Merge discourse-links-category into Discourse