Merge v3.4.85

This is the 3.4.85 stable release
3.4.85

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>