merge 2014.07.30 commit into master