commit 2014-08-06 12-08