++changes

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
Merge remote-tracking branch 'github/master'
Merge branch 'master' into 2.3