commit 2014-07-05 12-23