Fix for potential array overflow.
Merge branch 'master' of github.com:Senscape/Dagon