[UPDATE] Version 2.0.0
Merge pull request #3218 from YannickL/master

[UPDATE] Version 2.0.0