Use 1.4.1 deps
Merge branch '1.4'

Conflicts:
	rebar.config