fix for #360
Merge branch 'develop' of github.com:wordnik/swagger-core into develop