Squashed commits
Merge branch 'master' of https://github.com/dimitrkovalsky/slick