Production Branch Clean-up 2014-10-19