Merge pull request #1602 from rubenk/powerdns-constify