Updated stuff
Merge branch 'refs/heads/release-2.0'