commit 2014-08-07 14-17