commit 2014-06-06 10-17