commit 2014-06-30 12-52