Merge branch 'master' into new-polys

Conflicts:
	sympy/integrals/tests/test_risch.py
	sympy/printing/pretty/tests/test_pretty.py