Unified use of extensions in metadata. Now includes the dot everywhere
Merge branch 'master' into develop