Automatic merge of 'misc-fixes' branch from