Merge pull request #105 from lhein/7.2.x

merging consolidation changes from master