Python 3.3 compatibility. WARNING: will not work with Python 3.{1,2} because of u''. But at least work with Python 2.7 and 3.3 with the same file without the need to duplicate the work.
Merge branch 'release/2.0'