Patching upstream 3.4.14->3.4.15

Signed-off-by: Bryan Smith <zarboz@mint>