Merge branch 'new_branch_for_2.2' of github.com:aarondaniel/grav-merge into new_branch_for_2.2

Conflicts:
	src/Main.hs