[css-grid] grid-auto-flow values

Hi,

1 year ago it was suggested to use row|column instead of rows|columns as
values for grid-auto-flow property for coherency with flexbox [1].

The answer was positive [2], however rows|columns is still being used in
the last version of the spec [3].

What's the current status of these values? Would they change  to row|
column in the next versions of the spec?

Thanks,
  Rego

[1] http://lists.w3.org/Archives/Public/www-style/2013Jan/0634.html
[2] http://lists.w3.org/Archives/Public/www-style/2013Jan/0635.html
[3] http://www.w3.org/TR/css-grid-1/#grid-auto-flow-property