commit 2014-06-19 15-31