Update branch
Merge pull request #5052 from esteve/update-pluginlib-branch

Update branch