I merged the PR to master and 2.0 branch. Please also create a PR against 1.1
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
I merged the PR to master and 2.0 branch. Please also create a PR against 1.1