Merge pull request #4840 from kumpera/unaligned-access