Merge --squash crazy-branch to master