Merged change to textobj-indblock