Merge remote-tracking branch 'origin/disable_assertion_rewriting_external_modules' into disable_assertion_rewriting_external_modules

# Conflicts:
#	src/_pytest/assertion/rewrite.py
#	testing/test_assertrewrite.py

Author: Tusenka