Merge branch 'hotfix/v3.1.1' into develop

# Conflicts:
#	RELEASE_NOTES.rst

RELEASE_NOTES.rst

@@ -6,17 +6,13 @@ Please always read this file before installing the package
 Download software here: https://github.com/jbarlow83/OCRmyPDF/tags
 
 
-Latest:
-=====
+v3.1.1:
+=======
 
 Changes
 -------
 
--  Fixed bug where successful repair of PDF files errors led to abort (thanks to @shemgp)
--  You can now override the location of external programs OCRmyPDF uses by setting
-   environmental variables of the form OCRMYPDF_PROGRAMNAME, e.g. OCRMYPDF_TESSERACT will
-   override system Tesseract.
-
+-  Fixed bug that caused incorrect page size and DPI calculations on documents with mixed page sizes
 
 v3.1:
 =====

ocrmypdf/main.py

@@ -35,7 +35,7 @@ warnings.simplefilter('ignore', pypdf.utils.PdfReadWarning)
 
 
 BASEDIR = os.path.dirname(os.path.realpath(__file__))
-VERSION = '3.1'
+VERSION = '3.1.1'
 
 
 # -------------

setup.py

@@ -184,7 +184,7 @@ tests_require = open('test_requirements.txt').read().splitlines()
 
 setup(
     name='ocrmypdf',
-    version='3.1',  # also update: release notes, main.py
+    version='3.1.1',  # also update: release notes, main.py
     description='OCRmyPDF adds an OCR text layer to scanned PDF files, allowing them to be searched',
     url='https://github.com/jbarlow83/OCRmyPDF',
     author='James R. Barlow',