Merge branch 'master' into policy-reserved-domains

diff --cc modules/hints/README.rst
index ab13a02ea7d3878981b61e3a16a2e245b52d776d,57f2628454a2961fee13e9c5aeec41e2c1f84662..31be9bc6a410f4c36be89a5096818a8bfcfccc66
--- 1/modules/hints/README.rst
--- 2/modules/hints/README.rst
+++ b/modules/hints/README.rst
@@@ -22,11 -22,8 +22,11 @@@ Example
      hints.root({
        ['j.root-servers.net.'] = { '2001:503:c27::2:30', '192.58.128.30' }
      })
-     -- Set a custom hint
+     -- Add a custom hint
 -    hints['localhost'] = '127.0.0.1'
 +    hints['foo.bar'] = '127.0.0.1'
 +
 +.. note:: The ``policy`` module applies before ``hints``, meaning e.g. that hints for special names (:rfc:`6761#section-6`) like ``localhost`` or ``test`` will get shadowed by ``policy`` rules by default.
 +    That can be worked around e.g. by explicit ``policy.PASS`` action.
  
  Properties
  ^^^^^^^^^^