Merge "Fixed concatenation to properly discard empty strings" into qt-dev