Merging branch 'mm-fixloginbuttonfont' into fixloginerror