Merge branch 'tine20.com/2012.10' into 2013.03