Add note about diamond inheritance
Merge branch 'master' into gh-pages
Rebuild docs