Merge branch 'master' into CorePack
[language] merge from xoopscube/legacy extras lang
Merge branch 'CorePack' into pilot