commit 2014-06-06 13-20