Free GError on command line option parse
Merge branch 'master' into ctrlnp