Merge "Drop unnecessary 'x' bit from doc config file"
diff --git a/doc/source/conf.py b/doc/source/conf.py
old mode 100755
new mode 100644