Merge "Change data type for 64bits machine" into devel/master