added backports
Merge branch 'bug/backport-3.2.16' of github.com:digidentity/rails into bug/backport-3.2.16