commit 2014-06-27 16-45