Applying changes of JoomFish 2.2 pull request to the 2.5 core platform
https://github.com/JoomFish/joomfish-2.2/pull/10 Thx - Thomas Kuschel