Merge "Fix a heap-buffer-overflow issue." into devel/master