1.5.3 prep
Merge pull request #341 from mhaskel/1.5.3-prep

1.5.3 prep