Merge branch 'master' into import-system-xml-linq