refactor populate
fixed; depopulation of mixed documents

closes #1471
docs;
release 3.6.9
Merge branch '3.6.x' into gh-pages
website; 3.6.9