Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Mason.pm
index 2a0908a,16c9afd..9bd0cc3
--- 1/FS/FS/Mason.pm
--- 2/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@@ -309,9 -309,6 +309,9 @@@ if ( -e $addl_handler_use_file ) 
    use FS::contact_class;
    use FS::part_svc_class;
    use FS::ftp_target;
 +  use FS::quotation;
 +  use FS::quotation_pkg;
 +  use FS::quotation_pkg_discount;
    # Sammath Naur
  
    if ( $FS::Mason::addl_handler_use ) {
@@@ -588,7 -585,7 +588,7 @@@ sub mason_interps 
                      },
      compiler     => HTML::Mason::Compiler::ToObject->new(
                        default_escape_flags => 'h',
-                       allow_globals        => [qw(%session)],
+                       allow_globals        => [qw(%session $DECODED_ARGS)],
                      ),
    );