Merge pull request #175 from guillesilva/master-next

OCC fixes for Tyan Issue 134 and other miscellaneous fixes