commit 2014-06-11 13-19