This has been broken this whole time and no one told me!
Merge remote-tracking branch 'refs/remotes/origin/master' into vertex-poly-index

Conflicts:
	src/commands.c