merged default

--HG--
branch : stable
Version 1.2.0

--HG--
branch : stable
Added tag 1.2.0 for changeset 6009e3244691

--HG--
branch : stable
merged stable