commit 2014-06-26 16-55