Merge update from dev to master
Fix issue #695. Possible fix for issue #697 (though I wasn't able to duplicate that one). Plus, add the ability for PageTable to detect and pick up children that were added via some others means.