Fix Bug 1041509, bump plugincheck non-enumeration code to 31
Merge pull request #2165 from ossreleasefeed/bug1041509-bump-fx-version-to-31

Fix Bug 1041509, bump plugincheck non-enumeration code to 31