Fixing joomla/joomla-platform#1279
Merge branch 'master' of github.com:joomla/joomla-framework