commit 2014-06-25 21-47