Comment 20 for bug 1540965

Reviewed and upload for 14.04 and 15.10. Pending acceptance into proposed.