merged https://github.com/wordnik/swagger-js/issues/42
Merge remote-tracking branch 'upstream/develop-2.0' into develop-2.0