#JC-1407 fixed
Merge remote-tracking branch 'origin/master' into master.user_bbcode