commit 2014-06-23 17-00