commit 2014-06-19 21-23