Merge pull request #628 from APIs-guru/master

Wrap '$ref's to prevent 'definitions' override