Plugin: merging master to unstable

No changes here, as they were already made in the unstable branch.