commit 2014-06-04 12-10