Merge commit 'smcv/htmlbalance'