Merge branch '3.4-dev' of https://github.com/joomla/joomla-cms into componentrouterrulesinterface2