Merged PRO features to free + fix for mentions in JIRA 6.3+