Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'