Sync with 2014-04-08 master