QUT's 9.1sp9 Changes

Hi Tim / Myself / Nick,

Squashed commits 97ca579f19626b7b2b371f96d991bdf1425a6846, ac9a8aebf888cc317fd7e05a0649e39afb77d632 and 25e49e6799d848b10cb9adfc0db820a5cda86d6d from QUT SVN with our 9.1sp9 changes.

Will tag and update Ocelot probably tomorrow :)

-- Chris B (baldwicc)