Includes resolution
Merge branch 'master' of github.com:cwi-swat/php-analysis