Another version specific coverage fix.
Merge branch 'master' into coverage