1.5.1 prep.
Merge pull request #328 from mhaskel/1.5.1-prep

1.5.1 prep.