Merge branch 'release/1.2.0' into develop
Added support for the deprecated tag (renders a shortDeprecated and a deprecated tag for relevant elements)
Merge branch 'develop'