Merge branch '6.0'

diff --cc files/lib/system/exporter/VB5xExporter.class.php
Simple merge

diff --cc files/lib/system/exporter/WBB4xExporter.class.php
Simple merge

diff --cc package.xml
Simple merge