Minor updates.
Merge branch 'ajp_dev' into development

* ajp_dev:
  Minor updates.

Conflicts:
	source/Blimey.cs