Merge branch '2514' into merge_master
tree: 98f1c135baeab7572c684b0ced6cba09afb17d39
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE