Patched to Linux 3.4.27 (Squashed commit)