merge dccc39b to make automerger happy, original change 231cc6 was already merged

Merge commit 'dccc39b'
tree: cfb2b2459fca772ec78ef18954d63b096cb50a14
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE