Summary of changes: 4978c45... Update to upstream 20140724 version. (*) f1b2c55... Refresh the patches so everything applies properly. (*) (*) This commit already existed in another branch; no separate mail sent