Fixed lag problems when resizing frame (maybe...) (again)
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'