Contrib update: google_analytics
Improve pdnsd configuration update by removing non-IP lines early enough.
Merge branch 'refs/heads/master' into 2.3.x-dev