Merge in latest non-breaking changes from kernel 3.14.4