Merge branch 'elixir-1.9' into 'develop'