typo (closes #471)
Merge remote-tracking branch 'upstream/master'