Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken * commit '38947ddcfb2411d380d631ebfc29d66b11821879': Fix the build - doh.
Merge commit '38947ddcfb2411d380d631ebfc29d66b11821879' into kraken * commit '38947ddcfb2411d380d631ebfc29d66b11821879': Fix the build - doh.