commit 2014-06-26 13-55