use the entire template chain to build up search paths
update changelog
Merge branch 'fix.deep-inheritance-search-paths'
prep 2.3.1