commit 2014-08-10 21-05