dependency update
dependency updates
Merge branch 'myns' into 1.1.0

Conflicts:
	project.clj