Merge "tipsy: using user class borks positioning of tip"