Merge branch '2015.11-develop' into 2016.11