Merge pull request #459 from wilbryan/master-next

OCC Update 05/02/2016