Merge branch 'origin/new/bug3756_reenable_local_sysprefs' of git://git.tamil.fr/git...