Prepare for Joomla 3.x compatible branch (update from DWorkflow)