Fix deprecation warnings in 0.13.1
Merge remote-tracking branch 'origin/elixir-0.13.1'

Conflicts:
	mix.exs
Release v0.4.2