Trying to fix build error in travis...
Still trying to get travis to work...
Merge branch 'develop'