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

Tension release #3548