Merge branch '2014.7' forward into develop