Allow Joomla Naming Convention from 5b38ee04e782d38b062b34baea4f94cf879ea66e
Merge remote-tracking branch 'origin/2.5-develop' into 2.5-develop