Sync fork with trunk

Jun 10, 2014 -  Jul 09, 2014