Merge branch 'master' into single_code_base

Conflicts:
	sympy/concrete/summations.py
	sympy/solvers/recurr.py