Fix travis tests for 2.2
Merged branch '2.2/develop'