Pull 4/17/14 updates from master