commit 2014-08-06 10-34