Ignore merge commits
https://trello.com/c/2VYs6TKS
Merge branch 'develop'