Fix up one of the previously imported hunks
Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>
Merge pull request #40 from jonludlam/CA-114922

Fix up one of the previously imported hunks