Fixes #62
Merge branch 'master' into post-release-fixes
Fixes #63
Update the summary to be more understandable for disease restrictions.
Merge branch 'post-release-fixes' into qa
Merge remote-tracking branch 'origin/qa' into qa