Merge with default

--HG--
branch : stable
Added tag v2.0.3 for changeset 64e2df84cca3

--HG--
branch : stable
Update version number

--HG--
branch : stable
Fix issue #203

--HG--
branch : stable
Merge with stable