trying to resolve conflict take 2
Merge pull request #1793 from tysonn/conflict4-17

trying to resolve conflict take 2