Merge branches 'fixes', 'misc' and 'sa1111-for-next' into for-next