Merge branch 'master' into stable
Bump version number
Merge remote-tracking branch 'upstream/stable'

Conflicts:
	libraries/elm_dependencies.json