Remove unneeded jimport() calls (fixes potential J!3.1.5 issues)
Merge remote-tracking branch 'origin/master'