Patching upstream 3.0.13->3.0.14