synced with master of Jan 7 2014