Merge tag 'v3.4.93' into frostedlp

This is the 3.4.93 stable release

Signed-off-by: Paul <javelinanddart@gmail.com>