[git] ignoring phpdox output
Merge branch 'master' into develop