Removed unnecessary slicing.
Merge branch 'master' into release
Python 2.5 if… else… expression used (like elsewhere).