Avoid double exporting of structure

Debian bug #670734
Merge remote-tracking branch 'origin/QA_3_5'
Avoid double exporting of structure

Debian bug #670734