commit 2014-05-26 10-17