Pull 5/6/14 updates from master