Merge branch 'master' into tmp

Conflicts:
	sympy/solvers/tests/test_recurr.py
test_recurr.py: spaces after comma added