Synchronize with trunk up to r126837
Merge branch 'master' (r126837) into gb-groups
Tidy up some formatting and language
Fix bug that exempted internal GB items from forced zeroes
Remove provider methods on unregister