Merge branch 'pu/2013.10-longrun'