End of Oct 2014 commit