BUG FIX: make sure to recurse into level greater 3
Merge branch 'refs/heads/master' into 2.1