Fix error with merge
Merge branch 'autofake-first' into localwiki_master