Merge pull request #946 from jmaas/master

Get rid of opt_parse hack for Koan