Merge proposals dependent on lp://qastaging/~renatofilho/unity-2d/bug870055

lp://qastaging/~renatofilho/unity-2d/bug870055 has no merge proposals.