Merge dev (Joomla 3.x version) to master

No support for Joomla 2.5 any more