Cleaner erlang opts.
Merge branch 'test' into dev