added slave
Merge branch 'master' into Bug#7008