Merge pull request #549 from mhaskel/merge_master_to_2.1.x