commit 2014-05-26 15-17