Fixed compile error in line 36 due to copy-pasting flaw.
Merge remote-tracking branch 'origin/master'