Fix #1567 and add tests to cover getChildView taking a model
Merge pull request #1619 from cmaher/fix-1566

Fix #1567 and add tests to cover getChildView taking a model