Fix janice tearing issues
Merge remote-tracking branch 'novathor/3.0.101' into 3.0.101-new