Fixed manual ordering of swapped items.
Merge branch 'master' into server