Fix for #3460.
Doublesuperheating fix.
Merge pull request #3461 from Segrain/dev-freeze

Dev-freeze bugfixes.