[Merge] lp:~jamesodhunt/ubuntu/trusty/patch/bug-1306412 into lp:ubuntu/trusty/patch

[James Hunt]

Ah - I see debian has now applied the original patch so maybe easier to sync from there?
-- 
https://code.launchpad.net/~jamesodhunt/ubuntu/trusty/patch/bug-1306412/+merge/217937
Your team Ubuntu branches is requested to review the proposed merge of lp:~jamesodhunt/ubuntu/trusty/patch/bug-1306412 into lp:ubuntu/trusty/patch.