Issue #28678: Merge parameter name from 3.6
authorMartin Panter <vadmium+py@gmail.com>
Sun, 13 Nov 2016 23:36:30 +0000 (23:36 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Sun, 13 Nov 2016 23:36:30 +0000 (23:36 +0000)

Trivial merge