Split out 3.1 compatible branch (removed master-based travis configs)