copied from shairport
Metadata additions
Merge branch 'metadata' into 2.1