Merge remote-tracking branch 'origin/master' into develop

3 files changed, 3 insertions, 0 deletions

diff --git a/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md

index d2050a3e44..d2050a3e44 100644
--- a/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
diff --git a/MANIFEST.in b/MANIFEST.in

index 981698143f..afb60e12ee 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -27,4 +27,5 @@ exclude jenkins*.sh
 exclude jenkins*
 recursive-exclude jenkins *.sh
 
+prune .github
 prune demo/etc
diff --git a/docs/postgres.rst b/docs/postgres.rst

index b592801e93..904942ec74 100644
--- a/docs/postgres.rst
+++ b/docs/postgres.rst
@@ -1,6 +1,8 @@
 Using Postgres
 --------------
 
+Postgres version 9.4 or later is known to work.
+
 Set up database
 ===============