commit 2014-07-10 21-05