Sync fork with trunk

Jul 07, 2014 - Jul 18, 2014