Merge branch 'master' into preos
DO NOT USE ECHO WHEN SOMETHING MAY CONTAIN A B-A-C-K-S-L-A-S-H

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
++changes

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