commit 2014-08-06 14-23