Update facades.md
Update upgrade.md
Merge remote-tracking branch 'origin/4.1' into 4.2

Conflicts:
	upgrade.md