commit 2014-09-11 11-40