Backport: https://github.com/joomla/joomla-cms/pull/4044

@infograf768 here is the backport of https://github.com/joomla/joomla-cms/pull/4044

### Tracker

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=34038&start=0