Reenable the option for turning off GMCP.
Merge branch 'release_30' into release_31

Reenable the option for turning off GMCP.
Merge branch 'release_31' into development

Reenable the option for turning off GMCP.