Fix the broken trunk.
Merge branch 'ELF_Integration' of https://github.com/eberletj/vplus into ELF_Integration