commit 2014-06-17 15-24