Fixes #7939
Merge branch 'master' of https://github.com/MridulS/sympy

Conflicts:
	sympy/geometry/ellipse.py