2014-10-21 commit