reapplied #504 which was clobbered in a bad merge
Merge branch 'develop_scala-2.10' of github.com:swagger-api/swagger-core into develop_scala-2.10