Merge branch '2014.11' into 2014.11-develop