Fix bug in solve_qp
Merge branch 'master' into update_solver_interface