Merge branch 'master' into xtothex

Conflicts:
	sympy/integrals/risch.py