Fix a raise statement that was not updated to py3 compatible syntax in the merge.
Fix in globalparameters.py.in exception syntax.
Merge branch 'master' into next