Minimal changes to get issues code working.
Merge branch 'integrate-pullrequest-1'