Update master

Getting all the updates from the Joomla master repository.