Expanded the behavior for J6.x
Merge branch 'master' of https://github.com/rdumitriu/jira-qanda