Fixed dependencies for 2.1 branch
Merge pull request #1197 from jvandesande/Composer2.1

Fixed dependencies for 2.1 branch