mergeed
merged from upstream
removed ring.clj
Merge remote-tracking branch 'origin/2.0.1-SNAPSHOT' into 2.0.1-SNAPSHOT

Nothing special