Merge "Fix for compilation error on 32 bit builds"