Adds changes from 2014-10-27