merge 2014.07.30 with master