Squish of the first commits for the branch
Merge branch 'master' of https://github.com/gitlabhq/gitlab-recipes
Merge branch 'master' of github.com:Rovanion/gitlab-recipes