Pulling in changes from 5.3.X
Merge pull request #62 from kkronenb/master

Pulling in changes from 5.3.X