Merge pull request #502 from mhaskel/merge_2.0.x_to_master