commit 2014-08-05 13-11