Merge "Zero means undefined." into qt-dev