Merge branch 'release/v3.1.57' into develop
Second pass at using an API for spec references.
Merge pull request #223 from tobie/api-fix

Second pass at using an API for spec references.
v3.1.58
Merge branch 'release/v3.1.58' into gh-pages