commit 2014-08-05 15-52