Merge released version from default

--HG--
branch : stable
Merge from default

--HG--
branch : stable
Failing test for plus/space handling. Issue #9

--HG--
branch : stable
Merge from stable for failing test