DEV Bug #108 partially fixed: if a row is not added, the first cell of the row is not merged
Merge remote-tracking branch 'origin/master'