Merge branch 'use-libfm'