Merge branch '2016.11' into 2016.11-develop