psr-0 should have been psr-4 when switching to it
Merge branch 'refs/heads/wyr-dns-fix' into 0.4