Merge upstream default into issue_19

--HG--
branch : issue_19