Import cleanup
Merge remote-tracking branch 'origin/class-views' into class-views