Update travis configuration
Release 3.1.1
Merge master changes