Updated JSONAPI to 0.1.2
Merge pull request #8633 from joshdholtz/master

Updated JSONAPI to 0.1.2