slick/slick — pull request #673 by szeiger (2014-02-13 11:14:13+00:00)
Title: Clean up for 2.1 in master

Review by @cvogt