Fixes #1709: Applied to release branch

git-svn-id: http://chianti.ucsd.edu/svn@31096 0ecc0d97-ab19-0410-9704-bfe1a75892f5
Fixes #1714: Applied to release branch

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