commit 2014-08-19 21-03