Updated changes, removed 3.1 due to env setup problems [skip ci].