Merge branch 'dsolve' of https://github.com/smichr/sympy into smichr/dsolve