add scaladoc options
Merge branch '20130420'