Fix for latest jazz
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] mix.exs
	[resolved] mix.lock