Plain Diff
Merge "Slightly hackish workaround to support rectangles in directional intra predictors." into experimental