Merge pull request #997 from rustyswayne/1.6.0

Updates for 7.2.0 compatibility