commit 2014-06-04 15-25