updated to include 3.x plugin
Merge branch 'release/3.x.1'