Merge proposals dependent on lp:~paparent/fluidinfo-explorer/better-text-when-too-much-data-713458-713460

1. better-text-when-too-much-data-713458-713460
2. Dependent merge proposals