Merge r1839303, r1843290 from trunk: These need to be signed longs... cast as needed. Add CHANGES entry Submitted by: jim, jailletc36 Reviewed by: jailletc36 (by inspection), ylavic, jim