Revert "Revert "Merge remote-tracking branch 'schmittjoh/master'""

Since MaxDepth is working. :D

This reverts commit fae151af0242ca20415ff39c8af60c292a6e4cc7.