Merge branch 'update-elixir-make' into 'develop'