Update Filesystem.php
Merge branch '4.2'