merge Sep 03, 2014