Merge in global properties.
Merge branch 'default-properties'