commit 2014-08-07 11-10