Merge v2.1.2 from swagger-api/swagger-js (properly)

This a proper merge commit with to parents. The previous commit 079ac19
did not have the upstream tag as a parent, thus git could not recognize
the fact that we have already merged some commits in subsequent merges.

Author: Miroslav Bajtoš