Merge branch 'issue722' into 1.6.x
Merge branch 'issue648' into 1.6.x
update rhino version (use patched version)
synchronize WeakHashMap in InjectorClass
Merge branch 'issue740' into 2.0.x