Merge branch 'bugfix/erlang-24' into 'develop'