Fix up divergence with JuMP master
Merge branch 'master' into generaloracle