fixes #1302
Merge branch 'pending-contributor'