work in progress
Merge branch 'master' into contentmetadata
closes #117
Merge branch 'master' into contentmetadata
Merge branch 'master' into contentmetadata