Merge branch 'getopt'