Update to elixir master