Merge branch '2014.09' into 2015.07