Make it possible to pass runtime specific options directly.
Update moxiecode/moxie@b3166baab34a83f1be200023d7ede62608604559.