Merge branch 'master' into next

diff --cc com.woltlab.wcf/templates/userBBCodeTag.tpl
index e983c7833cbad95632d5f1706401fe0c57a188ab,83f6f539132116a7f16fb17631444e043424d5bf..4d7ec5439291f56bc4cc6222b98af7100f5ab0fa
--- 1/com.woltlab.wcf/templates/userBBCodeTag.tpl
--- 2/com.woltlab.wcf/templates/userBBCodeTag.tpl
+++ b/com.woltlab.wcf/templates/userBBCodeTag.tpl
@@@ -1,6 -1,6 +1,6 @@@
  {if $userProfile === null}
        {* user no longer exists, use plain output rather than using a broken link *}
-       @{$username}
- {else}
-       <a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="userMention userLink" data-user-id="{@$userProfile->userID}">{$userProfile->username}</a>
- {/if}
 -      <span class="userMention">{$username}</span>{* no newline after the tag
++      @{$username}{* no newline after the tag
+ *}{else}
+       <a href="{link controller='User' object=$userProfile->getDecoratedObject()}{/link}" class="userMention userLink" data-user-id="{@$userProfile->userID}">{$userProfile->username}</a>{* no newline after the tag
+ *}{/if}