Merge branch 'rbarlow-986026' into pulp-2.2
Merge branch 'pulp-2.2'