Merge branch 'master' of ssh://git.phpeclipse.com/phpeclipse