Corrected meta-data name
Merge remote-tracking branch 'upstream/0.7.x' into 0.7.x