Trianglelized, upstreamed version to v1.5

Conflicts:
	CONTRIBUTORS.mkdn