Updates for 2.3.2 plugin patch
Merge pull request #11 from khawkins/232_patch

Updates for 2.3.2 plugin patch