Merge branch 'bug30184_029' into bug30184_034

"ours" merge, because 0.3.4 has a different set of changes,
which already compile.