commit 2014-06-26 11-05