Revert "rebase 8 okt"

Reverts osignell/joomla-cms#1