commit 2014-07-05 11-03