fix for handling lists of objects in JavaSource constructor
Merge remote-tracking branch 'origin/master'