commit 2014-08-05 14-39