Merge branch 'master' of https://github.com/sympy/sympy into dyadicvector