Revert "Merge branch 'feature_f' into development"

This reverts commit a519effac1f8559ac5bb3936a58b7d5e5aa96820, reversing
changes made to 6718413dd88fbee5928228737977c747bf878743.
Merge remote branch 'world/release_18_04_2013' into release_18_04_2013