commit 2014-06-26 20-47