Merge with 3.7.1 (Ref #213)
Merge with the rest of 3.7.1
Bumped to 3.8.1 in preparation for next release.