do not change to the masterbranch...

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
ignore pypi-release marker

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
Merge branch 'master' into 4.0-pre-not-stable