merged commits into single commit
Merge branch 'master' of https://github.com/imrefazekas/rupture