New PR for tracker #28256

This replaces PR #949 which is now out of date.

http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemEdit&tracker_item_id=28256