0acbe6914d
The patch for the helper functions is by Nathan Nguyen <nathannguyen@catalyst-au.net> whom I wish to thank.