commit 2014-07-14 10-16