Sync `develop_2.0` branch back to `master`

Looks like you moved from `develop_2.0` branch back to `master` for swagger 2.0 spec support.  Can you merge this fix back to master?

Thanks!