Merge "bug_3259956 and bug_2166704"
tree: ffa08b15bbbaa2436d60e4d00cfae6cbcc3d8a82
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE