Merge branch 'hotfix/1.2.4'
Merge branch 'release/1.3.0'
Update File.php
Merge branch 'hotfix/1.3.1' into develop