Reassignment to reference doesn't cause error
Reassignment to reference doesn't cause error
Merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #880 from geoffliu/master

[C++/en] Slight nit to pick.