Merge remote branch 'origin/master'

diff --combined grml2usb
index 8fd6909,a09b97f..05d3b38
--- 1/grml2usb
--- 2/grml2usb
+++ b/grml2usb
@@@ -20,7 -20,7 +20,7 @@@ import fileinpu
  import glob
  
  # global variables
- PROG_VERSION = "0.9.17-pre1"
+ PROG_VERSION = "0.9.17"
  MOUNTED = set()  # register mountpoints
  TMPFILES = set() # register tmpfiles
  DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
@@@ -1220,8 -1220,6 +1220,8 @@@ def install_iso_files(grml_flavour, iso
      # * catch "install: .. No space left on device" & CO
  
      if options.dryrun:
 +        global GRML_DEFAULT
 +        GRML_DEFAULT = grml_flavour
          return 0
      elif not options.bootloaderonly:
          logging.info("Copying files. This might take a while....")
@@@ -1894,10 -1892,6 +1894,10 @@@ def main()
      if options.dryrun:
          logging.info("Running in simulation mode as requested via option dry-run.")
  
 +    if options.grubmbr and not options.grub:
 +        logging.critical("Error: --grub-mbr requires --grub option.")
 +        sys.exit(1)
 +
      # specified arguments
      device = args[len(args) - 1]
      isos = args[0:len(args) - 1]