refs #153 ported fix from gh71 branch
Bumped version to 3.8.
Merge 3.x upto 505f6754f25fd2ad9a6e2a34914f84388c8afb0a, including fix for gh153