set_time_limit on long product imports
Merge remote branch 'origin/fannieDevelop' into fannieDevelop