changed function signature
Merge branch 'v10' of https://github.com/chrisgraham/ocPortal into v10