commit 2014-06-10 16-42