Merge branch 'hotfix-1.2.5'
fix PHPDoc parsing
Merge branch 'hotfix-1.2.7' into develop