Merge branch 'master' of sipb-www@scripts:wiki