Fix up tests
Fix up tests
Merge branch 'development' of github.com:aptana/studio3-php into development