Added swapping unit's items of arbitrary slot positions.
Merge remote-tracking branch 'upstream/master'