Updated against master
Merge pull request #815 from everwakeful/master

Extend existing "meta" solution for JSON REST responses