mrg
Merge branch 'master' of
https://github.com/bikeshtricon/pyramid_test.git

Conflicts:
	CHANGES.txt