Merge branch '2014.11-develop' into 2015.11