Merge branch 'master' into dvd_scale_test