Fixed problems with merging oneline blocks, fixes #1360

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>