commit 2014-06-19 19-15