Merge branch 'master' into ms-decimal