commit 2014-06-26 10-20