Development

Merge from development into master to get the 'type' meta-information as a bug fix.