Merge branch 'develop-2.1.1'
Merge pull request #109 from adyenpayments/master

Merge branch 'develop-2.1.1'