Simple change to follow the parent GoogleToolbox and prevent warnings.
Merge branch 'master' into 64bit

Bring in changes to master to the 64bit branch.