Merge "bug fix for qtip reporting"