commit 2014-08-19 22-31