merge with 0.6

tests/root/bom.txt

@@ -0,0 +1,5 @@
+File with UTF-8 BOM
+===================
+
+This file has a UTF-8 "BOM".
+

tests/root/contents.txt

@@ -17,6 +17,7 @@ Contents:
    includes
    markup
    desc
+   bom
    math
    autodoc
    autosummary

tests/test_build.py

@@ -41,7 +41,7 @@ ENV_WARNINGS = """\
 %(root)s/images.txt:9: WARNING: image file not readable: foo.png
 %(root)s/images.txt:23: WARNING: nonlocal image URI found: \
 http://www.python.org/logo.png
-%(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading \
+%(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8-sig' used for reading \
 included file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
 %(root)s/includes.txt:56: WARNING: download file not readable: nonexisting.png
 """
@@ -115,6 +115,9 @@ HTML_XPATH = {
         ".//div[@class='footer']": 'Georg Brandl & Team',
         ".//a[@href='http://python.org/']": '',
     },
+    'bom.html': {
+        ".//title": " File with UTF-8 BOM",
+    },
     '_static/statictmpl.html': {
         ".//project": 'Sphinx <Tests>',
     },