Merge remote-tracking branch 'upstream/master'

Conflicts:
	FS/FS/cust_pkg.pm

diff --cc FS/FS/cust_pkg.pm
index eb6a714,771d3ec..5abdbe2
--- 1/FS/FS/cust_pkg.pm
--- 2/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@@ -48,8 -49,13 +48,10 @@@ use FS::svc_forward
  # for sending cancel emails in sub cancel
  use FS::Conf;
  
 -$DEBUG = 0;
 -$me = '[FS::cust_pkg]';
 +our ($disable_agentcheck, $DEBUG, $me, $import) = (0, 0, '[FS::cust_pkg]', 0);
  
 -$disable_agentcheck = 0;
 -
 -$upgrade = 0; #go away after setup+start dates cleaned up for old customers
++our $upgrade = 0; #go away after setup+start dates cleaned up for old customers
+ 
  sub _cache {
    my $self = shift;
    my ( $hashref, $cache ) = @_;