Fix spelling error
Misc fixes
Misc fixes
Misc fixes
Merged with v9
Merger fix
Merge branch 'v10' of github.com:chrisgraham/ocPortal into v10
Misc fixes
Misc fixes