fixup
Merge branch 'master' of github.com:JuliaOpt/JuMP.jl
finally fixes #79