commit 2014-08-27 22-19