commit 2014-06-27 13-22