Comment 69 for bug 1274034

I don't know if upstream want a back port to juno but for people who want a patch, attached is a patch against the latest stable/juno. I'm happy to submit this as a review to stable/juno if upstream things it back port worth.

NOTE: I don't have a facility for running the functional tests, and the structure seems to have changed quite a bit between master and juno. As a result I didn't back port the functional tests from master but I did write unit tests for juno.