Merge branch 'develop'
Fixed tests for php 5.3; touch() doesn't work with vfsStream in 5.3