Reformatted as per CPAN::Changes::Spec
Merge remote-tracking branch 'neilbowers/master'

Conflicts:
	Changes