MN: 2013 fixes
Merge remote-tracking branch 'origin/master'