Merge "Properly escape the messages in CategoryViewer.php"