Merge branch '396_elixir_1.7' into 'develop'