skok
Merge remote-tracking branch 'origin/resizing' into resizing