Generalise integers with units
Generalise integers with units

Change-Id: Iae5582f0ba5b26304a5ce6e9a7c9e0ed238a4240

flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast