Let's try adding phpdox back in.
Merge origin/master