commit 2014-06-30 16-22