Merge branch '2015.11' into 2015.11-develop