Merge branch 'update-compojure-to-1.1.8'