Merge branches 'frv' and 'mn10300'