Add icy version
Merge remote-tracking branch 'origin/master' into mojito
Merge branch 'master' of https://github.com/githubschool/recipes-for-06-18