Fixes #3330 with Scaladoc changes only
Merge pull request #3335 from swartzrock/master

Fixes #3330 with Scaladoc changes only