Updated test dependencies to fix travis tests
Merge branch 'stable'