commit 2014-06-03 10-26