Merge branch 'hotfix/fix_twitter_popup_share_size'
Merge branch 'release/0.8.42'
@template is now a reserved word in Dox.

move to  @tmpl
Bump+Changelog
Merge branch 'hotfix/rename_template_in_docs' into develop