Fix merge issue
Fix merge issue

sskeller/jsfiddles-base-bootstrap,sskeller/jsfiddles-less-color-util,sskeller/jsfiddles-example-equal-height-columns,sskeller/jsfiddles-d3-therm-2,sskeller/jsfiddles-base-bootstrap,sskeller/jsfiddles-d3-therm-2,sskeller/jsfiddles-example-equal-height-columns,sskeller/jsfiddles-less-color-util