Merge commit '3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4' * commit '3b30d80f5ef10a3c5c596283ef1f15e9ff6a3aa4': Fix typo in javadoc