Merge branches 'fixes' and 'misc'