commit 2014-06-25 12-24