Correct a dumb IllegalArgumentException.
Merge branch 'master' into withStaticInstance