References #1684: Backported r31072. Updated licenses

git-svn-id: http://chianti.ucsd.edu/svn@31076 0ecc0d97-ab19-0410-9704-bfe1a75892f5