Merge branch 'dev'
Merge branch 'master' into dev
+ SPMeta2.Syntax.Default clean up, less messy code, better supportability