Merge branch "Wip/v2.1.0 copy" into "gh-pages".