Fixed an out-of-bounds memory access violation possibility.
Merge remote-tracking branch 'remotes/upstream/master' into robust-memcache
Merge pull request #35 from xStrom/master

Out-of-bounds memory access violation fix.