Merge branch 'master' of https://github.com/json-api/json-api