[MERGE] Next into Master

Preparation of our first release.