v3.1.10: a bunch of small fixes

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