inner class names encoded java-style with '$' separator for generic bytecode type info
Merge remote-tracking branch 'origin/rel/1.3' into rel/1.3