Fix #314
Merge branch 'master' of git://github.com/JuliaOpt/JuMP.jl