Merge branch 'rmobile/fsi-despair' into rmobile-fixes-for-linus