Merge branch 'master' into psgi

* master:
  A failing reverse lookup doesn't imply it's a local address
  Tiny tidyups to copyright and license

Conflicts:
	lib/Catalyst/Engine/HTTP.pm

diff --cc lib/Catalyst.pm
Simple merge

diff --cc lib/Catalyst/Runtime.pm
Simple merge