commit 2014-07-31 12-25