2014-8-25 commit