commit 2014-04-25 12-08