commit 2014-06-10 14-39