am 1fd8a8ed: Merge change 21737 into eclair

Merge commit '1fd8a8ed0aa641d909e6157ea685ee3d97a81398'

* commit '1fd8a8ed0aa641d909e6157ea685ee3d97a81398':
  Added -s flag to ls.