Pull in fix for [IMMUTANT-454]
Pull in fix for [IMMUTANT-454]

Without breaking compatibility with WF8 (though the bug isn't fixed
there, only OOC and WF9)

immutant/immutant,kbaribeau/immutant,immutant/immutant,kbaribeau/immutant,immutant/immutant,kbaribeau/immutant,immutant/immutant