commit 2014-06-19 14-28