Merge branch 'master' into dynamic_slave_attributes