Merge pull request #2186 from annando/1512-profile-bbcode