merged changesets r644:647 and r651:655 from the GpPluginsRefactoringBranch back into the trunk (#177)