Merge "Fix for Ic74c7ba7 (c8c50eb): there's no reason to pass $this by reference."