Merge remote-tracking branch 'weierophinney/feature/view-script-resoultion'