Fix package import preventing local var, bug599.
Merge branch 'master' into combdly