commit 2014-05-30 15-25