[php-mikey179-vfsstream/f20] (3 commits) ...cleanup

[Remi Collet]

Summary of changes:

  4ef7db6... import from review #1097327 (*)
  561f9c1... import from review #1097327, spec (*)
  39db225... cleanup (*)

(*) This commit already existed in another branch; no separate mail sent