Updating: typo
Updating: improving contrib/gurobi
Merge remote-tracking branch 'upstream/master'