commit 2014-07-31 14-17