commit 2014-05-31 12-11