commit 2014-08-30 22-05