commit 2014-07-30 09-10