commit 2014-06-10 13-52