Merge "Fix apparent copy/paste error in double test"