Blah blah rebase this lol wut

Rebase onto 96d1222a
Merge pull request #1960 from jmeas/fix-dat-stuff

Tidies up _getNestedView code