Merge "Fix addition/overflow checks." into qt-qpr1-dev