Merge proposals dependent on lp://qastaging/~tiagosh/unity-2d/bugfix-880222

lp://qastaging/~tiagosh/unity-2d/bugfix-880222 has no merge proposals.