Merged fix from A.Gillis to allow build for 32bits system.
Authored by: Jean-Francois Dockes 2014-02-19
Parent(s): [0810b2]
Child(ren): [1af904]