Merge branch 'fantempplugin' into experimental