commit 2014-07-25 08-49