Merge branch 'release/1.0.4' into develop
Update elixir version for travis
Merge branch 'release/1.0.4'