commit 2014-07-11 08-18