Moving to $module instead of $plugin until the plugin repo is updated to accept the new format.
Merge branch 'master' into Release