Merge pull request #471 from mhaskel/merge_1.8.x_to_master