Update from Joomla master

Incl JHTMLBootstrap changes