Merge "Fix positioning of 1 pixel wide lines (esp. non AA lines.)"