Dan's bug #92
Merge remote-tracking branch 'origin/metadata_workpackage_01'