Change the scaling factor for grams in kilograms
Merge commit 'ORIG_HEAD'