Corrected inconsistent use of "this."
Merge remote-tracking branch 'origin/master'