Use proper Erlang version (yep, I'm an idiot)
Merge branch 'develop'