Merge branch 'for-v2013.04'