Bug#755610: Changes now being reviewed upstream

[Brian May]

It looks like these patches have been revised and merged upstream.
-- 
Brian May <br...@microcomaustralia.com.au>