Merge remote branch 'grml-scripts/master'