commit 2014-06-11 14-21