Merge branch 'master' into dwgsupp
Merge branch 'dwgsupp' into dxfsupp