commit 2014-06-06 12-22