Merged Weblocks 0.10.19