commit 2014-07-14 11-19