Skip to content

Fixes #1233#1282

Merged
fehguy merged 2 commits intoswagger-api:develop_2.0from npr:develop_2.0May 13, 2015