Merge branch '2013.10' into 2014.11