Patching upstream 3.4.12->3.4.13

Signed-off-by: Zarboz <zarboz@gmail.com>