Merge pull request #6774 from remitamine/academicearth