Merge branch '2014.11' into 2015.11