Merging changes suggested by @smichr.
Merging changes suggested by @smichr.

chaffra/sympy,jaimahajan1997/sympy,kaushik94/sympy,kaushik94/sympy,madan96/sympy,chaffra/sympy,skidzo/sympy,skidzo/sympy,madan96/sympy,jaimahajan1997/sympy,kaushik94/sympy,skidzo/sympy,yashsharan/sympy,chaffra/sympy,yashsharan/sympy,jaimahajan1997/sympy,madan96/sympy,yashsharan/sympy