Merge remote-tracking branch 'origin/tmyrden/views'
forThomas
Git is dumb
Fixed all the things