Merge of "modules/in-bulletin/branches/5.2.x@16384" to "modules/in-bulletin/branches/5.3.x@16368".
Conflicts:
- units/emoticons/emoticons_config.php
- units/poll_comments/poll_comments_config.php
- units/polls/polls_config.php
- units/posts/post_eh.php
- units/posts/posts_config.php
- units/private_messages/private_message_eh.php
- units/private_messages/private_messages_config.php
- units/topics/topics_config.php
- units/topics/topics_event_handler.php