Merge branch '2013.03' into 2013.10