Updating to latest master of 3rdparty - once more :-(
kill MDB2 in PHPDoc
fix return statement
Merge pull request #6503 from owncloud/finally-kill-mdb2-master

Finally kill mdb2 master