leftovers
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'github/master'
Working up to the render view controller with an external resource.