Merge branch '2016.11-develop-setup' into 2016.11-develop