Merge branch 'future' into workflow
Merge branch 'workflow' of github.com:wallix/redemption into workflow