Merge branch '2014.7' into develop