Fix #1885: Text clipping should always set the patch to the axes, regardless of the state of the clip_on kwarg, so that clip_on can be toggled after the fact
Merge pull request #1885 from mdboom/clip-text

text is not properly clipped in 1.2.1
Merge remote-tracking branch 'upstream/v1.2.x'

Conflicts:
	lib/matplotlib/axes.py