commit 2014-07-03 10-17