Upgrade to version 6.5.2
Merge pull request #2321 from pyed/diskaid

Upgrade to version 6.5.2