Merge proposals dependent on lp://staging/~mbranton/libopenshot/int64_fixes

lp://staging/~mbranton/libopenshot/int64_fixes has no merge proposals.