Avoid constructor in constructor as this apparently leads to problems on older gcc compilers.
Merge branch 'integration' into devel