Merge branch 'release/3.1.10'
Merge branch 'release/3.1.11'
update changelog

Signed-off-by: Chris “Kwpolska” Warrick <kwpolska@gmail.com>
Merge branch 'release/3.1.12'

Conflicts:
	CHANGELOG.rst
Merge branch 'release/3.1.13'

Conflicts:
	CHANGELOG.rst
Merge branch 'master' into develop