Merge "qtip: fix 'too many values to unpack' error"