Merge "Make CLPF handle frame widths and heights not divisible by 8." into nextgenv2