Merge pull request #334 from mhaskel/1.5.x-merge