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.
Added tag 3.8.1 for changeset 40744de29b84
Bumped to 3.8.2 in preparation for next release.
Merge with 3.8.1