Add workaround for broken prehistoric i686-lucid build environment
Try harder to work around i686-lucid issue
Merge branch 'upstream'