Tension release #3548
Merge pull request #3550 from jasondhales/tension_3548

Tension release #3548
Merge commit 'f855a469c67b4b89f561f62b5a643fef7004cd47'