Merge pull request #387 from mhaskel/merge_1.6.x