Merge branch 'resizex' (patches from Maciej)