Merge in 'cisco-global-exploiter'.