commit 2014-06-25 14-21