If multiple is true, return meta as array (trunk)

This is a Trunk pull request for the original #475 pull request that was set to master