Remove 5.3 from tests
Merge branch 'develop'