diff --git a/.bzrignore b/.bzrignore
index f30e8f9ae1..4b27e5744d 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,4 +1,3 @@
-.htaccess
 /lib/*
 /template/en/custom
 /docs/en/html
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta.pm b/.checksetup_lib/lib/perl5/CPAN/Meta.pm
new file mode 100644
index 0000000000..d9bc720a13
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta.pm
@@ -0,0 +1,1151 @@
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta;
+
+our $VERSION = '2.150005';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod     use v5.10;
+#pod     use strict;
+#pod     use warnings;
+#pod     use CPAN::Meta;
+#pod     use Module::Load;
+#pod
+#pod     my $meta = CPAN::Meta->load_file('META.json');
+#pod
+#pod     printf "testing requirements for %s version %s\n",
+#pod     $meta->name,
+#pod     $meta->version;
+#pod
+#pod     my $prereqs = $meta->effective_prereqs;
+#pod
+#pod     for my $phase ( qw/configure runtime build test/ ) {
+#pod         say "Requirements for $phase:";
+#pod         my $reqs = $prereqs->requirements_for($phase, "requires");
+#pod         for my $module ( sort $reqs->required_modules ) {
+#pod             my $status;
+#pod             if ( eval { load $module unless $module eq 'perl'; 1 } ) {
+#pod                 my $version = $module eq 'perl' ? $] : $module->VERSION;
+#pod                 $status = $reqs->accepts_module($module, $version)
+#pod                         ? "$version ok" : "$version not ok";
+#pod             } else {
+#pod                 $status = "missing"
+#pod             };
+#pod             say "  $module ($status)";
+#pod         }
+#pod     }
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod Software distributions released to the CPAN include a F<META.json> or, for
+#pod older distributions, F<META.yml>, which describes the distribution, its
+#pod contents, and the requirements for building and installing the distribution.
+#pod The data structure stored in the F<META.json> file is described in
+#pod L<CPAN::Meta::Spec>.
+#pod
+#pod CPAN::Meta provides a simple class to represent this distribution metadata (or
+#pod I<distmeta>), along with some helpful methods for interrogating that data.
+#pod
+#pod The documentation below is only for the methods of the CPAN::Meta object.  For
+#pod information on the meaning of individual fields, consult the spec.
+#pod
+#pod =cut
+
+use Carp qw(carp croak);
+use CPAN::Meta::Feature;
+use CPAN::Meta::Prereqs;
+use CPAN::Meta::Converter;
+use CPAN::Meta::Validator;
+use Parse::CPAN::Meta 1.4414 ();
+
+BEGIN { *_dclone = \&CPAN::Meta::Converter::_dclone }
+
+#pod =head1 STRING DATA
+#pod
+#pod The following methods return a single value, which is the value for the
+#pod corresponding entry in the distmeta structure.  Values should be either undef
+#pod or strings.
+#pod
+#pod =for :list
+#pod * abstract
+#pod * description
+#pod * dynamic_config
+#pod * generated_by
+#pod * name
+#pod * release_status
+#pod * version
+#pod
+#pod =cut
+
+BEGIN {
+  my @STRING_READERS = qw(
+    abstract
+    description
+    dynamic_config
+    generated_by
+    name
+    release_status
+    version
+  );
+
+  no strict 'refs';
+  for my $attr (@STRING_READERS) {
+    *$attr = sub { $_[0]{$attr} };
+  }
+}
+
+#pod =head1 LIST DATA
+#pod
+#pod These methods return lists of string values, which might be represented in the
+#pod distmeta structure as arrayrefs or scalars:
+#pod
+#pod =for :list
+#pod * authors
+#pod * keywords
+#pod * licenses
+#pod
+#pod The C<authors> and C<licenses> methods may also be called as C<author> and
+#pod C<license>, respectively, to match the field name in the distmeta structure.
+#pod
+#pod =cut
+
+BEGIN {
+  my @LIST_READERS = qw(
+    author
+    keywords
+    license
+  );
+
+  no strict 'refs';
+  for my $attr (@LIST_READERS) {
+    *$attr = sub {
+      my $value = $_[0]{$attr};
+      croak "$attr must be called in list context" unless wantarray;
+      return @{_dclone($value)} if ref $value;
+      return $value;
+    };
+  }
+}
+
+sub authors  { $_[0]->author }
+sub licenses { $_[0]->license }
+
+#pod =head1 MAP DATA
+#pod
+#pod These readers return hashrefs of arbitrary unblessed data structures, each
+#pod described more fully in the specification:
+#pod
+#pod =for :list
+#pod * meta_spec
+#pod * resources
+#pod * provides
+#pod * no_index
+#pod * prereqs
+#pod * optional_features
+#pod
+#pod =cut
+
+BEGIN {
+  my @MAP_READERS = qw(
+    meta-spec
+    resources
+    provides
+    no_index
+
+    prereqs
+    optional_features
+  );
+
+  no strict 'refs';
+  for my $attr (@MAP_READERS) {
+    (my $subname = $attr) =~ s/-/_/;
+    *$subname = sub {
+      my $value = $_[0]{$attr};
+      return _dclone($value) if $value;
+      return {};
+    };
+  }
+}
+
+#pod =head1 CUSTOM DATA
+#pod
+#pod A list of custom keys are available from the C<custom_keys> method and
+#pod particular keys may be retrieved with the C<custom> method.
+#pod
+#pod   say $meta->custom($_) for $meta->custom_keys;
+#pod
+#pod If a custom key refers to a data structure, a deep clone is returned.
+#pod
+#pod =cut
+
+sub custom_keys {
+  return grep {/^x_/i} keys %{$_[0]};
+}
+
+sub custom {
+  my ($self, $attr) = @_;
+  my $value = $self->{$attr};
+  return _dclone($value) if ref $value;
+  return $value;
+}
+
+#pod =method new
+#pod
+#pod   my $meta = CPAN::Meta->new($distmeta_struct, \%options);
+#pod
+#pod Returns a valid CPAN::Meta object or dies if the supplied metadata hash
+#pod reference fails to validate.  Older-format metadata will be up-converted to
+#pod version 2 if they validate against the original stated specification.
+#pod
+#pod It takes an optional hashref of options. Valid options include:
+#pod
+#pod =over
+#pod
+#pod =item *
+#pod
+#pod lazy_validation -- if true, new will attempt to convert the given metadata
+#pod to version 2 before attempting to validate it.  This means than any
+#pod fixable errors will be handled by CPAN::Meta::Converter before validation.
+#pod (Note that this might result in invalid optional data being silently
+#pod dropped.)  The default is false.
+#pod
+#pod =back
+#pod
+#pod =cut
+
+sub _new {
+  my ($class, $struct, $options) = @_;
+  my $self;
+
+  if ($options->{lazy_validation}) {
+
+    # try to convert to a valid structure; if succeeds, then return it
+    my $cmc = CPAN::Meta::Converter->new($struct);
+    $self = $cmc->convert(version => 2);    # valid or dies
+    return bless $self, $class;
+  }
+  else {
+    # validate original struct
+    my $cmv = CPAN::Meta::Validator->new($struct);
+    unless ($cmv->is_valid) {
+      die "Invalid metadata structure. Errors: " . join(", ", $cmv->errors) . "\n";
+    }
+  }
+
+  # up-convert older spec versions
+  my $version = $struct->{'meta-spec'}{version} || '1.0';
+  if ($version == 2) {
+    $self = $struct;
+  }
+  else {
+    my $cmc = CPAN::Meta::Converter->new($struct);
+    $self = $cmc->convert(version => 2);
+  }
+
+  return bless $self, $class;
+}
+
+sub new {
+  my ($class, $struct, $options) = @_;
+  my $self = eval { $class->_new($struct, $options) };
+  croak($@) if $@;
+  return $self;
+}
+
+#pod =method create
+#pod
+#pod   my $meta = CPAN::Meta->create($distmeta_struct, \%options);
+#pod
+#pod This is same as C<new()>, except that C<generated_by> and C<meta-spec> fields
+#pod will be generated if not provided.  This means the metadata structure is
+#pod assumed to otherwise follow the latest L<CPAN::Meta::Spec>.
+#pod
+#pod =cut
+
+sub create {
+  my ($class, $struct, $options) = @_;
+  my $version = __PACKAGE__->VERSION || 2;
+  $struct->{generated_by} ||= __PACKAGE__ . " version $version";
+  $struct->{'meta-spec'}{version} ||= int($version);
+  my $self = eval { $class->_new($struct, $options) };
+  croak($@) if $@;
+  return $self;
+}
+
+#pod =method load_file
+#pod
+#pod   my $meta = CPAN::Meta->load_file($distmeta_file, \%options);
+#pod
+#pod Given a pathname to a file containing metadata, this deserializes the file
+#pod according to its file suffix and constructs a new C<CPAN::Meta> object, just
+#pod like C<new()>.  It will die if the deserialized version fails to validate
+#pod against its stated specification version.
+#pod
+#pod It takes the same options as C<new()> but C<lazy_validation> defaults to
+#pod true.
+#pod
+#pod =cut
+
+sub load_file {
+  my ($class, $file, $options) = @_;
+  $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
+
+  croak "load_file() requires a valid, readable filename" unless -r $file;
+
+  my $self;
+  eval {
+    my $struct = Parse::CPAN::Meta->load_file($file);
+    $self = $class->_new($struct, $options);
+  };
+  croak($@) if $@;
+  return $self;
+}
+
+#pod =method load_yaml_string
+#pod
+#pod   my $meta = CPAN::Meta->load_yaml_string($yaml, \%options);
+#pod
+#pod This method returns a new CPAN::Meta object using the first document in the
+#pod given YAML string.  In other respects it is identical to C<load_file()>.
+#pod
+#pod =cut
+
+sub load_yaml_string {
+  my ($class, $yaml, $options) = @_;
+  $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
+
+  my $self;
+  eval {
+    my ($struct) = Parse::CPAN::Meta->load_yaml_string($yaml);
+    $self = $class->_new($struct, $options);
+  };
+  croak($@) if $@;
+  return $self;
+}
+
+#pod =method load_json_string
+#pod
+#pod   my $meta = CPAN::Meta->load_json_string($json, \%options);
+#pod
+#pod This method returns a new CPAN::Meta object using the structure represented by
+#pod the given JSON string.  In other respects it is identical to C<load_file()>.
+#pod
+#pod =cut
+
+sub load_json_string {
+  my ($class, $json, $options) = @_;
+  $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
+
+  my $self;
+  eval {
+    my $struct = Parse::CPAN::Meta->load_json_string($json);
+    $self = $class->_new($struct, $options);
+  };
+  croak($@) if $@;
+  return $self;
+}
+
+#pod =method load_string
+#pod
+#pod   my $meta = CPAN::Meta->load_string($string, \%options);
+#pod
+#pod If you don't know if a string contains YAML or JSON, this method will use
+#pod L<Parse::CPAN::Meta> to guess.  In other respects it is identical to
+#pod C<load_file()>.
+#pod
+#pod =cut
+
+sub load_string {
+  my ($class, $string, $options) = @_;
+  $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
+
+  my $self;
+  eval {
+    my $struct = Parse::CPAN::Meta->load_string($string);
+    $self = $class->_new($struct, $options);
+  };
+  croak($@) if $@;
+  return $self;
+}
+
+#pod =method save
+#pod
+#pod   $meta->save($distmeta_file, \%options);
+#pod
+#pod Serializes the object as JSON and writes it to the given file.  The only valid
+#pod option is C<version>, which defaults to '2'. On Perl 5.8.1 or later, the file
+#pod is saved with UTF-8 encoding.
+#pod
+#pod For C<version> 2 (or higher), the filename should end in '.json'.  L<JSON::PP>
+#pod is the default JSON backend. Using another JSON backend requires L<JSON> 2.5 or
+#pod later and you must set the C<$ENV{PERL_JSON_BACKEND}> to a supported alternate
+#pod backend like L<JSON::XS>.
+#pod
+#pod For C<version> less than 2, the filename should end in '.yml'.
+#pod L<CPAN::Meta::Converter> is used to generate an older metadata structure, which
+#pod is serialized to YAML.  CPAN::Meta::YAML is the default YAML backend.  You may
+#pod set the C<$ENV{PERL_YAML_BACKEND}> to a supported alternative backend, though
+#pod this is not recommended due to subtle incompatibilities between YAML parsers on
+#pod CPAN.
+#pod
+#pod =cut
+
+sub save {
+  my ($self, $file, $options) = @_;
+
+  my $version = $options->{version} || '2';
+  my $layer = $] ge '5.008001' ? ':utf8' : '';
+
+  if ($version ge '2') {
+    carp "'$file' should end in '.json'" unless $file =~ m{\.json$};
+  }
+  else {
+    carp "'$file' should end in '.yml'" unless $file =~ m{\.yml$};
+  }
+
+  my $data = $self->as_string($options);
+  open my $fh, ">$layer", $file or die "Error opening '$file' for writing: $!\n";
+
+  print {$fh} $data;
+  close $fh or die "Error closing '$file': $!\n";
+
+  return 1;
+}
+
+#pod =method meta_spec_version
+#pod
+#pod This method returns the version part of the C<meta_spec> entry in the distmeta
+#pod structure.  It is equivalent to:
+#pod
+#pod   $meta->meta_spec->{version};
+#pod
+#pod =cut
+
+sub meta_spec_version {
+  my ($self) = @_;
+  return $self->meta_spec->{version};
+}
+
+#pod =method effective_prereqs
+#pod
+#pod   my $prereqs = $meta->effective_prereqs;
+#pod
+#pod   my $prereqs = $meta->effective_prereqs( \@feature_identifiers );
+#pod
+#pod This method returns a L<CPAN::Meta::Prereqs> object describing all the
+#pod prereqs for the distribution.  If an arrayref of feature identifiers is given,
+#pod the prereqs for the identified features are merged together with the
+#pod distribution's core prereqs before the CPAN::Meta::Prereqs object is returned.
+#pod
+#pod =cut
+
+sub effective_prereqs {
+  my ($self, $features) = @_;
+  $features ||= [];
+
+  my $prereq = CPAN::Meta::Prereqs->new($self->prereqs);
+
+  return $prereq unless @$features;
+
+  my @other = map { ; $self->feature($_)->prereqs } @$features;
+
+  return $prereq->with_merged_prereqs(\@other);
+}
+
+#pod =method should_index_file
+#pod
+#pod   ... if $meta->should_index_file( $filename );
+#pod
+#pod This method returns true if the given file should be indexed.  It decides this
+#pod by checking the C<file> and C<directory> keys in the C<no_index> property of
+#pod the distmeta structure. Note that neither the version format nor
+#pod C<release_status> are considered.
+#pod
+#pod C<$filename> should be given in unix format.
+#pod
+#pod =cut
+
+sub should_index_file {
+  my ($self, $filename) = @_;
+
+  for my $no_index_file (@{$self->no_index->{file} || []}) {
+    return if $filename eq $no_index_file;
+  }
+
+  for my $no_index_dir (@{$self->no_index->{directory}}) {
+    $no_index_dir =~ s{$}{/} unless $no_index_dir =~ m{/\z};
+    return if index($filename, $no_index_dir) == 0;
+  }
+
+  return 1;
+}
+
+#pod =method should_index_package
+#pod
+#pod   ... if $meta->should_index_package( $package );
+#pod
+#pod This method returns true if the given package should be indexed.  It decides
+#pod this by checking the C<package> and C<namespace> keys in the C<no_index>
+#pod property of the distmeta structure. Note that neither the version format nor
+#pod C<release_status> are considered.
+#pod
+#pod =cut
+
+sub should_index_package {
+  my ($self, $package) = @_;
+
+  for my $no_index_pkg (@{$self->no_index->{package} || []}) {
+    return if $package eq $no_index_pkg;
+  }
+
+  for my $no_index_ns (@{$self->no_index->{namespace}}) {
+    return if index($package, "${no_index_ns}::") == 0;
+  }
+
+  return 1;
+}
+
+#pod =method features
+#pod
+#pod   my @feature_objects = $meta->features;
+#pod
+#pod This method returns a list of L<CPAN::Meta::Feature> objects, one for each
+#pod optional feature described by the distribution's metadata.
+#pod
+#pod =cut
+
+sub features {
+  my ($self) = @_;
+
+  my $opt_f = $self->optional_features;
+  my @features
+    = map { ; CPAN::Meta::Feature->new($_ => $opt_f->{$_}) } keys %$opt_f;
+
+  return @features;
+}
+
+#pod =method feature
+#pod
+#pod   my $feature_object = $meta->feature( $identifier );
+#pod
+#pod This method returns a L<CPAN::Meta::Feature> object for the optional feature
+#pod with the given identifier.  If no feature with that identifier exists, an
+#pod exception will be raised.
+#pod
+#pod =cut
+
+sub feature {
+  my ($self, $ident) = @_;
+
+  croak "no feature named $ident"
+    unless my $f = $self->optional_features->{$ident};
+
+  return CPAN::Meta::Feature->new($ident, $f);
+}
+
+#pod =method as_struct
+#pod
+#pod   my $copy = $meta->as_struct( \%options );
+#pod
+#pod This method returns a deep copy of the object's metadata as an unblessed hash
+#pod reference.  It takes an optional hashref of options.  If the hashref contains
+#pod a C<version> argument, the copied metadata will be converted to the version
+#pod of the specification and returned.  For example:
+#pod
+#pod   my $old_spec = $meta->as_struct( {version => "1.4"} );
+#pod
+#pod =cut
+
+sub as_struct {
+  my ($self, $options) = @_;
+  my $struct = _dclone($self);
+  if ($options->{version}) {
+    my $cmc = CPAN::Meta::Converter->new($struct);
+    $struct = $cmc->convert(version => $options->{version});
+  }
+  return $struct;
+}
+
+#pod =method as_string
+#pod
+#pod   my $string = $meta->as_string( \%options );
+#pod
+#pod This method returns a serialized copy of the object's metadata as a character
+#pod string.  (The strings are B<not> UTF-8 encoded.)  It takes an optional hashref
+#pod of options.  If the hashref contains a C<version> argument, the copied metadata
+#pod will be converted to the version of the specification and returned.  For
+#pod example:
+#pod
+#pod   my $string = $meta->as_string( {version => "1.4"} );
+#pod
+#pod For C<version> greater than or equal to 2, the string will be serialized as
+#pod JSON.  For C<version> less than 2, the string will be serialized as YAML.  In
+#pod both cases, the same rules are followed as in the C<save()> method for choosing
+#pod a serialization backend.
+#pod
+#pod The serialized structure will include a C<x_serialization_backend> entry giving
+#pod the package and version used to serialize.  Any existing key in the given
+#pod C<$meta> object will be clobbered.
+#pod
+#pod =cut
+
+sub as_string {
+  my ($self, $options) = @_;
+
+  my $version = $options->{version} || '2';
+
+  my $struct;
+  if ($self->meta_spec_version ne $version) {
+    my $cmc = CPAN::Meta::Converter->new($self->as_struct);
+    $struct = $cmc->convert(version => $version);
+  }
+  else {
+    $struct = $self->as_struct;
+  }
+
+  my ($data, $backend);
+  if ($version ge '2') {
+    $backend = Parse::CPAN::Meta->json_backend();
+    local $struct->{x_serialization_backend} = sprintf '%s version %s', $backend,
+      $backend->VERSION;
+    $data = $backend->new->pretty->canonical->encode($struct);
+  }
+  else {
+    $backend = Parse::CPAN::Meta->yaml_backend();
+    local $struct->{x_serialization_backend} = sprintf '%s version %s', $backend,
+      $backend->VERSION;
+    $data = eval { no strict 'refs'; &{"$backend\::Dump"}($struct) };
+    if ($@) {
+      croak $backend->can('errstr') ? $backend->errstr : $@;
+    }
+  }
+
+  return $data;
+}
+
+# Used by JSON::PP, etc. for "convert_blessed"
+sub TO_JSON {
+  return {%{$_[0]}};
+}
+
+1;
+
+# ABSTRACT: the distribution metadata for a CPAN dist
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta - the distribution metadata for a CPAN dist
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 SYNOPSIS
+
+    use v5.10;
+    use strict;
+    use warnings;
+    use CPAN::Meta;
+    use Module::Load;
+
+    my $meta = CPAN::Meta->load_file('META.json');
+
+    printf "testing requirements for %s version %s\n",
+    $meta->name,
+    $meta->version;
+
+    my $prereqs = $meta->effective_prereqs;
+
+    for my $phase ( qw/configure runtime build test/ ) {
+        say "Requirements for $phase:";
+        my $reqs = $prereqs->requirements_for($phase, "requires");
+        for my $module ( sort $reqs->required_modules ) {
+            my $status;
+            if ( eval { load $module unless $module eq 'perl'; 1 } ) {
+                my $version = $module eq 'perl' ? $] : $module->VERSION;
+                $status = $reqs->accepts_module($module, $version)
+                        ? "$version ok" : "$version not ok";
+            } else {
+                $status = "missing"
+            };
+            say "  $module ($status)";
+        }
+    }
+
+=head1 DESCRIPTION
+
+Software distributions released to the CPAN include a F<META.json> or, for
+older distributions, F<META.yml>, which describes the distribution, its
+contents, and the requirements for building and installing the distribution.
+The data structure stored in the F<META.json> file is described in
+L<CPAN::Meta::Spec>.
+
+CPAN::Meta provides a simple class to represent this distribution metadata (or
+I<distmeta>), along with some helpful methods for interrogating that data.
+
+The documentation below is only for the methods of the CPAN::Meta object.  For
+information on the meaning of individual fields, consult the spec.
+
+=head1 METHODS
+
+=head2 new
+
+  my $meta = CPAN::Meta->new($distmeta_struct, \%options);
+
+Returns a valid CPAN::Meta object or dies if the supplied metadata hash
+reference fails to validate.  Older-format metadata will be up-converted to
+version 2 if they validate against the original stated specification.
+
+It takes an optional hashref of options. Valid options include:
+
+=over
+
+=item *
+
+lazy_validation -- if true, new will attempt to convert the given metadata
+to version 2 before attempting to validate it.  This means than any
+fixable errors will be handled by CPAN::Meta::Converter before validation.
+(Note that this might result in invalid optional data being silently
+dropped.)  The default is false.
+
+=back
+
+=head2 create
+
+  my $meta = CPAN::Meta->create($distmeta_struct, \%options);
+
+This is same as C<new()>, except that C<generated_by> and C<meta-spec> fields
+will be generated if not provided.  This means the metadata structure is
+assumed to otherwise follow the latest L<CPAN::Meta::Spec>.
+
+=head2 load_file
+
+  my $meta = CPAN::Meta->load_file($distmeta_file, \%options);
+
+Given a pathname to a file containing metadata, this deserializes the file
+according to its file suffix and constructs a new C<CPAN::Meta> object, just
+like C<new()>.  It will die if the deserialized version fails to validate
+against its stated specification version.
+
+It takes the same options as C<new()> but C<lazy_validation> defaults to
+true.
+
+=head2 load_yaml_string
+
+  my $meta = CPAN::Meta->load_yaml_string($yaml, \%options);
+
+This method returns a new CPAN::Meta object using the first document in the
+given YAML string.  In other respects it is identical to C<load_file()>.
+
+=head2 load_json_string
+
+  my $meta = CPAN::Meta->load_json_string($json, \%options);
+
+This method returns a new CPAN::Meta object using the structure represented by
+the given JSON string.  In other respects it is identical to C<load_file()>.
+
+=head2 load_string
+
+  my $meta = CPAN::Meta->load_string($string, \%options);
+
+If you don't know if a string contains YAML or JSON, this method will use
+L<Parse::CPAN::Meta> to guess.  In other respects it is identical to
+C<load_file()>.
+
+=head2 save
+
+  $meta->save($distmeta_file, \%options);
+
+Serializes the object as JSON and writes it to the given file.  The only valid
+option is C<version>, which defaults to '2'. On Perl 5.8.1 or later, the file
+is saved with UTF-8 encoding.
+
+For C<version> 2 (or higher), the filename should end in '.json'.  L<JSON::PP>
+is the default JSON backend. Using another JSON backend requires L<JSON> 2.5 or
+later and you must set the C<$ENV{PERL_JSON_BACKEND}> to a supported alternate
+backend like L<JSON::XS>.
+
+For C<version> less than 2, the filename should end in '.yml'.
+L<CPAN::Meta::Converter> is used to generate an older metadata structure, which
+is serialized to YAML.  CPAN::Meta::YAML is the default YAML backend.  You may
+set the C<$ENV{PERL_YAML_BACKEND}> to a supported alternative backend, though
+this is not recommended due to subtle incompatibilities between YAML parsers on
+CPAN.
+
+=head2 meta_spec_version
+
+This method returns the version part of the C<meta_spec> entry in the distmeta
+structure.  It is equivalent to:
+
+  $meta->meta_spec->{version};
+
+=head2 effective_prereqs
+
+  my $prereqs = $meta->effective_prereqs;
+
+  my $prereqs = $meta->effective_prereqs( \@feature_identifiers );
+
+This method returns a L<CPAN::Meta::Prereqs> object describing all the
+prereqs for the distribution.  If an arrayref of feature identifiers is given,
+the prereqs for the identified features are merged together with the
+distribution's core prereqs before the CPAN::Meta::Prereqs object is returned.
+
+=head2 should_index_file
+
+  ... if $meta->should_index_file( $filename );
+
+This method returns true if the given file should be indexed.  It decides this
+by checking the C<file> and C<directory> keys in the C<no_index> property of
+the distmeta structure. Note that neither the version format nor
+C<release_status> are considered.
+
+C<$filename> should be given in unix format.
+
+=head2 should_index_package
+
+  ... if $meta->should_index_package( $package );
+
+This method returns true if the given package should be indexed.  It decides
+this by checking the C<package> and C<namespace> keys in the C<no_index>
+property of the distmeta structure. Note that neither the version format nor
+C<release_status> are considered.
+
+=head2 features
+
+  my @feature_objects = $meta->features;
+
+This method returns a list of L<CPAN::Meta::Feature> objects, one for each
+optional feature described by the distribution's metadata.
+
+=head2 feature
+
+  my $feature_object = $meta->feature( $identifier );
+
+This method returns a L<CPAN::Meta::Feature> object for the optional feature
+with the given identifier.  If no feature with that identifier exists, an
+exception will be raised.
+
+=head2 as_struct
+
+  my $copy = $meta->as_struct( \%options );
+
+This method returns a deep copy of the object's metadata as an unblessed hash
+reference.  It takes an optional hashref of options.  If the hashref contains
+a C<version> argument, the copied metadata will be converted to the version
+of the specification and returned.  For example:
+
+  my $old_spec = $meta->as_struct( {version => "1.4"} );
+
+=head2 as_string
+
+  my $string = $meta->as_string( \%options );
+
+This method returns a serialized copy of the object's metadata as a character
+string.  (The strings are B<not> UTF-8 encoded.)  It takes an optional hashref
+of options.  If the hashref contains a C<version> argument, the copied metadata
+will be converted to the version of the specification and returned.  For
+example:
+
+  my $string = $meta->as_string( {version => "1.4"} );
+
+For C<version> greater than or equal to 2, the string will be serialized as
+JSON.  For C<version> less than 2, the string will be serialized as YAML.  In
+both cases, the same rules are followed as in the C<save()> method for choosing
+a serialization backend.
+
+The serialized structure will include a C<x_serialization_backend> entry giving
+the package and version used to serialize.  Any existing key in the given
+C<$meta> object will be clobbered.
+
+=head1 STRING DATA
+
+The following methods return a single value, which is the value for the
+corresponding entry in the distmeta structure.  Values should be either undef
+or strings.
+
+=over 4
+
+=item *
+
+abstract
+
+=item *
+
+description
+
+=item *
+
+dynamic_config
+
+=item *
+
+generated_by
+
+=item *
+
+name
+
+=item *
+
+release_status
+
+=item *
+
+version
+
+=back
+
+=head1 LIST DATA
+
+These methods return lists of string values, which might be represented in the
+distmeta structure as arrayrefs or scalars:
+
+=over 4
+
+=item *
+
+authors
+
+=item *
+
+keywords
+
+=item *
+
+licenses
+
+=back
+
+The C<authors> and C<licenses> methods may also be called as C<author> and
+C<license>, respectively, to match the field name in the distmeta structure.
+
+=head1 MAP DATA
+
+These readers return hashrefs of arbitrary unblessed data structures, each
+described more fully in the specification:
+
+=over 4
+
+=item *
+
+meta_spec
+
+=item *
+
+resources
+
+=item *
+
+provides
+
+=item *
+
+no_index
+
+=item *
+
+prereqs
+
+=item *
+
+optional_features
+
+=back
+
+=head1 CUSTOM DATA
+
+A list of custom keys are available from the C<custom_keys> method and
+particular keys may be retrieved with the C<custom> method.
+
+  say $meta->custom($_) for $meta->custom_keys;
+
+If a custom key refers to a data structure, a deep clone is returned.
+
+=for Pod::Coverage TO_JSON abstract author authors custom custom_keys description dynamic_config
+generated_by keywords license licenses meta_spec name no_index
+optional_features prereqs provides release_status resources version
+
+=head1 BUGS
+
+Please report any bugs or feature using the CPAN Request Tracker.
+Bugs can be submitted through the web interface at
+L<http://rt.cpan.org/Dist/Display.html?Queue=CPAN-Meta>
+
+When submitting a bug or request, please include a test-file or a patch to an
+existing test-file that illustrates the bug or desired feature.
+
+=head1 SEE ALSO
+
+=over 4
+
+=item *
+
+L<CPAN::Meta::Converter>
+
+=item *
+
+L<CPAN::Meta::Validator>
+
+=back
+
+=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan
+
+=head1 SUPPORT
+
+=head2 Bugs / Feature Requests
+
+Please report any bugs or feature requests through the issue tracker
+at L<https://github.com/Perl-Toolchain-Gang/CPAN-Meta/issues>.
+You will be notified automatically of any progress on your issue.
+
+=head2 Source Code
+
+This is open source software.  The code repository is available for
+public review and contribution under the terms of the license.
+
+L<https://github.com/Perl-Toolchain-Gang/CPAN-Meta>
+
+  git clone https://github.com/Perl-Toolchain-Gang/CPAN-Meta.git
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 CONTRIBUTORS
+
+=for stopwords Ansgar Burchardt Avar Arnfjord Bjarmason Christopher J. Madsen Chuck Adams Cory G Watson Damyan Ivanov Eric Wilhelm Graham Knop Gregor Hermann Karen Etheridge Kenichi Ishigaki Ken Williams Lars Dieckow Leon Timmermans majensen Mark Fowler Matt S Trout Michael G. Schwern mohawk2 moznion Niko Tyni Olaf Alders Olivier Mengué Randy Sims Tomohiro Hosaka
+
+=over 4
+
+=item *
+
+Ansgar Burchardt <ansgar@cpan.org>
+
+=item *
+
+Avar Arnfjord Bjarmason <avar@cpan.org>
+
+=item *
+
+Christopher J. Madsen <cjm@cpan.org>
+
+=item *
+
+Chuck Adams <cja987@gmail.com>
+
+=item *
+
+Cory G Watson <gphat@cpan.org>
+
+=item *
+
+Damyan Ivanov <dam@cpan.org>
+
+=item *
+
+Eric Wilhelm <ewilhelm@cpan.org>
+
+=item *
+
+Graham Knop <haarg@haarg.org>
+
+=item *
+
+Gregor Hermann <gregoa@debian.org>
+
+=item *
+
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
+Kenichi Ishigaki <ishigaki@cpan.org>
+
+=item *
+
+Ken Williams <kwilliams@cpan.org>
+
+=item *
+
+Lars Dieckow <daxim@cpan.org>
+
+=item *
+
+Leon Timmermans <leont@cpan.org>
+
+=item *
+
+majensen <maj@fortinbras.us>
+
+=item *
+
+Mark Fowler <markf@cpan.org>
+
+=item *
+
+Matt S Trout <mst@shadowcat.co.uk>
+
+=item *
+
+Michael G. Schwern <mschwern@cpan.org>
+
+=item *
+
+mohawk2 <mohawk2@users.noreply.github.com>
+
+=item *
+
+moznion <moznion@gmail.com>
+
+=item *
+
+Niko Tyni <ntyni@debian.org>
+
+=item *
+
+Olaf Alders <olaf@wundersolutions.com>
+
+=item *
+
+Olivier Mengué <dolmen@cpan.org>
+
+=item *
+
+Randy Sims <randys@thepierianspring.org>
+
+=item *
+
+Tomohiro Hosaka <bokutin@bokut.in>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Converter.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Converter.pm
new file mode 100644
index 0000000000..c6a4531e20
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Converter.pm
@@ -0,0 +1,1695 @@
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta::Converter;
+
+our $VERSION = '2.150005';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod   my $struct = decode_json_file('META.json');
+#pod
+#pod   my $cmc = CPAN::Meta::Converter->new( $struct );
+#pod
+#pod   my $new_struct = $cmc->convert( version => "2" );
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod This module converts CPAN Meta structures from one form to another.  The
+#pod primary use is to convert older structures to the most modern version of
+#pod the specification, but other transformations may be implemented in the
+#pod future as needed.  (E.g. stripping all custom fields or stripping all
+#pod optional fields.)
+#pod
+#pod =cut
+
+use CPAN::Meta::Validator;
+use CPAN::Meta::Requirements;
+use Parse::CPAN::Meta 1.4400 ();
+
+# To help ExtUtils::MakeMaker bootstrap CPAN::Meta::Requirements on perls
+# before 5.10, we fall back to the EUMM bundled compatibility version module if
+# that's the only thing available.  This shouldn't ever happen in a normal CPAN
+# install of CPAN::Meta::Requirements, as version.pm will be picked up from
+# prereqs and be available at runtime.
+
+BEGIN {
+  eval "use version ()";    ## no critic
+  if (my $err = $@) {
+    eval "use ExtUtils::MakeMaker::version" or die $err;    ## no critic
+  }
+}
+
+# Perl 5.10.0 didn't have "is_qv" in version.pm
+*_is_qv
+  = version->can('is_qv') ? sub { $_[0]->is_qv } : sub { exists $_[0]->{qv} };
+
+sub _dclone {
+  my $ref = shift;
+
+  # if an object is in the data structure and doesn't specify how to
+  # turn itself into JSON, we just stringify the object.  That does the
+  # right thing for typical things that might be there, like version objects,
+  # Path::Class objects, etc.
+  no warnings 'once';
+  no warnings 'redefine';
+  local *UNIVERSAL::TO_JSON = sub {"$_[0]"};
+
+  my $json = Parse::CPAN::Meta->json_backend()
+    ->new->utf8->allow_blessed->convert_blessed;
+  $json->decode($json->encode($ref));
+}
+
+my %known_specs = (
+  '2'   => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
+  '1.4' => 'http://module-build.sourceforge.net/META-spec-v1.4.html',
+  '1.3' => 'http://module-build.sourceforge.net/META-spec-v1.3.html',
+  '1.2' => 'http://module-build.sourceforge.net/META-spec-v1.2.html',
+  '1.1' => 'http://module-build.sourceforge.net/META-spec-v1.1.html',
+  '1.0' => 'http://module-build.sourceforge.net/META-spec-v1.0.html'
+);
+
+my @spec_list = sort { $a <=> $b } keys %known_specs;
+my ($LOWEST, $HIGHEST) = @spec_list[0, -1];
+
+#--------------------------------------------------------------------------#
+# converters
+#
+# called as $converter->($element, $field_name, $full_meta, $to_version)
+#
+# defined return value used for field
+# undef return value means field is skipped
+#--------------------------------------------------------------------------#
+
+sub _keep { $_[0] }
+
+sub _keep_or_one { defined($_[0]) ? $_[0] : 1 }
+
+sub _keep_or_zero { defined($_[0]) ? $_[0] : 0 }
+
+sub _keep_or_unknown { defined($_[0]) && length($_[0]) ? $_[0] : "unknown" }
+
+sub _generated_by {
+  my $gen = shift;
+  my $sig = __PACKAGE__ . " version " . (__PACKAGE__->VERSION || "<dev>");
+
+  return $sig unless defined $gen and length $gen;
+  return $gen if $gen =~ /\Q$sig/;
+  return "$gen, $sig";
+}
+
+sub _listify { !defined $_[0] ? undef : ref $_[0] eq 'ARRAY' ? $_[0] : [$_[0]] }
+
+sub _prefix_custom {
+  my $key = shift;
+  $key =~ s/^(?!x_)   # Unless it already starts with x_
+             (?:x-?)? # Remove leading x- or x (if present)
+           /x_/ix;    # and prepend x_
+  return $key;
+}
+
+sub _ucfirst_custom {
+  my $key = shift;
+  $key = ucfirst $key unless $key =~ /[A-Z]/;
+  return $key;
+}
+
+sub _no_prefix_ucfirst_custom {
+  my $key = shift;
+  $key =~ s/^x_//;
+  return _ucfirst_custom($key);
+}
+
+sub _change_meta_spec {
+  my ($element, undef, undef, $version) = @_;
+  return {version => $version, url => $known_specs{$version},};
+}
+
+my @open_source = (
+  'perl',       'gpl',     'apache', 'artistic',
+  'artistic_2', 'lgpl',    'bsd',    'gpl',
+  'mit',        'mozilla', 'open_source',
+);
+
+my %is_open_source = map { ; $_ => 1 } @open_source;
+
+my @valid_licenses_1
+  = (@open_source, 'unrestricted', 'restrictive', 'unknown',);
+
+my %license_map_1
+  = ((map { $_ => $_ } @valid_licenses_1), artistic2 => 'artistic_2',);
+
+sub _license_1 {
+  my ($element) = @_;
+  return 'unknown' unless defined $element;
+  if ($license_map_1{lc $element}) {
+    return $license_map_1{lc $element};
+  }
+  else {
+    return 'unknown';
+  }
+}
+
+my @valid_licenses_2 = qw(
+  agpl_3
+  apache_1_1
+  apache_2_0
+  artistic_1
+  artistic_2
+  bsd
+  freebsd
+  gfdl_1_2
+  gfdl_1_3
+  gpl_1
+  gpl_2
+  gpl_3
+  lgpl_2_1
+  lgpl_3_0
+  mit
+  mozilla_1_0
+  mozilla_1_1
+  openssl
+  perl_5
+  qpl_1_0
+  ssleay
+  sun
+  zlib
+  open_source
+  restricted
+  unrestricted
+  unknown
+);
+
+# The "old" values were defined by Module::Build, and were often vague.  I have
+# made the decisions below based on reading Module::Build::API and how clearly
+# it specifies the version of the license.
+my %license_map_2 = (
+  (map { $_ => $_ } @valid_licenses_2),
+  apache      => 'apache_2_0',     # clearly stated as 2.0
+  artistic    => 'artistic_1',     # clearly stated as 1
+  artistic2   => 'artistic_2',     # clearly stated as 2
+  gpl         => 'open_source',    # we don't know which GPL; punt
+  lgpl        => 'open_source',    # we don't know which LGPL; punt
+  mozilla     => 'open_source',    # we don't know which MPL; punt
+  perl        => 'perl_5',         # clearly Perl 5
+  restrictive => 'restricted',
+);
+
+sub _license_2 {
+  my ($element) = @_;
+  return ['unknown'] unless defined $element;
+  $element = [$element] unless ref $element eq 'ARRAY';
+  my @new_list;
+  for my $lic (@$element) {
+    next unless defined $lic;
+    if (my $new = $license_map_2{lc $lic}) {
+      push @new_list, $new;
+    }
+  }
+  return @new_list ? \@new_list : ['unknown'];
+}
+
+my %license_downgrade_map = qw(
+  agpl_3            open_source
+  apache_1_1        apache
+  apache_2_0        apache
+  artistic_1        artistic
+  artistic_2        artistic_2
+  bsd               bsd
+  freebsd           open_source
+  gfdl_1_2          open_source
+  gfdl_1_3          open_source
+  gpl_1             gpl
+  gpl_2             gpl
+  gpl_3             gpl
+  lgpl_2_1          lgpl
+  lgpl_3_0          lgpl
+  mit               mit
+  mozilla_1_0       mozilla
+  mozilla_1_1       mozilla
+  openssl           open_source
+  perl_5            perl
+  qpl_1_0           open_source
+  ssleay            open_source
+  sun               open_source
+  zlib              open_source
+  open_source       open_source
+  restricted        restrictive
+  unrestricted      unrestricted
+  unknown           unknown
+);
+
+sub _downgrade_license {
+  my ($element) = @_;
+  if (!defined $element) {
+    return "unknown";
+  }
+  elsif (ref $element eq 'ARRAY') {
+    if (@$element > 1) {
+      if (grep { !$is_open_source{$license_downgrade_map{lc $_} || 'unknown'} }
+        @$element)
+      {
+        return 'unknown';
+      }
+      else {
+        return 'open_source';
+      }
+    }
+    elsif (@$element == 1) {
+      return $license_downgrade_map{lc $element->[0]} || "unknown";
+    }
+  }
+  elsif (!ref $element) {
+    return $license_downgrade_map{lc $element} || "unknown";
+  }
+  return "unknown";
+}
+
+my $no_index_spec_1_2 = {
+  'file'      => \&_listify,
+  'dir'       => \&_listify,
+  'package'   => \&_listify,
+  'namespace' => \&_listify,
+};
+
+my $no_index_spec_1_3 = {
+  'file'      => \&_listify,
+  'directory' => \&_listify,
+  'package'   => \&_listify,
+  'namespace' => \&_listify,
+};
+
+my $no_index_spec_2 = {
+  'file'      => \&_listify,
+  'directory' => \&_listify,
+  'package'   => \&_listify,
+  'namespace' => \&_listify,
+  ':custom'   => \&_prefix_custom,
+};
+
+sub _no_index_1_2 {
+  my (undef, undef, $meta) = @_;
+  my $no_index = $meta->{no_index} || $meta->{private};
+  return unless $no_index;
+
+  # cleanup wrong format
+  if (!ref $no_index) {
+    my $item = $no_index;
+    $no_index = {dir => [$item], file => [$item]};
+  }
+  elsif (ref $no_index eq 'ARRAY') {
+    my $list = $no_index;
+    $no_index = {dir => [@$list], file => [@$list]};
+  }
+
+  # common mistake: files -> file
+  if (exists $no_index->{files}) {
+    $no_index->{file} = delete $no_index->{files};
+  }
+
+  # common mistake: modules -> module
+  if (exists $no_index->{modules}) {
+    $no_index->{module} = delete $no_index->{modules};
+  }
+  return _convert($no_index, $no_index_spec_1_2);
+}
+
+sub _no_index_directory {
+  my ($element, $key, $meta, $version) = @_;
+  return unless $element;
+
+  # cleanup wrong format
+  if (!ref $element) {
+    my $item = $element;
+    $element = {directory => [$item], file => [$item]};
+  }
+  elsif (ref $element eq 'ARRAY') {
+    my $list = $element;
+    $element = {directory => [@$list], file => [@$list]};
+  }
+
+  if (exists $element->{dir}) {
+    $element->{directory} = delete $element->{dir};
+  }
+
+  # common mistake: files -> file
+  if (exists $element->{files}) {
+    $element->{file} = delete $element->{files};
+  }
+
+  # common mistake: modules -> module
+  if (exists $element->{modules}) {
+    $element->{module} = delete $element->{modules};
+  }
+  my $spec = $version == 2 ? $no_index_spec_2 : $no_index_spec_1_3;
+  return _convert($element, $spec);
+}
+
+sub _is_module_name {
+  my $mod = shift;
+  return unless defined $mod && length $mod;
+  return $mod =~ m{^[A-Za-z][A-Za-z0-9_]*(?:::[A-Za-z0-9_]+)*$};
+}
+
+sub _clean_version {
+  my ($element) = @_;
+  return 0 if !defined $element;
+
+  $element =~ s{^\s*}{};
+  $element =~ s{\s*$}{};
+  $element =~ s{^\.}{0.};
+
+  return 0 if !length $element;
+  return 0 if ($element eq 'undef' || $element eq '<undef>');
+
+  my $v = eval { version->new($element) };
+
+  # XXX check defined $v and not just $v because version objects leak memory
+  # in boolean context -- dagolden, 2012-02-03
+  if (defined $v) {
+    return _is_qv($v) ? $v->normal : $element;
+  }
+  else {
+    return 0;
+  }
+}
+
+sub _bad_version_hook {
+  my ($v) = @_;
+  $v =~ s{^\s*}{};
+  $v =~ s{\s*$}{};
+  $v =~ s{[a-z]+$}{};    # strip trailing alphabetics
+  my $vobj = eval { version->new($v) };
+  return defined($vobj) ? $vobj : version->new(0);    # or give up
+}
+
+sub _version_map {
+  my ($element) = @_;
+  return unless defined $element;
+  if (ref $element eq 'HASH') {
+
+    # XXX turn this into CPAN::Meta::Requirements with bad version hook
+    # and then turn it back into a hash
+    my $new_map = CPAN::Meta::Requirements->new(
+      {bad_version_hook => \&_bad_version_hook}    # punt
+    );
+    while (my ($k, $v) = each %$element) {
+      next unless _is_module_name($k);
+      if (!defined($v) || !length($v) || $v eq 'undef' || $v eq '<undef>') {
+        $v = 0;
+      }
+
+      # some weird, old META have bad yml with module => module
+      # so check if value is like a module name and not like a version
+      if (_is_module_name($v) && !version::is_lax($v)) {
+        $new_map->add_minimum($k => 0);
+        $new_map->add_minimum($v => 0);
+      }
+      $new_map->add_string_requirement($k => $v);
+    }
+    return $new_map->as_string_hash;
+  }
+  elsif (ref $element eq 'ARRAY') {
+    my $hashref = {map { $_ => 0 } @$element};
+    return _version_map($hashref);    # cleanup any weird stuff
+  }
+  elsif (ref $element eq '' && length $element) {
+    return {$element => 0};
+  }
+  return;
+}
+
+sub _prereqs_from_1 {
+  my (undef, undef, $meta) = @_;
+  my $prereqs = {};
+  for my $phase (qw/build configure/) {
+    my $key = "${phase}_requires";
+    $prereqs->{$phase}{requires} = _version_map($meta->{$key}) if $meta->{$key};
+  }
+  for my $rel (qw/requires recommends conflicts/) {
+    $prereqs->{runtime}{$rel} = _version_map($meta->{$rel}) if $meta->{$rel};
+  }
+  return $prereqs;
+}
+
+my $prereqs_spec = {
+  configure => \&_prereqs_rel,
+  build     => \&_prereqs_rel,
+  test      => \&_prereqs_rel,
+  runtime   => \&_prereqs_rel,
+  develop   => \&_prereqs_rel,
+  ':custom' => \&_prefix_custom,
+};
+
+my $relation_spec = {
+  requires   => \&_version_map,
+  recommends => \&_version_map,
+  suggests   => \&_version_map,
+  conflicts  => \&_version_map,
+  ':custom'  => \&_prefix_custom,
+};
+
+sub _cleanup_prereqs {
+  my ($prereqs, $key, $meta, $to_version) = @_;
+  return unless $prereqs && ref $prereqs eq 'HASH';
+  return _convert($prereqs, $prereqs_spec, $to_version);
+}
+
+sub _prereqs_rel {
+  my ($relation, $key, $meta, $to_version) = @_;
+  return unless $relation && ref $relation eq 'HASH';
+  return _convert($relation, $relation_spec, $to_version);
+}
+
+
+BEGIN {
+  my @old_prereqs = qw(
+    requires
+    configure_requires
+    recommends
+    conflicts
+  );
+
+  for (@old_prereqs) {
+    my $sub = "_get_$_";
+    my ($phase, $type) = split qr/_/, $_;
+    if (!defined $type) {
+      $type  = $phase;
+      $phase = 'runtime';
+    }
+    no strict 'refs';
+    *{$sub} = sub { _extract_prereqs($_[2]->{prereqs}, $phase, $type) };
+  }
+}
+
+sub _get_build_requires {
+  my ($data, $key, $meta) = @_;
+
+  my $test_h  = _extract_prereqs($_[2]->{prereqs}, qw(test  requires)) || {};
+  my $build_h = _extract_prereqs($_[2]->{prereqs}, qw(build requires)) || {};
+
+  my $test_req  = CPAN::Meta::Requirements->from_string_hash($test_h);
+  my $build_req = CPAN::Meta::Requirements->from_string_hash($build_h);
+
+  $test_req->add_requirements($build_req)->as_string_hash;
+}
+
+sub _extract_prereqs {
+  my ($prereqs, $phase, $type) = @_;
+  return unless ref $prereqs eq 'HASH';
+  return scalar _version_map($prereqs->{$phase}{$type});
+}
+
+sub _downgrade_optional_features {
+  my (undef, undef, $meta) = @_;
+  return unless exists $meta->{optional_features};
+  my $origin   = $meta->{optional_features};
+  my $features = {};
+  for my $name (keys %$origin) {
+    $features->{$name} = {
+      description => $origin->{$name}{description},
+      requires => _extract_prereqs($origin->{$name}{prereqs}, 'runtime', 'requires'),
+      configure_requires =>
+        _extract_prereqs($origin->{$name}{prereqs}, 'runtime', 'configure_requires'),
+      build_requires =>
+        _extract_prereqs($origin->{$name}{prereqs}, 'runtime', 'build_requires'),
+      recommends =>
+        _extract_prereqs($origin->{$name}{prereqs}, 'runtime', 'recommends'),
+      conflicts =>
+        _extract_prereqs($origin->{$name}{prereqs}, 'runtime', 'conflicts'),
+    };
+    for my $k (keys %{$features->{$name}}) {
+      delete $features->{$name}{$k} unless defined $features->{$name}{$k};
+    }
+  }
+  return $features;
+}
+
+sub _upgrade_optional_features {
+  my (undef, undef, $meta) = @_;
+  return unless exists $meta->{optional_features};
+  my $origin   = $meta->{optional_features};
+  my $features = {};
+  for my $name (keys %$origin) {
+    $features->{$name} = {
+      description => $origin->{$name}{description},
+      prereqs     => _prereqs_from_1(undef, undef, $origin->{$name}),
+    };
+    delete $features->{$name}{prereqs}{configure};
+  }
+  return $features;
+}
+
+my $optional_features_2_spec = {
+  description => \&_keep,
+  prereqs     => \&_cleanup_prereqs,
+  ':custom'   => \&_prefix_custom,
+};
+
+sub _feature_2 {
+  my ($element, $key, $meta, $to_version) = @_;
+  return unless $element && ref $element eq 'HASH';
+  _convert($element, $optional_features_2_spec, $to_version);
+}
+
+sub _cleanup_optional_features_2 {
+  my ($element, $key, $meta, $to_version) = @_;
+  return unless $element && ref $element eq 'HASH';
+  my $new_data = {};
+  for my $k (keys %$element) {
+    $new_data->{$k} = _feature_2($element->{$k}, $k, $meta, $to_version);
+  }
+  return unless keys %$new_data;
+  return $new_data;
+}
+
+sub _optional_features_1_4 {
+  my ($element) = @_;
+  return unless $element;
+  $element = _optional_features_as_map($element);
+  for my $name (keys %$element) {
+    for my $drop (qw/requires_packages requires_os excluded_os/) {
+      delete $element->{$name}{$drop};
+    }
+  }
+  return $element;
+}
+
+sub _optional_features_as_map {
+  my ($element) = @_;
+  return unless $element;
+  if (ref $element eq 'ARRAY') {
+    my %map;
+    for my $feature (@$element) {
+      my (@parts) = %$feature;
+      $map{$parts[0]} = $parts[1];
+    }
+    $element = \%map;
+  }
+  return $element;
+}
+
+sub _is_urlish { defined $_[0] && $_[0] =~ m{\A[-+.a-z0-9]+:.+}i }
+
+sub _url_or_drop {
+  my ($element) = @_;
+  return $element if _is_urlish($element);
+  return;
+}
+
+sub _url_list {
+  my ($element) = @_;
+  return unless $element;
+  $element = _listify($element);
+  $element = [grep { _is_urlish($_) } @$element];
+  return unless @$element;
+  return $element;
+}
+
+sub _author_list {
+  my ($element) = @_;
+  return ['unknown'] unless $element;
+  $element = _listify($element);
+  $element = [map { defined $_ && length $_ ? $_ : 'unknown' } @$element];
+  return ['unknown'] unless @$element;
+  return $element;
+}
+
+my $resource2_upgrade = {
+  license    => sub { return _is_urlish($_[0]) ? _listify($_[0]) : undef },
+  homepage   => \&_url_or_drop,
+  bugtracker => sub {
+    my ($item) = @_;
+    return unless $item;
+    if    ($item =~ m{^mailto:(.*)$}) { return {mailto => $1} }
+    elsif (_is_urlish($item))         { return {web    => $item} }
+    else                              {return}
+  },
+  repository => sub { return _is_urlish($_[0]) ? {url => $_[0]} : undef },
+  ':custom' => \&_prefix_custom,
+};
+
+sub _upgrade_resources_2 {
+  my (undef, undef, $meta, $version) = @_;
+  return unless exists $meta->{resources};
+  return _convert($meta->{resources}, $resource2_upgrade);
+}
+
+my $bugtracker2_spec
+  = {web => \&_url_or_drop, mailto => \&_keep, ':custom' => \&_prefix_custom,};
+
+sub _repo_type {
+  my ($element, $key, $meta, $to_version) = @_;
+  return $element if defined $element;
+  return unless exists $meta->{url};
+  my $repo_url = $meta->{url};
+  for my $type (qw/git svn/) {
+    return $type if $repo_url =~ m{\A$type};
+  }
+  return;
+}
+
+my $repository2_spec = {
+  web       => \&_url_or_drop,
+  url       => \&_url_or_drop,
+  type      => \&_repo_type,
+  ':custom' => \&_prefix_custom,
+};
+
+my $resources2_cleanup = {
+  license    => \&_url_list,
+  homepage   => \&_url_or_drop,
+  bugtracker => sub { ref $_[0] ? _convert($_[0], $bugtracker2_spec) : undef },
+  repository => sub {
+    my $data = shift;
+    ref $data ? _convert($data, $repository2_spec) : undef;
+  },
+  ':custom' => \&_prefix_custom,
+};
+
+sub _cleanup_resources_2 {
+  my ($resources, $key, $meta, $to_version) = @_;
+  return unless $resources && ref $resources eq 'HASH';
+  return _convert($resources, $resources2_cleanup, $to_version);
+}
+
+my $resource1_spec = {
+  license    => \&_url_or_drop,
+  homepage   => \&_url_or_drop,
+  bugtracker => \&_url_or_drop,
+  repository => \&_url_or_drop,
+  ':custom'  => \&_keep,
+};
+
+sub _resources_1_3 {
+  my (undef, undef, $meta, $version) = @_;
+  return unless exists $meta->{resources};
+  return _convert($meta->{resources}, $resource1_spec);
+}
+
+*_resources_1_4 = *_resources_1_3;
+
+sub _resources_1_2 {
+  my (undef, undef, $meta) = @_;
+  my $resources = $meta->{resources} || {};
+  if ($meta->{license_url} && !$resources->{license}) {
+    $resources->{license} = $meta->{license_url}
+      if _is_urlish($meta->{license_url});
+  }
+  return unless keys %$resources;
+  return _convert($resources, $resource1_spec);
+}
+
+my $resource_downgrade_spec = {
+  license    => sub { return ref $_[0] ? $_[0]->[0] : $_[0] },
+  homepage   => \&_url_or_drop,
+  bugtracker => sub { return $_[0]->{web} },
+  repository => sub { return $_[0]->{url} || $_[0]->{web} },
+  ':custom'  => \&_no_prefix_ucfirst_custom,
+};
+
+sub _downgrade_resources {
+  my (undef, undef, $meta, $version) = @_;
+  return unless exists $meta->{resources};
+  return _convert($meta->{resources}, $resource_downgrade_spec);
+}
+
+sub _release_status {
+  my ($element, undef, $meta) = @_;
+  return $element if $element && $element =~ m{\A(?:stable|testing|unstable)\z};
+  return _release_status_from_version(undef, undef, $meta);
+}
+
+sub _release_status_from_version {
+  my (undef, undef, $meta) = @_;
+  my $version = $meta->{version} || '';
+  return ($version =~ /_/) ? 'testing' : 'stable';
+}
+
+my $provides_spec = {file => \&_keep, version => \&_keep,};
+
+my $provides_spec_2
+  = {file => \&_keep, version => \&_keep, ':custom' => \&_prefix_custom,};
+
+sub _provides {
+  my ($element, $key, $meta, $to_version) = @_;
+  return unless defined $element && ref $element eq 'HASH';
+  my $spec = $to_version == 2 ? $provides_spec_2 : $provides_spec;
+  my $new_data = {};
+  for my $k (keys %$element) {
+    $new_data->{$k} = _convert($element->{$k}, $spec, $to_version);
+    $new_data->{$k}{version} = _clean_version($element->{$k}{version})
+      if exists $element->{$k}{version};
+  }
+  return $new_data;
+}
+
+sub _convert {
+  my ($data, $spec, $to_version, $is_fragment) = @_;
+
+  my $new_data = {};
+  for my $key (keys %$spec) {
+    next if $key eq ':custom' || $key eq ':drop';
+    next unless my $fcn = $spec->{$key};
+    if ($is_fragment && $key eq 'generated_by') {
+      $fcn = \&_keep;
+    }
+    die "spec for '$key' is not a coderef" unless ref $fcn && ref $fcn eq 'CODE';
+    my $new_value = $fcn->($data->{$key}, $key, $data, $to_version);
+    $new_data->{$key} = $new_value if defined $new_value;
+  }
+
+  my $drop_list = $spec->{':drop'};
+  my $customizer = $spec->{':custom'} || \&_keep;
+
+  for my $key (keys %$data) {
+    next if $drop_list && grep { $key eq $_ } @$drop_list;
+    next if exists $spec->{$key};    # we handled it
+    $new_data->{$customizer->($key)} = $data->{$key};
+  }
+
+  return $new_data;
+}
+
+#--------------------------------------------------------------------------#
+# define converters for each conversion
+#--------------------------------------------------------------------------#
+
+# each converts from prior version
+# special ":custom" field is used for keys not recognized in spec
+my %up_convert = (
+  '2-from-1.4' => {
+
+    # PRIOR MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_2,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # CHANGED TO MANDATORY
+    'dynamic_config' => \&_keep_or_one,
+
+    # ADDED MANDATORY
+    'release_status' => \&_release_status,
+
+    # PRIOR OPTIONAL
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_upgrade_optional_features,
+    'provides'          => \&_provides,
+    'resources'         => \&_upgrade_resources_2,
+
+    # ADDED OPTIONAL
+    'description' => \&_keep,
+    'prereqs'     => \&_prereqs_from_1,
+
+    # drop these deprecated fields, but only after we convert
+    ':drop' => [
+      qw(
+        build_requires
+        configure_requires
+        conflicts
+        distribution_type
+        license_url
+        private
+        recommends
+        requires
+        )
+    ],
+
+    # other random keys need x_ prefixing
+    ':custom' => \&_prefix_custom,
+  },
+  '1.4-from-1.3' => {
+
+    # PRIOR MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_1,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_optional_features_1_4,
+    'provides'          => \&_provides,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+    'resources'         => \&_resources_1_4,
+
+    # ADDED OPTIONAL
+    'configure_requires' => \&_keep,
+
+    # drop these deprecated fields, but only after we convert
+    ':drop' => [
+      qw(
+        license_url
+        private
+        )
+    ],
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.3-from-1.2' => {
+
+    # PRIOR MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_1,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_optional_features_as_map,
+    'provides'          => \&_provides,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+    'resources'         => \&_resources_1_3,
+
+    # drop these deprecated fields, but only after we convert
+    ':drop' => [
+      qw(
+        license_url
+        private
+        )
+    ],
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.2-from-1.1' => {
+
+    # PRIOR MANDATORY
+    'version' => \&_keep,
+
+    # CHANGED TO MANDATORY
+    'license'      => \&_license_1,
+    'name'         => \&_keep,
+    'generated_by' => \&_generated_by,
+
+    # ADDED MANDATORY
+    'abstract'  => \&_keep_or_unknown,
+    'author'    => \&_author_list,
+    'meta-spec' => \&_change_meta_spec,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # ADDED OPTIONAL
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_1_2,
+    'optional_features' => \&_optional_features_as_map,
+    'provides'          => \&_provides,
+    'resources'         => \&_resources_1_2,
+
+    # drop these deprecated fields, but only after we convert
+    ':drop' => [
+      qw(
+        license_url
+        private
+        )
+    ],
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.1-from-1.0' => {
+
+    # CHANGED TO MANDATORY
+    'version' => \&_keep,
+
+    # IMPLIED MANDATORY
+    'name' => \&_keep,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'generated_by'      => \&_generated_by,
+    'license'           => \&_license_1,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # ADDED OPTIONAL
+    'license_url' => \&_url_or_drop,
+    'private'     => \&_keep,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+);
+
+my %down_convert = (
+  '1.4-from-2' => {
+
+    # MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_downgrade_license,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # OPTIONAL
+    'build_requires'     => \&_get_build_requires,
+    'configure_requires' => \&_get_configure_requires,
+    'conflicts'          => \&_get_conflicts,
+    'distribution_type'  => \&_keep,
+    'dynamic_config'     => \&_keep_or_one,
+    'keywords'           => \&_keep,
+    'no_index'           => \&_no_index_directory,
+    'optional_features'  => \&_downgrade_optional_features,
+    'provides'           => \&_provides,
+    'recommends'         => \&_get_recommends,
+    'requires'           => \&_get_requires,
+    'resources'          => \&_downgrade_resources,
+
+    # drop these unsupported fields (after conversion)
+    ':drop' => [
+      qw(
+        description
+        prereqs
+        release_status
+        )
+    ],
+
+    # custom keys will be left unchanged
+    ':custom' => \&_keep
+  },
+  '1.3-from-1.4' => {
+
+    # MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_1,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_optional_features_as_map,
+    'provides'          => \&_provides,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+    'resources'         => \&_resources_1_3,
+
+    # drop these unsupported fields, but only after we convert
+    ':drop' => [
+      qw(
+        configure_requires
+        )
+    ],
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep,
+  },
+  '1.2-from-1.3' => {
+
+    # MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_1,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_1_2,
+    'optional_features' => \&_optional_features_as_map,
+    'provides'          => \&_provides,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+    'resources'         => \&_resources_1_3,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep,
+  },
+  '1.1-from-1.2' => {
+
+    # MANDATORY
+    'version' => \&_keep,
+
+    # IMPLIED MANDATORY
+    'name'      => \&_keep,
+    'meta-spec' => \&_change_meta_spec,
+
+    # OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'generated_by'      => \&_generated_by,
+    'license'           => \&_license_1,
+    'private'           => \&_keep,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # drop unsupported fields
+    ':drop' => [
+      qw(
+        abstract
+        author
+        provides
+        no_index
+        keywords
+        resources
+        )
+    ],
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep,
+  },
+  '1.0-from-1.1' => {
+
+    # IMPLIED MANDATORY
+    'name'      => \&_keep,
+    'meta-spec' => \&_change_meta_spec,
+    'version'   => \&_keep,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'generated_by'      => \&_generated_by,
+    'license'           => \&_license_1,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep,
+  },
+);
+
+my %cleanup = (
+  '2' => {
+
+    # PRIOR MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_2,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # CHANGED TO MANDATORY
+    'dynamic_config' => \&_keep_or_one,
+
+    # ADDED MANDATORY
+    'release_status' => \&_release_status,
+
+    # PRIOR OPTIONAL
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_cleanup_optional_features_2,
+    'provides'          => \&_provides,
+    'resources'         => \&_cleanup_resources_2,
+
+    # ADDED OPTIONAL
+    'description' => \&_keep,
+    'prereqs'     => \&_cleanup_prereqs,
+
+    # drop these deprecated fields, but only after we convert
+    ':drop' => [
+      qw(
+        build_requires
+        configure_requires
+        conflicts
+        distribution_type
+        license_url
+        private
+        recommends
+        requires
+        )
+    ],
+
+    # other random keys need x_ prefixing
+    ':custom' => \&_prefix_custom,
+  },
+  '1.4' => {
+
+    # PRIOR MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_1,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_optional_features_1_4,
+    'provides'          => \&_provides,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+    'resources'         => \&_resources_1_4,
+
+    # ADDED OPTIONAL
+    'configure_requires' => \&_keep,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.3' => {
+
+    # PRIOR MANDATORY
+    'abstract'     => \&_keep_or_unknown,
+    'author'       => \&_author_list,
+    'generated_by' => \&_generated_by,
+    'license'      => \&_license_1,
+    'meta-spec'    => \&_change_meta_spec,
+    'name'         => \&_keep,
+    'version'      => \&_keep,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_directory,
+    'optional_features' => \&_optional_features_as_map,
+    'provides'          => \&_provides,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+    'resources'         => \&_resources_1_3,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.2' => {
+
+    # PRIOR MANDATORY
+    'version' => \&_keep,
+
+    # CHANGED TO MANDATORY
+    'license'      => \&_license_1,
+    'name'         => \&_keep,
+    'generated_by' => \&_generated_by,
+
+    # ADDED MANDATORY
+    'abstract'  => \&_keep_or_unknown,
+    'author'    => \&_author_list,
+    'meta-spec' => \&_change_meta_spec,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # ADDED OPTIONAL
+    'keywords'          => \&_keep,
+    'no_index'          => \&_no_index_1_2,
+    'optional_features' => \&_optional_features_as_map,
+    'provides'          => \&_provides,
+    'resources'         => \&_resources_1_2,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.1' => {
+
+    # CHANGED TO MANDATORY
+    'version' => \&_keep,
+
+    # IMPLIED MANDATORY
+    'name'      => \&_keep,
+    'meta-spec' => \&_change_meta_spec,
+
+    # PRIOR OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'generated_by'      => \&_generated_by,
+    'license'           => \&_license_1,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # ADDED OPTIONAL
+    'license_url' => \&_url_or_drop,
+    'private'     => \&_keep,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep
+  },
+  '1.0' => {
+
+    # IMPLIED MANDATORY
+    'name'      => \&_keep,
+    'meta-spec' => \&_change_meta_spec,
+    'version'   => \&_keep,
+
+    # IMPLIED OPTIONAL
+    'build_requires'    => \&_version_map,
+    'conflicts'         => \&_version_map,
+    'distribution_type' => \&_keep,
+    'dynamic_config'    => \&_keep_or_one,
+    'generated_by'      => \&_generated_by,
+    'license'           => \&_license_1,
+    'recommends'        => \&_version_map,
+    'requires'          => \&_version_map,
+
+    # other random keys are OK if already valid
+    ':custom' => \&_keep,
+  },
+);
+
+# for a given field in a spec version, what fields will it feed
+# into in the *latest* spec (i.e. v2); meta-spec omitted because
+# we always expect a meta-spec to be generated
+my %fragments_generate = (
+  '2' => {
+    'abstract'          => 'abstract',
+    'author'            => 'author',
+    'generated_by'      => 'generated_by',
+    'license'           => 'license',
+    'name'              => 'name',
+    'version'           => 'version',
+    'dynamic_config'    => 'dynamic_config',
+    'release_status'    => 'release_status',
+    'keywords'          => 'keywords',
+    'no_index'          => 'no_index',
+    'optional_features' => 'optional_features',
+    'provides'          => 'provides',
+    'resources'         => 'resources',
+    'description'       => 'description',
+    'prereqs'           => 'prereqs',
+  },
+  '1.4' => {
+    'abstract'           => 'abstract',
+    'author'             => 'author',
+    'generated_by'       => 'generated_by',
+    'license'            => 'license',
+    'name'               => 'name',
+    'version'            => 'version',
+    'build_requires'     => 'prereqs',
+    'conflicts'          => 'prereqs',
+    'distribution_type'  => 'distribution_type',
+    'dynamic_config'     => 'dynamic_config',
+    'keywords'           => 'keywords',
+    'no_index'           => 'no_index',
+    'optional_features'  => 'optional_features',
+    'provides'           => 'provides',
+    'recommends'         => 'prereqs',
+    'requires'           => 'prereqs',
+    'resources'          => 'resources',
+    'configure_requires' => 'prereqs',
+  },
+);
+
+# this is not quite true but will work well enough
+# as 1.4 is a superset of earlier ones
+$fragments_generate{$_} = $fragments_generate{'1.4'} for qw/1.3 1.2 1.1 1.0/;
+
+#--------------------------------------------------------------------------#
+# Code
+#--------------------------------------------------------------------------#
+
+#pod =method new
+#pod
+#pod   my $cmc = CPAN::Meta::Converter->new( $struct );
+#pod
+#pod The constructor should be passed a valid metadata structure but invalid
+#pod structures are accepted.  If no meta-spec version is provided, version 1.0 will
+#pod be assumed.
+#pod
+#pod Optionally, you can provide a C<default_version> argument after C<$struct>:
+#pod
+#pod   my $cmc = CPAN::Meta::Converter->new( $struct, default_version => "1.4" );
+#pod
+#pod This is only needed when converting a metadata fragment that does not include a
+#pod C<meta-spec> field.
+#pod
+#pod =cut
+
+sub new {
+  my ($class, $data, %args) = @_;
+
+  # create an attributes hash
+  my $self = {
+    'data' => $data,
+    'spec' => _extract_spec_version($data, $args{default_version}),
+  };
+
+  # create the object
+  return bless $self, $class;
+}
+
+sub _extract_spec_version {
+  my ($data, $default) = @_;
+  my $spec = $data->{'meta-spec'};
+
+  # is meta-spec there and valid?
+  return ($default || "1.0") unless defined $spec && ref $spec eq 'HASH'; # before meta-spec?
+
+  # does the version key look like a valid version?
+  my $v = $spec->{version};
+  if (defined $v && $v =~ /^\d+(?:\.\d+)?$/) {
+    return $v     if defined $v && grep { $v eq $_ } keys %known_specs; # known spec
+    return $v + 0 if defined $v && grep { $v == $_ } keys %known_specs; # 2.0 => 2
+  }
+
+  # otherwise, use heuristics: look for 1.x vs 2.0 fields
+  return "2"   if exists $data->{prereqs};
+  return "1.4" if exists $data->{configure_requires};
+  return ($default || "1.2");    # when meta-spec was first defined
+}
+
+#pod =method convert
+#pod
+#pod   my $new_struct = $cmc->convert( version => "2" );
+#pod
+#pod Returns a new hash reference with the metadata converted to a different form.
+#pod C<convert> will die if any conversion/standardization still results in an
+#pod invalid structure.
+#pod
+#pod Valid parameters include:
+#pod
+#pod =over
+#pod
+#pod =item *
+#pod
+#pod C<version> -- Indicates the desired specification version (e.g. "1.0", "1.1" ... "1.4", "2").
+#pod Defaults to the latest version of the CPAN Meta Spec.
+#pod
+#pod =back
+#pod
+#pod Conversion proceeds through each version in turn.  For example, a version 1.2
+#pod structure might be converted to 1.3 then 1.4 then finally to version 2. The
+#pod conversion process attempts to clean-up simple errors and standardize data.
+#pod For example, if C<author> is given as a scalar, it will converted to an array
+#pod reference containing the item. (Converting a structure to its own version will
+#pod also clean-up and standardize.)
+#pod
+#pod When data are cleaned and standardized, missing or invalid fields will be
+#pod replaced with sensible defaults when possible.  This may be lossy or imprecise.
+#pod For example, some badly structured META.yml files on CPAN have prerequisite
+#pod modules listed as both keys and values:
+#pod
+#pod   requires => { 'Foo::Bar' => 'Bam::Baz' }
+#pod
+#pod These would be split and each converted to a prerequisite with a minimum
+#pod version of zero.
+#pod
+#pod When some mandatory fields are missing or invalid, the conversion will attempt
+#pod to provide a sensible default or will fill them with a value of 'unknown'.  For
+#pod example a missing or unrecognized C<license> field will result in a C<license>
+#pod field of 'unknown'.  Fields that may get an 'unknown' include:
+#pod
+#pod =for :list
+#pod * abstract
+#pod * author
+#pod * license
+#pod
+#pod =cut
+
+sub convert {
+  my ($self, %args) = @_;
+  my $args = {%args};
+
+  my $new_version = $args->{version} || $HIGHEST;
+  my $is_fragment = $args->{is_fragment};
+
+  my ($old_version) = $self->{spec};
+  my $converted = _dclone($self->{data});
+
+  if ($old_version == $new_version) {
+    $converted
+      = _convert($converted, $cleanup{$old_version}, $old_version, $is_fragment);
+    unless ($args->{is_fragment}) {
+      my $cmv = CPAN::Meta::Validator->new($converted);
+      unless ($cmv->is_valid) {
+        my $errs = join("\n", $cmv->errors);
+        die "Failed to clean-up $old_version metadata. Errors:\n$errs\n";
+      }
+    }
+    return $converted;
+  }
+  elsif ($old_version > $new_version) {
+    my @vers = sort { $b <=> $a } keys %known_specs;
+    for my $i (0 .. $#vers - 1) {
+      next if $vers[$i] > $old_version;
+      last if $vers[$i + 1] < $new_version;
+      my $spec_string = "$vers[$i+1]-from-$vers[$i]";
+      $converted = _convert($converted, $down_convert{$spec_string}, $vers[$i + 1],
+        $is_fragment);
+      unless ($args->{is_fragment}) {
+        my $cmv = CPAN::Meta::Validator->new($converted);
+        unless ($cmv->is_valid) {
+          my $errs = join("\n", $cmv->errors);
+          die "Failed to downconvert metadata to $vers[$i+1]. Errors:\n$errs\n";
+        }
+      }
+    }
+    return $converted;
+  }
+  else {
+    my @vers = sort { $a <=> $b } keys %known_specs;
+    for my $i (0 .. $#vers - 1) {
+      next if $vers[$i] < $old_version;
+      last if $vers[$i + 1] > $new_version;
+      my $spec_string = "$vers[$i+1]-from-$vers[$i]";
+      $converted = _convert($converted, $up_convert{$spec_string}, $vers[$i + 1],
+        $is_fragment);
+      unless ($args->{is_fragment}) {
+        my $cmv = CPAN::Meta::Validator->new($converted);
+        unless ($cmv->is_valid) {
+          my $errs = join("\n", $cmv->errors);
+          die "Failed to upconvert metadata to $vers[$i+1]. Errors:\n$errs\n";
+        }
+      }
+    }
+    return $converted;
+  }
+}
+
+#pod =method upgrade_fragment
+#pod
+#pod   my $new_struct = $cmc->upgrade_fragment;
+#pod
+#pod Returns a new hash reference with the metadata converted to the latest version
+#pod of the CPAN Meta Spec.  No validation is done on the result -- you must
+#pod validate after merging fragments into a complete metadata document.
+#pod
+#pod Available since version 2.141170.
+#pod
+#pod =cut
+
+sub upgrade_fragment {
+  my ($self)        = @_;
+  my ($old_version) = $self->{spec};
+  my %expected
+    = map { ; $_ => 1 }
+    grep  {defined}
+    map   { $fragments_generate{$old_version}{$_} } keys %{$self->{data}};
+  my $converted = $self->convert(version => $HIGHEST, is_fragment => 1);
+  for my $key (keys %$converted) {
+    next if $key =~ /^x_/i || $key eq 'meta-spec';
+    delete $converted->{$key} unless $expected{$key};
+  }
+  return $converted;
+}
+
+1;
+
+# ABSTRACT: Convert CPAN distribution metadata structures
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Converter - Convert CPAN distribution metadata structures
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 SYNOPSIS
+
+  my $struct = decode_json_file('META.json');
+
+  my $cmc = CPAN::Meta::Converter->new( $struct );
+
+  my $new_struct = $cmc->convert( version => "2" );
+
+=head1 DESCRIPTION
+
+This module converts CPAN Meta structures from one form to another.  The
+primary use is to convert older structures to the most modern version of
+the specification, but other transformations may be implemented in the
+future as needed.  (E.g. stripping all custom fields or stripping all
+optional fields.)
+
+=head1 METHODS
+
+=head2 new
+
+  my $cmc = CPAN::Meta::Converter->new( $struct );
+
+The constructor should be passed a valid metadata structure but invalid
+structures are accepted.  If no meta-spec version is provided, version 1.0 will
+be assumed.
+
+Optionally, you can provide a C<default_version> argument after C<$struct>:
+
+  my $cmc = CPAN::Meta::Converter->new( $struct, default_version => "1.4" );
+
+This is only needed when converting a metadata fragment that does not include a
+C<meta-spec> field.
+
+=head2 convert
+
+  my $new_struct = $cmc->convert( version => "2" );
+
+Returns a new hash reference with the metadata converted to a different form.
+C<convert> will die if any conversion/standardization still results in an
+invalid structure.
+
+Valid parameters include:
+
+=over
+
+=item *
+
+C<version> -- Indicates the desired specification version (e.g. "1.0", "1.1" ... "1.4", "2").
+Defaults to the latest version of the CPAN Meta Spec.
+
+=back
+
+Conversion proceeds through each version in turn.  For example, a version 1.2
+structure might be converted to 1.3 then 1.4 then finally to version 2. The
+conversion process attempts to clean-up simple errors and standardize data.
+For example, if C<author> is given as a scalar, it will converted to an array
+reference containing the item. (Converting a structure to its own version will
+also clean-up and standardize.)
+
+When data are cleaned and standardized, missing or invalid fields will be
+replaced with sensible defaults when possible.  This may be lossy or imprecise.
+For example, some badly structured META.yml files on CPAN have prerequisite
+modules listed as both keys and values:
+
+  requires => { 'Foo::Bar' => 'Bam::Baz' }
+
+These would be split and each converted to a prerequisite with a minimum
+version of zero.
+
+When some mandatory fields are missing or invalid, the conversion will attempt
+to provide a sensible default or will fill them with a value of 'unknown'.  For
+example a missing or unrecognized C<license> field will result in a C<license>
+field of 'unknown'.  Fields that may get an 'unknown' include:
+
+=over 4
+
+=item *
+
+abstract
+
+=item *
+
+author
+
+=item *
+
+license
+
+=back
+
+=head2 upgrade_fragment
+
+  my $new_struct = $cmc->upgrade_fragment;
+
+Returns a new hash reference with the metadata converted to the latest version
+of the CPAN Meta Spec.  No validation is done on the result -- you must
+validate after merging fragments into a complete metadata document.
+
+Available since version 2.141170.
+
+=head1 BUGS
+
+Please report any bugs or feature using the CPAN Request Tracker.
+Bugs can be submitted through the web interface at
+L<http://rt.cpan.org/Dist/Display.html?Queue=CPAN-Meta>
+
+When submitting a bug or request, please include a test-file or a patch to an
+existing test-file that illustrates the bug or desired feature.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Feature.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Feature.pm
new file mode 100644
index 0000000000..479b9816b2
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Feature.pm
@@ -0,0 +1,150 @@
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta::Feature;
+
+our $VERSION = '2.150005';
+
+use CPAN::Meta::Prereqs;
+
+#pod =head1 DESCRIPTION
+#pod
+#pod A CPAN::Meta::Feature object describes an optional feature offered by a CPAN
+#pod distribution and specified in the distribution's F<META.json> (or F<META.yml>)
+#pod file.
+#pod
+#pod For the most part, this class will only be used when operating on the result of
+#pod the C<feature> or C<features> methods on a L<CPAN::Meta> object.
+#pod
+#pod =method new
+#pod
+#pod   my $feature = CPAN::Meta::Feature->new( $identifier => \%spec );
+#pod
+#pod This returns a new Feature object.  The C<%spec> argument to the constructor
+#pod should be the same as the value of the C<optional_feature> entry in the
+#pod distmeta.  It must contain entries for C<description> and C<prereqs>.
+#pod
+#pod =cut
+
+sub new {
+  my ($class, $identifier, $spec) = @_;
+
+  my %guts = (
+    identifier  => $identifier,
+    description => $spec->{description},
+    prereqs     => CPAN::Meta::Prereqs->new($spec->{prereqs}),
+  );
+
+  bless \%guts => $class;
+}
+
+#pod =method identifier
+#pod
+#pod This method returns the feature's identifier.
+#pod
+#pod =cut
+
+sub identifier { $_[0]{identifier} }
+
+#pod =method description
+#pod
+#pod This method returns the feature's long description.
+#pod
+#pod =cut
+
+sub description { $_[0]{description} }
+
+#pod =method prereqs
+#pod
+#pod This method returns the feature's prerequisites as a L<CPAN::Meta::Prereqs>
+#pod object.
+#pod
+#pod =cut
+
+sub prereqs { $_[0]{prereqs} }
+
+1;
+
+# ABSTRACT: an optional feature provided by a CPAN distribution
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Feature - an optional feature provided by a CPAN distribution
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 DESCRIPTION
+
+A CPAN::Meta::Feature object describes an optional feature offered by a CPAN
+distribution and specified in the distribution's F<META.json> (or F<META.yml>)
+file.
+
+For the most part, this class will only be used when operating on the result of
+the C<feature> or C<features> methods on a L<CPAN::Meta> object.
+
+=head1 METHODS
+
+=head2 new
+
+  my $feature = CPAN::Meta::Feature->new( $identifier => \%spec );
+
+This returns a new Feature object.  The C<%spec> argument to the constructor
+should be the same as the value of the C<optional_feature> entry in the
+distmeta.  It must contain entries for C<description> and C<prereqs>.
+
+=head2 identifier
+
+This method returns the feature's identifier.
+
+=head2 description
+
+This method returns the feature's long description.
+
+=head2 prereqs
+
+This method returns the feature's prerequisites as a L<CPAN::Meta::Prereqs>
+object.
+
+=head1 BUGS
+
+Please report any bugs or feature using the CPAN Request Tracker.
+Bugs can be submitted through the web interface at
+L<http://rt.cpan.org/Dist/Display.html?Queue=CPAN-Meta>
+
+When submitting a bug or request, please include a test-file or a patch to an
+existing test-file that illustrates the bug or desired feature.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/History.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/History.pm
new file mode 100644
index 0000000000..e6db84af5b
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/History.pm
@@ -0,0 +1,317 @@
+# vi:tw=72
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta::History;
+
+our $VERSION = '2.150005';
+
+1;
+
+# ABSTRACT: history of CPAN Meta Spec changes
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::History - history of CPAN Meta Spec changes
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 DESCRIPTION
+
+The CPAN Meta Spec has gone through several iterations.  It was
+originally written in HTML and later revised into POD (though published
+in HTML generated from the POD).  Fields were added, removed or changed,
+sometimes by design and sometimes to reflect real-world usage after the
+fact.
+
+This document reconstructs the history of the CPAN Meta Spec based on
+change logs, repository commit messages and the published HTML files.
+In some cases, particularly prior to version 1.2, the exact version
+when certain fields were introduced or changed is inconsistent between
+sources.  When in doubt, the published HTML files for versions 1.0 to
+1.4 as they existed when version 2 was developed are used as the
+definitive source.
+
+Starting with version 2, the specification document is part of the
+CPAN-Meta distribution and will be published on CPAN as
+L<CPAN::Meta::Spec>.
+
+Going forward, specification version numbers will be integers and
+decimal portions will correspond to a release date for the CPAN::Meta
+library.
+
+=head1 HISTORY
+
+=head2 Version 2
+
+April 2010
+
+=over
+
+=item *
+
+Revised spec examples as perl data structures rather than YAML
+
+=item *
+
+Switched to JSON serialization from YAML
+
+=item *
+
+Specified allowed version number formats
+
+=item *
+
+Replaced 'requires', 'build_requires', 'configure_requires',
+'recommends' and 'conflicts' with new 'prereqs' data structure divided
+by I<phase> (configure, build, test, runtime, etc.) and I<relationship>
+(requires, recommends, suggests, conflicts)
+
+=item *
+
+Added support for 'develop' phase for requirements for maintaining
+a list of authoring tools
+
+=item *
+
+Changed 'license' to a list and revised the set of valid licenses
+
+=item *
+
+Made 'dynamic_config' mandatory to reduce confusion
+
+=item *
+
+Changed 'resources' subkey 'repository' to a hash that clarifies
+repository type, url for browsing and url for checkout
+
+=item *
+
+Changed 'resources' subkey 'bugtracker' to a hash for either web
+or mailto resource
+
+=item *
+
+Changed specification of 'optional_features':
+
+=over
+
+=item *
+
+Added formal specification and usage guide instead of just example
+
+=item *
+
+Changed to use new prereqs data structure instead of individual keys
+
+=back
+
+=item *
+
+Clarified intended use of 'author' as generalized contact list
+
+=item *
+
+Added 'release_status' field to indicate stable, testing or unstable
+status to provide hints to indexers
+
+=item *
+
+Added 'description' field for a longer description of the distribution
+
+=item *
+
+Formalized use of "x_" or "X_" for all custom keys not listed in the
+official spec
+
+=back
+
+=head2 Version 1.4
+
+June 2008
+
+=over
+
+=item *
+
+Noted explicit support for 'perl' in prerequisites
+
+=item *
+
+Added 'configure_requires' prerequisite type
+
+=item *
+
+Changed 'optional_features'
+
+=over
+
+=item *
+
+Example corrected to show map of maps instead of list of maps
+(though descriptive text said 'map' even in v1.3)
+
+=item *
+
+Removed 'requires_packages', 'requires_os' and 'excluded_os'
+as valid subkeys
+
+=back
+
+=back
+
+=head2 Version 1.3
+
+November 2006
+
+=over
+
+=item *
+
+Added 'no_index' subkey 'directory' and removed 'dir' to match actual
+usage in the wild
+
+=item *
+
+Added a 'repository' subkey to 'resources'
+
+=back
+
+=head2 Version 1.2
+
+August 2005
+
+=over
+
+=item *
+
+Re-wrote and restructured spec in POD syntax
+
+=item *
+
+Changed 'name' to be mandatory
+
+=item *
+
+Changed 'generated_by' to be mandatory
+
+=item *
+
+Changed 'license' to be mandatory
+
+=item *
+
+Added version range specifications for prerequisites
+
+=item *
+
+Added required 'abstract' field
+
+=item *
+
+Added required 'author' field
+
+=item *
+
+Added required 'meta-spec' field to define 'version' (and 'url') of the
+CPAN Meta Spec used for metadata
+
+=item *
+
+Added 'provides' field
+
+=item *
+
+Added 'no_index' field and deprecated 'private' field.  'no_index'
+subkeys include 'file', 'dir', 'package' and 'namespace'
+
+=item *
+
+Added 'keywords' field
+
+=item *
+
+Added 'resources' field with subkeys 'homepage', 'license', and
+'bugtracker'
+
+=item *
+
+Added 'optional_features' field as an alternate under 'recommends'.
+Includes 'description', 'requires', 'build_requires', 'conflicts',
+'requires_packages', 'requires_os' and 'excluded_os' as valid subkeys
+
+=item *
+
+Removed 'license_uri' field
+
+=back
+
+=head2 Version 1.1
+
+May 2003
+
+=over
+
+=item *
+
+Changed 'version' to be mandatory
+
+=item *
+
+Added 'private' field
+
+=item *
+
+Added 'license_uri' field
+
+=back
+
+=head2 Version 1.0
+
+March 2003
+
+=over
+
+=item *
+
+Original release (in HTML format only)
+
+=item *
+
+Included 'name', 'version', 'license', 'distribution_type', 'requires',
+'recommends', 'build_requires', 'conflicts', 'dynamic_config',
+'generated_by'
+
+=back
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Merge.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Merge.pm
new file mode 100644
index 0000000000..75d13a77b8
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Merge.pm
@@ -0,0 +1,300 @@
+use strict;
+use warnings;
+
+package CPAN::Meta::Merge;
+
+our $VERSION = '2.150005';
+
+use Carp qw/croak/;
+use Scalar::Util qw/blessed/;
+use CPAN::Meta::Converter 2.141170;
+
+sub _is_identical {
+  my ($left, $right) = @_;
+  return (not defined $left and not defined $right)
+
+    # if either of these are references, we compare the serialized value
+    || (defined $left and defined $right and $left eq $right);
+}
+
+sub _identical {
+  my ($left, $right, $path) = @_;
+  croak sprintf "Can't merge attribute %s: '%s' does not equal '%s'",
+    join('.', @{$path}), $left, $right
+    unless _is_identical($left, $right);
+  return $left;
+}
+
+sub _merge {
+  my ($current, $next, $mergers, $path) = @_;
+  for my $key (keys %{$next}) {
+    if (not exists $current->{$key}) {
+      $current->{$key} = $next->{$key};
+    }
+    elsif (my $merger = $mergers->{$key}) {
+      $current->{$key} = $merger->($current->{$key}, $next->{$key}, [@{$path}, $key]);
+    }
+    elsif ($merger = $mergers->{':default'}) {
+      $current->{$key} = $merger->($current->{$key}, $next->{$key}, [@{$path}, $key]);
+    }
+    else {
+      croak sprintf "Can't merge unknown attribute '%s'", join '.', @{$path}, $key;
+    }
+  }
+  return $current;
+}
+
+sub _uniq {
+  my %seen = ();
+  return grep { not $seen{$_}++ } @_;
+}
+
+sub _set_addition {
+  my ($left, $right) = @_;
+  return [+_uniq(@{$left}, @{$right})];
+}
+
+sub _uniq_map {
+  my ($left, $right, $path) = @_;
+  for my $key (keys %{$right}) {
+    if (not exists $left->{$key}) {
+      $left->{$key} = $right->{$key};
+    }
+
+    # identical strings or references are merged identically
+    elsif (_is_identical($left->{$key}, $right->{$key})) {
+      1;    # do nothing - keep left
+    }
+    elsif (ref $left->{$key} eq 'HASH' and ref $right->{$key} eq 'HASH') {
+      $left->{$key} = _uniq_map($left->{$key}, $right->{$key}, [@{$path}, $key]);
+    }
+    else {
+      croak 'Duplication of element ' . join '.', @{$path}, $key;
+    }
+  }
+  return $left;
+}
+
+sub _improvize {
+  my ($left, $right, $path) = @_;
+  my ($name) = reverse @{$path};
+  if ($name =~ /^x_/) {
+    if (ref($left) eq 'ARRAY') {
+      return _set_addition($left, $right, $path);
+    }
+    elsif (ref($left) eq 'HASH') {
+      return _uniq_map($left, $right, $path);
+    }
+    else {
+      return _identical($left, $right, $path);
+    }
+  }
+  croak sprintf "Can't merge '%s'", join '.', @{$path};
+}
+
+sub _optional_features {
+  my ($left, $right, $path) = @_;
+
+  for my $key (keys %{$right}) {
+    if (not exists $left->{$key}) {
+      $left->{$key} = $right->{$key};
+    }
+    else {
+      for my $subkey (keys %{$right->{$key}}) {
+        next if $subkey eq 'prereqs';
+        if (not exists $left->{$key}{$subkey}) {
+          $left->{$key}{$subkey} = $right->{$key}{$subkey};
+        }
+        else {
+          Carp::croak
+            "Cannot merge two optional_features named '$key' with different '$subkey' values"
+            if do {
+            no warnings 'uninitialized';
+            $left->{$key}{$subkey} ne $right->{$key}{$subkey};
+            };
+        }
+      }
+
+      require CPAN::Meta::Prereqs;
+      $left->{$key}{prereqs}
+        = CPAN::Meta::Prereqs->new($left->{$key}{prereqs})
+        ->with_merged_prereqs(CPAN::Meta::Prereqs->new($right->{$key}{prereqs}))
+        ->as_string_hash;
+    }
+  }
+  return $left;
+}
+
+
+my %default = (
+  abstract       => \&_identical,
+  author         => \&_set_addition,
+  dynamic_config => sub {
+    my ($left, $right) = @_;
+    return $left || $right;
+  },
+  generated_by => sub {
+    my ($left, $right) = @_;
+    return join ', ', _uniq(split(/, /, $left), split(/, /, $right));
+  },
+  license        => \&_set_addition,
+  'meta-spec'    => {version => \&_identical, url => \&_identical},
+  name           => \&_identical,
+  release_status => \&_identical,
+  version        => \&_identical,
+  description    => \&_identical,
+  keywords       => \&_set_addition,
+  no_index =>
+    {map { ($_ => \&_set_addition) } qw/file directory package namespace/},
+  optional_features => \&_optional_features,
+  prereqs           => sub {
+    require CPAN::Meta::Prereqs;
+    my ($left, $right) = map { CPAN::Meta::Prereqs->new($_) } @_[0, 1];
+    return $left->with_merged_prereqs($right)->as_string_hash;
+  },
+  provides  => \&_uniq_map,
+  resources => {
+    license    => \&_set_addition,
+    homepage   => \&_identical,
+    bugtracker => \&_uniq_map,
+    repository => \&_uniq_map,
+    ':default' => \&_improvize,
+  },
+  ':default' => \&_improvize,
+);
+
+sub new {
+  my ($class, %arguments) = @_;
+  croak 'default version required' if not exists $arguments{default_version};
+  my %mapping = %default;
+  my %extra = %{$arguments{extra_mappings} || {}};
+  for my $key (keys %extra) {
+    if (ref($mapping{$key}) eq 'HASH') {
+      $mapping{$key} = {%{$mapping{$key}}, %{$extra{$key}}};
+    }
+    else {
+      $mapping{$key} = $extra{$key};
+    }
+  }
+  return bless {
+    default_version => $arguments{default_version},
+    mapping         => _coerce_mapping(\%mapping, []),
+  }, $class;
+}
+
+my %coderef_for = (
+  set_addition => \&_set_addition,
+  uniq_map     => \&_uniq_map,
+  identical    => \&_identical,
+  improvize    => \&_improvize,
+);
+
+sub _coerce_mapping {
+  my ($orig, $map_path) = @_;
+  my %ret;
+  for my $key (keys %{$orig}) {
+    my $value = $orig->{$key};
+    if (ref($orig->{$key}) eq 'CODE') {
+      $ret{$key} = $value;
+    }
+    elsif (ref($value) eq 'HASH') {
+      my $mapping = _coerce_mapping($value, [@{$map_path}, $key]);
+      $ret{$key} = sub {
+        my ($left, $right, $path) = @_;
+        return _merge($left, $right, $mapping, [@{$path}]);
+      };
+    }
+    elsif ($coderef_for{$value}) {
+      $ret{$key} = $coderef_for{$value};
+    }
+    else {
+      croak "Don't know what to do with " . join '.', @{$map_path}, $key;
+    }
+  }
+  return \%ret;
+}
+
+sub merge {
+  my ($self, @items) = @_;
+  my $current = {};
+  for my $next (@items) {
+    if (blessed($next) && $next->isa('CPAN::Meta')) {
+      $next = $next->as_struct;
+    }
+    elsif (ref($next) eq 'HASH') {
+      my $cmc = CPAN::Meta::Converter->new($next,
+        default_version => $self->{default_version});
+      $next = $cmc->upgrade_fragment;
+    }
+    else {
+      croak "Don't know how to merge '$next'";
+    }
+    $current = _merge($current, $next, $self->{mapping}, []);
+  }
+  return $current;
+}
+
+1;
+
+# ABSTRACT: Merging CPAN Meta fragments
+
+
+# vim: ts=2 sts=2 sw=2 et :
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Merge - Merging CPAN Meta fragments
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 SYNOPSIS
+
+ my $merger = CPAN::Meta::Merge->new(default_version => "2");
+ my $meta = $merger->merge($base, @additional);
+
+=head1 DESCRIPTION
+
+=head1 METHODS
+
+=head2 new
+
+This creates a CPAN::Meta::Merge object. It takes one mandatory named
+argument, C<version>, declaring the version of the meta-spec that must be
+used for the merge. It can optionally take an C<extra_mappings> argument
+that allows one to add additional merging functions for specific elements.
+
+=head2 merge(@fragments)
+
+Merge all C<@fragments> together. It will accept both CPAN::Meta objects and
+(possibly incomplete) hashrefs of metadata.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Prereqs.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Prereqs.pm
new file mode 100644
index 0000000000..1bfb92ce3a
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Prereqs.pm
@@ -0,0 +1,422 @@
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta::Prereqs;
+
+our $VERSION = '2.150005';
+
+#pod =head1 DESCRIPTION
+#pod
+#pod A CPAN::Meta::Prereqs object represents the prerequisites for a CPAN
+#pod distribution or one of its optional features.  Each set of prereqs is
+#pod organized by phase and type, as described in L<CPAN::Meta::Prereqs>.
+#pod
+#pod =cut
+
+use Carp qw(confess);
+use Scalar::Util qw(blessed);
+use CPAN::Meta::Requirements 2.121;
+
+#pod =method new
+#pod
+#pod   my $prereq = CPAN::Meta::Prereqs->new( \%prereq_spec );
+#pod
+#pod This method returns a new set of Prereqs.  The input should look like the
+#pod contents of the C<prereqs> field described in L<CPAN::Meta::Spec>, meaning
+#pod something more or less like this:
+#pod
+#pod   my $prereq = CPAN::Meta::Prereqs->new({
+#pod     runtime => {
+#pod       requires => {
+#pod         'Some::Module' => '1.234',
+#pod         ...,
+#pod       },
+#pod       ...,
+#pod     },
+#pod     ...,
+#pod   });
+#pod
+#pod You can also construct an empty set of prereqs with:
+#pod
+#pod   my $prereqs = CPAN::Meta::Prereqs->new;
+#pod
+#pod This empty set of prereqs is useful for accumulating new prereqs before finally
+#pod dumping the whole set into a structure or string.
+#pod
+#pod =cut
+
+sub __legal_phases {qw(configure build test runtime develop)}
+sub __legal_types  {qw(requires recommends suggests conflicts)}
+
+# expect a prereq spec from META.json -- rjbs, 2010-04-11
+sub new {
+  my ($class, $prereq_spec) = @_;
+  $prereq_spec ||= {};
+
+  my %is_legal_phase = map { ; $_ => 1 } $class->__legal_phases;
+  my %is_legal_type  = map { ; $_ => 1 } $class->__legal_types;
+
+  my %guts;
+PHASE: for my $phase (keys %$prereq_spec) {
+    next PHASE unless $phase =~ /\Ax_/i or $is_legal_phase{$phase};
+
+    my $phase_spec = $prereq_spec->{$phase};
+    next PHASE unless keys %$phase_spec;
+
+  TYPE: for my $type (keys %$phase_spec) {
+      next TYPE unless $type =~ /\Ax_/i or $is_legal_type{$type};
+
+      my $spec = $phase_spec->{$type};
+
+      next TYPE unless keys %$spec;
+
+      $guts{prereqs}{$phase}{$type}
+        = CPAN::Meta::Requirements->from_string_hash($spec);
+    }
+  }
+
+  return bless \%guts => $class;
+}
+
+#pod =method requirements_for
+#pod
+#pod   my $requirements = $prereqs->requirements_for( $phase, $type );
+#pod
+#pod This method returns a L<CPAN::Meta::Requirements> object for the given
+#pod phase/type combination.  If no prerequisites are registered for that
+#pod combination, a new CPAN::Meta::Requirements object will be returned, and it may
+#pod be added to as needed.
+#pod
+#pod If C<$phase> or C<$type> are undefined or otherwise invalid, an exception will
+#pod be raised.
+#pod
+#pod =cut
+
+sub requirements_for {
+  my ($self, $phase, $type) = @_;
+
+  confess "requirements_for called without phase" unless defined $phase;
+  confess "requirements_for called without type"  unless defined $type;
+
+  unless ($phase =~ /\Ax_/i or grep { $phase eq $_ } $self->__legal_phases) {
+    confess "requested requirements for unknown phase: $phase";
+  }
+
+  unless ($type =~ /\Ax_/i or grep { $type eq $_ } $self->__legal_types) {
+    confess "requested requirements for unknown type: $type";
+  }
+
+  my $req = ($self->{prereqs}{$phase}{$type} ||= CPAN::Meta::Requirements->new);
+
+  $req->finalize if $self->is_finalized;
+
+  return $req;
+}
+
+#pod =method with_merged_prereqs
+#pod
+#pod   my $new_prereqs = $prereqs->with_merged_prereqs( $other_prereqs );
+#pod
+#pod   my $new_prereqs = $prereqs->with_merged_prereqs( \@other_prereqs );
+#pod
+#pod This method returns a new CPAN::Meta::Prereqs objects in which all the
+#pod other prerequisites given are merged into the current set.  This is primarily
+#pod provided for combining a distribution's core prereqs with the prereqs of one of
+#pod its optional features.
+#pod
+#pod The new prereqs object has no ties to the originals, and altering it further
+#pod will not alter them.
+#pod
+#pod =cut
+
+sub with_merged_prereqs {
+  my ($self, $other) = @_;
+
+  my @other = blessed($other) ? $other : @$other;
+
+  my @prereq_objs = ($self, @other);
+
+  my %new_arg;
+
+  for my $phase ($self->__legal_phases) {
+    for my $type ($self->__legal_types) {
+      my $req = CPAN::Meta::Requirements->new;
+
+      for my $prereq (@prereq_objs) {
+        my $this_req = $prereq->requirements_for($phase, $type);
+        next unless $this_req->required_modules;
+
+        $req->add_requirements($this_req);
+      }
+
+      next unless $req->required_modules;
+
+      $new_arg{$phase}{$type} = $req->as_string_hash;
+    }
+  }
+
+  return (ref $self)->new(\%new_arg);
+}
+
+#pod =method merged_requirements
+#pod
+#pod     my $new_reqs = $prereqs->merged_requirements( \@phases, \@types );
+#pod     my $new_reqs = $prereqs->merged_requirements( \@phases );
+#pod     my $new_reqs = $prereqs->merged_requirements();
+#pod
+#pod This method joins together all requirements across a number of phases
+#pod and types into a new L<CPAN::Meta::Requirements> object.  If arguments
+#pod are omitted, it defaults to "runtime", "build" and "test" for phases
+#pod and "requires" and "recommends" for types.
+#pod
+#pod =cut
+
+sub merged_requirements {
+  my ($self, $phases, $types) = @_;
+  $phases = [qw/runtime build test/]  unless defined $phases;
+  $types  = [qw/requires recommends/] unless defined $types;
+
+  confess "merged_requirements phases argument must be an arrayref"
+    unless ref $phases eq 'ARRAY';
+  confess "merged_requirements types argument must be an arrayref"
+    unless ref $types eq 'ARRAY';
+
+  my $req = CPAN::Meta::Requirements->new;
+
+  for my $phase (@$phases) {
+    unless ($phase =~ /\Ax_/i or grep { $phase eq $_ } $self->__legal_phases) {
+      confess "requested requirements for unknown phase: $phase";
+    }
+    for my $type (@$types) {
+      unless ($type =~ /\Ax_/i or grep { $type eq $_ } $self->__legal_types) {
+        confess "requested requirements for unknown type: $type";
+      }
+      $req->add_requirements($self->requirements_for($phase, $type));
+    }
+  }
+
+  $req->finalize if $self->is_finalized;
+
+  return $req;
+}
+
+
+#pod =method as_string_hash
+#pod
+#pod This method returns a hashref containing structures suitable for dumping into a
+#pod distmeta data structure.  It is made up of hashes and strings, only; there will
+#pod be no Prereqs, CPAN::Meta::Requirements, or C<version> objects inside it.
+#pod
+#pod =cut
+
+sub as_string_hash {
+  my ($self) = @_;
+
+  my %hash;
+
+  for my $phase ($self->__legal_phases) {
+    for my $type ($self->__legal_types) {
+      my $req = $self->requirements_for($phase, $type);
+      next unless $req->required_modules;
+
+      $hash{$phase}{$type} = $req->as_string_hash;
+    }
+  }
+
+  return \%hash;
+}
+
+#pod =method is_finalized
+#pod
+#pod This method returns true if the set of prereqs has been marked "finalized," and
+#pod cannot be altered.
+#pod
+#pod =cut
+
+sub is_finalized { $_[0]{finalized} }
+
+#pod =method finalize
+#pod
+#pod Calling C<finalize> on a Prereqs object will close it for further modification.
+#pod Attempting to make any changes that would actually alter the prereqs will
+#pod result in an exception being thrown.
+#pod
+#pod =cut
+
+sub finalize {
+  my ($self) = @_;
+
+  $self->{finalized} = 1;
+
+  for my $phase (keys %{$self->{prereqs}}) {
+    $_->finalize for values %{$self->{prereqs}{$phase}};
+  }
+}
+
+#pod =method clone
+#pod
+#pod   my $cloned_prereqs = $prereqs->clone;
+#pod
+#pod This method returns a Prereqs object that is identical to the original object,
+#pod but can be altered without affecting the original object.  Finalization does
+#pod not survive cloning, meaning that you may clone a finalized set of prereqs and
+#pod then modify the clone.
+#pod
+#pod =cut
+
+sub clone {
+  my ($self) = @_;
+
+  my $clone = (ref $self)->new($self->as_string_hash);
+}
+
+1;
+
+# ABSTRACT: a set of distribution prerequisites by phase and type
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Prereqs - a set of distribution prerequisites by phase and type
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 DESCRIPTION
+
+A CPAN::Meta::Prereqs object represents the prerequisites for a CPAN
+distribution or one of its optional features.  Each set of prereqs is
+organized by phase and type, as described in L<CPAN::Meta::Prereqs>.
+
+=head1 METHODS
+
+=head2 new
+
+  my $prereq = CPAN::Meta::Prereqs->new( \%prereq_spec );
+
+This method returns a new set of Prereqs.  The input should look like the
+contents of the C<prereqs> field described in L<CPAN::Meta::Spec>, meaning
+something more or less like this:
+
+  my $prereq = CPAN::Meta::Prereqs->new({
+    runtime => {
+      requires => {
+        'Some::Module' => '1.234',
+        ...,
+      },
+      ...,
+    },
+    ...,
+  });
+
+You can also construct an empty set of prereqs with:
+
+  my $prereqs = CPAN::Meta::Prereqs->new;
+
+This empty set of prereqs is useful for accumulating new prereqs before finally
+dumping the whole set into a structure or string.
+
+=head2 requirements_for
+
+  my $requirements = $prereqs->requirements_for( $phase, $type );
+
+This method returns a L<CPAN::Meta::Requirements> object for the given
+phase/type combination.  If no prerequisites are registered for that
+combination, a new CPAN::Meta::Requirements object will be returned, and it may
+be added to as needed.
+
+If C<$phase> or C<$type> are undefined or otherwise invalid, an exception will
+be raised.
+
+=head2 with_merged_prereqs
+
+  my $new_prereqs = $prereqs->with_merged_prereqs( $other_prereqs );
+
+  my $new_prereqs = $prereqs->with_merged_prereqs( \@other_prereqs );
+
+This method returns a new CPAN::Meta::Prereqs objects in which all the
+other prerequisites given are merged into the current set.  This is primarily
+provided for combining a distribution's core prereqs with the prereqs of one of
+its optional features.
+
+The new prereqs object has no ties to the originals, and altering it further
+will not alter them.
+
+=head2 merged_requirements
+
+    my $new_reqs = $prereqs->merged_requirements( \@phases, \@types );
+    my $new_reqs = $prereqs->merged_requirements( \@phases );
+    my $new_reqs = $prereqs->merged_requirements();
+
+This method joins together all requirements across a number of phases
+and types into a new L<CPAN::Meta::Requirements> object.  If arguments
+are omitted, it defaults to "runtime", "build" and "test" for phases
+and "requires" and "recommends" for types.
+
+=head2 as_string_hash
+
+This method returns a hashref containing structures suitable for dumping into a
+distmeta data structure.  It is made up of hashes and strings, only; there will
+be no Prereqs, CPAN::Meta::Requirements, or C<version> objects inside it.
+
+=head2 is_finalized
+
+This method returns true if the set of prereqs has been marked "finalized," and
+cannot be altered.
+
+=head2 finalize
+
+Calling C<finalize> on a Prereqs object will close it for further modification.
+Attempting to make any changes that would actually alter the prereqs will
+result in an exception being thrown.
+
+=head2 clone
+
+  my $cloned_prereqs = $prereqs->clone;
+
+This method returns a Prereqs object that is identical to the original object,
+but can be altered without affecting the original object.  Finalization does
+not survive cloning, meaning that you may clone a finalized set of prereqs and
+then modify the clone.
+
+=head1 BUGS
+
+Please report any bugs or feature using the CPAN Request Tracker.
+Bugs can be submitted through the web interface at
+L<http://rt.cpan.org/Dist/Display.html?Queue=CPAN-Meta>
+
+When submitting a bug or request, please include a test-file or a patch to an
+existing test-file that illustrates the bug or desired feature.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Requirements.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Requirements.pm
new file mode 100644
index 0000000000..f16870f4a9
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Requirements.pm
@@ -0,0 +1,1200 @@
+use 5.006;    # keep at v5.6 for CPAN.pm
+use strict;
+use warnings;
+
+package CPAN::Meta::Requirements;
+
+# ABSTRACT: a set of version requirements for a CPAN dist
+
+our $VERSION = '2.140';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod   use CPAN::Meta::Requirements;
+#pod
+#pod   my $build_requires = CPAN::Meta::Requirements->new;
+#pod
+#pod   $build_requires->add_minimum('Library::Foo' => 1.208);
+#pod
+#pod   $build_requires->add_minimum('Library::Foo' => 2.602);
+#pod
+#pod   $build_requires->add_minimum('Module::Bar'  => 'v1.2.3');
+#pod
+#pod   $METAyml->{build_requires} = $build_requires->as_string_hash;
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod A CPAN::Meta::Requirements object models a set of version constraints like
+#pod those specified in the F<META.yml> or F<META.json> files in CPAN distributions,
+#pod and as defined by L<CPAN::Meta::Spec>;
+#pod It can be built up by adding more and more constraints, and it will reduce them
+#pod to the simplest representation.
+#pod
+#pod Logically impossible constraints will be identified immediately by thrown
+#pod exceptions.
+#pod
+#pod =cut
+
+use Carp ();
+
+# To help ExtUtils::MakeMaker bootstrap CPAN::Meta::Requirements on perls
+# before 5.10, we fall back to the EUMM bundled compatibility version module if
+# that's the only thing available.  This shouldn't ever happen in a normal CPAN
+# install of CPAN::Meta::Requirements, as version.pm will be picked up from
+# prereqs and be available at runtime.
+
+BEGIN {
+  eval "use version ()";    ## no critic
+  if (my $err = $@) {
+    eval "use ExtUtils::MakeMaker::version" or die $err;    ## no critic
+  }
+}
+
+# Perl 5.10.0 didn't have "is_qv" in version.pm
+*_is_qv
+  = version->can('is_qv') ? sub { $_[0]->is_qv } : sub { exists $_[0]->{qv} };
+
+# construct once, reuse many times
+my $V0 = version->new(0);
+
+#pod =method new
+#pod
+#pod   my $req = CPAN::Meta::Requirements->new;
+#pod
+#pod This returns a new CPAN::Meta::Requirements object.  It takes an optional
+#pod hash reference argument.  Currently, only one key is supported:
+#pod
+#pod =for :list
+#pod * C<bad_version_hook> -- if provided, when a version cannot be parsed into
+#pod   a version object, this code reference will be called with the invalid
+#pod   version string as first argument, and the module name as second
+#pod   argument.  It must return a valid version object.
+#pod
+#pod All other keys are ignored.
+#pod
+#pod =cut
+
+my @valid_options = qw( bad_version_hook );
+
+sub new {
+  my ($class, $options) = @_;
+  $options ||= {};
+  Carp::croak "Argument to $class\->new() must be a hash reference"
+    unless ref $options eq 'HASH';
+  my %self = map { ; $_ => $options->{$_} } @valid_options;
+
+  return bless \%self => $class;
+}
+
+# from version::vpp
+sub _find_magic_vstring {
+  my $value  = shift;
+  my $tvalue = '';
+  require B;
+  my $sv = B::svref_2object(\$value);
+  my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
+  while ($magic) {
+    if ($magic->TYPE eq 'V') {
+      $tvalue = $magic->PTR;
+      $tvalue =~ s/^v?(.+)$/v$1/;
+      last;
+    }
+    else {
+      $magic = $magic->MOREMAGIC;
+    }
+  }
+  return $tvalue;
+}
+
+# safe if given an unblessed reference
+sub _isa_version {
+  UNIVERSAL::isa($_[0], 'UNIVERSAL') && $_[0]->isa('version');
+}
+
+sub _version_object {
+  my ($self, $module, $version) = @_;
+
+  my ($vobj, $err);
+
+  if (not defined $version or (!ref($version) && $version eq '0')) {
+    return $V0;
+  }
+  elsif (ref($version) eq 'version' || (ref($version) && _isa_version($version)))
+  {
+    $vobj = $version;
+  }
+  else {
+    # hack around version::vpp not handling <3 character vstring literals
+    if ($INC{'version/vpp.pm'} || $INC{'ExtUtils/MakeMaker/version/vpp.pm'}) {
+      my $magic = _find_magic_vstring($version);
+      $version = $magic if length $magic;
+    }
+
+    # pad to 3 characters if before 5.8.1 and appears to be a v-string
+    if ( $] < 5.008001
+      && $version !~ /\A[0-9]/
+      && substr($version, 0, 1) ne 'v'
+      && length($version) < 3)
+    {
+      $version .= "\0" x (3 - length($version));
+    }
+    eval {
+      local $SIG{__WARN__} = sub { die "Invalid version: $_[0]" };
+
+      # avoid specific segfault on some older version.pm versions
+      die "Invalid version: $version" if $version eq 'version';
+      $vobj = version->new($version);
+    };
+    if (my $err = $@) {
+      my $hook = $self->{bad_version_hook};
+      $vobj = eval { $hook->($version, $module) } if ref $hook eq 'CODE';
+      unless (eval { $vobj->isa("version") }) {
+        $err =~ s{ at .* line \d+.*$}{};
+        die "Can't convert '$version': $err";
+      }
+    }
+  }
+
+  # ensure no leading '.'
+  if ($vobj =~ m{\A\.}) {
+    $vobj = version->new("0$vobj");
+  }
+
+  # ensure normal v-string form
+  if (_is_qv($vobj)) {
+    $vobj = version->new($vobj->normal);
+  }
+
+  return $vobj;
+}
+
+#pod =method add_minimum
+#pod
+#pod   $req->add_minimum( $module => $version );
+#pod
+#pod This adds a new minimum version requirement.  If the new requirement is
+#pod redundant to the existing specification, this has no effect.
+#pod
+#pod Minimum requirements are inclusive.  C<$version> is required, along with any
+#pod greater version number.
+#pod
+#pod This method returns the requirements object.
+#pod
+#pod =method add_maximum
+#pod
+#pod   $req->add_maximum( $module => $version );
+#pod
+#pod This adds a new maximum version requirement.  If the new requirement is
+#pod redundant to the existing specification, this has no effect.
+#pod
+#pod Maximum requirements are inclusive.  No version strictly greater than the given
+#pod version is allowed.
+#pod
+#pod This method returns the requirements object.
+#pod
+#pod =method add_exclusion
+#pod
+#pod   $req->add_exclusion( $module => $version );
+#pod
+#pod This adds a new excluded version.  For example, you might use these three
+#pod method calls:
+#pod
+#pod   $req->add_minimum( $module => '1.00' );
+#pod   $req->add_maximum( $module => '1.82' );
+#pod
+#pod   $req->add_exclusion( $module => '1.75' );
+#pod
+#pod Any version between 1.00 and 1.82 inclusive would be acceptable, except for
+#pod 1.75.
+#pod
+#pod This method returns the requirements object.
+#pod
+#pod =method exact_version
+#pod
+#pod   $req->exact_version( $module => $version );
+#pod
+#pod This sets the version required for the given module to I<exactly> the given
+#pod version.  No other version would be considered acceptable.
+#pod
+#pod This method returns the requirements object.
+#pod
+#pod =cut
+
+BEGIN {
+  for my $type (qw(maximum exclusion exact_version)) {
+    my $method = "with_$type";
+    my $to_add = $type eq 'exact_version' ? $type : "add_$type";
+
+    my $code = sub {
+      my ($self, $name, $version) = @_;
+
+      $version = $self->_version_object($name, $version);
+
+      $self->__modify_entry_for($name, $method, $version);
+
+      return $self;
+    };
+
+    no strict 'refs';
+    *$to_add = $code;
+  }
+}
+
+# add_minimum is optimized compared to generated subs above because
+# it is called frequently and with "0" or equivalent input
+sub add_minimum {
+  my ($self, $name, $version) = @_;
+
+  # stringify $version so that version->new("0.00")->stringify ne "0"
+  # which preserves the user's choice of "0.00" as the requirement
+  if (not defined $version or "$version" eq '0') {
+    return $self if $self->__entry_for($name);
+    Carp::confess("can't add new requirements to finalized requirements")
+      if $self->is_finalized;
+
+    $self->{requirements}{$name}
+      = CPAN::Meta::Requirements::_Range::Range->with_minimum($V0, $name);
+  }
+  else {
+    $version = $self->_version_object($name, $version);
+
+    $self->__modify_entry_for($name, 'with_minimum', $version);
+  }
+  return $self;
+}
+
+#pod =method add_requirements
+#pod
+#pod   $req->add_requirements( $another_req_object );
+#pod
+#pod This method adds all the requirements in the given CPAN::Meta::Requirements
+#pod object to the requirements object on which it was called.  If there are any
+#pod conflicts, an exception is thrown.
+#pod
+#pod This method returns the requirements object.
+#pod
+#pod =cut
+
+sub add_requirements {
+  my ($self, $req) = @_;
+
+  for my $module ($req->required_modules) {
+    my $modifiers = $req->__entry_for($module)->as_modifiers;
+    for my $modifier (@$modifiers) {
+      my ($method, @args) = @$modifier;
+      $self->$method($module => @args);
+    }
+  }
+
+  return $self;
+}
+
+#pod =method accepts_module
+#pod
+#pod   my $bool = $req->accepts_module($module => $version);
+#pod
+#pod Given an module and version, this method returns true if the version
+#pod specification for the module accepts the provided version.  In other words,
+#pod given:
+#pod
+#pod   Module => '>= 1.00, < 2.00'
+#pod
+#pod We will accept 1.00 and 1.75 but not 0.50 or 2.00.
+#pod
+#pod For modules that do not appear in the requirements, this method will return
+#pod true.
+#pod
+#pod =cut
+
+sub accepts_module {
+  my ($self, $module, $version) = @_;
+
+  $version = $self->_version_object($module, $version);
+
+  return 1 unless my $range = $self->__entry_for($module);
+  return $range->_accepts($version);
+}
+
+#pod =method clear_requirement
+#pod
+#pod   $req->clear_requirement( $module );
+#pod
+#pod This removes the requirement for a given module from the object.
+#pod
+#pod This method returns the requirements object.
+#pod
+#pod =cut
+
+sub clear_requirement {
+  my ($self, $module) = @_;
+
+  return $self unless $self->__entry_for($module);
+
+  Carp::confess("can't clear requirements on finalized requirements")
+    if $self->is_finalized;
+
+  delete $self->{requirements}{$module};
+
+  return $self;
+}
+
+#pod =method requirements_for_module
+#pod
+#pod   $req->requirements_for_module( $module );
+#pod
+#pod This returns a string containing the version requirements for a given module in
+#pod the format described in L<CPAN::Meta::Spec> or undef if the given module has no
+#pod requirements. This should only be used for informational purposes such as error
+#pod messages and should not be interpreted or used for comparison (see
+#pod L</accepts_module> instead).
+#pod
+#pod =cut
+
+sub requirements_for_module {
+  my ($self, $module) = @_;
+  my $entry = $self->__entry_for($module);
+  return unless $entry;
+  return $entry->as_string;
+}
+
+#pod =method structured_requirements_for_module
+#pod
+#pod   $req->structured_requirements_for_module( $module );
+#pod
+#pod This returns a data structure containing the version requirements for a given
+#pod module or undef if the given module has no requirements.  This should
+#pod not be used for version checks (see L</accepts_module> instead).
+#pod
+#pod Added in version 2.134.
+#pod
+#pod =cut
+
+sub structured_requirements_for_module {
+  my ($self, $module) = @_;
+  my $entry = $self->__entry_for($module);
+  return unless $entry;
+  return $entry->as_struct;
+}
+
+#pod =method required_modules
+#pod
+#pod This method returns a list of all the modules for which requirements have been
+#pod specified.
+#pod
+#pod =cut
+
+sub required_modules { keys %{$_[0]{requirements}} }
+
+#pod =method clone
+#pod
+#pod   $req->clone;
+#pod
+#pod This method returns a clone of the invocant.  The clone and the original object
+#pod can then be changed independent of one another.
+#pod
+#pod =cut
+
+sub clone {
+  my ($self) = @_;
+  my $new = (ref $self)->new;
+
+  return $new->add_requirements($self);
+}
+
+sub __entry_for { $_[0]{requirements}{$_[1]} }
+
+sub __modify_entry_for {
+  my ($self, $name, $method, $version) = @_;
+
+  my $fin = $self->is_finalized;
+  my $old = $self->__entry_for($name);
+
+  Carp::confess("can't add new requirements to finalized requirements")
+    if $fin and not $old;
+
+  my $new = ($old || 'CPAN::Meta::Requirements::_Range::Range')
+    ->$method($version, $name);
+
+  Carp::confess("can't modify finalized requirements")
+    if $fin and $old->as_string ne $new->as_string;
+
+  $self->{requirements}{$name} = $new;
+}
+
+#pod =method is_simple
+#pod
+#pod This method returns true if and only if all requirements are inclusive minimums
+#pod -- that is, if their string expression is just the version number.
+#pod
+#pod =cut
+
+sub is_simple {
+  my ($self) = @_;
+  for my $module ($self->required_modules) {
+
+    # XXX: This is a complete hack, but also entirely correct.
+    return if $self->__entry_for($module)->as_string =~ /\s/;
+  }
+
+  return 1;
+}
+
+#pod =method is_finalized
+#pod
+#pod This method returns true if the requirements have been finalized by having the
+#pod C<finalize> method called on them.
+#pod
+#pod =cut
+
+sub is_finalized { $_[0]{finalized} }
+
+#pod =method finalize
+#pod
+#pod This method marks the requirements finalized.  Subsequent attempts to change
+#pod the requirements will be fatal, I<if> they would result in a change.  If they
+#pod would not alter the requirements, they have no effect.
+#pod
+#pod If a finalized set of requirements is cloned, the cloned requirements are not
+#pod also finalized.
+#pod
+#pod =cut
+
+sub finalize { $_[0]{finalized} = 1 }
+
+#pod =method as_string_hash
+#pod
+#pod This returns a reference to a hash describing the requirements using the
+#pod strings in the L<CPAN::Meta::Spec> specification.
+#pod
+#pod For example after the following program:
+#pod
+#pod   my $req = CPAN::Meta::Requirements->new;
+#pod
+#pod   $req->add_minimum('CPAN::Meta::Requirements' => 0.102);
+#pod
+#pod   $req->add_minimum('Library::Foo' => 1.208);
+#pod
+#pod   $req->add_maximum('Library::Foo' => 2.602);
+#pod
+#pod   $req->add_minimum('Module::Bar'  => 'v1.2.3');
+#pod
+#pod   $req->add_exclusion('Module::Bar'  => 'v1.2.8');
+#pod
+#pod   $req->exact_version('Xyzzy'  => '6.01');
+#pod
+#pod   my $hashref = $req->as_string_hash;
+#pod
+#pod C<$hashref> would contain:
+#pod
+#pod   {
+#pod     'CPAN::Meta::Requirements' => '0.102',
+#pod     'Library::Foo' => '>= 1.208, <= 2.206',
+#pod     'Module::Bar'  => '>= v1.2.3, != v1.2.8',
+#pod     'Xyzzy'        => '== 6.01',
+#pod   }
+#pod
+#pod =cut
+
+sub as_string_hash {
+  my ($self) = @_;
+
+  my %hash = map { ; $_ => $self->{requirements}{$_}->as_string }
+    $self->required_modules;
+
+  return \%hash;
+}
+
+#pod =method add_string_requirement
+#pod
+#pod   $req->add_string_requirement('Library::Foo' => '>= 1.208, <= 2.206');
+#pod   $req->add_string_requirement('Library::Foo' => v1.208);
+#pod
+#pod This method parses the passed in string and adds the appropriate requirement
+#pod for the given module.  A version can be a Perl "v-string".  It understands
+#pod version ranges as described in the L<CPAN::Meta::Spec/Version Ranges>. For
+#pod example:
+#pod
+#pod =over 4
+#pod
+#pod =item 1.3
+#pod
+#pod =item >= 1.3
+#pod
+#pod =item <= 1.3
+#pod
+#pod =item == 1.3
+#pod
+#pod =item != 1.3
+#pod
+#pod =item > 1.3
+#pod
+#pod =item < 1.3
+#pod
+#pod =item >= 1.3, != 1.5, <= 2.0
+#pod
+#pod A version number without an operator is equivalent to specifying a minimum
+#pod (C<E<gt>=>).  Extra whitespace is allowed.
+#pod
+#pod =back
+#pod
+#pod =cut
+
+my %methods_for_op = (
+  '==' => [qw(exact_version)],
+  '!=' => [qw(add_exclusion)],
+  '>=' => [qw(add_minimum)],
+  '<=' => [qw(add_maximum)],
+  '>'  => [qw(add_minimum add_exclusion)],
+  '<'  => [qw(add_maximum add_exclusion)],
+);
+
+sub add_string_requirement {
+  my ($self, $module, $req) = @_;
+
+  unless (defined $req && length $req) {
+    $req = 0;
+    $self->_blank_carp($module);
+  }
+
+  my $magic = _find_magic_vstring($req);
+  if (length $magic) {
+    $self->add_minimum($module => $magic);
+    return;
+  }
+
+  my @parts = split qr{\s*,\s*}, $req;
+
+  for my $part (@parts) {
+    my ($op, $ver) = $part =~ m{\A\s*(==|>=|>|<=|<|!=)\s*(.*)\z};
+
+    if (!defined $op) {
+      $self->add_minimum($module => $part);
+    }
+    else {
+      Carp::confess("illegal requirement string: $req")
+        unless my $methods = $methods_for_op{$op};
+
+      $self->$_($module => $ver) for @$methods;
+    }
+  }
+}
+
+#pod =method from_string_hash
+#pod
+#pod   my $req = CPAN::Meta::Requirements->from_string_hash( \%hash );
+#pod   my $req = CPAN::Meta::Requirements->from_string_hash( \%hash, \%opts );
+#pod
+#pod This is an alternate constructor for a CPAN::Meta::Requirements
+#pod object. It takes a hash of module names and version requirement
+#pod strings and returns a new CPAN::Meta::Requirements object. As with
+#pod add_string_requirement, a version can be a Perl "v-string". Optionally,
+#pod you can supply a hash-reference of options, exactly as with the L</new>
+#pod method.
+#pod
+#pod =cut
+
+sub _blank_carp {
+  my ($self, $module) = @_;
+  Carp::carp("Undefined requirement for $module treated as '0'");
+}
+
+sub from_string_hash {
+  my ($class, $hash, $options) = @_;
+
+  my $self = $class->new($options);
+
+  for my $module (keys %$hash) {
+    my $req = $hash->{$module};
+    unless (defined $req && length $req) {
+      $req = 0;
+      $class->_blank_carp($module);
+    }
+    $self->add_string_requirement($module, $req);
+  }
+
+  return $self;
+}
+
+##############################################################
+
+{
+
+  package CPAN::Meta::Requirements::_Range::Exact;
+  sub _new { bless {version => $_[1]} => $_[0] }
+
+  sub _accepts { return $_[0]{version} == $_[1] }
+
+  sub as_string { return "== $_[0]{version}" }
+
+  sub as_struct { return [['==', "$_[0]{version}"]] }
+
+  sub as_modifiers { return [[exact_version => $_[0]{version}]] }
+
+  sub _reject_requirements {
+    my ($self, $module, $error) = @_;
+    Carp::confess("illegal requirements for $module: $error");
+  }
+
+  sub _clone {
+    (ref $_[0])->_new(version->new($_[0]{version}));
+  }
+
+  sub with_exact_version {
+    my ($self, $version, $module) = @_;
+    $module = 'module' unless defined $module;
+
+    return $self->_clone if $self->_accepts($version);
+
+    $self->_reject_requirements(
+      $module,
+      "can't be exactly $version when exact requirement is already $self->{version}",
+    );
+  }
+
+  sub with_minimum {
+    my ($self, $minimum, $module) = @_;
+    $module = 'module' unless defined $module;
+
+    return $self->_clone if $self->{version} >= $minimum;
+    $self->_reject_requirements($module,
+      "minimum $minimum exceeds exact specification $self->{version}",
+    );
+  }
+
+  sub with_maximum {
+    my ($self, $maximum, $module) = @_;
+    $module = 'module' unless defined $module;
+
+    return $self->_clone if $self->{version} <= $maximum;
+    $self->_reject_requirements($module,
+      "maximum $maximum below exact specification $self->{version}",
+    );
+  }
+
+  sub with_exclusion {
+    my ($self, $exclusion, $module) = @_;
+    $module = 'module' unless defined $module;
+
+    return $self->_clone unless $exclusion == $self->{version};
+    $self->_reject_requirements($module,
+      "tried to exclude $exclusion, which is already exactly specified",
+    );
+  }
+}
+
+##############################################################
+
+{
+
+  package CPAN::Meta::Requirements::_Range::Range;
+
+  sub _self { ref($_[0]) ? $_[0] : (bless {} => $_[0]) }
+
+  sub _clone {
+    return (bless {} => $_[0]) unless ref $_[0];
+
+    my ($s) = @_;
+    my %guts = (
+      (exists $s->{minimum} ? (minimum => version->new($s->{minimum})) : ()),
+      (exists $s->{maximum} ? (maximum => version->new($s->{maximum})) : ()),
+
+      (
+        exists $s->{exclusions}
+        ? (exclusions => [map { version->new($_) } @{$s->{exclusions}}])
+        : ()
+      ),
+    );
+
+    bless \%guts => ref($s);
+  }
+
+  sub as_modifiers {
+    my ($self) = @_;
+    my @mods;
+    push @mods, [add_minimum => $self->{minimum}] if exists $self->{minimum};
+    push @mods, [add_maximum => $self->{maximum}] if exists $self->{maximum};
+    push @mods, map { ; [add_exclusion => $_] } @{$self->{exclusions} || []};
+    return \@mods;
+  }
+
+  sub as_struct {
+    my ($self) = @_;
+
+    return 0 if !keys %$self;
+
+    my @exclusions = @{$self->{exclusions} || []};
+
+    my @parts;
+
+    for my $tuple ([qw( >= > minimum )], [qw( <= < maximum )],) {
+      my ($op, $e_op, $k) = @$tuple;
+      if (exists $self->{$k}) {
+        my @new_exclusions = grep { $_ != $self->{$k} } @exclusions;
+        if (@new_exclusions == @exclusions) {
+          push @parts, [$op, "$self->{ $k }"];
+        }
+        else {
+          push @parts, [$e_op, "$self->{ $k }"];
+          @exclusions = @new_exclusions;
+        }
+      }
+    }
+
+    push @parts, map { ; ["!=", "$_"] } @exclusions;
+
+    return \@parts;
+  }
+
+  sub as_string {
+    my ($self) = @_;
+
+    my @parts = @{$self->as_struct};
+
+    return $parts[0][1] if @parts == 1 and $parts[0][0] eq '>=';
+
+    return join q{, }, map { ; join q{ }, @$_ } @parts;
+  }
+
+  sub _reject_requirements {
+    my ($self, $module, $error) = @_;
+    Carp::confess("illegal requirements for $module: $error");
+  }
+
+  sub with_exact_version {
+    my ($self, $version, $module) = @_;
+    $module = 'module' unless defined $module;
+    $self = $self->_clone;
+
+    unless ($self->_accepts($version)) {
+      $self->_reject_requirements($module,
+        "exact specification $version outside of range " . $self->as_string);
+    }
+
+    return CPAN::Meta::Requirements::_Range::Exact->_new($version);
+  }
+
+  sub _simplify {
+    my ($self, $module) = @_;
+
+    if (defined $self->{minimum} and defined $self->{maximum}) {
+      if ($self->{minimum} == $self->{maximum}) {
+        if (grep { $_ == $self->{minimum} } @{$self->{exclusions} || []}) {
+          $self->_reject_requirements($module,
+            "minimum and maximum are both $self->{minimum}, which is excluded",
+          );
+        }
+
+        return CPAN::Meta::Requirements::_Range::Exact->_new($self->{minimum});
+      }
+
+      if ($self->{minimum} > $self->{maximum}) {
+        $self->_reject_requirements($module,
+          "minimum $self->{minimum} exceeds maximum $self->{maximum}",
+        );
+      }
+    }
+
+    # eliminate irrelevant exclusions
+    if ($self->{exclusions}) {
+      my %seen;
+      @{$self->{exclusions}} = grep {
+              (!defined $self->{minimum} or $_ >= $self->{minimum})
+          and (!defined $self->{maximum} or $_ <= $self->{maximum})
+          and !$seen{$_}++
+      } @{$self->{exclusions}};
+    }
+
+    return $self;
+  }
+
+  sub with_minimum {
+    my ($self, $minimum, $module) = @_;
+    $module = 'module' unless defined $module;
+    $self = $self->_clone;
+
+    if (defined(my $old_min = $self->{minimum})) {
+      $self->{minimum} = (sort { $b cmp $a } ($minimum, $old_min))[0];
+    }
+    else {
+      $self->{minimum} = $minimum;
+    }
+
+    return $self->_simplify($module);
+  }
+
+  sub with_maximum {
+    my ($self, $maximum, $module) = @_;
+    $module = 'module' unless defined $module;
+    $self = $self->_clone;
+
+    if (defined(my $old_max = $self->{maximum})) {
+      $self->{maximum} = (sort { $a cmp $b } ($maximum, $old_max))[0];
+    }
+    else {
+      $self->{maximum} = $maximum;
+    }
+
+    return $self->_simplify($module);
+  }
+
+  sub with_exclusion {
+    my ($self, $exclusion, $module) = @_;
+    $module = 'module' unless defined $module;
+    $self = $self->_clone;
+
+    push @{$self->{exclusions} ||= []}, $exclusion;
+
+    return $self->_simplify($module);
+  }
+
+  sub _accepts {
+    my ($self, $version) = @_;
+
+    return if defined $self->{minimum} and $version < $self->{minimum};
+    return if defined $self->{maximum} and $version > $self->{maximum};
+    return
+      if defined $self->{exclusions}
+      and grep { $version == $_ } @{$self->{exclusions}};
+
+    return 1;
+  }
+}
+
+1;
+
+# vim: ts=2 sts=2 sw=2 et:
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Requirements - a set of version requirements for a CPAN dist
+
+=head1 VERSION
+
+version 2.140
+
+=head1 SYNOPSIS
+
+  use CPAN::Meta::Requirements;
+
+  my $build_requires = CPAN::Meta::Requirements->new;
+
+  $build_requires->add_minimum('Library::Foo' => 1.208);
+
+  $build_requires->add_minimum('Library::Foo' => 2.602);
+
+  $build_requires->add_minimum('Module::Bar'  => 'v1.2.3');
+
+  $METAyml->{build_requires} = $build_requires->as_string_hash;
+
+=head1 DESCRIPTION
+
+A CPAN::Meta::Requirements object models a set of version constraints like
+those specified in the F<META.yml> or F<META.json> files in CPAN distributions,
+and as defined by L<CPAN::Meta::Spec>;
+It can be built up by adding more and more constraints, and it will reduce them
+to the simplest representation.
+
+Logically impossible constraints will be identified immediately by thrown
+exceptions.
+
+=head1 METHODS
+
+=head2 new
+
+  my $req = CPAN::Meta::Requirements->new;
+
+This returns a new CPAN::Meta::Requirements object.  It takes an optional
+hash reference argument.  Currently, only one key is supported:
+
+=over 4
+
+=item *
+
+C<bad_version_hook> -- if provided, when a version cannot be parsed into a version object, this code reference will be called with the invalid version string as first argument, and the module name as second argument.  It must return a valid version object.
+
+=back
+
+All other keys are ignored.
+
+=head2 add_minimum
+
+  $req->add_minimum( $module => $version );
+
+This adds a new minimum version requirement.  If the new requirement is
+redundant to the existing specification, this has no effect.
+
+Minimum requirements are inclusive.  C<$version> is required, along with any
+greater version number.
+
+This method returns the requirements object.
+
+=head2 add_maximum
+
+  $req->add_maximum( $module => $version );
+
+This adds a new maximum version requirement.  If the new requirement is
+redundant to the existing specification, this has no effect.
+
+Maximum requirements are inclusive.  No version strictly greater than the given
+version is allowed.
+
+This method returns the requirements object.
+
+=head2 add_exclusion
+
+  $req->add_exclusion( $module => $version );
+
+This adds a new excluded version.  For example, you might use these three
+method calls:
+
+  $req->add_minimum( $module => '1.00' );
+  $req->add_maximum( $module => '1.82' );
+
+  $req->add_exclusion( $module => '1.75' );
+
+Any version between 1.00 and 1.82 inclusive would be acceptable, except for
+1.75.
+
+This method returns the requirements object.
+
+=head2 exact_version
+
+  $req->exact_version( $module => $version );
+
+This sets the version required for the given module to I<exactly> the given
+version.  No other version would be considered acceptable.
+
+This method returns the requirements object.
+
+=head2 add_requirements
+
+  $req->add_requirements( $another_req_object );
+
+This method adds all the requirements in the given CPAN::Meta::Requirements
+object to the requirements object on which it was called.  If there are any
+conflicts, an exception is thrown.
+
+This method returns the requirements object.
+
+=head2 accepts_module
+
+  my $bool = $req->accepts_module($module => $version);
+
+Given an module and version, this method returns true if the version
+specification for the module accepts the provided version.  In other words,
+given:
+
+  Module => '>= 1.00, < 2.00'
+
+We will accept 1.00 and 1.75 but not 0.50 or 2.00.
+
+For modules that do not appear in the requirements, this method will return
+true.
+
+=head2 clear_requirement
+
+  $req->clear_requirement( $module );
+
+This removes the requirement for a given module from the object.
+
+This method returns the requirements object.
+
+=head2 requirements_for_module
+
+  $req->requirements_for_module( $module );
+
+This returns a string containing the version requirements for a given module in
+the format described in L<CPAN::Meta::Spec> or undef if the given module has no
+requirements. This should only be used for informational purposes such as error
+messages and should not be interpreted or used for comparison (see
+L</accepts_module> instead).
+
+=head2 structured_requirements_for_module
+
+  $req->structured_requirements_for_module( $module );
+
+This returns a data structure containing the version requirements for a given
+module or undef if the given module has no requirements.  This should
+not be used for version checks (see L</accepts_module> instead).
+
+Added in version 2.134.
+
+=head2 required_modules
+
+This method returns a list of all the modules for which requirements have been
+specified.
+
+=head2 clone
+
+  $req->clone;
+
+This method returns a clone of the invocant.  The clone and the original object
+can then be changed independent of one another.
+
+=head2 is_simple
+
+This method returns true if and only if all requirements are inclusive minimums
+-- that is, if their string expression is just the version number.
+
+=head2 is_finalized
+
+This method returns true if the requirements have been finalized by having the
+C<finalize> method called on them.
+
+=head2 finalize
+
+This method marks the requirements finalized.  Subsequent attempts to change
+the requirements will be fatal, I<if> they would result in a change.  If they
+would not alter the requirements, they have no effect.
+
+If a finalized set of requirements is cloned, the cloned requirements are not
+also finalized.
+
+=head2 as_string_hash
+
+This returns a reference to a hash describing the requirements using the
+strings in the L<CPAN::Meta::Spec> specification.
+
+For example after the following program:
+
+  my $req = CPAN::Meta::Requirements->new;
+
+  $req->add_minimum('CPAN::Meta::Requirements' => 0.102);
+
+  $req->add_minimum('Library::Foo' => 1.208);
+
+  $req->add_maximum('Library::Foo' => 2.602);
+
+  $req->add_minimum('Module::Bar'  => 'v1.2.3');
+
+  $req->add_exclusion('Module::Bar'  => 'v1.2.8');
+
+  $req->exact_version('Xyzzy'  => '6.01');
+
+  my $hashref = $req->as_string_hash;
+
+C<$hashref> would contain:
+
+  {
+    'CPAN::Meta::Requirements' => '0.102',
+    'Library::Foo' => '>= 1.208, <= 2.206',
+    'Module::Bar'  => '>= v1.2.3, != v1.2.8',
+    'Xyzzy'        => '== 6.01',
+  }
+
+=head2 add_string_requirement
+
+  $req->add_string_requirement('Library::Foo' => '>= 1.208, <= 2.206');
+  $req->add_string_requirement('Library::Foo' => v1.208);
+
+This method parses the passed in string and adds the appropriate requirement
+for the given module.  A version can be a Perl "v-string".  It understands
+version ranges as described in the L<CPAN::Meta::Spec/Version Ranges>. For
+example:
+
+=over 4
+
+=item 1.3
+
+=item >= 1.3
+
+=item <= 1.3
+
+=item == 1.3
+
+=item != 1.3
+
+=item > 1.3
+
+=item < 1.3
+
+=item >= 1.3, != 1.5, <= 2.0
+
+A version number without an operator is equivalent to specifying a minimum
+(C<E<gt>=>).  Extra whitespace is allowed.
+
+=back
+
+=head2 from_string_hash
+
+  my $req = CPAN::Meta::Requirements->from_string_hash( \%hash );
+  my $req = CPAN::Meta::Requirements->from_string_hash( \%hash, \%opts );
+
+This is an alternate constructor for a CPAN::Meta::Requirements
+object. It takes a hash of module names and version requirement
+strings and returns a new CPAN::Meta::Requirements object. As with
+add_string_requirement, a version can be a Perl "v-string". Optionally,
+you can supply a hash-reference of options, exactly as with the L</new>
+method.
+
+=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan
+
+=head1 SUPPORT
+
+=head2 Bugs / Feature Requests
+
+Please report any bugs or feature requests through the issue tracker
+at L<https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements/issues>.
+You will be notified automatically of any progress on your issue.
+
+=head2 Source Code
+
+This is open source software.  The code repository is available for
+public review and contribution under the terms of the license.
+
+L<https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements>
+
+  git clone https://github.com/Perl-Toolchain-Gang/CPAN-Meta-Requirements.git
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 CONTRIBUTORS
+
+=for stopwords Ed J Karen Etheridge Leon Timmermans robario
+
+=over 4
+
+=item *
+
+Ed J <mohawk2@users.noreply.github.com>
+
+=item *
+
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
+Leon Timmermans <fawaka@gmail.com>
+
+=item *
+
+robario <webmaster@robario.com>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Spec.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Spec.pm
new file mode 100644
index 0000000000..a069fb3e95
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Spec.pm
@@ -0,0 +1,1236 @@
+# XXX RULES FOR PATCHING THIS FILE XXX
+# Patches that fix typos or formatting are acceptable.  Patches
+# that change semantics are not acceptable without prior approval
+# by David Golden or Ricardo Signes.
+
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta::Spec;
+
+our $VERSION = '2.150005';
+
+1;
+
+# ABSTRACT: specification for CPAN distribution metadata
+
+
+# vi:tw=72
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Spec - specification for CPAN distribution metadata
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 SYNOPSIS
+
+  my $distmeta = {
+    name => 'Module-Build',
+    abstract => 'Build and install Perl modules',
+    description =>  "Module::Build is a system for "
+      . "building, testing, and installing Perl modules. "
+      . "It is meant to ... blah blah blah ...",
+    version  => '0.36',
+    release_status => 'stable',
+    author   => [
+      'Ken Williams <kwilliams@cpan.org>',
+      'Module-Build List <module-build@perl.org>', # additional contact
+    ],
+    license  => [ 'perl_5' ],
+    prereqs => {
+      runtime => {
+        requires => {
+          'perl'   => '5.006',
+          'ExtUtils::Install' => '0',
+          'File::Basename' => '0',
+          'File::Compare'  => '0',
+          'IO::File'   => '0',
+        },
+        recommends => {
+          'Archive::Tar' => '1.00',
+          'ExtUtils::Install' => '0.3',
+          'ExtUtils::ParseXS' => '2.02',
+        },
+      },
+      build => {
+        requires => {
+          'Test::More' => '0',
+        },
+      }
+    },
+    resources => {
+      license => ['http://dev.perl.org/licenses/'],
+    },
+    optional_features => {
+      domination => {
+        description => 'Take over the world',
+        prereqs     => {
+          develop => { requires => { 'Genius::Evil'     => '1.234' } },
+          runtime => { requires => { 'Machine::Weather' => '2.0'   } },
+        },
+      },
+    },
+    dynamic_config => 1,
+    keywords => [ qw/ toolchain cpan dual-life / ],
+    'meta-spec' => {
+      version => '2',
+      url     => 'https://metacpan.org/pod/CPAN::Meta::Spec',
+    },
+    generated_by => 'Module::Build version 0.36',
+  };
+
+=head1 DESCRIPTION
+
+This document describes version 2 of the CPAN distribution metadata
+specification, also known as the "CPAN Meta Spec".
+
+Revisions of this specification for typo corrections and prose
+clarifications may be issued as CPAN::Meta::Spec 2.I<x>.  These
+revisions will never change semantics or add or remove specified
+behavior.
+
+Distribution metadata describe important properties of Perl
+distributions. Distribution building tools like Module::Build,
+Module::Install, ExtUtils::MakeMaker or Dist::Zilla should create a
+metadata file in accordance with this specification and include it with
+the distribution for use by automated tools that index, examine, package
+or install Perl distributions.
+
+=head1 TERMINOLOGY
+
+=over 4
+
+=item distribution
+
+This is the primary object described by the metadata. In the context of
+this document it usually refers to a collection of modules, scripts,
+and/or documents that are distributed together for other developers to
+use.  Examples of distributions are C<Class-Container>, C<libwww-perl>,
+or C<DBI>.
+
+=item module
+
+This refers to a reusable library of code contained in a single file.
+Modules usually contain one or more packages and are often referred
+to by the name of a primary package that can be mapped to the file
+name. For example, one might refer to C<File::Spec> instead of
+F<File/Spec.pm>
+
+=item package
+
+This refers to a namespace declared with the Perl C<package> statement.
+In Perl, packages often have a version number property given by the
+C<$VERSION> variable in the namespace.
+
+=item consumer
+
+This refers to code that reads a metadata file, deserializes it into a
+data structure in memory, or interprets a data structure of metadata
+elements.
+
+=item producer
+
+This refers to code that constructs a metadata data structure,
+serializes into a bytestream and/or writes it to disk.
+
+=item must, should, may, etc.
+
+These terms are interpreted as described in IETF RFC 2119.
+
+=back
+
+=head1 DATA TYPES
+
+Fields in the L</STRUCTURE> section describe data elements, each of
+which has an associated data type as described herein.  There are four
+primitive types: Boolean, String, List and Map.  Other types are
+subtypes of primitives and define compound data structures or define
+constraints on the values of a data element.
+
+=head2 Boolean
+
+A I<Boolean> is used to provide a true or false value.  It B<must> be
+represented as a defined value.
+
+=head2 String
+
+A I<String> is data element containing a non-zero length sequence of
+Unicode characters, such as an ordinary Perl scalar that is not a
+reference.
+
+=head2 List
+
+A I<List> is an ordered collection of zero or more data elements.
+Elements of a List may be of mixed types.
+
+Producers B<must> represent List elements using a data structure which
+unambiguously indicates that multiple values are possible, such as a
+reference to a Perl array (an "arrayref").
+
+Consumers expecting a List B<must> consider a String as equivalent to a
+List of length 1.
+
+=head2 Map
+
+A I<Map> is an unordered collection of zero or more data elements
+("values"), indexed by associated String elements ("keys").  The Map's
+value elements may be of mixed types.
+
+=head2 License String
+
+A I<License String> is a subtype of String with a restricted set of
+values.  Valid values are described in detail in the description of
+the L</license> field.
+
+=head2 URL
+
+I<URL> is a subtype of String containing a Uniform Resource Locator or
+Identifier.  [ This type is called URL and not URI for historical reasons. ]
+
+=head2 Version
+
+A I<Version> is a subtype of String containing a value that describes
+the version number of packages or distributions.  Restrictions on format
+are described in detail in the L</Version Formats> section.
+
+=head2 Version Range
+
+The I<Version Range> type is a subtype of String.  It describes a range
+of Versions that may be present or installed to fulfill prerequisites.
+It is specified in detail in the L</Version Ranges> section.
+
+=head1 STRUCTURE
+
+The metadata structure is a data element of type Map.  This section
+describes valid keys within the Map.
+
+Any keys not described in this specification document (whether top-level
+or within compound data structures described herein) are considered
+I<custom keys> and B<must> begin with an "x" or "X" and be followed by an
+underscore; i.e. they must match the pattern: C<< qr{\Ax_}i >>.  If a
+custom key refers to a compound data structure, subkeys within it do not
+need an "x_" or "X_" prefix.
+
+Consumers of metadata may ignore any or all custom keys.  All other keys
+not described herein are invalid and should be ignored by consumers.
+Producers must not generate or output invalid keys.
+
+For each key, an example is provided followed by a description.  The
+description begins with the version of spec in which the key was added
+or in which the definition was modified, whether the key is I<required>
+or I<optional> and the data type of the corresponding data element.
+These items are in parentheses, brackets and braces, respectively.
+
+If a data type is a Map or Map subtype, valid subkeys will be described
+as well.
+
+Some fields are marked I<Deprecated>.  These are shown for historical
+context and must not be produced in or consumed from any metadata structure
+of version 2 or higher.
+
+=head2 REQUIRED FIELDS
+
+=head3 abstract
+
+Example:
+
+  abstract => 'Build and install Perl modules'
+
+(Spec 1.2) [required] {String}
+
+This is a short description of the purpose of the distribution.
+
+=head3 author
+
+Example:
+
+  author => [ 'Ken Williams <kwilliams@cpan.org>' ]
+
+(Spec 1.2) [required] {List of one or more Strings}
+
+This List indicates the person(s) to contact concerning the
+distribution. The preferred form of the contact string is:
+
+  contact-name <email-address>
+
+This field provides a general contact list independent of other
+structured fields provided within the L</resources> field, such as
+C<bugtracker>.  The addressee(s) can be contacted for any purpose
+including but not limited to (security) problems with the distribution,
+questions about the distribution or bugs in the distribution.
+
+A distribution's original author is usually the contact listed within
+this field.  Co-maintainers, successor maintainers or mailing lists
+devoted to the distribution may also be listed in addition to or instead
+of the original author.
+
+=head3 dynamic_config
+
+Example:
+
+  dynamic_config => 1
+
+(Spec 2) [required] {Boolean}
+
+A boolean flag indicating whether a F<Build.PL> or F<Makefile.PL> (or
+similar) must be executed to determine prerequisites.
+
+This field should be set to a true value if the distribution performs
+some dynamic configuration (asking questions, sensing the environment,
+etc.) as part of its configuration.  This field should be set to a false
+value to indicate that prerequisites included in metadata may be
+considered final and valid for static analysis.
+
+Note: when this field is true, post-configuration prerequisites are not
+guaranteed to bear any relation whatsoever to those stated in the metadata,
+and relying on them doing so is an error. See also
+L</Prerequisites for dynamically configured distributions> in the implementors'
+notes.
+
+This field explicitly B<does not> indicate whether installation may be
+safely performed without using a Makefile or Build file, as there may be
+special files to install or custom installation targets (e.g. for
+dual-life modules that exist on CPAN as well as in the Perl core).  This
+field only defines whether or not prerequisites are exactly as given in the
+metadata.
+
+=head3 generated_by
+
+Example:
+
+  generated_by => 'Module::Build version 0.36'
+
+(Spec 1.0) [required] {String}
+
+This field indicates the tool that was used to create this metadata.
+There are no defined semantics for this field, but it is traditional to
+use a string in the form "Generating::Package version 1.23" or the
+author's name, if the file was generated by hand.
+
+=head3 license
+
+Example:
+
+  license => [ 'perl_5' ]
+
+  license => [ 'apache_2_0', 'mozilla_1_0' ]
+
+(Spec 2) [required] {List of one or more License Strings}
+
+One or more licenses that apply to some or all of the files in the
+distribution.  If multiple licenses are listed, the distribution
+documentation should be consulted to clarify the interpretation of
+multiple licenses.
+
+The following list of license strings are valid:
+
+ string          description
+ -------------   -----------------------------------------------
+ agpl_3          GNU Affero General Public License, Version 3
+ apache_1_1      Apache Software License, Version 1.1
+ apache_2_0      Apache License, Version 2.0
+ artistic_1      Artistic License, (Version 1)
+ artistic_2      Artistic License, Version 2.0
+ bsd             BSD License (three-clause)
+ freebsd         FreeBSD License (two-clause)
+ gfdl_1_2        GNU Free Documentation License, Version 1.2
+ gfdl_1_3        GNU Free Documentation License, Version 1.3
+ gpl_1           GNU General Public License, Version 1
+ gpl_2           GNU General Public License, Version 2
+ gpl_3           GNU General Public License, Version 3
+ lgpl_2_1        GNU Lesser General Public License, Version 2.1
+ lgpl_3_0        GNU Lesser General Public License, Version 3.0
+ mit             MIT (aka X11) License
+ mozilla_1_0     Mozilla Public License, Version 1.0
+ mozilla_1_1     Mozilla Public License, Version 1.1
+ openssl         OpenSSL License
+ perl_5          The Perl 5 License (Artistic 1 & GPL 1 or later)
+ qpl_1_0         Q Public License, Version 1.0
+ ssleay          Original SSLeay License
+ sun             Sun Internet Standards Source License (SISSL)
+ zlib            zlib License
+
+The following license strings are also valid and indicate other
+licensing not described above:
+
+ string          description
+ -------------   -----------------------------------------------
+ open_source     Other Open Source Initiative (OSI) approved license
+ restricted      Requires special permission from copyright holder
+ unrestricted    Not an OSI approved license, but not restricted
+ unknown         License not provided in metadata
+
+All other strings are invalid in the license field.
+
+=head3 meta-spec
+
+Example:
+
+  'meta-spec' => {
+    version => '2',
+    url     => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
+  }
+
+(Spec 1.2) [required] {Map}
+
+This field indicates the version of the CPAN Meta Spec that should be
+used to interpret the metadata.  Consumers must check this key as soon
+as possible and abort further metadata processing if the meta-spec
+version is not supported by the consumer.
+
+The following keys are valid, but only C<version> is required.
+
+=over
+
+=item version
+
+This subkey gives the integer I<Version> of the CPAN Meta Spec against
+which the document was generated.
+
+=item url
+
+This is a I<URL> of the metadata specification document corresponding to
+the given version.  This is strictly for human-consumption and should
+not impact the interpretation of the document.
+
+For the version 2 spec, either of these are recommended:
+
+=over 4
+
+=item *
+
+C<https://metacpan.org/pod/CPAN::Meta::Spec>
+
+=item *
+
+C<http://search.cpan.org/perldoc?CPAN::Meta::Spec>
+
+=back
+
+=back
+
+=head3 name
+
+Example:
+
+  name => 'Module-Build'
+
+(Spec 1.0) [required] {String}
+
+This field is the name of the distribution.  This is often created by
+taking the "main package" in the distribution and changing C<::> to
+C<->, but the name may be completely unrelated to the packages within
+the distribution.  For example, L<LWP::UserAgent> is distributed as part
+of the distribution name "libwww-perl".
+
+=head3 release_status
+
+Example:
+
+  release_status => 'stable'
+
+(Spec 2) [required] {String}
+
+This field provides the  release status of this distribution.  If the
+C<version> field contains an underscore character, then
+C<release_status> B<must not> be "stable."
+
+The C<release_status> field B<must> have one of the following values:
+
+=over
+
+=item stable
+
+This indicates an ordinary, "final" release that should be indexed by PAUSE
+or other indexers.
+
+=item testing
+
+This indicates a "beta" release that is substantially complete, but has an
+elevated risk of bugs and requires additional testing.  The distribution
+should not be installed over a stable release without an explicit request
+or other confirmation from a user.  This release status may also be used
+for "release candidate" versions of a distribution.
+
+=item unstable
+
+This indicates an "alpha" release that is under active development, but has
+been released for early feedback or testing and may be missing features or
+may have serious bugs.  The distribution should not be installed over a
+stable release without an explicit request or other confirmation from a
+user.
+
+=back
+
+Consumers B<may> use this field to determine how to index the
+distribution for CPAN or other repositories in addition to or in
+replacement of heuristics based on version number or file name.
+
+=head3 version
+
+Example:
+
+  version => '0.36'
+
+(Spec 1.0) [required] {Version}
+
+This field gives the version of the distribution to which the metadata
+structure refers.
+
+=head2 OPTIONAL FIELDS
+
+=head3 description
+
+Example:
+
+    description =>  "Module::Build is a system for "
+      . "building, testing, and installing Perl modules. "
+      . "It is meant to ... blah blah blah ...",
+
+(Spec 2) [optional] {String}
+
+A longer, more complete description of the purpose or intended use of
+the distribution than the one provided by the C<abstract> key.
+
+=head3 keywords
+
+Example:
+
+  keywords => [ qw/ toolchain cpan dual-life / ]
+
+(Spec 1.1) [optional] {List of zero or more Strings}
+
+A List of keywords that describe this distribution.  Keywords
+B<must not> include whitespace.
+
+=head3 no_index
+
+Example:
+
+  no_index => {
+    file      => [ 'My/Module.pm' ],
+    directory => [ 'My/Private' ],
+    package   => [ 'My::Module::Secret' ],
+    namespace => [ 'My::Module::Sample' ],
+  }
+
+(Spec 1.2) [optional] {Map}
+
+This Map describes any files, directories, packages, and namespaces that
+are private to the packaging or implementation of the distribution and
+should be ignored by indexing or search tools. Note that this is a list of
+exclusions, and the spec does not define what to I<include> - see
+L</Indexing distributions a la PAUSE> in the implementors notes for more
+information.
+
+Valid subkeys are as follows:
+
+=over
+
+=item file
+
+A I<List> of relative paths to files.  Paths B<must be> specified with
+unix conventions.
+
+=item directory
+
+A I<List> of relative paths to directories.  Paths B<must be> specified
+with unix conventions.
+
+[ Note: previous editions of the spec had C<dir> instead of C<directory> ]
+
+=item package
+
+A I<List> of package names.
+
+=item namespace
+
+A I<List> of package namespaces, where anything below the namespace
+must be ignored, but I<not> the namespace itself.
+
+In the example above for C<no_index>, C<My::Module::Sample::Foo> would
+be ignored, but C<My::Module::Sample> would not.
+
+=back
+
+=head3 optional_features
+
+Example:
+
+  optional_features => {
+    sqlite => {
+      description => 'Provides SQLite support',
+      prereqs => {
+        runtime => {
+          requires => {
+            'DBD::SQLite' => '1.25'
+          }
+        }
+      }
+    }
+  }
+
+(Spec 2) [optional] {Map}
+
+This Map describes optional features with incremental prerequisites.
+Each key of the C<optional_features> Map is a String used to identify
+the feature and each value is a Map with additional information about
+the feature.  Valid subkeys include:
+
+=over
+
+=item description
+
+This is a String describing the feature.  Every optional feature
+should provide a description
+
+=item prereqs
+
+This entry is required and has the same structure as that of the
+C<L</prereqs>> key.  It provides a list of package requirements
+that must be satisfied for the feature to be supported or enabled.
+
+There is one crucial restriction:  the prereqs of an optional feature
+B<must not> include C<configure> phase prereqs.
+
+=back
+
+Consumers B<must not> include optional features as prerequisites without
+explicit instruction from users (whether via interactive prompting,
+a function parameter or a configuration value, etc. ).
+
+If an optional feature is used by a consumer to add additional
+prerequisites, the consumer should merge the optional feature
+prerequisites into those given by the C<prereqs> key using the same
+semantics.  See L</Merging and Resolving Prerequisites> for details on
+merging prerequisites.
+
+I<Suggestion for disuse:> Because there is currently no way for a
+distribution to specify a dependency on an optional feature of another
+dependency, the use of C<optional_feature> is discouraged.  Instead,
+create a separate, installable distribution that ensures the desired
+feature is available.  For example, if C<Foo::Bar> has a C<Baz> feature,
+release a separate C<Foo-Bar-Baz> distribution that satisfies
+requirements for the feature.
+
+=head3 prereqs
+
+Example:
+
+  prereqs => {
+    runtime => {
+      requires => {
+        'perl'          => '5.006',
+        'File::Spec'    => '0.86',
+        'JSON'          => '2.16',
+      },
+      recommends => {
+        'JSON::XS'      => '2.26',
+      },
+      suggests => {
+        'Archive::Tar'  => '0',
+      },
+    },
+    build => {
+      requires => {
+        'Alien::SDL'    => '1.00',
+      },
+    },
+    test => {
+      recommends => {
+        'Test::Deep'    => '0.10',
+      },
+    }
+  }
+
+(Spec 2) [optional] {Map}
+
+This is a Map that describes all the prerequisites of the distribution.
+The keys are phases of activity, such as C<configure>, C<build>, C<test>
+or C<runtime>.  Values are Maps in which the keys name the type of
+prerequisite relationship such as C<requires>, C<recommends>, or
+C<suggests> and the value provides a set of prerequisite relations.  The
+set of relations B<must> be specified as a Map of package names to
+version ranges.
+
+The full definition for this field is given in the L</Prereq Spec>
+section.
+
+=head3 provides
+
+Example:
+
+  provides => {
+    'Foo::Bar' => {
+      file    => 'lib/Foo/Bar.pm',
+      version => '0.27_02',
+    },
+    'Foo::Bar::Blah' => {
+      file    => 'lib/Foo/Bar/Blah.pm',
+    },
+    'Foo::Bar::Baz' => {
+      file    => 'lib/Foo/Bar/Baz.pm',
+      version => '0.3',
+    },
+  }
+
+(Spec 1.2) [optional] {Map}
+
+This describes all packages provided by this distribution.  This
+information is used by distribution and automation mechanisms like
+PAUSE, CPAN, metacpan.org and search.cpan.org to build indexes saying in
+which distribution various packages can be found.
+
+The keys of C<provides> are package names that can be found within
+the distribution.  If a package name key is provided, it must
+have a Map with the following valid subkeys:
+
+=over
+
+=item file
+
+This field is required.  It must contain a Unix-style relative file path
+from the root of the distribution directory to a file that contains or
+generates the package.  It may be given as C<META.yml> or C<META.json>
+to claim a package for indexing without needing a C<*.pm>.
+
+=item version
+
+If it exists, this field must contains a I<Version> String for the
+package.  If the package does not have a C<$VERSION>, this field must
+be omitted.
+
+=back
+
+=head3 resources
+
+Example:
+
+  resources => {
+    license     => [ 'http://dev.perl.org/licenses/' ],
+    homepage    => 'http://sourceforge.net/projects/module-build',
+    bugtracker  => {
+      web    => 'http://rt.cpan.org/Public/Dist/Display.html?Name=CPAN-Meta',
+      mailto => 'meta-bugs@example.com',
+    },
+    repository  => {
+      url  => 'git://github.com/dagolden/cpan-meta.git',
+      web  => 'http://github.com/dagolden/cpan-meta',
+      type => 'git',
+    },
+    x_twitter   => 'http://twitter.com/cpan_linked/',
+  }
+
+(Spec 2) [optional] {Map}
+
+This field describes resources related to this distribution.
+
+Valid subkeys include:
+
+=over
+
+=item homepage
+
+The official home of this project on the web.
+
+=item license
+
+A List of I<URL>'s that relate to this distribution's license.  As with the
+top-level C<license> field, distribution documentation should be consulted
+to clarify the interpretation of multiple licenses provided here.
+
+=item bugtracker
+
+This entry describes the bug tracking system for this distribution.  It
+is a Map with the following valid keys:
+
+  web    - a URL pointing to a web front-end for the bug tracker
+  mailto - an email address to which bugs can be sent
+
+=item repository
+
+This entry describes the source control repository for this distribution.  It
+is a Map with the following valid keys:
+
+  url  - a URL pointing to the repository itself
+  web  - a URL pointing to a web front-end for the repository
+  type - a lowercase string indicating the VCS used
+
+Because a url like C<http://myrepo.example.com/> is ambiguous as to
+type, producers should provide a C<type> whenever a C<url> key is given.
+The C<type> field should be the name of the most common program used
+to work with the repository, e.g. C<git>, C<svn>, C<cvs>, C<darcs>,
+C<bzr> or C<hg>.
+
+=back
+
+=head2 DEPRECATED FIELDS
+
+=head3 build_requires
+
+I<(Deprecated in Spec 2)> [optional] {String}
+
+Replaced by C<prereqs>
+
+=head3 configure_requires
+
+I<(Deprecated in Spec 2)> [optional] {String}
+
+Replaced by C<prereqs>
+
+=head3 conflicts
+
+I<(Deprecated in Spec 2)> [optional] {String}
+
+Replaced by C<prereqs>
+
+=head3 distribution_type
+
+I<(Deprecated in Spec 2)> [optional] {String}
+
+This field indicated 'module' or 'script' but was considered
+meaningless, since many distributions are hybrids of several kinds of
+things.
+
+=head3 license_uri
+
+I<(Deprecated in Spec 1.2)> [optional] {URL}
+
+Replaced by C<license> in C<resources>
+
+=head3 private
+
+I<(Deprecated in Spec 1.2)> [optional] {Map}
+
+This field has been renamed to L</"no_index">.
+
+=head3 recommends
+
+I<(Deprecated in Spec 2)> [optional] {String}
+
+Replaced by C<prereqs>
+
+=head3 requires
+
+I<(Deprecated in Spec 2)> [optional] {String}
+
+Replaced by C<prereqs>
+
+=head1 VERSION NUMBERS
+
+=head2 Version Formats
+
+This section defines the Version type, used by several fields in the
+CPAN Meta Spec.
+
+Version numbers must be treated as strings, not numbers.  For
+example, C<1.200> B<must not> be serialized as C<1.2>.  Version
+comparison should be delegated to the Perl L<version> module, version
+0.80 or newer.
+
+Unless otherwise specified, version numbers B<must> appear in one of two
+formats:
+
+=over
+
+=item Decimal versions
+
+Decimal versions are regular "decimal numbers", with some limitations.
+They B<must> be non-negative and B<must> begin and end with a digit.  A
+single underscore B<may> be included, but B<must> be between two digits.
+They B<must not> use exponential notation ("1.23e-2").
+
+   version => '1.234'       # OK
+   version => '1.23_04'     # OK
+
+   version => '1.23_04_05'  # Illegal
+   version => '1.'          # Illegal
+   version => '.1'          # Illegal
+
+=item Dotted-integer versions
+
+Dotted-integer (also known as dotted-decimal) versions consist of
+positive integers separated by full stop characters (i.e. "dots",
+"periods" or "decimal points").  This are equivalent in format to Perl
+"v-strings", with some additional restrictions on form.  They must be
+given in "normal" form, which has a leading "v" character and at least
+three integer components.  To retain a one-to-one mapping with decimal
+versions, all components after the first B<should> be restricted to the
+range 0 to 999.  The final component B<may> be separated by an
+underscore character instead of a period.
+
+   version => 'v1.2.3'      # OK
+   version => 'v1.2_3'      # OK
+   version => 'v1.2.3.4'    # OK
+   version => 'v1.2.3_4'    # OK
+   version => 'v2009.10.31' # OK
+
+   version => 'v1.2'          # Illegal
+   version => '1.2.3'         # Illegal
+   version => 'v1.2_3_4'      # Illegal
+   version => 'v1.2009.10.31' # Not recommended
+
+=back
+
+=head2 Version Ranges
+
+Some fields (prereq, optional_features) indicate the particular
+version(s) of some other module that may be required as a prerequisite.
+This section details the Version Range type used to provide this
+information.
+
+The simplest format for a Version Range is just the version
+number itself, e.g. C<2.4>.  This means that B<at least> version 2.4
+must be present.  To indicate that B<any> version of a prerequisite is
+okay, even if the prerequisite doesn't define a version at all, use
+the version C<0>.
+
+Alternatively, a version range B<may> use the operators E<lt> (less than),
+E<lt>= (less than or equal), E<gt> (greater than), E<gt>= (greater than
+or equal), == (equal), and != (not equal).  For example, the
+specification C<E<lt> 2.0> means that any version of the prerequisite
+less than 2.0 is suitable.
+
+For more complicated situations, version specifications B<may> be AND-ed
+together using commas.  The specification C<E<gt>= 1.2, != 1.5, E<lt>
+2.0> indicates a version that must be B<at least> 1.2, B<less than> 2.0,
+and B<not equal to> 1.5.
+
+=head1 PREREQUISITES
+
+=head2 Prereq Spec
+
+The C<prereqs> key in the top-level metadata and within
+C<optional_features> define the relationship between a distribution and
+other packages.  The prereq spec structure is a hierarchical data
+structure which divides prerequisites into I<Phases> of activity in the
+installation process and I<Relationships> that indicate how
+prerequisites should be resolved.
+
+For example, to specify that C<Data::Dumper> is C<required> during the
+C<test> phase, this entry would appear in the distribution metadata:
+
+  prereqs => {
+    test => {
+      requires => {
+        'Data::Dumper' => '2.00'
+      }
+    }
+  }
+
+=head3 Phases
+
+Requirements for regular use must be listed in the C<runtime> phase.
+Other requirements should be listed in the earliest stage in which they
+are required and consumers must accumulate and satisfy requirements
+across phases before executing the activity. For example, C<build>
+requirements must also be available during the C<test> phase.
+
+  before action       requirements that must be met
+  ----------------    --------------------------------
+  perl Build.PL       configure
+  perl Makefile.PL
+
+  make                configure, runtime, build
+  Build
+
+  make test           configure, runtime, build, test
+  Build test
+
+Consumers that install the distribution must ensure that
+I<runtime> requirements are also installed and may install
+dependencies from other phases.
+
+  after action        requirements that must be met
+  ----------------    --------------------------------
+  make install        runtime
+  Build install
+
+=over
+
+=item configure
+
+The configure phase occurs before any dynamic configuration has been
+attempted.  Libraries required by the configure phase B<must> be
+available for use before the distribution building tool has been
+executed.
+
+=item build
+
+The build phase is when the distribution's source code is compiled (if
+necessary) and otherwise made ready for installation.
+
+=item test
+
+The test phase is when the distribution's automated test suite is run.
+Any library that is needed only for testing and not for subsequent use
+should be listed here.
+
+=item runtime
+
+The runtime phase refers not only to when the distribution's contents
+are installed, but also to its continued use.  Any library that is a
+prerequisite for regular use of this distribution should be indicated
+here.
+
+=item develop
+
+The develop phase's prereqs are libraries needed to work on the
+distribution's source code as its author does.  These tools might be
+needed to build a release tarball, to run author-only tests, or to
+perform other tasks related to developing new versions of the
+distribution.
+
+=back
+
+=head3 Relationships
+
+=over
+
+=item requires
+
+These dependencies B<must> be installed for proper completion of the
+phase.
+
+=item recommends
+
+Recommended dependencies are I<strongly> encouraged and should be
+satisfied except in resource constrained environments.
+
+=item suggests
+
+These dependencies are optional, but are suggested for enhanced operation
+of the described distribution.
+
+=item conflicts
+
+These libraries cannot be installed when the phase is in operation.
+This is a very rare situation, and the C<conflicts> relationship should
+be used with great caution, or not at all.
+
+=back
+
+=head2 Merging and Resolving Prerequisites
+
+Whenever metadata consumers merge prerequisites, either from different
+phases or from C<optional_features>, they should merged in a way which
+preserves the intended semantics of the prerequisite structure.  Generally,
+this means concatenating the version specifications using commas, as
+described in the L<Version Ranges> section.
+
+Another subtle error that can occur in resolving prerequisites comes from
+the way that modules in prerequisites are indexed to distribution files on
+CPAN.  When a module is deleted from a distribution, prerequisites calling
+for that module could indicate an older distribution should be installed,
+potentially overwriting files from a newer distribution.
+
+For example, as of Oct 31, 2009, the CPAN index file contained these
+module-distribution mappings:
+
+  Class::MOP                   0.94  D/DR/DROLSKY/Class-MOP-0.94.tar.gz
+  Class::MOP::Class            0.94  D/DR/DROLSKY/Class-MOP-0.94.tar.gz
+  Class::MOP::Class::Immutable 0.04  S/ST/STEVAN/Class-MOP-0.36.tar.gz
+
+Consider the case where "Class::MOP" 0.94 is installed.  If a
+distribution specified "Class::MOP::Class::Immutable" as a prerequisite,
+it could result in Class-MOP-0.36.tar.gz being installed, overwriting
+any files from Class-MOP-0.94.tar.gz.
+
+Consumers of metadata B<should> test whether prerequisites would result
+in installed module files being "downgraded" to an older version and
+B<may> warn users or ignore the prerequisite that would cause such a
+result.
+
+=head1 SERIALIZATION
+
+Distribution metadata should be serialized (as a hashref) as
+JSON-encoded data and packaged with distributions as the file
+F<META.json>.
+
+In the past, the distribution metadata structure had been packed with
+distributions as F<META.yml>, a file in the YAML Tiny format (for which,
+see L<YAML::Tiny>).  Tools that consume distribution metadata from disk
+should be capable of loading F<META.yml>, but should prefer F<META.json>
+if both are found.
+
+=head1 NOTES FOR IMPLEMENTORS
+
+=head2 Extracting Version Numbers from Perl Modules
+
+To get the version number from a Perl module, consumers should use the
+C<< MM->parse_version($file) >> method provided by
+L<ExtUtils::MakeMaker> or L<Module::Metadata>.  For example, for the
+module given by C<$mod>, the version may be retrieved in one of the
+following ways:
+
+  # via ExtUtils::MakeMaker
+  my $file = MM->_installed_file_for_module($mod);
+  my $version = MM->parse_version($file)
+
+The private C<_installed_file_for_module> method may be replaced with
+other methods for locating a module in C<@INC>.
+
+  # via Module::Metadata
+  my $info = Module::Metadata->new_from_module($mod);
+  my $version = $info->version;
+
+If only a filename is available, the following approach may be used:
+
+  # via Module::Build
+  my $info = Module::Metadata->new_from_file($file);
+  my $version = $info->version;
+
+=head2 Comparing Version Numbers
+
+The L<version> module provides the most reliable way to compare version
+numbers in all the various ways they might be provided or might exist
+within modules.  Given two strings containing version numbers, C<$v1> and
+C<$v2>, they should be converted to C<version> objects before using
+ordinary comparison operators.  For example:
+
+  use version;
+  if ( version->new($v1) <=> version->new($v2) ) {
+    print "Versions are not equal\n";
+  }
+
+If the only comparison needed is whether an installed module is of a
+sufficiently high version, a direct test may be done using the string
+form of C<eval> and the C<use> function.  For example, for module C<$mod>
+and version prerequisite C<$prereq>:
+
+  if ( eval "use $mod $prereq (); 1" ) {
+    print "Module $mod version is OK.\n";
+  }
+
+If the values of C<$mod> and C<$prereq> have not been scrubbed, however,
+this presents security implications.
+
+=head2 Prerequisites for dynamically configured distributions
+
+When C<dynamic_config> is true, it is an error to presume that the
+prerequisites given in distribution metadata will have any relationship
+whatsoever to the actual prerequisites of the distribution.
+
+In practice, however, one can generally expect such prerequisites to be
+one of two things:
+
+=over 4
+
+=item *
+
+The minimum prerequisites for the distribution, to which dynamic configuration will only add items
+
+=item *
+
+Whatever the distribution configured with on the releaser's machine at release time
+
+=back
+
+The second case often turns out to have identical results to the first case,
+albeit only by accident.
+
+As such, consumers may use this data for informational analysis, but
+presenting it to the user as canonical or relying on it as such is
+invariably the height of folly.
+
+=head2 Indexing distributions a la PAUSE
+
+While no_index tells you what must be ignored when indexing, this spec holds
+no opinion on how you should get your initial candidate list of things to
+possibly index. For "normal" distributions you might consider simply indexing
+the contents of lib/, but there are many fascinating oddities on CPAN and
+many dists from the days when it was normal to put the main .pm file in the
+root of the distribution archive - so PAUSE currently indexes all .pm and .PL
+files that are not either (a) specifically excluded by no_index (b) in
+C<inc>, C<xt>, or C<t> directories, or common 'mistake' directories such as
+C<perl5>.
+
+Or: If you're trying to be PAUSE-like, make sure you skip C<inc>, C<xt> and
+C<t> as well as anything marked as no_index.
+
+Also remember: If the META file contains a provides field, you shouldn't be
+indexing anything in the first place - just use that.
+
+=head1 SEE ALSO
+
+=over 4
+
+=item *
+
+CPAN, L<http://www.cpan.org/>
+
+=item *
+
+JSON, L<http://json.org/>
+
+=item *
+
+YAML, L<http://www.yaml.org/>
+
+=item *
+
+L<CPAN>
+
+=item *
+
+L<CPANPLUS>
+
+=item *
+
+L<ExtUtils::MakeMaker>
+
+=item *
+
+L<Module::Build>
+
+=item *
+
+L<Module::Install>
+
+=back
+
+=head1 HISTORY
+
+Ken Williams wrote the original CPAN Meta Spec (also known as the
+"META.yml spec") in 2003 and maintained it through several revisions
+with input from various members of the community.  In 2005, Randy
+Sims redrafted it from HTML to POD for the version 1.2 release.  Ken
+continued to maintain the spec through version 1.4.
+
+In late 2009, David Golden organized the version 2 proposal review
+process.  David and Ricardo Signes drafted the final version 2 spec
+in April 2010 based on the version 1.4 spec and patches contributed
+during the proposal process.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/Validator.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/Validator.pm
new file mode 100644
index 0000000000..db0ab51362
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/Validator.pm
@@ -0,0 +1,1247 @@
+use 5.006;
+use strict;
+use warnings;
+
+package CPAN::Meta::Validator;
+
+our $VERSION = '2.150005';
+
+#pod =head1 SYNOPSIS
+#pod
+#pod   my $struct = decode_json_file('META.json');
+#pod
+#pod   my $cmv = CPAN::Meta::Validator->new( $struct );
+#pod
+#pod   unless ( $cmv->is_valid ) {
+#pod     my $msg = "Invalid META structure.  Errors found:\n";
+#pod     $msg .= join( "\n", $cmv->errors );
+#pod     die $msg;
+#pod   }
+#pod
+#pod =head1 DESCRIPTION
+#pod
+#pod This module validates a CPAN Meta structure against the version of the
+#pod the specification claimed in the C<meta-spec> field of the structure.
+#pod
+#pod =cut
+
+#--------------------------------------------------------------------------#
+# This code copied and adapted from Test::CPAN::Meta
+# by Barbie, <barbie@cpan.org> for Miss Barbell Productions,
+# L<http://www.missbarbell.co.uk>
+#--------------------------------------------------------------------------#
+
+#--------------------------------------------------------------------------#
+# Specification Definitions
+#--------------------------------------------------------------------------#
+
+my %known_specs = (
+  '1.4' => 'http://module-build.sourceforge.net/META-spec-v1.4.html',
+  '1.3' => 'http://module-build.sourceforge.net/META-spec-v1.3.html',
+  '1.2' => 'http://module-build.sourceforge.net/META-spec-v1.2.html',
+  '1.1' => 'http://module-build.sourceforge.net/META-spec-v1.1.html',
+  '1.0' => 'http://module-build.sourceforge.net/META-spec-v1.0.html'
+);
+my %known_urls = map { $known_specs{$_} => $_ } keys %known_specs;
+
+my $module_map1
+  = {'map' => {':key' => {name => \&module, value => \&exversion}}};
+
+my $module_map2 = {'map' => {':key' => {name => \&module, value => \&version}}};
+
+my $no_index_2 = {
+  'map' => {
+    file      => {list => {value => \&string}},
+    directory => {list => {value => \&string}},
+    'package' => {list => {value => \&string}},
+    namespace => {list => {value => \&string}},
+    ':key' => {name => \&custom_2, value => \&anything},
+  }
+};
+
+my $no_index_1_3 = {
+  'map' => {
+    file      => {list => {value => \&string}},
+    directory => {list => {value => \&string}},
+    'package' => {list => {value => \&string}},
+    namespace => {list => {value => \&string}},
+    ':key' => {name => \&string, value => \&anything},
+  }
+};
+
+my $no_index_1_2 = {
+  'map' => {
+    file      => {list => {value => \&string}},
+    dir       => {list => {value => \&string}},
+    'package' => {list => {value => \&string}},
+    namespace => {list => {value => \&string}},
+    ':key' => {name => \&string, value => \&anything},
+  }
+};
+
+my $no_index_1_1
+  = {'map' => {':key' => {name => \&string, list => {value => \&string}},}};
+
+my $prereq_map = {
+  map => {
+    ':key' => {
+      name  => \&phase,
+      'map' => {':key' => {name => \&relation, %$module_map1,},},
+    }
+  },
+};
+
+my %definitions = (
+  '2' => {
+
+    # REQUIRED
+    'abstract'       => {mandatory => 1, value => \&string},
+    'author'         => {mandatory => 1, list  => {value => \&string}},
+    'dynamic_config' => {mandatory => 1, value => \&boolean},
+    'generated_by'   => {mandatory => 1, value => \&string},
+    'license'        => {mandatory => 1, list  => {value => \&license}},
+    'meta-spec' => {
+      mandatory => 1,
+      'map'     => {
+        version => {mandatory => 1, value => \&version},
+        url     => {value     => \&url},
+        ':key'  => {name      => \&custom_2, value => \&anything},
+      }
+    },
+    'name'           => {mandatory => 1, value => \&string},
+    'release_status' => {mandatory => 1, value => \&release_status},
+    'version'        => {mandatory => 1, value => \&version},
+
+    # OPTIONAL
+    'description' => {value => \&string},
+    'keywords'    => {list  => {value => \&string}},
+    'no_index'          => $no_index_2,
+    'optional_features' => {
+      'map' => {
+        ':key' => {
+          name  => \&string,
+          'map' => {
+            description => {value => \&string},
+            prereqs     => $prereq_map,
+            ':key'      => {name => \&custom_2, value => \&anything},
+          }
+        }
+      }
+    },
+    'prereqs'  => $prereq_map,
+    'provides' => {
+      'map' => {
+        ':key' => {
+          name  => \&module,
+          'map' => {
+            file    => {mandatory => 1, value => \&file},
+            version => {value     => \&version},
+            ':key'  => {name      => \&custom_2, value => \&anything},
+          }
+        }
+      }
+    },
+    'resources' => {
+      'map' => {
+        license    => {list  => {value => \&url}},
+        homepage   => {value => \&url},
+        bugtracker => {
+          'map' => {
+            web    => {value => \&url},
+            mailto => {value => \&string},
+            ':key' => {name  => \&custom_2, value => \&anything},
+          }
+        },
+        repository => {
+          'map' => {
+            web    => {value => \&url},
+            url    => {value => \&url},
+            type   => {value => \&string},
+            ':key' => {name  => \&custom_2, value => \&anything},
+          }
+        },
+        ':key' => {value => \&string, name => \&custom_2},
+      }
+    },
+
+    # CUSTOM -- additional user defined key/value pairs
+    # note we can only validate the key name, as the structure is user defined
+    ':key' => {name => \&custom_2, value => \&anything},
+  },
+
+  '1.4' => {
+    'meta-spec' => {
+      mandatory => 1,
+      'map'     => {
+        version => {mandatory => 1,        value => \&version},
+        url     => {mandatory => 1,        value => \&urlspec},
+        ':key'  => {name      => \&string, value => \&anything},
+      },
+    },
+
+    'name'         => {mandatory => 1, value => \&string},
+    'version'      => {mandatory => 1, value => \&version},
+    'abstract'     => {mandatory => 1, value => \&string},
+    'author'       => {mandatory => 1, list  => {value => \&string}},
+    'license'      => {mandatory => 1, value => \&license},
+    'generated_by' => {mandatory => 1, value => \&string},
+
+    'distribution_type' => {value => \&string},
+    'dynamic_config'    => {value => \&boolean},
+
+    'requires'           => $module_map1,
+    'recommends'         => $module_map1,
+    'build_requires'     => $module_map1,
+    'configure_requires' => $module_map1,
+    'conflicts'          => $module_map2,
+
+    'optional_features' => {
+      'map' => {
+        ':key' => {
+          name  => \&string,
+          'map' => {
+            description    => {value => \&string},
+            requires       => $module_map1,
+            recommends     => $module_map1,
+            build_requires => $module_map1,
+            conflicts      => $module_map2,
+            ':key'         => {name => \&string, value => \&anything},
+          }
+        }
+      }
+    },
+
+    'provides' => {
+      'map' => {
+        ':key' => {
+          name  => \&module,
+          'map' => {
+            file    => {mandatory => 1, value => \&file},
+            version => {value     => \&version},
+            ':key'  => {name      => \&string, value => \&anything},
+          }
+        }
+      }
+    },
+
+    'no_index' => $no_index_1_3,
+    'private'  => $no_index_1_3,
+
+    'keywords' => {list => {value => \&string}},
+
+    'resources' => {
+      'map' => {
+        license    => {value => \&url},
+        homepage   => {value => \&url},
+        bugtracker => {value => \&url},
+        repository => {value => \&url},
+        ':key'     => {value => \&string, name => \&custom_1},
+      }
+    },
+
+    # additional user defined key/value pairs
+    # note we can only validate the key name, as the structure is user defined
+    ':key' => {name => \&string, value => \&anything},
+  },
+
+  '1.3' => {
+    'meta-spec' => {
+      mandatory => 1,
+      'map'     => {
+        version => {mandatory => 1,        value => \&version},
+        url     => {mandatory => 1,        value => \&urlspec},
+        ':key'  => {name      => \&string, value => \&anything},
+      },
+    },
+
+    'name'         => {mandatory => 1, value => \&string},
+    'version'      => {mandatory => 1, value => \&version},
+    'abstract'     => {mandatory => 1, value => \&string},
+    'author'       => {mandatory => 1, list  => {value => \&string}},
+    'license'      => {mandatory => 1, value => \&license},
+    'generated_by' => {mandatory => 1, value => \&string},
+
+    'distribution_type' => {value => \&string},
+    'dynamic_config'    => {value => \&boolean},
+
+    'requires'       => $module_map1,
+    'recommends'     => $module_map1,
+    'build_requires' => $module_map1,
+    'conflicts'      => $module_map2,
+
+    'optional_features' => {
+      'map' => {
+        ':key' => {
+          name  => \&string,
+          'map' => {
+            description    => {value => \&string},
+            requires       => $module_map1,
+            recommends     => $module_map1,
+            build_requires => $module_map1,
+            conflicts      => $module_map2,
+            ':key'         => {name => \&string, value => \&anything},
+          }
+        }
+      }
+    },
+
+    'provides' => {
+      'map' => {
+        ':key' => {
+          name  => \&module,
+          'map' => {
+            file    => {mandatory => 1, value => \&file},
+            version => {value     => \&version},
+            ':key'  => {name      => \&string, value => \&anything},
+          }
+        }
+      }
+    },
+
+
+    'no_index' => $no_index_1_3,
+    'private'  => $no_index_1_3,
+
+    'keywords' => {list => {value => \&string}},
+
+    'resources' => {
+      'map' => {
+        license    => {value => \&url},
+        homepage   => {value => \&url},
+        bugtracker => {value => \&url},
+        repository => {value => \&url},
+        ':key'     => {value => \&string, name => \&custom_1},
+      }
+    },
+
+    # additional user defined key/value pairs
+    # note we can only validate the key name, as the structure is user defined
+    ':key' => {name => \&string, value => \&anything},
+  },
+
+# v1.2 is misleading, it seems to assume that a number of fields where created
+# within v1.1, when they were created within v1.2. This may have been an
+# original mistake, and that a v1.1 was retro fitted into the timeline, when
+# v1.2 was originally slated as v1.1. But I could be wrong ;)
+  '1.2' => {
+    'meta-spec' => {
+      mandatory => 1,
+      'map'     => {
+        version => {mandatory => 1,        value => \&version},
+        url     => {mandatory => 1,        value => \&urlspec},
+        ':key'  => {name      => \&string, value => \&anything},
+      },
+    },
+
+
+    'name'         => {mandatory => 1, value => \&string},
+    'version'      => {mandatory => 1, value => \&version},
+    'license'      => {mandatory => 1, value => \&license},
+    'generated_by' => {mandatory => 1, value => \&string},
+    'author'       => {mandatory => 1, list  => {value => \&string}},
+    'abstract'     => {mandatory => 1, value => \&string},
+
+    'distribution_type' => {value => \&string},
+    'dynamic_config'    => {value => \&boolean},
+
+    'keywords' => {list => {value => \&string}},
+
+    'private'   => $no_index_1_2,
+    '$no_index' => $no_index_1_2,
+
+    'requires'       => $module_map1,
+    'recommends'     => $module_map1,
+    'build_requires' => $module_map1,
+    'conflicts'      => $module_map2,
+
+    'optional_features' => {
+      'map' => {
+        ':key' => {
+          name  => \&string,
+          'map' => {
+            description    => {value => \&string},
+            requires       => $module_map1,
+            recommends     => $module_map1,
+            build_requires => $module_map1,
+            conflicts      => $module_map2,
+            ':key'         => {name => \&string, value => \&anything},
+          }
+        }
+      }
+    },
+
+    'provides' => {
+      'map' => {
+        ':key' => {
+          name  => \&module,
+          'map' => {
+            file    => {mandatory => 1, value => \&file},
+            version => {value     => \&version},
+            ':key'  => {name      => \&string, value => \&anything},
+          }
+        }
+      }
+    },
+
+    'resources' => {
+      'map' => {
+        license    => {value => \&url},
+        homepage   => {value => \&url},
+        bugtracker => {value => \&url},
+        repository => {value => \&url},
+        ':key'     => {value => \&string, name => \&custom_1},
+      }
+    },
+
+    # additional user defined key/value pairs
+    # note we can only validate the key name, as the structure is user defined
+    ':key' => {name => \&string, value => \&anything},
+  },
+
+# note that the 1.1 spec only specifies 'version' as mandatory
+  '1.1' => {
+    'name'         => {value     => \&string},
+    'version'      => {mandatory => 1, value => \&version},
+    'license'      => {value     => \&license},
+    'generated_by' => {value     => \&string},
+
+    'license_uri'       => {value => \&url},
+    'distribution_type' => {value => \&string},
+    'dynamic_config'    => {value => \&boolean},
+
+    'private' => $no_index_1_1,
+
+    'requires'       => $module_map1,
+    'recommends'     => $module_map1,
+    'build_requires' => $module_map1,
+    'conflicts'      => $module_map2,
+
+    # additional user defined key/value pairs
+    # note we can only validate the key name, as the structure is user defined
+    ':key' => {name => \&string, value => \&anything},
+  },
+
+# note that the 1.0 spec doesn't specify optional or mandatory fields
+# but we will treat version as mandatory since otherwise META 1.0 is
+# completely arbitrary and pointless
+  '1.0' => {
+    'name'         => {value     => \&string},
+    'version'      => {mandatory => 1, value => \&version},
+    'license'      => {value     => \&license},
+    'generated_by' => {value     => \&string},
+
+    'license_uri'       => {value => \&url},
+    'distribution_type' => {value => \&string},
+    'dynamic_config'    => {value => \&boolean},
+
+    'requires'       => $module_map1,
+    'recommends'     => $module_map1,
+    'build_requires' => $module_map1,
+    'conflicts'      => $module_map2,
+
+    # additional user defined key/value pairs
+    # note we can only validate the key name, as the structure is user defined
+    ':key' => {name => \&string, value => \&anything},
+  },
+);
+
+#--------------------------------------------------------------------------#
+# Code
+#--------------------------------------------------------------------------#
+
+#pod =method new
+#pod
+#pod   my $cmv = CPAN::Meta::Validator->new( $struct )
+#pod
+#pod The constructor must be passed a metadata structure.
+#pod
+#pod =cut
+
+sub new {
+  my ($class, $data) = @_;
+
+  # create an attributes hash
+  my $self = {
+    'data'   => $data,
+    'spec'   => eval { $data->{'meta-spec'}{'version'} } || "1.0",
+    'errors' => undef,
+  };
+
+  # create the object
+  return bless $self, $class;
+}
+
+#pod =method is_valid
+#pod
+#pod   if ( $cmv->is_valid ) {
+#pod     ...
+#pod   }
+#pod
+#pod Returns a boolean value indicating whether the metadata provided
+#pod is valid.
+#pod
+#pod =cut
+
+sub is_valid {
+  my $self         = shift;
+  my $data         = $self->{data};
+  my $spec_version = $self->{spec};
+  $self->check_map($definitions{$spec_version}, $data);
+  return !$self->errors;
+}
+
+#pod =method errors
+#pod
+#pod   warn( join "\n", $cmv->errors );
+#pod
+#pod Returns a list of errors seen during validation.
+#pod
+#pod =cut
+
+sub errors {
+  my $self = shift;
+  return () unless (defined $self->{errors});
+  return @{$self->{errors}};
+}
+
+#pod =begin :internals
+#pod
+#pod =head2 Check Methods
+#pod
+#pod =over
+#pod
+#pod =item *
+#pod
+#pod check_map($spec,$data)
+#pod
+#pod Checks whether a map (or hash) part of the data structure conforms to the
+#pod appropriate specification definition.
+#pod
+#pod =item *
+#pod
+#pod check_list($spec,$data)
+#pod
+#pod Checks whether a list (or array) part of the data structure conforms to
+#pod the appropriate specification definition.
+#pod
+#pod =item *
+#pod
+#pod =back
+#pod
+#pod =cut
+
+my $spec_error = "Missing validation action in specification. "
+  . "Must be one of 'map', 'list', or 'value'";
+
+sub check_map {
+  my ($self, $spec, $data) = @_;
+
+  if (ref($spec) ne 'HASH') {
+    $self->_error("Unknown META specification, cannot validate.");
+    return;
+  }
+
+  if (ref($data) ne 'HASH') {
+    $self->_error("Expected a map structure from string or file.");
+    return;
+  }
+
+  for my $key (keys %$spec) {
+    next unless ($spec->{$key}->{mandatory});
+    next if (defined $data->{$key});
+    push @{$self->{stack}}, $key;
+    $self->_error("Missing mandatory field, '$key'");
+    pop @{$self->{stack}};
+  }
+
+  for my $key (keys %$data) {
+    push @{$self->{stack}}, $key;
+    if ($spec->{$key}) {
+      if ($spec->{$key}{value}) {
+        $spec->{$key}{value}->($self, $key, $data->{$key});
+      }
+      elsif ($spec->{$key}{'map'}) {
+        $self->check_map($spec->{$key}{'map'}, $data->{$key});
+      }
+      elsif ($spec->{$key}{'list'}) {
+        $self->check_list($spec->{$key}{'list'}, $data->{$key});
+      }
+      else {
+        $self->_error("$spec_error for '$key'");
+      }
+
+    }
+    elsif ($spec->{':key'}) {
+      $spec->{':key'}{name}->($self, $key, $key);
+      if ($spec->{':key'}{value}) {
+        $spec->{':key'}{value}->($self, $key, $data->{$key});
+      }
+      elsif ($spec->{':key'}{'map'}) {
+        $self->check_map($spec->{':key'}{'map'}, $data->{$key});
+      }
+      elsif ($spec->{':key'}{'list'}) {
+        $self->check_list($spec->{':key'}{'list'}, $data->{$key});
+      }
+      else {
+        $self->_error("$spec_error for ':key'");
+      }
+
+
+    }
+    else {
+      $self->_error("Unknown key, '$key', found in map structure");
+    }
+    pop @{$self->{stack}};
+  }
+}
+
+sub check_list {
+  my ($self, $spec, $data) = @_;
+
+  if (ref($data) ne 'ARRAY') {
+    $self->_error("Expected a list structure");
+    return;
+  }
+
+  if (defined $spec->{mandatory}) {
+    if (!defined $data->[0]) {
+      $self->_error("Missing entries from mandatory list");
+    }
+  }
+
+  for my $value (@$data) {
+    push @{$self->{stack}}, $value || "<undef>";
+    if (defined $spec->{value}) {
+      $spec->{value}->($self, 'list', $value);
+    }
+    elsif (defined $spec->{'map'}) {
+      $self->check_map($spec->{'map'}, $value);
+    }
+    elsif (defined $spec->{'list'}) {
+      $self->check_list($spec->{'list'}, $value);
+    }
+    elsif ($spec->{':key'}) {
+      $self->check_map($spec, $value);
+    }
+    else {
+      $self->_error("$spec_error associated with '$self->{stack}[-2]'");
+    }
+    pop @{$self->{stack}};
+  }
+}
+
+#pod =head2 Validator Methods
+#pod
+#pod =over
+#pod
+#pod =item *
+#pod
+#pod header($self,$key,$value)
+#pod
+#pod Validates that the header is valid.
+#pod
+#pod Note: No longer used as we now read the data structure, not the file.
+#pod
+#pod =item *
+#pod
+#pod url($self,$key,$value)
+#pod
+#pod Validates that a given value is in an acceptable URL format
+#pod
+#pod =item *
+#pod
+#pod urlspec($self,$key,$value)
+#pod
+#pod Validates that the URL to a META specification is a known one.
+#pod
+#pod =item *
+#pod
+#pod string_or_undef($self,$key,$value)
+#pod
+#pod Validates that the value is either a string or an undef value. Bit of a
+#pod catchall function for parts of the data structure that are completely user
+#pod defined.
+#pod
+#pod =item *
+#pod
+#pod string($self,$key,$value)
+#pod
+#pod Validates that a string exists for the given key.
+#pod
+#pod =item *
+#pod
+#pod file($self,$key,$value)
+#pod
+#pod Validate that a file is passed for the given key. This may be made more
+#pod thorough in the future. For now it acts like \&string.
+#pod
+#pod =item *
+#pod
+#pod exversion($self,$key,$value)
+#pod
+#pod Validates a list of versions, e.g. '<= 5, >=2, ==3, !=4, >1, <6, 0'.
+#pod
+#pod =item *
+#pod
+#pod version($self,$key,$value)
+#pod
+#pod Validates a single version string. Versions of the type '5.8.8' and '0.00_00'
+#pod are both valid. A leading 'v' like 'v1.2.3' is also valid.
+#pod
+#pod =item *
+#pod
+#pod boolean($self,$key,$value)
+#pod
+#pod Validates for a boolean value. Currently these values are '1', '0', 'true',
+#pod 'false', however the latter 2 may be removed.
+#pod
+#pod =item *
+#pod
+#pod license($self,$key,$value)
+#pod
+#pod Validates that a value is given for the license. Returns 1 if an known license
+#pod type, or 2 if a value is given but the license type is not a recommended one.
+#pod
+#pod =item *
+#pod
+#pod custom_1($self,$key,$value)
+#pod
+#pod Validates that the given key is in CamelCase, to indicate a user defined
+#pod keyword and only has characters in the class [-_a-zA-Z].  In version 1.X
+#pod of the spec, this was only explicitly stated for 'resources'.
+#pod
+#pod =item *
+#pod
+#pod custom_2($self,$key,$value)
+#pod
+#pod Validates that the given key begins with 'x_' or 'X_', to indicate a user
+#pod defined keyword and only has characters in the class [-_a-zA-Z]
+#pod
+#pod =item *
+#pod
+#pod identifier($self,$key,$value)
+#pod
+#pod Validates that key is in an acceptable format for the META specification,
+#pod for an identifier, i.e. any that matches the regular expression
+#pod qr/[a-z][a-z_]/i.
+#pod
+#pod =item *
+#pod
+#pod module($self,$key,$value)
+#pod
+#pod Validates that a given key is in an acceptable module name format, e.g.
+#pod 'Test::CPAN::Meta::Version'.
+#pod
+#pod =back
+#pod
+#pod =end :internals
+#pod
+#pod =cut
+
+sub header {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    return 1 if ($value && $value =~ /^--- #YAML:1.0/);
+  }
+  $self->_error("file does not have a valid YAML header.");
+  return 0;
+}
+
+sub release_status {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    my $version = $self->{data}{version} || '';
+    if ($version =~ /_/) {
+      return 1 if ($value =~ /\A(?:testing|unstable)\z/);
+      $self->_error("'$value' for '$key' is invalid for version '$version'");
+    }
+    else {
+      return 1 if ($value =~ /\A(?:stable|testing|unstable)\z/);
+      $self->_error("'$value' for '$key' is invalid");
+    }
+  }
+  else {
+    $self->_error("'$key' is not defined");
+  }
+  return 0;
+}
+
+# _uri_split taken from URI::Split by Gisle Aas, Copyright 2003
+sub _uri_split {
+  return $_[0]
+    =~ m,(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?,;
+}
+
+sub url {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    my ($scheme, $auth, $path, $query, $frag) = _uri_split($value);
+    unless (defined $scheme && length $scheme) {
+      $self->_error("'$value' for '$key' does not have a URL scheme");
+      return 0;
+    }
+    unless (defined $auth && length $auth) {
+      $self->_error("'$value' for '$key' does not have a URL authority");
+      return 0;
+    }
+    return 1;
+  }
+  $value ||= '';
+  $self->_error("'$value' for '$key' is not a valid URL.");
+  return 0;
+}
+
+sub urlspec {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    return 1 if ($value && $known_specs{$self->{spec}} eq $value);
+    if ($value && $known_urls{$value}) {
+      $self->_error('META specification URL does not match version');
+      return 0;
+    }
+  }
+  $self->_error('Unknown META specification');
+  return 0;
+}
+
+sub anything { return 1 }
+
+sub string {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    return 1 if ($value || $value =~ /^0$/);
+  }
+  $self->_error("value is an undefined string");
+  return 0;
+}
+
+sub string_or_undef {
+  my ($self, $key, $value) = @_;
+  return 1 unless (defined $value);
+  return 1 if ($value || $value =~ /^0$/);
+  $self->_error("No string defined for '$key'");
+  return 0;
+}
+
+sub file {
+  my ($self, $key, $value) = @_;
+  return 1 if (defined $value);
+  $self->_error("No file defined for '$key'");
+  return 0;
+}
+
+sub exversion {
+  my ($self, $key, $value) = @_;
+  if (defined $value && ($value || $value =~ /0/)) {
+    my $pass = 1;
+    for (split(",", $value)) { $self->version($key, $_) or ($pass = 0); }
+    return $pass;
+  }
+  $value = '<undef>' unless (defined $value);
+  $self->_error("'$value' for '$key' is not a valid version.");
+  return 0;
+}
+
+sub version {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    return 0 unless ($value || $value =~ /0/);
+    return 1
+      if ($value =~ /^\s*((<|<=|>=|>|!=|==)\s*)?v?\d+((\.\d+((_|\.)\d+)?)?)/);
+  }
+  else {
+    $value = '<undef>';
+  }
+  $self->_error("'$value' for '$key' is not a valid version.");
+  return 0;
+}
+
+sub boolean {
+  my ($self, $key, $value) = @_;
+  if (defined $value) {
+    return 1 if ($value =~ /^(0|1|true|false)$/);
+  }
+  else {
+    $value = '<undef>';
+  }
+  $self->_error("'$value' for '$key' is not a boolean value.");
+  return 0;
+}
+
+my %v1_licenses = (
+  'perl'         => 'http://dev.perl.org/licenses/',
+  'gpl'          => 'http://www.opensource.org/licenses/gpl-license.php',
+  'apache'       => 'http://apache.org/licenses/LICENSE-2.0',
+  'artistic'     => 'http://opensource.org/licenses/artistic-license.php',
+  'artistic_2'   => 'http://opensource.org/licenses/artistic-license-2.0.php',
+  'lgpl'         => 'http://www.opensource.org/licenses/lgpl-license.php',
+  'bsd'          => 'http://www.opensource.org/licenses/bsd-license.php',
+  'gpl'          => 'http://www.opensource.org/licenses/gpl-license.php',
+  'mit'          => 'http://opensource.org/licenses/mit-license.php',
+  'mozilla'      => 'http://opensource.org/licenses/mozilla1.1.php',
+  'open_source'  => undef,
+  'unrestricted' => undef,
+  'restrictive'  => undef,
+  'unknown'      => undef,
+);
+
+my %v2_licenses = map { $_ => 1 } qw(
+  agpl_3
+  apache_1_1
+  apache_2_0
+  artistic_1
+  artistic_2
+  bsd
+  freebsd
+  gfdl_1_2
+  gfdl_1_3
+  gpl_1
+  gpl_2
+  gpl_3
+  lgpl_2_1
+  lgpl_3_0
+  mit
+  mozilla_1_0
+  mozilla_1_1
+  openssl
+  perl_5
+  qpl_1_0
+  ssleay
+  sun
+  zlib
+  open_source
+  restricted
+  unrestricted
+  unknown
+);
+
+sub license {
+  my ($self, $key, $value) = @_;
+  my $licenses = $self->{spec} < 2 ? \%v1_licenses : \%v2_licenses;
+  if (defined $value) {
+    return 1 if ($value && exists $licenses->{$value});
+  }
+  else {
+    $value = '<undef>';
+  }
+  $self->_error("License '$value' is invalid");
+  return 0;
+}
+
+sub custom_1 {
+  my ($self, $key) = @_;
+  if (defined $key) {
+
+    # a valid user defined key should be alphabetic
+    # and contain at least one capital case letter.
+    return 1 if ($key && $key =~ /^[_a-z]+$/i && $key =~ /[A-Z]/);
+  }
+  else {
+    $key = '<undef>';
+  }
+  $self->_error("Custom resource '$key' must be in CamelCase.");
+  return 0;
+}
+
+sub custom_2 {
+  my ($self, $key) = @_;
+  if (defined $key) {
+    return 1 if ($key && $key =~ /^x_/i);    # user defined
+  }
+  else {
+    $key = '<undef>';
+  }
+  $self->_error("Custom key '$key' must begin with 'x_' or 'X_'.");
+  return 0;
+}
+
+sub identifier {
+  my ($self, $key) = @_;
+  if (defined $key) {
+    return 1 if ($key && $key =~ /^([a-z][_a-z]+)$/i);    # spec 2.0 defined
+  }
+  else {
+    $key = '<undef>';
+  }
+  $self->_error("Key '$key' is not a legal identifier.");
+  return 0;
+}
+
+sub module {
+  my ($self, $key) = @_;
+  if (defined $key) {
+    return 1 if ($key && $key =~ /^[A-Za-z0-9_]+(::[A-Za-z0-9_]+)*$/);
+  }
+  else {
+    $key = '<undef>';
+  }
+  $self->_error("Key '$key' is not a legal module name.");
+  return 0;
+}
+
+my @valid_phases = qw/ configure build test runtime develop /;
+
+sub phase {
+  my ($self, $key) = @_;
+  if (defined $key) {
+    return 1 if (length $key && grep { $key eq $_ } @valid_phases);
+    return 1 if $key =~ /x_/i;
+  }
+  else {
+    $key = '<undef>';
+  }
+  $self->_error("Key '$key' is not a legal phase.");
+  return 0;
+}
+
+my @valid_relations = qw/ requires recommends suggests conflicts /;
+
+sub relation {
+  my ($self, $key) = @_;
+  if (defined $key) {
+    return 1 if (length $key && grep { $key eq $_ } @valid_relations);
+    return 1 if $key =~ /x_/i;
+  }
+  else {
+    $key = '<undef>';
+  }
+  $self->_error("Key '$key' is not a legal prereq relationship.");
+  return 0;
+}
+
+sub _error {
+  my $self = shift;
+  my $mess = shift;
+
+  $mess .= ' (' . join(' -> ', @{$self->{stack}}) . ')' if ($self->{stack});
+  $mess .= " [Validation: $self->{spec}]";
+
+  push @{$self->{errors}}, $mess;
+}
+
+1;
+
+# ABSTRACT: validate CPAN distribution metadata structures
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::Validator - validate CPAN distribution metadata structures
+
+=head1 VERSION
+
+version 2.150005
+
+=head1 SYNOPSIS
+
+  my $struct = decode_json_file('META.json');
+
+  my $cmv = CPAN::Meta::Validator->new( $struct );
+
+  unless ( $cmv->is_valid ) {
+    my $msg = "Invalid META structure.  Errors found:\n";
+    $msg .= join( "\n", $cmv->errors );
+    die $msg;
+  }
+
+=head1 DESCRIPTION
+
+This module validates a CPAN Meta structure against the version of the
+the specification claimed in the C<meta-spec> field of the structure.
+
+=head1 METHODS
+
+=head2 new
+
+  my $cmv = CPAN::Meta::Validator->new( $struct )
+
+The constructor must be passed a metadata structure.
+
+=head2 is_valid
+
+  if ( $cmv->is_valid ) {
+    ...
+  }
+
+Returns a boolean value indicating whether the metadata provided
+is valid.
+
+=head2 errors
+
+  warn( join "\n", $cmv->errors );
+
+Returns a list of errors seen during validation.
+
+=begin :internals
+
+=head2 Check Methods
+
+=over
+
+=item *
+
+check_map($spec,$data)
+
+Checks whether a map (or hash) part of the data structure conforms to the
+appropriate specification definition.
+
+=item *
+
+check_list($spec,$data)
+
+Checks whether a list (or array) part of the data structure conforms to
+the appropriate specification definition.
+
+=item *
+
+=back
+
+=head2 Validator Methods
+
+=over
+
+=item *
+
+header($self,$key,$value)
+
+Validates that the header is valid.
+
+Note: No longer used as we now read the data structure, not the file.
+
+=item *
+
+url($self,$key,$value)
+
+Validates that a given value is in an acceptable URL format
+
+=item *
+
+urlspec($self,$key,$value)
+
+Validates that the URL to a META specification is a known one.
+
+=item *
+
+string_or_undef($self,$key,$value)
+
+Validates that the value is either a string or an undef value. Bit of a
+catchall function for parts of the data structure that are completely user
+defined.
+
+=item *
+
+string($self,$key,$value)
+
+Validates that a string exists for the given key.
+
+=item *
+
+file($self,$key,$value)
+
+Validate that a file is passed for the given key. This may be made more
+thorough in the future. For now it acts like \&string.
+
+=item *
+
+exversion($self,$key,$value)
+
+Validates a list of versions, e.g. '<= 5, >=2, ==3, !=4, >1, <6, 0'.
+
+=item *
+
+version($self,$key,$value)
+
+Validates a single version string. Versions of the type '5.8.8' and '0.00_00'
+are both valid. A leading 'v' like 'v1.2.3' is also valid.
+
+=item *
+
+boolean($self,$key,$value)
+
+Validates for a boolean value. Currently these values are '1', '0', 'true',
+'false', however the latter 2 may be removed.
+
+=item *
+
+license($self,$key,$value)
+
+Validates that a value is given for the license. Returns 1 if an known license
+type, or 2 if a value is given but the license type is not a recommended one.
+
+=item *
+
+custom_1($self,$key,$value)
+
+Validates that the given key is in CamelCase, to indicate a user defined
+keyword and only has characters in the class [-_a-zA-Z].  In version 1.X
+of the spec, this was only explicitly stated for 'resources'.
+
+=item *
+
+custom_2($self,$key,$value)
+
+Validates that the given key begins with 'x_' or 'X_', to indicate a user
+defined keyword and only has characters in the class [-_a-zA-Z]
+
+=item *
+
+identifier($self,$key,$value)
+
+Validates that key is in an acceptable format for the META specification,
+for an identifier, i.e. any that matches the regular expression
+qr/[a-z][a-z_]/i.
+
+=item *
+
+module($self,$key,$value)
+
+Validates that a given key is in an acceptable module name format, e.g.
+'Test::CPAN::Meta::Version'.
+
+=back
+
+=end :internals
+
+=for Pod::Coverage anything boolean check_list custom_1 custom_2 exversion file
+identifier license module phase relation release_status string string_or_undef
+url urlspec version header check_map
+
+=head1 BUGS
+
+Please report any bugs or feature using the CPAN Request Tracker.
+Bugs can be submitted through the web interface at
+L<http://rt.cpan.org/Dist/Display.html?Queue=CPAN-Meta>
+
+When submitting a bug or request, please include a test-file or a patch to an
+existing test-file that illustrates the bug or desired feature.
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by David Golden and Ricardo Signes.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+
+# vim: ts=2 sts=2 sw=2 et :
diff --git a/.checksetup_lib/lib/perl5/CPAN/Meta/YAML.pm b/.checksetup_lib/lib/perl5/CPAN/Meta/YAML.pm
new file mode 100644
index 0000000000..8a298f0c55
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/CPAN/Meta/YAML.pm
@@ -0,0 +1,985 @@
+use 5.008001;    # sane UTF-8 support
+use strict;
+use warnings;
+
+package CPAN::Meta::YAML;    # git description: v1.68-2-gcc5324e
+
+# XXX-INGY is 5.8.1 too old/broken for utf8?
+# XXX-XDG Lancaster consensus was that it was sufficient until
+# proven otherwise
+$CPAN::Meta::YAML::VERSION = '0.018';
+;                            # original $VERSION removed by Doppelgaenger
+
+#####################################################################
+# The CPAN::Meta::YAML API.
+#
+# These are the currently documented API functions/methods and
+# exports:
+
+use Exporter;
+our @ISA       = qw{ Exporter  };
+our @EXPORT    = qw{ Load Dump };
+our @EXPORT_OK = qw{ LoadFile DumpFile freeze thaw };
+
+###
+# Functional/Export API:
+
+sub Dump {
+  return CPAN::Meta::YAML->new(@_)->_dump_string;
+}
+
+# XXX-INGY Returning last document seems a bad behavior.
+# XXX-XDG I think first would seem more natural, but I don't know
+# that it's worth changing now
+sub Load {
+  my $self = CPAN::Meta::YAML->_load_string(@_);
+  if (wantarray) {
+    return @$self;
+  }
+  else {
+    # To match YAML.pm, return the last document
+    return $self->[-1];
+  }
+}
+
+# XXX-INGY Do we really need freeze and thaw?
+# XXX-XDG I don't think so.  I'd support deprecating them.
+BEGIN {
+  *freeze = \&Dump;
+  *thaw   = \&Load;
+}
+
+sub DumpFile {
+  my $file = shift;
+  return CPAN::Meta::YAML->new(@_)->_dump_file($file);
+}
+
+sub LoadFile {
+  my $file = shift;
+  my $self = CPAN::Meta::YAML->_load_file($file);
+  if (wantarray) {
+    return @$self;
+  }
+  else {
+    # Return only the last document to match YAML.pm,
+    return $self->[-1];
+  }
+}
+
+
+###
+# Object Oriented API:
+
+# Create an empty CPAN::Meta::YAML object
+# XXX-INGY Why do we use ARRAY object?
+# NOTE: I get it now, but I think it's confusing and not needed.
+# Will change it on a branch later, for review.
+#
+# XXX-XDG I don't support changing it yet.  It's a very well-documented
+# "API" of CPAN::Meta::YAML.  I'd support deprecating it, but Adam suggested
+# we not change it until YAML.pm's own OO API is established so that
+# users only have one API change to digest, not two
+sub new {
+  my $class = shift;
+  bless [@_], $class;
+}
+
+# XXX-INGY It probably doesn't matter, and it's probably too late to
+# change, but 'read/write' are the wrong names. Read and Write
+# are actions that take data from storage to memory
+# characters/strings. These take the data to/from storage to native
+# Perl objects, which the terms dump and load are meant. As long as
+# this is a legacy quirk to CPAN::Meta::YAML it's ok, but I'd prefer not
+# to add new {read,write}_* methods to this API.
+
+sub read_string {
+  my $self = shift;
+  $self->_load_string(@_);
+}
+
+sub write_string {
+  my $self = shift;
+  $self->_dump_string(@_);
+}
+
+sub read {
+  my $self = shift;
+  $self->_load_file(@_);
+}
+
+sub write {
+  my $self = shift;
+  $self->_dump_file(@_);
+}
+
+
+#####################################################################
+# Constants
+
+# Printed form of the unprintable characters in the lowest range
+# of ASCII characters, listed by ASCII ordinal position.
+my @UNPRINTABLE = qw(
+  0    x01  x02  x03  x04  x05  x06  a
+  b    t    n    v    f    r    x0E  x0F
+  x10  x11  x12  x13  x14  x15  x16  x17
+  x18  x19  x1A  e    x1C  x1D  x1E  x1F
+);
+
+# Printable characters for escapes
+my %UNESCAPES = (
+  0    => "\x00",
+  z    => "\x00",
+  N    => "\x85",
+  a    => "\x07",
+  b    => "\x08",
+  t    => "\x09",
+  n    => "\x0a",
+  v    => "\x0b",
+  f    => "\x0c",
+  r    => "\x0d",
+  e    => "\x1b",
+  '\\' => '\\',
+);
+
+# XXX-INGY
+# I(ngy) need to decide if these values should be quoted in
+# CPAN::Meta::YAML or not. Probably yes.
+
+# These 3 values have special meaning when unquoted and using the
+# default YAML schema. They need quotes if they are strings.
+my %QUOTE = map { $_ => 1 } qw{
+  null true false
+};
+
+# The commented out form is simpler, but overloaded the Perl regex
+# engine due to recursion and backtracking problems on strings
+# larger than 32,000ish characters. Keep it for reference purposes.
+# qr/\"((?:\\.|[^\"])*)\"/
+my $re_capture_double_quoted = qr/\"([^\\"]*(?:\\.[^\\"]*)*)\"/;
+my $re_capture_single_quoted = qr/\'([^\']*(?:\'\'[^\']*)*)\'/;
+
+# unquoted re gets trailing space that needs to be stripped
+my $re_capture_unquoted_key
+  = qr/([^:]+(?::+\S(?:[^:]*|.*?(?=:)))*)(?=\s*\:(?:\s+|$))/;
+my $re_trailing_comment    = qr/(?:\s+\#.*)?/;
+my $re_key_value_separator = qr/\s*:(?:\s+(?:\#.*)?|$)/;
+
+
+#####################################################################
+# CPAN::Meta::YAML Implementation.
+#
+# These are the private methods that do all the work. They may change
+# at any time.
+
+
+###
+# Loader functions:
+
+# Create an object from a file
+sub _load_file {
+  my $class = ref $_[0] ? ref shift : shift;
+
+  # Check the file
+  my $file = shift or $class->_error('You did not specify a file name');
+  $class->_error("File '$file' does not exist")              unless -e $file;
+  $class->_error("'$file' is a directory, not a file")       unless -f _;
+  $class->_error("Insufficient permissions to read '$file'") unless -r _;
+
+  # Open unbuffered with strict UTF-8 decoding and no translation layers
+  open(my $fh, "<:unix:encoding(UTF-8)", $file);
+  unless ($fh) {
+    $class->_error("Failed to open file '$file': $!");
+  }
+
+  # flock if available (or warn if not possible for OS-specific reasons)
+  if (_can_flock()) {
+    flock($fh, Fcntl::LOCK_SH()) or warn "Couldn't lock '$file' for reading: $!";
+  }
+
+  # slurp the contents
+  my $contents = eval {
+    use warnings FATAL => 'utf8';
+    local $/;
+    <$fh>;
+  };
+  if (my $err = $@) {
+    $class->_error("Error reading from file '$file': $err");
+  }
+
+  # close the file (release the lock)
+  unless (close $fh) {
+    $class->_error("Failed to close file '$file': $!");
+  }
+
+  $class->_load_string($contents);
+}
+
+# Create an object from a string
+sub _load_string {
+  my $class = ref $_[0] ? ref shift : shift;
+  my $self = bless [], $class;
+  my $string = $_[0];
+  eval {
+    unless (defined $string) {
+      die \"Did not provide a string to load";
+    }
+
+    # Check if Perl has it marked as characters, but it's internally
+    # inconsistent.  E.g. maybe latin1 got read on a :utf8 layer
+    if (utf8::is_utf8($string) && !utf8::valid($string)) {
+      die \<<'...';
+Read an invalid UTF-8 string (maybe mixed UTF-8 and 8-bit character set).
+Did you decode with lax ":utf8" instead of strict ":encoding(UTF-8)"?
+...
+    }
+
+    # Ensure Unicode character semantics, even for 0x80-0xff
+    utf8::upgrade($string);
+
+    # Check for and strip any leading UTF-8 BOM
+    $string =~ s/^\x{FEFF}//;
+
+    # Check for some special cases
+    return $self unless length $string;
+
+    # Split the file into lines
+    my @lines = grep { !/^\s*(?:\#.*)?\z/ } split /(?:\015{1,2}\012|\015|\012)/,
+      $string;
+
+    # Strip the initial YAML header
+    @lines and $lines[0] =~ /^\%YAML[: ][\d\.]+.*\z/ and shift @lines;
+
+    # A nibbling parser
+    my $in_document = 0;
+    while (@lines) {
+
+      # Do we have a document header?
+      if ($lines[0] =~ /^---\s*(?:(.+)\s*)?\z/) {
+
+        # Handle scalar documents
+        shift @lines;
+        if (defined $1 and $1 !~ /^(?:\#.+|\%YAML[: ][\d\.]+)\z/) {
+          push @$self, $self->_load_scalar("$1", [undef], \@lines);
+          next;
+        }
+        $in_document = 1;
+      }
+
+      if (!@lines or $lines[0] =~ /^(?:---|\.\.\.)/) {
+
+        # A naked document
+        push @$self, undef;
+        while (@lines and $lines[0] !~ /^---/) {
+          shift @lines;
+        }
+        $in_document = 0;
+
+        # XXX The final '-+$' is to look for -- which ends up being an
+        # error later.
+      }
+      elsif (!$in_document && @$self) {
+
+        # only the first document can be explicit
+        die \"CPAN::Meta::YAML failed to classify the line '$lines[0]'";
+      }
+      elsif ($lines[0] =~ /^\s*\-(?:\s|$|-+$)/) {
+
+        # An array at the root
+        my $document = [];
+        push @$self, $document;
+        $self->_load_array($document, [0], \@lines);
+
+      }
+      elsif ($lines[0] =~ /^(\s*)\S/) {
+
+        # A hash at the root
+        my $document = {};
+        push @$self, $document;
+        $self->_load_hash($document, [length($1)], \@lines);
+
+      }
+      else {
+        # Shouldn't get here.  @lines have whitespace-only lines
+        # stripped, and previous match is a line with any
+        # non-whitespace.  So this clause should only be reachable via
+        # a perlbug where \s is not symmetric with \S
+
+        # uncoverable statement
+        die \"CPAN::Meta::YAML failed to classify the line '$lines[0]'";
+      }
+    }
+  };
+  my $err = $@;
+  if (ref $err eq 'SCALAR') {
+    $self->_error(${$err});
+  }
+  elsif ($err) {
+    $self->_error($err);
+  }
+
+  return $self;
+}
+
+sub _unquote_single {
+  my ($self, $string) = @_;
+  return '' unless length $string;
+  $string =~ s/\'\'/\'/g;
+  return $string;
+}
+
+sub _unquote_double {
+  my ($self, $string) = @_;
+  return '' unless length $string;
+  $string =~ s/\\"/"/g;
+  $string =~ s{\\([Nnever\\fartz0b]|x([0-9a-fA-F]{2}))}
+         {(length($1)>1)?pack("H2",$2):$UNESCAPES{$1}}gex;
+  return $string;
+}
+
+# Load a YAML scalar string to the actual Perl scalar
+sub _load_scalar {
+  my ($self, $string, $indent, $lines) = @_;
+
+  # Trim trailing whitespace
+  $string =~ s/\s*\z//;
+
+  # Explitic null/undef
+  return undef if $string eq '~';
+
+  # Single quote
+  if ($string =~ /^$re_capture_single_quoted$re_trailing_comment\z/) {
+    return $self->_unquote_single($1);
+  }
+
+  # Double quote.
+  if ($string =~ /^$re_capture_double_quoted$re_trailing_comment\z/) {
+    return $self->_unquote_double($1);
+  }
+
+  # Special cases
+  if ($string =~ /^[\'\"!&]/) {
+    die \"CPAN::Meta::YAML does not support a feature in line '$string'";
+  }
+  return {} if $string =~ /^{}(?:\s+\#.*)?\z/;
+  return [] if $string =~ /^\[\](?:\s+\#.*)?\z/;
+
+  # Regular unquoted string
+  if ($string !~ /^[>|]/) {
+    die \"CPAN::Meta::YAML found illegal characters in plain scalar: '$string'"
+      if $string =~ /^(?:-(?:\s|$)|[\@\%\`])/ or $string =~ /:(?:\s|$)/;
+    $string =~ s/\s+#.*\z//;
+    return $string;
+  }
+
+  # Error
+  die \"CPAN::Meta::YAML failed to find multi-line scalar content" unless @$lines;
+
+  # Check the indent depth
+  $lines->[0] =~ /^(\s*)/;
+  $indent->[-1] = length("$1");
+  if (defined $indent->[-2] and $indent->[-1] <= $indent->[-2]) {
+    die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'";
+  }
+
+  # Pull the lines
+  my @multiline = ();
+  while (@$lines) {
+    $lines->[0] =~ /^(\s*)/;
+    last unless length($1) >= $indent->[-1];
+    push @multiline, substr(shift(@$lines), length($1));
+  }
+
+  my $j = (substr($string, 0, 1) eq '>') ? ' ' : "\n";
+  my $t = (substr($string, 1, 1) eq '-') ? ''  : "\n";
+  return join($j, @multiline) . $t;
+}
+
+# Load an array
+sub _load_array {
+  my ($self, $array, $indent, $lines) = @_;
+
+  while (@$lines) {
+
+    # Check for a new document
+    if ($lines->[0] =~ /^(?:---|\.\.\.)/) {
+      while (@$lines and $lines->[0] !~ /^---/) {
+        shift @$lines;
+      }
+      return 1;
+    }
+
+    # Check the indent level
+    $lines->[0] =~ /^(\s*)/;
+    if (length($1) < $indent->[-1]) {
+      return 1;
+    }
+    elsif (length($1) > $indent->[-1]) {
+      die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'";
+    }
+
+    if ($lines->[0] =~ /^(\s*\-\s+)[^\'\"]\S*\s*:(?:\s+|$)/) {
+
+      # Inline nested hash
+      my $indent2 = length("$1");
+      $lines->[0] =~ s/-/ /;
+      push @$array, {};
+      $self->_load_hash($array->[-1], [@$indent, $indent2], $lines);
+
+    }
+    elsif ($lines->[0] =~ /^\s*\-\s*\z/) {
+      shift @$lines;
+      unless (@$lines) {
+        push @$array, undef;
+        return 1;
+      }
+      if ($lines->[0] =~ /^(\s*)\-/) {
+        my $indent2 = length("$1");
+        if ($indent->[-1] == $indent2) {
+
+          # Null array entry
+          push @$array, undef;
+        }
+        else {
+          # Naked indenter
+          push @$array, [];
+          $self->_load_array($array->[-1], [@$indent, $indent2], $lines);
+        }
+
+      }
+      elsif ($lines->[0] =~ /^(\s*)\S/) {
+        push @$array, {};
+        $self->_load_hash($array->[-1], [@$indent, length("$1")], $lines);
+
+      }
+      else {
+        die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
+      }
+
+    }
+    elsif ($lines->[0] =~ /^\s*\-(\s*)(.+?)\s*\z/) {
+
+      # Array entry with a value
+      shift @$lines;
+      push @$array, $self->_load_scalar("$2", [@$indent, undef], $lines);
+
+    }
+    elsif (defined $indent->[-2] and $indent->[-1] == $indent->[-2]) {
+
+      # This is probably a structure like the following...
+      # ---
+      # foo:
+      # - list
+      # bar: value
+      #
+      # ... so lets return and let the hash parser handle it
+      return 1;
+
+    }
+    else {
+      die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
+    }
+  }
+
+  return 1;
+}
+
+# Load a hash
+sub _load_hash {
+  my ($self, $hash, $indent, $lines) = @_;
+
+  while (@$lines) {
+
+    # Check for a new document
+    if ($lines->[0] =~ /^(?:---|\.\.\.)/) {
+      while (@$lines and $lines->[0] !~ /^---/) {
+        shift @$lines;
+      }
+      return 1;
+    }
+
+    # Check the indent level
+    $lines->[0] =~ /^(\s*)/;
+    if (length($1) < $indent->[-1]) {
+      return 1;
+    }
+    elsif (length($1) > $indent->[-1]) {
+      die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'";
+    }
+
+    # Find the key
+    my $key;
+
+    # Quoted keys
+    if ($lines->[0] =~ s/^\s*$re_capture_single_quoted$re_key_value_separator//) {
+      $key = $self->_unquote_single($1);
+    }
+    elsif ($lines->[0] =~ s/^\s*$re_capture_double_quoted$re_key_value_separator//)
+    {
+      $key = $self->_unquote_double($1);
+    }
+    elsif ($lines->[0] =~ s/^\s*$re_capture_unquoted_key$re_key_value_separator//) {
+      $key = $1;
+      $key =~ s/\s+$//;
+    }
+    elsif ($lines->[0] =~ /^\s*\?/) {
+      die \"CPAN::Meta::YAML does not support a feature in line '$lines->[0]'";
+    }
+    else {
+      die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
+    }
+
+    if (exists $hash->{$key}) {
+      warn "CPAN::Meta::YAML found a duplicate key '$key' in line '$lines->[0]'";
+    }
+
+    # Do we have a value?
+    if (length $lines->[0]) {
+
+      # Yes
+      $hash->{$key} = $self->_load_scalar(shift(@$lines), [@$indent, undef], $lines);
+    }
+    else {
+      # An indent
+      shift @$lines;
+      unless (@$lines) {
+        $hash->{$key} = undef;
+        return 1;
+      }
+      if ($lines->[0] =~ /^(\s*)-/) {
+        $hash->{$key} = [];
+        $self->_load_array($hash->{$key}, [@$indent, length($1)], $lines);
+      }
+      elsif ($lines->[0] =~ /^(\s*)./) {
+        my $indent2 = length("$1");
+        if ($indent->[-1] >= $indent2) {
+
+          # Null hash entry
+          $hash->{$key} = undef;
+        }
+        else {
+          $hash->{$key} = {};
+          $self->_load_hash($hash->{$key}, [@$indent, length($1)], $lines);
+        }
+      }
+    }
+  }
+
+  return 1;
+}
+
+
+###
+# Dumper functions:
+
+# Save an object to a file
+sub _dump_file {
+  my $self = shift;
+
+  require Fcntl;
+
+  # Check the file
+  my $file = shift or $self->_error('You did not specify a file name');
+
+  my $fh;
+
+  # flock if available (or warn if not possible for OS-specific reasons)
+  if (_can_flock()) {
+
+    # Open without truncation (truncate comes after lock)
+    my $flags = Fcntl::O_WRONLY() | Fcntl::O_CREAT();
+    sysopen($fh, $file, $flags);
+    unless ($fh) {
+      $self->_error("Failed to open file '$file' for writing: $!");
+    }
+
+    # Use no translation and strict UTF-8
+    binmode($fh, ":raw:encoding(UTF-8)");
+
+    flock($fh, Fcntl::LOCK_EX()) or warn "Couldn't lock '$file' for reading: $!";
+
+    # truncate and spew contents
+    truncate $fh, 0;
+    seek $fh, 0, 0;
+  }
+  else {
+    open $fh, ">:unix:encoding(UTF-8)", $file;
+  }
+
+  # serialize and spew to the handle
+  print {$fh} $self->_dump_string;
+
+  # close the file (release the lock)
+  unless (close $fh) {
+    $self->_error("Failed to close file '$file': $!");
+  }
+
+  return 1;
+}
+
+# Save an object to a string
+sub _dump_string {
+  my $self = shift;
+  return '' unless ref $self && @$self;
+
+  # Iterate over the documents
+  my $indent = 0;
+  my @lines  = ();
+
+  eval {
+    foreach my $cursor (@$self) {
+      push @lines, '---';
+
+      # An empty document
+      if (!defined $cursor) {
+
+        # Do nothing
+
+        # A scalar document
+      }
+      elsif (!ref $cursor) {
+        $lines[-1] .= ' ' . $self->_dump_scalar($cursor);
+
+        # A list at the root
+      }
+      elsif (ref $cursor eq 'ARRAY') {
+        unless (@$cursor) {
+          $lines[-1] .= ' []';
+          next;
+        }
+        push @lines, $self->_dump_array($cursor, $indent, {});
+
+        # A hash at the root
+      }
+      elsif (ref $cursor eq 'HASH') {
+        unless (%$cursor) {
+          $lines[-1] .= ' {}';
+          next;
+        }
+        push @lines, $self->_dump_hash($cursor, $indent, {});
+
+      }
+      else {
+        die \("Cannot serialize " . ref($cursor));
+      }
+    }
+  };
+  if (ref $@ eq 'SCALAR') {
+    $self->_error(${$@});
+  }
+  elsif ($@) {
+    $self->_error($@);
+  }
+
+  join '', map {"$_\n"} @lines;
+}
+
+sub _has_internal_string_value {
+  my $value = shift;
+  my $b_obj = B::svref_2object(\$value);    # for round trip problem
+  return $b_obj->FLAGS & B::SVf_POK();
+}
+
+sub _dump_scalar {
+  my $string = $_[1];
+  my $is_key = $_[2];
+
+  # Check this before checking length or it winds up looking like a string!
+  my $has_string_flag = _has_internal_string_value($string);
+  return '~'  unless defined $string;
+  return "''" unless length $string;
+  if (Scalar::Util::looks_like_number($string)) {
+
+    # keys and values that have been used as strings get quoted
+    if ($is_key || $has_string_flag) {
+      return qq['$string'];
+    }
+    else {
+      return $string;
+    }
+  }
+  if ($string =~ /[\x00-\x09\x0b-\x0d\x0e-\x1f\x7f-\x9f\'\n]/) {
+    $string =~ s/\\/\\\\/g;
+    $string =~ s/"/\\"/g;
+    $string =~ s/\n/\\n/g;
+    $string =~ s/[\x85]/\\N/g;
+    $string =~ s/([\x00-\x1f])/\\$UNPRINTABLE[ord($1)]/g;
+    $string =~ s/([\x7f-\x9f])/'\x' . sprintf("%X",ord($1))/ge;
+    return qq|"$string"|;
+  }
+  if ($string =~ /(?:^[~!@#%&*|>?:,'"`{}\[\]]|^-+$|\s|:\z)/ or $QUOTE{$string}) {
+    return "'$string'";
+  }
+  return $string;
+}
+
+sub _dump_array {
+  my ($self, $array, $indent, $seen) = @_;
+  if ($seen->{refaddr($array)}++) {
+    die \"CPAN::Meta::YAML does not support circular references";
+  }
+  my @lines = ();
+  foreach my $el (@$array) {
+    my $line = ('  ' x $indent) . '-';
+    my $type = ref $el;
+    if (!$type) {
+      $line .= ' ' . $self->_dump_scalar($el);
+      push @lines, $line;
+
+    }
+    elsif ($type eq 'ARRAY') {
+      if (@$el) {
+        push @lines, $line;
+        push @lines, $self->_dump_array($el, $indent + 1, $seen);
+      }
+      else {
+        $line .= ' []';
+        push @lines, $line;
+      }
+
+    }
+    elsif ($type eq 'HASH') {
+      if (keys %$el) {
+        push @lines, $line;
+        push @lines, $self->_dump_hash($el, $indent + 1, $seen);
+      }
+      else {
+        $line .= ' {}';
+        push @lines, $line;
+      }
+
+    }
+    else {
+      die \"CPAN::Meta::YAML does not support $type references";
+    }
+  }
+
+  @lines;
+}
+
+sub _dump_hash {
+  my ($self, $hash, $indent, $seen) = @_;
+  if ($seen->{refaddr($hash)}++) {
+    die \"CPAN::Meta::YAML does not support circular references";
+  }
+  my @lines = ();
+  foreach my $name (sort keys %$hash) {
+    my $el   = $hash->{$name};
+    my $line = ('  ' x $indent) . $self->_dump_scalar($name, 1) . ":";
+    my $type = ref $el;
+    if (!$type) {
+      $line .= ' ' . $self->_dump_scalar($el);
+      push @lines, $line;
+
+    }
+    elsif ($type eq 'ARRAY') {
+      if (@$el) {
+        push @lines, $line;
+        push @lines, $self->_dump_array($el, $indent + 1, $seen);
+      }
+      else {
+        $line .= ' []';
+        push @lines, $line;
+      }
+
+    }
+    elsif ($type eq 'HASH') {
+      if (keys %$el) {
+        push @lines, $line;
+        push @lines, $self->_dump_hash($el, $indent + 1, $seen);
+      }
+      else {
+        $line .= ' {}';
+        push @lines, $line;
+      }
+
+    }
+    else {
+      die \"CPAN::Meta::YAML does not support $type references";
+    }
+  }
+
+  @lines;
+}
+
+
+#####################################################################
+# DEPRECATED API methods:
+
+# Error storage (DEPRECATED as of 1.57)
+our $errstr = '';
+
+# Set error
+sub _error {
+  require Carp;
+  $errstr = $_[1];
+  $errstr =~ s/ at \S+ line \d+.*//;
+  Carp::croak($errstr);
+}
+
+# Retrieve error
+my $errstr_warned;
+
+sub errstr {
+  require Carp;
+  Carp::carp(
+    "CPAN::Meta::YAML->errstr and \$CPAN::Meta::YAML::errstr is deprecated")
+    unless $errstr_warned++;
+  $errstr;
+}
+
+
+#####################################################################
+# Helper functions. Possibly not needed.
+
+
+# Use to detect nv or iv
+use B;
+
+# XXX-INGY Is flock CPAN::Meta::YAML's responsibility?
+# Some platforms can't flock :-(
+# XXX-XDG I think it is.  When reading and writing files, we ought
+# to be locking whenever possible.  People (foolishly) use YAML
+# files for things like session storage, which has race issues.
+my $HAS_FLOCK;
+
+sub _can_flock {
+  if (defined $HAS_FLOCK) {
+    return $HAS_FLOCK;
+  }
+  else {
+    require Config;
+    my $c = \%Config::Config;
+    $HAS_FLOCK = grep { $c->{$_} } qw/d_flock d_fcntl_can_lock d_lockf/;
+    require Fcntl if $HAS_FLOCK;
+    return $HAS_FLOCK;
+  }
+}
+
+
+# XXX-INGY Is this core in 5.8.1? Can we remove this?
+# XXX-XDG Scalar::Util 1.18 didn't land until 5.8.8, so we need this
+#####################################################################
+# Use Scalar::Util if possible, otherwise emulate it
+
+use Scalar::Util ();
+
+BEGIN {
+  local $@;
+  if (eval { Scalar::Util->VERSION(1.18); }) {
+    *refaddr = *Scalar::Util::refaddr;
+  }
+  else {
+    eval <<'END_PERL';
+# Scalar::Util failed to load or too old
+sub refaddr {
+    my $pkg = ref($_[0]) or return undef;
+    if ( !! UNIVERSAL::can($_[0], 'can') ) {
+        bless $_[0], 'Scalar::Util::Fake';
+    } else {
+        $pkg = undef;
+    }
+    "$_[0]" =~ /0x(\w+)/;
+    my $i = do { no warnings 'portable'; hex $1 };
+    bless $_[0], $pkg if defined $pkg;
+    $i;
+}
+END_PERL
+  }
+}
+
+delete $CPAN::Meta::YAML::{refaddr};
+
+1;
+
+# XXX-INGY Doc notes I'm putting up here. Changing the doc when it's wrong
+# but leaving grey area stuff up here.
+#
+# I would like to change Read/Write to Load/Dump below without
+# changing the actual API names.
+#
+# It might be better to put Load/Dump API in the SYNOPSIS instead of the
+# dubious OO API.
+#
+# null and bool explanations may be outdated.
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+CPAN::Meta::YAML - Read and write a subset of YAML for CPAN Meta files
+
+=head1 VERSION
+
+version 0.018
+
+=head1 SYNOPSIS
+
+    use CPAN::Meta::YAML;
+
+    # reading a META file
+    open $fh, "<:utf8", "META.yml";
+    $yaml_text = do { local $/; <$fh> };
+    $yaml = CPAN::Meta::YAML->read_string($yaml_text)
+      or die CPAN::Meta::YAML->errstr;
+
+    # finding the metadata
+    $meta = $yaml->[0];
+
+    # writing a META file
+    $yaml_text = $yaml->write_string
+      or die CPAN::Meta::YAML->errstr;
+    open $fh, ">:utf8", "META.yml";
+    print $fh $yaml_text;
+
+=head1 DESCRIPTION
+
+This module implements a subset of the YAML specification for use in reading
+and writing CPAN metadata files like F<META.yml> and F<MYMETA.yml>.  It should
+not be used for any other general YAML parsing or generation task.
+
+NOTE: F<META.yml> (and F<MYMETA.yml>) files should be UTF-8 encoded.  Users are
+responsible for proper encoding and decoding.  In particular, the C<read> and
+C<write> methods do B<not> support UTF-8 and should not be used.
+
+=head1 SUPPORT
+
+This module is currently derived from L<YAML::Tiny> by Adam Kennedy.  If
+there are bugs in how it parses a particular META.yml file, please file
+a bug report in the YAML::Tiny bugtracker:
+L<https://github.com/Perl-Toolchain-Gang/YAML-Tiny/issues>
+
+=head1 SEE ALSO
+
+L<YAML::Tiny>, L<YAML>, L<YAML::XS>
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+Adam Kennedy <adamk@cpan.org>
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2010 by Adam Kennedy.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
+
+__END__
+
+
+# ABSTRACT: Read and write a subset of YAML for CPAN Meta files
+
+
diff --git a/.checksetup_lib/lib/perl5/JSON/PP.pm b/.checksetup_lib/lib/perl5/JSON/PP.pm
new file mode 100644
index 0000000000..342535b0b6
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/JSON/PP.pm
@@ -0,0 +1,2834 @@
+package JSON::PP;
+
+# JSON-2.0
+
+use 5.005;
+use strict;
+use base qw(Exporter);
+use overload ();
+
+use Carp ();
+use B    ();
+
+#use Devel::Peek;
+
+$JSON::PP::VERSION = '2.27400';
+
+@JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
+
+# instead of hash-access, i tried index-access for speed.
+# but this method is not faster than what i expected. so it will be changed.
+
+use constant P_ASCII           => 0;
+use constant P_LATIN1          => 1;
+use constant P_UTF8            => 2;
+use constant P_INDENT          => 3;
+use constant P_CANONICAL       => 4;
+use constant P_SPACE_BEFORE    => 5;
+use constant P_SPACE_AFTER     => 6;
+use constant P_ALLOW_NONREF    => 7;
+use constant P_SHRINK          => 8;
+use constant P_ALLOW_BLESSED   => 9;
+use constant P_CONVERT_BLESSED => 10;
+use constant P_RELAXED         => 11;
+
+use constant P_LOOSE             => 12;
+use constant P_ALLOW_BIGNUM      => 13;
+use constant P_ALLOW_BAREKEY     => 14;
+use constant P_ALLOW_SINGLEQUOTE => 15;
+use constant P_ESCAPE_SLASH      => 16;
+use constant P_AS_NONBLESSED     => 17;
+
+use constant P_ALLOW_UNKNOWN => 18;
+
+use constant OLD_PERL => $] < 5.008 ? 1 : 0;
+
+BEGIN {
+  my @xs_compati_bit_properties = qw(
+    latin1 ascii utf8 indent canonical space_before space_after allow_nonref shrink
+    allow_blessed convert_blessed relaxed allow_unknown
+  );
+  my @pp_bit_properties = qw(
+    allow_singlequote allow_bignum loose
+    allow_barekey escape_slash as_nonblessed
+  );
+
+  # Perl version check, Unicode handling is enabled?
+  # Helper module sets @JSON::PP::_properties.
+  if ($] < 5.008) {
+    my $helper = $] >= 5.006 ? 'JSON::PP::Compat5006' : 'JSON::PP::Compat5005';
+    eval qq| require $helper |;
+    if ($@) { Carp::croak $@; }
+  }
+
+  for my $name (@xs_compati_bit_properties, @pp_bit_properties) {
+    my $flag_name = 'P_' . uc($name);
+
+    eval qq/
+            sub $name {
+                my \$enable = defined \$_[1] ? \$_[1] : 1;
+
+                if (\$enable) {
+                    \$_[0]->{PROPS}->[$flag_name] = 1;
+                }
+                else {
+                    \$_[0]->{PROPS}->[$flag_name] = 0;
+                }
+
+                \$_[0];
+            }
+
+            sub get_$name {
+                \$_[0]->{PROPS}->[$flag_name] ? 1 : '';
+            }
+        /;
+  }
+
+}
+
+
+# Functions
+
+my %encode_allow_method = map { ($_ => 1) }
+  qw/utf8 pretty allow_nonref latin1 self_encode escape_slash
+  allow_blessed convert_blessed indent indent_length allow_bignum
+  as_nonblessed
+  /;
+my %decode_allow_method = map { ($_ => 1) }
+  qw/utf8 allow_nonref loose allow_singlequote allow_bignum
+  allow_barekey max_size relaxed/;
+
+
+my $JSON;    # cache
+
+sub encode_json ($) {    # encode
+  ($JSON ||= __PACKAGE__->new->utf8)->encode(@_);
+}
+
+
+sub decode_json {        # decode
+  ($JSON ||= __PACKAGE__->new->utf8)->decode(@_);
+}
+
+# Obsoleted
+
+sub to_json($) {
+  Carp::croak("JSON::PP::to_json has been renamed to encode_json.");
+}
+
+
+sub from_json($) {
+  Carp::croak("JSON::PP::from_json has been renamed to decode_json.");
+}
+
+
+# Methods
+
+sub new {
+  my $class = shift;
+  my $self  = {
+    max_depth => 512,
+    max_size  => 0,
+    indent    => 0,
+    FLAGS     => 0,
+    fallback  => sub { encode_error('Invalid value. JSON can only reference.') },
+    indent_length => 3,
+  };
+
+  bless $self, $class;
+}
+
+
+sub encode {
+  return $_[0]->PP_encode_json($_[1]);
+}
+
+
+sub decode {
+  return $_[0]->PP_decode_json($_[1], 0x00000000);
+}
+
+
+sub decode_prefix {
+  return $_[0]->PP_decode_json($_[1], 0x00000001);
+}
+
+
+# accessor
+
+
+# pretty printing
+
+sub pretty {
+  my ($self, $v) = @_;
+  my $enable = defined $v ? $v : 1;
+
+  if ($enable) {    # indent_length(3) for JSON::XS compatibility
+    $self->indent(1)->indent_length(3)->space_before(1)->space_after(1);
+  }
+  else {
+    $self->indent(0)->space_before(0)->space_after(0);
+  }
+
+  $self;
+}
+
+# etc
+
+sub max_depth {
+  my $max = defined $_[1] ? $_[1] : 0x80000000;
+  $_[0]->{max_depth} = $max;
+  $_[0];
+}
+
+
+sub get_max_depth { $_[0]->{max_depth}; }
+
+
+sub max_size {
+  my $max = defined $_[1] ? $_[1] : 0;
+  $_[0]->{max_size} = $max;
+  $_[0];
+}
+
+
+sub get_max_size { $_[0]->{max_size}; }
+
+
+sub filter_json_object {
+  $_[0]->{cb_object} = defined $_[1] ? $_[1] : 0;
+  $_[0]->{F_HOOK} = ($_[0]->{cb_object} or $_[0]->{cb_sk_object}) ? 1 : 0;
+  $_[0];
+}
+
+sub filter_json_single_key_object {
+  if (@_ > 1) {
+    $_[0]->{cb_sk_object}->{$_[1]} = $_[2];
+  }
+  $_[0]->{F_HOOK} = ($_[0]->{cb_object} or $_[0]->{cb_sk_object}) ? 1 : 0;
+  $_[0];
+}
+
+sub indent_length {
+  if (!defined $_[1] or $_[1] > 15 or $_[1] < 0) {
+    Carp::carp "The acceptable range of indent_length() is 0 to 15.";
+  }
+  else {
+    $_[0]->{indent_length} = $_[1];
+  }
+  $_[0];
+}
+
+sub get_indent_length {
+  $_[0]->{indent_length};
+}
+
+sub sort_by {
+  $_[0]->{sort_by} = defined $_[1] ? $_[1] : 1;
+  $_[0];
+}
+
+sub allow_bigint {
+  Carp::carp("allow_bigint() is obsoleted. use allow_bignum() insted.");
+}
+
+###############################
+
+###
+### Perl => JSON
+###
+
+
+{    # Convert
+
+  my $max_depth;
+  my $indent;
+  my $ascii;
+  my $latin1;
+  my $utf8;
+  my $space_before;
+  my $space_after;
+  my $canonical;
+  my $allow_blessed;
+  my $convert_blessed;
+
+  my $indent_length;
+  my $escape_slash;
+  my $bignum;
+  my $as_nonblessed;
+
+  my $depth;
+  my $indent_count;
+  my $keysort;
+
+
+  sub PP_encode_json {
+    my $self = shift;
+    my $obj  = shift;
+
+    $indent_count = 0;
+    $depth        = 0;
+
+    my $idx = $self->{PROPS};
+
+    (
+      $ascii,           $latin1,       $utf8,        $indent,
+      $canonical,       $space_before, $space_after, $allow_blessed,
+      $convert_blessed, $escape_slash, $bignum,      $as_nonblessed
+      )
+      = @{$idx}[
+      P_ASCII .. P_SPACE_AFTER, P_ALLOW_BLESSED,
+      P_CONVERT_BLESSED,        P_ESCAPE_SLASH,
+      P_ALLOW_BIGNUM,           P_AS_NONBLESSED
+      ];
+
+    ($max_depth, $indent_length) = @{$self}{qw/max_depth indent_length/};
+
+    $keysort = $canonical ? sub { $a cmp $b } : undef;
+
+    if ($self->{sort_by}) {
+      $keysort
+        = ref($self->{sort_by}) eq 'CODE' ? $self->{sort_by}
+        : $self->{sort_by} =~ /\D+/       ? $self->{sort_by}
+        :                                   sub { $a cmp $b };
+    }
+
+    encode_error(
+      "hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)"
+    ) if (!ref $obj and !$idx->[P_ALLOW_NONREF]);
+
+    my $str = $self->object_to_json($obj);
+
+    $str .= "\n" if ($indent);    # JSON::XS 2.26 compatible
+
+    unless ($ascii or $latin1 or $utf8) {
+      utf8::upgrade($str);
+    }
+
+    if ($idx->[P_SHRINK]) {
+      utf8::downgrade($str, 1);
+    }
+
+    return $str;
+  }
+
+
+  sub object_to_json {
+    my ($self, $obj) = @_;
+    my $type = ref($obj);
+
+    if ($type eq 'HASH') {
+      return $self->hash_to_json($obj);
+    }
+    elsif ($type eq 'ARRAY') {
+      return $self->array_to_json($obj);
+    }
+    elsif ($type) {    # blessed object?
+      if (blessed($obj)) {
+
+        return $self->value_to_json($obj) if ($obj->isa('JSON::PP::Boolean'));
+
+        if ($convert_blessed and $obj->can('TO_JSON')) {
+          my $result = $obj->TO_JSON();
+          if (defined $result and ref($result)) {
+            if (refaddr($obj) eq refaddr($result)) {
+              encode_error(sprintf(
+                "%s::TO_JSON method returned same object as was passed instead of a new one",
+                ref $obj));
+            }
+          }
+
+          return $self->object_to_json($result);
+        }
+
+        return "$obj" if ($bignum and _is_bignum($obj));
+        return $self->blessed_to_json($obj) if ($allow_blessed and $as_nonblessed); # will be removed.
+
+        encode_error(sprintf(
+          "encountered object '%s', but neither allow_blessed "
+            . "nor convert_blessed settings are enabled",
+          $obj
+        ))
+          unless ($allow_blessed);
+
+        return 'null';
+      }
+      else {
+        return $self->value_to_json($obj);
+      }
+    }
+    else {
+      return $self->value_to_json($obj);
+    }
+  }
+
+
+  sub hash_to_json {
+    my ($self, $obj) = @_;
+    my @res;
+
+    encode_error(
+      "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
+    ) if (++$depth > $max_depth);
+
+    my ($pre, $post) = $indent ? $self->_up_indent() : ('', '');
+    my $del = ($space_before ? ' ' : '') . ':' . ($space_after ? ' ' : '');
+
+    for my $k (_sort($obj)) {
+      if (OLD_PERL) { utf8::decode($k) }    # key for Perl 5.6 / be optimized
+      push @res,
+          string_to_json($self, $k)
+        . $del
+        . ($self->object_to_json($obj->{$k}) || $self->value_to_json($obj->{$k}));
+    }
+
+    --$depth;
+    $self->_down_indent() if ($indent);
+
+    return
+        '{'
+      . (@res ? $pre : '')
+      . (@res ? join(",$pre", @res) . $post : '') . '}';
+  }
+
+
+  sub array_to_json {
+    my ($self, $obj) = @_;
+    my @res;
+
+    encode_error(
+      "json text or perl structure exceeds maximum nesting level (max_depth set too low?)"
+    ) if (++$depth > $max_depth);
+
+    my ($pre, $post) = $indent ? $self->_up_indent() : ('', '');
+
+    for my $v (@$obj) {
+      push @res, $self->object_to_json($v) || $self->value_to_json($v);
+    }
+
+    --$depth;
+    $self->_down_indent() if ($indent);
+
+    return
+        '['
+      . (@res ? $pre : '')
+      . (@res ? join(",$pre", @res) . $post : '') . ']';
+  }
+
+
+  sub value_to_json {
+    my ($self, $value) = @_;
+
+    return 'null' if (!defined $value);
+
+    my $b_obj = B::svref_2object(\$value);    # for round trip problem
+    my $flags = $b_obj->FLAGS;
+
+    return $value                             # as is
+      if $flags & (B::SVp_IOK | B::SVp_NOK) and !($flags & B::SVp_POK); # SvTYPE is IV or NV?
+
+    my $type = ref($value);
+
+    if (!$type) {
+      return string_to_json($self, $value);
+    }
+    elsif (blessed($value) and $value->isa('JSON::PP::Boolean')) {
+      return $$value == 1 ? 'true' : 'false';
+    }
+    elsif ($type) {
+      if ((overload::StrVal($value) =~ /=(\w+)/)[0]) {
+        return $self->value_to_json("$value");
+      }
+
+      if ($type eq 'SCALAR' and defined $$value) {
+        return
+            $$value eq '1'                    ? 'true'
+          : $$value eq '0'                    ? 'false'
+          : $self->{PROPS}->[P_ALLOW_UNKNOWN] ? 'null'
+          :   encode_error("cannot encode reference to scalar");
+      }
+
+      if ($self->{PROPS}->[P_ALLOW_UNKNOWN]) {
+        return 'null';
+      }
+      else {
+        if ($type eq 'SCALAR' or $type eq 'REF') {
+          encode_error("cannot encode reference to scalar");
+        }
+        else {
+          encode_error(
+            "encountered $value, but JSON can only represent references to arrays or hashes"
+          );
+        }
+      }
+
+    }
+    else {
+      return $self->{fallback}->($value)
+        if ($self->{fallback} and ref($self->{fallback}) eq 'CODE');
+      return 'null';
+    }
+
+  }
+
+
+  my %esc = (
+    "\n" => '\n',
+    "\r" => '\r',
+    "\t" => '\t',
+    "\f" => '\f',
+    "\b" => '\b',
+    "\"" => '\"',
+    "\\" => '\\\\',
+    "\'" => '\\\'',
+  );
+
+
+  sub string_to_json {
+    my ($self, $arg) = @_;
+
+    $arg =~ s/([\x22\x5c\n\r\t\f\b])/$esc{$1}/g;
+    $arg =~ s/\//\\\//g if ($escape_slash);
+    $arg =~ s/([\x00-\x08\x0b\x0e-\x1f])/'\\u00' . unpack('H2', $1)/eg;
+
+    if ($ascii) {
+      $arg = JSON_PP_encode_ascii($arg);
+    }
+
+    if ($latin1) {
+      $arg = JSON_PP_encode_latin1($arg);
+    }
+
+    if ($utf8) {
+      utf8::encode($arg);
+    }
+
+    return '"' . $arg . '"';
+  }
+
+
+  sub blessed_to_json {
+    my $reftype = reftype($_[1]) || '';
+    if ($reftype eq 'HASH') {
+      return $_[0]->hash_to_json($_[1]);
+    }
+    elsif ($reftype eq 'ARRAY') {
+      return $_[0]->array_to_json($_[1]);
+    }
+    else {
+      return 'null';
+    }
+  }
+
+
+  sub encode_error {
+    my $error = shift;
+    Carp::croak "$error";
+  }
+
+
+  sub _sort {
+    defined $keysort ? (sort $keysort (keys %{$_[0]})) : keys %{$_[0]};
+  }
+
+
+  sub _up_indent {
+    my $self  = shift;
+    my $space = ' ' x $indent_length;
+
+    my ($pre, $post) = ('', '');
+
+    $post = "\n" . $space x $indent_count;
+
+    $indent_count++;
+
+    $pre = "\n" . $space x $indent_count;
+
+    return ($pre, $post);
+  }
+
+
+  sub _down_indent { $indent_count--; }
+
+
+  sub PP_encode_box {
+    {depth => $depth, indent_count => $indent_count,};
+  }
+
+}    # Convert
+
+
+sub _encode_ascii {
+  join(
+    '',
+    map {
+          $_ <= 127 ? chr($_)
+        : $_ <= 65535 ? sprintf('\u%04x', $_)
+        :               sprintf('\u%x\u%x', _encode_surrogates($_));
+    } unpack('U*', $_[0])
+  );
+}
+
+
+sub _encode_latin1 {
+  join(
+    '',
+    map {
+          $_ <= 255 ? chr($_)
+        : $_ <= 65535 ? sprintf('\u%04x', $_)
+        :               sprintf('\u%x\u%x', _encode_surrogates($_));
+    } unpack('U*', $_[0])
+  );
+}
+
+
+sub _encode_surrogates {    # from perlunicode
+  my $uni = $_[0] - 0x10000;
+  return ($uni / 0x400 + 0xD800, $uni % 0x400 + 0xDC00);
+}
+
+
+sub _is_bignum {
+  $_[0]->isa('Math::BigInt') or $_[0]->isa('Math::BigFloat');
+}
+
+
+#
+# JSON => Perl
+#
+
+my $max_intsize;
+
+BEGIN {
+  my $checkint = 1111;
+  for my $d (5 .. 64) {
+    $checkint .= 1;
+    my $int = eval qq| $checkint |;
+    if ($int =~ /[eE]/) {
+      $max_intsize = $d - 1;
+      last;
+    }
+  }
+}
+
+{    # PARSE
+
+  my %escapes = (    #  by Jeremy Muhlich <jmuhlich [at] bitflood.org>
+    b    => "\x8",
+    t    => "\x9",
+    n    => "\xA",
+    f    => "\xC",
+    r    => "\xD",
+    '\\' => '\\',
+    '"'  => '"',
+    '/'  => '/',
+  );
+
+  my $text;             # json data
+  my $at;               # offset
+  my $ch;               # first character
+  my $len;              # text length (changed according to UTF8 or NON UTF8)
+                        # INTERNAL
+  my $depth;            # nest counter
+  my $encoding;         # json text encoding
+  my $is_valid_utf8;    # temp variable
+  my $utf8_len;         # utf8 byte length
+                        # FLAGS
+  my $utf8;             # must be utf8
+  my $max_depth;        # max nest number of objects and arrays
+  my $max_size;
+  my $relaxed;
+  my $cb_object;
+  my $cb_sk_object;
+
+  my $F_HOOK;
+
+  my $allow_bigint;     # using Math::BigInt
+  my $singlequote;      # loosely quoting
+  my $loose;            #
+  my $allow_barekey;    # bareKey
+
+  # $opt flag
+  # 0x00000001 .... decode_prefix
+  # 0x10000000 .... incr_parse
+
+  sub PP_decode_json {
+    my ($self, $opt);    # $opt is an effective flag during this decode_json.
+
+    ($self, $text, $opt) = @_;
+
+    ($at, $ch, $depth) = (0, '', 0);
+
+    if (!defined $text or ref $text) {
+      decode_error(
+        "malformed JSON string, neither array, object, number, string or atom");
+    }
+
+    my $idx = $self->{PROPS};
+
+    ($utf8, $relaxed, $loose, $allow_bigint, $allow_barekey, $singlequote)
+      = @{$idx}[P_UTF8, P_RELAXED, P_LOOSE .. P_ALLOW_SINGLEQUOTE];
+
+    if ($utf8) {
+      utf8::downgrade($text, 1) or Carp::croak("Wide character in subroutine entry");
+    }
+    else {
+      utf8::upgrade($text);
+      utf8::encode($text);
+    }
+
+    $len = length $text;
+
+    ($max_depth, $max_size, $cb_object, $cb_sk_object, $F_HOOK)
+      = @{$self}{qw/max_depth  max_size cb_object cb_sk_object F_HOOK/};
+
+    if ($max_size > 1) {
+      use bytes;
+      my $bytes = length $text;
+      decode_error(
+        sprintf(
+          "attempted decode of JSON text of %s bytes size, but max_size is set to %s",
+          $bytes, $max_size
+        ),
+        1
+      ) if ($bytes > $max_size);
+    }
+
+    # Currently no effect
+    # should use regexp
+    my @octets = unpack('C4', $text);
+    $encoding
+      = ($octets[0] and $octets[1]) ? 'UTF-8'
+      : (!$octets[0] and $octets[1])  ? 'UTF-16BE'
+      : (!$octets[0] and !$octets[1]) ? 'UTF-32BE'
+      : ($octets[2])  ? 'UTF-16LE'
+      : (!$octets[2]) ? 'UTF-32LE'
+      :                 'unknown';
+
+    white();    # remove head white space
+
+    my $valid_start = defined $ch;  # Is there a first character for JSON structure?
+
+    my $result = value();
+
+    return undef if (!$result && ($opt & 0x10000000));    # for incr_parse
+
+    decode_error(
+      "malformed JSON string, neither array, object, number, string or atom")
+      unless $valid_start;
+
+    if (!$idx->[P_ALLOW_NONREF] and !ref $result) {
+      decode_error(
+        'JSON text must be an object or array (but found number, string, true, false or null,'
+          . ' use allow_nonref to allow this)',
+        1
+      );
+    }
+
+    Carp::croak('something wrong.') if $len < $at;    # we won't arrive here.
+
+    my $consumed = defined $ch ? $at - 1 : $at;       # consumed JSON text length
+
+    white();                                          # remove tail white space
+
+    if ($ch) {
+      return ($result, $consumed) if ($opt & 0x00000001); # all right if decode_prefix
+      decode_error("garbage after JSON object");
+    }
+
+    ($opt & 0x00000001) ? ($result, $consumed) : $result;
+  }
+
+
+  sub next_chr {
+    return $ch = undef if ($at >= $len);
+    $ch = substr($text, $at++, 1);
+  }
+
+
+  sub value {
+    white();
+    return          if (!defined $ch);
+    return object() if ($ch eq '{');
+    return array()  if ($ch eq '[');
+    return string() if ($ch eq '"' or ($singlequote and $ch eq "'"));
+    return number() if ($ch =~ /[0-9]/ or $ch eq '-');
+    return word();
+  }
+
+  sub string {
+    my ($i, $s, $t, $u);
+    my $utf16;
+    my $is_utf8;
+
+    ($is_valid_utf8, $utf8_len) = ('', 0);
+
+    $s = '';    # basically UTF8 flag on
+
+    if ($ch eq '"' or ($singlequote and $ch eq "'")) {
+      my $boundChar = $ch;
+
+    OUTER: while (defined(next_chr())) {
+
+        if ($ch eq $boundChar) {
+          next_chr();
+
+          if ($utf16) {
+            decode_error("missing low surrogate character in surrogate pair");
+          }
+
+          utf8::decode($s) if ($is_utf8);
+
+          return $s;
+        }
+        elsif ($ch eq '\\') {
+          next_chr();
+          if (exists $escapes{$ch}) {
+            $s .= $escapes{$ch};
+          }
+          elsif ($ch eq 'u') {    # UNICODE handling
+            my $u = '';
+
+            for (1 .. 4) {
+              $ch = next_chr();
+              last OUTER if ($ch !~ /[0-9a-fA-F]/);
+              $u .= $ch;
+            }
+
+            # U+D800 - U+DBFF
+            if ($u =~ /^[dD][89abAB][0-9a-fA-F]{2}/) {    # UTF-16 high surrogate?
+              $utf16 = $u;
+            }
+
+            # U+DC00 - U+DFFF
+            elsif ($u =~ /^[dD][c-fC-F][0-9a-fA-F]{2}/) {    # UTF-16 low surrogate?
+              unless (defined $utf16) {
+                decode_error("missing high surrogate character in surrogate pair");
+              }
+              $is_utf8 = 1;
+              $s .= JSON_PP_decode_surrogates($utf16, $u) || next;
+              $utf16 = undef;
+            }
+            else {
+              if (defined $utf16) {
+                decode_error("surrogate pair expected");
+              }
+
+              if ((my $hex = hex($u)) > 127) {
+                $is_utf8 = 1;
+                $s .= JSON_PP_decode_unicode($u) || next;
+              }
+              else {
+                $s .= chr $hex;
+              }
+            }
+
+          }
+          else {
+            unless ($loose) {
+              $at -= 2;
+              decode_error('illegal backslash escape sequence in string');
+            }
+            $s .= $ch;
+          }
+        }
+        else {
+
+          if (ord $ch > 127) {
+            unless ($ch = is_valid_utf8($ch)) {
+              $at -= 1;
+              decode_error("malformed UTF-8 character in JSON string");
+            }
+            else {
+              $at += $utf8_len - 1;
+            }
+
+            $is_utf8 = 1;
+          }
+
+          if (!$loose) {
+            if ($ch =~ /[\x00-\x1f\x22\x5c]/) {    # '/' ok
+              $at--;
+              decode_error('invalid character encountered while parsing JSON string');
+            }
+          }
+
+          $s .= $ch;
+        }
+      }
+    }
+
+    decode_error("unexpected end of string while parsing JSON string");
+  }
+
+
+  sub white {
+    while (defined $ch) {
+      if ($ch le ' ') {
+        next_chr();
+      }
+      elsif ($ch eq '/') {
+        next_chr();
+        if (defined $ch and $ch eq '/') {
+          1 while (defined(next_chr()) and $ch ne "\n" and $ch ne "\r");
+        }
+        elsif (defined $ch and $ch eq '*') {
+          next_chr();
+          while (1) {
+            if (defined $ch) {
+              if ($ch eq '*') {
+                if (defined(next_chr()) and $ch eq '/') {
+                  next_chr();
+                  last;
+                }
+              }
+              else {
+                next_chr();
+              }
+            }
+            else {
+              decode_error("Unterminated comment");
+            }
+          }
+          next;
+        }
+        else {
+          $at--;
+          decode_error(
+            "malformed JSON string, neither array, object, number, string or atom");
+        }
+      }
+      else {
+        if ($relaxed and $ch eq '#') {    # correctly?
+          pos($text) = $at;
+          $text =~ /\G([^\n]*(?:\r\n|\r|\n|$))/g;
+          $at = pos($text);
+          next_chr;
+          next;
+        }
+
+        last;
+      }
+    }
+  }
+
+
+  sub array {
+    my $a = $_[0] || [];    # you can use this code to use another array ref object.
+
+    decode_error(
+      'json text or perl structure exceeds maximum nesting level (max_depth set too low?)'
+    ) if (++$depth > $max_depth);
+
+    next_chr();
+    white();
+
+    if (defined $ch and $ch eq ']') {
+      --$depth;
+      next_chr();
+      return $a;
+    }
+    else {
+      while (defined($ch)) {
+        push @$a, value();
+
+        white();
+
+        if (!defined $ch) {
+          last;
+        }
+
+        if ($ch eq ']') {
+          --$depth;
+          next_chr();
+          return $a;
+        }
+
+        if ($ch ne ',') {
+          last;
+        }
+
+        next_chr();
+        white();
+
+        if ($relaxed and $ch eq ']') {
+          --$depth;
+          next_chr();
+          return $a;
+        }
+
+      }
+    }
+
+    decode_error(", or ] expected while parsing array");
+  }
+
+
+  sub object {
+    my $o = $_[0] || {};    # you can use this code to use another hash ref object.
+    my $k;
+
+    decode_error(
+      'json text or perl structure exceeds maximum nesting level (max_depth set too low?)'
+    ) if (++$depth > $max_depth);
+    next_chr();
+    white();
+
+    if (defined $ch and $ch eq '}') {
+      --$depth;
+      next_chr();
+      if ($F_HOOK) {
+        return _json_object_hook($o);
+      }
+      return $o;
+    }
+    else {
+      while (defined $ch) {
+        $k = ($allow_barekey and $ch ne '"' and $ch ne "'") ? bareKey() : string();
+        white();
+
+        if (!defined $ch or $ch ne ':') {
+          $at--;
+          decode_error("':' expected");
+        }
+
+        next_chr();
+        $o->{$k} = value();
+        white();
+
+        last if (!defined $ch);
+
+        if ($ch eq '}') {
+          --$depth;
+          next_chr();
+          if ($F_HOOK) {
+            return _json_object_hook($o);
+          }
+          return $o;
+        }
+
+        if ($ch ne ',') {
+          last;
+        }
+
+        next_chr();
+        white();
+
+        if ($relaxed and $ch eq '}') {
+          --$depth;
+          next_chr();
+          if ($F_HOOK) {
+            return _json_object_hook($o);
+          }
+          return $o;
+        }
+
+      }
+
+    }
+
+    $at--;
+    decode_error(", or } expected while parsing object/hash");
+  }
+
+
+  sub bareKey {    # doesn't strictly follow Standard ECMA-262 3rd Edition
+    my $key;
+    while ($ch =~ /[^\x00-\x23\x25-\x2F\x3A-\x40\x5B-\x5E\x60\x7B-\x7F]/) {
+      $key .= $ch;
+      next_chr();
+    }
+    return $key;
+  }
+
+
+  sub word {
+    my $word = substr($text, $at - 1, 4);
+
+    if ($word eq 'true') {
+      $at += 3;
+      next_chr;
+      return $JSON::PP::true;
+    }
+    elsif ($word eq 'null') {
+      $at += 3;
+      next_chr;
+      return undef;
+    }
+    elsif ($word eq 'fals') {
+      $at += 3;
+      if (substr($text, $at, 1) eq 'e') {
+        $at++;
+        next_chr;
+        return $JSON::PP::false;
+      }
+    }
+
+    $at--;    # for decode_error report
+
+    decode_error("'null' expected")  if ($word =~ /^n/);
+    decode_error("'true' expected")  if ($word =~ /^t/);
+    decode_error("'false' expected") if ($word =~ /^f/);
+    decode_error(
+      "malformed JSON string, neither array, object, number, string or atom");
+  }
+
+
+  sub number {
+    my $n = '';
+    my $v;
+    my $is_dec;
+
+    # According to RFC4627, hex or oct digits are invalid.
+    if ($ch eq '0') {
+      my $peek = substr($text, $at, 1);
+      my $hex = $peek =~ /[xX]/;    # 0 or 1
+
+      if ($hex) {
+        decode_error(
+          "malformed number (leading zero must not be followed by another digit)");
+        ($n) = (substr($text, $at + 1) =~ /^([0-9a-fA-F]+)/);
+      }
+      else {    # oct
+        ($n) = (substr($text, $at) =~ /^([0-7]+)/);
+        if (defined $n and length $n > 1) {
+          decode_error(
+            "malformed number (leading zero must not be followed by another digit)");
+        }
+      }
+
+      if (defined $n and length($n)) {
+        if (!$hex and length($n) == 1) {
+          decode_error(
+            "malformed number (leading zero must not be followed by another digit)");
+        }
+        $at += length($n) + $hex;
+        next_chr;
+        return $hex ? hex($n) : oct($n);
+      }
+    }
+
+    if ($ch eq '-') {
+      $n = '-';
+      next_chr;
+      if (!defined $ch or $ch !~ /\d/) {
+        decode_error("malformed number (no digits after initial minus)");
+      }
+    }
+
+    while (defined $ch and $ch =~ /\d/) {
+      $n .= $ch;
+      next_chr;
+    }
+
+    if (defined $ch and $ch eq '.') {
+      $n .= '.';
+      $is_dec = 1;
+
+      next_chr;
+      if (!defined $ch or $ch !~ /\d/) {
+        decode_error("malformed number (no digits after decimal point)");
+      }
+      else {
+        $n .= $ch;
+      }
+
+      while (defined(next_chr) and $ch =~ /\d/) {
+        $n .= $ch;
+      }
+    }
+
+    if (defined $ch and ($ch eq 'e' or $ch eq 'E')) {
+      $n .= $ch;
+      next_chr;
+
+      if (defined($ch) and ($ch eq '+' or $ch eq '-')) {
+        $n .= $ch;
+        next_chr;
+        if (!defined $ch or $ch =~ /\D/) {
+          decode_error("malformed number (no digits after exp sign)");
+        }
+        $n .= $ch;
+      }
+      elsif (defined($ch) and $ch =~ /\d/) {
+        $n .= $ch;
+      }
+      else {
+        decode_error("malformed number (no digits after exp sign)");
+      }
+
+      while (defined(next_chr) and $ch =~ /\d/) {
+        $n .= $ch;
+      }
+
+    }
+
+    $v .= $n;
+
+    if ($v !~ /[.eE]/ and length $v > $max_intsize) {
+      if ($allow_bigint) {    # from Adam Sussman
+        require Math::BigInt;
+        return Math::BigInt->new($v);
+      }
+      else {
+        return "$v";
+      }
+    }
+    elsif ($allow_bigint) {
+      require Math::BigFloat;
+      return Math::BigFloat->new($v);
+    }
+
+    return $is_dec ? $v / 1.0 : 0 + $v;
+  }
+
+
+  sub is_valid_utf8 {
+
+    $utf8_len
+      = $_[0] =~ /[\x00-\x7F]/ ? 1
+      : $_[0] =~ /[\xC2-\xDF]/ ? 2
+      : $_[0] =~ /[\xE0-\xEF]/ ? 3
+      : $_[0] =~ /[\xF0-\xF4]/ ? 4
+      :                          0;
+
+    return unless $utf8_len;
+
+    my $is_valid_utf8 = substr($text, $at - 1, $utf8_len);
+
+    return (
+      $is_valid_utf8 =~ /^(?:
+             [\x00-\x7F]
+            |[\xC2-\xDF][\x80-\xBF]
+            |[\xE0][\xA0-\xBF][\x80-\xBF]
+            |[\xE1-\xEC][\x80-\xBF][\x80-\xBF]
+            |[\xED][\x80-\x9F][\x80-\xBF]
+            |[\xEE-\xEF][\x80-\xBF][\x80-\xBF]
+            |[\xF0][\x90-\xBF][\x80-\xBF][\x80-\xBF]
+            |[\xF1-\xF3][\x80-\xBF][\x80-\xBF][\x80-\xBF]
+            |[\xF4][\x80-\x8F][\x80-\xBF][\x80-\xBF]
+        )$/x
+    ) ? $is_valid_utf8 : '';
+  }
+
+
+  sub decode_error {
+    my $error  = shift;
+    my $no_rep = shift;
+    my $str    = defined $text ? substr($text, $at) : '';
+    my $mess   = '';
+    my $type = $] >= 5.008 ? 'U*' : $] < 5.006 ? 'C*' : utf8::is_utf8($str) ? 'U*' # 5.6
+      : 'C*';
+
+    for my $c (unpack($type, $str)) {    # emulate pv_uni_display() ?
+      $mess
+        .= $c == 0x07 ? '\a'
+        : $c == 0x09  ? '\t'
+        : $c == 0x0a  ? '\n'
+        : $c == 0x0d  ? '\r'
+        : $c == 0x0c  ? '\f'
+        : $c < 0x20 ? sprintf('\x{%x}', $c)
+        : $c == 0x5c ? '\\\\'
+        : $c < 0x80  ? chr($c)
+        :              sprintf('\x{%x}', $c);
+      if (length $mess >= 20) {
+        $mess .= '...';
+        last;
+      }
+    }
+
+    unless (length $mess) {
+      $mess = '(end of string)';
+    }
+
+    Carp::croak(
+      $no_rep ? "$error" : "$error, at character offset $at (before \"$mess\")");
+
+  }
+
+
+  sub _json_object_hook {
+    my $o  = $_[0];
+    my @ks = keys %{$o};
+
+    if (  $cb_sk_object
+      and @ks == 1
+      and exists $cb_sk_object->{$ks[0]}
+      and ref $cb_sk_object->{$ks[0]})
+    {
+      my @val = $cb_sk_object->{$ks[0]}->($o->{$ks[0]});
+      if (@val == 1) {
+        return $val[0];
+      }
+    }
+
+    my @val = $cb_object->($o) if ($cb_object);
+    if (@val == 0 or @val > 1) {
+      return $o;
+    }
+    else {
+      return $val[0];
+    }
+  }
+
+
+  sub PP_decode_box {
+    {
+      text          => $text,
+      at            => $at,
+      ch            => $ch,
+      len           => $len,
+      depth         => $depth,
+      encoding      => $encoding,
+      is_valid_utf8 => $is_valid_utf8,
+    };
+  }
+
+}    # PARSE
+
+
+sub _decode_surrogates {    # from perlunicode
+  my $uni = 0x10000 + (hex($_[0]) - 0xD800) * 0x400 + (hex($_[1]) - 0xDC00);
+  my $un = pack('U*', $uni);
+  utf8::encode($un);
+  return $un;
+}
+
+
+sub _decode_unicode {
+  my $un = pack('U', hex shift);
+  utf8::encode($un);
+  return $un;
+}
+
+#
+# Setup for various Perl versions (the code from JSON::PP58)
+#
+
+BEGIN {
+
+  unless (defined &utf8::is_utf8) {
+    require Encode;
+    *utf8::is_utf8 = *Encode::is_utf8;
+  }
+
+  if ($] >= 5.008) {
+    *JSON::PP::JSON_PP_encode_ascii      = \&_encode_ascii;
+    *JSON::PP::JSON_PP_encode_latin1     = \&_encode_latin1;
+    *JSON::PP::JSON_PP_decode_surrogates = \&_decode_surrogates;
+    *JSON::PP::JSON_PP_decode_unicode    = \&_decode_unicode;
+  }
+
+  if ($] >= 5.008 and $] < 5.008003) {    # join() in 5.8.0 - 5.8.2 is broken.
+
+    package JSON::PP;
+    require subs;
+    subs->import('join');
+    eval q|
+            sub join {
+                return '' if (@_ < 2);
+                my $j   = shift;
+                my $str = shift;
+                for (@_) { $str .= $j . $_; }
+                return $str;
+            }
+        |;
+  }
+
+
+  sub JSON::PP::incr_parse {
+    local $Carp::CarpLevel = 1;
+    ($_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new)->incr_parse(@_);
+  }
+
+
+  sub JSON::PP::incr_skip {
+    ($_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new)->incr_skip;
+  }
+
+
+  sub JSON::PP::incr_reset {
+    ($_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new)->incr_reset;
+  }
+
+  eval q{
+        sub JSON::PP::incr_text : lvalue {
+            $_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new;
+
+            if ( $_[0]->{_incr_parser}->{incr_parsing} ) {
+                Carp::croak("incr_text cannot be called when the incremental parser already started parsing");
+            }
+            $_[0]->{_incr_parser}->{incr_text};
+        }
+    } if ($] >= 5.006);
+
+}    # Setup for various Perl versions (the code from JSON::PP58)
+
+
+###############################
+# Utilities
+#
+
+BEGIN {
+  eval 'require Scalar::Util';
+  unless ($@) {
+    *JSON::PP::blessed = \&Scalar::Util::blessed;
+    *JSON::PP::reftype = \&Scalar::Util::reftype;
+    *JSON::PP::refaddr = \&Scalar::Util::refaddr;
+  }
+  else {    # This code is from Sclar::Util.
+            # warn $@;
+    eval 'sub UNIVERSAL::a_sub_not_likely_to_be_here { ref($_[0]) }';
+    *JSON::PP::blessed = sub {
+      local ($@, $SIG{__DIE__}, $SIG{__WARN__});
+      ref($_[0]) ? eval { $_[0]->a_sub_not_likely_to_be_here } : undef;
+    };
+    my %tmap = qw(
+      B::NULL   SCALAR
+      B::HV     HASH
+      B::AV     ARRAY
+      B::CV     CODE
+      B::IO     IO
+      B::GV     GLOB
+      B::REGEXP REGEXP
+    );
+    *JSON::PP::reftype = sub {
+      my $r = shift;
+
+      return undef unless length(ref($r));
+
+      my $t = ref(B::svref_2object($r));
+
+      return exists $tmap{$t} ? $tmap{$t} : length(ref($$r)) ? 'REF' : 'SCALAR';
+    };
+    *JSON::PP::refaddr = sub {
+      return undef unless length(ref($_[0]));
+
+      my $addr;
+      if (defined(my $pkg = blessed($_[0]))) {
+        $addr .= bless $_[0], 'Scalar::Util::Fake';
+        bless $_[0], $pkg;
+      }
+      else {
+        $addr .= $_[0];
+      }
+
+      $addr =~ /0x(\w+)/;
+      local $^W;
+
+      #no warnings 'portable';
+      hex($1);
+      }
+  }
+}
+
+
+# shamelessly copied and modified from JSON::XS code.
+
+$JSON::PP::true  = do { bless \(my $dummy = 1), "JSON::PP::Boolean" };
+$JSON::PP::false = do { bless \(my $dummy = 0), "JSON::PP::Boolean" };
+
+sub is_bool { defined $_[0] and UNIVERSAL::isa($_[0], "JSON::PP::Boolean"); }
+
+sub true  {$JSON::PP::true}
+sub false {$JSON::PP::false}
+sub null  { undef; }
+
+###############################
+
+package JSON::PP::Boolean;
+
+use overload (
+  "0+" => sub { ${$_[0]} },
+  "++" => sub { $_[0] = ${$_[0]} + 1 },
+  "--" => sub { $_[0] = ${$_[0]} - 1 },
+  fallback => 1,
+);
+
+
+###############################
+
+package JSON::PP::IncrParser;
+
+use strict;
+
+use constant INCR_M_WS   => 0;    # initial whitespace skipping
+use constant INCR_M_STR  => 1;    # inside string
+use constant INCR_M_BS   => 2;    # inside backslash
+use constant INCR_M_JSON => 3;    # outside anything, count nesting
+use constant INCR_M_C0   => 4;
+use constant INCR_M_C1   => 5;
+
+$JSON::PP::IncrParser::VERSION = '1.01';
+
+my $unpack_format = $] < 5.006 ? 'C*' : 'U*';
+
+sub new {
+  my ($class) = @_;
+
+  bless {incr_nest => 0, incr_text => undef, incr_parsing => 0, incr_p => 0,},
+    $class;
+}
+
+
+sub incr_parse {
+  my ($self, $coder, $text) = @_;
+
+  $self->{incr_text} = '' unless (defined $self->{incr_text});
+
+  if (defined $text) {
+    if (utf8::is_utf8($text) and !utf8::is_utf8($self->{incr_text})) {
+      utf8::upgrade($self->{incr_text});
+      utf8::decode($self->{incr_text});
+    }
+    $self->{incr_text} .= $text;
+  }
+
+
+  my $max_size = $coder->get_max_size;
+
+  if (defined wantarray) {
+
+    $self->{incr_mode} = INCR_M_WS unless defined $self->{incr_mode};
+
+    if (wantarray) {
+      my @ret;
+
+      $self->{incr_parsing} = 1;
+
+      do {
+        push @ret, $self->_incr_parse($coder, $self->{incr_text});
+
+        unless (!$self->{incr_nest} and $self->{incr_mode} == INCR_M_JSON) {
+          $self->{incr_mode} = INCR_M_WS if $self->{incr_mode} != INCR_M_STR;
+        }
+
+      } until (length $self->{incr_text} >= $self->{incr_p});
+
+      $self->{incr_parsing} = 0;
+
+      return @ret;
+    }
+    else {    # in scalar context
+      $self->{incr_parsing} = 1;
+      my $obj = $self->_incr_parse($coder, $self->{incr_text});
+      $self->{incr_parsing} = 0 if defined $obj;    # pointed by Martin J. Evans
+      return $obj ? $obj : undef;    # $obj is an empty string, parsing was completed.
+    }
+
+  }
+
+}
+
+
+sub _incr_parse {
+  my ($self, $coder, $text, $skip) = @_;
+  my $p       = $self->{incr_p};
+  my $restore = $p;
+
+  my @obj;
+  my $len = length $text;
+
+  if ($self->{incr_mode} == INCR_M_WS) {
+    while ($len > $p) {
+      my $s = substr($text, $p, 1);
+      $p++ and next if (0x20 >= unpack($unpack_format, $s));
+      $self->{incr_mode} = INCR_M_JSON;
+      last;
+    }
+  }
+
+  while ($len > $p) {
+    my $s = substr($text, $p++, 1);
+
+    if ($s eq '"') {
+      if (substr($text, $p - 2, 1) eq '\\') {
+        next;
+      }
+
+      if ($self->{incr_mode} != INCR_M_STR) {
+        $self->{incr_mode} = INCR_M_STR;
+      }
+      else {
+        $self->{incr_mode} = INCR_M_JSON;
+        unless ($self->{incr_nest}) {
+          last;
+        }
+      }
+    }
+
+    if ($self->{incr_mode} == INCR_M_JSON) {
+
+      if ($s eq '[' or $s eq '{') {
+        if (++$self->{incr_nest} > $coder->get_max_depth) {
+          Carp::croak(
+            'json text or perl structure exceeds maximum nesting level (max_depth set too low?)'
+          );
+        }
+      }
+      elsif ($s eq ']' or $s eq '}') {
+        last if (--$self->{incr_nest} <= 0);
+      }
+      elsif ($s eq '#') {
+        while ($len > $p) {
+          last if substr($text, $p++, 1) eq "\n";
+        }
+      }
+
+    }
+
+  }
+
+  $self->{incr_p} = $p;
+
+  return if ($self->{incr_mode} == INCR_M_STR  and not $self->{incr_nest});
+  return if ($self->{incr_mode} == INCR_M_JSON and $self->{incr_nest} > 0);
+
+  return '' unless (length substr($self->{incr_text}, 0, $p));
+
+  local $Carp::CarpLevel = 2;
+
+  $self->{incr_p} = $restore;
+  $self->{incr_c} = $p;
+
+  my ($obj, $tail)
+    = $coder->PP_decode_json(substr($self->{incr_text}, 0, $p), 0x10000001);
+
+  $self->{incr_text} = substr($self->{incr_text}, $p);
+  $self->{incr_p} = 0;
+
+  return $obj || '';
+}
+
+
+sub incr_text {
+  if ($_[0]->{incr_parsing}) {
+    Carp::croak(
+      "incr_text cannot be called when the incremental parser already started parsing"
+    );
+  }
+  $_[0]->{incr_text};
+}
+
+
+sub incr_skip {
+  my $self = shift;
+  $self->{incr_text} = substr($self->{incr_text}, $self->{incr_c});
+  $self->{incr_p} = 0;
+}
+
+
+sub incr_reset {
+  my $self = shift;
+  $self->{incr_text}    = undef;
+  $self->{incr_p}       = 0;
+  $self->{incr_mode}    = 0;
+  $self->{incr_nest}    = 0;
+  $self->{incr_parsing} = 0;
+}
+
+###############################
+
+
+1;
+__END__
+=pod
+
+=head1 NAME
+
+JSON::PP - JSON::XS compatible pure-Perl module.
+
+=head1 SYNOPSIS
+
+ use JSON::PP;
+
+ # exported functions, they croak on error
+ # and expect/generate UTF-8
+
+ $utf8_encoded_json_text = encode_json $perl_hash_or_arrayref;
+ $perl_hash_or_arrayref  = decode_json $utf8_encoded_json_text;
+
+ # OO-interface
+
+ $coder = JSON::PP->new->ascii->pretty->allow_nonref;
+ 
+ $json_text   = $json->encode( $perl_scalar );
+ $perl_scalar = $json->decode( $json_text );
+ 
+ $pretty_printed = $json->pretty->encode( $perl_scalar ); # pretty-printing
+ 
+ # Note that JSON version 2.0 and above will automatically use
+ # JSON::XS or JSON::PP, so you should be able to just:
+ 
+ use JSON;
+
+
+=head1 VERSION
+
+    2.27400
+
+L<JSON::XS> 2.27 (~2.30) compatible.
+
+=head1 NOTE
+
+JSON::PP had been included in JSON distribution (CPAN module).
+It was a perl core module in Perl 5.14.
+
+=head1 DESCRIPTION
+
+This module is L<JSON::XS> compatible pure Perl module.
+(Perl 5.8 or later is recommended)
+
+JSON::XS is the fastest and most proper JSON module on CPAN.
+It is written by Marc Lehmann in C, so must be compiled and
+installed in the used environment.
+
+JSON::PP is a pure-Perl module and has compatibility to JSON::XS.
+
+
+=head2 FEATURES
+
+=over
+
+=item * correct unicode handling
+
+This module knows how to handle Unicode (depending on Perl version).
+
+See to L<JSON::XS/A FEW NOTES ON UNICODE AND PERL> and L<UNICODE HANDLING ON PERLS>.
+
+
+=item * round-trip integrity
+
+When you serialise a perl data structure using only data types supported
+by JSON and Perl, the deserialised data structure is identical on the Perl
+level. (e.g. the string "2.0" doesn't suddenly become "2" just because
+it looks like a number). There I<are> minor exceptions to this, read the
+MAPPING section below to learn about those.
+
+
+=item * strict checking of JSON correctness
+
+There is no guessing, no generating of illegal JSON texts by default,
+and only JSON is accepted as input by default (the latter is a security feature).
+But when some options are set, loose checking features are available.
+
+=back
+
+=head1 FUNCTIONAL INTERFACE
+
+Some documents are copied and modified from L<JSON::XS/FUNCTIONAL INTERFACE>.
+
+=head2 encode_json
+
+    $json_text = encode_json $perl_scalar
+
+Converts the given Perl data structure to a UTF-8 encoded, binary string.
+
+This function call is functionally identical to:
+
+    $json_text = JSON::PP->new->utf8->encode($perl_scalar)
+
+=head2 decode_json
+
+    $perl_scalar = decode_json $json_text
+
+The opposite of C<encode_json>: expects an UTF-8 (binary) string and tries
+to parse that as an UTF-8 encoded JSON text, returning the resulting
+reference.
+
+This function call is functionally identical to:
+
+    $perl_scalar = JSON::PP->new->utf8->decode($json_text)
+
+=head2 JSON::PP::is_bool
+
+    $is_boolean = JSON::PP::is_bool($scalar)
+
+Returns true if the passed scalar represents either JSON::PP::true or
+JSON::PP::false, two constants that act like C<1> and C<0> respectively
+and are also used to represent JSON C<true> and C<false> in Perl strings.
+
+=head2 JSON::PP::true
+
+Returns JSON true value which is blessed object.
+It C<isa> JSON::PP::Boolean object.
+
+=head2 JSON::PP::false
+
+Returns JSON false value which is blessed object.
+It C<isa> JSON::PP::Boolean object.
+
+=head2 JSON::PP::null
+
+Returns C<undef>.
+
+See L<MAPPING>, below, for more information on how JSON values are mapped to
+Perl.
+
+
+=head1 HOW DO I DECODE A DATA FROM OUTER AND ENCODE TO OUTER
+
+This section supposes that your perl version is 5.8 or later.
+
+If you know a JSON text from an outer world - a network, a file content, and so on,
+is encoded in UTF-8, you should use C<decode_json> or C<JSON> module object
+with C<utf8> enabled. And the decoded result will contain UNICODE characters.
+
+  # from network
+  my $json        = JSON::PP->new->utf8;
+  my $json_text   = CGI->new->param( 'json_data' );
+  my $perl_scalar = $json->decode( $json_text );
+  
+  # from file content
+  local $/;
+  open( my $fh, '<', 'json.data' );
+  $json_text   = <$fh>;
+  $perl_scalar = decode_json( $json_text );
+
+If an outer data is not encoded in UTF-8, firstly you should C<decode> it.
+
+  use Encode;
+  local $/;
+  open( my $fh, '<', 'json.data' );
+  my $encoding = 'cp932';
+  my $unicode_json_text = decode( $encoding, <$fh> ); # UNICODE
+  
+  # or you can write the below code.
+  #
+  # open( my $fh, "<:encoding($encoding)", 'json.data' );
+  # $unicode_json_text = <$fh>;
+
+In this case, C<$unicode_json_text> is of course UNICODE string.
+So you B<cannot> use C<decode_json> nor C<JSON> module object with C<utf8> enabled.
+Instead of them, you use C<JSON> module object with C<utf8> disable.
+
+  $perl_scalar = $json->utf8(0)->decode( $unicode_json_text );
+
+Or C<encode 'utf8'> and C<decode_json>:
+
+  $perl_scalar = decode_json( encode( 'utf8', $unicode_json_text ) );
+  # this way is not efficient.
+
+And now, you want to convert your C<$perl_scalar> into JSON data and
+send it to an outer world - a network or a file content, and so on.
+
+Your data usually contains UNICODE strings and you want the converted data to be encoded
+in UTF-8, you should use C<encode_json> or C<JSON> module object with C<utf8> enabled.
+
+  print encode_json( $perl_scalar ); # to a network? file? or display?
+  # or
+  print $json->utf8->encode( $perl_scalar );
+
+If C<$perl_scalar> does not contain UNICODE but C<$encoding>-encoded strings
+for some reason, then its characters are regarded as B<latin1> for perl
+(because it does not concern with your $encoding).
+You B<cannot> use C<encode_json> nor C<JSON> module object with C<utf8> enabled.
+Instead of them, you use C<JSON> module object with C<utf8> disable.
+Note that the resulted text is a UNICODE string but no problem to print it.
+
+  # $perl_scalar contains $encoding encoded string values
+  $unicode_json_text = $json->utf8(0)->encode( $perl_scalar );
+  # $unicode_json_text consists of characters less than 0x100
+  print $unicode_json_text;
+
+Or C<decode $encoding> all string values and C<encode_json>:
+
+  $perl_scalar->{ foo } = decode( $encoding, $perl_scalar->{ foo } );
+  # ... do it to each string values, then encode_json
+  $json_text = encode_json( $perl_scalar );
+
+This method is a proper way but probably not efficient.
+
+See to L<Encode>, L<perluniintro>.
+
+
+=head1 METHODS
+
+Basically, check to L<JSON> or L<JSON::XS>.
+
+=head2 new
+
+    $json = JSON::PP->new
+
+Returns a new JSON::PP object that can be used to de/encode JSON
+strings.
+
+All boolean flags described below are by default I<disabled>.
+
+The mutators for flags all return the JSON object again and thus calls can
+be chained:
+
+   my $json = JSON::PP->new->utf8->space_after->encode({a => [1,2]})
+   => {"a": [1, 2]}
+
+=head2 ascii
+
+    $json = $json->ascii([$enable])
+    
+    $enabled = $json->get_ascii
+
+If $enable is true (or missing), then the encode method will not generate characters outside
+the code range 0..127. Any Unicode characters outside that range will be escaped using either
+a single \uXXXX or a double \uHHHH\uLLLLL escape sequence, as per RFC4627.
+(See to L<JSON::XS/OBJECT-ORIENTED INTERFACE>).
+
+In Perl 5.005, there is no character having high value (more than 255).
+See to L<UNICODE HANDLING ON PERLS>.
+
+If $enable is false, then the encode method will not escape Unicode characters unless
+required by the JSON syntax or other flags. This results in a faster and more compact format.
+
+  JSON::PP->new->ascii(1)->encode([chr 0x10401])
+  => ["\ud801\udc01"]
+
+=head2 latin1
+
+    $json = $json->latin1([$enable])
+    
+    $enabled = $json->get_latin1
+
+If $enable is true (or missing), then the encode method will encode the resulting JSON
+text as latin1 (or iso-8859-1), escaping any characters outside the code range 0..255.
+
+If $enable is false, then the encode method will not escape Unicode characters
+unless required by the JSON syntax or other flags.
+
+  JSON::XS->new->latin1->encode (["\x{89}\x{abc}"]
+  => ["\x{89}\\u0abc"]    # (perl syntax, U+abc escaped, U+89 not)
+
+See to L<UNICODE HANDLING ON PERLS>.
+
+=head2 utf8
+
+    $json = $json->utf8([$enable])
+    
+    $enabled = $json->get_utf8
+
+If $enable is true (or missing), then the encode method will encode the JSON result
+into UTF-8, as required by many protocols, while the decode method expects to be handled
+an UTF-8-encoded string. Please note that UTF-8-encoded strings do not contain any
+characters outside the range 0..255, they are thus useful for bytewise/binary I/O.
+
+(In Perl 5.005, any character outside the range 0..255 does not exist.
+See to L<UNICODE HANDLING ON PERLS>.)
+
+In future versions, enabling this option might enable autodetection of the UTF-16 and UTF-32
+encoding families, as described in RFC4627.
+
+If $enable is false, then the encode method will return the JSON string as a (non-encoded)
+Unicode string, while decode expects thus a Unicode string. Any decoding or encoding
+(e.g. to UTF-8 or UTF-16) needs to be done yourself, e.g. using the Encode module.
+
+Example, output UTF-16BE-encoded JSON:
+
+  use Encode;
+  $jsontext = encode "UTF-16BE", JSON::PP->new->encode ($object);
+
+Example, decode UTF-32LE-encoded JSON:
+
+  use Encode;
+  $object = JSON::PP->new->decode (decode "UTF-32LE", $jsontext);
+
+
+=head2 pretty
+
+    $json = $json->pretty([$enable])
+
+This enables (or disables) all of the C<indent>, C<space_before> and
+C<space_after> flags in one call to generate the most readable
+(or most compact) form possible.
+
+Equivalent to:
+
+   $json->indent->space_before->space_after
+
+=head2 indent
+
+    $json = $json->indent([$enable])
+    
+    $enabled = $json->get_indent
+
+The default indent space length is three.
+You can use C<indent_length> to change the length.
+
+=head2 space_before
+
+    $json = $json->space_before([$enable])
+    
+    $enabled = $json->get_space_before
+
+If C<$enable> is true (or missing), then the C<encode> method will add an extra
+optional space before the C<:> separating keys from values in JSON objects.
+
+If C<$enable> is false, then the C<encode> method will not add any extra
+space at those places.
+
+This setting has no effect when decoding JSON texts.
+
+Example, space_before enabled, space_after and indent disabled:
+
+   {"key" :"value"}
+
+=head2 space_after
+
+    $json = $json->space_after([$enable])
+    
+    $enabled = $json->get_space_after
+
+If C<$enable> is true (or missing), then the C<encode> method will add an extra
+optional space after the C<:> separating keys from values in JSON objects
+and extra whitespace after the C<,> separating key-value pairs and array
+members.
+
+If C<$enable> is false, then the C<encode> method will not add any extra
+space at those places.
+
+This setting has no effect when decoding JSON texts.
+
+Example, space_before and indent disabled, space_after enabled:
+
+   {"key": "value"}
+
+=head2 relaxed
+
+    $json = $json->relaxed([$enable])
+    
+    $enabled = $json->get_relaxed
+
+If C<$enable> is true (or missing), then C<decode> will accept some
+extensions to normal JSON syntax (see below). C<encode> will not be
+affected in anyway. I<Be aware that this option makes you accept invalid
+JSON texts as if they were valid!>. I suggest only to use this option to
+parse application-specific files written by humans (configuration files,
+resource files etc.)
+
+If C<$enable> is false (the default), then C<decode> will only accept
+valid JSON texts.
+
+Currently accepted extensions are:
+
+=over 4
+
+=item * list items can have an end-comma
+
+JSON I<separates> array elements and key-value pairs with commas. This
+can be annoying if you write JSON texts manually and want to be able to
+quickly append elements, so this extension accepts comma at the end of
+such items not just between them:
+
+   [
+      1,
+      2, <- this comma not normally allowed
+   ]
+   {
+      "k1": "v1",
+      "k2": "v2", <- this comma not normally allowed
+   }
+
+=item * shell-style '#'-comments
+
+Whenever JSON allows whitespace, shell-style comments are additionally
+allowed. They are terminated by the first carriage-return or line-feed
+character, after which more white-space and comments are allowed.
+
+  [
+     1, # this comment not allowed in JSON
+        # neither this one...
+  ]
+
+=back
+
+=head2 canonical
+
+    $json = $json->canonical([$enable])
+    
+    $enabled = $json->get_canonical
+
+If C<$enable> is true (or missing), then the C<encode> method will output JSON objects
+by sorting their keys. This is adding a comparatively high overhead.
+
+If C<$enable> is false, then the C<encode> method will output key-value
+pairs in the order Perl stores them (which will likely change between runs
+of the same script).
+
+This option is useful if you want the same data structure to be encoded as
+the same JSON text (given the same overall settings). If it is disabled,
+the same hash might be encoded differently even if contains the same data,
+as key-value pairs have no inherent ordering in Perl.
+
+This setting has no effect when decoding JSON texts.
+
+If you want your own sorting routine, you can give a code reference
+or a subroutine name to C<sort_by>. See to C<JSON::PP OWN METHODS>.
+
+=head2 allow_nonref
+
+    $json = $json->allow_nonref([$enable])
+    
+    $enabled = $json->get_allow_nonref
+
+If C<$enable> is true (or missing), then the C<encode> method can convert a
+non-reference into its corresponding string, number or null JSON value,
+which is an extension to RFC4627. Likewise, C<decode> will accept those JSON
+values instead of croaking.
+
+If C<$enable> is false, then the C<encode> method will croak if it isn't
+passed an arrayref or hashref, as JSON texts must either be an object
+or array. Likewise, C<decode> will croak if given something that is not a
+JSON object or array.
+
+   JSON::PP->new->allow_nonref->encode ("Hello, World!")
+   => "Hello, World!"
+
+=head2 allow_unknown
+
+    $json = $json->allow_unknown ([$enable])
+    
+    $enabled = $json->get_allow_unknown
+
+If $enable is true (or missing), then "encode" will *not* throw an
+exception when it encounters values it cannot represent in JSON (for
+example, filehandles) but instead will encode a JSON "null" value.
+Note that blessed objects are not included here and are handled
+separately by c<allow_nonref>.
+
+If $enable is false (the default), then "encode" will throw an
+exception when it encounters anything it cannot encode as JSON.
+
+This option does not affect "decode" in any way, and it is
+recommended to leave it off unless you know your communications
+partner.
+
+=head2 allow_blessed
+
+    $json = $json->allow_blessed([$enable])
+    
+    $enabled = $json->get_allow_blessed
+
+If C<$enable> is true (or missing), then the C<encode> method will not
+barf when it encounters a blessed reference. Instead, the value of the
+B<convert_blessed> option will decide whether C<null> (C<convert_blessed>
+disabled or no C<TO_JSON> method found) or a representation of the
+object (C<convert_blessed> enabled and C<TO_JSON> method found) is being
+encoded. Has no effect on C<decode>.
+
+If C<$enable> is false (the default), then C<encode> will throw an
+exception when it encounters a blessed object.
+
+=head2 convert_blessed
+
+    $json = $json->convert_blessed([$enable])
+    
+    $enabled = $json->get_convert_blessed
+
+If C<$enable> is true (or missing), then C<encode>, upon encountering a
+blessed object, will check for the availability of the C<TO_JSON> method
+on the object's class. If found, it will be called in scalar context
+and the resulting scalar will be encoded instead of the object. If no
+C<TO_JSON> method is found, the value of C<allow_blessed> will decide what
+to do.
+
+The C<TO_JSON> method may safely call die if it wants. If C<TO_JSON>
+returns other blessed objects, those will be handled in the same
+way. C<TO_JSON> must take care of not causing an endless recursion cycle
+(== crash) in this case. The name of C<TO_JSON> was chosen because other
+methods called by the Perl core (== not by the user of the object) are
+usually in upper case letters and to avoid collisions with the C<to_json>
+function or method.
+
+This setting does not yet influence C<decode> in any way.
+
+If C<$enable> is false, then the C<allow_blessed> setting will decide what
+to do when a blessed object is found.
+
+=head2 filter_json_object
+
+    $json = $json->filter_json_object([$coderef])
+
+When C<$coderef> is specified, it will be called from C<decode> each
+time it decodes a JSON object. The only argument passed to the coderef
+is a reference to the newly-created hash. If the code references returns
+a single scalar (which need not be a reference), this value
+(i.e. a copy of that scalar to avoid aliasing) is inserted into the
+deserialised data structure. If it returns an empty list
+(NOTE: I<not> C<undef>, which is a valid scalar), the original deserialised
+hash will be inserted. This setting can slow down decoding considerably.
+
+When C<$coderef> is omitted or undefined, any existing callback will
+be removed and C<decode> will not change the deserialised hash in any
+way.
+
+Example, convert all JSON objects into the integer 5:
+
+   my $js = JSON::PP->new->filter_json_object (sub { 5 });
+   # returns [5]
+   $js->decode ('[{}]'); # the given subroutine takes a hash reference.
+   # throw an exception because allow_nonref is not enabled
+   # so a lone 5 is not allowed.
+   $js->decode ('{"a":1, "b":2}');
+
+=head2 filter_json_single_key_object
+
+    $json = $json->filter_json_single_key_object($key [=> $coderef])
+
+Works remotely similar to C<filter_json_object>, but is only called for
+JSON objects having a single key named C<$key>.
+
+This C<$coderef> is called before the one specified via
+C<filter_json_object>, if any. It gets passed the single value in the JSON
+object. If it returns a single value, it will be inserted into the data
+structure. If it returns nothing (not even C<undef> but the empty list),
+the callback from C<filter_json_object> will be called next, as if no
+single-key callback were specified.
+
+If C<$coderef> is omitted or undefined, the corresponding callback will be
+disabled. There can only ever be one callback for a given key.
+
+As this callback gets called less often then the C<filter_json_object>
+one, decoding speed will not usually suffer as much. Therefore, single-key
+objects make excellent targets to serialise Perl objects into, especially
+as single-key JSON objects are as close to the type-tagged value concept
+as JSON gets (it's basically an ID/VALUE tuple). Of course, JSON does not
+support this in any way, so you need to make sure your data never looks
+like a serialised Perl hash.
+
+Typical names for the single object key are C<__class_whatever__>, or
+C<$__dollars_are_rarely_used__$> or C<}ugly_brace_placement>, or even
+things like C<__class_md5sum(classname)__>, to reduce the risk of clashing
+with real hashes.
+
+Example, decode JSON objects of the form C<< { "__widget__" => <id> } >>
+into the corresponding C<< $WIDGET{<id>} >> object:
+
+   # return whatever is in $WIDGET{5}:
+   JSON::PP
+      ->new
+      ->filter_json_single_key_object (__widget__ => sub {
+            $WIDGET{ $_[0] }
+         })
+      ->decode ('{"__widget__": 5')
+
+   # this can be used with a TO_JSON method in some "widget" class
+   # for serialisation to json:
+   sub WidgetBase::TO_JSON {
+      my ($self) = @_;
+
+      unless ($self->{id}) {
+         $self->{id} = ..get..some..id..;
+         $WIDGET{$self->{id}} = $self;
+      }
+
+      { __widget__ => $self->{id} }
+   }
+
+=head2 shrink
+
+    $json = $json->shrink([$enable])
+    
+    $enabled = $json->get_shrink
+
+In JSON::XS, this flag resizes strings generated by either
+C<encode> or C<decode> to their minimum size possible.
+It will also try to downgrade any strings to octet-form if possible.
+
+In JSON::PP, it is noop about resizing strings but tries
+C<utf8::downgrade> to the returned string by C<encode>.
+See to L<utf8>.
+
+See to L<JSON::XS/OBJECT-ORIENTED INTERFACE>
+
+=head2 max_depth
+
+    $json = $json->max_depth([$maximum_nesting_depth])
+    
+    $max_depth = $json->get_max_depth
+
+Sets the maximum nesting level (default C<512>) accepted while encoding
+or decoding. If a higher nesting level is detected in JSON text or a Perl
+data structure, then the encoder and decoder will stop and croak at that
+point.
+
+Nesting level is defined by number of hash- or arrayrefs that the encoder
+needs to traverse to reach a given point or the number of C<{> or C<[>
+characters without their matching closing parenthesis crossed to reach a
+given character in a string.
+
+If no argument is given, the highest possible setting will be used, which
+is rarely useful.
+
+See L<JSON::XS/SECURITY CONSIDERATIONS> for more info on why this is useful.
+
+When a large value (100 or more) was set and it de/encodes a deep nested object/text,
+it may raise a warning 'Deep recursion on subroutine' at the perl runtime phase.
+
+=head2 max_size
+
+    $json = $json->max_size([$maximum_string_size])
+    
+    $max_size = $json->get_max_size
+
+Set the maximum length a JSON text may have (in bytes) where decoding is
+being attempted. The default is C<0>, meaning no limit. When C<decode>
+is called on a string that is longer then this many bytes, it will not
+attempt to decode the string but throw an exception. This setting has no
+effect on C<encode> (yet).
+
+If no argument is given, the limit check will be deactivated (same as when
+C<0> is specified).
+
+See L<JSON::XS/SECURITY CONSIDERATIONS> for more info on why this is useful.
+
+=head2 encode
+
+    $json_text = $json->encode($perl_scalar)
+
+Converts the given Perl data structure (a simple scalar or a reference
+to a hash or array) to its JSON representation. Simple scalars will be
+converted into JSON string or number sequences, while references to arrays
+become JSON arrays and references to hashes become JSON objects. Undefined
+Perl values (e.g. C<undef>) become JSON C<null> values.
+References to the integers C<0> and C<1> are converted into C<true> and C<false>.
+
+=head2 decode
+
+    $perl_scalar = $json->decode($json_text)
+
+The opposite of C<encode>: expects a JSON text and tries to parse it,
+returning the resulting simple scalar or reference. Croaks on error.
+
+JSON numbers and strings become simple Perl scalars. JSON arrays become
+Perl arrayrefs and JSON objects become Perl hashrefs. C<true> becomes
+C<1> (C<JSON::true>), C<false> becomes C<0> (C<JSON::false>) and
+C<null> becomes C<undef>.
+
+=head2 decode_prefix
+
+    ($perl_scalar, $characters) = $json->decode_prefix($json_text)
+
+This works like the C<decode> method, but instead of raising an exception
+when there is trailing garbage after the first JSON object, it will
+silently stop parsing there and return the number of characters consumed
+so far.
+
+   JSON->new->decode_prefix ("[1] the tail")
+   => ([], 3)
+
+=head1 INCREMENTAL PARSING
+
+Most of this section are copied and modified from L<JSON::XS/INCREMENTAL PARSING>.
+
+In some cases, there is the need for incremental parsing of JSON texts.
+This module does allow you to parse a JSON stream incrementally.
+It does so by accumulating text until it has a full JSON object, which
+it then can decode. This process is similar to using C<decode_prefix>
+to see if a full JSON object is available, but is much more efficient
+(and can be implemented with a minimum of method calls).
+
+This module will only attempt to parse the JSON text once it is sure it
+has enough text to get a decisive result, using a very simple but
+truly incremental parser. This means that it sometimes won't stop as
+early as the full parser, for example, it doesn't detect parentheses
+mismatches. The only thing it guarantees is that it starts decoding as
+soon as a syntactically valid JSON text has been seen. This means you need
+to set resource limits (e.g. C<max_size>) to ensure the parser will stop
+parsing in the presence if syntax errors.
+
+The following methods implement this incremental parser.
+
+=head2 incr_parse
+
+    $json->incr_parse( [$string] ) # void context
+    
+    $obj_or_undef = $json->incr_parse( [$string] ) # scalar context
+    
+    @obj_or_empty = $json->incr_parse( [$string] ) # list context
+
+This is the central parsing function. It can both append new text and
+extract objects from the stream accumulated so far (both of these
+functions are optional).
+
+If C<$string> is given, then this string is appended to the already
+existing JSON fragment stored in the C<$json> object.
+
+After that, if the function is called in void context, it will simply
+return without doing anything further. This can be used to add more text
+in as many chunks as you want.
+
+If the method is called in scalar context, then it will try to extract
+exactly I<one> JSON object. If that is successful, it will return this
+object, otherwise it will return C<undef>. If there is a parse error,
+this method will croak just as C<decode> would do (one can then use
+C<incr_skip> to skip the erroneous part). This is the most common way of
+using the method.
+
+And finally, in list context, it will try to extract as many objects
+from the stream as it can find and return them, or the empty list
+otherwise. For this to work, there must be no separators between the JSON
+objects or arrays, instead they must be concatenated back-to-back. If
+an error occurs, an exception will be raised as in the scalar context
+case. Note that in this case, any previously-parsed JSON texts will be
+lost.
+
+Example: Parse some JSON arrays/objects in a given string and return them.
+
+    my @objs = JSON->new->incr_parse ("[5][7][1,2]");
+
+=head2 incr_text
+
+    $lvalue_string = $json->incr_text
+
+This method returns the currently stored JSON fragment as an lvalue, that
+is, you can manipulate it. This I<only> works when a preceding call to
+C<incr_parse> in I<scalar context> successfully returned an object. Under
+all other circumstances you must not call this function (I mean it.
+although in simple tests it might actually work, it I<will> fail under
+real world conditions). As a special exception, you can also call this
+method before having parsed anything.
+
+This function is useful in two cases: a) finding the trailing text after a
+JSON object or b) parsing multiple JSON objects separated by non-JSON text
+(such as commas).
+
+    $json->incr_text =~ s/\s*,\s*//;
+
+In Perl 5.005, C<lvalue> attribute is not available.
+You must write codes like the below:
+
+    $string = $json->incr_text;
+    $string =~ s/\s*,\s*//;
+    $json->incr_text( $string );
+
+=head2 incr_skip
+
+    $json->incr_skip
+
+This will reset the state of the incremental parser and will remove the
+parsed text from the input buffer. This is useful after C<incr_parse>
+died, in which case the input buffer and incremental parser state is left
+unchanged, to skip the text parsed so far and to reset the parse state.
+
+=head2 incr_reset
+
+    $json->incr_reset
+
+This completely resets the incremental parser, that is, after this call,
+it will be as if the parser had never parsed anything.
+
+This is useful if you want to repeatedly parse JSON objects and want to
+ignore any trailing data, which means you have to reset the parser after
+each successful decode.
+
+See to L<JSON::XS/INCREMENTAL PARSING> for examples.
+
+
+=head1 JSON::PP OWN METHODS
+
+=head2 allow_singlequote
+
+    $json = $json->allow_singlequote([$enable])
+
+If C<$enable> is true (or missing), then C<decode> will accept
+JSON strings quoted by single quotations that are invalid JSON
+format.
+
+    $json->allow_singlequote->decode({"foo":'bar'});
+    $json->allow_singlequote->decode({'foo':"bar"});
+    $json->allow_singlequote->decode({'foo':'bar'});
+
+As same as the C<relaxed> option, this option may be used to parse
+application-specific files written by humans.
+
+
+=head2 allow_barekey
+
+    $json = $json->allow_barekey([$enable])
+
+If C<$enable> is true (or missing), then C<decode> will accept
+bare keys of JSON object that are invalid JSON format.
+
+As same as the C<relaxed> option, this option may be used to parse
+application-specific files written by humans.
+
+    $json->allow_barekey->decode('{foo:"bar"}');
+
+=head2 allow_bignum
+
+    $json = $json->allow_bignum([$enable])
+
+If C<$enable> is true (or missing), then C<decode> will convert
+the big integer Perl cannot handle as integer into a L<Math::BigInt>
+object and convert a floating number (any) into a L<Math::BigFloat>.
+
+On the contrary, C<encode> converts C<Math::BigInt> objects and C<Math::BigFloat>
+objects into JSON numbers with C<allow_blessed> enabled.
+
+   $json->allow_nonref->allow_blessed->allow_bignum;
+   $bigfloat = $json->decode('2.000000000000000000000000001');
+   print $json->encode($bigfloat);
+   # => 2.000000000000000000000000001
+
+See to L<JSON::XS/MAPPING> about the normal conversion of JSON number.
+
+=head2 loose
+
+    $json = $json->loose([$enable])
+
+The unescaped [\x00-\x1f\x22\x2f\x5c] strings are invalid in JSON strings
+and the module doesn't allow you to C<decode> to these (except for \x2f).
+If C<$enable> is true (or missing), then C<decode>  will accept these
+unescaped strings.
+
+    $json->loose->decode(qq|["abc
+                                   def"]|);
+
+See L<JSON::XS/SECURITY CONSIDERATIONS>.
+
+=head2 escape_slash
+
+    $json = $json->escape_slash([$enable])
+
+According to JSON Grammar, I<slash> (U+002F) is escaped. But default
+JSON::PP (as same as JSON::XS) encodes strings without escaping slash.
+
+If C<$enable> is true (or missing), then C<encode> will escape slashes.
+
+=head2 indent_length
+
+    $json = $json->indent_length($length)
+
+JSON::XS indent space length is 3 and cannot be changed.
+JSON::PP set the indent space length with the given $length.
+The default is 3. The acceptable range is 0 to 15.
+
+=head2 sort_by
+
+    $json = $json->sort_by($function_name)
+    $json = $json->sort_by($subroutine_ref)
+
+If $function_name or $subroutine_ref are set, its sort routine are used
+in encoding JSON objects.
+
+   $js = $pc->sort_by(sub { $JSON::PP::a cmp $JSON::PP::b })->encode($obj);
+   # is($js, q|{"a":1,"b":2,"c":3,"d":4,"e":5,"f":6,"g":7,"h":8,"i":9}|);
+
+   $js = $pc->sort_by('own_sort')->encode($obj);
+   # is($js, q|{"a":1,"b":2,"c":3,"d":4,"e":5,"f":6,"g":7,"h":8,"i":9}|);
+
+   sub JSON::PP::own_sort { $JSON::PP::a cmp $JSON::PP::b }
+
+As the sorting routine runs in the JSON::PP scope, the given
+subroutine name and the special variables C<$a>, C<$b> will begin
+'JSON::PP::'.
+
+If $integer is set, then the effect is same as C<canonical> on.
+
+=head1 INTERNAL
+
+For developers.
+
+=over
+
+=item PP_encode_box
+
+Returns
+
+        {
+            depth        => $depth,
+            indent_count => $indent_count,
+        }
+
+
+=item PP_decode_box
+
+Returns
+
+        {
+            text    => $text,
+            at      => $at,
+            ch      => $ch,
+            len     => $len,
+            depth   => $depth,
+            encoding      => $encoding,
+            is_valid_utf8 => $is_valid_utf8,
+        };
+
+=back
+
+=head1 MAPPING
+
+This section is copied from JSON::XS and modified to C<JSON::PP>.
+JSON::XS and JSON::PP mapping mechanisms are almost equivalent.
+
+See to L<JSON::XS/MAPPING>.
+
+=head2 JSON -> PERL
+
+=over 4
+
+=item object
+
+A JSON object becomes a reference to a hash in Perl. No ordering of object
+keys is preserved (JSON does not preserver object key ordering itself).
+
+=item array
+
+A JSON array becomes a reference to an array in Perl.
+
+=item string
+
+A JSON string becomes a string scalar in Perl - Unicode codepoints in JSON
+are represented by the same codepoints in the Perl string, so no manual
+decoding is necessary.
+
+=item number
+
+A JSON number becomes either an integer, numeric (floating point) or
+string scalar in perl, depending on its range and any fractional parts. On
+the Perl level, there is no difference between those as Perl handles all
+the conversion details, but an integer may take slightly less memory and
+might represent more values exactly than floating point numbers.
+
+If the number consists of digits only, C<JSON> will try to represent
+it as an integer value. If that fails, it will try to represent it as
+a numeric (floating point) value if that is possible without loss of
+precision. Otherwise it will preserve the number as a string value (in
+which case you lose roundtripping ability, as the JSON number will be
+re-encoded to a JSON string).
+
+Numbers containing a fractional or exponential part will always be
+represented as numeric (floating point) values, possibly at a loss of
+precision (in which case you might lose perfect roundtripping ability, but
+the JSON number will still be re-encoded as a JSON number).
+
+Note that precision is not accuracy - binary floating point values cannot
+represent most decimal fractions exactly, and when converting from and to
+floating point, C<JSON> only guarantees precision up to but not including
+the least significant bit.
+
+When C<allow_bignum> is enabled, the big integers 
+and the numeric can be optionally converted into L<Math::BigInt> and
+L<Math::BigFloat> objects.
+
+=item true, false
+
+These JSON atoms become C<JSON::PP::true> and C<JSON::PP::false>,
+respectively. They are overloaded to act almost exactly like the numbers
+C<1> and C<0>. You can check whether a scalar is a JSON boolean by using
+the C<JSON::is_bool> function.
+
+   print JSON::PP::true . "\n";
+    => true
+   print JSON::PP::true + 1;
+    => 1
+
+   ok(JSON::true eq  '1');
+   ok(JSON::true == 1);
+
+C<JSON> will install these missing overloading features to the backend modules.
+
+
+=item null
+
+A JSON null atom becomes C<undef> in Perl.
+
+C<JSON::PP::null> returns C<undef>.
+
+=back
+
+
+=head2 PERL -> JSON
+
+The mapping from Perl to JSON is slightly more difficult, as Perl is a
+truly typeless language, so we can only guess which JSON type is meant by
+a Perl value.
+
+=over 4
+
+=item hash references
+
+Perl hash references become JSON objects. As there is no inherent ordering
+in hash keys (or JSON objects), they will usually be encoded in a
+pseudo-random order that can change between runs of the same program but
+stays generally the same within a single run of a program. C<JSON>
+optionally sort the hash keys (determined by the I<canonical> flag), so
+the same datastructure will serialise to the same JSON text (given same
+settings and version of JSON::XS), but this incurs a runtime overhead
+and is only rarely useful, e.g. when you want to compare some JSON text
+against another for equality.
+
+
+=item array references
+
+Perl array references become JSON arrays.
+
+=item other references
+
+Other unblessed references are generally not allowed and will cause an
+exception to be thrown, except for references to the integers C<0> and
+C<1>, which get turned into C<false> and C<true> atoms in JSON. You can
+also use C<JSON::false> and C<JSON::true> to improve readability.
+
+   to_json [\0,JSON::PP::true]      # yields [false,true]
+
+=item JSON::PP::true, JSON::PP::false, JSON::PP::null
+
+These special values become JSON true and JSON false values,
+respectively. You can also use C<\1> and C<\0> directly if you want.
+
+JSON::PP::null returns C<undef>.
+
+=item blessed objects
+
+Blessed objects are not directly representable in JSON. See the
+C<allow_blessed> and C<convert_blessed> methods on various options on
+how to deal with this: basically, you can choose between throwing an
+exception, encoding the reference as if it weren't blessed, or provide
+your own serialiser method.
+
+See to L<convert_blessed>.
+
+=item simple scalars
+
+Simple Perl scalars (any scalar that is not a reference) are the most
+difficult objects to encode: JSON::XS and JSON::PP will encode undefined scalars as
+JSON C<null> values, scalars that have last been used in a string context
+before encoding as JSON strings, and anything else as number value:
+
+   # dump as number
+   encode_json [2]                      # yields [2]
+   encode_json [-3.0e17]                # yields [-3e+17]
+   my $value = 5; encode_json [$value]  # yields [5]
+
+   # used as string, so dump as string
+   print $value;
+   encode_json [$value]                 # yields ["5"]
+
+   # undef becomes null
+   encode_json [undef]                  # yields [null]
+
+You can force the type to be a string by stringifying it:
+
+   my $x = 3.1; # some variable containing a number
+   "$x";        # stringified
+   $x .= "";    # another, more awkward way to stringify
+   print $x;    # perl does it for you, too, quite often
+
+You can force the type to be a number by numifying it:
+
+   my $x = "3"; # some variable containing a string
+   $x += 0;     # numify it, ensuring it will be dumped as a number
+   $x *= 1;     # same thing, the choice is yours.
+
+You cannot currently force the type in other, less obscure, ways.
+
+Note that numerical precision has the same meaning as under Perl (so
+binary to decimal conversion follows the same rules as in Perl, which
+can differ to other languages). Also, your perl interpreter might expose
+extensions to the floating point numbers of your platform, such as
+infinities or NaN's - these cannot be represented in JSON, and it is an
+error to pass those in.
+
+=item Big Number
+
+When C<allow_bignum> is enabled, 
+C<encode> converts C<Math::BigInt> objects and C<Math::BigFloat>
+objects into JSON numbers.
+
+
+=back
+
+=head1 UNICODE HANDLING ON PERLS
+
+If you do not know about Unicode on Perl well,
+please check L<JSON::XS/A FEW NOTES ON UNICODE AND PERL>.
+
+=head2 Perl 5.8 and later
+
+Perl can handle Unicode and the JSON::PP de/encode methods also work properly.
+
+    $json->allow_nonref->encode(chr hex 3042);
+    $json->allow_nonref->encode(chr hex 12345);
+
+Returns C<"\u3042"> and C<"\ud808\udf45"> respectively.
+
+    $json->allow_nonref->decode('"\u3042"');
+    $json->allow_nonref->decode('"\ud808\udf45"');
+
+Returns UTF-8 encoded strings with UTF8 flag, regarded as C<U+3042> and C<U+12345>.
+
+Note that the versions from Perl 5.8.0 to 5.8.2, Perl built-in C<join> was broken,
+so JSON::PP wraps the C<join> with a subroutine. Thus JSON::PP works slow in the versions.
+
+
+=head2 Perl 5.6
+
+Perl can handle Unicode and the JSON::PP de/encode methods also work.
+
+=head2 Perl 5.005
+
+Perl 5.005 is a byte semantics world -- all strings are sequences of bytes.
+That means the unicode handling is not available.
+
+In encoding,
+
+    $json->allow_nonref->encode(chr hex 3042);  # hex 3042 is 12354.
+    $json->allow_nonref->encode(chr hex 12345); # hex 12345 is 74565.
+
+Returns C<B> and C<E>, as C<chr> takes a value more than 255, it treats
+as C<$value % 256>, so the above codes are equivalent to :
+
+    $json->allow_nonref->encode(chr 66);
+    $json->allow_nonref->encode(chr 69);
+
+In decoding,
+
+    $json->decode('"\u00e3\u0081\u0082"');
+
+The returned is a byte sequence C<0xE3 0x81 0x82> for UTF-8 encoded
+Japanese character (C<HIRAGANA LETTER A>).
+And if it is represented in Unicode code point, C<U+3042>.
+
+Next, 
+
+    $json->decode('"\u3042"');
+
+We ordinary expect the returned value is a Unicode character C<U+3042>.
+But here is 5.005 world. This is C<0xE3 0x81 0x82>.
+
+    $json->decode('"\ud808\udf45"');
+
+This is not a character C<U+12345> but bytes - C<0xf0 0x92 0x8d 0x85>.
+
+
+=head1 TODO
+
+=over
+
+=item speed
+
+=item memory saving
+
+=back
+
+
+=head1 SEE ALSO
+
+Most of the document are copied and modified from JSON::XS doc.
+
+L<JSON::XS>
+
+RFC4627 (L<http://www.ietf.org/rfc/rfc4627.txt>)
+
+=head1 AUTHOR
+
+Makamaka Hannyaharamitu, E<lt>makamaka[at]cpan.orgE<gt>
+
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright 2007-2016 by Makamaka Hannyaharamitu
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself. 
+
+=cut
diff --git a/.checksetup_lib/lib/perl5/JSON/PP/Boolean.pm b/.checksetup_lib/lib/perl5/JSON/PP/Boolean.pm
new file mode 100644
index 0000000000..d132e7203d
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/JSON/PP/Boolean.pm
@@ -0,0 +1,27 @@
+
+=head1 NAME
+
+JSON::PP::Boolean - dummy module providing JSON::PP::Boolean
+
+=head1 SYNOPSIS
+
+ # do not "use" yourself
+
+=head1 DESCRIPTION
+
+This module exists only to provide overload resolution for Storable and similar modules. See
+L<JSON::PP> for more info about this class.
+
+=cut
+
+use JSON::PP ();
+use strict;
+
+1;
+
+=head1 AUTHOR
+
+This idea is from L<JSON::XS::Boolean> written by Marc Lehmann <schmorp[at]schmorp.de>
+
+=cut
+
diff --git a/.checksetup_lib/lib/perl5/Module/Metadata.pm b/.checksetup_lib/lib/perl5/Module/Metadata.pm
new file mode 100644
index 0000000000..447d964773
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/Module/Metadata.pm
@@ -0,0 +1,1028 @@
+# -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
+# vim:ts=8:sw=2:et:sta:sts=2
+package Module::Metadata;
+
+# Adapted from Perl-licensed code originally distributed with
+# Module-Build by Ken Williams
+
+# This module provides routines to gather information about
+# perl modules (assuming this may be expanded in the distant
+# parrot future to look at other types of modules).
+
+use strict;
+use warnings;
+
+our $VERSION = '1.000019';
+$VERSION = eval $VERSION;
+
+use Carp qw/croak/;
+use File::Spec;
+use IO::File;
+use version 0.87;
+
+BEGIN {
+  if ($INC{'Log/Contextual.pm'}) {
+    Log::Contextual->import('log_info');
+  }
+  else {
+    *log_info = sub (&) { warn $_[0]->() };
+  }
+}
+use File::Find qw(find);
+
+my $V_NUM_REGEXP = qr{v?[0-9._]+};    # crudely, a v-string or decimal
+
+my $PKG_FIRST_WORD_REGEXP = qr{ # the FIRST word in a package name
+  [a-zA-Z_]                     # the first word CANNOT start with a digit
+    (?:
+      [\w']?                    # can contain letters, digits, _, or ticks
+      \w                        # But, NO multi-ticks or trailing ticks
+    )*
+}x;
+
+my $PKG_ADDL_WORD_REGEXP = qr{ # the 2nd+ word in a package name
+  \w                           # the 2nd+ word CAN start with digits
+    (?:
+      [\w']?                   # and can contain letters or ticks
+      \w                       # But, NO multi-ticks or trailing ticks
+    )*
+}x;
+
+my $PKG_NAME_REGEXP = qr{ # match a package name
+  (?: :: )?               # a pkg name can start with aristotle
+  $PKG_FIRST_WORD_REGEXP  # a package word
+  (?:
+    (?: :: )+             ### aristotle (allow one or many times)
+    $PKG_ADDL_WORD_REGEXP ### a package word
+  )*                      # ^ zero, one or many times
+  (?:
+    ::                    # allow trailing aristotle
+  )?
+}x;
+
+my $PKG_REGEXP = qr{   # match a package declaration
+  ^[\s\{;]*             # intro chars on a line
+  package               # the word 'package'
+  \s+                   # whitespace
+  ($PKG_NAME_REGEXP)    # a package name
+  \s*                   # optional whitespace
+  ($V_NUM_REGEXP)?        # optional version number
+  \s*                   # optional whitesapce
+  [;\{]                 # semicolon line terminator or block start (since 5.16)
+}x;
+
+my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name
+  ([\$*])         # sigil - $ or *
+  (
+    (             # optional leading package name
+      (?:::|\')?  # possibly starting like just :: (Ě  la $::VERSION)
+      (?:\w+(?:::|\'))*  # Foo::Bar:: ...
+    )?
+    VERSION
+  )\b
+}x;
+
+my $VERS_REGEXP = qr{ # match a VERSION definition
+  (?:
+    \(\s*$VARNAME_REGEXP\s*\) # with parens
+  |
+    $VARNAME_REGEXP           # without parens
+  )
+  \s*
+  =[^=~]  # = but not ==, nor =~
+}x;
+
+sub new_from_file {
+  my $class    = shift;
+  my $filename = File::Spec->rel2abs(shift);
+
+  return undef unless defined($filename) && -f $filename;
+  return $class->_init(undef, $filename, @_);
+}
+
+sub new_from_handle {
+  my $class    = shift;
+  my $handle   = shift;
+  my $filename = shift;
+  return undef unless defined($handle) && defined($filename);
+  $filename = File::Spec->rel2abs($filename);
+
+  return $class->_init(undef, $filename, @_, handle => $handle);
+
+}
+
+
+sub new_from_module {
+  my $class  = shift;
+  my $module = shift;
+  my %props  = @_;
+
+  $props{inc} ||= \@INC;
+  my $filename = $class->find_module_by_name($module, $props{inc});
+  return undef unless defined($filename) && -f $filename;
+  return $class->_init($module, $filename, %props);
+}
+
+{
+
+  my $compare_versions = sub {
+    my ($v1, $op, $v2) = @_;
+    $v1 = version->new($v1) unless UNIVERSAL::isa($v1, 'version');
+
+    my $eval_str = "\$v1 $op \$v2";
+    my $result   = eval $eval_str;
+    log_info {"error comparing versions: '$eval_str' $@"} if $@;
+
+    return $result;
+  };
+
+  my $normalize_version = sub {
+    my ($version) = @_;
+    if ($version =~ /[=<>!,]/) {    # logic, not just version
+                                    # take as is without modification
+    }
+    elsif (ref $version eq 'version') {    # version objects
+      $version = $version->is_qv ? $version->normal : $version->stringify;
+    }
+    elsif ($version =~ /^[^v][^.]*\.[^.]+\./) {    # no leading v, multiple dots
+          # normalize string tuples without "v": "1.2.3" -> "v1.2.3"
+      $version = "v$version";
+    }
+    else {
+      # leave alone
+    }
+    return $version;
+  };
+
+  # separate out some of the conflict resolution logic
+
+  my $resolve_module_versions = sub {
+    my $packages = shift;
+
+    my ($file, $version);
+    my $err = '';
+    foreach my $p (@$packages) {
+      if (defined($p->{version})) {
+        if (defined($version)) {
+          if ($compare_versions->($version, '!=', $p->{version})) {
+            $err .= "  $p->{file} ($p->{version})\n";
+          }
+          else {
+            # same version declared multiple times, ignore
+          }
+        }
+        else {
+          $file    = $p->{file};
+          $version = $p->{version};
+        }
+      }
+      $file ||= $p->{file} if defined($p->{file});
+    }
+
+    if ($err) {
+      $err = "  $file ($version)\n" . $err;
+    }
+
+    my %result = (file => $file, version => $version, err => $err);
+
+    return \%result;
+  };
+
+  sub provides {
+    my $class = shift;
+
+    croak "provides() requires key/value pairs \n" if @_ % 2;
+    my %args = @_;
+
+    croak "provides() takes only one of 'dir' or 'files'\n"
+      if $args{dir} && $args{files};
+
+    croak "provides() requires a 'version' argument" unless defined $args{version};
+
+    croak "provides() does not support version '$args{version}' metadata"
+      unless grep { $args{version} eq $_ } qw/1.4 2/;
+
+    $args{prefix} = 'lib' unless defined $args{prefix};
+
+    my $p;
+    if ($args{dir}) {
+      $p = $class->package_versions_from_directory($args{dir});
+    }
+    else {
+      croak "provides() requires 'files' to be an array reference\n"
+        unless ref $args{files} eq 'ARRAY';
+      $p = $class->package_versions_from_directory($args{files});
+    }
+
+    # Now, fix up files with prefix
+    if (length $args{prefix}) {    # check in case disabled with q{}
+      $args{prefix} =~ s{/$}{};
+      for my $v (values %$p) {
+        $v->{file} = "$args{prefix}/$v->{file}";
+      }
+    }
+
+    return $p;
+  }
+
+  sub package_versions_from_directory {
+    my ($class, $dir, $files) = @_;
+
+    my @files;
+
+    if ($files) {
+      @files = @$files;
+    }
+    else {
+      find(
+        {
+          wanted => sub {
+            push @files, $_ if -f $_ && /\.pm$/;
+          },
+          no_chdir => 1,
+        },
+        $dir
+      );
+    }
+
+    # First, we enumerate all packages & versions,
+    # separating into primary & alternative candidates
+    my (%prime, %alt);
+    foreach my $file (@files) {
+      my $mapped_filename = File::Spec::Unix->abs2rel($file, $dir);
+      my @path = split(/\//, $mapped_filename);
+      (my $prime_package = join('::', @path)) =~ s/\.pm$//;
+
+      my $pm_info = $class->new_from_file($file);
+
+      foreach my $package ($pm_info->packages_inside) {
+        next if $package eq 'main';    # main can appear numerous times, ignore
+        next if $package eq 'DB';      # special debugging package, ignore
+        next if grep /^_/, split(/::/, $package);    # private package, ignore
+
+        my $version = $pm_info->version($package);
+
+        $prime_package = $package if lc($prime_package) eq lc($package);
+        if ($package eq $prime_package) {
+          if (exists($prime{$package})) {
+            croak "Unexpected conflict in '$package'; multiple versions found.\n";
+          }
+          else {
+            $mapped_filename = "$package.pm" if lc("$package.pm") eq lc($mapped_filename);
+            $prime{$package}{file} = $mapped_filename;
+            $prime{$package}{version} = $version if defined($version);
+          }
+        }
+        else {
+          push(@{$alt{$package}}, {file => $mapped_filename, version => $version,});
+        }
+      }
+    }
+
+    # Then we iterate over all the packages found above, identifying conflicts
+    # and selecting the "best" candidate for recording the file & version
+    # for each package.
+    foreach my $package (keys(%alt)) {
+      my $result = $resolve_module_versions->($alt{$package});
+
+      if (exists($prime{$package})) {    # primary package selected
+
+        if ($result->{err}) {
+
+          # Use the selected primary package, but there are conflicting
+          # errors among multiple alternative packages that need to be
+          # reported
+          log_info {
+            "Found conflicting versions for package '$package'\n"
+              . "  $prime{$package}{file} ($prime{$package}{version})\n"
+              . $result->{err}
+          };
+
+        }
+        elsif (defined($result->{version})) {
+
+          # There is a primary package selected, and exactly one
+          # alternative package
+
+          if (exists($prime{$package}{version}) && defined($prime{$package}{version})) {
+
+            # Unless the version of the primary package agrees with the
+            # version of the alternative package, report a conflict
+            if ($compare_versions->($prime{$package}{version}, '!=', $result->{version})) {
+
+              log_info {
+                "Found conflicting versions for package '$package'\n"
+                  . "  $prime{$package}{file} ($prime{$package}{version})\n"
+                  . "  $result->{file} ($result->{version})\n"
+              };
+            }
+
+          }
+          else {
+            # The prime package selected has no version so, we choose to
+            # use any alternative package that does have a version
+            $prime{$package}{file}    = $result->{file};
+            $prime{$package}{version} = $result->{version};
+          }
+
+        }
+        else {
+          # no alt package found with a version, but we have a prime
+          # package so we use it whether it has a version or not
+        }
+
+      }
+      else {    # No primary package was selected, use the best alternative
+
+        if ($result->{err}) {
+          log_info {
+            "Found conflicting versions for package '$package'\n" . $result->{err}
+          };
+        }
+
+        # Despite possible conflicting versions, we choose to record
+        # something rather than nothing
+        $prime{$package}{file} = $result->{file};
+        $prime{$package}{version} = $result->{version} if defined($result->{version});
+      }
+    }
+
+    # Normalize versions.  Can't use exists() here because of bug in YAML::Node.
+    # XXX "bug in YAML::Node" comment seems irrelevant -- dagolden, 2009-05-18
+    for (grep defined $_->{version}, values %prime) {
+      $_->{version} = $normalize_version->($_->{version});
+    }
+
+    return \%prime;
+  }
+}
+
+
+sub _init {
+  my $class    = shift;
+  my $module   = shift;
+  my $filename = shift;
+  my %props    = @_;
+
+  my $handle = delete $props{handle};
+  my (%valid_props, @valid_props);
+  @valid_props = qw( collect_pod inc );
+  @valid_props{@valid_props} = delete(@props{@valid_props});
+  warn "Unknown properties: @{[keys %props]}\n" if scalar(%props);
+
+  my %data = (
+    module       => $module,
+    filename     => $filename,
+    version      => undef,
+    packages     => [],
+    versions     => {},
+    pod          => {},
+    pod_headings => [],
+    collect_pod  => 0,
+
+    %valid_props,
+  );
+
+  my $self = bless(\%data, $class);
+
+  if ($handle) {
+    $self->_parse_fh($handle);
+  }
+  else {
+    $self->_parse_file();
+  }
+
+  unless ($self->{module} and length($self->{module})) {
+    my ($v, $d, $f) = File::Spec->splitpath($self->{filename});
+    if ($f =~ /\.pm$/) {
+      $f =~ s/\..+$//;
+      my @candidates = grep /$f$/, @{$self->{packages}};
+      $self->{module} = shift(@candidates);    # punt
+    }
+    else {
+      if (grep /main/, @{$self->{packages}}) {
+        $self->{module} = 'main';
+      }
+      else {
+        $self->{module} = $self->{packages}[0] || '';
+      }
+    }
+  }
+
+  $self->{version} = $self->{versions}{$self->{module}}
+    if defined($self->{module});
+
+  return $self;
+}
+
+# class method
+sub _do_find_module {
+  my $class  = shift;
+  my $module = shift || croak 'find_module_by_name() requires a package name';
+  my $dirs   = shift || \@INC;
+
+  my $file = File::Spec->catfile(split(/::/, $module));
+  foreach my $dir (@$dirs) {
+    my $testfile = File::Spec->catfile($dir, $file);
+    return [File::Spec->rel2abs($testfile), $dir] if -e $testfile and !-d _; # For stuff like ExtUtils::xsubpp
+    return [File::Spec->rel2abs("$testfile.pm"), $dir] if -e "$testfile.pm";
+  }
+  return;
+}
+
+# class method
+sub find_module_by_name {
+  my $found = shift()->_do_find_module(@_) or return;
+  return $found->[0];
+}
+
+# class method
+sub find_module_dir_by_name {
+  my $found = shift()->_do_find_module(@_) or return;
+  return $found->[1];
+}
+
+
+# given a line of perl code, attempt to parse it if it looks like a
+# $VERSION assignment, returning sigil, full name, & package name
+sub _parse_version_expression {
+  my $self = shift;
+  my $line = shift;
+
+  my ($sig, $var, $pkg);
+  if ($line =~ /$VERS_REGEXP/o) {
+    ($sig, $var, $pkg) = $2 ? ($1, $2, $3) : ($4, $5, $6);
+    if ($pkg) {
+      $pkg = ($pkg eq '::') ? 'main' : $pkg;
+      $pkg =~ s/::$//;
+    }
+  }
+
+  return ($sig, $var, $pkg);
+}
+
+sub _parse_file {
+  my $self = shift;
+
+  my $filename = $self->{filename};
+  my $fh = IO::File->new($filename) or croak("Can't open '$filename': $!");
+
+  $self->_handle_bom($fh, $filename);
+
+  $self->_parse_fh($fh);
+}
+
+# Look for a UTF-8/UTF-16BE/UTF-16LE BOM at the beginning of the stream.
+# If there's one, then skip it and set the :encoding layer appropriately.
+sub _handle_bom {
+  my ($self, $fh, $filename) = @_;
+
+  my $pos = $fh->getpos;
+  return unless defined $pos;
+
+  my $buf = ' ' x 2;
+  my $count = $fh->read($buf, length $buf);
+  return unless defined $count and $count >= 2;
+
+  my $encoding;
+  if ($buf eq "\x{FE}\x{FF}") {
+    $encoding = 'UTF-16BE';
+  }
+  elsif ($buf eq "\x{FF}\x{FE}") {
+    $encoding = 'UTF-16LE';
+  }
+  elsif ($buf eq "\x{EF}\x{BB}") {
+    $buf = ' ';
+    $count = $fh->read($buf, length $buf);
+    if (defined $count and $count >= 1 and $buf eq "\x{BF}") {
+      $encoding = 'UTF-8';
+    }
+  }
+
+  if (defined $encoding) {
+    if ("$]" >= 5.008) {
+
+      # $fh->binmode requires perl 5.10
+      binmode($fh, ":encoding($encoding)");
+    }
+  }
+  else {
+    $fh->setpos($pos)
+      or croak(sprintf "Can't reset position to the top of '$filename'");
+  }
+
+  return $encoding;
+}
+
+sub _parse_fh {
+  my ($self, $fh) = @_;
+
+  my ($in_pod, $seen_end, $need_vers) = (0, 0, 0);
+  my (@pkgs, %vers, %pod, @pod);
+  my $pkg      = 'main';
+  my $pod_sect = '';
+  my $pod_data = '';
+  my $in_end   = 0;
+
+  while (defined(my $line = <$fh>)) {
+    my $line_num = $.;
+
+    chomp($line);
+
+    # From toke.c : any line that begins by "=X", where X is an alphabetic
+    # character, introduces a POD segment.
+    my $is_cut;
+    if ($line =~ /^=([a-zA-Z].*)/) {
+      my $cmd = $1;
+
+      # Then it goes back to Perl code for "=cutX" where X is a non-alphabetic
+      # character (which includes the newline, but here we chomped it away).
+      $is_cut = $cmd =~ /^cut(?:[^a-zA-Z]|$)/;
+      $in_pod = !$is_cut;
+    }
+
+    if ($in_pod) {
+
+      if ($line =~ /^=head[1-4]\s+(.+)\s*$/) {
+        push(@pod, $1);
+        if ($self->{collect_pod} && length($pod_data)) {
+          $pod{$pod_sect} = $pod_data;
+          $pod_data = '';
+        }
+        $pod_sect = $1;
+
+      }
+      elsif ($self->{collect_pod}) {
+        $pod_data .= "$line\n";
+
+      }
+
+    }
+    elsif ($is_cut) {
+
+      if ($self->{collect_pod} && length($pod_data)) {
+        $pod{$pod_sect} = $pod_data;
+        $pod_data = '';
+      }
+      $pod_sect = '';
+
+    }
+    else {
+
+      # Skip after __END__
+      next if $in_end;
+
+      # Skip comments in code
+      next if $line =~ /^\s*#/;
+
+      # Would be nice if we could also check $in_string or something too
+      if ($line eq '__END__') {
+        $in_end++;
+        next;
+      }
+      last if $line eq '__DATA__';
+
+      # parse $line to see if it's a $VERSION declaration
+      my ($vers_sig, $vers_fullname, $vers_pkg)
+        = ($line =~ /VERSION/) ? $self->_parse_version_expression($line) : ();
+
+      if ($line =~ /$PKG_REGEXP/o) {
+        $pkg = $1;
+        push(@pkgs, $pkg) unless grep($pkg eq $_, @pkgs);
+        $vers{$pkg} = $2 unless exists($vers{$pkg});
+        $need_vers = defined $2 ? 0 : 1;
+
+        # VERSION defined with full package spec, i.e. $Module::VERSION
+      }
+      elsif ($vers_fullname && $vers_pkg) {
+        push(@pkgs, $vers_pkg) unless grep($vers_pkg eq $_, @pkgs);
+        $need_vers = 0 if $vers_pkg eq $pkg;
+
+        unless (defined $vers{$vers_pkg} && length $vers{$vers_pkg}) {
+          $vers{$vers_pkg}
+            = $self->_evaluate_version_line($vers_sig, $vers_fullname, $line);
+        }
+
+        # first non-comment line in undeclared package main is VERSION
+      }
+      elsif (!exists($vers{main}) && $pkg eq 'main' && $vers_fullname) {
+        $need_vers = 0;
+        my $v = $self->_evaluate_version_line($vers_sig, $vers_fullname, $line);
+        $vers{$pkg} = $v;
+        push(@pkgs, 'main');
+
+        # first non-comment line in undeclared package defines package main
+      }
+      elsif (!exists($vers{main}) && $pkg eq 'main' && $line =~ /\w+/) {
+        $need_vers = 1;
+        $vers{main} = '';
+        push(@pkgs, 'main');
+
+        # only keep if this is the first $VERSION seen
+      }
+      elsif ($vers_fullname && $need_vers) {
+        $need_vers = 0;
+        my $v = $self->_evaluate_version_line($vers_sig, $vers_fullname, $line);
+
+
+        unless (defined $vers{$pkg} && length $vers{$pkg}) {
+          $vers{$pkg} = $v;
+        }
+
+      }
+
+    }
+
+  }
+
+  if ($self->{collect_pod} && length($pod_data)) {
+    $pod{$pod_sect} = $pod_data;
+  }
+
+  $self->{versions}     = \%vers;
+  $self->{packages}     = \@pkgs;
+  $self->{pod}          = \%pod;
+  $self->{pod_headings} = \@pod;
+}
+
+{
+  my $pn = 0;
+
+  sub _evaluate_version_line {
+    my $self = shift;
+    my ($sigil, $var, $line) = @_;
+
+    # Some of this code came from the ExtUtils:: hierarchy.
+
+    # We compile into $vsub because 'use version' would cause
+    # compiletime/runtime issues with local()
+    my $vsub;
+    $pn++;    # everybody gets their own package
+    my $eval = qq{BEGIN { my \$dummy = q#  Hide from _packages_inside()
+    #; package Module::Metadata::_version::p$pn;
+    use version;
+    no strict;
+    no warnings;
+
+      \$vsub = sub {
+        local $sigil$var;
+        \$$var=undef;
+        $line;
+        \$$var
+      };
+  }};
+
+    $eval = $1 if $eval =~ m{^(.+)}s;
+
+    local $^W;
+
+    # Try to get the $VERSION
+    eval $eval;
+
+    # some modules say $VERSION = $Foo::Bar::VERSION, but Foo::Bar isn't
+    # installed, so we need to hunt in ./lib for it
+    if ($@ =~ /Can't locate/ && -d 'lib') {
+      local @INC = ('lib', @INC);
+      eval $eval;
+    }
+    warn "Error evaling version line '$eval' in $self->{filename}: $@\n" if $@;
+    (ref($vsub) eq 'CODE')
+      or croak "failed to build version sub for $self->{filename}";
+    my $result = eval { $vsub->() };
+    croak
+      "Could not get version from $self->{filename} by executing:\n$eval\n\nThe fatal error was: $@\n"
+      if $@;
+
+    # Upgrade it into a version object
+    my $version = eval { _dwim_version($result) };
+
+    croak
+      "Version '$result' from $self->{filename} does not appear to be valid:\n$eval\n\nThe fatal error was: $@\n"
+      unless defined $version;    # "0" is OK!
+
+    return $version;
+  }
+}
+
+# Try to DWIM when things fail the lax version test in obvious ways
+{
+  my @version_prep = (
+
+    # Best case, it just works
+    sub { return shift },
+
+    # If we still don't have a version, try stripping any
+    # trailing junk that is prohibited by lax rules
+    sub {
+      my $v = shift;
+      $v =~ s{([0-9])[a-z-].*$}{$1}i;    # 1.23-alpha or 1.23b
+      return $v;
+    },
+
+    # Activestate apparently creates custom versions like '1.23_45_01', which
+    # cause version.pm to think it's an invalid alpha.  So check for that
+    # and strip them
+    sub {
+      my $v          = shift;
+      my $num_dots   = () = $v =~ m{(\.)}g;
+      my $num_unders = () = $v =~ m{(_)}g;
+      my $leading_v  = substr($v, 0, 1) eq 'v';
+      if (!$leading_v && $num_dots < 2 && $num_unders > 1) {
+        $v =~ s{_}{}g;
+        $num_unders = () = $v =~ m{(_)}g;
+      }
+      return $v;
+    },
+
+    # Worst case, try numifying it like we would have before version objects
+    sub {
+      my $v = shift;
+      no warnings 'numeric';
+      return 0 + $v;
+    },
+
+  );
+
+  sub _dwim_version {
+    my ($result) = shift;
+
+    return $result if ref($result) eq 'version';
+
+    my ($version, $error);
+    for my $f (@version_prep) {
+      $result = $f->($result);
+      $version = eval { version->new($result) };
+      $error ||= $@ if $@;    # capture first failure
+      last if defined $version;
+    }
+
+    croak $error unless defined $version;
+
+    return $version;
+  }
+}
+
+############################################################
+
+# accessors
+sub name { $_[0]->{module} }
+
+sub filename        { $_[0]->{filename} }
+sub packages_inside { @{$_[0]->{packages}} }
+sub pod_inside      { @{$_[0]->{pod_headings}} }
+sub contains_pod    { 0 + @{$_[0]->{pod_headings}} }
+
+sub version {
+  my $self = shift;
+  my $mod = shift || $self->{module};
+  my $vers;
+  if (defined($mod) && length($mod) && exists($self->{versions}{$mod})) {
+    return $self->{versions}{$mod};
+  }
+  else {
+    return undef;
+  }
+}
+
+sub pod {
+  my $self = shift;
+  my $sect = shift;
+  if (defined($sect) && length($sect) && exists($self->{pod}{$sect})) {
+    return $self->{pod}{$sect};
+  }
+  else {
+    return undef;
+  }
+}
+
+1;
+
+=head1 NAME
+
+Module::Metadata - Gather package and POD information from perl module files
+
+=head1 SYNOPSIS
+
+  use Module::Metadata;
+
+  # information about a .pm file
+  my $info = Module::Metadata->new_from_file( $file );
+  my $version = $info->version;
+
+  # CPAN META 'provides' field for .pm files in a directory
+  my $provides = Module::Metadata->provides(
+    dir => 'lib', version => 2
+  );
+
+=head1 DESCRIPTION
+
+This module provides a standard way to gather metadata about a .pm file through
+(mostly) static analysis and (some) code execution.  When determining the
+version of a module, the C<$VERSION> assignment is C<eval>ed, as is traditional
+in the CPAN toolchain.
+
+=head1 USAGE
+
+=head2 Class methods
+
+=over 4
+
+=item C<< new_from_file($filename, collect_pod => 1) >>
+
+Constructs a C<Module::Metadata> object given the path to a file.  Returns
+undef if the filename does not exist.
+
+C<collect_pod> is a optional boolean argument that determines whether POD
+data is collected and stored for reference.  POD data is not collected by
+default.  POD headings are always collected.
+
+If the file begins by an UTF-8, UTF-16BE or UTF-16LE byte-order mark, then
+it is skipped before processing, and the content of the file is also decoded
+appropriately starting from perl 5.8.
+
+=item C<< new_from_handle($handle, $filename, collect_pod => 1) >>
+
+This works just like C<new_from_file>, except that a handle can be provided
+as the first argument.
+
+Note that there is no validation to confirm that the handle is a handle or
+something that can act like one.  Passing something that isn't a handle will
+cause a exception when trying to read from it.  The C<filename> argument is
+mandatory or undef will be returned.
+
+You are responsible for setting the decoding layers on C<$handle> if
+required.
+
+=item C<< new_from_module($module, collect_pod => 1, inc => \@dirs) >>
+
+Constructs a C<Module::Metadata> object given a module or package name.
+Returns undef if the module cannot be found.
+
+In addition to accepting the C<collect_pod> argument as described above,
+this method accepts a C<inc> argument which is a reference to an array of
+directories to search for the module.  If none are given, the default is
+@INC.
+
+If the file that contains the module begins by an UTF-8, UTF-16BE or
+UTF-16LE byte-order mark, then it is skipped before processing, and the
+content of the file is also decoded appropriately starting from perl 5.8.
+
+=item C<< find_module_by_name($module, \@dirs) >>
+
+Returns the path to a module given the module or package name. A list
+of directories can be passed in as an optional parameter, otherwise
+@INC is searched.
+
+Can be called as either an object or a class method.
+
+=item C<< find_module_dir_by_name($module, \@dirs) >>
+
+Returns the entry in C<@dirs> (or C<@INC> by default) that contains
+the module C<$module>. A list of directories can be passed in as an
+optional parameter, otherwise @INC is searched.
+
+Can be called as either an object or a class method.
+
+=item C<< provides( %options ) >>
+
+This is a convenience wrapper around C<package_versions_from_directory>
+to generate a CPAN META C<provides> data structure.  It takes key/value
+pairs.  Valid option keys include:
+
+=over
+
+=item version B<(required)>
+
+Specifies which version of the L<CPAN::Meta::Spec> should be used as
+the format of the C<provides> output.  Currently only '1.4' and '2'
+are supported (and their format is identical).  This may change in
+the future as the definition of C<provides> changes.
+
+The C<version> option is required.  If it is omitted or if
+an unsupported version is given, then C<provides> will throw an error.
+
+=item dir
+
+Directory to search recursively for F<.pm> files.  May not be specified with
+C<files>.
+
+=item files
+
+Array reference of files to examine.  May not be specified with C<dir>.
+
+=item prefix
+
+String to prepend to the C<file> field of the resulting output. This defaults
+to F<lib>, which is the common case for most CPAN distributions with their
+F<.pm> files in F<lib>.  This option ensures the META information has the
+correct relative path even when the C<dir> or C<files> arguments are
+absolute or have relative paths from a location other than the distribution
+root.
+
+=back
+
+For example, given C<dir> of 'lib' and C<prefix> of 'lib', the return value
+is a hashref of the form:
+
+  {
+    'Package::Name' => {
+      version => '0.123',
+      file => 'lib/Package/Name.pm'
+    },
+    'OtherPackage::Name' => ...
+  }
+
+=item C<< package_versions_from_directory($dir, \@files?) >>
+
+Scans C<$dir> for .pm files (unless C<@files> is given, in which case looks
+for those files in C<$dir> - and reads each file for packages and versions,
+returning a hashref of the form:
+
+  {
+    'Package::Name' => {
+      version => '0.123',
+      file => 'Package/Name.pm'
+    },
+    'OtherPackage::Name' => ...
+  }
+
+The C<DB> and C<main> packages are always omitted, as are any "private"
+packages that have leading underscores in the namespace (e.g.
+C<Foo::_private>)
+
+Note that the file path is relative to C<$dir> if that is specified.
+This B<must not> be used directly for CPAN META C<provides>.  See
+the C<provides> method instead.
+
+=item C<< log_info (internal) >>
+
+Used internally to perform logging; imported from Log::Contextual if
+Log::Contextual has already been loaded, otherwise simply calls warn.
+
+=back
+
+=head2 Object methods
+
+=over 4
+
+=item C<< name() >>
+
+Returns the name of the package represented by this module. If there
+are more than one packages, it makes a best guess based on the
+filename. If it's a script (i.e. not a *.pm) the package name is
+'main'.
+
+=item C<< version($package) >>
+
+Returns the version as defined by the $VERSION variable for the
+package as returned by the C<name> method if no arguments are
+given. If given the name of a package it will attempt to return the
+version of that package if it is specified in the file.
+
+=item C<< filename() >>
+
+Returns the absolute path to the file.
+
+=item C<< packages_inside() >>
+
+Returns a list of packages. Note: this is a raw list of packages
+discovered (or assumed, in the case of C<main>).  It is not
+filtered for C<DB>, C<main> or private packages the way the
+C<provides> method does.  Invalid package names are not returned,
+for example "Foo:Bar".  Strange but valid package names are
+returned, for example "Foo::Bar::", and are left up to the caller
+on how to handle.
+
+=item C<< pod_inside() >>
+
+Returns a list of POD sections.
+
+=item C<< contains_pod() >>
+
+Returns true if there is any POD in the file.
+
+=item C<< pod($section) >>
+
+Returns the POD data in the given section.
+
+=back
+
+=head1 AUTHOR
+
+Original code from Module::Build::ModuleInfo by Ken Williams
+<kwilliams@cpan.org>, Randy W. Sims <RandyS@ThePierianSpring.org>
+
+Released as Module::Metadata by Matt S Trout (mst) <mst@shadowcat.co.uk> with
+assistance from David Golden (xdg) <dagolden@cpan.org>.
+
+=head1 COPYRIGHT & LICENSE
+
+Original code Copyright (c) 2001-2011 Ken Williams.
+Additional code Copyright (c) 2010-2011 Matt Trout and David Golden.
+All rights reserved.
+
+This library is free software; you can redistribute it and/or
+modify it under the same terms as Perl itself.
+
+=cut
+
diff --git a/.checksetup_lib/lib/perl5/Parse/CPAN/Meta.pm b/.checksetup_lib/lib/perl5/Parse/CPAN/Meta.pm
new file mode 100644
index 0000000000..55929c59fa
--- /dev/null
+++ b/.checksetup_lib/lib/perl5/Parse/CPAN/Meta.pm
@@ -0,0 +1,350 @@
+use 5.008001;
+use strict;
+
+package Parse::CPAN::Meta;
+
+# ABSTRACT: Parse META.yml and META.json CPAN metadata files
+
+our $VERSION = '1.4417';
+
+use Exporter;
+use Carp 'croak';
+
+our @ISA       = qw/Exporter/;
+our @EXPORT_OK = qw/Load LoadFile/;
+
+sub load_file {
+  my ($class, $filename) = @_;
+
+  my $meta = _slurp($filename);
+
+  if ($filename =~ /\.ya?ml$/) {
+    return $class->load_yaml_string($meta);
+  }
+  elsif ($filename =~ /\.json$/) {
+    return $class->load_json_string($meta);
+  }
+  else {
+    $class->load_string($meta);    # try to detect yaml/json
+  }
+}
+
+sub load_string {
+  my ($class, $string) = @_;
+  if ($string =~ /^---/) {         # looks like YAML
+    return $class->load_yaml_string($string);
+  }
+  elsif ($string =~ /^\s*\{/) {    # looks like JSON
+    return $class->load_json_string($string);
+  }
+  else {                           # maybe doc-marker-free YAML
+    return $class->load_yaml_string($string);
+  }
+}
+
+sub load_yaml_string {
+  my ($class, $string) = @_;
+  my $backend = $class->yaml_backend();
+  my $data = eval { no strict 'refs'; &{"$backend\::Load"}($string) };
+  croak $@ if $@;
+  return $data || {};              # in case document was valid but empty
+}
+
+sub load_json_string {
+  my ($class, $string) = @_;
+  my $data = eval { $class->json_backend()->new->decode($string) };
+  croak $@ if $@;
+  return $data || {};
+}
+
+sub yaml_backend {
+  if (!defined $ENV{PERL_YAML_BACKEND}) {
+    _can_load('CPAN::Meta::YAML', 0.011)
+      or croak "CPAN::Meta::YAML 0.011 is not available\n";
+    return "CPAN::Meta::YAML";
+  }
+  else {
+    my $backend = $ENV{PERL_YAML_BACKEND};
+    _can_load($backend) or croak "Could not load PERL_YAML_BACKEND '$backend'\n";
+    $backend->can("Load")
+      or croak "PERL_YAML_BACKEND '$backend' does not implement Load()\n";
+    return $backend;
+  }
+}
+
+sub json_backend {
+  if (!$ENV{PERL_JSON_BACKEND} or $ENV{PERL_JSON_BACKEND} eq 'JSON::PP') {
+    _can_load('JSON::PP' => 2.27103) or croak "JSON::PP 2.27103 is not available\n";
+    return 'JSON::PP';
+  }
+  else {
+    _can_load('JSON' => 2.5)
+      or croak "JSON 2.5 is required for "
+      . "\$ENV{PERL_JSON_BACKEND} = '$ENV{PERL_JSON_BACKEND}'\n";
+    return "JSON";
+  }
+}
+
+sub _slurp {
+  require Encode;
+  open my $fh, "<:raw", "$_[0]"    ## no critic
+    or die "can't open $_[0] for reading: $!";
+  my $content = do { local $/; <$fh> };
+  $content = Encode::decode('UTF-8', $content, Encode::PERLQQ());
+  return $content;
+}
+
+sub _can_load {
+  my ($module, $version) = @_;
+  (my $file = $module) =~ s{::}{/}g;
+  $file .= ".pm";
+  return 1 if $INC{$file};
+  return 0 if exists $INC{$file};    # prior load failed
+  eval { require $file; 1 } or return 0;
+  if (defined $version) {
+    eval { $module->VERSION($version); 1 } or return 0;
+  }
+  return 1;
+}
+
+# Kept for backwards compatibility only
+# Create an object from a file
+sub LoadFile ($) {                   ## no critic
+  return Load(_slurp(shift));
+}
+
+# Parse a document from a string.
+sub Load ($) {                       ## no critic
+  require CPAN::Meta::YAML;
+  my $object = eval { CPAN::Meta::YAML::Load(shift) };
+  croak $@ if $@;
+  return $object;
+}
+
+1;
+
+__END__
+
+=pod
+
+=encoding UTF-8
+
+=head1 NAME
+
+Parse::CPAN::Meta - Parse META.yml and META.json CPAN metadata files
+
+=head1 VERSION
+
+version 1.4417
+
+=head1 SYNOPSIS
+
+    #############################################
+    # In your file
+    
+    ---
+    name: My-Distribution
+    version: 1.23
+    resources:
+      homepage: "http://example.com/dist/My-Distribution"
+    
+    
+    #############################################
+    # In your program
+    
+    use Parse::CPAN::Meta;
+    
+    my $distmeta = Parse::CPAN::Meta->load_file('META.yml');
+    
+    # Reading properties
+    my $name     = $distmeta->{name};
+    my $version  = $distmeta->{version};
+    my $homepage = $distmeta->{resources}{homepage};
+
+=head1 DESCRIPTION
+
+B<Parse::CPAN::Meta> is a parser for F<META.json> and F<META.yml> files, using
+L<JSON::PP> and/or L<CPAN::Meta::YAML>.
+
+B<Parse::CPAN::Meta> provides three methods: C<load_file>, C<load_json_string>,
+and C<load_yaml_string>.  These will read and deserialize CPAN metafiles, and
+are described below in detail.
+
+B<Parse::CPAN::Meta> provides a legacy API of only two functions,
+based on the YAML functions of the same name. Wherever possible,
+identical calling semantics are used.  These may only be used with YAML sources.
+
+All error reporting is done with exceptions (die'ing).
+
+Note that META files are expected to be in UTF-8 encoding, only.  When
+converted string data, it must first be decoded from UTF-8.
+
+=begin Pod::Coverage
+
+
+
+
+=end Pod::Coverage
+
+=head1 METHODS
+
+=head2 load_file
+
+  my $metadata_structure = Parse::CPAN::Meta->load_file('META.json');
+
+  my $metadata_structure = Parse::CPAN::Meta->load_file('META.yml');
+
+This method will read the named file and deserialize it to a data structure,
+determining whether it should be JSON or YAML based on the filename.
+The file will be read using the ":utf8" IO layer.
+
+=head2 load_yaml_string
+
+  my $metadata_structure = Parse::CPAN::Meta->load_yaml_string($yaml_string);
+
+This method deserializes the given string of YAML and returns the first
+document in it.  (CPAN metadata files should always have only one document.)
+If the source was UTF-8 encoded, the string must be decoded before calling
+C<load_yaml_string>.
+
+=head2 load_json_string
+
+  my $metadata_structure = Parse::CPAN::Meta->load_json_string($json_string);
+
+This method deserializes the given string of JSON and the result.  
+If the source was UTF-8 encoded, the string must be decoded before calling
+C<load_json_string>.
+
+=head2 load_string
+
+  my $metadata_structure = Parse::CPAN::Meta->load_string($some_string);
+
+If you don't know whether a string contains YAML or JSON data, this method
+will use some heuristics and guess.  If it can't tell, it assumes YAML.
+
+=head2 yaml_backend
+
+  my $backend = Parse::CPAN::Meta->yaml_backend;
+
+Returns the module name of the YAML serializer. See L</ENVIRONMENT>
+for details.
+
+=head2 json_backend
+
+  my $backend = Parse::CPAN::Meta->json_backend;
+
+Returns the module name of the JSON serializer.  This will either
+be L<JSON::PP> or L<JSON>.  Even if C<PERL_JSON_BACKEND> is set,
+this will return L<JSON> as further delegation is handled by
+the L<JSON> module.  See L</ENVIRONMENT> for details.
+
+=head1 FUNCTIONS
+
+For maintenance clarity, no functions are exported by default.  These functions
+are available for backwards compatibility only and are best avoided in favor of
+C<load_file>.
+
+=head2 Load
+
+  my @yaml = Parse::CPAN::Meta::Load( $string );
+
+Parses a string containing a valid YAML stream into a list of Perl data
+structures.
+
+=head2 LoadFile
+
+  my @yaml = Parse::CPAN::Meta::LoadFile( 'META.yml' );
+
+Reads the YAML stream from a file instead of a string.
+
+=head1 ENVIRONMENT
+
+=head2 PERL_JSON_BACKEND
+
+By default, L<JSON::PP> will be used for deserializing JSON data. If the
+C<PERL_JSON_BACKEND> environment variable exists, is true and is not
+"JSON::PP", then the L<JSON> module (version 2.5 or greater) will be loaded and
+used to interpret C<PERL_JSON_BACKEND>.  If L<JSON> is not installed or is too
+old, an exception will be thrown.
+
+=head2 PERL_YAML_BACKEND
+
+By default, L<CPAN::Meta::YAML> will be used for deserializing YAML data. If
+the C<PERL_YAML_BACKEND> environment variable is defined, then it is interpreted
+as a module to use for deserialization.  The given module must be installed,
+must load correctly and must implement the C<Load()> function or an exception
+will be thrown.
+
+=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan
+
+=head1 SUPPORT
+
+=head2 Bugs / Feature Requests
+
+Please report any bugs or feature requests through the issue tracker
+at L<https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta/issues>.
+You will be notified automatically of any progress on your issue.
+
+=head2 Source Code
+
+This is open source software.  The code repository is available for
+public review and contribution under the terms of the license.
+
+L<https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta>
+
+  git clone https://github.com/Perl-Toolchain-Gang/Parse-CPAN-Meta.git
+
+=head1 AUTHORS
+
+=over 4
+
+=item *
+
+Adam Kennedy <adamk@cpan.org>
+
+=item *
+
+David Golden <dagolden@cpan.org>
+
+=back
+
+=head1 CONTRIBUTORS
+
+=for stopwords Graham Knop Joshua ben Jore Karen Etheridge Neil Bowers Ricardo Signes Steffen Mueller
+
+=over 4
+
+=item *
+
+Graham Knop <haarg@haarg.org>
+
+=item *
+
+Joshua ben Jore <jjore@cpan.org>
+
+=item *
+
+Karen Etheridge <ether@cpan.org>
+
+=item *
+
+Neil Bowers <neil@bowers.com>
+
+=item *
+
+Ricardo Signes <rjbs@cpan.org>
+
+=item *
+
+Steffen Mueller <smueller@cpan.org>
+
+=back
+
+=head1 COPYRIGHT AND LICENSE
+
+This software is copyright (c) 2015 by Adam Kennedy and Contributors.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+=cut
diff --git a/.gitignore b/.gitignore
index f30e8f9ae1..c450a8698a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
-.htaccess
+/**/.htaccess
 /lib/*
+/local/*
 /template/en/custom
+/docs/en/rst/extensions/*
+/docs/en/rst/api/extensions/*
+/docs/en/rst/integrating/internals/*
 /docs/en/html
 /docs/en/txt
 /docs/en/pdf
@@ -8,7 +12,14 @@
 /graphs
 /data
 /localconfig
+/cpanfile
 /index.html
+/Makefile
+/MYMETA.*
+/pm_to_blib
+/blib
+/.perl-version
+/Bugzilla-*.*/
 
 /skins/contrib/Dusk/admin.css
 /skins/contrib/Dusk/bug.css
diff --git a/.htaccess b/.htaccess
index f8611f81dd..a2d882d800 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,6 +1,16 @@
 # Don't allow people to retrieve non-cgi executable files or our private data
-<FilesMatch (\.pm|\.pl|\.tmpl|localconfig.*)$>
-  deny from all
+<FilesMatch (\.pm|\.pl|\.psgi|\.tmpl|localconfig.*|cpanfile)$>
+  <IfModule mod_version.c>
+    <IfVersion < 2.4>
+      Deny from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all denied
+    </IfVersion>
+  </IfModule>
+  <IfModule !mod_version.c>
+    Deny from all
+  </IfModule>
 </FilesMatch>
 
 Options -Indexes
@@ -29,5 +39,12 @@ Options -Indexes
 
 <IfModule mod_rewrite.c>
   RewriteEngine On
+  RewriteOptions inherit
   RewriteRule ^rest/(.*)$ rest.cgi/$1 [NE]
 </IfModule>
+
+# config.cgi using the RDF format can generate a pretty large file (several MB).
+# The XML format of bug reports can be quite large too.
+<IfModule mod_deflate.c>
+  AddOutputFilterByType DEFLATE text/xml application/rdf+xml
+</IfModule>
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..649190ee24
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,78 @@
+Byron Jones <glob@mozilla.com> Byron Jones <bjones@mozilla.com>
+Byron Jones <glob@mozilla.com> bugzilla%glob.com.au <>
+Byron Jones <glob@mozilla.com> byron jones (glob) <bugzilla@glob.com.au>
+Dave Miller <justdave@mozilla.com> justdave%bugzilla.org <>
+Dave Miller <justdave@mozilla.com> justdave%syndicomm.com <>
+David Lawrence <dkl@mozilla.com> Dave Lawrence <dkl@redhat.com>
+David Lawrence <dkl@mozilla.com> Dave Lawrence <dlawrence@mozilla.com>
+David Lawrence <dkl@mozilla.com> David Lawrence <dkl@redhat.com>
+David Lawrence <dkl@mozilla.com> David Lawrence <dlawrence@mozilla.com>
+David Lawrence <dkl@mozilla.com> dkl%redhat.com <>
+Dylan Hardison <dylan@mozilla.com> Dylan Hardison <dylan@hardison.net>
+Dylan Hardison <dylan@mozilla.com> Dylan William Hardison <dylan@hardison.net>
+Dylan Hardison <dylan@mozilla.com> Dylan William Hardison <dylan@mozill.com>
+Dylan Hardison <dylan@mozilla.com> Dylan William Hardison <dylan@mozilla.com>
+Gervase Markham <gerv@gerv.net> Gervase Markham <gerv@mozilla.org>
+Gervase Markham <gerv@gerv.net> gerv%gerv.net <>
+Max Kanat-Alexander <mkanat@bugzilla.org> mkanat%bugzilla.org <>
+Max Kanat-Alexander <mkanat@bugzilla.org> mkanat%kerio.com <>
+Simon Green <mail@simon.green> Simon Green <sgreen+mozilla@redhat.com>
+Simon Green <mail@simon.green> Simon Green <simon@simongreen.net>
+Terry <terry@mozilla.org> terry%mozilla.org <>
+Terry <terry@mozilla.org> terry%netscape.com <>
+Emmanuel Seyman <emmanuel@seyman.fr> eseyman%linagora.com <>
+<koosha.khajeh@gmail.com> <Koosha>
+
+A. Shimono (himorin) <shimono@bug-ja.org> A. Shimono <shimono@bug-ja.org>
+A. Shimono (himorin) <shimono@bug-ja.org> A. Shimono [:himorin] <shimono@bug-ja.org>
+Teemu Mannermaa <wicked@sci.fi> wicked%sci.fi <>
+
+bbaetz <bbaetz@acm.org> bbaetz%acm.org <>
+bbaetz <bbaetz@acm.org> bbaetz%cs.mcgill.ca <>
+bbaetz <bbaetz@acm.org> bbaetz%student.usyd.edu.au <>
+
+barnboy <barnboy@trilobyte.net> barnboy%trilobyte.net <>
+blakeross <blakeross@telocity.com> blakeross%telocity.com <>
+bryce-mozilla <bryce-mozilla@nextbus.com> bryce-mozilla%nextbus.com <>
+bugreport <bugreport@peshkin.net> bugreport%peshkin.net <>
+burnus <burnus@gmx.de> burnus%gmx.de <>
+caillon <caillon@returnzero.com> caillon%returnzero.com <>
+cyeh <cyeh@bluemartini.com> cyeh%bluemartini.com <>
+dave <dave@intrec.com> dave%intrec.com <>
+db48x <db48x@yahoo.com> db48x%yahoo.com <>
+dmose <dmose@mozilla.org> dmose%mozilla.org <>
+donm <donm@bluemartini.com> donm%bluemartini.com <>
+endico <endico@mozilla.org> endico%mozilla.org <>
+erik <erik@dasbistro.com> erik%dasbistro.com <>
+ghendricks <ghendricks@novell.com> ghendricks%novell.com <>
+guy.pyrzak <guy.pyrzak@gmail.com> guy.pyrzak%gmail.com <>
+harrison <harrison@netscape.com> harrison%netscape.com <>
+jake <jake@acutex.net> jake%acutex.net <>
+jake <jake@bugzilla.org> jake%bugzilla.org <>
+jeff.hedlund <jeff.hedlund@matrixsi.com> jeff.hedlund%matrixsi.com <>
+jkeiser <jkeiser@netscape.com> jkeiser%netscape.com <>
+jocuri <jocuri@softhome.net> jocuri%softhome.net <>
+john <john@johnkeiser.com> john%johnkeiser.com <>
+jouni <jouni@heikniemi.net> jouni%heikniemi.net <>
+jwz <jwz@mozilla.org> jwz%mozilla.org <>
+karl <karl@kornel.name> karl%kornel.name <>
+karl.kornel <karl.kornel@mindspeed.com> karl.kornel%mindspeed.com <>
+kiko <kiko@async.com.br> kiko%async.com.br <>
+matty <matty@chariot.net.au> matty%chariot.net.au <>
+mbarnson <mbarnson@excitehome.net> mbarnson%excitehome.net <>
+mbarnson <mbarnson@sisna.com> mbarnson%sisna.com <>
+mcafee <mcafee@netscape.com> mcafee%netscape.com <>
+mozilla <mozilla@colinogilvie.co.uk> mozilla%colinogilvie.co.uk <>
+myk <myk@mozilla.org> myk%mozilla.org <>
+olav <olav@bkor.dhs.org> olav%bkor.dhs.org <>
+preed <preed@sigkill.com> preed%sigkill.com <>
+reed <reed@reedloden.com> reed%reedloden.com <>
+seth <seth@cs.brandeis.edu> seth%cs.brandeis.edu <>
+shaver <shaver@netscape.com> shaver%netscape.com <>
+tara <tara@tequilarista.org> tara%tequilarista.org <>
+timeless <timeless@mac.com> timeless%mac.com <>
+timeless <timeless@mozdev.org> timeless%mozdev.org <>
+travis <travis@sedsystems.ca> travis%sedsystems.ca <>
+vladd <vladd@bugzilla.org> vladd%bugzilla.org <>
+wurblzap <wurblzap@gmail.com> wurblzap%gmail.com <>
+zach <zach@zachlipton.com> zach%zachlipton.com <>
diff --git a/.taskcluster.yml b/.taskcluster.yml
new file mode 100644
index 0000000000..a72aa72ed2
--- /dev/null
+++ b/.taskcluster.yml
@@ -0,0 +1,168 @@
+version: 0
+metadata:
+  name: "Bugzilla CI Tests"
+  description: "A suite of tests to check the quality of the Bugzilla codebase."
+  owner: "bugzilla-admin@mozilla.org"
+  source: "{{ event.head.repo.url }}"
+tasks:
+  - provisionerId: "{{ taskcluster.docker.provisionerId }}"
+    workerType: "{{ taskcluster.docker.workerType }}"
+    routes:
+      - "notify.email.bugzilla-admin@mozilla.org.on-failed"
+      - "notify.email.bugzilla-admin@mozilla.org.on-exception"
+      - "notify.irc-channel.#bugzilla.on-failed"
+      - "notify.irc-channel.#bugzilla.on-exception"
+      - "tc-treeherder.v2.bugzilla/bugzilla-master.{{ event.head.sha }}"
+    extra:
+      github:
+        env: true
+        events:
+          - pull_request.opened
+          - pull_request.synchronize
+          - pull_request.reopened
+          - push
+      treeherder:
+        symbol: "San"
+        machine:
+          platform: "linux64"
+          build:
+            platform: "linux64"
+    payload:
+      maxRunTime: 3600
+      image: "bugzilla/bugzilla-ci"
+      command:
+        - "runtests.sh"
+      env:
+        TEST_SUITE: "sanity"
+      artifacts:
+        public/runtests_log:
+          type: "file"
+          path: "/var/log/runtests.log"
+    metadata:
+      name: "Basic Sanity Tests"
+      description: "Basic Sanity Tests"
+      owner: "bugzilla-admin@mozilla.org"
+      source: "{{ event.head.repo.url }}"
+  - provisionerId: "{{ taskcluster.docker.provisionerId }}"
+    workerType: "{{ taskcluster.docker.workerType }}"
+    routes:
+      - "notify.email.bugzilla-admin@mozilla.org.on-failed"
+      - "notify.email.bugzilla-admin@mozilla.org.on-exception"
+      - "notify.irc-channel.#bugzilla.on-failed"
+      - "notify.irc-channel.#bugzilla.on-exception"
+      - "tc-treeherder.v2.bugzilla/bugzilla-master.{{ event.head.sha }}"
+    extra:
+      github:
+        env: true
+        events:
+          - pull_request.opened
+          - pull_request.synchronize
+          - pull_request.reopened
+          - push
+      treeherder:
+        symbol: "Doc"
+        machine:
+          platform: "linux64"
+          build:
+            platform: "linux64"
+    payload:
+      maxRunTime: 3600
+      image: "bugzilla/bugzilla-ci"
+      command:
+        - "runtests.sh"
+      env:
+        TEST_SUITE: "docs"
+      artifacts:
+        public/runtests_log:
+          type: "file"
+          path: "/var/log/runtests.log"
+    metadata:
+      name: "Documentation Build Test"
+      description: "Documentation Build Test"
+      owner: "bugzilla-admin@mozilla.org"
+      source: "{{ event.head.repo.url }}"
+  - provisionerId: "{{ taskcluster.docker.provisionerId }}"
+    workerType: "{{ taskcluster.docker.workerType }}"
+    routes:
+      - "notify.email.bugzilla-admin@mozilla.org.on-failed"
+      - "notify.email.bugzilla-admin@mozilla.org.on-exception"
+      - "notify.irc-channel.#bugzilla.on-failed"
+      - "notify.irc-channel.#bugzilla.on-exception"
+      - "tc-treeherder.v2.bugzilla/bugzilla-master.{{ event.head.sha }}"
+    extra:
+      github:
+        env: true
+        events:
+          - pull_request.opened
+          - pull_request.synchronize
+          - pull_request.reopened
+          - push
+      treeherder:
+        symbol: "API"
+        machine:
+          platform: "linux64"
+          build:
+            platform: "linux64"
+    payload:
+      maxRunTime: 3600
+      image: "bugzilla/bugzilla-ci"
+      command:
+        - "runtests.sh"
+      env:
+        TEST_SUITE: "webservices"
+      artifacts:
+        public/runtests_log:
+          type: "file"
+          path: "/var/log/runtests.log"
+        public/httpd_error_log:
+          type: "file"
+          path: "/var/log/httpd/error_log"
+    metadata:
+      name: "WebService API Tests"
+      description: "WebService API Tests"
+      owner: "bugzilla-admin@mozilla.org"
+      source: "{{ event.head.repo.url }}"
+  - provisionerId: "{{ taskcluster.docker.provisionerId }}"
+    workerType: "{{ taskcluster.docker.workerType }}"
+    routes:
+      - "notify.email.bugzilla-admin@mozilla.org.on-failed"
+      - "notify.email.bugzilla-admin@mozilla.org.on-exception"
+      - "notify.irc-channel.#bugzilla.on-failed"
+      - "notify.irc-channel.#bugzilla.on-exception"
+      - "tc-treeherder.v2.bugzilla/bugzilla-master.{{ event.head.sha }}"
+    extra:
+      github:
+        env: true
+        events:
+          - pull_request.opened
+          - pull_request.synchronize
+          - pull_request.reopened
+          - push
+      treeherder:
+        symbol: "Sel"
+        machine:
+          platform: "linux64"
+          build:
+            platform: "linux64"
+    payload:
+      maxRunTime: 3600
+      image: "bugzilla/bugzilla-ci"
+      command:
+        - "runtests.sh"
+      env:
+        TEST_SUITE: "selenium"
+      artifacts:
+        public/runtests_log:
+          type: "file"
+          path: "/var/log/runtests.log"
+        public/httpd_error_log:
+          type: "file"
+          path: "/var/log/httpd/error_log"
+        public/selenium_log":
+          type: "file"
+          path: "/selenium.log"
+    metadata:
+      name: "Selenium Tests"
+      description: "Selenium Tests"
+      owner: "bugzilla-admin@mozilla.org"
+      source: "{{ event.head.repo.url }}"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index eed86e0a30..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-language: perl
-perl:
-  - 5.10
-  - 5.12
-  - 5.14
-  - 5.16
-
-env:
-  - TEST_SUITE=sanity
-  - TEST_SUITE=docs
-  - TEST_SUITE=webservices DB=mysql
-  - TEST_SUITE=selenium DB=mysql
-  - TEST_SUITE=webservices DB=pg
-  - TEST_SUITE=selenium DB=pg
-
-matrix:
-  exclude:
-    - perl: 5.10
-      env: TEST_SUITE=docs
-    - perl: 5.12
-      env: TEST_SUITE=docs
-    - perl: 5.14
-      env: TEST_SUITE=docs
-    - perl: 5.10
-      env: TEST_SUITE=webservices DB=mysql
-    - perl: 5.10
-      env: TEST_SUITE=webservices DB=pg
-    - perl: 5.10
-      env: TEST_SUITE=selenium DB=mysql
-    - perl: 5.10
-      env: TEST_SUITE=selenium DB=pg
-    - perl: 5.12
-      env: TEST_SUITE=webservices DB=mysql
-    - perl: 5.12
-      env: TEST_SUITE=webservices DB=pg
-    - perl: 5.12
-      env: TEST_SUITE=selenium DB=mysql
-    - perl: 5.12
-      env: TEST_SUITE=selenium DB=pg
-    - perl: 5.14
-      env: TEST_SUITE=webservices DB=mysql
-    - perl: 5.14
-      env: TEST_SUITE=webservices DB=pg
-    - perl: 5.14
-      env: TEST_SUITE=selenium DB=mysql
-    - perl: 5.14
-      env: TEST_SUITE=selenium DB=pg
-
-before_install:
-  - git clone https://github.com/bugzilla/qa.git -b master qa
-
-install: true
-
-script: ./qa/travis.sh
-
-after_failure:
-  - sudo cat /var/log/apache2/error.log
-
-notifications:
-  irc:
-    channels:
-      - "irc.mozilla.org#qa-bugzilla"
-      - "irc.mozilla.org#bugzilla"
-    template:
-      - "Bugzilla %{branch} : %{author} : %{message}"
-      - "Commit Message : %{commit_message}"
-      - "Commit Link : %{compare_url}"
-      - "Build Link : %{build_url}"
-  on_success: change
-  on_failure: always
diff --git a/Bugzilla.pm b/Bugzilla.pm
index 048e72d481..9f7a205d6e 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -7,17 +7,20 @@
 
 package Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 # We want any compile errors to get to the browser, if possible.
 BEGIN {
-    # This makes sure we're in a CGI.
-    if ($ENV{SERVER_SOFTWARE} && !$ENV{MOD_PERL}) {
-        require CGI::Carp;
-        CGI::Carp->import('fatalsToBrowser');
-    }
+  # This makes sure we're in a CGI. mod_perl doesn't support Carp
+  # and Plack reports errors elsewhere.
+  # We cannot call i_am_persistent() from here as its module is
+  # not loaded yet.
+  if ($ENV{SERVER_SOFTWARE} && !($ENV{MOD_PERL} || $ENV{BZ_PLACK})) {
+    require CGI::Carp;
+    CGI::Carp->import('fatalsToBrowser');
+  }
 }
 
 use Bugzilla::Auth;
@@ -31,8 +34,8 @@ use Bugzilla::Extension;
 use Bugzilla::Field;
 use Bugzilla::Flag;
 use Bugzilla::Install::Localconfig qw(read_localconfig);
-use Bugzilla::Install::Requirements qw(OPTIONAL_MODULES);
-use Bugzilla::Install::Util qw(init_console include_languages);
+use Bugzilla::Install::Util qw(init_console include_languages i_am_persistent);
+use Bugzilla::Install::Requirements qw(load_cpan_meta check_cpan_feature);
 use Bugzilla::Memcached;
 use Bugzilla::Template;
 use Bugzilla::Token;
@@ -43,7 +46,11 @@ use File::Basename;
 use File::Spec::Functions;
 use DateTime::TimeZone;
 use Date::Parse;
+
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
+use List::Util qw(first);
 
 #####################################################################
 # Constants
@@ -51,15 +58,15 @@ use Safe;
 
 # Scripts that are not stopped by shutdownhtml being in effect.
 use constant SHUTDOWNHTML_EXEMPT => qw(
-    editparams.cgi
-    checksetup.pl
-    migrate.pl
-    recode.pl
+  editparams.cgi
+  checksetup.pl
+  migrate.pl
+  recode.pl
 );
 
 # Non-cgi scripts that should silently exit.
 use constant SHUTDOWNHTML_EXIT_SILENTLY => qw(
-    whine.pl
+  whine.pl
 );
 
 # shutdownhtml pages are sent as an HTTP 503. After how many seconds
@@ -70,106 +77,124 @@ use constant SHUTDOWNHTML_RETRY_AFTER => 3600;
 # Global Code
 #####################################################################
 
-#$::SIG{__DIE__} = i_am_cgi() ? \&CGI::Carp::confess : \&Carp::confess;
-
 # Note that this is a raw subroutine, not a method, so $class isn't available.
 sub init_page {
-    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-        init_console();
-    }
-    elsif (Bugzilla->params->{'utf8'}) {
-        binmode STDOUT, ':utf8';
-    }
+  if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+    init_console();
+  }
+  else {
+    binmode STDOUT, ':utf8';
+  }
 
-    if (${^TAINT}) {
-        # Some environment variables are not taint safe
-        delete @::ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
-        # Some modules throw undefined errors (notably File::Spec::Win32) if
-        # PATH is undefined.
-        $ENV{'PATH'} = '';
+  if (${^TAINT}) {
+    my $path = '';
+    if (ON_WINDOWS) {
+
+      # On Windows, these paths are tainted, preventing
+      # File::Spec::Win32->tmpdir from using them. But we need
+      # a place to temporary store attachments which are uploaded.
+      foreach my $temp (qw(TMPDIR TMP TEMP WINDIR)) {
+        trick_taint($ENV{$temp}) if $ENV{$temp};
+      }
+
+      # Some DLLs used by Strawberry Perl are also in c\bin,
+      # see https://rt.cpan.org/Public/Bug/Display.html?id=99104
+      if (!ON_ACTIVESTATE) {
+        my $c_path = $path = dirname($^X);
+        $c_path =~ s/\bperl\b(?=\\bin)/c/;
+        $path .= ";$c_path";
+        trick_taint($path);
+      }
     }
 
-    # Because this function is run live from perl "use" commands of
-    # other scripts, we're skipping the rest of this function if we get here
-    # during a perl syntax check (perl -c, like we do during the
-    # 001compile.t test).
-    return if $^C;
-
-    # IIS prints out warnings to the webpage, so ignore them, or log them
-    # to a file if the file exists.
-    if ($ENV{SERVER_SOFTWARE} && $ENV{SERVER_SOFTWARE} =~ /microsoft-iis/i) {
-        $SIG{__WARN__} = sub {
-            my ($msg) = @_;
-            my $datadir = bz_locations()->{'datadir'};
-            if (-w "$datadir/errorlog") {
-                my $warning_log = new IO::File(">>$datadir/errorlog");
-                print $warning_log $msg;
-                $warning_log->close();
-            }
-        };
-    }
+    # Some environment variables are not taint safe
+    delete @::ENV{'PATH', 'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
+
+    # Some modules throw undefined errors (notably File::Spec::Win32) if
+    # PATH is undefined.
+    $ENV{'PATH'} = $path;
+  }
 
-    my $script = basename($0);
+  # Because this function is run live from perl "use" commands of
+  # other scripts, we're skipping the rest of this function if we get here
+  # during a perl syntax check (perl -c, like we do during the
+  # 001compile.t test).
+  return if $^C;
+
+  # IIS prints out warnings to the webpage, so ignore them, or log them
+  # to a file if the file exists.
+  if ($ENV{SERVER_SOFTWARE} && $ENV{SERVER_SOFTWARE} =~ /microsoft-iis/i) {
+    $SIG{__WARN__} = sub {
+      my ($msg) = @_;
+      my $datadir = bz_locations()->{'datadir'};
+      if (-w "$datadir/errorlog") {
+        my $warning_log = new IO::File(">>$datadir/errorlog");
+        print $warning_log $msg;
+        $warning_log->close();
+      }
+    };
+  }
 
-    # Because of attachment_base, attachment.cgi handles this itself.
-    if ($script ne 'attachment.cgi') {
-        do_ssl_redirect_if_required();
+  my $script = basename($0);
+
+  # If Bugzilla is shut down, do not allow anything to run, just display a
+  # message to the user about the downtime and log out.  Scripts listed in
+  # SHUTDOWNHTML_EXEMPT are exempt from this message.
+  #
+  # This code must go here. It cannot go anywhere in Bugzilla::CGI, because
+  # it uses Template, and that causes various dependency loops.
+  if (!grep { $_ eq $script } SHUTDOWNHTML_EXEMPT
+    and Bugzilla->params->{'shutdownhtml'})
+  {
+    # Allow non-cgi scripts to exit silently (without displaying any
+    # message), if desired. At this point, no DBI call has been made
+    # yet, and no error will be returned if the DB is inaccessible.
+    if (!i_am_cgi() && grep { $_ eq $script } SHUTDOWNHTML_EXIT_SILENTLY) {
+      exit;
     }
 
-    # If Bugzilla is shut down, do not allow anything to run, just display a
-    # message to the user about the downtime and log out.  Scripts listed in 
-    # SHUTDOWNHTML_EXEMPT are exempt from this message.
-    #
-    # This code must go here. It cannot go anywhere in Bugzilla::CGI, because
-    # it uses Template, and that causes various dependency loops.
-    if (!grep { $_ eq $script } SHUTDOWNHTML_EXEMPT
-        and Bugzilla->params->{'shutdownhtml'})
-    {
-        # Allow non-cgi scripts to exit silently (without displaying any
-        # message), if desired. At this point, no DBI call has been made
-        # yet, and no error will be returned if the DB is inaccessible.
-        if (!i_am_cgi()
-            && grep { $_ eq $script } SHUTDOWNHTML_EXIT_SILENTLY)
-        {
-            exit;
-        }
-
-        # For security reasons, log out users when Bugzilla is down.
-        # Bugzilla->login() is required to catch the logincookie, if any.
-        my $user;
-        eval { $user = Bugzilla->login(LOGIN_OPTIONAL); };
-        if ($@) {
-            # The DB is not accessible. Use the default user object.
-            $user = Bugzilla->user;
-            $user->{settings} = {};
-        }
-        my $userid = $user->id;
-        Bugzilla->logout();
-
-        my $template = Bugzilla->template;
-        my $vars = {};
-        $vars->{'message'} = 'shutdown';
-        $vars->{'userid'} = $userid;
-        # Generate and return a message about the downtime, appropriately
-        # for if we're a command-line script or a CGI script.
-        my $extension;
-        if (i_am_cgi() && (!Bugzilla->cgi->param('ctype')
-                           || Bugzilla->cgi->param('ctype') eq 'html')) {
-            $extension = 'html';
-        }
-        else {
-            $extension = 'txt';
-        }
-        if (i_am_cgi()) {
-            # Set the HTTP status to 503 when Bugzilla is down to avoid pages
-            # being indexed by search engines.
-            print Bugzilla->cgi->header(-status => 503, 
-                -retry_after => SHUTDOWNHTML_RETRY_AFTER);
-        }
-        $template->process("global/message.$extension.tmpl", $vars)
-            || ThrowTemplateError($template->error);
-        exit;
+    # Plack requires to exit differently.
+    return -1 if $ENV{BZ_PLACK};
+    _shutdown();
+  }
+}
+
+sub _shutdown {
+
+  # For security reasons, log out users when Bugzilla is down.
+  # Bugzilla->login() is required to catch the logincookie, if any.
+  my $user = eval { Bugzilla->login(LOGIN_OPTIONAL); };
+  if ($@) {
+
+    # The DB is not accessible. Use the default user object.
+    $user = Bugzilla->user;
+    $user->{settings} = {};
+  }
+  my $userid = $user->id;
+  Bugzilla->logout();
+
+  # Generate and return a message about the downtime, appropriately
+  # for if we're a command-line script or a CGI script.
+  my $cgi       = Bugzilla->cgi;
+  my $extension = 'txt';
+
+  if (i_am_cgi()) {
+
+    # Set the HTTP status to 503 when Bugzilla is down to avoid pages
+    # being indexed by search engines.
+    print $cgi->header(-status => 503, -retry_after => SHUTDOWNHTML_RETRY_AFTER);
+
+    if (!$cgi->param('ctype') || $cgi->param('ctype') eq 'html') {
+      $extension = 'html';
     }
+  }
+
+  my $template = Bugzilla->template;
+  my $vars = {message => 'shutdown', userid => $userid};
+
+  $template->process("global/message.$extension.tmpl", $vars)
+    or ThrowTemplateError($template->error);
+  exit;
 }
 
 #####################################################################
@@ -177,481 +202,492 @@ sub init_page {
 #####################################################################
 
 sub template {
-    return $_[0]->request_cache->{template} ||= Bugzilla::Template->create();
+  return $_[0]->request_cache->{template} ||= Bugzilla::Template->create();
 }
 
 sub template_inner {
-    my ($class, $lang) = @_;
-    my $cache = $class->request_cache;
-    my $current_lang = $cache->{template_current_lang}->[0];
-    $lang ||= $current_lang || '';
-    return $cache->{"template_inner_$lang"} ||= Bugzilla::Template->create(language => $lang);
+  my ($class, $lang) = @_;
+  my $cache        = $class->request_cache;
+  my $current_lang = $cache->{template_current_lang}->[0];
+  $lang ||= $current_lang || '';
+  return $cache->{"template_inner_$lang"}
+    ||= Bugzilla::Template->create(language => $lang);
 }
 
 our $extension_packages;
+
 sub extensions {
-    my ($class) = @_;
-    my $cache = $class->request_cache;
-    if (!$cache->{extensions}) {
-        # Under mod_perl, mod_perl.pl populates $extension_packages for us.
-        if (!$extension_packages) {
-            $extension_packages = Bugzilla::Extension->load_all();
-        }
-        my @extensions;
-        foreach my $package (@$extension_packages) {
-            my $extension = $package->new();
-            if ($extension->enabled) {
-                push(@extensions, $extension);
-            }        
-        }
-        $cache->{extensions} = \@extensions;
+  my ($class) = @_;
+  my $cache = $class->request_cache;
+  if (!$cache->{extensions}) {
+
+    # Under mod_perl, mod_perl.pl populates $extension_packages for us.
+    if (!$extension_packages) {
+      $extension_packages = Bugzilla::Extension->load_all();
+    }
+    my @extensions;
+    foreach my $package (@$extension_packages) {
+      my $extension = $package->new();
+      if ($extension->enabled) {
+        push(@extensions, $extension);
+      }
     }
-    return $cache->{extensions};
+    $cache->{extensions} = \@extensions;
+  }
+  return $cache->{extensions};
+}
+
+sub api_server {
+  my $class = shift;
+  my $cache = $class->request_cache;
+  return $cache->{api_server} if defined $cache->{api_server};
+  require Bugzilla::API::Server;
+  $cache->{api_server} = Bugzilla::API::Server->server;
+  if (my $load_error = $cache->{api_server}->load_error) {
+    my @error_params = ($load_error->{error}, $load_error->{vars});
+    ThrowCodeError(@error_params) if $load_error->{type} eq 'code';
+    ThrowUserError(@error_params) if $load_error->{type} eq 'user';
+  }
+  return $cache->{api_server};
 }
 
 sub feature {
-    my ($class, $feature) = @_;
-    my $cache = $class->request_cache;
-    return $cache->{feature}->{$feature}
-        if exists $cache->{feature}->{$feature};
-
-    my $feature_map = $cache->{feature_map};
-    if (!$feature_map) {
-        foreach my $package (@{ OPTIONAL_MODULES() }) {
-            foreach my $f (@{ $package->{feature} }) {
-                $feature_map->{$f} ||= [];
-                push(@{ $feature_map->{$f} }, $package->{module});
-            }
-        }
-        $cache->{feature_map} = $feature_map;
-    }
+  my ($class, $feature_name) = @_;
+  return 0 unless CAN_HAS_FEATURE;
+  return 0 unless $class->has_feature($feature_name);
 
-    if (!$feature_map->{$feature}) {
-        ThrowCodeError('invalid_feature', { feature => $feature });
-    }
+  my $cache   = $class->process_cache;
+  my $feature = $cache->{cpan_meta}->feature($feature_name);
 
-    my $success = 1;
-    foreach my $module (@{ $feature_map->{$feature} }) {
-        eval "require $module" or $success = 0;
-    }
-    $cache->{feature}->{$feature} = $success;
-    return $success;
+# Bugzilla expects this will also load all the modules.. so we have to do that.
+# Later we should put a deprecation warning here, and favor calling has_feature().
+
+  return 1 if $cache->{feature_loaded}{$feature_name};
+  my @modules = $feature->prereqs->merged_requirements->required_modules;
+  Module::Runtime::require_module($_) foreach @modules;
+  $cache->{feature_loaded}{$feature_name} = 1;
+  return 1;
+}
+
+sub has_feature {
+  my ($class, $feature_name) = @_;
+
+  return 0 unless CAN_HAS_FEATURE;
+
+  my $cache = $class->process_cache;
+  return $cache->{feature}->{$feature_name}
+    if exists $cache->{feature}->{$feature_name};
+
+  my $meta = $cache->{cpan_meta} //= load_cpan_meta();
+  my $feature = eval { $meta->feature($feature_name) }
+    or ThrowCodeError('invalid_feature', {feature => $feature_name});
+
+  return $cache->{feature}{$feature_name} = check_cpan_feature($feature)->{ok};
 }
 
 sub cgi {
-    return $_[0]->request_cache->{cgi} ||= new Bugzilla::CGI();
+  return $_[0]->request_cache->{cgi} ||= new Bugzilla::CGI();
 }
 
 sub input_params {
-    my ($class, $params) = @_;
-    my $cache = $class->request_cache;
-    # This is how the WebService and other places set input_params.
-    if (defined $params) {
-        $cache->{input_params} = $params;
-    }
-    return $cache->{input_params} if defined $cache->{input_params};
+  my ($class, $params) = @_;
+  my $cache = $class->request_cache;
 
-    # Making this scalar makes it a tied hash to the internals of $cgi,
-    # so if a variable is changed, then it actually changes the $cgi object
-    # as well.
-    $cache->{input_params} = $class->cgi->Vars;
-    return $cache->{input_params};
+  # This is how the WebService and other places set input_params.
+  if (defined $params) {
+    $cache->{input_params} = $params;
+  }
+  return $cache->{input_params} if defined $cache->{input_params};
+
+  # Making this scalar makes it a tied hash to the internals of $cgi,
+  # so if a variable is changed, then it actually changes the $cgi object
+  # as well.
+  $cache->{input_params} = $class->cgi->Vars;
+  return $cache->{input_params};
 }
 
 sub localconfig {
-    return $_[0]->process_cache->{localconfig} ||= read_localconfig();
+  return $_[0]->process_cache->{localconfig} ||= read_localconfig();
 }
 
 sub params {
-    return $_[0]->request_cache->{params} ||= Bugzilla::Config::read_param_file();
+  return $_[0]->request_cache->{params} ||= Bugzilla::Config::read_param_file();
 }
 
 sub user {
-    return $_[0]->request_cache->{user} ||= new Bugzilla::User;
+  return $_[0]->request_cache->{user} ||= new Bugzilla::User;
 }
 
 sub set_user {
-    my ($class, $user) = @_;
-    $class->request_cache->{user} = $user;
+  my ($class, $user) = @_;
+  $class->request_cache->{user} = $user;
 }
 
 sub sudoer {
-    return $_[0]->request_cache->{sudoer};
+  return $_[0]->request_cache->{sudoer};
 }
 
 sub sudo_request {
-    my ($class, $new_user, $new_sudoer) = @_;
-    $class->request_cache->{user}   = $new_user;
-    $class->request_cache->{sudoer} = $new_sudoer;
-    # NOTE: If you want to log the start of an sudo session, do it here.
+  my ($class, $new_user, $new_sudoer) = @_;
+  $class->request_cache->{user}   = $new_user;
+  $class->request_cache->{sudoer} = $new_sudoer;
+
+  # NOTE: If you want to log the start of an sudo session, do it here.
 }
 
 sub page_requires_login {
-    return $_[0]->request_cache->{page_requires_login};
+  return $_[0]->request_cache->{page_requires_login};
 }
 
 sub login {
-    my ($class, $type) = @_;
+  my ($class, $type) = @_;
 
-    return $class->user if $class->user->id;
+  return $class->user if $class->user->id;
 
-    my $authorizer = new Bugzilla::Auth();
-    $type = LOGIN_REQUIRED if $class->cgi->param('GoAheadAndLogIn');
+  my $authorizer = new Bugzilla::Auth();
+  $type = LOGIN_REQUIRED if $class->cgi->param('GoAheadAndLogIn');
 
-    if (!defined $type || $type == LOGIN_NORMAL) {
-        $type = $class->params->{'requirelogin'} ? LOGIN_REQUIRED : LOGIN_NORMAL;
-    }
+  if (!defined $type || $type == LOGIN_NORMAL) {
+    $type = $class->params->{'requirelogin'} ? LOGIN_REQUIRED : LOGIN_NORMAL;
+  }
+
+  # Allow templates to know that we're in a page that always requires
+  # login.
+  if ($type == LOGIN_REQUIRED) {
+    $class->request_cache->{page_requires_login} = 1;
+  }
 
-    # Allow templates to know that we're in a page that always requires
-    # login.
-    if ($type == LOGIN_REQUIRED) {
-        $class->request_cache->{page_requires_login} = 1;
+  my $authenticated_user = $authorizer->login($type);
+
+  # At this point, we now know if a real person is logged in.
+  # We must now check to see if an sudo session is in progress.
+  # For a session to be in progress, the following must be true:
+  # 1: There must be a logged in user
+  # 2: That user must be in the 'bz_sudoer' group
+  # 3: There must be a valid value in the 'sudo' cookie
+  # 4: A Bugzilla::User object must exist for the given cookie value
+  # 5: That user must NOT be in the 'bz_sudo_protect' group
+  my $token = $class->cgi->cookie('sudo');
+  if (defined $authenticated_user && $token) {
+    my ($user_id, $date, $sudo_target_id) = Bugzilla::Token::GetTokenData($token);
+    if (!$user_id
+      || $user_id != $authenticated_user->id
+      || !detaint_natural($sudo_target_id)
+      || (time() - str2time($date) > MAX_SUDO_TOKEN_AGE))
+    {
+      $class->cgi->remove_cookie('sudo');
+      ThrowUserError('sudo_invalid_cookie');
     }
 
-    my $authenticated_user = $authorizer->login($type);
-    
-    # At this point, we now know if a real person is logged in.
-    # We must now check to see if an sudo session is in progress.
-    # For a session to be in progress, the following must be true:
-    # 1: There must be a logged in user
-    # 2: That user must be in the 'bz_sudoer' group
-    # 3: There must be a valid value in the 'sudo' cookie
-    # 4: A Bugzilla::User object must exist for the given cookie value
-    # 5: That user must NOT be in the 'bz_sudo_protect' group
-    my $token = $class->cgi->cookie('sudo');
-    if (defined $authenticated_user && $token) {
-        my ($user_id, $date, $sudo_target_id) = Bugzilla::Token::GetTokenData($token);
-        if (!$user_id
-            || $user_id != $authenticated_user->id
-            || !detaint_natural($sudo_target_id)
-            || (time() - str2time($date) > MAX_SUDO_TOKEN_AGE))
-        {
-            $class->cgi->remove_cookie('sudo');
-            ThrowUserError('sudo_invalid_cookie');
-        }
-
-        my $sudo_target = new Bugzilla::User($sudo_target_id);
-        if ($authenticated_user->in_group('bz_sudoers')
-            && defined $sudo_target
-            && !$sudo_target->in_group('bz_sudo_protect'))
-        {
-            $class->set_user($sudo_target);
-            $class->request_cache->{sudoer} = $authenticated_user;
-            # And make sure that both users have the same Auth object,
-            # since we never call Auth::login for the sudo target.
-            $sudo_target->set_authorizer($authenticated_user->authorizer);
-
-            # NOTE: If you want to do any special logging, do it here.
-        }
-        else {
-            delete_token($token);
-            $class->cgi->remove_cookie('sudo');
-            ThrowUserError('sudo_illegal_action', { sudoer => $authenticated_user,
-                                                    target_user => $sudo_target });
-        }
+    my $sudo_target = new Bugzilla::User($sudo_target_id);
+    if ( $authenticated_user->in_group('bz_sudoers')
+      && defined $sudo_target
+      && !$sudo_target->in_group('bz_sudo_protect'))
+    {
+      $class->set_user($sudo_target);
+      $class->request_cache->{sudoer} = $authenticated_user;
+
+      # And make sure that both users have the same Auth object,
+      # since we never call Auth::login for the sudo target.
+      $sudo_target->set_authorizer($authenticated_user->authorizer);
+
+      # NOTE: If you want to do any special logging, do it here.
     }
     else {
-        $class->set_user($authenticated_user);
+      delete_token($token);
+      $class->cgi->remove_cookie('sudo');
+      ThrowUserError('sudo_illegal_action',
+        {sudoer => $authenticated_user, target_user => $sudo_target});
     }
+  }
+  else {
+    $class->set_user($authenticated_user);
+  }
 
-    if ($class->sudoer) {
-        $class->sudoer->update_last_seen_date();
-    } else {
-        $class->user->update_last_seen_date();
-    }
+  if ($class->sudoer) {
+    $class->sudoer->update_last_seen_date();
+  }
+  else {
+    $class->user->update_last_seen_date();
+  }
 
-    return $class->user;
+  return $class->user;
 }
 
 sub logout {
-    my ($class, $option) = @_;
+  my ($class, $option) = @_;
 
-    # If we're not logged in, go away
-    return unless $class->user->id;
+  # If we're not logged in, go away
+  return unless $class->user->id;
 
-    $option = LOGOUT_CURRENT unless defined $option;
-    Bugzilla::Auth::Persist::Cookie->logout({type => $option});
-    $class->logout_request() unless $option eq LOGOUT_KEEP_CURRENT;
+  $option = LOGOUT_CURRENT unless defined $option;
+  Bugzilla::Auth::Persist::Cookie->logout({type => $option});
+  $class->logout_request() unless $option eq LOGOUT_KEEP_CURRENT;
 }
 
 sub logout_user {
-    my ($class, $user) = @_;
-    # When we're logging out another user we leave cookies alone, and
-    # therefore avoid calling Bugzilla->logout() directly.
-    Bugzilla::Auth::Persist::Cookie->logout({user => $user});
+  my ($class, $user) = @_;
+
+  # When we're logging out another user we leave cookies alone, and
+  # therefore avoid calling Bugzilla->logout() directly.
+  Bugzilla::Auth::Persist::Cookie->logout({user => $user});
 }
 
 # just a compatibility front-end to logout_user that gets a user by id
 sub logout_user_by_id {
-    my ($class, $id) = @_;
-    my $user = new Bugzilla::User($id);
-    $class->logout_user($user);
+  my ($class, $id) = @_;
+  my $user = new Bugzilla::User($id);
+  $class->logout_user($user);
 }
 
 # hack that invalidates credentials for a single request
 sub logout_request {
-    my $class = shift;
-    delete $class->request_cache->{user};
-    delete $class->request_cache->{sudoer};
-    # We can't delete from $cgi->cookie, so logincookie data will remain
-    # there. Don't rely on it: use Bugzilla->user->login instead!
+  my $class = shift;
+  delete $class->request_cache->{user};
+  delete $class->request_cache->{sudoer};
+
+  # We can't delete from $cgi->cookie, so logincookie data will remain
+  # there. Don't rely on it: use Bugzilla->user->login instead!
 }
 
 sub markdown {
-    return if !Bugzilla->feature('markdown');
+  return if !Bugzilla->feature('markdown');
 
-    require Bugzilla::Markdown;
-    return $_[0]->request_cache->{markdown} ||= Bugzilla::Markdown->new();
+  require Bugzilla::Markdown;
+  return $_[0]->request_cache->{markdown} ||= Bugzilla::Markdown->new();
 }
 
 sub job_queue {
-    require Bugzilla::JobQueue;
-    return $_[0]->request_cache->{job_queue} ||= Bugzilla::JobQueue->new();
+  require Bugzilla::JobQueue;
+  return $_[0]->request_cache->{job_queue} ||= Bugzilla::JobQueue->new();
 }
 
 sub dbh {
-    # If we're not connected, then we must want the main db
-    return $_[0]->request_cache->{dbh} ||= $_[0]->dbh_main;
+
+  # If we're not connected, then we must want the main db
+  return $_[0]->request_cache->{dbh} ||= $_[0]->dbh_main;
 }
 
 sub dbh_main {
-    return $_[0]->request_cache->{dbh_main} ||= Bugzilla::DB::connect_main();
+  return $_[0]->request_cache->{dbh_main} ||= Bugzilla::DB::connect_main();
 }
 
 sub languages {
-    return Bugzilla::Install::Util::supported_languages();
+  return Bugzilla::Install::Util::supported_languages();
 }
 
 sub current_language {
-    return $_[0]->request_cache->{current_language} ||= (include_languages())[0];
+  return $_[0]->request_cache->{current_language} ||= (include_languages())[0];
 }
 
 sub error_mode {
-    my ($class, $newval) = @_;
-    if (defined $newval) {
-        $class->request_cache->{error_mode} = $newval;
-    }
+  my ($class, $newval) = @_;
+  if (defined $newval) {
+    $class->request_cache->{error_mode} = $newval;
+  }
 
-    # XXX - Once we require Perl 5.10.1, this test can be replaced by //.
-    if (exists $class->request_cache->{error_mode}) {
-        return $class->request_cache->{error_mode};
-    }
-    else {
-        return (i_am_cgi() ? ERROR_MODE_WEBPAGE : ERROR_MODE_DIE);
-    }
+  if (exists $class->request_cache->{error_mode}) {
+    return $class->request_cache->{error_mode};
+  }
+  else {
+    return (i_am_cgi() ? ERROR_MODE_WEBPAGE : ERROR_MODE_DIE);
+  }
 }
 
 # This is used only by Bugzilla::Error to throw errors.
 sub _json_server {
-    my ($class, $newval) = @_;
-    if (defined $newval) {
-        $class->request_cache->{_json_server} = $newval;
-    }
-    return $class->request_cache->{_json_server};
+  my ($class, $newval) = @_;
+  if (defined $newval) {
+    $class->request_cache->{_json_server} = $newval;
+  }
+  return $class->request_cache->{_json_server};
 }
 
 sub usage_mode {
-    my ($class, $newval) = @_;
-    if (defined $newval) {
-        if ($newval == USAGE_MODE_BROWSER) {
-            $class->error_mode(ERROR_MODE_WEBPAGE);
-        }
-        elsif ($newval == USAGE_MODE_CMDLINE) {
-            $class->error_mode(ERROR_MODE_DIE);
-        }
-        elsif ($newval == USAGE_MODE_XMLRPC) {
-            $class->error_mode(ERROR_MODE_DIE_SOAP_FAULT);
-        }
-        elsif ($newval == USAGE_MODE_JSON) {
-            $class->error_mode(ERROR_MODE_JSON_RPC);
-        }
-        elsif ($newval == USAGE_MODE_EMAIL) {
-            $class->error_mode(ERROR_MODE_DIE);
-        }
-        elsif ($newval == USAGE_MODE_TEST) {
-            $class->error_mode(ERROR_MODE_TEST);
-        }
-        elsif ($newval == USAGE_MODE_REST) {
-            $class->error_mode(ERROR_MODE_REST);
-        }
-        else {
-            ThrowCodeError('usage_mode_invalid',
-                           {'invalid_usage_mode', $newval});
-        }
-        $class->request_cache->{usage_mode} = $newval;
+  my ($class, $newval) = @_;
+  if (defined $newval) {
+    if ($newval == USAGE_MODE_BROWSER) {
+      $class->error_mode(ERROR_MODE_WEBPAGE);
     }
-
-    # XXX - Once we require Perl 5.10.1, this test can be replaced by //.
-    if (exists $class->request_cache->{usage_mode}) {
-        return $class->request_cache->{usage_mode};
+    elsif ($newval == USAGE_MODE_CMDLINE) {
+      $class->error_mode(ERROR_MODE_DIE);
+    }
+    elsif ($newval == USAGE_MODE_XMLRPC) {
+      $class->error_mode(ERROR_MODE_DIE_SOAP_FAULT);
+    }
+    elsif ($newval == USAGE_MODE_JSON) {
+      $class->error_mode(ERROR_MODE_JSON_RPC);
+    }
+    elsif ($newval == USAGE_MODE_EMAIL) {
+      $class->error_mode(ERROR_MODE_DIE);
+    }
+    elsif ($newval == USAGE_MODE_TEST) {
+      $class->error_mode(ERROR_MODE_TEST);
+    }
+    elsif ($newval == USAGE_MODE_REST) {
+      $class->error_mode(ERROR_MODE_REST);
     }
     else {
-        return (i_am_cgi()? USAGE_MODE_BROWSER : USAGE_MODE_CMDLINE);
+      ThrowCodeError('usage_mode_invalid', {'invalid_usage_mode', $newval});
     }
+    $class->request_cache->{usage_mode} = $newval;
+  }
+
+  if (exists $class->request_cache->{usage_mode}) {
+    return $class->request_cache->{usage_mode};
+  }
+  else {
+    return (i_am_cgi() ? USAGE_MODE_BROWSER : USAGE_MODE_CMDLINE);
+  }
 }
 
 sub installation_mode {
-    my ($class, $newval) = @_;
-    ($class->request_cache->{installation_mode} = $newval) if defined $newval;
-    return $class->request_cache->{installation_mode}
-        || INSTALLATION_MODE_INTERACTIVE;
+  my ($class, $newval) = @_;
+  ($class->request_cache->{installation_mode} = $newval) if defined $newval;
+  return $class->request_cache->{installation_mode}
+    || INSTALLATION_MODE_INTERACTIVE;
 }
 
 sub installation_answers {
-    my ($class, $filename) = @_;
-    if ($filename) {
-        my $s = new Safe;
-        $s->rdo($filename);
+  my ($class, $filename) = @_;
+  if ($filename) {
+    my $s = new Safe;
+    $s->rdo($filename);
 
-        die "Error reading $filename: $!" if $!;
-        die "Error evaluating $filename: $@" if $@;
+    die "Error reading $filename: $!"    if $!;
+    die "Error evaluating $filename: $@" if $@;
 
-        # Now read the param back out from the sandbox
-        $class->request_cache->{installation_answers} = $s->varglob('answer');
-    }
-    return $class->request_cache->{installation_answers} || {};
+    # Now read the param back out from the sandbox
+    $class->request_cache->{installation_answers} = $s->varglob('answer');
+  }
+  return $class->request_cache->{installation_answers} || {};
 }
 
 sub switch_to_shadow_db {
-    my $class = shift;
-
-    if (!$class->request_cache->{dbh_shadow}) {
-        if ($class->params->{'shadowdb'}) {
-            $class->request_cache->{dbh_shadow} = Bugzilla::DB::connect_shadow();
-        } else {
-            $class->request_cache->{dbh_shadow} = $class->dbh_main;
-        }
+  my $class = shift;
+
+  if (!$class->request_cache->{dbh_shadow}) {
+    if ($class->params->{'shadowdb'}) {
+      $class->request_cache->{dbh_shadow} = Bugzilla::DB::connect_shadow();
+    }
+    else {
+      $class->request_cache->{dbh_shadow} = $class->dbh_main;
     }
+  }
+
+  $class->request_cache->{dbh} = $class->request_cache->{dbh_shadow};
 
-    $class->request_cache->{dbh} = $class->request_cache->{dbh_shadow};
-    # we have to return $class->dbh instead of {dbh} as
-    # {dbh_shadow} may be undefined if no shadow DB is used
-    # and no connection to the main DB has been established yet.
-    return $class->dbh;
+  # we have to return $class->dbh instead of {dbh} as
+  # {dbh_shadow} may be undefined if no shadow DB is used
+  # and no connection to the main DB has been established yet.
+  return $class->dbh;
 }
 
 sub switch_to_main_db {
-    my $class = shift;
+  my $class = shift;
+
+  $class->request_cache->{dbh} = $class->dbh_main;
+  return $class->dbh_main;
+}
 
-    $class->request_cache->{dbh} = $class->dbh_main;
-    return $class->dbh_main;
+sub is_shadow_db {
+  my $class = shift;
+  return $class->request_cache->{dbh} != $class->dbh_main;
 }
 
 sub fields {
-    my ($class, $criteria) = @_;
-    $criteria ||= {};
-    my $cache = $class->request_cache;
-
-    # We create an advanced cache for fields by type, so that we
-    # can avoid going back to the database for every fields() call.
-    # (And most of our fields() calls are for getting fields by type.)
-    #
-    # We also cache fields by name, because calling $field->name a few
-    # million times can be slow in calling code, but if we just do it
-    # once here, that makes things a lot faster for callers.
-    if (!defined $cache->{fields}) {
-        my @all_fields = Bugzilla::Field->get_all;
-        my (%by_name, %by_type);
-        foreach my $field (@all_fields) {
-            my $name = $field->name;
-            $by_type{$field->type}->{$name} = $field;
-            $by_name{$name} = $field;
-        }
-        $cache->{fields} = { by_type => \%by_type, by_name => \%by_name };
+  my ($class, $criteria) = @_;
+  $criteria ||= {};
+  my $cache = $class->request_cache;
+
+  # We create an advanced cache for fields by type, so that we
+  # can avoid going back to the database for every fields() call.
+  # (And most of our fields() calls are for getting fields by type.)
+  #
+  # We also cache fields by name, because calling $field->name a few
+  # million times can be slow in calling code, but if we just do it
+  # once here, that makes things a lot faster for callers.
+  if (!defined $cache->{fields}) {
+    my @all_fields = Bugzilla::Field->get_all;
+    my (%by_name, %by_type);
+    foreach my $field (@all_fields) {
+      my $name = $field->name;
+      $by_type{$field->type}->{$name} = $field;
+      $by_name{$name} = $field;
     }
+    $cache->{fields} = {by_type => \%by_type, by_name => \%by_name};
+  }
 
-    my $fields = $cache->{fields};
-    my %requested;
-    if (my $types = delete $criteria->{type}) {
-        $types = ref($types) ? $types : [$types];
-        %requested = map { %{ $fields->{by_type}->{$_} || {} } } @$types;
-    }
-    else {
-        %requested = %{ $fields->{by_name} };
-    }
+  my $fields = $cache->{fields};
+  my %requested;
+  if (my $types = delete $criteria->{type}) {
+    $types = ref($types) ? $types : [$types];
+    %requested = map { %{$fields->{by_type}->{$_} || {}} } @$types;
+  }
+  else {
+    %requested = %{$fields->{by_name}};
+  }
 
-    my $do_by_name = delete $criteria->{by_name};
+  my $do_by_name = delete $criteria->{by_name};
 
-    # Filtering before returning the fields based on
-    # the criterias.
-    foreach my $filter (keys %$criteria) {
-        foreach my $field (keys %requested) {
-            if ($requested{$field}->$filter != $criteria->{$filter}) {
-                delete $requested{$field};
-            }
-        }
+  # Filtering before returning the fields based on
+  # the criterias.
+  foreach my $filter (keys %$criteria) {
+    foreach my $field (keys %requested) {
+      if ($requested{$field}->$filter != $criteria->{$filter}) {
+        delete $requested{$field};
+      }
     }
+  }
 
-    return $do_by_name ? \%requested
-        : [sort { $a->sortkey <=> $b->sortkey || $a->name cmp $b->name } values %requested];
+  return $do_by_name
+    ? \%requested
+    : [sort { $a->sortkey <=> $b->sortkey || $a->name cmp $b->name }
+      values %requested];
 }
 
 sub active_custom_fields {
-    my $class = shift;
-    if (!exists $class->request_cache->{active_custom_fields}) {
-        $class->request_cache->{active_custom_fields} =
-          Bugzilla::Field->match({ custom => 1, obsolete => 0 });
-    }
-    return @{$class->request_cache->{active_custom_fields}};
+  my $class = shift;
+  if (!exists $class->request_cache->{active_custom_fields}) {
+    $class->request_cache->{active_custom_fields}
+      = Bugzilla::Field->match({custom => 1, obsolete => 0});
+  }
+  return @{$class->request_cache->{active_custom_fields}};
 }
 
 sub has_flags {
-    my $class = shift;
+  my $class = shift;
 
-    if (!defined $class->request_cache->{has_flags}) {
-        $class->request_cache->{has_flags} = Bugzilla::Flag->any_exist;
-    }
-    return $class->request_cache->{has_flags};
+  if (!defined $class->request_cache->{has_flags}) {
+    $class->request_cache->{has_flags} = Bugzilla::Flag->any_exist;
+  }
+  return $class->request_cache->{has_flags};
 }
 
 sub local_timezone {
-    return $_[0]->process_cache->{local_timezone}
-             ||= DateTime::TimeZone->new(name => 'local');
+  return $_[0]->process_cache->{local_timezone}
+    ||= DateTime::TimeZone->new(name => 'local');
 }
 
-# This creates the request cache for non-mod_perl installations.
-# This is identical to Install::Util::_cache so that things loaded
-# into Install::Util::_cache during installation can be read out
-# of request_cache later in installation.
-our $_request_cache = $Bugzilla::Install::Util::_cache;
-
-sub request_cache {
-    if ($ENV{MOD_PERL}) {
-        require Apache2::RequestUtil;
-        # Sometimes (for example, during mod_perl.pl), the request
-        # object isn't available, and we should use $_request_cache instead.
-        my $request = eval { Apache2::RequestUtil->request };
-        return $_request_cache if !$request;
-        return $request->pnotes();
-    }
-    return $_request_cache;
-}
+use constant request_cache => Bugzilla::Install::Util::_cache();
 
 sub clear_request_cache {
-    $_request_cache = {};
-    if ($ENV{MOD_PERL}) {
-        require Apache2::RequestUtil;
-        my $request = eval { Apache2::RequestUtil->request };
-        if ($request) {
-            my $pnotes = $request->pnotes;
-            delete @$pnotes{(keys %$pnotes)};
-        }
-    }
+  %{request_cache()} = ();
 }
 
 # This is a per-process cache.  Under mod_cgi it's identical to the
 # request_cache.  When using mod_perl, items in this cache live until the
 # worker process is terminated.
-our $_process_cache = {};
+my $process_cache = {};
 
 sub process_cache {
-    return $_process_cache;
+  return $process_cache;
 }
 
 # This is a memcached wrapper, which provides cross-process and cross-system
 # caching.
 sub memcached {
-    return $_[0]->process_cache->{memcached} ||= Bugzilla::Memcached->_new();
+  return $_[0]->process_cache->{memcached} ||= Bugzilla::Memcached->_new();
 }
 
 # Private methods
@@ -659,31 +695,35 @@ sub memcached {
 # Per-process cleanup. Note that this is a plain subroutine, not a method,
 # so we don't have $class available.
 sub _cleanup {
-    my $cache = Bugzilla->request_cache;
-    my $main = $cache->{dbh_main};
-    my $shadow = $cache->{dbh_shadow};
-    foreach my $dbh ($main, $shadow) {
-        next if !$dbh;
-        $dbh->bz_rollback_transaction() if $dbh->bz_in_transaction;
-        $dbh->disconnect;
-    }
-    my $smtp = $cache->{smtp};
-    $smtp->disconnect if $smtp;
-    clear_request_cache();
-
-    # These are both set by CGI.pm but need to be undone so that
-    # Apache can actually shut down its children if it needs to.
-    foreach my $signal (qw(TERM PIPE)) {
-        $SIG{$signal} = 'DEFAULT' if $SIG{$signal} && $SIG{$signal} eq 'IGNORE';
-    }
+  my $cache  = Bugzilla->request_cache;
+  my $main   = $cache->{dbh_main};
+  my $shadow = $cache->{dbh_shadow};
+  foreach my $dbh ($main, $shadow) {
+    next if !$dbh;
+    $dbh->bz_rollback_transaction() if $dbh->bz_in_transaction;
+    $dbh->disconnect;
+  }
+  my $smtp = $cache->{smtp};
+  $smtp->disconnect if $smtp;
+  clear_request_cache();
+  Bugzilla::Bug->CLEANUP() if $INC{"Bugzilla/Bug.pm"};
+
+  # These are both set by CGI.pm but need to be undone so that
+  # Apache can actually shut down its children if it needs to.
+  foreach my $signal (qw(TERM PIPE)) {
+    $SIG{$signal} = 'DEFAULT' if $SIG{$signal} && $SIG{$signal} eq 'IGNORE';
+  }
 }
 
 sub END {
-    # Bugzilla.pm cannot compile in mod_perl.pl if this runs.
-    _cleanup() unless $ENV{MOD_PERL};
+
+  # This is managed in mod_perl.pl and app.psgi when running
+  # in a persistent environment.
+  _cleanup() unless i_am_persistent();
 }
 
-init_page() if !$ENV{MOD_PERL};
+# Also managed in mod_perl.pl and app.psgi.
+init_page() unless i_am_persistent();
 
 1;
 
@@ -739,7 +779,7 @@ Note that items accessible via this object are demand-loaded when requested.
 
 For something to be added to this object, it should either be able to benefit
 from persistence when run under mod_perl (such as the a C<template> object),
-or should be something which is globally required by a large ammount of code
+or should be something which is globally required by a large amount of code
 (such as the current C<user> object).
 
 =head1 METHODS
@@ -760,7 +800,7 @@ If you ever need a L<Bugzilla::Template> object while you're already
 processing a template, use this. Also use it if you want to specify
 the language to use. If no argument is passed, it uses the last
 language set. If the argument is "" (empty string), the language is
-reset to the current one (the one used by Bugzilla->template).
+reset to the current one (the one used by C<Bugzilla-E<gt>template>).
 
 =item C<cgi>
 
@@ -878,8 +918,8 @@ specify this argument, all fields will be returned.
 
 =item C<error_mode>
 
-Call either C<Bugzilla->error_mode(Bugzilla::Constants::ERROR_MODE_DIE)>
-or C<Bugzilla->error_mode(Bugzilla::Constants::ERROR_MODE_DIE_SOAP_FAULT)> to
+Call either C<Bugzilla-E<gt>error_mode(Bugzilla::Constants::ERROR_MODE_DIE)>
+or C<Bugzilla-E<gt>error_mode(Bugzilla::Constants::ERROR_MODE_DIE_SOAP_FAULT)> to
 change this flag's default of C<Bugzilla::Constants::ERROR_MODE_WEBPAGE> and to
 indicate that errors should be passed to error mode specific error handlers
 rather than being sent to a browser and finished with an exit().
@@ -888,24 +928,24 @@ This is useful, for example, to keep C<eval> blocks from producing wild HTML
 on errors, making it easier for you to catch them.
 (Remember to reset the error mode to its previous value afterwards, though.)
 
-C<Bugzilla->error_mode> will return the current state of this flag.
+C<Bugzilla-E<gt>error_mode> will return the current state of this flag.
 
-Note that C<Bugzilla->error_mode> is being called by C<Bugzilla->usage_mode> on
+Note that C<Bugzilla-E<gt>error_mode> is being called by C<Bugzilla-E<gt>usage_mode> on
 usage mode changes.
 
 =item C<usage_mode>
 
-Call either C<Bugzilla->usage_mode(Bugzilla::Constants::USAGE_MODE_CMDLINE)>
-or C<Bugzilla->usage_mode(Bugzilla::Constants::USAGE_MODE_XMLRPC)> near the
+Call either C<Bugzilla-E<gt>usage_mode(Bugzilla::Constants::USAGE_MODE_CMDLINE)>
+or C<Bugzilla-E<gt>usage_mode(Bugzilla::Constants::USAGE_MODE_XMLRPC)> near the
 beginning of your script to change this flag's default of
 C<Bugzilla::Constants::USAGE_MODE_BROWSER> and to indicate that Bugzilla is
 being called in a non-interactive manner.
 
 This influences error handling because on usage mode changes, C<usage_mode>
-calls C<Bugzilla->error_mode> to set an error mode which makes sense for the
+calls C<Bugzilla-E<gt>error_mode> to set an error mode which makes sense for the
 usage mode.
 
-C<Bugzilla->usage_mode> will return the current state of this flag.
+C<Bugzilla-E<gt>usage_mode> will return the current state of this flag.
 
 =item C<installation_mode>
 
@@ -942,6 +982,12 @@ Switch from using the main database to using the shadow database.
 
 Change the database object to refer to the main database.
 
+=item C<is_shadow_db>
+
+Returns true if the currently active database is the shadow database.
+Returns false if a the currently active database is the man database, or if a
+shadow database is not configured or enabled.
+
 =item C<params>
 
 The current Parameters of Bugzilla, as a hashref. If C<data/params.json>
@@ -966,8 +1012,17 @@ this Bugzilla installation.
 
 =item C<feature>
 
-Tells you whether or not a specific feature is enabled. For names
-of features, see C<OPTIONAL_MODULES> in C<Bugzilla::Install::Requirements>.
+Wrapper around C<has_feature()> that also loads all of required modules into the runtime.
+
+=item C<has_feature>
+
+Consults F<MYMETA.yml> for optional Bugzilla features and returns true if all the requirements
+are installed.
+
+=item C<api_server>
+
+Returns a cached instance of the WebService API server object used for
+manipulating Bugzilla resources.
 
 =back
 
diff --git a/Bugzilla/API/1_0/Constants.pm b/Bugzilla/API/1_0/Constants.pm
new file mode 100644
index 0000000000..ebb4b34e5d
--- /dev/null
+++ b/Bugzilla/API/1_0/Constants.pm
@@ -0,0 +1,336 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Constants;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::Hook;
+
+use parent qw(Exporter);
+
+our @EXPORT_OK = qw(
+  WS_ERROR_CODE
+
+  STATUS_OK
+  STATUS_CREATED
+  STATUS_ACCEPTED
+  STATUS_NO_CONTENT
+  STATUS_MULTIPLE_CHOICES
+  STATUS_BAD_REQUEST
+  STATUS_NOT_FOUND
+  STATUS_GONE
+  REST_STATUS_CODE_MAP
+
+  ERROR_UNKNOWN_FATAL
+  ERROR_UNKNOWN_TRANSIENT
+
+  REST_CONTENT_TYPE_WHITELIST
+
+  API_AUTH_HEADERS
+);
+
+# This maps the error names in global/*-error.html.tmpl to numbers.
+# Generally, transient errors should have a number above 0, and
+# fatal errors should have a number below 0.
+#
+# This hash should generally contain any error that could be thrown
+# by the WebService interface. If it's extremely unlikely that the
+# error could be thrown (like some CodeErrors), it doesn't have to
+# be listed here.
+#
+# "Transient" means "If you resubmit that request with different data,
+# it may work."
+#
+# "Fatal" means, "There's something wrong with Bugzilla, probably
+# something an administrator would have to fix."
+#
+# NOTE: Numbers must never be recycled. If you remove a number, leave a
+# comment that it was retired. Also, if an error changes its name, you'll
+# have to fix it here.
+use constant WS_ERROR_CODE => {
+
+  # Generic errors (Bugzilla::Object and others) are 50-9
+  object_not_specified        => 50,
+  reassign_to_empty           => 50,
+  param_required              => 50,
+  params_required             => 50,
+  undefined_field             => 50,
+  object_does_not_exist       => 51,
+  param_must_be_numeric       => 52,
+  number_not_numeric          => 52,
+  param_invalid               => 53,
+  number_too_large            => 54,
+  number_too_small            => 55,
+  illegal_date                => 56,
+  param_integer_required      => 57,
+  param_scalar_array_required => 58,
+
+  # Bug errors usually occupy the 100-200 range.
+  improper_bug_id_field_value => 100,
+  bug_id_does_not_exist       => 101,
+  bug_access_denied           => 102,
+  bug_access_query            => 102,
+
+  # These all mean "invalid alias"
+  alias_too_long             => 103,
+  alias_in_use               => 103,
+  alias_is_numeric           => 103,
+  alias_has_comma_or_space   => 103,
+  multiple_alias_not_allowed => 103,
+
+  # Misc. bug field errors
+  illegal_field     => 104,
+  freetext_too_long => 104,
+
+  # Component errors
+  require_component         => 105,
+  component_name_too_long   => 105,
+  product_unknown_component => 105,
+
+  # Invalid Product
+  no_products           => 106,
+  entry_access_denied   => 106,
+  product_access_denied => 106,
+  product_disabled      => 106,
+
+  # Invalid Summary
+  require_summary => 107,
+
+  # Invalid field name
+  invalid_field_name => 108,
+
+  # Not authorized to edit the bug
+  product_edit_denied => 109,
+
+  # Comment-related errors
+  comment_is_private        => 110,
+  comment_id_invalid        => 111,
+  comment_too_long          => 114,
+  comment_invalid_isprivate => 117,
+  markdown_disabled         => 140,
+
+  # Comment tagging
+  comment_tag_disabled  => 125,
+  comment_tag_invalid   => 126,
+  comment_tag_too_long  => 127,
+  comment_tag_too_short => 128,
+
+  # See Also errors
+  bug_url_invalid  => 112,
+  bug_url_too_long => 112,
+
+  # Insidergroup Errors
+  user_not_insider => 113,
+
+  # Note: 114 is above in the Comment-related section.
+  # Bug update errors
+  illegal_change => 115,
+
+  # Dependency errors
+  dependency_loop_single => 116,
+  dependency_loop_multi  => 116,
+
+  # Note: 117 is above in the Comment-related section.
+  # Dup errors
+  dupe_loop_detected => 118,
+  dupe_id_required   => 119,
+
+  # Bug-related group errors
+  group_invalid_removal         => 120,
+  group_restriction_not_allowed => 120,
+
+  # Status/Resolution errors
+  missing_resolution            => 121,
+  resolution_not_allowed        => 122,
+  illegal_bug_status_transition => 123,
+
+  # Flag errors
+  flag_status_invalid          => 129,
+  flag_update_denied           => 130,
+  flag_type_requestee_disabled => 131,
+  flag_not_unique              => 132,
+  flag_type_not_unique         => 133,
+  flag_type_inactive           => 134,
+
+  # Authentication errors are usually 300-400.
+  invalid_login_or_password => 300,
+  account_disabled          => 301,
+  auth_invalid_email        => 302,
+  extern_id_conflict        => -303,
+  auth_failure              => 304,
+  password_too_short        => 305,
+  password_not_complex      => 305,
+  api_key_not_valid         => 306,
+  api_key_revoked           => 306,
+  auth_invalid_token        => 307,
+
+  # Except, historically, AUTH_NODATA, which is 410.
+  login_required => 410,
+
+  # User errors are 500-600.
+  account_exists              => 500,
+  illegal_email_address       => 501,
+  auth_cant_create_account    => 501,
+  account_creation_disabled   => 501,
+  account_creation_restricted => 501,
+  password_too_short          => 502,
+
+  # Error 503 password_too_long no longer exists.
+  invalid_username => 504,
+
+  # This is from strict_isolation, but it also basically means
+  # "invalid user."
+  invalid_user_group          => 504,
+  user_access_by_id_denied    => 505,
+  user_access_by_match_denied => 505,
+
+  # Attachment errors are 600-700.
+  file_too_large       => 600,
+  invalid_content_type => 601,
+
+  # Error 602 attachment_illegal_url no longer exists.
+  file_not_specified             => 603,
+  missing_attachment_description => 604,
+
+  # Error 605 attachment_url_disabled no longer exists.
+  zero_length_file => 606,
+
+  # Product erros are 700-800
+  product_blank_name                   => 700,
+  product_name_too_long                => 701,
+  product_name_already_in_use          => 702,
+  product_name_diff_in_case            => 702,
+  product_must_have_description        => 703,
+  product_must_have_version            => 704,
+  product_must_define_defaultmilestone => 705,
+  product_admin_denied                 => 706,
+
+  # Group errors are 800-900
+  empty_group_name        => 800,
+  group_exists            => 801,
+  empty_group_description => 802,
+  invalid_regexp          => 803,
+  invalid_group_name      => 804,
+  group_cannot_view       => 805,
+
+  # Classification errors are 900-1000
+  auth_classification_not_enabled => 900,
+
+  # Search errors are 1000-1100
+  buglist_parameters_required => 1000,
+
+  # Flag type errors are 1100-1200
+  flag_type_name_invalid        => 1101,
+  flag_type_description_invalid => 1102,
+  flag_type_cc_list_invalid     => 1103,
+  flag_type_sortkey_invalid     => 1104,
+  flag_type_not_editable        => 1105,
+
+  # Component errors are 1200-1300
+  component_already_exists               => 1200,
+  component_is_last                      => 1201,
+  component_has_bugs                     => 1202,
+  component_blank_name                   => 1210,
+  component_blank_description            => 1211,
+  multiple_components_update_not_allowed => 1212,
+  component_need_initialowner            => 1213,
+
+  # Errors thrown by the WebService itself. The ones that are negative
+  # conform to http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
+  xmlrpc_invalid_value          => -32600,
+  unknown_method                => -32601,
+  json_rpc_post_only            => 32610,
+  json_rpc_invalid_callback     => 32611,
+  xmlrpc_illegal_content_type   => 32612,
+  json_rpc_illegal_content_type => 32613,
+  rest_invalid_resource         => 32614,
+};
+
+# RESTful webservices use the http status code
+# to describe whether a call was successful or
+# to describe the type of error that occurred.
+use constant STATUS_OK               => 200;
+use constant STATUS_CREATED          => 201;
+use constant STATUS_ACCEPTED         => 202;
+use constant STATUS_NO_CONTENT       => 204;
+use constant STATUS_MULTIPLE_CHOICES => 300;
+use constant STATUS_BAD_REQUEST      => 400;
+use constant STATUS_NOT_AUTHORIZED   => 401;
+use constant STATUS_NOT_FOUND        => 404;
+use constant STATUS_GONE             => 410;
+
+# The integer value is the error code above returned by
+# the related webvservice call. We choose the appropriate
+# http status code based on the error code or use the
+# default STATUS_BAD_REQUEST.
+sub REST_STATUS_CODE_MAP {
+  my $status_code_map = {
+    51       => STATUS_NOT_FOUND,
+    101      => STATUS_NOT_FOUND,
+    102      => STATUS_NOT_AUTHORIZED,
+    106      => STATUS_NOT_AUTHORIZED,
+    109      => STATUS_NOT_AUTHORIZED,
+    110      => STATUS_NOT_AUTHORIZED,
+    113      => STATUS_NOT_AUTHORIZED,
+    115      => STATUS_NOT_AUTHORIZED,
+    120      => STATUS_NOT_AUTHORIZED,
+    300      => STATUS_NOT_AUTHORIZED,
+    301      => STATUS_NOT_AUTHORIZED,
+    302      => STATUS_NOT_AUTHORIZED,
+    303      => STATUS_NOT_AUTHORIZED,
+    304      => STATUS_NOT_AUTHORIZED,
+    410      => STATUS_NOT_AUTHORIZED,
+    504      => STATUS_NOT_AUTHORIZED,
+    505      => STATUS_NOT_AUTHORIZED,
+    32614    => STATUS_NOT_FOUND,
+    _default => STATUS_BAD_REQUEST
+  };
+
+  Bugzilla::Hook::process('webservice_status_code_map',
+    {status_code_map => $status_code_map});
+
+  return $status_code_map;
+}
+
+# These are the fallback defaults for errors not in ERROR_CODE.
+use constant ERROR_UNKNOWN_FATAL     => -32000;
+use constant ERROR_UNKNOWN_TRANSIENT => 32000;
+
+use constant ERROR_GENERAL => 999;
+
+# The first content type specified is used as the default.
+use constant REST_CONTENT_TYPE_WHITELIST => qw(
+  application/json
+  application/javascript
+  text/javascript
+  text/html
+);
+
+# Custom HTTP headers that can be used for API authentication rather than
+# passing as URL parameters. This is useful if you do not want sensitive
+# information to show up in webserver log files.
+use constant API_AUTH_HEADERS => {
+  X_BUGZILLA_LOGIN    => 'Bugzilla_login',
+  X_BUGZILLA_PASSWORD => 'Bugzilla_password',
+  X_BUGZILLA_API_KEY  => 'Bugzilla_api_key',
+  X_BUGZILLA_TOKEN    => 'Bugzilla_token',
+};
+
+1;
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_STATUS_CODE_MAP
+
+=item WS_DISPATCH
+
+=back
diff --git a/Bugzilla/API/1_0/Resource.pm b/Bugzilla/API/1_0/Resource.pm
new file mode 100644
index 0000000000..dba7fc33ea
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource.pm
@@ -0,0 +1,147 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# This is the base class for $self in WebService API method calls. For the
+# actual RPC server, see Bugzilla::API::Server and its subclasses.
+
+package Bugzilla::API::1_0::Resource;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Moo;
+
+#####################
+# Default Constants #
+#####################
+
+# Used by the server to convert incoming date fields apprpriately.
+use constant DATE_FIELDS => {};
+
+# Used by the server to convert incoming base64 fields appropriately.
+use constant BASE64_FIELDS => {};
+
+# For some methods, we shouldn't call Bugzilla->login before we call them
+use constant LOGIN_EXEMPT => {};
+
+# Used to allow methods to be called in the JSON-RPC WebService via GET.
+# Methods that can modify data MUST not be listed here.
+use constant READ_ONLY => ();
+
+# Whitelist of methods that a client is allowed to access when making
+# an API call.
+use constant PUBLIC_METHODS => ();
+
+# Array of path mappings for method names for the API. Also describes
+# how path values are mapped to method parameters values.
+use constant REST_RESOURCES => [];
+
+##################
+# Public Methods #
+##################
+
+sub login_exempt {
+  my ($class, $method) = @_;
+  return $class->LOGIN_EXEMPT->{$method};
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource - The Web Service Resource interface to Bugzilla
+
+=head1 DESCRIPTION
+
+This is the standard API for external programs that want to interact
+with Bugzilla. It provides endpoints or methods in various modules.
+
+You can interact with this API via L<REST|Bugzilla::API::1_0::Server>.
+
+=head1 CALLING METHODS
+
+Methods are grouped into "packages", like C<Bug> for
+L<Bugzilla::API::1_0::Resource::Bug>. So, for example,
+L<Bugzilla::API::1_0::Resource::Bug/get>, is called as C<Bug.get>.
+
+For REST, the "package" is more determined by the path used to access the
+resource. See each relevant method for specific details on how to access via REST.
+
+=head1 USAGE
+
+Full documentation on how to use the Bugzilla API can be found at
+L<https://bugzilla.readthedocs.org/en/latest/api/index.html>.
+
+=head1 ERRORS
+
+If a particular API call fails, it will throw an error in the appropriate format
+providing at least a numeric error code and descriptive text for the error.
+
+The various errors that functions can throw are specified by the
+documentation of those functions.
+
+Each error that Bugzilla can throw has a specific numeric code that will
+not change between versions of Bugzilla. If your code needs to know what
+error Bugzilla threw, use the numeric code. Don't try to parse the
+description, because that may change from version to version of Bugzilla.
+
+Note that if you display the error to the user in an HTML program, make
+sure that you properly escape the error, as it will not be HTML-escaped.
+
+=head2 Transient vs. Fatal Errors
+
+If the error code is a number greater than 0, the error is considered
+"transient," which means that it was an error made by the user, not
+some problem with Bugzilla itself.
+
+If the error code is a number less than 0, the error is "fatal," which
+means that it's some error in Bugzilla itself that probably requires
+administrative attention.
+
+Negative numbers and positive numbers don't overlap. That is, if there's
+an error 302, there won't be an error -302.
+
+=head2 Unknown Errors
+
+Sometimes a function will throw an error that doesn't have a specific
+error code. In this case, the code will be C<-32000> if it's a "fatal"
+error, and C<32000> if it's a "transient" error.
+
+=head1 SEE ALSO
+
+=head2 API Resource Modules
+
+=over
+
+=item L<Bugzilla::API::1_0::Resource::Bug>
+
+=item L<Bugzilla::API::1_0::Resource::Bugzilla>
+
+=item L<Bugzilla::API::1_0::Resource::Classification>
+
+=item L<Bugzilla::API::1_0::Resource::FlagType>
+
+=item L<Bugzilla::API::1_0::Resource::Component>
+
+=item L<Bugzilla::API::1_0::Resource::Group>
+
+=item L<Bugzilla::API::1_0::Resource::Product>
+
+=item L<Bugzilla::API::1_0::Resource::User>
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item login_exempt
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/Bug.pm b/Bugzilla/API/1_0/Resource/Bug.pm
new file mode 100644
index 0000000000..2861ea7bdb
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/Bug.pm
@@ -0,0 +1,4948 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Bug;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(STATUS_CREATED);
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Comment;
+use Bugzilla::Comment::TagWeights;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::Field;
+use Bugzilla::Bug;
+use Bugzilla::BugMail;
+use Bugzilla::Util qw(trick_taint trim diff_arrays detaint_natural);
+use Bugzilla::Version;
+use Bugzilla::Milestone;
+use Bugzilla::Status;
+use Bugzilla::Token qw(issue_hash_token);
+use Bugzilla::Search;
+use Bugzilla::Product;
+use Bugzilla::FlagType;
+use Bugzilla::Search::Quicksearch;
+
+use Moo;
+use List::Util qw(max);
+use List::MoreUtils qw(uniq);
+use Storable qw(dclone);
+
+extends 'Bugzilla::API::1_0::Resource';
+
+#############
+# Constants #
+#############
+
+use constant PRODUCT_SPECIFIC_FIELDS => qw(version target_milestone component);
+
+use constant DATE_FIELDS => {
+  comments => ['new_since'],
+  history  => ['new_since'],
+  search   => ['last_change_time', 'creation_time'],
+};
+
+use constant BASE64_FIELDS => {add_attachment => ['data'],};
+
+use constant READ_ONLY => qw(
+  attachments
+  comments
+  fields
+  get
+  history
+  legal_values
+  search
+  search_comment_tags
+);
+
+use constant PUBLIC_METHODS => qw(
+  add_attachment
+  add_comment
+  attachments
+  comments
+  create
+  fields
+  get
+  history
+  legal_values
+  possible_duplicates
+  render_comment
+  search
+  search_comment_tags
+  update
+  update_attachment
+  update_comment_tags
+  update_see_also
+  update_tags
+);
+
+use constant ATTACHMENT_MAPPED_SETTERS =>
+  {file_name => 'filename', summary => 'description',};
+
+use constant ATTACHMENT_MAPPED_RETURNS => {
+  description => 'summary',
+  ispatch     => 'is_patch',
+  isprivate   => 'is_private',
+  isobsolete  => 'is_obsolete',
+  filename    => 'file_name',
+  mimetype    => 'content_type',
+};
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/bug$},
+    {
+      GET  => {method => 'search',},
+      POST => {method => 'create', status_code => STATUS_CREATED}
+    },
+    qr{^/bug/$},
+    {GET => {method => 'get'}},
+    qr{^/bug/([^/]+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      },
+      PUT => {
+        method => 'update',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      }
+    },
+    qr{^/bug/([^/]+)/comment$},
+    {
+      GET => {
+        method => 'comments',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      },
+      POST => {
+        method => 'add_comment',
+        params => sub {
+          return {id => $_[0]};
+        },
+        success_code => STATUS_CREATED
+      }
+    },
+    qr{^/bug/comment/([^/]+)$},
+    {
+      GET => {
+        method => 'comments',
+        params => sub {
+          return {comment_ids => [$_[0]]};
+        }
+      }
+    },
+    qr{^/bug/comment/tags/([^/]+)$},
+    {
+      GET => {
+        method => 'search_comment_tags',
+        params => sub {
+          return {query => $_[0]};
+        },
+      },
+    },
+    qr{^/bug/comment/([^/]+)/tags$},
+    {
+      PUT => {
+        method => 'update_comment_tags',
+        params => sub {
+          return {comment_id => $_[0]};
+        },
+      },
+    },
+    qr{^/bug/([^/]+)/history$},
+    {
+      GET => {
+        method => 'history',
+        params => sub {
+          return {ids => [$_[0]]};
+        },
+      }
+    },
+    qr{^/bug/([^/]+)/attachment$},
+    {
+      GET => {
+        method => 'attachments',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      },
+      POST => {
+        method => 'add_attachment',
+        params => sub {
+          return {ids => [$_[0]]};
+        },
+        success_code => STATUS_CREATED
+      }
+    },
+    qr{^/bug/attachment/([^/]+)$},
+    {
+      GET => {
+        method => 'attachments',
+        params => sub {
+          return {attachment_ids => [$_[0]]};
+        }
+      },
+      PUT => {
+        method => 'update_attachment',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      }
+    },
+    qr{^/field/bug$},
+    {GET => {method => 'fields',}},
+    qr{^/field/bug/([^/]+)$},
+    {
+      GET => {
+        method => 'fields',
+        params => sub {
+          my $value = $_[0];
+          my $param = 'names';
+          $param = 'ids' if $value =~ /^\d+$/;
+          return {$param => [$_[0]]};
+        }
+      }
+    },
+    qr{^/field/bug/([^/]+)/values$},
+    {
+      GET => {
+        method => 'legal_values',
+        params => sub {
+          return {field => $_[0]};
+        }
+      }
+    },
+    qr{^/field/bug/([^/]+)/([^/]+)/values$},
+    {
+      GET => {
+        method => 'legal_values',
+        params => sub {
+          return {field => $_[0], product_id => $_[1]};
+        }
+      }
+    },
+  ];
+  return $rest_resources;
+}
+
+###########
+# Methods #
+###########
+
+sub fields {
+  my ($self, $params) = validate(@_, 'ids', 'names');
+
+  Bugzilla->switch_to_shadow_db();
+
+  my @fields;
+  if (defined $params->{ids}) {
+    my $ids = $params->{ids};
+    foreach my $id (@$ids) {
+      my $loop_field = Bugzilla::Field->check({id => $id});
+      push(@fields, $loop_field);
+    }
+  }
+
+  if (defined $params->{names}) {
+    my $names = $params->{names};
+    foreach my $field_name (@$names) {
+      my $loop_field = Bugzilla::Field->check($field_name);
+
+      # Don't push in duplicate fields if we also asked for this field
+      # in "ids".
+      if (!grep($_->id == $loop_field->id, @fields)) {
+        push(@fields, $loop_field);
+      }
+    }
+  }
+
+  if (!defined $params->{ids} and !defined $params->{names}) {
+    @fields = @{Bugzilla->fields({obsolete => 0})};
+  }
+
+  my @fields_out;
+  foreach my $field (@fields) {
+    my $visibility_field
+      = $field->visibility_field ? $field->visibility_field->name : undef;
+    my $vis_values = $field->visibility_values;
+    my $value_field = $field->value_field ? $field->value_field->name : undef;
+
+    my (@values, $has_values);
+    if ( ($field->is_select and $field->name ne 'product')
+      or grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)
+      or $field->name eq 'keywords')
+    {
+      $has_values = 1;
+      @values = @{$self->_legal_field_values({field => $field})};
+    }
+
+    if (grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)) {
+      $value_field = 'product';
+    }
+
+    my %field_data = (
+      id                => as_int($field->id),
+      type              => as_int($field->type),
+      is_custom         => as_boolean($field->custom),
+      name              => as_string($field->name),
+      display_name      => as_string($field->description),
+      is_mandatory      => as_boolean($field->is_mandatory),
+      is_on_bug_entry   => as_boolean($field->enter_bug),
+      visibility_field  => as_string($visibility_field),
+      visibility_values => as_name_array($vis_values)
+    );
+    if ($has_values) {
+      $field_data{value_field} = as_string($value_field);
+      $field_data{values}      = \@values;
+    }
+    push(@fields_out, filter $params, \%field_data);
+  }
+
+  return {fields => \@fields_out};
+}
+
+sub _legal_field_values {
+  my ($self, $params) = @_;
+  my $field      = $params->{field};
+  my $field_name = $field->name;
+  my $user       = Bugzilla->user;
+
+  my @result;
+  if (grep($_ eq $field_name, PRODUCT_SPECIFIC_FIELDS)) {
+    my @list;
+    if ($field_name eq 'version') {
+      @list = Bugzilla::Version->get_all;
+    }
+    elsif ($field_name eq 'component') {
+      @list = Bugzilla::Component->get_all;
+    }
+    else {
+      @list = Bugzilla::Milestone->get_all;
+    }
+
+    foreach my $value (@list) {
+      my $sortkey = $field_name eq 'target_milestone' ? $value->sortkey : 0;
+
+      # XXX This is very slow for large numbers of values.
+      my $product_name = $value->product->name;
+      if ($user->can_see_product($product_name)) {
+        push(
+          @result,
+          {
+            name              => as_string($value->name),
+            sort_key          => as_int($sortkey),
+            sortkey           => as_int($sortkey),                # deprecated
+            visibility_values => [as_string($product_name)],
+            is_active         => as_boolean($value->is_active),
+          }
+        );
+      }
+    }
+  }
+
+  elsif ($field_name eq 'bug_status') {
+    my @status_all     = Bugzilla::Status->get_all;
+    my $initial_status = bless(
+      {
+        id            => 0,
+        name          => '',
+        is_open       => 1,
+        sortkey       => 0,
+        can_change_to => Bugzilla::Status->can_change_to
+      },
+      'Bugzilla::Status'
+    );
+    unshift(@status_all, $initial_status);
+
+    foreach my $status (@status_all) {
+      my @can_change_to;
+      foreach my $change_to (@{$status->can_change_to}) {
+
+        # There's no need to note that a status can transition
+        # to itself.
+        next if $change_to->id == $status->id;
+        my %change_to_hash = (
+          name => as_string($change_to->name),
+          comment_required =>
+            as_boolean($change_to->comment_required_on_change_from($status)),
+        );
+        push(@can_change_to, \%change_to_hash);
+      }
+
+      push(
+        @result,
+        {
+          name              => as_string($status->name),
+          is_open           => as_boolean($status->is_open),
+          sort_key          => as_int($status->sortkey),
+          sortkey           => as_int($status->sortkey),       # deprecated
+          can_change_to     => \@can_change_to,
+          visibility_values => [],
+        }
+      );
+    }
+  }
+
+  elsif ($field_name eq 'keywords') {
+    my @legal_keywords = Bugzilla::Keyword->get_all;
+    foreach my $value (@legal_keywords) {
+      push(
+        @result,
+        {
+          name        => as_string($value->name),
+          description => as_string($value->description),
+        }
+      );
+    }
+  }
+  else {
+    my @values = Bugzilla::Field::Choice->type($field)->get_all();
+    foreach my $value (@values) {
+      my $vis_val = $value->visibility_value;
+      push(
+        @result,
+        {
+          name     => as_string($value->name),
+          sort_key => as_int($value->sortkey),
+          sortkey  => as_int($value->sortkey),    # deprecated
+          visibility_values => [defined $vis_val ? as_string($vis_val->name) : ()],
+        }
+      );
+    }
+  }
+
+  return \@result;
+}
+
+sub comments {
+  my ($self, $params) = validate(@_, 'ids', 'comment_ids');
+
+  if (!(defined $params->{ids} || defined $params->{comment_ids})) {
+    ThrowCodeError('params_required',
+      {function => 'Bug.comments', params => ['ids', 'comment_ids']});
+  }
+
+  my $bug_ids     = $params->{ids}         || [];
+  my $comment_ids = $params->{comment_ids} || [];
+
+  my $dbh  = Bugzilla->switch_to_shadow_db();
+  my $user = Bugzilla->user;
+
+  my %bugs;
+  foreach my $bug_id (@$bug_ids) {
+    my $bug = Bugzilla::Bug->check($bug_id);
+
+    # We want the API to always return comments in the same order.
+
+    my $comments
+      = $bug->comments({order => 'oldest_to_newest', after => $params->{new_since}
+      });
+    my @result;
+    foreach my $comment (@$comments) {
+      next if $comment->is_private && !$user->is_insider;
+      push(@result, $self->_translate_comment($comment, $params));
+    }
+    $bugs{$bug->id}{'comments'} = \@result;
+  }
+
+  my %comments;
+  if (scalar @$comment_ids) {
+    my @ids = map { trim($_) } @$comment_ids;
+    my $comment_data = Bugzilla::Comment->new_from_list(\@ids);
+
+    # See if we were passed any invalid comment ids.
+    my %got_ids = map { $_->id => 1 } @$comment_data;
+    foreach my $comment_id (@ids) {
+      if (!$got_ids{$comment_id}) {
+        ThrowUserError('comment_id_invalid', {id => $comment_id});
+      }
+    }
+
+    # Now make sure that we can see all the associated bugs.
+    my %got_bug_ids = map { $_->bug_id => 1 } @$comment_data;
+    Bugzilla::Bug->check($_) foreach (keys %got_bug_ids);
+
+    foreach my $comment (@$comment_data) {
+      if ($comment->is_private && !$user->is_insider) {
+        ThrowUserError('comment_is_private', {id => $comment->id});
+      }
+      $comments{$comment->id} = $self->_translate_comment($comment, $params);
+    }
+  }
+
+  return {bugs => \%bugs, comments => \%comments};
+}
+
+sub render_comment {
+  my ($self, $params) = @_;
+
+  unless (defined $params->{text}) {
+    ThrowCodeError('params_required',
+      {function => 'Bug.render_comment', params => ['text']});
+  }
+
+  Bugzilla->switch_to_shadow_db();
+  my $bug = $params->{id} ? Bugzilla::Bug->check($params->{id}) : undef;
+
+  my $markdown = $params->{markdown} ? 1 : 0;
+  my $tmpl
+    = $markdown
+    ? '[% text FILTER markdown(bug, { is_markdown => 1 }) %]'
+    : '[% text FILTER markdown(bug) %]';
+
+  my $html;
+  my $template = Bugzilla->template;
+  $template->process(\$tmpl, {bug => $bug, text => $params->{text}}, \$html);
+
+  return {html => $html};
+}
+
+# Helper for Bug.comments
+sub _translate_comment {
+  my ($self, $comment, $filters, $types, $prefix) = @_;
+  my $attach_id = $comment->is_about_attachment ? $comment->extra_data : undef;
+
+  my $comment_hash = {
+    id            => as_int($comment->id),
+    bug_id        => as_int($comment->bug_id),
+    creator       => as_login($comment->author->login),
+    time          => as_datetime($comment->creation_ts),
+    creation_time => as_datetime($comment->creation_ts),
+    is_private    => as_boolean($comment->is_private),
+    is_markdown   => as_boolean($comment->is_markdown),
+    text          => as_string($comment->body_full),
+    attachment_id => as_int($attach_id),
+    count         => as_int($comment->count),
+  };
+
+  # Don't load comment tags unless enabled
+  if (Bugzilla->params->{'comment_taggers_group'}) {
+    $comment_hash->{tags} = as_string_array($comment->tags);
+  }
+
+  return filter($filters, $comment_hash, $types, $prefix);
+}
+
+sub get {
+  my ($self, $params) = validate(@_, 'ids');
+
+  Bugzilla->switch_to_shadow_db() unless Bugzilla->user->id;
+
+  my $ids = $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  my (@bugs, @faults, @hashes);
+
+  # Cache permissions for bugs. This highly reduces the number of calls to the DB.
+  # visible_bugs() is only able to handle bug IDs, so we have to skip aliases.
+  my @int = grep { $_ =~ /^\d+$/ } @$ids;
+  Bugzilla->user->visible_bugs(\@int);
+
+  foreach my $bug_id (@$ids) {
+    my $bug;
+    if ($params->{permissive}) {
+      eval { $bug = Bugzilla::Bug->check($bug_id); };
+      if ($@) {
+        push(@faults,
+          {id => $bug_id, faultString => $@->faultstring, faultCode => $@->faultcode,});
+        undef $@;
+        next;
+      }
+    }
+    else {
+      $bug = Bugzilla::Bug->check($bug_id);
+    }
+    push(@bugs, $bug);
+    push(@hashes, $self->_bug_to_hash($bug, $params));
+  }
+
+  # Set the ETag before inserting the update tokens
+  # since the tokens will always be unique even if
+  # the data has not changed.
+  Bugzilla->api_server->etag(\@hashes);
+
+  $self->_add_update_tokens($params, \@bugs, \@hashes);
+
+  return {bugs => \@hashes, faults => \@faults};
+}
+
+# this is a function that gets bug activity for list of bug ids
+# it can be called as the following:
+# $call = $rpc->call( 'Bug.history', { ids => [1,2] });
+sub history {
+  my ($self, $params) = validate(@_, 'ids');
+
+  Bugzilla->switch_to_shadow_db();
+
+  my $ids = $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  my %api_name = reverse %{Bugzilla::Bug::FIELD_MAP()};
+  $api_name{'bug_group'} = 'groups';
+
+  my @return;
+  foreach my $bug_id (@$ids) {
+    my %item;
+    my $bug = Bugzilla::Bug->check($bug_id);
+    $bug_id = $bug->id;
+    $item{id} = as_int($bug_id);
+
+    my ($activity) = $bug->get_activity(undef, $params->{new_since});
+
+    my @history;
+    foreach my $changeset (@$activity) {
+      my %bug_history;
+      $bug_history{when}    = as_datetime($changeset->{when});
+      $bug_history{who}     = as_string($changeset->{who});
+      $bug_history{changes} = [];
+      foreach my $change (@{$changeset->{changes}}) {
+        my $api_field = $api_name{$change->{fieldname}} || $change->{fieldname};
+        my $attach_id = delete $change->{attachid};
+        if ($attach_id) {
+          $change->{attachment_id} = as_int($attach_id);
+        }
+        $change->{removed}    = as_string($change->{removed});
+        $change->{added}      = as_string($change->{added});
+        $change->{field_name} = as_string($api_field);
+        delete $change->{fieldname};
+        push(@{$bug_history{changes}}, $change);
+      }
+
+      push(@history, \%bug_history);
+    }
+
+    $item{history} = \@history;
+
+    # alias is returned in case users passes a mixture of ids and aliases
+    # then they get to know which bug activity relates to which value
+    # they passed
+    $item{alias} = as_string_array($bug->alias);
+
+    push(@return, \%item);
+  }
+
+  return {bugs => \@return};
+}
+
+sub search {
+  my ($self, $params) = @_;
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
+
+  Bugzilla->switch_to_shadow_db();
+
+  my $match_params = dclone($params);
+  delete $match_params->{include_fields};
+  delete $match_params->{exclude_fields};
+
+  # Determine whether this is a quicksearch query
+  if (exists $match_params->{quicksearch}) {
+    my $quicksearch = quicksearch($match_params->{'quicksearch'});
+    my $cgi         = Bugzilla::CGI->new($quicksearch);
+    $match_params = $cgi->Vars;
+  }
+
+  if (defined($match_params->{offset}) and !defined($match_params->{limit})) {
+    ThrowCodeError('param_required',
+      {param => 'limit', function => 'Bug.search()'});
+  }
+
+  my $max_results = Bugzilla->params->{max_search_results};
+  unless (defined $match_params->{limit} && $match_params->{limit} == 0) {
+    if (!defined $match_params->{limit} || $match_params->{limit} > $max_results) {
+      $match_params->{limit} = $max_results;
+    }
+  }
+  else {
+    delete $match_params->{limit};
+    delete $match_params->{offset};
+  }
+
+  $match_params = Bugzilla::Bug::map_fields($match_params);
+
+  my %options = (fields => ['bug_id']);
+
+  # Find the highest custom field id
+  my @field_ids = grep(/^f(\d+)$/a, keys %$match_params);
+  my $last_field_id = @field_ids ? max @field_ids + 1 : 1;
+
+  # Do special search types for certain fields.
+  if (my $change_when = delete $match_params->{'delta_ts'}) {
+    $match_params->{"f${last_field_id}"} = 'delta_ts';
+    $match_params->{"o${last_field_id}"} = 'greaterthaneq';
+    $match_params->{"v${last_field_id}"} = $change_when;
+    $last_field_id++;
+  }
+  if (my $creation_when = delete $match_params->{'creation_ts'}) {
+    $match_params->{"f${last_field_id}"} = 'creation_ts';
+    $match_params->{"o${last_field_id}"} = 'greaterthaneq';
+    $match_params->{"v${last_field_id}"} = $creation_when;
+    $last_field_id++;
+  }
+
+  # Some fields require a search type such as short desc, keywords, etc.
+  foreach my $param (qw(short_desc longdesc status_whiteboard bug_file_loc)) {
+    if (defined $match_params->{$param}
+      && !defined $match_params->{$param . '_type'})
+    {
+      $match_params->{$param . '_type'} = 'allwordssubstr';
+    }
+  }
+  if (defined $match_params->{'keywords'}
+    && !defined $match_params->{'keywords_type'})
+  {
+    $match_params->{'keywords_type'} = 'allwords';
+  }
+
+  # Backwards compatibility with old method regarding role search
+  $match_params->{'reporter'} = delete $match_params->{'creator'}
+    if $match_params->{'creator'};
+  foreach my $role (qw(assigned_to reporter qa_contact longdesc cc)) {
+    next if !exists $match_params->{$role};
+    my $value = delete $match_params->{$role};
+    $match_params->{"f${last_field_id}"} = $role;
+    $match_params->{"o${last_field_id}"} = "anywordssubstr";
+    $match_params->{"v${last_field_id}"}
+      = ref $value ? join(" ", @{$value}) : $value;
+    $last_field_id++;
+  }
+
+  # If no other parameters have been passed other than limit and offset
+  # then we throw error if system is configured to do so.
+  if ( !grep(!/^(limit|offset)$/, keys %$match_params)
+    && !Bugzilla->params->{search_allow_no_criteria})
+  {
+    ThrowUserError('buglist_parameters_required');
+  }
+
+  # Allow the use of order shortcuts similar to web UI
+  if ($match_params->{order}) {
+
+    # Convert the value of the "order" form field into a list of columns
+    # by which to sort the results.
+    my %order_types = (
+      "Bug Number" => ["bug_id"],
+      "Importance" => ["priority", "bug_severity"],
+      "Assignee"   => ["assigned_to", "bug_status", "priority", "bug_id"],
+      "Last Changed" =>
+        ["changeddate", "bug_status", "priority", "assigned_to", "bug_id"],
+    );
+    if ($order_types{$match_params->{order}}) {
+      $options{order} = $order_types{$match_params->{order}};
+    }
+    else {
+      $options{order} = [split(/\s*,\s*/, $match_params->{order})];
+    }
+  }
+
+  $options{params} = $match_params;
+
+  my $search = new Bugzilla::Search(%options);
+  my ($data) = $search->data;
+
+  if (!scalar @$data) {
+    return {bugs => []};
+  }
+
+# Search.pm won't return bugs that the user shouldn't see so no filtering is needed.
+  my @bug_ids = map { $_->[0] } @$data;
+  my %bug_objects
+    = map { $_->id => $_ } @{Bugzilla::Bug->new_from_list(\@bug_ids)};
+  my @bugs = map { $bug_objects{$_} } @bug_ids;
+  @bugs = map { $self->_bug_to_hash($_, $params) } @bugs;
+
+  return {bugs => \@bugs};
+}
+
+sub possible_duplicates {
+  my ($self, $params) = validate(@_, 'products');
+  my $user = Bugzilla->user;
+
+  Bugzilla->switch_to_shadow_db();
+
+  # Undo the array-ification that validate() does, for "summary".
+  $params->{summary}
+    || ThrowCodeError('param_required',
+    {function => 'Bug.possible_duplicates', param => 'summary'});
+
+  my @products;
+  foreach my $name (@{$params->{'products'} || []}) {
+    my $object = $user->can_enter_product($name, THROW_ERROR);
+    push(@products, $object);
+  }
+
+  my $possible_dupes = Bugzilla::Bug->possible_duplicates({
+    summary  => $params->{summary},
+    products => \@products,
+    limit    => $params->{limit}
+  });
+  my @hashes = map { $self->_bug_to_hash($_, $params) } @$possible_dupes;
+  $self->_add_update_tokens($params, $possible_dupes, \@hashes);
+  return {bugs => \@hashes};
+}
+
+sub update {
+  my ($self, $params) = validate(@_, 'ids');
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  my $dbh  = Bugzilla->dbh;
+
+  # We skip certain fields because their set_ methods actually use
+  # the external names instead of the internal names.
+  $params = Bugzilla::Bug::map_fields($params,
+    {summary => 1, platform => 1, severity => 1, url => 1});
+
+  my $ids = delete $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  my @bugs = map { Bugzilla::Bug->check_for_edit($_) } @$ids;
+
+  my %values = %$params;
+  $values{other_bugs} = \@bugs;
+
+  if (exists $values{comment} and exists $values{comment}{comment}) {
+    $values{comment}{body} = delete $values{comment}{comment};
+  }
+
+  # Prevent bugs that could be triggered by specifying fields that
+  # have valid "set_" functions in Bugzilla::Bug, but shouldn't be
+  # called using those field names.
+  delete $values{dependencies};
+
+  # For backwards compatibility, treat alias string or array as a set action
+  if (exists $values{alias}) {
+    if (not ref $values{alias}) {
+      $values{alias} = {set => [$values{alias}]};
+    }
+    elsif (ref $values{alias} eq 'ARRAY') {
+      $values{alias} = {set => $values{alias}};
+    }
+  }
+
+  my $flags = delete $values{flags};
+
+  foreach my $bug (@bugs) {
+    $bug->set_all(\%values);
+    if ($flags) {
+      my ($old_flags, $new_flags)
+        = extract_flags($flags, $bug->flag_types, $bug->flags);
+      $bug->set_flags($old_flags, $new_flags);
+    }
+  }
+
+  my %all_changes;
+  $dbh->bz_start_transaction();
+  foreach my $bug (@bugs) {
+    $all_changes{$bug->id} = $bug->update();
+  }
+  $dbh->bz_commit_transaction();
+
+  foreach my $bug (@bugs) {
+    $bug->send_changes($all_changes{$bug->id});
+  }
+
+  my %api_name = reverse %{Bugzilla::Bug::FIELD_MAP()};
+
+  # This doesn't normally belong in FIELD_MAP, but we do want to translate
+  # "bug_group" back into "groups".
+  $api_name{'bug_group'} = 'groups';
+
+  my @result;
+  foreach my $bug (@bugs) {
+    my %hash = (
+      id               => as_int($bug->id),
+      last_change_time => as_datetime($bug->delta_ts),
+      changes          => {},
+    );
+
+    # alias is returned in case users pass a mixture of ids and aliases,
+    # so that they can know which set of changes relates to which value
+    # they passed.
+    $hash{alias} = as_string_array($bug->alias);
+
+    my %changes = %{$all_changes{$bug->id}};
+    foreach my $field (keys %changes) {
+      my $change = $changes{$field};
+      my $api_field = $api_name{$field} || $field;
+
+      # We normalize undef to an empty string, so that the API
+      # stays consistent for things like Deadline that can become
+      # empty.
+      $change->[0] = '' if !defined $change->[0];
+      $change->[1] = '' if !defined $change->[1];
+      $hash{changes}->{$api_field}
+        = {removed => as_string($change->[0]), added => as_string($change->[1])};
+    }
+
+    push(@result, \%hash);
+  }
+
+  return {bugs => \@result};
+}
+
+sub create {
+  my ($self, $params) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+
+  $params = Bugzilla::Bug::map_fields($params);
+
+  my $flags = delete $params->{flags};
+
+  if ($flags) {
+    my $product = Bugzilla::Product->check($params->{product});
+    my $component
+      = Bugzilla::Component->check({
+      product => $product, name => $params->{component}
+      });
+    my $flag_types
+      = Bugzilla::FlagType::match({
+      product_id => $product->id, component_id => $component->id, is_active => 1,
+      });
+
+    my (undef, $new_flags) = extract_flags($flags, $flag_types);
+
+    $params->{flags} = $new_flags;
+  }
+
+  # We start a nested transaction in case flag setting fails
+  # we want the bug creation to roll back as well.
+  $dbh->bz_start_transaction();
+
+  my $bug = Bugzilla::Bug->create($params);
+
+  $dbh->bz_commit_transaction();
+
+  $bug->send_changes();
+
+  return {id => as_int($bug->bug_id)};
+}
+
+sub legal_values {
+  my ($self, $params) = @_;
+
+  Bugzilla->switch_to_shadow_db();
+
+  defined $params->{field}
+    or ThrowCodeError('param_required', {param => 'field'});
+
+  my $field = Bugzilla::Bug::FIELD_MAP->{$params->{field}} || $params->{field};
+
+  my @global_selects = @{Bugzilla->fields({is_select => 1, is_abnormal => 0})};
+
+  my $values;
+  if (grep($_->name eq $field, @global_selects)) {
+
+    # The field is a valid one.
+    trick_taint($field);
+    $values = get_legal_field_values($field);
+  }
+  elsif (grep($_ eq $field, PRODUCT_SPECIFIC_FIELDS)) {
+    my $id = $params->{product_id};
+    defined $id
+      || ThrowCodeError('param_required',
+      {function => 'Bug.legal_values', param => 'product_id'});
+    grep($_->id eq $id, @{Bugzilla->user->get_accessible_products})
+      || ThrowUserError('product_access_denied', {id => $id});
+
+    my $product = new Bugzilla::Product($id);
+    my @objects;
+    if ($field eq 'version') {
+      @objects = @{$product->versions};
+    }
+    elsif ($field eq 'target_milestone') {
+      @objects = @{$product->milestones};
+    }
+    elsif ($field eq 'component') {
+      @objects = @{$product->components};
+    }
+
+    $values = [map { $_->name } @objects];
+  }
+  else {
+    ThrowCodeError('invalid_field_name', {field => $params->{field}});
+  }
+
+  my @result;
+  foreach my $val (@$values) {
+    push(@result, as_string($val));
+  }
+
+  return {values => \@result};
+}
+
+sub add_attachment {
+  my ($self, $params) = validate(@_, 'ids');
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  defined $params->{ids}  || ThrowCodeError('param_required', {param => 'ids'});
+  defined $params->{data} || ThrowCodeError('param_required', {param => 'data'});
+
+  my @bugs = map { Bugzilla::Bug->check_for_edit($_) } @{$params->{ids}};
+
+  my @created;
+  $dbh->bz_start_transaction();
+  my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+
+  my $flags = delete $params->{flags};
+
+  foreach my $bug (@bugs) {
+    my $attachment = Bugzilla::Attachment->create({
+      bug         => $bug,
+      creation_ts => $timestamp,
+      data        => $params->{data},
+      description => $params->{summary},
+      filename    => $params->{file_name},
+      mimetype    => $params->{content_type},
+      ispatch     => $params->{is_patch},
+      isprivate   => $params->{is_private},
+    });
+
+    if ($flags) {
+      my ($old_flags, $new_flags)
+        = extract_flags($flags, $attachment->flag_types, $attachment->flags);
+      $attachment->set_flags($old_flags, $new_flags);
+    }
+
+    $attachment->update($timestamp);
+    my $comment = $params->{comment} || '';
+
+    my $is_markdown = 0;
+    if (ref $params->{comment} eq 'HASH') {
+      $is_markdown = $params->{comment}->{is_markdown};
+      $comment     = $params->{comment}->{body};
+    }
+
+    ThrowUserError('markdown_disabled')
+      if $is_markdown && !Bugzilla->user->use_markdown();
+
+    $attachment->bug->add_comment(
+      $comment,
+      {
+        is_markdown => $is_markdown,
+        isprivate   => $attachment->isprivate,
+        type        => CMT_ATTACHMENT_CREATED,
+        extra_data  => $attachment->id
+      }
+    );
+    push(@created, $attachment);
+  }
+  $_->bug->update($timestamp) foreach @created;
+  $dbh->bz_commit_transaction();
+
+  $_->send_changes() foreach @bugs;
+
+  my @created_ids = map { $_->id } @created;
+
+  return {ids => \@created_ids};
+}
+
+sub update_attachment {
+  my ($self, $params) = validate(@_, 'ids');
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  my $dbh  = Bugzilla->dbh;
+
+  my $ids = delete $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  # Some fields cannot be sent to set_all
+  foreach my $key (qw(login password token)) {
+    delete $params->{$key};
+  }
+
+  $params = translate($params, ATTACHMENT_MAPPED_SETTERS);
+
+  # Get all the attachments, after verifying that they exist and are editable
+  my @attachments = ();
+  my %bugs        = ();
+  foreach my $id (@$ids) {
+    my $attachment = Bugzilla::Attachment->new($id)
+      || ThrowUserError("invalid_attach_id", {attach_id => $id});
+    my $bug = $attachment->bug;
+    $attachment->_check_bug;
+
+    push @attachments, $attachment;
+    $bugs{$bug->id} = $bug;
+  }
+
+  my $flags       = delete $params->{flags};
+  my $comment     = delete $params->{comment};
+  my $is_markdown = 0;
+
+  if (ref $comment eq 'HASH') {
+    $is_markdown = $comment->{is_markdown};
+    $comment     = $comment->{body};
+  }
+
+  ThrowUserError('markdown_disabled') if $is_markdown && !$user->use_markdown();
+
+  # Update the values
+  foreach my $attachment (@attachments) {
+    my ($update_flags, $new_flags)
+      = $flags
+      ? extract_flags($flags, $attachment->flag_types, $attachment->flags)
+      : ([], []);
+    if ($attachment->validate_can_edit) {
+      $attachment->set_all($params);
+      $attachment->set_flags($update_flags, $new_flags) if $flags;
+    }
+    elsif (scalar @$update_flags && !scalar(@$new_flags) && !scalar keys %$params) {
+
+      # Requestees can set flags targeted to them, even if they cannot
+      # edit the attachment. Flag setters can edit their own flags too.
+      my %flag_list = map { $_->{id} => $_ } @$update_flags;
+      my $flag_objs = Bugzilla::Flag->new_from_list([keys %flag_list]);
+      my @editable_flags;
+      foreach my $flag_obj (@$flag_objs) {
+        if ($flag_obj->setter_id == $user->id
+          || ($flag_obj->requestee_id && $flag_obj->requestee_id == $user->id))
+        {
+          push(@editable_flags, $flag_list{$flag_obj->id});
+        }
+      }
+      if (!scalar @editable_flags) {
+        ThrowUserError("illegal_attachment_edit", {attach_id => $attachment->id});
+      }
+      $attachment->set_flags(\@editable_flags, []);
+    }
+    else {
+      ThrowUserError("illegal_attachment_edit", {attach_id => $attachment->id});
+    }
+  }
+
+  $dbh->bz_start_transaction();
+
+  # Do the actual update and get information to return to user
+  my @result;
+  foreach my $attachment (@attachments) {
+    my $changes = $attachment->update();
+
+    if ($comment = trim($comment)) {
+      $attachment->bug->add_comment(
+        $comment,
+        {
+          is_markdown => $is_markdown,
+          isprivate   => $attachment->isprivate,
+          type        => CMT_ATTACHMENT_UPDATED,
+          extra_data  => $attachment->id
+        }
+      );
+    }
+
+    $changes = translate($changes, ATTACHMENT_MAPPED_RETURNS);
+
+    my %hash = (
+      id               => as_int($attachment->id),
+      last_change_time => as_datetime($attachment->modification_time),
+      changes          => {},
+    );
+
+    foreach my $field (keys %$changes) {
+      my $change = $changes->{$field};
+
+      # We normalize undef to an empty string, so that the API
+      # stays consistent for things like Deadline that can become
+      # empty.
+      $hash{changes}->{$field} = {
+        removed => as_string($change->[0] // ''),
+        added   => as_string($change->[1] // '')
+      };
+    }
+
+    push(@result, \%hash);
+  }
+
+  $dbh->bz_commit_transaction();
+
+  # Email users about the change
+  foreach my $bug (values %bugs) {
+    $bug->update();
+    $bug->send_changes();
+  }
+
+  # Return the information to the user
+  return {attachments => \@result};
+}
+
+sub add_comment {
+  my ($self, $params) = @_;
+
+  # The user must login in order add a comment
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  # Check parameters
+  defined $params->{id} || ThrowCodeError('param_required', {param => 'id'});
+  my $comment = $params->{comment};
+  (defined $comment && trim($comment) ne '')
+    || ThrowCodeError('param_required', {param => 'comment'});
+
+  my $bug = Bugzilla::Bug->check_for_edit($params->{id});
+
+  # Backwards-compatibility for versions before 3.6
+  if (defined $params->{private}) {
+    $params->{is_private} = delete $params->{private};
+  }
+
+  ThrowUserError('markdown_disabled')
+    if $params->{is_markdown} && !$user->use_markdown();
+
+  # Append comment
+  $bug->add_comment(
+    $comment,
+    {
+      isprivate   => $params->{is_private},
+      is_markdown => $params->{is_markdown},
+      work_time   => $params->{work_time}
+    }
+  );
+
+  # Add comment tags
+  $bug->set_all({comment_tags => $params->{comment_tags}})
+    if defined $params->{comment_tags};
+
+  $bug->update();
+
+  my $new_comment_id = $bug->{added_comments}[0]->id;
+
+  # Send mail.
+  Bugzilla::BugMail::Send($bug->bug_id, {changer => $user});
+
+  return {id => as_int($new_comment_id)};
+}
+
+sub update_see_also {
+  my ($self, $params) = @_;
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  # Check parameters
+  $params->{ids} || ThrowCodeError('param_required', {param => 'id'});
+  my ($add, $remove) = @$params{qw(add remove)};
+  ($add || $remove)
+    or ThrowCodeError('params_required', {params => ['add', 'remove']});
+
+  my @bugs;
+  foreach my $id (@{$params->{ids}}) {
+    my $bug = Bugzilla::Bug->check_for_edit($id);
+    push(@bugs, $bug);
+    if ($remove) {
+      $bug->remove_see_also($_) foreach @$remove;
+    }
+    if ($add) {
+      $bug->add_see_also($_) foreach @$add;
+    }
+  }
+
+  my %changes;
+  foreach my $bug (@bugs) {
+    my $change = $bug->update();
+    if (my $see_also = $change->{see_also}) {
+      $changes{$bug->id}->{see_also} = {
+        removed => [split(', ', $see_also->[0])],
+        added   => [split(', ', $see_also->[1])],
+      };
+    }
+    else {
+      # We still want a changes entry, for API consistency.
+      $changes{$bug->id}->{see_also} = {added => [], removed => []};
+    }
+
+    Bugzilla::BugMail::Send($bug->id, {changer => $user});
+  }
+
+  return {changes => \%changes};
+}
+
+sub attachments {
+  my ($self, $params) = validate(@_, 'ids', 'attachment_ids');
+
+  Bugzilla->switch_to_shadow_db() unless Bugzilla->user->id;
+
+  if (!(defined $params->{ids} or defined $params->{attachment_ids})) {
+    ThrowCodeError('param_required',
+      {function => 'Bug.attachments', params => ['ids', 'attachment_ids']});
+  }
+
+  my $ids        = $params->{ids}            || [];
+  my $attach_ids = $params->{attachment_ids} || [];
+
+  my %bugs;
+  foreach my $bug_id (@$ids) {
+    my $bug = Bugzilla::Bug->check($bug_id);
+    $bugs{$bug->id} = [];
+    foreach my $attach (@{$bug->attachments}) {
+      push @{$bugs{$bug->id}}, $self->_attachment_to_hash($attach, $params);
+    }
+  }
+
+  my %attachments;
+  foreach my $attach (@{Bugzilla::Attachment->new_from_list($attach_ids)}) {
+    Bugzilla::Bug->check($attach->bug_id);
+    if ($attach->isprivate && !Bugzilla->user->is_insider) {
+      ThrowUserError('auth_failure',
+        {action => 'access', object => 'attachment', attach_id => $attach->id});
+    }
+    $attachments{$attach->id} = $self->_attachment_to_hash($attach, $params);
+  }
+
+  return {bugs => \%bugs, attachments => \%attachments};
+}
+
+sub update_tags {
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+
+  my $ids  = $params->{ids};
+  my $tags = $params->{tags};
+
+  ThrowCodeError('param_required',
+    {function => 'Bug.update_tags', param => 'ids'})
+    if !defined $ids;
+
+  ThrowCodeError('param_required',
+    {function => 'Bug.update_tags', param => 'tags'})
+    if !defined $tags;
+
+  my %changes;
+  foreach my $bug_id (@$ids) {
+    my $bug      = Bugzilla::Bug->check($bug_id);
+    my @old_tags = @{$bug->tags};
+
+    $bug->remove_tag($_) foreach @{$tags->{remove} || []};
+    $bug->add_tag($_)    foreach @{$tags->{add}    || []};
+
+    my ($removed, $added) = diff_arrays(\@old_tags, $bug->tags);
+
+    $removed = as_string_array($removed);
+    $added   = as_string_array($added);
+
+    $changes{$bug->id}->{tags} = {removed => $removed, added => $added};
+  }
+
+  return {changes => \%changes};
+}
+
+sub update_comment_tags {
+  my ($self, $params) = @_;
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->params->{'comment_taggers_group'}
+    || ThrowUserError("comment_tag_disabled");
+  $user->can_tag_comments || ThrowUserError(
+    "auth_failure",
+    {
+      group  => Bugzilla->params->{'comment_taggers_group'},
+      action => "update",
+      object => "comment_tags"
+    }
+  );
+
+  my $comment_id = $params->{comment_id} // ThrowCodeError('param_required',
+    {function => 'Bug.update_comment_tags', param => 'comment_id'});
+
+  ThrowCodeError('param_integer_required',
+    {function => 'Bug.update_comment_tags', param => 'comment_id'})
+    unless $comment_id =~ /^\d+$/a;
+
+  my $comment = Bugzilla::Comment->new($comment_id) || return [];
+  $comment->bug->check_is_visible();
+  if ($comment->is_private && !$user->is_insider) {
+    ThrowUserError('comment_is_private', {id => $comment_id});
+  }
+
+  my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  foreach my $tag (@{$params->{add} || []}) {
+    $comment->add_tag($tag) if defined $tag;
+  }
+  foreach my $tag (@{$params->{remove} || []}) {
+    $comment->remove_tag($tag) if defined $tag;
+  }
+  $comment->update();
+  $dbh->bz_commit_transaction();
+
+  return $comment->tags;
+}
+
+sub search_comment_tags {
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->params->{'comment_taggers_group'}
+    || ThrowUserError("comment_tag_disabled");
+  Bugzilla->user->can_tag_comments || ThrowUserError(
+    "auth_failure",
+    {
+      group  => Bugzilla->params->{'comment_taggers_group'},
+      action => "search",
+      object => "comment_tags"
+    }
+  );
+
+  my $query = $params->{query};
+  $query // ThrowCodeError('param_required', {param => 'query'});
+  my $limit = $params->{limit} || 7;
+  detaint_natural($limit)
+    || ThrowCodeError('param_must_be_numeric',
+    {param => 'limit', function => 'Bug.search_comment_tags'});
+
+
+  my $tags
+    = Bugzilla::Comment::TagWeights->match({
+    WHERE => {'tag LIKE ?' => "\%$query\%",}, LIMIT => $limit,
+    });
+  return [map { $_->tag } @$tags];
+}
+
+##############################
+# Private Helper Subroutines #
+##############################
+
+# A helper for get() and search(). This is done in this fashion in order
+# to produce a stable API and to explicitly type return values.
+# The internals of Bugzilla::Bug are not stable enough to just
+# return them directly.
+
+sub _bug_to_hash {
+  my ($self, $bug, $params) = @_;
+
+  # All the basic bug attributes are here, in alphabetical order.
+  # A bug attribute is "basic" if it doesn't require an additional
+  # database call to get the info.
+  my %item = %{filter $params,
+    {
+      # No need to format $bug->deadline specially, because Bugzilla::Bug
+      # already does it for us.
+      deadline         => as_string($bug->deadline),
+      id               => as_int($bug->bug_id),
+      is_confirmed     => as_boolean($bug->everconfirmed),
+      op_sys           => as_string($bug->op_sys),
+      platform         => as_string($bug->rep_platform),
+      priority         => as_string($bug->priority),
+      resolution       => as_string($bug->resolution),
+      severity         => as_string($bug->bug_severity),
+      status           => as_string($bug->bug_status),
+      summary          => as_string($bug->short_desc),
+      target_milestone => as_string($bug->target_milestone),
+      url              => as_string($bug->bug_file_loc),
+      version          => as_string($bug->version),
+      whiteboard       => as_string($bug->status_whiteboard),
+    }
+  };
+
+  # First we handle any fields that require extra work (such as date parsing
+  # or SQL calls).
+  if (filter_wants $params, 'alias') {
+    $item{alias} = as_string_array($bug->alias);
+  }
+  if (filter_wants $params, 'assigned_to') {
+    $item{'assigned_to'} = as_login($bug->assigned_to->login);
+    $item{'assigned_to_detail'}
+      = $self->_user_to_hash($bug->assigned_to, $params, undef, 'assigned_to');
+  }
+  if (filter_wants $params, 'blocks') {
+    $item{'blocks'} = as_int_array($bug->blocked);
+  }
+  if (filter_wants $params, 'classification') {
+    $item{classification} = as_string($bug->classification);
+  }
+  if (filter_wants $params, 'component') {
+    $item{component} = as_string($bug->component);
+  }
+  if (filter_wants $params, 'cc') {
+    $item{'cc'} = as_login_array($bug->cc);
+    $item{'cc_detail'}
+      = [map { $self->_user_to_hash($_, $params, undef, 'cc') } @{$bug->cc_users}];
+  }
+  if (filter_wants $params, 'creation_time') {
+    $item{'creation_time'} = as_datetime($bug->creation_ts);
+  }
+  if (filter_wants $params, 'creator') {
+    $item{'creator'} = as_login($bug->reporter->login);
+    $item{'creator_detail'}
+      = $self->_user_to_hash($bug->reporter, $params, undef, 'creator');
+  }
+  if (filter_wants $params, 'depends_on') {
+    $item{'depends_on'} = as_int_array($bug->dependson);
+  }
+  if (filter_wants $params, 'dupe_of') {
+    $item{'dupe_of'} = as_int($bug->dup_id);
+  }
+  if (filter_wants $params, 'groups') {
+    $item{'groups'} = as_name_array($bug->groups_in);
+  }
+  if (filter_wants $params, 'is_open') {
+    $item{'is_open'} = as_boolean($bug->status->is_open);
+  }
+  if (filter_wants $params, 'keywords') {
+    $item{'keywords'} = as_name_array($bug->keyword_objects);
+  }
+  if (filter_wants $params, 'last_change_time') {
+    $item{'last_change_time'} = as_datetime($bug->delta_ts);
+  }
+  if (filter_wants $params, 'product') {
+    $item{product} = as_string($bug->product);
+  }
+  if (filter_wants $params, 'qa_contact') {
+    my $qa_login = $bug->qa_contact ? $bug->qa_contact->login : '';
+    $item{'qa_contact'} = as_login($qa_login);
+    if ($bug->qa_contact) {
+      $item{'qa_contact_detail'}
+        = $self->_user_to_hash($bug->qa_contact, $params, undef, 'qa_contact');
+    }
+  }
+  if (filter_wants $params, 'see_also') {
+    $item{'see_also'} = as_name_array($bug->see_also);
+  }
+  if (filter_wants $params, 'flags') {
+    $item{'flags'} = [map { $self->_flag_to_hash($_) } @{$bug->flags}];
+  }
+  if (filter_wants $params, 'tags', 'extra') {
+    $item{'tags'} = $bug->tags;
+  }
+  if (filter_wants $params, 'duplicates', 'extra') {
+    $item{'duplicates'} = [map { as_int($_->id) } @{$bug->duplicates}];
+  }
+
+  # And now custom fields
+  my @custom_fields = Bugzilla->active_custom_fields;
+  foreach my $field (@custom_fields) {
+    my $name = $field->name;
+    next if !filter_wants($params, $name, ['default', 'custom']);
+    if ($field->type == FIELD_TYPE_BUG_ID) {
+      $item{$name} = as_int($bug->$name);
+    }
+    elsif ($field->type == FIELD_TYPE_DATETIME || $field->type == FIELD_TYPE_DATE) {
+      $item{$name} = as_datetime($bug->$name);
+    }
+    elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
+      $item{$name} = as_string_array($bug->$name);
+    }
+    else {
+      $item{$name} = as_string($bug->$name);
+    }
+  }
+
+  # Timetracking fields are only sent if the user can see them.
+  if (Bugzilla->user->is_timetracker) {
+    if (filter_wants $params, 'estimated_time') {
+      $item{'estimated_time'} = as_double($bug->estimated_time);
+    }
+    if (filter_wants $params, 'remaining_time') {
+      $item{'remaining_time'} = as_double($bug->remaining_time);
+    }
+    if (filter_wants $params, 'actual_time') {
+      $item{'actual_time'} = as_double($bug->actual_time);
+    }
+  }
+
+  # The "accessible" bits go here because they have long names and it
+  # makes the code look nicer to separate them out.
+  if (filter_wants $params, 'is_cc_accessible') {
+    $item{'is_cc_accessible'} = as_boolean($bug->cclist_accessible);
+  }
+  if (filter_wants $params, 'is_creator_accessible') {
+    $item{'is_creator_accessible'} = as_boolean($bug->reporter_accessible);
+  }
+
+  return \%item;
+}
+
+sub _user_to_hash {
+  my ($self, $user, $filters, $types, $prefix) = @_;
+  my $item = filter $filters,
+    {
+    id        => as_int($user->id),
+    real_name => as_string($user->name),
+    name      => as_login($user->login),
+    },
+    $types, $prefix;
+  return $item;
+}
+
+sub _attachment_to_hash {
+  my ($self, $attach, $filters, $types, $prefix) = @_;
+
+  my $item = filter $filters,
+    {
+    creation_time    => as_datetime($attach->attached),
+    last_change_time => as_datetime($attach->modification_time),
+    id               => as_int($attach->id),
+    bug_id           => as_int($attach->bug_id),
+    file_name        => as_string($attach->filename),
+    summary          => as_string($attach->description),
+    content_type     => as_string($attach->contenttype),
+    is_private       => as_boolean($attach->isprivate),
+    is_obsolete      => as_boolean($attach->isobsolete),
+    is_patch         => as_boolean($attach->ispatch),
+    },
+    $types, $prefix;
+
+  # creator requires an extra lookup, so we only send them if
+  # the filter wants them.
+  if (filter_wants $filters, 'creator', $types, $prefix) {
+    $item->{'creator'} = as_login($attach->attacher->login);
+  }
+
+  if (filter_wants $filters, 'data', $types, $prefix) {
+    $item->{'data'} = as_base64($attach->data);
+  }
+
+  if (filter_wants $filters, 'size', $types, $prefix) {
+    $item->{'size'} = as_int($attach->datasize);
+  }
+
+  if (filter_wants $filters, 'flags', $types, $prefix) {
+    $item->{'flags'} = [map { $self->_flag_to_hash($_) } @{$attach->flags}];
+  }
+
+  return $item;
+}
+
+sub _flag_to_hash {
+  my ($self, $flag) = @_;
+
+  my $item = {
+    id                => as_int($flag->id),
+    name              => as_string($flag->name),
+    type_id           => as_int($flag->type_id),
+    creation_date     => as_datetime($flag->creation_date),
+    modification_date => as_datetime($flag->modification_date),
+    status            => as_string($flag->status)
+  };
+
+  foreach my $field (qw(setter requestee)) {
+    my $field_id = $field . "_id";
+    $item->{$field} = as_login($flag->$field->login) if $flag->$field_id;
+  }
+
+  return $item;
+}
+
+sub _add_update_tokens {
+  my ($self, $params, $bugs, $hashes) = @_;
+
+  return if !Bugzilla->user->id;
+  return if !filter_wants($params, 'update_token');
+
+  for (my $i = 0; $i < @$bugs; $i++) {
+    my $token = issue_hash_token([$bugs->[$i]->id, $bugs->[$i]->delta_ts]);
+    $hashes->[$i]->{'update_token'} = as_string($token);
+  }
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::Bug - The API for creating, changing, and getting the
+details of bugs.
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to file a new bug in Bugzilla,
+or get information about bugs that have already been filed.
+
+=head1 USAGE
+
+Full documentation on how to use the Bugzilla API can be found at
+L<https://bugzilla.readthedocs.org/en/latest/api/core/v1/bug.html>.
+
+=head1 METHODS
+
+=head2 fields
+
+=over
+
+=item B<Description>
+
+Get information about valid bug fields, including the lists of legal values
+for each field.
+
+=item B<REST>
+
+You have several options for retrieving information about fields. The first
+part is the request method and the rest is the related path needed.
+
+To get information about all fields:
+
+GET /rest/field/bug
+
+To get information related to a single field:
+
+GET /rest/field/bug/<id_or_name>
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+You can pass either field ids or field names.
+
+B<Note>: If neither C<ids> nor C<names> is specified, then all
+non-obsolete fields will be returned.
+
+In addition to the parameters below, this method also accepts the
+standard L<include_fields|Bugzilla::API::1_0::Resource/include_fields> and
+L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+=over
+
+=item C<ids>   (array) - An array of integer field ids.
+
+=item C<names> (array) - An array of strings representing field names.
+
+=back
+
+=item B<Returns>
+
+A hash containing a single element, C<fields>. This is an array of hashes,
+containing the following keys:
+
+=over
+
+=item C<id>
+
+C<int> An integer id uniquely identifying this field in this installation only.
+
+=item C<type>
+
+C<int> The number of the fieldtype. The following values are defined:
+
+=over
+
+=item C<0> Unknown
+
+=item C<1> Free Text
+
+=item C<2> Drop Down
+
+=item C<3> Multiple-Selection Box
+
+=item C<4> Large Text Box
+
+=item C<5> Date/Time
+
+=item C<6> Bug Id
+
+=item C<7> Bug URLs ("See Also")
+
+=item C<8> Keywords
+
+=item C<9> Date
+
+=item C<10> Integer value
+
+=back
+
+=item C<is_custom>
+
+C<boolean> True when this is a custom field, false otherwise.
+
+=item C<name>
+
+C<string> The internal name of this field. This is a unique identifier for
+this field. If this is not a custom field, then this name will be the same
+across all Bugzilla installations.
+
+=item C<display_name>
+
+C<string> The name of the field, as it is shown in the user interface.
+
+=item C<is_mandatory>
+
+C<boolean> True if the field must have a value when filing new bugs.
+Also, mandatory fields cannot have their value cleared when updating
+bugs.
+
+=item C<is_on_bug_entry>
+
+C<boolean> For custom fields, this is true if the field is shown when you
+enter a new bug. For standard fields, this is currently always false,
+even if the field shows up when entering a bug. (To know whether or not
+a standard field is valid on bug entry, see L</create>.)
+
+=item C<visibility_field>
+
+C<string>  The name of a field that controls the visibility of this field
+in the user interface. This field only appears in the user interface when
+the named field is equal to one of the values in C<visibility_values>.
+Can be null.
+
+=item C<visibility_values>
+
+C<array> of C<string>s This field is only shown when C<visibility_field>
+matches one of these values. When C<visibility_field> is null,
+then this is an empty array.
+
+=item C<value_field>
+
+C<string>  The name of the field that controls whether or not particular
+values of the field are shown in the user interface. Can be null.
+
+=item C<values>
+
+This is an array of hashes, representing the legal values for
+select-type (drop-down and multiple-selection) fields. This is also
+populated for the C<component>, C<version>, C<target_milestone>, and C<keywords>
+fields, but not for the C<product> field (you must use
+L<Product.get_accessible_products|Bugzilla::API::1_0::Resource::Product/get_accessible_products>
+for that.
+
+For fields that aren't select-type fields, this will simply be an empty
+array.
+
+Each hash has the following keys:
+
+=over
+
+=item C<name>
+
+C<string> The actual value--this is what you would specify for this
+field in L</create>, etc.
+
+=item C<sort_key>
+
+C<int> Values, when displayed in a list, are sorted first by this integer
+and then secondly by their name.
+
+=item C<sortkey>
+
+B<DEPRECATED> - Use C<sort_key> instead.
+
+=item C<visibility_values>
+
+If C<value_field> is defined for this field, then this value is only shown
+if the C<value_field> is set to one of the values listed in this array.
+Note that for per-product fields, C<value_field> is set to C<'product'>
+and C<visibility_values> will reflect which product(s) this value appears in.
+
+=item C<is_active>
+
+C<boolean> This value is defined only for certain product specific fields
+such as version, target_milestone or component. When true, the value is active,
+otherwise the value is not active.
+
+=item C<description>
+
+C<string> The description of the value. This item is only included for the
+C<keywords> field.
+
+=item C<is_open>
+
+C<boolean> For C<bug_status> values, determines whether this status
+specifies that the bug is "open" (true) or "closed" (false). This item
+is only included for the C<bug_status> field.
+
+=item C<can_change_to>
+
+For C<bug_status> values, this is an array of hashes that determines which
+statuses you can transition to from this status. (This item is only included
+for the C<bug_status> field.)
+
+Each hash contains the following items:
+
+=over
+
+=item C<name>
+
+the name of the new status
+
+=item C<comment_required>
+
+this C<boolean> True if a comment is required when you change a bug into
+this status using this transition.
+
+=back
+
+=back
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (Invalid Field Name or Id)
+
+You specified an invalid field name or id.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.6>.
+
+=item The C<is_mandatory> return value was added in Bugzilla B<4.0>.
+
+=item C<sortkey> was renamed to C<sort_key> in Bugzilla B<4.2>.
+
+=item C<is_active> return key for C<values> was added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>
+
+=back
+
+=back
+
+=head2 legal_values
+
+B<DEPRECATED> - Use L</fields> instead.
+
+=over
+
+=item B<Description>
+
+Tells you what values are allowed for a particular field.
+
+=item B<REST>
+
+To get information on the values for a field based on field name:
+
+GET /rest/field/bug/<field_name>/values
+
+To get information based on field name and a specific product:
+
+GET /rest/field/bug/<field_name>/<product_id>/values
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+=over
+
+=item C<field> - The name of the field you want information about.
+This should be the same as the name you would use in L</create>, below.
+
+=item C<product_id> - If you're picking a product-specific field, you have
+to specify the id of the product you want the values for.
+
+=back
+
+=item B<Returns>
+
+C<values> - An array of strings: the legal values for this field.
+The values will be sorted as they normally would be in Bugzilla.
+
+=item B<Errors>
+
+=over
+
+=item 106 (Invalid Product)
+
+You were required to specify a product, and either you didn't, or you
+specified an invalid product (or a product that you can't access).
+
+=item 108 (Invalid Field Name)
+
+You specified a field that doesn't exist or isn't a drop-down field.
+
+=back
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 Bug Information
+
+=head2 attachments
+
+=over
+
+=item B<Description>
+
+It allows you to get data about attachments, given a list of bugs
+and/or attachment ids.
+
+B<Note>: Private attachments will only be returned if you are in the
+insidergroup or if you are the submitter of the attachment.
+
+=item B<REST>
+
+To get all current attachments for a bug:
+
+GET /rest/bug/<bug_id>/attachment
+
+To get a specific attachment based on attachment ID:
+
+GET /rest/bug/attachment/<attachment_id>
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+B<Note>: At least one of C<ids> or C<attachment_ids> is required.
+
+=over
+
+=item C<ids>
+
+See the description of the C<ids> parameter in the L</get> method.
+
+=item C<attachment_ids>
+
+C<array> An array of integer attachment ids.
+
+=back
+
+Also accepts the L<include_fields|Bugzilla::API::1_0::Resource/include_fields>,
+and L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+=item B<Returns>
+
+A hash containing two elements: C<bugs> and C<attachments>. The return
+value looks like this:
+
+ {
+     bugs => {
+         1345 => [
+             { (attachment) },
+             { (attachment) }
+         ],
+         9874 => [
+             { (attachment) },
+             { (attachment) }
+         ],
+     },
+
+     attachments => {
+         234 => { (attachment) },
+         123 => { (attachment) },
+     }
+ }
+
+The attachments of any bugs that you specified in the C<ids> argument in
+input are returned in C<bugs> on output. C<bugs> is a hash that has integer
+bug IDs for keys and the values are arrayrefs that contain hashes as attachments.
+(Fields for attachments are described below.)
+
+For any attachments that you specified directly in C<attachment_ids>, they
+are returned in C<attachments> on output. This is a hash where the attachment
+ids point directly to hashes describing the individual attachment.
+
+The fields for each attachment (where it says C<(attachment)> in the
+diagram above) are:
+
+=over
+
+=item C<data>
+
+C<base64> The raw data of the attachment, encoded as Base64.
+
+=item C<size>
+
+C<int> The length (in bytes) of the attachment.
+
+=item C<creation_time>
+
+C<dateTime> The time the attachment was created.
+
+=item C<last_change_time>
+
+C<dateTime> The last time the attachment was modified.
+
+=item C<id>
+
+C<int> The numeric id of the attachment.
+
+=item C<bug_id>
+
+C<int> The numeric id of the bug that the attachment is attached to.
+
+=item C<file_name>
+
+C<string> The file name of the attachment.
+
+=item C<summary>
+
+C<string> A short string describing the attachment.
+
+=item C<content_type>
+
+C<string> The MIME type of the attachment.
+
+=item C<is_private>
+
+C<boolean> True if the attachment is private (only visible to a certain
+group called the "insidergroup"), False otherwise.
+
+=item C<is_obsolete>
+
+C<boolean> True if the attachment is obsolete, False otherwise.
+
+=item C<is_patch>
+
+C<boolean> True if the attachment is a patch, False otherwise.
+
+=item C<creator>
+
+C<string> The login name of the user that created the attachment.
+
+=item C<flags>
+
+An array of hashes containing the information about flags currently set
+for each attachment. Each flag hash contains the following items:
+
+=over
+
+=item C<id>
+
+C<int> The id of the flag.
+
+=item C<name>
+
+C<string> The name of the flag.
+
+=item C<type_id>
+
+C<int> The type id of the flag.
+
+=item C<creation_date>
+
+C<dateTime> The timestamp when this flag was originally created.
+
+=item C<modification_date>
+
+C<dateTime> The timestamp when the flag was last modified.
+
+=item C<status>
+
+C<string> The current status of the flag.
+
+=item C<setter>
+
+C<string> The login name of the user who created or last modified the flag.
+
+=item C<requestee>
+
+C<string> The login name of the user this flag has been requested to be granted or denied.
+Note, this field is only returned if a requestee is set.
+
+=back
+
+=back
+
+=item B<Errors>
+
+This method can throw all the same errors as L</get>. In addition,
+it can also throw the following error:
+
+=over
+
+=item 304 (Auth Failure, Attachment is Private)
+
+You specified the id of a private attachment in the C<attachment_ids>
+argument, and you are not in the "insider group" that can see
+private attachments.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.6>.
+
+=item In Bugzilla B<4.0>, the C<attacher> return value was renamed to
+C<creator>.
+
+=item In Bugzilla B<4.0>, the C<description> return value was renamed to
+C<summary>.
+
+=item The C<data> return value was added in Bugzilla B<4.0>.
+
+=item In Bugzilla B<4.2>, the C<is_url> return value was removed
+(this attribute no longer exists for attachments).
+
+=item The C<size> return value was added in Bugzilla B<4.4>.
+
+=item The C<flags> array was added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+
+=head2 comments
+
+=over
+
+=item B<Description>
+
+This allows you to get data about comments, given a list of bugs
+and/or comment ids.
+
+=item B<REST>
+
+To get all comments for a particular bug using the bug ID or alias:
+
+GET /rest/bug/<id_or_alias>/comment
+
+To get a specific comment based on the comment ID:
+
+GET /rest/bug/comment/<comment_id>
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+B<Note>: At least one of C<ids> or C<comment_ids> is required.
+
+In addition to the parameters below, this method also accepts the
+standard L<include_fields|Bugzilla::API::1_0::Resource/include_fields> and
+L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+=over
+
+=item C<ids>
+
+C<array> An array that can contain both bug IDs and bug aliases.
+All of the comments (that are visible to you) will be returned for the
+specified bugs.
+
+=item C<comment_ids>
+
+C<array> An array of integer comment_ids. These comments will be
+returned individually, separate from any other comments in their
+respective bugs.
+
+=item C<new_since>
+
+C<dateTime> If specified, the method will only return comments I<newer>
+than this time. This only affects comments returned from the C<ids>
+argument. You will always be returned all comments you request in the
+C<comment_ids> argument, even if they are older than this date.
+
+=back
+
+=item B<Returns>
+
+Two items are returned:
+
+=over
+
+=item C<bugs>
+
+This is used for bugs specified in C<ids>. This is a hash,
+where the keys are the numeric ids of the bugs, and the value is
+a hash with a single key, C<comments>, which is an array of comments.
+(The format of comments is described below.)
+
+Note that any individual bug will only be returned once, so if you
+specify an id multiple times in C<ids>, it will still only be
+returned once.
+
+=item C<comments>
+
+Each individual comment requested in C<comment_ids> is returned here,
+in a hash where the numeric comment id is the key, and the value
+is the comment. (The format of comments is described below.)
+
+=back
+
+A "comment" as described above is a hash that contains the following
+keys:
+
+=over
+
+=item id
+
+C<int> The globally unique ID for the comment.
+
+=item bug_id
+
+C<int> The ID of the bug that this comment is on.
+
+=item attachment_id
+
+C<int> If the comment was made on an attachment, this will be the
+ID of that attachment. Otherwise it will be null.
+
+=item count
+
+C<int> The number of the comment local to the bug. The Description is 0,
+comments start with 1.
+
+=item text
+
+C<string> The actual text of the comment.
+
+=item creator
+
+C<string> The login name of the comment's author.
+
+=item time
+
+C<dateTime> The time (in Bugzilla's timezone) that the comment was added.
+
+=item creation_time
+
+C<dateTime> This is exactly same as the C<time> key. Use this field instead of
+C<time> for consistency with other methods including L</get> and L</attachments>.
+For compatibility, C<time> is still usable. However, please note that C<time>
+may be deprecated and removed in a future release.
+
+=item is_private
+
+C<boolean> True if this comment is private (only visible to a certain
+group called the "insidergroup"), False otherwise.
+
+=item is_markdown
+
+C<boolean> True if this comment needs Markdown processing, false otherwise.
+
+=back
+
+=item B<Errors>
+
+This method can throw all the same errors as L</get>. In addition,
+it can also throw the following errors:
+
+=over
+
+=item 110 (Comment Is Private)
+
+You specified the id of a private comment in the C<comment_ids>
+argument, and you are not in the "insider group" that can see
+private comments.
+
+=item 111 (Invalid Comment ID)
+
+You specified an id in the C<comment_ids> argument that is invalid--either
+you specified something that wasn't a number, or there is no comment with
+that id.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.4>.
+
+=item C<attachment_id> was added to the return value in Bugzilla B<3.6>.
+
+=item In Bugzilla B<4.0>, the C<author> return value was renamed to
+C<creator>.
+
+=item C<count> was added to the return value in Bugzilla B<4.4>.
+
+=item C<creation_time> was added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+
+=head2 get
+
+=over
+
+=item B<Description>
+
+Gets information about particular bugs in the database.
+
+=item B<REST>
+
+To get information about a particular bug using its ID or alias:
+
+GET /rest/bug/<id_or_alias>
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+In addition to the parameters below, this method also accepts the
+standard L<include_fields|Bugzilla::API::1_0::Resource/include_fields> and
+L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+=over
+
+=item C<ids>
+
+An array of numbers and strings.
+
+If an element in the array is entirely numeric, it represents a bug_id
+from the Bugzilla database to fetch. If it contains any non-numeric
+characters, it is considered to be a bug alias instead, and the bug with
+that alias will be loaded.
+
+=item C<permissive>
+
+C<boolean> Normally, if you request any inaccessible or invalid bug ids,
+Bug.get will throw an error. If this parameter is True, instead of throwing an
+error we return an array of hashes with a C<id>, C<faultString> and C<faultCode>
+for each bug that fails, and return normal information for the other bugs that
+were accessible.
+
+=back
+
+=item B<Returns>
+
+Two items are returned:
+
+=over
+
+=item C<bugs>
+
+An array of hashes that contains information about the bugs with
+the valid ids. Each hash contains the following items:
+
+These fields are returned by default or by specifying C<_default>
+in C<include_fields>.
+
+=over
+
+=item C<actual_time>
+
+C<double> The total number of hours that this bug has taken (so far).
+
+If you are not in the time-tracking group, this field will not be included
+in the return value.
+
+=item C<alias>
+
+C<array> of C<string>s The unique aliases of this bug. An empty array will be
+returned if this bug has no aliases.
+
+=item C<assigned_to>
+
+C<string> The login name of the user to whom the bug is assigned.
+
+=item C<assigned_to_detail>
+
+C<hash> A hash containing detailed user information for the assigned_to. To see the
+keys included in the user detail hash, see below.
+
+=item C<blocks>
+
+C<array> of C<int>s. The ids of bugs that are "blocked" by this bug.
+
+=item C<cc>
+
+C<array> of C<string>s. The login names of users on the CC list of this
+bug.
+
+=item C<cc_detail>
+
+C<array> of hashes containing detailed user information for each of the cc list
+members. To see the keys included in the user detail hash, see below.
+
+=item C<classification>
+
+C<string> The name of the current classification the bug is in.
+
+=item C<component>
+
+C<string> The name of the current component of this bug.
+
+=item C<creation_time>
+
+C<dateTime> When the bug was created.
+
+=item C<creator>
+
+C<string> The login name of the person who filed this bug (the reporter).
+
+=item C<creator_detail>
+
+C<hash> A hash containing detailed user information for the creator. To see the
+keys included in the user detail hash, see below.
+
+=item C<deadline>
+
+C<string> The day that this bug is due to be completed, in the format
+C<YYYY-MM-DD>.
+
+=item C<depends_on>
+
+C<array> of C<int>s. The ids of bugs that this bug "depends on".
+
+=item C<dupe_of>
+
+C<int> The bug ID of the bug that this bug is a duplicate of. If this bug
+isn't a duplicate of any bug, this will be null.
+
+=item C<estimated_time>
+
+C<double> The number of hours that it was estimated that this bug would
+take.
+
+If you are not in the time-tracking group, this field will not be included
+in the return value.
+
+=item C<flags>
+
+An array of hashes containing the information about flags currently set
+for the bug. Each flag hash contains the following items:
+
+=over
+
+=item C<id>
+
+C<int> The id of the flag.
+
+=item C<name>
+
+C<string> The name of the flag.
+
+=item C<type_id>
+
+C<int> The type id of the flag.
+
+=item C<creation_date>
+
+C<dateTime> The timestamp when this flag was originally created.
+
+=item C<modification_date>
+
+C<dateTime> The timestamp when the flag was last modified.
+
+=item C<status>
+
+C<string> The current status of the flag.
+
+=item C<setter>
+
+C<string> The login name of the user who created or last modified the flag.
+
+=item C<requestee>
+
+C<string> The login name of the user this flag has been requested to be granted or denied.
+Note, this field is only returned if a requestee is set.
+
+=back
+
+=item C<groups>
+
+C<array> of C<string>s. The names of all the groups that this bug is in.
+
+=item C<id>
+
+C<int> The unique numeric id of this bug.
+
+=item C<is_cc_accessible>
+
+C<boolean> If true, this bug can be accessed by members of the CC list,
+even if they are not in the groups the bug is restricted to.
+
+=item C<is_confirmed>
+
+C<boolean> True if the bug has been confirmed. Usually this means that
+the bug has at some point been moved out of the C<UNCONFIRMED> status
+and into another open status.
+
+=item C<is_open>
+
+C<boolean> True if this bug is open, false if it is closed.
+
+=item C<is_creator_accessible>
+
+C<boolean> If true, this bug can be accessed by the creator (reporter)
+of the bug, even if they are not a member of the groups the bug
+is restricted to.
+
+=item C<keywords>
+
+C<array> of C<string>s. Each keyword that is on this bug.
+
+=item C<last_change_time>
+
+C<dateTime> When the bug was last changed.
+
+=item C<op_sys>
+
+C<string> The name of the operating system that the bug was filed against.
+
+=item C<platform>
+
+C<string> The name of the platform (hardware) that the bug was filed against.
+
+=item C<priority>
+
+C<string> The priority of the bug.
+
+=item C<product>
+
+C<string> The name of the product this bug is in.
+
+=item C<qa_contact>
+
+C<string> The login name of the current QA Contact on the bug.
+
+=item C<qa_contact_detail>
+
+C<hash> A hash containing detailed user information for the qa_contact. To see the
+keys included in the user detail hash, see below.
+
+=item C<remaining_time>
+
+C<double> The number of hours of work remaining until work on this bug
+is complete.
+
+If you are not in the time-tracking group, this field will not be included
+in the return value.
+
+=item C<resolution>
+
+C<string> The current resolution of the bug, or an empty string if the bug
+is open.
+
+=item C<see_also>
+
+C<array> of C<string>s. The URLs in the See Also field on the bug.
+
+=item C<severity>
+
+C<string> The current severity of the bug.
+
+=item C<status>
+
+C<string> The current status of the bug.
+
+=item C<summary>
+
+C<string> The summary of this bug.
+
+=item C<target_milestone>
+
+C<string> The milestone that this bug is supposed to be fixed by, or for
+closed bugs, the milestone that it was fixed for.
+
+=item C<update_token>
+
+C<string> The token that you would have to pass to the F<process_bug.cgi>
+page in order to update this bug. This changes every time the bug is
+updated.
+
+This field is not returned to logged-out users.
+
+=item C<url>
+
+C<string> A URL that demonstrates the problem described in
+the bug, or is somehow related to the bug report.
+
+=item C<version>
+
+C<string> The version the bug was reported against.
+
+=item C<whiteboard>
+
+C<string> The value of the "status whiteboard" field on the bug.
+
+=item I<custom fields>
+
+Every custom field in this installation will also be included in the
+return value. Most fields are returned as C<string>s. However, some
+field types have different return values.
+
+Normally custom fields are returned by default similar to normal bug
+fields or you can specify only custom fields by using C<_custom> in
+C<include_fields>.
+
+=over
+
+=item Bug ID Fields - C<int>
+
+=item Multiple-Selection Fields - C<array> of C<string>s.
+
+=item Date/Time Fields - C<dateTime>
+
+=back
+
+=item I<user detail hashes>
+
+Each user detail hash contains the following items:
+
+=over
+
+=item C<id>
+
+C<int> The user id for this user.
+
+=item C<real_name>
+
+C<string> The 'real' name for this user, if any.
+
+=item C<name>
+
+C<string> The user's Bugzilla login.
+
+=back
+
+=back
+
+These fields are returned only by specifying "_extra" or the field name in "include_fields".
+
+=over
+
+=item C<tags>
+
+C<array> of C<string>s.  Each array item is a tag name.
+
+Note that tags are personal to the currently logged in user.
+
+=back
+
+=item C<faults>
+
+An array of hashes that contains invalid bug ids with error messages
+returned for them. Each hash contains the following items:
+
+=over
+
+=item id
+
+C<int> The numeric bug_id of this bug.
+
+=item faultString
+
+C<string> This will only be returned for invalid bugs if the C<permissive>
+argument was set when calling Bug.get, and it is an error indicating that
+the bug id was invalid.
+
+=item faultCode
+
+C<int> This will only be returned for invalid bugs if the C<permissive>
+argument was set when calling Bug.get, and it is the error code for the
+invalid bug error.
+
+=back
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 100 (Invalid Bug Alias)
+
+If you specified an alias and there is no bug with that alias.
+
+=item 101 (Invalid Bug ID)
+
+The bug_id you specified doesn't exist in the database.
+
+=item 102 (Access Denied)
+
+You do not have access to the bug_id you specified.
+
+=back
+
+=item B<History>
+
+=over
+
+=item C<permissive> argument added to this method's params in Bugzilla B<3.4>.
+
+=item The following properties were added to this method's return values
+in Bugzilla B<3.4>:
+
+=over
+
+=item For C<bugs>
+
+=over
+
+=item assigned_to
+
+=item component
+
+=item dupe_of
+
+=item is_open
+
+=item priority
+
+=item product
+
+=item resolution
+
+=item severity
+
+=item status
+
+=back
+
+=item C<faults>
+
+=back
+
+=item In Bugzilla B<4.0>, the following items were added to the C<bugs>
+return value: C<blocks>, C<cc>, C<classification>, C<creator>,
+C<deadline>, C<depends_on>, C<estimated_time>, C<is_cc_accessible>,
+C<is_confirmed>, C<is_creator_accessible>, C<groups>, C<keywords>,
+C<op_sys>, C<platform>, C<qa_contact>, C<remaining_time>, C<see_also>,
+C<target_milestone>, C<update_token>, C<url>, C<version>, C<whiteboard>,
+and all custom fields.
+
+=item The C<flags> array was added in Bugzilla B<4.4>.
+
+=item The C<actual_time> item was added to the C<bugs> return value
+in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=item In Bugzilla B<5.0>, the following items were added to the bugs return value: C<assigned_to_detail>, C<creator_detail>, C<qa_contact_detail>.
+
+=back
+
+=back
+
+=head2 history
+
+=over
+
+=item B<Description>
+
+Gets the history of changes for particular bugs in the database.
+
+=item B<REST>
+
+To get the history for a specific bug ID:
+
+GET /rest/bug/<bug_id>/history
+
+The returned data format will be the same as below.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+An array of numbers and strings.
+
+If an element in the array is entirely numeric, it represents a bug_id
+from the Bugzilla database to fetch. If it contains any non-numeric
+characters, it is considered to be a bug alias instead, and the data bug
+with that alias will be loaded.
+
+item C<new_since>
+
+C<dateTime> If specified, the method will only return changes I<newer>
+than this time.
+
+=back
+
+=item B<Returns>
+
+A hash containing a single element, C<bugs>. This is an array of hashes,
+containing the following keys:
+
+=over
+
+=item id
+
+C<int> The numeric id of the bug.
+
+=item alias
+
+C<array> of C<string>s The unique aliases of this bug. An empty array will be
+returned if this bug has no aliases.
+
+=item history
+
+C<array> An array of hashes, each hash having the following keys:
+
+=over
+
+=item when
+
+C<dateTime> The date the bug activity/change happened.
+
+=item who
+
+C<string> The login name of the user who performed the bug change.
+
+=item changes
+
+C<array> An array of hashes which contain all the changes that happened
+to the bug at this time (as specified by C<when>). Each hash contains
+the following items:
+
+=over
+
+=item field_name
+
+C<string> The name of the bug field that has changed.
+
+=item removed
+
+C<string> The previous value of the bug field which has been deleted
+by the change.
+
+=item added
+
+C<string> The new value of the bug field which has been added by the change.
+
+=item attachment_id
+
+C<int> The id of the attachment that was changed. This only appears if
+the change was to an attachment, otherwise C<attachment_id> will not be
+present in this hash.
+
+=back
+
+=back
+
+=back
+
+=item B<Errors>
+
+The same as L</get>.
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.4>.
+
+=item Field names returned by the C<field_name> field changed to be
+consistent with other methods. Since Bugzilla B<4.4>, they now match
+names used by L<Bug.update|/"update"> for consistency.
+
+=item REST API call added Bugzilla B<5.0>.
+
+=item Added C<new_since> parameter if Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 possible_duplicates
+
+=over
+
+=item B<Description>
+
+Allows a user to find possible duplicate bugs based on a set of keywords
+such as a user may use as a bug summary. Optionally the search can be
+narrowed down to specific products.
+
+=item B<Params>
+
+=over
+
+=item C<summary> (string) B<Required> - A string of keywords defining
+the type of bug you are trying to report.
+
+=item C<products> (array) - One or more product names to narrow the
+duplicate search to. If omitted, all bugs are searched.
+
+=back
+
+=item B<Returns>
+
+The same as L</get>.
+
+Note that you will only be returned information about bugs that you
+can see. Bugs that you can't see will be entirely excluded from the
+results. So, if you want to see private bugs, you will have to first
+log in and I<then> call this method.
+
+=item B<Errors>
+
+=over
+
+=item 50 (Param Required)
+
+You must specify a value for C<summary> containing a string of keywords to
+search for duplicates.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.0>.
+
+=item The C<product> parameter has been renamed to C<products> in
+Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 search
+
+=over
+
+=item B<Description>
+
+Allows you to search for bugs based on particular criteria.
+
+=item <REST>
+
+To search for bugs:
+
+GET /bug
+
+The URL parameters and the returned data format are the same as below.
+
+=item B<Params>
+
+Unless otherwise specified in the description of a parameter, bugs are
+returned if they match I<exactly> the criteria you specify in these
+parameters. That is, we don't match against substrings--if a bug is in
+the "Widgets" product and you ask for bugs in the "Widg" product, you
+won't get anything.
+
+Criteria are joined in a logical AND. That is, you will be returned
+bugs that match I<all> of the criteria, not bugs that match I<any> of
+the criteria.
+
+Each parameter can be either the type it says, or an array of the types
+it says. If you pass an array, it means "Give me bugs with I<any> of
+these values." For example, if you wanted bugs that were in either
+the "Foo" or "Bar" products, you'd pass:
+
+ product => ['Foo', 'Bar']
+
+Some Bugzillas may treat your arguments case-sensitively, depending
+on what database system they are using. Most commonly, though, Bugzilla is
+not case-sensitive with the arguments passed (because MySQL is the
+most-common database to use with Bugzilla, and MySQL is not case sensitive).
+
+In addition to the fields listed below, you may also use criteria that
+is similar to what is used in the Advanced Search screen of the Bugzilla
+UI. This includes fields specified by C<Search by Change History> and
+C<Custom Search>. The easiest way to determine what the field names are and what
+format Bugzilla expects, is to first construct your query using the
+Advanced Search UI, execute it and use the query parameters in they URL
+as your key/value pairs for the WebService call. With REST, you can
+just reuse the query parameter portion in the REST call itself.
+
+=over
+
+=item C<alias>
+
+C<array> of C<string>s The unique aliases of this bug. An empty array will be
+returned if this bug has no aliases.
+
+=item C<assigned_to>
+
+C<string> The login name of a user that a bug is assigned to.
+
+=item C<component>
+
+C<string> The name of the Component that the bug is in. Note that
+if there are multiple Components with the same name, and you search
+for that name, bugs in I<all> those Components will be returned. If you
+don't want this, be sure to also specify the C<product> argument.
+
+=item C<creation_time>
+
+C<dateTime> Searches for bugs that were created at this time or later.
+May not be an array.
+
+=item C<creator>
+
+C<string> The login name of the user who created the bug.
+
+You can also pass this argument with the name C<reporter>, for
+backwards compatibility with older Bugzillas.
+
+=item C<id>
+
+C<int> The numeric id of the bug.
+
+=item C<last_change_time>
+
+C<dateTime> Searches for bugs that were modified at this time or later.
+May not be an array.
+
+=item C<limit>
+
+C<int> Limit the number of results returned to C<int> records. If the limit
+is more than zero and higher than the maximum limit set by the administrator,
+then the maximum limit will be used instead. If you set the limit equal to zero,
+then all matching results will be returned instead.
+
+=item C<offset>
+
+C<int> Used in conjunction with the C<limit> argument, C<offset> defines
+the starting position for the search. For example, given a search that
+would return 100 bugs, setting C<limit> to 10 and C<offset> to 10 would return
+bugs 11 through 20 from the set of 100.
+
+=item C<op_sys>
+
+C<string> The "Operating System" field of a bug.
+
+=item C<platform>
+
+C<string> The Platform (sometimes called "Hardware") field of a bug.
+
+=item C<priority>
+
+C<string> The Priority field on a bug.
+
+=item C<product>
+
+C<string> The name of the Product that the bug is in.
+
+=item C<resolution>
+
+C<string> The current resolution--only set if a bug is closed. You can
+find open bugs by searching for bugs with an empty resolution.
+
+=item C<severity>
+
+C<string> The Severity field on a bug.
+
+=item C<status>
+
+C<string> The current status of a bug (not including its resolution,
+if it has one, which is a separate field above).
+
+=item C<summary>
+
+C<string> Searches for substrings in the single-line Summary field on
+bugs. If you specify an array, then bugs whose summaries match I<any> of the
+passed substrings will be returned.
+
+Note that unlike searching in the Bugzilla UI, substrings are not split
+on spaces. So searching for C<foo bar> will match "This is a foo bar"
+but not "This foo is a bar". C<['foo', 'bar']>, would, however, match
+the second item.
+
+=item C<tags>
+
+C<string> Searches for a bug with the specified tag.  If you specify an
+array, then any bugs that match I<any> of the tags will be returned.
+
+Note that tags are personal to the currently logged in user.
+
+=item C<target_milestone>
+
+C<string> The Target Milestone field of a bug. Note that even if this
+Bugzilla does not have the Target Milestone field enabled, you can
+still search for bugs by Target Milestone. However, it is likely that
+in that case, most bugs will not have a Target Milestone set (it
+defaults to "---" when the field isn't enabled).
+
+=item C<qa_contact>
+
+C<string> The login name of the bug's QA Contact. Note that even if
+this Bugzilla does not have the QA Contact field enabled, you can
+still search for bugs by QA Contact (though it is likely that no bug
+will have a QA Contact set, if the field is disabled).
+
+=item C<url>
+
+C<string> The "URL" field of a bug.
+
+=item C<version>
+
+C<string> The Version field of a bug.
+
+=item C<whiteboard>
+
+C<string> Search the "Status Whiteboard" field on bugs for a substring.
+Works the same as the C<summary> field described above, but searches the
+Status Whiteboard field.
+
+=item C<quicksearch>
+
+C<string> Search for bugs using quicksearch syntax.
+
+=back
+
+=item B<Returns>
+
+The same as L</get>.
+
+Note that you will only be returned information about bugs that you
+can see. Bugs that you can't see will be entirely excluded from the
+results. So, if you want to see private bugs, you will have to first
+log in and I<then> call this method.
+
+=item B<Errors>
+
+If you specify an invalid value for a particular field, you just won't
+get any results for that value.
+
+=over
+
+=item 1000 (Parameters Required)
+
+You may not search without any search terms.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.4>.
+
+=item Searching by C<votes> was removed in Bugzilla B<4.0>.
+
+=item The C<reporter> input parameter was renamed to C<creator>
+in Bugzilla B<4.0>.
+
+=item In B<4.2.6> and newer, added the ability to return all results if
+C<limit> is set equal to zero. Otherwise maximum results returned are limited
+by system configuration.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=item Updated to allow for full search capability similar to the Bugzilla UI
+in Bugzilla B<5.0>.
+
+=item Updated to allow quicksearch capability in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 Bug Creation and Modification
+
+=head2 create
+
+=over
+
+=item B<Description>
+
+This allows you to create a new bug in Bugzilla. If you specify any
+invalid fields, an error will be thrown stating which field is invalid.
+If you specify any fields you are not allowed to set, they will just be
+set to their defaults or ignored.
+
+You cannot currently set all the items here that you can set on enter_bug.cgi.
+
+=item B<REST>
+
+To create a new bug in Bugzilla:
+
+POST /rest/bug
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+Some params must be set, or an error will be thrown. These params are
+marked B<Required>.
+
+Some parameters can have defaults set in Bugzilla, by the administrator.
+If these parameters have defaults set, you can omit them. These parameters
+are marked B<Defaulted>.
+
+Clients that want to be able to interact uniformly with multiple
+Bugzillas should always set both the params marked B<Required> and those
+marked B<Defaulted>, because some Bugzillas may not have defaults set
+for B<Defaulted> parameters, and then this method will throw an error
+if you don't specify them.
+
+The descriptions of the parameters below are what they mean when Bugzilla is
+being used to track software bugs. They may have other meanings in some
+installations.
+
+=over
+
+=item C<product> (string) B<Required> - The name of the product the bug
+is being filed against.
+
+=item C<component> (string) B<Required> - The name of a component in the
+product above.
+
+=item C<summary> (string) B<Required> - A brief description of the bug being
+filed.
+
+=item C<version> (string) B<Required> - A version of the product above;
+the version the bug was found in.
+
+=item C<description> (string) B<Defaulted> - The initial description for
+this bug. Some Bugzilla installations require this to not be blank.
+
+=item C<op_sys> (string) B<Defaulted> - The operating system the bug was
+discovered on.
+
+=item C<platform> (string) B<Defaulted> - What type of hardware the bug was
+experienced on.
+
+=item C<priority> (string) B<Defaulted> - What order the bug will be fixed
+in by the developer, compared to the developer's other bugs.
+
+=item C<severity> (string) B<Defaulted> - How severe the bug is.
+
+=item C<alias> (array) - A brief alias for the bug that can be used
+instead of a bug number when accessing this bug. Must be unique in
+all of this Bugzilla.
+
+=item C<assigned_to> (username) - A user to assign this bug to, if you
+don't want it to be assigned to the component owner.
+
+=item C<cc> (array) - An array of usernames to CC on this bug.
+
+=item C<comment_is_private> (boolean) - If set to true, the description
+is private, otherwise it is assumed to be public.
+
+=item C<is_markdown> (boolean) - If set to true, the description
+has Markdown structures, otherwise it is a normal text.
+
+=item C<groups> (array) - An array of group names to put this
+bug into. You can see valid group names on the Permissions
+tab of the Preferences screen, or, if you are an administrator,
+in the Groups control panel.
+If you don't specify this argument, then the bug will be added into
+all the groups that are set as being "Default" for this product. (If
+you want to avoid that, you should specify C<groups> as an empty array.)
+
+=item C<qa_contact> (username) - If this installation has QA Contacts
+enabled, you can set the QA Contact here if you don't want to use
+the component's default QA Contact.
+
+=item C<status> (string) - The status that this bug should start out as.
+Note that only certain statuses can be set on bug creation.
+
+=item C<resolution> (string) - If you are filing a closed bug, then
+you will have to specify a resolution. You cannot currently specify
+a resolution of C<DUPLICATE> for new bugs, though. That must be done
+with L</update>.
+
+=item C<target_milestone> (string) - A valid target milestone for this
+product.
+
+=item C<flags>
+
+C<array> An array of hashes with flags to add to the bug. To create a flag,
+at least the status and the type_id or name must be provided. An optional
+requestee can be passed if the flag type is requestable to a specific user.
+
+=over
+
+=item C<name>
+
+C<string> The name of the flag type.
+
+=item C<type_id>
+
+C<int> The internal flag type id.
+
+=item C<status>
+
+C<string> The flags new status (i.e. "?", "+", "-" or "X" to clear a flag).
+
+=item C<requestee>
+
+C<string> The login of the requestee if the flag type is requestable to a specific user.
+
+=back
+
+=back
+
+In addition to the above parameters, if your installation has any custom
+fields, you can set them just by passing in the name of the field and
+its value as a string.
+
+=item B<Returns>
+
+A hash with one element, C<id>. This is the id of the newly-filed bug.
+
+=item B<Errors>
+
+=over
+
+=item 51 (Invalid Object)
+
+You specified a field value that is invalid. The error message will have
+more details.
+
+=item 103 (Invalid Alias)
+
+The alias you specified is invalid for some reason. See the error message
+for more details.
+
+=item 104 (Invalid Field)
+
+One of the drop-down fields has an invalid value, or a value entered in a
+text field is too long. The error message will have more detail.
+
+=item 105 (Invalid Component)
+
+You didn't specify a component.
+
+=item 106 (Invalid Product)
+
+Either you didn't specify a product, this product doesn't exist, or
+you don't have permission to enter bugs in this product.
+
+=item 107 (Invalid Summary)
+
+You didn't specify a summary for the bug.
+
+=item 116 (Dependency Loop)
+
+You specified values in the C<blocks> or C<depends_on> fields
+that would cause a circular dependency between bugs.
+
+=item 120 (Group Restriction Denied)
+
+You tried to restrict the bug to a group which does not exist, or which
+you cannot use with this product.
+
+=item 129 (Flag Status Invalid)
+
+The flag status is invalid.
+
+=item 130 (Flag Modification Denied)
+
+You tried to request, grant, or deny a flag but only a user with the required
+permissions may make the change.
+
+=item 131 (Flag not Requestable from Specific Person)
+
+You can't ask a specific person for the flag.
+
+=item 133 (Flag Type not Unique)
+
+The flag type specified matches several flag types. You must specify
+the type id value to update or add a flag.
+
+=item 134 (Inactive Flag Type)
+
+The flag type is inactive and cannot be used to create new flags.
+
+=item 504 (Invalid User)
+
+Either the QA Contact, Assignee, or CC lists have some invalid user
+in them. The error message will have more details.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Before B<3.0.4>, parameters marked as B<Defaulted> were actually
+B<Required>, due to a bug in Bugzilla.
+
+=item The C<groups> argument was added in Bugzilla B<4.0>. Before
+Bugzilla 4.0, bugs were only added into Mandatory groups by this
+method. Since Bugzilla B<4.0.2>, passing an illegal group name will
+throw an error. In Bugzilla 4.0 and 4.0.1, illegal group names were
+silently ignored.
+
+=item The C<comment_is_private> argument was added in Bugzilla B<4.0>.
+Before Bugzilla 4.0, you had to use the undocumented C<commentprivacy>
+argument.
+
+=item Error 116 was added in Bugzilla B<4.0>. Before that, dependency
+loop errors had a generic code of C<32000>.
+
+=item The ability to file new bugs with a C<resolution> was added in
+Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=item C<is_markdown> option added in Bugzilla B<6.0>.
+
+=back
+
+=back
+
+
+=head2 add_attachment
+
+=over
+
+=item B<Description>
+
+This allows you to add an attachment to a bug in Bugzilla.
+
+=item B<REST>
+
+To create attachment on a current bug:
+
+POST /rest/bug/<bug_id>/attachment
+
+The params to include in the POST body, as well as the returned
+data format are the same as below. The C<ids> param will be
+overridden as it it pulled from the URL path.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+B<Required> C<array> An array of ints and/or strings--the ids
+or aliases of bugs that you want to add this attachment to.
+The same attachment and comment will be added to all
+these bugs.
+
+=item C<data>
+
+B<Required> C<base64> or C<string> The content of the attachment.
+If the content of the attachment is not ASCII text, you must encode
+it in base64 and declare it as the C<base64> type.
+
+=item C<file_name>
+
+B<Required> C<string> The "file name" that will be displayed
+in the UI for this attachment.
+
+=item C<summary>
+
+B<Required> C<string> A short string describing the
+attachment.
+
+=item C<content_type>
+
+B<Required> C<string> The MIME type of the attachment, like
+C<text/plain> or C<image/png>.
+
+=item C<comment>
+
+C<string> or hash. A comment to add along with this attachment. If C<comment>
+is a hash, it has the following keys:
+
+=over
+
+=item C<body>
+
+C<string> The body of the comment.
+
+=item C<is_markdown>
+
+C<boolean> If set to true, the comment has Markdown structures; otherwise, it
+is an ordinary text.
+
+=back
+
+=item C<is_patch>
+
+C<boolean> True if Bugzilla should treat this attachment as a patch.
+If you specify this, you do not need to specify a C<content_type>.
+The C<content_type> of the attachment will be forced to C<text/plain>.
+
+Defaults to False if not specified.
+
+=item C<is_private>
+
+C<boolean> True if the attachment should be private (restricted
+to the "insidergroup"), False if the attachment should be public.
+
+Defaults to False if not specified.
+
+=item C<flags>
+
+C<array> An array of hashes with flags to add to the attachment. to create a flag,
+at least the status and the type_id or name must be provided. An optional requestee
+can be passed if the flag type is requestable to a specific user.
+
+=over
+
+=item C<name>
+
+C<string> The name of the flag type.
+
+=item C<type_id>
+
+C<int> The internal flag type id.
+
+=item C<status>
+
+C<string> The flags new status (i.e. "?", "+", "-" or "X" to clear a flag).
+
+=item C<requestee>
+
+C<string> The login of the requestee if the flag type is requestable to a specific user.
+
+=back
+
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
+=back
+
+=item B<Returns>
+
+A single item C<ids>, which contains an array of the
+attachment id(s) created.
+
+=item B<Errors>
+
+This method can throw all the same errors as L</get>, plus:
+
+=over
+
+=item 129 (Flag Status Invalid)
+
+The flag status is invalid.
+
+=item 130 (Flag Modification Denied)
+
+You tried to request, grant, or deny a flag but only a user with the required
+permissions may make the change.
+
+=item 131 (Flag not Requestable from Specific Person)
+
+You can't ask a specific person for the flag.
+
+=item 133 (Flag Type not Unique)
+
+The flag type specified matches several flag types. You must specify
+the type id value to update or add a flag.
+
+=item 134 (Inactive Flag Type)
+
+The flag type is inactive and cannot be used to create new flags.
+
+=item 140 (Markdown Disabled)
+
+You tried to set the C<is_markdown> flag of the comment to true but the Markdown feature is not enabled.
+
+=item 600 (Attachment Too Large)
+
+You tried to attach a file that was larger than Bugzilla will accept.
+
+=item 601 (Invalid MIME Type)
+
+You specified a C<content_type> argument that was blank, not a valid
+MIME type, or not a MIME type that Bugzilla accepts for attachments.
+
+=item 603 (File Name Not Specified)
+
+You did not specify a valid for the C<file_name> argument.
+
+=item 604 (Summary Required)
+
+You did not specify a value for the C<summary> argument.
+
+=item 606 (Empty Data)
+
+You set the "data" field to an empty string.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.0>.
+
+=item The C<is_url> parameter was removed in Bugzilla B<4.2>.
+
+=item The return value has changed in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=item C<is_markdown> added in Bugzilla B<6.0>.
+
+=back
+
+=back
+
+
+=head2 update_attachment
+
+=over
+
+=item B<Description>
+
+This allows you to update attachment metadata in Bugzilla.
+
+=item B<REST>
+
+To update attachment metadata on a current attachment:
+
+PUT /rest/bug/attachment/<attach_id>
+
+The params to include in the POST body, as well as the returned
+data format are the same as below. The C<ids> param will be
+overridden as it it pulled from the URL path.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+B<Required> C<array> An array of integers -- the ids of the attachments you
+want to update.
+
+=item C<file_name>
+
+C<string> The "file name" that will be displayed
+in the UI for this attachment.
+
+=item C<summary>
+
+C<string> A short string describing the
+attachment.
+
+=item C<comment>
+
+C<string> or hash: An optional comment to add to the attachment's bug. If C<comment> is
+a hash, it has the following keys:
+
+=over
+
+=item C<body>
+
+C<string> The body of the comment to be added.
+
+=item C<is_markdown>
+
+C<boolean> If set to true, the comment has Markdown structures; otherwise it is a normal
+text.
+
+=back
+
+=item C<content_type>
+
+C<string> The MIME type of the attachment, like
+C<text/plain> or C<image/png>.
+
+=item C<is_patch>
+
+C<boolean> True if Bugzilla should treat this attachment as a patch.
+If you specify this, you do not need to specify a C<content_type>.
+The C<content_type> of the attachment will be forced to C<text/plain>.
+
+=item C<is_private>
+
+C<boolean> True if the attachment should be private (restricted
+to the "insidergroup"), False if the attachment should be public.
+
+=item C<is_obsolete>
+
+C<boolean> True if the attachment is obsolete, False otherwise.
+
+=item C<flags>
+
+C<array> An array of hashes with changes to the flags. The following values
+can be specified. At least the status and one of type_id, id, or name must
+be specified. If a type_id or name matches a single currently set flag,
+the flag will be updated unless new is specified.
+
+=over
+
+=item C<name>
+
+C<string> The name of the flag that will be created or updated.
+
+=item C<type_id>
+
+C<int> The internal flag type id that will be created or updated. You will
+need to specify the C<type_id> if more than one flag type of the same name exists.
+
+=item C<status>
+
+C<string> The flags new status (i.e. "?", "+", "-" or "X" to clear a flag).
+
+=item C<requestee>
+
+C<string> The login of the requestee if the flag type is requestable to a specific user.
+
+=item C<id>
+
+C<int> Use id to specify the flag to be updated. You will need to specify the C<id>
+if more than one flag is set of the same name.
+
+=item C<new>
+
+C<boolean> Set to true if you specifically want a new flag to be created.
+
+=back
+
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field, "attachments". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the attachment that was updated.
+
+=item C<last_change_time>
+
+C<dateTime> The exact time that this update was done at, for this attachment.
+If no update was done (that is, no fields had their values changed and
+no comment was added) then this will instead be the last time the attachment
+was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this bug. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added> (C<string>) The values that were added to this field.
+possibly a comma-and-space-separated list if multiple values were added.
+
+=item C<removed> (C<string>) The values that were removed from this
+field.
+
+=back
+
+=back
+
+Here's an example of what a return value might look like:
+
+ {
+   attachments => [
+     {
+       id    => 123,
+       last_change_time => '2010-01-01T12:34:56',
+       changes => {
+         summary => {
+           removed => 'Sample ptach',
+           added   => 'Sample patch'
+         },
+         is_obsolete => {
+           removed => '0',
+           added   => '1',
+         }
+       },
+     }
+   ]
+ }
+
+=item B<Errors>
+
+This method can throw all the same errors as L</get>, plus:
+
+=over
+
+=item 129 (Flag Status Invalid)
+
+The flag status is invalid.
+
+=item 130 (Flag Modification Denied)
+
+You tried to request, grant, or deny a flag but only a user with the required
+permissions may make the change.
+
+=item 131 (Flag not Requestable from Specific Person)
+
+You can't ask a specific person for the flag.
+
+=item 132 (Flag not Unique)
+
+The flag specified has been set multiple times. You must specify the id
+value to update the flag.
+
+=item 133 (Flag Type not Unique)
+
+The flag type specified matches several flag types. You must specify
+the type id value to update or add a flag.
+
+=item 134 (Inactive Flag Type)
+
+The flag type is inactive and cannot be used to create new flags.
+
+=item 140 (Markdown Disabled)
+
+You tried to set the C<is_markdown> flag of the C<comment> to true but Markdown feature is
+not enabled.
+
+=item 601 (Invalid MIME Type)
+
+You specified a C<content_type> argument that was blank, not a valid
+MIME type, or not a MIME type that Bugzilla accepts for attachments.
+
+=item 603 (File Name Not Specified)
+
+You did not specify a valid for the C<file_name> argument.
+
+=item 604 (Summary Required)
+
+You did not specify a value for the C<summary> argument.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 add_comment
+
+=over
+
+=item B<Description>
+
+This allows you to add a comment to a bug in Bugzilla.
+
+=item B<REST>
+
+To create a comment on a current bug:
+
+POST /rest/bug/<bug_id>/comment
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+=over
+
+=item C<id> (int or string) B<Required> - The id or alias of the bug to append a
+comment to.
+
+=item C<comment> (string) B<Required> - The comment to append to the bug.
+If this is empty or all whitespace, an error will be thrown saying that
+you did not set the C<comment> parameter.
+
+=item C<is_private> (boolean) - If set to true, the comment is private,
+otherwise it is assumed to be public.
+
+=item C<is_markdown> (boolean) - If set to true, the comment has Markdown
+structures, otherwise it is a normal text.
+
+=item C<work_time> (double) - Adds this many hours to the "Hours Worked"
+on the bug. If you are not in the time tracking group, this value will
+be ignored.
+
+=item C<minor_update> (boolean) - If set to true, this is considered a minor update
+and no mail is sent to users who do not want minor update emails. If current user
+is not in the minor_update_group, this parameter is simply ignored.
+
+=back
+
+=item B<Returns>
+
+A hash with one element, C<id> whose value is the id of the newly-created comment.
+
+=item B<Errors>
+
+=over
+
+=item 54 (Hours Worked Too Large)
+
+You specified a C<work_time> larger than the maximum allowed value of
+C<99999.99>.
+
+=item 100 (Invalid Bug Alias)
+
+If you specified an alias and there is no bug with that alias.
+
+=item 101 (Invalid Bug ID)
+
+The id you specified doesn't exist in the database.
+
+=item 109 (Bug Edit Denied)
+
+You did not have the necessary rights to edit the bug.
+
+=item 113 (Can't Make Private Comments)
+
+You tried to add a private comment, but don't have the necessary rights.
+
+=item 114 (Comment Too Long)
+
+You tried to add a comment longer than the maximum allowed length
+(65,535 characters).
+
+=item 140 (Markdown Disabled)
+
+You tried to set the C<is_markdown> flag to true but the Markdown feature
+is not enabled.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.2>.
+
+=item Modified to return the new comment's id in Bugzilla B<3.4>
+
+=item Modified to throw an error if you try to add a private comment
+but can't, in Bugzilla B<3.4>.
+
+=item Before Bugzilla B<3.6>, the C<is_private> argument was called
+C<private>, and you can still call it C<private> for backwards-compatibility
+purposes if you wish.
+
+=item Before Bugzilla B<3.6>, error 54 and error 114 had a generic error
+code of 32000.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=item C<is_markdown> option added in Bugzilla B<6.0>.
+
+=back
+
+=back
+
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+Allows you to update the fields of a bug. Automatically sends emails
+out about the changes.
+
+=item B<REST>
+
+To update the fields of a current bug:
+
+PUT /rest/bug/<bug_id>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> param will be overridden as it is
+pulled from the URL path.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+Array of C<int>s or C<string>s. The ids or aliases of the bugs that
+you want to modify.
+
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
+=back
+
+B<Note>: All following fields specify the values you want to set on the
+bugs you are updating.
+
+=over
+
+=item C<alias>
+
+C<hash> These specify the aliases of a bug that can be used instead of a bug
+number when acessing this bug. To set these, you should pass a hash as the
+value. The hash may contain the following fields:
+
+=over
+
+=item C<add> An array of C<string>s. Aliases to add to this field.
+
+=item C<remove> An array of C<string>s. Aliases to remove from this field.
+If the aliases are not already in the field, they will be ignored.
+
+=item C<set> An array of C<string>s. An exact set of aliases to set this
+field to, overriding the current value. If you specify C<set>, then C<add>
+and  C<remove> will be ignored.
+
+=back
+
+You can only set this if you are modifying a single bug. If there is more
+than one bug specified in C<ids>, passing in a value for C<alias> will cause
+an error to be thrown.
+
+For backwards compatibility, you can also specify a single string. This will
+be treated as if you specified the set key above.
+
+=item C<assigned_to>
+
+C<string> The full login name of the user this bug is assigned to.
+
+=item C<blocks>
+
+=item C<depends_on>
+
+C<hash> These specify the bugs that this bug blocks or depends on,
+respectively. To set these, you should pass a hash as the value. The hash
+may contain the following fields:
+
+=over
+
+=item C<add> An array of C<int>s. Bug ids to add to this field.
+
+=item C<remove> An array of C<int>s. Bug ids to remove from this field.
+If the bug ids are not already in the field, they will be ignored.
+
+=item C<set> An array of C<int>s. An exact set of bug ids to set this
+field to, overriding the current value. If you specify C<set>, then C<add>
+and  C<remove> will be ignored.
+
+=back
+
+=item C<cc>
+
+C<hash> The users on the cc list. To modify this field, pass a hash, which
+may have the following fields:
+
+=over
+
+=item C<add> Array of C<string>s. User names to add to the CC list.
+They must be full user names, and an error will be thrown if you pass
+in an invalid user name.
+
+=item C<remove> Array of C<string>s. User names to remove from the CC
+list. They must be full user names, and an error will be thrown if you
+pass in an invalid user name.
+
+=back
+
+=item C<is_cc_accessible>
+
+C<boolean> Whether or not users in the CC list are allowed to access
+the bug, even if they aren't in a group that can normally access the bug.
+
+=item C<comment>
+
+C<hash>. A comment on the change. The hash may contain the following fields:
+
+=over
+
+=item C<body> C<string> The actual text of the comment.
+B<Note>: For compatibility with the parameters to L</add_comment>,
+you can also call this field C<comment>, if you want.
+
+=item C<is_private> C<boolean> Whether the comment is private or not.
+If you try to make a comment private and you don't have the permission
+to, an error will be thrown.
+
+=back
+
+=item C<comment_is_private>
+
+C<hash> This is how you update the privacy of comments that are already
+on a bug. This is a hash, where the keys are the C<int> id of comments (not
+their count on a bug, like #1, #2, #3, but their globally-unique id,
+as returned by L</comments>) and the value is a C<boolean> which specifies
+whether that comment should become private (C<true>) or public (C<false>).
+
+The comment ids must be valid for the bug being updated. Thus, it is not
+practical to use this while updating multiple bugs at once, as a single
+comment id will never be valid on multiple bugs.
+
+=item C<component>
+
+C<string> The Component the bug is in.
+
+=item C<deadline>
+
+C<string> The Deadline field--a date specifying when the bug must
+be completed by, in the format C<YYYY-MM-DD>.
+
+=item C<dupe_of>
+
+C<int> The bug that this bug is a duplicate of. If you want to mark
+a bug as a duplicate, the safest thing to do is to set this value
+and I<not> set the C<status> or C<resolution> fields. They will
+automatically be set by Bugzilla to the appropriate values for
+duplicate bugs.
+
+=item C<estimated_time>
+
+C<double> The total estimate of time required to fix the bug, in hours.
+This is the I<total> estimate, not the amount of time remaining to fix it.
+
+=item C<flags>
+
+C<array> An array of hashes with changes to the flags. The following values
+can be specified. At least the status and one of type_id, id, or name must
+be specified. If a type_id or name matches a single currently set flag,
+the flag will be updated unless new is specified.
+
+=over
+
+=item C<name>
+
+C<string> The name of the flag that will be created or updated.
+
+=item C<type_id>
+
+C<int> The internal flag type id that will be created or updated. You will
+need to specify the C<type_id> if more than one flag type of the same name exists.
+
+=item C<status>
+
+C<string> The flags new status (i.e. "?", "+", "-" or "X" to clear a flag).
+
+=item C<requestee>
+
+C<string> The login of the requestee if the flag type is requestable to a specific user.
+
+=item C<id>
+
+C<int> Use id to specify the flag to be updated. You will need to specify the C<id>
+if more than one flag is set of the same name.
+
+=item C<new>
+
+C<boolean> Set to true if you specifically want a new flag to be created.
+
+=back
+
+=item C<groups>
+
+C<hash> The groups a bug is in. To modify this field, pass a hash, which
+may have the following fields:
+
+=over
+
+=item C<add> Array of C<string>s. The names of groups to add. Passing
+in an invalid group name or a group that you cannot add to this bug will
+cause an error to be thrown.
+
+=item C<remove> Array of C<string>s. The names of groups to remove. Passing
+in an invalid group name or a group that you cannot remove from this bug
+will cause an error to be thrown.
+
+=back
+
+=item C<keywords>
+
+C<hash> Keywords on the bug. To modify this field, pass a hash, which
+may have the following fields:
+
+=over
+
+=item C<add> An array of C<strings>s. The names of keywords to add to
+the field on the bug. Passing something that isn't a valid keyword name
+will cause an error to be thrown.
+
+=item C<remove> An array of C<string>s. The names of keywords to remove
+from the field on the bug. Passing something that isn't a valid keyword
+name will cause an error to be thrown.
+
+=item C<set> An array of C<strings>s. An exact set of keywords to set the
+field to, on the bug. Passing something that isn't a valid keyword name
+will cause an error to be thrown. Specifying C<set> overrides C<add> and
+C<remove>.
+
+=back
+
+=item C<op_sys>
+
+C<string> The Operating System ("OS") field on the bug.
+
+=item C<platform>
+
+C<string> The Platform or "Hardware" field on the bug.
+
+=item C<priority>
+
+C<string> The Priority field on the bug.
+
+=item C<product>
+
+C<string> The name of the product that the bug is in. If you change
+this, you will probably also want to change C<target_milestone>,
+C<version>, and C<component>, since those have different legal
+values in every product.
+
+If you cannot change the C<target_milestone> field, it will be reset to
+the default for the product, when you move a bug to a new product.
+
+You may also wish to add or remove groups, as which groups are
+valid on a bug depends on the product. Groups that are not valid
+in the new product will be automatically removed, and groups which
+are mandatory in the new product will be automatically added, but no
+other automatic group changes will be done.
+
+Note that users can only move a bug into a product if they would
+normally have permission to file new bugs in that product.
+
+=item C<qa_contact>
+
+C<string> The full login name of the bug's QA Contact.
+
+=item C<is_creator_accessible>
+
+C<boolean> Whether or not the bug's reporter is allowed to access
+the bug, even if they aren't in a group that can normally access
+the bug.
+
+=item C<remaining_time>
+
+C<double> How much work time is remaining to fix the bug, in hours.
+If you set C<work_time> but don't explicitly set C<remaining_time>,
+then the C<work_time> will be deducted from the bug's C<remaining_time>.
+
+=item C<reset_assigned_to>
+
+C<boolean> If true, the C<assigned_to> field will be reset to the
+default for the component that the bug is in. (If you have set the
+component at the same time as using this, then the component used
+will be the new component, not the old one.)
+
+=item C<reset_qa_contact>
+
+C<boolean> If true, the C<qa_contact> field will be reset  to the
+default for the component that the bug is in. (If you have set the
+component at the same time as using this, then the component used
+will be the new component, not the old one.)
+
+=item C<resolution>
+
+C<string> The current resolution. May only be set if you are closing
+a bug or if you are modifying an already-closed bug. Attempting to set
+the resolution to I<any> value (even an empty or null string) on an
+open bug will cause an error to be thrown.
+
+If you change the C<status> field to an open status, the resolution
+field will automatically be cleared, so you don't have to clear it
+manually.
+
+=item C<see_also>
+
+C<hash> The See Also field on a bug, specifying URLs to bugs in other
+bug trackers. To modify this field, pass a hash, which may have the
+following fields:
+
+=over
+
+=item C<add> An array of C<strings>s. URLs to add to the field.
+Each URL must be a valid URL to a bug-tracker, or an error will
+be thrown.
+
+=item C<remove> An array of C<string>s. URLs to remove from the field.
+Invalid URLs will be ignored.
+
+=back
+
+=item C<severity>
+
+C<string> The Severity field of a bug.
+
+=item C<status>
+
+C<string> The status you want to change the bug to. Note that if
+a bug is changing from open to closed, you should also specify
+a C<resolution>.
+
+=item C<summary>
+
+C<string> The Summary field of the bug.
+
+=item C<target_milestone>
+
+C<string> The bug's Target Milestone.
+
+=item C<url>
+
+C<string> The "URL" field of a bug.
+
+=item C<version>
+
+C<string> The bug's Version field.
+
+=item C<whiteboard>
+
+C<string> The Status Whiteboard field of a bug.
+
+=item C<work_time>
+
+C<double> The number of hours worked on this bug as part of this change.
+If you set C<work_time> but don't explicitly set C<remaining_time>,
+then the C<work_time> will be deducted from the bug's C<remaining_time>.
+
+=back
+
+You can also set the value of any custom field by passing its name as
+a parameter, and the value to set the field to. For multiple-selection
+fields, the value should be an array of strings.
+
+=item B<Returns>
+
+A C<hash> with a single field, "bugs". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the bug that was updated.
+
+=item C<alias>
+
+C<array> of C<string>s The aliases of the bug that was updated, if this bug
+has any alias.
+
+=item C<last_change_time>
+
+C<dateTime> The exact time that this update was done at, for this bug.
+If no update was done (that is, no fields had their values changed and
+no comment was added) then this will instead be the last time the bug
+was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this bug. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added> (C<string>) The values that were added to this field,
+possibly a comma-and-space-separated list if multiple values were added.
+
+=item C<removed> (C<string>) The values that were removed from this
+field, possibly a comma-and-space-separated list if multiple values were
+removed.
+
+=back
+
+=back
+
+Here's an example of what a return value might look like:
+
+ {
+   bugs => [
+     {
+       id    => 123,
+       alias => [ 'foo' ],
+       last_change_time => '2010-01-01T12:34:56',
+       changes => {
+         status => {
+           removed => 'NEW',
+           added   => 'ASSIGNED'
+         },
+         keywords => {
+           removed => 'bar',
+           added   => 'qux, quo, qui',
+         }
+       },
+     }
+   ]
+ }
+
+Currently, some fields are not tracked in changes: C<comment>,
+C<comment_is_private>, and C<work_time>. This means that they will not
+show up in the return value even if they were successfully updated.
+This may change in a future version of Bugzilla.
+
+=item B<Errors>
+
+This function can throw all of the errors that L</get>, L</create>,
+and L</add_comment> can throw, plus:
+
+=over
+
+=item 50 (Empty Field)
+
+You tried to set some field to be empty, but that field cannot be empty.
+The error message will have more details.
+
+=item 52 (Input Not A Number)
+
+You tried to set a numeric field to a value that wasn't numeric.
+
+=item 54 (Number Too Large)
+
+You tried to set a numeric field to a value larger than that field can
+accept.
+
+=item 55 (Number Too Small)
+
+You tried to set a negative value in a numeric field that does not accept
+negative values.
+
+=item 56 (Bad Date/Time)
+
+You specified an invalid date or time in a date/time field (such as
+the C<deadline> field or a custom date/time field).
+
+=item 112 (See Also Invalid)
+
+You attempted to add an invalid value to the C<see_also> field.
+
+=item 115 (Permission Denied)
+
+You don't have permission to change a particular field to a particular value.
+The error message will have more detail.
+
+=item 116 (Dependency Loop)
+
+You specified a value in the C<blocks> or C<depends_on> fields that causes
+a dependency loop.
+
+=item 117 (Invalid Comment ID)
+
+You specified a comment id in C<comment_is_private> that isn't on this bug.
+
+=item 118 (Duplicate Loop)
+
+You specified a value for C<dupe_of> that causes an infinite loop of
+duplicates.
+
+=item 119 (dupe_of Required)
+
+You changed the resolution to C<DUPLICATE> but did not specify a value
+for the C<dupe_of> field.
+
+=item 120 (Group Add/Remove Denied)
+
+You tried to add or remove a group that you don't have permission to modify
+for this bug, or you tried to add a group that isn't valid in this product.
+
+=item 121 (Resolution Required)
+
+You tried to set the C<status> field to a closed status, but you didn't
+specify a resolution.
+
+=item 122 (Resolution On Open Status)
+
+This bug has an open status, but you specified a value for the C<resolution>
+field.
+
+=item 123 (Invalid Status Transition)
+
+You tried to change from one status to another, but the status workflow
+rules don't allow that change.
+
+=item 129 (Flag Status Invalid)
+
+The flag status is invalid.
+
+=item 130 (Flag Modification Denied)
+
+You tried to request, grant, or deny a flag but only a user with the required
+permissions may make the change.
+
+=item 131 (Flag not Requestable from Specific Person)
+
+You can't ask a specific person for the flag.
+
+=item 132 (Flag not Unique)
+
+The flag specified has been set multiple times. You must specify the id
+value to update the flag.
+
+=item 133 (Flag Type not Unique)
+
+The flag type specified matches several flag types. You must specify
+the type id value to update or add a flag.
+
+=item 134 (Inactive Flag Type)
+
+The flag type is inactive and cannot be used to create new flags.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.0>.
+
+=item REST API call added Bugzilla B<5.0>.
+
+=back
+
+=back
+
+
+=head2 update_see_also
+
+=over
+
+=item B<Description>
+
+Adds or removes URLs for the "See Also" field on bugs. These URLs must
+point to some valid bug in some Bugzilla installation or in Launchpad.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+Array of C<int>s or C<string>s. The ids or aliases of bugs that you want
+to modify.
+
+=item C<add>
+
+Array of C<string>s. URLs to Bugzilla bugs. These URLs will be added to
+the See Also field. They must be valid URLs to C<show_bug.cgi> in a
+Bugzilla installation or to a bug filed at launchpad.net.
+
+If the URLs don't start with C<http://> or C<https://>, it will be assumed
+that C<http://> should be added to the beginning of the string.
+
+It is safe to specify URLs that are already in the "See Also" field on
+a bug--they will just be silently ignored.
+
+=item C<remove>
+
+Array of C<string>s. These URLs will be removed from the See Also field.
+You must specify the full URL that you want removed. However, matching
+is done case-insensitively, so you don't have to specify the URL in
+exact case, if you don't want to.
+
+If you specify a URL that is not in the See Also field of a particular bug,
+it will just be silently ignored. Invaild URLs are currently silently ignored,
+though this may change in some future version of Bugzilla.
+
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
+=back
+
+NOTE: If you specify the same URL in both C<add> and C<remove>, it will
+be I<added>. (That is, C<add> overrides C<remove>.)
+
+=item B<Returns>
+
+C<changes>, a hash where the keys are numeric bug ids and the contents
+are a hash with one key, C<see_also>. C<see_also> points to a hash, which
+contains two keys, C<added> and C<removed>. These are arrays of strings,
+representing the actual changes that were made to the bug.
+
+Here's a diagram of what the return value looks like for updating
+bug ids 1 and 2:
+
+ {
+   changes => {
+       1 => {
+           see_also => {
+               added   => (an array of bug URLs),
+               removed => (an array of bug URLs),
+           }
+       },
+       2 => {
+           see_also => {
+               added   => (an array of bug URLs),
+               removed => (an array of bug URLs),
+           }
+       }
+   }
+ }
+
+This return value allows you to tell what this method actually did. It is in
+this format to be compatible with the return value of a future C<Bug.update>
+method.
+
+=item B<Errors>
+
+This method can throw all of the errors that L</get> throws, plus:
+
+=over
+
+=item 109 (Bug Edit Denied)
+
+You did not have the necessary rights to edit the bug.
+
+=item 112 (Invalid Bug URL)
+
+One of the URLs you provided did not look like a valid bug URL.
+
+=item 115 (See Also Edit Denied)
+
+You did not have the necessary rights to edit the See Also field for
+this bug.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.4>.
+
+=item Before Bugzilla B<3.6>, error 115 had a generic error code of 32000.
+
+=back
+
+=back
+
+
+=head2 update_tags
+
+=over
+
+=item B<Description>
+
+Adds or removes tags on bugs.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+B<Required> C<array> An array of ints and/or strings--the ids
+or aliases of bugs that you want to add or remove tags to. All the tags
+will be added or removed to all these bugs.
+
+=item C<tags>
+
+B<Required> C<hash> A hash representing tags to be added and/or removed.
+The hash has the following fields:
+
+=over
+
+=item C<add> An array of C<string>s representing tag names
+to be added to the bugs.
+
+It is safe to specify tags that are already associated with the
+bugs--they will just be silently ignored.
+
+=item C<remove> An array of C<string>s representing tag names
+to be removed from the bugs.
+
+It is safe to specify tags that are not associated with any
+bugs--they will just be silently ignored.
+
+=back
+
+=back
+
+=item B<Returns>
+
+C<changes>, a hash containing bug IDs as keys and one single value
+name "tags" which is also a hash, with C<added> and C<removed> as keys.
+See L</update_see_also> for an example of how it looks like.
+
+=item B<Errors>
+
+This method can throw the same errors as L</get>.
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.4>.
+
+=back
+
+=back
+
+=head2 search_comment_tags
+
+=over
+
+=item B<Description>
+
+Searches for tags which contain the provided substring.
+
+=item B<REST>
+
+To search for comment tags:
+
+GET /rest/bug/comment/tags/<query>
+
+=item B<Params>
+
+=over
+
+=item C<query>
+
+B<Required> C<string> Only tags containing this substring will be returned.
+
+=item C<limit>
+
+C<int> If provided will return no more than C<limit> tags.  Defaults to C<10>.
+
+=back
+
+=item B<Returns>
+
+An C<array of strings> of matching tags.
+
+=item B<Errors>
+
+This method can throw all of the errors that L</get> throws, plus:
+
+=over
+
+=item 125 (Comment Tagging Disabled)
+
+Comment tagging support is not available or enabled.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 update_comment_tags
+
+=over
+
+=item B<Description>
+
+Adds or removes tags from a comment.
+
+=item B<REST>
+
+To update the tags comments attached to a comment:
+
+PUT /rest/bug/comment/tags
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+=over
+
+=item C<comment_id>
+
+B<Required> C<int> The ID of the comment to update.
+
+=item C<add>
+
+C<array of strings> The tags to attach to the comment.
+
+=item C<remove>
+
+C<array of strings> The tags to detach from the comment.
+
+=back
+
+=item B<Returns>
+
+An C<array of strings> containing the comment's updated tags.
+
+=item B<Errors>
+
+This method can throw all of the errors that L</get> throws, plus:
+
+=over
+
+=item 125 (Comment Tagging Disabled)
+
+Comment tagging support is not available or enabled.
+
+=item 126 (Invalid Comment Tag)
+
+The comment tag provided was not valid (eg. contains invalid characters).
+
+=item 127 (Comment Tag Too Short)
+
+The comment tag provided is shorter than the minimum length.
+
+=item 128 (Comment Tag Too Long)
+
+The comment tag provided is longer than the maximum length.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 render_comment
+
+=over
+
+=item B<Description>
+
+Returns the HTML rendering of the provided comment text.
+
+=item B<Params>
+
+=over
+
+=item C<text>
+
+B<Required> C<strings> Text comment text to render.
+
+=item C<id>
+
+C<int> The ID of the bug to render the comment against.
+
+=back
+
+=item B<Returns>
+
+C<html> containing the HTML rendering.
+
+=item B<Errors>
+
+This method can throw all of the errors that L</get> throws.
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 SEE ALSO
+
+=over
+
+=item L<Bugzilla::API::1_0::Resource>
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/BugUserLastVisit.pm b/Bugzilla/API/1_0/Resource/BugUserLastVisit.pm
new file mode 100644
index 0000000000..3264e069fe
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/BugUserLastVisit.pm
@@ -0,0 +1,237 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::BugUserLastVisit;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Bug;
+use Bugzilla::Error;
+use Bugzilla::Constants;
+
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+use constant READ_ONLY => qw(
+  get
+);
+
+use constant PUBLIC_METHODS => qw(
+  get
+  update
+);
+
+sub REST_RESOURCES {
+  use re '/a';
+  return [
+    # bug-id
+    qr{^/bug_user_last_visit/(\d+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          return {ids => [$_[0]]};
+        },
+      },
+      POST => {
+        method => 'update',
+        params => sub {
+          return {ids => [$_[0]]};
+        },
+      },
+    },
+  ];
+}
+
+############
+# Methods  #
+############
+
+sub update {
+  my ($self, $params) = validate(@_, 'ids');
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
+
+  $user->login(LOGIN_REQUIRED);
+
+  my $ids = $params->{ids} // [];
+  ThrowCodeError('param_required', {param => 'ids'}) unless @$ids;
+
+  # Cache permissions for bugs. This highly reduces the number of calls to the
+  # DB.  visible_bugs() is only able to handle bug IDs, so we have to skip
+  # aliases.
+  $user->visible_bugs([grep /^[0-9]+$/, @$ids]);
+
+  $dbh->bz_start_transaction();
+  my @results;
+  my $last_visit_ts = $dbh->selectrow_array('SELECT NOW()');
+  foreach my $bug_id (@$ids) {
+    my $bug = Bugzilla::Bug->check({id => $bug_id, cache => 1});
+
+    ThrowUserError('user_not_involved', {bug_id => $bug->id})
+      unless $user->is_involved_in_bug($bug);
+
+    $bug->update_user_last_visit($user, $last_visit_ts);
+
+    push(@results,
+      _bug_user_last_visit_to_hash($bug->bug_id, $last_visit_ts, $params));
+  }
+  $dbh->bz_commit_transaction();
+
+  return \@results;
+}
+
+sub get {
+  my ($self, $params) = validate(@_, 'ids');
+  my $user = Bugzilla->user;
+  my $ids  = $params->{ids};
+
+  $user->login(LOGIN_REQUIRED);
+
+  my @last_visits;
+  if ($ids) {
+
+    # Cache permissions for bugs. This highly reduces the number of calls to
+    # the DB.  visible_bugs() is only able to handle bug IDs, so we have to
+    # skip aliases.
+    $user->visible_bugs([grep /^[0-9]+$/, @$ids]);
+
+    my %last_visit
+      = map { $_->bug_id => $_->last_visit_ts } @{$user->last_visited($ids)};
+    @last_visits
+      = map { _bug_user_last_visit_to_hash($_, $last_visit{$_}, $params) } @$ids;
+  }
+  else {
+    @last_visits
+      = map { _bug_user_last_visit_to_hash($_->bug_id, $_->last_visit_ts, $params) }
+      @{$user->last_visited};
+  }
+
+  return \@last_visits;
+}
+
+sub _bug_user_last_visit_to_hash {
+  my ($bug_id, $last_visit_ts, $params) = @_;
+
+  my %result
+    = (id => as_int($bug_id), last_visit_ts => as_datetime($last_visit_ts));
+
+  return filter($params, \%result);
+}
+
+1;
+
+__END__
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::BugUserLastVisit - Find and Store the last time a
+user visited a bug.
+
+=head1 METHODS
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+Update the last visit time for the specified bug and current user.
+
+=item B<REST>
+
+To add a single bug id:
+
+    POST /rest/bug_user_last_visit/<bug-id>
+
+Tp add one or more bug ids at once:
+
+    POST /rest/bug_user_last_visit
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+=over
+
+=item C<ids> (array) - One or more bug ids to add.
+
+=back
+
+=item B<Returns>
+
+=over
+
+=item C<array> - An array of hashes containing the following:
+
+=over
+
+=item C<id> - (int) The bug id.
+
+=item C<last_visit_ts> - (string) The timestamp the user last visited the bug.
+
+=back
+
+=back
+
+=back
+
+=head2 get
+
+=over
+
+=item B<Description>
+
+Get the last visited timestamp for one or more specified bug ids.
+
+=item B<REST>
+
+To return the last visited timestamp for a single bug id:
+
+    GET /rest/bug_user_last_visit/<bug-id>
+
+=item B<Params>
+
+=over
+
+=item C<ids> (integer) - One or more optional bug ids to get.
+
+=back
+
+=item B<Returns>
+
+=over
+
+=item C<array> - An array of hashes containing the following:
+
+=over
+
+=item C<id> - (int) The bug id.
+
+=item C<last_visit_ts> - (string) The timestamp the user last visited the bug.
+
+=back
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/Bugzilla.pm b/Bugzilla/API/1_0/Resource/Bugzilla.pm
new file mode 100644
index 0000000000..e88b175696
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/Bugzilla.pm
@@ -0,0 +1,513 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Bugzilla;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Constants;
+use Bugzilla::Util qw(datetime_from trick_taint);
+
+use DateTime;
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+# Basic info that is needed before logins
+use constant LOGIN_EXEMPT => {parameters => 1, timezone => 1, version => 1,};
+
+use constant READ_ONLY => qw(
+  extensions
+  last_audit_time
+  parameters
+  timezone
+  time
+  version
+);
+
+use constant PUBLIC_METHODS => qw(
+  extensions
+  last_audit_time
+  parameters
+  time
+  timezone
+  version
+);
+
+# Logged-out users do not need to know more than that.
+use constant PARAMETERS_LOGGED_OUT => qw(
+  maintainer
+  requirelogin
+);
+
+# These parameters are guessable from the web UI when the user
+# is logged in. So it's safe to access them.
+use constant PARAMETERS_LOGGED_IN => qw(
+  allowemailchange
+  attachment_base
+  commentonchange_resolution
+  commentonduplicate
+  defaultopsys
+  defaultplatform
+  defaultpriority
+  defaultseverity
+  duplicate_or_move_bug_status
+  emailregexpdesc
+  letsubmitterchoosemilestone
+  letsubmitterchoosepriority
+  mailfrom
+  maintainer
+  maxattachmentsize
+  maxlocalattachment
+  noresolveonopenblockers
+  password_complexity
+  rememberlogin
+  requirelogin
+  search_allow_no_criteria
+  urlbase
+  use_email_as_login
+  use_see_also
+  useclassification
+  usemenuforusers
+  useqacontact
+  usestatuswhiteboard
+  usetargetmilestone
+);
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/version$},         {GET => {method => 'version'}},
+    qr{^/extensions$},      {GET => {method => 'extensions'}},
+    qr{^/timezone$},        {GET => {method => 'timezone'}},
+    qr{^/time$},            {GET => {method => 'time'}},
+    qr{^/last_audit_time$}, {GET => {method => 'last_audit_time'}},
+    qr{^/parameters$},      {GET => {method => 'parameters'}}
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+sub version {
+  my $self = shift;
+  return {version => as_string(BUGZILLA_VERSION)};
+}
+
+sub extensions {
+  my $self = shift;
+
+  my %retval;
+  foreach my $extension (@{Bugzilla->extensions}) {
+    my $version = $extension->VERSION || 0;
+    my $name = $extension->NAME;
+    $retval{$name}->{version} = as_string($version);
+  }
+  return {extensions => \%retval};
+}
+
+sub timezone {
+  my $self = shift;
+
+  # All Webservices return times in UTC; Use UTC here for backwards compat.
+  return {timezone => as_string("+0000")};
+}
+
+sub time {
+  my ($self) = @_;
+
+  # All Webservices return times in UTC; Use UTC here for backwards compat.
+  # Hardcode values where appropriate
+  my $dbh = Bugzilla->dbh;
+
+  my $db_time = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  $db_time = datetime_from($db_time, 'UTC');
+  my $now_utc = DateTime->now();
+
+  return {db_time => as_datetime($db_time), web_time => as_datetime($now_utc),};
+}
+
+sub last_audit_time {
+  my ($self, $params) = validate(@_, 'class');
+  my $dbh = Bugzilla->dbh;
+
+  my $sql_statement = "SELECT MAX(at_time) FROM audit_log";
+  my $class_values  = $params->{class};
+  my @class_values_quoted;
+  foreach my $class_value (@$class_values) {
+    push(@class_values_quoted, $dbh->quote($class_value))
+      if $class_value =~ /^Bugzilla(::[a-zA-Z0-9_]+)*$/;
+  }
+
+  if (@class_values_quoted) {
+    $sql_statement .= " WHERE " . $dbh->sql_in('class', \@class_values_quoted);
+  }
+
+  my $last_audit_time = $dbh->selectrow_array("$sql_statement");
+
+  # All Webservices return times in UTC; Use UTC here for backwards compat.
+  # Hardcode values where appropriate
+  $last_audit_time = datetime_from($last_audit_time, 'UTC');
+
+  return {last_audit_time => as_datetime($last_audit_time)};
+}
+
+sub parameters {
+  my ($self, $args) = @_;
+  my $user   = Bugzilla->login(LOGIN_OPTIONAL);
+  my $params = Bugzilla->params;
+  $args ||= {};
+
+  my @params_list
+    = $user->in_group('tweakparams') ? keys(%$params)
+    : $user->id                      ? PARAMETERS_LOGGED_IN
+    :                                  PARAMETERS_LOGGED_OUT;
+
+  my %parameters;
+  foreach my $param (@params_list) {
+    next unless filter_wants($args, $param);
+    $parameters{$param} = as_string($params->{$param});
+  }
+
+  return {parameters => \%parameters};
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::Bugzilla - Global functions for the webservice interface.
+
+=head1 DESCRIPTION
+
+This provides functions that tell you about Bugzilla in general.
+
+=head1 METHODS
+
+=head2 version
+
+=over
+
+=item B<Description>
+
+Returns the current version of Bugzilla.
+
+=item B<REST>
+
+GET /rest/version
+
+The returned data format is the same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash with a single item, C<version>, that is the version as a
+string.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 extensions
+
+=over
+
+=item B<Description>
+
+Gets information about the extensions that are currently installed and enabled
+in this Bugzilla.
+
+=item B<REST>
+
+GET /rest/extensions
+
+The returned data format is the same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash with a single item, C<extensions>. This points to a hash. I<That> hash
+contains the names of extensions as keys, and the values are a hash.
+That hash contains a single key C<version>, which is the version of the
+extension, or C<0> if the extension hasn't defined a version.
+
+The return value looks something like this:
+
+ extensions => {
+     Example => {
+         version => '3.6',
+     },
+     BmpConvert => {
+         version => '1.0',
+     },
+ }
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.2>.
+
+=item As of Bugzilla B<3.6>, the names of extensions are canonical names
+that the extensions define themselves. Before 3.6, the names of the
+extensions depended on the directory they were in on the Bugzilla server.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 timezone
+
+B<DEPRECATED> This method may be removed in a future version of Bugzilla.
+Use L</time> instead.
+
+=over
+
+=item B<Description>
+
+Returns the timezone that Bugzilla expects dates and times in.
+
+=item B<REST>
+
+GET /rest/timezone
+
+The returned data format is the same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash with a single item, C<timezone>, that is the timezone offset as a
+string in (+/-)XXXX (RFC 2822) format.
+
+=item B<History>
+
+=over
+
+=item As of Bugzilla B<3.6>, the timezone returned is always C<+0000>
+(the UTC timezone).
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+
+=head2 time
+
+=over
+
+=item B<Description>
+
+Gets information about what time the Bugzilla server thinks it is, and
+what timezone it's running in.
+
+=item B<REST>
+
+GET /rest/time
+
+The returned data format is the same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A struct with the following items:
+
+=over
+
+=item C<db_time>
+
+C<dateTime> The current time in UTC, according to the Bugzilla
+I<database server>.
+
+Note that Bugzilla assumes that the database and the webserver are running
+in the same time zone. However, if the web server and the database server
+aren't synchronized for some reason, I<this> is the time that you should
+rely on for doing searches and other input to the WebService.
+
+=item C<web_time>
+
+C<dateTime> This is the current time in UTC, according to Bugzilla's
+I<web server>.
+
+This might be different by a second from C<db_time> since this comes from
+a different source. If it's any more different than a second, then there is
+likely some problem with this Bugzilla instance. In this case you should
+rely on the C<db_time>, not the C<web_time>.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.4>.
+
+=item As of Bugzilla B<3.6>, this method returns all data as though the server
+were in the UTC timezone, instead of returning information in the server's
+local timezone.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 parameters
+
+=over
+
+=item B<Description>
+
+Returns parameter values currently used in this Bugzilla.
+
+=item B<REST>
+
+GET /rest/parameters
+
+The returned data format is the same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash with a single item C<parameters> which contains a hash with
+the name of the parameters as keys and their value as values. All
+values are returned as strings.
+The list of parameters returned by this method depends on the user
+credentials:
+
+A logged-out user can only access the C<maintainer> and C<requirelogin> parameters.
+
+A logged-in user can access the following parameters (listed alphabetically):
+    C<allowemailchange>,
+    C<attachment_base>,
+    C<commentonchange_resolution>,
+    C<commentonduplicate>,
+    C<defaultopsys>,
+    C<defaultplatform>,
+    C<defaultpriority>,
+    C<defaultseverity>,
+    C<duplicate_or_move_bug_status>,
+    C<emailregexpdesc>,
+    C<letsubmitterchoosemilestone>,
+    C<letsubmitterchoosepriority>,
+    C<mailfrom>,
+    C<maintainer>,
+    C<maxattachmentsize>,
+    C<maxlocalattachment>,
+    C<noresolveonopenblockers>,
+    C<password_complexity>,
+    C<rememberlogin>,
+    C<requirelogin>,
+    C<search_allow_no_criteria>,
+    C<urlbase>,
+    C<use_email_as_login>,
+    C<use_see_also>,
+    C<useclassification>,
+    C<usemenuforusers>,
+    C<useqacontact>,
+    C<usestatuswhiteboard>,
+    C<usetargetmilestone>.
+
+A user in the tweakparams group can access all existing parameters.
+New parameters can appear or obsolete parameters can disappear depending
+on the version of Bugzilla and on extensions being installed.
+The list of parameters returned by this method is not stable and will
+never be stable.
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 last_audit_time
+
+=over
+
+=item B<Description>
+
+Gets the latest time of the audit_log table.
+
+=item B<REST>
+
+GET /rest/last_audit_time
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+You can pass the optional parameter C<class> to get the maximum for only
+the listed classes.
+
+=over
+
+=item C<class> (array) - An array of strings representing the class names.
+
+B<Note:> The class names are defined as "Bugzilla::<class_name>". For the product
+use Bugzilla:Product.
+
+=back
+
+=item B<Returns>
+
+A hash with a single item, C<last_audit_time>, that is the maximum of the
+at_time from the audit_log.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/Classification.pm b/Bugzilla/API/1_0/Resource/Classification.pm
new file mode 100644
index 0000000000..acf089663e
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/Classification.pm
@@ -0,0 +1,247 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Classification;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Classification;
+use Bugzilla::Error;
+
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+use constant READ_ONLY => qw(
+  get
+);
+
+use constant PUBLIC_METHODS => qw(
+  get
+);
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/classification/([^/]+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      }
+    }
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+sub get {
+  my ($self, $params) = validate(@_, 'names', 'ids');
+
+  defined $params->{names}
+    || defined $params->{ids}
+    || ThrowCodeError('params_required',
+    {function => 'Classification.get', params => ['names', 'ids']});
+
+  my $user = Bugzilla->user;
+
+  Bugzilla->params->{'useclassification'}
+    || $user->in_group('editclassifications')
+    || ThrowUserError('auth_classification_not_enabled');
+
+  Bugzilla->switch_to_shadow_db;
+
+  my @classification_objs
+    = @{params_to_objects($params, 'Bugzilla::Classification')};
+  unless ($user->in_group('editclassifications')) {
+    my %selectable_class
+      = map { $_->id => 1 } @{$user->get_selectable_classifications};
+    @classification_objs = grep { $selectable_class{$_->id} } @classification_objs;
+  }
+
+  my @classifications
+    = map { $self->_classification_to_hash($_, $params) } @classification_objs;
+
+  return {classifications => \@classifications};
+}
+
+sub _classification_to_hash {
+  my ($self, $classification, $params) = @_;
+
+  my $user = Bugzilla->user;
+  return
+    unless (Bugzilla->params->{'useclassification'}
+    || $user->in_group('editclassifications'));
+
+  my $products
+    = $user->in_group('editclassifications')
+    ? $classification->products
+    : $user->get_selectable_products($classification->id);
+
+  return filter $params,
+    {
+    id          => as_int($classification->id),
+    name        => as_string($classification->name),
+    description => as_string($classification->description),
+    sort_key    => as_int($classification->sortkey),
+    products    => [map { $self->_product_to_hash($_, $params) } @$products],
+    };
+}
+
+sub _product_to_hash {
+  my ($self, $product, $params) = @_;
+
+  return filter $params,
+    {
+    id          => as_int($product->id),
+    name        => as_string($product->name),
+    description => as_string($product->description),
+    },
+    undef, 'products';
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::Classification - The Classification API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to deal with the available Classifications.
+You will be able to get information about them as well as manipulate them.
+
+=head1 METHODS
+
+=head2 get
+
+=over
+
+=item B<Description>
+
+Returns a hash containing information about a set of classifications.
+
+=item B<REST>
+
+To return information on a single classification:
+
+GET /rest/classification/<classification_id_or_name>
+
+The returned data format will be the same as below.
+
+=item B<Params>
+
+In addition to the parameters below, this method also accepts the
+standard L<include_fields|Bugzilla::API::1_0::Resource/include_fields> and
+L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+You could get classifications info by supplying their names and/or ids.
+So, this method accepts the following parameters:
+
+=over
+
+=item C<ids>
+
+An array of classification ids.
+
+=item C<names>
+
+An array of classification names.
+
+=back
+
+=item B<Returns>
+
+A hash with the key C<classifications> and an array of hashes as the corresponding value.
+Each element of the array represents a classification that the user is authorized to see
+and has the following keys:
+
+=over
+
+=item C<id>
+
+C<int> The id of the classification.
+
+=item C<name>
+
+C<string> The name of the classification.
+
+=item C<description>
+
+C<string> The description of the classificaion.
+
+=item C<sort_key>
+
+C<int> The value which determines the order the classification is sorted.
+
+=item C<products>
+
+An array of hashes. The array contains the products the user is authorized to
+access within the classification. Each hash has the following keys:
+
+=over
+
+=item C<name>
+
+C<string> The name of the product.
+
+=item C<id>
+
+C<int> The id of the product.
+
+=item C<description>
+
+C<string> The description of the product.
+
+=back
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 900 (Classification not enabled)
+
+Classification is not enabled on this installation.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/Component.pm b/Bugzilla/API/1_0/Resource/Component.pm
new file mode 100644
index 0000000000..c930d24b0c
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/Component.pm
@@ -0,0 +1,631 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Component;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(STATUS_CREATED);
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Component;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+use constant PUBLIC_METHODS => qw(
+  create
+  delete
+  update
+);
+
+use constant CREATE_MAPPED_FIELDS => {
+  default_assignee   => 'initialowner',
+  default_qa_contact => 'initialqacontact',
+  default_cc         => 'initial_cc',
+  is_open            => 'isactive',
+};
+
+use constant MAPPED_FIELDS => {is_open => 'is_active',};
+
+use constant MAPPED_RETURNS => {
+  initialowner     => 'default_assignee',
+  initialqacontact => 'default_qa_contact',
+  cc_list          => 'default_cc',
+  isactive         => 'isopen',
+};
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/component$},
+    {POST => {method => 'create', success_code => STATUS_CREATED}},
+    qr{^/component/(\d+)$},
+    {
+      PUT => {
+        method => 'update',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      },
+      DELETE => {
+        method => 'delete',
+        params => sub {
+          return {ids => [$_[0]]};
+        }
+      },
+    },
+    qr{^/component/([^/]+)/([^/]+)$},
+    {
+      PUT => {
+        method => 'update',
+        params => sub {
+          return {names => [{product => $_[0], component => $_[1]}]};
+        }
+      },
+      DELETE => {
+        method => 'delete',
+        params => sub {
+          return {names => [{product => $_[0], component => $_[1]}]};
+        }
+      },
+    },
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+sub create {
+  my ($self, $params) = @_;
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar @{$user->get_products_by_permission('editcomponents')}
+    || ThrowUserError('auth_failure',
+    {group => 'editcomponents', action => 'edit', object => 'components'});
+
+  my $product = $user->check_can_admin_product($params->{product});
+
+  # Translate the fields
+  my $values = translate($params, CREATE_MAPPED_FIELDS);
+  $values->{product} = $product;
+
+  # Create the component and return the newly created id.
+  my $component = Bugzilla::Component->create($values);
+  return {id => as_int($component->id)};
+}
+
+sub _component_params_to_objects {
+
+  # We can't use Util's _param_to_objects since name is a hash
+  my $params = shift;
+  my $user   = Bugzilla->user;
+
+  my @components = ();
+
+  if (defined $params->{ids}) {
+    push @components, @{Bugzilla::Component->new_from_list($params->{ids})};
+  }
+
+  if (defined $params->{names}) {
+
+    # To get the component objects for product/component combination
+    # first obtain the product object from the passed product name
+    foreach my $name_hash (@{$params->{names}}) {
+      my $product = $user->check_can_admin_product($name_hash->{product});
+      push @components,
+        @{Bugzilla::Component->match({
+          product_id => $product->id, name => $name_hash->{component}
+        })};
+    }
+  }
+
+  my %seen_component_ids = ();
+
+  my @accessible_components;
+  foreach my $component (@components) {
+
+    # Skip if we already included this component
+    next if $seen_component_ids{$component->id}++;
+
+    # Can the user see and admin this product?
+    my $product = $component->product;
+    $user->check_can_admin_product($product->name);
+
+    push @accessible_components, $component;
+  }
+
+  return \@accessible_components;
+}
+
+sub update {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar @{$user->get_products_by_permission('editcomponents')}
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "components"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Component.update', params => ['ids', 'names']});
+
+  my $component_objects = _component_params_to_objects($params);
+
+  # If the user tries to change component name for several
+  # components of the same product then throw an error
+  if ($params->{name}) {
+    my %unique_product_comps;
+    foreach my $comp (@$component_objects) {
+      if ($unique_product_comps{$comp->product_id}) {
+        ThrowUserError("multiple_components_update_not_allowed");
+      }
+      else {
+        $unique_product_comps{$comp->product_id} = 1;
+      }
+    }
+  }
+
+  my $values = translate($params, MAPPED_FIELDS);
+
+  # We delete names and ids to keep only new values to set.
+  delete $values->{names};
+  delete $values->{ids};
+
+  $dbh->bz_start_transaction();
+  foreach my $component (@$component_objects) {
+    $component->set_all($values);
+  }
+
+  my %changes;
+  foreach my $component (@$component_objects) {
+    my $returned_changes = $component->update();
+    $changes{$component->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $component (@$component_objects) {
+    my %hash = (id => $component->id, changes => {},);
+
+    foreach my $field (keys %{$changes{$component->id}}) {
+      my $change = $changes{$component->id}->{$field};
+
+      if ( $field eq 'default_assignee'
+        || $field eq 'default_qa_contact'
+        || $field eq 'default_cc')
+      {
+        # We need to convert user ids to login names
+        my @old_user_ids = split(/[,\s]+/, $change->[0]);
+        my @new_user_ids = split(/[,\s]+/, $change->[1]);
+
+        my @old_users
+          = map { $_->login } @{Bugzilla::User->new_from_list(\@old_user_ids)};
+        my @new_users
+          = map { $_->login } @{Bugzilla::User->new_from_list(\@new_user_ids)};
+
+        $hash{changes}{$field} = {
+          removed => as_string(join(', ', @old_users)),
+          added   => as_string(join(', ', @new_users)),
+        };
+      }
+      else {
+        $hash{changes}{$field}
+          = {removed => as_string($change->[0]), added => as_string($change->[1])};
+      }
+    }
+
+    push(@result, \%hash);
+  }
+
+  return {components => \@result};
+}
+
+sub delete {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar @{$user->get_products_by_permission('editcomponents')}
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "components"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Component.delete', params => ['ids', 'names']});
+
+  my $component_objects = _component_params_to_objects($params);
+
+  $dbh->bz_start_transaction();
+  my %changes;
+  foreach my $component (@$component_objects) {
+    my $returned_changes = $component->remove_from_db();
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $component (@$component_objects) {
+    push @result, {id => $component->id};
+  }
+
+  return {components => \@result};
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::Component - The Component API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to deal with the available product components.
+You will be able to get information about them as well as manipulate them.
+
+=head1 METHODS
+
+=head2 create
+
+=over
+
+=item B<Description>
+
+This allows you to create a new component in Bugzilla.
+
+=item B<Params>
+
+Some params must be set, or an error will be thrown. These params are
+marked B<Required>.
+
+=over
+
+=item C<name>
+
+B<Required> C<string> The name of the new component.
+
+=item C<product>
+
+B<Required> C<string> The name of the product that the component must be
+added to. This product must already exist, and the user have the necessary
+permissions to edit components for it.
+
+=item C<description>
+
+B<Required> C<string> The description of the new component.
+
+=item C<default_assignee>
+
+B<Required> C<string> The login name of the default assignee of the component.
+
+=item C<default_cc>
+
+C<array> An array of strings with each element representing one login name of the default CC list.
+
+=item C<default_qa_contact>
+
+C<string> The login name of the default QA contact for the component.
+
+=item C<is_open>
+
+C<boolean> 1 if you want to enable the component for bug creations. 0 otherwise. Default is 1.
+
+=back
+
+=item B<Returns>
+
+A hash with one key: C<id>. This will represent the ID of the newly-added
+component.
+
+=item B<Errors>
+
+=over
+
+=item 304 (Authorization Failure)
+
+You are not authorized to create a new component.
+
+=item 1200 (Component already exists)
+
+The name that you specified for the new component already exists in the
+specified product.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+This allows you to update one or more components in Bugzilla.
+
+=item B<REST>
+
+PUT /rest/component/<component_id>
+
+PUT /rest/component/<product_name>/<component_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
+=item B<Params>
+
+B<Note:> The following parameters specify which components you are updating.
+You must set one or both of these parameters.
+
+=over
+
+=item C<ids>
+
+C<array> of C<int>s. Numeric ids of the components that you wish to update.
+
+=item C<names>
+
+C<array> of C<hash>es. Names of the components that you wish to update. The
+hash keys are C<product> and C<component>, representing the name of the product
+and the component you wish to change.
+
+=back
+
+B<Note:> The following parameters specify the new values you want to set for
+the components you are updating.
+
+=over
+
+=item C<name>
+
+C<string> A new name for this component. If you try to set this while updating
+more than one component for a product, an error will occur, as component names
+must be unique per product.
+
+=item C<description>
+
+C<string> Update the long description for these components to this value.
+
+=item C<default_assignee>
+
+C<string> The login name of the default assignee of the component.
+
+=item C<default_cc>
+
+C<array> An array of strings with each element representing one login name of the default CC list.
+
+=item C<default_qa_contact>
+
+C<string> The login name of the default QA contact for the component.
+
+=item C<is_open>
+
+C<boolean> True if the component is currently allowing bugs to be entered
+into it, False otherwise.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "components". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the component that was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this component. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added>
+
+C<string> The value that this field was changed to.
+
+=item C<removed>
+
+C<string> The value that was previously set in this field.
+
+=back
+
+Note that booleans will be represented with the strings '1' and '0'.
+
+Here's an example of what a return value might look like:
+
+ {
+   components => [
+     {
+       id => 123,
+       changes => {
+         name => {
+           removed => 'FooName',
+           added   => 'BarName'
+         },
+         default_assignee => {
+           removed => 'foo@company.com',
+           added   => 'bar@company.com',
+         }
+       }
+     }
+   ]
+ }
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (User does not exist)
+
+One of the contact e-mail addresses is not a valid Bugzilla user.
+
+=item 106 (Product access denied)
+
+The product you are trying to modify does not exist or you don't have access to it.
+
+=item 706 (Product admin denied)
+
+You do not have the permission to change components for this product.
+
+=item 105 (Component name too long)
+
+The name specified for this component was longer than the maximum
+allowed length.
+
+=item 1200 (Component name already exists)
+
+You specified the name of a component that already exists.
+(Component names must be unique per product in Bugzilla.)
+
+=item 1210 (Component blank name)
+
+You must specify a non-blank name for this component.
+
+=item 1211 (Component must have description)
+
+You must specify a description for this component.
+
+=item 1212 (Component name is not unique)
+
+You have attempted to set more than one component in the same product with the
+same name. Component names must be unique in each product.
+
+=item 1213 (Component needs a default assignee)
+
+A default assignee is required for this component.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 delete
+
+=over
+
+=item B<Description>
+
+This allows you to delete one or more components in Bugzilla.
+
+=item B<REST>
+
+DELETE /rest/component/<component_id>
+
+DELETE /rest/component/<product_name>/<component_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
+=item B<Params>
+
+B<Note:> The following parameters specify which components you are deleting.
+You must set one or both of these parameters.
+
+=over
+
+=item C<ids>
+
+C<array> of C<int>s. Numeric ids of the components that you wish to delete.
+
+=item C<names>
+
+C<array> of C<hash>es. Names of the components that you wish to delete. The
+hash keys are C<product> and C<component>, representing the name of the product
+and the component you wish to delete.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "components". This points to an array of hashes
+with the following field:
+
+=over
+
+=item C<id>
+
+C<int> The id of the component that was deleted.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 106 (Product access denied)
+
+The product you are trying to modify does not exist or you don't have access to it.
+
+=item 706 (Product admin denied)
+
+You do not have the permission to delete components for this product.
+
+=item 1202 (Component has bugs)
+
+The component you are trying to delete currently has bugs assigned to it.
+You must move these bugs before trying to delete the component.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/FlagType.pm b/Bugzilla/API/1_0/Resource/FlagType.pm
new file mode 100644
index 0000000000..23579e4c0b
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/FlagType.pm
@@ -0,0 +1,897 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::FlagType;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(STATUS_CREATED);
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Component;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::FlagType;
+use Bugzilla::Product;
+use Bugzilla::Util qw(trim);
+
+use List::MoreUtils qw(uniq);
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+use constant READ_ONLY => qw(
+  get
+);
+
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  update
+);
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/flag_type$},
+    {POST => {method => 'create', success_code => STATUS_CREATED}},
+    qr{^/flag_type/([^/]+)/([^/]+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          return {product => $_[0], component => $_[1]};
+        }
+      }
+    },
+    qr{^/flag_type/([^/]+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          return {product => $_[0]};
+        }
+      },
+      PUT => {
+        method => 'update',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      }
+    },
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+sub get {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->switch_to_shadow_db();
+  my $user = Bugzilla->user;
+
+  defined $params->{product}
+    || ThrowCodeError('param_required',
+    {function => 'Bug.flag_types', param => 'product'});
+
+  my $product   = delete $params->{product};
+  my $component = delete $params->{component};
+
+  $product = Bugzilla::Product->check({name => $product, cache => 1});
+  $component
+    = Bugzilla::Component->check(
+    {name => $component, product => $product, cache => 1})
+    if $component;
+
+  my $flag_params = {product_id => $product->id};
+  $flag_params->{component_id} = $component->id if $component;
+  my $matched_flag_types = Bugzilla::FlagType::match($flag_params);
+
+  my $flag_types = {bug => [], attachment => []};
+  foreach my $flag_type (@$matched_flag_types) {
+    push(@{$flag_types->{bug}}, $self->_flagtype_to_hash($flag_type, $product))
+      if $flag_type->target_type eq 'bug';
+    push(
+      @{$flag_types->{attachment}},
+      $self->_flagtype_to_hash($flag_type, $product)
+    ) if $flag_type->target_type eq 'attachment';
+  }
+
+  return $flag_types;
+}
+
+sub create {
+  my ($self, $params) = @_;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar(@{$user->get_products_by_permission('editcomponents')})
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "add", object => "flagtypes"});
+
+  $params->{name} || ThrowCodeError('param_required', {param => 'name'});
+  $params->{description}
+    || ThrowCodeError('param_required', {param => 'description'});
+
+  my %args = (
+    sortkey                     => 1,
+    name                        => undef,
+    inclusions                  => ['0:0'],    # Default to __ALL__:__ALL__
+    cc_list                     => '',
+    description                 => undef,
+    is_requestable              => 'on',
+    exclusions                  => [],
+    is_multiplicable            => 'on',
+    request_group               => '',
+    is_active                   => 'on',
+    is_specifically_requestable => 'on',
+    target_type                 => 'bug',
+    grant_group                 => '',
+  );
+
+  foreach my $key (keys %args) {
+    $args{$key} = $params->{$key} if defined($params->{$key});
+  }
+
+  $args{name}        = trim($params->{name});
+  $args{description} = trim($params->{description});
+
+  # Is specifically requestable is actually is_requesteeable
+  if (exists $args{is_specifically_requestable}) {
+    $args{is_requesteeble} = delete $args{is_specifically_requestable};
+  }
+
+# Default is on for the tickbox flags.
+# If the user has set them to 'off' then undefine them so the flags are not ticked
+  foreach
+    my $arg_name (qw(is_requestable is_multiplicable is_active is_requesteeble))
+  {
+    if (defined($args{$arg_name}) && ($args{$arg_name} eq '0')) {
+      $args{$arg_name} = undef;
+    }
+  }
+
+  # Process group inclusions and exclusions
+  $args{inclusions} = _process_lists($params->{inclusions})
+    if defined $params->{inclusions};
+  $args{exclusions} = _process_lists($params->{exclusions})
+    if defined $params->{exclusions};
+
+  my $flagtype = Bugzilla::FlagType->create(\%args);
+
+  return {id => as_int($flagtype->id)};
+}
+
+sub update {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar(@{$user->get_products_by_permission('editcomponents')})
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "flagtypes"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'FlagType.update', params => ['ids', 'names']});
+
+  # Get the list of unique flag type ids we are updating
+  my @flag_type_ids = defined($params->{ids}) ? @{$params->{ids}} : ();
+  if (defined $params->{names}) {
+    push @flag_type_ids,
+      map { $_->id } @{Bugzilla::FlagType::match({name => $params->{names}})};
+  }
+  @flag_type_ids = uniq @flag_type_ids;
+
+  # We delete names and ids to keep only new values to set.
+  delete $params->{names};
+  delete $params->{ids};
+
+  # Process group inclusions and exclusions
+  # We removed them from $params because these are handled differently
+  my $inclusions = _process_lists(delete $params->{inclusions})
+    if defined $params->{inclusions};
+  my $exclusions = _process_lists(delete $params->{exclusions})
+    if defined $params->{exclusions};
+
+  $dbh->bz_start_transaction();
+  my %changes = ();
+
+  foreach my $flag_type_id (@flag_type_ids) {
+    my ($flagtype, $can_fully_edit)
+      = $user->check_can_admin_flagtype($flag_type_id);
+
+    if ($can_fully_edit) {
+      $flagtype->set_all($params);
+    }
+    elsif (scalar keys %$params) {
+      ThrowUserError('flag_type_not_editable', {flagtype => $flagtype});
+    }
+
+    # Process the clusions
+    foreach my $type ('inclusions', 'exclusions') {
+      my $clusions = $type eq 'inclusions' ? $inclusions : $exclusions;
+      next if not defined $clusions;
+
+      my @extra_clusions = ();
+      if (!$user->in_group('editcomponents')) {
+        my $products = $user->get_products_by_permission('editcomponents');
+
+        # Bring back the products the user cannot edit.
+        foreach my $item (values %{$flagtype->$type}) {
+          my ($prod_id, $comp_id) = split(':', $item);
+          push(@extra_clusions, $item) unless grep { $_->id == $prod_id } @$products;
+        }
+      }
+
+      $flagtype->set_clusions({$type => [@$clusions, @extra_clusions],});
+    }
+
+    my $returned_changes = $flagtype->update();
+    $changes{$flagtype->id}
+      = {name => $flagtype->name, changes => $returned_changes,};
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $flag_type_id (keys %changes) {
+    my %hash = (
+      id      => as_int($flag_type_id),
+      name    => as_string($changes{$flag_type_id}{name}),
+      changes => {},
+    );
+
+    foreach my $field (keys %{$changes{$flag_type_id}{changes}}) {
+      my $change = $changes{$flag_type_id}{changes}{$field};
+      $hash{changes}{$field}
+        = {removed => as_string($change->[0]), added => as_string($change->[1])};
+    }
+
+    push(@result, \%hash);
+  }
+
+  return {flagtypes => \@result};
+}
+
+sub _flagtype_to_hash {
+  my ($self, $flagtype, $product) = @_;
+  my $user = Bugzilla->user;
+
+  my @values = ('X');
+  push(@values, '?')
+    if ($flagtype->is_requestable && $user->can_request_flag($flagtype));
+  push(@values, '+', '-') if $user->can_set_flag($flagtype);
+
+  my $item = {
+    id               => as_int($flagtype->id),
+    name             => as_string($flagtype->name),
+    description      => as_string($flagtype->description),
+    type             => as_string($flagtype->target_type),
+    values           => \@values,
+    is_active        => as_boolean($flagtype->is_active),
+    is_requesteeble  => as_boolean($flagtype->is_requesteeble),
+    is_multiplicable => as_boolean($flagtype->is_multiplicable)
+  };
+
+  if ($product) {
+    my $inclusions
+      = $self->_flagtype_clusions_to_hash($flagtype->inclusions, $product->id);
+    my $exclusions
+      = $self->_flagtype_clusions_to_hash($flagtype->exclusions, $product->id);
+
+    # if we have both inclusions and exclusions, the exclusions are redundant
+    $exclusions = [] if @$inclusions && @$exclusions;
+
+    # no need to return anything if there's just "any component"
+    $item->{inclusions} = $inclusions if @$inclusions && $inclusions->[0] ne '';
+    $item->{exclusions} = $exclusions if @$exclusions && $exclusions->[0] ne '';
+  }
+
+  return $item;
+}
+
+sub _flagtype_clusions_to_hash {
+  my ($self, $clusions, $product_id) = @_;
+  my $result = [];
+  foreach my $key (keys %$clusions) {
+    my ($prod_id, $comp_id) = split(/:/, $clusions->{$key}, 2);
+    if ($prod_id == 0 || $prod_id == $product_id) {
+      if ($comp_id) {
+        my $component = Bugzilla::Component->new({id => $comp_id, cache => 1});
+        push @$result, $component->name;
+      }
+      else {
+        return [''];
+      }
+    }
+  }
+  return $result;
+}
+
+sub _process_lists {
+  my $list = shift;
+  my $user = Bugzilla->user;
+
+  my @products;
+  if ($user->in_group('editcomponents')) {
+    @products = Bugzilla::Product->get_all;
+  }
+  else {
+    @products = @{$user->get_products_by_permission('editcomponents')};
+  }
+
+  my @component_list;
+
+  foreach my $item (@$list) {
+
+    # A hash with products as the key and component names as the values
+    if (ref($item) eq 'HASH') {
+      while (my ($product_name, $component_names) = each %$item) {
+        my $product = Bugzilla::Product->check({name => $product_name});
+        unless (grep { $product->name eq $_->name } @products) {
+          ThrowUserError('product_access_denied', {name => $product_name});
+        }
+        my @component_ids;
+
+        foreach my $comp_name (@$component_names) {
+          my $component
+            = Bugzilla::Component->check({product => $product, name => $comp_name});
+          ThrowCodeError('param_invalid', {param => $comp_name})
+            unless defined $component;
+          push @component_list, $product->id . ':' . $component->id;
+        }
+      }
+    }
+    elsif (!ref($item)) {
+
+      # These are whole products
+      my $product = Bugzilla::Product->check({name => $item});
+      unless (grep { $product->name eq $_->name } @products) {
+        ThrowUserError('product_access_denied', {name => $item});
+      }
+      push @component_list, $product->id . ':0';
+    }
+    else {
+      # The user has passed something invalid
+      ThrowCodeError('param_invalid', {param => $item});
+    }
+  }
+
+  return \@component_list;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::FlagType - API for creating flags.
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to create new flags
+
+=head1 METHODS
+
+=head2 Get Flag Types
+
+=over
+
+=item C<get>
+
+=item B<Description>
+
+Get information about valid flag types that can be set for bugs and attachments.
+
+=item B<REST>
+
+You have several options for retrieving information about flag types. The first
+part is the request method and the rest is the related path needed.
+
+To get information about all flag types for a product:
+
+GET /rest/flag_type/<product>
+
+To get information about flag_types for a product and component:
+
+GET /rest/flag_type/<product>/<component>
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+You must pass a product name and an optional component name.
+
+=over
+
+=item C<product>   (string) - The name of a valid product.
+
+=item C<component> (string) - An optional valid component name associated with the product.
+
+=back
+
+=item B<Returns>
+
+A hash containing two keys, C<bug> and C<attachment>. Each key value is an array of hashes,
+containing the following keys:
+
+=over
+
+=item C<id>
+
+C<int> An integer id uniquely identifying this flag type.
+
+=item C<name>
+
+C<string> The name for the flag type.
+
+=item C<type>
+
+C<string> The target of the flag type which is either C<bug> or C<attachment>.
+
+=item C<description>
+
+C<string> The description of the flag type.
+
+=item C<values>
+
+C<array> An array of string values that the user can set on the flag type.
+
+=item C<is_requesteeble>
+
+C<boolean> Users can ask specific other users to set flags of this type.
+
+=item C<is_multiplicable>
+
+C<boolean> Multiple flags of this type can be set for the same bug or attachment.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 106 (Product Access Denied)
+
+Either the product does not exist or you don't have access to it.
+
+=item 51 (Invalid Component)
+
+The component provided does not exist in the product.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 Create Flag
+
+=over
+
+=item C<create>
+
+=item B<Description>
+
+Creates a new FlagType
+
+=item B<REST>
+
+POST /rest/flag_type
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+At a minimum the following two arguments must be supplied:
+
+=over
+
+=item C<name> (string) - The name of the new Flag Type.
+
+=item C<description> (string) - A description for the Flag Type object.
+
+=back
+
+=item B<Returns>
+
+C<int> flag_id
+
+The ID of the new FlagType object is returned.
+
+=item B<Params>
+
+=over
+
+=item name B<required>
+
+C<string> A short name identifying this type.
+
+=item description B<required>
+
+C<string> A comprehensive description of this type.
+
+=item inclusions B<optional>
+
+An array of strings or a hash containing product names, and optionally
+component names. If you provide a string, the flag type will be shown on
+all bugs in that product. If you provide a hash, the key represents the
+product name, and the value is the components of the product to be included.
+
+For example:
+
+ [ 'FooProduct',
+   {
+     BarProduct => [ 'C1', 'C3' ],
+     BazProduct => [ 'C7' ]
+   }
+ ]
+
+This flag will be added to B<All> components of I<FooProduct>,
+components C1 and C3 of I<BarProduct>, and C7 of I<BazProduct>.
+
+=item exclusions B<optional>
+
+An array of strings or hashes containing product names. This uses the same
+fromat as inclusions.
+
+This will exclude the flag from all products and components specified.
+
+=item sortkey B<optional>
+
+C<int> A number between 1 and 32767 by which this type will be sorted when
+displayed to users in a list; ignore if you don't care what order the types
+appear in or if you want them to appear in alphabetical order.
+
+=item is_active B<optional>
+
+C<boolean> Flag of this type appear in the UI and can be set. Default is B<true>.
+
+=item is_requestable B<optional>
+
+C<boolean> Users can ask for flags of this type to be set. Default is B<true>.
+
+=item cc_list B<optional>
+
+C<array> An array of strings. If the flag type is requestable, who should
+receive e-mail notification of requests. This is an array of e-mail addresses
+which do not need to be Bugzilla logins.
+
+=item is_specifically_requestable B<optional>
+
+C<boolean> Users can ask specific other users to set flags of this type as
+opposed to just asking the wind.  Default is B<true>.
+
+=item is_multiplicable B<optional>
+
+C<boolean> Multiple flags of this type can be set on the same bug. Default is B<true>.
+
+=item grant_group B<optional>
+
+C<string> The group allowed to grant/deny flags of this type (to allow all
+users to grant/deny these flags, select no group). Default is B<no group>.
+
+=item request_group B<optional>
+
+C<string> If flags of this type are requestable, the group allowed to request
+them (to allow all users to request these flags, select no group). Note that
+the request group alone has no effect if the grant group is not defined!
+Default is B<no group>.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (Group Does Not Exist)
+
+The group name you entered does not exist, or you do not have access to it.
+
+=item 105 (Unknown component)
+
+The component does not exist for this product.
+
+=item 106 (Product Access Denied)
+
+Either the product does not exist or you don't have editcomponents privileges
+to it.
+
+=item 501 (Illegal Email Address)
+
+One of the e-mail address in the CC list is invalid. An e-mail in the CC
+list does NOT need to be a valid Bugzilla user.
+
+=item 1101 (Flag Type Name invalid)
+
+You must specify a non-blank name for this flag type. It must
+no contain spaces or commas, and must be 50 characters or less.
+
+=item 1102 (Flag type must have description)
+
+You must specify a description for this flag type.
+
+=item 1103 (Flag type CC list is invalid
+
+The CC list must be 200 characters or less.
+
+=item 1104 (Flag Type Sort Key Not Valid)
+
+The sort key is not a valid number.
+
+=item 1105 (Flag Type Not Editable)
+
+This flag type is not available for the products you can administer. Therefore
+you can not edit attributes of the flag type, other than the inclusion and
+exclusion list.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+This allows you to update a flag type in Bugzilla.
+
+=item B<REST>
+
+PUT /rest/flag_type/<product_id_or_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
+=item B<Params>
+
+B<Note:> The following parameters specify which products you are updating.
+You must set one or both of these parameters.
+
+=over
+
+=item C<ids>
+
+C<array> of C<int>s. Numeric ids of the flag types that you wish to update.
+
+=item C<names>
+
+C<array> of C<string>s. Names of the flag types that you wish to update. If
+many flag types have the same name, this will change ALL of them.
+
+=back
+
+B<Note:> The following parameters specify the new values you want to set for
+the products you are updating.
+
+=over
+
+=item name
+
+C<string> A short name identifying this type.
+
+=item description
+
+C<string> A comprehensive description of this type.
+
+=item inclusions B<optional>
+
+An array of strings or a hash containing product names, and optionally
+component names. If you provide a string, the flag type will be shown on
+all bugs in that product. If you provide a hash, the key represents the
+product name, and the value is the components of the product to be included.
+
+for example
+
+ [ 'FooProduct',
+   {
+     BarProduct => [ 'C1', 'C3' ],
+     BazProduct => [ 'C7' ]
+   }
+ ]
+
+This flag will be added to B<All> components of I<FooProduct>,
+components C1 and C3 of I<BarProduct>, and C7 of I<BazProduct>.
+
+=item exclusions B<optional>
+
+An array of strings or hashes containing product names.
+This uses the same fromat as inclusions.
+
+This will exclude the flag from all products and components specified.
+
+=item sortkey
+
+C<int> A number between 1 and 32767 by which this type will be sorted when
+displayed to users in a list; ignore if you don't care what order the types
+appear in or if you want them to appear in alphabetical order.
+
+=item is_active
+
+C<boolean> Flag of this type appear in the UI and can be set.
+
+=item is_requestable
+
+C<boolean> Users can ask for flags of this type to be set.
+
+=item cc_list
+
+C<array> An array of strings. If the flag type is requestable, who should
+receive e-mail notification of requests. This is an array of e-mail addresses
+which do not need to be Bugzilla logins.
+
+=item is_specifically_requestable
+
+C<boolean> Users can ask specific other users to set flags of this type as
+opposed to just asking the wind.
+
+=item is_multiplicable
+
+C<boolean> Multiple flags of this type can be set on the same bug.
+
+=item grant_group
+
+C<string> The group allowed to grant/deny flags of this type (to allow all
+users to grant/deny these flags, select no group).
+
+=item request_group
+
+C<string> If flags of this type are requestable, the group allowed to request
+them (to allow all users to request these flags, select no group). Note that
+the request group alone has no effect if the grant group is not defined!
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "flagtypes". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the product that was updated.
+
+=item C<name>
+
+C<string> The name of the product that was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this product. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added>
+
+C<string> The value that this field was changed to.
+
+=item C<removed>
+
+C<string> The value that was previously set in this field.
+
+=back
+
+Note that booleans will be represented with the strings '1' and '0'.
+
+Here's an example of what a return value might look like:
+
+ {
+   products => [
+     {
+       id => 123,
+       changes => {
+         name => {
+           removed => 'FooFlagType',
+           added   => 'BarFlagType'
+         },
+         is_requestable => {
+           removed => '1',
+           added   => '0',
+         }
+       }
+     }
+   ]
+ }
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (Group Does Not Exist)
+
+The group name you entered does not exist, or you do not have access to it.
+
+=item 105 (Unknown component)
+
+The component does not exist for this product.
+
+=item 106 (Product Access Denied)
+
+Either the product does not exist or you don't have editcomponents privileges
+to it.
+
+=item 501 (Illegal Email Address)
+
+One of the e-mail address in the CC list is invalid. An e-mail in the CC
+list does NOT need to be a valid Bugzilla user.
+
+=item 1101 (Flag Type Name invalid)
+
+You must specify a non-blank name for this flag type. It must
+no contain spaces or commas, and must be 50 characters or less.
+
+=item 1102 (Flag type must have description)
+
+You must specify a description for this flag type.
+
+=item 1103 (Flag type CC list is invalid
+
+The CC list must be 200 characters or less.
+
+=item 1104 (Flag Type Sort Key Not Valid)
+
+The sort key is not a valid number.
+
+=item 1105 (Flag Type Not Editable)
+
+This flag type is not available for the products you can administer. Therefore
+you can not edit attributes of the flag type, other than the inclusion and
+exclusion list.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/Group.pm b/Bugzilla/API/1_0/Resource/Group.pm
new file mode 100644
index 0000000000..451c0c1bf2
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/Group.pm
@@ -0,0 +1,634 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Group;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(STATUS_CREATED);
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Constants;
+use Bugzilla::Error;
+
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  update
+);
+
+use constant MAPPED_RETURNS =>
+  {userregexp => 'user_regexp', isactive => 'is_active'};
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/group$},
+    {
+      GET  => {method => 'get'},
+      POST => {method => 'create', success_code => STATUS_CREATED}
+    },
+    qr{^/group/([^/]+)$},
+    {
+      PUT => {
+        method => 'update',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      }
+    }
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+sub create {
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('creategroups')
+    || ThrowUserError("auth_failure",
+    {group => "creategroups", action => "add", object => "group"});
+
+  # Create group
+  my $group = Bugzilla::Group->create({
+    name        => $params->{name},
+    description => $params->{description},
+    userregexp  => $params->{user_regexp},
+    isactive    => $params->{is_active},
+    isbuggroup  => 1,
+    icon_url    => $params->{icon_url}
+  });
+  return {id => as_int($group->id)};
+}
+
+sub update {
+  my ($self, $params) = @_;
+
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('creategroups')
+    || ThrowUserError("auth_failure",
+    {group => "creategroups", action => "edit", object => "group"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Group.update', params => ['ids', 'names']});
+
+  my $group_objects = params_to_objects($params, 'Bugzilla::Group');
+
+  my %values = %$params;
+
+  # We delete names and ids to keep only new values to set.
+  delete $values{names};
+  delete $values{ids};
+
+  $dbh->bz_start_transaction();
+  foreach my $group (@$group_objects) {
+    $group->set_all(\%values);
+  }
+
+  my %changes;
+  foreach my $group (@$group_objects) {
+    my $returned_changes = $group->update();
+    $changes{$group->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $group (@$group_objects) {
+    my %hash = (id => $group->id, changes => {},);
+    foreach my $field (keys %{$changes{$group->id}}) {
+      my $change = $changes{$group->id}->{$field};
+      $hash{changes}{$field}
+        = {removed => as_string($change->[0]), added => as_string($change->[1])};
+    }
+    push(@result, \%hash);
+  }
+
+  return {groups => \@result};
+}
+
+sub get {
+  my ($self, $params) = validate(@_, 'ids', 'names', 'type');
+
+  Bugzilla->login(LOGIN_REQUIRED);
+
+  # Reject access if there is no sense in continuing.
+  my $user = Bugzilla->user;
+  my $all_groups
+    = $user->in_group('editusers') || $user->in_group('creategroups');
+  if (!$all_groups && !$user->can_bless) {
+    ThrowUserError('group_cannot_view');
+  }
+
+  Bugzilla->switch_to_shadow_db();
+
+  my $groups = [];
+
+  if (defined $params->{ids}) {
+
+    # Get the groups by id
+    $groups = Bugzilla::Group->new_from_list($params->{ids});
+  }
+
+  if (defined $params->{names}) {
+
+    # Get the groups by name. Check will throw an error if a bad name is given
+    foreach my $name (@{$params->{names}}) {
+
+      # Skip if we got this from params->{id}
+      next if grep { $_->name eq $name } @$groups;
+
+      push @$groups, Bugzilla::Group->check({name => $name});
+    }
+  }
+
+  if (!defined $params->{ids} && !defined $params->{names}) {
+    if ($all_groups) {
+      @$groups = Bugzilla::Group->get_all;
+    }
+    else {
+      # Get only groups the user has bless groups too
+      $groups = $user->bless_groups;
+    }
+  }
+
+  # Now create a result entry for each.
+  my @groups = map { $self->_group_to_hash($params, $_) } @$groups;
+  return {groups => \@groups};
+}
+
+sub _group_to_hash {
+  my ($self, $params, $group) = @_;
+  my $user = Bugzilla->user;
+
+  my $field_data = {
+    id          => as_int($group->id),
+    name        => as_string($group->name),
+    description => as_string($group->description),
+  };
+
+  if ($user->in_group('creategroups')) {
+    $field_data->{is_active}    = as_boolean($group->is_active);
+    $field_data->{is_bug_group} = as_boolean($group->is_bug_group);
+    $field_data->{user_regexp}  = as_string($group->user_regexp);
+  }
+
+  if ($params->{membership}) {
+    $field_data->{membership} = $self->_get_group_membership($group, $params);
+  }
+  return $field_data;
+}
+
+sub _get_group_membership {
+  my ($self, $group, $params) = @_;
+  my $user = Bugzilla->user;
+
+  my %users_only;
+  my $dbh       = Bugzilla->dbh;
+  my $editusers = $user->in_group('editusers');
+
+  my $query = 'SELECT userid FROM profiles';
+  my $visibleGroups;
+
+  if (!$editusers && Bugzilla->params->{'usevisibilitygroups'}) {
+
+    # Show only users in visible groups.
+    $visibleGroups = $user->visible_groups_inherited;
+
+    if (scalar @$visibleGroups) {
+      $query .= qq{, user_group_map AS ugm
+                         WHERE ugm.user_id = profiles.userid
+                           AND ugm.isbless = 0
+                           AND } . $dbh->sql_in('ugm.group_id', $visibleGroups);
+    }
+  }
+  elsif ($editusers
+    || $user->can_bless($group->id)
+    || $user->in_group('creategroups'))
+  {
+    $visibleGroups = 1;
+    $query .= qq{, user_group_map AS ugm
+                     WHERE ugm.user_id = profiles.userid
+                       AND ugm.isbless = 0
+                    };
+  }
+  if (!$visibleGroups) {
+    ThrowUserError('group_not_visible', {group => $group});
+  }
+
+  my $grouplist = Bugzilla::Group->flatten_group_membership($group->id);
+  $query .= ' AND ' . $dbh->sql_in('ugm.group_id', $grouplist);
+
+  my $userids      = $dbh->selectcol_arrayref($query);
+  my $user_objects = Bugzilla::User->new_from_list($userids);
+  my @users        = map { {
+    id                => as_int($_->id),
+    real_name         => as_string($_->name),
+    name              => as_login($_->login),
+    email             => as_email($_->email),
+    can_login         => as_boolean($_->is_enabled),
+    email_enabled     => as_boolean($_->email_enabled),
+    login_denied_text => as_string($_->disabledtext),
+  } } @$user_objects;
+
+  return \@users;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::Group - The API for creating, changing, and getting
+information about Groups.
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to create Groups and
+get information about them.
+
+=head1 METHODS
+
+=head2 create
+
+=over
+
+=item B<Description>
+
+This allows you to create a new group in Bugzilla.
+
+=item B<REST>
+
+POST /rest/group
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+Some params must be set, or an error will be thrown. These params are
+marked B<Required>.
+
+=over
+
+=item C<name>
+
+B<Required> C<string> A short name for this group. Must be unique. This
+is not usually displayed in the user interface, except in a few places.
+
+=item C<description>
+
+B<Required> C<string> A human-readable name for this group. Should be
+relatively short. This is what will normally appear in the UI as the
+name of the group.
+
+=item C<user_regexp>
+
+C<string> A regular expression. Any user whose Bugzilla username matches
+this regular expression will automatically be granted membership in this group.
+
+=item C<is_active>
+
+C<boolean> C<True> if new group can be used for bugs, C<False> if this
+is a group that will only contain users and no bugs will be restricted
+to it.
+
+=item C<icon_url>
+
+C<string> A URL pointing to a small icon used to identify the group.
+This icon will show up next to users' names in various parts of Bugzilla
+if they are in this group.
+
+=back
+
+=item B<Returns>
+
+A hash with one element, C<id>. This is the id of the newly-created group.
+
+=item B<Errors>
+
+=over
+
+=item 800 (Empty Group Name)
+
+You must specify a value for the C<name> field.
+
+=item 801 (Group Exists)
+
+There is already another group with the same C<name>.
+
+=item 802 (Group Missing Description)
+
+You must specify a value for the C<description> field.
+
+=item 803 (Group Regexp Invalid)
+
+You specified an invalid regular expression in the C<user_regexp> field.
+
+=back
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+This allows you to update a group in Bugzilla.
+
+=item B<REST>
+
+PUT /rest/group/<group_name_or_id>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> param will be overridden as it is pulled
+from the URL path.
+
+=item B<Params>
+
+At least C<ids> or C<names> must be set, or an error will be thrown.
+
+=over
+
+=item C<ids>
+
+B<Required> C<array> Contain ids of groups to update.
+
+=item C<names>
+
+B<Required> C<array> Contain names of groups to update.
+
+=item C<name>
+
+C<string> A new name for group.
+
+=item C<description>
+
+C<string> A new description for groups. This is what will appear in the UI
+as the name of the groups.
+
+=item C<user_regexp>
+
+C<string> A new regular expression for email. Will automatically grant
+membership to these groups to anyone with an email address that matches
+this perl regular expression.
+
+=item C<is_active>
+
+C<boolean> Set if groups are active and eligible to be used for bugs.
+True if bugs can be restricted to this group, false otherwise.
+
+=item C<icon_url>
+
+C<string> A URL pointing to an icon that will appear next to the name of
+users who are in this group.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "groups". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the group that was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this group. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added>
+
+C<string> The values that were added to this field,
+possibly a comma-and-space-separated list if multiple values were added.
+
+=item C<removed>
+
+C<string> The values that were removed from this field, possibly a
+comma-and-space-separated list if multiple values were removed.
+
+=back
+
+=back
+
+=item B<Errors>
+
+The same as L</create>.
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 Group Information
+
+=head2 get
+
+=over
+
+=item B<Description>
+
+Returns information about L<Bugzilla::Group|Groups>.
+
+=item B<REST>
+
+To return information about a specific group by C<id> or C<name>:
+
+GET /rest/group/<group_id_or_name>
+
+You can also return information about more than one specific group
+by using the following in your query string:
+
+GET /rest/group?ids=1&ids=2&ids=3 or GET /group?names=ProductOne&names=Product2
+
+the returned data format is same as below.
+
+=item B<Params>
+
+If neither ids or names is passed, and you are in the creategroups or
+editusers group, then all groups will be retrieved. Otherwise, only groups
+that you have bless privileges for will be returned.
+
+=over
+
+=item C<ids>
+
+C<array> Contain ids of groups to update.
+
+=item C<names>
+
+C<array> Contain names of groups to update.
+
+=item C<membership>
+
+C<boolean> Set to 1 then a list of members of the passed groups' names and
+ids will be returned.
+
+=back
+
+=item B<Returns>
+
+If the user is a member of the "creategroups" group they will receive
+information about all groups or groups matching the criteria that they passed.
+You have to be in the creategroups group unless you're requesting membership
+information.
+
+If the user is not a member of the "creategroups" group, but they are in the
+"editusers" group or have bless privileges to the groups they require
+membership information for, the is_active, is_bug_group and user_regexp values
+are not supplied.
+
+The return value will be a hash containing group names as the keys, each group
+name will point to a hash that describes the group and has the following items:
+
+=over
+
+=item id
+
+C<int> The unique integer ID that Bugzilla uses to identify this group.
+Even if the name of the group changes, this ID will stay the same.
+
+=item name
+
+C<string> The name of the group.
+
+=item description
+
+C<string> The description of the group.
+
+=item is_bug_group
+
+C<int> Whether this groups is to be used for bug reports or is only administrative specific.
+
+=item user_regexp
+
+C<string> A regular expression that allows users to be added to this group if their login matches.
+
+=item is_active
+
+C<int> Whether this group is currently active or not.
+
+=item users
+
+C<array> An array of hashes, each hash contains a user object for one of the
+members of this group, only returned if the user sets the C<membership>
+parameter to 1, the user hash has the following items:
+
+=over
+
+=item id
+
+C<int> The id of the user.
+
+=item real_name
+
+C<string> The actual name of the user.
+
+=item email
+
+C<string> If you are in the editusers group, returns the email address of the
+user, else returns nothing.
+
+=item name
+
+C<string> The login name of the user.
+
+=item can_login
+
+C<boolean> A boolean value to indicate if the user can login into bugzilla.
+
+=item email_enabled
+
+C<boolean> A boolean value to indicate if bug-related mail will be sent
+to the user or not.
+
+=item disabled_text
+
+C<string> A text field that holds the reason for disabling a user from logging
+into bugzilla, if empty then the user account is enabled otherwise it is
+disabled/closed.
+
+=back
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (Invalid Object)
+
+A non existing group name was passed to the function, as a result no
+group object existed for that invalid name.
+
+=item 805 (Cannot view groups)
+
+Logged-in users are not authorized to edit bugzilla groups as they are not
+members of the creategroups group in bugzilla, or they are not authorized to
+access group member's information as they are not members of the "editusers"
+group or can bless the group.
+
+=back
+
+=item B<History>
+
+=over
+
+=item This function was added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=cut
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/Product.pm b/Bugzilla/API/1_0/Resource/Product.pm
new file mode 100644
index 0000000000..a4b8546fb7
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/Product.pm
@@ -0,0 +1,986 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Product;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(STATUS_CREATED);
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Product;
+use Bugzilla::User;
+use Bugzilla::Error;
+use Bugzilla::Constants;
+
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+use constant READ_ONLY => qw(
+  get
+  get_accessible_products
+  get_enterable_products
+  get_selectable_products
+);
+
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  get_accessible_products
+  get_enterable_products
+  get_selectable_products
+  update
+);
+
+use constant MAPPED_FIELDS =>
+  {has_unconfirmed => 'allows_unconfirmed', is_open => 'is_active',};
+
+use constant MAPPED_RETURNS => {
+  allows_unconfirmed => 'has_unconfirmed',
+  defaultmilestone   => 'default_milestone',
+  isactive           => 'is_open',
+};
+
+use constant FIELD_MAP =>
+  {has_unconfirmed => 'allows_unconfirmed', is_open => 'isactive',};
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/product_accessible$},
+    {GET => {method => 'get_accessible_products'}},
+    qr{^/product_enterable$},
+    {GET => {method => 'get_enterable_products'}},
+    qr{^/product_selectable$},
+    {GET => {method => 'get_selectable_products'}},
+    qr{^/product$},
+    {
+      GET  => {method => 'get'},
+      POST => {method => 'create', success_code => STATUS_CREATED}
+    },
+    qr{^/product/([^/]+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      },
+      PUT => {
+        method => 'update',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      }
+    },
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+# Get the ids of the products the user can search
+sub get_selectable_products {
+  Bugzilla->switch_to_shadow_db();
+  return {ids => [map { $_->id } @{Bugzilla->user->get_selectable_products}]};
+}
+
+# Get the ids of the products the user can enter bugs against
+sub get_enterable_products {
+  Bugzilla->switch_to_shadow_db();
+  return {ids => [map { $_->id } @{Bugzilla->user->get_enterable_products}]};
+}
+
+# Get the union of the products the user can search and enter bugs against.
+sub get_accessible_products {
+  Bugzilla->switch_to_shadow_db();
+  return {ids => [map { $_->id } @{Bugzilla->user->get_accessible_products}]};
+}
+
+# Get a list of actual products, based on list of ids or names
+sub get {
+  my ($self, $params) = validate(@_, 'ids', 'names', 'type');
+  my $user = Bugzilla->user;
+
+       defined $params->{ids}
+    || defined $params->{names}
+    || defined $params->{type}
+    || ThrowCodeError("params_required",
+    {function => "Product.get", params => ['ids', 'names', 'type']});
+  Bugzilla->switch_to_shadow_db();
+
+  my $products = [];
+  if (defined $params->{type}) {
+    my %product_hash;
+    foreach my $type (@{$params->{type}}) {
+      my $result = [];
+      if ($type eq 'accessible') {
+        $result = $user->get_accessible_products();
+      }
+      elsif ($type eq 'enterable') {
+        $result = $user->get_enterable_products();
+      }
+      elsif ($type eq 'selectable') {
+        $result = $user->get_selectable_products();
+      }
+      else {
+        ThrowUserError('get_products_invalid_type', {type => $type});
+      }
+      map { $product_hash{$_->id} = $_ } @$result;
+    }
+    $products = [values %product_hash];
+  }
+  else {
+    $products = $user->get_accessible_products;
+  }
+
+  my @requested_products;
+
+  if (defined $params->{ids}) {
+
+    # Create a hash with the ids the user wants
+    my %ids = map { $_ => 1 } @{$params->{ids}};
+
+    # Return the intersection of this, by grepping the ids from $products.
+    push(@requested_products, grep { $ids{$_->id} } @$products);
+  }
+
+  if (defined $params->{names}) {
+
+    # Create a hash with the names the user wants
+    my %names = map { lc($_) => 1 } @{$params->{names}};
+
+    # Return the intersection of this, by grepping the names
+    # from $products, union'ed with products found by ID to
+    # avoid duplicates
+    foreach my $product (grep { $names{lc $_->name} } @$products) {
+      next if grep { $_->id == $product->id } @requested_products;
+      push @requested_products, $product;
+    }
+  }
+
+  # If we just requested a specific type of products without
+  # specifying ids or names, then return the entire list.
+  if (!defined $params->{ids} && !defined $params->{names}) {
+    @requested_products = @$products;
+  }
+
+  # Now create a result entry for each.
+  my @products = map { $self->_product_to_hash($params, $_) } @requested_products;
+  return {products => \@products};
+}
+
+sub create {
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('editcomponents')
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "add", object => "products"});
+
+  # Create product
+  my $args = {
+    name             => $params->{name},
+    description      => $params->{description},
+    version          => $params->{version},
+    defaultmilestone => $params->{default_milestone},
+
+    # create_series has no default value.
+    create_series => defined $params->{create_series}
+    ? $params->{create_series}
+    : 1
+  };
+  foreach my $field (qw(has_unconfirmed is_open classification)) {
+    if (defined $params->{$field}) {
+      my $name = FIELD_MAP->{$field} || $field;
+      $args->{$name} = $params->{$field};
+    }
+  }
+  my $product = Bugzilla::Product->create($args);
+  return {id => as_int($product->id)};
+}
+
+sub update {
+  my ($self, $params) = @_;
+
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('editcomponents')
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "products"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Product.update', params => ['ids', 'names']});
+
+  my $product_objects = params_to_objects($params, 'Bugzilla::Product');
+
+  my $values = translate($params, MAPPED_FIELDS);
+
+  # We delete names and ids to keep only new values to set.
+  delete $values->{names};
+  delete $values->{ids};
+
+  $dbh->bz_start_transaction();
+  foreach my $product (@$product_objects) {
+    $product->set_all($values);
+  }
+
+  my %changes;
+  foreach my $product (@$product_objects) {
+    my $returned_changes = $product->update();
+    $changes{$product->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $product (@$product_objects) {
+    my %hash = (id => $product->id, changes => {},);
+
+    foreach my $field (keys %{$changes{$product->id}}) {
+      my $change = $changes{$product->id}->{$field};
+      $hash{changes}{$field}
+        = {removed => as_string($change->[0]), added => as_string($change->[1])};
+    }
+
+    push(@result, \%hash);
+  }
+
+  return {products => \@result};
+}
+
+sub _product_to_hash {
+  my ($self, $params, $product) = @_;
+
+  my $field_data = {
+    id                => as_int($product->id),
+    name              => as_string($product->name),
+    description       => as_string($product->description),
+    is_active         => as_boolean($product->is_active),
+    default_milestone => as_string($product->default_milestone),
+    has_unconfirmed   => as_boolean($product->allows_unconfirmed),
+    classification    => as_string($product->classification->name),
+  };
+  if (filter_wants($params, 'components')) {
+    $field_data->{components}
+      = [map { $self->_component_to_hash($_, $params) } @{$product->components}];
+  }
+  if (filter_wants($params, 'versions')) {
+    $field_data->{versions}
+      = [map { $self->_version_to_hash($_, $params) } @{$product->versions}];
+  }
+  if (filter_wants($params, 'milestones')) {
+    $field_data->{milestones}
+      = [map { $self->_milestone_to_hash($_, $params) } @{$product->milestones}];
+  }
+  return filter($params, $field_data);
+}
+
+sub _component_to_hash {
+  my ($self, $component, $params) = @_;
+  my $field_data = filter $params, {
+    id                  => as_int($component->id),
+    name                => as_string($component->name),
+    description         => as_string($component->description),
+    default_assigned_to => as_login($component->default_assignee->login),
+    default_qa_contact  => as_login(
+      $component->default_qa_contact ? $component->default_qa_contact->login : ""
+    ),
+    sort_key => 0,    # sort_key is returned to match Bug.fields
+    is_active => as_boolean($component->is_active),
+    },
+    undef, 'components';
+
+  if (filter_wants($params, 'flag_types', undef, 'components')) {
+    $field_data->{flag_types} = {
+      bug =>
+        [map { $self->_flag_type_to_hash($_) } @{$component->flag_types->{'bug'}}],
+      attachment => [
+        map { $self->_flag_type_to_hash($_) } @{$component->flag_types->{'attachment'}}
+      ],
+    };
+  }
+
+  return $field_data;
+}
+
+sub _flag_type_to_hash {
+  my ($self, $flag_type, $params) = @_;
+  return filter $params,
+    {
+    id               => as_int($flag_type->id),
+    name             => as_string($flag_type->name),
+    description      => as_string($flag_type->description),
+    cc_list          => as_string($flag_type->cc_list),
+    sort_key         => as_int($flag_type->sortkey),
+    is_active        => as_boolean($flag_type->is_active),
+    is_requestable   => as_boolean($flag_type->is_requestable),
+    is_requesteeble  => as_boolean($flag_type->is_requesteeble),
+    is_multiplicable => as_boolean($flag_type->is_multiplicable),
+    grant_group      => as_int($flag_type->grant_group_id),
+    request_group    => as_int($flag_type->request_group_id),
+    },
+    undef, 'flag_types';
+}
+
+sub _version_to_hash {
+  my ($self, $version, $params) = @_;
+  return filter $params, {
+    id   => as_int($version->id),
+    name => as_string($version->name),
+    sort_key => 0,    # sort_key is returened to match Bug.fields
+    is_active => as_boolean($version->is_active),
+    },
+    undef, 'versions';
+}
+
+sub _milestone_to_hash {
+  my ($self, $milestone, $params) = @_;
+  return filter $params,
+    {
+    id        => as_int($milestone->id),
+    name      => as_string($milestone->name),
+    sort_key  => as_int($milestone->sortkey),
+    is_active => as_boolean($milestone->is_active),
+    },
+    undef, 'milestones';
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::Product - The Product API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to list the available Products and
+get information about them.
+
+=head1 METHODS
+
+=head2 get_selectable_products
+
+=over
+
+=item B<Description>
+
+Returns a list of the ids of the products the user can search on.
+
+=item B<REST>
+
+GET /rest/product_selectable
+
+the returned data format is same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash containing one item, C<ids>, that contains an array of product
+ids.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 get_enterable_products
+
+=over
+
+=item B<Description>
+
+Returns a list of the ids of the products the user can enter bugs
+against.
+
+=item B<REST>
+
+GET /rest/product_enterable
+
+the returned data format is same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash containing one item, C<ids>, that contains an array of product
+ids.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 get_accessible_products
+
+=over
+
+=item B<Description>
+
+Returns a list of the ids of the products the user can search or enter
+bugs against.
+
+=item B<REST>
+
+GET /rest/product_accessible
+
+the returned data format is same as below.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+A hash containing one item, C<ids>, that contains an array of product
+ids.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 get
+
+=over
+
+=item B<Description>
+
+Returns a list of information about the products passed to it.
+
+B<Note>: You must at least specify one of C<ids> or C<names>.
+
+=item B<REST>
+
+To return information about a specific groups of products such as
+C<accessible>, C<selectable>, or C<enterable>:
+
+GET /rest/product?type=accessible
+
+To return information about a specific product by C<id> or C<name>:
+
+GET /rest/product/<product_id_or_name>
+
+You can also return information about more than one specific product
+by using the following in your query string:
+
+GET /rest/product?ids=1&ids=2&ids=3 or GET /product?names=ProductOne&names=Product2
+
+the returned data format is same as below.
+
+=item B<Params>
+
+In addition to the parameters below, this method also accepts the
+standard L<include_fields|Bugzilla::API::1_0::Resource/include_fields> and
+L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+This RPC call supports sub field restrictions.
+
+=over
+
+=item C<ids>
+
+An array of product ids
+
+=item C<names>
+
+An array of product names
+
+=item C<type>
+
+The group of products to return. Valid values are: C<accessible> (default),
+C<selectable>, and C<enterable>. C<type> can be a single value or an array
+of values if more than one group is needed with duplicates removed.
+
+=back
+
+=item B<Returns>
+
+A hash containing one item, C<products>, that is an array of
+hashes. Each hash describes a product, and has the following items:
+
+=over
+
+=item C<id>
+
+C<int> An integer id uniquely identifying the product in this installation only.
+
+=item C<name>
+
+C<string> The name of the product.  This is a unique identifier for the
+product.
+
+=item C<description>
+
+C<string> A description of the product, which may contain HTML.
+
+=item C<is_active>
+
+C<boolean> A boolean indicating if the product is active.
+
+=item C<default_milestone>
+
+C<string> The name of the default milestone for the product.
+
+=item C<has_unconfirmed>
+
+C<boolean> Indicates whether the UNCONFIRMED bug status is available
+for this product.
+
+=item C<classification>
+
+C<string> The classification name for the product.
+
+=item C<components>
+
+C<array> An array of hashes, where each hash describes a component, and has the
+following items:
+
+=over
+
+=item C<id>
+
+C<int> An integer id uniquely identifying the component in this installation
+only.
+
+=item C<name>
+
+C<string> The name of the component.  This is a unique identifier for this
+component.
+
+=item C<description>
+
+C<string> A description of the component, which may contain HTML.
+
+=item C<default_assigned_to>
+
+C<string> The login name of the user to whom new bugs will be assigned by
+default.
+
+=item C<default_qa_contact>
+
+C<string> The login name of the user who will be set as the QA Contact for
+new bugs by default. Empty string if the QA contact is not defined.
+
+=item C<sort_key>
+
+C<int> Components, when displayed in a list, are sorted first by this integer
+and then secondly by their name.
+
+=item C<is_active>
+
+C<boolean> A boolean indicating if the component is active.  Inactive
+components are not enabled for new bugs.
+
+=item C<flag_types>
+
+A hash containing the two items C<bug> and C<attachment> that each contains an
+array of hashes, where each hash describes a flagtype, and has the
+following items:
+
+=over
+
+=item C<id>
+
+C<int> Returns the ID of the flagtype.
+
+=item C<name>
+
+C<string> Returns the name of the flagtype.
+
+=item C<description>
+
+C<string> Returns the description of the flagtype.
+
+=item C<cc_list>
+
+C<string> Returns the concatenated CC list for the flagtype, as a single string.
+
+=item C<sort_key>
+
+C<int> Returns the sortkey of the flagtype.
+
+=item C<is_active>
+
+C<boolean> Returns whether the flagtype is active or disabled. Flags being
+in a disabled flagtype are not deleted. It only prevents you from
+adding new flags to it.
+
+=item C<is_requestable>
+
+C<boolean> Returns whether you can request for the given flagtype
+(i.e. whether the '?' flag is available or not).
+
+=item C<is_requesteeble>
+
+C<boolean> Returns whether you can ask someone specifically or not.
+
+=item C<is_multiplicable>
+
+C<boolean> Returns whether you can have more than one flag for the given
+flagtype in a given bug/attachment.
+
+=item C<grant_group>
+
+C<int> the group id that is allowed to grant/deny flags of this type.
+If the item is not included all users are allowed to grant/deny this
+flagtype.
+
+=item C<request_group>
+
+C<int> the group id that is allowed to request the flag if the flag
+is of the type requestable. If the item is not included all users
+are allowed request this flagtype.
+
+=back
+
+=back
+
+=item C<versions>
+
+C<array> An array of hashes, where each hash describes a version, and has the
+following items: C<name>, C<sort_key> and C<is_active>.
+
+=item C<milestones>
+
+C<array> An array of hashes, where each hash describes a milestone, and has the
+following items: C<name>, C<sort_key> and C<is_active>.
+
+=back
+
+Note, that if the user tries to access a product that is not in the
+list of accessible products for the user, or a product that does not
+exist, that is silently ignored, and no information about that product
+is returned.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item In Bugzilla B<4.2>, C<names> was added as an input parameter.
+
+=item In Bugzilla B<4.2>, C<classification>, C<components>, C<versions>,
+C<milestones>, C<default_milestone> and C<has_unconfirmed> were added to
+the fields returned by C<get> as a replacement for C<internals>, which has
+been removed.
+
+=item In Bugzilla B<4.4>, C<flag_types> was added to the fields returned
+by C<get>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 Product Creation and Modification
+
+=head2 create
+
+=over
+
+=item B<Description>
+
+This allows you to create a new product in Bugzilla.
+
+=item B<REST>
+
+POST /rest/product
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+Some params must be set, or an error will be thrown. These params are
+marked B<Required>.
+
+=over
+
+=item C<name>
+
+B<Required> C<string> The name of this product. Must be globally unique
+within Bugzilla.
+
+=item C<description>
+
+B<Required> C<string> A description for this product. Allows some simple HTML.
+
+=item C<version>
+
+B<Required> C<string> The default version for this product.
+
+=item C<has_unconfirmed>
+
+C<boolean> Allow the UNCONFIRMED status to be set on bugs in this product.
+Default: true.
+
+=item C<classification>
+
+C<string> The name of the Classification which contains this product.
+
+=item C<default_milestone>
+
+C<string> The default milestone for this product. Default '---'.
+
+=item C<is_open>
+
+C<boolean> True if the product is currently allowing bugs to be entered
+into it. Default: true.
+
+=item C<create_series>
+
+C<boolean> True if you want series for New Charts to be created for this
+new product. Default: true.
+
+=back
+
+=item B<Returns>
+
+A hash with one element, id. This is the id of the newly-filed product.
+
+=item B<Errors>
+
+=over
+
+=item 51 (Classification does not exist)
+
+You must specify an existing classification name.
+
+=item 700 (Product blank name)
+
+You must specify a non-blank name for this product.
+
+=item 701 (Product name too long)
+
+The name specified for this product was longer than the maximum
+allowed length.
+
+=item 702 (Product name already exists)
+
+You specified the name of a product that already exists.
+(Product names must be globally unique in Bugzilla.)
+
+=item 703 (Product must have description)
+
+You must specify a description for this product.
+
+=item 704 (Product must have version)
+
+You must specify a version for this product.
+
+=back
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+This allows you to update a product in Bugzilla.
+
+=item B<REST>
+
+PUT /rest/product/<product_id_or_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
+=item B<Params>
+
+B<Note:> The following parameters specify which products you are updating.
+You must set one or both of these parameters.
+
+=over
+
+=item C<ids>
+
+C<array> of C<int>s. Numeric ids of the products that you wish to update.
+
+=item C<names>
+
+C<array> of C<string>s. Names of the products that you wish to update.
+
+=back
+
+B<Note:> The following parameters specify the new values you want to set for
+the products you are updating.
+
+=over
+
+=item C<name>
+
+C<string> A new name for this product. If you try to set this while updating more
+than one product, an error will occur, as product names must be unique.
+
+=item C<default_milestone>
+
+C<string> When a new bug is filed, what milestone does it get by default if the
+user does not choose one? Must represent a milestone that is valid for this product.
+
+=item C<description>
+
+C<string> Update the long description for these products to this value.
+
+=item C<has_unconfirmed>
+
+C<boolean> Allow the UNCONFIRMED status to be set on bugs in products.
+
+=item C<is_open>
+
+C<boolean> True if the product is currently allowing bugs to be entered
+into it, False otherwise.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "products". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the product that was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this product. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added>
+
+C<string> The value that this field was changed to.
+
+=item C<removed>
+
+C<string> The value that was previously set in this field.
+
+=back
+
+Note that booleans will be represented with the strings '1' and '0'.
+
+Here's an example of what a return value might look like:
+
+ {
+   products => [
+     {
+       id => 123,
+       changes => {
+         name => {
+           removed => 'FooName',
+           added   => 'BarName'
+         },
+         has_unconfirmed => {
+           removed => '1',
+           added   => '0',
+         }
+       }
+     }
+   ]
+ }
+
+=item B<Errors>
+
+=over
+
+=item 700 (Product blank name)
+
+You must specify a non-blank name for this product.
+
+=item 701 (Product name too long)
+
+The name specified for this product was longer than the maximum
+allowed length.
+
+=item 702 (Product name already exists)
+
+You specified the name of a product that already exists.
+(Product names must be globally unique in Bugzilla.)
+
+=item 703 (Product must have description)
+
+You must specify a description for this product.
+
+=item 705 (Product must define a default milestone)
+
+You must define a default milestone.
+
+=back
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Resource/User.pm b/Bugzilla/API/1_0/Resource/User.pm
new file mode 100644
index 0000000000..d2db048001
--- /dev/null
+++ b/Bugzilla/API/1_0/Resource/User.pm
@@ -0,0 +1,1217 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::User;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(STATUS_CREATED);
+use Bugzilla::API::1_0::Util;
+
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::Group;
+use Bugzilla::User;
+use Bugzilla::Util qw(trim detaint_natural);
+
+use List::Util qw(first min);
+use Moo;
+
+extends 'Bugzilla::API::1_0::Resource';
+
+##############
+# Constants  #
+##############
+
+# Don't need auth to login
+use constant LOGIN_EXEMPT => {login => 1, offer_account_by_email => 1,};
+
+use constant READ_ONLY => qw(
+  get
+  login
+  logout
+  valid_login
+  whoami
+);
+
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  login
+  logout
+  offer_account_by_email
+  update
+  valid_login
+  whoami
+);
+
+use constant MAPPED_FIELDS =>
+  {full_name => 'name', login_denied_text => 'disabledtext',};
+
+use constant MAPPED_RETURNS =>
+  {realname => 'full_name', disabledtext => 'login_denied_text',};
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/login$},
+    {GET => {method => 'login'}, POST => {method => 'login'}},
+    qr{^/logout$},
+    {GET => {method => 'logout'}},
+    qr{^/valid_login$},
+    {GET => {method => 'valid_login'}},
+    qr{^/user$},
+    {
+      GET  => {method => 'get'},
+      POST => {method => 'create', success_code => STATUS_CREATED}
+    },
+    qr{^/user/([^/]+)$},
+    {
+      GET => {
+        method => 'get',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      },
+      PUT => {
+        method => 'update',
+        params => sub {
+          my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
+          return {$param => [$_[0]]};
+        }
+      }
+    },
+    qr{^/whoami$},
+    {GET => {method => 'whoami'}}
+  ];
+  return $rest_resources;
+}
+
+############
+# Methods  #
+############
+
+sub login {
+  my ($self, $params) = @_;
+
+  # Check to see if we are already logged in
+  my $user = Bugzilla->user;
+  if ($user->id) {
+    return $self->_login_to_hash($user);
+  }
+
+  # Username and password params are required
+  foreach my $param ("login", "password") {
+    (defined $params->{$param} || defined $params->{'Bugzilla_' . $param})
+      || ThrowCodeError('param_required', {param => $param});
+  }
+
+  $user = Bugzilla->login();
+  return $self->_login_to_hash($user);
+}
+
+sub logout {
+  my $self = shift;
+  Bugzilla->logout;
+}
+
+sub valid_login {
+  my ($self, $params) = @_;
+  defined $params->{login}
+    || ThrowCodeError('param_required', {param => 'login'});
+  Bugzilla->login();
+  if (Bugzilla->user->id && Bugzilla->user->login eq $params->{login}) {
+    return as_boolean(1);
+  }
+  return as_boolean(0);
+}
+
+sub offer_account_by_email {
+  my $self     = shift;
+  my ($params) = @_;
+  my $email    = trim($params->{email})
+    || ThrowCodeError('param_required', {param => 'email'});
+
+  my $login
+    = Bugzilla->params->{use_email_as_login} ? $email : trim($params->{login});
+  $login or ThrowCodeError('param_required', {param => 'login'});
+
+  Bugzilla->user->check_account_creation_enabled;
+  Bugzilla->user->check_and_send_account_creation_confirmation($login, $email);
+  return undef;
+}
+
+sub create {
+  my $self = shift;
+  my ($params) = @_;
+
+  Bugzilla->user->in_group('editusers')
+    || ThrowUserError("auth_failure",
+    {group => "editusers", action => "add", object => "users"});
+
+  my $email = trim($params->{email})
+    || ThrowCodeError('param_required', {param => 'email'});
+
+  my $login
+    = Bugzilla->params->{use_email_as_login} ? $email : trim($params->{login});
+  $login or ThrowCodeError('param_required', {param => 'login'});
+
+  my $realname = trim($params->{full_name});
+  my $password = trim($params->{password}) || '*';
+
+  my $user = Bugzilla::User->create({
+    login_name    => $login,
+    email         => $email,
+    realname      => $realname,
+    cryptpassword => $password
+  });
+
+  return {id => as_int($user->id)};
+}
+
+
+# function to return user information by passing either user ids or
+# login names or both together:
+# $call = $rpc->call( 'User.get', { ids => [1,2,3],
+#         names => ['testusera@redhat.com', 'testuserb@redhat.com'] });
+sub get {
+  my ($self, $params)
+    = validate(@_, 'names', 'ids', 'match', 'group_ids', 'groups');
+
+  Bugzilla->switch_to_shadow_db();
+
+       defined($params->{names})
+    || defined($params->{ids})
+    || defined($params->{match})
+    || ThrowCodeError('params_required',
+    {function => 'User.get', params => ['ids', 'names', 'match']});
+
+  my @user_objects;
+  @user_objects = map { Bugzilla::User->check($_) } @{$params->{names}}
+    if $params->{names};
+
+  # start filtering to remove duplicate user ids
+  my %unique_users = map { $_->id => $_ } @user_objects;
+  @user_objects = values %unique_users;
+
+  my @users;
+
+  # If the user is not logged in: Return an error if they passed any user ids.
+  # Otherwise, return a limited amount of information based on login names.
+  if (!Bugzilla->user->id) {
+    if ($params->{ids}) {
+      ThrowUserError("user_access_by_id_denied");
+    }
+    if ($params->{match}) {
+      ThrowUserError('user_access_by_match_denied');
+    }
+    my $in_group = $self->_filter_users_by_group(\@user_objects, $params);
+    @users = map {
+      filter $params,
+        {
+        id        => as_int($_->id),
+        real_name => as_string($_->name),
+        name      => as_login($_->login),
+        }
+    } @$in_group;
+
+    return {users => \@users};
+  }
+
+  my $obj_by_ids;
+  $obj_by_ids = Bugzilla::User->new_from_list($params->{ids}) if $params->{ids};
+
+  # obj_by_ids are only visible to the user if they can see
+  # the otheruser, for non visible otheruser throw an error
+  foreach my $obj (@$obj_by_ids) {
+    if (Bugzilla->user->can_see_user($obj)) {
+      if (!$unique_users{$obj->id}) {
+        push(@user_objects, $obj);
+        $unique_users{$obj->id} = $obj;
+      }
+    }
+    else {
+      ThrowUserError(
+        'auth_failure',
+        {
+          reason => "not_visible",
+          action => "access",
+          object => "user",
+          userid => $obj->id
+        }
+      );
+    }
+  }
+
+  # User Matching
+  my $limit = Bugzilla->params->{maxusermatches};
+  if ($params->{limit}) {
+    detaint_natural($params->{limit})
+      || ThrowCodeError('param_must_be_numeric',
+      {function => 'Bugzilla::API::1_0::Resource::User::match', param => 'limit'});
+    $limit = $limit ? min($params->{limit}, $limit) : $params->{limit};
+  }
+
+  my $exclude_disabled = $params->{'include_disabled'} ? 0 : 1;
+  foreach my $match_string (@{$params->{'match'} || []}) {
+    my $matched = Bugzilla::User::match($match_string, $limit, $exclude_disabled);
+    foreach my $user (@$matched) {
+      if (!$unique_users{$user->id}) {
+        push(@user_objects, $user);
+        $unique_users{$user->id} = $user;
+      }
+    }
+  }
+
+  my $in_group = $self->_filter_users_by_group(\@user_objects, $params);
+  foreach my $user (@$in_group) {
+    my $user_info = filter $params,
+      {
+      id        => as_int($user->id),
+      real_name => as_string($user->name),
+      name      => as_login($user->login),
+      can_login => as_boolean($user->is_enabled ? 1 : 0),
+      };
+
+    if (Bugzilla->user->in_group('editusers')) {
+      $user_info->{email}           = as_email($user->email),
+        $user_info->{email_enabled} = as_boolean($user->email_enabled);
+      $user_info->{login_denied_text} = as_string($user->disabledtext);
+    }
+
+    if (Bugzilla->user->id == $user->id) {
+      if (filter_wants($params, 'saved_searches')) {
+        $user_info->{saved_searches}
+          = [map { $self->_query_to_hash($_) } @{$user->queries}];
+      }
+      if (filter_wants($params, 'saved_reports')) {
+        $user_info->{saved_reports}
+          = [map { $self->_report_to_hash($_) } @{$user->reports}];
+      }
+    }
+
+    if (filter_wants($params, 'groups')) {
+      if (Bugzilla->user->id == $user->id || Bugzilla->user->in_group('editusers')) {
+        $user_info->{groups} = [map { $self->_group_to_hash($_) } @{$user->groups}];
+      }
+      else {
+        $user_info->{groups} = $self->_filter_bless_groups($user->groups);
+      }
+    }
+
+    push(@users, $user_info);
+  }
+
+  return {users => \@users};
+}
+
+sub update {
+  my ($self, $params) = @_;
+
+  my $dbh = Bugzilla->dbh;
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  # Reject access if there is no sense in continuing.
+  $user->in_group('editusers')
+    || $user->can_bless()
+    || ThrowUserError("auth_failure",
+    {group => "editusers", action => "edit", object => "users"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'User.update', params => ['ids', 'names']});
+
+  my $user_objects = params_to_objects($params, 'Bugzilla::User');
+
+  my $values = translate($params, MAPPED_FIELDS);
+
+  # We delete names and ids to keep only new values to set.
+  delete $values->{names};
+  delete $values->{ids};
+
+  $dbh->bz_start_transaction();
+
+  $values = {groups => $values->{groups}} unless $user->in_group('editusers');
+  foreach my $user (@$user_objects) {
+    $user->set_all($values);
+  }
+
+  my %changes;
+  foreach my $user (@$user_objects) {
+    my $returned_changes = $user->update();
+    $changes{$user->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $user (@$user_objects) {
+    my %hash = (id => $user->id, changes => {},);
+
+    foreach my $field (keys %{$changes{$user->id}}) {
+      my $change = $changes{$user->id}->{$field};
+
+      # We normalize undef to an empty string, so that the API
+      # stays consistent for things that can become empty.
+      $change->[0] = '' if !defined $change->[0];
+      $change->[1] = '' if !defined $change->[1];
+
+      # We also flatten arrays (used by groups and blessed_groups)
+      $change->[0] = join(',', @{$change->[0]}) if ref $change->[0];
+      $change->[1] = join(',', @{$change->[1]}) if ref $change->[1];
+
+      $hash{changes}{$field}
+        = {removed => as_string($change->[0]), added => as_string($change->[1])};
+    }
+
+    push(@result, \%hash);
+  }
+
+  return {users => \@result};
+}
+
+sub _filter_users_by_group {
+  my ($self, $users, $params) = @_;
+  my ($group_ids, $group_names) = @$params{qw(group_ids groups)};
+
+  # If no groups are specified, we return all users.
+  return $users if (!$group_ids and !$group_names);
+
+  my $user = Bugzilla->user;
+  my (@groups, %groups);
+
+  if ($group_ids) {
+    @groups = map { Bugzilla::Group->check({id => $_}) } @$group_ids;
+    $groups{$_->id} = $_ foreach @groups;
+  }
+  if ($group_names) {
+    foreach my $name (@$group_names) {
+      my $group
+        = Bugzilla::Group->check({name => $name, _error => 'invalid_group_name'});
+      $user->in_group($group)
+        || ThrowUserError('invalid_group_name', {name => $name});
+      $groups{$group->id} = $group;
+    }
+  }
+  @groups = values %groups;
+
+  my @in_group = grep { $self->_user_in_any_group($_, \@groups) } @$users;
+  return \@in_group;
+}
+
+sub _user_in_any_group {
+  my ($self, $user, $groups) = @_;
+  foreach my $group (@$groups) {
+    return 1 if $user->in_group($group);
+  }
+  return 0;
+}
+
+sub _filter_bless_groups {
+  my ($self, $groups) = @_;
+  my $user = Bugzilla->user;
+
+  my @filtered_groups;
+  foreach my $group (@$groups) {
+    next unless $user->can_bless($group->id);
+    push(@filtered_groups, $self->_group_to_hash($group));
+  }
+
+  return \@filtered_groups;
+}
+
+sub _group_to_hash {
+  my ($self, $group) = @_;
+  my $item = {
+    id          => as_int($group->id),
+    name        => as_string($group->name),
+    description => as_string($group->description),
+  };
+  return $item;
+}
+
+sub _query_to_hash {
+  my ($self, $query) = @_;
+  my $item = {
+    id    => as_int($query->id),
+    name  => as_string($query->name),
+    query => as_string($query->url),
+  };
+  return $item;
+}
+
+sub _report_to_hash {
+  my ($self, $report) = @_;
+  my $item = {
+    id    => as_int($report->id),
+    name  => as_string($report->name),
+    query => as_string($report->query),
+  };
+  return $item;
+}
+
+sub _login_to_hash {
+  my ($self, $user) = @_;
+  my $item = {id => as_int($user->id)};
+  if ($user->{_login_token}) {
+    $item->{'token'} = $user->id . "-" . $user->{_login_token};
+  }
+  return $item;
+}
+
+sub whoami {
+  my ($self, $params) = @_;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  return filter $params,
+    {
+    id        => as_int($user->id),
+    real_name => as_string($user->name),
+    name      => as_login($user->login),
+    };
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Resource::User - The User Account and Login API
+
+=head1 DESCRIPTION
+
+This part of the Bugzilla API allows you to create User Accounts and
+log in/out using an existing account.
+
+=head1 METHODS
+
+The authentication methods listed here are now deprecated, and will be removed
+in the release after Bugzilla 5.0. The correct way to authenticate when making
+calls is noted in L<Bugzilla::API::Server>.
+
+=head2 login
+
+B<DEPRECATED>
+
+=over
+
+=item B<Description>
+
+Logging in, with a username and password, is required for many
+Bugzilla installations, in order to search for bugs, post new bugs,
+etc. This method logs in an user.
+
+=item B<Params>
+
+=over
+
+=item C<login> (string) - The user's login name.
+
+=item C<password> (string) - The user's password.
+
+=item C<restrict_login> (bool) B<Optional> - If set to a true value,
+the token returned by this method will only be valid from the IP address
+which called this method.
+
+=back
+
+=item B<Returns>
+
+On success, a hash containing two items, C<id>, the numeric id of the
+user that was logged in, and a C<token> which can be passed in
+the parameters as authentication in other calls. The token can be sent
+along with any future requests to the webservice, for the duration of the
+session, i.e. till L<User.logout|/logout> is called.
+
+=item B<Errors>
+
+=over
+
+=item 300 (Invalid Username or Password)
+
+The username does not exist, or the password is wrong.
+
+=item 301 (Login Disabled)
+
+The ability to login with this account has been disabled.  A reason may be
+specified with the error.
+
+=item 305 (New Password Required)
+
+The current password is correct, but the user is asked to change
+their password.
+
+=item 50 (Param Required)
+
+A login or password parameter was not provided.
+
+=back
+
+=item B<History>
+
+=over
+
+=item C<remember> was removed in Bugzilla B<5.0> as this method no longer
+creates a login cookie.
+
+=item C<restrict_login> was added in Bugzilla B<5.0>.
+
+=item C<token> was added in Bugzilla B<4.4.3>.
+
+=item This function will be removed in the release after Bugzilla 5.0, in favour of API keys.
+
+=back
+
+=back
+
+=head2 logout
+
+B<DEPRECATED>
+
+=over
+
+=item B<Description>
+
+Log out the user. Does nothing if there is no user logged in.
+
+=item B<Params> (none)
+
+=item B<Returns> (nothing)
+
+=item B<Errors> (none)
+
+=back
+
+=head2 valid_login
+
+B<DEPRECATED>
+
+=over
+
+=item B<Description>
+
+This method will verify whether a client's cookies or current login
+token is still valid or have expired. A valid username must be provided
+as well that matches.
+
+=item B<Params>
+
+=over
+
+=item C<login>
+
+The login name that matches the provided cookies or token.
+
+=item C<token>
+
+(string) Persistent login token current being used for authentication (optional).
+Cookies passed by client will be used before the token if both provided.
+
+=back
+
+=item B<Returns>
+
+Returns true/false depending on if the current cookies or token are valid
+for the provided username.
+
+=item B<Errors> (none)
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=item This function will be removed in the release after Bugzilla 5.0, in favour of API keys.
+
+=back
+
+=back
+
+=head1 Account Creation and Modification
+
+=head2 offer_account_by_email
+
+=over
+
+=item B<Description>
+
+Sends an email to the user, offering to create an account.  The user
+will have to click on a URL in the email, and choose their password
+and real name.
+
+This is the recommended way to create a Bugzilla account.
+
+=item B<Param>
+
+=over
+
+=item C<email> (string) - the email to send the offer to.
+
+=item C<login> (string) - the login of the user account.
+
+=back
+
+=item B<Returns> (nothing)
+
+=item B<Errors>
+
+=over
+
+=item 500 (Account Already Exists)
+
+An account with that email address already exists in Bugzilla.
+
+=item 501 (Illegal Email Address)
+
+This Bugzilla does not allow you to create accounts with the format of
+email address you specified. Account creation may be entirely disabled.
+
+=back
+
+=back
+
+=head2 create
+
+=over
+
+=item B<Description>
+
+Creates a user account directly in Bugzilla, password and all.
+Instead of this, you should use L</offer_account_by_email> when
+possible, because that makes sure that the email address specified can
+actually receive an email. This function does not check that.
+
+You must be logged in and have the C<editusers> privilege in order to
+call this function.
+
+=item B<REST>
+
+POST /rest/user
+
+The params to include in the POST body as well as the returned data format,
+are the same as below.
+
+=item B<Params>
+
+=over
+
+=item C<email> (string) - The email address for the new user.
+
+=item C<login> (string) - The login name for the new user.
+If the installation has the C<use_email_as_login> parameter switched on, then
+this parameter is ignored, and the value of the C<email> parameter will
+be used as the login name for the new account.
+
+=item C<full_name> (string) B<Optional> - The user's full name. Will
+be set to empty if not specified.
+
+=item C<password> (string) B<Optional> - The password for the new user
+account, in plain text.  It will be stripped of leading and trailing
+whitespace.  If blank or not specified, the newly created account will
+exist in Bugzilla, but will not be allowed to log in using DB
+authentication until a password is set either by the user (through
+resetting their password) or by the administrator.
+
+=back
+
+=item B<Returns>
+
+A hash containing one item, C<id>, the numeric id of the user that was
+created.
+
+=item B<Errors>
+
+The same as L</offer_account_by_email>. If a password is specified,
+the function may also throw:
+
+=over
+
+=item 502 (Password Too Short)
+
+The password specified is too short. (Usually, this means the
+password is under three characters.)
+
+=back
+
+=item B<History>
+
+=over
+
+=item Error 503 (Password Too Long) removed in Bugzilla B<3.6>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 update
+
+=over
+
+=item B<Description>
+
+Updates user accounts in Bugzilla.
+
+=item B<REST>
+
+PUT /rest/user/<user_id_or_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params are overridden as they
+are pulled from the URL path.
+
+=item B<Params>
+
+=over
+
+=item C<ids>
+
+C<array> Contains ids of user to update.
+
+=item C<names>
+
+C<array> Contains login of user to update.
+
+=item C<full_name>
+
+C<string> The new name of the user.
+
+=item C<email>
+
+C<string> The email of the user. Note that email used to login to bugzilla.
+Also note that you can only update one user at a time when changing the
+login name / email. (An error will be thrown if you try to update this field
+for multiple users at once.)
+
+=item C<password>
+
+C<string> The password of the user.
+
+=item C<email_enabled>
+
+C<boolean> A boolean value to enable/disable sending bug-related mail to the user.
+
+=item C<login_denied_text>
+
+C<string> A text field that holds the reason for disabling a user from logging
+into bugzilla, if empty then the user account is enabled otherwise it is
+disabled/closed.
+
+=item C<groups>
+
+C<hash> These specify the groups that this user is directly a member of.
+To set these, you should pass a hash as the value. The hash may contain
+the following fields:
+
+=over
+
+=item C<add> An array of C<int>s or C<string>s. The group ids or group names
+that the user should be added to.
+
+=item C<remove> An array of C<int>s or C<string>s. The group ids or group names
+that the user should be removed from.
+
+=item C<set> An array of C<int>s or C<string>s. An exact set of group ids
+and group names that the user should be a member of. NOTE: This does not
+remove groups from the user where the person making the change does not
+have the bless privilege for.
+
+If you specify C<set>, then C<add> and C<remove> will be ignored. A group in
+both the C<add> and C<remove> list will be added. Specifying a group that the
+user making the change does not have bless rights will generate an error.
+
+=back
+
+=item C<bless_groups>
+
+C<hash> - This is the same as groups, but affects what groups a user
+has direct membership to bless that group. It takes the same inputs as
+groups.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "users". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the user that was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this user. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added>
+
+C<string> The values that were added to this field,
+possibly a comma-and-space-separated list if multiple values were added.
+
+=item C<removed>
+
+C<string> The values that were removed from this field, possibly a
+comma-and-space-separated list if multiple values were removed.
+
+=back
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (Bad Login Name)
+
+You passed an invalid login name in the "names" array.
+
+=item 304 (Authorization Required)
+
+Logged-in users are not authorized to edit other users.
+
+=back
+
+=item B<History>
+
+=over
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head1 User Info
+
+=head2 get
+
+=over
+
+=item B<Description>
+
+Gets information about user accounts in Bugzilla.
+
+=item B<REST>
+
+To get information about a single user:
+
+GET /rest/user/<user_id_or_name>
+
+To search for users by name, group using URL params same as below:
+
+GET /rest/user
+
+The returned data format is the same as below.
+
+=item B<Params>
+
+B<Note>: At least one of C<ids>, C<names>, or C<match> must be specified.
+
+B<Note>: Users will not be returned more than once, so even if a user
+is matched by more than one argument, only one user will be returned.
+
+In addition to the parameters below, this method also accepts the
+standard L<include_fields|Bugzilla::API::1_0::Resource/include_fields> and
+L<exclude_fields|Bugzilla::API::1_0::Resource/exclude_fields> arguments.
+
+=over
+
+=item C<ids> (array)
+
+An array of integers, representing user ids.
+
+Logged-out users cannot pass this parameter to this function. If they try,
+they will get an error. Logged-in users will get an error if they specify
+the id of a user they cannot see.
+
+=item C<names> (array)
+
+An array of login names (strings).
+
+=item C<match> (array)
+
+An array of strings. This works just like "user matching" in
+Bugzilla itself. Users will be returned whose real name or login name
+contains any one of the specified strings. Users that you cannot see will
+not be included in the returned list.
+
+Most installations have a limit on how many matches are returned for
+each string, which defaults to 1000 but can be changed by the Bugzilla
+administrator.
+
+Logged-out users cannot use this argument, and an error will be thrown
+if they try. (This is to make it harder for spammers to harvest email
+addresses from Bugzilla, and also to enforce the user visibility
+restrictions that are implemented on some Bugzillas.)
+
+=item C<limit> (int)
+
+Limit the number of users matched by the C<match> parameter. If value
+is greater than the system limit, the system limit will be used. This
+parameter is only used when user matching using the C<match> parameter
+is being performed.
+
+=item C<group_ids> (array)
+
+=item C<groups> (array)
+
+C<group_ids> is an array of numeric ids for groups that a user can be in.
+C<groups> is an array of names of groups that a user can be in.
+If these are specified, they limit the return value to users who are
+in I<any> of the groups specified.
+
+=item C<include_disabled> (boolean)
+
+By default, when using the C<match> parameter, disabled users are excluded
+from the returned results unless their full username is identical to the
+match string. Setting C<include_disabled> to C<true> will include disabled
+users in the returned results even if their username doesn't fully match
+the input string.
+
+=back
+
+=item B<Returns>
+
+A hash containing one item, C<users>, that is an array of
+hashes. Each hash describes a user, and has the following items:
+
+=over
+
+=item id
+
+C<int> The unique integer ID that Bugzilla uses to represent this user.
+Even if the user's login name changes, this will not change.
+
+=item real_name
+
+C<string> The actual name of the user. May be blank.
+
+=item email
+
+C<string> The email address of the user.
+
+=item name
+
+C<string> The login name of the user.
+
+=item can_login
+
+C<boolean> A boolean value to indicate if the user can login into bugzilla.
+
+=item email_enabled
+
+C<boolean> A boolean value to indicate if bug-related mail will be sent
+to the user or not.
+
+=item login_denied_text
+
+C<string> A text field that holds the reason for disabling a user from logging
+into bugzilla, if empty then the user account is enabled. Otherwise it is
+disabled/closed.
+
+=item groups
+
+C<array> An array of group hashes the user is a member of. If the currently
+logged in user is querying their own account or is a member of the 'editusers'
+group, the array will contain all the groups that the user is a
+member of. Otherwise, the array will only contain groups that the logged in
+user can bless. Each hash describes the group and contains the following items:
+
+=over
+
+=item id
+
+C<int> The group id
+
+=item name
+
+C<string> The name of the group
+
+=item description
+
+C<string> The description for the group
+
+=back
+
+=item saved_searches
+
+C<array> An array of hashes, each of which represents a user's saved search and has
+the following keys:
+
+=over
+
+=item id
+
+C<int> An integer id uniquely identifying the saved search.
+
+=item name
+
+C<string> The name of the saved search.
+
+=item query
+
+C<string> The CGI parameters for the saved search.
+
+=back
+
+=item saved_reports
+
+C<array> An array of hashes, each of which represents a user's saved report and has
+the following keys:
+
+=over
+
+=item id
+
+C<int> An integer id uniquely identifying the saved report.
+
+=item name
+
+C<string> The name of the saved report.
+
+=item query
+
+C<string> The CGI parameters for the saved report.
+
+=back
+
+B<Note>: If you are not logged in to Bugzilla when you call this function, you
+will only be returned the C<id>, C<name>, and C<real_name> items. If you are
+logged in and not in editusers group, you will only be returned the C<id>, C<name>,
+C<real_name>, C<can_login>, and C<groups> items. The groups returned are
+filtered based on your permission to bless each group.
+The C<saved_searches> and C<saved_reports> items are only returned if you are
+querying your own account, even if you are in the editusers group.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (Bad Login Name or Group ID)
+
+You passed an invalid login name in the "names" array or a bad
+group ID in the C<group_ids> argument.
+
+=item 52 (Invalid Parameter)
+
+The value used must be an integer greater than zero.
+
+=item 304 (Authorization Required)
+
+You are logged in, but you are not authorized to see one of the users you
+wanted to get information about by user id.
+
+=item 505 (User Access By Id or User-Matching Denied)
+
+Logged-out users cannot use the "ids" or "match" arguments to this
+function.
+
+=item 804 (Invalid Group Name)
+
+You passed a group name in the C<groups> argument which either does not
+exist or you do not belong to it.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<3.4>.
+
+=item C<group_ids> and C<groups> were added in Bugzilla B<4.0>.
+
+=item C<include_disabled> was added in Bugzilla B<4.0>. Default
+behavior for C<match> was changed to only return enabled accounts.
+
+=item Error 804 has been added in Bugzilla 4.0.9 and 4.2.4. It's now
+illegal to pass a group name you don't belong to.
+
+=item C<groups>, C<saved_searches>, and C<saved_reports> were added
+in Bugzilla B<4.4>.
+
+=item REST API call added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 whoami
+
+=over
+
+=item B<Description>
+
+Allows for validating a user's API key, token, or username and password.
+If successfully authenticated, it returns simple information about the
+logged in user.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+On success, a hash containing information about the logged in user.
+
+=over
+
+=item id
+
+C<int> The unique integer ID that Bugzilla uses to represent this user.
+Even if the user's login name changes, this will not change.
+
+=item real_name
+
+C<string> The actual name of the user. May be blank.
+
+=item name
+
+C<string> The login name of the user.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 300 (Invalid Username or Password)
+
+The username does not exist, or the password is wrong.
+
+=item 301 (Account Disabled)
+
+The account has been disabled.  A reason may be specified with the
+error.
+
+=item 305 (New Password Required)
+
+The current password is correct, but the user is asked to change
+his password.
+
+=back
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item REST_RESOURCES
+
+=back
diff --git a/Bugzilla/API/1_0/Server.pm b/Bugzilla/API/1_0/Server.pm
new file mode 100644
index 0000000000..fb8fd93ba4
--- /dev/null
+++ b/Bugzilla/API/1_0/Server.pm
@@ -0,0 +1,480 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Server;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(API_AUTH_HEADERS);
+use Bugzilla::API::1_0::Util
+  qw(taint_data fix_credentials api_include_exclude datetime_format_inbound);
+
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::Hook;
+use Bugzilla::Util qw(datetime_from trick_taint);
+
+use File::Basename qw(basename);
+use File::Glob qw(:glob);
+use List::MoreUtils qw(none uniq);
+use MIME::Base64 qw(decode_base64 encode_base64);
+use Moo;
+use Scalar::Util qw(blessed);
+
+extends 'Bugzilla::API::Server';
+
+############
+# Start up #
+############
+
+has api_version   => (is => 'ro', default => '1_0',  init_arg => undef);
+has api_namespace => (is => 'ro', default => 'core', init_arg => undef);
+
+sub _build_content_type {
+
+  # Determine how the data should be represented. We do this early so
+  # errors will also be returned with the proper content type.
+  # If no accept header was sent or the content types specified were not
+  # matched, we default to the first type in the whitelist.
+  return $_[0]
+    ->_best_content_type(@{$_[0]->constants->{REST_CONTENT_TYPE_WHITELIST}});
+}
+
+##################
+# Public Methods #
+##################
+
+sub handle {
+  my ($self) = @_;
+
+  # Using current path information, decide which class/method to
+  # use to serve the request. Throw error if no resource was found
+  # unless we were looking for OPTIONS
+  if (!$self->_find_resource) {
+    if ($self->request->method eq 'OPTIONS' && $self->api_options) {
+      my $response = $self->response_header($self->constants->{STATUS_OK}, "");
+      my $options_string = join(', ', @{$self->api_options});
+      $response->header(
+        'Allow'                        => $options_string,
+        'Access-Control-Allow-Methods' => $options_string
+      );
+      return $self->print_response($response);
+    }
+
+    ThrowUserError("rest_invalid_resource",
+      {path => $self->cgi->path_info, method => $self->request->method});
+  }
+
+  my $params = $self->_retrieve_json_params;
+  $self->_params_check($params);
+
+  fix_credentials($params);
+
+  # Fix includes/excludes for each call
+  api_include_exclude($params);
+
+  # Set callback name if exists
+  $self->callback($params->{'callback'}) if $params->{'callback'};
+
+  Bugzilla->input_params($params);
+
+  # Let's try to authenticate before executing
+  $self->handle_login;
+
+  # Execute the handler
+  my $result = $self->_handle;
+
+  # The result needs to be a valid JSON data structure
+  # and not a undefined or scalar value.
+  if ( !ref $result
+    || blessed($result)
+    || (ref $result ne 'HASH' && ref $result ne 'ARRAY'))
+  {
+    $result = {result => $result};
+  }
+
+  $self->response($result);
+}
+
+sub response {
+  my ($self, $result) = @_;
+
+  # Error data needs to be formatted differently
+  my $status_code;
+  if (my $error = $self->return_error) {
+    $status_code            = delete $error->{status_code};
+    $error->{documentation} = REST_DOC;
+    $result                 = $error;
+  }
+  else {
+    $status_code = $self->success_code;
+  }
+
+  Bugzilla::Hook::process('webservice_rest_result',
+    {api => $self, result => \$result});
+
+  # ETag support
+  my $etag = $self->etag;
+  $self->etag($result) if !$etag;
+
+  # If accessing through web browser, then display in readable format
+  my $content;
+  if ($self->content_type eq 'text/html') {
+    $result = $self->json->pretty->canonical->allow_nonref->encode($result);
+    my $template = Bugzilla->template;
+    $template->process("rest.html.tmpl", {result => $result}, \$content)
+      || ThrowTemplateError($template->error());
+  }
+  else {
+    $content = $self->json->encode($result);
+  }
+
+  if (my $callback = $self->callback) {
+
+    # Prepend the response with /**/ in order to protect
+    # against possible encoding attacks (e.g., affecting Flash).
+    $content = "/**/$callback($content)";
+  }
+
+  my $response = $self->response_header($status_code, $content);
+
+  Bugzilla::Hook::process('webservice_rest_response',
+    {api => $self, response => $response});
+
+  $self->print_response($response);
+}
+
+sub print_response {
+  my ($self, $response) = @_;
+
+  # Access Control
+  my @allowed_headers
+    = qw(accept content-type origin user-agent x-requested-with);
+  foreach my $header (keys %{API_AUTH_HEADERS()}) {
+
+    # We want to lowercase and replace _ with -
+    my $translated_header = $header;
+    $translated_header =~ tr/A-Z_/a-z\-/;
+    push(@allowed_headers, $translated_header);
+  }
+  $response->header("Access-Control-Allow-Origin", "*");
+  $response->header("Access-Control-Allow-Headers", join(', ', @allowed_headers));
+
+  # Use $cgi->header properly instead of just printing text directly.
+  # This fixes various problems, including sending Bugzilla's cookies
+  # properly.
+  my $headers = $response->headers;
+  my @header_args;
+  foreach my $name ($headers->header_field_names) {
+    my @values = $headers->header($name);
+    $name =~ s/-/_/g;
+    foreach my $value (@values) {
+      push(@header_args, "-$name", $value);
+    }
+  }
+
+  # ETag support
+  my $etag = $self->etag;
+  if ($etag && $self->cgi->check_etag($etag)) {
+    push(@header_args, "-ETag", $etag);
+    print $self->cgi->header(-status => '304 Not Modified', @header_args);
+  }
+  else {
+    push(@header_args, "-ETag", $etag) if $etag;
+    print $self->cgi->header(-status => $response->code, @header_args);
+    print $response->content;
+  }
+}
+
+sub handle_login {
+  my $self       = shift;
+  my $controller = $self->controller;
+  my $method     = $self->method_name;
+
+  return
+    if ($controller->login_exempt($method)
+    and !defined Bugzilla->input_params->{Bugzilla_login});
+
+  Bugzilla->login();
+
+  Bugzilla::Hook::process('webservice_before_call',
+    {rpc => $self, controller => $controller});
+}
+
+###################
+# Private Methods #
+###################
+
+sub _handle {
+  my ($self)     = shift;
+  my $method     = $self->method_name;
+  my $controller = $self->controller;
+  my $params     = Bugzilla->input_params;
+  my $cache      = Bugzilla->request_cache;
+
+  unless ($controller->can($method)) {
+    return $self->return_error(302, "No such a method : '$method'.");
+  }
+
+  # Let Bugzilla::Error know we are inside an eval() for exceptions
+  $cache->{in_eval} = 1;
+  my $result = eval { $controller->$method($params) };
+  $cache->{in_eval} = 0;
+
+  return $self->return_error if $self->return_error;
+
+  if ($@) {
+    return $self->return_error(500, "Procedure error: $@");
+  }
+
+  # Set the ETag if not already set in the webservice methods.
+  my $etag = $self->etag;
+  if (!$etag && ref $result) {
+    $self->etag($result);
+  }
+
+  return $result;
+}
+
+sub _params_check {
+  my ($self, $params) = @_;
+  my $method     = $self->method_name;
+  my $controller = $self->controller;
+
+  taint_data($params);
+
+  # Now, convert dateTime fields on input.
+  my @date_fields = @{$controller->DATE_FIELDS->{$method} || []};
+  foreach my $field (@date_fields) {
+    if (defined $params->{$field}) {
+      my $value = $params->{$field};
+      if (ref $value eq 'ARRAY') {
+        $params->{$field} = [map { datetime_format_inbound($_) } @$value];
+      }
+      else {
+        $params->{$field} = datetime_format_inbound($value);
+      }
+    }
+  }
+  my @base64_fields = @{$controller->BASE64_FIELDS->{$method} || []};
+  foreach my $field (@base64_fields) {
+    if (defined $params->{$field}) {
+      $params->{$field} = decode_base64($params->{$field});
+    }
+  }
+
+  if ($self->request->method eq 'POST' || $self->request->method eq 'PUT') {
+
+    # CSRF is possible via XMLHttpRequest when the Content-Type header
+    # is not application/json (for example: text/plain or
+    # application/x-www-form-urlencoded).
+    # application/json is the single official MIME type, per RFC 4627.
+    my $content_type = $self->cgi->content_type;
+
+    # The charset can be appended to the content type, so we use a regexp.
+    if ($content_type !~ m{^application/json(-rpc)?(;.*)?$}i) {
+      ThrowUserError('json_rpc_illegal_content_type',
+        {content_type => $content_type});
+    }
+  }
+  else {
+    # When being called using GET, we don't allow calling
+    # methods that can change data. This protects us against cross-site
+    # request forgeries.
+    if (!grep($_ eq $method, $controller->READ_ONLY)) {
+      ThrowUserError('json_rpc_post_only', {method => $self->method_name});
+    }
+  }
+
+  # Only allowed methods to be used from our whitelist
+  if (none { $_ eq $method } $controller->PUBLIC_METHODS) {
+    ThrowCodeError('unknown_method', {method => $self->method_name});
+  }
+}
+
+sub _retrieve_json_params {
+  my $self = shift;
+
+  # Make a copy of the current input_params rather than edit directly
+  my $params = {};
+  %{$params} = %{Bugzilla->input_params};
+
+  # First add any parameters we were able to pull out of the path
+  # based on the resource regexp and combine with the normal URL
+  # parameters.
+  if (my $api_params = $self->api_params) {
+    foreach my $param (keys %$api_params) {
+
+      # If the param does not already exist or if the
+      # rest param is a single value, add it to the
+      # global params.
+      if (!exists $params->{$param} || !ref $api_params->{$param}) {
+        $params->{$param} = $api_params->{$param};
+      }
+
+      # If param is a list then add any extra values to the list
+      elsif (ref $api_params->{$param}) {
+        my @extra_values
+          = ref $params->{$param} ? @{$params->{$param}} : ($params->{$param});
+        $params->{$param} = [uniq(@{$api_params->{$param}}, @extra_values)];
+      }
+    }
+  }
+
+  # Any parameters passed in in the body of a non-GET request will override
+  # any parameters pull from the url path. Otherwise non-unique keys are
+  # combined.
+  if ($self->request->method ne 'GET') {
+    my $extra_params = {};
+
+    # We do this manually because CGI.pm doesn't understand JSON strings.
+    my $json = delete $params->{'POSTDATA'} || delete $params->{'PUTDATA'};
+    if ($json) {
+      eval { $extra_params = $self->json->decode($json); };
+      if ($@) {
+        ThrowUserError('json_rpc_invalid_params', {err_msg => $@});
+      }
+    }
+
+    # Allow parameters in the query string if request was non-GET.
+    # Note: parameters in query string body override any matching
+    # parameters in the request body.
+    foreach my $param ($self->cgi->url_param()) {
+      $extra_params->{$param} = $self->cgi->url_param($param);
+    }
+
+    %{$params} = (%{$params}, %{$extra_params}) if %{$extra_params};
+  }
+
+  return $params;
+}
+
+sub _find_resource {
+  my ($self)          = @_;
+  my $api_version     = $self->api_version;
+  my $api_ext_version = $self->api_ext_version;
+  my $api_namespace   = $self->api_namespace;
+  my $api_path        = $self->api_path;
+  my $request_method  = $self->request->method;
+  my $resource_found  = 0;
+
+  my $resource_modules;
+  if ($api_ext_version) {
+    $resource_modules = File::Spec->catdir(bz_locations()->{extensionsdir},
+      $api_namespace, 'API', $api_ext_version, 'Resource', '*.pm');
+  }
+  else {
+    $resource_modules = File::Spec->catdir(bz_locations()->{cgi_path},
+      'Bugzilla', 'API', $api_version, 'Resource', '*.pm');
+  }
+
+  # Load in the WebService modules from the appropriate version directory
+  # and then call $module->REST_RESOURCES to get the resources array ref.
+  foreach my $module_file (bsd_glob($resource_modules)) {
+
+    # Create a controller object
+    trick_taint($module_file);
+    my $module_basename = basename($module_file, '.pm');
+    eval { require "$module_file"; } || die $@;
+    my $module_class
+      = "Bugzilla::API::${api_version}::Resource::${module_basename}";
+    my $controller = $module_class->new;
+    next if !$controller || !$controller->can('REST_RESOURCES');
+
+    # The resource data for each module needs to be an array ref with an
+    # even number of elements to work correctly.
+    my $this_resources = $controller->REST_RESOURCES;
+    next if (ref $this_resources ne 'ARRAY' || scalar @$this_resources % 2 != 0);
+
+    while (my ($regex, $options_data) = splice(@$this_resources, 0, 2)) {
+      next if ref $options_data ne 'HASH';
+
+      if (my @matches = ($self->api_path =~ $regex)) {
+
+        # If a specific path is accompanied by a OPTIONS request
+        # method, the user is asking for a list of possible request
+        # methods for a specific path.
+        $self->api_options([keys %$options_data]);
+
+        if ($options_data->{$request_method}) {
+          my $resource_data = $options_data->{$request_method};
+
+          # The method key/value can be a simple scalar method name
+          # or a anonymous subroutine so we execute it here.
+          my $method
+            = ref $resource_data->{method} eq 'CODE'
+            ? $resource_data->{method}->($self)
+            : $resource_data->{method};
+          $self->method_name($method);
+
+          # Pull out any parameters parsed from the URL path
+          # and store them for use by the method.
+          if ($resource_data->{params}) {
+            $self->api_params($resource_data->{params}->(@matches));
+          }
+
+          # If a special success code is needed for this particular
+          # method, then store it for later when generating response.
+          if ($resource_data->{success_code}) {
+            $self->success_code($resource_data->{success_code});
+          }
+
+          # Stash away for later
+          $self->controller($controller);
+
+          # No need to look further
+          $resource_found = 1;
+          last;
+        }
+      }
+    }
+    last if $resource_found;
+  }
+
+  return $resource_found;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Server - The API 1.0 Interface to Bugzilla
+
+=head1 DESCRIPTION
+
+This documentation describes version 1.0 of the Bugzilla API. This
+module inherits from L<Bugzilla::API::Server> and overrides specific
+methods to make this version distinct from other versions of the API.
+New versions of the API may make breaking changes by implementing
+these methods in a different way.
+
+=head1 SEE ALSO
+
+L<Bugzilla::API::Server>
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item api_namespace
+
+=item api_version
+
+=item handle
+
+=item response
+
+=item print_response
+
+=item handle_login
+
+=back
+
diff --git a/Bugzilla/API/1_0/Util.pm b/Bugzilla/API/1_0/Util.pm
new file mode 100644
index 0000000000..2307319bd3
--- /dev/null
+++ b/Bugzilla/API/1_0/Util.pm
@@ -0,0 +1,569 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Util;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::API::1_0::Constants qw(API_AUTH_HEADERS);
+use Bugzilla::Error;
+use Bugzilla::Flag;
+use Bugzilla::FlagType;
+use Bugzilla::Util qw(datetime_from email_filter);
+
+use JSON;
+use MIME::Base64 qw(decode_base64 encode_base64);
+use Storable qw(dclone);
+use Test::Taint ();
+use URI::Escape qw(uri_unescape);
+use List::MoreUtils qw(any none);
+
+use parent qw(Exporter);
+
+our @EXPORT = qw(
+  api_include_exclude
+  as_base64
+  as_boolean
+  as_datetime
+  as_double
+  as_email
+  as_int
+  as_int_array
+  as_login
+  as_login_array
+  as_name_array
+  as_string
+  as_string_array
+  datetime_format_inbound
+  datetime_format_outbound
+  extract_flags
+  filter
+  filter_wants
+  fix_credentials
+  params_to_objects
+  taint_data
+  translate
+  validate
+);
+
+sub extract_flags {
+  my ($flags, $flag_types, $current_flags) = @_;
+  my (@new_flags, @old_flags);
+
+  $current_flags //= [];
+
+  # Copy the user provided $flags as we may call extract_flags more than
+  # once when editing multiple bugs or attachments.
+  my $flags_copy = dclone($flags);
+
+  foreach my $flag (@$flags_copy) {
+    my $id      = $flag->{id};
+    my $type_id = $flag->{type_id};
+
+    my $new  = delete $flag->{new};
+    my $name = delete $flag->{name};
+
+    if ($id) {
+      my $flag_obj = grep($id == $_->id, @$current_flags);
+      $flag_obj
+        || ThrowUserError('object_does_not_exist',
+        {class => 'Bugzilla::Flag', id => $id});
+    }
+    elsif ($type_id) {
+      my $type_obj = grep($type_id == $_->id, @$flag_types);
+      $type_obj
+        || ThrowUserError('object_does_not_exist',
+        {class => 'Bugzilla::FlagType', id => $type_id});
+      if (!$new) {
+        my @flag_matches = grep($type_id == $_->type->id, @$current_flags);
+        @flag_matches > 1 && ThrowUserError('flag_not_unique', {value => $type_id});
+        if (!@flag_matches) {
+          delete $flag->{id};
+        }
+        else {
+          delete $flag->{type_id};
+          $flag->{id} = $flag_matches[0]->id;
+        }
+      }
+    }
+    elsif ($name) {
+      my @type_matches = grep($name eq $_->name, @$flag_types);
+      @type_matches > 1 && ThrowUserError('flag_type_not_unique', {value => $name});
+      @type_matches
+        || ThrowUserError('object_does_not_exist',
+        {class => 'Bugzilla::FlagType', name => $name});
+      if ($new) {
+        delete $flag->{id};
+        $flag->{type_id} = $type_matches[0]->id;
+      }
+      else {
+        my @flag_matches = grep($name eq $_->type->name, @$current_flags);
+        @flag_matches > 1 && ThrowUserError('flag_not_unique', {value => $name});
+        if (@flag_matches) {
+          $flag->{id} = $flag_matches[0]->id;
+        }
+        else {
+          delete $flag->{id};
+          $flag->{type_id} = $type_matches[0]->id;
+        }
+      }
+    }
+
+    if ($flag->{id}) {
+      push(@old_flags, $flag);
+    }
+    else {
+      push(@new_flags, $flag);
+    }
+  }
+
+  return (\@old_flags, \@new_flags);
+}
+
+sub filter($$;$$) {
+  my ($params, $hash, $types, $prefix) = @_;
+  my %newhash = %$hash;
+
+  foreach my $key (keys %$hash) {
+    delete $newhash{$key} if !filter_wants($params, $key, $types, $prefix);
+  }
+
+  return \%newhash;
+}
+
+sub filter_wants($$;$$) {
+  my ($params, $field, $types, $prefix) = @_;
+
+  # Since this is operation is resource intensive, we will cache the results
+  # This assumes that $params->{*_fields} doesn't change between calls
+  my $cache = Bugzilla->request_cache->{filter_wants} ||= {};
+  $field = "${prefix}.${field}" if $prefix;
+
+  if (exists $cache->{$field}) {
+    return $cache->{$field};
+  }
+
+  # Mimic old behavior if no types provided
+  my %field_types
+    = map { $_ => 1 } (ref $types ? @$types : ($types || 'default'));
+
+  my %include = map { $_ => 1 } @{$params->{'include_fields'} || []};
+  my %exclude = map { $_ => 1 } @{$params->{'exclude_fields'} || []};
+
+  my %include_types;
+  my %exclude_types;
+
+  # Only return default fields if nothing is specified
+  $include_types{default} = 1 if !%include;
+
+  # Look for any field types requested
+  foreach my $key (keys %include) {
+    next if $key !~ /^_(.*)$/;
+    $include_types{$1} = 1;
+    delete $include{$key};
+  }
+  foreach my $key (keys %exclude) {
+    next if $key !~ /^_(.*)$/;
+    $exclude_types{$1} = 1;
+    delete $exclude{$key};
+  }
+
+  # Explicit inclusion/exclusion
+  return $cache->{$field} = 0 if $exclude{$field};
+  return $cache->{$field} = 1 if $include{$field};
+
+  # If the user has asked to include all or exclude all
+  return $cache->{$field} = 0 if $exclude_types{'all'};
+  return $cache->{$field} = 1 if $include_types{'all'};
+
+  # If the user has not asked for any fields specifically or if the user has asked
+  # for one or more of the field's types (and not excluded them)
+  foreach my $type (keys %field_types) {
+    return $cache->{$field} = 0 if $exclude_types{$type};
+    return $cache->{$field} = 1 if $include_types{$type};
+  }
+
+  my $wants = 0;
+  if ($prefix) {
+
+    # Include the field if the parent is include (and this one is not excluded)
+    $wants = 1 if $include{$prefix};
+  }
+  else {
+    # We want to include this if one of the sub keys is included
+    my $key = $field . '.';
+    my $len = length($key);
+    $wants = 1 if grep { substr($_, 0, $len) eq $key } keys %include;
+  }
+
+  return $cache->{$field} = $wants;
+}
+
+sub taint_data {
+  my @params = @_;
+  return if !@params;
+
+  # Though this is a private function, it hasn't changed since 2004 and
+  # should be safe to use, and prevents us from having to write it ourselves
+  # or require another module to do it.
+  Test::Taint::_deeply_traverse(\&_delete_bad_keys, \@params);
+  Test::Taint::taint_deeply(\@params);
+}
+
+sub _delete_bad_keys {
+  foreach my $item (@_) {
+    next if ref $item ne 'HASH';
+    foreach my $key (keys %$item) {
+
+      # Making something a hash key always untaints it, in Perl.
+      # However, we need to validate our argument names in some way.
+      # We know that all hash keys passed in to the WebService wil
+      # match \w+, contain '.' or '-', so we delete any key that
+      # doesn't match that.
+      if ($key !~ /^[\w\.\-]+$/) {
+        delete $item->{$key};
+      }
+    }
+  }
+  return @_;
+}
+
+sub api_include_exclude {
+  my ($params) = @_;
+
+  if ($params->{'include_fields'} && !ref $params->{'include_fields'}) {
+    $params->{'include_fields'} = [split(/[\s+,]/, $params->{'include_fields'})];
+  }
+  if ($params->{'exclude_fields'} && !ref $params->{'exclude_fields'}) {
+    $params->{'exclude_fields'} = [split(/[\s+,]/, $params->{'exclude_fields'})];
+  }
+
+  return $params;
+}
+
+sub validate {
+  my ($self, $params, @keys) = @_;
+
+  # If $params is defined but not a reference, then we weren't
+  # sent any parameters at all, and we're getting @keys where
+  # $params should be.
+  return ($self, undef) if (defined $params and !ref $params);
+
+  my @id_params = qw(ids comment_ids);
+
+  # If @keys is not empty then we convert any named
+  # parameters that have scalar values to arrayrefs
+  # that match.
+  foreach my $key (@keys) {
+    if (exists $params->{$key}) {
+      $params->{$key} = [$params->{$key}] unless ref $params->{$key};
+
+      if (any { $key eq $_ } @id_params) {
+        my $ids = $params->{$key};
+        ThrowCodeError('param_scalar_array_required', {param => $key})
+          unless ref($ids) eq 'ARRAY' && none { ref $_ } @$ids;
+      }
+    }
+  }
+
+  return ($self, $params);
+}
+
+sub translate {
+  my ($params, $mapped) = @_;
+  my %changes;
+  while (my ($key, $value) = each(%$params)) {
+    my $new_field = $mapped->{$key} || $key;
+    $changes{$new_field} = $value;
+  }
+  return \%changes;
+}
+
+sub params_to_objects {
+  my ($params, $class) = @_;
+  my (@objects, @objects_by_ids);
+
+  @objects = map { $class->check($_) } @{$params->{names}} if $params->{names};
+
+  @objects_by_ids = map { $class->check({id => $_}) } @{$params->{ids}}
+    if $params->{ids};
+
+  push(@objects, @objects_by_ids);
+  my %seen;
+  @objects = grep { !$seen{$_->id}++ } @objects;
+  return \@objects;
+}
+
+sub fix_credentials {
+  my ($params) = @_;
+  my $cgi = Bugzilla->cgi;
+
+  # Allow user to pass in authentication details in X-Headers
+  # This allows callers to keep credentials out of GET request query-strings
+  if ($cgi) {
+    foreach my $field (keys %{API_AUTH_HEADERS()}) {
+      next
+        if exists $params->{API_AUTH_HEADERS->{$field}}
+        || ($cgi->http($field) // '') eq '';
+      $params->{API_AUTH_HEADERS->{$field}} = uri_unescape($cgi->http($field));
+    }
+  }
+
+  # Allow user to pass in login=foo&password=bar as a convenience
+  # even if not calling GET /login. We also do not delete them as
+  # GET /login requires "login" and "password".
+  if (exists $params->{'login'} && exists $params->{'password'}) {
+    $params->{'Bugzilla_login'}    = delete $params->{'login'};
+    $params->{'Bugzilla_password'} = delete $params->{'password'};
+  }
+
+  # Allow user to pass api_key=12345678 as a convenience which becomes
+  # "Bugzilla_api_key" which is what the auth code looks for.
+  if (exists $params->{api_key}) {
+    $params->{Bugzilla_api_key} = delete $params->{api_key};
+  }
+
+  # Allow user to pass token=12345678 as a convenience which becomes
+  # "Bugzilla_token" which is what the auth code looks for.
+  if (exists $params->{'token'}) {
+    $params->{'Bugzilla_token'} = delete $params->{'token'};
+  }
+
+  # Allow extensions to modify the credential data before login
+  Bugzilla::Hook::process('webservice_fix_credentials', {params => $params});
+}
+
+sub datetime_format_inbound {
+  my ($time) = @_;
+
+  my $converted = datetime_from($time, Bugzilla->local_timezone);
+  if (!defined $converted) {
+    ThrowUserError('illegal_date', {date => $time});
+  }
+  $time = $converted->ymd() . ' ' . $converted->hms();
+  return $time;
+}
+
+sub datetime_format_outbound {
+  my ($date) = @_;
+
+  return undef if (!defined $date or $date eq '');
+
+  my $time = $date;
+  if (blessed($date)) {
+
+    # We expect this to mean we were sent a datetime object
+    $time->set_time_zone('UTC');
+  }
+  else {
+    # We always send our time in UTC, for consistency.
+    # passed in value is likely a string, create a datetime object
+    $time = datetime_from($date, 'UTC');
+  }
+  return $time->iso8601() . 'Z';
+}
+
+
+# simple types
+
+sub as_boolean { $_[0]         ? JSON::true  : JSON::false }
+sub as_double  { defined $_[0] ? $_[0] + 0.0 : JSON::null }
+sub as_int     { defined $_[0] ? int($_[0])  : JSON::null }
+sub as_string  { defined $_[0] ? $_[0] . ''  : JSON::null }
+
+# array types
+
+sub as_int_array    { [map { as_int($_) } @{$_[0] //          []}] }
+sub as_login_array  { [map { as_login($_) } @{$_[0] //        []}] }
+sub as_name_array   { [map { as_string($_->name) } @{$_[0] // []}] }
+sub as_string_array { [map { as_string($_) } @{$_[0] //       []}] }
+
+# complex types
+
+sub as_datetime {
+  return
+    defined $_[0] ? datetime_from($_[0], 'UTC')->iso8601() . 'Z' : JSON::null;
+}
+
+sub as_login {
+  defined $_[0]
+    ? (Bugzilla->params->{use_email_as_login} ? email_filter($_[0]) : $_[0] . '')
+    : JSON::null;
+}
+
+sub as_email {
+  defined($_[0])
+    && Bugzilla->user->in_group('editusers') ? $_[0] . '' : JSON::null;
+}
+
+sub as_base64 {
+  utf8::encode($_[0]) if utf8::is_utf8($_[0]);
+  return encode_base64($_[0], '');
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::1_0::Util - Utility functions used inside of the WebSercvice
+API code. These are B<not> functions that can be called via the API.
+
+=head1 DESCRIPTION
+
+This is somewhat like L<Bugzilla::Util>, but these functions are only used
+internally in the API code.
+
+=head1 SYNOPSIS
+
+ filter({ include_fields => ['id', 'name'],
+          exclude_fields => ['name'] }, $hash);
+ my $wants = filter_wants $params, 'field_name';
+ validate(@_, 'ids');
+
+=head1 METHODS
+
+=head2 api_include_exclude
+
+The API allows for values for C<include_fields> and C<exclude_fields> to be
+passed from the client in the URI string in a comma delimited format. This
+converts that format into proper arrays used by other API code such as
+C<filter>, etc.
+
+=head2 filter
+
+This helps implement the C<include_fields> and C<exclude_fields> arguments
+of WebService methods. Given a hash (the second argument to this subroutine),
+this will remove any keys that are I<not> in C<include_fields> and then remove
+any keys that I<are> in C<exclude_fields>.
+
+An optional third option can be passed that prefixes the field name to allow
+filtering of data two or more levels deep.
+
+For example, if you want to filter out the C<id> key/value in components returned
+by Product.get, you would use the value C<component.id> in your C<exclude_fields>
+list.
+
+=head2 filter_wants
+
+Returns C<1> if a filter would preserve the specified field when passing
+a hash to L</filter>, C<0> otherwise.
+
+=head2 validate
+
+This helps in the validation of parameters passed into the WebService
+methods. Currently it converts listed parameters into an array reference
+if the client only passed a single scalar value. It modifies the parameters
+hash in place so other parameters should be unaltered.
+
+=head2 translate
+
+WebService methods frequently take parameters with different names than
+the ones that we use internally in Bugzilla. This function takes a hashref
+that has field names for keys and returns a hashref with those keys renamed
+according to the mapping passed in with the second parameter (which is also
+a hashref).
+
+=head2 params_to_objects
+
+Creates objects of the type passed in as the second parameter, using the
+parameters passed to a WebService method (the first parameter to this function).
+Helps make life simpler for WebService methods that internally create objects
+via both "ids" and "names" fields. Also de-duplicates objects that were loaded
+by both "ids" and "names". Returns an arrayref of objects.
+
+=head2 fix_credentials
+
+Allows for certain parameters related to authentication such as Bugzilla_login,
+Bugzilla_password, and Bugzilla_token to have shorter named equivalents passed in.
+This function converts the shorter versions to their respective internal names.
+
+=head2 extract_flags
+
+Subroutine that takes a list of hashes that are potential flag changes for
+both bugs and attachments. Then breaks the list down into two separate lists
+based on if the change is to add a new flag or to update an existing flag.
+
+=head2 as_base64
+
+Returns a base64 encoded value based on the parameter passed in.
+
+=head2 as_boolean
+
+If a true value is passed as a parameter, the method will return a JSON::true.
+If not returns JSON::false.
+
+=head2 as_datetime
+
+Formats an internal datetime value into a 'UTC' string suitable for returning to
+the client. If parameter is undefined, returns JSON::null.
+
+=head2 as_double
+
+Takes a number value passed as a parameter, and adds 0.0 to it converting to a
+double value. If parameter is undefined, returns JSON::null.
+
+=head2 as_email
+
+Takes an email address as a parameter. If the user is in the editusers group,
+it returns the email address, unchanged. If the parameter is undefined or the
+user is not in the editusers group, it returns JSON::null.
+
+=head2 as_int
+
+Takes a string or number passed as a parameter and converts it to an integer
+value. If parameter is undefined, returns JSON::null.
+
+=head2 as_int_array
+
+Similar to C<as_int>, but takes an array reference to a list of values and
+returns an array reference with the converted values.
+
+=head2 as_login
+
+Takes a login name as a parameter. If C<use_email_as_login> is enabled and the
+user is logged out, it returns the local part of the email address (the part
+before '@'). Else it returns the full login name. If parameter is undefined,
+returns JSON::null.
+
+=head2 as_login_array
+
+Similar to C<as_login>, but takes an array reference to a list of values and
+returns an array reference with the converted values.
+
+=head2 as_name_array
+
+Takes a list of L<Bugzilla::Object> values and returns an array of new values
+by calling '$object->name' for each value.
+
+=head2 as_string
+
+Returns whatever parameter is passed in unchanged, unless undefined, then it
+returns JSON::null.
+
+=head2 as_string_array
+
+Similar to C<as_string>, but takes an array reference to a list of values and
+returns an array reference with the converted values.
+
+=head2 datetime_format_inbound
+
+Takes a datetime string passed in from the client and converts into the format
+'%Y-%m-%d %T' to be used by the internal Bugzilla code.
+
+=head2 datetime_format_outbound
+
+Formats the current datetime value from the internal formal into 'UTC' before
+turning to the client.
+
+=head2 taint_data
+
+Walks the data structure passed in by the client for an API call and taints
+any values that it finds for security purposes.
diff --git a/Bugzilla/API/Server.pm b/Bugzilla/API/Server.pm
new file mode 100644
index 0000000000..16e21c7a94
--- /dev/null
+++ b/Bugzilla/API/Server.pm
@@ -0,0 +1,653 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::Server;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Bugzilla::Constants;
+use Bugzilla::Util qw(trick_taint trim disable_utf8);
+
+use Digest::MD5 qw(md5_base64);
+use File::Spec qw(catfile);
+use HTTP::Request;
+use HTTP::Response;
+use JSON;
+use Moo;
+use Module::Runtime qw(require_module);
+use Scalar::Util qw(blessed);
+use Storable qw(freeze);
+
+#############
+# Constants #
+#############
+
+use constant DEFAULT_API_VERSION   => '1_0';
+use constant DEFAULT_API_NAMESPACE => 'core';
+
+#################################
+# Set up basic accessor methods #
+#################################
+
+has api_ext         => (is => 'rw', default => 0);
+has api_ext_version => (is => 'rw', default => '');
+has api_options     => (is => 'rw', default => sub { [] });
+has api_params      => (is => 'rw', default => sub { {} });
+has api_path        => (is => 'rw', default => '');
+has cgi          => (is => 'lazy');
+has content_type => (is => 'rw', default => 'application/json');
+has controller   => (is => 'rw', default => undef);
+has json         => (is => 'lazy');
+has load_error   => (is => 'rw', default => undef);
+has method_name  => (is => 'rw', default => '');
+has request      => (is => 'lazy');
+has success_code => (is => 'rw', default => 200);
+
+##################
+# Public methods #
+##################
+
+sub server {
+  my ($class) = @_;
+
+  my $api_namespace = DEFAULT_API_NAMESPACE;
+  my $api_version   = DEFAULT_API_VERSION;
+
+  # First load the default server in case something fails
+  # we still have something to return.
+  my $server_class = "Bugzilla::API::${api_version}::Server";
+  require_module($server_class);
+  my $self = $server_class->new;
+
+  my $path_info = Bugzilla->cgi->path_info;
+
+  # If we do not match /<namespace>/<version>/ then we assume legacy calls
+  # and use the default namespace and version.
+  if ($path_info =~ m|^/([^/]+)/(\d+\.\d+(?:\.\d+)?)/|) {
+
+    # First figure out the namespace we are accessing (core is native)
+    $api_namespace = $1 if $path_info =~ s|^/([^/]+)||;
+    $api_namespace = $self->_check_namespace($api_namespace);
+
+    # Figure out which version we are looking for based on path
+    $api_version = $1 if $path_info =~ s|^/(\d+\.\d+(?:\.\d+)?)(/.*)$|$2|;
+    $api_version = $self->_check_version($api_version, $api_namespace);
+  }
+
+  # If the version pulled from the path is different than
+  # what the server is currently, then reload as the new version.
+  if ($api_version ne $self->api_version) {
+    my $server_class = "Bugzilla::API::${api_version}::Server";
+    require_module($server_class);
+    $self = $server_class->new;
+  }
+
+  # Stuff away for later
+  $self->api_path($path_info);
+
+  return $self;
+}
+
+sub constants {
+  my ($self) = @_;
+  return $self->{_constants} if defined $self->{_constants};
+
+  no strict 'refs';
+
+  my $api_version = $self->api_version;
+  my $class       = "Bugzilla::API::${api_version}::Constants";
+  require_module($class);
+
+  $self->{_constants} = {};
+  foreach my $constant (@{$class . "::EXPORT_OK"}) {
+    if (ref $class->$constant) {
+      $self->{_constants}->{$constant} = $class->$constant;
+    }
+    else {
+      my @list = ($class->$constant);
+      $self->{_constants}->{$constant} = (scalar(@list) == 1) ? $list[0] : \@list;
+    }
+  }
+
+  return $self->{_constants};
+}
+
+sub response_header {
+  my ($self, $code, $result) = @_;
+
+  # The HTTP body needs to be bytes (not a utf8 string) for recent
+  # versions of HTTP::Message, but JSON::RPC::Server doesn't handle this
+  # properly. $_[1] is the HTTP body content we're going to be sending.
+  if (utf8::is_utf8($result)) {
+    utf8::encode($result);
+
+    # Since we're going to just be sending raw bytes, we need to
+    # set STDOUT to not expect utf8.
+    disable_utf8();
+  }
+  my $h = HTTP::Headers->new;
+  $h->header('Content-Type' => $self->content_type . '; charset=UTF-8');
+  return HTTP::Response->new($code => undef, $h, $result);
+}
+
+###################################
+# Public methods to be overridden #
+###################################
+
+sub handle         { }
+sub response       { }
+sub print_response { }
+sub handle_login   { }
+
+###################
+# Utility methods #
+###################
+
+sub return_error {
+  my ($self, $status_code, $message, $error_code) = @_;
+  if ($status_code && $message) {
+    $self->{_return_error}
+      = {status_code => $status_code, error => JSON::true, message => $message};
+    $self->{_return_error}->{code} = $error_code if $error_code;
+  }
+  return $self->{_return_error};
+}
+
+sub callback {
+  my ($self, $value) = @_;
+  if (defined $value) {
+    $value = trim($value);
+
+    # We don't use \w because we don't want to allow Unicode here.
+    if ($value !~ /^[A-Za-z0-9_\.\[\]]+$/) {
+      ThrowUserError('json_rpc_invalid_callback', {callback => $value});
+    }
+    $self->{_callback} = $value;
+
+    # JSONP needs to be parsed by a JS parser, not by a JSON parser.
+    $self->content_type('text/javascript');
+  }
+  return $self->{_callback};
+}
+
+# ETag support
+sub etag {
+  my ($self, $data) = @_;
+  my $cache = Bugzilla->request_cache;
+  if (defined $data) {
+
+    # Serialize the data if passed a reference
+    local $Storable::canonical = 1;
+    $data = freeze($data) if ref $data;
+
+    # Wide characters cause md5_base64() to die.
+    utf8::encode($data) if utf8::is_utf8($data);
+
+    # Append content_type to the end of the data
+    # string as we want the etag to be unique to
+    # the content_type. We do not need this for
+    # XMLRPC as text/xml is always returned.
+    if (blessed($self) && $self->can('content_type')) {
+      $data .= $self->content_type if $self->content_type;
+    }
+
+    $cache->{'_etag'} = md5_base64($data);
+  }
+  return $cache->{'_etag'};
+}
+
+# HACK: Allow error tag checking to work with t/012throwables.t
+sub ThrowUserError {
+  my ($error, $self, $vars) = @_;
+  $self->load_error({type => 'user', error => $error, vars => $vars});
+}
+
+sub ThrowCodeError {
+  my ($error, $self, $vars) = @_;
+  $self->load_error({type => 'code', error => $error, vars => $vars});
+}
+
+###################
+# Private methods #
+###################
+
+sub _build_cgi {
+  return Bugzilla->cgi;
+}
+
+sub _build_json {
+
+  # This may seem a little backwards to set utf8(0), but what this really
+  # means is "don't convert our utf8 into byte strings, just leave it as a
+  # utf8 string."
+  return JSON->new->utf8(0)->allow_blessed(1)->convert_blessed(1);
+}
+
+sub _build_request {
+  return HTTP::Request->new($_[0]->cgi->request_method, $_[0]->cgi->url);
+}
+
+sub _check_namespace {
+  my ($self, $namespace) = @_;
+
+  # No need to do anything else if native api
+  return $namespace if lc($namespace) eq lc(DEFAULT_API_NAMESPACE);
+
+  # Check if namespace matches an extension name
+  my $found = 0;
+  foreach my $extension (@{Bugzilla->extensions}) {
+    $found = 1 if lc($extension->NAME) eq lc($namespace);
+  }
+
+  # Make sure we have this namespace available
+  if (!$found) {
+    ThrowUserError('unknown_api_namespace', $self, {api_namespace => $namespace});
+    return DEFAULT_API_NAMESPACE;
+  }
+
+  return $namespace;
+}
+
+sub _check_version {
+  my ($self, $version, $namespace) = @_;
+
+  return DEFAULT_API_VERSION if !defined $version;
+
+  my $old_version = $version;
+  $version =~ s/\./_/g;
+
+  my $version_dir;
+  if (lc($namespace) eq 'core') {
+    $version_dir = File::Spec->catdir('Bugzilla', 'API', $version);
+  }
+  else {
+    $version_dir = File::Spec->catdir(bz_locations()->{extensionsdir},
+      $namespace, 'API', $version);
+  }
+
+  # Make sure we actual have this version installed
+  if (!-d $version_dir) {
+    ThrowUserError('unknown_api_version', $self,
+      {api_version => $old_version, api_namespace => $namespace});
+    return DEFAULT_API_VERSION;
+  }
+
+  # If we using an extension API, we need to determining which version of
+  # the Core API it was written for.
+  if (lc($namespace) ne 'core') {
+    my $core_api_version;
+    foreach my $extension (@{Bugzilla->extensions}) {
+      next if lc($extension->NAME) ne lc($namespace);
+      if ($extension->API_VERSION_MAP && $extension->API_VERSION_MAP->{$version}) {
+        $self->api_ext_version($version);
+        $version = $extension->API_VERSION_MAP->{$version};
+      }
+    }
+  }
+
+  return $version;
+}
+
+sub _best_content_type {
+  my ($self, @types) = @_;
+  my @accept_types = $self->_get_content_prefs();
+
+ # Return the types as-is if no accept header sent, since sorting will be a no-op.
+  if (!@accept_types) {
+    return $types[0];
+  }
+  my $score = sub { $self->_score_type(shift, @accept_types) };
+  my @scored_types = sort { $score->($b) <=> $score->($a) } @types;
+  return $scored_types[0] || '*/*';
+}
+
+sub _score_type {
+  my ($self, $type, @accept_types) = @_;
+  my $score = scalar(@accept_types);
+  for my $accept_type (@accept_types) {
+    return $score if $type eq $accept_type;
+    $score--;
+  }
+  return 0;
+}
+
+sub _get_content_prefs {
+  my $self           = shift;
+  my $default_weight = 1;
+  my @prefs;
+
+  # Parse the Accept header, and save type name, score, and position.
+  my @accept_types = split /,/, $self->cgi->http('accept') || '';
+  my $order = 0;
+  for my $accept_type (@accept_types) {
+    my ($weight) = ($accept_type =~ /q=(\d\.\d+|\d+)/);
+    my ($name)   = ($accept_type =~ m#(\S+/[^;]+)#);
+    next unless $name;
+    push @prefs, {name => $name, order => $order++};
+    if (defined $weight) {
+      $prefs[-1]->{score} = $weight;
+    }
+    else {
+      $prefs[-1]->{score} = $default_weight;
+      $default_weight -= 0.001;
+    }
+  }
+
+  # Sort the types by score, subscore by order, and pull out just the name
+  @prefs = map { $_->{name} }
+    sort { $b->{score} <=> $a->{score} || $a->{order} <=> $b->{order} } @prefs;
+  return @prefs;
+}
+
+####################################
+# Private methods to be overridden #
+####################################
+
+sub _handle               { }
+sub _params_check         { }
+sub _retrieve_json_params { }
+sub _find_resource        { }
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::API::Server - The Web Service API interface to Bugzilla
+
+=head1 DESCRIPTION
+
+This is the standard API for external programs that want to interact
+with Bugzilla. It provides various resources in various modules.
+
+You interact with this API using L<REST|Bugzilla::API::Server>.
+
+Full client documentation for the Bugzilla API can be found at
+L<https://bugzilla.readthedocs.org/en/latest/api/index.html>.
+
+=head1 USAGE
+
+Methodl are grouped into "namespaces", like C<core> for
+native Bugzilla API methods. Extensions reside in their own
+I<namespaces> such as C<Example>. So, for example:
+
+GET /example/1.0/bug1
+
+calls
+
+GET /bug/1
+
+in the C<Example> namespace.
+
+The endpoint for the API interface is the C<rest.cgi> script in
+your Bugzilla installation. For example, if your Bugzilla is at
+C<bugzilla.yourdomain.com>, to access the API and load a bug,
+you would use C<http://bugzilla.yourdomain.com/rest.cgi/core/1.0/bug/35>.
+
+If using Apache and mod_rewrite is installed and enabled, you can
+simplify the endpoint by changing /rest.cgi/ to something like /api/
+or something similar. So the same example from above would be:
+C<http://bugzilla.yourdomain.com/api/core/1.0/bug/35> which is simpler
+to remember.
+
+Add this to your .htaccess file:
+
+  <IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteRule ^rest/(.*)$ rest.cgi/$1 [NE]
+  </IfModule>
+
+=head1 BROWSING
+
+If the Accept: header of a request is set to text/html (as it is by an
+ordinary web browser) then the API will return the JSON data as a HTML
+page which the browser can display. In other words, you can play with the
+API using just your browser and see results in a human-readable form.
+This is a good way to try out the various GET calls, even if you can't use
+it for POST or PUT.
+
+=head1 DATA FORMAT
+
+The API only supports JSON input, and either JSON and JSONP output.
+So objects sent and received must be in JSON format.
+
+On every request, you must set both the "Accept" and "Content-Type" HTTP
+headers to the MIME type of the data format you are using to communicate with
+the API. Content-Type tells the API how to interpret your request, and Accept
+tells it how you want your data back. "Content-Type" must be "application/json".
+"Accept" can be either that, or "application/javascript" for JSONP - add a "callback"
+parameter to name your callback.
+
+Parameters may also be passed in as part of the query string for non-GET requests
+and will override any matching parameters in the request body.
+
+=head1 AUTHENTICATION
+
+Along with viewing data as an anonymous user, you may also see private information
+if you have a Bugzilla account by providing your login credentials.
+
+=over
+
+=item Login name and password
+
+Pass in as query parameters of any request:
+
+login=fred@example.com&password=ilovecheese
+
+Remember to URL encode any special characters, which are often seen in passwords and to
+also enable SSL support.
+
+=item Login token
+
+By calling GET /login?login=fred@example.com&password=ilovecheese, you get back
+a C<token> value which can then be passed to each subsequent call as
+authentication. This is useful for third party clients that cannot use cookies
+and do not want to store a user's login and password in the client. You can also
+pass in "token" as a convenience.
+
+=item API Key
+
+You can also authenticate by passing an C<api_key> value as part of the query
+parameters which is setup using the I<API Keys> tab in C<userprefs.cgi>.
+
+=back
+
+=head1 ERRORS
+
+When an API error occurs, a data structure is returned with the key C<error>
+set to C<true>.
+
+The error contents look similar to:
+
+ { "error": true, "message": "Some message here", "code": 123 }
+
+=head1 CONSTANTS
+
+=over
+
+=item DEFAULT_API_VERSION
+
+The default API version that is used by C<server>.
+Current default is L<1.0> which is the first version of the API implemented in this way..
+
+=item DEFAULT_API_NAMESPACE
+
+The default API namespace that is used if C<server> is called before C<init_serber>.
+Current default is L<core> which is the native API methods (non-extension).
+
+=back
+
+=head1 METHODS
+
+The L<Bugzilla::API::Server> has the following methods used by various
+code in Bugzilla.
+
+=over
+
+=item server
+
+Returns a L<Bugzilla::API::Server> object after looking at the cgi path to
+determine which version of the API is being requested and which namespace to
+load methods from. A new server instance of the proper version is returned.
+
+=item constants
+
+A method return a hash containing the constants from the Constants.pm module
+in the API version directory. The calling code will not need to know which
+version of the API is being used to access the constant values.
+
+=item json
+
+Returns a L<JSON> encode/decoder object.
+
+=item load_error
+
+Method that stores error data if a API module fails to load and ThrowUserError
+or ThrowCodeError needs to send a proper error to the client.
+
+=item cgi
+
+Returns a L<Bugzilla::CGI> object.
+
+=item request
+
+Returns a L<HTTP::Request> object.
+
+=item response_header
+
+Returns a L<HTTP::Response> object with the appropriate content-type set.
+Requires that a status code and content data to be passed in.
+
+=item handle
+
+Handles the current request by finding the correct resource, setting the parameters,
+authentication, executing the resource, and forming an appropriate response.
+
+=item response
+
+Encodes the return data in the requested content-type and also does some other
+changes such as conversion to JSONP and setting status_code. Also sets the eTag
+header values based on the result content.
+
+=item print_response
+
+Prints the final response headers and content to STDOUT.
+
+=item handle_login
+
+Authenticates the user and performs additional checks.
+
+=item return_error
+
+If an error occurs, this method will return a data structure describing the error
+with a code and message.
+
+=item callback
+
+When calling the API over GET, you can use the "JSONP" method of doing cross-domain
+requests, if you want to access the API directly on a web page from another site.
+JSONP is described at L<http://bob.pythonmac.org/archives/2005/12/05/remote-json-jsonp/>.
+
+To use JSONP with Bugzilla's API, simply specify a C<callback> parameter when
+using it via GET as described above. For example, here's some HTML you could use
+to get the time on a remote Bugzilla website, using JSONP:
+
+ <script type="text/javascript" src="http://bugzilla.example.com/time?callback=foo">
+
+That would call the API path for C<time> and pass its value to a function
+called C<foo> as the only argument. All the other URL parameters (such as for
+passing in arguments to methods) that can be passed during GET requests are also
+available, of course. The above is just the simplest possible example.
+
+The values returned when using JSONP are identical to the values returned
+when not using JSONP, so you will also get error messages if there is an
+error.
+
+The C<callback> URL parameter may only contain letters, numbers, periods, and
+the underscore (C<_>) character. Including any other characters will cause
+Bugzilla to throw an error. (This error will be a normal API response, not JSONP.)
+
+=item etag
+
+Using the data structure passed to the subroutine, we convert the data to a string
+and then md5 hash the string to creates a value for the eTag header. This allows
+a user to include the value in seubsequent requests and only return the full data
+if it has changed.
+
+=item api_ext
+
+A boolean value signifying if the current request is for an API method is exported
+by an extension or is part of the core methods.
+
+=item api_ext_version
+
+If the current request is for an extension API method, this is the version of the
+extension API that should be used.
+
+=item api_namespace
+
+The current namespace of the API method being requested as determined by the
+cgi path. If a namespace is not provided, we default to L<core>.
+
+=item api_options
+
+Once a resource has been matched to the current request, this the available options
+to the client such as GET, PUT, etc.
+
+=item api_params
+
+Once a resource has been matched, this is the params that were pulled from the
+regex used to match the resource. This could be a resource id or name such as
+a bug id, etc.
+
+=item api_path
+
+The final cgi path after namespace and version have been removed. This is the
+path used to locate a matching resource from the controller modules.
+
+=item api_version
+
+The current version of the L<core> API that is being used for processing the
+request. Note that this version may be different from C<api_ext_version> if
+the client requested a method in an extension's namespace.
+
+=item content_type
+
+The content-type of the data that will be returned. The current default is
+L<application/json>. If a caller is msking a request using a browser, it will
+most likely be L<text/html>.
+
+=item controller
+
+Once a resource has been matched, this is the controller module that contains
+the method that will be executed.
+
+=item method_name
+
+The method in the controller module that will be executed to handle the request.
+
+=item success_code
+
+The success code to be used when creating the L<response> object to be returned.
+It can be different depending on if the request was successful, a resource was
+created, or an error occurred.
+
+=back
+
+=head1 B<Methods in need of POD>
+
+=over
+
+=item ThrowCodeError
+
+=item ThrowUserError
+
+=back
+
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index b44c94cd08..94fecd7f63 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Attachment;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -46,6 +46,7 @@ use Bugzilla::Hook;
 
 use File::Copy;
 use List::Util qw(max);
+use Scalar::Util qw(weaken isweak);
 use Storable qw(dclone);
 
 use parent qw(Bugzilla::Object);
@@ -57,55 +58,51 @@ use parent qw(Bugzilla::Object);
 use constant DB_TABLE   => 'attachments';
 use constant ID_FIELD   => 'attach_id';
 use constant LIST_ORDER => ID_FIELD;
+
 # Attachments are tracked in bugs_activity.
 use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
 
 use constant DB_COLUMNS => qw(
-    attach_id
-    bug_id
-    creation_ts
-    description
-    filename
-    isobsolete
-    ispatch
-    isprivate
-    mimetype
-    modification_time
-    submitter_id
+  attach_id
+  bug_id
+  creation_ts
+  description
+  filename
+  isobsolete
+  ispatch
+  isprivate
+  mimetype
+  modification_time
+  submitter_id
 );
 
-use constant REQUIRED_FIELD_MAP => {
-    bug_id => 'bug',
-};
+use constant REQUIRED_FIELD_MAP => {bug_id => 'bug',};
 use constant EXTRA_REQUIRED_FIELDS => qw(data);
 
 use constant UPDATE_COLUMNS => qw(
-    description
-    filename
-    isobsolete
-    ispatch
-    isprivate
-    mimetype
+  description
+  filename
+  isobsolete
+  ispatch
+  isprivate
+  mimetype
 );
 
 use constant VALIDATORS => {
-    bug           => \&_check_bug,
-    description   => \&_check_description,
-    filename      => \&_check_filename,
-    ispatch       => \&Bugzilla::Object::check_boolean,
-    isprivate     => \&_check_is_private,
-    mimetype      => \&_check_content_type,
+  bug         => \&_check_bug,
+  description => \&_check_description,
+  filename    => \&_check_filename,
+  ispatch     => \&Bugzilla::Object::check_boolean,
+  isprivate   => \&_check_is_private,
+  mimetype    => \&_check_content_type,
 };
 
-use constant VALIDATOR_DEPENDENCIES => {
-    content_type => ['ispatch'],
-    mimetype     => ['ispatch'],
-};
+use constant VALIDATOR_DEPENDENCIES =>
+  {content_type => ['ispatch'], mimetype => ['ispatch'],};
 
-use constant UPDATE_VALIDATORS => {
-    isobsolete => \&Bugzilla::Object::check_boolean,
-};
+use constant UPDATE_VALIDATORS =>
+  {isobsolete => \&Bugzilla::Object::check_boolean,};
 
 ###############################
 ####      Accessors      ######
@@ -126,7 +123,7 @@ the ID of the bug to which the attachment is attached
 =cut
 
 sub bug_id {
-    return $_[0]->{bug_id};
+  return $_[0]->{bug_id};
 }
 
 =over
@@ -140,8 +137,14 @@ the bug object to which the attachment is attached
 =cut
 
 sub bug {
-    require Bugzilla::Bug;
-    return $_[0]->{bug} //= Bugzilla::Bug->new({ id => $_[0]->bug_id, cache => 1 });
+  my ($self) = @_;
+  require Bugzilla::Bug;
+  return $self->{bug} if defined $self->{bug};
+
+# note $bug exists as a strong reference to keep $self->{bug} defined until the end of this method
+  my $bug = $self->{bug} = Bugzilla::Bug->new({id => $_[0]->bug_id, cache => 1});
+  weaken($self->{bug}) unless isweak($self->{bug});
+  return $bug;
 }
 
 =over
@@ -155,7 +158,7 @@ user-provided text describing the attachment
 =cut
 
 sub description {
-    return $_[0]->{description};
+  return $_[0]->{description};
 }
 
 =over
@@ -169,7 +172,7 @@ the attachment's MIME media type
 =cut
 
 sub contenttype {
-    return $_[0]->{mimetype};
+  return $_[0]->{mimetype};
 }
 
 =over
@@ -183,8 +186,8 @@ the user who attached the attachment
 =cut
 
 sub attacher {
-    return $_[0]->{attacher}
-      //= new Bugzilla::User({ id => $_[0]->{submitter_id}, cache => 1 });
+  return $_[0]->{attacher}
+    //= new Bugzilla::User({id => $_[0]->{submitter_id}, cache => 1});
 }
 
 =over
@@ -198,7 +201,7 @@ the date and time on which the attacher attached the attachment
 =cut
 
 sub attached {
-    return $_[0]->{creation_ts};
+  return $_[0]->{creation_ts};
 }
 
 =over
@@ -212,7 +215,7 @@ the date and time on which the attachment was last modified.
 =cut
 
 sub modification_time {
-    return $_[0]->{modification_time};
+  return $_[0]->{modification_time};
 }
 
 =over
@@ -226,7 +229,7 @@ the name of the file the attacher attached
 =cut
 
 sub filename {
-    return $_[0]->{filename};
+  return $_[0]->{filename};
 }
 
 =over
@@ -240,7 +243,7 @@ whether or not the attachment is a patch
 =cut
 
 sub ispatch {
-    return $_[0]->{ispatch};
+  return $_[0]->{ispatch};
 }
 
 =over
@@ -254,7 +257,7 @@ whether or not the attachment is obsolete
 =cut
 
 sub isobsolete {
-    return $_[0]->{isobsolete};
+  return $_[0]->{isobsolete};
 }
 
 =over
@@ -268,7 +271,7 @@ whether or not the attachment is private
 =cut
 
 sub isprivate {
-    return $_[0]->{isprivate};
+  return $_[0]->{isprivate};
 }
 
 =over
@@ -285,65 +288,104 @@ matches, because this will return a value even if it's matched by the generic
 =cut
 
 sub is_viewable {
-    my $contenttype = $_[0]->contenttype;
-    my $cgi = Bugzilla->cgi;
+  my $contenttype = $_[0]->contenttype;
+  my $cgi         = Bugzilla->cgi;
 
-    # We assume we can view all text and image types.
-    return 1 if ($contenttype =~ /^(text|image)\//);
+  # We assume we can view all text and image types.
+  return 1 if ($contenttype =~ /^(text|image)\//);
 
-    # Mozilla can view XUL. Note the trailing slash on the Gecko detection to
-    # avoid sending XUL to Safari.
-    return 1 if (($contenttype =~ /^application\/vnd\.mozilla\./)
-                 && ($cgi->user_agent() =~ /Gecko\//));
+  # Mozilla can view XUL. Note the trailing slash on the Gecko detection to
+  # avoid sending XUL to Safari.
+  return 1
+    if (($contenttype =~ /^application\/vnd\.mozilla\./)
+    && ($cgi->user_agent() =~ /Gecko\//));
 
-    # If it's not one of the above types, we check the Accept: header for any
-    # types mentioned explicitly.
-    my $accept = join(",", $cgi->Accept());
-    return 1 if ($accept =~ /^(.*,)?\Q$contenttype\E(,.*)?$/);
+  # If it's not one of the above types, we check the Accept: header for any
+  # types mentioned explicitly.
+  my $accept = join(",", $cgi->Accept());
+  return 1 if ($accept =~ /^(.*,)?\Q$contenttype\E(,.*)?$/);
 
-    return 0;
+  return 0;
 }
 
 =over
 
 =item C<data>
 
-the content of the attachment
+Returns the content of the attachment.
+As a side-effect, sets $self->is_on_filesystem.
 
 =back
 
 =cut
 
 sub data {
-    my $self = shift;
-    return $self->{data} if exists $self->{data};
+  my $self = shift;
+  return $self->{data} if exists $self->{data};
 
-    # First try to get the attachment data from the database.
-    ($self->{data}) = Bugzilla->dbh->selectrow_array("SELECT thedata
+  # First try to get the attachment data from the database.
+  ($self->{data}) = Bugzilla->dbh->selectrow_array(
+    "SELECT thedata
                                                       FROM attach_data
-                                                      WHERE id = ?",
-                                                     undef,
-                                                     $self->id);
-
-    # If there's no attachment data in the database, the attachment is stored
-    # in a local file, so retrieve it from there.
-    if (length($self->{data}) == 0) {
-        if (open(AH, $self->_get_local_filename())) {
-            local $/;
-            binmode AH;
-            $self->{data} = <AH>;
-            close(AH);
-        }
+                                                      WHERE id = ?", undef,
+    $self->id
+  );
+
+  # Setting the property here is cheap, as opposed to making an extra
+  # query later, and hitting the filesystem to see if the file is
+  # still there.
+  $self->{is_on_filesystem} = 0;
+
+  # If there's no attachment data in the database, the attachment is stored
+  # in a local file, so retrieve it from there.
+  if (length($self->{data}) == 0) {
+    if (open(AH, '<', $self->_get_local_filename())) {
+
+      # file is actually on disk.
+      $self->{is_on_filesystem} = 1;
+      local $/;
+      binmode AH;
+      $self->{data} = <AH>;
+      close(AH);
     }
+  }
+
+  return $self->{data};
+}
+
+=over
+
+=item C<is_on_filesystem>
 
-    return $self->{data};
+Returns true if the attachment is stored on disk (via maxlocalattachment
+parameter), as opposed to in the database.
+
+=back
+
+=cut
+
+# When the attachment is on the filesystem, you can let the backend
+# (nginx, apache, lighttpd) serve it for you if it supports the X-Sendfile
+# feature. This means that the attachment CGI script may have a reduced
+# footprint. e.g. bug 906010 and bug 1073241.
+
+sub is_on_filesystem {
+  my $self = shift;
+  return $self->{is_on_filesystem} if exists $self->{is_on_filesystem};
+
+  # In order to serve an attachment, you also send the datasize in the
+  # content-length header. Making additional queries which are exactly
+  # the same as found in the datasize code path is just wasteful.
+  my $datasize = $self->datasize;
+  return $self->{is_on_filesystem};
 }
 
 =over
 
 =item C<datasize>
 
-the length (in bytes) of the attachment content
+Returns the length (in bytes) of the attachment content.
+As a side-effect, sets $self->is_on_filesystem.
 
 =back
 
@@ -358,37 +400,45 @@ the length (in bytes) of the attachment content
 # LENGTH() function or stat()ing the file instead.  I've left it in for now.
 
 sub datasize {
-    my $self = shift;
-    return $self->{datasize} if defined $self->{datasize};
+  my $self = shift;
+  return $self->{datasize} if defined $self->{datasize};
 
-    # If we have already retrieved the data, return its size.
-    return length($self->{data}) if exists $self->{data};
+  # If we have already retrieved the data, return its size.
+  return length($self->{data}) if exists $self->{data};
 
-    $self->{datasize} =
-        Bugzilla->dbh->selectrow_array("SELECT LENGTH(thedata)
+  $self->{datasize} = Bugzilla->dbh->selectrow_array(
+    "SELECT LENGTH(thedata)
                                         FROM attach_data
-                                        WHERE id = ?",
-                                       undef, $self->id) || 0;
-
-    # If there's no attachment data in the database, either the attachment
-    # is stored in a local file, and so retrieve its size from the file,
-    # or the attachment has been deleted.
-    unless ($self->{datasize}) {
-        if (open(AH, $self->_get_local_filename())) {
-            binmode AH;
-            $self->{datasize} = (stat(AH))[7];
-            close(AH);
-        }
+                                        WHERE id = ?", undef, $self->id
+  ) || 0;
+
+  # Setting the property here is cheap, as opposed to making an extra
+  # query later, and hitting the filesystem to see if the file is
+  # still there.
+  $self->{is_on_filesystem} = 0;
+
+  # If there's no attachment data in the database, either the attachment
+  # is stored in a local file, and so retrieve its size from the file,
+  # or the attachment has been deleted.
+  unless ($self->{datasize}) {
+    if (open(AH, '<', $self->_get_local_filename())) {
+
+      # file is actually on disk.
+      $self->{is_on_filesystem} = 1;
+      binmode AH;
+      $self->{datasize} = (stat(AH))[7];
+      close(AH);
     }
+  }
 
-    return $self->{datasize};
+  return $self->{datasize};
 }
 
 sub _get_local_filename {
-    my $self = shift;
-    my $hash = ($self->id % 100) + 100;
-    $hash =~ s/.*(\d\d)$/group.$1/;
-    return bz_locations()->{'attachdir'} . "/$hash/attachment." . $self->id;
+  my $self = shift;
+  my $hash = ($self->id % 100) + 100;
+  $hash =~ s/.*(\d\d)$/group.$1/;
+  return bz_locations()->{'attachdir'} . "/$hash/attachment." . $self->id;
 }
 
 =over
@@ -402,8 +452,9 @@ flags that have been set on the attachment
 =cut
 
 sub flags {
-    # Don't cache it as it must be in sync with ->flag_types.
-    return $_[0]->{flags} = [map { @{$_->{flags}} } @{$_[0]->flag_types}];
+
+  # Don't cache it as it must be in sync with ->flag_types.
+  return $_[0]->{flags} = [map { @{$_->{flags}} } @{$_[0]->flag_types}];
 }
 
 =over
@@ -418,202 +469,214 @@ already set, grouped by flag type.
 =cut
 
 sub flag_types {
-    my $self = shift;
-    return $self->{flag_types} if exists $self->{flag_types};
+  my $self = shift;
+  return $self->{flag_types} if exists $self->{flag_types};
 
-    my $vars = { target_type  => 'attachment',
-                 product_id   => $self->bug->product_id,
-                 component_id => $self->bug->component_id,
-                 attach_id    => $self->id };
+  my $vars = {
+    target_type  => 'attachment',
+    product_id   => $self->bug->product_id,
+    component_id => $self->bug->component_id,
+    attach_id    => $self->id
+  };
 
-    return $self->{flag_types} = Bugzilla::Flag->_flag_types($vars);
+  return $self->{flag_types} = Bugzilla::Flag->_flag_types($vars);
 }
 
 ###############################
 ####      Validators     ######
 ###############################
 
-sub set_content_type { $_[0]->set('mimetype', $_[1]); }
+sub set_content_type { $_[0]->set('mimetype',    $_[1]); }
 sub set_description  { $_[0]->set('description', $_[1]); }
-sub set_filename     { $_[0]->set('filename', $_[1]); }
-sub set_is_patch     { $_[0]->set('ispatch', $_[1]); }
-sub set_is_private   { $_[0]->set('isprivate', $_[1]); }
-
-sub set_is_obsolete  {
-    my ($self, $obsolete) = @_;
-
-    my $old = $self->isobsolete;
-    $self->set('isobsolete', $obsolete);
-    my $new = $self->isobsolete;
-
-    # If the attachment is being marked as obsolete, cancel pending requests.
-    if ($new && $old != $new) {
-        my @requests = grep { $_->status eq '?' } @{$self->flags};
-        return unless scalar @requests;
-
-        my %flag_ids = map { $_->id => 1 } @requests;
-        foreach my $flagtype (@{$self->flag_types}) {
-            @{$flagtype->{flags}} = grep { !$flag_ids{$_->id} } @{$flagtype->{flags}};
-        }
+sub set_filename     { $_[0]->set('filename',    $_[1]); }
+sub set_is_patch     { $_[0]->set('ispatch',     $_[1]); }
+sub set_is_private   { $_[0]->set('isprivate',   $_[1]); }
+
+sub set_is_obsolete {
+  my ($self, $obsolete) = @_;
+
+  my $old = $self->isobsolete;
+  $self->set('isobsolete', $obsolete);
+  my $new = $self->isobsolete;
+
+  # If the attachment is being marked as obsolete, cancel pending requests.
+  if ($new && $old != $new) {
+    my @requests = grep { $_->status eq '?' } @{$self->flags};
+    return unless scalar @requests;
+
+    my %flag_ids = map { $_->id => 1 } @requests;
+    foreach my $flagtype (@{$self->flag_types}) {
+      @{$flagtype->{flags}} = grep { !$flag_ids{$_->id} } @{$flagtype->{flags}};
     }
+  }
 }
 
 sub set_flags {
-    my ($self, $flags, $new_flags) = @_;
+  my ($self, $flags, $new_flags) = @_;
 
-    Bugzilla::Flag->set_flag($self, $_) foreach (@$flags, @$new_flags);
+  Bugzilla::Flag->set_flag($self, $_) foreach (@$flags, @$new_flags);
 }
 
 sub _check_bug {
-    my ($invocant, $bug) = @_;
-    my $user = Bugzilla->user;
+  my ($invocant, $bug) = @_;
+  my $user = Bugzilla->user;
 
-    $bug = ref $invocant ? $invocant->bug : $bug;
+  $bug = ref $invocant ? $invocant->bug : $bug;
 
-    $bug || ThrowCodeError('param_required', 
-                           { function => "$invocant->create", param => 'bug' });
+  $bug
+    || ThrowCodeError('param_required',
+    {function => "$invocant->create", param => 'bug'});
 
-    ($user->can_see_bug($bug->id) && $user->can_edit_product($bug->product_id))
-      || ThrowUserError("illegal_attachment_edit_bug", { bug_id => $bug->id });
+  ($user->can_see_bug($bug->id) && $user->can_edit_product($bug->product_id))
+    || ThrowUserError("illegal_attachment_edit_bug", {bug_id => $bug->id});
 
-    return $bug;
+  return $bug;
 }
 
 sub _check_content_type {
-    my ($invocant, $content_type, undef, $params) = @_;
- 
-    my $is_patch = ref($invocant) ? $invocant->ispatch : $params->{ispatch};
-    $content_type = 'text/plain' if $is_patch;
-    $content_type = clean_text($content_type);
-    # The subsets below cover all existing MIME types and charsets registered by IANA.
-    # (MIME type: RFC 2045 section 5.1; charset: RFC 2278 section 3.3)
-    my $legal_types = join('|', LEGAL_CONTENT_TYPES);
-    if (!$content_type
-        || $content_type !~ /^($legal_types)\/[a-z0-9_\-\+\.]+(;\s*charset=[a-z0-9_\-\+]+)?$/i)
-    {
-        ThrowUserError("invalid_content_type", { contenttype => $content_type });
+  my ($invocant, $content_type, undef, $params) = @_;
+
+  my $is_patch = ref($invocant) ? $invocant->ispatch : $params->{ispatch};
+  $content_type = 'text/plain' if $is_patch;
+  $content_type = clean_text($content_type);
+
+# The subsets below cover all existing MIME types and charsets registered by IANA.
+# (MIME type: RFC 2045 section 5.1; charset: RFC 2278 section 3.3)
+  my $legal_types = join('|', LEGAL_CONTENT_TYPES);
+  if (!$content_type
+    || $content_type
+    !~ /^($legal_types)\/[a-z0-9_\-\+\.]+(;\s*charset=[a-z0-9_\-\+]+)?$/i)
+  {
+    ThrowUserError("invalid_content_type", {contenttype => $content_type});
+  }
+  trick_taint($content_type);
+
+  # $ENV{HOME} must be defined when using File::MimeInfo::Magic,
+  # see https://rt.cpan.org/Public/Bug/Display.html?id=41744.
+  local $ENV{HOME} = $ENV{HOME} || File::Spec->rootdir();
+
+  # If we have autodetected application/octet-stream from the Content-Type
+  # header, let's have a better go using a sniffer if available.
+  if ( (Bugzilla->input_params->{contenttypemethod} // '') eq 'autodetect'
+    && ($content_type eq 'application/octet-stream' || $content_type =~ m{text/x-})
+    && Bugzilla->feature('typesniffer'))
+  {
+    import File::MimeInfo::Magic qw(mimetype);
+    require IO::Scalar;
+
+    # data is either a filehandle, or the data itself.
+    my $fh = $params->{data};
+    if (!ref($fh)) {
+      $fh = new IO::Scalar \$fh;
     }
-    trick_taint($content_type);
-
-    # $ENV{HOME} must be defined when using File::MimeInfo::Magic,
-    # see https://rt.cpan.org/Public/Bug/Display.html?id=41744.
-    local $ENV{HOME} = $ENV{HOME} || File::Spec->rootdir();
-
-    # If we have autodetected application/octet-stream from the Content-Type
-    # header, let's have a better go using a sniffer if available.
-    if (defined Bugzilla->input_params->{contenttypemethod}
-        && Bugzilla->input_params->{contenttypemethod} eq 'autodetect'
-        && $content_type eq 'application/octet-stream'
-        && Bugzilla->feature('typesniffer'))
-    {
-        import File::MimeInfo::Magic qw(mimetype);
-        require IO::Scalar;
-
-        # data is either a filehandle, or the data itself.
-        my $fh = $params->{data};
-        if (!ref($fh)) {
-            $fh = new IO::Scalar \$fh;
-        }
-        elsif (!$fh->isa('IO::Handle')) {
-            # CGI.pm sends us an Fh that isn't actually an IO::Handle, but
-            # has a method for getting an actual handle out of it.
-            $fh = $fh->handle;
-            # ->handle returns an literal IO::Handle, even though the
-            # underlying object is a file. So we rebless it to be a proper
-            # IO::File object so that we can call ->seek on it and so on.
-            # Just in case CGI.pm fixes this some day, we check ->isa first.
-            if (!$fh->isa('IO::File')) {
-                bless $fh, 'IO::File';
-            }
-        }
-
-        my $mimetype = mimetype($fh);
-        $fh->seek(0, 0);
-        $content_type = $mimetype if $mimetype;
+    elsif (!$fh->isa('IO::Handle')) {
+
+      # CGI.pm sends us an Fh that isn't actually an IO::Handle, but
+      # has a method for getting an actual handle out of it.
+      $fh = $fh->handle;
+
+      # ->handle returns an literal IO::Handle, even though the
+      # underlying object is a file. So we rebless it to be a proper
+      # IO::File object so that we can call ->seek on it and so on.
+      # Just in case CGI.pm fixes this some day, we check ->isa first.
+      if (!$fh->isa('IO::File')) {
+        bless $fh, 'IO::File';
+      }
     }
 
-    # Make sure patches are viewable in the browser
-    if (!ref($invocant)
-        && defined Bugzilla->input_params->{contenttypemethod}
-        && Bugzilla->input_params->{contenttypemethod} eq 'autodetect'
-        && $content_type =~ m{text/x-(?:diff|patch)})
-    {
-        $params->{ispatch} = 1;
-        $content_type = 'text/plain';
-    }
-
-    return $content_type;
+    my $mimetype = mimetype($fh);
+    $fh->seek(0, 0);
+    $content_type = $mimetype if $mimetype;
+  }
+
+  # Make sure patches are viewable in the browser
+  if ( !ref($invocant)
+    && (Bugzilla->input_params->{contenttypemethod} // '') eq 'autodetect'
+    && $content_type =~ m{text/x-(?:diff|patch)})
+  {
+    $params->{ispatch} = 1;
+    $content_type = 'text/plain';
+  }
+
+  return $content_type;
 }
 
 sub _check_data {
-    my ($invocant, $params) = @_;
+  my ($invocant, $params) = @_;
 
-    my $data = $params->{data};
-    $params->{filesize} = ref $data ? -s $data : length($data);
+  my $data = $params->{data};
+  $params->{filesize} = ref $data ? -s $data : length($data);
 
-    Bugzilla::Hook::process('attachment_process_data', { data       => \$data,
-                                                         attributes => $params });
+  Bugzilla::Hook::process('attachment_process_data',
+    {data => \$data, attributes => $params});
 
-    $params->{filesize} || ThrowUserError('zero_length_file');
-    # Make sure the attachment does not exceed the maximum permitted size.
-    my $max_size = max(Bugzilla->params->{'maxlocalattachment'} * 1048576,
-                       Bugzilla->params->{'maxattachmentsize'} * 1024);
+  $params->{filesize} || ThrowUserError('zero_length_file');
 
-    if ($params->{filesize} > $max_size) {
-        my $vars = { filesize => sprintf("%.0f", $params->{filesize}/1024) };
-        ThrowUserError('file_too_large', $vars);
-    }
-    return $data;
+  # Make sure the attachment does not exceed the maximum permitted size.
+  my $max_size = max(
+    Bugzilla->params->{'maxlocalattachment'} * 1048576,
+    Bugzilla->params->{'maxattachmentsize'} * 1024
+  );
+
+  if ($params->{filesize} > $max_size) {
+    my $vars = {filesize => sprintf("%.0f", $params->{filesize} / 1024)};
+    ThrowUserError('file_too_large', $vars);
+  }
+  return $data;
 }
 
 sub _check_description {
-    my ($invocant, $description) = @_;
+  my ($invocant, $description) = @_;
 
-    $description = trim($description);
-    $description || ThrowUserError('missing_attachment_description');
-    return $description;
+  $description = trim($description);
+  $description || ThrowUserError('missing_attachment_description');
+  return $description;
 }
 
 sub _check_filename {
-    my ($invocant, $filename) = @_;
-
-    $filename = clean_text($filename);
-    if (!$filename) {
-        if (ref $invocant) {
-            ThrowUserError('filename_not_specified');
-        }
-        else {
-            ThrowUserError('file_not_specified');
-        }
-    }
+  my ($invocant, $filename) = @_;
 
-    # Remove path info (if any) from the file name.  The browser should do this
-    # for us, but some are buggy.  This may not work on Mac file names and could
-    # mess up file names with slashes in them, but them's the breaks.  We only
-    # use this as a hint to users downloading attachments anyway, so it's not
-    # a big deal if it munges incorrectly occasionally.
-    $filename =~ s/^.*[\/\\]//;
-
-    # Truncate the filename to MAX_ATTACH_FILENAME_LENGTH characters, counting 
-    # from the end of the string to make sure we keep the filename extension.
-    $filename = substr($filename, 
-                       -&MAX_ATTACH_FILENAME_LENGTH, 
-                       MAX_ATTACH_FILENAME_LENGTH);
-    trick_taint($filename);
-
-    return $filename;
+  $filename = clean_text($filename);
+  if (!$filename) {
+    if (ref $invocant) {
+      ThrowUserError('filename_not_specified');
+    }
+    else {
+      ThrowUserError('file_not_specified');
+    }
+  }
+
+  # Remove path info (if any) from the file name.  The browser should do this
+  # for us, but some are buggy.  This may not work on Mac file names and could
+  # mess up file names with slashes in them, but them's the breaks.  We only
+  # use this as a hint to users downloading attachments anyway, so it's not
+  # a big deal if it munges incorrectly occasionally.
+  $filename =~ s/^.*[\/\\]//;
+
+  # Truncate the filename to MAX_ATTACH_FILENAME_LENGTH characters, counting
+  # from the end of the string to make sure we keep the filename extension.
+  $filename
+    = substr($filename, -&MAX_ATTACH_FILENAME_LENGTH, MAX_ATTACH_FILENAME_LENGTH);
+  trick_taint($filename);
+
+  return $filename;
 }
 
 sub _check_is_private {
-    my ($invocant, $is_private) = @_;
-
-    $is_private = $is_private ? 1 : 0;
-    if (((!ref $invocant && $is_private)
-         || (ref $invocant && $invocant->isprivate != $is_private))
-        && !Bugzilla->user->is_insider) {
-        ThrowUserError('user_not_insider');
-    }
-    return $is_private;
+  my ($invocant, $is_private) = @_;
+
+  $is_private = $is_private ? 1 : 0;
+  if (
+    (
+         (!ref $invocant && $is_private)
+      || (ref $invocant && $invocant->isprivate != $is_private)
+    )
+    && !Bugzilla->user->is_insider
+    )
+  {
+    ThrowUserError('user_not_insider');
+  }
+  return $is_private;
 }
 
 =pod
@@ -635,69 +698,74 @@ Returns:    a reference to an array of attachment objects.
 =cut
 
 sub get_attachments_by_bug {
-    my ($class, $bug, $vars) = @_;
-    my $user = Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
-
-    # By default, private attachments are not accessible, unless the user
-    # is in the insider group or submitted the attachment.
-    my $and_restriction = '';
-    my @values = ($bug->id);
-
-    unless ($user->is_insider) {
-        $and_restriction = 'AND (isprivate = 0 OR submitter_id = ?)';
-        push(@values, $user->id);
+  my ($class, $bug, $vars) = @_;
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
+
+  # By default, private attachments are not accessible, unless the user
+  # is in the insider group or submitted the attachment.
+  my $and_restriction = '';
+  my @values          = ($bug->id);
+
+  unless ($user->is_insider) {
+    $and_restriction = 'AND (isprivate = 0 OR submitter_id = ?)';
+    push(@values, $user->id);
+  }
+
+  my $attach_ids = $dbh->selectcol_arrayref(
+    "SELECT attach_id FROM attachments
+                                               WHERE bug_id = ? $and_restriction",
+    undef, @values
+  );
+
+  my $attachments = Bugzilla::Attachment->new_from_list($attach_ids);
+  $_->{bug} = $bug foreach @$attachments;
+
+ # To avoid $attachment->flags and $attachment->flag_types running SQL queries
+ # themselves for each attachment listed here, we collect all the data at once and
+ # populate $attachment->{flag_types} ourselves. We also load all attachers and
+ # datasizes at once for the same reason.
+  if ($vars->{preload}) {
+
+    # Preload flag types and flags
+    my $vars = {
+      target_type  => 'attachment',
+      product_id   => $bug->product_id,
+      component_id => $bug->component_id,
+      attach_id    => $attach_ids
+    };
+    my $flag_types = Bugzilla::Flag->_flag_types($vars);
+
+    foreach my $attachment (@$attachments) {
+      $attachment->{flag_types} = [];
+      my $new_types = dclone($flag_types);
+      foreach my $new_type (@$new_types) {
+        $new_type->{flags}
+          = [grep($_->attach_id == $attachment->id, @{$new_type->{flags}})];
+        push(@{$attachment->{flag_types}}, $new_type);
+      }
     }
 
-    my $attach_ids = $dbh->selectcol_arrayref("SELECT attach_id FROM attachments
-                                               WHERE bug_id = ? $and_restriction",
-                                               undef, @values);
-
-    my $attachments = Bugzilla::Attachment->new_from_list($attach_ids);
-    $_->{bug} = $bug foreach @$attachments;
-
-    # To avoid $attachment->flags and $attachment->flag_types running SQL queries
-    # themselves for each attachment listed here, we collect all the data at once and
-    # populate $attachment->{flag_types} ourselves. We also load all attachers and
-    # datasizes at once for the same reason.
-    if ($vars->{preload}) {
-        # Preload flag types and flags
-        my $vars = { target_type  => 'attachment',
-                     product_id   => $bug->product_id,
-                     component_id => $bug->component_id,
-                     attach_id    => $attach_ids };
-        my $flag_types = Bugzilla::Flag->_flag_types($vars);
-
-        foreach my $attachment (@$attachments) {
-            $attachment->{flag_types} = [];
-            my $new_types = dclone($flag_types);
-            foreach my $new_type (@$new_types) {
-                $new_type->{flags} = [ grep($_->attach_id == $attachment->id,
-                                            @{ $new_type->{flags} }) ];
-                push(@{ $attachment->{flag_types} }, $new_type);
-            }
-        }
-
-        # Preload attachers.
-        my %user_ids = map { $_->{submitter_id} => 1 } @$attachments;
-        my $users = Bugzilla::User->new_from_list([keys %user_ids]);
-        my %user_map = map { $_->id => $_ } @$users;
-        foreach my $attachment (@$attachments) {
-            $attachment->{attacher} = $user_map{$attachment->{submitter_id}};
-        }
-
-        # Preload datasizes.
-        my $sizes =
-          $dbh->selectall_hashref('SELECT attach_id, LENGTH(thedata) AS datasize
+    # Preload attachers.
+    my %user_ids = map { $_->{submitter_id} => 1 } @$attachments;
+    my $users    = Bugzilla::User->new_from_list([keys %user_ids]);
+    my %user_map = map { $_->id => $_ } @$users;
+    foreach my $attachment (@$attachments) {
+      $attachment->{attacher} = $user_map{$attachment->{submitter_id}};
+    }
+
+    # Preload datasizes.
+    my $sizes = $dbh->selectall_hashref(
+      'SELECT attach_id, LENGTH(thedata) AS datasize
                                    FROM attachments LEFT JOIN attach_data ON attach_id = id
-                                   WHERE bug_id = ?',
-                                   'attach_id', undef, $bug->id);
+                                   WHERE bug_id = ?', 'attach_id', undef, $bug->id
+    );
 
-        # Force the size of attachments not in the DB to be recalculated.
-        $_->{datasize} = $sizes->{$_->id}->{datasize} || undef foreach @$attachments;
-    }
+    # Force the size of attachments not in the DB to be recalculated.
+    $_->{datasize} = $sizes->{$_->id}->{datasize} || undef foreach @$attachments;
+  }
 
-    return $attachments;
+  return $attachments;
 }
 
 =pod
@@ -716,13 +784,15 @@ Returns:     1 on success, 0 otherwise.
 =cut
 
 sub validate_can_edit {
-    my $attachment = shift;
-    my $user = Bugzilla->user;
-
-    # The submitter can edit their attachments.
-    return ($attachment->attacher->id == $user->id
-            || ((!$attachment->isprivate || $user->is_insider)
-                 && $user->in_group('editbugs', $attachment->bug->product_id))) ? 1 : 0;
+  my $attachment = shift;
+  my $user       = Bugzilla->user;
+
+  # The submitter can edit their attachments.
+  return (
+    $attachment->attacher->id == $user->id
+      || ((!$attachment->isprivate || $user->is_insider)
+      && $user->in_group('editbugs', $attachment->bug->product_id))
+  ) ? 1 : 0;
 }
 
 =item C<validate_obsolete($bug, $attach_ids)>
@@ -741,37 +811,36 @@ Returns:     The list of attachment objects to mark as obsolete.
 =cut
 
 sub validate_obsolete {
-    my ($class, $bug, $list) = @_;
+  my ($class, $bug, $list) = @_;
 
-    # Make sure the attachment id is valid and the user has permissions to view
-    # the bug to which it is attached. Make sure also that the user can view
-    # the attachment itself.
-    my @obsolete_attachments;
-    foreach my $attachid (@$list) {
-        my $vars = {};
-        $vars->{'attach_id'} = $attachid;
+  # Make sure the attachment id is valid and the user has permissions to view
+  # the bug to which it is attached. Make sure also that the user can view
+  # the attachment itself.
+  my @obsolete_attachments;
+  foreach my $attachid (@$list) {
+    my $vars = {};
+    $vars->{'attach_id'} = $attachid;
 
-        detaint_natural($attachid)
-          || ThrowUserError('invalid_attach_id', $vars);
+    detaint_natural($attachid) || ThrowUserError('invalid_attach_id', $vars);
 
-        # Make sure the attachment exists in the database.
-        my $attachment = new Bugzilla::Attachment($attachid)
-          || ThrowUserError('invalid_attach_id', $vars);
+    # Make sure the attachment exists in the database.
+    my $attachment = new Bugzilla::Attachment($attachid)
+      || ThrowUserError('invalid_attach_id', $vars);
 
-        # Check that the user can view and edit this attachment.
-        $attachment->validate_can_edit
-          || ThrowUserError('illegal_attachment_edit', { attach_id => $attachment->id });
+    # Check that the user can view and edit this attachment.
+    $attachment->validate_can_edit
+      || ThrowUserError('illegal_attachment_edit', {attach_id => $attachment->id});
 
-        if ($attachment->bug_id != $bug->bug_id) {
-            $vars->{'my_bug_id'} = $bug->bug_id;
-            ThrowUserError('mismatched_bug_ids_on_obsolete', $vars);
-        }
+    if ($attachment->bug_id != $bug->bug_id) {
+      $vars->{'my_bug_id'} = $bug->bug_id;
+      ThrowUserError('mismatched_bug_ids_on_obsolete', $vars);
+    }
 
-        next if $attachment->isobsolete;
+    next if $attachment->isobsolete;
 
-        push(@obsolete_attachments, $attachment);
-    }
-    return @obsolete_attachments;
+    push(@obsolete_attachments, $attachment);
+  }
+  return @obsolete_attachments;
 }
 
 ###############################
@@ -806,111 +875,119 @@ Returns:    The new attachment object.
 =cut
 
 sub create {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
-
-    $class->check_required_create_fields(@_);
-    my $params = $class->run_create_validators(@_);
-
-    # Extract everything which is not a valid column name.
-    my $bug = delete $params->{bug};
-    $params->{bug_id} = $bug->id;
-    my $data = delete $params->{data};
-    my $size = delete $params->{filesize};
-
-    my $attachment = $class->insert_create_data($params);
-    my $attachid = $attachment->id;
-
-    # The file is too large to be stored in the DB, so we store it locally.
-    if ($size > Bugzilla->params->{'maxattachmentsize'} * 1024) {
-        my $attachdir = bz_locations()->{'attachdir'};
-        my $hash = ($attachid % 100) + 100;
-        $hash =~ s/.*(\d\d)$/group.$1/;
-        mkdir "$attachdir/$hash", 0770;
-        chmod 0770, "$attachdir/$hash";
-        if (ref $data) {
-            copy($data, "$attachdir/$hash/attachment.$attachid");
-            close $data;
-        }
-        else {
-            open(AH, '>', "$attachdir/$hash/attachment.$attachid");
-            binmode AH;
-            print AH $data;
-            close AH;
-        }
-        $data = ''; # Will be stored in the DB.
-    }
-    # If we have a filehandle, we need its content to store it in the DB.
-    elsif (ref $data) {
-        local $/;
-        # Store the content in a temp variable while we close the FH.
-        my $tmp = <$data>;
-        close $data;
-        $data = $tmp;
-    }
+  my $class = shift;
+  my $dbh   = Bugzilla->dbh;
 
-    my $sth = $dbh->prepare("INSERT INTO attach_data
-                             (id, thedata) VALUES ($attachid, ?)");
+  $class->check_required_create_fields(@_);
+  my $params = $class->run_create_validators(@_);
 
-    trick_taint($data);
-    $sth->bind_param(1, $data, $dbh->BLOB_TYPE);
-    $sth->execute();
+  # Extract everything which is not a valid column name.
+  my $bug = delete $params->{bug};
+  $params->{bug_id} = $bug->id;
+  my $data = delete $params->{data};
+  my $size = delete $params->{filesize};
 
-    $attachment->{bug} = $bug;
+  my $attachment = $class->insert_create_data($params);
+  my $attachid   = $attachment->id;
 
-    # Return the new attachment object.
-    return $attachment;
-}
+  # The file is too large to be stored in the DB, so we store it locally.
+  if ($size > Bugzilla->params->{'maxattachmentsize'} * 1024) {
+    my $attachdir = bz_locations()->{'attachdir'};
+    my $hash      = ($attachid % 100) + 100;
+    $hash =~ s/.*(\d\d)$/group.$1/;
+    mkdir "$attachdir/$hash", 0770;
+    chmod 0770, "$attachdir/$hash";
+    if (ref $data) {
+      copy($data, "$attachdir/$hash/attachment.$attachid");
+      close $data;
+    }
+    else {
+      open(AH, '>', "$attachdir/$hash/attachment.$attachid");
+      binmode AH;
+      print AH $data;
+      close AH;
+    }
+    $data = '';    # Will be stored in the DB.
+  }
 
-sub run_create_validators {
-    my ($class, $params) = @_;
+  # If we have a filehandle, we need its content to store it in the DB.
+  elsif (ref $data) {
+    local $/;
+
+    # Store the content in a temp variable while we close the FH.
+    my $tmp = <$data>;
+    close $data;
+    $data = $tmp;
+  }
+
+  my $sth = $dbh->prepare(
+    "INSERT INTO attach_data
+                             (id, thedata) VALUES ($attachid, ?)"
+  );
 
-    # Let's validate the attachment content first as it may
-    # alter some other attachment attributes.
-    $params->{data} = $class->_check_data($params);
-    $params = $class->SUPER::run_create_validators($params);
+  trick_taint($data);
+  $sth->bind_param(1, $data, $dbh->BLOB_TYPE);
+  $sth->execute();
 
-    $params->{creation_ts} ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-    $params->{modification_time} = $params->{creation_ts};
-    $params->{submitter_id} = Bugzilla->user->id || ThrowUserError('invalid_user');
+  $attachment->{bug} = $bug;
 
-    return $params;
+  # Return the new attachment object.
+  return $attachment;
 }
 
-sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    my $timestamp = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+sub run_create_validators {
+  my ($class, $params) = @_;
 
-    my ($changes, $old_self) = $self->SUPER::update(@_);
+  $params->{submitter_id} = Bugzilla->user->id || ThrowUserError('invalid_user');
 
-    my ($removed, $added) = Bugzilla::Flag->update_flags($self, $old_self, $timestamp);
-    if ($removed || $added) {
-        $changes->{'flagtypes.name'} = [$removed, $added];
-    }
+  # Let's validate the attachment content first as it may
+  # alter some other attachment attributes.
+  $params->{data} = $class->_check_data($params);
+  $params = $class->SUPER::run_create_validators($params);
 
-    # Record changes in the activity table.
-    require Bugzilla::Bug;
-    foreach my $field (keys %$changes) {
-        my $change = $changes->{$field};
-        $field = "attachments.$field" unless $field eq "flagtypes.name";
-        Bugzilla::Bug::LogActivityEntry($self->bug_id, $field, $change->[0],
-            $change->[1], $user->id, $timestamp, undef, $self->id);
-    }
+  $params->{creation_ts}
+    ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  $params->{modification_time} = $params->{creation_ts};
 
-    if (scalar(keys %$changes)) {
-        $dbh->do('UPDATE attachments SET modification_time = ? WHERE attach_id = ?',
-                 undef, ($timestamp, $self->id));
-        $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
-                 undef, ($timestamp, $self->bug_id));
-        $self->{modification_time} = $timestamp;
-        # because we updated the attachments table after SUPER::update(), we
-        # need to ensure the cache is flushed.
-        Bugzilla->memcached->clear({ table => 'attachments', id => $self->id });
-    }
+  return $params;
+}
 
-    return $changes;
+sub update {
+  my $self      = shift;
+  my $dbh       = Bugzilla->dbh;
+  my $user      = Bugzilla->user;
+  my $timestamp = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+
+  my ($changes, $old_self) = $self->SUPER::update(@_);
+
+  my ($removed, $added)
+    = Bugzilla::Flag->update_flags($self, $old_self, $timestamp);
+  if ($removed || $added) {
+    $changes->{'flagtypes.name'} = [$removed, $added];
+  }
+
+  # Record changes in the activity table.
+  require Bugzilla::Bug;
+  foreach my $field (keys %$changes) {
+    my $change = $changes->{$field};
+    $field = "attachments.$field" unless $field eq "flagtypes.name";
+    Bugzilla::Bug::LogActivityEntry($self->bug_id, $field, $change->[0],
+      $change->[1], $user->id, $timestamp, undef, $self->id);
+  }
+
+  if (scalar(keys %$changes)) {
+    $dbh->do('UPDATE attachments SET modification_time = ? WHERE attach_id = ?',
+      undef, ($timestamp, $self->id));
+    $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
+      undef, ($timestamp, $self->bug_id));
+    $self->{modification_time} = $timestamp;
+
+    # because we updated the attachments table after SUPER::update(), we
+    # need to ensure the cache is flushed.
+    Bugzilla->memcached->clear({table => 'attachments', id => $self->id});
+  }
+
+  return $changes;
 }
 
 =pod
@@ -928,30 +1005,33 @@ Returns:    nothing
 =cut
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-    my $flag_ids = $dbh->selectcol_arrayref(
-        'SELECT id FROM flags WHERE attach_id = ?', undef, $self->id);
-    $dbh->do('DELETE FROM flags WHERE ' . $dbh->sql_in('id', $flag_ids))
-        if @$flag_ids;
-    $dbh->do('DELETE FROM attach_data WHERE id = ?', undef, $self->id);
-    $dbh->do('UPDATE attachments SET mimetype = ?, ispatch = ?, isobsolete = ?
-              WHERE attach_id = ?', undef, ('text/plain', 0, 1, $self->id));
-    $dbh->bz_commit_transaction();
-
-    my $filename = $self->_get_local_filename;
-    if (-e $filename) {
-        unlink $filename or warn "Couldn't unlink $filename: $!";
-    }
-
-    # As we don't call SUPER->remove_from_db we need to manually clear
-    # memcached here.
-    Bugzilla->memcached->clear({ table => 'attachments', id => $self->id });
-    foreach my $flag_id (@$flag_ids) {
-        Bugzilla->memcached->clear({ table => 'flags', id => $flag_id });
-    }
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+  my $flag_ids
+    = $dbh->selectcol_arrayref('SELECT id FROM flags WHERE attach_id = ?',
+    undef, $self->id);
+  $dbh->do('DELETE FROM flags WHERE ' . $dbh->sql_in('id', $flag_ids))
+    if @$flag_ids;
+  $dbh->do('DELETE FROM attach_data WHERE id = ?', undef, $self->id);
+  $dbh->do(
+    'UPDATE attachments SET mimetype = ?, ispatch = ?, isobsolete = ?
+              WHERE attach_id = ?', undef, ('text/plain', 0, 1, $self->id)
+  );
+  $dbh->bz_commit_transaction();
+
+  my $filename = $self->_get_local_filename;
+  if (-e $filename) {
+    unlink $filename or warn "Couldn't unlink $filename: $!";
+  }
+
+  # As we don't call SUPER->remove_from_db we need to manually clear
+  # memcached here.
+  Bugzilla->memcached->clear({table => 'attachments', id => $self->id});
+  foreach my $flag_id (@$flag_ids) {
+    Bugzilla->memcached->clear({table => 'flags', id => $flag_id});
+  }
 }
 
 ###############################
@@ -960,37 +1040,39 @@ sub remove_from_db {
 
 # Extract the content type from the attachment form.
 sub get_content_type {
-    my $cgi = Bugzilla->cgi;
+  my $cgi = Bugzilla->cgi;
 
-    return 'text/plain' if ($cgi->param('ispatch') || $cgi->param('attach_text'));
+  return 'text/plain' if ($cgi->param('ispatch') || $cgi->param('attach_text'));
 
-    my $content_type;
-    my $method = $cgi->param('contenttypemethod') || '';
+  my $content_type;
+  my $method = $cgi->param('contenttypemethod') || '';
 
-    if ($method eq 'list') {
-        # The user selected a content type from the list, so use their
-        # selection.
-        $content_type = $cgi->param('contenttypeselection');
-    }
-    elsif ($method eq 'manual') {
-        # The user entered a content type manually, so use their entry.
-        $content_type = $cgi->param('contenttypeentry');
-    }
-    else {
-        defined $cgi->upload('data') || ThrowUserError('file_not_specified');
-        # The user asked us to auto-detect the content type, so use the type
-        # specified in the HTTP request headers.
-        $content_type =
-            $cgi->uploadInfo($cgi->param('data'))->{'Content-Type'};
-        $content_type || ThrowUserError("missing_content_type");
-
-        # Internet Explorer sends image/x-png for PNG images,
-        # so convert that to image/png to match other browsers.
-        if ($content_type eq 'image/x-png') {
-            $content_type = 'image/png';
-        }
+  if ($method eq 'list') {
+
+    # The user selected a content type from the list, so use their
+    # selection.
+    $content_type = $cgi->param('contenttypeselection');
+  }
+  elsif ($method eq 'manual') {
+
+    # The user entered a content type manually, so use their entry.
+    $content_type = $cgi->param('contenttypeentry');
+  }
+  else {
+    defined $cgi->upload('data') || ThrowUserError('file_not_specified');
+
+    # The user asked us to auto-detect the content type, so use the type
+    # specified in the HTTP request headers.
+    $content_type = $cgi->uploadInfo(scalar $cgi->param('data'))->{'Content-Type'};
+    $content_type || ThrowUserError("missing_content_type");
+
+    # Internet Explorer sends image/x-png for PNG images,
+    # so convert that to image/png to match other browsers.
+    if ($content_type eq 'image/x-png') {
+      $content_type = 'image/png';
     }
-    return $content_type;
+  }
+  return $content_type;
 }
 
 
diff --git a/Bugzilla/Attachment/PatchReader.pm b/Bugzilla/Attachment/PatchReader.pm
index d0e2212202..2f8974b8ae 100644
--- a/Bugzilla/Attachment/PatchReader.pm
+++ b/Bugzilla/Attachment/PatchReader.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Attachment::PatchReader;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -23,184 +23,196 @@ use Bugzilla::Util;
 use constant PERLIO_IS_ENABLED => $Config{useperlio};
 
 sub process_diff {
-    my ($attachment, $format) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $cgi = Bugzilla->cgi;
-    my $lc  = Bugzilla->localconfig;
-    my $vars = {};
-
-    require PatchReader::Raw;
-    my $reader = new PatchReader::Raw;
-
-    if ($format eq 'raw') {
-        require PatchReader::DiffPrinter::raw;
-        $reader->sends_data_to(new PatchReader::DiffPrinter::raw());
-        # Actually print out the patch.
-        print $cgi->header(-type => 'text/plain');
-        disable_utf8();
-        $reader->iterate_string('Attachment ' . $attachment->id, $attachment->data);
-    }
-    else {
-        my @other_patches = ();
-        if ($lc->{interdiffbin} && $lc->{diffpath}) {
-            # Get the list of attachments that the user can view in this bug.
-            my @attachments =
-                @{Bugzilla::Attachment->get_attachments_by_bug($attachment->bug)};
-            # Extract patches only.
-            @attachments = grep {$_->ispatch == 1} @attachments;
-            # We want them sorted from newer to older.
-            @attachments = sort { $b->id <=> $a->id } @attachments;
-
-            # Ignore the current patch, but select the one right before it
-            # chronologically.
-            my $select_next_patch = 0;
-            foreach my $attach (@attachments) {
-                if ($attach->id == $attachment->id) {
-                    $select_next_patch = 1;
-                }
-                else {
-                    push(@other_patches, { 'id'       => $attach->id,
-                                           'desc'     => $attach->description,
-                                           'selected' => $select_next_patch });
-                    $select_next_patch = 0;
-                }
-            }
-        }
+  my ($attachment, $format) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $cgi  = Bugzilla->cgi;
+  my $lc   = Bugzilla->localconfig;
+  my $vars = {};
 
-        $vars->{'bugid'} = $attachment->bug_id;
-        $vars->{'attachid'} = $attachment->id;
-        $vars->{'description'} = $attachment->description;
-        $vars->{'other_patches'} = \@other_patches;
-
-        setup_template_patch_reader($reader, $vars);
-        # The patch is going to be displayed in a HTML page and if the utf8
-        # param is enabled, we have to encode attachment data as utf8.
-        if (Bugzilla->params->{'utf8'}) {
-            $attachment->data; # Populate ->{data}
-            utf8::decode($attachment->{data});
-        }
-        $reader->iterate_string('Attachment ' . $attachment->id, $attachment->data);
-    }
-}
-
-sub process_interdiff {
-    my ($old_attachment, $new_attachment, $format) = @_;
-    my $cgi = Bugzilla->cgi;
-    my $lc  = Bugzilla->localconfig;
-    my $vars = {};
-
-    require PatchReader::Raw;
-
-    # Encode attachment data as utf8 if it's going to be displayed in a HTML
-    # page using the UTF-8 encoding.
-    if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
-        $old_attachment->data; # Populate ->{data}
-        utf8::decode($old_attachment->{data});
-        $new_attachment->data; # Populate ->{data}
-        utf8::decode($new_attachment->{data});
-    }
-
-    # Get old patch data.
-    my ($old_filename, $old_file_list) = get_unified_diff($old_attachment, $format);
-    # Get new patch data.
-    my ($new_filename, $new_file_list) = get_unified_diff($new_attachment, $format);
-
-    my $warning = warn_if_interdiff_might_fail($old_file_list, $new_file_list);
-
-    # Send through interdiff, send output directly to template.
-    # Must hack path so that interdiff will work.
-    local $ENV{'PATH'} = $lc->{diffpath};
-
-    # Open the interdiff pipe, reading from both STDOUT and STDERR
-    # To avoid deadlocks, we have to read the entire output from all handles
-    my ($stdout, $stderr) = ('', '');
-    my ($pid, $interdiff_stdout, $interdiff_stderr, $use_select);
-    if ($ENV{MOD_PERL}) {
-        require Apache2::RequestUtil;
-        require Apache2::SubProcess;
-        my $request = Apache2::RequestUtil->request;
-        (undef, $interdiff_stdout, $interdiff_stderr) = $request->spawn_proc_prog(
-            $lc->{interdiffbin}, [$old_filename, $new_filename]
-        );
-        $use_select = !PERLIO_IS_ENABLED;
-    } else {
-        $interdiff_stderr = gensym;
-        $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr,
-                        $lc->{interdiffbin}, $old_filename, $new_filename);
-        $use_select = 1;
-    }
+  require PatchReader::Raw;
+  my $reader = new PatchReader::Raw;
 
-    if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
-        binmode $interdiff_stdout, ':utf8';
-        binmode $interdiff_stderr, ':utf8';
-    } else {
-        binmode $interdiff_stdout;
-        binmode $interdiff_stderr;
-    }
-
-    if ($use_select) {
-        my $select = IO::Select->new();
-        $select->add($interdiff_stdout, $interdiff_stderr);
-        while (my @handles = $select->can_read) {
-            foreach my $handle (@handles) {
-                my $line = <$handle>;
-                if (!defined $line) {
-                    $select->remove($handle);
-                    next;
-                }
-                if ($handle == $interdiff_stdout) {
-                    $stdout .= $line;
-                } else {
-                    $stderr .= $line;
-                }
+  if ($format eq 'raw') {
+    require PatchReader::DiffPrinter::raw;
+    $reader->sends_data_to(new PatchReader::DiffPrinter::raw());
+
+    # Actually print out the patch.
+    print $cgi->header(-type => 'text/plain');
+    disable_utf8();
+    $reader->iterate_string('Attachment ' . $attachment->id, $attachment->data);
+  }
+  else {
+    my @other_patches = ();
+    if ($lc->{interdiffbin} && $lc->{diffpath}) {
+
+      # Get the list of attachments that the user can view in this bug.
+      my @attachments
+        = @{Bugzilla::Attachment->get_attachments_by_bug($attachment->bug)};
+
+      # Extract patches only.
+      @attachments = grep { $_->ispatch == 1 } @attachments;
+
+      # We want them sorted from newer to older.
+      @attachments = sort { $b->id <=> $a->id } @attachments;
+
+      # Ignore the current patch, but select the one right before it
+      # chronologically.
+      my $select_next_patch = 0;
+      foreach my $attach (@attachments) {
+        if ($attach->id == $attachment->id) {
+          $select_next_patch = 1;
+        }
+        else {
+          push(
+            @other_patches,
+            {
+              'id'       => $attach->id,
+              'desc'     => $attach->description,
+              'selected' => $select_next_patch
             }
+          );
+          $select_next_patch = 0;
         }
-        waitpid($pid, 0) if $pid;
-
-    } else {
-        local $/ = undef;
-        $stdout = <$interdiff_stdout>;
-        $stdout //= '';
-        $stderr = <$interdiff_stderr>;
-        $stderr //= '';
+      }
     }
 
-    close($interdiff_stdout),
-    close($interdiff_stderr);
-
-    # Tidy up
-    unlink($old_filename) or warn "Could not unlink $old_filename: $!";
-    unlink($new_filename) or warn "Could not unlink $new_filename: $!";
+    $vars->{'bugid'}         = $attachment->bug_id;
+    $vars->{'attachid'}      = $attachment->id;
+    $vars->{'description'}   = $attachment->description;
+    $vars->{'other_patches'} = \@other_patches;
 
-    # Any output on STDERR means interdiff failed to full process the patches.
-    # Interdiff's error messages are generic and not useful to end users, so we
-    # show a generic failure message.
-    if ($stderr) {
-        warn($stderr);
-        $warning = 'interdiff3';
-    }
+    setup_template_patch_reader($reader, $vars);
 
-    my $reader = new PatchReader::Raw;
+    # The patch is going to be displayed in a HTML page, so we have
+    # to encode attachment data as utf8.
+    $attachment->data;    # Populate ->{data}
+    utf8::decode($attachment->{data});
+    $reader->iterate_string('Attachment ' . $attachment->id, $attachment->data);
+  }
+}
 
-    if ($format eq 'raw') {
-        require PatchReader::DiffPrinter::raw;
-        $reader->sends_data_to(new PatchReader::DiffPrinter::raw());
-        # Actually print out the patch.
-        print $cgi->header(-type => 'text/plain');
-        disable_utf8();
-    }
-    else {
-        $vars->{'warning'} = $warning if $warning;
-        $vars->{'bugid'} = $new_attachment->bug_id;
-        $vars->{'oldid'} = $old_attachment->id;
-        $vars->{'old_desc'} = $old_attachment->description;
-        $vars->{'newid'} = $new_attachment->id;
-        $vars->{'new_desc'} = $new_attachment->description;
-
-        setup_template_patch_reader($reader, $vars);
+sub process_interdiff {
+  my ($old_attachment, $new_attachment, $format) = @_;
+  my $cgi  = Bugzilla->cgi;
+  my $lc   = Bugzilla->localconfig;
+  my $vars = {};
+
+  require PatchReader::Raw;
+
+  # Encode attachment data as utf8 if it's going to be displayed in a HTML page.
+  if ($format ne 'raw') {
+    $old_attachment->data;    # Populate ->{data}
+    utf8::decode($old_attachment->{data});
+    $new_attachment->data;    # Populate ->{data}
+    utf8::decode($new_attachment->{data});
+  }
+
+  # Get old patch data.
+  my ($old_filename, $old_file_list) = get_unified_diff($old_attachment, $format);
+
+  # Get new patch data.
+  my ($new_filename, $new_file_list) = get_unified_diff($new_attachment, $format);
+
+  my $warning = warn_if_interdiff_might_fail($old_file_list, $new_file_list);
+
+  # Send through interdiff, send output directly to template.
+  # Must hack path so that interdiff will work.
+  local $ENV{'PATH'} = $lc->{diffpath};
+
+  # Open the interdiff pipe, reading from both STDOUT and STDERR
+  # To avoid deadlocks, we have to read the entire output from all handles
+  my ($stdout, $stderr) = ('', '');
+  my ($pid, $interdiff_stdout, $interdiff_stderr, $use_select);
+  if ($ENV{MOD_PERL}) {
+    require Apache2::RequestUtil;
+    require Apache2::SubProcess;
+    my $request = Apache2::RequestUtil->request;
+    (undef, $interdiff_stdout, $interdiff_stderr)
+      = $request->spawn_proc_prog($lc->{interdiffbin},
+      [$old_filename, $new_filename]);
+    $use_select = !PERLIO_IS_ENABLED;
+  }
+  else {
+    $interdiff_stderr = gensym;
+    $pid = open3(gensym, $interdiff_stdout, $interdiff_stderr, $lc->{interdiffbin},
+      $old_filename, $new_filename);
+    $use_select = 1;
+  }
+
+  if ($format ne 'raw') {
+    binmode $interdiff_stdout, ':utf8';
+    binmode $interdiff_stderr, ':utf8';
+  }
+  else {
+    binmode $interdiff_stdout;
+    binmode $interdiff_stderr;
+  }
+
+  if ($use_select) {
+    my $select = IO::Select->new();
+    $select->add($interdiff_stdout, $interdiff_stderr);
+    while (my @handles = $select->can_read) {
+      foreach my $handle (@handles) {
+        my $line = <$handle>;
+        if (!defined $line) {
+          $select->remove($handle);
+          next;
+        }
+        if ($handle == $interdiff_stdout) {
+          $stdout .= $line;
+        }
+        else {
+          $stderr .= $line;
+        }
+      }
     }
-    $reader->iterate_string('interdiff #' . $old_attachment->id .
-                            ' #' . $new_attachment->id, $stdout);
+    waitpid($pid, 0) if $pid;
+
+  }
+  else {
+    local $/ = undef;
+    $stdout = <$interdiff_stdout>;
+    $stdout //= '';
+    $stderr = <$interdiff_stderr>;
+    $stderr //= '';
+  }
+
+  close($interdiff_stdout), close($interdiff_stderr);
+
+  # Tidy up
+  unlink($old_filename) or warn "Could not unlink $old_filename: $!";
+  unlink($new_filename) or warn "Could not unlink $new_filename: $!";
+
+  # Any output on STDERR means interdiff failed to full process the patches.
+  # Interdiff's error messages are generic and not useful to end users, so we
+  # show a generic failure message.
+  if ($stderr) {
+    warn($stderr);
+    $warning = 'interdiff3';
+  }
+
+  my $reader = new PatchReader::Raw;
+
+  if ($format eq 'raw') {
+    require PatchReader::DiffPrinter::raw;
+    $reader->sends_data_to(new PatchReader::DiffPrinter::raw());
+
+    # Actually print out the patch.
+    print $cgi->header(-type => 'text/plain');
+    disable_utf8();
+  }
+  else {
+    $vars->{'warning'}  = $warning if $warning;
+    $vars->{'bugid'}    = $new_attachment->bug_id;
+    $vars->{'oldid'}    = $old_attachment->id;
+    $vars->{'old_desc'} = $old_attachment->description;
+    $vars->{'newid'}    = $new_attachment->id;
+    $vars->{'new_desc'} = $new_attachment->description;
+
+    setup_template_patch_reader($reader, $vars);
+  }
+  $reader->iterate_string(
+    'interdiff #' . $old_attachment->id . ' #' . $new_attachment->id, $stdout);
 }
 
 ######################
@@ -208,92 +220,92 @@ sub process_interdiff {
 ######################
 
 sub get_unified_diff {
-    my ($attachment, $format) = @_;
+  my ($attachment, $format) = @_;
 
-    # Bring in the modules we need.
-    require PatchReader::Raw;
-    require PatchReader::DiffPrinter::raw;
-    require PatchReader::PatchInfoGrabber;
-    require File::Temp;
-
-    $attachment->ispatch
-      || ThrowCodeError('must_be_patch', { 'attach_id' => $attachment->id });
-
-    # Reads in the patch, converting to unified diff in a temp file.
-    my $reader = new PatchReader::Raw;
-    my $last_reader = $reader;
-
-    # Grabs the patch file info.
-    my $patch_info_grabber = new PatchReader::PatchInfoGrabber();
-    $last_reader->sends_data_to($patch_info_grabber);
-    $last_reader = $patch_info_grabber;
-
-    # Prints out to temporary file.
-    my ($fh, $filename) = File::Temp::tempfile();
-    if ($format ne 'raw' && Bugzilla->params->{'utf8'}) {
-        # The HTML page will be displayed with the UTF-8 encoding.
-        binmode $fh, ':utf8';
-    }
-    my $raw_printer = new PatchReader::DiffPrinter::raw($fh);
-    $last_reader->sends_data_to($raw_printer);
-    $last_reader = $raw_printer;
+  # Bring in the modules we need.
+  require PatchReader::Raw;
+  require PatchReader::DiffPrinter::raw;
+  require PatchReader::PatchInfoGrabber;
+  require File::Temp;
 
-    # Iterate!
-    $reader->iterate_string($attachment->id, $attachment->data);
+  $attachment->ispatch
+    || ThrowCodeError('must_be_patch', {'attach_id' => $attachment->id});
 
-    return ($filename, $patch_info_grabber->patch_info()->{files});
-}
+  # Reads in the patch, converting to unified diff in a temp file.
+  my $reader      = new PatchReader::Raw;
+  my $last_reader = $reader;
 
-sub warn_if_interdiff_might_fail {
-    my ($old_file_list, $new_file_list) = @_;
+  # Grabs the patch file info.
+  my $patch_info_grabber = new PatchReader::PatchInfoGrabber();
+  $last_reader->sends_data_to($patch_info_grabber);
+  $last_reader = $patch_info_grabber;
 
-    # Verify that the list of files diffed is the same.
-    my @old_files = sort keys %{$old_file_list};
-    my @new_files = sort keys %{$new_file_list};
-    if (@old_files != @new_files
-        || join(' ', @old_files) ne join(' ', @new_files))
-    {
-        return 'interdiff1';
-    }
+  # Prints out to temporary file.
+  my ($fh, $filename) = File::Temp::tempfile();
+  if ($format ne 'raw') {
 
-    # Verify that the revisions in the files are the same.
-    foreach my $file (keys %{$old_file_list}) {
-        if (exists $old_file_list->{$file}{old_revision}
-            && exists $new_file_list->{$file}{old_revision}
-            && $old_file_list->{$file}{old_revision} ne
-            $new_file_list->{$file}{old_revision})
-        {
-            return 'interdiff2';
-        }
-    }
-    return undef;
-}
+    # The HTML page will be displayed with the UTF-8 encoding.
+    binmode $fh, ':utf8';
+  }
+  my $raw_printer = new PatchReader::DiffPrinter::raw($fh);
+  $last_reader->sends_data_to($raw_printer);
+  $last_reader = $raw_printer;
 
-sub setup_template_patch_reader {
-    my ($last_reader, $vars) = @_;
-    my $cgi = Bugzilla->cgi;
-    my $template = Bugzilla->template;
+  # Iterate!
+  $reader->iterate_string($attachment->id, $attachment->data);
 
-    require PatchReader::DiffPrinter::template;
+  return ($filename, $patch_info_grabber->patch_info()->{files});
+}
 
-    # Define the vars for templates.
-    if (defined $cgi->param('headers')) {
-        $vars->{'headers'} = $cgi->param('headers');
-    }
-    else {
-        $vars->{'headers'} = 1;
+sub warn_if_interdiff_might_fail {
+  my ($old_file_list, $new_file_list) = @_;
+
+  # Verify that the list of files diffed is the same.
+  my @old_files = sort keys %{$old_file_list};
+  my @new_files = sort keys %{$new_file_list};
+  if (@old_files != @new_files || join(' ', @old_files) ne join(' ', @new_files))
+  {
+    return 'interdiff1';
+  }
+
+  # Verify that the revisions in the files are the same.
+  foreach my $file (keys %{$old_file_list}) {
+    if ( exists $old_file_list->{$file}{old_revision}
+      && exists $new_file_list->{$file}{old_revision}
+      && $old_file_list->{$file}{old_revision} ne
+      $new_file_list->{$file}{old_revision})
+    {
+      return 'interdiff2';
     }
+  }
+  return undef;
+}
 
-    $vars->{'collapsed'} = $cgi->param('collapsed');
-
-    # Print everything out.
-    print $cgi->header(-type => 'text/html');
-
-    $last_reader->sends_data_to(new PatchReader::DiffPrinter::template($template,
-                                'attachment/diff-header.html.tmpl',
-                                'attachment/diff-file.html.tmpl',
-                                'attachment/diff-footer.html.tmpl',
-                                $vars));
+sub setup_template_patch_reader {
+  my ($last_reader, $vars) = @_;
+  my $cgi      = Bugzilla->cgi;
+  my $template = Bugzilla->template;
+
+  require PatchReader::DiffPrinter::template;
+
+  # Define the vars for templates.
+  if (defined $cgi->param('headers')) {
+    $vars->{'headers'} = $cgi->param('headers');
+  }
+  else {
+    $vars->{'headers'} = 1;
+  }
+
+  $vars->{'collapsed'} = $cgi->param('collapsed');
+
+  # Print everything out.
+  print $cgi->header(-type => 'text/html');
+
+  $last_reader->sends_data_to(new PatchReader::DiffPrinter::template(
+    $template,                        'attachment/diff-header.html.tmpl',
+    'attachment/diff-file.html.tmpl', 'attachment/diff-footer.html.tmpl',
+    $vars
+  ));
 }
 
 1;
diff --git a/Bugzilla/Auth.pm b/Bugzilla/Auth.pm
index c830f0506d..50bb7f5132 100644
--- a/Bugzilla/Auth.pm
+++ b/Bugzilla/Auth.pm
@@ -7,14 +7,14 @@
 
 package Bugzilla::Auth;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use fields qw(
-    _info_getter
-    _verifier
-    _persister
+  _info_getter
+  _verifier
+  _persister
 );
 
 use Bugzilla::Constants;
@@ -28,218 +28,227 @@ use Bugzilla::Auth::Persist::Cookie;
 use Socket;
 
 sub new {
-    my ($class, $params) = @_;
-    my $self = fields::new($class);
+  my ($class, $params) = @_;
+  my $self = fields::new($class);
 
-    $params            ||= {};
-    $params->{Login}   ||= Bugzilla->params->{'user_info_class'} . ',Cookie,APIKey';
-    $params->{Verify}  ||= Bugzilla->params->{'user_verify_class'};
+  $params           ||= {};
+  $params->{Login}  ||= Bugzilla->params->{'user_info_class'} . ',Cookie,APIKey';
+  $params->{Verify} ||= Bugzilla->params->{'user_verify_class'};
 
-    $self->{_info_getter} = new Bugzilla::Auth::Login::Stack($params->{Login});
-    $self->{_verifier} = new Bugzilla::Auth::Verify::Stack($params->{Verify});
-    # If we ever have any other login persistence methods besides cookies,
-    # this could become more configurable.
-    $self->{_persister} = new Bugzilla::Auth::Persist::Cookie();
+  $self->{_info_getter} = new Bugzilla::Auth::Login::Stack($params->{Login});
+  $self->{_verifier}    = new Bugzilla::Auth::Verify::Stack($params->{Verify});
 
-    return $self;
+  # If we ever have any other login persistence methods besides cookies,
+  # this could become more configurable.
+  $self->{_persister} = new Bugzilla::Auth::Persist::Cookie();
+
+  return $self;
 }
 
 sub login {
-    my ($self, $type) = @_;
-
-    # Get login info from the cookie, form, environment variables, etc.
-    my $login_info = $self->{_info_getter}->get_login_info();
+  my ($self, $type) = @_;
 
-    if ($login_info->{failure}) {
-        return $self->_handle_login_result($login_info, $type);
-    }
+  # Get login info from the cookie, form, environment variables, etc.
+  my $login_info = $self->{_info_getter}->get_login_info();
 
-    # Now verify their username and password against the DB, LDAP, etc.
-    if ($self->{_info_getter}->{successful}->requires_verification) {
-        $login_info = $self->{_verifier}->check_credentials($login_info);
-        if ($login_info->{failure}) {
-            return $self->_handle_login_result($login_info, $type);
-        }
-        $login_info =
-          $self->{_verifier}->{successful}->create_or_update_user($login_info);
-    }
-    else {
-        $login_info = $self->{_verifier}->create_or_update_user($login_info);
-    }
+  if ($login_info->{failure}) {
+    return $self->_handle_login_result($login_info, $type);
+  }
 
+  # Now verify their username and password against the DB, LDAP, etc.
+  if ($self->{_info_getter}->{successful}->requires_verification) {
+    $login_info = $self->{_verifier}->check_credentials($login_info);
     if ($login_info->{failure}) {
-        return $self->_handle_login_result($login_info, $type);
+      return $self->_handle_login_result($login_info, $type);
     }
+    $login_info
+      = $self->{_verifier}->{successful}->create_or_update_user($login_info);
+  }
+  else {
+    $login_info = $self->{_verifier}->create_or_update_user($login_info);
+  }
+
+  if ($login_info->{failure}) {
+    return $self->_handle_login_result($login_info, $type);
+  }
 
-    # Make sure the user isn't disabled.
-    my $user = $login_info->{user};
-    if (!$user->is_enabled) {
-        return $self->_handle_login_result({ failure => AUTH_DISABLED,
-                                              user    => $user }, $type);
-    }
-    $user->set_authorizer($self);
+  # Make sure the user isn't disabled.
+  my $user = $login_info->{user};
+  if (!$user->is_enabled) {
+    return $self->_handle_login_result({failure => AUTH_DISABLED, user => $user},
+      $type);
+  }
+  $user->set_authorizer($self);
 
-    return $self->_handle_login_result($login_info, $type);
+  return $self->_handle_login_result($login_info, $type);
 }
 
 sub can_change_password {
-    my ($self) = @_;
-    my $verifier = $self->{_verifier}->{successful};
-    $verifier  ||= $self->{_verifier};
-    my $getter   = $self->{_info_getter}->{successful};
-    $getter      = $self->{_info_getter} 
-        if (!$getter || $getter->isa('Bugzilla::Auth::Login::Cookie'));
-    return $verifier->can_change_password &&
-           $getter->user_can_create_account;
+  my ($self) = @_;
+  my $verifier = $self->{_verifier}->{successful};
+  $verifier ||= $self->{_verifier};
+  my $getter = $self->{_info_getter}->{successful};
+  $getter = $self->{_info_getter}
+    if (!$getter || $getter->isa('Bugzilla::Auth::Login::Cookie'));
+  return $verifier->can_change_password && $getter->user_can_create_account;
 }
 
 sub can_login {
-    my ($self) = @_;
-    my $getter = $self->{_info_getter}->{successful};
-    $getter    = $self->{_info_getter}
-        if (!$getter || $getter->isa('Bugzilla::Auth::Login::Cookie'));
-    return $getter->can_login;
+  my ($self) = @_;
+  my $getter = $self->{_info_getter}->{successful};
+  $getter = $self->{_info_getter}
+    if (!$getter || $getter->isa('Bugzilla::Auth::Login::Cookie'));
+  return $getter->can_login;
 }
 
 sub can_logout {
-    my ($self) = @_;
-    my $getter = $self->{_info_getter}->{successful};
-    # If there's no successful getter, we're not logged in, so of
-    # course we can't log out!
-    return 0 unless $getter;
-    return $getter->can_logout;
+  my ($self) = @_;
+  my $getter = $self->{_info_getter}->{successful};
+
+  # If there's no successful getter, we're not logged in, so of
+  # course we can't log out!
+  return 0 unless $getter;
+  return $getter->can_logout;
 }
 
 sub login_token {
-    my ($self) = @_;
-    my $getter = $self->{_info_getter}->{successful};
-    if ($getter && $getter->isa('Bugzilla::Auth::Login::Cookie')) {
-        return $getter->login_token;
-    }
-    return undef;
+  my ($self) = @_;
+  my $getter = $self->{_info_getter}->{successful};
+  if ($getter && $getter->isa('Bugzilla::Auth::Login::Cookie')) {
+    return $getter->login_token;
+  }
+  return undef;
 }
 
 sub user_can_create_account {
-    my ($self) = @_;
-    my $verifier = $self->{_verifier}->{successful};
-    $verifier  ||= $self->{_verifier};
-    my $getter   = $self->{_info_getter}->{successful};
-    $getter      = $self->{_info_getter}
-        if (!$getter || $getter->isa('Bugzilla::Auth::Login::Cookie'));
-    return $verifier->user_can_create_account
-           && $getter->user_can_create_account;
+  my ($self) = @_;
+  my $verifier = $self->{_verifier}->{successful};
+  $verifier ||= $self->{_verifier};
+  my $getter = $self->{_info_getter}->{successful};
+  $getter = $self->{_info_getter}
+    if (!$getter || $getter->isa('Bugzilla::Auth::Login::Cookie'));
+  return $verifier->user_can_create_account && $getter->user_can_create_account;
 }
 
 sub extern_id_used {
-    my ($self) = @_;
-    return $self->{_info_getter}->extern_id_used
-           ||  $self->{_verifier}->extern_id_used;
+  my ($self) = @_;
+  return $self->{_info_getter}->extern_id_used
+    || $self->{_verifier}->extern_id_used;
+}
+
+sub can_change_login {
+  return $_[0]->user_can_create_account;
 }
 
 sub can_change_email {
-    return $_[0]->user_can_create_account;
+  return $_[0]->user_can_create_account;
 }
 
 sub _handle_login_result {
-    my ($self, $result, $login_type) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my $user      = $result->{user};
-    my $fail_code = $result->{failure};
-
-    if (!$fail_code) {
-        # We don't persist logins over GET requests in the WebService,
-        # because the persistance information can't be re-used again.
-        # (See Bugzilla::WebService::Server::JSONRPC for more info.)
-        if ($self->{_info_getter}->{successful}->requires_persistence
-            and !Bugzilla->request_cache->{auth_no_automatic_login}) 
-        {
-            $user->{_login_token} = $self->{_persister}->persist_login($user);
-        }
-    }
-    elsif ($fail_code == AUTH_ERROR) {
-        if ($result->{user_error}) {
-            ThrowUserError($result->{user_error}, $result->{details});
-        }
-        else {
-            ThrowCodeError($result->{error}, $result->{details});
-        }
-    }
-    elsif ($fail_code == AUTH_NODATA) {
-        $self->{_info_getter}->fail_nodata($self) 
-            if $login_type == LOGIN_REQUIRED;
+  my ($self, $result, $login_type) = @_;
+  my $dbh = Bugzilla->dbh;
 
-        # If we're not LOGIN_REQUIRED, we just return the default user.
-        $user = Bugzilla->user;
-    }
-    # The username/password may be wrong
-    # Don't let the user know whether the username exists or whether
-    # the password was just wrong. (This makes it harder for a cracker
-    # to find account names by brute force)
-    elsif ($fail_code == AUTH_LOGINFAILED or $fail_code == AUTH_NO_SUCH_USER) {
-        my $remaining_attempts = MAX_LOGIN_ATTEMPTS 
-                                 - ($result->{failure_count} || 0);
-        ThrowUserError("invalid_login_or_password", 
-                       { remaining => $remaining_attempts });
-    }
-    # The account may be disabled
-    elsif ($fail_code == AUTH_DISABLED) {
-        $self->{_persister}->logout();
-        # XXX This is NOT a good way to do this, architecturally.
-        $self->{_persister}->clear_browser_cookies();
-        # and throw a user error
-        ThrowUserError("account_disabled",
-            {'disabled_reason' => $result->{user}->disabledtext});
+  my $user      = $result->{user};
+  my $fail_code = $result->{failure};
+
+  if (!$fail_code) {
+
+    # We don't persist logins over GET requests in the WebService,
+    # because the persistence information can't be re-used again.
+    # (See Bugzilla::WebService::Server::JSONRPC for more info.)
+    if ($self->{_info_getter}->{successful}->requires_persistence
+      and !Bugzilla->request_cache->{auth_no_automatic_login})
+    {
+      $user->{_login_token} = $self->{_persister}->persist_login($user);
     }
-    elsif ($fail_code == AUTH_LOCKOUT) {
-        my $attempts = $user->account_ip_login_failures;
-
-        # We want to know when the account will be unlocked. This is 
-        # determined by the 5th-from-last login failure (or more/less than
-        # 5th, if MAX_LOGIN_ATTEMPTS is not 5).
-        my $determiner = $attempts->[scalar(@$attempts) - MAX_LOGIN_ATTEMPTS];
-        my $unlock_at = datetime_from($determiner->{login_time}, 
-                                      Bugzilla->local_timezone);
-        $unlock_at->add(minutes => LOGIN_LOCKOUT_INTERVAL);
-
-        # If we were *just* locked out, notify the maintainer about the
-        # lockout.
-        if ($result->{just_locked_out}) {
-            # We're sending to the maintainer, who may be not a Bugzilla 
-            # account, but just an email address. So we use the
-            # installation's default language for sending the email.
-            my $default_settings = Bugzilla::User::Setting::get_defaults();
-            my $template = Bugzilla->template_inner(
-                               $default_settings->{lang}->{default_value});
-            my $address = $attempts->[0]->{ip_addr};
-            # Note: inet_aton will only resolve IPv4 addresses.
-            # For IPv6 we'll need to use inet_pton which requires Perl 5.12.
-            my $n = inet_aton($address);
-            if ($n) {
-                $address = gethostbyaddr($n, AF_INET) . " ($address)"
-            }
-            my $vars = {
-                locked_user => $user,
-                attempts    => $attempts,
-                unlock_at   => $unlock_at,
-                address     => $address,
-            };
-            my $message;
-            $template->process('email/lockout.txt.tmpl', $vars, \$message)
-                || ThrowTemplateError($template->error);
-            MessageToMTA($message);
-        }
-
-        $unlock_at->set_time_zone($user->timezone);
-        ThrowUserError('account_locked', 
-            { ip_addr => $determiner->{ip_addr}, unlock_at => $unlock_at });
+  }
+  elsif ($fail_code == AUTH_ERROR) {
+    if ($result->{user_error}) {
+      ThrowUserError($result->{user_error}, $result->{details});
     }
-    # If we get here, then we've run out of options, which shouldn't happen.
     else {
-        ThrowCodeError("authres_unhandled", { value => $fail_code });
+      ThrowCodeError($result->{error}, $result->{details});
+    }
+  }
+  elsif ($fail_code == AUTH_NODATA) {
+    $self->{_info_getter}->fail_nodata($self) if $login_type == LOGIN_REQUIRED;
+
+    # If we're not LOGIN_REQUIRED, we just return the default user.
+    $user = Bugzilla->user;
+  }
+
+  # The username/password may be wrong
+  # Don't let the user know whether the username exists or whether
+  # the password was just wrong. (This makes it harder for a cracker
+  # to find account names by brute force)
+  elsif ($fail_code == AUTH_LOGINFAILED or $fail_code == AUTH_NO_SUCH_USER) {
+    my $remaining_attempts = MAX_LOGIN_ATTEMPTS - ($result->{failure_count} || 0);
+    ThrowUserError("invalid_login_or_password", {remaining => $remaining_attempts});
+  }
+
+  # The account may be disabled
+  elsif ($fail_code == AUTH_DISABLED) {
+    $self->{_persister}->logout();
+
+    # XXX This is NOT a good way to do this, architecturally.
+    $self->{_persister}->clear_browser_cookies();
+
+    # and throw a user error
+    ThrowUserError("account_disabled",
+      {'disabled_reason' => $result->{user}->disabledtext});
+  }
+  elsif ($fail_code == AUTH_LOCKOUT) {
+    my $attempts = $user->account_ip_login_failures;
+
+    # We want to know when the account will be unlocked. This is
+    # determined by the 5th-from-last login failure (or more/less than
+    # 5th, if MAX_LOGIN_ATTEMPTS is not 5).
+    my $determiner = $attempts->[scalar(@$attempts) - MAX_LOGIN_ATTEMPTS];
+    my $unlock_at
+      = datetime_from($determiner->{login_time}, Bugzilla->local_timezone);
+    $unlock_at->add(minutes => LOGIN_LOCKOUT_INTERVAL);
+
+    # If we were *just* locked out, notify the maintainer about the
+    # lockout.
+    if ($result->{just_locked_out}) {
+
+      # We're sending to the maintainer, who may be not a Bugzilla
+      # account, but just an email address. So we use the
+      # installation's default language for sending the email.
+      my $default_settings = Bugzilla::User::Setting::get_defaults();
+      my $template
+        = Bugzilla->template_inner($default_settings->{lang}->{default_value});
+      my $address = $attempts->[0]->{ip_addr};
+
+      # Note: inet_aton will only resolve IPv4 addresses.
+      # For IPv6 we'll need to use inet_pton which requires Perl 5.12.
+      my $n = inet_aton($address);
+      if ($n) {
+        $address = gethostbyaddr($n, AF_INET) . " ($address)";
+      }
+      my $vars = {
+        locked_user => $user,
+        attempts    => $attempts,
+        unlock_at   => $unlock_at,
+        address     => $address,
+      };
+      my $message;
+      $template->process('email/lockout.txt.tmpl', $vars, \$message)
+        || ThrowTemplateError($template->error);
+      MessageToMTA($message);
     }
 
-    return $user;
+    $unlock_at->set_time_zone($user->timezone);
+    ThrowUserError('account_locked',
+      {ip_addr => $determiner->{ip_addr}, unlock_at => $unlock_at});
+  }
+
+  # If we get here, then we've run out of options, which shouldn't happen.
+  else {
+    ThrowCodeError("authres_unhandled", {value => $fail_code});
+  }
+
+  return $user;
 }
 
 1;
@@ -412,6 +421,14 @@ Returns:     C<true> if users are allowed to create new Bugzilla accounts,
 
 Description: Whether or not current login system uses extern_id.
 
+=item C<can_change_login>
+
+Description: Whether or not the current login system allows users to
+             change their own login.
+Params:      None
+Returns:     C<true> if users can change their own login,
+             C<false> otherwise.
+
 =item C<can_change_email>
 
 Description: Whether or not the current login system allows users to
diff --git a/Bugzilla/Auth/Login.pm b/Bugzilla/Auth/Login.pm
index a5f0897771..50f454c108 100644
--- a/Bugzilla/Auth/Login.pm
+++ b/Bugzilla/Auth/Login.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Login;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,18 +16,18 @@ use fields qw();
 # Determines whether or not a user can logout. It's really a subroutine,
 # but we implement it here as a constant. Override it in subclasses if
 # that particular type of login method cannot log out.
-use constant can_logout => 1;
-use constant can_login  => 1;
-use constant requires_persistence  => 1;
-use constant requires_verification => 1;
+use constant can_logout              => 1;
+use constant can_login               => 1;
+use constant requires_persistence    => 1;
+use constant requires_verification   => 1;
 use constant user_can_create_account => 0;
-use constant is_automatic => 0;
-use constant extern_id_used => 0; 
+use constant is_automatic            => 0;
+use constant extern_id_used          => 0;
 
 sub new {
-    my ($class) = @_;
-    my $self = fields::new($class);
-    return $self;
+  my ($class) = @_;
+  my $self = fields::new($class);
+  return $self;
 }
 
 1;
diff --git a/Bugzilla/Auth/Login/APIKey.pm b/Bugzilla/Auth/Login/APIKey.pm
index 63e35578af..fdb7475ffd 100644
--- a/Bugzilla/Auth/Login/APIKey.pm
+++ b/Bugzilla/Auth/Login/APIKey.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Login::APIKey;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,28 +26,29 @@ use constant can_logout            => 0;
 # This method is only available to web services. An API key can never
 # be used to authenticate a Web request.
 sub get_login_info {
-    my ($self) = @_;
-    my $params = Bugzilla->input_params;
-    my ($user_id, $login_cookie);
+  my ($self) = @_;
+  my $params = Bugzilla->input_params;
+  my ($user_id, $login_cookie);
 
-    my $api_key_text = trim(delete $params->{'Bugzilla_api_key'});
-    if (!i_am_webservice() || !$api_key_text) {
-        return { failure => AUTH_NODATA };
-    }
+  my $api_key_text = trim(delete $params->{'Bugzilla_api_key'});
+  if (!i_am_webservice() || !$api_key_text) {
+    return {failure => AUTH_NODATA};
+  }
 
-    my $api_key = Bugzilla::User::APIKey->new({ name => $api_key_text });
+  my $api_key = Bugzilla::User::APIKey->new({name => $api_key_text});
 
-    if (!$api_key or $api_key->api_key ne $api_key_text) {
-        # The second part checks the correct capitalisation. Silly MySQL
-        ThrowUserError("api_key_not_valid");
-    }
-    elsif ($api_key->revoked) {
-        ThrowUserError('api_key_revoked');
-    }
+  if (!$api_key or $api_key->api_key ne $api_key_text) {
 
-    $api_key->update_last_used();
+    # The second part checks the correct capitalisation. Silly MySQL
+    ThrowUserError("api_key_not_valid");
+  }
+  elsif ($api_key->revoked) {
+    ThrowUserError('api_key_revoked');
+  }
 
-    return { user_id => $api_key->user_id };
+  $api_key->update_last_used();
+
+  return {user_id => $api_key->user_id};
 }
 
 1;
diff --git a/Bugzilla/Auth/Login/CGI.pm b/Bugzilla/Auth/Login/CGI.pm
index 6003d62a5b..58f84b798e 100644
--- a/Bugzilla/Auth/Login/CGI.pm
+++ b/Bugzilla/Auth/Login/CGI.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Login::CGI;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,65 +21,71 @@ use Bugzilla::Error;
 use Bugzilla::Token;
 
 sub get_login_info {
-    my ($self) = @_;
-    my $params = Bugzilla->input_params;
-    my $cgi = Bugzilla->cgi;
-
-    my $login = trim(delete $params->{'Bugzilla_login'});
-    my $password = delete $params->{'Bugzilla_password'};
-    # The token must match the cookie to authenticate the request.
-    my $login_token = delete $params->{'Bugzilla_login_token'};
-    my $login_cookie = $cgi->cookie('Bugzilla_login_request_cookie');
-
-    my $valid = 0;
-    # If the web browser accepts cookies, use them.
-    if ($login_token && $login_cookie) {
-        my ($time, undef) = split(/-/, $login_token);
-        # Regenerate the token based on the information we have.
-        my $expected_token = issue_hash_token(['login_request', $login_cookie], $time);
-        $valid = 1 if $expected_token eq $login_token;
-        $cgi->remove_cookie('Bugzilla_login_request_cookie');
-    }
-    # WebServices and other local scripts can bypass this check.
-    # This is safe because we won't store a login cookie in this case.
-    elsif (Bugzilla->usage_mode != USAGE_MODE_BROWSER) {
-        $valid = 1;
-    }
-    # Else falls back to the Referer header and accept local URLs.
-    # Attachments are served from a separate host (ideally), and so
-    # an evil attachment cannot abuse this check with a redirect.
-    elsif (my $referer = $cgi->referer) {
-        my $urlbase = correct_urlbase();
-        $valid = 1 if $referer =~ /^\Q$urlbase\E/;
-    }
-    # If the web browser doesn't accept cookies and the Referer header
-    # is missing, we have no way to make sure that the authentication
-    # request comes from the user.
-    elsif ($login && $password) {
-        ThrowUserError('auth_untrusted_request', { login => $login });
-    }
-
-    if (!defined($login) || !defined($password) || !$valid) {
-        return { failure => AUTH_NODATA };
-    }
-
-    return { username => $login, password => $password };
+  my ($self) = @_;
+  my $params = Bugzilla->input_params;
+  my $cgi    = Bugzilla->cgi;
+
+  my $login    = trim(delete $params->{'Bugzilla_login'});
+  my $password = delete $params->{'Bugzilla_password'};
+
+  # The token must match the cookie to authenticate the request.
+  my $login_token  = delete $params->{'Bugzilla_login_token'};
+  my $login_cookie = $cgi->cookie('Bugzilla_login_request_cookie');
+
+  my $valid = 0;
+
+  # If the web browser accepts cookies, use them.
+  if ($login_token && $login_cookie) {
+    my ($time, undef) = split(/-/, $login_token);
+
+    # Regenerate the token based on the information we have.
+    my $expected_token = issue_hash_token(['login_request', $login_cookie], $time);
+    $valid = 1 if $expected_token eq $login_token;
+    $cgi->remove_cookie('Bugzilla_login_request_cookie');
+  }
+
+  # WebServices and other local scripts can bypass this check.
+  # This is safe because we won't store a login cookie in this case.
+  elsif (Bugzilla->usage_mode != USAGE_MODE_BROWSER) {
+    $valid = 1;
+  }
+
+  # Else falls back to the Referer header and accept local URLs.
+  # Attachments are served from a separate host (ideally), and so
+  # an evil attachment cannot abuse this check with a redirect.
+  elsif (my $referer = $cgi->referer) {
+    my $urlbase = correct_urlbase();
+    $valid = 1 if $referer =~ /^\Q$urlbase\E/;
+  }
+
+  # If the web browser doesn't accept cookies and the Referer header
+  # is missing, we have no way to make sure that the authentication
+  # request comes from the user.
+  elsif ($login && $password) {
+    ThrowUserError('auth_untrusted_request', {login => $login});
+  }
+
+  if (!defined($login) || !defined($password) || !$valid) {
+    return {failure => AUTH_NODATA};
+  }
+
+  return {username => $login, password => $password};
 }
 
 sub fail_nodata {
-    my ($self) = @_;
-    my $cgi = Bugzilla->cgi;
-    my $template = Bugzilla->template;
-
-    if (Bugzilla->usage_mode != USAGE_MODE_BROWSER) {
-        ThrowUserError('login_required');
-    }
-
-    print $cgi->header();
-    $template->process("account/auth/login.html.tmpl",
-                       { 'target' => $cgi->url(-relative=>1) }) 
-        || ThrowTemplateError($template->error());
-    exit;
+  my ($self)   = @_;
+  my $cgi      = Bugzilla->cgi;
+  my $template = Bugzilla->template;
+
+  if (Bugzilla->usage_mode != USAGE_MODE_BROWSER) {
+    ThrowUserError('login_required');
+  }
+
+  print $cgi->header();
+  $template->process("account/auth/login.html.tmpl",
+    {'target' => $cgi->url(-relative => 1)})
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 1;
diff --git a/Bugzilla/Auth/Login/Cookie.pm b/Bugzilla/Auth/Login/Cookie.pm
index c09f08d24d..1b0f6eacae 100644
--- a/Bugzilla/Auth/Login/Cookie.pm
+++ b/Bugzilla/Auth/Login/Cookie.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Login::Cookie;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -23,121 +23,132 @@ use List::Util qw(first);
 
 use constant requires_persistence  => 0;
 use constant requires_verification => 0;
-use constant can_login => 0;
+use constant can_login             => 0;
 
 sub is_automatic { return $_[0]->login_token ? 0 : 1; }
 
 # Note that Cookie never consults the Verifier, it always assumes
 # it has a valid DB account or it fails.
 sub get_login_info {
-    my ($self) = @_;
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    my ($user_id, $login_cookie);
-
-    if (!Bugzilla->request_cache->{auth_no_automatic_login}) {
-        $login_cookie = $cgi->cookie("Bugzilla_logincookie");
-        $user_id      = $cgi->cookie("Bugzilla_login");
-
-        # If cookies cannot be found, this could mean that they haven't
-        # been made available yet. In this case, look at Bugzilla_cookie_list.
-        unless ($login_cookie) {
-            my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
-                                @{$cgi->{'Bugzilla_cookie_list'}};
-            $login_cookie = $cookie->value if $cookie;
-        }
-        unless ($user_id) {
-            my $cookie = first {$_->name eq 'Bugzilla_login'}
-                                @{$cgi->{'Bugzilla_cookie_list'}};
-            $user_id = $cookie->value if $cookie;
-        }
+  my ($self) = @_;
+  my $cgi    = Bugzilla->cgi;
+  my $dbh    = Bugzilla->dbh;
+  my ($user_id, $login_cookie);
+
+  if (!Bugzilla->request_cache->{auth_no_automatic_login}) {
+    $login_cookie = $cgi->cookie("Bugzilla_logincookie");
+    $user_id      = $cgi->cookie("Bugzilla_login");
+
+    # If cookies cannot be found, this could mean that they haven't
+    # been made available yet. In this case, look at Bugzilla_cookie_list.
+    unless ($login_cookie) {
+      my $cookie = first { $_->name eq 'Bugzilla_logincookie' }
+      @{$cgi->{'Bugzilla_cookie_list'}};
+      $login_cookie = $cookie->value if $cookie;
+    }
+    unless ($user_id) {
+      my $cookie = first { $_->name eq 'Bugzilla_login' }
+      @{$cgi->{'Bugzilla_cookie_list'}};
+      $user_id = $cookie->value if $cookie;
+    }
 
-        # If the call is for a web service, and an api token is provided, check
-        # it is valid.
-        if (i_am_webservice() && Bugzilla->input_params->{Bugzilla_api_token}) {
-            my $api_token = Bugzilla->input_params->{Bugzilla_api_token};
-            my ($token_user_id, undef, undef, $token_type)
-                = Bugzilla::Token::GetTokenData($api_token);
-            if (!defined $token_type
-                || $token_type ne 'api_token'
-                || $user_id != $token_user_id)
-            {
-                ThrowUserError('auth_invalid_token', { token => $api_token });
-            }
+    # If the call is for a web service, and an api token is provided, check
+    # it is valid.
+    if (i_am_webservice()) {
+      if (exists Bugzilla->input_params->{Bugzilla_api_token}) {
+        my $api_token = Bugzilla->input_params->{Bugzilla_api_token};
+        my ($token_user_id, undef, undef, $token_type)
+          = Bugzilla::Token::GetTokenData($api_token);
+        if ( !defined $token_type
+          || $token_type ne 'api_token'
+          || $user_id != $token_user_id)
+        {
+          ThrowUserError('auth_invalid_token', {token => $api_token});
         }
-    }
+      }
+      elsif ($login_cookie && Bugzilla->usage_mode == USAGE_MODE_REST) {
 
-    # If no cookies were provided, we also look for a login token
-    # passed in the parameters of a webservice
-    my $token = $self->login_token;
-    if ($token && (!$login_cookie || !$user_id)) {
-        ($user_id, $login_cookie) = ($token->{'user_id'}, $token->{'login_token'});
+        # REST requires an api-token when using cookie authentication
+        # fall back to a non-authenticated request
+        $login_cookie = '';
+      }
     }
+  }
+
+  # If no cookies were provided, we also look for a login token
+  # passed in the parameters of a webservice
+  my $token = $self->login_token;
+  if ($token && (!$login_cookie || !$user_id)) {
+    ($user_id, $login_cookie) = ($token->{'user_id'}, $token->{'login_token'});
+  }
+
+  my $ip_addr = remote_ip();
 
-    my $ip_addr = remote_ip();
+  if ($login_cookie && $user_id) {
 
-    if ($login_cookie && $user_id) {
-        # Anything goes for these params - they're just strings which
-        # we're going to verify against the db
-        trick_taint($ip_addr);
-        trick_taint($login_cookie);
-        detaint_natural($user_id);
+    # Anything goes for these params - they're just strings which
+    # we're going to verify against the db
+    trick_taint($ip_addr);
+    trick_taint($login_cookie);
+    detaint_natural($user_id);
 
-        my $db_cookie =
-          $dbh->selectrow_array('SELECT cookie
+    my $db_cookie = $dbh->selectrow_array(
+      'SELECT cookie
                                    FROM logincookies
                                   WHERE cookie = ?
                                         AND userid = ?
-                                        AND (ipaddr = ? OR ipaddr IS NULL)',
-                                 undef, ($login_cookie, $user_id, $ip_addr));
-
-        # If the cookie or token is valid, return a valid username.
-        # If they were not valid and we are using a webservice, then
-        # throw an error notifying the client.
-        if (defined $db_cookie && $login_cookie eq $db_cookie) {
-            # If we logged in successfully, then update the lastused 
-            # time on the login cookie
-            $dbh->do("UPDATE logincookies SET lastused = NOW() 
-                       WHERE cookie = ?", undef, $login_cookie);
-            return { user_id => $user_id };
-        }
-        elsif (i_am_webservice()) {
-            ThrowUserError('invalid_cookies_or_token');
-        }
+                                        AND (ipaddr = ? OR ipaddr IS NULL)', undef,
+      ($login_cookie, $user_id, $ip_addr)
+    );
+
+    # If the cookie or token is valid, return a valid username.
+    # If they were not valid and we are using a webservice, then
+    # throw an error notifying the client.
+    if (defined $db_cookie && $login_cookie eq $db_cookie) {
+
+      # If we logged in successfully, then update the lastused
+      # time on the login cookie
+      $dbh->do(
+        "UPDATE logincookies SET lastused = NOW() 
+                       WHERE cookie = ?", undef, $login_cookie
+      );
+      return {user_id => $user_id};
     }
-
-    # Either the cookie or token is invalid and we are not authenticating
-    # via a webservice, or we did not receive a cookie or token. We don't
-    # want to ever return AUTH_LOGINFAILED, because we don't want Bugzilla to
-    # actually throw an error when it gets a bad cookie or token. It should just
-    # look like there was no cookie or token to begin with.
-    return { failure => AUTH_NODATA };
+    elsif (i_am_webservice()) {
+      ThrowUserError('invalid_cookies_or_token');
+    }
+  }
+
+  # Either the cookie or token is invalid and we are not authenticating
+  # via a webservice, or we did not receive a cookie or token. We don't
+  # want to ever return AUTH_LOGINFAILED, because we don't want Bugzilla to
+  # actually throw an error when it gets a bad cookie or token. It should just
+  # look like there was no cookie or token to begin with.
+  return {failure => AUTH_NODATA};
 }
 
 sub login_token {
-    my ($self) = @_;
-    my $input      = Bugzilla->input_params;
-    my $usage_mode = Bugzilla->usage_mode;
+  my ($self)     = @_;
+  my $input      = Bugzilla->input_params;
+  my $usage_mode = Bugzilla->usage_mode;
 
-    return $self->{'_login_token'} if exists $self->{'_login_token'};
+  return $self->{'_login_token'} if exists $self->{'_login_token'};
 
-    if (!i_am_webservice()) {
-        return $self->{'_login_token'} = undef;
-    }
+  if (!i_am_webservice()) {
+    return $self->{'_login_token'} = undef;
+  }
 
-    # Check if a token was passed in via requests for WebServices
-    my $token = trim(delete $input->{'Bugzilla_token'});
-    return $self->{'_login_token'} = undef if !$token;
+  # Check if a token was passed in via requests for WebServices
+  my $token = trim(delete $input->{'Bugzilla_token'});
+  return $self->{'_login_token'} = undef if !$token;
 
-    my ($user_id, $login_token) = split('-', $token, 2);
-    if (!detaint_natural($user_id) || !$login_token) {
-        return $self->{'_login_token'} = undef;
-    }
+  my ($user_id, $login_token) = split('-', $token, 2);
+  if (!detaint_natural($user_id) || !$login_token) {
+    return $self->{'_login_token'} = undef;
+  }
 
-    return $self->{'_login_token'} = {
-        user_id     => $user_id,
-        login_token => $login_token
-    };
+  return $self->{'_login_token'}
+    = {user_id => $user_id, login_token => $login_token};
 }
 
 1;
diff --git a/Bugzilla/Auth/Login/Env.pm b/Bugzilla/Auth/Login/Env.pm
index 653df2bb39..1c9181ebbf 100644
--- a/Bugzilla/Auth/Login/Env.pm
+++ b/Bugzilla/Auth/Login/Env.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Login::Env;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,28 +16,31 @@ use parent qw(Bugzilla::Auth::Login);
 use Bugzilla::Constants;
 use Bugzilla::Error;
 
-use constant can_logout => 0;
-use constant can_login  => 0;
+use constant can_logout            => 0;
+use constant can_login             => 0;
 use constant requires_persistence  => 0;
 use constant requires_verification => 0;
-use constant is_automatic => 1;
-use constant extern_id_used => 1;
+use constant is_automatic          => 1;
+use constant extern_id_used        => 1;
 
 sub get_login_info {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    my $env_id       = $ENV{Bugzilla->params->{"auth_env_id"}} || '';
-    my $env_email    = $ENV{Bugzilla->params->{"auth_env_email"}} || '';
-    my $env_realname = $ENV{Bugzilla->params->{"auth_env_realname"}} || '';
+  my $env_id       = $ENV{Bugzilla->params->{"auth_env_id"}}       || '';
+  my $env_email    = $ENV{Bugzilla->params->{"auth_env_email"}}    || '';
+  my $env_realname = $ENV{Bugzilla->params->{"auth_env_realname"}} || '';
 
-    return { failure => AUTH_NODATA } if !$env_email;
+  return {failure => AUTH_NODATA} if !$env_email;
 
-    return { username => $env_email, extern_id => $env_id, 
-             realname => $env_realname };
+  return {
+    username  => $env_email,
+    extern_id => $env_id,
+    realname  => $env_realname
+  };
 }
 
 sub fail_nodata {
-    ThrowCodeError('env_no_email');
+  ThrowCodeError('env_no_email');
 }
 
 1;
diff --git a/Bugzilla/Auth/Login/Stack.pm b/Bugzilla/Auth/Login/Stack.pm
index dc35998e4f..fc356d67da 100644
--- a/Bugzilla/Auth/Login/Stack.pm
+++ b/Bugzilla/Auth/Login/Stack.pm
@@ -7,14 +7,14 @@
 
 package Bugzilla::Auth::Login::Stack;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use base qw(Bugzilla::Auth::Login);
 use fields qw(
-    _stack
-    successful
+  _stack
+  successful
 );
 use Hash::Util qw(lock_keys);
 use Bugzilla::Hook;
@@ -22,81 +22,87 @@ use Bugzilla::Constants;
 use List::MoreUtils qw(any);
 
 sub new {
-    my $class = shift;
-    my $self = $class->SUPER::new(@_);
-    my $list = shift;
-    my %methods = map { $_ => "Bugzilla/Auth/Login/$_.pm" } split(',', $list);
-    lock_keys(%methods);
-    Bugzilla::Hook::process('auth_login_methods', { modules => \%methods });
-
-    $self->{_stack} = [];
-    foreach my $login_method (split(',', $list)) {
-        my $module = $methods{$login_method};
-        require $module;
-        $module =~ s|/|::|g;
-        $module =~ s/.pm$//;
-        push(@{$self->{_stack}}, $module->new(@_));
-    }
-    return $self;
+  my $class   = shift;
+  my $self    = $class->SUPER::new(@_);
+  my $list    = shift;
+  my %methods = map { $_ => "Bugzilla/Auth/Login/$_.pm" } split(',', $list);
+  lock_keys(%methods);
+  Bugzilla::Hook::process('auth_login_methods', {modules => \%methods});
+
+  $self->{_stack} = [];
+  foreach my $login_method (split(',', $list)) {
+    my $module = $methods{$login_method};
+    require $module;
+    $module =~ s|/|::|g;
+    $module =~ s/.pm$//;
+    push(@{$self->{_stack}}, $module->new(@_));
+  }
+  return $self;
 }
 
 sub get_login_info {
-    my $self = shift;
-    my $result;
-    foreach my $object (@{$self->{_stack}}) {
-        # See Bugzilla::WebService::Server::JSONRPC for where and why
-        # auth_no_automatic_login is used.
-        if (Bugzilla->request_cache->{auth_no_automatic_login}) {
-            next if $object->is_automatic;
-        }
-        $result = $object->get_login_info(@_);
-        $self->{successful} = $object;
-        
-        # We only carry on down the stack if this method denied all knowledge.
-        last unless ($result->{failure}
-                    && ($result->{failure} eq AUTH_NODATA 
-                       || $result->{failure} eq AUTH_NO_SUCH_USER));
-        
-        # If none of the methods succeed, it's undef.
-        $self->{successful} = undef;
+  my $self = shift;
+  my $result;
+  foreach my $object (@{$self->{_stack}}) {
+
+    # See Bugzilla::WebService::Server::JSONRPC for where and why
+    # auth_no_automatic_login is used.
+    if (Bugzilla->request_cache->{auth_no_automatic_login}) {
+      next if $object->is_automatic;
     }
-    return $result;
+    $result = $object->get_login_info(@_);
+    $self->{successful} = $object;
+
+    # We only carry on down the stack if this method denied all knowledge.
+    last
+      unless ($result->{failure}
+      && ( $result->{failure} eq AUTH_NODATA
+        || $result->{failure} eq AUTH_NO_SUCH_USER));
+
+    # If none of the methods succeed, it's undef.
+    $self->{successful} = undef;
+  }
+  return $result;
 }
 
 sub fail_nodata {
-    my $self = shift;
-    # We fail from the bottom of the stack.
-    my @reverse_stack = reverse @{$self->{_stack}};
-    foreach my $object (@reverse_stack) {
-        # We pick the first object that actually has the method
-        # implemented.
-        if ($object->can('fail_nodata')) {
-            $object->fail_nodata(@_);
-        }
+  my $self = shift;
+
+  # We fail from the bottom of the stack.
+  my @reverse_stack = reverse @{$self->{_stack}};
+  foreach my $object (@reverse_stack) {
+
+    # We pick the first object that actually has the method
+    # implemented.
+    if ($object->can('fail_nodata')) {
+      $object->fail_nodata(@_);
     }
+  }
 }
 
 sub can_login {
-    my ($self) = @_;
-    # We return true if any method can log in.
-    foreach my $object (@{$self->{_stack}}) {
-        return 1 if $object->can_login;
-    }
-    return 0;
+  my ($self) = @_;
+
+  # We return true if any method can log in.
+  foreach my $object (@{$self->{_stack}}) {
+    return 1 if $object->can_login;
+  }
+  return 0;
 }
 
 sub user_can_create_account {
-    my ($self) = @_;
-    # We return true if any method allows users to create accounts.
-    foreach my $object (@{$self->{_stack}}) {
-        return 1 if $object->user_can_create_account;
-    }
-    return 0;
+  my ($self) = @_;
+
+  # We return true if any method allows users to create accounts.
+  foreach my $object (@{$self->{_stack}}) {
+    return 1 if $object->user_can_create_account;
+  }
+  return 0;
 }
 
 sub extern_id_used {
-    my ($self) = @_;
-    return any { $_->extern_id_used } @{ $self->{_stack} };
+  my ($self) = @_;
+  return any { $_->extern_id_used } @{$self->{_stack}};
 }
 
 1;
diff --git a/Bugzilla/Auth/Persist/Cookie.pm b/Bugzilla/Auth/Persist/Cookie.pm
index 2d1291f3b9..a4ef1fa999 100644
--- a/Bugzilla/Auth/Persist/Cookie.pm
+++ b/Bugzilla/Auth/Persist/Cookie.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Persist::Cookie;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,145 +20,158 @@ use Bugzilla::Token;
 use List::Util qw(first);
 
 sub new {
-    my ($class) = @_;
-    my $self = fields::new($class);
-    return $self;
+  my ($class) = @_;
+  my $self = fields::new($class);
+  return $self;
 }
 
 sub persist_login {
-    my ($self, $user) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $cgi = Bugzilla->cgi;
-    my $input_params = Bugzilla->input_params;
-
-    my $ip_addr;
-    if ($input_params->{'Bugzilla_restrictlogin'}) {
-        $ip_addr = remote_ip();
-        # The IP address is valid, at least for comparing with itself in a
-        # subsequent login
-        trick_taint($ip_addr);
-    }
-
-    $dbh->bz_start_transaction();
-
-    my $login_cookie = 
-        Bugzilla::Token::GenerateUniqueToken('logincookies', 'cookie');
-
-    $dbh->do("INSERT INTO logincookies (cookie, userid, ipaddr, lastused)
-              VALUES (?, ?, ?, NOW())",
-              undef, $login_cookie, $user->id, $ip_addr);
-
-    # Issuing a new cookie is a good time to clean up the old
-    # cookies.
-    $dbh->do("DELETE FROM logincookies WHERE lastused < "
-             . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-',
-                                   MAX_LOGINCOOKIE_AGE, 'DAY'));
-
-    $dbh->bz_commit_transaction();
-
-    # We do not want WebServices to generate login cookies.
-    # All we need is the login token for User.login.
-    return $login_cookie if i_am_webservice();
-
-    # Prevent JavaScript from accessing login cookies.
-    my %cookieargs = ('-httponly' => 1);
-
-    # Remember cookie only if admin has told so
-    # or admin didn't forbid it and user told to remember.
-    if ( Bugzilla->params->{'rememberlogin'} eq 'on' ||
-         (Bugzilla->params->{'rememberlogin'} ne 'off' &&
-          $input_params->{'Bugzilla_remember'} &&
-          $input_params->{'Bugzilla_remember'} eq 'on') ) 
-    {
-        # Not a session cookie, so set an infinite expiry
-        $cookieargs{'-expires'} = 'Fri, 01-Jan-2038 00:00:00 GMT';
-    }
-    if (Bugzilla->params->{'ssl_redirect'}) {
-        # Make these cookies only be sent to us by the browser during 
-        # HTTPS sessions, if we're using SSL.
-        $cookieargs{'-secure'} = 1;
-    }
-
-    $cgi->send_cookie(-name => 'Bugzilla_login',
-                      -value => $user->id,
-                      %cookieargs);
-    $cgi->send_cookie(-name => 'Bugzilla_logincookie',
-                      -value => $login_cookie,
-                      %cookieargs);
+  my ($self, $user) = @_;
+  my $dbh          = Bugzilla->dbh;
+  my $cgi          = Bugzilla->cgi;
+  my $input_params = Bugzilla->input_params;
+
+  my $ip_addr;
+  if ($input_params->{'Bugzilla_restrictlogin'}) {
+    $ip_addr = remote_ip();
+
+    # The IP address is valid, at least for comparing with itself in a
+    # subsequent login
+    trick_taint($ip_addr);
+  }
+
+  $dbh->bz_start_transaction();
+
+  my $login_cookie
+    = Bugzilla::Token::GenerateUniqueToken('logincookies', 'cookie');
+
+  $dbh->do(
+    "INSERT INTO logincookies (cookie, userid, ipaddr, lastused)
+              VALUES (?, ?, ?, NOW())", undef, $login_cookie, $user->id, $ip_addr
+  );
+
+  # Issuing a new cookie is a good time to clean up the old
+  # cookies.
+  $dbh->do("DELETE FROM logincookies WHERE lastused < "
+      . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', MAX_LOGINCOOKIE_AGE, 'DAY'));
+
+  $dbh->bz_commit_transaction();
+
+  # We do not want WebServices to generate login cookies.
+  # All we need is the login token for User.login.
+  return $login_cookie if i_am_webservice();
+
+  # Prevent JavaScript from accessing login cookies.
+  my %cookieargs = ('-httponly' => 1);
+
+  # Remember cookie only if admin has told so
+  # or admin didn't forbid it and user told to remember.
+  if (
+    Bugzilla->params->{'rememberlogin'} eq 'on'
+    || ( Bugzilla->params->{'rememberlogin'} ne 'off'
+      && $input_params->{'Bugzilla_remember'}
+      && $input_params->{'Bugzilla_remember'} eq 'on')
+    )
+  {
+    # Not a session cookie, so set an infinite expiry
+    $cookieargs{'-expires'} = 'Fri, 01-Jan-2038 00:00:00 GMT';
+  }
+  if (Bugzilla->params->{'ssl_redirect'}) {
+
+    # Make these cookies only be sent to us by the browser during
+    # HTTPS sessions, if we're using SSL.
+    $cookieargs{'-secure'} = 1;
+  }
+
+  $cgi->send_cookie(-name => 'Bugzilla_login', -value => $user->id, %cookieargs);
+  $cgi->send_cookie(
+    -name  => 'Bugzilla_logincookie',
+    -value => $login_cookie,
+    %cookieargs
+  );
 }
 
 sub logout {
-    my ($self, $param) = @_;
-
-    my $dbh = Bugzilla->dbh;
-    my $cgi = Bugzilla->cgi;
-    my $input = Bugzilla->input_params;
-    $param = {} unless $param;
-    my $user = $param->{user} || Bugzilla->user;
-    my $type = $param->{type} || LOGOUT_ALL;
-
-    if ($type == LOGOUT_ALL) {
-        $dbh->do("DELETE FROM logincookies WHERE userid = ?",
-                 undef, $user->id);
-        return;
-    }
-
-    # The LOGOUT_*_CURRENT options require the current login cookie.
-    # If a new cookie has been issued during this run, that's the current one.
-    # If not, it's the one we've received.
-    my @login_cookies;
-    my $cookie = first {$_->name eq 'Bugzilla_logincookie'}
-                       @{$cgi->{'Bugzilla_cookie_list'}};
-    if ($cookie) {
-        push(@login_cookies, $cookie->value);
-    }
-    elsif ($cookie = $cgi->cookie('Bugzilla_logincookie')) {
-        push(@login_cookies, $cookie);
-    }
-
-    # If we are a webservice using a token instead of cookie
-    # then add that as well to the login cookies to delete
-    if (my $login_token = $user->authorizer->login_token) {
-        push(@login_cookies, $login_token->{'login_token'});
-    }
-
-    # Make sure that @login_cookies is not empty to not break SQL statements.
-    push(@login_cookies, '') unless @login_cookies;
-
-    # These queries use both the cookie ID and the user ID as keys. Even
-    # though we know the userid must match, we still check it in the SQL
-    # as a sanity check, since there is no locking here, and if the user
-    # logged out from two machines simultaneously, while someone else
-    # logged in and got the same cookie, we could be logging the other
-    # user out here. Yes, this is very very very unlikely, but why take
-    # chances? - bbaetz
-    map { trick_taint($_) } @login_cookies;
-    @login_cookies = map { $dbh->quote($_) } @login_cookies;
-    if ($type == LOGOUT_KEEP_CURRENT) {
-        $dbh->do("DELETE FROM logincookies WHERE " .
-                 $dbh->sql_in('cookie', \@login_cookies, 1) .
-                 " AND userid = ?",
-                 undef, $user->id);
-    } elsif ($type == LOGOUT_CURRENT) {
-        $dbh->do("DELETE FROM logincookies WHERE " .
-                 $dbh->sql_in('cookie', \@login_cookies) .
-                 " AND userid = ?",
-                 undef, $user->id);
-    } else {
-        die("Invalid type $type supplied to logout()");
-    }
-
-    if ($type != LOGOUT_KEEP_CURRENT) {
-        clear_browser_cookies();
-    }
+  my ($self, $param) = @_;
+
+  my $dbh   = Bugzilla->dbh;
+  my $cgi   = Bugzilla->cgi;
+  my $input = Bugzilla->input_params;
+  $param = {} unless $param;
+  my $user = $param->{user} || Bugzilla->sudoer || Bugzilla->user;
+  my $type = $param->{type} || LOGOUT_ALL;
+
+  if ($type == LOGOUT_ALL) {
+    $dbh->do("DELETE FROM logincookies WHERE userid = ?", undef, $user->id);
+    $dbh->do("DELETE FROM tokens WHERE userid = ? AND tokentype = 'sudo'",
+      undef, $user->id);
+    return;
+  }
+
+  # The LOGOUT_*_CURRENT options require the current login cookie.
+  # If a new cookie has been issued during this run, that's the current one.
+  # If not, it's the one we've received.
+  my @login_cookies;
+  my $cookie = first { $_->name eq 'Bugzilla_logincookie' }
+  @{$cgi->{'Bugzilla_cookie_list'}};
+  if ($cookie) {
+    push(@login_cookies, $cookie->value);
+  }
+  elsif ($cookie = $cgi->cookie('Bugzilla_logincookie')) {
+    push(@login_cookies, $cookie);
+  }
+
+  # If we are a webservice using a token instead of cookie
+  # then add that as well to the login cookies to delete
+  if (my $login_token = $user->authorizer->login_token) {
+    push(@login_cookies, $login_token->{'login_token'});
+  }
+
+  # Make sure that @login_cookies is not empty to not break SQL statements.
+  push(@login_cookies, '') unless @login_cookies;
+
+  # These queries use both the cookie ID and the user ID as keys. Even
+  # though we know the userid must match, we still check it in the SQL
+  # as a sanity check, since there is no locking here, and if the user
+  # logged out from two machines simultaneously, while someone else
+  # logged in and got the same cookie, we could be logging the other
+  # user out here. Yes, this is very very very unlikely, but why take
+  # chances? - bbaetz
+  map { trick_taint($_) } @login_cookies;
+  @login_cookies = map { $dbh->quote($_) } @login_cookies;
+  if ($type == LOGOUT_KEEP_CURRENT) {
+    $dbh->do(
+      "DELETE FROM logincookies WHERE "
+        . $dbh->sql_in('cookie', \@login_cookies, 1)
+        . " AND userid = ?",
+      undef, $user->id
+    );
+  }
+  elsif ($type == LOGOUT_CURRENT) {
+    $dbh->do(
+      "DELETE FROM logincookies WHERE "
+        . $dbh->sql_in('cookie', \@login_cookies)
+        . " AND userid = ?",
+      undef, $user->id
+    );
+    my $token = $cgi->cookie('sudo');
+    delete_token($token);
+  }
+  else {
+    die("Invalid type $type supplied to logout()");
+  }
+
+  if ($type != LOGOUT_KEEP_CURRENT) {
+    clear_browser_cookies();
+  }
 
 }
 
 sub clear_browser_cookies {
-    my $cgi = Bugzilla->cgi;
-    $cgi->remove_cookie('Bugzilla_login');
-    $cgi->remove_cookie('Bugzilla_logincookie');
-    $cgi->remove_cookie('sudo');
+  my $cgi = Bugzilla->cgi;
+  $cgi->remove_cookie('Bugzilla_login');
+  $cgi->remove_cookie('Bugzilla_logincookie');
+  $cgi->remove_cookie('sudo');
 }
 
 1;
diff --git a/Bugzilla/Auth/Verify.pm b/Bugzilla/Auth/Verify.pm
index e44fb06aef..cc93618908 100644
--- a/Bugzilla/Auth/Verify.pm
+++ b/Bugzilla/Auth/Verify.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Verify;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -19,110 +19,131 @@ use Bugzilla::User;
 use Bugzilla::Util;
 
 use constant user_can_create_account => 1;
-use constant extern_id_used => 0;
+use constant extern_id_used          => 0;
 
 sub new {
-    my ($class, $login_type) = @_;
-    my $self = fields::new($class);
-    return $self;
+  my ($class, $login_type) = @_;
+  my $self = fields::new($class);
+  return $self;
 }
 
 sub can_change_password {
-    return $_[0]->can('change_password');
+  return $_[0]->can('change_password');
 }
 
 sub create_or_update_user {
-    my ($self, $params) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my $extern_id = $params->{extern_id};
-    my $username  = $params->{bz_username} || $params->{username};
-    my $password  = $params->{password} || '*';
-    my $real_name = $params->{realname} || '';
-    my $user_id   = $params->{user_id};
-
-    # A passed-in user_id always overrides anything else, for determining
-    # what account we should return.
-    if (!$user_id) {
-        my $username_user_id = login_to_id($username || '');
-        my $extern_user_id;
-        if ($extern_id) {
-            trick_taint($extern_id);
-            $extern_user_id = $dbh->selectrow_array('SELECT userid
-                 FROM profiles WHERE extern_id = ?', undef, $extern_id);
-        }
-
-        # If we have both a valid extern_id and a valid username, and they are
-        # not the same id, then we have a conflict.
-        if ($username_user_id && $extern_user_id
-            && $username_user_id ne $extern_user_id)
-        {
-            my $extern_name = Bugzilla::User->new($extern_user_id)->login;
-            return { failure => AUTH_ERROR, error => "extern_id_conflict",
-                     details => {extern_id   => $extern_id,
-                                 extern_user => $extern_name,
-                                 username    => $username} };
-        }
-
-        # If we have a valid username, but no valid id,
-        # then we have to create the user. This happens when we're
-        # passed only a username, and that username doesn't exist already.
-        if ($username && !$username_user_id && !$extern_user_id) {
-            validate_email_syntax($username)
-              || return { failure => AUTH_ERROR, 
-                          error   => 'auth_invalid_email',
-                          details => {addr => $username} };
-            # Usually we'd call validate_password, but external authentication
-            # systems might follow different standards than ours. So in this
-            # place here, we call trick_taint without checks.
-            trick_taint($password);
-
-            # XXX Theoretically this could fail with an error, but the fix for
-            # that is too involved to be done right now.
-            my $user = Bugzilla::User->create({ 
-                login_name    => $username, 
-                cryptpassword => $password,
-                realname      => $real_name});
-            $username_user_id = $user->id;
-        }
-
-        # If we have a valid username id and an extern_id, but no valid
-        # extern_user_id, then we have to set the user's extern_id.
-        if ($extern_id && $username_user_id && !$extern_user_id) {
-            $dbh->do('UPDATE profiles SET extern_id = ? WHERE userid = ?',
-                     undef, $extern_id, $username_user_id);
-            Bugzilla->memcached->clear({ table => 'profiles', id => $username_user_id });
-        }
-
-        # Finally, at this point, one of these will give us a valid user id.
-        $user_id = $extern_user_id || $username_user_id;
+  my ($self, $params) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $extern_id = $params->{extern_id};
+  my $login = $params->{bz_username} || $params->{username};
+  my $email = Bugzilla->params->{use_email_as_login} ? $login : $params->{email};
+  my $password  = $params->{password} || '*';
+  my $real_name = $params->{realname} || '';
+  my $user_id   = $params->{user_id};
+
+  # A passed-in user_id always overrides anything else, for determining
+  # what account we should return.
+  if (!$user_id) {
+    my $login_user_id = login_to_id($login || '');
+    my $extern_user_id;
+    if ($extern_id) {
+      trick_taint($extern_id);
+      $extern_user_id = $dbh->selectrow_array(
+        'SELECT userid
+                 FROM profiles WHERE extern_id = ?', undef, $extern_id
+      );
     }
 
-    # If we still don't have a valid user_id, then we weren't passed
-    # enough information in $params, and we should die right here.
-    ThrowCodeError('bad_arg', {argument => 'params', function =>
-        'Bugzilla::Auth::Verify::create_or_update_user'})
-        unless $user_id;
-
-    my $user = new Bugzilla::User($user_id);
-
-    # Now that we have a valid User, we need to see if any data has to be
-    # updated.
-    if ($username && lc($user->login) ne lc($username)) {
-        validate_email_syntax($username)
-          || return { failure => AUTH_ERROR, error => 'auth_invalid_email',
-                      details => {addr => $username} };
-        $user->set_login($username);
+    # If we have both a valid extern_id and a valid login, and they are
+    # not the same id, then we have a conflict.
+    if ($login_user_id && $extern_user_id && $login_user_id ne $extern_user_id) {
+      my $extern_name = Bugzilla::User->new($extern_user_id)->login;
+      return {
+        failure => AUTH_ERROR,
+        error   => "extern_id_conflict",
+        details =>
+          {extern_id => $extern_id, extern_user => $extern_name, username => $login}
+      };
     }
-    if ($real_name && $user->name ne $real_name) {
-        # $real_name is more than likely tainted, but we only use it
-        # in a placeholder and we never use it after this.
-        trick_taint($real_name);
-        $user->set_name($real_name);
+
+    # If we have a valid login, but no valid id,
+    # then we have to create the user. This happens when we're
+    # passed only a login, and that login doesn't exist already.
+    if ($login && !$login_user_id && !$extern_user_id) {
+      validate_email_syntax($email) || return {
+        failure => AUTH_ERROR,
+        error   => 'auth_invalid_email',
+        details => {addr => $email}
+      };
+
+      # Usually we'd call validate_password, but external authentication
+      # systems might follow different standards than ours. So in this
+      # place here, we call trick_taint without checks.
+      trick_taint($password);
+
+      # XXX Theoretically this could fail with an error, but the fix for
+      # that is too involved to be done right now.
+      my $user = Bugzilla::User->create({
+        login_name    => $login,
+        email         => $email,
+        cryptpassword => $password,
+        realname      => $real_name
+      });
+      $login_user_id = $user->id;
+    }
+
+    # If we have a valid login id and an extern_id, but no valid
+    # extern_user_id, then we have to set the user's extern_id.
+    if ($extern_id && $login_user_id && !$extern_user_id) {
+      $dbh->do('UPDATE profiles SET extern_id = ? WHERE userid = ?',
+        undef, $extern_id, $login_user_id);
+      Bugzilla->memcached->clear({table => 'profiles', id => $login_user_id});
     }
-    $user->update();
 
-    return { user => $user };
+    # Finally, at this point, one of these will give us a valid user id.
+    $user_id = $extern_user_id || $login_user_id;
+  }
+
+  # If we still don't have a valid user_id, then we weren't passed
+  # enough information in $params, and we should die right here.
+  ThrowCodeError(
+    'bad_arg',
+    {
+      argument => 'params',
+      function => 'Bugzilla::Auth::Verify::create_or_update_user'
+    }
+  ) unless $user_id;
+
+  my $user = new Bugzilla::User($user_id);
+
+  # Now that we have a valid User, we need to see if any data has to be updated.
+  my $changed = 0;
+
+  if ($email && lc($user->email) ne lc($email)) {
+    validate_email_syntax($email) || return {
+      failure => AUTH_ERROR,
+      error   => 'auth_invalid_email',
+      details => {addr => $email}
+    };
+    $user->set_email($email);
+    $changed = 1;
+  }
+  if ($login && lc($user->login) ne lc($login)) {
+    $user->set_login($login);
+    $changed = 1;
+  }
+  if ($real_name && $user->name ne $real_name) {
+
+    # $real_name is more than likely tainted, but we only use it
+    # in a placeholder and we never use it after this.
+    trick_taint($real_name);
+    $user->set_name($real_name);
+    $changed = 1;
+  }
+  $user->update() if $changed;
+
+  return {user => $user};
 }
 
 1;
diff --git a/Bugzilla/Auth/Verify/DB.pm b/Bugzilla/Auth/Verify/DB.pm
index 28a9310c97..a15d1d9983 100644
--- a/Bugzilla/Auth/Verify/DB.pm
+++ b/Bugzilla/Auth/Verify/DB.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Verify::DB;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -19,95 +19,97 @@ use Bugzilla::Util;
 use Bugzilla::User;
 
 sub check_credentials {
-    my ($self, $login_data) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self, $login_data) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my $username = $login_data->{username};
-    my $user = new Bugzilla::User({ name => $username });
+  my $username = $login_data->{username};
+  my $user = new Bugzilla::User({name => $username});
 
-    return { failure => AUTH_NO_SUCH_USER } unless $user;
+  return {failure => AUTH_NO_SUCH_USER} unless $user;
 
-    $login_data->{user} = $user;
-    $login_data->{bz_username} = $user->login;
+  $login_data->{user}        = $user;
+  $login_data->{bz_username} = $user->login;
 
+  if ($user->account_is_locked_out) {
+    return {failure => AUTH_LOCKOUT, user => $user};
+  }
+
+  my $password              = $login_data->{password};
+  my $real_password_crypted = $user->cryptpassword;
+
+  # Using the internal crypted password as the salt,
+  # crypt the password the user entered.
+  my $entered_password_crypted = bz_crypt($password, $real_password_crypted);
+
+  if ($entered_password_crypted ne $real_password_crypted) {
+
+    # Record the login failure
+    $user->note_login_failure();
+
+    # Immediately check if we are locked out
     if ($user->account_is_locked_out) {
-        return { failure => AUTH_LOCKOUT, user => $user };
+      return {failure => AUTH_LOCKOUT, user => $user, just_locked_out => 1};
     }
 
-    my $password = $login_data->{password};
-    my $real_password_crypted = $user->cryptpassword;
-
-    # Using the internal crypted password as the salt,
-    # crypt the password the user entered.
-    my $entered_password_crypted = bz_crypt($password, $real_password_crypted);
-
-    if ($entered_password_crypted ne $real_password_crypted) {
-        # Record the login failure
-        $user->note_login_failure();
-
-        # Immediately check if we are locked out
-        if ($user->account_is_locked_out) {
-            return { failure => AUTH_LOCKOUT, user => $user,
-                     just_locked_out => 1 };
-        }
-
-        return { failure => AUTH_LOGINFAILED,
-                 failure_count => scalar(@{ $user->account_ip_login_failures }),
-               };
-    } 
-
-    # Force the user to change their password if it does not meet the current
-    # criteria. This should usually only happen if the criteria has changed.
-    if (Bugzilla->usage_mode == USAGE_MODE_BROWSER &&
-        Bugzilla->params->{password_check_on_login})
-    {
-        my $check = validate_password_check($password);
-        if ($check) {
-            return {
-                failure => AUTH_ERROR,
-                user_error => $check,
-                details => { locked_user => $user }
-            }
-        }
+    return {
+      failure       => AUTH_LOGINFAILED,
+      failure_count => scalar(@{$user->account_ip_login_failures}),
+    };
+  }
+
+  # Force the user to change their password if it does not meet the current
+  # criteria. This should usually only happen if the criteria has changed.
+  if ( Bugzilla->usage_mode == USAGE_MODE_BROWSER
+    && Bugzilla->params->{password_check_on_login})
+  {
+    my $check = validate_password_check($password);
+    if ($check) {
+      return {
+        failure    => AUTH_ERROR,
+        user_error => $check,
+        details    => {locked_user => $user}
+      };
     }
+  }
 
-    # The user's credentials are okay, so delete any outstanding
-    # password tokens or login failures they may have generated.
-    Bugzilla::Token::DeletePasswordTokens($user->id, "user_logged_in");
-    $user->clear_login_failures();
+  # The user's credentials are okay, so delete any outstanding
+  # password tokens or login failures they may have generated.
+  Bugzilla::Token::DeletePasswordTokens($user->id, "user_logged_in");
+  $user->clear_login_failures();
 
-    my $update_password = 0;
+  my $update_password = 0;
 
-    # If their old password was using crypt() or some different hash
-    # than we're using now, convert the stored password to using
-    # whatever hashing system we're using now.
-    my $current_algorithm = PASSWORD_DIGEST_ALGORITHM;
-    $update_password = 1 if ($real_password_crypted !~ /{\Q$current_algorithm\E}$/);
+  # If their old password was using crypt() or some different hash
+  # than we're using now, convert the stored password to using
+  # whatever hashing system we're using now.
+  my $current_algorithm = PASSWORD_DIGEST_ALGORITHM;
+  $update_password = 1 if ($real_password_crypted !~ /{\Q$current_algorithm\E}$/);
 
-    # If their old password was using a different length salt than what
-    # we're using now, update the password to use the new salt length.
-    if ($real_password_crypted =~ /^([^,]+),/) {
-        $update_password = 1 if (length($1) != PASSWORD_SALT_LENGTH);
-    }
+  # If their old password was using a different length salt than what
+  # we're using now, update the password to use the new salt length.
+  if ($real_password_crypted =~ /^([^,]+),/) {
+    $update_password = 1 if (length($1) != PASSWORD_SALT_LENGTH);
+  }
 
-    # If needed, update the user's password.
-    if ($update_password) {
-        # We can't call $user->set_password because we don't want the password
-        # complexity rules to apply here.
-        $user->{cryptpassword} = bz_crypt($password);
-        $user->update();
-    }
+  # If needed, update the user's password.
+  if ($update_password) {
+
+    # We can't call $user->set_password because we don't want the password
+    # complexity rules to apply here.
+    $user->{cryptpassword} = bz_crypt($password);
+    $user->update();
+  }
 
-    return $login_data;
+  return $login_data;
 }
 
 sub change_password {
-    my ($self, $user, $password) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $cryptpassword = bz_crypt($password);
-    $dbh->do("UPDATE profiles SET cryptpassword = ? WHERE userid = ?",
-             undef, $cryptpassword, $user->id);
-    Bugzilla->memcached->clear({ table => 'profiles', id => $user->id });
+  my ($self, $user, $password) = @_;
+  my $dbh           = Bugzilla->dbh;
+  my $cryptpassword = bz_crypt($password);
+  $dbh->do("UPDATE profiles SET cryptpassword = ? WHERE userid = ?",
+    undef, $cryptpassword, $user->id);
+  Bugzilla->memcached->clear({table => 'profiles', id => $user->id});
 }
 
 1;
diff --git a/Bugzilla/Auth/Verify/LDAP.pm b/Bugzilla/Auth/Verify/LDAP.pm
index e37f557939..34195804c6 100644
--- a/Bugzilla/Auth/Verify/LDAP.pm
+++ b/Bugzilla/Auth/Verify/LDAP.pm
@@ -7,13 +7,13 @@
 
 package Bugzilla::Auth::Verify::LDAP;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use base qw(Bugzilla::Auth::Verify);
 use fields qw(
-    ldap
+  ldap
 );
 
 use Bugzilla::Constants;
@@ -28,126 +28,136 @@ use constant admin_can_create_account => 0;
 use constant user_can_create_account  => 0;
 
 sub check_credentials {
-    my ($self, $params) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # We need to bind anonymously to the LDAP server.  This is
-    # because we need to get the Distinguished Name of the user trying
-    # to log in.  Some servers (such as iPlanet) allow you to have unique
-    # uids spread out over a subtree of an area (such as "People"), so
-    # just appending the Base DN to the uid isn't sufficient to get the
-    # user's DN.  For servers which don't work this way, there will still
-    # be no harm done.
+  my ($self, $params) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # We need to bind anonymously to the LDAP server.  This is
+  # because we need to get the Distinguished Name of the user trying
+  # to log in.  Some servers (such as iPlanet) allow you to have unique
+  # uids spread out over a subtree of an area (such as "People"), so
+  # just appending the Base DN to the uid isn't sufficient to get the
+  # user's DN.  For servers which don't work this way, there will still
+  # be no harm done.
+  $self->_bind_ldap_for_search();
+
+  # Now, we verify that the user exists, and get a LDAP Distinguished
+  # Name for the user.
+  my $username = $params->{username};
+  my $dn_result
+    = $self->ldap->search(_bz_search_params($username), attrs => ['dn']);
+  return {
+    failure => AUTH_ERROR,
+    error   => "ldap_search_error",
+    details => {errstr => $dn_result->error, username => $username}
+    }
+    if $dn_result->code;
+
+  return {failure => AUTH_NO_SUCH_USER} if !$dn_result->count;
+
+  my $dn = $dn_result->shift_entry->dn;
+
+  # Check the password.
+  my $pw_result = $self->ldap->bind($dn, password => $params->{password});
+  return {failure => AUTH_LOGINFAILED} if $pw_result->code;
+
+  # And now we fill in the user's details.
+
+  # First try the search as the (already bound) user in question.
+  my $user_entry;
+  my $error_string;
+  my $detail_result = $self->ldap->search(_bz_search_params($username));
+  if ($detail_result->code) {
+
+    # Stash away the original error, just in case
+    $error_string = $detail_result->error;
+  }
+  else {
+    $user_entry = $detail_result->shift_entry;
+  }
+
+  # If that failed (either because the search failed, or returned no
+  # results) then try re-binding as the initial search user, but only
+  # if the LDAPbinddn parameter is set.
+  if (!$user_entry && Bugzilla->params->{"LDAPbinddn"}) {
     $self->_bind_ldap_for_search();
 
-    # Now, we verify that the user exists, and get a LDAP Distinguished
-    # Name for the user.
-    my $username = $params->{username};
-    my $dn_result = $self->ldap->search(_bz_search_params($username),
-                                        attrs  => ['dn']);
-    return { failure => AUTH_ERROR, error => "ldap_search_error",
-             details => {errstr => $dn_result->error, username => $username}
-    } if $dn_result->code;
-
-    return { failure => AUTH_NO_SUCH_USER } if !$dn_result->count;
-
-    my $dn = $dn_result->shift_entry->dn;
-
-    # Check the password.   
-    my $pw_result = $self->ldap->bind($dn, password => $params->{password});
-    return { failure => AUTH_LOGINFAILED } if $pw_result->code;
-
-    # And now we fill in the user's details.
-
-    # First try the search as the (already bound) user in question.
-    my $user_entry;
-    my $error_string;
-    my $detail_result = $self->ldap->search(_bz_search_params($username));
-    if ($detail_result->code) {
-        # Stash away the original error, just in case
-        $error_string = $detail_result->error;
-    } else {
-        $user_entry = $detail_result->shift_entry;
+    $detail_result = $self->ldap->search(_bz_search_params($username));
+    if (!$detail_result->code) {
+      $user_entry = $detail_result->shift_entry;
     }
+  }
 
-    # If that failed (either because the search failed, or returned no
-    # results) then try re-binding as the initial search user, but only
-    # if the LDAPbinddn parameter is set.
-    if (!$user_entry && Bugzilla->params->{"LDAPbinddn"}) {
-        $self->_bind_ldap_for_search();
-
-        $detail_result = $self->ldap->search(_bz_search_params($username));
-        if (!$detail_result->code) {
-            $user_entry = $detail_result->shift_entry;
-        }
+  # If we *still* don't have anything in $user_entry then give up.
+  return {
+    failure => AUTH_ERROR,
+    error   => "ldap_search_error",
+    details => {errstr => $error_string, username => $username}
     }
+    if !$user_entry;
 
-    # If we *still* don't have anything in $user_entry then give up.
-    return { failure => AUTH_ERROR, error => "ldap_search_error",
-             details => {errstr => $error_string, username => $username}
-    } if !$user_entry;
 
+  my $mail_attr = Bugzilla->params->{"LDAPmailattribute"};
+  if ($mail_attr) {
+    if (!$user_entry->exists($mail_attr)) {
+      return {
+        failure => AUTH_ERROR,
+        error   => "ldap_cannot_retreive_attr",
+        details => {attr => $mail_attr}
+      };
+    }
 
-    my $mail_attr = Bugzilla->params->{"LDAPmailattribute"};
-    if ($mail_attr) {
-        if (!$user_entry->exists($mail_attr)) {
-            return { failure => AUTH_ERROR,
-                     error   => "ldap_cannot_retreive_attr",
-                     details => {attr => $mail_attr} };
-        }
+    my @emails = $user_entry->get_value($mail_attr);
 
-        my @emails = $user_entry->get_value($mail_attr);
+    # Default to the first email address returned.
+    $params->{email} = $emails[0];
 
-        # Default to the first email address returned.
-        $params->{bz_username} = $emails[0];
+    if (@emails > 1) {
 
-        if (@emails > 1) {
-            # Cycle through the adresses and check if they're Bugzilla logins.
-            # Use the first one that returns a valid id. 
-            foreach my $email (@emails) {
-                if ( login_to_id($email) ) {
-                    $params->{bz_username} = $email;
-                    last;
-                }
-            }
+      # Cycle through the addresses and check if they're Bugzilla logins.
+      # Use the first one that returns a valid id.
+      foreach my $email (@emails) {
+        if (email_to_id($email)) {
+          $params->{email} = $email;
+          last;
         }
-
-    } else {
-        $params->{bz_username} = $username;
+      }
     }
+  }
 
-    $params->{realname}  ||= $user_entry->get_value("displayName");
-    $params->{realname}  ||= $user_entry->get_value("cn");
+  $params->{bz_username} = $username;
+  $params->{realname} ||= $user_entry->get_value("displayName");
+  $params->{realname} ||= $user_entry->get_value("cn");
 
-    $params->{extern_id} = $username;
+  $params->{extern_id} = $username;
 
-    return $params;
+  return $params;
 }
 
 sub _bz_search_params {
-    my ($username) = @_;
-    $username = escape_filter_value($username);
-    return (base   => Bugzilla->params->{"LDAPBaseDN"},
-            scope  => "sub",
-            filter => '(&(' . Bugzilla->params->{"LDAPuidattribute"} 
-                      . "=$username)"
-                      . Bugzilla->params->{"LDAPfilter"} . ')');
+  my ($username) = @_;
+  $username = escape_filter_value($username);
+  return (
+    base   => Bugzilla->params->{"LDAPBaseDN"},
+    scope  => "sub",
+    filter => '(&('
+      . Bugzilla->params->{"LDAPuidattribute"}
+      . "=$username)"
+      . Bugzilla->params->{"LDAPfilter"} . ')'
+  );
 }
 
 sub _bind_ldap_for_search {
-    my ($self) = @_;
-    my $bind_result;
-    if (Bugzilla->params->{"LDAPbinddn"}) {
-        my ($LDAPbinddn,$LDAPbindpass) = 
-            split(":",Bugzilla->params->{"LDAPbinddn"});
-        $bind_result = 
-            $self->ldap->bind($LDAPbinddn, password => $LDAPbindpass);
-    }
-    else {
-        $bind_result = $self->ldap->bind();
-    }
-    ThrowCodeError("ldap_bind_failed", {errstr => $bind_result->error})
-        if $bind_result->code;
+  my ($self) = @_;
+  my $bind_result;
+  if (Bugzilla->params->{"LDAPbinddn"}) {
+    my ($LDAPbinddn, $LDAPbindpass) = split(":", Bugzilla->params->{"LDAPbinddn"});
+    $bind_result = $self->ldap->bind($LDAPbinddn, password => $LDAPbindpass);
+  }
+  else {
+    $bind_result = $self->ldap->bind();
+  }
+  ThrowCodeError("ldap_bind_failed", {errstr => $bind_result->error})
+    if $bind_result->code;
 }
 
 # We can't just do this in new(), because we're not allowed to throw any
@@ -156,27 +166,27 @@ sub _bind_ldap_for_search {
 # to fix their mistake. (Because Bugzilla->login always calls
 # Bugzilla::Auth->new, and almost every page calls Bugzilla->login.)
 sub ldap {
-    my ($self) = @_;
-    return $self->{ldap} if $self->{ldap};
-
-    my @servers = split(/[\s,]+/, Bugzilla->params->{"LDAPserver"});
-    ThrowCodeError("ldap_server_not_defined") unless @servers;
-
-    foreach (@servers) {
-        $self->{ldap} = new Net::LDAP(trim($_));
-        last if $self->{ldap};
-    }
-    ThrowCodeError("ldap_connect_failed", { server => join(", ", @servers) }) 
-        unless $self->{ldap};
-
-    # try to start TLS if needed
-    if (Bugzilla->params->{"LDAPstarttls"}) {
-        my $mesg = $self->{ldap}->start_tls();
-        ThrowCodeError("ldap_start_tls_failed", { error => $mesg->error() })
-            if $mesg->code();
-    }
-
-    return $self->{ldap};
+  my ($self) = @_;
+  return $self->{ldap} if $self->{ldap};
+
+  my @servers = split(/[\s,]+/, Bugzilla->params->{"LDAPserver"});
+  ThrowCodeError("ldap_server_not_defined") unless @servers;
+
+  foreach (@servers) {
+    $self->{ldap} = new Net::LDAP(trim($_));
+    last if $self->{ldap};
+  }
+  ThrowCodeError("ldap_connect_failed", {server => join(", ", @servers)})
+    unless $self->{ldap};
+
+  # try to start TLS if needed
+  if (Bugzilla->params->{"LDAPstarttls"}) {
+    my $mesg = $self->{ldap}->start_tls();
+    ThrowCodeError("ldap_start_tls_failed", {error => $mesg->error()})
+      if $mesg->code();
+  }
+
+  return $self->{ldap};
 }
 
 1;
diff --git a/Bugzilla/Auth/Verify/RADIUS.pm b/Bugzilla/Auth/Verify/RADIUS.pm
index 283d9b4661..14ed03b9a5 100644
--- a/Bugzilla/Auth/Verify/RADIUS.pm
+++ b/Bugzilla/Auth/Verify/RADIUS.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Auth::Verify::RADIUS;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -23,33 +23,39 @@ use constant admin_can_create_account => 0;
 use constant user_can_create_account  => 0;
 
 sub check_credentials {
-    my ($self, $params) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $address_suffix = Bugzilla->params->{'RADIUS_email_suffix'};
-    my $username = $params->{username};
-
-    # If we're using RADIUS_email_suffix, we may need to cut it off from
-    # the login name.
-    if ($address_suffix) {
-        $username =~ s/\Q$address_suffix\E$//i;
-    }
-
-    # Create RADIUS object.
-    my $radius =
-        new Authen::Radius(Host   => Bugzilla->params->{'RADIUS_server'},
-                           Secret => Bugzilla->params->{'RADIUS_secret'})
-        || return { failure => AUTH_ERROR, error => 'radius_preparation_error',
-                    details => {errstr => Authen::Radius::strerror() } };
-
-    # Check the password.
-    $radius->check_pwd($username, $params->{password},
-                       Bugzilla->params->{'RADIUS_NAS_IP'} || undef)
-        || return { failure => AUTH_LOGINFAILED };
-
-    # Build the user account's e-mail address.
-    $params->{bz_username} = $username . $address_suffix;
-
-    return $params;
+  my ($self, $params) = @_;
+  my $dbh            = Bugzilla->dbh;
+  my $address_suffix = Bugzilla->params->{'RADIUS_email_suffix'};
+  my $username       = $params->{username};
+
+  # If we're using RADIUS_email_suffix, we may need to cut it off from
+  # the login name.
+  if ($address_suffix) {
+    $username =~ s/\Q$address_suffix\E$//i;
+  }
+
+  # Create RADIUS object.
+  my $radius = new Authen::Radius(
+    Host   => Bugzilla->params->{'RADIUS_server'},
+    Secret => Bugzilla->params->{'RADIUS_secret'}
+    )
+    || return {
+    failure => AUTH_ERROR,
+    error   => 'radius_preparation_error',
+    details => {errstr => Authen::Radius::strerror()}
+    };
+
+  # Check the password.
+  $radius->check_pwd($username, $params->{password},
+    Bugzilla->params->{'RADIUS_NAS_IP'} || undef)
+    || return {failure => AUTH_LOGINFAILED};
+
+  $params->{bz_username} = $username;
+
+  # Build the user account's e-mail address.
+  $params->{email} = $username . $address_suffix;
+
+  return $params;
 }
 
 1;
diff --git a/Bugzilla/Auth/Verify/Stack.pm b/Bugzilla/Auth/Verify/Stack.pm
index 3e5db3cecb..a54432a19b 100644
--- a/Bugzilla/Auth/Verify/Stack.pm
+++ b/Bugzilla/Auth/Verify/Stack.pm
@@ -7,14 +7,14 @@
 
 package Bugzilla::Auth::Verify::Stack;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use base qw(Bugzilla::Auth::Verify);
 use fields qw(
-    _stack
-    successful
+  _stack
+  successful
 );
 
 use Bugzilla::Hook;
@@ -23,70 +23,75 @@ use Hash::Util qw(lock_keys);
 use List::MoreUtils qw(any);
 
 sub new {
-    my $class = shift;
-    my $list = shift;
-    my $self = $class->SUPER::new(@_);
-    my %methods = map { $_ => "Bugzilla/Auth/Verify/$_.pm" } split(',', $list);
-    lock_keys(%methods);
-    Bugzilla::Hook::process('auth_verify_methods', { modules => \%methods });
-
-    $self->{_stack} = [];
-    foreach my $verify_method (split(',', $list)) {
-        my $module = $methods{$verify_method};
-        require $module;
-        $module =~ s|/|::|g;
-        $module =~ s/.pm$//;
-        push(@{$self->{_stack}}, $module->new(@_));
-    }
-    return $self;
+  my $class   = shift;
+  my $list    = shift;
+  my $self    = $class->SUPER::new(@_);
+  my %methods = map { $_ => "Bugzilla/Auth/Verify/$_.pm" } split(',', $list);
+  lock_keys(%methods);
+  Bugzilla::Hook::process('auth_verify_methods', {modules => \%methods});
+
+  $self->{_stack} = [];
+  foreach my $verify_method (split(',', $list)) {
+    my $module = $methods{$verify_method};
+    require $module;
+    $module =~ s|/|::|g;
+    $module =~ s/.pm$//;
+    push(@{$self->{_stack}}, $module->new(@_));
+  }
+  return $self;
 }
 
 sub can_change_password {
-    my ($self) = @_;
-    # We return true if any method can change passwords.
-    foreach my $object (@{$self->{_stack}}) {
-        return 1 if $object->can_change_password;
-    }
-    return 0;
+  my ($self) = @_;
+
+  # We return true if any method can change passwords.
+  foreach my $object (@{$self->{_stack}}) {
+    return 1 if $object->can_change_password;
+  }
+  return 0;
 }
 
 sub check_credentials {
-    my $self = shift;
-    my $result;
-    foreach my $object (@{$self->{_stack}}) {
-        $result = $object->check_credentials(@_);
-        $self->{successful} = $object;
-        last if !$result->{failure};
-        # So that if none of them succeed, it's undef.
-        $self->{successful} = undef;
-    }
-    # Returns the result at the bottom of the stack if they all fail.
-    return $result;
+  my $self = shift;
+  my $result;
+  foreach my $object (@{$self->{_stack}}) {
+    $result = $object->check_credentials(@_);
+    $self->{successful} = $object;
+    last if !$result->{failure};
+
+    # So that if none of them succeed, it's undef.
+    $self->{successful} = undef;
+  }
+
+  # Returns the result at the bottom of the stack if they all fail.
+  return $result;
 }
 
 sub create_or_update_user {
-    my $self = shift;
-    my $result;
-    foreach my $object (@{$self->{_stack}}) {
-        $result = $object->create_or_update_user(@_);
-        last if !$result->{failure};
-    }
-    # Returns the result at the bottom of the stack if they all fail.
-    return $result;
+  my $self = shift;
+  my $result;
+  foreach my $object (@{$self->{_stack}}) {
+    $result = $object->create_or_update_user(@_);
+    last if !$result->{failure};
+  }
+
+  # Returns the result at the bottom of the stack if they all fail.
+  return $result;
 }
 
 sub user_can_create_account {
-    my ($self) = @_;
-    # We return true if any method allows the user to create an account.
-    foreach my $object (@{$self->{_stack}}) {
-        return 1 if $object->user_can_create_account;
-    }
-    return 0;
+  my ($self) = @_;
+
+  # We return true if any method allows the user to create an account.
+  foreach my $object (@{$self->{_stack}}) {
+    return 1 if $object->user_can_create_account;
+  }
+  return 0;
 }
 
 sub extern_id_used {
-    my ($self) = @_;
-    return any { $_->extern_id_used } @{ $self->{_stack} };
+  my ($self) = @_;
+  return any { $_->extern_id_used } @{$self->{_stack}};
 }
 
 1;
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index aa5085fe70..b2666a55d8 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Bug;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -34,15 +34,18 @@ use Bugzilla::BugUserLastVisit;
 use List::MoreUtils qw(firstidx uniq part);
 use List::Util qw(min max first);
 use Storable qw(dclone);
-use Scalar::Util qw(blessed);
+use Scalar::Util qw(blessed weaken);
 
 use parent qw(Bugzilla::Object Exporter);
 @Bugzilla::Bug::EXPORT = qw(
-    bug_alias_to_id
-    LogActivityEntry
-    editable_bug_fields
+  bug_alias_to_id
+  LogActivityEntry
+  editable_bug_fields
 );
 
+# This hash keeps a weak copy of every bug created.
+my %CLEANUP;
+
 #####################################################################
 # Constants
 #####################################################################
@@ -51,198 +54,200 @@ use constant DB_TABLE   => 'bugs';
 use constant ID_FIELD   => 'bug_id';
 use constant NAME_FIELD => 'bug_id';
 use constant LIST_ORDER => ID_FIELD;
+
 # Bugs have their own auditing table, bugs_activity.
 use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
+
 # This will be enabled later
 use constant USE_MEMCACHED => 0;
 
 # This is a sub because it needs to call other subroutines.
 sub DB_COLUMNS {
-    my $dbh = Bugzilla->dbh;
-    my @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT}
-                      Bugzilla->active_custom_fields;
-    my @custom_names = map {$_->name} @custom;
-
-    my @columns = (qw(
-        assigned_to
-        bug_file_loc
-        bug_id
-        bug_severity
-        bug_status
-        cclist_accessible
-        component_id
-        creation_ts
-        delta_ts
-        estimated_time
-        everconfirmed
-        lastdiffed
-        op_sys
-        priority
-        product_id
-        qa_contact
-        remaining_time
-        rep_platform
-        reporter_accessible
-        resolution
-        short_desc
-        status_whiteboard
-        target_milestone
-        version
-    ),
-    'reporter    AS reporter_id',
-    $dbh->sql_date_format('deadline', '%Y-%m-%d') . ' AS deadline',
-    @custom_names);
-    
-    Bugzilla::Hook::process("bug_columns", { columns => \@columns });
-    
-    return @columns;
+  my $dbh = Bugzilla->dbh;
+  my @custom
+    = grep { $_->type != FIELD_TYPE_MULTI_SELECT } Bugzilla->active_custom_fields;
+  my @custom_names = map { $_->name } @custom;
+
+  my @columns = (
+    qw(
+      assigned_to
+      bug_file_loc
+      bug_id
+      bug_severity
+      bug_status
+      cclist_accessible
+      component_id
+      creation_ts
+      delta_ts
+      estimated_time
+      everconfirmed
+      lastdiffed
+      op_sys
+      priority
+      product_id
+      qa_contact
+      remaining_time
+      rep_platform
+      reporter_accessible
+      resolution
+      short_desc
+      status_whiteboard
+      target_milestone
+      version
+      ), 'reporter    AS reporter_id',
+    $dbh->sql_date_format('deadline', '%Y-%m-%d') . ' AS deadline', @custom_names
+  );
+
+  Bugzilla::Hook::process("bug_columns", {columns => \@columns});
+
+  return @columns;
 }
 
 sub VALIDATORS {
 
-    my $validators = {
-        alias          => \&_check_alias,
-        assigned_to    => \&_check_assigned_to,
-        blocked        => \&_check_dependencies,
-        bug_file_loc   => \&_check_bug_file_loc,
-        bug_severity   => \&_check_select_field,
-        bug_status     => \&_check_bug_status,
-        cc             => \&_check_cc,
-        comment        => \&_check_comment,
-        component      => \&_check_component,
-        creation_ts    => \&_check_creation_ts,
-        deadline       => \&_check_deadline,
-        dependson      => \&_check_dependencies,
-        dup_id         => \&_check_dup_id,
-        estimated_time => \&_check_time_field,
-        everconfirmed  => \&Bugzilla::Object::check_boolean,
-        groups         => \&_check_groups,
-        keywords       => \&_check_keywords,
-        op_sys         => \&_check_select_field,
-        priority       => \&_check_priority,
-        product        => \&_check_product,
-        qa_contact     => \&_check_qa_contact,
-        remaining_time => \&_check_time_field,
-        rep_platform   => \&_check_select_field,
-        resolution     => \&_check_resolution,
-        short_desc     => \&_check_short_desc,
-        status_whiteboard => \&_check_status_whiteboard,
-        target_milestone  => \&_check_target_milestone,
-        version           => \&_check_version,
-
-        cclist_accessible   => \&Bugzilla::Object::check_boolean,
-        reporter_accessible => \&Bugzilla::Object::check_boolean,
-    };
-
-    # Set up validators for custom fields.    
-    foreach my $field (Bugzilla->active_custom_fields) {
-        my $validator;
-        if ($field->type == FIELD_TYPE_SINGLE_SELECT) {
-            $validator = \&_check_select_field;
-        }
-        elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
-            $validator = \&_check_multi_select_field;
-        }
-        elsif ($field->type == FIELD_TYPE_DATETIME) {
-            $validator = \&_check_datetime_field;
-        }
-        elsif ($field->type == FIELD_TYPE_DATE) {
-            $validator = \&_check_date_field;
-        }
-        elsif ($field->type == FIELD_TYPE_FREETEXT) {
-            $validator = \&_check_freetext_field;
-        }
-        elsif ($field->type == FIELD_TYPE_BUG_ID) {
-            $validator = \&_check_bugid_field;
-        }
-        elsif ($field->type == FIELD_TYPE_TEXTAREA) {
-            $validator = \&_check_textarea_field;
-        }
-        elsif ($field->type == FIELD_TYPE_INTEGER) {
-            $validator = \&_check_integer_field;
-        }
-        else {
-            $validator = \&_check_default_field;
-        }
-        $validators->{$field->name} = $validator;
+  my $validators = {
+    alias             => \&_check_alias,
+    assigned_to       => \&_check_assigned_to,
+    blocked           => \&_check_dependencies,
+    bug_file_loc      => \&_check_bug_file_loc,
+    bug_severity      => \&_check_select_field,
+    bug_status        => \&_check_bug_status,
+    cc                => \&_check_cc,
+    comment           => \&_check_comment,
+    component         => \&_check_component,
+    creation_ts       => \&_check_creation_ts,
+    deadline          => \&_check_deadline,
+    dependson         => \&_check_dependencies,
+    dup_id            => \&_check_dup_id,
+    estimated_time    => \&_check_time_field,
+    everconfirmed     => \&Bugzilla::Object::check_boolean,
+    groups            => \&_check_groups,
+    keywords          => \&_check_keywords,
+    op_sys            => \&_check_select_field,
+    priority          => \&_check_priority,
+    product           => \&_check_product,
+    qa_contact        => \&_check_qa_contact,
+    remaining_time    => \&_check_time_field,
+    rep_platform      => \&_check_select_field,
+    resolution        => \&_check_resolution,
+    short_desc        => \&_check_short_desc,
+    status_whiteboard => \&_check_status_whiteboard,
+    target_milestone  => \&_check_target_milestone,
+    version           => \&_check_version,
+
+    cclist_accessible   => \&Bugzilla::Object::check_boolean,
+    reporter_accessible => \&Bugzilla::Object::check_boolean,
+  };
+
+  # Set up validators for custom fields.
+  foreach my $field (Bugzilla->active_custom_fields) {
+    my $validator;
+    if ($field->type == FIELD_TYPE_SINGLE_SELECT) {
+      $validator = \&_check_select_field;
+    }
+    elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
+      $validator = \&_check_multi_select_field;
+    }
+    elsif ($field->type == FIELD_TYPE_DATETIME) {
+      $validator = \&_check_datetime_field;
+    }
+    elsif ($field->type == FIELD_TYPE_DATE) {
+      $validator = \&_check_date_field;
+    }
+    elsif ($field->type == FIELD_TYPE_FREETEXT) {
+      $validator = \&_check_freetext_field;
+    }
+    elsif ($field->type == FIELD_TYPE_BUG_ID) {
+      $validator = \&_check_bugid_field;
+    }
+    elsif ($field->type == FIELD_TYPE_TEXTAREA) {
+      $validator = \&_check_textarea_field;
+    }
+    elsif ($field->type == FIELD_TYPE_INTEGER) {
+      $validator = \&_check_integer_field;
     }
+    else {
+      $validator = \&_check_default_field;
+    }
+    $validators->{$field->name} = $validator;
+  }
 
-    return $validators;
-};
+  return $validators;
+}
 
 sub VALIDATOR_DEPENDENCIES {
-    my $cache = Bugzilla->request_cache;
-    return $cache->{bug_validator_dependencies} 
-        if $cache->{bug_validator_dependencies};
-
-    my %deps = (
-        assigned_to      => ['component'],
-        blocked          => ['product'],
-        bug_status       => ['product', 'comment', 'target_milestone'],
-        cc               => ['component'],
-        comment          => ['creation_ts'],
-        component        => ['product'],
-        dependson        => ['product'],
-        dup_id           => ['bug_status', 'resolution'],
-        groups           => ['product'],
-        keywords         => ['product'],
-        resolution       => ['bug_status', 'dependson'],
-        qa_contact       => ['component'],
-        target_milestone => ['product'],
-        version          => ['product'],
-    );
-
-    foreach my $field (@{ Bugzilla->fields }) {
-        $deps{$field->name} = [ $field->visibility_field->name ]
-            if $field->{visibility_field_id};
-    }
-
-    $cache->{bug_validator_dependencies} = \%deps;
-    return \%deps;
-};
+  my $cache = Bugzilla->request_cache;
+  return $cache->{bug_validator_dependencies}
+    if $cache->{bug_validator_dependencies};
+
+  my %deps = (
+    alias            => ['product'],
+    assigned_to      => ['component'],
+    blocked          => ['product'],
+    bug_status       => ['product', 'comment', 'target_milestone'],
+    cc               => ['component'],
+    comment          => ['creation_ts'],
+    component        => ['product'],
+    dependson        => ['product'],
+    dup_id           => ['bug_status', 'resolution'],
+    groups           => ['product'],
+    keywords         => ['product'],
+    resolution       => ['bug_status', 'dependson'],
+    qa_contact       => ['component'],
+    target_milestone => ['product'],
+    version          => ['product'],
+  );
+
+  foreach my $field (@{Bugzilla->fields}) {
+    $deps{$field->name} = [$field->visibility_field->name]
+      if $field->{visibility_field_id};
+  }
+
+  $cache->{bug_validator_dependencies} = \%deps;
+  return \%deps;
+}
 
 sub UPDATE_COLUMNS {
-    my @custom = grep {$_->type != FIELD_TYPE_MULTI_SELECT}
-                      Bugzilla->active_custom_fields;
-    my @custom_names = map {$_->name} @custom;
-    my @columns = qw(
-        assigned_to
-        bug_file_loc
-        bug_severity
-        bug_status
-        cclist_accessible
-        component_id
-        deadline
-        estimated_time
-        everconfirmed
-        op_sys
-        priority
-        product_id
-        qa_contact
-        remaining_time
-        rep_platform
-        reporter_accessible
-        resolution
-        short_desc
-        status_whiteboard
-        target_milestone
-        version
-    );
-    push(@columns, @custom_names);
-    return @columns;
-};
-
-use constant NUMERIC_COLUMNS => qw(
+  my @custom
+    = grep { $_->type != FIELD_TYPE_MULTI_SELECT } Bugzilla->active_custom_fields;
+  my @custom_names = map { $_->name } @custom;
+  my @columns = qw(
+    assigned_to
+    bug_file_loc
+    bug_severity
+    bug_status
+    cclist_accessible
+    component_id
+    deadline
     estimated_time
+    everconfirmed
+    op_sys
+    priority
+    product_id
+    qa_contact
     remaining_time
+    rep_platform
+    reporter_accessible
+    resolution
+    short_desc
+    status_whiteboard
+    target_milestone
+    version
+  );
+  push(@columns, @custom_names);
+  return @columns;
+}
+
+use constant NUMERIC_COLUMNS => qw(
+  estimated_time
+  remaining_time
 );
 
 sub DATE_COLUMNS {
-    my @fields = (@{ Bugzilla->fields({ type => [FIELD_TYPE_DATETIME,
-                                                 FIELD_TYPE_DATE] })
-                   });
-    return map { $_->name } @fields;
+  my @fields
+    = (@{Bugzilla->fields({type => [FIELD_TYPE_DATETIME, FIELD_TYPE_DATE]})});
+  return map { $_->name } @fields;
 }
 
 # Used in LogActivityEntry(). Gives the max length of lines in the
@@ -254,30 +259,28 @@ use constant MAX_LINE_LENGTH => 254;
 # of Bugzilla. (These are the field names that the WebService and email_in.pl
 # use.)
 use constant FIELD_MAP => {
-    blocks           => 'blocked',
-    commentprivacy   => 'comment_is_private',
-    creation_time    => 'creation_ts',
-    creator          => 'reporter',
-    description      => 'comment',
-    depends_on       => 'dependson',
-    dupe_of          => 'dup_id',
-    id               => 'bug_id',
-    is_confirmed     => 'everconfirmed',
-    is_cc_accessible => 'cclist_accessible',
-    is_creator_accessible => 'reporter_accessible',
-    last_change_time => 'delta_ts',
-    platform         => 'rep_platform',
-    severity         => 'bug_severity',
-    status           => 'bug_status',
-    summary          => 'short_desc',
-    url              => 'bug_file_loc',
-    whiteboard       => 'status_whiteboard',
+  blocks                => 'blocked',
+  commentprivacy        => 'comment_is_private',
+  creation_time         => 'creation_ts',
+  creator               => 'reporter',
+  description           => 'comment',
+  depends_on            => 'dependson',
+  dupe_of               => 'dup_id',
+  id                    => 'bug_id',
+  is_confirmed          => 'everconfirmed',
+  is_cc_accessible      => 'cclist_accessible',
+  is_creator_accessible => 'reporter_accessible',
+  last_change_time      => 'delta_ts',
+  platform              => 'rep_platform',
+  severity              => 'bug_severity',
+  status                => 'bug_status',
+  summary               => 'short_desc',
+  url                   => 'bug_file_loc',
+  whiteboard            => 'status_whiteboard',
 };
 
-use constant REQUIRED_FIELD_MAP => {
-    product_id   => 'product',
-    component_id => 'component',
-};
+use constant REQUIRED_FIELD_MAP =>
+  {product_id => 'product', component_id => 'component',};
 
 # Creation timestamp is here because it needs to be validated
 # but it can be NULL in the database (see comments in create above)
@@ -295,349 +298,395 @@ use constant REQUIRED_FIELD_MAP => {
 #
 # Groups are in a separate table, but must always be validated so that
 # mandatory groups get set on bugs.
-use constant EXTRA_REQUIRED_FIELDS => qw(creation_ts target_milestone cc qa_contact groups);
+use constant EXTRA_REQUIRED_FIELDS =>
+  qw(creation_ts target_milestone cc qa_contact groups);
 
 #####################################################################
 
 sub new {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $param = shift;
-
-    # Remove leading "#" mark if we've just been passed an id.
-    if (!ref $param && $param =~ /^#(\d+)$/) {
-        $param = $1;
-    }
-
-    # If we get something that looks like a word (not a number),
-    # make it the "name" param.
-    if (!defined $param
-        || (!ref($param) && $param !~ /^\d+$/)
-        || (ref($param) && $param->{id} !~ /^\d+$/))
-    {
-        if ($param) {
-            my $alias = ref($param) ? $param->{id} : $param;
-            my $bug_id = bug_alias_to_id($alias);
-            if (! $bug_id) {
-                my $error_self = {};
-                bless $error_self, $class;
-                $error_self->{'bug_id'} = $alias;
-                $error_self->{'error'}  = 'InvalidBugId';
-                return $error_self;
-            }
-            $param = { id => $bug_id,
-                       cache => ref($param) ? $param->{cache} : 0 };
-        }
-        else {
-            # We got something that's not a number.
-            my $error_self = {};
-            bless $error_self, $class;
-            $error_self->{'bug_id'} = $param;
-            $error_self->{'error'}  = 'InvalidBugId';
-            return $error_self;
-        }
-    }
-
-    unshift @_, $param;
-    my $self = $class->SUPER::new(@_);
-
-    # Bugzilla::Bug->new always returns something, but sets $self->{error}
-    # if the bug wasn't found in the database.
-    if (!$self) {
+  my $invocant = shift;
+  my $class    = ref($invocant) || $invocant;
+  my $param    = shift;
+
+  # Let's not be abused by pseudo-numbers.
+  use re '/a';
+
+  # Remove leading "#" mark if we've just been passed an id.
+  if (!ref $param && $param =~ /^#(\d+)$/) {
+    $param = $1;
+  }
+
+  # If we get something that looks like a word (not a number),
+  # make it the "name" param.
+  if ( !defined $param
+    || (!ref($param) && $param !~ /^\d+$/)
+    || (ref($param)  && $param->{id} !~ /^\d+$/))
+  {
+    if ($param) {
+      my $alias = ref($param) ? $param->{id} : $param;
+      my $bug_id = bug_alias_to_id($alias);
+      if (!$bug_id) {
         my $error_self = {};
-        if (ref $param) {
-            $error_self->{bug_id} = $param->{name};
-            $error_self->{error}  = 'InvalidBugId';
-        }
-        else {
-            $error_self->{bug_id} = $param;
-            $error_self->{error}  = 'NotFound';
-        }
         bless $error_self, $class;
+        $error_self->{'bug_id'} = $alias;
+        $error_self->{'error'}  = 'InvalidBugId';
         return $error_self;
+      }
+      $param = {id => $bug_id, cache => ref($param) ? $param->{cache} : 0};
+    }
+    else {
+      # We got something that's not a number.
+      my $error_self = {};
+      bless $error_self, $class;
+      $error_self->{'bug_id'} = $param;
+      $error_self->{'error'}  = 'InvalidBugId';
+      return $error_self;
+    }
+  }
+
+  unshift @_, $param;
+  my $self = $class->SUPER::new(@_);
+
+  # Bugzilla::Bug->new always returns something, but sets $self->{error}
+  # if the bug wasn't found in the database.
+  if (!$self) {
+    my $error_self = {};
+    if (ref $param) {
+      $error_self->{bug_id} = $param->{name};
+      $error_self->{error}  = 'InvalidBugId';
+    }
+    else {
+      $error_self->{bug_id} = $param;
+      $error_self->{error}  = 'NotFound';
     }
+    bless $error_self, $class;
+    return $error_self;
+  }
 
-    return $self;
+  $CLEANUP{$self->id} = $self;
+  weaken($CLEANUP{$self->id});
+
+  return $self;
 }
 
 sub initialize {
-    $_[0]->_create_cf_accessors();
+  $_[0]->_create_cf_accessors();
 }
 
 sub object_cache_key {
-    my $class = shift;
-    my $key = $class->SUPER::object_cache_key(@_)
-      || return;
-    return $key . ',' . Bugzilla->user->id;
+  my $class = shift;
+  my $key = $class->SUPER::object_cache_key(@_) || return;
+  return $key . ',' . Bugzilla->user->id;
+}
+
+# This is called by Bugzilla::_cleanup() at the end of requests in a persistent environment
+# (such as mod_perl)
+sub CLEANUP {
+  foreach my $bug (values %CLEANUP) {
+
+    # $bug will be undef if there are no other references to it.
+    next unless $bug;
+    delete $bug->{depends_on_obj};
+    delete $bug->{blocks_obj};
+  }
+  %CLEANUP = ();
 }
 
 sub check {
-    my $class = shift;
-    my ($param, $field) = @_;
+  my $class = shift;
+  my ($param, $field) = @_;
 
-    # Bugzilla::Bug throws lots of special errors, so we don't call
-    # SUPER::check, we just call our new and do our own checks.
-    my $id = ref($param)
-        ? ($param->{id} = trim($param->{id}))
-        : ($param = trim($param));
-    ThrowUserError('improper_bug_id_field_value', { field => $field }) unless defined $id;
+  # Bugzilla::Bug throws lots of special errors, so we don't call
+  # SUPER::check, we just call our new and do our own checks.
+  my $id
+    = ref($param) ? ($param->{id} = trim($param->{id})) : ($param = trim($param));
+  ThrowUserError('improper_bug_id_field_value', {field => $field})
+    unless defined $id;
 
-    my $self = $class->new($param);
+  my $self = $class->new($param);
 
-    if ($self->{error}) {
-        # For error messages, use the id that was returned by new(), because
-        # it's cleaned up.
-        $id = $self->id;
+  if ($self->{error}) {
 
-        if ($self->{error} eq 'NotFound') {
-             ThrowUserError("bug_id_does_not_exist", { bug_id => $id });
-        }
-        if ($self->{error} eq 'InvalidBugId') {
-            ThrowUserError("improper_bug_id_field_value",
-                              { bug_id => $id,
-                                field  => $field });
-        }
-    }
+    # For error messages, use the id that was returned by new(), because
+    # it's cleaned up.
+    $id = $self->id;
 
-    unless ($field && $field =~ /^(dependson|blocked|dup_id)$/) {
-        $self->check_is_visible($id);
+    if ($self->{error} eq 'NotFound') {
+      ThrowUserError("bug_id_does_not_exist", {bug_id => $id});
     }
-    return $self;
+    if ($self->{error} eq 'InvalidBugId') {
+      ThrowUserError("improper_bug_id_field_value", {bug_id => $id, field => $field});
+    }
+  }
+
+  unless ($field && $field =~ /^(dependson|blocked|dup_id)$/) {
+    $self->check_is_visible($id);
+  }
+  return $self;
 }
 
 sub check_for_edit {
-    my $class = shift;
-    my $bug = $class->check(@_);
+  my $class = shift;
+  my $bug   = $class->check(@_);
 
-    Bugzilla->user->can_edit_product($bug->product_id)
-        || ThrowUserError("product_edit_denied", { product => $bug->product });
+  Bugzilla->user->can_edit_product($bug->product_id)
+    || ThrowUserError("product_edit_denied", {product => $bug->product});
 
-    return $bug;
+  return $bug;
 }
 
 sub check_is_visible {
-    my ($self, $input_id) = @_;
-    $input_id ||= $self->id;
-    my $user = Bugzilla->user;
-
-    if (!$user->can_see_bug($self->id)) {
-        # The error the user sees depends on whether or not they are
-        # logged in (i.e. $user->id contains the user's positive integer ID).
-        # If we are validating an alias, then use it in the error message
-        # instead of its corresponding bug ID, to not disclose it.
-        if ($user->id) {
-            ThrowUserError("bug_access_denied", { bug_id => $input_id });
-        } else {
-            ThrowUserError("bug_access_query", { bug_id => $input_id });
-        }
-    }
-}
+  my ($self, $input_id) = @_;
+  $input_id ||= $self->id;
+  my $user = Bugzilla->user;
 
-sub match {
-    my $class = shift;
-    my ($params) = @_;
-
-    # Allow matching certain fields by name (in addition to matching by ID).
-    my %translate_fields = (
-        assigned_to => 'Bugzilla::User',
-        qa_contact  => 'Bugzilla::User',
-        reporter    => 'Bugzilla::User',
-        product     => 'Bugzilla::Product',
-        component   => 'Bugzilla::Component',
-    );
-    my %translated;
-
-    foreach my $field (keys %translate_fields) {
-        my @ids;
-        # Convert names to ids. We use "exists" everywhere since people can
-        # legally specify "undef" to mean IS NULL (even though most of these
-        # fields can't be NULL, people can still specify it...).
-        if (exists $params->{$field}) {
-            my $names = $params->{$field};
-            my $type = $translate_fields{$field};
-            my $param = $type eq 'Bugzilla::User' ? 'login_name' : 'name';
-            # We call Bugzilla::Object::match directly to avoid the
-            # Bugzilla::User::match implementation which is different.
-            my $objects = Bugzilla::Object::match($type, { $param => $names });
-            push(@ids, map { $_->id } @$objects);
-        }
-        # You can also specify ids directly as arguments to this function,
-        # so include them in the list if they have been specified.
-        if (exists $params->{"${field}_id"}) {
-            my $current_ids = $params->{"${field}_id"};
-            my @id_array = ref $current_ids ? @$current_ids : ($current_ids);
-            push(@ids, @id_array);
-        }
-        # We do this "or" instead of a "scalar(@ids)" to handle the case
-        # when people passed only invalid object names. Otherwise we'd
-        # end up with a SUPER::match call with zero criteria (which dies).
-        if (exists $params->{$field} or exists $params->{"${field}_id"}) {
-            $translated{$field} = scalar(@ids) == 1 ? $ids[0] : \@ids;
-        }
-    }
+  if (!$user->can_see_bug($self->id)) {
 
-    # The user fields don't have an _id on the end of them in the database,
-    # but the product & component fields do, so we have to have separate
-    # code to deal with the different sets of fields here.
-    foreach my $field (qw(assigned_to qa_contact reporter)) {
-        delete $params->{"${field}_id"};
-        $params->{$field} = $translated{$field} 
-            if exists $translated{$field};
+    # The error the user sees depends on whether or not they are
+    # logged in (i.e. $user->id contains the user's positive integer ID).
+    # If we are validating an alias, then use it in the error message
+    # instead of its corresponding bug ID, to not disclose it.
+    if ($user->id) {
+      ThrowUserError("bug_access_denied", {bug_id => $input_id});
     }
-    foreach my $field (qw(product component)) {
-        delete $params->{$field};
-        $params->{"${field}_id"} = $translated{$field} 
-            if exists $translated{$field};
+    else {
+      ThrowUserError("bug_access_query", {bug_id => $input_id});
     }
+  }
+}
 
-    return $class->SUPER::match(@_);
+sub match {
+  my $class = shift;
+  my ($params) = @_;
+
+  # Allow matching certain fields by name (in addition to matching by ID).
+  my %translate_fields = (
+    assigned_to => 'Bugzilla::User',
+    qa_contact  => 'Bugzilla::User',
+    reporter    => 'Bugzilla::User',
+    product     => 'Bugzilla::Product',
+    component   => 'Bugzilla::Component',
+  );
+  my %translated;
+
+  foreach my $field (keys %translate_fields) {
+    my @ids;
+
+    # Convert names to ids. We use "exists" everywhere since people can
+    # legally specify "undef" to mean IS NULL (even though most of these
+    # fields can't be NULL, people can still specify it...).
+    if (exists $params->{$field}) {
+      my $names = $params->{$field};
+      my $type  = $translate_fields{$field};
+      my $param = $type eq 'Bugzilla::User' ? 'login_name' : 'name';
+
+      # We call Bugzilla::Object::match directly to avoid the
+      # Bugzilla::User::match implementation which is different.
+      my $objects = Bugzilla::Object::match($type, {$param => $names});
+      push(@ids, map { $_->id } @$objects);
+    }
+
+    # You can also specify ids directly as arguments to this function,
+    # so include them in the list if they have been specified.
+    if (exists $params->{"${field}_id"}) {
+      my $current_ids = $params->{"${field}_id"};
+      my @id_array = ref $current_ids ? @$current_ids : ($current_ids);
+      push(@ids, @id_array);
+    }
+
+    # We do this "or" instead of a "scalar(@ids)" to handle the case
+    # when people passed only invalid object names. Otherwise we'd
+    # end up with a SUPER::match call with zero criteria (which dies).
+    if (exists $params->{$field} or exists $params->{"${field}_id"}) {
+      $translated{$field} = scalar(@ids) == 1 ? $ids[0] : \@ids;
+    }
+  }
+
+  # The user fields don't have an _id on the end of them in the database,
+  # but the product & component fields do, so we have to have separate
+  # code to deal with the different sets of fields here.
+  foreach my $field (qw(assigned_to qa_contact reporter)) {
+    delete $params->{"${field}_id"};
+    $params->{$field} = $translated{$field} if exists $translated{$field};
+  }
+  foreach my $field (qw(product component)) {
+    delete $params->{$field};
+    $params->{"${field}_id"} = $translated{$field} if exists $translated{$field};
+  }
+
+  return $class->SUPER::match(@_);
 }
 
 # Helps load up information for bugs for show_bug.cgi and other situations
 # that will need to access info on lots of bugs.
 sub preload {
-    my ($class, $bugs) = @_;
-    my $user = Bugzilla->user;
-
-    # It would be faster but MUCH more complicated to select all the
-    # deps for the entire list in one SQL statement. If we ever have
-    # a profile that proves that that's necessary, we can switch over
-    # to the more complex method.
-    my @all_dep_ids;
-    foreach my $bug (@$bugs) {
-        push(@all_dep_ids, @{ $bug->blocked }, @{ $bug->dependson });
-        push(@all_dep_ids, @{ $bug->duplicate_ids });
-    }
-    @all_dep_ids = uniq @all_dep_ids;
-    # If we don't do this, can_see_bug will do one call per bug in
-    # the dependency and duplicate lists, in Bugzilla::Template::get_bug_link.
-    $user->visible_bugs(\@all_dep_ids);
-
-    foreach my $bug (@$bugs) {
-        $bug->_preload_referenced_bugs();
-    }
+  my ($class, $bugs) = @_;
+  my $user = Bugzilla->user;
+
+  # It would be faster but MUCH more complicated to select all the
+  # deps for the entire list in one SQL statement. If we ever have
+  # a profile that proves that that's necessary, we can switch over
+  # to the more complex method.
+  my @all_dep_ids;
+  foreach my $bug (@$bugs) {
+    push @all_dep_ids, @{$bug->blocked}, @{$bug->dependson};
+    push @all_dep_ids, @{$bug->duplicate_ids};
+    push @all_dep_ids, @{$bug->_preload_referenced_bugs};
+  }
+  @all_dep_ids = uniq @all_dep_ids;
+
+  # If we don't do this, can_see_bug will do one call per bug in
+  # the dependency and duplicate lists, in Bugzilla::Template::get_bug_link.
+  $user->visible_bugs(\@all_dep_ids);
 }
 
 # Helps load up bugs referenced in comments by retrieving them with a single
 # query from the database and injecting bug objects into the object-cache.
 sub _preload_referenced_bugs {
-    my $self = shift;
-    my @referenced_bug_ids;
-
-    # inject current duplicates into the object-cache first
-    foreach my $bug (@{ $self->duplicates }) {
-        $bug->object_cache_set()
-            unless Bugzilla::Bug->object_cache_get($bug->id);
-    }
-
-    # preload bugs from comments
-    require Bugzilla::Template;
-    foreach my $comment (@{ $self->comments }) {
-        if ($comment->type == CMT_HAS_DUPE || $comment->type == CMT_DUPE_OF) {
-            # duplicate bugs that aren't currently in $self->duplicates
-            push @referenced_bug_ids, $comment->extra_data
-                unless Bugzilla::Bug->object_cache_get($comment->extra_data);
-        }
-        else {
-            # bugs referenced in comments
-            Bugzilla::Template::quoteUrls($comment->body, undef, undef, undef,
-                sub {
-                    my $bug_id = $_[0];
-                    push @referenced_bug_ids, $bug_id
-                        unless Bugzilla::Bug->object_cache_get($bug_id);
-                });
-        }
-    }
+  my $self = shift;
 
-    # inject into object-cache
-    my $referenced_bugs = Bugzilla::Bug->new_from_list(
-        [ uniq @referenced_bug_ids ]);
-    foreach my $bug (@$referenced_bugs) {
-        $bug->object_cache_set();
-    }
+  # inject current duplicates into the object-cache first
+  foreach my $bug (@{$self->duplicates}) {
+    $bug->object_cache_set() unless Bugzilla::Bug->object_cache_get($bug->id);
+  }
+
+  # preload bugs from comments
+  my $referenced_bug_ids = _extract_bug_ids($self->comments);
+  my @ref_bug_ids
+    = grep { !Bugzilla::Bug->object_cache_get($_) } @$referenced_bug_ids;
+
+  # inject into object-cache
+  my $referenced_bugs = Bugzilla::Bug->new_from_list(\@ref_bug_ids);
+  $_->object_cache_set() foreach @$referenced_bugs;
 
-    # preload bug visibility
-    Bugzilla->user->visible_bugs(\@referenced_bug_ids);
+  return $referenced_bug_ids;
 }
 
-sub possible_duplicates {
-    my ($class, $params) = @_;
-    my $short_desc = $params->{summary};
-    my $products = $params->{products} || [];
-    my $limit = $params->{limit} || MAX_POSSIBLE_DUPLICATES;
-    $limit = MAX_POSSIBLE_DUPLICATES if $limit > MAX_POSSIBLE_DUPLICATES;
-    $products = [$products] if !ref($products) eq 'ARRAY';
-
-    my $orig_limit = $limit;
-    detaint_natural($limit) 
-        || ThrowCodeError('param_must_be_numeric', 
-                          { function => 'possible_duplicates',
-                            param    => $orig_limit });
+# Extract bug IDs mentioned in comments. This is much faster than calling quoteUrls().
+sub _extract_bug_ids {
+  my $comments = shift;
+  my @bug_ids;
 
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    my @words = split(/[\b\s]+/, $short_desc || '');
-    # Remove leading/trailing punctuation from words
-    foreach my $word (@words) {
-        $word =~ s/(?:^\W+|\W+$)//g;
-    }
-    # And make sure that each word is longer than 2 characters.
-    @words = grep { defined $_ and length($_) > 2 } @words;
+  # Let's not be abused by pseudo-numbers.
+  use re '/a';
 
-    return [] if !@words;
+  my $params   = Bugzilla->params;
+  my @urlbases = ($params->{'urlbase'});
+  push(@urlbases, $params->{'sslbase'}) if $params->{'sslbase'};
+  my $urlbase_re = '(?:' . join('|', map {qr/$_/} @urlbases) . ')';
+  my $bug_word   = template_var('terms')->{bug};
+  my $bugs_word  = template_var('terms')->{bugs};
 
-    my ($where_sql, $relevance_sql);
-    if ($dbh->FULLTEXT_OR) {
-        my $joined_terms = join($dbh->FULLTEXT_OR, @words);
-        ($where_sql, $relevance_sql) = 
-            $dbh->sql_fulltext_search('bugs_fulltext.short_desc', $joined_terms);
-        $relevance_sql ||= $where_sql;
+  foreach my $comment (@$comments) {
+    if ($comment->type == CMT_HAS_DUPE || $comment->type == CMT_DUPE_OF) {
+      push @bug_ids, $comment->extra_data;
+      next;
     }
-    else {
-        my (@where, @relevance);
-        foreach my $word (@words) {
-            my ($term, $rel_term) = $dbh->sql_fulltext_search(
-                'bugs_fulltext.short_desc', $word);
-            push(@where, $term);
-            push(@relevance, $rel_term || $term);
-        }
+    my $s = $comment->already_wrapped ? qr/\s/ : qr/\h/;
+    my $text = $comment->body;
 
-        $where_sql = join(' OR ', @where);
-        $relevance_sql = join(' + ', @relevance);
+    # Full bug links
+    push @bug_ids, $text =~ /\b$urlbase_re\Qshow_bug.cgi?id=\E(\d+)(?:\#c\d+)?/g;
+
+    # bug X
+    my $bug_re = qr/\Q$bug_word\E$s*\#?$s*(\d+)/i;
+    push @bug_ids, $text =~ /\b$bug_re/g;
+
+    # bugs X, Y, Z
+    my $bugs_re = qr/\Q$bugs_word\E$s*\#?$s*(\d+)(?:$s*,$s*\#?$s*(\d+))+/i;
+    push @bug_ids, $text =~ /\b$bugs_re/g;
+
+    # Old duplicate markers
+    push @bug_ids, $text
+      =~ /(?<=^\*\*\*\ This\ bug\ has\ been\ marked\ as\ a\ duplicate\ of\ )(\d+)(?=\ \*\*\*\Z)/;
+  }
+
+  # Make sure to filter invalid bug IDs.
+  @bug_ids = grep { $_ < MAX_INT_32 } @bug_ids;
+  return [uniq @bug_ids];
+}
+
+sub possible_duplicates {
+  my ($class, $params) = @_;
+  my $short_desc = $params->{summary};
+  my $products   = $params->{products} || [];
+  my $limit      = $params->{limit} || MAX_POSSIBLE_DUPLICATES;
+  $limit    = MAX_POSSIBLE_DUPLICATES if $limit > MAX_POSSIBLE_DUPLICATES;
+  $products = [$products]             if !ref($products) eq 'ARRAY';
+
+  my $orig_limit = $limit;
+  detaint_natural($limit)
+    || ThrowCodeError('param_must_be_numeric',
+    {function => 'possible_duplicates', param => $orig_limit});
+
+  my $dbh   = Bugzilla->dbh;
+  my $user  = Bugzilla->user;
+  my @words = split(/[\b\s]+/, $short_desc || '');
+
+  # Remove leading/trailing punctuation from words
+  foreach my $word (@words) {
+    $word =~ s/(?:^\W+|\W+$)//g;
+  }
+
+  # And make sure that each word is longer than 2 characters.
+  @words = grep { defined $_ and length($_) > 2 } @words;
+
+  return [] if !@words;
+
+  my ($where_sql, $relevance_sql);
+  if ($dbh->FULLTEXT_OR) {
+    my $joined_terms = join($dbh->FULLTEXT_OR, @words);
+    ($where_sql, $relevance_sql)
+      = $dbh->sql_fulltext_search('bugs_fulltext.short_desc', $joined_terms);
+    $relevance_sql ||= $where_sql;
+  }
+  else {
+    my (@where, @relevance);
+    foreach my $word (@words) {
+      my ($term, $rel_term)
+        = $dbh->sql_fulltext_search('bugs_fulltext.short_desc', $word);
+      push(@where, $term);
+      push(@relevance, $rel_term || $term);
     }
 
-    my $product_ids = join(',', map { $_->id } @$products);
-    my $product_sql = $product_ids ? "AND product_id IN ($product_ids)" : "";
+    $where_sql     = join(' OR ', @where);
+    $relevance_sql = join(' + ',  @relevance);
+  }
+
+  my $product_ids = join(',', map { $_->id } @$products);
+  my $product_sql = $product_ids ? "AND product_id IN ($product_ids)" : "";
 
-    # Because we collapse duplicates, we want to get slightly more bugs
-    # than were actually asked for.
-    my $sql_limit = $limit + 5;
+  # Because we collapse duplicates, we want to get slightly more bugs
+  # than were actually asked for.
+  my $sql_limit = $limit + 5;
 
-    my $possible_dupes = $dbh->selectall_arrayref(
-        "SELECT bugs.bug_id AS bug_id, bugs.resolution AS resolution,
+  my $possible_dupes = $dbh->selectall_arrayref(
+    "SELECT bugs.bug_id AS bug_id, bugs.resolution AS resolution,
                 ($relevance_sql) AS relevance
            FROM bugs
                 INNER JOIN bugs_fulltext ON bugs.bug_id = bugs_fulltext.bug_id
           WHERE ($where_sql) $product_sql
-       ORDER BY relevance DESC, bug_id DESC " .
-          $dbh->sql_limit($sql_limit), {Slice=>{}});
-
-    my @actual_dupe_ids;
-    # Resolve duplicates into their ultimate target duplicates.
-    foreach my $bug (@$possible_dupes) {
-        my $push_id = $bug->{bug_id};
-        if ($bug->{resolution} && $bug->{resolution} eq 'DUPLICATE') {
-            $push_id = _resolve_ultimate_dup_id($bug->{bug_id});
-        }
-        push(@actual_dupe_ids, $push_id);
-    }
-    @actual_dupe_ids = uniq @actual_dupe_ids;
-    if (scalar @actual_dupe_ids > $limit) {
-        @actual_dupe_ids = @actual_dupe_ids[0..($limit-1)];
+       ORDER BY relevance DESC, bug_id DESC " . $dbh->sql_limit($sql_limit),
+    {Slice => {}}
+  );
+
+  my @actual_dupe_ids;
+
+  # Resolve duplicates into their ultimate target duplicates.
+  foreach my $bug (@$possible_dupes) {
+    my $push_id = $bug->{bug_id};
+    if ($bug->{resolution} && $bug->{resolution} eq 'DUPLICATE') {
+      $push_id = _resolve_ultimate_dup_id($bug->{bug_id});
     }
+    push(@actual_dupe_ids, $push_id);
+  }
+  @actual_dupe_ids = uniq @actual_dupe_ids;
+  if (scalar @actual_dupe_ids > $limit) {
+    @actual_dupe_ids = @actual_dupe_ids[0 .. ($limit - 1)];
+  }
 
-    my $visible = $user->visible_bugs(\@actual_dupe_ids);
-    return $class->new_from_list($visible);
+  my $visible = $user->visible_bugs(\@actual_dupe_ids);
+  return $class->new_from_list($visible);
 }
 
 # Docs for create() (there's no POD in this file yet, but we very
@@ -669,595 +718,650 @@ sub possible_duplicates {
 #
 # C<assigned_to> - The full login name of the user who the bug is
 #                  initially assigned to.
-# C<qa_contact>  - The full login name of the QA Contact for this bug. 
+# C<qa_contact>  - The full login name of the QA Contact for this bug.
 #                  Will be ignored if C<useqacontact> is off.
 #
-# C<estimated_time> - For time-tracking. Will be ignored if 
+# C<estimated_time> - For time-tracking. Will be ignored if
 #                     C<timetrackinggroup> is not set, or if the current
 #                     user is not a member of the timetrackinggroup.
 # C<deadline>       - For time-tracking. Will be ignored for the same
 #                     reasons as C<estimated_time>.
+# C<flags>        - An array of flags that will be applied to the bug.
 sub create {
-    my ($class, $params) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-
-    # These fields have default values which we can use if they are undefined.
-    $params->{bug_severity} = Bugzilla->params->{defaultseverity}
-      unless defined $params->{bug_severity};
-    $params->{priority} = Bugzilla->params->{defaultpriority}
-      unless defined $params->{priority};
-    $params->{op_sys} = Bugzilla->params->{defaultopsys}
-      unless defined $params->{op_sys};
-    $params->{rep_platform} = Bugzilla->params->{defaultplatform}
-      unless defined $params->{rep_platform};
-    # Make sure a comment is always defined.
-    $params->{comment} = '' unless defined $params->{comment};
-    $params->{is_markdown} = 0
-      unless defined $params->{is_markdown} && $params->{is_markdown} eq '1';
-
-    $class->check_required_create_fields($params);
-    $params = $class->run_create_validators($params);
-
-    # These are not a fields in the bugs table, so we don't pass them to
-    # insert_create_data.
-    my $bug_aliases      = delete $params->{alias};
-    my $cc_ids           = delete $params->{cc};
-    my $groups           = delete $params->{groups};
-    my $depends_on       = delete $params->{dependson};
-    my $blocked          = delete $params->{blocked};
-    my $keywords         = delete $params->{keywords};
-    my $creation_comment = delete $params->{comment};
-    my $is_markdown      = delete $params->{is_markdown};
-    my $see_also         = delete $params->{see_also};
-
-    # We don't want the bug to appear in the system until it's correctly
-    # protected by groups.
-    my $timestamp = delete $params->{creation_ts}; 
-
-    my $ms_values = $class->_extract_multi_selects($params);
-    my $bug = $class->insert_create_data($params);
-
-    # Add the group restrictions
-    my $sth_group = $dbh->prepare(
-        'INSERT INTO bug_group_map (bug_id, group_id) VALUES (?, ?)');
-    foreach my $group (@$groups) {
-        $sth_group->execute($bug->bug_id, $group->id);
-    }
-
-    $dbh->do('UPDATE bugs SET creation_ts = ? WHERE bug_id = ?', undef,
-             $timestamp, $bug->bug_id);
-    # Update the bug instance as well
-    $bug->{creation_ts} = $timestamp;
-
-    # Add the CCs
-    my $sth_cc = $dbh->prepare('INSERT INTO cc (bug_id, who) VALUES (?,?)');
-    foreach my $user_id (@$cc_ids) {
-        $sth_cc->execute($bug->bug_id, $user_id);
-    }
-
-    # Add in keywords
-    my $sth_keyword = $dbh->prepare(
-        'INSERT INTO keywords (bug_id, keywordid) VALUES (?, ?)');
-    foreach my $keyword_id (map($_->id, @$keywords)) {
-        $sth_keyword->execute($bug->bug_id, $keyword_id);
-    }
-
-    # Set up dependencies (blocked/dependson)
-    my $sth_deps = $dbh->prepare(
-        'INSERT INTO dependencies (blocked, dependson) VALUES (?, ?)');
-    my $sth_bug_time = $dbh->prepare('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?');
-
-    foreach my $depends_on_id (@$depends_on) {
-        $sth_deps->execute($bug->bug_id, $depends_on_id);
-        # Log the reverse action on the other bug.
-        LogActivityEntry($depends_on_id, 'blocked', '', $bug->bug_id,
-                         $bug->{reporter_id}, $timestamp);
-        $sth_bug_time->execute($timestamp, $depends_on_id);
-    }
-    foreach my $blocked_id (@$blocked) {
-        $sth_deps->execute($blocked_id, $bug->bug_id);
-        # Log the reverse action on the other bug.
-        LogActivityEntry($blocked_id, 'dependson', '', $bug->bug_id,
-                         $bug->{reporter_id}, $timestamp);
-        $sth_bug_time->execute($timestamp, $blocked_id);
-    }
-
-    # Insert the values into the multiselect value tables
-    foreach my $field (keys %$ms_values) {
-        $dbh->do("DELETE FROM bug_$field where bug_id = ?",
-                undef, $bug->bug_id);
-        foreach my $value ( @{$ms_values->{$field}} ) {
-            $dbh->do("INSERT INTO bug_$field (bug_id, value) VALUES (?,?)",
-                    undef, $bug->bug_id, $value);
-        }
-    }
-
-    # Insert any see_also values
-    if ($see_also) {
-        my $see_also_array = $see_also;
-        if (!ref $see_also_array) {
-            $see_also = trim($see_also);
-            $see_also_array = [ split(/[\s,]+/, $see_also) ];
-        }
-        foreach my $value (@$see_also_array) {
-            $bug->add_see_also($value);
-        }
-        foreach my $see_also (@{ $bug->see_also }) {
-            $see_also->insert_create_data($see_also);
-        }
-        foreach my $ref_bug (@{ $bug->{_update_ref_bugs} || [] }) {
-            $ref_bug->update();
-        }
-        delete $bug->{_update_ref_bugs};
-    }
-
-    # Comment #0 handling...
-
-    # We now have a bug id so we can fill this out
-    $creation_comment->{'bug_id'} = $bug->id;
-    $creation_comment->{'is_markdown'} = $is_markdown;
-
-    # Insert the comment. We always insert a comment on bug creation,
-    # but sometimes it's blank.
-    Bugzilla::Comment->insert_create_data($creation_comment);
-
-    # Set up aliases
-    my $sth_aliases = $dbh->prepare('INSERT INTO bugs_aliases (alias, bug_id) VALUES (?, ?)');
-    foreach my $alias (@$bug_aliases) {
-        trick_taint($alias);
-        $sth_aliases->execute($alias, $bug->bug_id);
-    }
+  my ($class, $params) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+
+  # These fields have default values which we can use if they are undefined.
+  $params->{bug_severity} = Bugzilla->params->{defaultseverity}
+    unless defined $params->{bug_severity};
+  $params->{priority} = Bugzilla->params->{defaultpriority}
+    unless defined $params->{priority};
+  $params->{op_sys} = Bugzilla->params->{defaultopsys}
+    unless defined $params->{op_sys};
+  $params->{rep_platform} = Bugzilla->params->{defaultplatform}
+    unless defined $params->{rep_platform};
+
+  # Make sure a comment is always defined.
+  $params->{comment} = '' unless defined $params->{comment};
+  $params->{is_markdown} = 0
+    unless defined $params->{is_markdown} && $params->{is_markdown} eq '1';
+
+  $class->check_required_create_fields($params);
+  $params = $class->run_create_validators($params);
+
+  # These are not a fields in the bugs table, so we don't pass them to
+  # insert_create_data.
+  my $bug_aliases      = delete $params->{alias};
+  my $cc_ids           = delete $params->{cc};
+  my $groups           = delete $params->{groups};
+  my $depends_on       = delete $params->{dependson};
+  my $blocked          = delete $params->{blocked};
+  my $keywords         = delete $params->{keywords};
+  my $creation_comment = delete $params->{comment};
+  my $is_markdown      = delete $params->{is_markdown};
+  my $see_also         = delete $params->{see_also};
+  my $comment_tags     = delete $params->{comment_tags};
+  my $flags            = delete $params->{flags};
+
+  # We don't want the bug to appear in the system until it's correctly
+  # protected by groups.
+  my $timestamp = delete $params->{creation_ts};
+
+  my $ms_values = $class->_extract_multi_selects($params);
+  my $bug       = $class->insert_create_data($params);
+
+  # Add the group restrictions
+  my $sth_group
+    = $dbh->prepare('INSERT INTO bug_group_map (bug_id, group_id) VALUES (?, ?)');
+  foreach my $group (@$groups) {
+    $sth_group->execute($bug->bug_id, $group->id);
+  }
+
+  $dbh->do('UPDATE bugs SET creation_ts = ? WHERE bug_id = ?',
+    undef, $timestamp, $bug->bug_id);
+
+  # Update the bug instance as well
+  $bug->{creation_ts} = $timestamp;
+
+  # Add the CCs
+  my $sth_cc = $dbh->prepare('INSERT INTO cc (bug_id, who) VALUES (?,?)');
+  foreach my $user_id (@$cc_ids) {
+    $sth_cc->execute($bug->bug_id, $user_id);
+  }
+
+  # Add in keywords
+  my $sth_keyword
+    = $dbh->prepare('INSERT INTO keywords (bug_id, keywordid) VALUES (?, ?)');
+  foreach my $keyword_id (map($_->id, @$keywords)) {
+    $sth_keyword->execute($bug->bug_id, $keyword_id);
+  }
+
+  # Set up dependencies (blocked/dependson)
+  my $sth_deps = $dbh->prepare(
+    'INSERT INTO dependencies (blocked, dependson) VALUES (?, ?)');
+  my $sth_bug_time
+    = $dbh->prepare('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?');
+
+  foreach my $depends_on_id (@$depends_on) {
+    $sth_deps->execute($bug->bug_id, $depends_on_id);
+
+    # Log the reverse action on the other bug.
+    LogActivityEntry($depends_on_id, 'blocked', '', $bug->bug_id,
+      $bug->{reporter_id}, $timestamp);
+    $sth_bug_time->execute($timestamp, $depends_on_id);
+  }
+  foreach my $blocked_id (@$blocked) {
+    $sth_deps->execute($blocked_id, $bug->bug_id);
+
+    # Log the reverse action on the other bug.
+    LogActivityEntry($blocked_id, 'dependson', '', $bug->bug_id,
+      $bug->{reporter_id}, $timestamp);
+    $sth_bug_time->execute($timestamp, $blocked_id);
+  }
+
+  # Insert the values into the multiselect value tables
+  foreach my $field (keys %$ms_values) {
+    $dbh->do("DELETE FROM bug_$field where bug_id = ?", undef, $bug->bug_id);
+    foreach my $value (@{$ms_values->{$field}}) {
+      $dbh->do("INSERT INTO bug_$field (bug_id, value) VALUES (?,?)",
+        undef, $bug->bug_id, $value);
+    }
+  }
+
+  # Insert any see_also values
+  if ($see_also) {
+    my $see_also_array = $see_also;
+    if (!ref $see_also_array) {
+      $see_also = trim($see_also);
+      $see_also_array = [split(/[\s,]+/, $see_also)];
+    }
+    foreach my $value (@$see_also_array) {
+      $bug->add_see_also($value);
+    }
+    foreach my $see_also (@{$bug->see_also}) {
+      $see_also->insert_create_data($see_also);
+    }
+    foreach my $ref_bug (@{$bug->{_update_ref_bugs} || []}) {
+      $ref_bug->update();
+    }
+    delete $bug->{_update_ref_bugs};
+  }
+
+  # Apply any flags.
+  if (defined $flags) {
+    $bug->set_flags($flags);
+    foreach my $flag (@{$bug->flags}) {
+      Bugzilla::Flag->create($flag);
+    }
+    delete $bug->{flag_types}; # cause flag_types to be reloaded with newly created flags
+  }
+
+  # Comment #0 handling...
+
+  # We now have a bug id so we can fill this out
+  $creation_comment->{'bug_id'}      = $bug->id;
+  $creation_comment->{'is_markdown'} = $is_markdown;
+
+  # Insert the comment. We always insert a comment on bug creation,
+  # but sometimes it's blank.
+  my $comment = Bugzilla::Comment->insert_create_data($creation_comment);
+
+  # Add comment tags
+  if (defined $comment_tags && Bugzilla->user->can_tag_comments) {
+    $comment_tags = ref $comment_tags ? $comment_tags : [$comment_tags];
+    foreach my $tag (@{$comment_tags}) {
+      $comment->add_tag($tag) if defined $tag;
+    }
+    $comment->update();
+  }
+
+  # Set up aliases
+  my $sth_aliases
+    = $dbh->prepare('INSERT INTO bugs_aliases (alias, bug_id) VALUES (?, ?)');
+  foreach my $alias (@$bug_aliases) {
+    trick_taint($alias);
+    $sth_aliases->execute($alias, $bug->bug_id);
+  }
 
-    Bugzilla::Hook::process('bug_end_of_create', { bug => $bug,
-                                                   timestamp => $timestamp,
-                                                 });
+  Bugzilla::Hook::process('bug_end_of_create',
+    {bug => $bug, timestamp => $timestamp,});
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 
-    # Because MySQL doesn't support transactions on the fulltext table,
-    # we do this after we've committed the transaction. That way we're
-    # sure we're inserting a good Bug ID.
-    $bug->_sync_fulltext( new_bug => 1 );
+  # Because MySQL doesn't support transactions on the fulltext table,
+  # we do this after we've committed the transaction. That way we're
+  # sure we're inserting a good Bug ID.
+  $bug->_sync_fulltext(new_bug => 1);
 
-    return $bug;
+  return $bug;
 }
 
 sub run_create_validators {
-    my $class  = shift;
-    my $params = $class->SUPER::run_create_validators(@_);
+  my $class  = shift;
+  my $params = $class->SUPER::run_create_validators(@_);
 
-    # Add classification for checking mandatory fields which depend on it
-    $params->{classification} = $params->{product}->classification->name;
+  # Add classification for checking mandatory fields which depend on it
+  $params->{classification} = $params->{product}->classification->name;
 
-    my @mandatory_fields = @{ Bugzilla->fields({ is_mandatory => 1,
-                                                 enter_bug    => 1,
-                                                 obsolete     => 0 }) };
-    foreach my $field (@mandatory_fields) {
-        $class->_check_field_is_mandatory($params->{$field->name}, $field,
-                                          $params);
-    }
+  my @mandatory_fields
+    = @{Bugzilla->fields({is_mandatory => 1, enter_bug => 1, obsolete => 0})};
+  foreach my $field (@mandatory_fields) {
+    $class->_check_field_is_mandatory($params->{$field->name}, $field, $params);
+  }
 
-    my $product = delete $params->{product};
-    $params->{product_id} = $product->id;
-    my $component = delete $params->{component};
-    $params->{component_id} = $component->id;
+  my $product = delete $params->{product};
+  $params->{product_id} = $product->id;
+  my $component = delete $params->{component};
+  $params->{component_id} = $component->id;
 
-    # Callers cannot set reporter, creation_ts, or delta_ts.
-    $params->{reporter} = $class->_check_reporter();
-    $params->{delta_ts} = $params->{creation_ts};
+  # Callers cannot set reporter, creation_ts, or delta_ts.
+  $params->{reporter} = $class->_check_reporter();
+  $params->{delta_ts} = $params->{creation_ts};
 
-    if ($params->{estimated_time}) {
-        $params->{remaining_time} = $params->{estimated_time};
-    }
+  if ($params->{estimated_time}) {
+    $params->{remaining_time} = $params->{estimated_time};
+  }
 
-    $class->_check_strict_isolation($params->{cc}, $params->{assigned_to},
-                                    $params->{qa_contact}, $product);
+  $class->_check_strict_isolation($params->{cc}, $params->{assigned_to},
+    $params->{qa_contact}, $product);
 
-    # You can't set these fields.
-    delete $params->{lastdiffed};
-    delete $params->{bug_id};
-    delete $params->{classification};
+  # You can't set these fields.
+  delete $params->{lastdiffed};
+  delete $params->{bug_id};
+  delete $params->{classification};
 
-    Bugzilla::Hook::process('bug_end_of_create_validators',
-                            { params => $params });
+  Bugzilla::Hook::process('bug_end_of_create_validators', {params => $params});
 
-    # And this is not a valid DB field, it's just used as part of 
-    # _check_dependencies to avoid running it twice for both blocked 
-    # and dependson.
-    delete $params->{_dependencies_validated};
+  # And this is not a valid DB field, it's just used as part of
+  # _check_dependencies to avoid running it twice for both blocked
+  # and dependson.
+  delete $params->{_dependencies_validated};
 
-    return $params;
+  return $params;
 }
 
 sub update {
-    my $self = shift;
-    my $dbh  = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    # XXX This is just a temporary hack until all updating happens
-    # inside this function.
-    my $delta_ts = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-
-    $dbh->bz_start_transaction();
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
 
-    my ($changes, $old_bug) = $self->SUPER::update(@_);
+  # XXX This is just a temporary hack until all updating happens
+  # inside this function.
+  my $delta_ts = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
 
-    Bugzilla::Hook::process('bug_start_of_update',
-        { timestamp => $delta_ts, bug => $self,
-           old_bug => $old_bug, changes => $changes });
+  $dbh->bz_start_transaction();
 
-    # Certain items in $changes have to be fixed so that they hold
-    # a name instead of an ID.
-    foreach my $field (qw(product_id component_id)) {
-        my $change = delete $changes->{$field};
-        if ($change) {
-            my $new_field = $field;
-            $new_field =~ s/_id$//;
-            $changes->{$new_field} = 
-                [$self->{"_old_${new_field}_name"}, $self->$new_field];
-        }
-    }
-    foreach my $field (qw(qa_contact assigned_to)) {
-        if ($changes->{$field}) {
-            my ($from, $to) = @{ $changes->{$field} };
-            $from = $old_bug->$field->login if $from;
-            $to   = $self->$field->login    if $to;
-            $changes->{$field} = [$from, $to];
-        }
-    }
-
-    # CC
-    my @old_cc = map {$_->id} @{$old_bug->cc_users};
-    my @new_cc = map {$_->id} @{$self->cc_users};
-    my ($removed_cc, $added_cc) = diff_arrays(\@old_cc, \@new_cc);
-    
-    if (scalar @$removed_cc) {
-        $dbh->do('DELETE FROM cc WHERE bug_id = ? AND ' 
-                 . $dbh->sql_in('who', $removed_cc), undef, $self->id);
-    }
-    foreach my $user_id (@$added_cc) {
-        $dbh->do('INSERT INTO cc (bug_id, who) VALUES (?,?)',
-                 undef, $self->id, $user_id);
-    }
-    # If any changes were found, record it in the activity log
-    if (scalar @$removed_cc || scalar @$added_cc) {
-        my $removed_users = Bugzilla::User->new_from_list($removed_cc);
-        my $added_users   = Bugzilla::User->new_from_list($added_cc);
-        my $removed_names = join(', ', (map {$_->login} @$removed_users));
-        my $added_names   = join(', ', (map {$_->login} @$added_users));
-        $changes->{cc} = [$removed_names, $added_names];
-    }
-
-    # Aliases
-    my $old_aliases = $old_bug->alias;
-    my $new_aliases = $self->alias;
-    my ($removed_aliases, $added_aliases) = diff_arrays($old_aliases, $new_aliases);
-
-    foreach my $alias (@$removed_aliases) {
-        $dbh->do('DELETE FROM bugs_aliases WHERE bug_id = ? AND alias = ?',
-                 undef, $self->id, $alias);
-    }
-    foreach my $alias (@$added_aliases) {
-        trick_taint($alias);
-        $dbh->do('INSERT INTO bugs_aliases (bug_id, alias) VALUES (?,?)',
-                 undef, $self->id, $alias);
-    }
-    # If any changes were found, record it in the activity log
-    if (scalar @$removed_aliases || scalar @$added_aliases) {
-        $changes->{alias} = [join(', ', @$removed_aliases), join(', ', @$added_aliases)];
-    }
-
-    # Keywords
-    my @old_kw_ids = map { $_->id } @{$old_bug->keyword_objects};
-    my @new_kw_ids = map { $_->id } @{$self->keyword_objects};
-
-    my ($removed_kw, $added_kw) = diff_arrays(\@old_kw_ids, \@new_kw_ids);
-
-    if (scalar @$removed_kw) {
-        $dbh->do('DELETE FROM keywords WHERE bug_id = ? AND ' 
-                 . $dbh->sql_in('keywordid', $removed_kw), undef, $self->id);
-    }
-    foreach my $keyword_id (@$added_kw) {
-        $dbh->do('INSERT INTO keywords (bug_id, keywordid) VALUES (?,?)',
-                 undef, $self->id, $keyword_id);
-    }
-    # If any changes were found, record it in the activity log
-    if (scalar @$removed_kw || scalar @$added_kw) {
-        my $removed_keywords = Bugzilla::Keyword->new_from_list($removed_kw);
-        my $added_keywords   = Bugzilla::Keyword->new_from_list($added_kw);
-        my $removed_names = join(', ', (map {$_->name} @$removed_keywords));
-        my $added_names   = join(', ', (map {$_->name} @$added_keywords));
-        $changes->{keywords} = [$removed_names, $added_names];
-    }
-
-    # Dependencies
-    foreach my $pair ([qw(dependson blocked)], [qw(blocked dependson)]) {
-        my ($type, $other) = @$pair;
-        my $old = $old_bug->$type;
-        my $new = $self->$type;
-        
-        my ($removed, $added) = diff_arrays($old, $new);
-        foreach my $removed_id (@$removed) {
-            $dbh->do("DELETE FROM dependencies WHERE $type = ? AND $other = ?",
-                     undef, $removed_id, $self->id);
-            
-            # Add an activity entry for the other bug.
-            LogActivityEntry($removed_id, $other, $self->id, '',
-                             $user->id, $delta_ts);
-            # Update delta_ts on the other bug so that we trigger mid-airs.
-            $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
-                     undef, $delta_ts, $removed_id);
-        }
-        foreach my $added_id (@$added) {
-            $dbh->do("INSERT INTO dependencies ($type, $other) VALUES (?,?)",
-                     undef, $added_id, $self->id);
-            
-            # Add an activity entry for the other bug.
-            LogActivityEntry($added_id, $other, '', $self->id,
-                             $user->id, $delta_ts);
-            # Update delta_ts on the other bug so that we trigger mid-airs.
-            $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
-                     undef, $delta_ts, $added_id);
-        }
-        
-        if (scalar(@$removed) || scalar(@$added)) {
-            $changes->{$type} = [join(', ', @$removed), join(', ', @$added)];
-        }
-    }
-
-    # Groups
-    my %old_groups = map {$_->id => $_} @{$old_bug->groups_in};
-    my %new_groups = map {$_->id => $_} @{$self->groups_in};
-    my ($removed_gr, $added_gr) = diff_arrays([keys %old_groups],
-                                              [keys %new_groups]);
-    if (scalar @$removed_gr || scalar @$added_gr) {
-        if (@$removed_gr) {
-            my $qmarks = join(',', ('?') x @$removed_gr);
-            $dbh->do("DELETE FROM bug_group_map
-                       WHERE bug_id = ? AND group_id IN ($qmarks)", undef,
-                     $self->id, @$removed_gr);
-        }
-        my $sth_insert = $dbh->prepare(
-            'INSERT INTO bug_group_map (bug_id, group_id) VALUES (?,?)');
-        foreach my $gid (@$added_gr) {
-            $sth_insert->execute($self->id, $gid);
-        }
-        my @removed_names = map { $old_groups{$_}->name } @$removed_gr;
-        my @added_names   = map { $new_groups{$_}->name } @$added_gr;
-        $changes->{'bug_group'} = [join(', ', @removed_names),
-                                   join(', ', @added_names)];
-    }
-
-    # Comments
-    foreach my $comment (@{$self->{added_comments} || []}) {
-        # Override the Comment's timestamp to be identical to the update
-        # timestamp.
-        $comment->{bug_when} = $delta_ts;
-        $comment = Bugzilla::Comment->insert_create_data($comment);
-        if ($comment->work_time) {
-            LogActivityEntry($self->id, "work_time", "", $comment->work_time,
-                             $user->id, $delta_ts);
-        }
-    }
+  my ($changes, $old_bug) = $self->SUPER::update(@_);
 
-    # Comment Privacy 
-    foreach my $comment (@{$self->{comment_isprivate} || []}) {
-        $comment->update();
-        
-        my ($from, $to) 
-            = $comment->is_private ? (0, 1) : (1, 0);
-        LogActivityEntry($self->id, "longdescs.isprivate", $from, $to, 
-                         $user->id, $delta_ts, $comment->id);
-    }
-
-    # Clear the cache of comments
-    delete $self->{comments};
-
-    # Insert the values into the multiselect value tables
-    my @multi_selects = grep {$_->type == FIELD_TYPE_MULTI_SELECT}
-                             Bugzilla->active_custom_fields;
-    foreach my $field (@multi_selects) {
-        my $name = $field->name;
-        my ($removed, $added) = diff_arrays($old_bug->$name, $self->$name);
-        if (scalar @$removed || scalar @$added) {
-            $changes->{$name} = [join(', ', @$removed), join(', ', @$added)];
-
-            $dbh->do("DELETE FROM bug_$name where bug_id = ?",
-                     undef, $self->id);
-            foreach my $value (@{$self->$name}) {
-                $dbh->do("INSERT INTO bug_$name (bug_id, value) VALUES (?,?)",
-                         undef, $self->id, $value);
-            }
-        }
-    }
-
-    # See Also
-
-    my ($removed_see, $added_see) =
-        diff_arrays($old_bug->see_also, $self->see_also, 'name');
-
-    $_->remove_from_db foreach @$removed_see;
-    $_->insert_create_data($_) foreach @$added_see;
-
-    # If any changes were found, record it in the activity log
-    if (scalar @$removed_see || scalar @$added_see) {
-        $changes->{see_also} = [join(', ', map { $_->name } @$removed_see),
-                                join(', ', map { $_->name } @$added_see)];
-    }
-
-    # Flags
-    my ($removed, $added) = Bugzilla::Flag->update_flags($self, $old_bug, $delta_ts);
-    if ($removed || $added) {
-        $changes->{'flagtypes.name'} = [$removed, $added];
-    }
-
-    $_->update foreach @{ $self->{_update_ref_bugs} || [] };
-    delete $self->{_update_ref_bugs};
-
-    # Log bugs_activity items
-    # XXX Eventually, when bugs_activity is able to track the dupe_id,
-    # this code should go below the duplicates-table-updating code below.
-    foreach my $field (keys %$changes) {
-        my $change = $changes->{$field};
-        my $from = defined $change->[0] ? $change->[0] : '';
-        my $to   = defined $change->[1] ? $change->[1] : '';
-        LogActivityEntry($self->id, $field, $from, $to,
-                         $user->id, $delta_ts);
-    }
-
-    # Check if we have to update the duplicates table and the other bug.
-    my ($old_dup, $cur_dup) = ($old_bug->dup_id || 0, $self->dup_id || 0);
-    if ($old_dup != $cur_dup) {
-        $dbh->do("DELETE FROM duplicates WHERE dupe = ?", undef, $self->id);
-        if ($cur_dup) {
-            $dbh->do('INSERT INTO duplicates (dupe, dupe_of) VALUES (?,?)',
-                     undef, $self->id, $cur_dup);
-            if (my $update_dup = delete $self->{_dup_for_update}) {
-                $update_dup->update();
-            }
-        }
-
-        $changes->{'dup_id'} = [$old_dup || undef, $cur_dup || undef];
-    }
-
-    Bugzilla::Hook::process('bug_end_of_update', 
-        { bug => $self, timestamp => $delta_ts, changes => $changes,
-          old_bug => $old_bug });
-
-    # If any change occurred, refresh the timestamp of the bug.
-    if (scalar(keys %$changes) || $self->{added_comments}
-        || $self->{comment_isprivate})
+  Bugzilla::Hook::process(
+    'bug_start_of_update',
     {
-        $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
-                 undef, ($delta_ts, $self->id));
-        $self->{delta_ts} = $delta_ts;
-    }
-
-    # Update last-visited
-    if ($user->is_involved_in_bug($self)) {
-        $self->update_user_last_visit($user, $delta_ts);
-    }
-
-    # If a user is no longer involved, remove their last visit entry
-    my $last_visits =
-      Bugzilla::BugUserLastVisit->match({ bug_id => $self->id });
-    foreach my $lv (@$last_visits) {
-        $lv->remove_from_db() unless $lv->user->is_involved_in_bug($self);
-    }
-
-    # Update bug ignore data if user wants to ignore mail for this bug
-    if (exists $self->{'bug_ignored'}) {
-        my $bug_ignored_changed;
-        if ($self->{'bug_ignored'} && !$user->is_bug_ignored($self->id)) {
-            $dbh->do('INSERT INTO email_bug_ignore
-                      (user_id, bug_id) VALUES (?, ?)',
-                     undef, $user->id, $self->id);
-            $bug_ignored_changed = 1;
-
-        }
-        elsif (!$self->{'bug_ignored'} && $user->is_bug_ignored($self->id)) {
-            $dbh->do('DELETE FROM email_bug_ignore
-                      WHERE user_id = ? AND bug_id = ?',
-                     undef, $user->id, $self->id);
-            $bug_ignored_changed = 1;
-        }
-        delete $user->{bugs_ignored} if $bug_ignored_changed;
-    }
-
-    $dbh->bz_commit_transaction();
-
-    # The only problem with this here is that update() is often called
-    # in the middle of a transaction, and if that transaction is rolled
-    # back, this change will *not* be rolled back. As we expect rollbacks
-    # to be extremely rare, that is OK for us.
-    $self->_sync_fulltext(
-        update_short_desc => $changes->{short_desc},
-        update_comments   => $self->{added_comments} || $self->{comment_isprivate}
+      timestamp => $delta_ts,
+      bug       => $self,
+      old_bug   => $old_bug,
+      changes   => $changes
+    }
+  );
+
+  # Certain items in $changes have to be fixed so that they hold
+  # a name instead of an ID.
+  foreach my $field (qw(product_id component_id)) {
+    my $change = delete $changes->{$field};
+    if ($change) {
+      my $new_field = $field;
+      $new_field =~ s/_id$//;
+      $changes->{$new_field} = [$self->{"_old_${new_field}_name"}, $self->$new_field];
+    }
+  }
+  foreach my $field (qw(qa_contact assigned_to)) {
+    if ($changes->{$field}) {
+      my ($from, $to) = @{$changes->{$field}};
+      $from = $old_bug->$field->login if $from;
+      $to   = $self->$field->login    if $to;
+      $changes->{$field} = [$from, $to];
+    }
+  }
+
+  # CC
+  my @old_cc = map { $_->id } @{$old_bug->cc_users};
+  my @new_cc = map { $_->id } @{$self->cc_users};
+  my ($removed_cc, $added_cc) = diff_arrays(\@old_cc, \@new_cc);
+
+  if (scalar @$removed_cc) {
+    $dbh->do(
+      'DELETE FROM cc WHERE bug_id = ? AND ' . $dbh->sql_in('who', $removed_cc),
+      undef, $self->id);
+  }
+  foreach my $user_id (@$added_cc) {
+    $dbh->do('INSERT INTO cc (bug_id, who) VALUES (?,?)',
+      undef, $self->id, $user_id);
+  }
+
+  # If any changes were found, record it in the activity log
+  if (scalar @$removed_cc || scalar @$added_cc) {
+    my $removed_users = Bugzilla::User->new_from_list($removed_cc);
+    my $added_users   = Bugzilla::User->new_from_list($added_cc);
+    my $removed_names = join(', ', (map { $_->login } @$removed_users));
+    my $added_names   = join(', ', (map { $_->login } @$added_users));
+    $changes->{cc} = [$removed_names, $added_names];
+  }
+
+  # Aliases
+  my $old_aliases = $old_bug->alias;
+  my $new_aliases = $self->alias;
+  my ($removed_aliases, $added_aliases) = diff_arrays($old_aliases, $new_aliases);
+
+  foreach my $alias (@$removed_aliases) {
+    $dbh->do('DELETE FROM bugs_aliases WHERE bug_id = ? AND alias = ?',
+      undef, $self->id, $alias);
+  }
+  foreach my $alias (@$added_aliases) {
+    trick_taint($alias);
+    $dbh->do('INSERT INTO bugs_aliases (bug_id, alias) VALUES (?,?)',
+      undef, $self->id, $alias);
+  }
+
+  # If any changes were found, record it in the activity log
+  if (scalar @$removed_aliases || scalar @$added_aliases) {
+    $changes->{alias}
+      = [join(', ', @$removed_aliases), join(', ', @$added_aliases)];
+  }
+
+  # Keywords
+  my @old_kw_ids = map { $_->id } @{$old_bug->keyword_objects};
+  my @new_kw_ids = map { $_->id } @{$self->keyword_objects};
+
+  my ($removed_kw, $added_kw) = diff_arrays(\@old_kw_ids, \@new_kw_ids);
+
+  if (scalar @$removed_kw) {
+    $dbh->do(
+      'DELETE FROM keywords WHERE bug_id = ? AND '
+        . $dbh->sql_in('keywordid', $removed_kw),
+      undef, $self->id
     );
-
-    # Remove obsolete internal variables.
-    delete $self->{'_old_assigned_to'};
-    delete $self->{'_old_qa_contact'};
-
-    # Also flush the visible_bugs cache for this bug as the user's
-    # relationship with this bug may have changed.
-    delete $user->{_visible_bugs_cache}->{$self->id};
-
-    return $changes;
+  }
+  foreach my $keyword_id (@$added_kw) {
+    $dbh->do('INSERT INTO keywords (bug_id, keywordid) VALUES (?,?)',
+      undef, $self->id, $keyword_id);
+  }
+
+  # If any changes were found, record it in the activity log
+  if (scalar @$removed_kw || scalar @$added_kw) {
+    my $removed_keywords = Bugzilla::Keyword->new_from_list($removed_kw);
+    my $added_keywords   = Bugzilla::Keyword->new_from_list($added_kw);
+    my $removed_names    = join(', ', (map { $_->name } @$removed_keywords));
+    my $added_names      = join(', ', (map { $_->name } @$added_keywords));
+    $changes->{keywords} = [$removed_names, $added_names];
+  }
+
+  # Dependencies
+  foreach my $pair ([qw(dependson blocked)], [qw(blocked dependson)]) {
+    my ($type, $other) = @$pair;
+    my $old = $old_bug->$type;
+    my $new = $self->$type;
+
+    my ($removed, $added) = diff_arrays($old, $new);
+    foreach my $removed_id (@$removed) {
+      $dbh->do("DELETE FROM dependencies WHERE $type = ? AND $other = ?",
+        undef, $removed_id, $self->id);
+
+      # Add an activity entry for the other bug.
+      LogActivityEntry($removed_id, $other, $self->id, '', $user->id, $delta_ts);
+
+      # Update delta_ts on the other bug so that we trigger mid-airs.
+      $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
+        undef, $delta_ts, $removed_id);
+    }
+    foreach my $added_id (@$added) {
+      $dbh->do("INSERT INTO dependencies ($type, $other) VALUES (?,?)",
+        undef, $added_id, $self->id);
+
+      # Add an activity entry for the other bug.
+      LogActivityEntry($added_id, $other, '', $self->id, $user->id, $delta_ts);
+
+      # Update delta_ts on the other bug so that we trigger mid-airs.
+      $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
+        undef, $delta_ts, $added_id);
+    }
+
+    if (scalar(@$removed) || scalar(@$added)) {
+      $changes->{$type} = [join(', ', @$removed), join(', ', @$added)];
+    }
+  }
+
+  # Groups
+  my %old_groups = map { $_->id => $_ } @{$old_bug->groups_in};
+  my %new_groups = map { $_->id => $_ } @{$self->groups_in};
+  my ($removed_gr, $added_gr)
+    = diff_arrays([keys %old_groups], [keys %new_groups]);
+  if (scalar @$removed_gr || scalar @$added_gr) {
+    if (@$removed_gr) {
+      my $qmarks = join(',', ('?') x @$removed_gr);
+      $dbh->do(
+        "DELETE FROM bug_group_map
+                       WHERE bug_id = ? AND group_id IN ($qmarks)", undef, $self->id,
+        @$removed_gr
+      );
+    }
+    my $sth_insert
+      = $dbh->prepare('INSERT INTO bug_group_map (bug_id, group_id) VALUES (?,?)');
+    foreach my $gid (@$added_gr) {
+      $sth_insert->execute($self->id, $gid);
+    }
+    my @removed_names = map { $old_groups{$_}->name } @$removed_gr;
+    my @added_names   = map { $new_groups{$_}->name } @$added_gr;
+    $changes->{'bug_group'}
+      = [join(', ', @removed_names), join(', ', @added_names)];
+  }
+
+  # Comments and comment tags
+  foreach my $comment (@{$self->{added_comments} || []}) {
+
+    # Override the Comment's timestamp to be identical to the update
+    # timestamp.
+    $comment->{bug_when} = $delta_ts;
+    $comment = Bugzilla::Comment->insert_create_data($comment);
+    if ($comment->work_time) {
+      LogActivityEntry($self->id, "work_time", "", $comment->work_time, $user->id,
+        $delta_ts);
+    }
+    foreach my $tag (@{$self->{added_comment_tags} || []}) {
+      $comment->add_tag($tag) if defined $tag;
+    }
+    $comment->update() if @{$self->{added_comment_tags} || []};
+  }
+
+  # Comment Privacy
+  foreach my $comment (@{$self->{comment_isprivate} || []}) {
+    $comment->update();
+
+    my ($from, $to) = $comment->is_private ? (0, 1) : (1, 0);
+    LogActivityEntry($self->id, "longdescs.isprivate", $from, $to, $user->id,
+      $delta_ts, $comment->id);
+  }
+
+  # Clear the cache of comments
+  delete $self->{comments};
+
+  # Insert the values into the multiselect value tables
+  my @multi_selects
+    = grep { $_->type == FIELD_TYPE_MULTI_SELECT } Bugzilla->active_custom_fields;
+  foreach my $field (@multi_selects) {
+    my $name = $field->name;
+    my ($removed, $added) = diff_arrays($old_bug->$name, $self->$name);
+    if (scalar @$removed || scalar @$added) {
+      $changes->{$name} = [join(', ', @$removed), join(', ', @$added)];
+
+      $dbh->do("DELETE FROM bug_$name where bug_id = ?", undef, $self->id);
+      foreach my $value (@{$self->$name}) {
+        $dbh->do("INSERT INTO bug_$name (bug_id, value) VALUES (?,?)",
+          undef, $self->id, $value);
+      }
+    }
+  }
+
+  # See Also
+
+  my ($removed_see, $added_see)
+    = diff_arrays($old_bug->see_also, $self->see_also, 'name');
+
+  $_->remove_from_db foreach @$removed_see;
+  $_->insert_create_data($_) foreach @$added_see;
+
+  # If any changes were found, record it in the activity log
+  if (scalar @$removed_see || scalar @$added_see) {
+    $changes->{see_also} = [
+      join(', ', map { $_->name } @$removed_see),
+      join(', ', map { $_->name } @$added_see)
+    ];
+  }
+
+  # Flags
+  my ($removed, $added)
+    = Bugzilla::Flag->update_flags($self, $old_bug, $delta_ts);
+  if ($removed || $added) {
+    $changes->{'flagtypes.name'} = [$removed, $added];
+  }
+
+  $_->update foreach @{$self->{_update_ref_bugs} || []};
+  delete $self->{_update_ref_bugs};
+
+  # Log bugs_activity items
+  # XXX Eventually, when bugs_activity is able to track the dupe_id,
+  # this code should go below the duplicates-table-updating code below.
+  foreach my $field (keys %$changes) {
+    my $change = $changes->{$field};
+    my $from   = defined $change->[0] ? $change->[0] : '';
+    my $to     = defined $change->[1] ? $change->[1] : '';
+    LogActivityEntry($self->id, $field, $from, $to, $user->id, $delta_ts);
+  }
+
+  # Check if we have to update the duplicates table and the other bug.
+  my ($old_dup, $cur_dup) = ($old_bug->dup_id || 0, $self->dup_id || 0);
+  if ($old_dup != $cur_dup) {
+    $dbh->do("DELETE FROM duplicates WHERE dupe = ?", undef, $self->id);
+    if ($cur_dup) {
+      $dbh->do('INSERT INTO duplicates (dupe, dupe_of) VALUES (?,?)',
+        undef, $self->id, $cur_dup);
+      if (my $update_dup = delete $self->{_dup_for_update}) {
+        $update_dup->update();
+      }
+    }
+
+    $changes->{'dup_id'} = [$old_dup || undef, $cur_dup || undef];
+  }
+
+  Bugzilla::Hook::process(
+    'bug_end_of_update',
+    {
+      bug       => $self,
+      timestamp => $delta_ts,
+      changes   => $changes,
+      old_bug   => $old_bug
+    }
+  );
+
+  # If any change occurred, refresh the timestamp of the bug.
+  if ( scalar(keys %$changes)
+    || $self->{added_comments}
+    || $self->{comment_isprivate})
+  {
+    $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
+      undef, ($delta_ts, $self->id));
+    $self->{delta_ts} = $delta_ts;
+  }
+
+  # Update last-visited
+  if ($user->is_involved_in_bug($self)) {
+    $self->update_user_last_visit($user, $delta_ts);
+  }
+
+  # If a user is no longer involved, remove their last visit entry
+  my $last_visits = Bugzilla::BugUserLastVisit->match({bug_id => $self->id});
+  foreach my $lv (@$last_visits) {
+    $lv->remove_from_db() unless $lv->user->is_involved_in_bug($self);
+  }
+
+  # Update bug ignore data if user wants to ignore mail for this bug
+  if (exists $self->{'bug_ignored'}) {
+    my $bug_ignored_changed;
+    if ($self->{'bug_ignored'} && !$user->is_bug_ignored($self->id)) {
+      $dbh->do(
+        'INSERT INTO email_bug_ignore
+                      (user_id, bug_id) VALUES (?, ?)', undef, $user->id, $self->id
+      );
+      $bug_ignored_changed = 1;
+
+    }
+    elsif (!$self->{'bug_ignored'} && $user->is_bug_ignored($self->id)) {
+      $dbh->do(
+        'DELETE FROM email_bug_ignore
+                      WHERE user_id = ? AND bug_id = ?', undef, $user->id, $self->id
+      );
+      $bug_ignored_changed = 1;
+    }
+    delete $user->{bugs_ignored} if $bug_ignored_changed;
+  }
+
+  $dbh->bz_commit_transaction();
+
+  # The only problem with this here is that update() is often called
+  # in the middle of a transaction, and if that transaction is rolled
+  # back, this change will *not* be rolled back. As we expect rollbacks
+  # to be extremely rare, that is OK for us.
+  $self->_sync_fulltext(
+    update_short_desc => $changes->{short_desc},
+    update_comments   => $self->{added_comments} || $self->{comment_isprivate}
+  );
+
+  # Remove obsolete internal variables.
+  delete $self->{'_old_assigned_to'};
+  delete $self->{'_old_qa_contact'};
+
+  # Also flush the visible_bugs cache for this bug as the user's
+  # relationship with this bug may have changed.
+  delete $user->{_visible_bugs_cache}->{$self->id};
+
+  return $changes;
 }
 
 # Used by create().
 # We need to handle multi-select fields differently than normal fields,
 # because they're arrays and don't go into the bugs table.
 sub _extract_multi_selects {
-    my ($invocant, $params) = @_;
-
-    my @multi_selects = grep {$_->type == FIELD_TYPE_MULTI_SELECT}
-                             Bugzilla->active_custom_fields;
-    my %ms_values;
-    foreach my $field (@multi_selects) {
-        my $name = $field->name;
-        if (exists $params->{$name}) {
-            my $array = delete($params->{$name}) || [];
-            $ms_values{$name} = $array;
-        }
+  my ($invocant, $params) = @_;
+
+  my @multi_selects
+    = grep { $_->type == FIELD_TYPE_MULTI_SELECT } Bugzilla->active_custom_fields;
+  my %ms_values;
+  foreach my $field (@multi_selects) {
+    my $name = $field->name;
+    if (exists $params->{$name}) {
+      my $array = delete($params->{$name}) || [];
+      $ms_values{$name} = $array;
     }
-    return \%ms_values;
+  }
+  return \%ms_values;
 }
 
 # Should be called any time you update short_desc or change a comment.
 sub _sync_fulltext {
-    my ($self, %options) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my($all_comments, $public_comments);
-    if ($options{new_bug} || $options{update_comments}) {
-        my $comments = $dbh->selectall_arrayref(
-            'SELECT thetext, isprivate FROM longdescs WHERE bug_id = ?',
-            undef, $self->id);
-        $all_comments = join("\n", map { $_->[0] } @$comments);
-        my @no_private = grep { !$_->[1] } @$comments;
-        $public_comments = join("\n", map { $_->[0] } @no_private);
-    }
-
-    if ($options{new_bug}) {
-        $dbh->do('INSERT INTO bugs_fulltext (bug_id, short_desc, comments,
+  my ($self, %options) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my ($all_comments, $public_comments);
+  if ($options{new_bug} || $options{update_comments}) {
+    my $comments
+      = $dbh->selectall_arrayref(
+      'SELECT thetext, isprivate FROM longdescs WHERE bug_id = ?',
+      undef, $self->id);
+    $all_comments = join("\n", map { $_->[0] } @$comments);
+    my @no_private = grep { !$_->[1] } @$comments;
+    $public_comments = join("\n", map { $_->[0] } @no_private);
+  }
+
+  if ($options{new_bug}) {
+    $dbh->do(
+      'INSERT INTO bugs_fulltext (bug_id, short_desc, comments,
                                              comments_noprivate)
-                 VALUES (?, ?, ?, ?)',
-                 undef,
-                 $self->id, $self->short_desc, $all_comments, $public_comments);
-    } else {
-        my(@names, @values);
-        if ($options{update_short_desc}) {
-            push @names, 'short_desc';
-            push @values, $self->short_desc;
-        }
-        if ($options{update_comments}) {
-            push @names, ('comments', 'comments_noprivate');
-            push @values, ($all_comments, $public_comments);
-        }
-        if (@names) {
-            $dbh->do('UPDATE bugs_fulltext SET ' .
-                     join(', ', map { "$_ = ?" } @names) .
-                     ' WHERE bug_id = ?',
-                     undef,
-                     @values, $self->id);
-        }
+                 VALUES (?, ?, ?, ?)', undef, $self->id, $self->short_desc,
+      $all_comments, $public_comments
+    );
+  }
+  else {
+    my (@names, @values);
+    if ($options{update_short_desc}) {
+      push @names,  'short_desc';
+      push @values, $self->short_desc;
     }
+    if ($options{update_comments}) {
+      push @names, ('comments', 'comments_noprivate');
+      push @values, ($all_comments, $public_comments);
+    }
+    if (@names) {
+      $dbh->do(
+        'UPDATE bugs_fulltext SET '
+          . join(', ', map {"$_ = ?"} @names)
+          . ' WHERE bug_id = ?',
+        undef, @values, $self->id
+      );
+    }
+  }
 }
 
 sub remove_from_db {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  ThrowCodeError("bug_error", {bug => $self}) if $self->{'error'};
 
-    ThrowCodeError("bug_error", { bug => $self }) if $self->{'error'};
+  my $bug_id = $self->{'bug_id'};
+  $self->SUPER::remove_from_db();
 
-    my $bug_id = $self->{'bug_id'};
-    $self->SUPER::remove_from_db();
-    # The bugs_fulltext table doesn't support foreign keys.
-    $dbh->do("DELETE FROM bugs_fulltext WHERE bug_id = ?", undef, $bug_id);
+  # The bugs_fulltext table doesn't support foreign keys.
+  $dbh->do("DELETE FROM bugs_fulltext WHERE bug_id = ?", undef, $bug_id);
 }
 
 #####################################################################
@@ -1265,96 +1369,124 @@ sub remove_from_db {
 #####################################################################
 
 sub send_changes {
-    my ($self, $changes, $vars) = @_;
+  my ($self, $changes, $vars, $minor_update) = @_;
 
-    my $user = Bugzilla->user;
+  my $user = Bugzilla->user;
 
-    my $old_qa  = $changes->{'qa_contact'}  
-                  ? $changes->{'qa_contact'}->[0] : '';
-    my $old_own = $changes->{'assigned_to'} 
-                  ? $changes->{'assigned_to'}->[0] : '';
-    my $old_cc  = $changes->{cc}
-                  ? $changes->{cc}->[0] : '';
-
-    my %forced = (
-        cc        => [split(/[,;]+/, $old_cc)],
-        owner     => $old_own,
-        qacontact => $old_qa,
-        changer   => $user,
-    );
-
-    _send_bugmail({ id => $self->id, type => 'bug', forced => \%forced }, 
-                  $vars);
-
-    # If the bug was marked as a duplicate, we need to notify users on the
-    # other bug of any changes to that bug.
-    my $new_dup_id = $changes->{'dup_id'} ? $changes->{'dup_id'}->[1] : undef;
-    if ($new_dup_id) {
-        _send_bugmail({ forced => { changer => $user }, type => "dupe",
-                        id => $new_dup_id }, $vars);
-    }
-
-    # If there were changes in dependencies, we need to notify those
-    # dependencies.
-    if ($changes->{'bug_status'}) {
-        my ($old_status, $new_status) = @{ $changes->{'bug_status'} };
-
-        # If this bug has changed from opened to closed or vice-versa,
-        # then all of the bugs we block need to be notified.
-        if (is_open_state($old_status) ne is_open_state($new_status)) {
-            my $params = { forced   => { changer => $user },
-                           type     => 'dep',
-                           dep_only => 1,
-                           blocker  => $self,
-                           changes  => $changes };
-
-            foreach my $id (@{ $self->blocked }) {
-                $params->{id} = $id;
-                _send_bugmail($params, $vars);
-            }
-        }
-    }
+  my $old_qa  = $changes->{'qa_contact'}  ? $changes->{'qa_contact'}->[0]  : '';
+  my $old_own = $changes->{'assigned_to'} ? $changes->{'assigned_to'}->[0] : '';
+  my $old_cc  = $changes->{cc}            ? $changes->{cc}->[0]            : '';
 
-    # To get a list of all changed dependencies, convert the "changes" arrays
-    # into a long string, then collapse that string into unique numbers in
-    # a hash.
-    my $all_changed_deps = join(', ', @{ $changes->{'dependson'} || [] });
-    $all_changed_deps = join(', ', @{ $changes->{'blocked'} || [] },
-                                   $all_changed_deps);
-    my %changed_deps = map { $_ => 1 } split(', ', $all_changed_deps);
-    # When clearning one field (say, blocks) and filling in the other
-    # (say, dependson), an empty string can get into the hash and cause
-    # an error later.
-    delete $changed_deps{''};
+  my %forced = (
+    cc        => [split(/[,;]+/, $old_cc)],
+    owner     => $old_own,
+    qacontact => $old_qa,
+    changer   => $user,
+  );
 
-    foreach my $id (sort { $a <=> $b } (keys %changed_deps)) {
-        _send_bugmail({ forced => { changer => $user }, type => "dep",
-                         id => $id }, $vars);
-    }
-
-    # Sending emails for the referenced bugs.
-    foreach my $ref_bug_id (uniq @{ $self->{see_also_changes} || [] }) {
-        _send_bugmail({ forced => { changer => $user },
-                        id => $ref_bug_id }, $vars);
-    }
+  _send_bugmail(
+    {
+      id           => $self->id,
+      type         => 'bug',
+      forced       => \%forced,
+      minor_update => $minor_update
+    },
+    $vars
+  );
+
+  # If the bug was marked as a duplicate, we need to notify users on the
+  # other bug of any changes to that bug.
+  my $new_dup_id = $changes->{'dup_id'} ? $changes->{'dup_id'}->[1] : undef;
+  if ($new_dup_id) {
+    _send_bugmail(
+      {
+        forced       => {changer => $user},
+        type         => "dupe",
+        id           => $new_dup_id,
+        minor_update => $minor_update
+      },
+      $vars
+    );
+  }
+
+  # If there were changes in dependencies, we need to notify those
+  # dependencies.
+  if ($changes->{'bug_status'}) {
+    my ($old_status, $new_status) = @{$changes->{'bug_status'}};
+
+    # If this bug has changed from opened to closed or vice-versa,
+    # then all of the bugs we block need to be notified.
+    if (is_open_state($old_status) ne is_open_state($new_status)) {
+      my $params = {
+        forced       => {changer => $user},
+        type         => 'dep',
+        dep_only     => 1,
+        blocker      => $self,
+        changes      => $changes,
+        minor_update => $minor_update
+      };
+
+      foreach my $id (@{$self->blocked}) {
+        $params->{id} = $id;
+        _send_bugmail($params, $vars);
+      }
+    }
+  }
+
+  # To get a list of all changed dependencies, convert the "changes" arrays
+  # into a long string, then collapse that string into unique numbers in
+  # a hash.
+  my $all_changed_deps = join(', ', @{$changes->{'dependson'} || []});
+  $all_changed_deps
+    = join(', ', @{$changes->{'blocked'} || []}, $all_changed_deps);
+  my %changed_deps = map { $_ => 1 } split(', ', $all_changed_deps);
+
+  # When clearning one field (say, blocks) and filling in the other
+  # (say, dependson), an empty string can get into the hash and cause
+  # an error later.
+  delete $changed_deps{''};
+
+  foreach my $id (sort { $a <=> $b } (keys %changed_deps)) {
+    _send_bugmail(
+      {
+        forced       => {changer => $user},
+        type         => "dep",
+        id           => $id,
+        minor_update => $minor_update
+      },
+      $vars
+    );
+  }
+
+  # Sending emails for the referenced bugs.
+  foreach my $ref_bug_id (uniq @{$self->{see_also_changes} || []}) {
+    _send_bugmail(
+      {
+        forced       => {changer => $user},
+        id           => $ref_bug_id,
+        minor_update => $minor_update
+      },
+      $vars
+    );
+  }
 }
 
 sub _send_bugmail {
-    my ($params, $vars) = @_;
+  my ($params, $vars) = @_;
 
-    require Bugzilla::BugMail;
+  require Bugzilla::BugMail;
 
-    my $results = 
-        Bugzilla::BugMail::Send($params->{'id'}, $params->{'forced'}, $params);
+  my $results
+    = Bugzilla::BugMail::Send($params->{'id'}, $params->{'forced'}, $params);
 
-    if (Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
-        my $template = Bugzilla->template;
-        $vars->{$_} = $params->{$_} foreach keys %$params;
-        $vars->{'sent_bugmail'} = $results;
-        $template->process("bug/process/results.html.tmpl", $vars)
-            || ThrowTemplateError($template->error());
-        $vars->{'header_done'} = 1;
-    }
+  if (Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
+    my $template = Bugzilla->template;
+    $vars->{$_} = $params->{$_} foreach keys %$params;
+    $vars->{'sent_bugmail'} = $results;
+    $template->process("bug/process/results.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    $vars->{'header_done'} = 1;
+  }
 }
 
 #####################################################################
@@ -1362,928 +1494,961 @@ sub _send_bugmail {
 #####################################################################
 
 sub _check_alias {
-    my ($invocant, $aliases) = @_;
-    $aliases = ref $aliases ? $aliases : [split(/[\s,]+/, $aliases)];
+  my ($invocant, $aliases, undef, $params) = @_;
+  $aliases = ref $aliases ? $aliases : [split(/[\s,]+/, $aliases)];
 
-    # Remove empty aliases
-    @$aliases = grep { $_ } @$aliases;
+  # Remove empty aliases
+  @$aliases = grep {$_} @$aliases;
 
-    foreach my $alias (@$aliases) {
-        $alias = trim($alias);
+  my $product = blessed($invocant) ? $invocant->product_obj : $params->{product};
 
-        # Make sure the alias isn't too long.
-        if (length($alias) > 40) {
-            ThrowUserError("alias_too_long");
-        }
-        # Make sure the alias isn't just a number.
-        if ($alias =~ /^\d+$/) {
-            ThrowUserError("alias_is_numeric", { alias => $alias });
-        }
-        # Make sure the alias has no commas or spaces.
-        if ($alias =~ /[, ]/) {
-            ThrowUserError("alias_has_comma_or_space", { alias => $alias });
-        }
-        # Make sure the alias is unique, or that it's already our alias.
-        my $other_bug = new Bugzilla::Bug($alias);
-        if (!$other_bug->{error}
-            && (!ref $invocant || $other_bug->id != $invocant->id))
-        {
-            ThrowUserError("alias_in_use", { alias => $alias,
-                                             bug_id => $other_bug->id });
-        }
+  # You need editbugs to edit these fields
+  unless (Bugzilla->user->in_group('editbugs', $product->id)) {
+    if (scalar @$aliases) {
+      ThrowUserError('illegal_change',
+        {field => 'alias', action => 'set', privs => PRIVILEGES_REQUIRED_EMPOWERED});
     }
+  }
 
-    return $aliases;
-}
+  foreach my $alias (@$aliases) {
+    $alias = trim($alias);
 
-sub _check_assigned_to {
-    my ($invocant, $assignee, undef, $params) = @_;
-    my $user = Bugzilla->user;
-    my $component = blessed($invocant) ? $invocant->component_obj
-                                       : $params->{component};
-
-    # Default assignee is the component owner.
-    my $id;
-    # If this is a new bug, you can only set the assignee if you have editbugs.
-    # If you didn't specify the assignee, we use the default assignee.
-    if (!ref $invocant
-        && (!$user->in_group('editbugs', $component->product_id) || !$assignee))
+    # Make sure the alias isn't too long.
+    if (length($alias) > 40) {
+      ThrowUserError("alias_too_long");
+    }
+
+    # Make sure the alias isn't just a number.
+    if ($alias =~ /^\d+$/) {
+      ThrowUserError("alias_is_numeric", {alias => $alias});
+    }
+
+    # Make sure the alias has no commas or spaces.
+    if ($alias =~ /[, ]/) {
+      ThrowUserError("alias_has_comma_or_space", {alias => $alias});
+    }
+
+    # Make sure the alias is unique, or that it's already our alias.
+    my $other_bug = new Bugzilla::Bug($alias);
+    if (!$other_bug->{error} && (!ref $invocant || $other_bug->id != $invocant->id))
     {
-        $id = $component->default_assignee->id;
-    } else {
-        if (!ref $assignee) {
-            $assignee = trim($assignee);
-            # When updating a bug, assigned_to can't be empty.
-            ThrowUserError("reassign_to_empty") if ref $invocant && !$assignee;
-            $assignee = Bugzilla::User->check($assignee);
-        }
-        $id = $assignee->id;
-        # create() checks this another way, so we don't have to run this
-        # check during create().
-        $invocant->_check_strict_isolation_for_user($assignee) if ref $invocant;
+      ThrowUserError("alias_in_use", {alias => $alias, other_bug => $other_bug});
     }
-    return $id;
+  }
+
+  return $aliases;
+}
+
+sub _check_assigned_to {
+  my ($invocant, $assignee, undef, $params) = @_;
+  my $user = Bugzilla->user;
+  my $component
+    = blessed($invocant) ? $invocant->component_obj : $params->{component};
+
+  # Default assignee is the component owner.
+  my $id;
+
+  # If this is a new bug, you can only set the assignee if you have editbugs.
+  # If you didn't specify the assignee, we use the default assignee.
+  if (!ref $invocant
+    && (!$user->in_group('editbugs', $component->product_id) || !$assignee))
+  {
+    $id = $component->default_assignee->id;
+  }
+  else {
+    if (!ref $assignee) {
+      $assignee = trim($assignee);
+
+      # When updating a bug, assigned_to can't be empty.
+      ThrowUserError("reassign_to_empty") if ref $invocant && !$assignee;
+      $assignee = Bugzilla::User->check($assignee);
+    }
+    $id = $assignee->id;
+
+    # create() checks this another way, so we don't have to run this
+    # check during create().
+    $invocant->_check_strict_isolation_for_user($assignee) if ref $invocant;
+  }
+  return $id;
 }
 
 sub _check_bug_file_loc {
-    my ($invocant, $url) = @_;
-    $url = '' if !defined($url);
-    $url = trim($url);
-    # On bug entry, if bug_file_loc is "http://", the default, use an 
-    # empty value instead. However, on bug editing people can set that
-    # back if they *really* want to.
-    if (!ref $invocant && $url eq 'http://') {
-        $url = '';
-    }
-    return $url;
+  my ($invocant, $url) = @_;
+  $url = '' if !defined($url);
+  $url = trim($url);
+
+  # On bug entry, if bug_file_loc is "http://", the default, use an
+  # empty value instead. However, on bug editing people can set that
+  # back if they *really* want to.
+  if (!ref $invocant && $url eq 'http://') {
+    $url = '';
+  }
+  return $url;
 }
 
 sub _check_bug_status {
-    my ($invocant, $new_status, undef, $params) = @_;
-    my $user = Bugzilla->user;
-    my @valid_statuses;
-    my $old_status; # Note that this is undef for new bugs.
-
-    my ($product, $comment);
-    if (ref $invocant) {
-        @valid_statuses = @{$invocant->statuses_available};
-        $product = $invocant->product_obj;
-        $old_status = $invocant->status;
-        my $comments = $invocant->{added_comments} || [];
-        $comment = $comments->[-1];
-    }
-    else {
-        $product = $params->{product};
-        $comment = $params->{comment};
-        @valid_statuses = @{ Bugzilla::Bug->statuses_available($product) };
-    }
-
-    # Check permissions for users filing new bugs.
-    if (!ref $invocant) {
-        if ($user->in_group('editbugs', $product->id)
-            || $user->in_group('canconfirm', $product->id)) {
-            # If the user with privs hasn't selected another status,
-            # select the first one of the list.
-            unless ($new_status) {
-                if (scalar(@valid_statuses) == 1) {
-                    $new_status = $valid_statuses[0];
-                }
-                else {
-                    $new_status = ($valid_statuses[0]->name ne 'UNCONFIRMED') ?
-                                  $valid_statuses[0] : $valid_statuses[1];
-                }
-            }
+  my ($invocant, $new_status, undef, $params) = @_;
+  my $user = Bugzilla->user;
+  my @valid_statuses;
+  my $old_status;    # Note that this is undef for new bugs.
+
+  my ($product, $comment);
+  if (ref $invocant) {
+    @valid_statuses = @{$invocant->statuses_available};
+    $product        = $invocant->product_obj;
+    $old_status     = $invocant->status;
+    my $comments = $invocant->{added_comments} || [];
+    $comment = $comments->[-1];
+  }
+  else {
+    $product        = $params->{product};
+    $comment        = $params->{comment};
+    @valid_statuses = @{Bugzilla::Bug->statuses_available($product)};
+  }
+
+  # Check permissions for users filing new bugs.
+  if (!ref $invocant) {
+    if ( $user->in_group('editbugs', $product->id)
+      || $user->in_group('canconfirm', $product->id))
+    {
+      # If the user with privs hasn't selected another status,
+      # select the first one of the list.
+      unless ($new_status) {
+        if (scalar(@valid_statuses) == 1) {
+          $new_status = $valid_statuses[0];
         }
         else {
-            # A user with no privs cannot choose the initial status.
-            # If UNCONFIRMED is valid for this product, use it; else
-            # use the first bug status available.
-            if (grep {$_->name eq 'UNCONFIRMED'} @valid_statuses) {
-                $new_status = 'UNCONFIRMED';
-            }
-            else {
-                $new_status = $valid_statuses[0];
-            }
+          $new_status
+            = ($valid_statuses[0]->name ne 'UNCONFIRMED')
+            ? $valid_statuses[0]
+            : $valid_statuses[1];
         }
+      }
     }
+    else {
+      # A user with no privs cannot choose the initial status.
+      # If UNCONFIRMED is valid for this product, use it; else
+      # use the first bug status available.
+      if (grep { $_->name eq 'UNCONFIRMED' } @valid_statuses) {
+        $new_status = 'UNCONFIRMED';
+      }
+      else {
+        $new_status = $valid_statuses[0];
+      }
+    }
+  }
+
+  # Time to validate the bug status.
+  $new_status = Bugzilla::Status->check($new_status) unless ref($new_status);
+
+  # We skip this check if we are changing from a status to itself.
+  if ((!$old_status || $old_status->id != $new_status->id)
+    && !grep { $_->name eq $new_status->name } @valid_statuses)
+  {
+    ThrowUserError('illegal_bug_status_transition',
+      {old => $old_status, new => $new_status});
+  }
+
+  # Check if a comment is required for this change.
+  if ($new_status->comment_required_on_change_from($old_status)
+    && !$comment->{'thetext'})
+  {
+    ThrowUserError(
+      'comment_required',
+      {
+        old => $old_status ? $old_status->name : undef,
+        new => $new_status->name,
+        field => 'bug_status'
+      }
+    );
+  }
 
-    # Time to validate the bug status.
-    $new_status = Bugzilla::Status->check($new_status) unless ref($new_status);
-    # We skip this check if we are changing from a status to itself.
-    if ( (!$old_status || $old_status->id != $new_status->id)
-          && !grep {$_->name eq $new_status->name} @valid_statuses) 
-    {
-        ThrowUserError('illegal_bug_status_transition',
-                       { old => $old_status, new => $new_status });
-    }
-
-    # Check if a comment is required for this change.
-    if ($new_status->comment_required_on_change_from($old_status)
-        && !$comment->{'thetext'})
-    {
-        ThrowUserError('comment_required',
-          { old => $old_status ? $old_status->name : undef,
-            new => $new_status->name, field => 'bug_status' });
-    }
-    
-    if (ref $invocant 
-        && ($new_status->name eq 'IN_PROGRESS'
-            # Backwards-compat for the old default workflow.
-            or $new_status->name eq 'ASSIGNED')
-        && Bugzilla->params->{"usetargetmilestone"}
-        && Bugzilla->params->{"musthavemilestoneonaccept"}
-        # musthavemilestoneonaccept applies only if at least two
-        # target milestones are defined for the product.
-        && scalar(@{ $product->milestones }) > 1
-        && $invocant->target_milestone eq $product->default_milestone)
-    {
-        ThrowUserError("milestone_required", { bug => $invocant });
-    }
-
-    if (!blessed $invocant) {
-        $params->{everconfirmed} = $new_status->name eq 'UNCONFIRMED' ? 0 : 1;
-    }
+  if (!blessed $invocant) {
+    $params->{everconfirmed} = $new_status->name eq 'UNCONFIRMED' ? 0 : 1;
+  }
 
-    return $new_status->name;
+  return $new_status->name;
 }
 
 sub _check_cc {
-    my ($invocant, $ccs, undef, $params) = @_;
-    my $component = blessed($invocant) ? $invocant->component_obj
-                                       : $params->{component};
-    return [map {$_->id} @{$component->initial_cc}] unless $ccs;
+  my ($invocant, $ccs, undef, $params) = @_;
+  my $component
+    = blessed($invocant) ? $invocant->component_obj : $params->{component};
+  return [map { $_->id } @{$component->initial_cc}] unless $ccs;
 
-    # Allow comma-separated input as well as arrayrefs.
-    $ccs = [split(/[,;]+/, $ccs)] if !ref $ccs;
+  # Allow comma-separated input as well as arrayrefs.
+  $ccs = [split(/[,;]+/, $ccs)] if !ref $ccs;
 
-    my %cc_ids;
-    foreach my $person (@$ccs) {
-        $person = trim($person);
-        next unless $person;
-        my $id = login_to_id($person, THROW_ERROR);
-        $cc_ids{$id} = 1;
-    }
+  my %cc_ids;
+  foreach my $person (@$ccs) {
+    $person = trim($person);
+    next unless $person;
+    my $id = login_to_id($person, THROW_ERROR);
+    $cc_ids{$id} = 1;
+  }
 
-    # Enforce Default CC
-    $cc_ids{$_->id} = 1 foreach (@{$component->initial_cc});
+  # Enforce Default CC
+  $cc_ids{$_->id} = 1 foreach (@{$component->initial_cc});
 
-    return [keys %cc_ids];
+  return [keys %cc_ids];
 }
 
 sub _check_comment {
-    my ($invocant, $comment_txt, undef, $params) = @_;
+  my ($invocant, $comment_txt, undef, $params) = @_;
 
-    # Comment can be empty. We should force it to be empty if the text is undef
-    if (!defined $comment_txt) {
-        $comment_txt = '';
-    }
+  # Comment can be empty. We should force it to be empty if the text is undef
+  if (!defined $comment_txt) {
+    $comment_txt = '';
+  }
 
-    # Load up some data
-    my $isprivate = delete $params->{comment_is_private};
-    my $timestamp = $params->{creation_ts};
+  # Load up some data
+  my $isprivate = delete $params->{comment_is_private};
+  my $timestamp = $params->{creation_ts};
 
-    # Create the new comment so we can check it
-    my $comment = {
-        thetext  => $comment_txt,
-        bug_when => $timestamp,
-    };
+  # Create the new comment so we can check it
+  my $comment = {thetext => $comment_txt, bug_when => $timestamp,};
 
-    # We don't include the "isprivate" column unless it was specified. 
-    # This allows it to fall back to its database default.
-    if (defined $isprivate) {
-        $comment->{isprivate} = $isprivate;
-    }
+  # We don't include the "isprivate" column unless it was specified.
+  # This allows it to fall back to its database default.
+  if (defined $isprivate) {
+    $comment->{isprivate} = $isprivate;
+  }
 
-    # Validate comment. We have to do this special as a comment normally
-    # requires a bug to be already created. For a new bug, the first comment
-    # obviously can't get the bug if the bug is created after this
-    # (see bug 590334)
-    Bugzilla::Comment->check_required_create_fields($comment);
-    $comment = Bugzilla::Comment->run_create_validators($comment,
-                                                        { skip => ['bug_id'] }
-    );
+  # Validate comment. We have to do this special as a comment normally
+  # requires a bug to be already created. For a new bug, the first comment
+  # obviously can't get the bug if the bug is created after this
+  # (see bug 590334)
+  Bugzilla::Comment->check_required_create_fields($comment);
+  $comment
+    = Bugzilla::Comment->run_create_validators($comment, {skip => ['bug_id']});
 
-    return $comment; 
+  return $comment;
 }
 
 sub _check_commenton {
-    my ($invocant, $new_value, $field, $params) = @_;
+  my ($invocant, $new_value, $field, $params) = @_;
 
-    my $has_comment =
-        ref($invocant) ? $invocant->{added_comments}
-                       : (defined $params->{comment}
-                          and $params->{comment}->{thetext} ne '');
+  my $has_comment
+    = ref($invocant)
+    ? $invocant->{added_comments}
+    : (defined $params->{comment} and $params->{comment}->{thetext} ne '');
 
-    my $is_changing = ref($invocant) ? $invocant->$field ne $new_value
-                                     : $new_value ne '';
+  my $is_changing
+    = ref($invocant) ? $invocant->$field ne $new_value : $new_value ne '';
 
-    if ($is_changing && !$has_comment) {
-        my $old_value = ref($invocant) ? $invocant->$field : undef;
-        ThrowUserError('comment_required',
-            { field => $field, old => $old_value, new => $new_value });
-    }
+  if ($is_changing && !$has_comment) {
+    my $old_value = ref($invocant) ? $invocant->$field : undef;
+    ThrowUserError('comment_required',
+      {field => $field, old => $old_value, new => $new_value});
+  }
 }
 
 sub _check_component {
-    my ($invocant, $name, undef, $params) = @_;
-    $name = trim($name);
-    $name || ThrowUserError("require_component");
-    my $product = blessed($invocant) ? $invocant->product_obj 
-                                     : $params->{product};
-    my $old_comp = blessed($invocant) ? $invocant->component : '';
-    my $object = Bugzilla::Component->check({ product => $product, name => $name });
-    if ($object->name ne $old_comp && !$object->is_active) {
-        ThrowUserError('value_inactive', { class => ref($object), value => $name });
-    }
-    return $object;
+  my ($invocant, $name, undef, $params) = @_;
+  $name = trim($name);
+  $name || ThrowUserError("require_component");
+  my $product  = blessed($invocant) ? $invocant->product_obj : $params->{product};
+  my $old_comp = blessed($invocant) ? $invocant->component   : '';
+  my $object = Bugzilla::Component->check({product => $product, name => $name});
+  if ($object->name ne $old_comp && !$object->is_active) {
+    ThrowUserError('value_inactive', {class => ref($object), value => $name});
+  }
+  return $object;
 }
 
 sub _check_creation_ts {
-    return Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  return Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
 }
 
 sub _check_deadline {
-    my ($invocant, $date) = @_;
+  my ($invocant, $date) = @_;
 
-    # When filing bugs, we're forgiving and just return undef if
-    # the user isn't a timetracker. When updating bugs, check_can_change_field
-    # controls permissions, so we don't want to check them here.
-    if (!ref $invocant and !Bugzilla->user->is_timetracker) {
-        return undef;
-    }
+  # When filing bugs, we're forgiving and just return undef if
+  # the user isn't a timetracker. When updating bugs, check_can_change_field
+  # controls permissions, so we don't want to check them here.
+  if (!ref $invocant and !Bugzilla->user->is_timetracker) {
+    return undef;
+  }
 
-    # Validate entered deadline
-    $date = trim($date);
-    return undef if !$date;
-    validate_date($date)
-        || ThrowUserError('illegal_date', { date   => $date,
-                                            format => 'YYYY-MM-DD' });
-    return $date;
+  # Validate entered deadline
+  $date = trim($date);
+  return undef if !$date;
+  validate_date($date)
+    || ThrowUserError('illegal_date', {date => $date, format => 'YYYY-MM-DD'});
+  return $date;
 }
 
 # Takes two comma/space-separated strings and returns arrayrefs
 # of valid bug IDs.
 sub _check_dependencies {
-    my ($invocant, $value, $field, $params) = @_;
-
-    return $value if $params->{_dependencies_validated};
-
-    if (!ref $invocant) {
-        # Only editbugs users can set dependencies on bug entry.
-        return ([], []) unless Bugzilla->user->in_group(
-            'editbugs', $params->{product}->id);
-    }
-
-    # This is done this way so that dependson and blocked can be in
-    # VALIDATORS, meaning that they can be in VALIDATOR_DEPENDENCIES,
-    # which means that they can be checked in the right order during
-    # bug creation.
-    my $opposite = $field eq 'dependson' ? 'blocked' : 'dependson';
-    my %deps_in = ($field => $value || '',
-                   $opposite => $params->{$opposite} || '');
-
-    foreach my $type (qw(dependson blocked)) {
-        my @bug_ids = ref($deps_in{$type}) 
-            ? @{$deps_in{$type}} 
-            : split(/[\s,]+/, $deps_in{$type});
-        # Eliminate nulls.
-        @bug_ids = grep {$_} @bug_ids;
-
-        my @check_access = @bug_ids;
-        # When we're updating a bug, only added or removed bug_ids are 
-        # checked for whether or not we can see/edit those bugs.
-        if (ref $invocant) {
-            my $old = $invocant->$type;
-            my ($removed, $added) = diff_arrays($old, \@bug_ids);
-            @check_access = (@$added, @$removed);
-            
-            # Check field permissions if we've changed anything.
-            if (@check_access) {
-                my $privs;
-                if (!$invocant->check_can_change_field($type, 0, 1, \$privs)) {
-                    ThrowUserError('illegal_change', { field => $type,
-                                                       privs => $privs });
-                }
-            }
+  my ($invocant, $value, $field, $params) = @_;
+
+  return $value if $params->{_dependencies_validated};
+
+  if (!ref $invocant) {
+
+    # Only editbugs users can set dependencies on bug entry.
+    return ([], [])
+      unless Bugzilla->user->in_group('editbugs', $params->{product}->id);
+  }
+
+  # This is done this way so that dependson and blocked can be in
+  # VALIDATORS, meaning that they can be in VALIDATOR_DEPENDENCIES,
+  # which means that they can be checked in the right order during
+  # bug creation.
+  my $opposite = $field eq 'dependson' ? 'blocked' : 'dependson';
+  my %deps_in = ($field => $value || '', $opposite => $params->{$opposite} || '');
+
+  foreach my $type (qw(dependson blocked)) {
+    my @bug_ids
+      = ref($deps_in{$type})
+      ? @{$deps_in{$type}}
+      : split(/[\s,]+/, $deps_in{$type});
+
+    # Eliminate nulls.
+    @bug_ids = grep {$_} @bug_ids;
+
+    my @check_access = @bug_ids;
+
+    # When we're updating a bug, only added or removed bug_ids are
+    # checked for whether or not we can see/edit those bugs.
+    if (ref $invocant) {
+      my $old = $invocant->$type;
+      my ($removed, $added) = diff_arrays($old, \@bug_ids);
+      @check_access = (@$added, @$removed);
+
+      # Check field permissions if we've changed anything.
+      if (@check_access) {
+        my $privs;
+        if (!$invocant->check_can_change_field($type, 0, 1, \$privs)) {
+          ThrowUserError('illegal_change', {field => $type, privs => $privs});
         }
+      }
+    }
 
-        my $user = Bugzilla->user;
-        foreach my $modified_id (@check_access) {
-            my $delta_bug = $invocant->check($modified_id);
-            # Under strict isolation, you can't modify a bug if you can't
-            # edit it, even if you can see it.
-            if (Bugzilla->params->{"strict_isolation"}) {
-                if (!$user->can_edit_product($delta_bug->{'product_id'})) {
-                    ThrowUserError("illegal_change_deps", {field => $type});
-                }
-            }
+    my $user = Bugzilla->user;
+    foreach my $modified_id (@check_access) {
+      my $delta_bug = $invocant->check($modified_id);
+
+      # Under strict isolation, you can't modify a bug if you can't
+      # edit it, even if you can see it.
+      if (Bugzilla->params->{"strict_isolation"}) {
+        if (!$user->can_edit_product($delta_bug->{'product_id'})) {
+          ThrowUserError("illegal_change_deps", {field => $type});
         }
-        # Replace all aliases by their corresponding bug ID.
-        @bug_ids = map { $_ =~ /^(\d+)$/ ? $1 : $invocant->check($_, $type)->id } @bug_ids;
-        $deps_in{$type} = \@bug_ids;
+      }
     }
 
-    # And finally, check for dependency loops.
-    my $bug_id = ref($invocant) ? $invocant->id : 0;
-    my %deps = ValidateDependencies($deps_in{dependson}, $deps_in{blocked},
-                                    $bug_id);
+    # Replace all aliases by their corresponding bug ID.
+    @bug_ids
+      = map { $_ =~ /^(\d+)$/a ? $1 : $invocant->check($_, $type)->id } @bug_ids;
+    $deps_in{$type} = \@bug_ids;
+  }
+
+  # And finally, check for dependency loops.
+  my $bug_id = ref($invocant) ? $invocant->id : 0;
+  my %deps
+    = ValidateDependencies($deps_in{dependson}, $deps_in{blocked}, $bug_id);
 
-    $params->{$opposite} = $deps{$opposite};
-    $params->{_dependencies_validated} = 1;
-    return $deps{$field};
+  $params->{$opposite} = $deps{$opposite};
+  $params->{_dependencies_validated} = 1;
+  return $deps{$field};
 }
 
 sub _check_dup_id {
-    my ($self, $dupe_of) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self, $dupe_of) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # Store the bug ID/alias passed by the user for visibility checks.
+  my $orig_dupe_of = $dupe_of = trim($dupe_of);
+  $dupe_of || ThrowCodeError('undefined_field', {field => 'dup_id'});
+
+  # Validate the bug ID. The second argument will force check() to only
+  # make sure that the bug exists, and convert the alias to the bug ID
+  # if a string is passed. Group restrictions are checked below.
+  my $dupe_of_bug = $self->check($dupe_of, 'dup_id');
+  $dupe_of = $dupe_of_bug->id;
+
+  # If the dupe is unchanged, we have nothing more to check.
+  return $dupe_of if ($self->dup_id && $self->dup_id == $dupe_of);
+
+  # If we come here, then the duplicate is new. We have to make sure
+  # that we can view/change it (issue A on bug 96085).
+  $dupe_of_bug->check_is_visible($orig_dupe_of);
+
+  # Make sure a loop isn't created when marking this bug
+  # as duplicate.
+  _resolve_ultimate_dup_id($self->id, $dupe_of, 1);
+
+  my $cur_dup = $self->dup_id || 0;
+  if ( $cur_dup != $dupe_of
+    && Bugzilla->params->{'commentonduplicate'}
+    && !$self->{added_comments})
+  {
+    ThrowUserError('comment_required');
+  }
+
+  # Should we add the reporter to the CC list of the new bug?
+  # If they can see the bug...
+  if ($self->reporter->can_see_bug($dupe_of)) {
+
+    # We only add them if they're not the reporter of the other bug.
+    $self->{_add_dup_cc} = 1 if $dupe_of_bug->reporter->id != $self->reporter->id;
+  }
+
+  # What if the reporter currently can't see the new bug? In the browser
+  # interface, we prompt the user. In other interfaces, we default to
+  # not adding the user, as the safest option.
+  elsif (Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
+
+    # If we've already confirmed whether the user should be added...
+    my $cgi           = Bugzilla->cgi;
+    my $add_confirmed = $cgi->param('confirm_add_duplicate');
+    if (defined $add_confirmed) {
+      $self->{_add_dup_cc} = $add_confirmed;
+    }
+    else {
+      # Note that here we don't check if the user is already the reporter
+      # of the dupe_of bug, since we already checked if they can *see*
+      # the bug, above. People might have reporter_accessible turned
+      # off, but cclist_accessible turned on, so they might want to
+      # add the reporter even though they're already the reporter of the
+      # dup_of bug.
+      my $vars     = {};
+      my $template = Bugzilla->template;
 
-    # Store the bug ID/alias passed by the user for visibility checks.
-    my $orig_dupe_of = $dupe_of = trim($dupe_of);
-    $dupe_of || ThrowCodeError('undefined_field', { field => 'dup_id' });
-    # Validate the bug ID. The second argument will force check() to only
-    # make sure that the bug exists, and convert the alias to the bug ID
-    # if a string is passed. Group restrictions are checked below.
-    my $dupe_of_bug = $self->check($dupe_of, 'dup_id');
-    $dupe_of = $dupe_of_bug->id;
-
-    # If the dupe is unchanged, we have nothing more to check.
-    return $dupe_of if ($self->dup_id && $self->dup_id == $dupe_of);
-
-    # If we come here, then the duplicate is new. We have to make sure
-    # that we can view/change it (issue A on bug 96085).
-    $dupe_of_bug->check_is_visible($orig_dupe_of);
-
-    # Make sure a loop isn't created when marking this bug
-    # as duplicate.
-   _resolve_ultimate_dup_id($self->id, $dupe_of, 1);
-
-    my $cur_dup = $self->dup_id || 0;
-    if ($cur_dup != $dupe_of && Bugzilla->params->{'commentonduplicate'}
-        && !$self->{added_comments})
-    {
-        ThrowUserError('comment_required');
-    }
-
-    # Should we add the reporter to the CC list of the new bug?
-    # If they can see the bug...
-    if ($self->reporter->can_see_bug($dupe_of)) {
-        # We only add them if they're not the reporter of the other bug.
-        $self->{_add_dup_cc} = 1
-            if $dupe_of_bug->reporter->id != $self->reporter->id;
-    }
-    # What if the reporter currently can't see the new bug? In the browser 
-    # interface, we prompt the user. In other interfaces, we default to 
-    # not adding the user, as the safest option.
-    elsif (Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
-        # If we've already confirmed whether the user should be added...
-        my $cgi = Bugzilla->cgi;
-        my $add_confirmed = $cgi->param('confirm_add_duplicate');
-        if (defined $add_confirmed) {
-            $self->{_add_dup_cc} = $add_confirmed;
-        }
-        else {
-            # Note that here we don't check if the user is already the reporter
-            # of the dupe_of bug, since we already checked if they can *see*
-            # the bug, above. People might have reporter_accessible turned
-            # off, but cclist_accessible turned on, so they might want to
-            # add the reporter even though they're already the reporter of the
-            # dup_of bug.
-            my $vars = {};
-            my $template = Bugzilla->template;
-            # Ask the user what they want to do about the reporter.
-            $vars->{'cclist_accessible'} = $dupe_of_bug->cclist_accessible;
-            $vars->{'original_bug_id'} = $dupe_of;
-            $vars->{'duplicate_bug_id'} = $self->id;
-            print $cgi->header();
-            $template->process("bug/process/confirm-duplicate.html.tmpl", $vars)
-              || ThrowTemplateError($template->error());
-            exit;
-        }
+      # Ask the user what they want to do about the reporter.
+      $vars->{'cclist_accessible'} = $dupe_of_bug->cclist_accessible;
+      $vars->{'original_bug_id'}   = $dupe_of;
+      $vars->{'duplicate_bug_id'}  = $self->id;
+      print $cgi->header();
+      $template->process("bug/process/confirm-duplicate.html.tmpl", $vars)
+        || ThrowTemplateError($template->error());
+      exit;
     }
+  }
 
-    return $dupe_of;
+  return $dupe_of;
 }
 
 sub _check_groups {
-    my ($invocant, $group_names, undef, $params) = @_;
-
-    my $bug_id = blessed($invocant) ? $invocant->id : undef;
-    my $product = blessed($invocant) ? $invocant->product_obj 
-                                     : $params->{product};
-    my %add_groups;
-
-    # In email or WebServices, when the "groups" item actually 
-    # isn't specified, then just add the default groups.
-    if (!defined $group_names) {
-        my $available = $product->groups_available;
-        foreach my $group (@$available) {
-            $add_groups{$group->id} = $group if $group->{is_default};
-        }
+  my ($invocant, $group_names, undef, $params) = @_;
+
+  my $bug_id  = blessed($invocant) ? $invocant->id          : undef;
+  my $product = blessed($invocant) ? $invocant->product_obj : $params->{product};
+  my %add_groups;
+
+  # In email or WebServices, when the "groups" item actually
+  # isn't specified, then just add the default groups.
+  if (!defined $group_names) {
+    my $available = $product->groups_available;
+    foreach my $group (@$available) {
+      $add_groups{$group->id} = $group if $group->{is_default};
     }
-    else {
-        # Allow a comma-separated list, for email_in.pl.
-        $group_names = [map { trim($_) } split(',', $group_names)]
-            if !ref $group_names;
-
-        # First check all the groups they chose to set.
-        my %args = ( product => $product->name, bug_id => $bug_id, action => 'add' );
-        foreach my $name (@$group_names) {
-            my $group = Bugzilla::Group->check_no_disclose({ %args, name => $name });
-
-            if (!$product->group_is_settable($group)) {
-                ThrowUserError('group_restriction_not_allowed', { %args, name => $name });
-            }
-            $add_groups{$group->id} = $group;
-        }
+  }
+  else {
+    # Allow a comma-separated list, for email_in.pl.
+    $group_names = [map { trim($_) } split(',', $group_names)] if !ref $group_names;
+
+    # First check all the groups they chose to set.
+    my %args = (product => $product->name, bug_id => $bug_id, action => 'add');
+    foreach my $name (@$group_names) {
+      my $group = Bugzilla::Group->check_no_disclose({%args, name => $name});
+
+      if (!$product->group_is_settable($group)) {
+        ThrowUserError('group_restriction_not_allowed', {%args, name => $name});
+      }
+      $add_groups{$group->id} = $group;
     }
+  }
 
-    # Now enforce mandatory groups.
-    $add_groups{$_->id} = $_ foreach @{ $product->groups_mandatory };
+  # Now enforce mandatory groups.
+  $add_groups{$_->id} = $_ foreach @{$product->groups_mandatory};
 
-    my @add_groups = values %add_groups;
-    return \@add_groups;
+  my @add_groups = values %add_groups;
+  return \@add_groups;
 }
 
 sub _check_keywords {
-    my ($invocant, $keywords_in, undef, $params) = @_;
+  my ($invocant, $keywords_in, undef, $params) = @_;
 
-    return [] if !defined $keywords_in;
+  return [] if !defined $keywords_in;
 
-    my $keyword_array = $keywords_in;
-    if (!ref $keyword_array) {
-        $keywords_in = trim($keywords_in);
-        $keyword_array = [split(/[\s,]+/, $keywords_in)];
-    }
- 
-    my %keywords;
-    foreach my $keyword (@$keyword_array) {
-        next unless $keyword;
-        my $obj = Bugzilla::Keyword->check($keyword);
-        $keywords{$obj->id} = $obj;
-    }
-    return [values %keywords];
+  my $keyword_array = $keywords_in;
+  if (!ref $keyword_array) {
+    $keywords_in = trim($keywords_in);
+    $keyword_array = [split(/[\s,]+/, $keywords_in)];
+  }
+
+  my %keywords;
+  foreach my $keyword (@$keyword_array) {
+    next unless $keyword;
+    my $obj = Bugzilla::Keyword->check($keyword);
+    $keywords{$obj->id} = $obj;
+  }
+
+  my %old_kw_id;
+  if (blessed $invocant) {
+    my @old_keywords = @{$invocant->keyword_objects};
+    %old_kw_id = map { $_->id => 1 } @old_keywords;
+  }
+
+  foreach my $keyword (values %keywords) {
+    next if $keyword->is_active || exists $old_kw_id{$keyword->id};
+
+    ThrowUserError('value_inactive',
+      {value => $keyword->name, class => ref $keyword});
+  }
+
+  return [values %keywords];
 }
 
 sub _check_product {
-    my ($invocant, $name) = @_;
-    $name = trim($name);
-    # If we're updating the bug and they haven't changed the product,
-    # always allow it.
-    if (ref $invocant && lc($invocant->product_obj->name) eq lc($name)) {
-        return $invocant->product_obj;
-    }
-    # Check that the product exists and that the user
-    # is allowed to enter bugs into this product.
-    my $product = Bugzilla->user->can_enter_product($name, THROW_ERROR);
-    return $product;
+  my ($invocant, $name) = @_;
+  $name = trim($name);
+
+  # If we're updating the bug and they haven't changed the product,
+  # always allow it.
+  if (ref $invocant && lc($invocant->product_obj->name) eq lc($name)) {
+    return $invocant->product_obj;
+  }
+
+  # Check that the product exists and that the user
+  # is allowed to enter bugs into this product.
+  my $product = Bugzilla->user->can_enter_product($name, THROW_ERROR);
+  return $product;
 }
 
 sub _check_priority {
-    my ($invocant, $priority) = @_;
-    if (!ref $invocant && !Bugzilla->params->{'letsubmitterchoosepriority'}) {
-        $priority = Bugzilla->params->{'defaultpriority'};
-    }
-    return $invocant->_check_select_field($priority, 'priority');
+  my ($invocant, $priority) = @_;
+  if (!ref $invocant && !Bugzilla->params->{'letsubmitterchoosepriority'}) {
+    $priority = Bugzilla->params->{'defaultpriority'};
+  }
+  return $invocant->_check_select_field($priority, 'priority');
 }
 
 sub _check_qa_contact {
-    my ($invocant, $qa_contact, undef, $params) = @_;
-    $qa_contact = trim($qa_contact) if !ref $qa_contact;
-    my $component = blessed($invocant) ? $invocant->component_obj
-                                       : $params->{component};
-    if (!ref $invocant) {
-        # Bugs get no QA Contact on creation if useqacontact is off.
-        return undef if !Bugzilla->params->{useqacontact};
-        # Set the default QA Contact if one isn't specified or if the
-        # user doesn't have editbugs.
-        if (!Bugzilla->user->in_group('editbugs', $component->product_id)
-            || !$qa_contact)
-        {
-            return $component->default_qa_contact ? $component->default_qa_contact->id : undef;
-        }
+  my ($invocant, $qa_contact, undef, $params) = @_;
+  $qa_contact = trim($qa_contact) if !ref $qa_contact;
+  my $component
+    = blessed($invocant) ? $invocant->component_obj : $params->{component};
+  if (!ref $invocant) {
+
+    # Bugs get no QA Contact on creation if useqacontact is off.
+    return undef if !Bugzilla->params->{useqacontact};
+
+    # Set the default QA Contact if one isn't specified or if the
+    # user doesn't have editbugs.
+    if ( !Bugzilla->user->in_group('editbugs', $component->product_id)
+      || !$qa_contact)
+    {
+      return $component->default_qa_contact
+        ? $component->default_qa_contact->id
+        : undef;
     }
+  }
 
-    # If a QA Contact was specified or if we're updating, check
-    # the QA Contact for validity.
-    my $id;
-    if ($qa_contact) {
-        $qa_contact = Bugzilla::User->check($qa_contact) if !ref $qa_contact;
-        $id = $qa_contact->id;
-        # create() checks this another way, so we don't have to run this
-        # check during create().
-        # If there is no QA contact, this check is not required.
-        $invocant->_check_strict_isolation_for_user($qa_contact)
-            if (ref $invocant && $id);
-    }
+  # If a QA Contact was specified or if we're updating, check
+  # the QA Contact for validity.
+  my $id;
+  if ($qa_contact) {
+    $qa_contact = Bugzilla::User->check($qa_contact) if !ref $qa_contact;
+    $id = $qa_contact->id;
+
+    # create() checks this another way, so we don't have to run this
+    # check during create().
+    # If there is no QA contact, this check is not required.
+    $invocant->_check_strict_isolation_for_user($qa_contact)
+      if (ref $invocant && $id);
+  }
 
-    # "0" always means "undef", for QA Contact.
-    return $id || undef;
+  # "0" always means "undef", for QA Contact.
+  return $id || undef;
 }
 
 sub _check_reporter {
-    my $invocant = shift;
-    my $reporter;
-    if (ref $invocant) {
-        # You cannot change the reporter of a bug.
-        $reporter = $invocant->reporter->id;
-    }
-    else {
-        # On bug creation, the reporter is the logged in user
-        # (meaning that they must be logged in first!).
-        Bugzilla->login(LOGIN_REQUIRED);
-        $reporter = Bugzilla->user->id;
-    }
-    return $reporter;
+  my $invocant = shift;
+  my $reporter;
+  if (ref $invocant) {
+
+    # You cannot change the reporter of a bug.
+    $reporter = $invocant->reporter->id;
+  }
+  else {
+    # On bug creation, the reporter is the logged in user
+    # (meaning that they must be logged in first!).
+    Bugzilla->login(LOGIN_REQUIRED);
+    $reporter = Bugzilla->user->id;
+  }
+  return $reporter;
 }
 
 sub _check_resolution {
-    my ($invocant, $resolution, undef, $params) = @_;
-    $resolution = trim($resolution);
-    my $status = ref($invocant) ? $invocant->status->name 
-                                : $params->{bug_status};
-    my $is_open = ref($invocant) ? $invocant->status->is_open 
-                                 : is_open_state($status);
-    
-    # Throw a special error for resolving bugs without a resolution
-    # (or trying to change the resolution to '' on a closed bug without
-    # using clear_resolution).
-    ThrowUserError('missing_resolution', { status => $status })
-        if !$resolution && !$is_open;
-    
-    # Make sure this is a valid resolution.
-    $resolution = $invocant->_check_select_field($resolution, 'resolution');
-
-    # Don't allow open bugs to have resolutions.
-    ThrowUserError('resolution_not_allowed') if $is_open;
-    
-    # Check noresolveonopenblockers.
-    my $dependson = ref($invocant) ? $invocant->dependson
-                                   : ($params->{dependson} || []);
-    if (Bugzilla->params->{"noresolveonopenblockers"}
-        && $resolution eq 'FIXED'
-        && (!ref $invocant or !$invocant->resolution 
-            or $resolution ne $invocant->resolution)
-        && scalar @$dependson)
-    {
-        my $dep_bugs = Bugzilla::Bug->new_from_list($dependson);
-        my $count_open = grep { $_->isopened } @$dep_bugs;
-        if ($count_open) {
-            my $bug_id = ref($invocant) ? $invocant->id : undef;
-            ThrowUserError("still_unresolved_bugs",
-                           { bug_id => $bug_id, dep_count => $count_open });
-        }
-    }
-
-    # Check if they're changing the resolution and need to comment.
-    if (Bugzilla->params->{'commentonchange_resolution'}) {
-        $invocant->_check_commenton($resolution, 'resolution', $params);
-    }
-    
-    return $resolution;
+  my ($invocant, $resolution, undef, $params) = @_;
+  $resolution = trim($resolution);
+  my $status = ref($invocant) ? $invocant->status->name : $params->{bug_status};
+  my $is_open
+    = ref($invocant) ? $invocant->status->is_open : is_open_state($status);
+
+  # Throw a special error for resolving bugs without a resolution
+  # (or trying to change the resolution to '' on a closed bug without
+  # using clear_resolution).
+  ThrowUserError('missing_resolution', {status => $status})
+    if !$resolution && !$is_open;
+
+  # Make sure this is a valid resolution.
+  $resolution = $invocant->_check_select_field($resolution, 'resolution');
+
+  # Don't allow open bugs to have resolutions.
+  ThrowUserError('resolution_not_allowed') if $is_open;
+
+  # Check if resolution_forbidden_with_open_blockers.
+  my $dependson
+    = ref($invocant) ? $invocant->dependson : ($params->{dependson} || []);
+  if (
+       Bugzilla->params->{"resolution_forbidden_with_open_blockers"}
+    && $resolution eq Bugzilla->params->{"resolution_forbidden_with_open_blockers"}
+    && ( !ref $invocant
+      or !$invocant->resolution
+      or $resolution ne $invocant->resolution)
+    && scalar @$dependson
+    )
+  {
+    my $dep_bugs = Bugzilla::Bug->new_from_list($dependson);
+    my $count_open = grep { $_->isopened } @$dep_bugs;
+    if ($count_open) {
+      my $bug_id = ref($invocant) ? $invocant->id : undef;
+      ThrowUserError("still_unresolved_bugs",
+        {bug_id => $bug_id, dep_count => $count_open});
+    }
+  }
+
+  # Check if they're changing the resolution and need to comment.
+  if (Bugzilla->params->{'commentonchange_resolution'}) {
+    $invocant->_check_commenton($resolution, 'resolution', $params);
+  }
+
+  return $resolution;
 }
 
 sub _check_short_desc {
-    my ($invocant, $short_desc) = @_;
-    # Set the parameter to itself, but cleaned up
-    $short_desc = clean_text($short_desc) if $short_desc;
+  my ($invocant, $short_desc) = @_;
 
-    if (!defined $short_desc || $short_desc eq '') {
-        ThrowUserError("require_summary");
-    }
-    if (length($short_desc) > MAX_FREETEXT_LENGTH) {
-        ThrowUserError('freetext_too_long', 
-                       { field => 'short_desc', text => $short_desc });
-    }
-    return $short_desc;
+  # Set the parameter to itself, but cleaned up
+  $short_desc = clean_text($short_desc) if $short_desc;
+
+  if (!defined $short_desc || $short_desc eq '') {
+    ThrowUserError("require_summary");
+  }
+  if (length($short_desc) > MAX_FREETEXT_LENGTH) {
+    ThrowUserError('freetext_too_long',
+      {field => 'short_desc', text => $short_desc});
+  }
+  return $short_desc;
 }
 
 sub _check_status_whiteboard { return defined $_[1] ? $_[1] : ''; }
 
 # Unlike other checkers, this one doesn't return anything.
 sub _check_strict_isolation {
-    my ($invocant, $ccs, $assignee, $qa_contact, $product) = @_;
-    return unless Bugzilla->params->{'strict_isolation'};
-
-    if (ref $invocant) {
-        my $original = $invocant->new($invocant->id);
-
-        # We only check people if they've been added. This way, if
-        # strict_isolation is turned on when there are invalid users
-        # on bugs, people can still add comments and so on.
-        my @old_cc = map { $_->id } @{$original->cc_users};
-        my @new_cc = map { $_->id } @{$invocant->cc_users};
-        my ($removed, $added) = diff_arrays(\@old_cc, \@new_cc);
-        $ccs = Bugzilla::User->new_from_list($added);
-
-        $assignee = $invocant->assigned_to
-            if $invocant->assigned_to->id != $original->assigned_to->id;
-        if ($invocant->qa_contact
-            && (!$original->qa_contact
-                || $invocant->qa_contact->id != $original->qa_contact->id))
-        {
-            $qa_contact = $invocant->qa_contact;
-        }
-        $product = $invocant->product_obj;
+  my ($invocant, $ccs, $assignee, $qa_contact, $product) = @_;
+  return unless Bugzilla->params->{'strict_isolation'};
+
+  if (ref $invocant) {
+    my $original = $invocant->new($invocant->id);
+
+    # We only check people if they've been added. This way, if
+    # strict_isolation is turned on when there are invalid users
+    # on bugs, people can still add comments and so on.
+    my @old_cc = map { $_->id } @{$original->cc_users};
+    my @new_cc = map { $_->id } @{$invocant->cc_users};
+    my ($removed, $added) = diff_arrays(\@old_cc, \@new_cc);
+    $ccs = Bugzilla::User->new_from_list($added);
+
+    $assignee = $invocant->assigned_to
+      if $invocant->assigned_to->id != $original->assigned_to->id;
+    if (
+      $invocant->qa_contact
+      && (!$original->qa_contact
+        || $invocant->qa_contact->id != $original->qa_contact->id)
+      )
+    {
+      $qa_contact = $invocant->qa_contact;
     }
+    $product = $invocant->product_obj;
+  }
 
-    my @related_users = @$ccs;
-    push(@related_users, $assignee) if $assignee;
+  my @related_users = @$ccs;
+  push(@related_users, $assignee) if $assignee;
 
-    if (Bugzilla->params->{'useqacontact'} && $qa_contact) {
-        push(@related_users, $qa_contact);
-    }
+  if (Bugzilla->params->{'useqacontact'} && $qa_contact) {
+    push(@related_users, $qa_contact);
+  }
 
-    @related_users = @{Bugzilla::User->new_from_list(\@related_users)}
-        if !ref $invocant;
+  @related_users = @{Bugzilla::User->new_from_list(\@related_users)}
+    if !ref $invocant;
 
-    # For each unique user in @related_users...(assignee and qa_contact
-    # could be duplicates of users in the CC list)
-    my %unique_users = map {$_->id => $_} @related_users;
-    my @blocked_users;
-    foreach my $id (keys %unique_users) {
-        my $related_user = $unique_users{$id};
-        if (!$related_user->can_edit_product($product->id) ||
-            !$related_user->can_see_product($product->name)) {
-            push (@blocked_users, $related_user->login);
-        }
+  # For each unique user in @related_users...(assignee and qa_contact
+  # could be duplicates of users in the CC list)
+  my %unique_users = map { $_->id => $_ } @related_users;
+  my @blocked_users;
+  foreach my $id (keys %unique_users) {
+    my $related_user = $unique_users{$id};
+    if ( !$related_user->can_edit_product($product->id)
+      || !$related_user->can_see_product($product->name))
+    {
+      push(@blocked_users, $related_user->login);
     }
-    if (scalar(@blocked_users)) {
-        my %vars = ( users   => \@blocked_users,
-                     product => $product->name );
-        if (ref $invocant) {
-            $vars{'bug_id'} = $invocant->id;
-        }
-        else {
-            $vars{'new'} = 1;
-        }
-        ThrowUserError("invalid_user_group", \%vars);
+  }
+  if (scalar(@blocked_users)) {
+    my %vars = (users => \@blocked_users, product => $product->name);
+    if (ref $invocant) {
+      $vars{'bug_id'} = $invocant->id;
+    }
+    else {
+      $vars{'new'} = 1;
     }
+    ThrowUserError("invalid_user_group", \%vars);
+  }
 }
 
 # This is used by various set_ checkers, to make their code simpler.
 sub _check_strict_isolation_for_user {
-    my ($self, $user) = @_;
-    return unless Bugzilla->params->{"strict_isolation"};
-    if (!$user->can_edit_product($self->{product_id})) {
-        ThrowUserError('invalid_user_group',
-                       { users   => $user->login,
-                         product => $self->product,
-                         bug_id  => $self->id });
-    }
+  my ($self, $user) = @_;
+  return unless Bugzilla->params->{"strict_isolation"};
+  if (!$user->can_edit_product($self->{product_id})) {
+    ThrowUserError('invalid_user_group',
+      {users => $user->login, product => $self->product, bug_id => $self->id});
+  }
 }
 
 sub _check_tag_name {
-    my ($invocant, $tag) = @_;
+  my ($invocant, $tag) = @_;
+
+  $tag = clean_text($tag);
+  $tag || ThrowUserError('no_tag_to_edit');
+  ThrowUserError('tag_name_too_long') if length($tag) > MAX_LEN_QUERY_NAME;
+  trick_taint($tag);
 
-    $tag = clean_text($tag);
-    $tag || ThrowUserError('no_tag_to_edit');
-    ThrowUserError('tag_name_too_long') if length($tag) > MAX_LEN_QUERY_NAME;
-    trick_taint($tag);
-    # Tags are all lowercase.
-    return lc($tag);
+  # Tags are all lowercase.
+  return lc($tag);
 }
 
 sub _check_target_milestone {
-    my ($invocant, $target, undef, $params) = @_;
-    my $product = blessed($invocant) ? $invocant->product_obj 
-                                     : $params->{product};
-    my $old_target = blessed($invocant) ? $invocant->target_milestone : '';
-    $target = trim($target);
-    $target = $product->default_milestone if !defined $target;
-    my $object = Bugzilla::Milestone->check(
-        { product => $product, name => $target });
-    if ($old_target && $object->name ne $old_target && !$object->is_active) {
-        ThrowUserError('value_inactive', { class => ref($object),  value => $target });
-    }
-    return $object->name;
+  my ($invocant, $target, undef, $params) = @_;
+  my $product = blessed($invocant) ? $invocant->product_obj : $params->{product};
+  my $old_target = blessed($invocant) ? $invocant->target_milestone : '';
+  $target = trim($target);
+  $target = $product->default_milestone if !defined $target;
+  my $object = Bugzilla::Milestone->check({product => $product, name => $target});
+  if ($old_target && $object->name ne $old_target && !$object->is_active) {
+    ThrowUserError('value_inactive', {class => ref($object), value => $target});
+  }
+  return $object->name;
 }
 
 sub _check_time_field {
-    my ($invocant, $value, $field, $params) = @_;
+  my ($invocant, $value, $field, $params) = @_;
 
-    # When filing bugs, we're forgiving and just return 0 if
-    # the user isn't a timetracker. When updating bugs, check_can_change_field
-    # controls permissions, so we don't want to check them here.
-    if (!ref $invocant and !Bugzilla->user->is_timetracker) {
-        return 0;
-    }
+  # When filing bugs, we're forgiving and just return 0 if
+  # the user isn't a timetracker. When updating bugs, check_can_change_field
+  # controls permissions, so we don't want to check them here.
+  if (!ref $invocant and !Bugzilla->user->is_timetracker) {
+    return 0;
+  }
 
-    # check_time is in Bugzilla::Object.
-    return $invocant->check_time($value, $field, $params);
+  # check_time is in Bugzilla::Object.
+  return $invocant->check_time($value, $field, $params);
 }
 
 sub _check_version {
-    my ($invocant, $version, undef, $params) = @_;
-    $version = trim($version);
-    my $product = blessed($invocant) ? $invocant->product_obj 
-                                     : $params->{product};
-    my $old_vers = blessed($invocant) ? $invocant->version : '';
-    my $object = Bugzilla::Version->check({ product => $product, name => $version });
-    if ($object->name ne $old_vers && !$object->is_active) {
-        ThrowUserError('value_inactive', { class => ref($object), value => $version });
-    }
-    return $object->name;
+  my ($invocant, $version, undef, $params) = @_;
+  $version = trim($version);
+  my $product  = blessed($invocant) ? $invocant->product_obj : $params->{product};
+  my $old_vers = blessed($invocant) ? $invocant->version     : '';
+  my $object = Bugzilla::Version->check({product => $product, name => $version});
+  if ($object->name ne $old_vers && !$object->is_active) {
+    ThrowUserError('value_inactive', {class => ref($object), value => $version});
+  }
+  return $object->name;
 }
 
 # Custom Field Validators
 
 sub _check_field_is_mandatory {
-    my ($invocant, $value, $field, $params) = @_;
+  my ($invocant, $value, $field, $params) = @_;
 
-    if (!blessed($field)) {
-        $field = Bugzilla::Field->new({ name => $field });
-        return if !$field;
-    }
+  if (!blessed($field)) {
+    $field = Bugzilla::Field->new({name => $field});
+    return if !$field;
+  }
 
-    return if !$field->is_mandatory;
+  return if !$field->is_mandatory;
 
-    return if !$field->is_visible_on_bug($params || $invocant);
+  return if !$field->is_visible_on_bug($params || $invocant);
 
-    return if ($field->type == FIELD_TYPE_SINGLE_SELECT
-                 && scalar @{ get_legal_field_values($field->name) } == 1);
+  return
+    if ($field->type == FIELD_TYPE_SINGLE_SELECT
+    && scalar @{get_legal_field_values($field->name)} == 1);
 
-    return if ($field->type == FIELD_TYPE_MULTI_SELECT
-                 && !scalar @{ get_legal_field_values($field->name) });
+  return
+    if ($field->type == FIELD_TYPE_MULTI_SELECT
+    && !scalar @{get_legal_field_values($field->name)});
 
-    if (ref($value) eq 'ARRAY') {
-        $value = join('', @$value);
-    }
+  if (ref($value) eq 'ARRAY') {
+    $value = join('', @$value);
+  }
 
-    $value = trim($value);
-    if (!defined($value)
-        or $value eq ""
-        or ($value eq '---' and $field->type == FIELD_TYPE_SINGLE_SELECT)
-        or ($value =~ EMPTY_DATETIME_REGEX
-            and $field->type == FIELD_TYPE_DATETIME))
-    {
-        ThrowUserError('required_field', { field => $field });
-    }
+  $value = trim($value);
+  if ( !defined($value)
+    or $value eq ""
+    or ($value eq '---' and $field->type == FIELD_TYPE_SINGLE_SELECT)
+    or ($value =~ EMPTY_DATETIME_REGEX and $field->type == FIELD_TYPE_DATETIME))
+  {
+    ThrowUserError('required_field', {field => $field});
+  }
 }
 
 sub _check_date_field {
-    my ($invocant, $date) = @_;
-    return $invocant->_check_datetime_field($date, undef, {date_only => 1});
+  my ($invocant, $date) = @_;
+  return $invocant->_check_datetime_field($date, undef, {date_only => 1});
 }
 
 sub _check_datetime_field {
-    my ($invocant, $date_time, $field, $params) = @_;
-
-    # Empty datetimes are empty strings or strings only containing
-    # 0's, whitespace, and punctuation.
-    if ($date_time =~ /^[\s0[:punct:]]*$/) {
-        return undef;
-    }
-
-    $date_time = trim($date_time);
-    my ($date, $time) = split(' ', $date_time);
-    if ($date && !validate_date($date)) {
-        ThrowUserError('illegal_date', { date   => $date,
-                                         format => 'YYYY-MM-DD' });
-    }
-    if ($time && $params->{date_only}) {
-        ThrowUserError('illegal_date', { date   => $date_time,
-                                         format => 'YYYY-MM-DD' });
-    }
-    if ($time && !validate_time($time)) {
-        ThrowUserError('illegal_time', { 'time' => $time,
-                                         format => 'HH:MM:SS' });
-    }
-    return $date_time
+  my ($invocant, $date_time, $field, $params) = @_;
+
+  # Empty datetimes are empty strings or strings only containing
+  # 0's, whitespace, and punctuation.
+  if ($date_time =~ /^[\s0[:punct:]]*$/) {
+    return undef;
+  }
+
+  $date_time = trim($date_time);
+  my ($date, $time) = split(' ', $date_time);
+  if ($date && !validate_date($date)) {
+    ThrowUserError('illegal_date', {date => $date, format => 'YYYY-MM-DD'});
+  }
+  if ($time && $params->{date_only}) {
+    ThrowUserError('illegal_date', {date => $date_time, format => 'YYYY-MM-DD'});
+  }
+  if ($time && !validate_time($time)) {
+    ThrowUserError('illegal_time', {'time' => $time, format => 'HH:MM:SS'});
+  }
+  return $date_time;
 }
 
 sub _check_default_field { return defined $_[1] ? trim($_[1]) : ''; }
 
 sub _check_freetext_field {
-    my ($invocant, $text, $field) = @_;
+  my ($invocant, $text, $field) = @_;
 
-    $text = (defined $text) ? trim($text) : '';
-    if (length($text) > MAX_FREETEXT_LENGTH) {
-        ThrowUserError('freetext_too_long', 
-                       { field => $field, text => $text });
-    }
-    return $text;
+  $text = (defined $text) ? trim($text) : '';
+  if (length($text) > MAX_FREETEXT_LENGTH) {
+    ThrowUserError('freetext_too_long', {field => $field, text => $text});
+  }
+  return $text;
 }
 
 sub _check_multi_select_field {
-    my ($invocant, $values, $field) = @_;
+  my ($invocant, $values, $field) = @_;
 
-    # Allow users (mostly email_in.pl) to specify multi-selects as
-    # comma-separated values.
-    if (defined $values and !ref $values) {
-        # We don't split on spaces because multi-select values can and often
-        # do have spaces in them. (Theoretically they can have commas in them
-        # too, but that's much less common and people should be able to work
-        # around it pretty cleanly, if they want to use email_in.pl.)
-        $values = [split(',', $values)];
-    }
+  # Allow users (mostly email_in.pl) to specify multi-selects as
+  # comma-separated values.
+  if (defined $values and !ref $values) {
 
-    return [] if !$values;
-    my @checked_values;
-    foreach my $value (@$values) {
-        push(@checked_values, $invocant->_check_select_field($value, $field));
-    }
-    return \@checked_values;
+    # We don't split on spaces because multi-select values can and often
+    # do have spaces in them. (Theoretically they can have commas in them
+    # too, but that's much less common and people should be able to work
+    # around it pretty cleanly, if they want to use email_in.pl.)
+    $values = [split(',', $values)];
+  }
+
+  return [] if !$values;
+  my @checked_values;
+  foreach my $value (@$values) {
+    push(@checked_values, $invocant->_check_select_field($value, $field));
+  }
+  return \@checked_values;
 }
 
 sub _check_select_field {
-    my ($invocant, $value, $field) = @_;
-    my $object = Bugzilla::Field::Choice->type($field)->check($value);
-    return $object->name;
+  my ($invocant, $value, $field) = @_;
+  my $object = Bugzilla::Field::Choice->type($field)->check($value);
+  return $object->name;
 }
 
 sub _check_bugid_field {
-    my ($invocant, $value, $field) = @_;
-    return undef if !$value;
-    
-    # check that the value is a valid, visible bug id
-    my $checked_id = $invocant->check($value, $field)->id;
-    
-    # check for loop (can't have a loop if this is a new bug)
-    if (ref $invocant) {
-        _check_relationship_loop($field, $invocant->bug_id, $checked_id);
-    }
+  my ($invocant, $value, $field) = @_;
+  return undef if !$value;
+
+  # check that the value is a valid, visible bug id
+  my $checked_id = $invocant->check($value, $field)->id;
 
-    return $checked_id;
+  # check for loop (can't have a loop if this is a new bug)
+  if (ref $invocant) {
+    _check_relationship_loop($field, $invocant->bug_id, $checked_id);
+  }
+
+  return $checked_id;
 }
 
 sub _check_textarea_field {
-    my ($invocant, $text, $field) = @_;
+  my ($invocant, $text, $field) = @_;
 
-    $text = (defined $text) ? trim($text) : '';
+  $text = (defined $text) ? trim($text) : '';
 
-    # Web browsers submit newlines as \r\n.
-    # Sanitize all input to match the web standard.
-    # XMLRPC input could be either \n or \r\n
-    $text =~ s/\r?\n/\r\n/g;
+  # Web browsers submit newlines as \r\n.
+  # Sanitize all input to match the web standard.
+  # XMLRPC input could be either \n or \r\n
+  $text =~ s/\r?\n/\r\n/g;
 
-    return $text;
+  return $text;
 }
 
 sub _check_integer_field {
-    my ($invocant, $value, $field) = @_;
-    $value = defined($value) ? trim($value) : '';
+  my ($invocant, $value, $field) = @_;
+  $value = defined($value) ? trim($value) : '';
 
-    if ($value eq '') {
-        return 0;
-    }
+  if ($value eq '') {
+    return 0;
+  }
 
-    my $orig_value = $value;
-    if (!detaint_signed($value)) {
-        ThrowUserError("number_not_integer",
-                       {field => $field, num => $orig_value});
-    }
-    elsif ($value > MAX_INT_32) {
-        ThrowUserError("number_too_large",
-                       {field => $field, num => $orig_value, max_num => MAX_INT_32});
-    }
+  my $orig_value = $value;
+  if (!detaint_signed($value)) {
+    ThrowUserError("number_not_integer", {field => $field, num => $orig_value});
+  }
+  elsif (abs($value) > MAX_INT_32) {
+    ThrowUserError("number_too_large",
+      {field => $field, num => $orig_value, max_num => MAX_INT_32});
+  }
 
-    return $value;
+  return $value;
 }
 
 sub _check_relationship_loop {
-    # Generates a dependency tree for a given bug.  Calls itself recursively
-    # to generate sub-trees for the bug's dependencies.
-    my ($field, $bug_id, $dep_id, $ids) = @_;
-
-    # Don't do anything if this bug doesn't have any dependencies.
-    return unless defined($dep_id);
-
-    # Check whether we have seen this bug yet
-    $ids = {} unless defined $ids;
-    $ids->{$bug_id} = 1;
-    if ($ids->{$dep_id}) {
-        ThrowUserError("relationship_loop_single", {
-            'bug_id' => $bug_id,
-            'dep_id' => $dep_id,
-            'field_name' => $field});
-    }
-    
-    # Get this dependency's record from the database
-    my $dbh = Bugzilla->dbh;
-    my $next_dep_id = $dbh->selectrow_array(
-        "SELECT $field FROM bugs WHERE bug_id = ?", undef, $dep_id);
 
-    _check_relationship_loop($field, $dep_id, $next_dep_id, $ids);
+  # Generates a dependency tree for a given bug.  Calls itself recursively
+  # to generate sub-trees for the bug's dependencies.
+  my ($field, $bug_id, $dep_id, $ids) = @_;
+
+  # Don't do anything if this bug doesn't have any dependencies.
+  return unless defined($dep_id);
+
+  # Check whether we have seen this bug yet
+  $ids = {} unless defined $ids;
+  $ids->{$bug_id} = 1;
+  if ($ids->{$dep_id}) {
+    ThrowUserError("relationship_loop_single",
+      {'bug_id' => $bug_id, 'dep_id' => $dep_id, 'field_name' => $field});
+  }
+
+  # Get this dependency's record from the database
+  my $dbh = Bugzilla->dbh;
+  my $next_dep_id
+    = $dbh->selectrow_array("SELECT $field FROM bugs WHERE bug_id = ?",
+    undef, $dep_id);
+
+  _check_relationship_loop($field, $dep_id, $next_dep_id, $ids);
 }
 
 #####################################################################
@@ -2291,63 +2456,63 @@ sub _check_relationship_loop {
 #####################################################################
 
 sub fields {
-    my $class = shift;
-
-   my @fields =
-   (
-        # Standard Fields
-        # Keep this ordering in sync with bugzilla.dtd.
-        qw(bug_id alias creation_ts short_desc delta_ts
-           reporter_accessible cclist_accessible
-           classification_id classification
-           product component version rep_platform op_sys
-           bug_status resolution dup_id see_also
-           bug_file_loc status_whiteboard keywords
-           priority bug_severity target_milestone
-           dependson blocked everconfirmed
-           reporter assigned_to cc estimated_time
-           remaining_time actual_time deadline),
-
-        # Conditional Fields
-        Bugzilla->params->{'useqacontact'} ? "qa_contact" : (),
-        # Custom Fields
-        map { $_->name } Bugzilla->active_custom_fields
-    );
-    Bugzilla::Hook::process('bug_fields', {'fields' => \@fields} );
-    
-    return @fields;
+  my $class = shift;
+
+  my @fields = (
+
+    # Standard Fields
+    # Keep this ordering in sync with bugzilla.dtd.
+    qw(bug_id alias creation_ts short_desc delta_ts
+      reporter_accessible cclist_accessible
+      classification_id classification
+      product component version rep_platform op_sys
+      bug_status resolution dup_id see_also
+      bug_file_loc status_whiteboard keywords
+      priority bug_severity target_milestone
+      dependson blocked everconfirmed
+      reporter assigned_to cc estimated_time
+      remaining_time actual_time deadline),
+
+    # Conditional Fields
+    Bugzilla->params->{'useqacontact'} ? "qa_contact" : (),
+
+    # Custom Fields
+    map { $_->name } Bugzilla->active_custom_fields
+  );
+  Bugzilla::Hook::process('bug_fields', {'fields' => \@fields});
+
+  return @fields;
 }
 
 #####################################################################
-# Mutators 
+# Mutators
 #####################################################################
 
 # To run check_can_change_field.
 sub _set_global_validator {
-    my ($self, $value, $field) = @_;
-    my $current = $self->$field;
-    my $privs;
-
-    if (ref $current && ref($current) ne 'ARRAY'
-        && $current->isa('Bugzilla::Object')) {
-        $current = $current->id ;
-    }
-    if (ref $value && ref($value) ne 'ARRAY'
-        && $value->isa('Bugzilla::Object')) {
-        $value = $value->id ;
-    }
-    my $can = $self->check_can_change_field($field, $current, $value, \$privs);
-    if (!$can) {
-        if ($field eq 'assigned_to' || $field eq 'qa_contact') {
-            $value   = Bugzilla::User->new($value)->login;
-            $current = Bugzilla::User->new($current)->login;
-        }
-        ThrowUserError('illegal_change', { field    => $field,
-                                           oldvalue => $current,
-                                           newvalue => $value,
-                                           privs    => $privs });
-    }
-    $self->_check_field_is_mandatory($value, $field);
+  my ($self, $value, $field) = @_;
+  my $current = $self->$field;
+  my $privs;
+
+  if ( ref $current
+    && ref($current) ne 'ARRAY'
+    && $current->isa('Bugzilla::Object'))
+  {
+    $current = $current->id;
+  }
+  if (ref $value && ref($value) ne 'ARRAY' && $value->isa('Bugzilla::Object')) {
+    $value = $value->id;
+  }
+  my $can = $self->check_can_change_field($field, $current, $value, \$privs);
+  if (!$can) {
+    if ($field eq 'assigned_to' || $field eq 'qa_contact') {
+      $value   = Bugzilla::User->new($value)->login;
+      $current = Bugzilla::User->new($current)->login;
+    }
+    ThrowUserError('illegal_change',
+      {field => $field, oldvalue => $current, newvalue => $value, privs => $privs});
+  }
+  $self->_check_field_is_mandatory($value, $field);
 }
 
 
@@ -2358,353 +2523,397 @@ sub _set_global_validator {
 # Note that if you are changing multiple bugs at once, you must pass
 # other_bugs to set_all in order for it to behave properly.
 sub set_all {
-    my $self = shift;
-    my ($input_params) = @_;
-    
-    # Clone the data as we are going to alter it, and this would affect
-    # subsequent bugs when calling set_all() again, as some fields would
-    # be modified or no longer defined.
-    my $params = {};
-    %$params = %$input_params;
-
-    # You cannot mark bugs as duplicate when changing several bugs at once
-    # (because currently there is no way to check for duplicate loops in that
-    # situation). You also cannot set the alias of several bugs at once.
-    if ($params->{other_bugs} and scalar @{ $params->{other_bugs} } > 1) {
-        ThrowUserError('dupe_not_allowed') if exists $params->{dup_id};
-        ThrowUserError('multiple_alias_not_allowed') 
-            if defined $params->{alias};
-    }
-
-    # For security purposes, and because lots of other checks depend on it,
-    # we set the product first before anything else.
-    my $product_changed; # Used only for strict_isolation checks.
-    if (exists $params->{'product'}) {
-        $product_changed = $self->_set_product($params->{'product'}, $params);
-    }
-
-    # strict_isolation checks mean that we should set the groups
-    # immediately after changing the product.
-    $self->_add_remove($params, 'groups');
-
-    if (exists $params->{'dependson'} or exists $params->{'blocked'}) {
-        my %set_deps;
-        foreach my $name (qw(dependson blocked)) {
-            my @dep_ids = @{ $self->$name };
-            # If only one of the two fields was passed in, then we need to
-            # retain the current value for the other one.
-            if (!exists $params->{$name}) {
-                $set_deps{$name} = \@dep_ids;
-                next;
-            }
-
-            # Explicitly setting them to a particular value overrides
-            # add/remove.
-            if (exists $params->{$name}->{set}) {
-                $set_deps{$name} = $params->{$name}->{set};
-                next;
-            }
-
-            foreach my $add (@{ $params->{$name}->{add} || [] }) {
-                push(@dep_ids, $add) if !grep($_ == $add, @dep_ids);
-            }
-            foreach my $remove (@{ $params->{$name}->{remove} || [] }) {
-                @dep_ids = grep($_ != $remove, @dep_ids);
-            }
-            $set_deps{$name} = \@dep_ids;
-        }
-
-        $self->set_dependencies($set_deps{'dependson'}, $set_deps{'blocked'});
-    }
+  my $self = shift;
+  my ($input_params) = @_;
+
+  # Clone the data as we are going to alter it, and this would affect
+  # subsequent bugs when calling set_all() again, as some fields would
+  # be modified or no longer defined.
+  my $params = {};
+  %$params = %$input_params;
+
+  # You cannot mark bugs as duplicate when changing several bugs at once
+  # (because currently there is no way to check for duplicate loops in that
+  # situation). You also cannot set the alias of several bugs at once.
+  if ($params->{other_bugs} and scalar @{$params->{other_bugs}} > 1) {
+    ThrowUserError('dupe_not_allowed') if exists $params->{dup_id};
+    ThrowUserError('multiple_alias_not_allowed') if defined $params->{alias};
+  }
+
+  # For security purposes, and because lots of other checks depend on it,
+  # we set the product first before anything else.
+  my $product_changed;    # Used only for strict_isolation checks.
+  if (exists $params->{'product'}) {
+    $product_changed = $self->_set_product($params->{'product'}, $params);
+  }
+
+  # strict_isolation checks mean that we should set the groups
+  # immediately after changing the product.
+  $self->_add_remove($params, 'groups');
+
+  if (exists $params->{'dependson'} or exists $params->{'blocked'}) {
+    my %set_deps;
+    foreach my $name (qw(dependson blocked)) {
+      my @dep_ids = @{$self->$name};
+
+      # If only one of the two fields was passed in, then we need to
+      # retain the current value for the other one.
+      if (!exists $params->{$name}) {
+        $set_deps{$name} = \@dep_ids;
+        next;
+      }
+
+      # Explicitly setting them to a particular value overrides
+      # add/remove.
+      if (exists $params->{$name}->{set}) {
+        $set_deps{$name} = $params->{$name}->{set};
+        next;
+      }
+
+      foreach my $add (@{$params->{$name}->{add} || []}) {
+        push(@dep_ids, $add) if !grep($_ == $add, @dep_ids);
+      }
+      foreach my $remove (@{$params->{$name}->{remove} || []}) {
+        @dep_ids = grep($_ != $remove, @dep_ids);
+      }
+      $set_deps{$name} = \@dep_ids;
+    }
+
+    $self->set_dependencies($set_deps{'dependson'}, $set_deps{'blocked'});
+  }
+
+  if (exists $params->{'keywords'}) {
+
+    # Sorting makes the order "add, remove, set", just like for other
+    # fields.
+    foreach my $action (sort keys %{$params->{'keywords'}}) {
+      $self->modify_keywords($params->{'keywords'}->{$action}, $action);
+    }
+  }
+
+  if (exists $params->{'comment'} or exists $params->{'work_time'}) {
+
+    # Add a comment as needed to each bug. This is done early because
+    # there are lots of things that want to check if we added a comment.
+    $self->add_comment(
+      $params->{'comment'}->{'body'},
+      {
+        isprivate   => $params->{'comment'}->{'is_private'},
+        work_time   => $params->{'work_time'},
+        is_markdown => $params->{'comment'}->{'is_markdown'}
+      }
+    );
+  }
 
-    if (exists $params->{'keywords'}) {
-        # Sorting makes the order "add, remove, set", just like for other
-        # fields.
-        foreach my $action (sort keys %{ $params->{'keywords'} }) {
-            $self->modify_keywords($params->{'keywords'}->{$action}, $action);
-        }
-    }
+  if (defined $params->{comment_tags} && Bugzilla->user->can_tag_comments()) {
+    $self->{added_comment_tags}
+      = ref $params->{comment_tags}
+      ? $params->{comment_tags}
+      : [$params->{comment_tags}];
+  }
 
-    if (exists $params->{'comment'} or exists $params->{'work_time'}) {
-        # Add a comment as needed to each bug. This is done early because
-        # there are lots of things that want to check if we added a comment.
-        $self->add_comment($params->{'comment'}->{'body'},
-            { isprivate => $params->{'comment'}->{'is_private'},
-              work_time => $params->{'work_time'},
-              is_markdown => $params->{'comment'}->{'is_markdown'} });
-    }
+  if (exists $params->{alias} && $params->{alias}{set}) {
+    my ($removed_aliases, $added_aliases)
+      = diff_arrays($self->alias, $params->{alias}{set});
+    $params->{alias} = {add => $added_aliases, remove => $removed_aliases,};
+  }
 
-    if (exists $params->{alias} && $params->{alias}{set}) {
-        $params->{alias} = {
-            add    => $params->{alias}{set},
-            remove => $self->alias,
-        };
-    }
+  my %normal_set_all;
+  foreach my $name (keys %$params) {
 
-    my %normal_set_all;
-    foreach my $name (keys %$params) {
-        # These are handled separately below.
-        if ($self->can("set_$name")) {
-            $normal_set_all{$name} = $params->{$name};
-        }
+    # These are handled separately below.
+    if ($self->can("set_$name")) {
+      $normal_set_all{$name} = $params->{$name};
     }
-    $self->SUPER::set_all(\%normal_set_all);
+  }
+  $self->SUPER::set_all(\%normal_set_all);
 
-    $self->reset_assigned_to if $params->{'reset_assigned_to'};
-    $self->reset_qa_contact  if $params->{'reset_qa_contact'};
+  $self->reset_assigned_to if $params->{'reset_assigned_to'};
+  $self->reset_qa_contact  if $params->{'reset_qa_contact'};
 
-    $self->_add_remove($params, 'see_also');
+  $self->_add_remove($params, 'see_also');
 
-    # And set custom fields.
-    my @custom_fields = Bugzilla->active_custom_fields;
-    foreach my $field (@custom_fields) {
-        my $fname = $field->name;
-        if (exists $params->{$fname}) {
-            $self->set_custom_field($field, $params->{$fname});
-        }
+  # And set custom fields.
+  my @custom_fields = Bugzilla->active_custom_fields;
+  foreach my $field (@custom_fields) {
+    my $fname = $field->name;
+    if (exists $params->{$fname}) {
+      $self->set_custom_field($field, $params->{$fname});
     }
+  }
 
-    $self->_add_remove($params, 'cc');
-    $self->_add_remove($params, 'alias');
+  $self->_add_remove($params, 'cc');
+  $self->_add_remove($params, 'alias');
 
-    # Theoretically you could move a product without ever specifying
-    # a new assignee or qa_contact, or adding/removing any CCs. So,
-    # we have to check that the current assignee, qa, and CCs are still
-    # valid if we've switched products, under strict_isolation. We can only
-    # do that here, because if they *did* change the assignee, qa, or CC,
-    # then we don't want to check the original ones, only the new ones.
-    $self->_check_strict_isolation() if $product_changed;
+  # Theoretically you could move a product without ever specifying
+  # a new assignee or qa_contact, or adding/removing any CCs. So,
+  # we have to check that the current assignee, qa, and CCs are still
+  # valid if we've switched products, under strict_isolation. We can only
+  # do that here, because if they *did* change the assignee, qa, or CC,
+  # then we don't want to check the original ones, only the new ones.
+  $self->_check_strict_isolation() if $product_changed;
 }
 
 # Helper for set_all that helps with fields that have an "add/remove"
 # pattern instead of a "set_" pattern.
 sub _add_remove {
-    my ($self, $params, $name) = @_;
-    my @add    = @{ $params->{$name}->{add}    || [] };
-    my @remove = @{ $params->{$name}->{remove} || [] };
-    $name =~ s/s$// if $name ne 'alias';
-    my $add_method = "add_$name";
-    my $remove_method = "remove_$name";
-    $self->$add_method($_) foreach @add;
-    $self->$remove_method($_) foreach @remove;
+  my ($self, $params, $name) = @_;
+  my @add    = @{$params->{$name}->{add}    || []};
+  my @remove = @{$params->{$name}->{remove} || []};
+  $name =~ s/s$// if $name ne 'alias';
+  my $add_method    = "add_$name";
+  my $remove_method = "remove_$name";
+  $self->$add_method($_)    foreach @add;
+  $self->$remove_method($_) foreach @remove;
 }
 
 sub set_assigned_to {
-    my ($self, $value) = @_;
-    $self->set('assigned_to', $value);
-    # Store the old assignee. check_can_change_field() needs it.
-    $self->{'_old_assigned_to'} = $self->{'assigned_to_obj'}->id;
-    delete $self->{'assigned_to_obj'};
+  my ($self, $value) = @_;
+  $self->set('assigned_to', $value);
+
+  # Store the old assignee. check_can_change_field() needs it.
+  $self->{'_old_assigned_to'} = $self->{'assigned_to_obj'}->id;
+  delete $self->{'assigned_to_obj'};
 }
+
 sub reset_assigned_to {
-    my $self = shift;
-    my $comp = $self->component_obj;
-    $self->set_assigned_to($comp->default_assignee);
+  my $self = shift;
+  my $comp = $self->component_obj;
+  $self->set_assigned_to($comp->default_assignee);
 }
 sub set_bug_ignored       { $_[0]->set('bug_ignored',       $_[1]); }
 sub set_cclist_accessible { $_[0]->set('cclist_accessible', $_[1]); }
+
 sub set_comment_is_private {
-    my ($self, $comment_id, $isprivate) = @_;
+  my ($self, $comments, $isprivate) = @_;
+  $self->{comment_isprivate} ||= [];
+  my $is_insider = Bugzilla->user->is_insider;
 
-    # We also allow people to pass in a hash of comment ids to update.
-    if (ref $comment_id) {
-        while (my ($id, $is) = each %$comment_id) {
-            $self->set_comment_is_private($id, $is);
-        }
-        return;
-    }
+  $comments = {$comments => $isprivate} unless ref $comments;
+
+  foreach my $comment (@{$self->comments}) {
 
-    my ($comment) = grep($comment_id == $_->id, @{ $self->comments });
-    ThrowUserError('comment_invalid_isprivate', { id => $comment_id }) 
-        if !$comment;
+    # Skip unmodified comment privacy.
+    next unless exists $comments->{$comment->id};
 
-    $isprivate = $isprivate ? 1 : 0;
+    my $isprivate = delete $comments->{$comment->id} ? 1 : 0;
     if ($isprivate != $comment->is_private) {
-        ThrowUserError('user_not_insider') if !Bugzilla->user->is_insider;
-        $self->{comment_isprivate} ||= [];
-        $comment->set_is_private($isprivate);
-        push @{$self->{comment_isprivate}}, $comment;
-    }
-}
-sub set_component  {
-    my ($self, $name) = @_;
-    my $old_comp  = $self->component_obj;
-    my $component = $self->_check_component($name);
-    if ($old_comp->id != $component->id) {
-        $self->{component_id}  = $component->id;
-        $self->{component}     = $component->name;
-        $self->{component_obj} = $component;
-        # For update()
-        $self->{_old_component_name} = $old_comp->name;
-        # Add in the Default CC of the new Component;
-        foreach my $cc (@{$component->initial_cc}) {
-            $self->add_cc($cc);
-        }
+      ThrowUserError('user_not_insider') unless $is_insider;
+      $comment->set_is_private($isprivate);
+      push @{$self->{comment_isprivate}}, $comment;
     }
+  }
+
+  # If there are still entries in $comments, then they are illegal.
+  ThrowUserError('comment_invalid_isprivate', {id => join(', ', keys %$comments)})
+    if scalar keys %$comments;
+
+  # If no comment privacy has been modified, remove this key.
+  delete $self->{comment_isprivate} unless scalar @{$self->{comment_isprivate}};
 }
-sub set_custom_field {
-    my ($self, $field, $value) = @_;
 
-    if (ref $value eq 'ARRAY' && $field->type != FIELD_TYPE_MULTI_SELECT) {
-        $value = $value->[0];
+sub set_component {
+  my ($self, $name) = @_;
+  my $old_comp  = $self->component_obj;
+  my $component = $self->_check_component($name);
+  if ($old_comp->id != $component->id) {
+    $self->{component_id}  = $component->id;
+    $self->{component}     = $component->name;
+    $self->{component_obj} = $component;
+
+    # For update()
+    $self->{_old_component_name} = $old_comp->name;
+
+    # Add in the Default CC of the new Component;
+    foreach my $cc (@{$component->initial_cc}) {
+      $self->add_cc($cc);
     }
-    ThrowCodeError('field_not_custom', { field => $field }) if !$field->custom;
-    $self->set($field->name, $value);
+  }
+}
+
+sub set_custom_field {
+  my ($self, $field, $value) = @_;
+
+  if (ref $value eq 'ARRAY' && $field->type != FIELD_TYPE_MULTI_SELECT) {
+    $value = $value->[0];
+  }
+  ThrowCodeError('field_not_custom', {field => $field}) if !$field->custom;
+  $self->set($field->name, $value);
 }
 sub set_deadline { $_[0]->set('deadline', $_[1]); }
+
 sub set_dependencies {
-    my ($self, $dependson, $blocked) = @_;
-    my %extra = ( blocked => $blocked );
-    $dependson = $self->_check_dependencies($dependson, 'dependson', \%extra);
-    $blocked = $extra{blocked};
-    # These may already be detainted, but all setters are supposed to
-    # detaint their input if they've run a validator (just as though
-    # we had used Bugzilla::Object::set), so we do that here.
-    detaint_natural($_) foreach (@$dependson, @$blocked);
-    $self->{'dependson'} = $dependson;
-    $self->{'blocked'}   = $blocked;
-    delete $self->{depends_on_obj};
-    delete $self->{blocks_obj};
+  my ($self, $dependson, $blocked) = @_;
+  my %extra = (blocked => $blocked);
+  $dependson = $self->_check_dependencies($dependson, 'dependson', \%extra);
+  $blocked = $extra{blocked};
+
+  # These may already be detainted, but all setters are supposed to
+  # detaint their input if they've run a validator (just as though
+  # we had used Bugzilla::Object::set), so we do that here.
+  detaint_natural($_) foreach (@$dependson, @$blocked);
+  $self->{'dependson'} = $dependson;
+  $self->{'blocked'}   = $blocked;
+  delete $self->{depends_on_obj};
+  delete $self->{blocks_obj};
 }
 sub _clear_dup_id { $_[0]->{dup_id} = undef; }
+
 sub set_dup_id {
-    my ($self, $dup_id) = @_;
-    my $old = $self->dup_id || 0;
-    $self->set('dup_id', $dup_id);
-    my $new = $self->dup_id;
-    return if $old == $new;
-
-    # Make sure that we have the DUPLICATE resolution. This is needed
-    # if somebody calls set_dup_id without calling set_bug_status or
-    # set_resolution.
-    if ($self->resolution ne 'DUPLICATE') {
-        # Even if the current status is VERIFIED, we change it back to
-        # RESOLVED (or whatever the duplicate_or_move_bug_status is) here,
-        # because that's the same thing the UI does when you click on the
-        # "Mark as Duplicate" link. If people really want to retain their
-        # current status, they can use set_bug_status and set the DUPLICATE
-        # resolution before getting here.
-        $self->set_bug_status(
-            Bugzilla->params->{'duplicate_or_move_bug_status'},
-            { resolution => 'DUPLICATE' });
-    }
-    
-    # Update the other bug.
-    my $dupe_of = new Bugzilla::Bug($self->dup_id);
-    if (delete $self->{_add_dup_cc}) {
-        $dupe_of->add_cc($self->reporter);
-    }
-    $dupe_of->add_comment("", { type       => CMT_HAS_DUPE,
-                                extra_data => $self->id });
-    $self->{_dup_for_update} = $dupe_of;
-    
-    # Now make sure that we add a duplicate comment on *this* bug.
-    # (Change an existing comment into a dup comment, if there is one,
-    # or add an empty dup comment.)
-    if ($self->{added_comments}) {
-        my @normal = grep { !defined $_->{type} || $_->{type} == CMT_NORMAL }
-                          @{ $self->{added_comments} };
-        # Turn the last one into a dup comment.
-        $normal[-1]->{type} = CMT_DUPE_OF;
-        $normal[-1]->{extra_data} = $self->dup_id;
-    }
-    else {
-        $self->add_comment('', { type       => CMT_DUPE_OF,
-                                 extra_data => $self->dup_id });
-    }
+  my ($self, $dup_id) = @_;
+  my $old = $self->dup_id || 0;
+  $self->set('dup_id', $dup_id);
+  my $new = $self->dup_id;
+  return if $old == $new;
+
+  # Make sure that we have the DUPLICATE resolution. This is needed
+  # if somebody calls set_dup_id without calling set_bug_status or
+  # set_resolution.
+  if ($self->resolution ne 'DUPLICATE') {
+
+    # Even if the current status is VERIFIED, we change it back to
+    # RESOLVED (or whatever the duplicate_or_move_bug_status is) here,
+    # because that's the same thing the UI does when you click on the
+    # "Mark as Duplicate" link. If people really want to retain their
+    # current status, they can use set_bug_status and set the DUPLICATE
+    # resolution before getting here.
+    $self->set_bug_status(Bugzilla->params->{'duplicate_or_move_bug_status'},
+      {resolution => 'DUPLICATE'});
+  }
+
+  # Update the other bug.
+  my $dupe_of = new Bugzilla::Bug($self->dup_id);
+  if (delete $self->{_add_dup_cc}) {
+    $dupe_of->add_cc($self->reporter);
+  }
+  $dupe_of->add_comment("", {type => CMT_HAS_DUPE, extra_data => $self->id});
+  $self->{_dup_for_update} = $dupe_of;
+
+  # Now make sure that we add a duplicate comment on *this* bug.
+  # (Change an existing comment into a dup comment, if there is one,
+  # or add an empty dup comment.)
+  if ($self->{added_comments}) {
+    my @normal = grep { !defined $_->{type} || $_->{type} == CMT_NORMAL }
+      @{$self->{added_comments}};
+
+    # Turn the last one into a dup comment.
+    $normal[-1]->{type}       = CMT_DUPE_OF;
+    $normal[-1]->{extra_data} = $self->dup_id;
+  }
+  else {
+    $self->add_comment('', {type => CMT_DUPE_OF, extra_data => $self->dup_id});
+  }
+}
+
+sub set_estimated_time {
+  my $et = $_[1];
+  $et =~ s/,/./g;
+  $_[0]->set('estimated_time', $et);
 }
-sub set_estimated_time { $_[0]->set('estimated_time', $_[1]); }
 sub _set_everconfirmed { $_[0]->set('everconfirmed', $_[1]); }
+
 sub set_flags {
-    my ($self, $flags, $new_flags) = @_;
+  my ($self, $flags, $new_flags) = @_;
 
-    Bugzilla::Flag->set_flag($self, $_) foreach (@$flags, @$new_flags);
+  Bugzilla::Flag->set_flag($self, $_) foreach (@$flags, @$new_flags);
 }
-sub set_op_sys         { $_[0]->set('op_sys',        $_[1]); }
-sub set_platform       { $_[0]->set('rep_platform',  $_[1]); }
-sub set_priority       { $_[0]->set('priority',      $_[1]); }
+sub set_op_sys   { $_[0]->set('op_sys',       $_[1]); }
+sub set_platform { $_[0]->set('rep_platform', $_[1]); }
+sub set_priority { $_[0]->set('priority',     $_[1]); }
+
 # For security reasons, you have to use set_all to change the product.
 # See the strict_isolation check in set_all for an explanation.
 sub _set_product {
-    my ($self, $name, $params) = @_;
-    my $old_product = $self->product_obj;
-    my $product = $self->_check_product($name);
-    
-    my $product_changed = 0;
-    if ($old_product->id != $product->id) {
-        $self->{product_id}  = $product->id;
-        $self->{product}     = $product->name;
-        $self->{product_obj} = $product;
-        # For update()
-        $self->{_old_product_name} = $old_product->name;
-        # Delete fields that depend upon the old Product value.
-        delete $self->{choices};
-        $product_changed = 1;
-    }
-
-    $params ||= {};
-    # We delete these so that they're not set again later in set_all.
-    my $comp_name = delete $params->{component} || $self->component;
-    my $vers_name = delete $params->{version}   || $self->version;
-    my $tm_name   = delete $params->{target_milestone};
-    # This way, if usetargetmilestone is off and we've changed products,
-    # set_target_milestone will reset our target_milestone to
-    # $product->default_milestone. But if we haven't changed products,
-    # we don't reset anything.
-    if (!defined $tm_name
-        && (Bugzilla->params->{'usetargetmilestone'} || !$product_changed))
-    {
-        $tm_name = $self->target_milestone;
-    }
-
-    if ($product_changed && Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
-        # Try to set each value with the new product.
-        # Have to set error_mode because Throw*Error calls exit() otherwise.
-        my $old_error_mode = Bugzilla->error_mode;
-        Bugzilla->error_mode(ERROR_MODE_DIE);
-        my $component_ok = eval { $self->set_component($comp_name);      1; };
-        my $version_ok   = eval { $self->set_version($vers_name);        1; };
-        my $milestone_ok = 1;
-        # Reporters can move bugs between products but not set the TM.
-        if ($self->check_can_change_field('target_milestone', 0, 1)) {
-            $milestone_ok = eval { $self->set_target_milestone($tm_name); 1; };
-        }
-        else {
-            # Have to set this directly to bypass the validators.
-            $self->{target_milestone} = $product->default_milestone;
-        }
-        # If there were any errors thrown, make sure we don't mess up any
-        # other part of Bugzilla that checks $@.
-        undef $@;
-        Bugzilla->error_mode($old_error_mode);
-        
-        my $verified = $params->{product_change_confirmed};
-        my %vars;
-        if (!$verified || !$component_ok || !$version_ok || !$milestone_ok) {
-            $vars{defaults} = {
-                # Note that because of the eval { set } above, these are
-                # already set correctly if they're valid, otherwise they're
-                # set to some invalid value which the template will ignore.
-                component => $self->component,
-                version   => $self->version,
-                milestone => $milestone_ok ? $self->target_milestone
-                                           : $product->default_milestone
-            };
-            $vars{components} = [map { $_->name } grep($_->is_active, @{$product->components})];
-            $vars{milestones} = [map { $_->name } grep($_->is_active, @{$product->milestones})];
-            $vars{versions}   = [map { $_->name } grep($_->is_active, @{$product->versions})];
-        }
+  my ($self, $name, $params) = @_;
+  my $old_product = $self->product_obj;
+  my $product     = $self->_check_product($name);
+
+  my $product_changed = 0;
+  if ($old_product->id != $product->id) {
+    $self->{product_id}  = $product->id;
+    $self->{product}     = $product->name;
+    $self->{product_obj} = $product;
 
-        if (!$verified) {
-            $vars{verify_bug_groups} = 1;
-            my $dbh = Bugzilla->dbh;
-            my @idlist = ($self->id);
-            push(@idlist, map {$_->id} @{ $params->{other_bugs} })
-                if $params->{other_bugs};
-            @idlist = uniq @idlist;
-            # Get the ID of groups which are no longer valid in the new product.
-            my $gids = $dbh->selectcol_arrayref(
-                'SELECT bgm.group_id
+    # For update()
+    $self->{_old_product_name} = $old_product->name;
+
+    # Delete fields that depend upon the old Product value.
+    delete $self->{choices};
+    $product_changed = 1;
+  }
+
+  $params ||= {};
+
+  # We delete these so that they're not set again later in set_all.
+  my $comp_name = delete $params->{component} || $self->component;
+  my $vers_name = delete $params->{version}   || $self->version;
+  my $tm_name   = delete $params->{target_milestone};
+
+  # This way, if usetargetmilestone is off and we've changed products,
+  # set_target_milestone will reset our target_milestone to
+  # $product->default_milestone. But if we haven't changed products,
+  # we don't reset anything.
+  if (!defined $tm_name
+    && (Bugzilla->params->{'usetargetmilestone'} || !$product_changed))
+  {
+    $tm_name = $self->target_milestone;
+  }
+
+  if ($product_changed && Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
+
+    # Try to set each value with the new product.
+    # Have to set error_mode because Throw*Error calls exit() otherwise.
+    my $old_error_mode = Bugzilla->error_mode;
+    Bugzilla->error_mode(ERROR_MODE_DIE);
+    my $component_ok = eval { $self->set_component($comp_name); 1; };
+    my $version_ok   = eval { $self->set_version($vers_name);   1; };
+    my $milestone_ok = 1;
+
+    # Reporters can move bugs between products but not set the TM.
+    if ($self->check_can_change_field('target_milestone', 0, 1)) {
+      $milestone_ok = eval { $self->set_target_milestone($tm_name); 1; };
+    }
+    else {
+      # Have to set this directly to bypass the validators.
+      $self->{target_milestone} = $product->default_milestone;
+    }
+
+    # If there were any errors thrown, make sure we don't mess up any
+    # other part of Bugzilla that checks $@.
+    undef $@;
+    Bugzilla->error_mode($old_error_mode);
+
+    my $verified = $params->{product_change_confirmed};
+    my %vars;
+    if (!$verified || !$component_ok || !$version_ok || !$milestone_ok) {
+      $vars{defaults} = {
+
+        # Note that because of the eval { set } above, these are
+        # already set correctly if they're valid, otherwise they're
+        # set to some invalid value which the template will ignore.
+        component => $self->component,
+        version   => $self->version,
+        milestone => $milestone_ok
+        ? $self->target_milestone
+        : $product->default_milestone
+      };
+      $vars{components}
+        = [map { $_->name } grep($_->is_active, @{$product->components})];
+      $vars{milestones}
+        = [map { $_->name } grep($_->is_active, @{$product->milestones})];
+      $vars{versions} = [map { $_->name } grep($_->is_active, @{$product->versions})];
+    }
+
+    if (!$verified) {
+      $vars{verify_bug_groups} = 1;
+      my $dbh    = Bugzilla->dbh;
+      my @idlist = ($self->id);
+      push(@idlist, map { $_->id } @{$params->{other_bugs}}) if $params->{other_bugs};
+      @idlist = uniq @idlist;
+
+      # Get the ID of groups which are no longer valid in the new product.
+      my $gids = $dbh->selectcol_arrayref(
+        'SELECT bgm.group_id
                    FROM bug_group_map AS bgm
                   WHERE bgm.bug_id IN (' . join(',', ('?') x @idlist) . ')
                     AND bgm.group_id NOT IN
@@ -2713,159 +2922,177 @@ sub _set_product {
                            WHERE gcm.product_id = ?
                                  AND ( (gcm.membercontrol != ?
                                         AND gcm.group_id IN ('
-                                        . Bugzilla->user->groups_as_string . '))
-                                       OR gcm.othercontrol != ?) )',
-                undef, (@idlist, $product->id, CONTROLMAPNA, CONTROLMAPNA));
-            $vars{'old_groups'} = Bugzilla::Group->new_from_list($gids);
-
-            # Did we come here from editing multiple bugs? (affects how we
-            # show optional group changes)
-            $vars{multiple_bugs} = (@idlist > 1) ? 1 : 0;
-        }
-
-        if (%vars) {
-            $vars{product} = $product;
-            $vars{bug} = $self;
-            my $template = Bugzilla->template;
-            $template->process("bug/process/verify-new-product.html.tmpl",
-                \%vars) || ThrowTemplateError($template->error());
-            exit;
-        }
+          . Bugzilla->user->groups_as_string . '))
+                                       OR gcm.othercontrol != ?) )', undef,
+        (@idlist, $product->id, CONTROLMAPNA, CONTROLMAPNA)
+      );
+      $vars{'old_groups'} = Bugzilla::Group->new_from_list($gids);
+
+      # Did we come here from editing multiple bugs? (affects how we
+      # show optional group changes)
+      $vars{multiple_bugs} = (@idlist > 1) ? 1 : 0;
+    }
+
+    if (%vars) {
+      $vars{product} = $product;
+      $vars{bug}     = $self;
+      my $template = Bugzilla->template;
+      $template->process("bug/process/verify-new-product.html.tmpl", \%vars)
+        || ThrowTemplateError($template->error());
+      exit;
+    }
+  }
+  else {
+    # When we're not in the browser (or we didn't change the product), we
+    # just die if any of these are invalid.
+    $self->set_component($comp_name);
+    $self->set_version($vers_name);
+    if ($product_changed
+      and !$self->check_can_change_field('target_milestone', 0, 1))
+    {
+      # Have to set this directly to bypass the validators.
+      $self->{target_milestone} = $product->default_milestone;
     }
     else {
-        # When we're not in the browser (or we didn't change the product), we
-        # just die if any of these are invalid.
-        $self->set_component($comp_name);
-        $self->set_version($vers_name);
-        if ($product_changed 
-            and !$self->check_can_change_field('target_milestone', 0, 1)) 
-        {
-            # Have to set this directly to bypass the validators.
-            $self->{target_milestone} = $product->default_milestone;
-        }
-        else {
-            $self->set_target_milestone($tm_name);
-        }
+      $self->set_target_milestone($tm_name);
     }
+  }
 
-    if ($product_changed) {
-        # Remove groups that can't be set in the new product.
-        # We copy this array because the original array is modified while we're
-        # working, and that confuses "foreach".
-        my @current_groups = @{$self->groups_in};
-        foreach my $group (@current_groups) {
-            if (!$product->group_is_valid($group)) {
-                $self->remove_group($group);
-            }
-        }
+  if ($product_changed) {
 
-        # Make sure the bug is in all the mandatory groups for the new product.
-        foreach my $group (@{$product->groups_mandatory}) {
-            $self->add_group($group);
-        }
+    # Remove groups that can't be set in the new product.
+    # We copy this array because the original array is modified while we're
+    # working, and that confuses "foreach".
+    my @current_groups = @{$self->groups_in};
+    foreach my $group (@current_groups) {
+      if (!$product->group_is_valid($group)) {
+        $self->remove_group($group);
+      }
     }
-    
-    return $product_changed;
+
+    # Make sure the bug is in all the mandatory groups for the new product.
+    foreach my $group (@{$product->groups_mandatory}) {
+      $self->add_group($group);
+    }
+  }
+
+  return $product_changed;
 }
 
 sub set_qa_contact {
-    my ($self, $value) = @_;
-    $self->set('qa_contact', $value);
-    # Store the old QA contact. check_can_change_field() needs it.
-    if ($self->{'qa_contact_obj'}) {
-        $self->{'_old_qa_contact'} = $self->{'qa_contact_obj'}->id;
-    }
-    delete $self->{'qa_contact_obj'};
+  my ($self, $value) = @_;
+  $self->set('qa_contact', $value);
+
+  # Store the old QA contact. check_can_change_field() needs it.
+  if ($self->{'qa_contact_obj'}) {
+    $self->{'_old_qa_contact'} = $self->{'qa_contact_obj'}->id;
+  }
+  delete $self->{'qa_contact_obj'};
 }
+
 sub reset_qa_contact {
-    my $self = shift;
-    my $comp = $self->component_obj;
-    $self->set_qa_contact($comp->default_qa_contact);
+  my $self = shift;
+  my $comp = $self->component_obj;
+  $self->set_qa_contact($comp->default_qa_contact);
+}
+
+sub set_remaining_time {
+  my $rt = $_[1];
+  $rt =~ s/,/./g;
+  $_[0]->set('remaining_time', $rt);
 }
-sub set_remaining_time { $_[0]->set('remaining_time', $_[1]); }
+
 # Used only when closing a bug or moving between closed states.
 sub _zero_remaining_time { $_[0]->{'remaining_time'} = 0; }
 sub set_reporter_accessible { $_[0]->set('reporter_accessible', $_[1]); }
+
 sub set_resolution {
-    my ($self, $value, $params) = @_;
-    
-    my $old_res = $self->resolution;
-    $self->set('resolution', $value);
-    delete $self->{choices};
-    my $new_res = $self->resolution;
+  my ($self, $value, $params) = @_;
 
-    if ($new_res ne $old_res) {
-        # Clear the dup_id if we're leaving the dup resolution.
-        if ($old_res eq 'DUPLICATE') {
-            $self->_clear_dup_id();
-        }
-        # Duplicates should have no remaining time left.
-        elsif ($new_res eq 'DUPLICATE' && $self->remaining_time != 0) {
-            $self->_zero_remaining_time();
-        }
+  my $old_res = $self->resolution;
+  $self->set('resolution', $value);
+  delete $self->{choices};
+  my $new_res = $self->resolution;
+
+  if ($new_res ne $old_res) {
+
+    # Clear the dup_id if we're leaving the dup resolution.
+    if ($old_res eq 'DUPLICATE') {
+      $self->_clear_dup_id();
     }
-    
-    # We don't check if we're entering or leaving the dup resolution here,
-    # because we could be moving from being a dup of one bug to being a dup
-    # of another, theoretically. Note that this code block will also run
-    # when going between different closed states.
-    if ($self->resolution eq 'DUPLICATE') {
-        if (my $dup_id = $params->{dup_id}) {
-            $self->set_dup_id($dup_id);
-        }
-        elsif (!$self->dup_id) {
-            ThrowUserError('dupe_id_required');
-        }
+
+    # Duplicates should have no remaining time left.
+    elsif ($new_res eq 'DUPLICATE' && $self->remaining_time != 0) {
+      $self->_zero_remaining_time();
     }
+  }
 
-    # This method has handled dup_id, so set_all doesn't have to worry
-    # about it now.
-    delete $params->{dup_id};
+  # We don't check if we're entering or leaving the dup resolution here,
+  # because we could be moving from being a dup of one bug to being a dup
+  # of another, theoretically. Note that this code block will also run
+  # when going between different closed states.
+  if ($self->resolution eq 'DUPLICATE') {
+    if (my $dup_id = $params->{dup_id}) {
+      $self->set_dup_id($dup_id);
+    }
+    elsif (!$self->dup_id) {
+      ThrowUserError('dupe_id_required');
+    }
+  }
+
+  # This method has handled dup_id, so set_all doesn't have to worry
+  # about it now.
+  delete $params->{dup_id};
 }
+
 sub clear_resolution {
-    my $self = shift;
-    if (!$self->status->is_open) {
-        ThrowUserError('resolution_cant_clear', { bug_id => $self->id });
-    }
-    $self->{'resolution'} = ''; 
-    $self->_clear_dup_id; 
+  my $self = shift;
+  if (!$self->status->is_open) {
+    ThrowUserError('resolution_cant_clear', {bug_id => $self->id});
+  }
+  $self->{'resolution'} = '';
+  $self->_clear_dup_id;
 }
-sub set_severity       { $_[0]->set('bug_severity',  $_[1]); }
+sub set_severity { $_[0]->set('bug_severity', $_[1]); }
+
 sub set_bug_status {
-    my ($self, $status, $params) = @_;
-    my $old_status = $self->status;
-    $self->set('bug_status', $status);
-    delete $self->{'status'};
-    delete $self->{'statuses_available'};
-    delete $self->{'choices'};
-    my $new_status = $self->status;
-   
-    if ($new_status->is_open) {
-        # Check for the everconfirmed transition
-        $self->_set_everconfirmed($new_status->name eq 'UNCONFIRMED' ? 0 : 1);
-        $self->clear_resolution();
-        # Calling clear_resolution handled the "resolution" and "dup_id"
-        # setting, so set_all doesn't have to worry about them.
-        delete $params->{resolution};
-        delete $params->{dup_id};
+  my ($self, $status, $params) = @_;
+  my $old_status = $self->status;
+  $self->set('bug_status', $status);
+  delete $self->{'status'};
+  delete $self->{'statuses_available'};
+  delete $self->{'choices'};
+  my $new_status = $self->status;
+
+  if ($new_status->is_open) {
+
+    # Check for the everconfirmed transition
+    $self->_set_everconfirmed($new_status->name eq 'UNCONFIRMED' ? 0 : 1);
+    $self->clear_resolution();
+
+    # Calling clear_resolution handled the "resolution" and "dup_id"
+    # setting, so set_all doesn't have to worry about them.
+    delete $params->{resolution};
+    delete $params->{dup_id};
+  }
+  else {
+    # We do this here so that we can make sure closed statuses have
+    # resolutions.
+    my $resolution = $self->resolution;
+
+    # We need to check "defined" to prevent people from passing
+    # a blank resolution in the WebService, which would otherwise fail
+    # silently.
+    if (defined $params->{resolution}) {
+      $resolution = delete $params->{resolution};
     }
-    else {
-        # We do this here so that we can make sure closed statuses have
-        # resolutions.
-        my $resolution = $self->resolution;
-        # We need to check "defined" to prevent people from passing
-        # a blank resolution in the WebService, which would otherwise fail
-        # silently.
-        if (defined $params->{resolution}) {
-            $resolution = delete $params->{resolution};
-        }
-        $self->set_resolution($resolution, $params);
+    $self->set_resolution($resolution, $params);
 
-        # Changing between closed statuses zeros the remaining time.
-        if ($new_status->id != $old_status->id && $self->remaining_time != 0) {
-            $self->_zero_remaining_time();
-        }
+    # Changing between closed statuses zeros the remaining time.
+    if ($new_status->id != $old_status->id && $self->remaining_time != 0) {
+      $self->_zero_remaining_time();
     }
+  }
 }
 sub set_status_whiteboard { $_[0]->set('status_whiteboard', $_[1]); }
 sub set_summary           { $_[0]->set('short_desc',        $_[1]); }
@@ -2882,362 +3109,398 @@ sub set_version           { $_[0]->set('version',           $_[1]); }
 # Accepts a User object or a username. Adds the user only if they
 # don't already exist as a CC on the bug.
 sub add_cc {
-    my ($self, $user_or_name) = @_;
-    return if !$user_or_name;
-    my $user = ref $user_or_name ? $user_or_name
-                                 : Bugzilla::User->check($user_or_name);
-    $self->_check_strict_isolation_for_user($user);
-    my $cc_users = $self->cc_users;
-    push(@$cc_users, $user) if !grep($_->id == $user->id, @$cc_users);
+  my ($self, $user_or_name) = @_;
+  return if !$user_or_name;
+  my $user
+    = ref $user_or_name ? $user_or_name : Bugzilla::User->check($user_or_name);
+  $self->_check_strict_isolation_for_user($user);
+  my $cc_users = $self->cc_users;
+  push(@$cc_users, $user) if !grep($_->id == $user->id, @$cc_users);
 }
 
 # Accepts a User object or a username. Removes the User if they exist
 # in the list, but doesn't throw an error if they don't exist.
 sub remove_cc {
-    my ($self, $user_or_name) = @_;
-    my $user = ref $user_or_name ? $user_or_name
-                                 : Bugzilla::User->check($user_or_name);
-    my $currentUser = Bugzilla->user;
-    if (!$self->user->{'canedit'} && $user->id != $currentUser->id) {
-        ThrowUserError('cc_remove_denied');
-    }
-    my $cc_users = $self->cc_users;
-    @$cc_users = grep { $_->id != $user->id } @$cc_users;
+  my ($self, $user_or_name) = @_;
+  my $user
+    = ref $user_or_name ? $user_or_name : Bugzilla::User->check($user_or_name);
+  my $currentUser = Bugzilla->user;
+  if (!$self->user->{'canedit'} && $user->id != $currentUser->id) {
+    ThrowUserError('cc_remove_denied');
+  }
+  my $cc_users = $self->cc_users;
+  @$cc_users = grep { $_->id != $user->id } @$cc_users;
 }
 
 sub add_alias {
-    my ($self, $alias) = @_;
-    return if !$alias;
-    my $aliases = $self->_check_alias($alias);
-    $alias = $aliases->[0];
-    my $bug_aliases = $self->alias;
-    push(@$bug_aliases, $alias) if !grep($_ eq $alias, @$bug_aliases);
+  my ($self, $alias) = @_;
+  return if !$alias;
+  my $aliases = $self->_check_alias($alias);
+  $alias = $aliases->[0];
+  my @new_aliases;
+  my $found = 0;
+  foreach my $old_alias (@{$self->alias}) {
+    if (lc($old_alias) eq lc($alias)) {
+      push(@new_aliases, $alias);
+      $found = 1;
+    }
+    else {
+      push(@new_aliases, $old_alias);
+    }
+  }
+  push(@new_aliases, $alias) if !$found;
+  $self->{alias} = \@new_aliases;
 }
 
 sub remove_alias {
-    my ($self, $alias) = @_;
-    my $bug_aliases = $self->alias;
-    @$bug_aliases = grep { $_ ne $alias } @$bug_aliases;
+  my ($self, $alias) = @_;
+
+  my $privs;
+  my $can = $self->check_can_change_field('alias', '', $alias, \$privs);
+  if (!$can) {
+    ThrowUserError('illegal_change',
+      {field => 'alias', action => 'unset', oldvalue => $alias, privs => $privs});
+  }
+
+  my $bug_aliases = $self->alias;
+  @$bug_aliases = grep { $_ ne $alias } @$bug_aliases;
 }
 
 # $bug->add_comment("comment", {isprivate => 1, work_time => 10.5,
 #                               type => CMT_NORMAL, extra_data => $data});
 sub add_comment {
-    my ($self, $comment, $params) = @_;
+  my ($self, $comment, $params) = @_;
 
-    $params ||= {};
+  $params ||= {};
 
-    # Fill out info that doesn't change and callers may not pass in
-    $params->{'bug_id'}  = $self;
-    $params->{'thetext'} = defined($comment) ? $comment : '';
+  # Fill out info that doesn't change and callers may not pass in
+  $params->{'bug_id'} = $self;
+  $params->{'thetext'} = defined($comment) ? $comment : '';
 
-    # Validate all the entered data
-    Bugzilla::Comment->check_required_create_fields($params);
-    $params = Bugzilla::Comment->run_create_validators($params);
+  # Validate all the entered data
+  Bugzilla::Comment->check_required_create_fields($params);
+  $params = Bugzilla::Comment->run_create_validators($params);
 
-    # This makes it so we won't create new comments when there is nothing
-    # to add 
-    if ($params->{'thetext'} eq ''
-        && !($params->{type} || abs($params->{work_time} || 0)))
-    {
-        return;
-    }
+  # This makes it so we won't create new comments when there is nothing
+  # to add
+  if ($params->{'thetext'} eq ''
+    && !($params->{type} || abs($params->{work_time} || 0)))
+  {
+    return;
+  }
 
-    # If the user has explicitly set remaining_time, this will be overridden
-    # later in set_all. But if they haven't, this keeps remaining_time
-    # up-to-date.
-    if ($params->{work_time}) {
-        $self->set_remaining_time(max($self->remaining_time - $params->{work_time}, 0));
-    }
+  # If the user has explicitly set remaining_time, this will be overridden
+  # later in set_all. But if they haven't, this keeps remaining_time
+  # up-to-date.
+  if ($params->{work_time}) {
+    $self->set_remaining_time(max($self->remaining_time - $params->{work_time}, 0));
+  }
 
-    $self->{added_comments} ||= [];
+  $self->{added_comments} ||= [];
 
-    push(@{$self->{added_comments}}, $params);
+  push(@{$self->{added_comments}}, $params);
 }
 
 sub modify_keywords {
-    my ($self, $keywords, $action) = @_;
+  my ($self, $keywords, $action) = @_;
 
-    if (!$action || !grep { $action eq $_ } qw(add remove set)) {
-        $action = 'set';
-    }
+  if (!$action || !grep { $action eq $_ } qw(add remove set)) {
+    $action = 'set';
+  }
 
-    $keywords = $self->_check_keywords($keywords);
-    my @old_keywords = @{ $self->keyword_objects };
-    my @result;
+  $keywords = $self->_check_keywords($keywords);
+  my @old_keywords = @{$self->keyword_objects};
+  my @result;
 
-    if ($action eq 'set') {
-        @result = @$keywords;
+  if ($action eq 'set') {
+    @result = @$keywords;
+  }
+  else {
+    # We're adding or deleting specific keywords.
+    my %keys = map { $_->id => $_ } @old_keywords;
+    if ($action eq 'add') {
+      $keys{$_->id} = $_ foreach @$keywords;
     }
     else {
-        # We're adding or deleting specific keywords.
-        my %keys = map { $_->id => $_ } @old_keywords;
-        if ($action eq 'add') {
-            $keys{$_->id} = $_ foreach @$keywords;
-        }
-        else {
-            delete $keys{$_->id} foreach @$keywords;
-        }
-        @result = values %keys;
+      delete $keys{$_->id} foreach @$keywords;
     }
+    @result = values %keys;
+  }
 
-    # Check if anything was added or removed.
-    my @old_ids = map { $_->id } @old_keywords;
-    my @new_ids = map { $_->id } @result;
-    my ($removed, $added) = diff_arrays(\@old_ids, \@new_ids);
-    my $any_changes = scalar @$removed || scalar @$added;
+  # Check if anything was added or removed.
+  my @old_ids = map { $_->id } @old_keywords;
+  my @new_ids = map { $_->id } @result;
+  my ($removed, $added) = diff_arrays(\@old_ids, \@new_ids);
+  my $any_changes = scalar @$removed || scalar @$added;
 
-    # Make sure we retain the sort order.
-    @result = sort {lc($a->name) cmp lc($b->name)} @result;
+  # Make sure we retain the sort order.
+  @result = sort { lc($a->name) cmp lc($b->name) } @result;
 
-    if ($any_changes) {
-        my $privs;
-        my $new = join(', ', (map {$_->name} @result));
-        my $check = $self->check_can_change_field('keywords', 0, 1, \$privs)
-            || ThrowUserError('illegal_change', { field    => 'keywords',
-                                                  oldvalue => $self->keywords,
-                                                  newvalue => $new,
-                                                  privs    => $privs });
-    }
-
-    $self->{'keyword_objects'} = \@result;
+  if ($any_changes) {
+    my $privs;
+    my $new = join(', ', (map { $_->name } @result));
+    my $check
+      = $self->check_can_change_field('keywords', 0, 1, \$privs) || ThrowUserError(
+      'illegal_change',
+      {
+        field    => 'keywords',
+        oldvalue => $self->keywords,
+        newvalue => $new,
+        privs    => $privs
+      }
+      );
+  }
+
+  $self->{'keyword_objects'} = \@result;
 }
 
 sub add_group {
-    my ($self, $group) = @_;
+  my ($self, $group) = @_;
 
-    # If the user enters "FoO" but the DB has "Foo", $group->name would
-    # return "Foo" and thus revealing the existence of the group name.
-    # So we have to store and pass the name as entered by the user to
-    # the error message, if we have it.
-    my $group_name = blessed($group) ? $group->name : $group;
-    my $args = { name => $group_name, product => $self->product,
-                 bug_id => $self->id, action => 'add' };
+  # If the user enters "FoO" but the DB has "Foo", $group->name would
+  # return "Foo" and thus revealing the existence of the group name.
+  # So we have to store and pass the name as entered by the user to
+  # the error message, if we have it.
+  my $group_name = blessed($group) ? $group->name : $group;
+  my $args = {
+    name    => $group_name,
+    product => $self->product,
+    bug_id  => $self->id,
+    action  => 'add'
+  };
 
-    $group = Bugzilla::Group->check_no_disclose($args) if !blessed $group;
+  $group = Bugzilla::Group->check_no_disclose($args) if !blessed $group;
 
-    # If the bug is already in this group, then there is nothing to do.
-    return if $self->in_group($group);
+  # If the bug is already in this group, then there is nothing to do.
+  return if $self->in_group($group);
 
 
-    # Make sure that bugs in this product can actually be restricted
-    # to this group by the current user.
-    $self->product_obj->group_is_settable($group)
-         || ThrowUserError('group_restriction_not_allowed', $args);
+  # Make sure that bugs in this product can actually be restricted
+  # to this group by the current user.
+  $self->product_obj->group_is_settable($group)
+    || ThrowUserError('group_restriction_not_allowed', $args);
 
-    # OtherControl people can add groups only during a product change,
-    # and only when the group is not NA for them.
-    if (!Bugzilla->user->in_group($group->name)) {
-        my $controls = $self->product_obj->group_controls->{$group->id};
-        if (!$self->{_old_product_name}
-            || $controls->{othercontrol} == CONTROLMAPNA)
-        {
-            ThrowUserError('group_restriction_not_allowed', $args);
-        }
+  # OtherControl people can add groups only during a product change,
+  # and only when the group is not NA for them.
+  if (!Bugzilla->user->in_group($group->name)) {
+    my $controls = $self->product_obj->group_controls->{$group->id};
+    if (!$self->{_old_product_name} || $controls->{othercontrol} == CONTROLMAPNA) {
+      ThrowUserError('group_restriction_not_allowed', $args);
     }
+  }
 
-    my $current_groups = $self->groups_in;
-    push(@$current_groups, $group);
+  my $current_groups = $self->groups_in;
+  push(@$current_groups, $group);
 }
 
 sub remove_group {
-    my ($self, $group) = @_;
+  my ($self, $group) = @_;
 
-    # See add_group() for the reason why we store the user input.
-    my $group_name = blessed($group) ? $group->name : $group;
-    my $args = { name => $group_name, product => $self->product,
-                 bug_id => $self->id, action => 'remove' };
+  # See add_group() for the reason why we store the user input.
+  my $group_name = blessed($group) ? $group->name : $group;
+  my $args = {
+    name    => $group_name,
+    product => $self->product,
+    bug_id  => $self->id,
+    action  => 'remove'
+  };
 
-    $group = Bugzilla::Group->check_no_disclose($args) if !blessed $group;
+  $group = Bugzilla::Group->check_no_disclose($args) if !blessed $group;
 
-    # If the bug isn't in this group, then either the name is misspelled,
-    # or the group really doesn't exist. Let the user know about this problem.
-    $self->in_group($group) || ThrowUserError('group_invalid_removal', $args);
+  # If the bug isn't in this group, then either the name is misspelled,
+  # or the group really doesn't exist. Let the user know about this problem.
+  $self->in_group($group) || ThrowUserError('group_invalid_removal', $args);
 
-    # Check if this is a valid group for this product. You can *always*
-    # remove a group that is not valid for this product (set_product does this).
-    # This particularly happens when we're moving a bug to a new product.
-    # You still have to be a member of an inactive group to remove it.
-    if ($self->product_obj->group_is_valid($group)) {
-        my $controls = $self->product_obj->group_controls->{$group->id};
+  # Check if this is a valid group for this product. You can *always*
+  # remove a group that is not valid for this product (set_product does this).
+  # This particularly happens when we're moving a bug to a new product.
+  # You still have to be a member of an inactive group to remove it.
+  if ($self->product_obj->group_is_valid($group)) {
+    my $controls = $self->product_obj->group_controls->{$group->id};
 
-        # Nobody can ever remove a Mandatory group, unless it became inactive.
-        if ($controls->{membercontrol} == CONTROLMAPMANDATORY && $group->is_active) {
-            ThrowUserError('group_invalid_removal', $args);
-        }
+    # Nobody can ever remove a Mandatory group, unless it became inactive.
+    if ($controls->{membercontrol} == CONTROLMAPMANDATORY && $group->is_active) {
+      ThrowUserError('group_invalid_removal', $args);
+    }
 
-        # OtherControl people can remove groups only during a product change,
-        # and only when they are non-Mandatory and non-NA.
-        if (!Bugzilla->user->in_group($group->name)) {
-            if (!$self->{_old_product_name}
-                || $controls->{othercontrol} == CONTROLMAPMANDATORY
-                || $controls->{othercontrol} == CONTROLMAPNA)
-            {
-                ThrowUserError('group_invalid_removal', $args);
-            }
-        }
+    # OtherControl people can remove groups only during a product change,
+    # and only when they are non-Mandatory and non-NA.
+    if (!Bugzilla->user->in_group($group->name)) {
+      if (!$self->{_old_product_name}
+        || $controls->{othercontrol} == CONTROLMAPMANDATORY
+        || $controls->{othercontrol} == CONTROLMAPNA)
+      {
+        ThrowUserError('group_invalid_removal', $args);
+      }
     }
+  }
 
-    my $current_groups = $self->groups_in;
-    @$current_groups = grep { $_->id != $group->id } @$current_groups;
+  my $current_groups = $self->groups_in;
+  @$current_groups = grep { $_->id != $group->id } @$current_groups;
 }
 
 sub add_see_also {
-    my ($self, $input, $skip_recursion) = @_;
-
-    # This is needed by xt/search.t.
-    $input = $input->name if blessed($input);
+  my ($self, $input, $skip_recursion) = @_;
 
-    $input = trim($input);
-    return if !$input;
+  # This is needed by xt/search.t.
+  $input = $input->name if blessed($input);
 
-    my ($class, $uri) = Bugzilla::BugUrl->class_for($input);
-
-    my $params = { value => $uri, bug_id => $self, class => $class };
-    $class->check_required_create_fields($params);
-
-    my $field_values = $class->run_create_validators($params);
-    my $value = $field_values->{value}->as_string;
-    trick_taint($value);
-    $field_values->{value} = $value;
-
-    # We only add the new URI if it hasn't been added yet. URIs are
-    # case-sensitive, but most of our DBs are case-insensitive, so we do
-    # this check case-insensitively.
-    if (!grep { lc($_->name) eq lc($value) } @{ $self->see_also }) {
-        my $privs;
-        my $can = $self->check_can_change_field('see_also', '', $value, \$privs);
-        if (!$can) {
-            ThrowUserError('illegal_change', { field    => 'see_also',
-                                               newvalue => $value,
-                                               privs    => $privs });
-        }
-        # If this is a link to a local bug then save the
-        # ref bug id for sending changes email.
-        my $ref_bug = delete $field_values->{ref_bug};
-        if ($class->isa('Bugzilla::BugUrl::Bugzilla::Local')
-            and !$skip_recursion
-            and $ref_bug->check_can_change_field('see_also', '', $self->id, \$privs))
-        {
-            $ref_bug->add_see_also($self->id, 'skip_recursion');
-            push @{ $self->{_update_ref_bugs} }, $ref_bug;
-            push @{ $self->{see_also_changes} }, $ref_bug->id;
-        }
-        push @{ $self->{see_also} }, bless ($field_values, $class);
-    }
-}
+  $input = trim($input);
+  return if !$input;
 
-sub remove_see_also {
-    my ($self, $url, $skip_recursion) = @_;
-    my $see_also = $self->see_also;
+  my ($class, $uri) = Bugzilla::BugUrl->class_for($input);
 
-    # This is needed by xt/search.t.
-    $url = $url->name if blessed($url);
+  my $params = {value => $uri, bug_id => $self, class => $class};
+  $class->check_required_create_fields($params);
 
-    my ($removed_bug_url, $new_see_also) =
-        part { lc($_->name) ne lc($url) } @$see_also;
+  my $field_values = $class->run_create_validators($params);
+  my $value        = $field_values->{value}->as_string;
+  trick_taint($value);
+  $field_values->{value} = $value;
 
+  # We only add the new URI if it hasn't been added yet. URIs are
+  # case-sensitive, but most of our DBs are case-insensitive, so we do
+  # this check case-insensitively.
+  if (!grep { lc($_->name) eq lc($value) } @{$self->see_also}) {
     my $privs;
-    my $can = $self->check_can_change_field('see_also', $see_also, $new_see_also, \$privs);
+    my $can = $self->check_can_change_field('see_also', '', $value, \$privs);
     if (!$can) {
-        ThrowUserError('illegal_change', { field    => 'see_also',
-                                           oldvalue => $url,
-                                           privs    => $privs });
+      ThrowUserError('illegal_change',
+        {field => 'see_also', newvalue => $value, privs => $privs});
     }
 
-    # Since we remove also the url from the referenced bug,
-    # we need to notify changes for that bug too.
-    $removed_bug_url = $removed_bug_url->[0];
-    if (!$skip_recursion and $removed_bug_url
-        and $removed_bug_url->isa('Bugzilla::BugUrl::Bugzilla::Local')
-        and $removed_bug_url->ref_bug_url)
+    # If this is a link to a local bug then save the
+    # ref bug id for sending changes email.
+    my $ref_bug = delete $field_values->{ref_bug};
+    if (  $class->isa('Bugzilla::BugUrl::Bugzilla::Local')
+      and !$skip_recursion
+      and $ref_bug->check_can_change_field('see_also', '', $self->id, \$privs))
     {
-        my $ref_bug
-            = Bugzilla::Bug->check($removed_bug_url->ref_bug_url->bug_id);
+      $ref_bug->add_see_also($self->id, 'skip_recursion');
+      push @{$self->{_update_ref_bugs}}, $ref_bug;
+      push @{$self->{see_also_changes}}, $ref_bug->id;
+    }
+    push @{$self->{see_also}}, bless($field_values, $class);
+  }
+}
 
-        if (Bugzilla->user->can_edit_product($ref_bug->product_id)
-            and $ref_bug->check_can_change_field('see_also', $self->id, '', \$privs))
-        {
-            my $self_url = $removed_bug_url->local_uri($self->id);
-            $ref_bug->remove_see_also($self_url, 'skip_recursion');
-            push @{ $self->{_update_ref_bugs} }, $ref_bug;
-            push @{ $self->{see_also_changes} }, $ref_bug->id;
-        }
+sub remove_see_also {
+  my ($self, $url, $skip_recursion) = @_;
+  my $see_also = $self->see_also;
+
+  # This is needed by xt/search.t.
+  $url = $url->name if blessed($url);
+
+  my ($removed_bug_url, $new_see_also)
+    = part { lc($_->name) ne lc($url) } @$see_also;
+
+  my $privs;
+  my $can = $self->check_can_change_field('see_also', $see_also, $new_see_also,
+    \$privs);
+  if (!$can) {
+    ThrowUserError('illegal_change',
+      {field => 'see_also', oldvalue => $url, privs => $privs});
+  }
+
+  # Since we remove also the url from the referenced bug,
+  # we need to notify changes for that bug too.
+  $removed_bug_url = $removed_bug_url->[0];
+  if ( !$skip_recursion
+    and $removed_bug_url
+    and $removed_bug_url->isa('Bugzilla::BugUrl::Bugzilla::Local')
+    and $removed_bug_url->ref_bug_url)
+  {
+    my $ref_bug = Bugzilla::Bug->check($removed_bug_url->ref_bug_url->bug_id);
+
+    if (Bugzilla->user->can_edit_product($ref_bug->product_id)
+      and $ref_bug->check_can_change_field('see_also', $self->id, '', \$privs))
+    {
+      my $self_url = $removed_bug_url->local_uri($self->id);
+      $ref_bug->remove_see_also($self_url, 'skip_recursion');
+      push @{$self->{_update_ref_bugs}}, $ref_bug;
+      push @{$self->{see_also_changes}}, $ref_bug->id;
     }
+  }
 
-    $self->{see_also} = $new_see_also || [];
+  $self->{see_also} = $new_see_also || [];
 }
 
 sub add_tag {
-    my ($self, $tag) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    $tag = $self->_check_tag_name($tag);
+  my ($self, $tag) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+  $tag = $self->_check_tag_name($tag);
+
+  my $tag_id = $user->tags->{$tag}->{id};
+
+  # If this tag doesn't exist for this user yet, create it.
+  if (!$tag_id) {
+    $dbh->do('INSERT INTO tag (user_id, name) VALUES (?, ?)',
+      undef, ($user->id, $tag));
+
+    $tag_id = $dbh->selectrow_array(
+      'SELECT id FROM tag
+                                         WHERE name = ? AND user_id = ?', undef,
+      ($tag, $user->id)
+    );
 
-    my $tag_id = $user->tags->{$tag}->{id};
-    # If this tag doesn't exist for this user yet, create it.
-    if (!$tag_id) {
-        $dbh->do('INSERT INTO tag (user_id, name) VALUES (?, ?)',
-                  undef, ($user->id, $tag));
+    # The list has changed.
+    delete $user->{tags};
+  }
 
-        $tag_id = $dbh->selectrow_array('SELECT id FROM tag
-                                         WHERE name = ? AND user_id = ?',
-                                         undef, ($tag, $user->id));
-        # The list has changed.
-        delete $user->{tags};
-    }
-    # Do nothing if this tag is already set for this bug.
-    return if grep { $_ eq $tag } @{$self->tags};
+  # Do nothing if this tag is already set for this bug.
+  return if grep { $_ eq $tag } @{$self->tags};
 
-    # Increment the counter. Do it before the SQL call below,
-    # to not count the tag twice.
-    $user->tags->{$tag}->{bug_count}++;
+  # Increment the counter. Do it before the SQL call below,
+  # to not count the tag twice.
+  $user->tags->{$tag}->{bug_count}++;
 
-    $dbh->do('INSERT INTO bug_tag (bug_id, tag_id) VALUES (?, ?)',
-              undef, ($self->id, $tag_id));
+  $dbh->do('INSERT INTO bug_tag (bug_id, tag_id) VALUES (?, ?)',
+    undef, ($self->id, $tag_id));
 
-    push(@{$self->{tags}}, $tag);
+  push(@{$self->{tags}}, $tag);
 }
 
 sub remove_tag {
-    my ($self, $tag) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    $tag = $self->_check_tag_name($tag);
+  my ($self, $tag) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+  $tag = $self->_check_tag_name($tag);
 
-    my $tag_id = exists $user->tags->{$tag} ? $user->tags->{$tag}->{id} : undef;
-    # Do nothing if the user doesn't use this tag, or didn't set it for this bug.
-    return unless ($tag_id && grep { $_ eq $tag } @{$self->tags});
+  my $tag_id = exists $user->tags->{$tag} ? $user->tags->{$tag}->{id} : undef;
 
-    $dbh->do('DELETE FROM bug_tag WHERE bug_id = ? AND tag_id = ?',
-              undef, ($self->id, $tag_id));
+  # Do nothing if the user doesn't use this tag, or didn't set it for this bug.
+  return unless ($tag_id && grep { $_ eq $tag } @{$self->tags});
 
-    $self->{tags} = [grep { $_ ne $tag } @{$self->tags}];
+  $dbh->do('DELETE FROM bug_tag WHERE bug_id = ? AND tag_id = ?',
+    undef, ($self->id, $tag_id));
 
-    # Decrement the counter, and delete the tag if no bugs are using it anymore.
-    if (!--$user->tags->{$tag}->{bug_count}) {
-        $dbh->do('DELETE FROM tag WHERE name = ? AND user_id = ?',
-                  undef, ($tag, $user->id));
+  $self->{tags} = [grep { $_ ne $tag } @{$self->tags}];
 
-        # The list has changed.
-        delete $user->{tags};
-    }
+  # Decrement the counter, and delete the tag if no bugs are using it anymore.
+  if (!--$user->tags->{$tag}->{bug_count}) {
+    $dbh->do('DELETE FROM tag WHERE name = ? AND user_id = ?',
+      undef, ($tag, $user->id));
+
+    # The list has changed.
+    delete $user->{tags};
+  }
 }
 
 sub tags {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    # This method doesn't support several users using the same bug object.
-    if (!exists $self->{tags}) {
-        $self->{tags} = $dbh->selectcol_arrayref(
-            'SELECT name FROM bug_tag
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  # This method doesn't support several users using the same bug object.
+  if (!exists $self->{tags}) {
+    $self->{tags} = $dbh->selectcol_arrayref(
+      'SELECT name FROM bug_tag
              INNER JOIN tag ON tag.id = bug_tag.tag_id
-             WHERE bug_id = ? AND user_id = ?',
-             undef, ($self->id, $user->id));
-    }
-    return $self->{tags};
+             WHERE bug_id = ? AND user_id = ?', undef, ($self->id, $user->id)
+    );
+  }
+  return $self->{tags};
 }
 
 #####################################################################
@@ -3247,30 +3510,30 @@ sub tags {
 # These are accessors that don't need to access the database.
 # Keep them in alphabetical order.
 
-sub bug_file_loc        { return $_[0]->{bug_file_loc}        }
-sub bug_id              { return $_[0]->{bug_id}              }
-sub bug_severity        { return $_[0]->{bug_severity}        }
-sub bug_status          { return $_[0]->{bug_status}          }
-sub cclist_accessible   { return $_[0]->{cclist_accessible}   }
-sub component_id        { return $_[0]->{component_id}        }
-sub creation_ts         { return $_[0]->{creation_ts}         }
-sub estimated_time      { return $_[0]->{estimated_time}      }
-sub deadline            { return $_[0]->{deadline}            }
-sub delta_ts            { return $_[0]->{delta_ts}            }
-sub error               { return $_[0]->{error}               }
-sub everconfirmed       { return $_[0]->{everconfirmed}       }
-sub lastdiffed          { return $_[0]->{lastdiffed}          }
-sub op_sys              { return $_[0]->{op_sys}              }
-sub priority            { return $_[0]->{priority}            }
-sub product_id          { return $_[0]->{product_id}          }
-sub remaining_time      { return $_[0]->{remaining_time}      }
+sub bug_file_loc        { return $_[0]->{bug_file_loc} }
+sub bug_id              { return $_[0]->{bug_id} }
+sub bug_severity        { return $_[0]->{bug_severity} }
+sub bug_status          { return $_[0]->{bug_status} }
+sub cclist_accessible   { return $_[0]->{cclist_accessible} }
+sub component_id        { return $_[0]->{component_id} }
+sub creation_ts         { return $_[0]->{creation_ts} }
+sub estimated_time      { return $_[0]->{estimated_time} }
+sub deadline            { return $_[0]->{deadline} }
+sub delta_ts            { return $_[0]->{delta_ts} }
+sub error               { return $_[0]->{error} }
+sub everconfirmed       { return $_[0]->{everconfirmed} }
+sub lastdiffed          { return $_[0]->{lastdiffed} }
+sub op_sys              { return $_[0]->{op_sys} }
+sub priority            { return $_[0]->{priority} }
+sub product_id          { return $_[0]->{product_id} }
+sub remaining_time      { return $_[0]->{remaining_time} }
 sub reporter_accessible { return $_[0]->{reporter_accessible} }
-sub rep_platform        { return $_[0]->{rep_platform}        }
-sub resolution          { return $_[0]->{resolution}          }
-sub short_desc          { return $_[0]->{short_desc}          }
-sub status_whiteboard   { return $_[0]->{status_whiteboard}   }
-sub target_milestone    { return $_[0]->{target_milestone}    }
-sub version             { return $_[0]->{version}             }
+sub rep_platform        { return $_[0]->{rep_platform} }
+sub resolution          { return $_[0]->{resolution} }
+sub short_desc          { return $_[0]->{short_desc} }
+sub status_whiteboard   { return $_[0]->{status_whiteboard} }
+sub target_milestone    { return $_[0]->{target_milestone} }
+sub version             { return $_[0]->{version} }
 
 #####################################################################
 # Complex Accessors
@@ -3289,670 +3552,713 @@ sub version             { return $_[0]->{version}             }
 # security holes.
 
 sub dup_id {
-    my ($self) = @_;
-    return $self->{'dup_id'} if exists $self->{'dup_id'};
+  my ($self) = @_;
+  return $self->{'dup_id'} if exists $self->{'dup_id'};
 
-    $self->{'dup_id'} = undef;
-    return if $self->{'error'};
+  $self->{'dup_id'} = undef;
+  return if $self->{'error'};
 
-    if ($self->{'resolution'} eq 'DUPLICATE') { 
-        my $dbh = Bugzilla->dbh;
-        $self->{'dup_id'} =
-          $dbh->selectrow_array(q{SELECT dupe_of 
+  if ($self->{'resolution'} eq 'DUPLICATE') {
+    my $dbh = Bugzilla->dbh;
+    $self->{'dup_id'} = $dbh->selectrow_array(
+      q{SELECT dupe_of 
                                   FROM duplicates
-                                  WHERE dupe = ?},
-                                undef,
-                                $self->{'bug_id'});
-    }
-    return $self->{'dup_id'};
+                                  WHERE dupe = ?}, undef, $self->{'bug_id'}
+    );
+  }
+  return $self->{'dup_id'};
 }
 
 sub _resolve_ultimate_dup_id {
-    my ($bug_id, $dupe_of, $loops_are_an_error) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $sth = $dbh->prepare('SELECT dupe_of FROM duplicates WHERE dupe = ?');
-
-    my $this_dup = $dupe_of || $dbh->selectrow_array($sth, undef, $bug_id);
-    my $last_dup = $bug_id;
-
-    my %dupes;
-    while ($this_dup) {
-        if ($this_dup == $bug_id) {
-            if ($loops_are_an_error) {
-                ThrowUserError('dupe_loop_detected', { bug_id  => $bug_id,
-                                                       dupe_of => $dupe_of });
-            }
-            else {
-                return $last_dup;
-            }
-        }
-        # If $dupes{$this_dup} is already set to 1, then a loop
-        # already exists which does not involve this bug.
-        # As the user is not responsible for this loop, do not
-        # prevent them from marking this bug as a duplicate.
-        return $last_dup if exists $dupes{$this_dup};
-        $dupes{$this_dup} = 1;
-        $last_dup = $this_dup;
-        $this_dup = $dbh->selectrow_array($sth, undef, $this_dup);
+  my ($bug_id, $dupe_of, $loops_are_an_error) = @_;
+  my $dbh = Bugzilla->dbh;
+  my $sth = $dbh->prepare('SELECT dupe_of FROM duplicates WHERE dupe = ?');
+
+  my $this_dup = $dupe_of || $dbh->selectrow_array($sth, undef, $bug_id);
+  my $last_dup = $bug_id;
+
+  my %dupes;
+  while ($this_dup) {
+    if ($this_dup == $bug_id) {
+      if ($loops_are_an_error) {
+        ThrowUserError('dupe_loop_detected', {bug_id => $bug_id, dupe_of => $dupe_of});
+      }
+      else {
+        return $last_dup;
+      }
     }
 
-    return $last_dup;
+    # If $dupes{$this_dup} is already set to 1, then a loop
+    # already exists which does not involve this bug.
+    # As the user is not responsible for this loop, do not
+    # prevent them from marking this bug as a duplicate.
+    return $last_dup if exists $dupes{$this_dup};
+    $dupes{$this_dup} = 1;
+    $last_dup = $this_dup;
+    $this_dup = $dbh->selectrow_array($sth, undef, $this_dup);
+  }
+
+  return $last_dup;
 }
 
 sub actual_time {
-    my ($self) = @_;
-    return $self->{'actual_time'} if exists $self->{'actual_time'};
+  my ($self) = @_;
+  return $self->{'actual_time'} if exists $self->{'actual_time'};
 
-    if ( $self->{'error'} || !Bugzilla->user->is_timetracker ) {
-        $self->{'actual_time'} = undef;
-        return $self->{'actual_time'};
-    }
+  if ($self->{'error'} || !Bugzilla->user->is_timetracker) {
+    $self->{'actual_time'} = undef;
+    return $self->{'actual_time'};
+  }
 
-    my $sth = Bugzilla->dbh->prepare("SELECT SUM(work_time)
+  my $sth = Bugzilla->dbh->prepare(
+    "SELECT SUM(work_time)
                                       FROM longdescs 
-                                      WHERE longdescs.bug_id=?");
-    $sth->execute($self->{bug_id});
-    $self->{'actual_time'} = $sth->fetchrow_array();
-    return $self->{'actual_time'};
+                                      WHERE longdescs.bug_id=?"
+  );
+  $sth->execute($self->{bug_id});
+  $self->{'actual_time'} = $sth->fetchrow_array();
+  return $self->{'actual_time'};
 }
 
 sub alias {
-    my ($self) = @_;
-    return $self->{'alias'} if exists $self->{'alias'};
-    return [] if $self->{'error'};
-
-    my $dbh = Bugzilla->dbh;
-    $self->{'alias'} = $dbh->selectcol_arrayref(
-        q{SELECT alias
-            FROM bugs_aliases
-           WHERE bug_id = ?
-        ORDER BY alias},
-      undef, $self->bug_id);
+  my ($self) = @_;
+  return $self->{'alias'} if exists $self->{'alias'};
+  return [] if $self->{'error'};
 
-    $self->{'alias'} = [] if !scalar(@{$self->{'alias'}});
+  my $dbh = Bugzilla->dbh;
+  $self->{'alias'}
+    = $dbh->selectcol_arrayref(
+    q{SELECT alias FROM bugs_aliases WHERE bug_id = ? ORDER BY alias},
+    undef, $self->bug_id);
 
-    return $self->{'alias'};
+  return $self->{'alias'};
 }
 
 sub any_flags_requesteeble {
-    my ($self) = @_;
-    return $self->{'any_flags_requesteeble'} 
-        if exists $self->{'any_flags_requesteeble'};
-    return 0 if $self->{'error'};
+  my ($self) = @_;
+  return $self->{'any_flags_requesteeble'}
+    if exists $self->{'any_flags_requesteeble'};
+  return 0 if $self->{'error'};
+
+  my $any_flags_requesteeble
+    = grep { $_->is_requestable && $_->is_requesteeble } @{$self->flag_types};
 
-    my $any_flags_requesteeble =
-      grep { $_->is_requestable && $_->is_requesteeble } @{$self->flag_types};
-    # Useful in case a flagtype is no longer requestable but a requestee
-    # has been set before we turned off that bit.
-    $any_flags_requesteeble ||= grep { $_->requestee_id } @{$self->flags};
-    $self->{'any_flags_requesteeble'} = $any_flags_requesteeble;
+  # Useful in case a flagtype is no longer requestable but a requestee
+  # has been set before we turned off that bit.
+  $any_flags_requesteeble ||= grep { $_->requestee_id } @{$self->flags};
+  $self->{'any_flags_requesteeble'} = $any_flags_requesteeble;
 
-    return $self->{'any_flags_requesteeble'};
+  return $self->{'any_flags_requesteeble'};
 }
 
 sub attachments {
-    my ($self) = @_;
-    return $self->{'attachments'} if exists $self->{'attachments'};
-    return [] if $self->{'error'};
+  my ($self) = @_;
+  return $self->{'attachments'} if exists $self->{'attachments'};
+  return [] if $self->{'error'};
 
-    $self->{'attachments'} =
-        Bugzilla::Attachment->get_attachments_by_bug($self, {preload => 1});
-    return $self->{'attachments'};
+  $self->{'attachments'}
+    = Bugzilla::Attachment->get_attachments_by_bug($self, {preload => 1});
+  $_->object_cache_set() foreach @{$self->{'attachments'}};
+  return $self->{'attachments'};
 }
 
 sub assigned_to {
-    my ($self) = @_;
-    return $self->{'assigned_to_obj'} if exists $self->{'assigned_to_obj'};
-    $self->{'assigned_to'} = 0 if $self->{'error'};
-    $self->{'assigned_to_obj'} ||= new Bugzilla::User({ id => $self->{'assigned_to'}, cache => 1 });
-    return $self->{'assigned_to_obj'};
+  my ($self) = @_;
+  return $self->{'assigned_to_obj'} if exists $self->{'assigned_to_obj'};
+  $self->{'assigned_to'} = 0 if $self->{'error'};
+  $self->{'assigned_to_obj'}
+    ||= new Bugzilla::User({id => $self->{'assigned_to'}, cache => 1});
+  return $self->{'assigned_to_obj'};
 }
 
 sub blocked {
-    my ($self) = @_;
-    return $self->{'blocked'} if exists $self->{'blocked'};
-    return [] if $self->{'error'};
-    $self->{'blocked'} = EmitDependList("dependson", "blocked", $self->bug_id);
-    return $self->{'blocked'};
+  my ($self) = @_;
+  return $self->{'blocked'} if exists $self->{'blocked'};
+  return [] if $self->{'error'};
+  $self->{'blocked'} = EmitDependList("dependson", "blocked", $self->bug_id);
+  return $self->{'blocked'};
 }
 
 sub blocks_obj {
-    my ($self) = @_;
-    $self->{blocks_obj} ||= $self->_bugs_in_order($self->blocked);
-    return $self->{blocks_obj};
+  my ($self) = @_;
+  $self->{blocks_obj} ||= $self->_bugs_in_order($self->blocked);
+  return $self->{blocks_obj};
 }
 
 sub bug_group {
-    my ($self) = @_;
-    return join(', ', (map { $_->name } @{$self->groups_in}));
+  my ($self) = @_;
+  return join(', ', (map { $_->name } @{$self->groups_in}));
 }
 
 sub related_bugs {
-    my ($self, $relationship) = @_;
-    return [] if $self->{'error'};
+  my ($self, $relationship) = @_;
+  return [] if $self->{'error'};
 
-    my $field_name = $relationship->name;
-    $self->{'related_bugs'}->{$field_name} ||= $self->match({$field_name => $self->id});
-    return $self->{'related_bugs'}->{$field_name}; 
+  my $field_name = $relationship->name;
+  $self->{'related_bugs'}->{$field_name}
+    ||= $self->match({$field_name => $self->id});
+  return $self->{'related_bugs'}->{$field_name};
 }
 
 sub cc {
-    my ($self) = @_;
-    return $self->{'cc'} if exists $self->{'cc'};
-    return [] if $self->{'error'};
+  my ($self) = @_;
+  return $self->{'cc'} if exists $self->{'cc'};
+  return [] if $self->{'error'};
 
-    my $dbh = Bugzilla->dbh;
-    $self->{'cc'} = $dbh->selectcol_arrayref(
-        q{SELECT profiles.login_name FROM cc, profiles
+  my $dbh = Bugzilla->dbh;
+  $self->{'cc'} = $dbh->selectcol_arrayref(
+    q{SELECT profiles.login_name FROM cc, profiles
            WHERE bug_id = ?
              AND cc.who = profiles.userid
-        ORDER BY profiles.login_name},
-      undef, $self->bug_id);
+        ORDER BY profiles.login_name}, undef, $self->bug_id
+  );
 
-    return $self->{'cc'};
+  return $self->{'cc'};
 }
 
 # XXX Eventually this will become the standard "cc" method used everywhere.
 sub cc_users {
-    my $self = shift;
-    return $self->{'cc_users'} if exists $self->{'cc_users'};
-    return [] if $self->{'error'};
-    
-    my $dbh = Bugzilla->dbh;
-    my $cc_ids = $dbh->selectcol_arrayref(
-        'SELECT who FROM cc WHERE bug_id = ?', undef, $self->id);
-    $self->{'cc_users'} = Bugzilla::User->new_from_list($cc_ids);
-    return $self->{'cc_users'};
+  my $self = shift;
+  return $self->{'cc_users'} if exists $self->{'cc_users'};
+  return [] if $self->{'error'};
+
+  my $dbh    = Bugzilla->dbh;
+  my $cc_ids = $dbh->selectcol_arrayref('SELECT who FROM cc WHERE bug_id = ?',
+    undef, $self->id);
+  $self->{'cc_users'} = Bugzilla::User->new_from_list($cc_ids);
+  return $self->{'cc_users'};
 }
 
 sub component {
-    my ($self) = @_;
-    return '' if $self->{error};
-    $self->{component} //= $self->component_obj->name;
-    return $self->{component};
+  my ($self) = @_;
+  return '' if $self->{error};
+  $self->{component} //= $self->component_obj->name;
+  return $self->{component};
 }
 
 # XXX Eventually this will replace component()
 sub component_obj {
-    my ($self) = @_;
-    return $self->{component_obj} if defined $self->{component_obj};
-    return {} if $self->{error};
-    $self->{component_obj} =
-        new Bugzilla::Component({ id => $self->{component_id}, cache => 1 });
-    return $self->{component_obj};
+  my ($self) = @_;
+  return $self->{component_obj} if defined $self->{component_obj};
+  return {} if $self->{error};
+  $self->{component_obj}
+    = new Bugzilla::Component({id => $self->{component_id}, cache => 1});
+  return $self->{component_obj};
 }
 
 sub classification_id {
-    my ($self) = @_;
-    return 0 if $self->{error};
-    $self->{classification_id} //= $self->product_obj->classification_id;
-    return $self->{classification_id};
+  my ($self) = @_;
+  return 0 if $self->{error};
+  $self->{classification_id} //= $self->product_obj->classification_id;
+  return $self->{classification_id};
 }
 
 sub classification {
-    my ($self) = @_;
-    return '' if $self->{error};
-    $self->{classification} //= $self->product_obj->classification->name;
-    return $self->{classification};
+  my ($self) = @_;
+  return '' if $self->{error};
+  $self->{classification} //= $self->product_obj->classification->name;
+  return $self->{classification};
 }
 
 sub default_bug_status {
-    my $class = shift;
-    # XXX This should just call new_bug_statuses when the UI accepts closed
-    # bug statuses instead of accepting them as a parameter.
-    my @statuses = @_;
+  my $class = shift;
 
-    my $status;
-    if (scalar(@statuses) == 1) {
-        $status = $statuses[0]->name;
-    }
-    else {
-        $status = ($statuses[0]->name ne 'UNCONFIRMED')
-                  ? $statuses[0]->name : $statuses[1]->name;
-    }
+  # XXX This should just call new_bug_statuses when the UI accepts closed
+  # bug statuses instead of accepting them as a parameter.
+  my @statuses = @_;
 
-    return $status;
+  my $status;
+  if (scalar(@statuses) == 1) {
+    $status = $statuses[0]->name;
+  }
+  else {
+    $status
+      = ($statuses[0]->name ne 'UNCONFIRMED')
+      ? $statuses[0]->name
+      : $statuses[1]->name;
+  }
+
+  return $status;
 }
 
 sub dependson {
-    my ($self) = @_;
-    return $self->{'dependson'} if exists $self->{'dependson'};
-    return [] if $self->{'error'};
-    $self->{'dependson'} = 
-        EmitDependList("blocked", "dependson", $self->bug_id);
-    return $self->{'dependson'};
+  my ($self) = @_;
+  return $self->{'dependson'} if exists $self->{'dependson'};
+  return [] if $self->{'error'};
+  $self->{'dependson'} = EmitDependList("blocked", "dependson", $self->bug_id);
+  return $self->{'dependson'};
 }
 
 sub depends_on_obj {
-    my ($self) = @_;
-    $self->{depends_on_obj} ||= $self->_bugs_in_order($self->dependson);
-    return $self->{depends_on_obj};
+  my ($self) = @_;
+  $self->{depends_on_obj} ||= $self->_bugs_in_order($self->dependson);
+  return $self->{depends_on_obj};
 }
 
 sub duplicates {
-    my $self = shift;
-    return $self->{duplicates} if exists $self->{duplicates};
-    return [] if $self->{error};
-    $self->{duplicates} = Bugzilla::Bug->new_from_list($self->duplicate_ids);
-    return $self->{duplicates};
+  my $self = shift;
+  return $self->{duplicates} if exists $self->{duplicates};
+  return [] if $self->{error};
+  $self->{duplicates} = Bugzilla::Bug->new_from_list($self->duplicate_ids);
+  return $self->{duplicates};
 }
 
 sub duplicate_ids {
-    my $self = shift;
-    return $self->{duplicate_ids} if exists $self->{duplicate_ids};
-    return [] if $self->{error};
+  my $self = shift;
+  return $self->{duplicate_ids} if exists $self->{duplicate_ids};
+  return [] if $self->{error};
 
-    my $dbh = Bugzilla->dbh;
-    $self->{duplicate_ids} =
-      $dbh->selectcol_arrayref('SELECT dupe FROM duplicates WHERE dupe_of = ?',
-                               undef, $self->id);
-    return $self->{duplicate_ids};
+  my $dbh = Bugzilla->dbh;
+  $self->{duplicate_ids}
+    = $dbh->selectcol_arrayref('SELECT dupe FROM duplicates WHERE dupe_of = ?',
+    undef, $self->id);
+  return $self->{duplicate_ids};
 }
 
 sub flag_types {
-    my ($self) = @_;
-    return $self->{'flag_types'} if exists $self->{'flag_types'};
-    return [] if $self->{'error'};
+  my ($self) = @_;
+  return $self->{'flag_types'} if exists $self->{'flag_types'};
+  return [] if $self->{'error'};
 
-    my $vars = { target_type  => 'bug',
-                 product_id   => $self->{product_id},
-                 component_id => $self->{component_id},
-                 bug_id       => $self->bug_id };
+  my $vars = {
+    target_type  => 'bug',
+    product_id   => $self->{product_id},
+    component_id => $self->{component_id},
+    bug_id       => $self->bug_id
+  };
 
-    $self->{'flag_types'} = Bugzilla::Flag->_flag_types($vars);
-    return $self->{'flag_types'};
+  $self->{'flag_types'} = Bugzilla::Flag->_flag_types($vars);
+  return $self->{'flag_types'};
 }
 
 sub flags {
-    my $self = shift;
+  my $self = shift;
 
-    # Don't cache it as it must be in sync with ->flag_types.
-    $self->{flags} = [map { @{$_->{flags}} } @{$self->flag_types}];
-    return $self->{flags};
+  # Don't cache it as it must be in sync with ->flag_types.
+  $self->{flags} = [map { @{$_->{flags}} } @{$self->flag_types}];
+  return $self->{flags};
 }
 
 sub isopened {
-    my $self = shift;
-    return is_open_state($self->{bug_status}) ? 1 : 0;
+  my $self = shift;
+  unless (exists $self->{isopened}) {
+    $self->{isopened} = is_open_state($self->{bug_status}) ? 1 : 0;
+  }
+  return $self->{isopened};
 }
 
 sub keywords {
-    my ($self) = @_;
-    return join(', ', (map { $_->name } @{$self->keyword_objects}));
+  my ($self) = @_;
+  return join(', ', (map { $_->name } @{$self->keyword_objects}));
 }
 
 # XXX At some point, this should probably replace the normal "keywords" sub.
 sub keyword_objects {
-    my $self = shift;
-    return $self->{'keyword_objects'} if defined $self->{'keyword_objects'};
-    return [] if $self->{'error'};
+  my $self = shift;
+  return $self->{'keyword_objects'} if defined $self->{'keyword_objects'};
+  return [] if $self->{'error'};
 
-    my $dbh = Bugzilla->dbh;
-    my $ids = $dbh->selectcol_arrayref(
-         "SELECT keywordid FROM keywords WHERE bug_id = ?", undef, $self->id);
-    $self->{'keyword_objects'} = Bugzilla::Keyword->new_from_list($ids);
-    return $self->{'keyword_objects'};
+  my $dbh = Bugzilla->dbh;
+  my $ids
+    = $dbh->selectcol_arrayref("SELECT keywordid FROM keywords WHERE bug_id = ?",
+    undef, $self->id);
+  $self->{'keyword_objects'} = Bugzilla::Keyword->new_from_list($ids);
+  return $self->{'keyword_objects'};
 }
 
 sub comments {
-    my ($self, $params) = @_;
-    return [] if $self->{'error'};
-    $params ||= {};
-
-    if (!defined $self->{'comments'}) {
-        $self->{'comments'} = Bugzilla::Comment->match({ bug_id => $self->id });
-        my $count = 0;
-        state $is_mysql = Bugzilla->dbh->isa('Bugzilla::DB::Mysql') ? 1 : 0;
-        foreach my $comment (@{ $self->{'comments'} }) {
-            $comment->{count} = $count++;
-            $comment->{bug} = $self;
-            # XXX - hack for MySQL. Convert [U+....] back into its Unicode
-            # equivalent for characters above U+FFFF as MySQL older than 5.5.3
-            # cannot store them, see Bugzilla::Comment::_check_thetext().
-            if ($is_mysql) {
-                # Perl 5.13.8 and older complain about non-characters.
-                no warnings 'utf8';
-                $comment->{thetext} =~ s/\x{FDD0}\[U\+((?:[1-9A-F]|10)[0-9A-F]{4})\]\x{FDD1}/chr(hex $1)/eg
-            }
-        }
-        # Some bugs may have no comments when upgrading old installations.
-        Bugzilla::Comment->preload($self->{'comments'}) if $count;
-    }
-    my @comments = @{ $self->{'comments'} };
-
-    my $order = $params->{order} 
-        || Bugzilla->user->setting('comment_sort_order');
-    if ($order ne 'oldest_to_newest') {
-        @comments = reverse @comments;
-        if ($order eq 'newest_to_oldest_desc_first') {
-            unshift(@comments, pop @comments);
-        }
-    }
-
-    if ($params->{after}) {
-        my $from = datetime_from($params->{after});
-        @comments = grep { datetime_from($_->creation_ts) > $from } @comments;
-    }
-    if ($params->{to}) {
-        my $to = datetime_from($params->{to});
-        @comments = grep { datetime_from($_->creation_ts) <= $to } @comments;
-    }
-    return \@comments;
+  my ($self, $params) = @_;
+  return [] if $self->{'error'};
+  $params ||= {};
+
+  if (!defined $self->{'comments'}) {
+    $self->{'comments'} = Bugzilla::Comment->match({bug_id => $self->id});
+    my $count = 0;
+    state $is_mysql = Bugzilla->dbh->isa('Bugzilla::DB::Mysql') ? 1 : 0;
+    foreach my $comment (@{$self->{'comments'}}) {
+      $comment->{count} = $count++;
+      $comment->{bug}   = $self;
+      weaken($comment->{bug});
+
+      # XXX - hack for MySQL. Convert [U+....] back into its Unicode
+      # equivalent for characters above U+FFFF as MySQL older than 5.5.3
+      # cannot store them, see Bugzilla::Comment::_check_thetext().
+      if ($is_mysql) {
+        $comment->{thetext}
+          =~ s/\x{FDD0}\[U\+((?:[1-9A-F]|10)[0-9A-F]{4})\]\x{FDD1}/chr(hex $1)/eg;
+      }
+    }
+
+    # Some bugs may have no comments when upgrading old installations.
+    Bugzilla::Comment->preload($self->{'comments'}) if $count;
+  }
+  my @comments = @{$self->{'comments'}};
+
+  my $order = $params->{order} || Bugzilla->user->setting('comment_sort_order');
+  if ($order ne 'oldest_to_newest') {
+    @comments = reverse @comments;
+    if ($order eq 'newest_to_oldest_desc_first') {
+      unshift(@comments, pop @comments);
+    }
+  }
+
+  if ($params->{after}) {
+    my $from = datetime_from($params->{after});
+    @comments = grep { datetime_from($_->creation_ts) > $from } @comments;
+  }
+  if ($params->{to}) {
+    my $to = datetime_from($params->{to});
+    @comments = grep { datetime_from($_->creation_ts) <= $to } @comments;
+  }
+  return \@comments;
 }
 
 sub new_bug_statuses {
-    my ($class, $product) = @_;
-    my $user = Bugzilla->user;
+  my ($class, $product) = @_;
+  my $user = Bugzilla->user;
 
-    # Construct the list of allowable statuses.
-    my @statuses = @{ Bugzilla::Bug->statuses_available($product) };
+  # Construct the list of allowable statuses.
+  my @statuses = @{Bugzilla::Bug->statuses_available($product)};
 
-    # If the user has no privs...
-    unless ($user->in_group('editbugs', $product->id)
-            || $user->in_group('canconfirm', $product->id))
-    {
-        # ... use UNCONFIRMED if available, else use the first status of the list.
-        my ($unconfirmed) = grep { $_->name eq 'UNCONFIRMED' } @statuses;
-    
-        # Because of an apparent Perl bug, "$unconfirmed || $statuses[0]" doesn't
-        # work, so we're using an "?:" operator. See bug 603314 for details.
-        @statuses = ($unconfirmed ? $unconfirmed : $statuses[0]);
-    }
+  # If the user has no privs...
+  unless ($user->in_group('editbugs', $product->id)
+    || $user->in_group('canconfirm', $product->id))
+  {
+    # ... use UNCONFIRMED if available, else use the first status of the list.
+    my ($unconfirmed) = grep { $_->name eq 'UNCONFIRMED' } @statuses;
 
-    return \@statuses;
+    # Because of an apparent Perl bug, "$unconfirmed || $statuses[0]" doesn't
+    # work, so we're using an "?:" operator. See bug 603314 for details.
+    @statuses = ($unconfirmed ? $unconfirmed : $statuses[0]);
+  }
+
+  return \@statuses;
 }
 
 # This is needed by xt/search.t.
 sub percentage_complete {
-    my $self = shift;
-    return undef if $self->{'error'} || !Bugzilla->user->is_timetracker;
-    my $remaining = $self->remaining_time;
-    my $actual    = $self->actual_time;
-    my $total = $remaining + $actual;
-    return undef if $total == 0;
-    # Search.pm truncates this value to an integer, so we want to as well,
-    # since this is mostly used in a test where its value needs to be
-    # identical to what the database will return.
-    return int(100 * ($actual / $total));
+  my $self = shift;
+  return undef if $self->{'error'} || !Bugzilla->user->is_timetracker;
+  my $remaining = $self->remaining_time;
+  my $actual    = $self->actual_time;
+  my $total     = $remaining + $actual;
+  return undef if $total == 0;
+
+  # Search.pm truncates this value to an integer, so we want to as well,
+  # since this is mostly used in a test where its value needs to be
+  # identical to what the database will return.
+  return int(100 * ($actual / $total));
 }
 
 sub product {
-    my ($self) = @_;
-    return '' if $self->{error};
-    $self->{product} //= $self->product_obj->name;
-    return $self->{product};
+  my ($self) = @_;
+  return '' if $self->{error};
+  $self->{product} //= $self->product_obj->name;
+  return $self->{product};
 }
 
 # XXX This should eventually replace the "product" subroutine.
 sub product_obj {
-    my $self = shift;
-    return {} if $self->{error};
-    $self->{product_obj} ||=
-        new Bugzilla::Product({ id => $self->{product_id}, cache => 1 });
-    return $self->{product_obj};
+  my $self = shift;
+  return {} if $self->{error};
+  $self->{product_obj}
+    ||= new Bugzilla::Product({id => $self->{product_id}, cache => 1});
+  return $self->{product_obj};
 }
 
 sub qa_contact {
-    my ($self) = @_;
-    return $self->{'qa_contact_obj'} if exists $self->{'qa_contact_obj'};
-    return undef if $self->{'error'};
+  my ($self) = @_;
+  return $self->{'qa_contact_obj'} if exists $self->{'qa_contact_obj'};
+  return undef if $self->{'error'};
 
-    if (Bugzilla->params->{'useqacontact'} && $self->{'qa_contact'}) {
-        $self->{'qa_contact_obj'} = new Bugzilla::User({ id => $self->{'qa_contact'}, cache => 1 });
-    } else {
-        $self->{'qa_contact_obj'} = undef;
-    }
-    return $self->{'qa_contact_obj'};
+  if (Bugzilla->params->{'useqacontact'} && $self->{'qa_contact'}) {
+    $self->{'qa_contact_obj'}
+      = new Bugzilla::User({id => $self->{'qa_contact'}, cache => 1});
+  }
+  else {
+    $self->{'qa_contact_obj'} = undef;
+  }
+  return $self->{'qa_contact_obj'};
 }
 
 sub reporter {
-    my ($self) = @_;
-    return $self->{'reporter'} if exists $self->{'reporter'};
-    $self->{'reporter_id'} = 0 if $self->{'error'};
-    $self->{'reporter'} = new Bugzilla::User({ id => $self->{'reporter_id'}, cache => 1 });
-    return $self->{'reporter'};
+  my ($self) = @_;
+  return $self->{'reporter'} if exists $self->{'reporter'};
+  $self->{'reporter_id'} = 0 if $self->{'error'};
+  $self->{'reporter'}
+    = new Bugzilla::User({id => $self->{'reporter_id'}, cache => 1});
+  return $self->{'reporter'};
 }
 
 sub see_also {
-    my ($self) = @_;
-    return [] if $self->{'error'};
-    if (!exists $self->{see_also}) {
-        my $ids = Bugzilla->dbh->selectcol_arrayref(
-            'SELECT id FROM bug_see_also WHERE bug_id = ?',
-            undef, $self->id);
+  my ($self) = @_;
+  return [] if $self->{'error'};
+  if (!exists $self->{see_also}) {
+    my $ids
+      = Bugzilla->dbh->selectcol_arrayref(
+      'SELECT id FROM bug_see_also WHERE bug_id = ?',
+      undef, $self->id);
 
-        my $bug_urls = Bugzilla::BugUrl->new_from_list($ids);
+    my $bug_urls = Bugzilla::BugUrl->new_from_list($ids);
 
-        $self->{see_also} = $bug_urls;
-    }
-    return $self->{see_also};
+    $self->{see_also} = $bug_urls;
+  }
+  return $self->{see_also};
 }
 
 sub status {
-    my $self = shift;
-    return undef if $self->{'error'};
+  my $self = shift;
+  return undef if $self->{'error'};
 
-    $self->{'status'} ||= new Bugzilla::Status({name => $self->{'bug_status'}});
-    return $self->{'status'};
+  $self->{'status'} ||= new Bugzilla::Status({name => $self->{'bug_status'}});
+  return $self->{'status'};
 }
 
 sub statuses_available {
-    my ($invocant, $product) = @_;
+  my ($invocant, $product) = @_;
 
-    my @statuses;
+  my @statuses;
 
-    if (ref $invocant) {
-      return [] if $invocant->{'error'};
+  if (ref $invocant) {
+    return [] if $invocant->{'error'};
 
-      return $invocant->{'statuses_available'}
-          if defined $invocant->{'statuses_available'};
+    return $invocant->{'statuses_available'}
+      if defined $invocant->{'statuses_available'};
 
-        @statuses = @{ $invocant->status->can_change_to };
-        $product = $invocant->product_obj;
-    } else {
-        @statuses = @{ Bugzilla::Status->can_change_to };
-    }
+    @statuses = @{$invocant->status->can_change_to};
+    $product  = $invocant->product_obj;
+  }
+  else {
+    @statuses = @{Bugzilla::Status->can_change_to};
+  }
 
-    # UNCONFIRMED is only a valid status if it is enabled in this product.
-    if (!$product->allows_unconfirmed) {
-        @statuses = grep { $_->name ne 'UNCONFIRMED' } @statuses;
-    }
+  # UNCONFIRMED is only a valid status if it is enabled in this product.
+  if (!$product->allows_unconfirmed) {
+    @statuses = grep { $_->name ne 'UNCONFIRMED' } @statuses;
+  }
 
-    if (ref $invocant) {
-        my $available = $invocant->_refine_available_statuses(@statuses);
-        $invocant->{'statuses_available'} = $available;
-        return $available;
-    }
+  if (ref $invocant) {
+    my $available = $invocant->_refine_available_statuses(@statuses);
+    $invocant->{'statuses_available'} = $available;
+    return $available;
+  }
 
-    return \@statuses;
+  return \@statuses;
 }
 
 sub _refine_available_statuses {
-    my $self = shift;
-    my @statuses = @_;
-
-    my @available;
-    foreach my $status (@statuses) {
-        # Make sure this is a legal status transition
-        next if !$self->check_can_change_field(
-                     'bug_status', $self->status->name, $status->name);
-        push(@available, $status);
-    }
+  my $self     = shift;
+  my @statuses = @_;
 
-    # If this bug has an inactive status set, it should still be in the list.
-    if (!grep($_->name eq $self->status->name, @available)) {
-        unshift(@available, $self->status);
-    }
-    
-    return \@available;
-}
+  my @available;
+  foreach my $status (@statuses) {
 
-sub show_attachment_flags {
-    my ($self) = @_;
-    return $self->{'show_attachment_flags'} 
-        if exists $self->{'show_attachment_flags'};
-    return 0 if $self->{'error'};
+    # Make sure this is a legal status transition
+    next
+      if !$self->check_can_change_field('bug_status', $self->status->name,
+      $status->name);
+    push(@available, $status);
+  }
 
-    # The number of types of flags that can be set on attachments to this bug
-    # and the number of flags on those attachments.  One of these counts must be
-    # greater than zero in order for the "flags" column to appear in the table
-    # of attachments.
-    my $num_attachment_flag_types = Bugzilla::FlagType::count(
-        { 'target_type'  => 'attachment',
-          'product_id'   => $self->{'product_id'},
-          'component_id' => $self->{'component_id'} });
-    my $num_attachment_flags = Bugzilla::Flag->count(
-        { 'target_type'  => 'attachment',
-          'bug_id'       => $self->bug_id });
+  # If this bug has an inactive status set, it should still be in the list.
+  if (!grep($_->name eq $self->status->name, @available)) {
+    unshift(@available, $self->status);
+  }
 
-    $self->{'show_attachment_flags'} =
-        ($num_attachment_flag_types || $num_attachment_flags);
+  return \@available;
+}
 
-    return $self->{'show_attachment_flags'};
+sub show_attachment_flags {
+  my ($self) = @_;
+  return $self->{'show_attachment_flags'}
+    if exists $self->{'show_attachment_flags'};
+  return 0 if $self->{'error'};
+
+  # The number of types of flags that can be set on attachments to this bug
+  # and the number of flags on those attachments.  One of these counts must be
+  # greater than zero in order for the "flags" column to appear in the table
+  # of attachments.
+  my $num_attachment_flag_types = Bugzilla::FlagType::count({
+    'target_type'  => 'attachment',
+    'product_id'   => $self->{'product_id'},
+    'component_id' => $self->{'component_id'}
+  });
+  my $num_attachment_flags
+    = Bugzilla::Flag->count({
+    'target_type' => 'attachment', 'bug_id' => $self->bug_id
+    });
+
+  $self->{'show_attachment_flags'}
+    = ($num_attachment_flag_types || $num_attachment_flags);
+
+  return $self->{'show_attachment_flags'};
 }
 
 sub groups {
-    my $self = shift;
-    return $self->{'groups'} if exists $self->{'groups'};
-    return [] if $self->{'error'};
+  my $self = shift;
+  return $self->{'groups'} if exists $self->{'groups'};
+  return [] if $self->{'error'};
+
+  my $dbh = Bugzilla->dbh;
+  my @groups;
+
+  # Some of this stuff needs to go into Bugzilla::User
+
+  # For every group, we need to know if there is ANY bug_group_map
+  # record putting the current bug in that group and if there is ANY
+  # user_group_map record putting the user in that group.
+  # The LEFT JOINs are checking for record existence.
+  #
+  my $grouplist = Bugzilla->user->groups_as_string;
+  my $sth
+    = $dbh->prepare("SELECT DISTINCT groups.id, name, description,"
+      . " CASE WHEN bug_group_map.group_id IS NOT NULL"
+      . " THEN 1 ELSE 0 END,"
+      . " CASE WHEN groups.id IN($grouplist) THEN 1 ELSE 0 END,"
+      . " isactive, membercontrol, othercontrol"
+      . " FROM groups"
+      . " LEFT JOIN bug_group_map"
+      . " ON bug_group_map.group_id = groups.id"
+      . " AND bug_id = ?"
+      . " LEFT JOIN group_control_map"
+      . " ON group_control_map.group_id = groups.id"
+      . " AND group_control_map.product_id = ? "
+      . " WHERE isbuggroup = 1"
+      . " ORDER BY description");
+  $sth->execute($self->{'bug_id'}, $self->{'product_id'});
+
+  while (
+    my (
+      $groupid, $name,     $description,   $ison,
+      $ingroup, $isactive, $membercontrol, $othercontrol
+    )
+    = $sth->fetchrow_array()
+    )
+  {
+
+    $membercontrol ||= 0;
+
+    # For product groups, we only want to use the group if either
+    # (1) The bit is set and not required, or
+    # (2) The group is Shown or Default for members and
+    #     the user is a member of the group.
+    if (
+      $ison
+      || ( $isactive
+        && $ingroup
+        && ( ($membercontrol == CONTROLMAPDEFAULT)
+          || ($membercontrol == CONTROLMAPSHOWN)))
+      )
+    {
+      my $ismandatory = $isactive && ($membercontrol == CONTROLMAPMANDATORY);
 
-    my $dbh = Bugzilla->dbh;
-    my @groups;
-
-    # Some of this stuff needs to go into Bugzilla::User
-
-    # For every group, we need to know if there is ANY bug_group_map
-    # record putting the current bug in that group and if there is ANY
-    # user_group_map record putting the user in that group.
-    # The LEFT JOINs are checking for record existence.
-    #
-    my $grouplist = Bugzilla->user->groups_as_string;
-    my $sth = $dbh->prepare(
-             "SELECT DISTINCT groups.id, name, description," .
-             " CASE WHEN bug_group_map.group_id IS NOT NULL" .
-             " THEN 1 ELSE 0 END," .
-             " CASE WHEN groups.id IN($grouplist) THEN 1 ELSE 0 END," .
-             " isactive, membercontrol, othercontrol" .
-             " FROM groups" . 
-             " LEFT JOIN bug_group_map" .
-             " ON bug_group_map.group_id = groups.id" .
-             " AND bug_id = ?" .
-             " LEFT JOIN group_control_map" .
-             " ON group_control_map.group_id = groups.id" .
-             " AND group_control_map.product_id = ? " .
-             " WHERE isbuggroup = 1" .
-             " ORDER BY description");
-    $sth->execute($self->{'bug_id'},
-                  $self->{'product_id'});
-
-    while (my ($groupid, $name, $description, $ison, $ingroup, $isactive,
-            $membercontrol, $othercontrol) = $sth->fetchrow_array()) {
-
-        $membercontrol ||= 0;
-
-        # For product groups, we only want to use the group if either
-        # (1) The bit is set and not required, or
-        # (2) The group is Shown or Default for members and
-        #     the user is a member of the group.
-        if ($ison ||
-            ($isactive && $ingroup
-                       && (($membercontrol == CONTROLMAPDEFAULT)
-                           || ($membercontrol == CONTROLMAPSHOWN))
-            ))
+      push(
+        @groups,
         {
-            my $ismandatory = $isactive
-              && ($membercontrol == CONTROLMAPMANDATORY);
-
-            push (@groups, { "bit" => $groupid,
-                             "name" => $name,
-                             "ison" => $ison,
-                             "ingroup" => $ingroup,
-                             "mandatory" => $ismandatory,
-                             "description" => $description });
+          "bit"         => $groupid,
+          "name"        => $name,
+          "ison"        => $ison,
+          "ingroup"     => $ingroup,
+          "mandatory"   => $ismandatory,
+          "description" => $description
         }
+      );
     }
+  }
 
-    $self->{'groups'} = \@groups;
+  $self->{'groups'} = \@groups;
 
-    return $self->{'groups'};
+  return $self->{'groups'};
 }
 
 sub groups_in {
-    my $self = shift;
-    return $self->{'groups_in'} if exists $self->{'groups_in'};
-    return [] if $self->{'error'};
-    my $group_ids = Bugzilla->dbh->selectcol_arrayref(
-        'SELECT group_id FROM bug_group_map WHERE bug_id = ?',
-        undef, $self->id);
-    $self->{'groups_in'} = Bugzilla::Group->new_from_list($group_ids);
-    return $self->{'groups_in'};
+  my $self = shift;
+  return $self->{'groups_in'} if exists $self->{'groups_in'};
+  return [] if $self->{'error'};
+  my $group_ids
+    = Bugzilla->dbh->selectcol_arrayref(
+    'SELECT group_id FROM bug_group_map WHERE bug_id = ?',
+    undef, $self->id);
+  $self->{'groups_in'} = Bugzilla::Group->new_from_list($group_ids);
+  return $self->{'groups_in'};
 }
 
 sub in_group {
-    my ($self, $group) = @_;
-    return grep($_->id == $group->id, @{$self->groups_in}) ? 1 : 0;
+  my ($self, $group) = @_;
+  return grep($_->id == $group->id, @{$self->groups_in}) ? 1 : 0;
 }
 
 sub user {
-    my $self = shift;
-    return $self->{'user'} if exists $self->{'user'};
-    return {} if $self->{'error'};
-
-    my $user = Bugzilla->user;
-    my $prod_id = $self->{'product_id'};
-
-    my $editbugs = $user->in_group('editbugs', $prod_id);
-    my $is_reporter = $user->id == $self->{reporter_id} ? 1 : 0;
-    my $is_assignee = $user->id == $self->{'assigned_to'} ? 1 : 0;
-    my $is_qa_contact = Bugzilla->params->{'useqacontact'}
-                        && $self->{'qa_contact'}
-                        && $user->id == $self->{'qa_contact'} ? 1 : 0;
-
-    my $canedit = $editbugs || $is_assignee || $is_qa_contact;
-    my $canconfirm = $editbugs || $user->in_group('canconfirm', $prod_id);
-    my $has_any_role = $is_reporter || $is_assignee || $is_qa_contact;
-
-    $self->{'user'} = {canconfirm => $canconfirm,
-                       canedit    => $canedit,
-                       isreporter => $is_reporter,
-                       has_any_role => $has_any_role};
-    return $self->{'user'};
+  my $self = shift;
+  return $self->{'user'} if exists $self->{'user'};
+  return {} if $self->{'error'};
+
+  my $user    = Bugzilla->user;
+  my $prod_id = $self->{'product_id'};
+
+  my $editbugs = $user->in_group('editbugs', $prod_id);
+  my $is_reporter = $user->id == $self->{reporter_id}   ? 1 : 0;
+  my $is_assignee = $user->id == $self->{'assigned_to'} ? 1 : 0;
+  my $is_qa_contact
+    = Bugzilla->params->{'useqacontact'}
+    && $self->{'qa_contact'}
+    && $user->id == $self->{'qa_contact'} ? 1 : 0;
+
+  my $canedit = $editbugs || $is_assignee || $is_qa_contact;
+  my $canconfirm = $editbugs || $user->in_group('canconfirm', $prod_id);
+  my $has_any_role = $is_reporter || $is_assignee || $is_qa_contact;
+
+  $self->{'user'} = {
+    canconfirm   => $canconfirm,
+    canedit      => $canedit,
+    isreporter   => $is_reporter,
+    has_any_role => $has_any_role
+  };
+  return $self->{'user'};
 }
 
 # This is intended to get values that can be selected by the user in the
 # UI. It should not be used for security or validation purposes.
 sub choices {
-    my $self = shift;
-    return $self->{'choices'} if exists $self->{'choices'};
-    return {} if $self->{'error'};
-    my $user = Bugzilla->user;
-
-    my @products = @{ $user->get_enterable_products };
-    # The current product is part of the popup, even if new bugs are no longer
-    # allowed for that product
-    if (!grep($_->name eq $self->product_obj->name, @products)) {
-        unshift(@products, $self->product_obj);
-    }
-    my %class_ids = map { $_->classification_id => 1 } @products;
-    my $classifications = 
-        Bugzilla::Classification->new_from_list([keys %class_ids]);
-
-    my %choices = (
-        bug_status => $self->statuses_available,
-        classification => $classifications,
-        product    => \@products,
-        component  => $self->product_obj->components,
-        version    => $self->product_obj->versions,
-        target_milestone => $self->product_obj->milestones,
-    );
-
-    my $resolution_field = new Bugzilla::Field({ name => 'resolution' });
-    # Don't include the empty resolution in drop-downs.
-    my @resolutions = grep($_->name, @{ $resolution_field->legal_values });
-    $choices{'resolution'} = \@resolutions;
-
-    $self->{'choices'} = \%choices;
-    return $self->{'choices'};
+  my $self = shift;
+  return $self->{'choices'} if exists $self->{'choices'};
+  return {} if $self->{'error'};
+  my $user = Bugzilla->user;
+
+  my @products = @{$user->get_enterable_products};
+
+  # The current product is part of the popup, even if new bugs are no longer
+  # allowed for that product
+  if (!grep($_->name eq $self->product_obj->name, @products)) {
+    unshift(@products, $self->product_obj);
+  }
+  my %class_ids = map { $_->classification_id => 1 } @products;
+  my $classifications
+    = Bugzilla::Classification->new_from_list([keys %class_ids]);
+
+  my %choices = (
+    bug_status       => $self->statuses_available,
+    classification   => $classifications,
+    product          => \@products,
+    component        => $self->product_obj->components,
+    version          => $self->product_obj->versions,
+    target_milestone => $self->product_obj->milestones,
+  );
+
+  my $resolution_field = new Bugzilla::Field({name => 'resolution'});
+
+  # Don't include the empty resolution in drop-downs.
+  my @resolutions = grep($_->name, @{$resolution_field->legal_values});
+  $choices{'resolution'} = \@resolutions;
+
+  foreach my $key (keys %choices) {
+    my $value = $self->$key;
+    $choices{$key}
+      = [grep { $_->is_active || $_->name eq $value } @{$choices{$key}}];
+  }
+
+  $self->{'choices'} = \%choices;
+  return $self->{'choices'};
 }
 
 # Convenience Function. If you need speed, use this. If you need
@@ -3961,11 +4267,11 @@ sub choices {
 # Queries the database for the bug with a given alias, and returns
 # the ID of the bug if it exists or the undefined value if it doesn't.
 sub bug_alias_to_id {
-    my ($alias) = @_;
-    my $dbh = Bugzilla->dbh;
-    trick_taint($alias);
-    return $dbh->selectrow_array(
-        "SELECT bug_id FROM bugs_aliases WHERE alias = ?", undef, $alias);
+  my ($alias) = @_;
+  my $dbh = Bugzilla->dbh;
+  trick_taint($alias);
+  return $dbh->selectrow_array("SELECT bug_id FROM bugs_aliases WHERE alias = ?",
+    undef, $alias);
 }
 
 #####################################################################
@@ -3975,21 +4281,26 @@ sub bug_alias_to_id {
 # Returns a list of currently active and editable bug fields,
 # including multi-select fields.
 sub editable_bug_fields {
-    my @fields = Bugzilla->dbh->bz_table_columns('bugs');
-    # Add multi-select fields
-    push(@fields, map { $_->name } @{Bugzilla->fields({obsolete => 0,
-                                                       type => FIELD_TYPE_MULTI_SELECT})});
-    # Obsolete custom fields are not editable.
-    my @obsolete_fields = @{ Bugzilla->fields({obsolete => 1, custom => 1}) };
-    @obsolete_fields = map { $_->name } @obsolete_fields;
-    foreach my $remove ("bug_id", "reporter", "creation_ts", "delta_ts", 
-                        "lastdiffed", @obsolete_fields) 
-    {
-        my $location = firstidx { $_ eq $remove } @fields;
-        # Ensure field exists before attempting to remove it.
-        splice(@fields, $location, 1) if ($location > -1);
-    }
-    return @fields;
+  my @fields = Bugzilla->dbh->bz_table_columns('bugs');
+
+  # Add multi-select fields
+  push(@fields,
+    map { $_->name }
+      @{Bugzilla->fields({obsolete => 0, type => FIELD_TYPE_MULTI_SELECT})});
+
+  # Obsolete custom fields are not editable.
+  my @obsolete_fields = @{Bugzilla->fields({obsolete => 1, custom => 1})};
+  @obsolete_fields = map { $_->name } @obsolete_fields;
+  foreach
+    my $remove ("bug_id", "reporter", "creation_ts", "delta_ts", "lastdiffed",
+    @obsolete_fields)
+  {
+    my $location = firstidx { $_ eq $remove } @fields;
+
+    # Ensure field exists before attempting to remove it.
+    splice(@fields, $location, 1) if ($location > -1);
+  }
+  return @fields;
 }
 
 # XXX - When Bug::update() will be implemented, we should make this routine
@@ -3997,84 +4308,107 @@ sub editable_bug_fields {
 # Join with bug_status and bugs tables to show bugs with open statuses first,
 # and then the others
 sub EmitDependList {
-    my ($my_field, $target_field, $bug_id, $exclude_resolved) = @_;
-    my $cache = Bugzilla->request_cache->{bug_dependency_list} ||= {};
+  my ($my_field, $target_field, $bug_id, $exclude_resolved) = @_;
+  my $cache = Bugzilla->request_cache->{bug_dependency_list} ||= {};
 
-    my $dbh = Bugzilla->dbh;
-    $exclude_resolved = $exclude_resolved ? 1 : 0;
-    my $is_open_clause = $exclude_resolved ? 'AND is_open = 1' : '';
+  my $dbh = Bugzilla->dbh;
+  $exclude_resolved = $exclude_resolved ? 1 : 0;
+  my $is_open_clause = $exclude_resolved ? 'AND is_open = 1' : '';
 
-    $cache->{"${target_field}_sth_$exclude_resolved"} ||= $dbh->prepare(
-          "SELECT $target_field
+  $cache->{"${target_field}_sth_$exclude_resolved"} ||= $dbh->prepare(
+    "SELECT $target_field
              FROM dependencies
                   INNER JOIN bugs ON dependencies.$target_field = bugs.bug_id
                   INNER JOIN bug_status ON bugs.bug_status = bug_status.value
             WHERE $my_field = ? $is_open_clause
-            ORDER BY is_open DESC, $target_field");
+            ORDER BY is_open DESC, $target_field"
+  );
 
-    return $dbh->selectcol_arrayref(
-        $cache->{"${target_field}_sth_$exclude_resolved"},
-        undef, $bug_id);
+  return $dbh->selectcol_arrayref(
+    $cache->{"${target_field}_sth_$exclude_resolved"},
+    undef, $bug_id);
 }
 
 # Creates a lot of bug objects in the same order as the input array.
 sub _bugs_in_order {
-    my ($self, $bug_ids) = @_;
-    my %bug_map;
-    # there's no need to load bugs from the database if they are already in the
-    # object-cache
-    my @missing_ids;
-    foreach my $bug_id (@$bug_ids) {
-        if (my $bug = Bugzilla::Bug->object_cache_get($bug_id)) {
-            $bug_map{$bug_id} = $bug;
-        }
-        else {
-            push @missing_ids, $bug_id;
-        }
+  my ($self, $bug_ids) = @_;
+  return [] unless @$bug_ids;
+
+  my %bug_map;
+  my $dbh = Bugzilla->dbh;
+
+  # there's no need to load bugs from the database if they are already in the
+  # object-cache
+  my @missing_ids;
+  foreach my $bug_id (@$bug_ids) {
+    if (my $bug = Bugzilla::Bug->object_cache_get($bug_id)) {
+      $bug_map{$bug_id} = $bug;
     }
-    my $bugs = $self->new_from_list(\@missing_ids);
-    foreach my $bug (@$bugs) {
-        $bug_map{$bug->id} = $bug;
+    else {
+      push @missing_ids, $bug_id;
     }
-    return [ map { $bug_map{$_} } @$bug_ids ];
-}
+  }
+  if (@missing_ids) {
+    my $bugs = Bugzilla::Bug->new_from_list(\@missing_ids);
+    $bug_map{$_->id} = $_ foreach @$bugs;
+  }
 
-# Get the activity of a bug, starting from $starttime (if given).
-# This routine assumes Bugzilla::Bug->check has been previously called.
-sub get_activity {
-    my ($self, $attach_id, $starttime, $include_comment_tags) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
+  # Dependencies are often displayed using their aliases instead of their
+  # bug ID. Load them all at once.
+  my $rows
+    = $dbh->selectall_arrayref('SELECT bug_id, alias FROM bugs_aliases WHERE '
+      . $dbh->sql_in('bug_id', $bug_ids)
+      . ' ORDER BY alias');
 
-    # Arguments passed to the SQL query.
-    my @args = ($self->id);
+  foreach my $row (@$rows) {
+    my ($bug_id, $alias) = @$row;
+    $bug_map{$bug_id}->{alias} ||= [];
+    push @{$bug_map{$bug_id}->{alias}}, $alias;
+  }
 
-    # Only consider changes since $starttime, if given.
-    my $datepart = "";
-    if (defined $starttime) {
-        trick_taint($starttime);
-        push (@args, $starttime);
-        $datepart = "AND bug_when > ?";
-    }
+  # Make sure all bugs have their alias attribute set.
+  $bug_map{$_}->{alias} ||= [] foreach @$bug_ids;
 
-    my $attachpart = "";
-    if ($attach_id) {
-        push(@args, $attach_id);
-        $attachpart = "AND bugs_activity.attach_id = ?";
-    }
+  return [map { $bug_map{$_} } @$bug_ids];
+}
 
-    # Only includes attachments the user is allowed to see.
-    my $suppjoins = "";
-    my $suppwhere = "";
-    if (!$user->is_insider) {
-        $suppjoins = "LEFT JOIN attachments 
+# Get the activity of a bug, starting from $starttime (if given).
+# This routine assumes Bugzilla::Bug->check has been previously called.
+sub get_activity {
+  my ($self, $attach_id, $starttime, $include_comment_tags) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  # Arguments passed to the SQL query.
+  my @args = ($self->id);
+
+  # Only consider changes since $starttime, if given.
+  my $datepart = "";
+  if (defined $starttime) {
+    trick_taint($starttime);
+    push(@args, $starttime);
+    $datepart = "AND bug_when > ?";
+  }
+
+  my $attachpart = "";
+  if ($attach_id) {
+    push(@args, $attach_id);
+    $attachpart = "AND bugs_activity.attach_id = ?";
+  }
+
+  # Only includes attachments the user is allowed to see.
+  my $suppjoins = "";
+  my $suppwhere = "";
+  if (!$user->is_insider) {
+    $suppjoins = "LEFT JOIN attachments 
                    ON attachments.attach_id = bugs_activity.attach_id";
-        $suppwhere = "AND COALESCE(attachments.isprivate, 0) = 0";
-    }
+    $suppwhere = "AND COALESCE(attachments.isprivate, 0) = 0";
+  }
 
-    my $query = "SELECT fielddefs.name, bugs_activity.attach_id, " .
-        $dbh->sql_date_format('bugs_activity.bug_when', '%Y.%m.%d %H:%i:%s') .
-            " AS bug_when, bugs_activity.removed, bugs_activity.added, profiles.login_name,
+  my $query
+    = "SELECT fielddefs.name, bugs_activity.attach_id, "
+    . $dbh->sql_date_format('bugs_activity.bug_when', '%Y.%m.%d %H:%i:%s')
+    . " AS bug_when, bugs_activity.removed, bugs_activity.added, profiles.login_name,
                bugs_activity.comment_id
           FROM bugs_activity
                $suppjoins
@@ -4087,24 +4421,26 @@ sub get_activity {
                $attachpart
                $suppwhere ";
 
-    if (Bugzilla->params->{'comment_taggers_group'}
-        && $include_comment_tags
-        && !$attach_id)
-    {
-        # Only includes comment tag activity for comments the user is allowed to see.
-        $suppjoins = "";
-        $suppwhere = "";
-        if (!Bugzilla->user->is_insider) {
-            $suppjoins = "INNER JOIN longdescs
+  if ( Bugzilla->params->{'comment_taggers_group'}
+    && $include_comment_tags
+    && !$attach_id)
+  {
+    # Only includes comment tag activity for comments the user is allowed to see.
+    $suppjoins = "";
+    $suppwhere = "";
+    if (!Bugzilla->user->is_insider) {
+      $suppjoins = "INNER JOIN longdescs
                           ON longdescs.comment_id = longdescs_tags_activity.comment_id";
-            $suppwhere = "AND longdescs.isprivate = 0";
-        }
+      $suppwhere = "AND longdescs.isprivate = 0";
+    }
 
-        $query .= "
+    $query .= "
             UNION ALL
             SELECT 'comment_tag' AS name,
-                   NULL AS attach_id," .
-                   $dbh->sql_date_format('longdescs_tags_activity.bug_when', '%Y.%m.%d %H:%i:%s') . " AS bug_when,
+                   NULL AS attach_id,"
+      . $dbh->sql_date_format('longdescs_tags_activity.bug_when',
+      '%Y.%m.%d %H:%i:%s')
+      . " AS bug_when,
                    longdescs_tags_activity.removed,
                    longdescs_tags_activity.added,
                    profiles.login_name,
@@ -4116,168 +4452,187 @@ sub get_activity {
                    $datepart
                    $suppwhere
         ";
-        push @args, $self->id;
-        push @args, $starttime if defined $starttime;
-    }
+    push @args, $self->id;
+    push @args, $starttime if defined $starttime;
+  }
 
-    $query .= "ORDER BY bug_when, comment_id";
+  $query .= "ORDER BY bug_when, comment_id";
 
-    my $list = $dbh->selectall_arrayref($query, undef, @args);
+  my $list = $dbh->selectall_arrayref($query, undef, @args);
 
-    my @operations;
-    my $operation = {};
-    my $changes = [];
-    my $incomplete_data = 0;
+  my @operations;
+  my $operation       = {};
+  my $changes         = [];
+  my $incomplete_data = 0;
 
-    foreach my $entry (@$list) {
-        my ($fieldname, $attachid, $when, $removed, $added, $who, $comment_id) = @$entry;
-        my %change;
-        my $activity_visible = 1;
-
-        # check if the user should see this field's activity
-        if (grep { $fieldname eq $_ } TIMETRACKING_FIELDS) {
-            $activity_visible = $user->is_timetracker;
-        }
-        elsif ($fieldname eq 'longdescs.isprivate'
-               && !$user->is_insider && $added)
-        { 
-            $activity_visible = 0;
-        } 
-        else {
-            $activity_visible = 1;
-        }
+  foreach my $entry (@$list) {
+    my ($fieldname, $attachid, $when, $removed, $added, $who, $comment_id)
+      = @$entry;
+    my %change;
+    my $activity_visible = 1;
 
-        if ($activity_visible) {
-            # Check for the results of an old Bugzilla data corruption bug
-            if (($added eq '?' && $removed eq '?')
-                || ($added =~ /^\? / || $removed =~ /^\? /)) {
-                $incomplete_data = 1;
-            }
-
-            # An operation, done by 'who' at time 'when', has a number of
-            # 'changes' associated with it.
-            # If this is the start of a new operation, store the data from the
-            # previous one, and set up the new one.
-            if ($operation->{'who'}
-                && ($who ne $operation->{'who'}
-                    || $when ne $operation->{'when'}))
-            {
-                $operation->{'changes'} = $changes;
-                push (@operations, $operation);
-
-                # Create new empty anonymous data structures.
-                $operation = {};
-                $changes = [];
-            }
-
-            # If this is the same field as the previous item, then concatenate
-            # the data into the same change.
-            if ($operation->{'who'} && $who eq $operation->{'who'}
-                && $when eq $operation->{'when'}
-                && $fieldname eq $operation->{'fieldname'}
-                && ($comment_id || 0) == ($operation->{'comment_id'} || 0)
-                && ($attachid || 0) == ($operation->{'attachid'} || 0))
-            {
-                my $old_change = pop @$changes;
-                $removed = join_activity_entries($fieldname, $old_change->{'removed'}, $removed);
-                $added = join_activity_entries($fieldname, $old_change->{'added'}, $added);
-            }
-            $operation->{'who'} = $who;
-            $operation->{'when'} = $when;
-            $operation->{'fieldname'} = $change{'fieldname'} = $fieldname;
-            $operation->{'attachid'} = $change{'attachid'} = $attachid;
-            $change{'removed'} = $removed;
-            $change{'added'} = $added;
-
-            if ($comment_id) {
-                $operation->{comment_id} = $change{'comment'} = Bugzilla::Comment->new($comment_id);
-            }
-
-            push (@$changes, \%change);
-        }
+    # check if the user should see this field's activity
+    if (grep { $fieldname eq $_ } TIMETRACKING_FIELDS) {
+      $activity_visible = $user->is_timetracker;
     }
-
-    if ($operation->{'who'}) {
-        $operation->{'changes'} = $changes;
-        push (@operations, $operation);
+    elsif ($fieldname eq 'longdescs.isprivate' && !$user->is_insider && $added) {
+      $activity_visible = 0;
+    }
+    else {
+      $activity_visible = 1;
     }
 
-    return(\@operations, $incomplete_data);
+    if ($activity_visible) {
+
+      # Check for the results of an old Bugzilla data corruption bug
+      if ( ($added eq '?' && $removed eq '?')
+        || ($added =~ /^\? / || $removed =~ /^\? /))
+      {
+        $incomplete_data = 1;
+      }
+
+      # An operation, done by 'who' at time 'when', has a number of
+      # 'changes' associated with it.
+      # If this is the start of a new operation, store the data from the
+      # previous one, and set up the new one.
+      if ($operation->{'who'}
+        && ($who ne $operation->{'who'} || $when ne $operation->{'when'}))
+      {
+        $operation->{'changes'} = $changes;
+        push(@operations, $operation);
+
+        # Create new empty anonymous data structures.
+        $operation = {};
+        $changes   = [];
+      }
+
+      # If this is the same field as the previous item, then concatenate
+      # the data into the same change.
+      if ( $operation->{'who'}
+        && $who eq $operation->{'who'}
+        && $when eq $operation->{'when'}
+        && $fieldname eq $operation->{'fieldname'}
+        && ($comment_id || 0) == ($operation->{'comment_id'} || 0)
+        && ($attachid   || 0) == ($operation->{'attachid'}   || 0))
+      {
+        my $old_change = pop @$changes;
+        $removed
+          = join_activity_entries($fieldname, $old_change->{'removed'}, $removed);
+        $added = join_activity_entries($fieldname, $old_change->{'added'}, $added);
+      }
+      $operation->{'who'}       = $who;
+      $operation->{'when'}      = $when;
+      $operation->{'fieldname'} = $change{'fieldname'} = $fieldname;
+      $operation->{'attachid'}  = $change{'attachid'} = $attachid;
+      $change{'removed'}        = $removed;
+      $change{'added'}          = $added;
+
+      if ($comment_id) {
+        $operation->{comment_id} = $change{'comment'}
+          = Bugzilla::Comment->new($comment_id);
+      }
+
+      push(@$changes, \%change);
+    }
+  }
+
+  if ($operation->{'who'}) {
+    $operation->{'changes'} = $changes;
+    push(@operations, $operation);
+  }
+
+  return (\@operations, $incomplete_data);
+}
+
+sub has_unsent_changes {
+  my $self = shift;
+  return 1 if !defined $self->lastdiffed;
+  return datetime_from($self->lastdiffed) < datetime_from($self->delta_ts)
+    ? 1
+    : 0;
 }
 
 # Update the bugs_activity table to reflect changes made in bugs.
 sub LogActivityEntry {
-    my ($bug_id, $field, $removed, $added, $user_id, $timestamp, $comment_id,
-        $attach_id) = @_;
-    my $sth = Bugzilla->dbh->prepare_cached(
-        'INSERT INTO bugs_activity
+  my ($bug_id, $field, $removed, $added, $user_id, $timestamp, $comment_id,
+    $attach_id)
+    = @_;
+  my $sth = Bugzilla->dbh->prepare_cached(
+    'INSERT INTO bugs_activity
         (bug_id, who, bug_when, fieldid, removed, added, comment_id, attach_id)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)');
-
-    # in the case of CCs, deps, and keywords, there's a possibility that someone
-    # might try to add or remove a lot of them at once, which might take more
-    # space than the activity table allows.  We'll solve this by splitting it
-    # into multiple entries if it's too long.
-    while ($removed || $added) {
-        my ($removestr, $addstr) = ($removed, $added);
-        if (length($removestr) > MAX_LINE_LENGTH) {
-            my $commaposition = find_wrap_point($removed, MAX_LINE_LENGTH);
-            $removestr = substr($removed, 0, $commaposition);
-            $removed = substr($removed, $commaposition);
-        } else {
-            $removed = ""; # no more entries
-        }
-        if (length($addstr) > MAX_LINE_LENGTH) {
-            my $commaposition = find_wrap_point($added, MAX_LINE_LENGTH);
-            $addstr = substr($added, 0, $commaposition);
-            $added = substr($added, $commaposition);
-        } else {
-            $added = ""; # no more entries
-        }
-        trick_taint($addstr);
-        trick_taint($removestr);
-        my $fieldid = get_field_id($field);
-        $sth->execute($bug_id, $user_id, $timestamp, $fieldid, $removestr,
-            $addstr, $comment_id, $attach_id);
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)'
+  );
+
+  # in the case of CCs, deps, and keywords, there's a possibility that someone
+  # might try to add or remove a lot of them at once, which might take more
+  # space than the activity table allows.  We'll solve this by splitting it
+  # into multiple entries if it's too long.
+  while ($removed || $added) {
+    my ($removestr, $addstr) = ($removed, $added);
+    if (length($removestr) > MAX_LINE_LENGTH) {
+      my $commaposition = find_wrap_point($removed, MAX_LINE_LENGTH);
+      $removestr = substr($removed, 0, $commaposition);
+      $removed = substr($removed, $commaposition);
     }
+    else {
+      $removed = "";    # no more entries
+    }
+    if (length($addstr) > MAX_LINE_LENGTH) {
+      my $commaposition = find_wrap_point($added, MAX_LINE_LENGTH);
+      $addstr = substr($added, 0, $commaposition);
+      $added = substr($added, $commaposition);
+    }
+    else {
+      $added = "";      # no more entries
+    }
+    trick_taint($addstr);
+    trick_taint($removestr);
+    my $fieldid = get_field_id($field);
+    $sth->execute(
+      $bug_id,    $user_id, $timestamp,  $fieldid,
+      $removestr, $addstr,  $comment_id, $attach_id
+    );
+  }
 }
 
 # Update bug_user_last_visit table
 sub update_user_last_visit {
-    my ($self, $user, $last_visit_ts) = @_;
-    my $lv = Bugzilla::BugUserLastVisit->match({ bug_id  => $self->id,
-                                                 user_id => $user->id })->[0];
-
-    if ($lv) {
-        $lv->set(last_visit_ts => $last_visit_ts);
-        $lv->update;
-    }
-    else {
-        Bugzilla::BugUserLastVisit->create({ bug_id        => $self->id,
-                                             user_id       => $user->id,
-                                             last_visit_ts => $last_visit_ts });
-    }
+  my ($self, $user, $last_visit_ts) = @_;
+  my $lv
+    = Bugzilla::BugUserLastVisit->match({bug_id => $self->id, user_id => $user->id
+    })->[0];
+
+  if ($lv) {
+    $lv->set(last_visit_ts => $last_visit_ts);
+    $lv->update;
+  }
+  else {
+    Bugzilla::BugUserLastVisit->create({
+      bug_id => $self->id, user_id => $user->id, last_visit_ts => $last_visit_ts
+    });
+  }
 }
 
 # Convert WebService API and email_in.pl field names to internal DB field
 # names.
 sub map_fields {
-    my ($params, $except) = @_; 
-
-    my %field_values;
-    foreach my $field (keys %$params) {
-        # Don't allow setting private fields via email_in or the WebService.
-        next if $field =~ /^_/;
-        my $field_name;
-        if ($except->{$field}) {
-           $field_name = $field;
-        }
-        else {
-            $field_name = FIELD_MAP->{$field} || $field;
-        }
-        $field_values{$field_name} = $params->{$field};
+  my ($params, $except) = @_;
+
+  my %field_values;
+  foreach my $field (keys %$params) {
+
+    # Don't allow setting private fields via email_in or the WebService.
+    next if $field =~ /^_/;
+    my $field_name;
+    if ($except->{$field}) {
+      $field_name = $field;
+    }
+    else {
+      $field_name = FIELD_MAP->{$field} || $field;
     }
-    return \%field_values;
+    $field_values{$field_name} = $params->{$field};
+  }
+  return \%field_values;
 }
 
 ################################################################################
@@ -4297,164 +4652,193 @@ sub map_fields {
 # $PrivilegesRequired - return the reason of the failure, if any
 ################################################################################
 sub check_can_change_field {
-    my $self = shift;
-    my ($field, $oldvalue, $newvalue, $PrivilegesRequired) = (@_);
-    my $user = Bugzilla->user;
+  my $self = shift;
+  my ($field, $oldvalue, $newvalue, $PrivilegesRequired) = (@_);
+  my $user = Bugzilla->user;
+
+  $oldvalue = defined($oldvalue) ? $oldvalue : '';
+  $newvalue = defined($newvalue) ? $newvalue : '';
+
+  # Return true if they haven't changed this field at all.
+  if ($oldvalue eq $newvalue) {
+    return 1;
+  }
+  elsif (ref($newvalue) eq 'ARRAY' && ref($oldvalue) eq 'ARRAY') {
+    my ($removed, $added) = diff_arrays($oldvalue, $newvalue);
+    return 1 if !scalar(@$removed) && !scalar(@$added);
+  }
+  elsif (trim($oldvalue) eq trim($newvalue)) {
+    return 1;
 
-    $oldvalue = defined($oldvalue) ? $oldvalue : '';
-    $newvalue = defined($newvalue) ? $newvalue : '';
-
-    # Return true if they haven't changed this field at all.
-    if ($oldvalue eq $newvalue) {
-        return 1;
-    } elsif (ref($newvalue) eq 'ARRAY' && ref($oldvalue) eq 'ARRAY') {
-        my ($removed, $added) = diff_arrays($oldvalue, $newvalue);
-        return 1 if !scalar(@$removed) && !scalar(@$added);
-    } elsif (trim($oldvalue) eq trim($newvalue)) {
-        return 1;
     # numeric fields need to be compared using ==
-    } elsif (($field eq 'estimated_time' || $field eq 'remaining_time' 
-              || $field eq 'work_time')
-             && $oldvalue == $newvalue)
+  }
+  elsif (
+    (
+         $field eq 'estimated_time'
+      || $field eq 'remaining_time'
+      || $field eq 'work_time'
+    )
+    && $oldvalue == $newvalue
+    )
+  {
+    return 1;
+  }
+
+  my @priv_results;
+  Bugzilla::Hook::process(
+    'bug_check_can_change_field',
     {
-        return 1;
-    }
-
-    my @priv_results;
-    Bugzilla::Hook::process('bug_check_can_change_field',
-        { bug => $self, field => $field, 
-          new_value => $newvalue, old_value => $oldvalue, 
-          priv_results => \@priv_results });
-    if (my $priv_required = first { $_ > 0 } @priv_results) {
-        $$PrivilegesRequired = $priv_required;
-        return 0;
-    }
-    my $allow_found = first { $_ == 0 } @priv_results;
-    if (defined $allow_found) {
-        return 1;
-    }
-
-    # Allow anyone to change comments, or set flags
-    if ($field =~ /^longdesc/ || $field eq 'flagtypes.name') {
-        return 1;
-    }
-
-    # If the user isn't allowed to change a field, we must tell them who can.
-    # We store the required permission set into the $PrivilegesRequired
-    # variable which gets passed to the error template.
-    #
-    # $PrivilegesRequired = PRIVILEGES_REQUIRED_NONE : no privileges required;
-    # $PrivilegesRequired = PRIVILEGES_REQUIRED_REPORTER : the reporter, assignee or an empowered user;
-    # $PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE : the assignee or an empowered user;
-    # $PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED : an empowered user.
-
-    # Only users in the time-tracking group can change time-tracking fields,
-    # including the deadline.
-    if (grep { $_ eq $field } (TIMETRACKING_FIELDS, 'deadline')) {
-        if (!$user->is_timetracker) {
-            $$PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED;
-            return 0;
-        }
-    }
+      bug          => $self,
+      field        => $field,
+      new_value    => $newvalue,
+      old_value    => $oldvalue,
+      priv_results => \@priv_results
+    }
+  );
+  if (my $priv_required = first { $_ > 0 } @priv_results) {
+    $$PrivilegesRequired = $priv_required;
+    return 0;
+  }
+  my $allow_found = first { $_ == 0 } @priv_results;
+  if (defined $allow_found) {
+    return 1;
+  }
+
+  # Allow anyone to change comments, or set flags
+  if ($field =~ /^longdesc/ || $field eq 'flagtypes.name') {
+    return 1;
+  }
+
+# If the user isn't allowed to change a field, we must tell them who can.
+# We store the required permission set into the $PrivilegesRequired
+# variable which gets passed to the error template.
+#
+# $PrivilegesRequired = PRIVILEGES_REQUIRED_NONE : no privileges required;
+# $PrivilegesRequired = PRIVILEGES_REQUIRED_REPORTER : the reporter, assignee or an empowered user;
+# $PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE : the assignee or an empowered user;
+# $PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED : an empowered user.
+
+  # Only users in the time-tracking group can change time-tracking fields,
+  # including the deadline.
+  if (grep { $_ eq $field } (TIMETRACKING_FIELDS, 'deadline')) {
+    if (!$user->is_timetracker) {
+      $$PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED;
+      return 0;
+    }
+  }
+
+  # Allow anyone with (product-specific) "editbugs" privs to change anything.
+  if ($user->in_group('editbugs', $self->{'product_id'})) {
+    return 1;
+  }
+
+  # You need editbugs in order to change the alias
+  if ($field eq 'alias') {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED;
+    return 0;
+  }
+
+  # *Only* users with (product-specific) "canconfirm" privs can confirm bugs.
+  if ($self->_changes_everconfirmed($field, $oldvalue, $newvalue)) {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED;
+    return $user->in_group('canconfirm', $self->{'product_id'});
+  }
+
+  # Make sure that a valid bug ID has been given.
+  if (!$self->{'error'}) {
 
-    # Allow anyone with (product-specific) "editbugs" privs to change anything.
-    if ($user->in_group('editbugs', $self->{'product_id'})) {
-        return 1;
+    # Allow the assignee to change anything else.
+    if ( $self->{'assigned_to'} == $user->id
+      || $self->{'_old_assigned_to'} && $self->{'_old_assigned_to'} == $user->id)
+    {
+      return 1;
     }
 
-    # *Only* users with (product-specific) "canconfirm" privs can confirm bugs.
-    if ($self->_changes_everconfirmed($field, $oldvalue, $newvalue)) {
-        $$PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED;
-        return $user->in_group('canconfirm', $self->{'product_id'});
+    # Allow the QA contact to change anything else.
+    if (
+      Bugzilla->params->{'useqacontact'}
+      && ( ($self->{'qa_contact'} && $self->{'qa_contact'} == $user->id)
+        || ($self->{'_old_qa_contact'} && $self->{'_old_qa_contact'} == $user->id))
+      )
+    {
+      return 1;
     }
+  }
 
-    # Make sure that a valid bug ID has been given.
-    if (!$self->{'error'}) {
-        # Allow the assignee to change anything else.
-        if ($self->{'assigned_to'} == $user->id
-            || $self->{'_old_assigned_to'} && $self->{'_old_assigned_to'} == $user->id)
-        {
-            return 1;
-        }
+  # At this point, the user is either the reporter or an
+  # unprivileged user. We first check for fields the reporter
+  # is not allowed to change.
 
-        # Allow the QA contact to change anything else.
-        if (Bugzilla->params->{'useqacontact'}
-            && (($self->{'qa_contact'} && $self->{'qa_contact'} == $user->id)
-                || ($self->{'_old_qa_contact'} && $self->{'_old_qa_contact'} == $user->id)))
-        {
-            return 1;
-        }
-    }
+  # The reporter may not:
+  # - reassign bugs, unless the bugs are assigned to them;
+  #   in that case we will have already returned 1 above
+  #   when checking for the assignee of the bug.
+  if ($field eq 'assigned_to') {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
+    return 0;
+  }
 
-    # At this point, the user is either the reporter or an
-    # unprivileged user. We first check for fields the reporter
-    # is not allowed to change.
+  # - change the QA contact
+  if ($field eq 'qa_contact') {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
+    return 0;
+  }
 
-    # The reporter may not:
-    # - reassign bugs, unless the bugs are assigned to them;
-    #   in that case we will have already returned 1 above
-    #   when checking for the assignee of the bug.
-    if ($field eq 'assigned_to') {
-        $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
-        return 0;
-    }
-    # - change the QA contact
-    if ($field eq 'qa_contact') {
-        $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
-        return 0;
-    }
-    # - change the target milestone
-    if ($field eq 'target_milestone') {
-        $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
-        return 0;
-    }
-    # - change the priority (unless they could have set it originally)
-    if ($field eq 'priority'
-        && !Bugzilla->params->{'letsubmitterchoosepriority'})
-    {
-        $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
-        return 0;
-    }
-    # - unconfirm bugs (confirming them is handled above)
-    if ($field eq 'everconfirmed') {
-        $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
-        return 0;
-    }
-    # - change the status from one open state to another
-    if ($field eq 'bug_status'
-        && is_open_state($oldvalue) && is_open_state($newvalue)) 
-    {
-       $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
-       return 0;
-    }
+  # - change the target milestone
+  if ($field eq 'target_milestone') {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
+    return 0;
+  }
 
-    # The reporter is allowed to change anything else.
-    if (!$self->{'error'} && $self->{'reporter_id'} == $user->id) {
-        return 1;
-    }
+  # - change the priority (unless they could have set it originally)
+  if ($field eq 'priority' && !Bugzilla->params->{'letsubmitterchoosepriority'}) {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
+    return 0;
+  }
 
-    # If we haven't returned by this point, then the user doesn't
-    # have the necessary permissions to change this field.
-    $$PrivilegesRequired = PRIVILEGES_REQUIRED_REPORTER;
+  # - unconfirm bugs (confirming them is handled above)
+  if ($field eq 'everconfirmed') {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
     return 0;
+  }
+
+  # - change the status from one open state to another
+  if ( $field eq 'bug_status'
+    && is_open_state($oldvalue)
+    && is_open_state($newvalue))
+  {
+    $$PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE;
+    return 0;
+  }
+
+  # The reporter is allowed to change anything else.
+  if (!$self->{'error'} && $self->{'reporter_id'} == $user->id) {
+    return 1;
+  }
+
+  # If we haven't returned by this point, then the user doesn't
+  # have the necessary permissions to change this field.
+  $$PrivilegesRequired = PRIVILEGES_REQUIRED_REPORTER;
+  return 0;
 }
 
 # A helper for check_can_change_field
 sub _changes_everconfirmed {
-    my ($self, $field, $old, $new) = @_;
-    return 1 if $field eq 'everconfirmed';
-    if ($field eq 'bug_status') {
-        if ($self->everconfirmed) {
-            # Moving a confirmed bug to UNCONFIRMED will change everconfirmed.
-            return 1 if $new eq 'UNCONFIRMED';
-        }
-        else {
-            # Moving an unconfirmed bug to an open state that isn't 
-            # UNCONFIRMED will confirm the bug.
-            return 1 if (is_open_state($new) and $new ne 'UNCONFIRMED');
-        }
+  my ($self, $field, $old, $new) = @_;
+  return 1 if $field eq 'everconfirmed';
+  if ($field eq 'bug_status') {
+    if ($self->everconfirmed) {
+
+      # Moving a confirmed bug to UNCONFIRMED will change everconfirmed.
+      return 1 if $new eq 'UNCONFIRMED';
     }
-    return 0;
+    else {
+      # Moving an unconfirmed bug to an open state that isn't
+      # UNCONFIRMED will confirm the bug.
+      return 1 if (is_open_state($new) and $new ne 'UNCONFIRMED');
+    }
+  }
+  return 0;
 }
 
 #
@@ -4463,71 +4847,77 @@ sub _changes_everconfirmed {
 
 # Validate and return a hash of dependencies
 sub ValidateDependencies {
-    my $fields = {};
-    # These can be arrayrefs or they can be strings.
-    $fields->{'dependson'} = shift;
-    $fields->{'blocked'} = shift;
-    my $id = shift || 0;
-
-    unless (defined($fields->{'dependson'})
-            || defined($fields->{'blocked'}))
-    {
-        return;
-    }
-
-    my $dbh = Bugzilla->dbh;
-    my %deps;
-    my %deptree;
-    foreach my $pair (["blocked", "dependson"], ["dependson", "blocked"]) {
-        my ($me, $target) = @{$pair};
-        $deptree{$target} = [];
-        $deps{$target} = [];
-        next unless $fields->{$target};
-
-        my %seen;
-        my $target_array = ref($fields->{$target}) ? $fields->{$target}
-                           : [split(/[\s,]+/, $fields->{$target})];
-        foreach my $i (@$target_array) {
-            if ($id == $i) {
-                ThrowUserError("dependency_loop_single");
-            }
-            if (!exists $seen{$i}) {
-                push(@{$deptree{$target}}, $i);
-                $seen{$i} = 1;
-            }
-        }
-        # populate $deps{$target} as first-level deps only.
-        # and find remainder of dependency tree in $deptree{$target}
-        @{$deps{$target}} = @{$deptree{$target}};
-        my @stack = @{$deps{$target}};
-        while (@stack) {
-            my $i = shift @stack;
-            my $dep_list =
-                $dbh->selectcol_arrayref("SELECT $target
-                                          FROM dependencies
-                                          WHERE $me = ?", undef, $i);
-            foreach my $t (@$dep_list) {
-                # ignore any _current_ dependencies involving this bug,
-                # as they will be overwritten with data from the form.
-                if ($t != $id && !exists $seen{$t}) {
-                    push(@{$deptree{$target}}, $t);
-                    push @stack, $t;
-                    $seen{$t} = 1;
-                }
-            }
+  my $fields = {};
+
+  # These can be arrayrefs or they can be strings.
+  $fields->{'dependson'} = shift;
+  $fields->{'blocked'}   = shift;
+  my $id = shift || 0;
+
+  unless (defined($fields->{'dependson'}) || defined($fields->{'blocked'})) {
+    return;
+  }
+
+  my $dbh = Bugzilla->dbh;
+  my %deps;
+  my %deptree;
+  my %sth;
+  $sth{dependson}
+    = $dbh->prepare('SELECT dependson FROM dependencies WHERE blocked   = ?');
+  $sth{blocked}
+    = $dbh->prepare('SELECT blocked   FROM dependencies WHERE dependson = ?');
+
+  foreach my $pair (["blocked", "dependson"], ["dependson", "blocked"]) {
+    my ($me, $target) = @{$pair};
+    $deptree{$target} = [];
+    $deps{$target}    = [];
+    next unless $fields->{$target};
+
+    my %seen;
+    my $target_array
+      = ref($fields->{$target})
+      ? $fields->{$target}
+      : [split(/[\s,]+/, $fields->{$target})];
+    foreach my $i (@$target_array) {
+      if ($id == $i) {
+        ThrowUserError("dependency_loop_single");
+      }
+      if (!exists $seen{$i}) {
+        push(@{$deptree{$target}}, $i);
+        $seen{$i} = 1;
+      }
+    }
+
+    # populate $deps{$target} as first-level deps only.
+    # and find remainder of dependency tree in $deptree{$target}
+    @{$deps{$target}} = @{$deptree{$target}};
+    my @stack = @{$deps{$target}};
+    while (@stack) {
+      my $i = shift @stack;
+      my $dep_list = $dbh->selectcol_arrayref($sth{$target}, undef, $i);
+      foreach my $t (@$dep_list) {
+
+        # ignore any _current_ dependencies involving this bug,
+        # as they will be overwritten with data from the form.
+        if ($t != $id && !exists $seen{$t}) {
+          push(@{$deptree{$target}}, $t);
+          push @stack, $t;
+          $seen{$t} = 1;
         }
+      }
     }
+  }
 
-    my @deps   = @{$deptree{'dependson'}};
-    my @blocks = @{$deptree{'blocked'}};
-    my %union = ();
-    my %isect = ();
-    foreach my $b (@deps, @blocks) { $union{$b}++ && $isect{$b}++ }
-    my @isect = keys %isect;
-    if (scalar(@isect) > 0) {
-        ThrowUserError("dependency_loop_multi", {'deps' => \@isect});
-    }
-    return %deps;
+  my @deps   = @{$deptree{'dependson'}};
+  my @blocks = @{$deptree{'blocked'}};
+  my %union  = ();
+  my %isect  = ();
+  foreach my $b (@deps, @blocks) { $union{$b}++ && $isect{$b}++ }
+  my @isect = keys %isect;
+  if (scalar(@isect) > 0) {
+    ThrowUserError("dependency_loop_multi", {'deps' => \@isect});
+  }
+  return %deps;
 }
 
 
@@ -4536,51 +4926,52 @@ sub ValidateDependencies {
 #####################################################################
 
 sub _create_cf_accessors {
-    my ($invocant) = @_;
-    my $class = ref($invocant) || $invocant;
-    return if Bugzilla->request_cache->{"${class}_cf_accessors_created"};
-
-    my $fields = Bugzilla->fields({ custom => 1 });
-    foreach my $field (@$fields) {
-        my $accessor = $class->_accessor_for($field);
-        my $name = "${class}::" . $field->name;
-        {
-            no strict 'refs';
-            next if defined *{$name};
-            *{$name} = $accessor;
-        }
+  my ($invocant) = @_;
+  my $class = ref($invocant) || $invocant;
+  return if Bugzilla->request_cache->{"${class}_cf_accessors_created"};
+
+  my $fields = Bugzilla->fields({custom => 1});
+  foreach my $field (@$fields) {
+    my $accessor = $class->_accessor_for($field);
+    my $name     = "${class}::" . $field->name;
+    {
+      no strict 'refs';
+      next if defined *{$name};
+      *{$name} = $accessor;
     }
+  }
 
-    Bugzilla->request_cache->{"${class}_cf_accessors_created"} = 1;
+  Bugzilla->request_cache->{"${class}_cf_accessors_created"} = 1;
 }
 
 sub _accessor_for {
-    my ($class, $field) = @_;
-    if ($field->type == FIELD_TYPE_MULTI_SELECT) {
-        return $class->_multi_select_accessor($field->name);
-    }
-    return $class->_cf_accessor($field->name);
+  my ($class, $field) = @_;
+  if ($field->type == FIELD_TYPE_MULTI_SELECT) {
+    return $class->_multi_select_accessor($field->name);
+  }
+  return $class->_cf_accessor($field->name);
 }
 
 sub _cf_accessor {
-    my ($class, $field) = @_;
-    my $accessor = sub {
-        my ($self) = @_;
-        return $self->{$field};
-    };
-    return $accessor;
+  my ($class, $field) = @_;
+  my $accessor = sub {
+    my ($self) = @_;
+    return $self->{$field};
+  };
+  return $accessor;
 }
 
 sub _multi_select_accessor {
-    my ($class, $field) = @_;
-    my $accessor = sub {
-        my ($self) = @_;
-        $self->{$field} ||= Bugzilla->dbh->selectcol_arrayref(
-            "SELECT value FROM bug_$field WHERE bug_id = ? ORDER BY value",
-            undef, $self->id);
-        return $self->{$field};
-    };
-    return $accessor;
+  my ($class, $field) = @_;
+  my $accessor = sub {
+    my ($self) = @_;
+    $self->{$field}
+      ||= Bugzilla->dbh->selectcol_arrayref(
+      "SELECT value FROM bug_$field WHERE bug_id = ? ORDER BY value",
+      undef, $self->id);
+    return $self->{$field};
+  };
+  return $accessor;
 }
 
 1;
@@ -4609,6 +5000,10 @@ call L<update> to make the changes permanent.
 Creates or updates a L<Bugzilla::BugUserLastVisit> for this bug and the supplied
 $user, the timestamp given as $last_visit.
 
+=item C<has_unsent_changes()>
+
+Checks if this bug has changes for which bug mail has not been sent.
+
 =back
 
 =head1 B<Methods in need of POD>
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm
index 8b4219787d..5cddf8415c 100644
--- a/Bugzilla/BugMail.pm
+++ b/Bugzilla/BugMail.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugMail;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,21 +26,19 @@ use Scalar::Util qw(blessed);
 use List::MoreUtils qw(uniq);
 use Storable qw(dclone);
 
-use constant BIT_DIRECT    => 1;
-use constant BIT_WATCHING  => 2;
+use constant BIT_DIRECT   => 1;
+use constant BIT_WATCHING => 2;
 
 sub relationships {
-    my $ref = RELATIONSHIPS;
-    # Clone it so that we don't modify the constant;
-    my %relationships = %$ref;
-    Bugzilla::Hook::process('bugmail_relationships', 
-                            { relationships => \%relationships });
-    return %relationships;
+  my $ref = RELATIONSHIPS;
+
+  # Clone it so that we don't modify the constant;
+  my %relationships = %$ref;
+  Bugzilla::Hook::process('bugmail_relationships',
+    {relationships => \%relationships});
+  return %relationships;
 }
 
-# This is a bit of a hack, basically keeping the old system()
-# cmd line interface. Should clean this up at some point.
-#
 # args: bug_id, and an optional hash ref which may have keys for:
 # changer, owner, qa, reporter, cc
 # Optional hash contains values of people which will be forced to those
@@ -48,446 +46,446 @@ sub relationships {
 # All the names are email addresses, not userids
 # values are scalars, except for cc, which is a list
 sub Send {
-    my ($id, $forced, $params) = @_;
-    $params ||= {};
-
-    my $dbh = Bugzilla->dbh;
-    my $bug = new Bugzilla::Bug($id);
-
-    my $start = $bug->lastdiffed;
-    my $end   = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-
-    # Bugzilla::User objects of people in various roles. More than one person
-    # can 'have' a role, if the person in that role has changed, or people are
-    # watching.
-    my @assignees = ($bug->assigned_to);
-    my @qa_contacts = $bug->qa_contact || ();
-
-    my @ccs = @{ $bug->cc_users };
-    # Include the people passed in as being in particular roles.
-    # This can include people who used to hold those roles.
-    # At this point, we don't care if there are duplicates in these arrays.
-    my $changer = $forced->{'changer'};
-    if ($forced->{'owner'}) {
-        push (@assignees, Bugzilla::User->check($forced->{'owner'}));
-    }
-    
-    if ($forced->{'qacontact'}) {
-        push (@qa_contacts, Bugzilla::User->check($forced->{'qacontact'}));
-    }
-    
-    if ($forced->{'cc'}) {
-        foreach my $cc (@{$forced->{'cc'}}) {
-            push(@ccs, Bugzilla::User->check($cc));
-        }
-    }
-    my %user_cache = map { $_->id => $_ } (@assignees, @qa_contacts, @ccs);
-
-    my @diffs;
-    if (!$start) {
-        @diffs = _get_new_bugmail_fields($bug);
+  my ($id, $forced, $params) = @_;
+  $params ||= {};
+
+  my $dbh = Bugzilla->dbh;
+  my $bug = new Bugzilla::Bug($id);
+
+  my $start = $bug->lastdiffed;
+  my $end   = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+
+  # Bugzilla::User objects of people in various roles. More than one person
+  # can 'have' a role, if the person in that role has changed, or people are
+  # watching.
+  my @assignees = ($bug->assigned_to);
+  my @qa_contacts = $bug->qa_contact || ();
+
+  my @ccs = @{$bug->cc_users};
+
+  # Include the people passed in as being in particular roles.
+  # This can include people who used to hold those roles.
+  # At this point, we don't care if there are duplicates in these arrays.
+  my $changer = $forced->{'changer'};
+  if ($forced->{'owner'}) {
+    push(@assignees, Bugzilla::User->check($forced->{'owner'}));
+  }
+
+  if ($forced->{'qacontact'}) {
+    push(@qa_contacts, Bugzilla::User->check($forced->{'qacontact'}));
+  }
+
+  if ($forced->{'cc'}) {
+    foreach my $cc (@{$forced->{'cc'}}) {
+      push(@ccs, Bugzilla::User->check($cc));
     }
+  }
+  my %user_cache = map { $_->id => $_ } (@assignees, @qa_contacts, @ccs);
+
+  my @diffs;
+  if (!$start) {
+    @diffs = _get_new_bugmail_fields($bug);
+  }
+
+  my $comments = [];
+
+  if ($params->{dep_only}) {
+    push(
+      @diffs,
+      {
+        field_name => 'bug_status',
+        old        => $params->{changes}->{bug_status}->[0],
+        new        => $params->{changes}->{bug_status}->[1],
+        login_name => $changer->login,
+        who        => $changer,
+        blocker    => $params->{blocker}
+      },
+      {
+        field_name => 'resolution',
+        old        => $params->{changes}->{resolution}->[0],
+        new        => $params->{changes}->{resolution}->[1],
+        login_name => $changer->login,
+        who        => $changer,
+        blocker    => $params->{blocker}
+      }
+    );
+  }
+  else {
+    push(@diffs, _get_diffs($bug, $end, \%user_cache));
 
-    if ($params->{dep_only}) {
-        push(@diffs, { field_name => 'bug_status',
-                       old        => $params->{changes}->{bug_status}->[0],
-                       new        => $params->{changes}->{bug_status}->[1],
-                       login_name => $changer->login,
-                       who        => $changer,
-                       blocker    => $params->{blocker} },
-                     { field_name => 'resolution',
-                       old        => $params->{changes}->{resolution}->[0],
-                       new        => $params->{changes}->{resolution}->[1],
-                       login_name => $changer->login,
-                       who        => $changer,
-                       blocker    => $params->{blocker} });
-    }
-    else {
-        push(@diffs, _get_diffs($bug, $end, \%user_cache));
-    }
+    $comments = $bug->comments({after => $start, to => $end});
 
-    my $comments = $bug->comments({ after => $start, to => $end });
     # Skip empty comments.
     @$comments = grep { $_->type || $_->body =~ /\S/ } @$comments;
 
     # If no changes have been made, there is no need to process further.
     return {'sent' => []} unless scalar(@diffs) || scalar(@$comments);
+  }
 
-    ###########################################################################
-    # Start of email filtering code
-    ###########################################################################
-    
-    # A user_id => roles hash to keep track of people.
-    my %recipients;
-    my %watching;
-
-    # We also record bugs that are referenced
-    my @referenced_bug_ids = ();
-
-    # Now we work out all the people involved with this bug, and note all of
-    # the relationships in a hash. The keys are userids, the values are an
-    # array of role constants.
-    
-    # CCs
-    $recipients{$_->id}->{+REL_CC} = BIT_DIRECT foreach (@ccs);
-    
-    # Reporter (there's only ever one)
-    $recipients{$bug->reporter->id}->{+REL_REPORTER} = BIT_DIRECT;
-    
-    # QA Contact
-    if (Bugzilla->params->{'useqacontact'}) {
-        foreach (@qa_contacts) {
-            # QA Contact can be blank; ignore it if so.
-            $recipients{$_->id}->{+REL_QA} = BIT_DIRECT if $_;
-        }
-    }
+  ###########################################################################
+  # Start of email filtering code
+  ###########################################################################
 
-    # Assignee
-    $recipients{$_->id}->{+REL_ASSIGNEE} = BIT_DIRECT foreach (@assignees);
-
-    # The last relevant set of people are those who are being removed from 
-    # their roles in this change. We get their names out of the diffs.
-    foreach my $change (@diffs) {
-        if ($change->{old}) {
-            # You can't stop being the reporter, so we don't check that
-            # relationship here.
-            # Ignore people whose user account has been deleted or renamed.
-            if ($change->{field_name} eq 'cc') {
-                foreach my $cc_user (split(/[\s,]+/, $change->{old})) {
-                    my $uid = login_to_id($cc_user);
-                    $recipients{$uid}->{+REL_CC} = BIT_DIRECT if $uid;
-                }
-            }
-            elsif ($change->{field_name} eq 'qa_contact') {
-                my $uid = login_to_id($change->{old});
-                $recipients{$uid}->{+REL_QA} = BIT_DIRECT if $uid;
-            }
-            elsif ($change->{field_name} eq 'assigned_to') {
-                my $uid = login_to_id($change->{old});
-                $recipients{$uid}->{+REL_ASSIGNEE} = BIT_DIRECT if $uid;
-            }
-        }
+  # A user_id => roles hash to keep track of people.
+  my %recipients;
+  my %watching;
 
-        if ($change->{field_name} eq 'dependson' || $change->{field_name} eq 'blocked') {
-            push @referenced_bug_ids, split(/[\s,]+/, $change->{old});
-            push @referenced_bug_ids, split(/[\s,]+/, $change->{new});
-        }
-    }
+  # We also record bugs that are referenced
+  my @referenced_bug_ids = ();
 
-    my $referenced_bugs = scalar(@referenced_bug_ids)
-        ? Bugzilla::Bug->new_from_list([uniq @referenced_bug_ids])
-        : [];
+  # Now we work out all the people involved with this bug, and note all of
+  # the relationships in a hash. The keys are userids, the values are an
+  # array of role constants.
 
-    # Make sure %user_cache has every user in it so far referenced
-    foreach my $user_id (keys %recipients) {
-        $user_cache{$user_id} ||= new Bugzilla::User($user_id);
-    }
-    
-    Bugzilla::Hook::process('bugmail_recipients',
-                            { bug => $bug, recipients => \%recipients,
-                              users => \%user_cache, diffs => \@diffs });
-
-    # We should not assume %recipients to have any entries.
-    if (scalar keys %recipients) {
-        # Find all those user-watching anyone on the current list, who is not
-        # on it already themselves.
-        my $involved = join(",", keys %recipients);
-
-        my $userwatchers =
-            $dbh->selectall_arrayref("SELECT watcher, watched FROM watch
-                                      WHERE watched IN ($involved)");
-
-        # Mark these people as having the role of the person they are watching
-        foreach my $watch (@$userwatchers) {
-            while (my ($role, $bits) = each %{$recipients{$watch->[1]}}) {
-                $recipients{$watch->[0]}->{$role} |= BIT_WATCHING
-                    if $bits & BIT_DIRECT;
-            }
-            push(@{$watching{$watch->[0]}}, $watch->[1]);
-        }
-    }
+  # CCs
+  $recipients{$_->id}->{+REL_CC} = BIT_DIRECT foreach (@ccs);
 
-    # Global watcher
-    my @watchers = split(/[,\s]+/, Bugzilla->params->{'globalwatchers'});
-    foreach (@watchers) {
-        my $watcher_id = login_to_id($_);
-        next unless $watcher_id;
-        $recipients{$watcher_id}->{+REL_GLOBAL_WATCHER} = BIT_DIRECT;
-    }
+  # Reporter (there's only ever one)
+  $recipients{$bug->reporter->id}->{+REL_REPORTER} = BIT_DIRECT;
 
-    # We now have a complete set of all the users, and their relationships to
-    # the bug in question. However, we are not necessarily going to mail them
-    # all - there are preferences, permissions checks and all sorts to do yet.
-    my @sent;
-
-    # The email client will display the Date: header in the desired timezone,
-    # so we can always use UTC here.
-    my $date = $params->{dep_only} ? $end : $bug->delta_ts;
-    $date = format_time($date, '%a, %d %b %Y %T %z', 'UTC');
-
-    foreach my $user_id (keys %recipients) {
-        my %rels_which_want;
-        my $user = $user_cache{$user_id} ||= new Bugzilla::User($user_id);
-        # Deleted users must be excluded.
-        next unless $user;
-
-        # If email notifications are disabled for this account, or the bug
-        # is ignored, there is no need to do additional checks.
-        next if ($user->email_disabled || $user->is_bug_ignored($id));
-
-        if ($user->can_see_bug($id)) {
-            # Go through each role the user has and see if they want mail in
-            # that role.
-            foreach my $relationship (keys %{$recipients{$user_id}}) {
-                if ($user->wants_bug_mail($bug,
-                                          $relationship, 
-                                          $start ? \@diffs : [],
-                                          $comments,
-                                          $params->{dep_only},
-                                          $changer))
-                {
-                    $rels_which_want{$relationship} = 
-                        $recipients{$user_id}->{$relationship};
-                }
-            }
-        }
+  # QA Contact
+  if (Bugzilla->params->{'useqacontact'}) {
+    foreach (@qa_contacts) {
 
-        if (scalar(%rels_which_want)) {
-            # So the user exists, can see the bug, and wants mail in at least
-            # one role. But do we want to send it to them?
-
-            # We shouldn't send mail if this is a dependency mail and the
-            # depending bug is not visible to the user.
-            # This is to avoid leaking the summary of a confidential bug.
-            my $dep_ok = 1;
-            if ($params->{dep_only}) {
-                $dep_ok = $user->can_see_bug($params->{blocker}->id) ? 1 : 0;
-            }
-
-            # Email the user if the dep check passed.
-            if ($dep_ok) {
-                my $sent_mail = sendMail(
-                    { to              => $user, 
-                      bug             => $bug,
-                      comments        => $comments,
-                      date            => $date,
-                      changer         => $changer,
-                      watchers        => exists $watching{$user_id} ?
-                                         $watching{$user_id} : undef,
-                      diffs           => \@diffs,
-                      rels_which_want => \%rels_which_want,
-                      dep_only        => $params->{dep_only},
-                      referenced_bugs => $referenced_bugs,
-                    });
-                push(@sent, $user->login) if $sent_mail;
-            }
+      # QA Contact can be blank; ignore it if so.
+      $recipients{$_->id}->{+REL_QA} = BIT_DIRECT if $_;
+    }
+  }
+
+  # Assignee
+  $recipients{$_->id}->{+REL_ASSIGNEE} = BIT_DIRECT foreach (@assignees);
+
+  # The last relevant set of people are those who are being removed from
+  # their roles in this change. We get their names out of the diffs.
+  foreach my $change (@diffs) {
+    if ($change->{old}) {
+
+      # You can't stop being the reporter, so we don't check that
+      # relationship here.
+      # Ignore people whose user account has been deleted or renamed.
+      if ($change->{field_name} eq 'cc') {
+        foreach my $cc_user (split(/[\s,]+/, $change->{old})) {
+          my $uid = login_to_id($cc_user);
+          $recipients{$uid}->{+REL_CC} = BIT_DIRECT if $uid;
         }
+      }
+      elsif ($change->{field_name} eq 'qa_contact') {
+        my $uid = login_to_id($change->{old});
+        $recipients{$uid}->{+REL_QA} = BIT_DIRECT if $uid;
+      }
+      elsif ($change->{field_name} eq 'assigned_to') {
+        my $uid = login_to_id($change->{old});
+        $recipients{$uid}->{+REL_ASSIGNEE} = BIT_DIRECT if $uid;
+      }
     }
 
-    # When sending bugmail about a blocker being reopened or resolved,
-    # we say nothing about changes in the bug being blocked, so we must
-    # not update lastdiffed in this case.
-    if (!$params->{dep_only}) {
-        $dbh->do('UPDATE bugs SET lastdiffed = ? WHERE bug_id = ?',
-                 undef, ($end, $id));
-        $bug->{lastdiffed} = $end;
+    if ($change->{field_name} eq 'dependson' || $change->{field_name} eq 'blocked')
+    {
+      push @referenced_bug_ids, split(/[\s,]+/, $change->{old} // '');
+      push @referenced_bug_ids, split(/[\s,]+/, $change->{new} // '');
+    }
+  }
+
+  my $referenced_bugs
+    = scalar(@referenced_bug_ids)
+    ? Bugzilla::Bug->new_from_list([uniq @referenced_bug_ids])
+    : [];
+
+  # Make sure %user_cache has every user in it so far referenced
+  foreach my $user_id (keys %recipients) {
+    $user_cache{$user_id} ||= new Bugzilla::User($user_id);
+  }
+
+  Bugzilla::Hook::process(
+    'bugmail_recipients',
+    {
+      bug        => $bug,
+      recipients => \%recipients,
+      users      => \%user_cache,
+      diffs      => \@diffs
     }
+  );
 
-    return {'sent' => \@sent};
-}
+  # We should not assume %recipients to have any entries.
+  if (scalar keys %recipients) {
 
-sub sendMail {
-    my $params = shift;
-
-    my $user            = $params->{to};
-    my $bug             = $params->{bug};
-    my @send_comments   = @{ $params->{comments} };
-    my $date            = $params->{date};
-    my $changer         = $params->{changer};
-    my $watchingRef     = $params->{watchers};
-    my @diffs           = @{ $params->{diffs} };
-    my $relRef          = $params->{rels_which_want};
-    my $dep_only        = $params->{dep_only};
-    my $referenced_bugs = $params->{referenced_bugs};
-
-    # Only display changes the user is allowed see.
-    my @display_diffs;
-
-    foreach my $diff (@diffs) {
-        my $add_diff = 0;
-
-        if (grep { $_ eq $diff->{field_name} } TIMETRACKING_FIELDS) {
-            $add_diff = 1 if $user->is_timetracker;
-        }
-        elsif (!$diff->{isprivate} || $user->is_insider) {
-            $add_diff = 1;
-        }
-        push(@display_diffs, $diff) if $add_diff;
-    }
+    # Find all those user-watching anyone on the current list, who is not
+    # on it already themselves.
+    my $involved = join(",", keys %recipients);
 
-    if (!$user->is_insider) {
-        @send_comments = grep { !$_->is_private } @send_comments;
-    }
+    my $userwatchers = $dbh->selectall_arrayref(
+      "SELECT watcher, watched FROM watch
+                                      WHERE watched IN ($involved)"
+    );
 
-    if (!scalar(@display_diffs) && !scalar(@send_comments)) {
-      # Whoops, no differences!
-      return 0;
+    # Mark these people as having the role of the person they are watching
+    foreach my $watch (@$userwatchers) {
+      while (my ($role, $bits) = each %{$recipients{$watch->[1]}}) {
+        $recipients{$watch->[0]}->{$role} |= BIT_WATCHING if $bits & BIT_DIRECT;
+      }
+      push(@{$watching{$watch->[0]}}, $watch->[1]);
+    }
+  }
+
+  # Global watcher
+  my @watchers = split(/[,\s]+/, Bugzilla->params->{'globalwatchers'});
+  foreach (@watchers) {
+    my $watcher_id = login_to_id($_);
+    next unless $watcher_id;
+    $recipients{$watcher_id}->{+REL_GLOBAL_WATCHER} = BIT_DIRECT;
+  }
+
+  # We now have a complete set of all the users, and their relationships to
+  # the bug in question. However, we are not necessarily going to mail them
+  # all - there are preferences, permissions checks and all sorts to do yet.
+  my @sent;
+
+  # The email client will display the Date: header in the desired timezone,
+  # so we can always use UTC here.
+  my $date = $params->{dep_only} ? $end : $bug->delta_ts;
+  $date = format_time($date, '%a, %d %b %Y %T %z', 'UTC');
+
+  my $minor_update = $changer->in_group(Bugzilla->params->{minor_update_group})
+    && $params->{minor_update};
+
+  foreach my $user_id (keys %recipients) {
+    my %rels_which_want;
+    my $user = $user_cache{$user_id} ||= new Bugzilla::User($user_id);
+
+    # Deleted users must be excluded.
+    next unless $user;
+
+    # If email notifications are disabled for this account, or the bug
+    # is ignored, there is no need to do additional checks.
+    next if ($user->email_disabled || $user->is_bug_ignored($id));
+
+    if ($user->can_see_bug($id)) {
+
+      # Go through each role the user has and see if they want mail in
+      # that role.
+      foreach my $relationship (keys %{$recipients{$user_id}}) {
+        if ($user->wants_bug_mail(
+          $bug, $relationship, $start ? \@diffs : [], $comments,
+          $params->{dep_only}, $changer, $minor_update
+        ))
+        {
+          $rels_which_want{$relationship} = $recipients{$user_id}->{$relationship};
+        }
+      }
     }
 
-    my (@reasons, @reasons_watch);
-    while (my ($relationship, $bits) = each %{$relRef}) {
-        push(@reasons, $relationship) if ($bits & BIT_DIRECT);
-        push(@reasons_watch, $relationship) if ($bits & BIT_WATCHING);
+    if (scalar(%rels_which_want)) {
+
+      # So the user exists, can see the bug, and wants mail in at least
+      # one role. But do we want to send it to them?
+
+      # We shouldn't send mail if this is a dependency mail and the
+      # depending bug is not visible to the user.
+      # This is to avoid leaking the summary of a confidential bug.
+      my $dep_ok = 1;
+      if ($params->{dep_only}) {
+        $dep_ok = $user->can_see_bug($params->{blocker}->id) ? 1 : 0;
+      }
+
+      # Email the user if the dep check passed.
+      if ($dep_ok) {
+        my $sent_mail = sendMail({
+          to              => $user,
+          bug             => $bug,
+          comments        => $comments,
+          date            => $date,
+          changer         => $changer,
+          watchers        => exists $watching{$user_id} ? $watching{$user_id} : undef,
+          diffs           => \@diffs,
+          rels_which_want => \%rels_which_want,
+          dep_only        => $params->{dep_only},
+          referenced_bugs => $referenced_bugs,
+        });
+        push(@sent, $user->login) if $sent_mail;
+      }
     }
+  }
 
-    my %relationships = relationships();
-    my @headerrel   = map { $relationships{$_} } @reasons;
-    my @watchingrel = map { $relationships{$_} } @reasons_watch;
-    push(@headerrel,   'None') unless @headerrel;
-    push(@watchingrel, 'None') unless @watchingrel;
-    push @watchingrel, map { Bugzilla::User->new($_)->login } @$watchingRef;
+  # When sending bugmail about a blocker being reopened or resolved,
+  # we say nothing about changes in the bug being blocked, so we must
+  # not update lastdiffed in this case.
+  if (!$params->{dep_only}) {
+    $dbh->do('UPDATE bugs SET lastdiffed = ? WHERE bug_id = ?', undef, ($end, $id));
+    $bug->{lastdiffed} = $end;
+  }
 
-    my @changedfields = uniq map { $_->{field_name} } @display_diffs;
+  return {'sent' => \@sent};
+}
 
-    # Add attachments.created to changedfields if one or more
-    # comments contain information about a new attachment
-    if (grep($_->type == CMT_ATTACHMENT_CREATED, @send_comments)) {
-        push(@changedfields, 'attachments.created');
+sub sendMail {
+  my $params = shift;
+
+  my $user            = $params->{to};
+  my $bug             = $params->{bug};
+  my @send_comments   = @{$params->{comments}};
+  my $date            = $params->{date};
+  my $changer         = $params->{changer};
+  my $watchingRef     = $params->{watchers};
+  my @diffs           = @{$params->{diffs}};
+  my $relRef          = $params->{rels_which_want};
+  my $dep_only        = $params->{dep_only};
+  my $referenced_bugs = $params->{referenced_bugs};
+
+  # Only display changes the user is allowed see.
+  my @display_diffs;
+
+  foreach my $diff (@diffs) {
+    my $add_diff = 0;
+
+    if (grep { $_ eq $diff->{field_name} } TIMETRACKING_FIELDS) {
+      $add_diff = 1 if $user->is_timetracker;
     }
-
-    my $bugmailtype = "changed";
-    $bugmailtype = "new" if !$bug->lastdiffed;
-    $bugmailtype = "dep_changed" if $dep_only;
-
-    my $vars = {
-        date               => $date,
-        to_user            => $user,
-        bug                => $bug,
-        reasons            => \@reasons,
-        reasons_watch      => \@reasons_watch,
-        reasonsheader      => join(" ", @headerrel),
-        reasonswatchheader => join(" ", @watchingrel),
-        changer            => $changer,
-        diffs              => \@display_diffs,
-        changedfields      => \@changedfields,
-        referenced_bugs    => $user->visible_bugs($referenced_bugs),
-        new_comments       => \@send_comments,
-        threadingmarker    => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
-        bugmailtype        => $bugmailtype,
-    };
-    if (Bugzilla->params->{'use_mailer_queue'}) {
-        enqueue($vars);
-    } else {
-        MessageToMTA(_generate_bugmail($vars));
+    elsif (!$diff->{isprivate} || $user->is_insider) {
+      $add_diff = 1;
     }
-
-    return 1;
+    push(@display_diffs, $diff) if $add_diff;
+  }
+
+  if (!$user->is_insider) {
+    @send_comments = grep { !$_->is_private } @send_comments;
+  }
+
+  if (!scalar(@display_diffs) && !scalar(@send_comments)) {
+
+    # Whoops, no differences!
+    return 0;
+  }
+
+  my (@reasons, @reasons_watch);
+  while (my ($relationship, $bits) = each %{$relRef}) {
+    push(@reasons,       $relationship) if ($bits & BIT_DIRECT);
+    push(@reasons_watch, $relationship) if ($bits & BIT_WATCHING);
+  }
+
+  my %relationships = relationships();
+  my @headerrel     = map { $relationships{$_} } @reasons;
+  my @watchingrel   = map { $relationships{$_} } @reasons_watch;
+  push(@headerrel,   'None') unless @headerrel;
+  push(@watchingrel, 'None') unless @watchingrel;
+  push @watchingrel, map { Bugzilla::User->new($_)->login } @$watchingRef;
+
+  my @changedfields = uniq map { $_->{field_name} } @display_diffs;
+
+  # Add attachments.created to changedfields if one or more
+  # comments contain information about a new attachment
+  if (grep($_->type == CMT_ATTACHMENT_CREATED, @send_comments)) {
+    push(@changedfields, 'attachments.created');
+  }
+
+  my $bugmailtype = "changed";
+  $bugmailtype = "new"         if !$bug->lastdiffed;
+  $bugmailtype = "dep_changed" if $dep_only;
+
+  my $vars = {
+    date               => $date,
+    to_user            => $user,
+    bug                => $bug,
+    reasons            => \@reasons,
+    reasons_watch      => \@reasons_watch,
+    reasonsheader      => join(" ", @headerrel),
+    reasonswatchheader => join(" ", @watchingrel),
+    changer            => $changer,
+    diffs              => \@display_diffs,
+    changedfields      => \@changedfields,
+    referenced_bugs    => $user->visible_bugs($referenced_bugs),
+    new_comments       => \@send_comments,
+    threadingmarker => build_thread_marker($bug->id, $user->id, !$bug->lastdiffed),
+    bugmailtype     => $bugmailtype,
+  };
+  if (Bugzilla->params->{'use_mailer_queue'}) {
+    enqueue($vars);
+  }
+  else {
+    MessageToMTA(_generate_bugmail($vars));
+  }
+
+  return 1;
 }
 
 sub enqueue {
-    my ($vars) = @_;
-    # we need to flatten all objects to a hash before pushing to the job queue.
-    # the hashes need to be inflated in the dequeue method.
-    $vars->{bug}          = _flatten_object($vars->{bug});
-    $vars->{to_user}      = _flatten_object($vars->{to_user});
-    $vars->{changer}      = _flatten_object($vars->{changer});
-    $vars->{new_comments} = [ map { _flatten_object($_) } @{ $vars->{new_comments} } ];
-    foreach my $diff (@{ $vars->{diffs} }) {
-        $diff->{who} = _flatten_object($diff->{who});
-        if (exists $diff->{blocker}) {
-            $diff->{blocker} = _flatten_object($diff->{blocker});
-        }
+  my ($vars) = @_;
+
+  # we need to flatten all objects to a hash before pushing to the job queue.
+  # the hashes need to be inflated in the dequeue method.
+  $vars->{bug}          = _flatten_object($vars->{bug});
+  $vars->{to_user}      = _flatten_object($vars->{to_user});
+  $vars->{changer}      = _flatten_object($vars->{changer});
+  $vars->{new_comments} = [map { _flatten_object($_) } @{$vars->{new_comments}}];
+  foreach my $diff (@{$vars->{diffs}}) {
+    $diff->{who} = _flatten_object($diff->{who});
+    if (exists $diff->{blocker}) {
+      $diff->{blocker} = _flatten_object($diff->{blocker});
     }
-    Bugzilla->job_queue->insert('bug_mail', { vars => $vars });
+  }
+  Bugzilla->job_queue->insert('bug_mail', {vars => $vars});
 }
 
 sub dequeue {
-    my ($payload) = @_;
-    # clone the payload so we can modify it without impacting TheSchwartz's
-    # ability to process the job when we've finished
-    my $vars = dclone($payload);
-    # inflate objects
-    $vars->{bug}          = Bugzilla::Bug->new_from_hash($vars->{bug});
-    $vars->{to_user}      = Bugzilla::User->new_from_hash($vars->{to_user});
-    $vars->{changer}      = Bugzilla::User->new_from_hash($vars->{changer});
-    $vars->{new_comments} = [ map { Bugzilla::Comment->new_from_hash($_) } @{ $vars->{new_comments} } ];
-    foreach my $diff (@{ $vars->{diffs} }) {
-        $diff->{who} = Bugzilla::User->new_from_hash($diff->{who});
-        if (exists $diff->{blocker}) {
-            $diff->{blocker} = Bugzilla::Bug->new_from_hash($diff->{blocker});
-        }
+  my ($payload) = @_;
+
+  # clone the payload so we can modify it without impacting TheSchwartz's
+  # ability to process the job when we've finished
+  my $vars = dclone($payload);
+
+  # inflate objects
+  $vars->{bug}     = Bugzilla::Bug->new_from_hash($vars->{bug});
+  $vars->{to_user} = Bugzilla::User->new_from_hash($vars->{to_user});
+  $vars->{changer} = Bugzilla::User->new_from_hash($vars->{changer});
+  $vars->{new_comments}
+    = [map { Bugzilla::Comment->new_from_hash($_) } @{$vars->{new_comments}}];
+  foreach my $diff (@{$vars->{diffs}}) {
+    $diff->{who} = Bugzilla::User->new_from_hash($diff->{who});
+    if (exists $diff->{blocker}) {
+      $diff->{blocker} = Bugzilla::Bug->new_from_hash($diff->{blocker});
     }
-    # generate bugmail and send
-    MessageToMTA(_generate_bugmail($vars), 1);
+  }
+
+  # generate bugmail and send
+  MessageToMTA(_generate_bugmail($vars), 1);
 }
 
 sub _flatten_object {
-    my ($object) = @_;
-    # nothing to do if it's already flattened
-    return $object unless blessed($object);
-    # the same objects are used for each recipient, so cache the flattened hash
-    my $cache = Bugzilla->request_cache->{bugmail_flat_objects} ||= {};
-    my $key = blessed($object) . '-' . $object->id;
-    return $cache->{$key} ||= $object->flatten_to_hash;
+  my ($object) = @_;
+
+  # nothing to do if it's already flattened
+  return $object unless blessed($object);
+
+  # the same objects are used for each recipient, so cache the flattened hash
+  my $cache = Bugzilla->request_cache->{bugmail_flat_objects} ||= {};
+  my $key = blessed($object) . '-' . $object->id;
+  return $cache->{$key} ||= $object->flatten_to_hash;
 }
 
 sub _generate_bugmail {
-    my ($vars) = @_;
-    my $user = $vars->{to_user};
-    my $template = Bugzilla->template_inner($user->setting('lang'));
-    my ($msg_text, $msg_html, $msg_header);
-
-    $template->process("email/bugmail-header.txt.tmpl", $vars, \$msg_header)
-        || ThrowTemplateError($template->error());
-    $template->process("email/bugmail.txt.tmpl", $vars, \$msg_text)
-        || ThrowTemplateError($template->error());
-
-    my @parts = (
-        Email::MIME->create(
-            attributes => {
-                content_type => "text/plain",
-            },
-            body => $msg_text,
-        )
-    );
-    if ($user->setting('email_format') eq 'html') {
-        $template->process("email/bugmail.html.tmpl", $vars, \$msg_html)
-            || ThrowTemplateError($template->error());
-        push @parts, Email::MIME->create(
-            attributes => {
-                content_type => "text/html",         
-            },
-            body => $msg_html,
-        );
-    }
-
-    # TT trims the trailing newline, and threadingmarker may be ignored.
-    my $email = new Email::MIME("$msg_header\n");
-    if (scalar(@parts) == 1) {
-        $email->content_type_set($parts[0]->content_type);
-    } else {
-        $email->content_type_set('multipart/alternative');
-        # Some mail clients need same encoding for each part, even empty ones.
-        $email->charset_set('UTF-8') if Bugzilla->params->{'utf8'};
-    }
-    $email->parts_set(\@parts);
-    return $email;
+  my ($vars) = @_;
+  my $templates = {
+    header => "email/bugmail-header.txt.tmpl",
+    text   => "email/bugmail.txt.tmpl",
+    html   => "email/bugmail.html.tmpl",
+  };
+  return generate_email($vars, $templates);
 }
 
 sub _get_diffs {
-    my ($bug, $end, $user_cache) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my @args = ($bug->id);
-    # If lastdiffed is NULL, then we don't limit the search on time.
-    my $when_restriction = '';
-    if ($bug->lastdiffed) {
-        $when_restriction = ' AND bug_when > ? AND bug_when <= ?';
-        push @args, ($bug->lastdiffed, $end);
-    }
+  my ($bug, $end, $user_cache) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my @args = ($bug->id);
+
+  # If lastdiffed is NULL, then we don't limit the search on time.
+  my $when_restriction = '';
+  if ($bug->lastdiffed) {
+    $when_restriction = ' AND bug_when > ? AND bug_when <= ?';
+    push @args, ($bug->lastdiffed, $end);
+  }
 
-    my $diffs = $dbh->selectall_arrayref(
-           "SELECT fielddefs.name AS field_name,
+  my $diffs = $dbh->selectall_arrayref(
+    "SELECT fielddefs.name AS field_name,
                    bugs_activity.bug_when, bugs_activity.removed AS old,
                    bugs_activity.added AS new, bugs_activity.attach_id,
                    bugs_activity.comment_id, bugs_activity.who
@@ -496,89 +494,92 @@ sub _get_diffs {
                 ON fielddefs.id = bugs_activity.fieldid
              WHERE bugs_activity.bug_id = ?
                    $when_restriction
-          ORDER BY bugs_activity.bug_when, bugs_activity.id",
-        {Slice=>{}}, @args);
-
-    foreach my $diff (@$diffs) {
-        $user_cache->{$diff->{who}} ||= new Bugzilla::User($diff->{who}); 
-        $diff->{who} =  $user_cache->{$diff->{who}};
-        if ($diff->{attach_id}) {
-            $diff->{isprivate} = $dbh->selectrow_array(
-                'SELECT isprivate FROM attachments WHERE attach_id = ?',
-                undef, $diff->{attach_id});
-         }
-         if ($diff->{field_name} eq 'longdescs.isprivate') {
-             my $comment = Bugzilla::Comment->new($diff->{comment_id});
-             $diff->{num} = $comment->count;
-             $diff->{isprivate} = $diff->{new};
-         }
+          ORDER BY bugs_activity.bug_when, bugs_activity.id", {Slice => {}}, @args
+  );
+
+  foreach my $diff (@$diffs) {
+    $user_cache->{$diff->{who}} ||= new Bugzilla::User($diff->{who});
+    $diff->{who} = $user_cache->{$diff->{who}};
+    if ($diff->{attach_id}) {
+      $diff->{isprivate}
+        = $dbh->selectrow_array(
+        'SELECT isprivate FROM attachments WHERE attach_id = ?',
+        undef, $diff->{attach_id});
     }
-
-    my @changes = ();
-    foreach my $diff (@$diffs) {
-        # If this is the same field as the previous item, then concatenate
-        # the data into the same change.
-        if (scalar(@changes)
-            && $diff->{field_name}        eq $changes[-1]->{field_name}
-            && $diff->{bug_when}          eq $changes[-1]->{bug_when}
-            && $diff->{who}               eq $changes[-1]->{who}
-            && ($diff->{attach_id} // 0)  == ($changes[-1]->{attach_id} // 0)
-            && ($diff->{comment_id} // 0) == ($changes[-1]->{comment_id} // 0)
-        ) {
-            my $old_change = pop @changes;
-            $diff->{old} = join_activity_entries($diff->{field_name}, $old_change->{old}, $diff->{old});
-            $diff->{new} = join_activity_entries($diff->{field_name}, $old_change->{new}, $diff->{new});
-        }
-        push @changes, $diff;
+    if ($diff->{field_name} eq 'longdescs.isprivate') {
+      my $comment = Bugzilla::Comment->new($diff->{comment_id});
+      $diff->{num}       = $comment->count;
+      $diff->{isprivate} = $diff->{new};
     }
+  }
+
+  my @changes = ();
+  foreach my $diff (@$diffs) {
+
+    # If this is the same field as the previous item, then concatenate
+    # the data into the same change.
+    if ( scalar(@changes)
+      && $diff->{field_name} eq $changes[-1]->{field_name}
+      && $diff->{bug_when} eq $changes[-1]->{bug_when}
+      && $diff->{who} eq $changes[-1]->{who}
+      && ($diff->{attach_id} // 0) ==  ($changes[-1]->{attach_id} // 0)
+      && ($diff->{comment_id} // 0) == ($changes[-1]->{comment_id} // 0))
+    {
+      my $old_change = pop @changes;
+      $diff->{old} = join_activity_entries($diff->{field_name}, $old_change->{old},
+        $diff->{old});
+      $diff->{new} = join_activity_entries($diff->{field_name}, $old_change->{new},
+        $diff->{new});
+    }
+    push @changes, $diff;
+  }
 
-    return @changes;
+  return @changes;
 }
 
 sub _get_new_bugmail_fields {
-    my $bug = shift;
-    my @fields = @{ Bugzilla->fields({obsolete => 0, in_new_bugmail => 1}) };
-    my @diffs;
-    my $params = Bugzilla->params;
-
-    foreach my $field (@fields) {
-        my $name = $field->name;
-        my $value = $bug->$name;
-
-        next if !$field->is_visible_on_bug($bug)
-            || ($name eq 'classification' && !$params->{'useclassification'})
-            || ($name eq 'status_whiteboard' && !$params->{'usestatuswhiteboard'})
-            || ($name eq 'qa_contact' && !$params->{'useqacontact'})
-            || ($name eq 'target_milestone' && !$params->{'usetargetmilestone'});
-
-        if (ref $value eq 'ARRAY') {
-            $value = join(', ', @$value);
-        }
-        elsif (blessed($value) && $value->isa('Bugzilla::User')) {
-            $value = $value->login;
-        }
-        elsif (blessed($value) && $value->isa('Bugzilla::Object')) {
-            $value = $value->name;
-        }
-        elsif ($name eq 'estimated_time') {
-            # "0.00" (which is what we get from the DB) is true,
-            # so we explicitly do a numerical comparison with 0.
-            $value = 0 if $value == 0;
-        }
-        elsif ($name eq 'deadline') {
-            $value = time2str("%Y-%m-%d", str2time($value)) if $value;
-        }
-
-        # If there isn't anything to show, don't include this header.
-        next unless $value;
+  my $bug = shift;
+  my @fields = @{Bugzilla->fields({obsolete => 0, in_new_bugmail => 1})};
+  my @diffs;
+  my $params = Bugzilla->params;
+
+  foreach my $field (@fields) {
+    my $name  = $field->name;
+    my $value = $bug->$name;
+
+    next
+      if !$field->is_visible_on_bug($bug)
+      || ($name eq 'classification'    && !$params->{'useclassification'})
+      || ($name eq 'status_whiteboard' && !$params->{'usestatuswhiteboard'})
+      || ($name eq 'qa_contact'        && !$params->{'useqacontact'})
+      || ($name eq 'target_milestone'  && !$params->{'usetargetmilestone'});
+
+    if (ref $value eq 'ARRAY') {
+      $value = join(', ', @$value);
+    }
+    elsif (blessed($value) && $value->isa('Bugzilla::User')) {
+      $value = $value->login;
+    }
+    elsif (blessed($value) && $value->isa('Bugzilla::Object')) {
+      $value = $value->name;
+    }
+    elsif ($name eq 'estimated_time') {
 
-        push(@diffs, {
-            field_name => $name,
-            who        => $bug->reporter,
-            new        => $value});
+      # "0.00" (which is what we get from the DB) is true,
+      # so we explicitly do a numerical comparison with 0.
+      $value = 0 if $value == 0;
     }
+    elsif ($name eq 'deadline') {
+      $value = time2str("%Y-%m-%d", str2time($value)) if $value;
+    }
+
+    # If there isn't anything to show, don't include this header.
+    next unless $value;
+
+    push(@diffs, {field_name => $name, who => $bug->reporter, new => $value});
+  }
 
-    return @diffs;
+  return @diffs;
 }
 
 1;
diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm
index 1e836ca1e8..5d0afdc3b7 100644
--- a/Bugzilla/BugUrl.pm
+++ b/Bugzilla/BugUrl.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -28,48 +28,49 @@ use URI::QueryParam;
 use constant DB_TABLE   => 'bug_see_also';
 use constant NAME_FIELD => 'value';
 use constant LIST_ORDER => 'id';
+
 # See Also is tracked in bugs_activity.
 use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
 use constant AUDIT_REMOVES => 0;
 
 use constant DB_COLUMNS => qw(
-    id
-    bug_id
-    value
-    class
+  id
+  bug_id
+  value
+  class
 );
 
 # This must be strings with the names of the validations,
 # instead of coderefs, because subclasses override these
 # validators with their own.
 use constant VALIDATORS => {
-    value  => '_check_value',
-    bug_id => '_check_bug_id',
-    class  => \&_check_class,
+  value  => '_check_value',
+  bug_id => '_check_bug_id',
+  class  => \&_check_class,
 };
 
 # This is the order we go through all of subclasses and
 # pick the first one that should handle the url. New
 # subclasses should be added at the end of the list.
 use constant SUB_CLASSES => qw(
-    Bugzilla::BugUrl::Bugzilla::Local
-    Bugzilla::BugUrl::Bugzilla
-    Bugzilla::BugUrl::Launchpad
-    Bugzilla::BugUrl::Google
-    Bugzilla::BugUrl::Debian
-    Bugzilla::BugUrl::JIRA
-    Bugzilla::BugUrl::Trac
-    Bugzilla::BugUrl::MantisBT
-    Bugzilla::BugUrl::SourceForge
-    Bugzilla::BugUrl::GitHub
+  Bugzilla::BugUrl::Bugzilla::Local
+  Bugzilla::BugUrl::Bugzilla
+  Bugzilla::BugUrl::Launchpad
+  Bugzilla::BugUrl::Google
+  Bugzilla::BugUrl::Debian
+  Bugzilla::BugUrl::JIRA
+  Bugzilla::BugUrl::Trac
+  Bugzilla::BugUrl::MantisBT
+  Bugzilla::BugUrl::SourceForge
+  Bugzilla::BugUrl::GitHub
 );
 
 ###############################
 ####      Accessors      ######
 ###############################
 
-sub class  { return $_[0]->{class}  }
+sub class  { return $_[0]->{class} }
 sub bug_id { return $_[0]->{bug_id} }
 
 ###############################
@@ -77,129 +78,127 @@ sub bug_id { return $_[0]->{bug_id} }
 ###############################
 
 sub new {
-    my $class = shift;
-    my $param = shift;
-
-    if (ref $param) {
-        my $bug_id = $param->{bug_id};
-        my $name   = $param->{name} || $param->{value};
-        if (!defined $bug_id) {
-            ThrowCodeError('bad_arg',
-                { argument => 'bug_id',
-                  function => "${class}::new" });
-        }
-        if (!defined $name) {
-            ThrowCodeError('bad_arg',
-                { argument => 'name',
-                  function => "${class}::new" });
-        }
-
-        my $condition = 'bug_id = ? AND value = ?';
-        my @values = ($bug_id, $name);
-        $param = { condition => $condition, values => \@values };
+  my $class = shift;
+  my $param = shift;
+
+  if (ref $param) {
+    my $bug_id = $param->{bug_id};
+    my $name = $param->{name} || $param->{value};
+    if (!defined $bug_id) {
+      ThrowCodeError('bad_arg', {argument => 'bug_id', function => "${class}::new"});
+    }
+    if (!defined $name) {
+      ThrowCodeError('bad_arg', {argument => 'name', function => "${class}::new"});
     }
 
-    unshift @_, $param;
-    return $class->SUPER::new(@_);
+    my $condition = 'bug_id = ? AND value = ?';
+    my @values = ($bug_id, $name);
+    $param = {condition => $condition, values => \@values};
+  }
+
+  unshift @_, $param;
+  return $class->SUPER::new(@_);
 }
 
 sub _do_list_select {
-    my $class = shift;
-    my $objects = $class->SUPER::_do_list_select(@_);
+  my $class   = shift;
+  my $objects = $class->SUPER::_do_list_select(@_);
 
-    foreach my $object (@$objects) {
-        eval "use " . $object->class; die $@ if $@;
-        bless $object, $object->class;
-    }
+  foreach my $object (@$objects) {
+    eval "use " . $object->class;
+
+    # If the class cannot be loaded, then we build a generic object.
+    bless $object, ($@ ? 'Bugzilla::BugUrl' : $object->class);
+  }
 
-    return $objects
+  return $objects;
 }
 
 # This is an abstract method. It must be overridden
 # in every subclass.
 sub should_handle {
-    my ($class, $input) = @_;
-    ThrowCodeError('unknown_method',
-        { method => "${class}::should_handle" });
+  my ($class, $input) = @_;
+  ThrowCodeError('unknown_method', {method => "${class}::should_handle"});
 }
 
 sub class_for {
-    my ($class, $value) = @_;
-
-    my @sub_classes = $class->SUB_CLASSES;
-    Bugzilla::Hook::process("bug_url_sub_classes",
-        { sub_classes => \@sub_classes });
-
-    my $uri = URI->new($value);
-    foreach my $subclass (@sub_classes) {
-        eval "use $subclass";
-        die $@ if $@;
-        return wantarray ? ($subclass, $uri) : $subclass
-            if $subclass->should_handle($uri);
-    }
+  my ($class, $value) = @_;
 
-    ThrowUserError('bug_url_invalid', { url => $value });
+  my @sub_classes = $class->SUB_CLASSES;
+  Bugzilla::Hook::process("bug_url_sub_classes", {sub_classes => \@sub_classes});
+
+  my $uri = URI->new($value);
+  foreach my $subclass (@sub_classes) {
+    eval "use $subclass";
+    die $@ if $@;
+    return wantarray ? ($subclass, $uri) : $subclass
+      if $subclass->should_handle($uri);
+  }
+
+  ThrowUserError('bug_url_invalid', {url => $value});
 }
 
 sub _check_class {
-    my ($class, $subclass) = @_;
-    eval "use $subclass"; die $@ if $@;
-    return $subclass;
+  my ($class, $subclass) = @_;
+  eval "use $subclass";
+  die $@ if $@;
+  return $subclass;
 }
 
 sub _check_bug_id {
-    my ($class, $bug_id) = @_;
+  my ($class, $bug_id) = @_;
 
-    my $bug;
-    if (blessed $bug_id) {
-        # We got a bug object passed in, use it
-        $bug = $bug_id;
-        $bug->check_is_visible;
-    }
-    else {
-        # We got a bug id passed in, check it and get the bug object
-        $bug = Bugzilla::Bug->check({ id => $bug_id });
-    }
+  my $bug;
+  if (blessed $bug_id) {
+
+    # We got a bug object passed in, use it
+    $bug = $bug_id;
+    $bug->check_is_visible;
+  }
+  else {
+    # We got a bug id passed in, check it and get the bug object
+    $bug = Bugzilla::Bug->check({id => $bug_id});
+  }
 
-    return $bug->id;
+  return $bug->id;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
-
-    my $value = $uri->as_string;
-
-    if (!$value) {
-        ThrowCodeError('param_required',
-                       { function => 'add_see_also', param => '$value' });
-    }
-
-    # We assume that the URL is an HTTP URL if there is no (something):// 
-    # in front.
-    if (!$uri->scheme) {
-        # This works better than setting $uri->scheme('http'), because
-        # that creates URLs like "http:domain.com" and doesn't properly
-        # differentiate the path from the domain.
-        $uri = new URI("http://$value");
-    }
-    elsif ($uri->scheme ne 'http' && $uri->scheme ne 'https') {
-        ThrowUserError('bug_url_invalid', { url => $value, reason => 'http' });
-    }
-
-    # This stops the following edge cases from being accepted:
-    # * show_bug.cgi?id=1
-    # * /show_bug.cgi?id=1
-    # * http:///show_bug.cgi?id=1
-    if (!$uri->authority or $uri->path !~ m{/}) {
-        ThrowUserError('bug_url_invalid',
-                       { url => $value, reason => 'path_only' });
-    }
-
-    if (length($uri->path) > MAX_BUG_URL_LENGTH) {
-        ThrowUserError('bug_url_too_long', { url => $uri->path });
-    }
-
-    return $uri;
+  my ($class, $uri) = @_;
+
+  my $value = $uri->as_string;
+
+  if (!$value) {
+    ThrowCodeError('param_required',
+      {function => 'add_see_also', param => '$value'});
+  }
+
+  # We assume that the URL is an HTTP URL if there is no (something)://
+  # in front.
+  if (!$uri->scheme) {
+
+    # This works better than setting $uri->scheme('http'), because
+    # that creates URLs like "http:domain.com" and doesn't properly
+    # differentiate the path from the domain.
+    $uri = new URI("http://$value");
+  }
+  elsif ($uri->scheme ne 'http' && $uri->scheme ne 'https') {
+    ThrowUserError('bug_url_invalid', {url => $value, reason => 'http'});
+  }
+
+  # This stops the following edge cases from being accepted:
+  # * show_bug.cgi?id=1
+  # * /show_bug.cgi?id=1
+  # * http:///show_bug.cgi?id=1
+  if (!$uri->authority or $uri->path !~ m{/}) {
+    ThrowUserError('bug_url_invalid', {url => $value, reason => 'path_only'});
+  }
+
+  if (length($uri->path) > MAX_BUG_URL_LENGTH) {
+    ThrowUserError('bug_url_too_long', {url => $uri->path});
+  }
+
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/Bugzilla.pm b/Bugzilla/BugUrl/Bugzilla.pm
index 402ff1509b..8f6ab7475f 100644
--- a/Bugzilla/BugUrl/Bugzilla.pm
+++ b/Bugzilla/BugUrl/Bugzilla.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,37 +21,39 @@ use Bugzilla::Util;
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-    return ($uri->path =~ /show_bug\.cgi$/) ? 1 : 0;
+  my ($class, $uri) = @_;
+  return ($uri->path =~ /show_bug\.cgi$/) ? 1 : 0;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
-
-    $uri = $class->SUPER::_check_value($uri);
-
-    my $bug_id = $uri->query_param('id');
-    # We don't currently allow aliases, because we can't check to see
-    # if somebody's putting both an alias link and a numeric ID link.
-    # When we start validating the URL by accessing the other Bugzilla,
-    # we can allow aliases.
-    detaint_natural($bug_id);
-    if (!$bug_id) {
-        my $value = $uri->as_string;
-        ThrowUserError('bug_url_invalid', { url => $value, reason => 'id' });
-    }
-
-    # Make sure that "id" is the only query parameter.
-    $uri->query("id=$bug_id");
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
-
-    return $uri;
+  my ($class, $uri) = @_;
+
+  $uri = $class->SUPER::_check_value($uri);
+
+  my $bug_id = $uri->query_param('id');
+
+  # We don't currently allow aliases, because we can't check to see
+  # if somebody's putting both an alias link and a numeric ID link.
+  # When we start validating the URL by accessing the other Bugzilla,
+  # we can allow aliases.
+  detaint_natural($bug_id);
+  if (!$bug_id) {
+    my $value = $uri->as_string;
+    ThrowUserError('bug_url_invalid', {url => $value, reason => 'id'});
+  }
+
+  # Make sure that "id" is the only query parameter.
+  $uri->query("id=$bug_id");
+
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
+
+  return $uri;
 }
 
 sub target_bug_id {
-    my ($self) = @_;
-    return new URI($self->name)->query_param('id');
+  my ($self) = @_;
+  return new URI($self->name)->query_param('id');
 }
 
 1;
diff --git a/Bugzilla/BugUrl/Bugzilla/Local.pm b/Bugzilla/BugUrl/Bugzilla/Local.pm
index 7b9cb6a4fa..9941c3fb4a 100644
--- a/Bugzilla/BugUrl/Bugzilla/Local.pm
+++ b/Bugzilla/BugUrl/Bugzilla/Local.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::Bugzilla::Local;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,77 +20,75 @@ use Bugzilla::Util;
 ####    Initialization     ####
 ###############################
 
-use constant VALIDATOR_DEPENDENCIES => {
-    value => ['bug_id'],
-};
+use constant VALIDATOR_DEPENDENCIES => {value => ['bug_id'],};
 
 ###############################
 ####        Methods        ####
 ###############################
 
 sub ref_bug_url {
-    my $self = shift;
-
-    if (!exists $self->{ref_bug_url}) {
-        my $ref_bug_id = new URI($self->name)->query_param('id');
-        my $ref_bug = Bugzilla::Bug->check($ref_bug_id);
-        my $ref_value = $self->local_uri($self->bug_id);
-        $self->{ref_bug_url} =
-            new Bugzilla::BugUrl::Bugzilla::Local({ bug_id => $ref_bug->id,
-                                                    value => $ref_value });
-    }
-    return $self->{ref_bug_url};
+  my $self = shift;
+
+  if (!exists $self->{ref_bug_url}) {
+    my $ref_bug_id = new URI($self->name)->query_param('id');
+    my $ref_bug    = Bugzilla::Bug->check($ref_bug_id);
+    my $ref_value  = $self->local_uri($self->bug_id);
+    $self->{ref_bug_url} = new Bugzilla::BugUrl::Bugzilla::Local(
+      {bug_id => $ref_bug->id, value => $ref_value});
+  }
+  return $self->{ref_bug_url};
 }
 
 sub should_handle {
-    my ($class, $uri) = @_;
-
-    # Check if it is either a bug id number or an alias.
-    return 1 if $uri->as_string =~ m/^\w+$/;
-
-    # Check if it is a local Bugzilla uri and call
-    # Bugzilla::BugUrl::Bugzilla to check if it's a valid Bugzilla
-    # see also url.
-    my $canonical_local = URI->new($class->local_uri)->canonical;
-    if ($canonical_local->authority eq $uri->canonical->authority
-        and $canonical_local->path eq $uri->canonical->path)
-    {
-        return $class->SUPER::should_handle($uri);
-    }
-
-    return 0;
+  my ($class, $uri) = @_;
+
+  # Check if it is either a bug id number or an alias.
+  return 1 if $uri->as_string =~ m/^\w+$/;
+
+  # Check if it is a local Bugzilla uri and call
+  # Bugzilla::BugUrl::Bugzilla to check if it's a valid Bugzilla
+  # see also url.
+  my $canonical_local = URI->new($class->local_uri)->canonical;
+  if (  $canonical_local->authority eq $uri->canonical->authority
+    and $canonical_local->path eq $uri->canonical->path)
+  {
+    return $class->SUPER::should_handle($uri);
+  }
+
+  return 0;
 }
 
 sub _check_value {
-    my ($class, $uri, undef, $params) = @_;
-
-    # At this point we are going to treat any word as a
-    # bug id/alias to the local Bugzilla.
-    my $value = $uri->as_string;
-    if ($value =~ m/^\w+$/) {
-        $uri = new URI($class->local_uri($value));
-    } else {
-        # It's not a word, then we have to check
-        # if it's a valid Bugzilla url.
-        $uri = $class->SUPER::_check_value($uri);
-    }
-
-    my $ref_bug_id  = $uri->query_param('id');
-    my $ref_bug     = Bugzilla::Bug->check($ref_bug_id);
-    my $self_bug_id = $params->{bug_id};
-    $params->{ref_bug} = $ref_bug;
-
-    if ($ref_bug->id == $self_bug_id) {
-        ThrowUserError('see_also_self_reference');
-    }
- 
-    return $uri;
+  my ($class, $uri, undef, $params) = @_;
+
+  # At this point we are going to treat any word as a
+  # bug id/alias to the local Bugzilla.
+  my $value = $uri->as_string;
+  if ($value =~ m/^\w+$/) {
+    $uri = new URI($class->local_uri($value));
+  }
+  else {
+    # It's not a word, then we have to check
+    # if it's a valid Bugzilla url.
+    $uri = $class->SUPER::_check_value($uri);
+  }
+
+  my $ref_bug_id  = $uri->query_param('id');
+  my $ref_bug     = Bugzilla::Bug->check($ref_bug_id);
+  my $self_bug_id = $params->{bug_id};
+  $params->{ref_bug} = $ref_bug;
+
+  if ($ref_bug->id == $self_bug_id) {
+    ThrowUserError('see_also_self_reference');
+  }
+
+  return $uri;
 }
 
 sub local_uri {
-    my ($self, $bug_id) = @_;
-    $bug_id ||= '';
-    return correct_urlbase() . "show_bug.cgi?id=$bug_id";
+  my ($self, $bug_id) = @_;
+  $bug_id ||= '';
+  return correct_urlbase() . "show_bug.cgi?id=$bug_id";
 }
 
 1;
diff --git a/Bugzilla/BugUrl/Debian.pm b/Bugzilla/BugUrl/Debian.pm
index 2b611aa57b..538e34cc8b 100644
--- a/Bugzilla/BugUrl/Debian.pm
+++ b/Bugzilla/BugUrl/Debian.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::Debian;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,28 +18,35 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-
-    # Debian BTS URLs can look like various things:
-    #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234
-    #   http://bugs.debian.org/1234
-    return (lc($uri->authority) eq 'bugs.debian.org'
-            and (($uri->path =~ /bugreport\.cgi$/
-                  and $uri->query_param('bug') =~ m|^\d+$|)
-                 or $uri->path =~ m|^/\d+$|)) ? 1 : 0;
+  my ($class, $uri) = @_;
+
+  # Debian BTS URLs can look like various things:
+  #   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1234
+  #   http://bugs.debian.org/1234
+  #   https://debbugs.gnu.org/cgi/bugreport.cgi?bug=123
+  #   https://debbugs.gnu.org/123
+  return (
+    (
+           lc($uri->authority) eq 'bugs.debian.org'
+        or lc($uri->authority) eq 'debbugs.gnu.org'
+    )
+      and
+      (($uri->path =~ /bugreport\.cgi$/ and $uri->query_param('bug') =~ m|^\d+$|a)
+      or $uri->path =~ m|^/\d+$|a)
+  ) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # This is the shortest standard URL form for Debian BTS URLs,
-    # and so we reduce all URLs to this.
-    $uri->path =~ m|^/(\d+)$| || $uri->query_param('bug') =~ m|^(\d+)$|;
-    $uri = new URI("http://bugs.debian.org/$1");
+  # This is the shortest standard URL form for Debian BTS URLs,
+  # and so we reduce all URLs to this.
+  $uri->path =~ m|^/(\d+)$|a || $uri->query_param('bug') =~ m|^(\d+)$|a;
+  $uri = new URI('https://' . $uri->authority . '/' . $1);
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/GitHub.pm b/Bugzilla/BugUrl/GitHub.pm
index 22814dc50e..46e4509a41 100644
--- a/Bugzilla/BugUrl/GitHub.pm
+++ b/Bugzilla/BugUrl/GitHub.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::GitHub;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,23 +18,25 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-
-    # GitHub issue URLs have only one form:
-    #  https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111
-    return (lc($uri->authority) eq 'github.com'
-            and $uri->path =~ m|^/[^/]+/[^/]+/issues/\d+$|) ? 1 : 0;
+  my ($class, $uri) = @_;
+
+# GitHub issue URLs have only one form:
+#  https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/issues/111
+# GitHub pull request URLs have only one form:
+#  https://github.com/USER_OR_TEAM_OR_ORGANIZATION_NAME/REPOSITORY_NAME/pull/111
+  return (lc($uri->authority) eq 'github.com'
+      and $uri->path =~ m!^/[^/]+/[^/]+/(?:issues|pull)/\d+$!) ? 1 : 0;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    $uri = $class->SUPER::_check_value($uri);
+  $uri = $class->SUPER::_check_value($uri);
 
-    # GitHub HTTP URLs redirect to HTTPS, so just use the HTTPS scheme.
-    $uri->scheme('https');
+  # GitHub HTTP URLs redirect to HTTPS, so just use the HTTPS scheme.
+  $uri->scheme('https');
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/Google.pm b/Bugzilla/BugUrl/Google.pm
index 71a9c46fb5..4bc0e3cbda 100644
--- a/Bugzilla/BugUrl/Google.pm
+++ b/Bugzilla/BugUrl/Google.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::Google;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,27 +18,27 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # Google Code URLs only have one form:
-    #   http(s)://code.google.com/p/PROJECT_NAME/issues/detail?id=1234
-    return (lc($uri->authority) eq 'code.google.com'
-            and $uri->path =~ m|^/p/[^/]+/issues/detail$|
-            and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
+  # Google Code URLs only have one form:
+  #   http(s)://code.google.com/p/PROJECT_NAME/issues/detail?id=1234
+  return (lc($uri->authority) eq 'code.google.com'
+      and $uri->path =~ m|^/p/[^/]+/issues/detail$|
+      and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
-    
-    $uri = $class->SUPER::_check_value($uri);
+  my ($class, $uri) = @_;
 
-    # While Google Code URLs can be either HTTP or HTTPS,
-    # always go with the HTTP scheme, as that's the default.
-    if ($uri->scheme eq 'https') {
-        $uri->scheme('http');
-    }
+  $uri = $class->SUPER::_check_value($uri);
 
-    return $uri;
+  # While Google Code URLs can be either HTTP or HTTPS,
+  # always go with the HTTP scheme, as that's the default.
+  if ($uri->scheme eq 'https') {
+    $uri->scheme('http');
+  }
+
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/JIRA.pm b/Bugzilla/BugUrl/JIRA.pm
index e9d2a2d2a6..a46c1fd5e6 100644
--- a/Bugzilla/BugUrl/JIRA.pm
+++ b/Bugzilla/BugUrl/JIRA.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::JIRA;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,25 +18,26 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # JIRA URLs have only one basic form (but the jira is optional):
-    #   https://issues.apache.org/jira/browse/KEY-1234
-    #   http://issues.example.com/browse/KEY-1234
-    return ($uri->path =~ m|/browse/[A-Z][A-Z]+-\d+$|) ? 1 : 0;
+  # JIRA URLs have only one basic form (but the jira is optional):
+  #   https://issues.apache.org/jira/browse/KEY-1234
+  #   http://issues.example.com/browse/KEY-1234
+  return ($uri->path =~ m|/browse/[A-Z][A-Z]+-\d+$|) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Make sure there are no query parameters.
-    $uri->query(undef);
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
+  # Make sure there are no query parameters.
+  $uri->query(undef);
 
-    return $uri;
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
+
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/Launchpad.pm b/Bugzilla/BugUrl/Launchpad.pm
index 0362747a24..9988aa9577 100644
--- a/Bugzilla/BugUrl/Launchpad.pm
+++ b/Bugzilla/BugUrl/Launchpad.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::Launchpad;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,27 +18,28 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-
-    # Launchpad bug URLs can look like various things:
-    #   https://bugs.launchpad.net/ubuntu/+bug/1234
-    #   https://launchpad.net/bugs/1234
-    # All variations end with either "/bugs/1234" or "/+bug/1234"
-    return ($uri->authority =~ /launchpad\.net$/
-            and $uri->path =~ m|bugs?/\d+$|) ? 1 : 0;
+  my ($class, $uri) = @_;
+
+  # Launchpad bug URLs can look like various things:
+  #   https://bugs.launchpad.net/ubuntu/+bug/1234
+  #   https://launchpad.net/bugs/1234
+  # All variations end with either "/bugs/1234" or "/+bug/1234"
+  return ($uri->authority =~ /launchpad\.net$/ and $uri->path =~ m|bugs?/\d+$|a)
+    ? 1
+    : 0;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    $uri = $class->SUPER::_check_value($uri);
+  $uri = $class->SUPER::_check_value($uri);
 
-    # This is the shortest standard URL form for Launchpad bugs,
-    # and so we reduce all URLs to this.
-    $uri->path =~ m|bugs?/(\d+)$|;
-    $uri = new URI("https://launchpad.net/bugs/$1");
+  # This is the shortest standard URL form for Launchpad bugs,
+  # and so we reduce all URLs to this.
+  $uri->path =~ m|bugs?/(\d+)$|a;
+  $uri = new URI("https://launchpad.net/bugs/$1");
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/MantisBT.pm b/Bugzilla/BugUrl/MantisBT.pm
index 60d3b578ef..2e03ffa8ad 100644
--- a/Bugzilla/BugUrl/MantisBT.pm
+++ b/Bugzilla/BugUrl/MantisBT.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::MantisBT;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,22 +18,22 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # MantisBT URLs look like the following ('bugs' directory is optional):
-    #   http://www.mantisbt.org/bugs/view.php?id=1234
-    return ($uri->path_query =~ m|view\.php\?id=\d+$|) ? 1 : 0;
+  # MantisBT URLs look like the following ('bugs' directory is optional):
+  #   http://www.mantisbt.org/bugs/view.php?id=1234
+  return ($uri->path_query =~ m|view\.php\?id=\d+$|) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Remove any # part if there is one.
-    $uri->fragment(undef);
+  # Remove any # part if there is one.
+  $uri->fragment(undef);
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/SourceForge.pm b/Bugzilla/BugUrl/SourceForge.pm
index acba0df28b..277b759591 100644
--- a/Bugzilla/BugUrl/SourceForge.pm
+++ b/Bugzilla/BugUrl/SourceForge.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::SourceForge;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,27 +18,45 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-
-    # SourceForge tracker URLs have only one form:
-    #  http://sourceforge.net/tracker/?func=detail&aid=111&group_id=111&atid=111
-    return (lc($uri->authority) eq 'sourceforge.net'
-            and $uri->path =~ m|/tracker/|
-            and $uri->query_param('func') eq 'detail'
-            and $uri->query_param('aid')
-            and $uri->query_param('group_id')
-            and $uri->query_param('atid')) ? 1 : 0;
+  my ($class, $uri) = @_;
+
+  # SourceForge tracker URLs have only one form:
+  #  http://sourceforge.net/tracker/?func=detail&aid=111&group_id=111&atid=111
+  # SourceForge Allura ticket URLs have several forms:
+  #  http://sourceforge.net/p/project/bugs/12345/
+  #  http://sourceforge.net/p/project/feature-requests/12345/
+  #  http://sourceforge.net/p/project/patches/12345/
+  #  http://sourceforge.net/p/project/support-requests/12345/
+  return (
+    lc($uri->authority) eq 'sourceforge.net'
+      and (
+      (
+            $uri->path eq '/tracker/'
+        and $uri->query_param('func') eq 'detail'
+        and $uri->query_param('aid')
+        and $uri->query_param('group_id')
+        and $uri->query_param('atid')
+      )
+      or $uri->path
+      =~ m!^/p/[^/]+/(?:bugs|feature-requests|patches|support-requests)/\d+/?$!
+      )
+  ) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Remove any # part if there is one.
-    $uri->fragment(undef);
+  # Remove any # part if there is one.
+  $uri->fragment(undef);
 
-    return $uri;
+  # Make sure the trailing slash is present
+  my $path = $uri->path;
+  $path =~ s!/*$!/!;
+  $uri->path($path);
+
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUrl/Trac.pm b/Bugzilla/BugUrl/Trac.pm
index fe74abf33d..e8b1b6d79a 100644
--- a/Bugzilla/BugUrl/Trac.pm
+++ b/Bugzilla/BugUrl/Trac.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::BugUrl::Trac;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,25 +18,26 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # Trac URLs can look like various things:
-    #   http://dev.mutt.org/trac/ticket/1234
-    #   http://trac.roundcube.net/ticket/1484130
-    return ($uri->path =~ m|/ticket/\d+$|) ? 1 : 0;
+  # Trac URLs can look like various things:
+  #   http://dev.mutt.org/trac/ticket/1234
+  #   http://trac.roundcube.net/ticket/1484130
+  return ($uri->path =~ m|/ticket/\d+$|) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Make sure there are no query parameters.
-    $uri->query(undef);
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
+  # Make sure there are no query parameters.
+  $uri->query(undef);
 
-    return $uri;
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
+
+  return $uri;
 }
 
 1;
diff --git a/Bugzilla/BugUserLastVisit.pm b/Bugzilla/BugUserLastVisit.pm
index d043b121ab..c1f967510d 100644
--- a/Bugzilla/BugUserLastVisit.pm
+++ b/Bugzilla/BugUserLastVisit.pm
@@ -7,14 +7,14 @@
 
 package Bugzilla::BugUserLastVisit;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Bugzilla::Object);
 
 #####################################################################
-# Overriden Constants that are used as methods
+# Overridden Constants that are used as methods
 #####################################################################
 
 use constant DB_TABLE       => 'bug_user_last_visit';
@@ -25,25 +25,27 @@ use constant LIST_ORDER     => 'id';
 use constant NAME_FIELD     => 'id';
 
 # turn off auditing and exclude these objects from memcached
-use constant { AUDIT_CREATES => 0,
-               AUDIT_UPDATES => 0,
-               AUDIT_REMOVES => 0,
-               USE_MEMCACHED => 0 };
+use constant {
+  AUDIT_CREATES => 0,
+  AUDIT_UPDATES => 0,
+  AUDIT_REMOVES => 0,
+  USE_MEMCACHED => 0
+};
 
 #####################################################################
 # Provide accessors for our columns
 #####################################################################
 
-sub id            { return $_[0]->{id}            }
-sub bug_id        { return $_[0]->{bug_id}        }
-sub user_id       { return $_[0]->{user_id}       }
+sub id            { return $_[0]->{id} }
+sub bug_id        { return $_[0]->{bug_id} }
+sub user_id       { return $_[0]->{user_id} }
 sub last_visit_ts { return $_[0]->{last_visit_ts} }
 
 sub user {
-    my $self = shift;
+  my $self = shift;
 
-    $self->{user} //= Bugzilla::User->new({ id => $self->user_id, cache => 1 });
-    return $self->{user};
+  $self->{user} //= Bugzilla::User->new({id => $self->user_id, cache => 1});
+  return $self->{user};
 }
 
 1;
diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index 18181f489c..a2adf3a5c1 100644
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::CGI;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,611 +18,717 @@ use Bugzilla::Error;
 use Bugzilla::Util;
 use Bugzilla::Hook;
 use Bugzilla::Search::Recent;
+use Bugzilla::Install::Util qw(i_am_persistent);
 
 use File::Basename;
 
+use constant DEFAULT_CSP => (
+  default_src => ['self'],
+  script_src  => ['self', 'unsafe-inline', 'unsafe-eval'],
+  style_src   => ['self', 'unsafe-inline'],
+);
+
 sub _init_bz_cgi_globals {
-    my $invocant = shift;
-    # We need to disable output buffering - see bug 179174
-    $| = 1;
-
-    # Ignore SIGTERM and SIGPIPE - this prevents DB corruption. If the user closes
-    # their browser window while a script is running, the web server sends these
-    # signals, and we don't want to die half way through a write.
-    $SIG{TERM} = 'IGNORE';
-    $SIG{PIPE} = 'IGNORE';
-
-    # We don't precompile any functions here, that's done specially in
-    # mod_perl code.
-    $invocant->_setup_symbols(qw(:no_xhtml :oldstyle_urls :private_tempfiles
-                                 :unique_headers));
+  my $invocant = shift;
+
+  # We need to disable output buffering - see bug 179174
+  $| = 1;
+
+  # Ignore SIGTERM and SIGPIPE - this prevents DB corruption. If the user closes
+  # their browser window while a script is running, the web server sends these
+  # signals, and we don't want to die half way through a write.
+  $SIG{TERM} = 'IGNORE';
+  $SIG{PIPE} = 'IGNORE';
+
+  # We don't precompile any functions here, that's done specially in
+  # mod_perl code.
+  $invocant->_setup_symbols(qw(:no_xhtml :oldstyle_urls :unique_headers :utf8));
 }
 
 BEGIN { __PACKAGE__->_init_bz_cgi_globals() if i_am_cgi(); }
 
 sub new {
-    my ($invocant, @args) = @_;
-    my $class = ref($invocant) || $invocant;
-
-    # Under mod_perl, CGI's global variables get reset on each request,
-    # so we need to set them up again every time.
-    $class->_init_bz_cgi_globals() if $ENV{MOD_PERL};
-
-    my $self = $class->SUPER::new(@args);
-
-    # Make sure our outgoing cookie list is empty on each invocation
-    $self->{Bugzilla_cookie_list} = [];
-
-    # Path-Info is of no use for Bugzilla and interacts badly with IIS.
-    # Moreover, it causes unexpected behaviors, such as totally breaking
-    # the rendering of pages.
-    my $script = basename($0);
-    if (my $path_info = $self->path_info) {
-        my @whitelist = ("rest.cgi");
-        Bugzilla::Hook::process('path_info_whitelist', { whitelist => \@whitelist });
-        if (!grep($_ eq $script, @whitelist)) {
-            # IIS includes the full path to the script in PATH_INFO,
-            # so we have to extract the real PATH_INFO from it,
-            # else we will be redirected outside Bugzilla.
-            my $script_name = $self->script_name;
-            $path_info =~ s/^\Q$script_name\E//;
-            if ($path_info) {
-                print $self->redirect($self->url(-path => 0, -query => 1));
-            }
-        }
-    }
+  my ($invocant, @args) = @_;
+  my $class = ref($invocant) || $invocant;
 
-    # Send appropriate charset
-    $self->charset(Bugzilla->params->{'utf8'} ? 'UTF-8' : '');
+  $class->_init_bz_cgi_globals() if i_am_persistent();
 
-    # Redirect to urlbase/sslbase if we are not viewing an attachment.
-    if ($self->url_is_attachment_base and $script ne 'attachment.cgi') {
-        $self->redirect_to_urlbase();
-    }
+  my $self = $class->SUPER::new(@args);
 
-    # Check for errors
-    # All of the Bugzilla code wants to do this, so do it here instead of
-    # in each script
-
-    my $err = $self->cgi_error;
-
-    if ($err) {
-        # Note that this error block is only triggered by CGI.pm for malformed
-        # multipart requests, and so should never happen unless there is a
-        # browser bug.
-
-        print $self->header(-status => $err);
-
-        # ThrowCodeError wants to print the header, so it grabs Bugzilla->cgi
-        # which creates a new Bugzilla::CGI object, which fails again, which
-        # ends up here, and calls ThrowCodeError, and then recurses forever.
-        # So don't use it.
-        # In fact, we can't use templates at all, because we need a CGI object
-        # to determine the template lang as well as the current url (from the
-        # template)
-        # Since this is an internal error which indicates a severe browser bug,
-        # just die.
-        die "CGI parsing error: $err";
+  # Make sure our outgoing cookie list is empty on each invocation
+  $self->{Bugzilla_cookie_list} = [];
+
+  my $script = basename($0);
+
+  # attachment.cgi handles this itself.
+  if ($script ne 'attachment.cgi') {
+    $self->do_ssl_redirect_if_required();
+    $self->redirect_to_urlbase if $self->url_is_attachment_base;
+  }
+
+
+  # Path-Info is of no use for Bugzilla and interacts badly with IIS.
+  # Moreover, it causes unexpected behaviors, such as totally breaking
+  # the rendering of pages.
+  if ($self->script_name && $self->path_info) {
+    my @whitelist = ("rest.cgi");
+    Bugzilla::Hook::process('path_info_whitelist', {whitelist => \@whitelist});
+    if (!grep($_ eq $script, @whitelist)) {
+      print $self->redirect($self->url(-path => 0, -query => 1));
     }
+  }
 
-    return $self;
-}
+  # Send appropriate charset
+  $self->charset('UTF-8');
 
-# We want this sorted plus the ability to exclude certain params
-sub canonicalise_query {
-    my ($self, @exclude) = @_;
+  # Check for errors
+  # All of the Bugzilla code wants to do this, so do it here instead of
+  # in each script
 
-    # Reconstruct the URL by concatenating the sorted param=value pairs
-    my @parameters;
-    foreach my $key (sort($self->param())) {
-        # Leave this key out if it's in the exclude list
-        next if grep { $_ eq $key } @exclude;
+  my $err = $self->cgi_error;
 
-        # Remove the Boolean Charts for standard query.cgi fields
-        # They are listed in the query URL already
-        next if $key =~ /^(field|type|value)(-\d+){3}$/;
+  if ($err) {
 
-        my $esc_key = url_quote($key);
+    # Note that this error block is only triggered by CGI.pm for malformed
+    # multipart requests, and so should never happen unless there is a
+    # browser bug.
 
-        foreach my $value ($self->param($key)) {
-            # Omit params with an empty value
-            if (defined($value) && $value ne '') {
-                my $esc_value = url_quote($value);
+    print $self->header(-status => $err);
 
-                push(@parameters, "$esc_key=$esc_value");
-            }
-        }
-    }
+    # ThrowCodeError wants to print the header, so it grabs Bugzilla->cgi
+    # which creates a new Bugzilla::CGI object, which fails again, which
+    # ends up here, and calls ThrowCodeError, and then recurses forever.
+    # So don't use it.
+    # In fact, we can't use templates at all, because we need a CGI object
+    # to determine the template lang as well as the current url (from the
+    # template)
+    # Since this is an internal error which indicates a severe browser bug,
+    # just die.
+    die "CGI parsing error: $err";
+  }
 
-    return join("&", @parameters);
+  return $self;
 }
 
-sub clean_search_url {
-    my $self = shift;
-    # Delete any empty URL parameter.
-    my @cgi_params = $self->param;
-
-    foreach my $param (@cgi_params) {
-        if (defined $self->param($param) && $self->param($param) eq '') {
-            $self->delete($param);
-            $self->delete("${param}_type");
-        }
-
-        # Custom Search stuff is empty if it's "noop". We also keep around
-        # the old Boolean Chart syntax for backwards-compatibility.
-        if (($param =~ /\d-\d-\d/ || $param =~ /^[[:alpha:]]\d+$/)
-            && defined $self->param($param) && $self->param($param) eq 'noop')
-        {
-            $self->delete($param);
+sub content_security_policy {
+  my ($self, %add_params) = @_;
+  if (Bugzilla->has_feature('csp')) {
+    require Bugzilla::CGI::ContentSecurityPolicy;
+    return $self->{Bugzilla_csp} if $self->{Bugzilla_csp};
+    my %params = DEFAULT_CSP;
+    if (%add_params) {
+      foreach my $key (keys %add_params) {
+        if (defined $add_params{$key}) {
+          $params{$key} = $add_params{$key};
         }
-        
-        # Any "join" for custom search that's an AND can be removed, because
-        # that's the default.
-        if (($param =~ /^j\d+$/ || $param eq 'j_top')
-            && $self->param($param) eq 'AND')
-        {
-            $self->delete($param);
+        else {
+          delete $params{$key};
         }
+      }
     }
+    return $self->{Bugzilla_csp}
+      = Bugzilla::CGI::ContentSecurityPolicy->new(%params);
+  }
+  return undef;
+}
 
-    # Delete leftovers from the login form
-    $self->delete('Bugzilla_remember', 'GoAheadAndLogIn');
+sub csp_nonce {
+  my ($self) = @_;
 
-    # Delete the token if we're not performing an action which needs it
-    unless ((defined $self->param('remtype')
-             && ($self->param('remtype') eq 'asdefault'
-                 || $self->param('remtype') eq 'asnamed'))
-            || (defined $self->param('remaction')
-                && $self->param('remaction') eq 'forget'))
-    {
-        $self->delete("token");
-    }
+  if (Bugzilla->has_feature('csp')) {
+    my $csp = $self->content_security_policy;
+    return $csp->nonce if $csp->has_nonce;
+  }
 
-    foreach my $num (1,2,3) {
-        # If there's no value in the email field, delete the related fields.
-        if (!$self->param("email$num")) {
-            foreach my $field (qw(type assigned_to reporter qa_contact cc longdesc)) {
-                $self->delete("email$field$num");
-            }
-        }
+  return '';
+}
+
+# We want this sorted plus the ability to exclude certain params
+sub canonicalise_query {
+  my ($self, @exclude) = @_;
+
+  # Reconstruct the URL by concatenating the sorted param=value pairs
+  my @parameters;
+  foreach my $key (sort($self->multi_param())) {
+
+    # Leave this key out if it's in the exclude list
+    next if grep { $_ eq $key } @exclude;
+
+    # Remove the Boolean Charts for standard query.cgi fields
+    # They are listed in the query URL already
+    next if $key =~ /^(field|type|value)(-\d+){3}$/;
+
+    my $esc_key = url_quote($key);
+
+    foreach my $value ($self->multi_param($key)) {
+
+      # Omit params with an empty value
+      if (defined($value) && $value ne '') {
+        my $esc_value = url_quote($value);
+
+        push(@parameters, "$esc_key=$esc_value");
+      }
     }
+  }
 
-    # chfieldto is set to "Now" by default in query.cgi. But if none
-    # of the other chfield parameters are set, it's meaningless.
-    if (!defined $self->param('chfieldfrom') && !$self->param('chfield')
-        && !defined $self->param('chfieldvalue') && $self->param('chfieldto')
-        && lc($self->param('chfieldto')) eq 'now')
-    {
-        $self->delete('chfieldto');
+  return join("&", @parameters);
+}
+
+sub clean_search_url {
+  my $self = shift;
+
+  # Delete any empty URL parameter.
+  my @cgi_params = $self->multi_param();
+
+  foreach my $param (@cgi_params) {
+    if (defined $self->param($param) && $self->param($param) eq '') {
+      $self->delete($param);
+      $self->delete("${param}_type");
     }
 
-    # cmdtype "doit" is the default from query.cgi, but it's only meaningful
-    # if there's a remtype parameter.
-    if (defined $self->param('cmdtype') && $self->param('cmdtype') eq 'doit'
-        && !defined $self->param('remtype'))
+    # Custom Search stuff is empty if it's "noop". We also keep around
+    # the old Boolean Chart syntax for backwards-compatibility.
+    if ( ($param =~ /\d-\d-\d/ || $param =~ /^[[:alpha:]]\d+$/)
+      && defined $self->param($param)
+      && $self->param($param) eq 'noop')
     {
-        $self->delete('cmdtype');
+      $self->delete($param);
     }
 
-    # "Reuse same sort as last time" is actually the default, so we don't
-    # need it in the URL.
-    if ($self->param('order') 
-        && $self->param('order') eq 'Reuse same sort as last time')
+    # Any "join" for custom search that's an AND can be removed, because
+    # that's the default.
+    if (($param =~ /^j\d+$/ || $param eq 'j_top') && $self->param($param) eq 'AND')
     {
-        $self->delete('order');
-    }
+      $self->delete($param);
+    }
+  }
+
+  # Delete leftovers from the login form
+  $self->delete('Bugzilla_remember', 'GoAheadAndLogIn');
+
+  # Delete the token if we're not performing an action which needs it
+  unless (
+    (
+      defined $self->param('remtype')
+      && ( $self->param('remtype') eq 'asdefault'
+        || $self->param('remtype') eq 'asnamed')
+    )
+    || (defined $self->param('remaction') && $self->param('remaction') eq 'forget')
+    )
+  {
+    $self->delete("token");
+  }
+
+  foreach my $num (1, 2, 3) {
+
+    # If there's no value in the email field, delete the related fields.
+    if (!$self->param("email$num")) {
+      foreach my $field (qw(type assigned_to reporter qa_contact cc longdesc)) {
+        $self->delete("email$field$num");
+      }
+    }
+  }
+
+  # chfieldto is set to "Now" by default in query.cgi. But if none
+  # of the other chfield parameters are set, it's meaningless.
+  if ( !defined $self->param('chfieldfrom')
+    && !$self->param('chfield')
+    && !defined $self->param('chfieldvalue')
+    && $self->param('chfieldto')
+    && lc($self->param('chfieldto')) eq 'now')
+  {
+    $self->delete('chfieldto');
+  }
+
+  # cmdtype "doit" is the default from query.cgi, but it's only meaningful
+  # if there's a remtype parameter.
+  if ( defined $self->param('cmdtype')
+    && $self->param('cmdtype') eq 'doit'
+    && !defined $self->param('remtype'))
+  {
+    $self->delete('cmdtype');
+  }
+
+  # "Reuse same sort as last time" is actually the default, so we don't
+  # need it in the URL.
+  if ( $self->param('order')
+    && $self->param('order') eq 'Reuse same sort as last time')
+  {
+    $self->delete('order');
+  }
+
+  # list_id is added in buglist.cgi after calling clean_search_url,
+  # and doesn't need to be saved in saved searches.
+  $self->delete('list_id');
+
+  # no_redirect is used internally by redirect_search_url().
+  $self->delete('no_redirect');
+
+  # And now finally, if query_format is our only parameter, that
+  # really means we have no parameters, so we should delete query_format.
+  if ($self->param('query_format') && scalar($self->param()) == 1) {
+    $self->delete('query_format');
+  }
+}
 
-    # list_id is added in buglist.cgi after calling clean_search_url,
-    # and doesn't need to be saved in saved searches.
-    $self->delete('list_id');
+sub check_etag {
+  my ($self, $valid_etag) = @_;
 
-    # no_redirect is used internally by redirect_search_url().
-    $self->delete('no_redirect');
+  # ETag support.
+  my $if_none_match = $self->http('If-None-Match');
+  return if !$if_none_match;
 
-    # And now finally, if query_format is our only parameter, that
-    # really means we have no parameters, so we should delete query_format.
-    if ($self->param('query_format') && scalar($self->param()) == 1) {
-        $self->delete('query_format');
-    }
-}
+  my @if_none = split(/[\s,]+/, $if_none_match);
+  foreach my $possible_etag (@if_none) {
 
-sub check_etag {
-    my ($self, $valid_etag) = @_;
-
-    # ETag support.
-    my $if_none_match = $self->http('If-None-Match');
-    return if !$if_none_match;
-
-    my @if_none = split(/[\s,]+/, $if_none_match);
-    foreach my $possible_etag (@if_none) {
-        # remove quotes from begin and end of the string
-        $possible_etag =~ s/^\"//g;
-        $possible_etag =~ s/\"$//g;
-        if ($possible_etag eq $valid_etag or $possible_etag eq '*') {
-            return 1;
-        }
+    # remove quotes from begin and end of the string
+    $possible_etag =~ s/^\"//g;
+    $possible_etag =~ s/\"$//g;
+    if ($possible_etag eq $valid_etag or $possible_etag eq '*') {
+      return 1;
     }
+  }
 
-    return 0;
+  return 0;
 }
 
 # Have to add the cookies in.
 sub multipart_start {
-    my $self = shift;
-    
-    my %args = @_;
-
-    # CGI.pm::multipart_start doesn't honour its own charset information, so
-    # we do it ourselves here
-    if (defined $self->charset() && defined $args{-type}) {
-        # Remove any existing charset specifier
-        $args{-type} =~ s/;.*$//;
-        # and add the specified one
-        $args{-type} .= '; charset=' . $self->charset();
-    }
-        
-    my $headers = $self->SUPER::multipart_start(%args);
-    # Eliminate the one extra CRLF at the end.
-    $headers =~ s/$CGI::CRLF$//;
-    # Add the cookies. We have to do it this way instead of
-    # passing them to multpart_start, because CGI.pm's multipart_start
-    # doesn't understand a '-cookie' argument pointing to an arrayref.
-    foreach my $cookie (@{$self->{Bugzilla_cookie_list}}) {
-        $headers .= "Set-Cookie: ${cookie}${CGI::CRLF}";
-    }
-    $headers .= $CGI::CRLF;
-    $self->{_multipart_in_progress} = 1;
-    return $headers;
+  my $self = shift;
+
+  # We have to explicitly pass the charset.
+  my $headers = $self->SUPER::multipart_start(@_, -charset => $self->charset());
+
+  # Eliminate the one extra CRLF at the end.
+  $headers =~ s/$CGI::CRLF$//;
+
+  # Add the cookies. We have to do it this way instead of
+  # passing them to multipart_start, because CGI.pm's multipart_start
+  # doesn't understand a '-cookie' argument pointing to an arrayref.
+  foreach my $cookie (@{$self->{Bugzilla_cookie_list}}) {
+    $headers .= "Set-Cookie: ${cookie}${CGI::CRLF}";
+  }
+  $headers .= $CGI::CRLF;
+  $self->{_multipart_in_progress} = 1;
+  return $headers;
 }
 
 sub close_standby_message {
-    my ($self, $contenttype, $disp, $disp_prefix, $extension) = @_;
-    $self->set_dated_content_disp($disp, $disp_prefix, $extension);
+  my ($self, $contenttype, $disp, $disp_prefix, $extension) = @_;
+  $self->set_dated_content_disp($disp, $disp_prefix, $extension);
+
+  if ($self->{_multipart_in_progress}) {
+    print $self->multipart_end();
+    print $self->multipart_start(-type => $contenttype);
+  }
+  elsif (!$self->{_header_done}) {
+    print $self->header($contenttype);
+  }
+}
 
-    if ($self->{_multipart_in_progress}) {
-        print $self->multipart_end();
-        print $self->multipart_start(-type => $contenttype);
-    }
-    else {
-        print $self->header($contenttype);
+our $ALLOW_UNSAFE_RESPONSE = 0;
+
+# responding to text/plain or text/html is safe
+# responding to any request with a referer header is safe
+# some things need to have unsafe responses (attachment.cgi)
+# everything else should get a 403.
+sub _prevent_unsafe_response {
+  my ($self, $headers) = @_;
+  my $safe_content_type_re = qr{
+        ^ (*COMMIT) # COMMIT makes the regex faster
+                    # by preventing back-tracking. see also perldoc pelre.
+        # application/x-javascript, xml, atom+xml, rdf+xml, xml-dtd, and json
+        (?: application/ (?: x(?: -javascript | ml (?: -dtd )? )
+                           | (?: atom | rdf) \+ xml
+                           | json )
+        # text/csv, text/calendar, text/plain, and text/html
+          | text/ (?: c (?: alendar | sv )
+                    | plain
+                    | html )
+        # used for HTTP push responses
+          | multipart/x-mixed-replace)
+    }sx;
+  my $safe_referer_re = do {
+
+    # Note that urlbase must end with a /.
+    # It almost certainly does, but let's be extra careful.
+    my $urlbase = correct_urlbase();
+    $urlbase =~ s{/$}{};
+    qr{
+            # Begins with literal urlbase
+            ^ (*COMMIT)
+            \Q$urlbase\E
+            # followed by a slash or end of string
+            (?: /
+              | $ )
+        }sx
+  };
+
+  return if $ALLOW_UNSAFE_RESPONSE;
+
+  if (Bugzilla->usage_mode == USAGE_MODE_BROWSER) {
+
+    # Safe content types are ones that arn't images.
+    # For now let's assume plain text and html are not valid images.
+    my $content_type = $headers->{'-type'} // $headers->{'-content_type'}
+      // 'text/html';
+    my $is_safe_content_type = $content_type =~ $safe_content_type_re;
+
+    # Safe referers are ones that begin with the urlbase.
+    my $referer = $self->referer;
+    my $is_safe_referer = $referer && $referer =~ $safe_referer_re;
+
+    if (!$is_safe_referer && !$is_safe_content_type) {
+      print $self->SUPER::header(-type => 'text/html', -status => '403 Forbidden');
+      if ($content_type ne 'text/html') {
+        print "Untrusted Referer Header\n";
+        if ($ENV{MOD_PERL}) {
+          my $r = $self->r;
+          $r->rflush;
+          $r->status(200);
+        }
+      }
+      exit;
     }
+  }
 }
 
 # Override header so we can add the cookies in
 sub header {
-    my $self = shift;
-
-    my %headers;
-    my $user = Bugzilla->user;
-
-    # If there's only one parameter, then it's a Content-Type.
-    if (scalar(@_) == 1) {
-        %headers = ('-type' => shift(@_));
-    }
-    else {
-        %headers = @_;
-    }
-
-    if ($self->{'_content_disp'}) {
-        $headers{'-content_disposition'} = $self->{'_content_disp'};
-    }
+  my $self = shift;
+
+  my %headers;
+  my $user = Bugzilla->user;
+
+  # If there's only one parameter, then it's a Content-Type.
+  if (scalar(@_) == 1) {
+    %headers = ('-type' => shift(@_));
+  }
+  else {
+    %headers = @_;
+  }
+  $self->_prevent_unsafe_response(\%headers);
+
+  if ($self->{'_content_disp'}) {
+    $headers{'-content_disposition'} = $self->{'_content_disp'};
+  }
+
+  if (!$user->id
+    && $user->authorizer->can_login
+    && !$self->cookie('Bugzilla_login_request_cookie'))
+  {
+    my %args;
+    my $params = Bugzilla->params;
+    if ($params->{ssl_redirect} || $params->{urlbase} =~ /^https/i) {
+      $args{'-secure'} = 1;
+    }
+
+    $self->send_cookie(
+      -name     => 'Bugzilla_login_request_cookie',
+      -value    => generate_random_password(),
+      -httponly => 1,
+      %args
+    );
+  }
 
-    if (!$user->id && $user->authorizer->can_login
-        && !$self->cookie('Bugzilla_login_request_cookie'))
-    {
-        my %args;
-        $args{'-secure'} = 1 if Bugzilla->params->{ssl_redirect};
+  # Add the cookies in if we have any
+  if (scalar(@{$self->{Bugzilla_cookie_list}})) {
+    $headers{'-cookie'} = $self->{Bugzilla_cookie_list};
+  }
 
-        $self->send_cookie(-name => 'Bugzilla_login_request_cookie',
-                           -value => generate_random_password(),
-                           -httponly => 1,
-                           %args);
+  # Add Strict-Transport-Security (STS) header if this response
+  # is over SSL and the strict_transport_security param is turned on.
+  if ( $self->https
+    && !$self->url_is_attachment_base
+    && Bugzilla->params->{'strict_transport_security'} ne 'off')
+  {
+    my $sts_opts = 'max-age=' . MAX_STS_AGE;
+    if (Bugzilla->params->{'strict_transport_security'} eq 'include_subdomains') {
+      $sts_opts .= '; includeSubDomains';
     }
 
-    # Add the cookies in if we have any
-    if (scalar(@{$self->{Bugzilla_cookie_list}})) {
-        $headers{'-cookie'} = $self->{Bugzilla_cookie_list};
-    }
+    $headers{'-strict_transport_security'} = $sts_opts;
+  }
 
-    # Add Strict-Transport-Security (STS) header if this response
-    # is over SSL and the strict_transport_security param is turned on.
-    if ($self->https && !$self->url_is_attachment_base
-        && Bugzilla->params->{'strict_transport_security'} ne 'off') 
-    {
-        my $sts_opts = 'max-age=' . MAX_STS_AGE;
-        if (Bugzilla->params->{'strict_transport_security'} 
-            eq 'include_subdomains')
-        {
-            $sts_opts .= '; includeSubDomains';
-        }
-        
-        $headers{'-strict_transport_security'} = $sts_opts;
-    }
+  # Add X-Frame-Options header to prevent framing and subsequent
+  # possible clickjacking problems.
+  unless ($self->url_is_attachment_base) {
+    $headers{'-x_frame_options'} = 'SAMEORIGIN';
+  }
 
-    # Add X-Frame-Options header to prevent framing and subsequent
-    # possible clickjacking problems.
-    unless ($self->url_is_attachment_base) {
-        $headers{'-x_frame_options'} = 'SAMEORIGIN';
-    }
+  # Add X-XSS-Protection header to prevent simple XSS attacks
+  # and enforce the blocking (rather than the rewriting) mode.
+  $headers{'-x_xss_protection'} = '1; mode=block';
 
-    # Add X-XSS-Protection header to prevent simple XSS attacks
-    # and enforce the blocking (rather than the rewriting) mode.
-    $headers{'-x_xss_protection'} = '1; mode=block';
+  # Add X-Content-Type-Options header to prevent browsers sniffing
+  # the MIME type away from the declared Content-Type.
+  $headers{'-x_content_type_options'} = 'nosniff';
 
-    # Add X-Content-Type-Options header to prevent browsers sniffing
-    # the MIME type away from the declared Content-Type.
-    $headers{'-x_content_type_options'} = 'nosniff';
+  my $csp = $self->content_security_policy;
+  $csp->add_cgi_headers(\%headers) if defined $csp;
 
-    Bugzilla::Hook::process('cgi_headers',
-        { cgi => $self, headers => \%headers }
-    );
+  Bugzilla::Hook::process('cgi_headers', {cgi => $self, headers => \%headers});
+  $self->{_header_done} = 1;
 
-    return $self->SUPER::header(%headers) || "";
+  return $self->SUPER::header(%headers) || "";
 }
 
 sub param {
-    my $self = shift;
-
-    # When we are just requesting the value of a parameter...
-    if (scalar(@_) == 1) {
-        my @result = $self->SUPER::param(@_); 
-
-        # Also look at the URL parameters, after we look at the POST 
-        # parameters. This is to allow things like login-form submissions
-        # with URL parameters in the form's "target" attribute.
-        if (!scalar(@result)
-            && $self->request_method && $self->request_method eq 'POST')
-        {
-            @result = $self->url_param(@_);
-        }
-
-        # Fix UTF-8-ness of input parameters.
-        if (Bugzilla->params->{'utf8'}) {
-            @result = map { _fix_utf8($_) } @result;
-        }
-
-        return wantarray ? @result : $result[0];
-    }
-    # And for various other functions in CGI.pm, we need to correctly
-    # return the URL parameters in addition to the POST parameters when
-    # asked for the list of parameters.
-    elsif (!scalar(@_) && $self->request_method 
-           && $self->request_method eq 'POST') 
+  my $self = shift;
+
+  my @caller = caller(0);
+  if (wantarray && $caller[0] ne 'CGI') {
+    warn 'Illegal call to $cgi->param in list context from ' . $caller[0];
+  }
+
+  # When we are just requesting the value of a parameter...
+  if (scalar(@_) == 1) {
+    my @result = $self->SUPER::multi_param(@_);
+
+    # Also look at the URL parameters, after we look at the POST
+    # parameters. This is to allow things like login-form submissions
+    # with URL parameters in the form's "target" attribute.
+    if ( !scalar(@result)
+      && $self->request_method
+      && $self->request_method eq 'POST')
     {
-        my @post_params = $self->SUPER::param;
-        my @url_params  = $self->url_param;
-        my %params = map { $_ => 1 } (@post_params, @url_params);
-        return keys %params;
+      @result = $self->url_param(@_);
     }
 
-    return $self->SUPER::param(@_);
+    return wantarray ? @result : $result[0];
+  }
+
+  # And for various other functions in CGI.pm, we need to correctly
+  # return the URL parameters in addition to the POST parameters when
+  # asked for the list of parameters.
+  elsif (!scalar(@_) && $self->request_method && $self->request_method eq 'POST')
+  {
+    my @post_params = $self->SUPER::multi_param();
+    my @url_params  = $self->url_param;
+    my %params      = map { $_ => 1 } (@post_params, @url_params);
+    return keys %params;
+  }
+
+  return $self->SUPER::multi_param(@_);
 }
 
 sub url_param {
-    my $self = shift;
-    # Some servers fail to set the QUERY_STRING parameter, which
-    # causes undef issues
-    $ENV{'QUERY_STRING'} //= '';
-    return $self->SUPER::url_param(@_);
-}
+  my $self = shift;
 
-sub _fix_utf8 {
-    my $input = shift;
-    # The is_utf8 is here in case CGI gets smart about utf8 someday.
-    utf8::decode($input) if defined $input && !ref $input && !utf8::is_utf8($input);
-    return $input;
+  # Some servers fail to set the QUERY_STRING parameter, which
+  # causes undef issues
+  $ENV{'QUERY_STRING'} //= '';
+  return $self->SUPER::url_param(@_);
 }
 
 sub should_set {
-    my ($self, $param) = @_;
-    my $set = (defined $self->param($param) 
-               or defined $self->param("defined_$param"))
-              ? 1 : 0;
-    return $set;
+  my ($self, $param) = @_;
+  my $set
+    = (defined $self->param($param) or defined $self->param("defined_$param"))
+    ? 1
+    : 0;
+  return $set;
 }
 
 # The various parts of Bugzilla which create cookies don't want to have to
 # pass them around to all of the callers. Instead, store them locally here,
 # and then output as required from |header|.
 sub send_cookie {
-    my $self = shift;
-
-    # Move the param list into a hash for easier handling.
-    my %paramhash;
-    my @paramlist;
-    my ($key, $value);
-    while ($key = shift) {
-        $value = shift;
-        $paramhash{$key} = $value;
-    }
-
-    # Complain if -value is not given or empty (bug 268146).
-    if (!exists($paramhash{'-value'}) || !$paramhash{'-value'}) {
-        ThrowCodeError('cookies_need_value');
-    }
+  my ($self, %paramhash) = @_;
 
-    # Add the default path and the domain in.
-    $paramhash{'-path'} = Bugzilla->params->{'cookiepath'};
-    $paramhash{'-domain'} = Bugzilla->params->{'cookiedomain'}
-        if Bugzilla->params->{'cookiedomain'};
+  # Complain if -value is not given or empty (bug 268146).
+  ThrowCodeError('cookies_need_value') unless $paramhash{'-value'};
 
-    # Move the param list back into an array for the call to cookie().
-    foreach (keys(%paramhash)) {
-        unshift(@paramlist, $_ => $paramhash{$_});
-    }
+  # Add the default path and the domain in.
+  my $uri = URI->new(Bugzilla->params->{urlbase});
+  $paramhash{'-path'} = $uri->path;
+  $paramhash{'-domain'} = $uri->host if $uri->can('host') && $uri->host;
 
-    push(@{$self->{'Bugzilla_cookie_list'}}, $self->cookie(@paramlist));
+  push(@{$self->{'Bugzilla_cookie_list'}}, $self->cookie(%paramhash));
 }
 
 # Cookies are removed by setting an expiry date in the past.
 # This method is a send_cookie wrapper doing exactly this.
 sub remove_cookie {
-    my $self = shift;
-    my ($cookiename) = (@_);
-
-    # Expire the cookie, giving a non-empty dummy value (bug 268146).
-    $self->send_cookie('-name'    => $cookiename,
-                       '-expires' => 'Tue, 15-Sep-1998 21:49:00 GMT',
-                       '-value'   => 'X');
+  my $self = shift;
+  my ($cookiename) = (@_);
+
+  # Expire the cookie, giving a non-empty dummy value (bug 268146).
+  $self->send_cookie(
+    '-name'    => $cookiename,
+    '-expires' => 'Tue, 15-Sep-1998 21:49:00 GMT',
+    '-value'   => 'X'
+  );
 }
 
 # This helps implement Bugzilla::Search::Recent, and also shortens search
 # URLs that get POSTed to buglist.cgi.
 sub redirect_search_url {
-    my $self = shift;
-
-    # If there is no parameter, there is nothing to do.
-    return unless $self->param;
-
-    # If we're retreiving an old list, we never need to redirect or
-    # do anything related to Bugzilla::Search::Recent.
-    return if $self->param('regetlastlist');
-
-    my $user = Bugzilla->user;
-
-    if ($user->id) {
-        # There are two conditions that could happen here--we could get a URL
-        # with no list id, and we could get a URL with a list_id that isn't
-        # ours.
-        my $list_id = $self->param('list_id');
-        if ($list_id) {
-            # If we have a valid list_id, no need to redirect or clean.
-            return if Bugzilla::Search::Recent->check_quietly(
-                { id => $list_id });
-        }
-    }
-    elsif ($self->request_method ne 'POST') {
-        # Logged-out users who do a GET don't get a list_id, don't get
-        # their URLs cleaned, and don't get redirected.
-        return;
-    }
-
-    my $no_redirect = $self->param('no_redirect');
-    $self->clean_search_url();
-
-    # Make sure we still have params still after cleaning otherwise we 
-    # do not want to store a list_id for an empty search.
-    if ($user->id && $self->param) {
-        # Insert a placeholder Bugzilla::Search::Recent, so that we know what
-        # the id of the resulting search will be. This is then pulled out
-        # of the Referer header when viewing show_bug.cgi to know what
-        # bug list we came from.
-        my $recent_search = Bugzilla::Search::Recent->create_placeholder;
-        $self->param('list_id', $recent_search->id);
-    }
-
-    # Browsers which support history.replaceState do not need to be
-    # redirected. We can fix the URL on the fly.
-    return if $no_redirect;
-
-    # GET requests that lacked a list_id are always redirected. POST requests
-    # are only redirected if they're under the CGI_URI_LIMIT though.
-    my $self_url = $self->self_url();
-    if ($self->request_method() ne 'POST' or length($self_url) < CGI_URI_LIMIT) {
-        print $self->redirect(-url => $self_url);
-        exit;
-    }
+  my $self = shift;
+
+  # If there is no parameter, there is nothing to do.
+  return unless $self->param;
+
+  # If we're retrieving an old list, we never need to redirect or
+  # do anything related to Bugzilla::Search::Recent.
+  return if $self->param('regetlastlist');
+
+  my $user = Bugzilla->user;
+
+  if ($user->id) {
+
+    # There are two conditions that could happen here--we could get a URL
+    # with no list id, and we could get a URL with a list_id that isn't
+    # ours.
+    my $list_id = $self->param('list_id');
+    if ($list_id) {
+
+      # If we have a valid list_id, no need to redirect or clean.
+      return if Bugzilla::Search::Recent->check_quietly({id => $list_id});
+    }
+  }
+  elsif ($self->request_method ne 'POST') {
+
+    # Logged-out users who do a GET don't get a list_id, don't get
+    # their URLs cleaned, and don't get redirected.
+    return;
+  }
+
+  my $no_redirect = $self->param('no_redirect');
+  $self->clean_search_url();
+
+  # Make sure we still have params still after cleaning otherwise we
+  # do not want to store a list_id for an empty search.
+  if ($user->id && $self->param) {
+
+    # Insert a placeholder Bugzilla::Search::Recent, so that we know what
+    # the id of the resulting search will be. This is then pulled out
+    # of the Referer header when viewing show_bug.cgi to know what
+    # bug list we came from.
+    my $recent_search = Bugzilla::Search::Recent->create_placeholder;
+    $self->param('list_id', $recent_search->id);
+  }
+
+  # Browsers which support history.replaceState do not need to be
+  # redirected. We can fix the URL on the fly.
+  return if $no_redirect;
+
+  # GET requests that lacked a list_id are always redirected. POST requests
+  # are only redirected if they're under the CGI_URI_LIMIT though.
+  if ($self->request_method() ne 'POST'
+    or length($self->self_url) < CGI_URI_LIMIT)
+  {
+    $self->redirect_to_urlbase();
+  }
 }
 
 sub redirect_to_https {
-    my $self = shift;
-    my $sslbase = Bugzilla->params->{'sslbase'};
-    # If this is a POST, we don't want ?POSTDATA in the query string.
-    # We expect the client to re-POST, which may be a violation of
-    # the HTTP spec, but the only time we're expecting it often is
-    # in the WebService, and WebService clients usually handle this
-    # correctly.
-    $self->delete('POSTDATA');
-    my $url = $sslbase . $self->url('-path_info' => 1, '-query' => 1, 
-                                    '-relative' => 1);
-
-    # XML-RPC clients (SOAP::Lite at least) require a 301 to redirect properly
-    # and do not work with 302. Our redirect really is permanent anyhow, so
-    # it doesn't hurt to make it a 301.
-    print $self->redirect(-location => $url, -status => 301);
-
-    # When using XML-RPC with mod_perl, we need the headers sent immediately.
-    $self->r->rflush if $ENV{MOD_PERL};
-    exit;
+  my $self    = shift;
+  my $sslbase = Bugzilla->params->{'sslbase'};
+
+  # If this is a POST, we don't want ?POSTDATA in the query string.
+  # We expect the client to re-POST, which may be a violation of
+  # the HTTP spec, but the only time we're expecting it often is
+  # in the WebService, and WebService clients usually handle this
+  # correctly.
+  $self->delete('POSTDATA');
+  my $url
+    = $sslbase . $self->url('-path_info' => 1, '-query' => 1, '-relative' => 1);
+
+  # XML-RPC clients (SOAP::Lite at least) require a 301 to redirect properly
+  # and do not work with 302. Our redirect really is permanent anyhow, so
+  # it doesn't hurt to make it a 301.
+  print $self->redirect(-location => $url, -status => 301);
+
+  # When using XML-RPC with mod_perl, we need the headers sent immediately.
+  $self->r->rflush if $ENV{MOD_PERL};
+  exit;
 }
 
 # Redirect to the urlbase version of the current URL.
 sub redirect_to_urlbase {
-    my $self = shift;
-    my $path = $self->url('-path_info' => 1, '-query' => 1, '-relative' => 1);
-    print $self->redirect('-location' => correct_urlbase() . $path);
-    exit;
+  my $self = shift;
+  my $path = $self->url('-path_info' => 1, '-query' => 1, '-relative' => 1);
+  print $self->redirect('-location' => correct_urlbase() . $path);
+  exit;
 }
 
 sub url_is_attachment_base {
-    my ($self, $id) = @_;
-    return 0 if !use_attachbase() or !i_am_cgi();
-    my $attach_base = Bugzilla->params->{'attachment_base'};
-    # If we're passed an id, we only want one specific attachment base
-    # for a particular bug. If we're not passed an ID, we just want to
-    # know if our current URL matches the attachment_base *pattern*.
-    my $regex;
-    if ($id) {
-        $attach_base =~ s/\%bugid\%/$id/;
-        $regex = quotemeta($attach_base);
-    }
-    else {
-        # In this circumstance we run quotemeta first because we need to
-        # insert an active regex meta-character afterward.
-        $regex = quotemeta($attach_base);
-        $regex =~ s/\\\%bugid\\\%/\\d+/;
-    }
-    $regex = "^$regex";
-    return ($self->url =~ $regex) ? 1 : 0;
+  my ($self, $id) = @_;
+  return 0 unless use_attachbase() && i_am_cgi();
+  my $attach_base = Bugzilla->params->{'attachment_base'};
+
+  # If we're passed an id, we only want one specific attachment base
+  # for a particular bug. If we're not passed an ID, we just want to
+  # know if our current URL matches the attachment_base *pattern*.
+  my $regex;
+  if ($id) {
+    $attach_base =~ s/\%bugid\%/$id/;
+    $regex = quotemeta($attach_base);
+  }
+  else {
+    # In this circumstance we run quotemeta first because we need to
+    # insert an active regex meta-character afterward.
+    $regex = quotemeta($attach_base);
+    $regex =~ s/\\\%bugid\\\%/\\d+/;
+  }
+  $regex = "^$regex";
+
+  my $url = $self->url;
+
+  # If we are behind a reverse proxy, we need to determine the original
+  # URL, else the comparison with the attachment_base URL will fail.
+  if (Bugzilla->params->{'inbound_proxies'}) {
+
+    # X-Forwarded-Proto is defined in RFC 7239.
+    my $protocol = $ENV{HTTP_X_FORWARDED_PROTO} || $self->protocol;
+    my $host = $self->virtual_host;
+
+    # X-Forwarded-URI is not standard.
+    my $uri = $ENV{HTTP_X_FORWARDED_URI} || $self->request_uri || '';
+    $url = "$protocol://$host$uri";
+  }
+  return ($url =~ $regex) ? 1 : 0;
 }
 
 sub set_dated_content_disp {
-    my ($self, $type, $prefix, $ext) = @_;
+  my ($self, $type, $prefix, $ext) = @_;
 
-    my @time = localtime(time());
-    my $date = sprintf "%04d-%02d-%02d", 1900+$time[5], $time[4]+1, $time[3];
-    my $filename = "$prefix-$date.$ext";
+  my @time = localtime(time());
+  my $date = sprintf "%04d-%02d-%02d", 1900 + $time[5], $time[4] + 1, $time[3];
+  my $filename = "$prefix-$date.$ext";
 
-    $filename =~ s/\s/_/g; # Remove whitespace to avoid HTTP header tampering
-    $filename =~ s/\\/_/g; # Remove backslashes as well
-    $filename =~ s/"/\\"/g; # escape quotes
+  $filename =~ s/\s/_/g;     # Remove whitespace to avoid HTTP header tampering
+  $filename =~ s/\\/_/g;     # Remove backslashes as well
+  $filename =~ s/"/\\"/g;    # escape quotes
 
-    my $disposition = "$type; filename=\"$filename\"";
+  my $disposition = "$type; filename=\"$filename\"";
 
-    $self->{'_content_disp'} = $disposition;
+  $self->{'_content_disp'} = $disposition;
 }
 
 ##########################
 # Vars TIEHASH Interface #
 ##########################
 
-# Fix the TIEHASH interface (scalar $cgi->Vars) to return and accept 
+# Fix the TIEHASH interface (scalar $cgi->Vars) to return and accept
 # arrayrefs.
 sub STORE {
-    my $self = shift;
-    my ($param, $value) = @_;
-    if (defined $value and ref $value eq 'ARRAY') {
-        return $self->param(-name => $param, -value => $value);
-    }
-    return $self->SUPER::STORE(@_);
+  my $self = shift;
+  my ($param, $value) = @_;
+  if (defined $value and ref $value eq 'ARRAY') {
+    return $self->param(-name => $param, -value => $value);
+  }
+  return $self->SUPER::STORE(@_);
 }
 
 sub FETCH {
-    my ($self, $param) = @_;
-    return $self if $param eq 'CGI'; # CGI.pm did this, so we do too.
-    my @result = $self->param($param);
-    return undef if !scalar(@result);
-    return $result[0] if scalar(@result) == 1;
-    return \@result;
-}
-
-# For the Vars TIEHASH interface: the normal CGI.pm DELETE doesn't return 
-# the value deleted, but Perl's "delete" expects that value.
-sub DELETE {
-    my ($self, $param) = @_;
-    my $value = $self->FETCH($param);
-    $self->delete($param);
-    return $value;
+  my ($self, $param) = @_;
+  return $self if $param eq 'CGI';    # CGI.pm did this, so we do too.
+  my @result = $self->multi_param($param);
+  return undef if !scalar(@result);
+  return $result[0] if scalar(@result) == 1;
+  return \@result;
 }
 
 1;
@@ -643,7 +749,7 @@ Bugzilla::CGI - CGI handling for Bugzilla
 
 This package inherits from the standard CGI module, to provide additional
 Bugzilla-specific functionality. In general, see L<the CGI.pm docs|CGI> for
-documention.
+documentation.
 
 =head1 CHANGES FROM L<CGI.PM|CGI>
 
@@ -682,6 +788,18 @@ correctly, using C<print> or the mod_perl APIs as appropriate.
 
 To remove (expire) a cookie, use C<remove_cookie>.
 
+=item C<content_security_policy>
+
+Set a Content Security Policy for the current request. This is a no-op if the 'csp' feature
+is not available. The arguments to this method are passed to the constructor of L<Bugzilla::CGI::ContentSecurityPolicy>,
+consult that module for a list of what directives are supported.
+
+=item C<csp_nonce>
+
+Returns a CSP nonce value if CSP is available and 'nonce' is listed as a source in a CSP *_src directive.
+
+If there is no nonce used, or CSP is not available, this returns the empty string.
+
 =item C<remove_cookie>
 
 This is a wrapper around send_cookie, setting an expiry date in the past,
diff --git a/Bugzilla/CGI/ContentSecurityPolicy.pm b/Bugzilla/CGI/ContentSecurityPolicy.pm
new file mode 100644
index 0000000000..63741f7e8e
--- /dev/null
+++ b/Bugzilla/CGI/ContentSecurityPolicy.pm
@@ -0,0 +1,357 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::CGI::ContentSecurityPolicy;
+
+use 5.14.0;
+use strict;
+use warnings;
+use Moo;
+use MooX::StrictConstructor;
+use Types::Standard qw(Bool Str ArrayRef);
+use Type::Utils;
+
+use Bugzilla::Util qw(generate_random_password);
+
+my $SRC_KEYWORD
+  = enum ['none', 'self', 'unsafe-inline', 'unsafe-eval', 'nonce'];
+my $SRC_URI = declare as Str, where {
+  $_ =~ m{
+        ^(?: https?:// )?  # optional http:// or https://
+        [*A-Za-z0-9.-]+    # hostname including wildcards. Possibly too permissive.
+        (?: :[0-9]+ )?     # optional port
+    }x;
+};
+my $SRC              = $SRC_KEYWORD | $SRC_URI;
+my $SOURCE_LIST      = ArrayRef [$SRC];
+my $REFERRER_KEYWORD = enum [
+  qw(
+    no-referrer no-referrer-when-downgrade
+    origin      origin-when-cross-origin unsafe-url
+    )
+];
+
+my @ALL_BOOL = qw( sandbox upgrade_insecure_requests );
+my @ALL_SRC  = qw(
+  default_src child_src  connect_src
+  font_src    img_src    media_src
+  object_src  script_src style_src
+);
+
+has \@ALL_SRC => (is => 'ro', isa => $SOURCE_LIST, predicate => 1);
+has \@ALL_BOOL   => (is => 'ro', isa => Bool, default   => 0);
+has 'report_uri' => (is => 'ro', isa => Str,  predicate => 1);
+has 'base_uri'   => (is => 'ro', isa => Str,  predicate => 1);
+has 'report_only' => (is => 'ro', isa => Bool);
+has 'referrer' => (is => 'ro', isa => $REFERRER_KEYWORD, predicate => 1);
+has 'value'   => (is => 'lazy');
+has 'nonce'   => (is => 'lazy', init_arg => undef, predicate => 1);
+has 'disable' => (is => 'ro', isa => Bool, default => 0);
+
+sub _has_directive {
+  my ($self, $directive) = @_;
+  my $method = 'has_' . $directive;
+  return $self->$method;
+}
+
+sub header_names {
+  my ($self) = @_;
+  my @names
+    = ('Content-Security-Policy', 'X-Content-Security-Policy', 'X-WebKit-CSP');
+  if ($self->report_only) {
+    return map { $_ . '-Report-Only' } @names;
+  }
+  else {
+    return @names;
+  }
+}
+
+sub add_cgi_headers {
+  my ($self, $headers) = @_;
+  return if $self->disable;
+  foreach my $name ($self->header_names) {
+    $headers->{"-$name"} = $self->value;
+  }
+}
+
+sub _build_value {
+  my $self = shift;
+  my @result;
+
+  my @list_directives    = (@ALL_SRC);
+  my @boolean_directives = (@ALL_BOOL);
+  my @single_directives  = qw(report_uri base_uri);
+
+  foreach my $directive (@list_directives) {
+    next unless $self->_has_directive($directive);
+    my @values = map { $self->_quote($_) } @{$self->$directive};
+    if (@values) {
+      push @result, join(' ', _name($directive), @values);
+    }
+  }
+
+  foreach my $directive (@single_directives) {
+    next unless $self->_has_directive($directive);
+    my $value = $self->$directive;
+    if (defined $value) {
+      push @result, _name($directive) . ' ' . $value;
+    }
+  }
+
+  foreach my $directive (@boolean_directives) {
+    if ($self->$directive) {
+      push @result, _name($directive);
+    }
+  }
+
+  return join('; ', @result);
+}
+
+sub _build_nonce {
+  return generate_random_password(48);
+}
+
+sub _name {
+  my $name = shift;
+  $name =~ tr/_/-/;
+  return $name;
+}
+
+sub _quote {
+  my ($self, $val) = @_;
+
+  if ($val eq 'nonce') {
+    return q{'nonce-} . $self->nonce . q{'};
+  }
+  elsif ($SRC_KEYWORD->check($val)) {
+    return qq{'$val'};
+  }
+  else {
+    return $val;
+  }
+}
+
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::CGI::ContentSecurityPolicy - Object-oriented interface to generating CSP directives and adding them to headers.
+
+=head1 SYNOPSIS
+
+    use Bugzilla::CGI::ContentSecurityPolicy;
+
+    my $csp = Bugzilla::CGI::ContentSecurityPolicy->new(
+        default_src => [ 'self' ],
+        style_src   => [ 'self', 'unsafe-inline' ],
+        script_src  => [ 'self', 'nonce' ],
+        child_src   => ['none'],
+        report_uri  => '/csp-report.cgi',
+        referrer    => 'origin-when-cross-origin',
+    );
+    $csp->headers_names               # returns a list of header names and depends on the value of $self->report_only
+    $csp->value                       # returns the string representation of the policy.
+    $csp->add_cgi_headers(\%hashref); # will insert entries compatible with CGI.pm's $cgi->headers() method into the provided hashref.
+
+=head1 DESCRIPTION
+
+This class provides an object interface to constructing Content Security Policies.
+
+Rather than use this module, scripts should call $cgi->content_security_policy() which constructs the CSP headers
+and registers them for the current request.
+
+See L<Bugzilla::CGI> for details.
+
+=head1 ATTRIBUTES
+
+Generally all CSP directives are available as attributes to the constructor,
+with dashes replaced by underscores. All directives that can be lists must be
+passed as array references, and the quoting rules for urls and keywords like
+'self' or 'none' is handled automatically.
+
+=head2 report_only
+
+If this is true, then the the -Report-Only version of the headers will be produced, so nothing will be blocked.
+
+=head2 disable
+
+If this is true, no CSP headers will be used at all.
+
+=head2 base_uri
+
+The base-uri directive defines the URIs that a user agent may use as the
+document base URL. If this value is absent, then any URI is allowed. If this
+directive is absent, the user agent will use the value in the base element.
+
+=head2 child_src
+
+The child-src directive defines the valid sources for web workers and nested
+browsing contexts loaded using elements such as <frame> and <iframe>. This
+directive is preferred over the frame-src directive, which is deprecated. For
+workers, non-compliant requests are treated as fatal network errors by the user
+agent.
+
+=head2 connect_src
+
+The connect-src directive defines valid sources for fetch, XMLHttpRequest, WebSocket, and EventSource connections.
+
+=head2 default_src
+
+The default-src directive defines the security policy for types of content which are not expressly called out by more specific directives. This directive covers the following directives:
+
+=over 4
+
+=item *
+
+L</child_src>
+
+=item *
+
+L</connect_src>
+
+=item *
+
+L</font_src>
+
+=item *
+
+L</img_src>
+
+=item *
+
+L</media_src>
+
+=item *
+
+L</object_src>
+
+=item *
+
+L</script_src>
+
+=item *
+
+L</style_src>
+
+=back
+
+=head2 font_src
+
+The font-src directive specifies valid sources for fonts loaded using @font-face.
+
+=head2 img_src
+
+The img-src directive specifies valid sources of images and favicons.
+
+=head2 manifest_src
+
+The manifest-src directive specifies which manifest can be applied to the resource.
+
+=head2 media_src
+
+The media-src directive specifies valid sources for loading media using the <audio> and <video> elements.
+
+=head2 object_src
+
+The object-src directive specifies valid sources for the <object>, <embed>, and <applet> elements.
+
+=head2 referrer
+
+The referrer directive specifies information in the B<referer> (sic) header for
+links away from a page. Valid values are C<no-referrer>,
+C<no-referrer-when-downgrade>, C<origin>, C<origin-when-cross-origin>, and
+C<unsafe-url>.
+
+=head2 report_uri
+
+The report-uri directive instructs the user agent to report attempts to violate
+the Content Security Policy. These violation reports consist of JSON documents
+sent via an HTTP POST request to the specified URI.
+
+=head2 sandbox
+
+The sandbox directive applies restrictions to a page's actions including
+preventing popups, preventing the execution of plugins and scripts, and
+enforcing a same-origin policy.
+
+=head2 script_src
+
+The script-src directive specifies valid sources for JavaScript. When either the
+script-src or the default-src directive is included, inline script and eval()
+are disabled unless you specify 'unsafe-inline' and 'unsafe-eval', respectively.
+In Chrome 49 and later, 'script-src http' will match both HTTP and HTTPS.
+
+=head2 style_src
+
+The style-src directive specifies valid sources for stylesheets. This includes
+both externally-loaded stylesheets and inline use of the C<style> element and
+HTML style attributes. Stylesheets from sources that aren't included in the
+source list are not requested or loaded. When either the style-src or the
+default-src directive is included, inline use of the C<style> element and HTML
+style attributes are disabled unless you specify 'unsafe-inline'.
+
+=head2 upgrade_insecure_requests
+
+The upgrade-insecure-requests directive instructs user agents to treat all of a
+site's unsecure URL's (those serverd over HTTP) as though they have been
+replaced with secure URL's (those served over HTTPS). This directive is intended
+for web sites with large numbers of unsecure legacy URL's that need to be
+rewritten.
+
+=head1 METHODS
+
+=head2 header_names()
+
+This returns a list of header names. This will typically be
+C<Content-Security-Policy>, C<X-Content-Security-Policy>, and C<X-WebKit-CSP>.
+
+=head2 value()
+
+This returns the value or right-of-colon part of the header.
+
+=head2 add_cgi_headers($headers)
+
+This adds C<header_value()> to C<$headers> in a format that is compatible with
+L<CGI>'s headers() method.
+
+=head2 nonce() / has_nonce()
+
+This is unique value that can used if the 'nonce' is used as a source for
+style_src or script_src.
+
+=head1 B<Methods in need of POD>
+
+=over 4
+
+=item has_report_uri
+
+=item has_child_src
+
+=item has_connect_src
+
+=item has_script_src
+
+=item has_media_src
+
+=item has_base_uri
+
+=item has_img_src
+
+=item has_referrer
+
+=item has_style_src
+
+=item has_default_src
+
+=item has_object_src
+
+=item has_font_src
+
+=back
diff --git a/Bugzilla/Chart.pm b/Bugzilla/Chart.pm
index 3c69006aac..4a42d2fa90 100644
--- a/Bugzilla/Chart.pm
+++ b/Bugzilla/Chart.pm
@@ -13,7 +13,7 @@
 # the same points.
 package Bugzilla::Chart;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,405 +26,424 @@ use Date::Parse;
 use List::Util qw(max);
 
 sub new {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-  
-    # Create a ref to an empty hash and bless it
-    my $self = {};
-    bless($self, $class);
-
-    if ($#_ == 0) {
-        # Construct from a CGI object.
-        $self->init($_[0]);
-    } 
-    else {
-        die("CGI object not passed in - invalid number of args \($#_\)($_)");
-    }
+  my $invocant = shift;
+  my $class = ref($invocant) || $invocant;
+
+  # Create a ref to an empty hash and bless it
+  my $self = {};
+  bless($self, $class);
+
+  if ($#_ == 0) {
 
-    return $self;
+    # Construct from a CGI object.
+    $self->init($_[0]);
+  }
+  else {
+    die("CGI object not passed in - invalid number of args \($#_\)($_)");
+  }
+
+  return $self;
 }
 
 sub init {
-    my $self = shift;
-    my $cgi = shift;
-
-    # The data structure is a list of lists (lines) of Series objects. 
-    # There is a separate list for the labels.
-    #
-    # The URL encoding is:
-    # line0=67&line0=73&line1=81&line2=67...
-    # &label0=B+/+R+/+CONFIRMED&label1=...
-    # &select0=1&select3=1...    
-    # &cumulate=1&datefrom=2002-02-03&dateto=2002-04-04&ctype=html...
-    # &gt=1&labelgt=Grand+Total    
-    foreach my $param ($cgi->param()) {
-        # Store all the lines
-        if ($param =~ /^line(\d+)$/) {
-            foreach my $series_id ($cgi->param($param)) {
-                detaint_natural($series_id) 
-                                     || ThrowCodeError("invalid_series_id");
-                my $series = new Bugzilla::Series($series_id);
-                push(@{$self->{'lines'}[$1]}, $series) if $series;
-            }
-        }
-
-        # Store all the labels
-        if ($param =~ /^label(\d+)$/) {
-            $self->{'labels'}[$1] = $cgi->param($param);
-        }        
-    }
-    
-    # Store the miscellaneous metadata
-    $self->{'cumulate'} = $cgi->param('cumulate') ? 1 : 0;
-    $self->{'gt'}       = $cgi->param('gt') ? 1 : 0;
-    $self->{'labelgt'}  = $cgi->param('labelgt');
-    $self->{'datefrom'} = $cgi->param('datefrom');
-    $self->{'dateto'}   = $cgi->param('dateto');
-    
-    # If we are cumulating, a grand total makes no sense
-    $self->{'gt'} = 0 if $self->{'cumulate'};
-    
-    # Make sure the dates are ones we are able to interpret
-    foreach my $date ('datefrom', 'dateto') {
-        if ($self->{$date}) {
-            $self->{$date} = str2time($self->{$date}) 
-              || ThrowUserError("illegal_date", { date => $self->{$date}});
-        }
+  my $self = shift;
+  my $cgi  = shift;
+
+  # The data structure is a list of lists (lines) of Series objects.
+  # There is a separate list for the labels.
+  #
+  # The URL encoding is:
+  # line0=67&line0=73&line1=81&line2=67...
+  # &label0=B+/+R+/+CONFIRMED&label1=...
+  # &select0=1&select3=1...
+  # &cumulate=1&datefrom=2002-02-03&dateto=2002-04-04&ctype=html...
+  # &gt=1&labelgt=Grand+Total
+  foreach my $param ($cgi->multi_param()) {
+
+    # Store all the lines
+    if ($param =~ /^line(\d+)$/a) {
+      foreach my $series_id ($cgi->multi_param($param)) {
+        detaint_natural($series_id) || ThrowCodeError("invalid_series_id");
+        my $series = new Bugzilla::Series($series_id);
+        push(@{$self->{'lines'}[$1]}, $series) if $series;
+      }
     }
 
-    # datefrom can't be after dateto
-    if ($self->{'datefrom'} && $self->{'dateto'} && 
-        $self->{'datefrom'} > $self->{'dateto'}) 
-    {
-          ThrowUserError('misarranged_dates', { 'datefrom' => scalar $cgi->param('datefrom'),
-                                                'dateto' => scalar $cgi->param('dateto') });
+    # Store all the labels
+    if ($param =~ /^label(\d+)$/a) {
+      $self->{'labels'}[$1] = $cgi->param($param);
     }
+  }
+
+  # Store the miscellaneous metadata
+  $self->{'cumulate'} = $cgi->param('cumulate') ? 1 : 0;
+  $self->{'gt'}       = $cgi->param('gt')       ? 1 : 0;
+  $self->{'labelgt'}  = $cgi->param('labelgt');
+  $self->{'datefrom'} = $cgi->param('datefrom');
+  $self->{'dateto'}   = $cgi->param('dateto');
+
+  # If we are cumulating, a grand total makes no sense
+  $self->{'gt'} = 0 if $self->{'cumulate'};
+
+  # Make sure the dates are ones we are able to interpret
+  foreach my $date ('datefrom', 'dateto') {
+    if ($self->{$date}) {
+      $self->{$date} = str2time($self->{$date})
+        || ThrowUserError("illegal_date", {date => $self->{$date}});
+    }
+  }
+
+  # datefrom can't be after dateto
+  if ( $self->{'datefrom'}
+    && $self->{'dateto'}
+    && $self->{'datefrom'} > $self->{'dateto'})
+  {
+    ThrowUserError(
+      'misarranged_dates',
+      {
+        'datefrom' => scalar $cgi->param('datefrom'),
+        'dateto'   => scalar $cgi->param('dateto')
+      }
+    );
+  }
 }
 
 # Alter Chart so that the selected series are added to it.
 sub add {
-    my $self = shift;
-    my @series_ids = @_;
-
-    # Get the current size of the series; required for adding Grand Total later
-    my $current_size = scalar($self->getSeriesIDs());
-    
-    # Count the number of added series
-    my $added = 0;
-    # Create new Series and push them on to the list of lines.
-    # Note that new lines have no label; the display template is responsible
-    # for inventing something sensible.
-    foreach my $series_id (@series_ids) {
-        my $series = new Bugzilla::Series($series_id);
-        if ($series) {
-            push(@{$self->{'lines'}}, [$series]);
-            push(@{$self->{'labels'}}, "");
-            $added++;
-        }
+  my $self       = shift;
+  my @series_ids = @_;
+
+  # Get the current size of the series; required for adding Grand Total later
+  my $current_size = scalar($self->getSeriesIDs());
+
+  # Count the number of added series
+  my $added = 0;
+
+  # Create new Series and push them on to the list of lines.
+  # Note that new lines have no label; the display template is responsible
+  # for inventing something sensible.
+  foreach my $series_id (@series_ids) {
+    my $series = new Bugzilla::Series($series_id);
+    if ($series) {
+      push(@{$self->{'lines'}}, [$series]);
+      push(@{$self->{'labels'}}, "");
+      $added++;
     }
-    
-    # If we are going from < 2 to >= 2 series, add the Grand Total line.
-    if (!$self->{'gt'}) {
-        if ($current_size < 2 &&
-            $current_size + $added >= 2) 
-        {
-            $self->{'gt'} = 1;
-        }
+  }
+
+  # If we are going from < 2 to >= 2 series, add the Grand Total line.
+  if (!$self->{'gt'}) {
+    if ($current_size < 2 && $current_size + $added >= 2) {
+      $self->{'gt'} = 1;
     }
+  }
 }
 
 # Alter Chart so that the selections are removed from it.
 sub remove {
-    my $self = shift;
-    my @line_ids = @_;
-    
-    foreach my $line_id (@line_ids) {
-        if ($line_id == 65536) {
-            # Magic value - delete Grand Total.
-            $self->{'gt'} = 0;
-        } 
-        else {
-            delete($self->{'lines'}->[$line_id]);
-            delete($self->{'labels'}->[$line_id]);
-        }
+  my $self     = shift;
+  my @line_ids = @_;
+
+  foreach my $line_id (@line_ids) {
+    if ($line_id == 65536) {
+
+      # Magic value - delete Grand Total.
+      $self->{'gt'} = 0;
+    }
+    else {
+      delete($self->{'lines'}->[$line_id]);
+      delete($self->{'labels'}->[$line_id]);
     }
+  }
 }
 
 # Alter Chart so that the selections are summed.
 sub sum {
-    my $self = shift;
-    my @line_ids = @_;
-    
-    # We can't add the Grand Total to things.
-    @line_ids = grep(!/^65536$/, @line_ids);
-        
-    # We can't add less than two things.
-    return if scalar(@line_ids) < 2;
-    
-    my @series;
-    my $label = "";
-    my $biggestlength = 0;
-    
-    # We rescue the Series objects of all the series involved in the sum.
-    foreach my $line_id (@line_ids) {
-        my @line = @{$self->{'lines'}->[$line_id]};
-        
-        foreach my $series (@line) {
-            push(@series, $series);
-        }
-        
-        # We keep the label that labels the line with the most series.
-        if (scalar(@line) > $biggestlength) {
-            $biggestlength = scalar(@line);
-            $label = $self->{'labels'}->[$line_id];
-        }
+  my $self     = shift;
+  my @line_ids = @_;
+
+  # We can't add the Grand Total to things.
+  @line_ids = grep(!/^65536$/, @line_ids);
+
+  # We can't add less than two things.
+  return if scalar(@line_ids) < 2;
+
+  my @series;
+  my $label         = "";
+  my $biggestlength = 0;
+
+  # We rescue the Series objects of all the series involved in the sum.
+  foreach my $line_id (@line_ids) {
+    my @line = @{$self->{'lines'}->[$line_id]};
+
+    foreach my $series (@line) {
+      push(@series, $series);
+    }
+
+    # We keep the label that labels the line with the most series.
+    if (scalar(@line) > $biggestlength) {
+      $biggestlength = scalar(@line);
+      $label         = $self->{'labels'}->[$line_id];
     }
+  }
 
-    $self->remove(@line_ids);
+  $self->remove(@line_ids);
 
-    push(@{$self->{'lines'}}, \@series);
-    push(@{$self->{'labels'}}, $label);
+  push(@{$self->{'lines'}},  \@series);
+  push(@{$self->{'labels'}}, $label);
 }
 
 sub data {
-    my $self = shift;
-    $self->{'_data'} ||= $self->readData();
-    return $self->{'_data'};
+  my $self = shift;
+  $self->{'_data'} ||= $self->readData();
+  return $self->{'_data'};
 }
 
 # Convert the Chart's data into a plottable form in $self->{'_data'}.
 sub readData {
-    my $self = shift;
-    my @data;
-    my @maxvals;
-
-    # Note: you get a bad image if getSeriesIDs returns nothing
-    # We need to handle errors better.
-    my $series_ids = join(",", $self->getSeriesIDs());
-
-    return [] unless $series_ids;
-
-    # Work out the date boundaries for our data.
-    my $dbh = Bugzilla->dbh;
-    
-    # The date used is the one given if it's in a sensible range; otherwise,
-    # it's the earliest or latest date in the database as appropriate.
-    my $datefrom = $dbh->selectrow_array("SELECT MIN(series_date) " . 
-                                         "FROM series_data " .
-                                         "WHERE series_id IN ($series_ids)");
-    $datefrom = str2time($datefrom);
-
-    if ($self->{'datefrom'} && $self->{'datefrom'} > $datefrom) {
-        $datefrom = $self->{'datefrom'};
-    }
-
-    my $dateto = $dbh->selectrow_array("SELECT MAX(series_date) " . 
-                                       "FROM series_data " .
-                                       "WHERE series_id IN ($series_ids)");
-    $dateto = str2time($dateto); 
-
-    if ($self->{'dateto'} && $self->{'dateto'} < $dateto) {
-        $dateto = $self->{'dateto'};
-    }
-
-    # Convert UNIX times back to a date format usable for SQL queries.
-    my $sql_from = time2str('%Y-%m-%d', $datefrom);
-    my $sql_to = time2str('%Y-%m-%d', $dateto);
-
-    # Prepare the query which retrieves the data for each series
-    my $query = "SELECT " . $dbh->sql_to_days('series_date') . " - " .
-                            $dbh->sql_to_days('?') . ", series_value " .
-                "FROM series_data " .
-                "WHERE series_id = ? " .
-                "AND series_date >= ?";
-    if ($dateto) {
-        $query .= " AND series_date <= ?";
-    }
-    
-    my $sth = $dbh->prepare($query);
-
-    my $gt_index = $self->{'gt'} ? scalar(@{$self->{'lines'}}) : undef;
-    my $line_index = 0;
-
-    $maxvals[$gt_index] = 0 if $gt_index;
-
-    my @datediff_total;
-
-    foreach my $line (@{$self->{'lines'}}) {        
-        # Even if we end up with no data, we need an empty arrayref to prevent
-        # errors in the PNG-generating code
-        $data[$line_index] = [];
-        $maxvals[$line_index] = 0;
-
-        foreach my $series (@$line) {
-
-            # Get the data for this series and add it on
-            if ($dateto) {
-                $sth->execute($sql_from, $series->{'series_id'}, $sql_from, $sql_to);
-            }
-            else {
-                $sth->execute($sql_from, $series->{'series_id'}, $sql_from);
-            }
-            my $points = $sth->fetchall_arrayref();
-
-            foreach my $point (@$points) {
-                my ($datediff, $value) = @$point;
-                $data[$line_index][$datediff] ||= 0;
-                $data[$line_index][$datediff] += $value;
-                if ($data[$line_index][$datediff] > $maxvals[$line_index]) {
-                    $maxvals[$line_index] = $data[$line_index][$datediff];
-                }
-
-                $datediff_total[$datediff] += $value;
-
-                # Add to the grand total, if we are doing that
-                if ($gt_index) {
-                    $data[$gt_index][$datediff] ||= 0;
-                    $data[$gt_index][$datediff] += $value;
-                    if ($data[$gt_index][$datediff] > $maxvals[$gt_index]) {
-                        $maxvals[$gt_index] = $data[$gt_index][$datediff];
-                    }
-                }
-            }
+  my $self = shift;
+  my @data;
+  my @maxvals;
+
+  # Note: you get a bad image if getSeriesIDs returns nothing
+  # We need to handle errors better.
+  my $series_ids = join(",", $self->getSeriesIDs());
+
+  return [] unless $series_ids;
+
+  # Work out the date boundaries for our data.
+  my $dbh = Bugzilla->dbh;
+
+  # The date used is the one given if it's in a sensible range; otherwise,
+  # it's the earliest or latest date in the database as appropriate.
+  my $datefrom
+    = $dbh->selectrow_array("SELECT MIN(series_date) "
+      . "FROM series_data "
+      . "WHERE series_id IN ($series_ids)");
+  $datefrom = str2time($datefrom);
+
+  if ($self->{'datefrom'} && $self->{'datefrom'} > $datefrom) {
+    $datefrom = $self->{'datefrom'};
+  }
+
+  my $dateto
+    = $dbh->selectrow_array("SELECT MAX(series_date) "
+      . "FROM series_data "
+      . "WHERE series_id IN ($series_ids)");
+  $dateto = str2time($dateto);
+
+  if ($self->{'dateto'} && $self->{'dateto'} < $dateto) {
+    $dateto = $self->{'dateto'};
+  }
+
+  # Convert UNIX times back to a date format usable for SQL queries.
+  my $sql_from = time2str('%Y-%m-%d', $datefrom);
+  my $sql_to   = time2str('%Y-%m-%d', $dateto);
+
+  # Prepare the query which retrieves the data for each series
+  my $query
+    = "SELECT "
+    . $dbh->sql_to_days('series_date') . " - "
+    . $dbh->sql_to_days('?')
+    . ", series_value "
+    . "FROM series_data "
+    . "WHERE series_id = ? "
+    . "AND series_date >= ?";
+  if ($dateto) {
+    $query .= " AND series_date <= ?";
+  }
+
+  my $sth = $dbh->prepare($query);
+
+  my $gt_index = $self->{'gt'} ? scalar(@{$self->{'lines'}}) : undef;
+  my $line_index = 0;
+
+  $maxvals[$gt_index] = 0 if $gt_index;
+
+  my @datediff_total;
+
+  foreach my $line (@{$self->{'lines'}}) {
+
+    # Even if we end up with no data, we need an empty arrayref to prevent
+    # errors in the PNG-generating code
+    $data[$line_index]    = [];
+    $maxvals[$line_index] = 0;
+
+    foreach my $series (@$line) {
+
+      # Get the data for this series and add it on
+      if ($dateto) {
+        $sth->execute($sql_from, $series->{'series_id'}, $sql_from, $sql_to);
+      }
+      else {
+        $sth->execute($sql_from, $series->{'series_id'}, $sql_from);
+      }
+      my $points = $sth->fetchall_arrayref();
+
+      foreach my $point (@$points) {
+        my ($datediff, $value) = @$point;
+        $data[$line_index][$datediff] ||= 0;
+        $data[$line_index][$datediff] += $value;
+        if ($data[$line_index][$datediff] > $maxvals[$line_index]) {
+          $maxvals[$line_index] = $data[$line_index][$datediff];
         }
 
-        # We are done with the series making up this line, go to the next one
-        $line_index++;
-    }
+        $datediff_total[$datediff] += $value;
 
-    # calculate maximum y value
-    if ($self->{'cumulate'}) {
-        # Make sure we do not try to take the max of an array with undef values
-        my @processed_datediff;
-        while (@datediff_total) {
-            my $datediff = shift @datediff_total;
-            push @processed_datediff, $datediff if defined($datediff);
+        # Add to the grand total, if we are doing that
+        if ($gt_index) {
+          $data[$gt_index][$datediff] ||= 0;
+          $data[$gt_index][$datediff] += $value;
+          if ($data[$gt_index][$datediff] > $maxvals[$gt_index]) {
+            $maxvals[$gt_index] = $data[$gt_index][$datediff];
+          }
         }
-        $self->{'y_max_value'} = max(@processed_datediff);
-    }
-    else {
-        $self->{'y_max_value'} = max(@maxvals);
-    }
-    $self->{'y_max_value'} |= 1; # For log()
-
-    # Align the max y value:
-    #  For one- or two-digit numbers, increase y_max_value until divisible by 8
-    #  For larger numbers, see the comments below to figure out what's going on
-    if ($self->{'y_max_value'} < 100) {
-        do {
-            ++$self->{'y_max_value'};
-        } while ($self->{'y_max_value'} % 8 != 0);
-    }
-    else {
-        #  First, get the # of digits in the y_max_value
-        my $num_digits = 1+int(log($self->{'y_max_value'})/log(10));
-
-        # We want to zero out all but the top 2 digits
-        my $mask_length = $num_digits - 2;
-        $self->{'y_max_value'} /= 10**$mask_length;
-        $self->{'y_max_value'} = int($self->{'y_max_value'});
-        $self->{'y_max_value'} *= 10**$mask_length;
-
-        # Add 10^$mask_length to the max value
-        # Continue to increase until it's divisible by 8 * 10^($mask_length-1)
-        # (Throwing in the -1 keeps at least the smallest digit at zero)
-        do {
-            $self->{'y_max_value'} += 10**$mask_length;
-        } while ($self->{'y_max_value'} % (8*(10**($mask_length-1))) != 0);
+      }
     }
 
-        
-    # Add the x-axis labels into the data structure
-    my $date_progression = generateDateProgression($datefrom, $dateto);
-    unshift(@data, $date_progression);
+    # We are done with the series making up this line, go to the next one
+    $line_index++;
+  }
 
-    if ($self->{'gt'}) {
-        # Add Grand Total to label list
-        push(@{$self->{'labels'}}, $self->{'labelgt'});
+  # calculate maximum y value
+  if ($self->{'cumulate'}) {
 
-        $data[$gt_index] ||= [];
+    # Make sure we do not try to take the max of an array with undef values
+    my @processed_datediff;
+    while (@datediff_total) {
+      my $datediff = shift @datediff_total;
+      push @processed_datediff, $datediff if defined($datediff);
     }
-
-    return \@data;
+    $self->{'y_max_value'} = max(@processed_datediff);
+  }
+  else {
+    $self->{'y_max_value'} = max(@maxvals);
+  }
+  $self->{'y_max_value'} |= 1;    # For log()
+
+  # Align the max y value:
+  #  For one- or two-digit numbers, increase y_max_value until divisible by 8
+  #  For larger numbers, see the comments below to figure out what's going on
+  if ($self->{'y_max_value'} < 100) {
+    do {
+      ++$self->{'y_max_value'};
+    } while ($self->{'y_max_value'} % 8 != 0);
+  }
+  else {
+    #  First, get the # of digits in the y_max_value
+    my $num_digits = 1 + int(log($self->{'y_max_value'}) / log(10));
+
+    # We want to zero out all but the top 2 digits
+    my $mask_length = $num_digits - 2;
+    $self->{'y_max_value'} /= 10**$mask_length;
+    $self->{'y_max_value'} = int($self->{'y_max_value'});
+    $self->{'y_max_value'} *= 10**$mask_length;
+
+    # Add 10^$mask_length to the max value
+    # Continue to increase until it's divisible by 8 * 10^($mask_length-1)
+    # (Throwing in the -1 keeps at least the smallest digit at zero)
+    do {
+      $self->{'y_max_value'} += 10**$mask_length;
+    } while ($self->{'y_max_value'} % (8 * (10**($mask_length - 1))) != 0);
+  }
+
+
+  # Add the x-axis labels into the data structure
+  my $date_progression = generateDateProgression($datefrom, $dateto);
+  unshift(@data, $date_progression);
+
+  if ($self->{'gt'}) {
+
+    # Add Grand Total to label list
+    push(@{$self->{'labels'}}, $self->{'labelgt'});
+
+    $data[$gt_index] ||= [];
+  }
+
+  return \@data;
 }
 
 # Flatten the data structure into a list of series_ids
 sub getSeriesIDs {
-    my $self = shift;
-    my @series_ids;
+  my $self = shift;
+  my @series_ids;
 
-    foreach my $line (@{$self->{'lines'}}) {
-        foreach my $series (@$line) {
-            push(@series_ids, $series->{'series_id'});
-        }
+  foreach my $line (@{$self->{'lines'}}) {
+    foreach my $series (@$line) {
+      push(@series_ids, $series->{'series_id'});
     }
+  }
 
-    return @series_ids;
+  return @series_ids;
 }
 
 # Class method to get the data necessary to populate the "select series"
 # widgets on various pages.
 sub getVisibleSeries {
-    my %cats;
-
-    my $grouplist = Bugzilla->user->groups_as_string;
-    
-    # Get all visible series
-    my $dbh = Bugzilla->dbh;
-    my $serieses = $dbh->selectall_arrayref("SELECT cc1.name, cc2.name, " .
-                        "series.name, series.series_id " .
-                        "FROM series " .
-                        "INNER JOIN series_categories AS cc1 " .
-                        "    ON series.category = cc1.id " .
-                        "INNER JOIN series_categories AS cc2 " .
-                        "    ON series.subcategory = cc2.id " .
-                        "LEFT JOIN category_group_map AS cgm " .
-                        "    ON series.category = cgm.category_id " .
-                        "    AND cgm.group_id NOT IN($grouplist) " .
-                        "WHERE creator = ? OR (is_public = 1 AND cgm.category_id IS NULL) " .
-                   $dbh->sql_group_by('series.series_id', 'cc1.name, cc2.name, ' .
-                                      'series.name'),
-                        undef, Bugzilla->user->id);
-    foreach my $series (@$serieses) {
-        my ($cat, $subcat, $name, $series_id) = @$series;
-        $cats{$cat}{$subcat}{$name} = $series_id;
-    }
-
-    return \%cats;
+  my %cats;
+
+  my $grouplist = Bugzilla->user->groups_as_string;
+
+  # Get all visible series
+  my $dbh      = Bugzilla->dbh;
+  my $serieses = $dbh->selectall_arrayref(
+    "SELECT cc1.name, cc2.name, "
+      . "series.name, series.series_id "
+      . "FROM series "
+      . "INNER JOIN series_categories AS cc1 "
+      . "    ON series.category = cc1.id "
+      . "INNER JOIN series_categories AS cc2 "
+      . "    ON series.subcategory = cc2.id "
+      . "LEFT JOIN category_group_map AS cgm "
+      . "    ON series.category = cgm.category_id "
+      . "    AND cgm.group_id NOT IN($grouplist) "
+      . "WHERE creator = ? OR (is_public = 1 AND cgm.category_id IS NULL) "
+      . $dbh->sql_group_by(
+      'series.series_id', 'cc1.name, cc2.name, ' . 'series.name'
+      ),
+    undef,
+    Bugzilla->user->id
+  );
+  foreach my $series (@$serieses) {
+    my ($cat, $subcat, $name, $series_id) = @$series;
+    $cats{$cat}{$subcat}{$name} = $series_id;
+  }
+
+  return \%cats;
 }
 
 sub generateDateProgression {
-    my ($datefrom, $dateto) = @_;
-    my @progression;
-
-    $dateto = $dateto || time();
-    my $oneday = 60 * 60 * 24;
-
-    # When the from and to dates are converted by str2time(), you end up with
-    # a time figure representing midnight at the beginning of that day. We
-    # adjust the times by 1/3 and 2/3 of a day respectively to prevent
-    # edge conditions in time2str().
-    $datefrom += $oneday / 3;
-    $dateto += (2 * $oneday) / 3;
-
-    while ($datefrom < $dateto) {
-        push (@progression, time2str("%Y-%m-%d", $datefrom));
-        $datefrom += $oneday;
-    }
+  my ($datefrom, $dateto) = @_;
+  my @progression;
+
+  $dateto = $dateto || time();
+  my $oneday = 60 * 60 * 24;
+
+  # When the from and to dates are converted by str2time(), you end up with
+  # a time figure representing midnight at the beginning of that day. We
+  # adjust the times by 1/3 and 2/3 of a day respectively to prevent
+  # edge conditions in time2str().
+  $datefrom += $oneday / 3;
+  $dateto   += (2 * $oneday) / 3;
 
-    return \@progression;
+  while ($datefrom < $dateto) {
+    push(@progression, time2str("%Y-%m-%d", $datefrom));
+    $datefrom += $oneday;
+  }
+
+  return \@progression;
 }
 
 sub dump {
-    my $self = shift;
-
-    # Make sure we've read in our data
-    my $data = $self->data;
-    
-    require Data::Dumper;
-    say "<pre>Bugzilla::Chart object:";
-    print html_quote(Data::Dumper::Dumper($self));
-    print "</pre>";
+  my $self = shift;
+
+  # Make sure we've read in our data
+  my $data = $self->data;
+
+  require Data::Dumper;
+  say "<pre>Bugzilla::Chart object:";
+  print html_quote(Data::Dumper::Dumper($self));
+  print "</pre>";
 }
 
 1;
diff --git a/Bugzilla/Classification.pm b/Bugzilla/Classification.pm
index 09f71baaf1..85de92b1a2 100644
--- a/Bugzilla/Classification.pm
+++ b/Bugzilla/Classification.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Classification;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,26 +26,26 @@ use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object Exporter);
 
 use constant IS_CONFIG => 1;
 
-use constant DB_TABLE => 'classifications';
+use constant DB_TABLE   => 'classifications';
 use constant LIST_ORDER => 'sortkey, name';
 
 use constant DB_COLUMNS => qw(
-    id
-    name
-    description
-    sortkey
+  id
+  name
+  description
+  sortkey
 );
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    description
-    sortkey
+  name
+  description
+  sortkey
 );
 
 use constant VALIDATORS => {
-    name        => \&_check_name,
-    description => \&_check_description,
-    sortkey     => \&_check_sortkey,
+  name        => \&_check_name,
+  description => \&_check_description,
+  sortkey     => \&_check_sortkey,
 };
 
 ###############################
@@ -53,29 +53,31 @@ use constant VALIDATORS => {
 ###############################
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    ThrowUserError("classification_not_deletable") if ($self->id == 1);
+  ThrowUserError("classification_not_deletable") if ($self->id == 1);
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    # Reclassify products to the default classification, if needed.
-    my $product_ids = $dbh->selectcol_arrayref(
-        'SELECT id FROM products WHERE classification_id = ?', undef, $self->id);
-
-    if (@$product_ids) {
-        $dbh->do('UPDATE products SET classification_id = 1 WHERE '
-                  . $dbh->sql_in('id', $product_ids));
-        foreach my $id (@$product_ids) {
-            Bugzilla->memcached->clear({ table => 'products', id => $id });
-        }
-        Bugzilla->memcached->clear_config();
+  # Reclassify products to the default classification, if needed.
+  my $product_ids
+    = $dbh->selectcol_arrayref(
+    'SELECT id FROM products WHERE classification_id = ?',
+    undef, $self->id);
+
+  if (@$product_ids) {
+    $dbh->do('UPDATE products SET classification_id = 1 WHERE '
+        . $dbh->sql_in('id', $product_ids));
+    foreach my $id (@$product_ids) {
+      Bugzilla->memcached->clear({table => 'products', id => $id});
     }
+    Bugzilla->memcached->clear_config();
+  }
 
-    $self->SUPER::remove_from_db();
+  $self->SUPER::remove_from_db();
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 
 }
 
@@ -84,38 +86,41 @@ sub remove_from_db {
 ###############################
 
 sub _check_name {
-    my ($invocant, $name) = @_;
-
-    $name = trim($name);
-    $name || ThrowUserError('classification_not_specified');
-
-    if (length($name) > MAX_CLASSIFICATION_SIZE) {
-        ThrowUserError('classification_name_too_long', {'name' => $name});
-    }
-
-    my $classification = new Bugzilla::Classification({name => $name});
-    if ($classification && (!ref $invocant || $classification->id != $invocant->id)) {
-        ThrowUserError("classification_already_exists", { name => $classification->name });
-    }
-    return $name;
+  my ($invocant, $name) = @_;
+
+  $name = trim($name);
+  $name || ThrowUserError('classification_not_specified');
+
+  if (length($name) > MAX_CLASSIFICATION_SIZE) {
+    ThrowUserError('classification_name_too_long', {'name' => $name});
+  }
+
+  my $classification = new Bugzilla::Classification({name => $name});
+  if ($classification && (!ref $invocant || $classification->id != $invocant->id))
+  {
+    ThrowUserError("classification_already_exists",
+      {name => $classification->name});
+  }
+  return $name;
 }
 
 sub _check_description {
-    my ($invocant, $description) = @_;
+  my ($invocant, $description) = @_;
 
-    $description  = trim($description || '');
-    return $description;
+  $description = trim($description || '');
+  return $description;
 }
 
 sub _check_sortkey {
-    my ($invocant, $sortkey) = @_;
-
-    $sortkey ||= 0;
-    my $stored_sortkey = $sortkey;
-    if (!detaint_natural($sortkey) || $sortkey > MAX_SMALLINT) {
-        ThrowUserError('classification_invalid_sortkey', { 'sortkey' => $stored_sortkey });
-    }
-    return $sortkey;
+  my ($invocant, $sortkey) = @_;
+
+  $sortkey ||= 0;
+  my $stored_sortkey = $sortkey;
+  if (!detaint_natural($sortkey) || $sortkey > MAX_SMALLINT) {
+    ThrowUserError('classification_invalid_sortkey',
+      {'sortkey' => $stored_sortkey});
+  }
+  return $sortkey;
 }
 
 #####################################
@@ -124,41 +129,45 @@ sub _check_sortkey {
 
 use constant FIELD_NAME => 'classification';
 use constant is_default => 0;
-use constant is_active => 1;
+use constant is_active  => 1;
 
 ###############################
 ####       Methods         ####
 ###############################
 
-sub set_name        { $_[0]->set('name', $_[1]); }
+sub set_name        { $_[0]->set('name',        $_[1]); }
 sub set_description { $_[0]->set('description', $_[1]); }
-sub set_sortkey     { $_[0]->set('sortkey', $_[1]); }
+sub set_sortkey     { $_[0]->set('sortkey',     $_[1]); }
 
 sub product_count {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{'product_count'}) {
-        $self->{'product_count'} = $dbh->selectrow_array(q{
+  if (!defined $self->{'product_count'}) {
+    $self->{'product_count'} = $dbh->selectrow_array(
+      q{
             SELECT COUNT(*) FROM products
-            WHERE classification_id = ?}, undef, $self->id) || 0;
-    }
-    return $self->{'product_count'};
+            WHERE classification_id = ?}, undef, $self->id
+    ) || 0;
+  }
+  return $self->{'product_count'};
 }
 
 sub products {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!$self->{'products'}) {
-        my $product_ids = $dbh->selectcol_arrayref(q{
+  if (!$self->{'products'}) {
+    my $product_ids = $dbh->selectcol_arrayref(
+      q{
             SELECT id FROM products
             WHERE classification_id = ?
-            ORDER BY name}, undef, $self->id);
+            ORDER BY name}, undef, $self->id
+    );
 
-        $self->{'products'} = Bugzilla::Product->new_from_list($product_ids);
-    }
-    return $self->{'products'};
+    $self->{'products'} = Bugzilla::Product->new_from_list($product_ids);
+  }
+  return $self->{'products'};
 }
 
 ###############################
@@ -166,7 +175,7 @@ sub products {
 ###############################
 
 sub description { return $_[0]->{'description'}; }
-sub sortkey     { return $_[0]->{'sortkey'};     }
+sub sortkey     { return $_[0]->{'sortkey'}; }
 
 
 ###############################
@@ -177,27 +186,32 @@ sub sortkey     { return $_[0]->{'sortkey'};     }
 # in global/choose-product.html.tmpl.
 
 sub sort_products_by_classification {
-    my $products = shift;
-    my $list;
-
-    if (Bugzilla->params->{'useclassification'}) {
-        my $class = {};
-        # Get all classifications with at least one product.
-        foreach my $product (@$products) {
-            $class->{$product->classification_id}->{'object'} ||=
-                new Bugzilla::Classification($product->classification_id);
-            # Nice way to group products per classification, without querying
-            # the DB again.
-            push(@{$class->{$product->classification_id}->{'products'}}, $product);
-        }
-        $list = [sort {$a->{'object'}->sortkey <=> $b->{'object'}->sortkey
-                       || lc($a->{'object'}->name) cmp lc($b->{'object'}->name)}
-                      (values %$class)];
-    }
-    else {
-        $list = [{object => undef, products => $products}];
+  my $products = shift;
+  my $list;
+
+  if (Bugzilla->params->{'useclassification'}) {
+    my $class = {};
+
+    # Get all classifications with at least one product.
+    foreach my $product (@$products) {
+      $class->{$product->classification_id}->{'object'}
+        ||= new Bugzilla::Classification($product->classification_id);
+
+      # Nice way to group products per classification, without querying
+      # the DB again.
+      push(@{$class->{$product->classification_id}->{'products'}}, $product);
     }
-    return $list;
+    $list = [
+      sort {
+        $a->{'object'}->sortkey <=> $b->{'object'}->sortkey
+          || lc($a->{'object'}->name) cmp lc($b->{'object'}->name)
+      } (values %$class)
+    ];
+  }
+  else {
+    $list = [{object => undef, products => $products}];
+  }
+  return $list;
 }
 
 1;
diff --git a/Bugzilla/Comment.pm b/Bugzilla/Comment.pm
index 3dabe67028..a4c023c881 100644
--- a/Bugzilla/Comment.pm
+++ b/Bugzilla/Comment.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Comment;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,7 +21,7 @@ use Bugzilla::User;
 use Bugzilla::Util;
 
 use List::Util qw(first);
-use Scalar::Util qw(blessed);
+use Scalar::Util qw(blessed weaken isweak);
 
 ###############################
 ####    Initialization     ####
@@ -33,49 +33,50 @@ use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
 
 use constant DB_COLUMNS => qw(
-    comment_id
-    bug_id
-    who
-    bug_when
-    work_time
-    thetext
-    isprivate
-    already_wrapped
-    type
-    extra_data
-    is_markdown
+  comment_id
+  bug_id
+  who
+  bug_when
+  work_time
+  thetext
+  isprivate
+  already_wrapped
+  type
+  extra_data
+  is_markdown
 );
 
 use constant UPDATE_COLUMNS => qw(
-    isprivate
-    type
-    extra_data
+  isprivate
+  type
+  extra_data
 );
 
 use constant DB_TABLE => 'longdescs';
 use constant ID_FIELD => 'comment_id';
+
 # In some rare cases, two comments can have identical timestamps. If
 # this happens, we want to be sure that the comment added later shows up
 # later in the sequence.
 use constant LIST_ORDER => 'bug_when, comment_id';
 
 use constant VALIDATORS => {
-    bug_id      => \&_check_bug_id,
-    who         => \&_check_who,
-    bug_when    => \&_check_bug_when,
-    work_time   => \&_check_work_time,
-    thetext     => \&_check_thetext,
-    isprivate   => \&_check_isprivate,
-    is_markdown => \&Bugzilla::Object::check_boolean,
-    extra_data  => \&_check_extra_data,
-    type        => \&_check_type,
+  bug_id      => \&_check_bug_id,
+  who         => \&_check_who,
+  bug_when    => \&_check_bug_when,
+  work_time   => \&_check_work_time,
+  thetext     => \&_check_thetext,
+  isprivate   => \&_check_isprivate,
+  is_markdown => \&Bugzilla::Object::check_boolean,
+  extra_data  => \&_check_extra_data,
+  type        => \&_check_type,
 };
 
 use constant VALIDATOR_DEPENDENCIES => {
-    extra_data => ['type'],
-    bug_id     => ['who'],
-    work_time  => ['who', 'bug_id'],
-    isprivate  => ['who'],
+  extra_data => ['type'],
+  bug_id     => ['who'],
+  work_time  => ['who', 'bug_id'],
+  isprivate  => ['who'],
 };
 
 #########################
@@ -83,91 +84,100 @@ use constant VALIDATOR_DEPENDENCIES => {
 #########################
 
 sub update {
-    my $self = shift;
-    my ($changes, $old_comment) = $self->SUPER::update(@_);
-
-    if (exists $changes->{'thetext'} || exists $changes->{'isprivate'}) {
-        $self->bug->_sync_fulltext( update_comments => 1);
-    }
-
-    my @old_tags = @{ $old_comment->tags };
-    my @new_tags = @{ $self->tags };
-    my ($removed_tags, $added_tags) = diff_arrays(\@old_tags, \@new_tags);
-
-    if (@$removed_tags || @$added_tags) {
-        my $dbh = Bugzilla->dbh;
-        my $when = $dbh->selectrow_array("SELECT LOCALTIMESTAMP(0)");
-        my $sth_delete = $dbh->prepare(
-            "DELETE FROM longdescs_tags WHERE comment_id = ? AND tag = ?"
-        );
-        my $sth_insert = $dbh->prepare(
-            "INSERT INTO longdescs_tags(comment_id, tag) VALUES (?, ?)"
-        );
-        my $sth_activity = $dbh->prepare(
-            "INSERT INTO longdescs_tags_activity
+  my $self = shift;
+  my ($changes, $old_comment) = $self->SUPER::update(@_);
+
+  if (exists $changes->{'thetext'} || exists $changes->{'isprivate'}) {
+    $self->bug->_sync_fulltext(update_comments => 1);
+  }
+
+  my @old_tags = @{$old_comment->tags};
+  my @new_tags = @{$self->tags};
+  my ($removed_tags, $added_tags) = diff_arrays(\@old_tags, \@new_tags);
+
+  if (@$removed_tags || @$added_tags) {
+    my $dbh        = Bugzilla->dbh;
+    my $when       = $dbh->selectrow_array("SELECT LOCALTIMESTAMP(0)");
+    my $sth_delete = $dbh->prepare(
+      "DELETE FROM longdescs_tags WHERE comment_id = ? AND tag = ?");
+    my $sth_insert
+      = $dbh->prepare("INSERT INTO longdescs_tags(comment_id, tag) VALUES (?, ?)");
+    my $sth_activity = $dbh->prepare(
+      "INSERT INTO longdescs_tags_activity
             (bug_id, comment_id, who, bug_when, added, removed)
             VALUES (?, ?, ?, ?, ?, ?)"
-        );
-
-        foreach my $tag (@$removed_tags) {
-            my $weighted = Bugzilla::Comment::TagWeights->new({ name => $tag });
-            if ($weighted) {
-                if ($weighted->weight == 1) {
-                    $weighted->remove_from_db();
-                } else {
-                    $weighted->set_weight($weighted->weight - 1);
-                    $weighted->update();
-                }
-            }
-            trick_taint($tag);
-            $sth_delete->execute($self->id, $tag);
-            $sth_activity->execute(
-                $self->bug_id, $self->id, Bugzilla->user->id, $when, '', $tag);
-        }
+    );
 
-        foreach my $tag (@$added_tags) {
-            my $weighted = Bugzilla::Comment::TagWeights->new({ name => $tag });
-            if ($weighted) {
-                $weighted->set_weight($weighted->weight + 1);
-                $weighted->update();
-            } else {
-                Bugzilla::Comment::TagWeights->create({ tag => $tag, weight => 1 });
-            }
-            trick_taint($tag);
-            $sth_insert->execute($self->id, $tag);
-            $sth_activity->execute(
-                $self->bug_id, $self->id, Bugzilla->user->id, $when, $tag, '');
+    foreach my $tag (@$removed_tags) {
+      my $weighted = Bugzilla::Comment::TagWeights->new({name => $tag});
+      if ($weighted) {
+        if ($weighted->weight == 1) {
+          $weighted->remove_from_db();
         }
+        else {
+          $weighted->set_weight($weighted->weight - 1);
+          $weighted->update();
+        }
+      }
+      trick_taint($tag);
+      $sth_delete->execute($self->id, $tag);
+      $sth_activity->execute($self->bug_id, $self->id, Bugzilla->user->id, $when, '',
+        $tag);
     }
 
-    return $changes;
+    foreach my $tag (@$added_tags) {
+      my $weighted = Bugzilla::Comment::TagWeights->new({name => $tag});
+      if ($weighted) {
+        $weighted->set_weight($weighted->weight + 1);
+        $weighted->update();
+      }
+      else {
+        Bugzilla::Comment::TagWeights->create({tag => $tag, weight => 1});
+      }
+      trick_taint($tag);
+      $sth_insert->execute($self->id, $tag);
+      $sth_activity->execute($self->bug_id, $self->id, Bugzilla->user->id, $when,
+        $tag, '');
+    }
+  }
+
+  return $changes;
 }
 
 # Speeds up displays of comment lists by loading all author objects and tags at
 # once for a whole list.
 sub preload {
-    my ($class, $comments) = @_;
-    # Author
-    my %user_ids = map { $_->{who} => 1 } @$comments;
-    my $users = Bugzilla::User->new_from_list([keys %user_ids]);
-    my %user_map = map { $_->id => $_ } @$users;
-    foreach my $comment (@$comments) {
-        $comment->{author} = $user_map{$comment->{who}};
-    }
-    # Tags
-    if (Bugzilla->params->{'comment_taggers_group'}) {
-        my $dbh = Bugzilla->dbh;
-        my @comment_ids = map { $_->id } @$comments;
-        my %comment_map = map { $_->id => $_ } @$comments;
-        my $rows = $dbh->selectall_arrayref(
-            "SELECT comment_id, " . $dbh->sql_group_concat('tag', "','") . "
+  my ($class, $comments) = @_;
+
+  # Author
+  my %user_ids = map { $_->{who} => 1 } @$comments;
+  my $users    = Bugzilla::User->new_from_list([keys %user_ids]);
+  my %user_map = map { $_->id => $_ } @$users;
+  foreach my $comment (@$comments) {
+    $comment->{author} = $user_map{$comment->{who}};
+  }
+
+  # Tags
+  if (Bugzilla->params->{'comment_taggers_group'}) {
+    my $dbh         = Bugzilla->dbh;
+    my @comment_ids = map { $_->id } @$comments;
+    my %comment_map = map { $_->id => $_ } @$comments;
+    my $rows        = $dbh->selectall_arrayref(
+      "SELECT comment_id, " . $dbh->sql_group_concat('tag', "','") . "
                FROM longdescs_tags
-              WHERE " . $dbh->sql_in('comment_id', \@comment_ids) . "
-              GROUP BY comment_id");
-        foreach my $row (@$rows) {
-            $comment_map{$row->[0]}->{tags} = [ split(/,/, $row->[1]) ];
-        }
+              WHERE "
+        . $dbh->sql_in('comment_id', \@comment_ids) . ' '
+        . $dbh->sql_group_by('comment_id')
+    );
+    foreach my $row (@$rows) {
+      $comment_map{$row->[0]}->{tags} = [split(/,/, $row->[1])];
     }
+
+    # Also sets the 'tags' attribute for comments which have no entry
+    # in the longdescs_tags table, else calling $comment->tags will
+    # trigger another SQL query again.
+    $comment_map{$_}->{tags} ||= [] foreach @comment_ids;
+  }
 }
 
 ###############################
@@ -175,128 +185,140 @@ sub preload {
 ###############################
 
 sub already_wrapped { return $_[0]->{'already_wrapped'}; }
-sub body        { return $_[0]->{'thetext'};   }
-sub bug_id      { return $_[0]->{'bug_id'};    }
-sub creation_ts { return $_[0]->{'bug_when'};  }
-sub is_private  { return $_[0]->{'isprivate'}; }
-sub is_markdown { return $_[0]->{'is_markdown'}; }
-sub work_time   {
-    # Work time is returned as a string (see bug 607909)
-    return 0 if $_[0]->{'work_time'} + 0 == 0;
-    return $_[0]->{'work_time'};
+sub body            { return $_[0]->{'thetext'}; }
+sub bug_id          { return $_[0]->{'bug_id'}; }
+sub creation_ts     { return $_[0]->{'bug_when'}; }
+sub is_private      { return $_[0]->{'isprivate'}; }
+sub is_markdown     { return $_[0]->{'is_markdown'}; }
+
+sub work_time {
+
+  # Work time is returned as a string (see bug 607909)
+  return 0 if $_[0]->{'work_time'} + 0 == 0;
+  return $_[0]->{'work_time'};
 }
-sub type        { return $_[0]->{'type'};      }
-sub extra_data  { return $_[0]->{'extra_data'} }
+sub type       { return $_[0]->{'type'}; }
+sub extra_data { return $_[0]->{'extra_data'} }
 
 sub tags {
-    my ($self) = @_;
-    return [] unless Bugzilla->params->{'comment_taggers_group'};
-    $self->{'tags'} ||= Bugzilla->dbh->selectcol_arrayref(
-        "SELECT tag
+  my ($self) = @_;
+  state $comment_taggers_group = Bugzilla->params->{'comment_taggers_group'};
+  return [] unless $comment_taggers_group;
+  $self->{'tags'} ||= Bugzilla->dbh->selectcol_arrayref(
+    "SELECT tag
            FROM longdescs_tags
           WHERE comment_id = ?
-          ORDER BY tag",
-        undef, $self->id);
-    return $self->{'tags'};
+          ORDER BY tag", undef, $self->id
+  );
+  return $self->{'tags'};
 }
 
 sub collapsed {
-    my ($self) = @_;
-    return 0 unless Bugzilla->params->{'comment_taggers_group'};
-    return $self->{collapsed} if exists $self->{collapsed};
-    $self->{collapsed} = 0;
-    Bugzilla->request_cache->{comment_tags_collapsed}
-            ||= [ split(/\s*,\s*/, Bugzilla->params->{'collapsed_comment_tags'}) ];
-    my @collapsed_tags = @{ Bugzilla->request_cache->{comment_tags_collapsed} };
-    foreach my $my_tag (@{ $self->tags }) {
-        $my_tag = lc($my_tag);
-        foreach my $collapsed_tag (@collapsed_tags) {
-            if ($my_tag eq lc($collapsed_tag)) {
-                $self->{collapsed} = 1;
-                last;
-            }
-        }
-        last if $self->{collapsed};
+  my ($self) = @_;
+  state $comment_taggers_group = Bugzilla->params->{'comment_taggers_group'};
+  return 0 unless $comment_taggers_group;
+  return $self->{collapsed} if exists $self->{collapsed};
+
+  state $collapsed_comment_tags = Bugzilla->params->{'collapsed_comment_tags'};
+  $self->{collapsed} = 0;
+  Bugzilla->request_cache->{comment_tags_collapsed}
+    ||= [split(/\s*,\s*/, $collapsed_comment_tags)];
+  my @collapsed_tags = @{Bugzilla->request_cache->{comment_tags_collapsed}};
+  foreach my $my_tag (@{$self->tags}) {
+    $my_tag = lc($my_tag);
+    foreach my $collapsed_tag (@collapsed_tags) {
+      if ($my_tag eq lc($collapsed_tag)) {
+        $self->{collapsed} = 1;
+        last;
+      }
     }
-    return $self->{collapsed};
+    last if $self->{collapsed};
+  }
+  return $self->{collapsed};
 }
 
 sub bug {
-    my $self = shift;
-    require Bugzilla::Bug;
-    $self->{bug} ||= new Bugzilla::Bug($self->bug_id);
-    return $self->{bug};
+  my $self = shift;
+  require Bugzilla::Bug;
+
+# note $bug exists as a strong reference to keep $self->{bug} defined until the end of this method
+  my $bug = $self->{bug} ||= new Bugzilla::Bug($self->bug_id);
+  weaken($self->{bug}) unless isweak($self->{bug});
+  return $bug;
 }
 
 sub is_about_attachment {
-    my ($self) = @_;
-    return 1 if ($self->type == CMT_ATTACHMENT_CREATED
-                 or $self->type == CMT_ATTACHMENT_UPDATED);
-    return 0;
+  my ($self) = @_;
+  return 1
+    if ($self->type == CMT_ATTACHMENT_CREATED
+    or $self->type == CMT_ATTACHMENT_UPDATED);
+  return 0;
 }
 
 sub attachment {
-    my ($self) = @_;
-    return undef if not $self->is_about_attachment;
-    $self->{attachment} ||=
-        new Bugzilla::Attachment({ id => $self->extra_data, cache => 1 });
-    return $self->{attachment};
+  my ($self) = @_;
+  return undef if not $self->is_about_attachment;
+  $self->{attachment}
+    ||= new Bugzilla::Attachment({id => $self->extra_data, cache => 1});
+  return $self->{attachment};
 }
 
-sub author { 
-    my $self = shift;
-    $self->{'author'}
-      ||= new Bugzilla::User({ id => $self->{'who'}, cache => 1 });
-    return $self->{'author'};
+sub author {
+  my $self = shift;
+  $self->{'author'} ||= new Bugzilla::User({id => $self->{'who'}, cache => 1});
+  return $self->{'author'};
 }
 
 sub body_full {
-    my ($self, $params) = @_;
-    $params ||= {};
-    my $template = Bugzilla->template_inner;
-    my $body;
-    if ($self->type) {
-        $template->process("bug/format_comment.txt.tmpl", 
-                           { comment => $self, %$params }, \$body)
-            || ThrowTemplateError($template->error());
-        $body =~ s/^X//;
-    }
-    else {
-        $body = $self->body;
-    }
-    if ($params->{wrap} and !$self->already_wrapped) {
-        $body = wrap_comment($body);
-    }
-    return $body;
+  my ($self, $params) = @_;
+  $params ||= {};
+  my $template = Bugzilla->template_inner;
+  my $body;
+  if ($self->type) {
+    $template->process("bug/format_comment.txt.tmpl", {comment => $self, %$params},
+      \$body)
+      || ThrowTemplateError($template->error());
+    $body =~ s/^X//;
+  }
+  else {
+    $body = $self->body;
+  }
+  if (!$self->is_markdown and !$self->already_wrapped) {
+    $body = wrap_cite($body);
+  }
+  if ($params->{wrap} and !$self->already_wrapped) {
+    $body = wrap_comment($body);
+  }
+  return $body;
 }
 
 ############
 # Mutators #
 ############
 
-sub set_is_private  { $_[0]->set('isprivate',  $_[1]); }
-sub set_type        { $_[0]->set('type',       $_[1]); }
-sub set_extra_data  { $_[0]->set('extra_data', $_[1]); }
+sub set_is_private  { $_[0]->set('isprivate',   $_[1]); }
+sub set_type        { $_[0]->set('type',        $_[1]); }
+sub set_extra_data  { $_[0]->set('extra_data',  $_[1]); }
 sub set_is_markdown { $_[0]->set('is_markdown', $_[1]); }
 
 sub add_tag {
-    my ($self, $tag) = @_;
-    $tag = $self->_check_tag($tag);
+  my ($self, $tag) = @_;
+  $tag = $self->_check_tag($tag);
 
-    my $tags = $self->tags;
-    return if grep { lc($tag) eq lc($_) } @$tags;
-    push @$tags, $tag;
-    $self->{'tags'} = [ sort @$tags ];
+  my $tags = $self->tags;
+  return if grep { lc($tag) eq lc($_) } @$tags;
+  push @$tags, $tag;
+  $self->{'tags'} = [sort @$tags];
 }
 
 sub remove_tag {
-    my ($self, $tag) = @_;
-    $tag = $self->_check_tag($tag);
+  my ($self, $tag) = @_;
+  $tag = $self->_check_tag($tag);
 
-    my $tags = $self->tags;
-    my $index = first { lc($tags->[$_]) eq lc($tag) } 0..scalar(@$tags) - 1;
-    return unless defined $index;
-    splice(@$tags, $index, 1);
+  my $tags = $self->tags;
+  my $index = first { lc($tags->[$_]) eq lc($tag) } 0 .. scalar(@$tags) - 1;
+  return unless defined $index;
+  splice(@$tags, $index, 1);
 }
 
 ##############
@@ -304,180 +326,177 @@ sub remove_tag {
 ##############
 
 sub run_create_validators {
-    my $self = shift;
-    my $params = $self->SUPER::run_create_validators(@_);
-    # Sometimes this run_create_validators is called with parameters that
-    # skip bug_id validation, so it might not exist in the resulting hash.
-    if (defined $params->{bug_id}) {
-        $params->{bug_id} = $params->{bug_id}->id;
-    }
-    return $params;
+  my $self   = shift;
+  my $params = $self->SUPER::run_create_validators(@_);
+
+  # Sometimes this run_create_validators is called with parameters that
+  # skip bug_id validation, so it might not exist in the resulting hash.
+  if (defined $params->{bug_id}) {
+    $params->{bug_id} = $params->{bug_id}->id;
+  }
+  return $params;
 }
 
 sub _check_extra_data {
-    my ($invocant, $extra_data, undef, $params) = @_;
-    my $type = blessed($invocant) ? $invocant->type : $params->{type};
+  my ($invocant, $extra_data, undef, $params) = @_;
+  my $type = blessed($invocant) ? $invocant->type : $params->{type};
 
-    if ($type == CMT_NORMAL) {
-        if (defined $extra_data) {
-            ThrowCodeError('comment_extra_data_not_allowed',
-                           { type => $type, extra_data => $extra_data });
-        }
+  if ($type == CMT_NORMAL) {
+    if (defined $extra_data) {
+      ThrowCodeError('comment_extra_data_not_allowed',
+        {type => $type, extra_data => $extra_data});
+    }
+  }
+  else {
+    if (!defined $extra_data) {
+      ThrowCodeError('comment_extra_data_required', {type => $type});
+    }
+    elsif ($type == CMT_ATTACHMENT_CREATED or $type == CMT_ATTACHMENT_UPDATED) {
+      my $attachment = Bugzilla::Attachment->check({id => $extra_data});
+      $extra_data = $attachment->id;
     }
     else {
-        if (!defined $extra_data) {
-            ThrowCodeError('comment_extra_data_required', { type => $type });
-        }
-        elsif ($type == CMT_ATTACHMENT_CREATED 
-               or $type == CMT_ATTACHMENT_UPDATED) 
-        {
-             my $attachment = Bugzilla::Attachment->check({ 
-                 id => $extra_data });
-             $extra_data = $attachment->id;
-        }
-        else {
-            my $original = $extra_data;
-            detaint_natural($extra_data) 
-              or ThrowCodeError('comment_extra_data_not_numeric',
-                                { type => $type, extra_data => $original });
-        }
+      my $original = $extra_data;
+      detaint_natural($extra_data)
+        or ThrowCodeError('comment_extra_data_not_numeric',
+        {type => $type, extra_data => $original});
     }
+  }
 
-    return $extra_data;
+  return $extra_data;
 }
 
 sub _check_type {
-    my ($invocant, $type) = @_;
-    $type ||= CMT_NORMAL;
-    my $original = $type;
-    detaint_natural($type)
-        or ThrowCodeError('comment_type_invalid', { type => $original });
-    return $type;
+  my ($invocant, $type) = @_;
+  $type ||= CMT_NORMAL;
+  my $original = $type;
+  detaint_natural($type)
+    or ThrowCodeError('comment_type_invalid', {type => $original});
+  return $type;
 }
 
 sub _check_bug_id {
-    my ($invocant, $bug_id) = @_;
-
-    ThrowCodeError('param_required', {function => 'Bugzilla::Comment->create',
-                                      param => 'bug_id'}) unless $bug_id;
-
-    my $bug;
-    if (blessed $bug_id) {
-        # We got a bug object passed in, use it
-        $bug = $bug_id;
-        $bug->check_is_visible;
-    }
-    else {
-        # We got a bug id passed in, check it and get the bug object
-        $bug = Bugzilla::Bug->check({ id => $bug_id });
-    }
-
-    # Make sure the user can edit the product
-    Bugzilla->user->can_edit_product($bug->{product_id});
-
-    # Make sure the user can comment
-    my $privs;
-    $bug->check_can_change_field('longdesc', 0, 1, \$privs)
-        || ThrowUserError('illegal_change', 
-                          { field => 'longdesc', privs => $privs });
-    return $bug;
+  my ($invocant, $bug_id) = @_;
+
+  ThrowCodeError('param_required',
+    {function => 'Bugzilla::Comment->create', param => 'bug_id'})
+    unless $bug_id;
+
+  my $bug;
+  if (blessed $bug_id) {
+
+    # We got a bug object passed in, use it
+    $bug = $bug_id;
+    $bug->check_is_visible;
+  }
+  else {
+    # We got a bug id passed in, check it and get the bug object
+    $bug = Bugzilla::Bug->check({id => $bug_id});
+  }
+
+  # Make sure the user can edit the product
+  Bugzilla->user->can_edit_product($bug->{product_id});
+
+  # Make sure the user can comment
+  my $privs;
+  $bug->check_can_change_field('longdesc', 0, 1, \$privs)
+    || ThrowUserError('illegal_change', {field => 'longdesc', privs => $privs});
+  return $bug;
 }
 
 sub _check_who {
-    my ($invocant, $who) = @_;
-    Bugzilla->login(LOGIN_REQUIRED);
-    return Bugzilla->user->id;
+  my ($invocant, $who) = @_;
+  Bugzilla->login(LOGIN_REQUIRED);
+  return Bugzilla->user->id;
 }
 
 sub _check_bug_when {
-    my ($invocant, $when) = @_;
+  my ($invocant, $when) = @_;
 
-    # Make sure the timestamp is defined, default to a timestamp from the db
-    if (!defined $when) {
-        $when = Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-    }
+  # Make sure the timestamp is defined, default to a timestamp from the db
+  if (!defined $when) {
+    $when = Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  }
 
-    # Make sure the timestamp parses
-    if (!datetime_from($when)) {
-        ThrowCodeError('invalid_timestamp', { timestamp => $when });
-    }
+  # Make sure the timestamp parses
+  if (!datetime_from($when)) {
+    ThrowCodeError('invalid_timestamp', {timestamp => $when});
+  }
 
-    return $when;
+  return $when;
 }
 
 sub _check_work_time {
-    my ($invocant, $value_in, $field, $params) = @_;
-
-    # Call down to Bugzilla::Object, letting it know negative
-    # values are ok
-    my $time = $invocant->check_time($value_in, $field, $params, 1);
-    my $privs;
-    $params->{bug_id}->check_can_change_field('work_time', 0, $time, \$privs)
-        || ThrowUserError('illegal_change',
-                          { field => 'work_time', privs => $privs });
-    return $time;
+  my ($invocant, $value_in, $field, $params) = @_;
+
+  # Call down to Bugzilla::Object, letting it know negative
+  # values are ok
+  my $time = $invocant->check_time($value_in, $field, $params, 1);
+  my $privs;
+  $params->{bug_id}->check_can_change_field('work_time', 0, $time, \$privs)
+    || ThrowUserError('illegal_change', {field => 'work_time', privs => $privs});
+  return $time;
 }
 
 sub _check_thetext {
-    my ($invocant, $thetext) = @_;
-
-    ThrowCodeError('param_required',{function => 'Bugzilla::Comment->create',
-                                     param => 'thetext'}) unless defined $thetext;
-
-    # Remove any trailing whitespace. Leading whitespace could be
-    # a valid part of the comment.
-    $thetext =~ s/\s*$//s;
-    $thetext =~ s/\r\n?/\n/g; # Get rid of \r.
-
-    # Characters above U+FFFF cannot be stored by MySQL older than 5.5.3 as they
-    # require the new utf8mb4 character set. Other DB servers are handling them
-    # without any problem. So we need to replace these characters if we use MySQL,
-    # else the comment is truncated.
-    # XXX - Once we use utf8mb4 for comments, this hack for MySQL can go away.
-    state $is_mysql = Bugzilla->dbh->isa('Bugzilla::DB::Mysql') ? 1 : 0;
-    if ($is_mysql) {
-        # Perl 5.13.8 and older complain about non-characters.
-        no warnings 'utf8';
-        $thetext =~ s/([\x{10000}-\x{10FFFF}])/"\x{FDD0}[" . uc(sprintf('U+%04x', ord($1))) . "]\x{FDD1}"/eg;
-    }
-
-    ThrowUserError('comment_too_long') if length($thetext) > MAX_COMMENT_LENGTH;
-    return $thetext;
+  my ($invocant, $thetext) = @_;
+
+  ThrowCodeError('param_required',
+    {function => 'Bugzilla::Comment->create', param => 'thetext'})
+    unless defined $thetext;
+
+  # Remove any trailing whitespace. Leading whitespace could be
+  # a valid part of the comment.
+  $thetext =~ s/\s*$//s;
+  $thetext =~ s/\r\n?/\n/g;    # Get rid of \r.
+
+  # Characters above U+FFFF cannot be stored by MySQL older than 5.5.3 as they
+  # require the new utf8mb4 character set. Other DB servers are handling them
+  # without any problem. So we need to replace these characters if we use MySQL,
+  # else the comment is truncated.
+  # XXX - Once we use utf8mb4 for comments, this hack for MySQL can go away.
+  state $is_mysql = Bugzilla->dbh->isa('Bugzilla::DB::Mysql') ? 1 : 0;
+  if ($is_mysql) {
+    $thetext
+      =~ s/([\x{10000}-\x{10FFFF}])/"\x{FDD0}[" . uc(sprintf('U+%04x', ord($1))) . "]\x{FDD1}"/eg;
+  }
+
+  ThrowUserError('comment_too_long') if length($thetext) > MAX_COMMENT_LENGTH;
+  return $thetext;
 }
 
 sub _check_isprivate {
-    my ($invocant, $isprivate) = @_;
-    if ($isprivate && !Bugzilla->user->is_insider) {
-        ThrowUserError('user_not_insider');
-    }
-    return $isprivate ? 1 : 0;
+  my ($invocant, $isprivate) = @_;
+  if ($isprivate && !Bugzilla->user->is_insider) {
+    ThrowUserError('user_not_insider');
+  }
+  return $isprivate ? 1 : 0;
 }
 
 sub _check_tag {
-    my ($invocant, $tag) = @_;
-    length($tag) < MIN_COMMENT_TAG_LENGTH
-        and ThrowUserError('comment_tag_too_short', { tag => $tag });
-    length($tag) > MAX_COMMENT_TAG_LENGTH
-        and ThrowUserError('comment_tag_too_long', { tag => $tag });
-    $tag =~ /^[\w\d\._-]+$/
-        or ThrowUserError('comment_tag_invalid', { tag => $tag });
-    return $tag;
+  my ($invocant, $tag) = @_;
+  length($tag) < MIN_COMMENT_TAG_LENGTH
+    and ThrowUserError('comment_tag_too_short', {tag => $tag});
+  length($tag) > MAX_COMMENT_TAG_LENGTH
+    and ThrowUserError('comment_tag_too_long', {tag => $tag});
+  $tag =~ /^[\w\d\._-]+$/ or ThrowUserError('comment_tag_invalid', {tag => $tag});
+  return $tag;
 }
 
 sub count {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    return $self->{'count'} if defined $self->{'count'};
+  return $self->{'count'} if defined $self->{'count'};
 
-    my $dbh = Bugzilla->dbh;
-    ($self->{'count'}) = $dbh->selectrow_array(
-        "SELECT COUNT(*)
+  my $dbh = Bugzilla->dbh;
+  ($self->{'count'}) = $dbh->selectrow_array(
+    "SELECT COUNT(*)
            FROM longdescs 
           WHERE bug_id = ? 
-                AND bug_when <= ?",
-        undef, $self->bug_id, $self->creation_ts);
+                AND bug_when <= ?", undef, $self->bug_id, $self->creation_ts
+  );
 
-    return --$self->{'count'};
+  return --$self->{'count'};
 }
 
 1;
diff --git a/Bugzilla/Comment/TagWeights.pm b/Bugzilla/Comment/TagWeights.pm
index 7dba53e34c..42200f663c 100644
--- a/Bugzilla/Comment/TagWeights.pm
+++ b/Bugzilla/Comment/TagWeights.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Comment::TagWeights;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,20 +21,20 @@ use constant AUDIT_UPDATES => 0;
 use constant AUDIT_REMOVES => 0;
 
 use constant DB_COLUMNS => qw(
-    id
-    tag
-    weight
+  id
+  tag
+  weight
 );
 
 use constant UPDATE_COLUMNS => qw(
-    weight
+  weight
 );
 
 use constant DB_TABLE   => 'longdescs_tags_weights';
 use constant ID_FIELD   => 'id';
 use constant NAME_FIELD => 'tag';
 use constant LIST_ORDER => 'weight DESC';
-use constant VALIDATORS => { };
+use constant VALIDATORS => {};
 
 # There's no gain to caching these objects
 use constant USE_MEMCACHED => 0;
diff --git a/Bugzilla/Component.pm b/Bugzilla/Component.pm
index 9bc0a44931..b9688d009f 100644
--- a/Bugzilla/Component.pm
+++ b/Bugzilla/Component.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Component;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -27,147 +27,147 @@ use Scalar::Util qw(blessed);
 ###############################
 
 use constant DB_TABLE => 'components';
+
 # This is mostly for the editfields.cgi case where ->get_all is called.
 use constant LIST_ORDER => 'product_id, name';
 
 use constant DB_COLUMNS => qw(
-    id
-    name
-    product_id
-    initialowner
-    initialqacontact
-    description
-    isactive
+  id
+  name
+  product_id
+  initialowner
+  initialqacontact
+  description
+  isactive
 );
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    initialowner
-    initialqacontact
-    description
-    isactive
+  name
+  initialowner
+  initialqacontact
+  description
+  isactive
 );
 
-use constant REQUIRED_FIELD_MAP => {
-    product_id => 'product',
-};
+use constant REQUIRED_FIELD_MAP => {product_id => 'product',};
 
 use constant VALIDATORS => {
-    create_series    => \&Bugzilla::Object::check_boolean,
-    product          => \&_check_product,
-    initialowner     => \&_check_initialowner,
-    initialqacontact => \&_check_initialqacontact,
-    description      => \&_check_description,
-    initial_cc       => \&_check_cc_list,
-    name             => \&_check_name,
-    isactive         => \&Bugzilla::Object::check_boolean,
+  create_series    => \&Bugzilla::Object::check_boolean,
+  product          => \&_check_product,
+  initialowner     => \&_check_initialowner,
+  initialqacontact => \&_check_initialqacontact,
+  description      => \&_check_description,
+  initial_cc       => \&_check_cc_list,
+  name             => \&_check_name,
+  isactive         => \&Bugzilla::Object::check_boolean,
 };
 
-use constant VALIDATOR_DEPENDENCIES => {
-    name => ['product'],
-};
+use constant VALIDATOR_DEPENDENCIES => {name => ['product'],};
 
 ###############################
 
 sub new {
-    my $class = shift;
-    my $param = shift;
-    my $dbh = Bugzilla->dbh;
-
-    my $product;
-    if (ref $param and !defined $param->{id}) {
-        $product = $param->{product};
-        my $name = $param->{name};
-        if (!defined $product) {
-            ThrowCodeError('bad_arg',
-                {argument => 'product',
-                 function => "${class}::new"});
-        }
-        if (!defined $name) {
-            ThrowCodeError('bad_arg',
-                {argument => 'name',
-                 function => "${class}::new"});
-        }
-
-        my $condition = 'product_id = ? AND name = ?';
-        my @values = ($product->id, $name);
-        $param = { condition => $condition, values => \@values };
+  my $class = shift;
+  my $param = shift;
+  my $dbh   = Bugzilla->dbh;
+
+  my $product;
+  if (ref $param and !defined $param->{id}) {
+    $product = $param->{product};
+    my $name = $param->{name};
+    if (!defined $product) {
+      ThrowCodeError('bad_arg', {argument => 'product', function => "${class}::new"});
     }
+    if (!defined $name) {
+      ThrowCodeError('bad_arg', {argument => 'name', function => "${class}::new"});
+    }
+
+    my $condition = 'product_id = ? AND name = ?';
+    my @values = ($product->id, $name);
+    $param = {condition => $condition, values => \@values};
+  }
 
-    unshift @_, $param;
-    my $component = $class->SUPER::new(@_);
-    # Add the product object as attribute only if the component exists.
-    $component->{product} = $product if ($component && $product);
-    return $component;
+  unshift @_, $param;
+  my $component = $class->SUPER::new(@_);
+
+  # Add the product object as attribute only if the component exists.
+  $component->{product} = $product if ($component && $product);
+  return $component;
 }
 
 sub create {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
+  my $class = shift;
+  my $dbh   = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    $class->check_required_create_fields(@_);
-    my $params = $class->run_create_validators(@_);
-    my $cc_list = delete $params->{initial_cc};
-    my $create_series = delete $params->{create_series};
-    my $product = delete $params->{product};
-    $params->{product_id} = $product->id;
+  $class->check_required_create_fields(@_);
+  my $params        = $class->run_create_validators(@_);
+  my $cc_list       = delete $params->{initial_cc};
+  my $create_series = delete $params->{create_series};
+  my $product       = delete $params->{product};
+  $params->{product_id} = $product->id;
 
-    my $component = $class->insert_create_data($params);
-    $component->{product} = $product;
+  my $component = $class->insert_create_data($params);
+  $component->{product} = $product;
 
-    # We still have to fill the component_cc table.
-    $component->_update_cc_list($cc_list) if $cc_list;
+  # We still have to fill the component_cc table.
+  $component->_update_cc_list($cc_list) if $cc_list;
 
-    # Create series for the new component.
-    $component->_create_series() if $create_series;
+  # Create series for the new component.
+  $component->_create_series() if $create_series;
 
-    $dbh->bz_commit_transaction();
-    return $component;
+  $dbh->bz_commit_transaction();
+  return $component;
 }
 
 sub update {
-    my $self = shift;
-    my $changes = $self->SUPER::update(@_);
-
-    # Update the component_cc table if necessary.
-    if (defined $self->{cc_ids}) {
-        my $diff = $self->_update_cc_list($self->{cc_ids});
-        $changes->{cc_list} = $diff if defined $diff;
-    }
-    return $changes;
+  my $self    = shift;
+  my $changes = $self->SUPER::update(@_);
+
+  # Update the component_cc table if necessary.
+  if (defined $self->{cc_ids}) {
+    my $diff = $self->_update_cc_list($self->{cc_ids});
+    $changes->{cc_list} = $diff if defined $diff;
+  }
+  return $changes;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    $self->_check_if_controller(); # From ChoiceInterface
+  $self->_check_if_controller();    # From ChoiceInterface
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    # Products must have at least one component.
-    if (scalar(@{$self->product->components}) == 1) {
-        ThrowUserError('component_is_last', { comp => $self });
-    }
+  # Products must have at least one component.
+  my @components = @{$self->product->components};
+  if (scalar(@components) == 1) {
+    ThrowUserError('component_is_last', {comp => $self});
+  }
+
+  if ($self->bug_count) {
+    if (Bugzilla->params->{'allowbugdeletion'}) {
+      require Bugzilla::Bug;
+      foreach my $bug_id (@{$self->bug_ids}) {
 
-    if ($self->bug_count) {
-        if (Bugzilla->params->{'allowbugdeletion'}) {
-            require Bugzilla::Bug;
-            foreach my $bug_id (@{$self->bug_ids}) {
-                # Note: We allow admins to delete bugs even if they can't
-                # see them, as long as they can see the product.
-                my $bug = new Bugzilla::Bug($bug_id);
-                $bug->remove_from_db();
-            }
-        } else {
-            ThrowUserError('component_has_bugs', {nb => $self->bug_count});
-        }
+        # Note: We allow admins to delete bugs even if they can't
+        # see them, as long as they can see the product.
+        my $bug = new Bugzilla::Bug($bug_id);
+        $bug->remove_from_db();
+      }
     }
-    $self->SUPER::remove_from_db();
+    else {
+      ThrowUserError('component_has_bugs', {nb => $self->bug_count});
+    }
+  }
+
+  # Update the list of components in the product object.
+  $self->product->{components} = [grep { $_->id != $self->id } @components];
+  $self->SUPER::remove_from_db();
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 }
 
 ################################
@@ -175,69 +175,70 @@ sub remove_from_db {
 ################################
 
 sub _check_name {
-    my ($invocant, $name, undef, $params) = @_;
-    my $product = blessed($invocant) ? $invocant->product : $params->{product};
-
-    $name = trim($name);
-    $name || ThrowUserError('component_blank_name');
-
-    if (length($name) > MAX_COMPONENT_SIZE) {
-        ThrowUserError('component_name_too_long', {'name' => $name});
-    }
-
-    my $component = new Bugzilla::Component({product => $product, name => $name});
-    if ($component && (!ref $invocant || $component->id != $invocant->id)) {
-        ThrowUserError('component_already_exists', { name    => $component->name,
-                                                     product => $product });
-    }
-    return $name;
+  my ($invocant, $name, undef, $params) = @_;
+  my $product = blessed($invocant) ? $invocant->product : $params->{product};
+
+  $name = trim($name);
+  $name || ThrowUserError('component_blank_name');
+
+  if (length($name) > MAX_COMPONENT_SIZE) {
+    ThrowUserError('component_name_too_long', {'name' => $name});
+  }
+
+  my $component = new Bugzilla::Component({product => $product, name => $name});
+  if ($component && (!ref $invocant || $component->id != $invocant->id)) {
+    ThrowUserError('component_already_exists',
+      {name => $component->name, product => $product});
+  }
+  return $name;
 }
 
 sub _check_description {
-    my ($invocant, $description) = @_;
+  my ($invocant, $description) = @_;
 
-    $description = trim($description);
-    $description || ThrowUserError('component_blank_description');
-    return $description;
+  $description = trim($description);
+  $description || ThrowUserError('component_blank_description');
+  return $description;
 }
 
 sub _check_initialowner {
-    my ($invocant, $owner) = @_;
+  my ($invocant, $owner) = @_;
 
-    $owner || ThrowUserError('component_need_initialowner');
-    my $owner_id = Bugzilla::User->check($owner)->id;
-    return $owner_id;
+  $owner || ThrowUserError('component_need_initialowner');
+  my $owner_id = Bugzilla::User->check($owner)->id;
+  return $owner_id;
 }
 
 sub _check_initialqacontact {
-    my ($invocant, $qa_contact) = @_;
-
-    my $qa_contact_id;
-    if (Bugzilla->params->{'useqacontact'}) {
-        $qa_contact_id = Bugzilla::User->check($qa_contact)->id if $qa_contact;
-    }
-    elsif (ref $invocant) {
-        $qa_contact_id = $invocant->{initialqacontact};
-    }
-    return $qa_contact_id;
+  my ($invocant, $qa_contact) = @_;
+
+  my $qa_contact_id;
+  if (Bugzilla->params->{'useqacontact'}) {
+    $qa_contact_id = Bugzilla::User->check($qa_contact)->id if $qa_contact;
+  }
+  elsif (ref $invocant) {
+    $qa_contact_id = $invocant->{initialqacontact};
+  }
+  return $qa_contact_id;
 }
 
 sub _check_product {
-    my ($invocant, $product) = @_;
-    $product || ThrowCodeError('param_required', 
-                    { function => "$invocant->create", param => 'product' });
-    return Bugzilla->user->check_can_admin_product($product->name);
+  my ($invocant, $product) = @_;
+  $product
+    || ThrowCodeError('param_required',
+    {function => "$invocant->create", param => 'product'});
+  return Bugzilla->user->check_can_admin_product($product->name);
 }
 
 sub _check_cc_list {
-    my ($invocant, $cc_list) = @_;
-
-    my %cc_ids;
-    foreach my $cc (@$cc_list) {
-        my $id = login_to_id($cc, THROW_ERROR);
-        $cc_ids{$id} = 1;
-    }
-    return [keys %cc_ids];
+  my ($invocant, $cc_list) = @_;
+
+  my %cc_ids;
+  foreach my $cc (@$cc_list) {
+    my $id = login_to_id($cc, THROW_ERROR);
+    $cc_ids{$id} = 1;
+  }
+  return [keys %cc_ids];
 }
 
 ###############################
@@ -245,156 +246,176 @@ sub _check_cc_list {
 ###############################
 
 sub _update_cc_list {
-    my ($self, $cc_list) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self, $cc_list) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my $old_cc_list =
-      $dbh->selectcol_arrayref('SELECT user_id FROM component_cc
-                                WHERE component_id = ?', undef, $self->id);
+  my $old_cc_list = $dbh->selectcol_arrayref(
+    'SELECT user_id FROM component_cc
+                                WHERE component_id = ?', undef, $self->id
+  );
 
-    my ($removed, $added) = diff_arrays($old_cc_list, $cc_list);
-    my $diff;
-    if (scalar @$removed || scalar @$added) {
-        $diff = [join(', ', @$removed), join(', ', @$added)];
-    }
+  my ($removed, $added) = diff_arrays($old_cc_list, $cc_list);
+  my $diff;
+  if (scalar @$removed || scalar @$added) {
+    $diff = [join(', ', @$removed), join(', ', @$added)];
+  }
 
-    $dbh->do('DELETE FROM component_cc WHERE component_id = ?', undef, $self->id);
+  $dbh->do('DELETE FROM component_cc WHERE component_id = ?', undef, $self->id);
 
-    my $sth = $dbh->prepare('INSERT INTO component_cc
-                             (user_id, component_id) VALUES (?, ?)');
-    $sth->execute($_, $self->id) foreach (@$cc_list);
+  my $sth = $dbh->prepare(
+    'INSERT INTO component_cc
+                             (user_id, component_id) VALUES (?, ?)'
+  );
+  $sth->execute($_, $self->id) foreach (@$cc_list);
 
-    return $diff;
+  return $diff;
 }
 
 sub _create_series {
-    my $self = shift;
-
-    # Insert default charting queries for this product.
-    # If they aren't using charting, this won't do any harm.
-    my $prodcomp = "&product="   . url_quote($self->product->name) .
-                   "&component=" . url_quote($self->name);
-
-    my $open_query = 'field0-0-0=resolution&type0-0-0=notregexp&value0-0-0=.' .
-                     $prodcomp;
-    my $nonopen_query = 'field0-0-0=resolution&type0-0-0=regexp&value0-0-0=.' .
-                        $prodcomp;
-
-    my @series = ([get_text('series_all_open'), $open_query],
-                  [get_text('series_all_closed'), $nonopen_query]);
-
-    foreach my $sdata (@series) {
-        my $series = new Bugzilla::Series(undef, $self->product->name,
-                                          $self->name, $sdata->[0],
-                                          Bugzilla->user->id, 1, $sdata->[1], 1);
-        $series->writeToDatabase();
-    }
+  my $self = shift;
+
+  # Insert default charting queries for this product.
+  # If they aren't using charting, this won't do any harm.
+  my $prodcomp
+    = "&product="
+    . url_quote($self->product->name)
+    . "&component="
+    . url_quote($self->name);
+
+  my $open_query
+    = 'field0-0-0=resolution&type0-0-0=notregexp&value0-0-0=.' . $prodcomp;
+  my $nonopen_query
+    = 'field0-0-0=resolution&type0-0-0=regexp&value0-0-0=.' . $prodcomp;
+
+  my @series = (
+    [get_text('series_all_open'),   $open_query],
+    [get_text('series_all_closed'), $nonopen_query]
+  );
+
+  foreach my $sdata (@series) {
+    my $series
+      = new Bugzilla::Series(undef, $self->product->name, $self->name, $sdata->[0],
+      Bugzilla->user->id, 1, $sdata->[1], 1);
+    $series->writeToDatabase();
+  }
 }
 
-sub set_name { $_[0]->set('name', $_[1]); }
+sub set_name        { $_[0]->set('name',        $_[1]); }
 sub set_description { $_[0]->set('description', $_[1]); }
-sub set_is_active { $_[0]->set('isactive', $_[1]); }
+sub set_is_active   { $_[0]->set('isactive',    $_[1]); }
+
 sub set_default_assignee {
-    my ($self, $owner) = @_;
+  my ($self, $owner) = @_;
+
+  $self->set('initialowner', $owner);
 
-    $self->set('initialowner', $owner);
-    # Reset the default owner object.
-    delete $self->{default_assignee};
+  # Reset the default owner object.
+  delete $self->{default_assignee};
 }
+
 sub set_default_qa_contact {
-    my ($self, $qa_contact) = @_;
+  my ($self, $qa_contact) = @_;
 
-    $self->set('initialqacontact', $qa_contact);
-    # Reset the default QA contact object.
-    delete $self->{default_qa_contact};
+  $self->set('initialqacontact', $qa_contact);
+
+  # Reset the default QA contact object.
+  delete $self->{default_qa_contact};
 }
+
 sub set_cc_list {
-    my ($self, $cc_list) = @_;
+  my ($self, $cc_list) = @_;
 
-    $self->{cc_ids} = $self->_check_cc_list($cc_list);
-    # Reset the list of CC user objects.
-    delete $self->{initial_cc};
+  $self->{cc_ids} = $self->_check_cc_list($cc_list);
+
+  # Reset the list of CC user objects.
+  delete $self->{initial_cc};
 }
 
 sub bug_count {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{'bug_count'}) {
-        $self->{'bug_count'} = $dbh->selectrow_array(q{
+  if (!defined $self->{'bug_count'}) {
+    $self->{'bug_count'} = $dbh->selectrow_array(
+      q{
             SELECT COUNT(*) FROM bugs
-            WHERE component_id = ?}, undef, $self->id) || 0;
-    }
-    return $self->{'bug_count'};
+            WHERE component_id = ?}, undef, $self->id
+    ) || 0;
+  }
+  return $self->{'bug_count'};
 }
 
 sub bug_ids {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{'bugs_ids'}) {
-        $self->{'bugs_ids'} = $dbh->selectcol_arrayref(q{
+  if (!defined $self->{'bugs_ids'}) {
+    $self->{'bugs_ids'} = $dbh->selectcol_arrayref(
+      q{
             SELECT bug_id FROM bugs
-            WHERE component_id = ?}, undef, $self->id);
-    }
-    return $self->{'bugs_ids'};
+            WHERE component_id = ?}, undef, $self->id
+    );
+  }
+  return $self->{'bugs_ids'};
 }
 
 sub default_assignee {
-    my $self = shift;
+  my $self = shift;
 
-    return $self->{'default_assignee'}
-      ||= new Bugzilla::User({ id => $self->{'initialowner'}, cache => 1 });
+  return $self->{'default_assignee'}
+    ||= new Bugzilla::User({id => $self->{'initialowner'}, cache => 1});
 }
 
 sub default_qa_contact {
-    my $self = shift;
+  my $self = shift;
 
-    return unless $self->{'initialqacontact'};
-    return $self->{'default_qa_contact'}
-      ||= new Bugzilla::User({id => $self->{'initialqacontact'}, cache => 1 });
+  return unless $self->{'initialqacontact'};
+  return $self->{'default_qa_contact'}
+    ||= new Bugzilla::User({id => $self->{'initialqacontact'}, cache => 1});
 }
 
 sub flag_types {
-    my $self = shift;
-
-    if (!defined $self->{'flag_types'}) {
-        my $flagtypes = Bugzilla::FlagType::match({ product_id   => $self->product_id,
-                                                    component_id => $self->id });
-
-        $self->{'flag_types'} = {};
-        $self->{'flag_types'}->{'bug'} =
-          [grep { $_->target_type eq 'bug' } @$flagtypes];
-        $self->{'flag_types'}->{'attachment'} =
-          [grep { $_->target_type eq 'attachment' } @$flagtypes];
-    }
-    return $self->{'flag_types'};
+  my $self = shift;
+
+  if (!defined $self->{'flag_types'}) {
+    my $flagtypes = Bugzilla::FlagType::match(
+      {product_id => $self->product_id, component_id => $self->id});
+
+    $self->{'flag_types'} = {};
+    $self->{'flag_types'}->{'bug'}
+      = [grep { $_->target_type eq 'bug' } @$flagtypes];
+    $self->{'flag_types'}->{'attachment'}
+      = [grep { $_->target_type eq 'attachment' } @$flagtypes];
+  }
+  return $self->{'flag_types'};
 }
 
 sub initial_cc {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    if (!defined $self->{'initial_cc'}) {
-        # If set_cc_list() has been called but data are not yet written
-        # into the DB, we want the new values defined by it.
-        my $cc_ids = $self->{cc_ids}
-                     || $dbh->selectcol_arrayref('SELECT user_id FROM component_cc
-                                                  WHERE component_id = ?',
-                                                  undef, $self->id);
-
-        $self->{'initial_cc'} = Bugzilla::User->new_from_list($cc_ids);
-    }
-    return $self->{'initial_cc'};
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  if (!defined $self->{'initial_cc'}) {
+
+    # If set_cc_list() has been called but data are not yet written
+    # into the DB, we want the new values defined by it.
+    my $cc_ids = $self->{cc_ids} || $dbh->selectcol_arrayref(
+      'SELECT user_id FROM component_cc
+                                                  WHERE component_id = ?', undef,
+      $self->id
+    );
+
+    $self->{'initial_cc'} = Bugzilla::User->new_from_list($cc_ids);
+  }
+  return $self->{'initial_cc'};
 }
 
 sub product {
-    my $self = shift;
-    if (!defined $self->{'product'}) {
-        require Bugzilla::Product; # We cannot |use| it.
-        $self->{'product'} = new Bugzilla::Product($self->product_id);
-    }
-    return $self->{'product'};
+  my $self = shift;
+
+  require Bugzilla::Product;
+  $self->{'product'}
+    ||= Bugzilla::Product->new({id => $self->product_id, cache => 1});
+  return $self->{'product'};
 }
 
 ###############################
@@ -402,8 +423,8 @@ sub product {
 ###############################
 
 sub description { return $_[0]->{'description'}; }
-sub product_id  { return $_[0]->{'product_id'};  }
-sub is_active   { return $_[0]->{'isactive'};    }
+sub product_id  { return $_[0]->{'product_id'}; }
+sub is_active   { return $_[0]->{'isactive'}; }
 
 ##############################################
 # Implement Bugzilla::Field::ChoiceInterface #
@@ -413,11 +434,11 @@ use constant FIELD_NAME => 'component';
 use constant is_default => 0;
 
 sub is_set_on_bug {
-    my ($self, $bug) = @_;
-    my $value = blessed($bug) ? $bug->component_id : $bug->{component};
-    $value = $value->id if blessed($value);
-    return 0 unless $value;
-    return $value == $self->id ? 1 : 0;
+  my ($self, $bug) = @_;
+  my $value = blessed($bug) ? $bug->component_id : $bug->{component};
+  $value = $value->id if blessed($value);
+  return 0 unless $value;
+  return $value == $self->id ? 1 : 0;
 }
 
 ###############################
diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index fdbedbdc04..378b7bd9f3 100644
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,339 +16,342 @@ use autodie qw(:default);
 
 use Bugzilla::Constants;
 use Bugzilla::Hook;
-use Bugzilla::Util qw(trick_taint);
+use Bugzilla::Install::Util qw(i_am_persistent);
+use Bugzilla::Util qw(trick_taint read_text write_text);
 
 use JSON::XS;
-use File::Slurp;
 use File::Temp;
 use File::Basename;
 
 # Don't export localvars by default - people should have to explicitly
 # ask for it, as a (probably futile) attempt to stop code using it
 # when it shouldn't
-%Bugzilla::Config::EXPORT_TAGS =
-  (
-   admin => [qw(update_params SetParam write_params)],
-  );
+%Bugzilla::Config::EXPORT_TAGS = (
+  admin => [
+    qw(update_params
+      SetParam
+      call_param_onchange_handlers
+      write_params)
+  ],
+);
 Exporter::export_ok_tags('admin');
 
+# new installs get these set of defaults (unless overridden by the answers file)
+my %NEW_INSTALL_DEFAULT = (or_groups => 1, use_email_as_login => 0,);
+
 # INITIALISATION CODE
 # Perl throws a warning if we use bz_locations() directly after do.
 our %params;
+
 # Load in the param definitions
 sub _load_params {
-    my $panels = param_panels();
-    my %hook_panels;
-    foreach my $panel (keys %$panels) {
-        my $module = $panels->{$panel};
-        eval("require $module") || die $@;
-        my @new_param_list = $module->get_param_list();
-        $hook_panels{lc($panel)} = { params => \@new_param_list };
-    }
-    # This hook is also called in editparams.cgi. This call here is required
-    # to make SetParam work.
-    Bugzilla::Hook::process('config_modify_panels', 
-                            { panels => \%hook_panels });
-
-    foreach my $panel (keys %hook_panels) {
-        foreach my $item (@{$hook_panels{$panel}->{params}}) {
-            $params{$item->{'name'}} = $item;
-        }
+  my $panels = param_panels();
+  my %hook_panels;
+  foreach my $panel (keys %$panels) {
+    my $module = $panels->{$panel};
+    eval("require $module") || die $@;
+    my @new_param_list = $module->get_param_list();
+    $hook_panels{lc($panel)} = {params => \@new_param_list};
+  }
+
+  # This hook is also called in editparams.cgi. This call here is required
+  # to make SetParam work.
+  Bugzilla::Hook::process('config_modify_panels', {panels => \%hook_panels});
+
+  foreach my $panel (keys %hook_panels) {
+    foreach my $item (@{$hook_panels{$panel}->{params}}) {
+      $params{$item->{'name'}} = $item;
     }
+  }
 }
+
 # END INIT CODE
 
 # Subroutines go here
 
 sub param_panels {
-    my $param_panels = {};
-    my $libpath = bz_locations()->{'libpath'};
-    foreach my $item ((glob "$libpath/Bugzilla/Config/*.pm")) {
-        $item =~ m#/([^/]+)\.pm$#;
-        my $module = $1;
-        $param_panels->{$module} = "Bugzilla::Config::$module" unless $module eq 'Common';
-    }
-    # Now check for any hooked params
-    Bugzilla::Hook::process('config_add_panels', 
-                            { panel_modules => $param_panels });
-    return $param_panels;
+  my $param_panels = {};
+  my $libpath      = bz_locations()->{'libpath'};
+  foreach my $item ((glob "$libpath/Bugzilla/Config/*.pm")) {
+    $item =~ m#/([^/]+)\.pm$#;
+    my $module = $1;
+    $param_panels->{$module} = "Bugzilla::Config::$module"
+      unless $module eq 'Common';
+  }
+
+  # Now check for any hooked params
+  Bugzilla::Hook::process('config_add_panels', {panel_modules => $param_panels});
+  return $param_panels;
 }
 
 sub SetParam {
-    my ($name, $value) = @_;
+  my ($name, $value) = @_;
 
-    _load_params unless %params;
-    die "Unknown param $name" unless (exists $params{$name});
+  _load_params() unless %params;
+  die "Unknown param $name" unless (exists $params{$name});
 
-    my $entry = $params{$name};
+  my $entry = $params{$name};
 
-    # sanity check the value
+  # sanity check the value
 
-    # XXX - This runs the checks. Which would be good, except that
-    # check_shadowdb creates the database as a side effect, and so the
-    # checker fails the second time around...
-    if ($name ne 'shadowdb' && exists $entry->{'checker'}) {
-        my $err = $entry->{'checker'}->($value, $entry);
-        die "Param $name is not valid: $err" unless $err eq '';
-    }
+  # XXX - This runs the checks. Which would be good, except that
+  # check_shadowdb creates the database as a side effect, and so the
+  # checker fails the second time around...
+  if ($name ne 'shadowdb' && exists $entry->{'checker'}) {
+    my $err = $entry->{'checker'}->($value, $entry);
+    die "Param $name is not valid: $err" unless $err eq '';
+  }
 
-    Bugzilla->params->{$name} = $value;
+  Bugzilla->params->{$name} = $value;
 }
 
-sub update_params {
-    my ($params) = @_;
-    my $answer = Bugzilla->installation_answers;
-    my $datadir = bz_locations()->{'datadir'};
-    my $param;
-
-    # If the old data/params file using Data::Dumper output still exists,
-    # read it. It will be deleted once the parameters are stored in the new
-    # data/params.json file.
-    my $old_file = "$datadir/params";
-
-    if (-e $old_file) {
-        require Safe;
-        my $s = new Safe;
-
-        $s->rdo($old_file);
-        die "Error reading $old_file: $!" if $!;
-        die "Error evaluating $old_file: $@" if $@;
-
-        # Now read the param back out from the sandbox.
-        $param = \%{ $s->varglob('param') };
-    }
-    else {
-        # Rename params.js to params.json if checksetup.pl
-        # was executed with an earlier version of this change
-        rename "$old_file.js", "$old_file.json"
-            if -e "$old_file.js" && !-e "$old_file.json";
-
-        # Read the new data/params.json file.
-        $param = read_param_file();
-    }
-
-    my %new_params;
-
-    # If we didn't return any param values, then this is a new installation.
-    my $new_install = !(keys %$param);
+sub call_param_onchange_handlers {
+  my ($changes) = @_;
 
-    # --- UPDATE OLD PARAMS ---
+  _load_params() unless %params;
 
-    # Change from usebrowserinfo to defaultplatform/defaultopsys combo
-    if (exists $param->{'usebrowserinfo'}) {
-        if (!$param->{'usebrowserinfo'}) {
-            if (!exists $param->{'defaultplatform'}) {
-                $new_params{'defaultplatform'} = 'Other';
-            }
-            if (!exists $param->{'defaultopsys'}) {
-                $new_params{'defaultopsys'} = 'Other';
-            }
-        }
-    }
-
-    # Change from a boolean for quips to multi-state
-    if (exists $param->{'usequip'} && !exists $param->{'enablequips'}) {
-        $new_params{'enablequips'} = $param->{'usequip'} ? 'on' : 'off';
-    }
-
-    # Change from old product groups to controls for group_control_map
-    # 2002-10-14 bug 147275 bugreport@peshkin.net
-    if (exists $param->{'usebuggroups'} && 
-        !exists $param->{'makeproductgroups'}) 
-    {
-        $new_params{'makeproductgroups'} = $param->{'usebuggroups'};
-    }
-
-    # Modularise auth code
-    if (exists $param->{'useLDAP'} && !exists $param->{'loginmethod'}) {
-        $new_params{'loginmethod'} = $param->{'useLDAP'} ? "LDAP" : "DB";
-    }
-
-    # set verify method to whatever loginmethod was
-    if (exists $param->{'loginmethod'} 
-        && !exists $param->{'user_verify_class'}) 
-    {
-        $new_params{'user_verify_class'} = $param->{'loginmethod'};
-    }
-
-    # Remove quip-display control from parameters
-    # and give it to users via User Settings (Bug 41972)
-    if ( exists $param->{'enablequips'} 
-         && !exists $param->{'quip_list_entry_control'}) 
-    {
-        my $new_value;
-        ($param->{'enablequips'} eq 'on')       && do {$new_value = 'open';};
-        ($param->{'enablequips'} eq 'approved') && do {$new_value = 'moderated';};
-        ($param->{'enablequips'} eq 'frozen')   && do {$new_value = 'closed';};
-        ($param->{'enablequips'} eq 'off')      && do {$new_value = 'closed';};
-        $new_params{'quip_list_entry_control'} = $new_value;
-    }
-
-    # Old mail_delivery_method choices contained no uppercase characters
-    my $mta = $param->{'mail_delivery_method'};
-    if ($mta) {
-        if ($mta !~ /[A-Z]/) {
-            my %translation = (
-                'sendmail' => 'Sendmail',
-                'smtp'     => 'SMTP',
-                'qmail'    => 'Qmail',
-                'testfile' => 'Test',
-                'none'     => 'None');
-            $param->{'mail_delivery_method'} = $translation{$mta};
-        }
-        # This will force the parameter to be reset to its default value.
-        delete $param->{'mail_delivery_method'} if $param->{'mail_delivery_method'} eq 'Qmail';
+  foreach my $name (@$changes) {
+    my $param = $params{$name};
+    if (exists $param->{'onchange'}) {
+      $param->{'onchange'}->(Bugzilla->params->{$name});
     }
+  }
+}
 
-    # Convert the old "ssl" parameter to the new "ssl_redirect" parameter.
-    # Both "authenticated sessions" and "always" turn on "ssl_redirect"
-    # when upgrading.
-    if (exists $param->{'ssl'} and $param->{'ssl'} ne 'never') {
-        $new_params{'ssl_redirect'} = 1;
+sub update_params {
+  my ($params) = @_;
+  my $answer   = Bugzilla->installation_answers;
+  my $datadir  = bz_locations()->{'datadir'};
+  my $param;
+
+  # If the old data/params file using Data::Dumper output still exists,
+  # read it. It will be deleted once the parameters are stored in the new
+  # data/params.json file.
+  my $old_file = "$datadir/params";
+
+  if (-e $old_file) {
+    require Safe;
+    my $s = new Safe;
+
+    $s->rdo($old_file);
+    die "Error reading $old_file: $!"    if $!;
+    die "Error evaluating $old_file: $@" if $@;
+
+    # Now read the param back out from the sandbox.
+    $param = \%{$s->varglob('param')};
+  }
+  else {
+    # Rename params.js to params.json if checksetup.pl
+    # was executed with an earlier version of this change
+    rename "$old_file.js", "$old_file.json"
+      if -e "$old_file.js" && !-e "$old_file.json";
+
+    # Read the new data/params.json file.
+    $param = read_param_file();
+  }
+
+  my %new_params;
+
+  # If we didn't return any param values, then this is a new installation.
+  my $new_install = !(keys %$param);
+
+  # --- UPDATE OLD PARAMS ---
+
+  # Change from usebrowserinfo to defaultplatform/defaultopsys combo
+  if (exists $param->{'usebrowserinfo'}) {
+    if (!$param->{'usebrowserinfo'}) {
+      if (!exists $param->{'defaultplatform'}) {
+        $new_params{'defaultplatform'} = 'Other';
+      }
+      if (!exists $param->{'defaultopsys'}) {
+        $new_params{'defaultopsys'} = 'Other';
+      }
     }
-
-    # "specific_search_allow_empty_words" has been renamed to "search_allow_no_criteria".
-    if (exists $param->{'specific_search_allow_empty_words'}) {
-        $new_params{'search_allow_no_criteria'} = $param->{'specific_search_allow_empty_words'};
+  }
+
+  # Change from a boolean for quips to multi-state
+  if (exists $param->{'usequip'} && !exists $param->{'enablequips'}) {
+    $new_params{'enablequips'} = $param->{'usequip'} ? 'on' : 'off';
+  }
+
+  # Modularise auth code
+  if (exists $param->{'useLDAP'} && !exists $param->{'loginmethod'}) {
+    $new_params{'loginmethod'} = $param->{'useLDAP'} ? "LDAP" : "DB";
+  }
+
+  # set verify method to whatever loginmethod was
+  if (exists $param->{'loginmethod'} && !exists $param->{'user_verify_class'}) {
+    $new_params{'user_verify_class'} = $param->{'loginmethod'};
+  }
+
+  # Remove quip-display control from parameters
+  # and give it to users via User Settings (Bug 41972)
+  if (exists $param->{'enablequips'}
+    && !exists $param->{'quip_list_entry_control'})
+  {
+    my $new_value;
+    ($param->{'enablequips'} eq 'on')       && do { $new_value = 'open'; };
+    ($param->{'enablequips'} eq 'approved') && do { $new_value = 'moderated'; };
+    ($param->{'enablequips'} eq 'frozen')   && do { $new_value = 'closed'; };
+    ($param->{'enablequips'} eq 'off')      && do { $new_value = 'closed'; };
+    $new_params{'quip_list_entry_control'} = $new_value;
+  }
+
+  # Old mail_delivery_method choices contained no uppercase characters
+  my $mta = $param->{'mail_delivery_method'};
+  if ($mta) {
+    if ($mta !~ /[A-Z]/) {
+      my %translation = (
+        'sendmail' => 'Sendmail',
+        'smtp'     => 'SMTP',
+        'qmail'    => 'Qmail',
+        'testfile' => 'Test',
+        'none'     => 'None'
+      );
+      $param->{'mail_delivery_method'} = $translation{$mta};
     }
 
-    # --- DEFAULTS FOR NEW PARAMS ---
-
-    _load_params unless %params;
-    foreach my $name (keys %params) {
-        my $item = $params{$name};
-        unless (exists $param->{$name}) {
-            print "New parameter: $name\n" unless $new_install;
-            if (exists $new_params{$name}) {
-                $param->{$name} = $new_params{$name};
-            }
-            elsif (exists $answer->{$name}) {
-                $param->{$name} = $answer->{$name};
-            }
-            else {
-                $param->{$name} = $item->{'default'};
-            }
-        }
+    # This will force the parameter to be reset to its default value.
+    delete $param->{'mail_delivery_method'}
+      if $param->{'mail_delivery_method'} eq 'Qmail';
+  }
+
+  # Convert the old "ssl" parameter to the new "ssl_redirect" parameter.
+  # Both "authenticated sessions" and "always" turn on "ssl_redirect"
+  # when upgrading.
+  if (exists $param->{'ssl'} and $param->{'ssl'} ne 'never') {
+    $new_params{'ssl_redirect'} = 1;
+  }
+
+# "specific_search_allow_empty_words" has been renamed to "search_allow_no_criteria".
+  if (exists $param->{'specific_search_allow_empty_words'}) {
+    $new_params{'search_allow_no_criteria'}
+      = $param->{'specific_search_allow_empty_words'};
+  }
+
+  if (exists $param->{'noresolveonopenblockers'}) {
+    $new_params{'resolution_forbidden_with_open_blockers'}
+      = $param->{'noresolveonopenblockers'} ? 'FIXED' : "";
+  }
+
+  # --- DEFAULTS FOR NEW PARAMS ---
+
+  _load_params() unless %params;
+  foreach my $name (keys %params) {
+    my $item = $params{$name};
+    unless (exists $param->{$name}) {
+      print "New parameter: $name\n" unless $new_install;
+      if (exists $new_params{$name}) {
+        $param->{$name} = $new_params{$name};
+      }
+      elsif (exists $answer->{$name}) {
+        $param->{$name} = $answer->{$name};
+      }
+      elsif ($new_install and exists $NEW_INSTALL_DEFAULT{$name}) {
+        $param->{$name} = $NEW_INSTALL_DEFAULT{$name};
+      }
+      else {
+        $param->{$name} = $item->{'default'};
+      }
     }
+  }
 
-    $param->{'utf8'} = 1 if $new_install;
-
-    # Bug 452525: OR based groups are on by default for new installations
-    $param->{'or_groups'} = 1 if $new_install;
+  # --- REMOVE OLD PARAMS ---
 
-    # --- REMOVE OLD PARAMS ---
+  my %oldparams;
 
-    my %oldparams;
-    # Remove any old params
-    foreach my $item (keys %$param) {
-        if (!exists $params{$item}) {
-            $oldparams{$item} = delete $param->{$item};
-        }
+  # Remove any old params
+  foreach my $item (keys %$param) {
+    if (!exists $params{$item}) {
+      $oldparams{$item} = delete $param->{$item};
     }
-
-    # Write any old parameters to old-params.txt
-    my $old_param_file = "$datadir/old-params.txt";
-    if (scalar(keys %oldparams)) {
-        my $op_file = new IO::File($old_param_file, '>>', 0600)
-          || die "Couldn't create $old_param_file: $!";
-
-        print "The following parameters are no longer used in Bugzilla,",
-              " and so have been\nmoved from your parameters file into",
-              " $old_param_file:\n";
-
-        my $comma = "";
-        foreach my $item (keys %oldparams) {
-            print $op_file "\n\n$item:\n" . $oldparams{$item} . "\n";
-            print "${comma}$item";
-            $comma = ", ";
-        }
-        print "\n";
-        $op_file->close;
-    }
-
-    if (ON_WINDOWS && !-e SENDMAIL_EXE
-        && $param->{'mail_delivery_method'} eq 'Sendmail')
-    {
-        my $smtp = $answer->{'SMTP_SERVER'};
-        if (!$smtp) {
-            print "\nBugzilla requires an SMTP server to function on",
-                  " Windows.\nPlease enter your SMTP server's hostname: ";
-            $smtp = <STDIN>;
-            chomp $smtp;
-            if ($smtp) {
-                $param->{'smtpserver'} = $smtp;
-             }
-             else {
-                print "\nWarning: No SMTP Server provided, defaulting to",
-                      " localhost\n";
-            }
-        }
-
-        $param->{'mail_delivery_method'} = 'SMTP';
+  }
+
+  # Write any old parameters to old-params.txt
+  my $old_param_file = "$datadir/old-params.txt";
+  if (scalar(keys %oldparams)) {
+    my $op_file = new IO::File($old_param_file, '>>', 0600)
+      || die "Couldn't create $old_param_file: $!";
+
+    print "The following parameters are no longer used in Bugzilla,",
+      " and so have been\nmoved from your parameters file into",
+      " $old_param_file:\n";
+
+    my $comma = "";
+    foreach my $item (keys %oldparams) {
+      print $op_file "\n\n$item:\n" . $oldparams{$item} . "\n";
+      print "${comma}$item";
+      $comma = ", ";
     }
+    print "\n";
+    $op_file->close;
+  }
 
-    write_params($param);
+  write_params($param);
 
-    if (-e $old_file) {
-        unlink $old_file;
-        say "$old_file has been converted into $old_file.json, using the JSON format.";
-    }
+  if (-e $old_file) {
+    unlink $old_file;
+    say "$old_file has been converted into $old_file.json, using the JSON format.";
+  }
 
-    # Return deleted params and values so that checksetup.pl has a chance
-    # to convert old params to new data.
-    return %oldparams;
+  # Return deleted params and values so that checksetup.pl has a chance
+  # to convert old params to new data.
+  return %oldparams;
 }
 
 sub write_params {
-    my ($param_data) = @_;
-    $param_data ||= Bugzilla->params;
-    my $param_file = bz_locations()->{'datadir'} . '/params.json';
+  my ($param_data) = @_;
+  $param_data ||= Bugzilla->params;
+  my $param_file = bz_locations()->{'datadir'} . '/params.json';
 
-    my $json_data = JSON::XS->new->canonical->pretty->encode($param_data);
-    write_file($param_file, { binmode => ':utf8', atomic => 1 }, \$json_data);
+  my $json_data = JSON::XS->new->canonical->pretty->encode($param_data);
+  write_text($param_file, $json_data);
 
-    # It's not common to edit parameters and loading
-    # Bugzilla::Install::Filesystem is slow.
-    require Bugzilla::Install::Filesystem;
-    Bugzilla::Install::Filesystem::fix_file_permissions($param_file);
+  # It's not common to edit parameters and loading
+  # Bugzilla::Install::Filesystem is slow.
+  require Bugzilla::Install::Filesystem;
+  Bugzilla::Install::Filesystem::fix_file_permissions($param_file);
 
-    # And now we have to reset the params cache so that Bugzilla will re-read
-    # them.
-    delete Bugzilla->request_cache->{params};
+  # And now we have to reset the params cache so that Bugzilla will re-read
+  # them.
+  delete Bugzilla->request_cache->{params};
 }
 
 sub read_param_file {
-    my %params;
-    my $file = bz_locations()->{'datadir'} . '/params.json';
-
-    if (-e $file) {
-        my $data;
-        read_file($file, binmode => ':utf8', buf_ref => \$data);
-
-        # If params.json has been manually edited and e.g. some quotes are
-        # missing, we don't want JSON::XS to leak the content of the file
-        # to all users in its error message, so we have to eval'uate it.
-        %params = eval { %{JSON::XS->new->decode($data)} };
-        if ($@) {
-            my $error_msg = (basename($0) eq 'checksetup.pl') ?
-                $@ : 'run checksetup.pl to see the details.';
-            die "Error parsing $file: $error_msg";
-        }
-        # JSON::XS doesn't detaint data for us.
-        trick_taint($params{$_}) foreach keys %params;
+  my $params;
+  my $file = bz_locations()->{'datadir'} . '/params.json';
+
+  if (-e $file) {
+    my $data = read_text($file);
+    trick_taint($data);
+
+    # If params.json has been manually edited and e.g. some quotes are
+    # missing, we don't want JSON::XS to leak the content of the file
+    # to all users in its error message, so we have to eval'uate it.
+    $params = eval { JSON::XS->new->decode($data) };
+    if ($@) {
+      my $error_msg
+        = (basename($0) eq 'checksetup.pl')
+        ? $@
+        : 'run checksetup.pl to see the details.';
+      die "Error parsing $file: $error_msg";
     }
-    elsif ($ENV{'SERVER_SOFTWARE'}) {
-       # We're in a CGI, but the params file doesn't exist. We can't
-       # Template Toolkit, or even install_string, since checksetup
-       # might not have thrown an error. Bugzilla::CGI->new
-       # hasn't even been called yet, so we manually use CGI::Carp here
-       # so that the user sees the error.
-       require CGI::Carp;
-       CGI::Carp->import('fatalsToBrowser');
-       die "The $file file does not exist."
-           . ' You probably need to run checksetup.pl.',
+  }
+  elsif ($ENV{'SERVER_SOFTWARE'}) {
+
+    # We're in a CGI, but the params file doesn't exist. We can't
+    # Template Toolkit, or even install_string, since checksetup
+    # might not have thrown an error. Bugzilla::CGI->new
+    # hasn't even been called yet, so we manually use CGI::Carp here
+    # so that the user sees the error.
+    unless (i_am_persistent()) {
+      require CGI::Carp;
+      CGI::Carp->import('fatalsToBrowser');
     }
-    return \%params;
+    die "The $file file does not exist."
+      . ' You probably need to run checksetup.pl.',;
+  }
+  return $params // {};
 }
 
 1;
@@ -366,6 +369,7 @@ Bugzilla::Config - Configuration parameters for Bugzilla
 
   update_params();
   SetParam($param, $value);
+  call_param_onchange_handlers(\@changes);
   write_params();
 
 =head1 DESCRIPTION
@@ -396,6 +400,16 @@ Prints out information about what it's doing, if it makes any changes.
 May prompt the user for input, if certain required parameters are not
 specified.
 
+=item C<call_param_onchange_handlers(\@changes)>
+
+Expects a list of parameter names.
+For each parameter, checks whether there is a change handler defined,
+and if so, calls it.
+
+Params:  C<\@changes> (required) - A list of parameter names.
+
+Returns: nothing
+
 =item C<write_params($params)>
 
 Description: Writes the parameters to disk.
diff --git a/Bugzilla/Config/Admin.pm b/Bugzilla/Config/Admin.pm
index 41d9292985..44173366f5 100644
--- a/Bugzilla/Config/Admin.pm
+++ b/Bugzilla/Config/Admin.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Admin;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,32 +16,21 @@ use Bugzilla::Config::Common;
 our $sortkey = 200;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'allowbugdeletion',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'allowemailchange',
-   type => 'b',
-   default => 1
-  },
-
-  {
-   name => 'allowuserdeletion',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'last_visit_keep_days',
-   type => 't',
-   default => 10,
-   checker => \&check_numeric
-  });
+    {name => 'allowbugdeletion', type => 'b', default => 0},
+
+    {name => 'allowemailchange', type => 'b', default => 1},
+
+    {name => 'allowuserdeletion', type => 'b', default => 0},
+
+    {
+      name    => 'last_visit_keep_days',
+      type    => 't',
+      default => 10,
+      checker => \&check_numeric
+    }
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Config/Advanced.pm b/Bugzilla/Config/Advanced.pm
index 8356c33610..5ef16568f4 100644
--- a/Bugzilla/Config/Advanced.pm
+++ b/Bugzilla/Config/Advanced.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Advanced;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,31 +17,32 @@ our $sortkey = 1700;
 
 use constant get_param_list => (
   {
-   name => 'cookiedomain',
-   type => 't',
-   default => ''
+    name    => 'inbound_proxies',
+    type    => 't',
+    default => '',
+    checker => \&check_inbound_proxies
   },
 
-  {
-   name => 'inbound_proxies',
-   type => 't',
-   default => '',
-   checker => \&check_ip
-  },
+  {name => 'proxy_url', type => 't', default => ''},
 
   {
-   name => 'proxy_url',
-   type => 't',
-   default => ''
-  },
-
-  {
-   name => 'strict_transport_security',
-   type => 's',
-   choices => ['off', 'this_domain_only', 'include_subdomains'],
-   default => 'off',
-   checker => \&check_multi
+    name    => 'strict_transport_security',
+    type    => 's',
+    choices => ['off', 'this_domain_only', 'include_subdomains'],
+    default => 'off',
+    checker => \&check_multi
   },
 );
 
+sub check_inbound_proxies {
+  my $inbound_proxies = shift;
+
+  return "" if $inbound_proxies eq "*";
+  my @proxies = split(/[\s,]+/, $inbound_proxies);
+  foreach my $proxy (@proxies) {
+    validate_ip($proxy) || return "$proxy is not a valid IPv4 or IPv6 address";
+  }
+  return "";
+}
+
 1;
diff --git a/Bugzilla/Config/Attachment.pm b/Bugzilla/Config/Attachment.pm
index 580ec46d98..a37b2b1519 100644
--- a/Bugzilla/Config/Attachment.pm
+++ b/Bugzilla/Config/Attachment.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Attachment;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,48 +16,49 @@ use Bugzilla::Config::Common;
 our $sortkey = 400;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'allow_attachment_display',
-   type => 'b',
-   default => 0
-  },
+    {name => 'allow_attachment_display', type => 'b', default => 0},
 
-  {
-   name => 'attachment_base',
-   type => 't',
-   default => '',
-   checker => \&check_urlbase
-  },
+    {
+      name    => 'attachment_base',
+      type    => 't',
+      default => '',
+      checker => \&check_urlbase
+    },
 
-  {
-  name => 'allow_attachment_deletion',
-  type => 'b',
-  default => 0
-  },
+    {name => 'allow_attachment_deletion', type => 'b', default => 0},
 
-  {
-   name => 'maxattachmentsize',
-   type => 't',
-   default => '1000',
-   checker => \&check_maxattachmentsize
-  },
+    {
+      name    => 'xsendfile_header',
+      type    => 's',
+      choices => ['off', 'X-Sendfile', 'X-Accel-Redirect', 'X-LIGHTTPD-send-file'],
+      default => 'off',
+      checker => \&check_multi
+    },
 
-  # The maximum size (in bytes) for patches and non-patch attachments.
-  # The default limit is 1000KB, which is 24KB less than mysql's default
-  # maximum packet size (which determines how much data can be sent in a
-  # single mysql packet and thus how much data can be inserted into the
-  # database) to provide breathing space for the data in other fields of
-  # the attachment record as well as any mysql packet overhead (I don't
-  # know of any, but I suspect there may be some.)
+    {
+      name    => 'maxattachmentsize',
+      type    => 't',
+      default => '1000',
+      checker => \&check_maxattachmentsize
+    },
 
-  {
-   name => 'maxlocalattachment',
-   type => 't',
-   default => '0',
-   checker => \&check_numeric
-  } );
+    # The maximum size (in bytes) for patches and non-patch attachments.
+    # The default limit is 1000KB, which is 24KB less than mysql's default
+    # maximum packet size (which determines how much data can be sent in a
+    # single mysql packet and thus how much data can be inserted into the
+    # database) to provide breathing space for the data in other fields of
+    # the attachment record as well as any mysql packet overhead (I don't
+    # know of any, but I suspect there may be some.)
+
+    {
+      name    => 'maxlocalattachment',
+      type    => 't',
+      default => '0',
+      checker => \&check_numeric
+    }
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Config/Auth.pm b/Bugzilla/Config/Auth.pm
index 78d719b15d..d559e3b247 100644
--- a/Bugzilla/Config/Auth.pm
+++ b/Bugzilla/Config/Auth.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Auth;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,111 +16,89 @@ use Bugzilla::Config::Common;
 our $sortkey = 300;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'auth_env_id',
-   type    => 't',
-   default => '',
-  },
-
-  {
-   name    => 'auth_env_email',
-   type    => 't',
-   default => '',
-  },
-
-  {
-   name    => 'auth_env_realname',
-   type    => 't',
-   default => '',
-  },
-
-  # XXX in the future:
-  #
-  # user_verify_class and user_info_class should have choices gathered from
-  # whatever sits in their respective directories
-  #
-  # rather than comma-separated lists, these two should eventually become
-  # arrays, but that requires alterations to editparams first
-
-  {
-   name => 'user_info_class',
-   type => 's',
-   choices => [ 'CGI', 'Env', 'Env,CGI' ],
-   default => 'CGI',
-   checker => \&check_multi
-  },
-
-  {
-   name => 'user_verify_class',
-   type => 'o',
-   choices => [ 'DB', 'RADIUS', 'LDAP' ],
-   default => 'DB',
-   checker => \&check_user_verify_class
-  },
-
-  {
-   name => 'rememberlogin',
-   type => 's',
-   choices => ['on', 'defaulton', 'defaultoff', 'off'],
-   default => 'on',
-   checker => \&check_multi
-  },
-
-  {
-   name => 'requirelogin',
-   type => 'b',
-   default => '0'
-  },
-
-  {
-   name => 'webservice_email_filter',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'emailregexp',
-   type => 't',
-   default => q:^[\\w\\.\\+\\-=']+@[\\w\\.\\-]+\\.[\\w\\-]+$:,
-   checker => \&check_regexp
-  },
-
-  {
-   name => 'emailregexpdesc',
-   type => 'l',
-   default => 'A legal address must contain exactly one \'@\', and at least ' .
-              'one \'.\' after the @.'
-  },
-
-  {
-   name => 'emailsuffix',
-   type => 't',
-   default => ''
-  },
-
-  {
-   name => 'createemailregexp',
-   type => 't',
-   default => q:.*:,
-   checker => \&check_regexp
-  },
-
-  {
-   name => 'password_complexity',
-   type => 's',
-   choices => [ 'no_constraints', 'mixed_letters', 'letters_numbers',
-                'letters_numbers_specialchars' ],
-   default => 'no_constraints',
-   checker => \&check_multi
-  },
-
-  {
-   name => 'password_check_on_login',
-   type => 'b',
-   default => '1'
-  },
+    {name => 'auth_env_id', type => 't', default => '',},
+
+    {name => 'auth_env_email', type => 't', default => '',},
+
+    {name => 'auth_env_realname', type => 't', default => '',},
+
+    # XXX in the future:
+    #
+    # user_verify_class and user_info_class should have choices gathered from
+    # whatever sits in their respective directories
+    #
+    # rather than comma-separated lists, these two should eventually become
+    # arrays, but that requires alterations to editparams first
+
+    {
+      name    => 'user_info_class',
+      type    => 's',
+      choices => ['CGI', 'Env', 'Env,CGI'],
+      default => 'CGI',
+      checker => \&check_multi
+    },
+
+    {
+      name    => 'user_verify_class',
+      type    => 'o',
+      choices => ['DB', 'RADIUS', 'LDAP'],
+      default => 'DB',
+      checker => \&check_user_verify_class
+    },
+
+    {
+      name    => 'rememberlogin',
+      type    => 's',
+      choices => ['on', 'defaulton', 'defaultoff', 'off'],
+      default => 'on',
+      checker => \&check_multi
+    },
+
+    {name => 'requirelogin', type => 'b', default => '0'},
+
+    {
+      name    => 'emailregexp',
+      type    => 't',
+      default => q:^[\\w\\.\\+\\-=']+@[\\w\\.\\-]+\\.[\\w\\-]+$:,
+      checker => \&check_regexp
+    },
+
+    {
+      name    => 'emailregexpdesc',
+      type    => 'l',
+      default => 'A legal address must contain exactly one \'@\', and at least '
+        . 'one \'.\' after the @.'
+    },
+
+    {
+      name     => 'use_email_as_login',
+      type     => 'b',
+      default  => '1',
+      onchange => \&change_use_email_as_login
+    },
+
+    {
+      name    => 'createemailregexp',
+      type    => 't',
+      default => q:.*:,
+      checker => \&check_regexp
+    },
+
+    {
+      name    => 'password_complexity',
+      type    => 's',
+      choices => [
+        'no_constraints',  'mixed_letters',
+        'letters_numbers', 'letters_numbers_specialchars'
+      ],
+      default => 'no_constraints',
+      checker => \&check_multi
+    },
+
+    {name => 'password_check_on_login', type => 'b', default => '1'},
+    {name => 'auth_delegation',         type => 'b', default => 0,},
   );
   return @param_list;
 }
diff --git a/Bugzilla/Config/BugChange.pm b/Bugzilla/Config/BugChange.pm
index 0acdc0ce49..0028cf95f6 100644
--- a/Bugzilla/Config/BugChange.pm
+++ b/Bugzilla/Config/BugChange.pm
@@ -7,12 +7,13 @@
 
 package Bugzilla::Config::BugChange;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Config::Common;
 use Bugzilla::Status;
+use Bugzilla::Field;
 
 our $sortkey = 500;
 
@@ -26,56 +27,47 @@ sub get_param_list {
   # and bug_status.is_open is not yet defined (hence the eval), so we use
   # the bug statuses above as they are still hardcoded.
   eval {
-      my @current_closed_states = map {$_->name} closed_bug_statuses();
-      # If no closed state was found, use the default list above.
-      @closed_bug_statuses = @current_closed_states if scalar(@current_closed_states);
+    my @current_closed_states = map { $_->name } closed_bug_statuses();
+
+    # If no closed state was found, use the default list above.
+    @closed_bug_statuses = @current_closed_states if scalar(@current_closed_states);
   };
 
   my @param_list = (
-  {
-   name => 'duplicate_or_move_bug_status',
-   type => 's',
-   choices => \@closed_bug_statuses,
-   default => $closed_bug_statuses[0],
-   checker => \&check_bug_status
-  },
-
-  {
-   name => 'letsubmitterchoosepriority',
-   type => 'b',
-   default => 1
-  },
-
-  {
-   name => 'letsubmitterchoosemilestone',
-   type => 'b',
-   default => 1
-  },
-
-  {
-   name => 'musthavemilestoneonaccept',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'commentonchange_resolution',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'commentonduplicate',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name    => 'noresolveonopenblockers',
-   type    => 'b',
-   default => 0,
-  } );
+    {
+      name     => 'duplicate_or_move_bug_status',
+      type     => 's',
+      choices  => \@closed_bug_statuses,
+      default  => $closed_bug_statuses[0],
+      checker  => \&check_bug_status,
+      onchange => \&change_duplicate_or_move_bug_status
+    },
+
+    {name => 'letsubmitterchoosepriority', type => 'b', default => 1},
+
+    {name => 'letsubmitterchoosemilestone', type => 'b', default => 1},
+
+    {name => 'commentonchange_resolution', type => 'b', default => 0},
+
+    {name => 'commentonduplicate', type => 'b', default => 0},
+
+    {
+      name    => 'resolution_forbidden_with_open_blockers',
+      type    => 's',
+      choices => \&_get_resolutions,
+      default => '',
+      checker => \&check_resolution,
+    }
+  );
+
   return @param_list;
 }
 
+sub _get_resolutions {
+  my $resolution_field = Bugzilla::Field->new({name => 'resolution', cache => 1});
+
+  # The empty resolution is included - it represents "no value".
+  return [map { $_->name } @{$resolution_field->legal_values}];
+}
+
 1;
diff --git a/Bugzilla/Config/BugFields.pm b/Bugzilla/Config/BugFields.pm
index ef2faa64b6..adc6fe7ccb 100644
--- a/Bugzilla/Config/BugFields.pm
+++ b/Bugzilla/Config/BugFields.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::BugFields;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,73 +25,50 @@ sub get_param_list {
   my @legal_OS         = @{get_legal_field_values('op_sys')};
 
   my @param_list = (
-  {
-   name => 'useclassification',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'usetargetmilestone',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'useqacontact',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'usestatuswhiteboard',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'use_see_also',
-   type => 'b',
-   default => 1
-  },
-
-  {
-   name => 'defaultpriority',
-   type => 's',
-   choices => \@legal_priorities,
-   default => $legal_priorities[-1],
-   checker => \&check_priority
-  },
-
-  {
-   name => 'defaultseverity',
-   type => 's',
-   choices => \@legal_severities,
-   default => $legal_severities[-1],
-   checker => \&check_severity
-  },
-
-  {
-   name => 'defaultplatform',
-   type => 's',
-   choices => ['', @legal_platforms],
-   default => '',
-   checker => \&check_platform
-  },
-
-  {
-   name => 'defaultopsys',
-   type => 's',
-   choices => ['', @legal_OS],
-   default => '',
-   checker => \&check_opsys
-  },
-
-  {
-   name => 'collapsed_comment_tags',
-   type => 't',
-   default => 'obsolete, spam',
-  });
+    {name => 'useclassification', type => 'b', default => 0},
+
+    {name => 'usetargetmilestone', type => 'b', default => 0},
+
+    {name => 'useqacontact', type => 'b', default => 0},
+
+    {name => 'usestatuswhiteboard', type => 'b', default => 0},
+
+    {name => 'use_see_also', type => 'b', default => 1},
+
+    {
+      name    => 'defaultpriority',
+      type    => 's',
+      choices => \@legal_priorities,
+      default => $legal_priorities[-1],
+      checker => \&check_priority
+    },
+
+    {
+      name    => 'defaultseverity',
+      type    => 's',
+      choices => \@legal_severities,
+      default => $legal_severities[-1],
+      checker => \&check_severity
+    },
+
+    {
+      name    => 'defaultplatform',
+      type    => 's',
+      choices => ['', @legal_platforms],
+      default => '',
+      checker => \&check_platform
+    },
+
+    {
+      name    => 'defaultopsys',
+      type    => 's',
+      choices => ['', @legal_OS],
+      default => '',
+      checker => \&check_opsys
+    },
+
+    {name => 'collapsed_comment_tags', type => 't', default => 'obsolete, spam',}
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Config/Common.pm b/Bugzilla/Config/Common.pm
index fe6a2c2c0a..3f7e3a0461 100644
--- a/Bugzilla/Config/Common.pm
+++ b/Bugzilla/Config/Common.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Common;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,401 +21,389 @@ use Bugzilla::Group;
 use Bugzilla::Status;
 
 use parent qw(Exporter);
-@Bugzilla::Config::Common::EXPORT =
-    qw(check_multi check_numeric check_regexp check_url check_group
-       check_sslbase check_priority check_severity check_platform
-       check_opsys check_shadowdb check_urlbase check_webdotbase
-       check_user_verify_class check_ip check_font_file
-       check_mail_delivery_method check_notification check_utf8
-       check_bug_status check_smtp_auth check_theschwartz_available
-       check_maxattachmentsize check_email check_smtp_ssl
-       check_comment_taggers_group check_smtp_server
+@Bugzilla::Config::Common::EXPORT
+  = qw(check_multi check_numeric check_regexp check_group
+  check_sslbase check_priority check_severity check_platform
+  check_opsys check_shadowdb check_urlbase check_user_verify_class
+  check_ip check_mail_delivery_method check_notification
+  check_bug_status check_smtp_auth check_theschwartz_available
+  check_maxattachmentsize check_email check_smtp_ssl
+  check_comment_taggers_group check_smtp_server check_resolution
+
+  change_use_email_as_login change_duplicate_or_move_bug_status
 );
 
 # Checking functions for the various values
 
 sub check_multi {
-    my ($value, $param) = (@_);
+  my ($value, $param) = (@_);
 
-    if ($param->{'type'} eq "s") {
-        unless (scalar(grep {$_ eq $value} (@{$param->{'choices'}}))) {
-            return "Invalid choice '$value' for single-select list param '$param->{'name'}'";
-        }
-
-        return "";
+  if ($param->{'type'} eq "s") {
+    unless (scalar(grep { $_ eq $value } (@{$param->{'choices'}}))) {
+      return
+        "Invalid choice '$value' for single-select list param '$param->{'name'}'";
     }
-    elsif ($param->{'type'} eq 'm' || $param->{'type'} eq 'o') {
-        foreach my $chkParam (split(',', $value)) {
-            unless (scalar(grep {$_ eq $chkParam} (@{$param->{'choices'}}))) {
-                return "Invalid choice '$chkParam' for multi-select list param '$param->{'name'}'";
-            }
-        }
-
-        return "";
+
+    return "";
+  }
+  elsif ($param->{'type'} eq 'm' || $param->{'type'} eq 'o') {
+    if (ref($value) ne "ARRAY") {
+      $value = [split(',', $value)];
     }
-    else {
-        return "Invalid param type '$param->{'type'}' for check_multi(); " .
-          "contact your Bugzilla administrator";
+    foreach my $chkParam (@$value) {
+      unless (scalar(grep { $_ eq $chkParam } (@{$param->{'choices'}}))) {
+        return
+          "Invalid choice '$chkParam' for multi-select list param '$param->{'name'}'";
+      }
     }
+
+    return "";
+  }
+  else {
+    return "Invalid param type '$param->{'type'}' for check_multi(); "
+      . "contact your Bugzilla administrator";
+  }
 }
 
 sub check_numeric {
-    my ($value) = (@_);
-    if ($value !~ /^[0-9]+$/) {
-        return "must be a numeric value";
-    }
-    return "";
+  my ($value) = (@_);
+  if ($value !~ /^[0-9]+$/) {
+    return "must be a numeric value";
+  }
+  return "";
 }
 
 sub check_regexp {
-    my ($value) = (@_);
-    eval { qr/$value/ };
-    return $@;
+  my ($value) = (@_);
+  eval {qr/$value/};
+  return $@;
 }
 
 sub check_email {
-    my ($value) = @_;
-    if ($value !~ $Email::Address::mailbox) {
-        return "must be a valid email address.";
-    }
-    return "";
+  my ($value) = @_;
+  if ($value !~ $Email::Address::mailbox) {
+    return "must be a valid email address.";
+  }
+  return "";
 }
 
 sub check_sslbase {
-    my $url = shift;
-    if ($url ne '') {
-        if ($url !~ m#^https://([^/]+).*/$#) {
-            return "must be a legal URL, that starts with https and ends with a slash.";
-        }
-        my $host = $1;
-        # Fall back to port 443 if for some reason getservbyname() fails.
-        my $port = getservbyname('https', 'tcp') || 443;
-        if ($host =~ /^(.+):(\d+)$/) {
-            $host = $1;
-            $port = $2;
-        }
-        local *SOCK;
-        my $proto = getprotobyname('tcp');
-        socket(SOCK, PF_INET, SOCK_STREAM, $proto);
-        my $iaddr = inet_aton($host) || return "The host $host cannot be resolved";
-        my $sin = sockaddr_in($port, $iaddr);
-        if (!connect(SOCK, $sin)) {
-            return "Failed to connect to $host:$port ($!); unable to enable SSL";
-        }
-        close(SOCK);
-    }
-    return "";
+  my $url = shift;
+  if ($url ne '') {
+    if ($url !~ m#^https://([^/]+).*/$#) {
+      return "must be a legal URL, that starts with https and ends with a slash";
+    }
+    my $host = $1;
+
+    # Fall back to port 443 if for some reason getservbyname() fails.
+    my $port = getservbyname('https', 'tcp') || 443;
+    if ($host =~ /^(.+):(\d+)$/) {
+      $host = $1;
+      $port = $2;
+    }
+    local *SOCK;
+    my $proto = getprotobyname('tcp');
+    socket(SOCK, PF_INET, SOCK_STREAM, $proto);
+    my $iaddr = inet_aton($host) || return "The host $host cannot be resolved";
+    my $sin = sockaddr_in($port, $iaddr);
+    if (!connect(SOCK, $sin)) {
+      return "Failed to connect to $host:$port ($!); unable to enable SSL";
+    }
+    close(SOCK);
+  }
+  return "";
 }
 
 sub check_ip {
-    my $inbound_proxies = shift;
-    my @proxies = split(/[\s,]+/, $inbound_proxies);
-    foreach my $proxy (@proxies) {
-        validate_ip($proxy) || return "$proxy is not a valid IPv4 or IPv6 address";
-    }
-    return "";
-}
-
-sub check_utf8 {
-    my $utf8 = shift;
-    # You cannot turn off the UTF-8 parameter if you've already converted
-    # your tables to utf-8.
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->isa('Bugzilla::DB::Mysql') && $dbh->bz_db_is_utf8 && !$utf8) {
-        return "You cannot disable UTF-8 support, because your MySQL database"
-               . " is encoded in UTF-8";
-    }
-    return "";
+  my $inbound_proxies = shift;
+  my @proxies = split(/[\s,]+/, $inbound_proxies);
+  foreach my $proxy (@proxies) {
+    validate_ip($proxy) || return "$proxy is not a valid IPv4 or IPv6 address";
+  }
+  return "";
 }
 
 sub check_priority {
-    my ($value) = (@_);
-    my $legal_priorities = get_legal_field_values('priority');
-    if (!grep($_ eq $value, @$legal_priorities)) {
-        return "Must be a legal priority value: one of " .
-            join(", ", @$legal_priorities);
-    }
-    return "";
+  my ($value) = (@_);
+  my $legal_priorities = get_legal_field_values('priority');
+  if (!grep($_ eq $value, @$legal_priorities)) {
+    return "Must be a legal priority value: one of "
+      . join(", ", @$legal_priorities);
+  }
+  return "";
 }
 
 sub check_severity {
-    my ($value) = (@_);
-    my $legal_severities = get_legal_field_values('bug_severity');
-    if (!grep($_ eq $value, @$legal_severities)) {
-        return "Must be a legal severity value: one of " .
-            join(", ", @$legal_severities);
-    }
-    return "";
+  my ($value) = (@_);
+  my $legal_severities = get_legal_field_values('bug_severity');
+  if (!grep($_ eq $value, @$legal_severities)) {
+    return "Must be a legal severity value: one of "
+      . join(", ", @$legal_severities);
+  }
+  return "";
 }
 
 sub check_platform {
-    my ($value) = (@_);
-    my $legal_platforms = get_legal_field_values('rep_platform');
-    if (!grep($_ eq $value, '', @$legal_platforms)) {
-        return "Must be empty or a legal platform value: one of " .
-            join(", ", @$legal_platforms);
-    }
-    return "";
+  my ($value) = (@_);
+  my $legal_platforms = get_legal_field_values('rep_platform');
+  if (!grep($_ eq $value, '', @$legal_platforms)) {
+    return "Must be empty or a legal platform value: one of "
+      . join(", ", @$legal_platforms);
+  }
+  return "";
 }
 
 sub check_opsys {
-    my ($value) = (@_);
-    my $legal_OS = get_legal_field_values('op_sys');
-    if (!grep($_ eq $value, '', @$legal_OS)) {
-        return "Must be empty or a legal operating system value: one of " .
-            join(", ", @$legal_OS);
-    }
-    return "";
+  my ($value) = (@_);
+  my $legal_OS = get_legal_field_values('op_sys');
+  if (!grep($_ eq $value, '', @$legal_OS)) {
+    return "Must be empty or a legal operating system value: one of "
+      . join(", ", @$legal_OS);
+  }
+  return "";
 }
 
 sub check_bug_status {
-    my $bug_status = shift;
-    my @closed_bug_statuses = map {$_->name} closed_bug_statuses();
-    if (!grep($_ eq $bug_status, @closed_bug_statuses)) {
-        return "Must be a valid closed status: one of " . join(', ', @closed_bug_statuses);
-    }
-    return "";
+  my $bug_status = shift;
+  my @closed_bug_statuses = map { $_->name } closed_bug_statuses();
+  if (!grep($_ eq $bug_status, @closed_bug_statuses)) {
+    return "Must be a valid closed status: one of "
+      . join(', ', @closed_bug_statuses);
+  }
+  return "";
 }
 
-sub check_group {
-    my $group_name = shift;
-    return "" unless $group_name;
-    my $group = new Bugzilla::Group({'name' => $group_name});
-    unless (defined $group) {
-        return "Must be an existing group name";
-    }
-    return "";
-}
+sub check_resolution {
+  my $resolution = shift;
+  my $resolution_field = Bugzilla::Field->new({name => 'resolution', cache => 1});
 
-sub check_shadowdb {
-    my ($value) = (@_);
-    $value = trim($value);
-    if ($value eq "") {
-        return "";
-    }
+  # The empty resolution is included - it represents "no value"
+  my @resolutions = map { $_->name } @{$resolution_field->legal_values};
 
-    if (!Bugzilla->params->{'shadowdbhost'}) {
-        return "You need to specify a host when using a shadow database";
-    }
+  if (!grep($_ eq $resolution, @resolutions)) {
+    return "Must be blank or a valid resolution: one of "
+      . join(', ', @resolutions);
+  }
+  return "";
+}
 
-    # Can't test existence of this because ConnectToDatabase uses the param,
-    # but we can't set this before testing....
-    # This can really only be fixed after we can use the DBI more openly
-    return "";
+sub check_group {
+  my $group_name = shift;
+  return "" unless $group_name;
+  my $group = new Bugzilla::Group({'name' => $group_name});
+  unless (defined $group) {
+    return "Must be an existing group name";
+  }
+  return "";
 }
 
-sub check_urlbase {
-    my ($url) = (@_);
-    if ($url && $url !~ m:^http.*/$:) {
-        return "must be a legal URL, that starts with http and ends with a slash.";
-    }
+sub check_shadowdb {
+  my ($value) = (@_);
+  $value = trim($value);
+  if ($value eq "") {
     return "";
-}
+  }
 
-sub check_url {
-    my ($url) = (@_);
-    return '' if $url eq ''; # Allow empty URLs
-    if ($url !~ m:/$:) {
-        return 'must be a legal URL, absolute or relative, ending with a slash.';
-    }
-    return '';
-}
+  if (!Bugzilla->params->{'shadowdbhost'}) {
+    return "You need to specify a host when using a shadow database";
+  }
 
-sub check_webdotbase {
-    my ($value) = (@_);
-    $value = trim($value);
-    if ($value eq "") {
-        return "";
-    }
-    if($value !~ /^https?:/) {
-        if(! -x $value) {
-            return "The file path \"$value\" is not a valid executable.  Please specify the complete file path to 'dot' if you intend to generate graphs locally.";
-        }
-        # Check .htaccess allows access to generated images
-        my $webdotdir = bz_locations()->{'webdotdir'};
-        if(-e "$webdotdir/.htaccess") {
-            open HTACCESS, "$webdotdir/.htaccess";
-            if(! grep(/ \\\.png\$/,<HTACCESS>)) {
-                return "Dependency graph images are not accessible.\nAssuming that you have not modified the file, delete $webdotdir/.htaccess and re-run checksetup.pl to rectify.\n";
-            }
-            close HTACCESS;
-        }
-    }
-    return "";
+  # Can't test existence of this because ConnectToDatabase uses the param,
+  # but we can't set this before testing....
+  # This can really only be fixed after we can use the DBI more openly
+  return "";
 }
 
-sub check_font_file {
-    my ($font) = @_;
-    $font = trim($font);
-    return '' unless $font;
-
-    if ($font !~ /\.ttf$/) {
-        return "The file must point to a TrueType font file (its extension must be .ttf)"
-    }
-    if (! -f $font) {
-        return "The file '$font' cannot be found. Make sure you typed the full path to the file"
-    }
-    return '';
+sub check_urlbase {
+  my ($url) = (@_);
+  if ($url && $url !~ m:^http.*/$:) {
+    return "must be a legal URL, that starts with http and ends with a slash.";
+  }
+  return "";
 }
 
 sub check_user_verify_class {
-    # doeditparams traverses the list of params, and for each one it checks,
-    # then updates. This means that if one param checker wants to look at 
-    # other params, it must be below that other one. So you can't have two 
-    # params mutually dependent on each other.
-    # This means that if someone clears the LDAP config params after setting
-    # the login method as LDAP, we won't notice, but all logins will fail.
-    # So don't do that.
-
-    my $params = Bugzilla->params;
-    my ($list, $entry) = @_;
-    $list || return 'You need to specify at least one authentication mechanism';
-    for my $class (split /,\s*/, $list) {
-        my $res = check_multi($class, $entry);
-        return $res if $res;
-        if ($class eq 'RADIUS') {
-            if (!Bugzilla->feature('auth_radius')) {
-                return "RADIUS support is not available. Run checksetup.pl"
-                       . " for more details";
-            }
-            return "RADIUS servername (RADIUS_server) is missing"
-                if !$params->{"RADIUS_server"};
-            return "RADIUS_secret is empty" if !$params->{"RADIUS_secret"};
-        }
-        elsif ($class eq 'LDAP') {
-            if (!Bugzilla->feature('auth_ldap')) {
-                return "LDAP support is not available. Run checksetup.pl"
-                       . " for more details";
-            }
-            return "LDAP servername (LDAPserver) is missing" 
-                if !$params->{"LDAPserver"};
-            return "LDAPBaseDN is empty" if !$params->{"LDAPBaseDN"};
-        }
-    }
-    return "";
+
+  # doeditparams traverses the list of params, and for each one it checks,
+  # then updates. This means that if one param checker wants to look at
+  # other params, it must be below that other one. So you can't have two
+  # params mutually dependent on each other.
+  # This means that if someone clears the LDAP config params after setting
+  # the login method as LDAP, we won't notice, but all logins will fail.
+  # So don't do that.
+
+  my $params = Bugzilla->params;
+  my ($list, $entry) = @_;
+  $list || return 'You need to specify at least one authentication mechanism';
+  for my $class (split /,\s*/, $list) {
+    my $res = check_multi($class, $entry);
+    return $res if $res;
+    if ($class eq 'RADIUS') {
+      if (!Bugzilla->feature('auth_radius')) {
+        return "RADIUS support is not available. Run checksetup.pl"
+          . " for more details";
+      }
+      return "RADIUS servername (RADIUS_server) is missing"
+        if !$params->{"RADIUS_server"};
+      return "RADIUS_secret is empty" if !$params->{"RADIUS_secret"};
+    }
+    elsif ($class eq 'LDAP') {
+      if (!Bugzilla->feature('auth_ldap')) {
+        return "LDAP support is not available. Run checksetup.pl" . " for more details";
+      }
+      return "LDAP servername (LDAPserver) is missing" if !$params->{"LDAPserver"};
+      return "LDAPBaseDN is empty"                     if !$params->{"LDAPBaseDN"};
+    }
+  }
+  return "";
 }
 
 sub check_mail_delivery_method {
-    my $check = check_multi(@_);
-    return $check if $check;
-    my $mailer = shift;
-    if ($mailer eq 'sendmail' and ON_WINDOWS) {
-        # look for sendmail.exe 
-        return "Failed to locate " . SENDMAIL_EXE
-            unless -e SENDMAIL_EXE;
-    }
-    return "";
+  my $check = check_multi(@_);
+  return $check if $check;
+  my $mailer = shift;
+  if ($mailer eq 'Sendmail' and ON_WINDOWS) {
+
+    # look for sendmail.exe
+    return "Failed to locate " . SENDMAIL_EXE unless -e SENDMAIL_EXE;
+  }
+  return "";
 }
 
 sub check_maxattachmentsize {
-    my $check = check_numeric(@_);
-    return $check if $check;
-    my $size = shift;
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->isa('Bugzilla::DB::Mysql')) {
-        my (undef, $max_packet) = $dbh->selectrow_array(
-            q{SHOW VARIABLES LIKE 'max\_allowed\_packet'});
-        my $byte_size = $size * 1024;
-        if ($max_packet < $byte_size) {
-            return "You asked for a maxattachmentsize of $byte_size bytes,"
-                   . " but the max_allowed_packet setting in MySQL currently"
-                   . " only allows packets up to $max_packet bytes";
-        }
-    }
-    return "";
+  my $check = check_numeric(@_);
+  return $check if $check;
+  my $size = shift;
+  my $dbh  = Bugzilla->dbh;
+  if ($dbh->isa('Bugzilla::DB::Mysql')) {
+    my (undef, $max_packet)
+      = $dbh->selectrow_array(q{SHOW VARIABLES LIKE 'max\_allowed\_packet'});
+    my $byte_size = $size * 1024;
+    if ($max_packet < $byte_size) {
+      return
+          "You asked for a maxattachmentsize of $byte_size bytes,"
+        . " but the max_allowed_packet setting in MySQL currently"
+        . " only allows packets up to $max_packet bytes";
+    }
+  }
+  return "";
 }
 
 sub check_notification {
-    my $option = shift;
-    my @current_version =
-        (BUGZILLA_VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
-    if ($current_version[1] % 2 && $option eq 'stable_branch_release') {
-        return "You are currently running a development snapshot, and so your " .
-               "installation is not based on a branch. If you want to be notified " .
-               "about the next stable release, you should select " .
-               "'latest_stable_release' instead";
-    }
-    if ($option ne 'disabled' && !Bugzilla->feature('updates')) {
-        return "Some Perl modules are missing to get notifications about " .
-               "new releases. See the output of checksetup.pl for more information";
-    }
-    return "";
+  my $option = shift;
+  my @current_version
+    = (BUGZILLA_VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
+  if ($current_version[1] % 2 && $option eq 'stable_branch_release') {
+    return
+        "You are currently running a development snapshot, and so your "
+      . "installation is not based on a branch. If you want to be notified "
+      . "about the next stable release, you should select "
+      . "'latest_stable_release' instead";
+  }
+  if ($option ne 'disabled' && !Bugzilla->feature('updates')) {
+    return "Some Perl modules are missing to get notifications about "
+      . "new releases. See the output of checksetup.pl for more information";
+  }
+  return "";
 }
 
 sub check_smtp_server {
-    my $host = shift;
-    my $port;
-
-    if ($host =~ /:/) {
-        ($host, $port) = split(/:/, $host, 2);
-        unless ($port && detaint_natural($port)) {
-            return "Invalid port. It must be an integer (typically 25, 465 or 587)";
-        }
-    }
-    trick_taint($host);
-    # Let's first try to connect using SSL. If this fails, we fall back to
-    # an unencrypted connection.
-    foreach my $method (['Net::SMTP::SSL', 465], ['Net::SMTP', 25]) {
-        my ($class, $default_port) = @$method;
-        next if $class eq 'Net::SMTP::SSL' && !Bugzilla->feature('smtp_ssl');
-        eval "require $class";
-        my $smtp = $class->new($host, Port => $port || $default_port, Timeout => 5);
-        if ($smtp) {
-            # The connection works!
-            $smtp->quit;
-            return '';
-        }
-    }
-    return "Cannot connect to $host" . ($port ? " using port $port" : "");
+  my $host = shift;
+  my $port;
+
+  return '' unless $host;
+
+  if ($host =~ /:/) {
+    ($host, $port) = split(/:/, $host, 2);
+    unless ($port && detaint_natural($port)) {
+      return "Invalid port. It must be an integer (typically 25, 465 or 587)";
+    }
+  }
+  trick_taint($host);
+
+  # Let's first try to connect using SSL. If this fails, we fall back to
+  # an unencrypted connection.
+  foreach my $method (['Net::SMTP::SSL', 465], ['Net::SMTP', 25]) {
+    my ($class, $default_port) = @$method;
+    next if $class eq 'Net::SMTP::SSL' && !Bugzilla->feature('smtp_ssl');
+    eval "require $class";
+    my $smtp = $class->new($host, Port => $port || $default_port, Timeout => 5);
+    if ($smtp) {
+
+      # The connection works!
+      $smtp->quit;
+      return '';
+    }
+  }
+  return "Cannot connect to $host" . ($port ? " using port $port" : "");
 }
 
 sub check_smtp_auth {
-    my $username = shift;
-    if ($username and !Bugzilla->feature('smtp_auth')) {
-        return "SMTP Authentication is not available. Run checksetup.pl for"
-               . " more details";
-    }
-    return "";
+  my $username = shift;
+  if ($username and !Bugzilla->feature('smtp_auth')) {
+    return "SMTP Authentication is not available. Run checksetup.pl for"
+      . " more details";
+  }
+  return "";
 }
 
 sub check_smtp_ssl {
-    my $use_ssl = shift;
-    if ($use_ssl && !Bugzilla->feature('smtp_ssl')) {
-        return "SSL support is not available. Run checksetup.pl for more details";
-    }
-    return "";
+  my $use_ssl = shift;
+  if ($use_ssl && !Bugzilla->feature('smtp_ssl')) {
+    return "SSL support is not available. Run checksetup.pl for more details";
+  }
+  return "";
 }
 
 sub check_theschwartz_available {
-    my $use_queue = shift;
-    if ($use_queue && !Bugzilla->feature('jobqueue')) {
-        return "Using the job queue requires that you have certain Perl"
-               . " modules installed. See the output of checksetup.pl"
-               . " for more information";
-    }
-    return "";
+  my $use_queue = shift;
+  if ($use_queue && !Bugzilla->feature('jobqueue')) {
+    return
+        "Using the job queue requires that you have certain Perl"
+      . " modules installed. See the output of checksetup.pl"
+      . " for more information";
+  }
+  return "";
 }
 
 sub check_comment_taggers_group {
-    my $group_name = shift;
-    if ($group_name && !Bugzilla->feature('jsonrpc')) {
-        return "Comment tagging requires installation of the JSONRPC feature";
-    }
-    return check_group($group_name);
+  my $group_name = shift;
+  if ($group_name && !Bugzilla->feature('jsonrpc')) {
+    return "Comment tagging requires installation of the JSONRPC feature";
+  }
+  return check_group($group_name);
+}
+
+# Change handler functions for various parameters
+
+# If use_email_as_login is turned on, update all login names to be email
+# addresses.
+sub change_use_email_as_login {
+  my $newvalue = shift;
+  if ($newvalue) {
+    Bugzilla->dbh->do('UPDATE profiles SET login_name = email');
+  }
+}
+
+sub change_duplicate_or_move_bug_status {
+  my $newvalue = shift;
+  Bugzilla::Status::add_missing_bug_status_transitions($newvalue);
 }
 
 # OK, here are the parameter definitions themselves.
 #
 # Each definition is a hash with keys:
 #
-# name    - name of the param
-# desc    - description of the param (for editparams.cgi)
-# type    - see below
-# choices - (optional) see below
-# default - default value for the param
-# checker - (optional) checking function for validating parameter entry
-#           It is called with the value of the param as the first arg and a
-#           reference to the param's hash as the second argument
+# name     - name of the param
+# desc     - description of the param (for editparams.cgi)
+# type     - see below
+# choices  - (optional) see below
+# default  - default value for the param
+# checker  - (optional) checking function for validating parameter entry.
+#            It is called with the value of the param as the first arg
+#            and a reference to the param's hash as the second argument.
+# onchange - (optional) handling function for parameter changes.
+#            The argument is the new value of the param.
 #
 # The type value can be one of the following:
 #
@@ -443,11 +431,6 @@ sub check_comment_taggers_group {
 #      &check_multi should always be used as the param verification function
 #      for list (single and multiple) parameter types.
 #
-# o -- A list of values, orderable, and with many selectable (shows up as a
-#      JavaScript-enhanced select box if JavaScript is enabled, and a text
-#      entry field if not)
-#      Set up in the same way as type m.
-#
 # s -- A list of values, with one selectable (shows up as a select box)
 #      To specify the list of values, make the 'choices' key be an array
 #      reference of the valid choices. The 'default' key should be one of
@@ -462,13 +445,20 @@ sub check_comment_taggers_group {
 #       }
 #
 #      Here, 'b' is the default option, and 'a' and 'c' are other possible
-#      options, but only one at a time! 
+#      options, but only one at a time!
 #
 #      &check_multi should always be used as the param verification function
 #      for list (single and multiple) parameter types.
+#
+# o -- A list of values, orderable, and with many selectable (shows up as a
+#      JavaScript-enhanced select box if JavaScript is enabled, and a text
+#      entry field if not)
+#      Set up in the same way as type s. If the default has multiple values,
+#      then they must be concatenated, separated by a comma.
+#      For instance: default => 'a,c'.
 
 sub get_param_list {
-    return;
+  return;
 }
 
 1;
@@ -492,7 +482,7 @@ in the relevant F<Bugzilla::Config::*> package.
 =item C<check_multi>
 
 Checks that a multi-valued parameter (ie types C<s>, C<o> or C<m>) satisfies
-its contraints.
+its constraints.
 
 =item C<check_numeric>
 
@@ -507,6 +497,17 @@ Checks that the value is a valid regexp
 Checks that the required modules for comment tagging are installed, and that a
 valid group is provided.
 
+=item C<change_use_email_as_login>
+
+Change handler for "use_email_as_login" parameter - if param is changed to
+true, updates login_name field to be the value of the email field for all
+users.
+
+=item C<change_duplicate_or_move_bug_status>
+
+Change handler for "duplicate_or_move_bug_status" parameter - if param is
+changed, insert all missing transitions to the new bug status.
+
 =back
 
 =head1 B<Methods in need of POD>
@@ -523,28 +524,22 @@ valid group is provided.
 
 =item check_bug_status
 
+=item check_resolution
+
 =item check_shadowdb
 
 =item check_smtp_server
 
 =item check_smtp_auth
 
-=item check_url
-
 =item check_urlbase
 
 =item check_email
 
-=item check_webdotbase
-
-=item check_font_file
-
 =item get_param_list
 
 =item check_maxattachmentsize
 
-=item check_utf8
-
 =item check_group
 
 =item check_opsys
diff --git a/Bugzilla/Config/Core.pm b/Bugzilla/Config/Core.pm
index 654e569ba1..96d763c5db 100644
--- a/Bugzilla/Config/Core.pm
+++ b/Bugzilla/Config/Core.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Core;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,31 +16,11 @@ use Bugzilla::Config::Common;
 our $sortkey = 100;
 
 use constant get_param_list => (
-  {
-   name => 'urlbase',
-   type => 't',
-   default => '',
-   checker => \&check_urlbase
-  },
-
-  {
-   name => 'ssl_redirect',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'sslbase',
-   type => 't',
-   default => '',
-   checker => \&check_sslbase
-  },
-
-  {
-   name => 'cookiepath',
-   type => 't',
-   default => '/'
-  },
+  {name => 'urlbase', type => 't', default => '', checker => \&check_urlbase},
+
+  {name => 'ssl_redirect', type => 'b', default => 0},
+
+  {name => 'sslbase', type => 't', default => '', checker => \&check_sslbase},
 );
 
 1;
diff --git a/Bugzilla/Config/DependencyGraph.pm b/Bugzilla/Config/DependencyGraph.pm
deleted file mode 100644
index a9b8598df8..0000000000
--- a/Bugzilla/Config/DependencyGraph.pm
+++ /dev/null
@@ -1,37 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::Config::DependencyGraph;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::Config::Common;
-
-our $sortkey = 800;
-
-sub get_param_list {
-  my $class = shift;
-  my @param_list = (
-  {
-   name => 'webdotbase',
-   type => 't',
-   default => 'http://www.research.att.com/~north/cgi-bin/webdot.cgi/%urlbase%',
-   checker => \&check_webdotbase
-  },
-
-  {
-   name => 'font_file',
-   type => 't',
-   default => '',
-   checker => \&check_font_file
-  });
-  return @param_list;
-}
-
-1;
diff --git a/Bugzilla/Config/General.pm b/Bugzilla/Config/General.pm
index 5efaa6f6c2..673806b331 100644
--- a/Bugzilla/Config/General.pm
+++ b/Bugzilla/Config/General.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::General;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,46 +17,26 @@ our $sortkey = 150;
 
 use constant get_param_list => (
   {
-   name => 'maintainer',
-   type => 't',
-   no_reset => '1',
-   default => '',
-   checker => \&check_email
+    name     => 'maintainer',
+    type     => 't',
+    no_reset => '1',
+    default  => '',
+    checker  => \&check_email
   },
 
-  {
-   name => 'docs_urlbase',
-   type => 't',
-   default => 'docs/%lang%/html/',
-   checker => \&check_url
-  },
-
-  {
-   name => 'utf8',
-   type => 'b',
-   default => '0',
-   checker => \&check_utf8
-  },
+  {name => 'shutdownhtml', type => 'l', default => ''},
 
-  {
-   name => 'shutdownhtml',
-   type => 'l',
-   default => ''
-  },
-
-  {
-   name => 'announcehtml',
-   type => 'l',
-   default => ''
-  },
+  {name => 'announcehtml', type => 'l', default => ''},
 
   {
-   name => 'upgrade_notification',
-   type => 's',
-   choices => ['development_snapshot', 'latest_stable_release',
-               'stable_branch_release', 'disabled'],
-   default => 'latest_stable_release',
-   checker => \&check_notification
+    name    => 'upgrade_notification',
+    type    => 's',
+    choices => [
+      'development_snapshot',  'latest_stable_release',
+      'stable_branch_release', 'disabled'
+    ],
+    default => 'latest_stable_release',
+    checker => \&check_notification
   },
 );
 
diff --git a/Bugzilla/Config/GroupSecurity.pm b/Bugzilla/Config/GroupSecurity.pm
index e827834a0b..0b05d23b25 100644
--- a/Bugzilla/Config/GroupSecurity.pm
+++ b/Bugzilla/Config/GroupSecurity.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::GroupSecurity;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,84 +20,75 @@ sub get_param_list {
   my $class = shift;
 
   my @param_list = (
-  {
-   name => 'makeproductgroups',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'chartgroup',
-   type => 's',
-   choices => \&_get_all_group_names,
-   default => 'editbugs',
-   checker => \&check_group
-  },
-
-  {
-   name => 'insidergroup',
-   type => 's',
-   choices => \&_get_all_group_names,
-   default => '',
-   checker => \&check_group
-  },
-
-  {
-   name => 'timetrackinggroup',
-   type => 's',
-   choices => \&_get_all_group_names,
-   default => 'editbugs',
-   checker => \&check_group
-  },
-
-  {
-   name => 'querysharegroup',
-   type => 's',
-   choices => \&_get_all_group_names,
-   default => 'editbugs',
-   checker => \&check_group
-  },
-
-  {
-   name => 'comment_taggers_group',
-   type => 's',
-   choices => \&_get_all_group_names,
-   default => 'editbugs',
-   checker => \&check_comment_taggers_group
-  },
-
-  {
-   name => 'debug_group',
-   type => 's',
-   choices => \&_get_all_group_names,
-   default => 'admin',
-   checker => \&check_group
-  },
-  
-  {
-   name => 'usevisibilitygroups',
-   type => 'b',
-   default => 0
-  }, 
-  
-  {
-   name => 'strict_isolation',
-   type => 'b',
-   default => 0
-  },
-
-  {
-   name => 'or_groups',
-   type => 'b',
-   default => 0
-  } );
+    {
+      name    => 'chartgroup',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => 'editbugs',
+      checker => \&check_group
+    },
+
+    {
+      name    => 'insidergroup',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => '',
+      checker => \&check_group
+    },
+
+    {
+      name    => 'timetrackinggroup',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => 'editbugs',
+      checker => \&check_group
+    },
+
+    {
+      name    => 'querysharegroup',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => 'editbugs',
+      checker => \&check_group
+    },
+
+    {
+      name    => 'comment_taggers_group',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => 'editbugs',
+      checker => \&check_comment_taggers_group
+    },
+
+    {
+      name    => 'minor_update_group',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => '',
+      checker => \&check_group
+    },
+
+    {
+      name    => 'debug_group',
+      type    => 's',
+      choices => \&_get_all_group_names,
+      default => 'admin',
+      checker => \&check_group
+    },
+
+    {name => 'usevisibilitygroups', type => 'b', default => 0},
+
+    {name => 'strict_isolation', type => 'b', default => 0},
+
+    {name => 'or_groups', type => 'b', default => 0}
+  );
   return @param_list;
 }
 
 sub _get_all_group_names {
-    my @group_names = map {$_->name} Bugzilla::Group->get_all;
-    unshift(@group_names, '');
-    return \@group_names;
+  my @group_names = map { $_->name } Bugzilla::Group->get_all;
+  unshift(@group_names, '');
+  return \@group_names;
 }
 
 1;
diff --git a/Bugzilla/Config/LDAP.pm b/Bugzilla/Config/LDAP.pm
index 0bc8240dfd..1aac80dc84 100644
--- a/Bugzilla/Config/LDAP.pm
+++ b/Bugzilla/Config/LDAP.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::LDAP;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,49 +16,22 @@ use Bugzilla::Config::Common;
 our $sortkey = 1000;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'LDAPserver',
-   type => 't',
-   default => ''
-  },
+    {name => 'LDAPserver', type => 't', default => ''},
 
-  {
-   name => 'LDAPstarttls',
-   type => 'b',
-   default => 0
-  },
+    {name => 'LDAPstarttls', type => 'b', default => 0},
 
-  {
-   name => 'LDAPbinddn',
-   type => 't',
-   default => ''
-  },
+    {name => 'LDAPbinddn', type => 't', default => ''},
 
-  {
-   name => 'LDAPBaseDN',
-   type => 't',
-   default => ''
-  },
+    {name => 'LDAPBaseDN', type => 't', default => ''},
 
-  {
-   name => 'LDAPuidattribute',
-   type => 't',
-   default => 'uid'
-  },
+    {name => 'LDAPuidattribute', type => 't', default => 'uid'},
 
-  {
-   name => 'LDAPmailattribute',
-   type => 't',
-   default => 'mail'
-  },
+    {name => 'LDAPmailattribute', type => 't', default => 'mail'},
 
-  {
-   name => 'LDAPfilter',
-   type => 't',
-   default => '',
-  } );
+    {name => 'LDAPfilter', type => 't', default => '',}
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm
index 467bdab3f9..bb85fdc966 100644
--- a/Bugzilla/Config/MTA.pm
+++ b/Bugzilla/Config/MTA.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::MTA;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,68 +16,43 @@ use Bugzilla::Config::Common;
 our $sortkey = 1200;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'mail_delivery_method',
-   type => 's',
-   choices => ['Sendmail', 'SMTP', 'Test', 'None'],
-   default => 'Sendmail',
-   checker => \&check_mail_delivery_method
-  },
-
-  {
-   name => 'mailfrom',
-   type => 't',
-   default => 'bugzilla-daemon'
-  },
-
-  {
-   name => 'use_mailer_queue',
-   type => 'b',
-   default => 0,
-   checker => \&check_theschwartz_available,
-  },
-
-  {
-   name => 'smtpserver',
-   type => 't',
-   default => 'localhost',
-   checker => \&check_smtp_server
-  },
-  {
-   name => 'smtp_username',
-   type => 't',
-   default => '',
-   checker => \&check_smtp_auth
-  },
-  {
-   name => 'smtp_password',
-   type => 'p',
-   default => ''
-  },
-  {
-   name => 'smtp_ssl',
-   type => 'b',
-   default => 0,
-   checker => \&check_smtp_ssl
-  },
-  {
-   name => 'smtp_debug',
-   type => 'b',
-   default => 0
-  },
-  {
-   name => 'whinedays',
-   type => 't',
-   default => 7,
-   checker => \&check_numeric
-  },
-  {
-   name => 'globalwatchers',
-   type => 't',
-   default => '',
-  }, );
+    {
+      name    => 'mail_delivery_method',
+      type    => 's',
+      choices => ['Sendmail', 'SMTP', 'Test', 'None'],
+      default => 'Sendmail',
+      checker => \&check_mail_delivery_method
+    },
+
+    {name => 'mailfrom', type => 't', default => 'bugzilla-daemon'},
+
+    {
+      name    => 'use_mailer_queue',
+      type    => 'b',
+      default => 0,
+      checker => \&check_theschwartz_available,
+    },
+
+    {
+      name    => 'smtpserver',
+      type    => 't',
+      default => 'localhost',
+      checker => \&check_smtp_server
+    },
+    {
+      name    => 'smtp_username',
+      type    => 't',
+      default => '',
+      checker => \&check_smtp_auth
+    },
+    {name => 'smtp_password', type => 'p', default => ''},
+    {name => 'smtp_ssl',   type => 'b', default => 0, checker => \&check_smtp_ssl},
+    {name => 'smtp_debug', type => 'b', default => 0},
+    {name => 'whinedays',  type => 't', default => 7, checker => \&check_numeric},
+    {name => 'globalwatchers', type => 't', default => '',},
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Config/Memcached.pm b/Bugzilla/Config/Memcached.pm
index 292803d864..e3f8003304 100644
--- a/Bugzilla/Config/Memcached.pm
+++ b/Bugzilla/Config/Memcached.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Memcached;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,16 +17,8 @@ our $sortkey = 1550;
 
 sub get_param_list {
   return (
-    {
-        name    => 'memcached_servers',
-        type    => 't',
-        default => ''
-    },
-    {
-        name    => 'memcached_namespace',
-        type    => 't',
-        default => 'bugzilla:',
-    },
+    {name => 'memcached_servers',   type => 't', default => ''},
+    {name => 'memcached_namespace', type => 't', default => 'bugzilla:',},
   );
 }
 
diff --git a/Bugzilla/Config/Query.pm b/Bugzilla/Config/Query.pm
index f18bb90df1..346551df11 100644
--- a/Bugzilla/Config/Query.pm
+++ b/Bugzilla/Config/Query.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::Query;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,47 +16,45 @@ use Bugzilla::Config::Common;
 our $sortkey = 1400;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'quip_list_entry_control',
-   type => 's',
-   choices => ['open', 'moderated', 'closed'],
-   default => 'open',
-   checker => \&check_multi
-  },
-
-  {
-   name => 'mybugstemplate',
-   type => 't',
-   default => 'buglist.cgi?resolution=---&amp;emailassigned_to1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=%userid%'
-  },
-
-  {
-   name => 'defaultquery',
-   type => 't',
-   default => 'resolution=---&emailassigned_to1=1&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailqa_contact2=1&emaillongdesc3=1&order=Importance&long_desc_type=substring'
-  },
-
-  {
-   name => 'search_allow_no_criteria',
-   type => 'b',
-   default => 1
-  },
-
-  {
-    name => 'default_search_limit',
-    type => 't',
-    default => '500',
-    checker => \&check_numeric
-  },
-
-  {
-    name => 'max_search_results',
-    type => 't',
-    default => '10000',
-    checker => \&check_numeric
-  },
+    {
+      name    => 'quip_list_entry_control',
+      type    => 's',
+      choices => ['open', 'moderated', 'closed'],
+      default => 'open',
+      checker => \&check_multi
+    },
+
+    {
+      name => 'mybugstemplate',
+      type => 't',
+      default =>
+        'buglist.cgi?resolution=---&amp;emailassigned_to1=1&amp;emailreporter1=1&amp;emailtype1=exact&amp;email1=%userid%'
+    },
+
+    {
+      name => 'defaultquery',
+      type => 't',
+      default =>
+        'resolution=---&emailassigned_to1=1&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailqa_contact2=1&emaillongdesc3=1&order=Importance&long_desc_type=substring'
+    },
+
+    {name => 'search_allow_no_criteria', type => 'b', default => 1},
+
+    {
+      name    => 'default_search_limit',
+      type    => 't',
+      default => '500',
+      checker => \&check_numeric
+    },
+
+    {
+      name    => 'max_search_results',
+      type    => 't',
+      default => '10000',
+      checker => \&check_numeric
+    },
   );
   return @param_list;
 }
diff --git a/Bugzilla/Config/RADIUS.pm b/Bugzilla/Config/RADIUS.pm
index 8e30b07a98..f952785e94 100644
--- a/Bugzilla/Config/RADIUS.pm
+++ b/Bugzilla/Config/RADIUS.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::RADIUS;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,31 +16,15 @@ use Bugzilla::Config::Common;
 our $sortkey = 1100;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name =>    'RADIUS_server',
-   type =>    't',
-   default => ''
-  },
-
-  {
-   name =>    'RADIUS_secret',
-   type =>    't',
-   default => ''
-  },
-
-  {
-   name =>    'RADIUS_NAS_IP',
-   type =>    't',
-   default => ''
-  },
-
-  {
-   name =>    'RADIUS_email_suffix',
-   type =>    't',
-   default => ''
-  },
+    {name => 'RADIUS_server', type => 't', default => ''},
+
+    {name => 'RADIUS_secret', type => 't', default => ''},
+
+    {name => 'RADIUS_NAS_IP', type => 't', default => ''},
+
+    {name => 'RADIUS_email_suffix', type => 't', default => ''},
   );
   return @param_list;
 }
diff --git a/Bugzilla/Config/ShadowDB.pm b/Bugzilla/Config/ShadowDB.pm
index 5dbbb5202a..3f0e0e0219 100644
--- a/Bugzilla/Config/ShadowDB.pm
+++ b/Bugzilla/Config/ShadowDB.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::ShadowDB;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,35 +16,23 @@ use Bugzilla::Config::Common;
 our $sortkey = 1500;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'shadowdbhost',
-   type => 't',
-   default => '',
-  },
-
-  {
-   name => 'shadowdbport',
-   type => 't',
-   default => '3306',
-   checker => \&check_numeric,
-  },
-
-  {
-   name => 'shadowdbsock',
-   type => 't',
-   default => '',
-  },
-
-  # This entry must be _after_ the shadowdb{host,port,sock} settings so that
-  # they can be used in the validation here
-  {
-   name => 'shadowdb',
-   type => 't',
-   default => '',
-   checker => \&check_shadowdb
-  } );
+    {name => 'shadowdbhost', type => 't', default => '',},
+
+    {
+      name    => 'shadowdbport',
+      type    => 't',
+      default => '3306',
+      checker => \&check_numeric,
+    },
+
+    {name => 'shadowdbsock', type => 't', default => '',},
+
+    # This entry must be _after_ the shadowdb{host,port,sock} settings so that
+    # they can be used in the validation here
+    {name => 'shadowdb', type => 't', default => '', checker => \&check_shadowdb}
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Config/UserMatch.pm b/Bugzilla/Config/UserMatch.pm
index 3f74a7c44e..cbd8515fa6 100644
--- a/Bugzilla/Config/UserMatch.pm
+++ b/Bugzilla/Config/UserMatch.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Config::UserMatch;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,32 +16,21 @@ use Bugzilla::Config::Common;
 our $sortkey = 1600;
 
 sub get_param_list {
-  my $class = shift;
+  my $class      = shift;
   my @param_list = (
-  {
-   name => 'usemenuforusers',
-   type => 'b',
-   default => '0'
-  },
-
-  {
-   name    => 'ajax_user_autocompletion', 
-   type    => 'b', 
-   default => '1', 
-  },
-
-  {
-   name    => 'maxusermatches',
-   type    => 't',
-   default => '1000',
-   checker => \&check_numeric
-  },
-
-  {
-   name    => 'confirmuniqueusermatch',
-   type    => 'b',
-   default => 1,
-  } );
+    {name => 'usemenuforusers', type => 'b', default => '0'},
+
+    {name => 'ajax_user_autocompletion', type => 'b', default => '1',},
+
+    {
+      name    => 'maxusermatches',
+      type    => 't',
+      default => '1000',
+      checker => \&check_numeric
+    },
+
+    {name => 'confirmuniqueusermatch', type => 'b', default => 1,}
+  );
   return @param_list;
 }
 
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 4c1f110036..5e416c5133 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Constants;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -15,186 +15,193 @@ use parent qw(Exporter);
 
 # For bz_locations
 use File::Basename;
-use Memoize;
 
 @Bugzilla::Constants::EXPORT = qw(
-    BUGZILLA_VERSION
-    REST_DOC
-
-    REMOTE_FILE
-    LOCAL_FILE
+  BUGZILLA_VERSION
+  REST_DOC
 
-    bz_locations
-
-    CONCATENATE_ASSETS
-
-    IS_NULL
-    NOT_NULL
-
-    CONTROLMAPNA
-    CONTROLMAPSHOWN
-    CONTROLMAPDEFAULT
-    CONTROLMAPMANDATORY
-
-    AUTH_OK
-    AUTH_NODATA
-    AUTH_ERROR
-    AUTH_LOGINFAILED
-    AUTH_DISABLED
-    AUTH_NO_SUCH_USER
-    AUTH_LOCKOUT
-
-    USER_PASSWORD_MIN_LENGTH
-
-    LOGIN_OPTIONAL
-    LOGIN_NORMAL
-    LOGIN_REQUIRED
-
-    LOGOUT_ALL
-    LOGOUT_CURRENT
-    LOGOUT_KEEP_CURRENT
-
-    GRANT_DIRECT
-    GRANT_REGEXP
-
-    GROUP_MEMBERSHIP
-    GROUP_BLESS
-    GROUP_VISIBLE
-
-    MAILTO_USER
-    MAILTO_GROUP
-
-    DEFAULT_COLUMN_LIST
-    DEFAULT_QUERY_NAME
-    DEFAULT_MILESTONE
-
-    SAVE_NUM_SEARCHES
-
-    COMMENT_COLS
-    MAX_COMMENT_LENGTH
-
-    MIN_COMMENT_TAG_LENGTH
-    MAX_COMMENT_TAG_LENGTH
-
-    CMT_NORMAL
-    CMT_DUPE_OF
-    CMT_HAS_DUPE
-    CMT_ATTACHMENT_CREATED
-    CMT_ATTACHMENT_UPDATED
-
-    THROW_ERROR
-    
-    RELATIONSHIPS
-    REL_ASSIGNEE REL_QA REL_REPORTER REL_CC REL_GLOBAL_WATCHER
-    REL_ANY
-    
-    POS_EVENTS
-    EVT_OTHER EVT_ADDED_REMOVED EVT_COMMENT EVT_ATTACHMENT EVT_ATTACHMENT_DATA
-    EVT_PROJ_MANAGEMENT EVT_OPENED_CLOSED EVT_KEYWORD EVT_CC EVT_DEPEND_BLOCK
-    EVT_BUG_CREATED EVT_COMPONENT
-
-    NEG_EVENTS
-    EVT_UNCONFIRMED EVT_CHANGED_BY_ME 
-        
-    GLOBAL_EVENTS
-    EVT_FLAG_REQUESTED EVT_REQUESTED_FLAG
-
-    ADMIN_GROUP_NAME
-    PER_PRODUCT_PRIVILEGES
-
-    SENDMAIL_EXE
-    SENDMAIL_PATH
-
-    FIELD_TYPE_UNKNOWN
-    FIELD_TYPE_FREETEXT
-    FIELD_TYPE_SINGLE_SELECT
-    FIELD_TYPE_MULTI_SELECT
-    FIELD_TYPE_TEXTAREA
-    FIELD_TYPE_DATETIME
-    FIELD_TYPE_DATE
-    FIELD_TYPE_BUG_ID
-    FIELD_TYPE_BUG_URLS
-    FIELD_TYPE_KEYWORDS
-    FIELD_TYPE_INTEGER
-    FIELD_TYPE_HIGHEST_PLUS_ONE
-
-    EMPTY_DATETIME_REGEX
-
-    ABNORMAL_SELECTS
-
-    TIMETRACKING_FIELDS
-
-    USAGE_MODE_BROWSER
-    USAGE_MODE_CMDLINE
-    USAGE_MODE_XMLRPC
-    USAGE_MODE_EMAIL
-    USAGE_MODE_JSON
-    USAGE_MODE_TEST
-    USAGE_MODE_REST
-
-    ERROR_MODE_WEBPAGE
-    ERROR_MODE_DIE
-    ERROR_MODE_DIE_SOAP_FAULT
-    ERROR_MODE_JSON_RPC
-    ERROR_MODE_TEST
-    ERROR_MODE_REST
-
-    COLOR_ERROR
-    COLOR_SUCCESS
-
-    INSTALLATION_MODE_INTERACTIVE
-    INSTALLATION_MODE_NON_INTERACTIVE
-
-    DB_MODULE
-    ROOT_USER
-    ON_WINDOWS
-    ON_ACTIVESTATE
-
-    MAX_TOKEN_AGE
-    MAX_LOGINCOOKIE_AGE
-    MAX_SUDO_TOKEN_AGE
-    MAX_LOGIN_ATTEMPTS
-    LOGIN_LOCKOUT_INTERVAL
-    ACCOUNT_CHANGE_INTERVAL
-    MAX_STS_AGE
-
-    SAFE_PROTOCOLS
-    LEGAL_CONTENT_TYPES
-
-    MIN_SMALLINT
-    MAX_SMALLINT
-    MAX_INT_32
-
-    MAX_LEN_QUERY_NAME
-    MAX_CLASSIFICATION_SIZE
-    MAX_PRODUCT_SIZE
-    MAX_MILESTONE_SIZE
-    MAX_COMPONENT_SIZE
-    MAX_FIELD_VALUE_SIZE
-    MAX_FIELD_LONG_DESC_LENGTH
-    MAX_FREETEXT_LENGTH
-    MAX_BUG_URL_LENGTH
-    MAX_POSSIBLE_DUPLICATES
-    MAX_ATTACH_FILENAME_LENGTH
-    MAX_QUIP_LENGTH
-    MAX_WEBDOT_BUGS
-
-    PASSWORD_DIGEST_ALGORITHM
-    PASSWORD_SALT_LENGTH
-    
-    CGI_URI_LIMIT
-
-    PRIVILEGES_REQUIRED_NONE
-    PRIVILEGES_REQUIRED_REPORTER
-    PRIVILEGES_REQUIRED_ASSIGNEE
-    PRIVILEGES_REQUIRED_EMPOWERED
-
-    AUDIT_CREATE
-    AUDIT_REMOVE
-
-    MOST_FREQUENT_THRESHOLD
-
-    MARKDOWN_TAB_WIDTH
+  REMOTE_FILE
+  LOCAL_FILE
+
+  bz_locations
+
+  CAN_HAS_FEATURE
+
+  CONCATENATE_ASSETS
+
+  IS_NULL
+  NOT_NULL
+
+  CONTROLMAPNA
+  CONTROLMAPSHOWN
+  CONTROLMAPDEFAULT
+  CONTROLMAPMANDATORY
+
+  AUTH_OK
+  AUTH_NODATA
+  AUTH_ERROR
+  AUTH_LOGINFAILED
+  AUTH_DISABLED
+  AUTH_NO_SUCH_USER
+  AUTH_LOCKOUT
+
+  USER_PASSWORD_MIN_LENGTH
+
+  LOGIN_OPTIONAL
+  LOGIN_NORMAL
+  LOGIN_REQUIRED
+
+  LOGOUT_ALL
+  LOGOUT_CURRENT
+  LOGOUT_KEEP_CURRENT
+
+  GRANT_DIRECT
+  GRANT_REGEXP
+
+  GROUP_MEMBERSHIP
+  GROUP_BLESS
+  GROUP_VISIBLE
+
+  MAILTO_USER
+  MAILTO_GROUP
+
+  DEFAULT_COLUMN_LIST
+  DEFAULT_QUERY_NAME
+  DEFAULT_MILESTONE
+
+  SAVE_NUM_SEARCHES
+
+  COMMENT_COLS
+  MAX_COMMENT_LENGTH
+
+  MIN_COMMENT_TAG_LENGTH
+  MAX_COMMENT_TAG_LENGTH
+
+  CMT_NORMAL
+  CMT_DUPE_OF
+  CMT_HAS_DUPE
+  CMT_ATTACHMENT_CREATED
+  CMT_ATTACHMENT_UPDATED
+
+  THROW_ERROR
+
+  RELATIONSHIPS
+  REL_ASSIGNEE REL_QA REL_REPORTER REL_CC REL_GLOBAL_WATCHER
+  REL_ANY
+
+  POS_EVENTS
+  EVT_OTHER EVT_ADDED_REMOVED EVT_COMMENT EVT_ATTACHMENT EVT_ATTACHMENT_DATA
+  EVT_PROJ_MANAGEMENT EVT_OPENED_CLOSED EVT_KEYWORD EVT_CC EVT_DEPEND_BLOCK
+  EVT_BUG_CREATED EVT_COMPONENT
+
+  NEG_EVENTS
+  EVT_UNCONFIRMED EVT_CHANGED_BY_ME EVT_MINOR_UPDATE
+
+  GLOBAL_EVENTS
+  EVT_FLAG_REQUESTED EVT_REQUESTED_FLAG
+
+  ADMIN_GROUP_NAME
+  PER_PRODUCT_PRIVILEGES
+
+  SENDMAIL_EXE
+  SENDMAIL_PATH
+
+  FIELD_TYPE_UNKNOWN
+  FIELD_TYPE_FREETEXT
+  FIELD_TYPE_SINGLE_SELECT
+  FIELD_TYPE_MULTI_SELECT
+  FIELD_TYPE_TEXTAREA
+  FIELD_TYPE_DATETIME
+  FIELD_TYPE_DATE
+  FIELD_TYPE_BUG_ID
+  FIELD_TYPE_BUG_URLS
+  FIELD_TYPE_KEYWORDS
+  FIELD_TYPE_INTEGER
+  FIELD_TYPE_HIGHEST_PLUS_ONE
+
+  EMPTY_DATETIME_REGEX
+
+  ABNORMAL_SELECTS
+
+  TIMETRACKING_FIELDS
+
+  USAGE_MODE_BROWSER
+  USAGE_MODE_CMDLINE
+  USAGE_MODE_XMLRPC
+  USAGE_MODE_EMAIL
+  USAGE_MODE_JSON
+  USAGE_MODE_TEST
+  USAGE_MODE_REST
+
+  ERROR_MODE_WEBPAGE
+  ERROR_MODE_DIE
+  ERROR_MODE_DIE_SOAP_FAULT
+  ERROR_MODE_JSON_RPC
+  ERROR_MODE_TEST
+  ERROR_MODE_REST
+
+  COLOR_ERROR
+  COLOR_SUCCESS
+
+  INSTALLATION_MODE_INTERACTIVE
+  INSTALLATION_MODE_NON_INTERACTIVE
+
+  DB_MODULE
+  ROOT_USER
+  ON_WINDOWS
+  ON_ACTIVESTATE
+
+  MAX_TOKEN_AGE
+  MAX_LOGINCOOKIE_AGE
+  MAX_SUDO_TOKEN_AGE
+  MAX_LOGIN_ATTEMPTS
+  LOGIN_LOCKOUT_INTERVAL
+  ACCOUNT_CHANGE_INTERVAL
+  MAX_STS_AGE
+
+  SAFE_PROTOCOLS
+  LEGAL_CONTENT_TYPES
+
+  MIN_SMALLINT
+  MAX_SMALLINT
+  MAX_INT_32
+
+  MAX_LEN_QUERY_NAME
+  MAX_CLASSIFICATION_SIZE
+  MAX_PRODUCT_SIZE
+  MAX_MILESTONE_SIZE
+  MAX_COMPONENT_SIZE
+  MAX_FIELD_VALUE_SIZE
+  MAX_FIELD_LONG_DESC_LENGTH
+  MAX_FREETEXT_LENGTH
+  MAX_BUG_URL_LENGTH
+  MAX_POSSIBLE_DUPLICATES
+  MAX_ATTACH_FILENAME_LENGTH
+  MAX_QUIP_LENGTH
+  MAX_WEBDOT_BUGS
+
+  PASSWORD_DIGEST_ALGORITHM
+  PASSWORD_SALT_LENGTH
+
+  CGI_URI_LIMIT
+
+  PRIVILEGES_REQUIRED_NONE
+  PRIVILEGES_REQUIRED_REPORTER
+  PRIVILEGES_REQUIRED_ASSIGNEE
+  PRIVILEGES_REQUIRED_EMPOWERED
+
+  AUDIT_CREATE
+  AUDIT_REMOVE
+
+  MOST_FREQUENT_THRESHOLD
+
+  MARKDOWN_TAB_WIDTH
+
+  EMAIL_LIMIT_PER_MINUTE
+  EMAIL_LIMIT_PER_HOUR
+  EMAIL_LIMIT_EXCEPTION
+
+  JOB_QUEUE_VIEW_MAX_JOBS
 );
 
 @Bugzilla::Constants::EXPORT_OK = qw(contenttypes);
@@ -202,20 +209,35 @@ use Memoize;
 # CONSTANTS
 #
 # Bugzilla version
-use constant BUGZILLA_VERSION => "4.5.6+";
+# NOTE: 5.1.x and 5.3.x are the same lineage, due to 5.2 branching from
+# 5.0.6 instead of 5.1.x
+use constant BUGZILLA_VERSION => "5.3.3+";
 
 # A base link to the current REST Documentation. We place it here
 # as it will need to be updated to whatever the current release is.
-use constant REST_DOC => "http://www.bugzilla.org/docs/tip/en/html/api/";
+use constant REST_DOC => 'https://bugzilla.readthedocs.org/en/latest/api/';
 
 # Location of the remote and local XML files to track new releases.
 use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml';
-use constant LOCAL_FILE  => 'bugzilla-update.xml'; # Relative to datadir.
+use constant LOCAL_FILE => 'bugzilla-update.xml';    # Relative to datadir.
+
+use constant CAN_HAS_FEATURE => eval {
+  require CPAN::Meta::Prereqs;
+  require CPAN::Meta::Requirements;
+  require Module::Metadata;
+  require Module::Runtime;
+  CPAN::Meta::Prereqs->VERSION('2.132830');
+  CPAN::Meta::Requirements->VERSION('2.121');
+  Module::Metadata->VERSION('1.000019');
+  1;
+};
 
 # When true CSS and JavaScript assets will be concatanted and minified at
 # run-time, to reduce the number of requests required to render a page.
 # Setting this to a false value can help debugging.
-use constant CONCATENATE_ASSETS => 1;
+use constant CONCATENATE_ASSETS => $ENV{PLACK_ENV}
+  ? $ENV{PLACK_ENV} ne "development"
+  : 1;
 
 # These are unique values that are unlikely to match a string or a number,
 # to be used in criteria for match() functions and other things. They start
@@ -231,9 +253,9 @@ use constant NOT_NULL => '  __NOT_NULL__  ';
 #
 # ControlMap constants for group_control_map.
 # membercontol:othercontrol => meaning
-# Na:Na               => Bugs in this product may not be restricted to this 
+# Na:Na               => Bugs in this product may not be restricted to this
 #                        group.
-# Shown:Na            => Members of the group may restrict bugs 
+# Shown:Na            => Members of the group may restrict bugs
 #                        in this product to this group.
 # Shown:Shown         => Members of the group may restrict bugs
 #                        in this product to this group.
@@ -255,46 +277,46 @@ use constant NOT_NULL => '  __NOT_NULL__  ';
 # Mandatory:Mandatory => Bug will be forced into this group regardless.
 # All other combinations are illegal.
 
-use constant CONTROLMAPNA => 0;
-use constant CONTROLMAPSHOWN => 1;
-use constant CONTROLMAPDEFAULT => 2;
+use constant CONTROLMAPNA        => 0;
+use constant CONTROLMAPSHOWN     => 1;
+use constant CONTROLMAPDEFAULT   => 2;
 use constant CONTROLMAPMANDATORY => 3;
 
 # See Bugzilla::Auth for docs on AUTH_*, LOGIN_* and LOGOUT_*
 
-use constant AUTH_OK => 0;
-use constant AUTH_NODATA => 1;
-use constant AUTH_ERROR => 2;
-use constant AUTH_LOGINFAILED => 3;
-use constant AUTH_DISABLED => 4;
-use constant AUTH_NO_SUCH_USER  => 5;
-use constant AUTH_LOCKOUT => 6;
+use constant AUTH_OK           => 0;
+use constant AUTH_NODATA       => 1;
+use constant AUTH_ERROR        => 2;
+use constant AUTH_LOGINFAILED  => 3;
+use constant AUTH_DISABLED     => 4;
+use constant AUTH_NO_SUCH_USER => 5;
+use constant AUTH_LOCKOUT      => 6;
 
 # The minimum length a password must have.
 use constant USER_PASSWORD_MIN_LENGTH => 6;
 
 use constant LOGIN_OPTIONAL => 0;
-use constant LOGIN_NORMAL => 1;
+use constant LOGIN_NORMAL   => 1;
 use constant LOGIN_REQUIRED => 2;
 
-use constant LOGOUT_ALL => 0;
-use constant LOGOUT_CURRENT => 1;
+use constant LOGOUT_ALL          => 0;
+use constant LOGOUT_CURRENT      => 1;
 use constant LOGOUT_KEEP_CURRENT => 2;
 
 use constant GRANT_DIRECT => 0;
 use constant GRANT_REGEXP => 2;
 
 use constant GROUP_MEMBERSHIP => 0;
-use constant GROUP_BLESS => 1;
-use constant GROUP_VISIBLE => 2;
+use constant GROUP_BLESS      => 1;
+use constant GROUP_VISIBLE    => 2;
 
-use constant MAILTO_USER => 0;
+use constant MAILTO_USER  => 0;
 use constant MAILTO_GROUP => 1;
 
 # The default list of columns for buglist.cgi
 use constant DEFAULT_COLUMN_LIST => (
-    "product", "component", "assigned_to",
-    "bug_status", "resolution", "short_desc", "changeddate"
+  "product",    "component",  "assigned_to", "bug_status",
+  "resolution", "short_desc", "changeddate"
 );
 
 # Used by query.cgi and buglist.cgi as the named-query name
@@ -309,6 +331,7 @@ use constant SAVE_NUM_SEARCHES => 10;
 
 # The column width for comment textareas and comments in bugmails.
 use constant COMMENT_COLS => 80;
+
 # Used in _check_comment(). Gives the max length allowed for a comment.
 use constant MAX_COMMENT_LENGTH => 65535;
 
@@ -317,9 +340,10 @@ use constant MIN_COMMENT_TAG_LENGTH => 3;
 use constant MAX_COMMENT_TAG_LENGTH => 24;
 
 # The type of bug comments.
-use constant CMT_NORMAL => 0;
-use constant CMT_DUPE_OF => 1;
+use constant CMT_NORMAL   => 0;
+use constant CMT_DUPE_OF  => 1;
 use constant CMT_HAS_DUPE => 2;
+
 # Type 3 was CMT_POPULAR_VOTES, which moved to the Voting extension.
 # Type 4 was CMT_MOVED_TO, which moved to the OldBugMove extension.
 use constant CMT_ATTACHMENT_CREATED => 5;
@@ -329,27 +353,26 @@ use constant CMT_ATTACHMENT_UPDATED => 6;
 # an error when the validation fails.
 use constant THROW_ERROR => 1;
 
-use constant REL_ASSIGNEE           => 0;
-use constant REL_QA                 => 1;
-use constant REL_REPORTER           => 2;
-use constant REL_CC                 => 3;
+use constant REL_ASSIGNEE => 0;
+use constant REL_QA       => 1;
+use constant REL_REPORTER => 2;
+use constant REL_CC       => 3;
+
 # REL 4 was REL_VOTER, before it was moved ino an extension.
-use constant REL_GLOBAL_WATCHER     => 5;
+use constant REL_GLOBAL_WATCHER => 5;
 
 # We need these strings for the X-Bugzilla-Reasons header
 # Note: this hash uses "," rather than "=>" to avoid auto-quoting of the LHS.
 # This should be accessed through Bugzilla::BugMail::relationships() instead
 # of being accessed directly.
 use constant RELATIONSHIPS => {
-    REL_ASSIGNEE      , "AssignedTo",
-    REL_REPORTER      , "Reporter",
-    REL_QA            , "QAcontact",
-    REL_CC            , "CC",
-    REL_GLOBAL_WATCHER, "GlobalWatcher"
+  REL_ASSIGNEE,       "AssignedTo", REL_REPORTER, "Reporter",
+  REL_QA,             "QAcontact",  REL_CC,       "CC",
+  REL_GLOBAL_WATCHER, "GlobalWatcher"
 };
-                              
+
 # Used for global events like EVT_FLAG_REQUESTED
-use constant REL_ANY                => 100;
+use constant REL_ANY => 100;
 
 # There are two sorts of event - positive and negative. Positive events are
 # those for which the user says "I want mail if this happens." Negative events
@@ -357,34 +380,35 @@ use constant REL_ANY                => 100;
 #
 # Exactly when each event fires is defined in wants_bug_mail() in User.pm; I'm
 # not commenting them here in case the comments and the code get out of sync.
-use constant EVT_OTHER              => 0;
-use constant EVT_ADDED_REMOVED      => 1;
-use constant EVT_COMMENT            => 2;
-use constant EVT_ATTACHMENT         => 3;
-use constant EVT_ATTACHMENT_DATA    => 4;
-use constant EVT_PROJ_MANAGEMENT    => 5;
-use constant EVT_OPENED_CLOSED      => 6;
-use constant EVT_KEYWORD            => 7;
-use constant EVT_CC                 => 8;
-use constant EVT_DEPEND_BLOCK       => 9;
-use constant EVT_BUG_CREATED        => 10;
-use constant EVT_COMPONENT          => 11;
-
-use constant POS_EVENTS => EVT_OTHER, EVT_ADDED_REMOVED, EVT_COMMENT, 
-                           EVT_ATTACHMENT, EVT_ATTACHMENT_DATA, 
-                           EVT_PROJ_MANAGEMENT, EVT_OPENED_CLOSED, EVT_KEYWORD,
-                           EVT_CC, EVT_DEPEND_BLOCK, EVT_BUG_CREATED,
-                           EVT_COMPONENT;
-
-use constant EVT_UNCONFIRMED        => 50;
-use constant EVT_CHANGED_BY_ME      => 51;
-
-use constant NEG_EVENTS => EVT_UNCONFIRMED, EVT_CHANGED_BY_ME;
+use constant EVT_OTHER           => 0;
+use constant EVT_ADDED_REMOVED   => 1;
+use constant EVT_COMMENT         => 2;
+use constant EVT_ATTACHMENT      => 3;
+use constant EVT_ATTACHMENT_DATA => 4;
+use constant EVT_PROJ_MANAGEMENT => 5;
+use constant EVT_OPENED_CLOSED   => 6;
+use constant EVT_KEYWORD         => 7;
+use constant EVT_CC              => 8;
+use constant EVT_DEPEND_BLOCK    => 9;
+use constant EVT_BUG_CREATED     => 10;
+use constant EVT_COMPONENT       => 11;
+
+use constant
+  POS_EVENTS => EVT_OTHER,
+  EVT_ADDED_REMOVED,   EVT_COMMENT,       EVT_ATTACHMENT, EVT_ATTACHMENT_DATA,
+  EVT_PROJ_MANAGEMENT, EVT_OPENED_CLOSED, EVT_KEYWORD,    EVT_CC,
+  EVT_DEPEND_BLOCK,    EVT_BUG_CREATED,   EVT_COMPONENT;
+
+use constant EVT_UNCONFIRMED   => 50;
+use constant EVT_CHANGED_BY_ME => 51;
+use constant EVT_MINOR_UPDATE  => 52;
+
+use constant NEG_EVENTS => EVT_UNCONFIRMED, EVT_CHANGED_BY_ME, EVT_MINOR_UPDATE;
 
 # These are the "global" flags, which aren't tied to a particular relationship.
 # and so use REL_ANY.
-use constant EVT_FLAG_REQUESTED     => 100; # Flag has been requested of me
-use constant EVT_REQUESTED_FLAG     => 101; # I have requested a flag
+use constant EVT_FLAG_REQUESTED => 100;    # Flag has been requested of me
+use constant EVT_REQUESTED_FLAG => 101;    # I have requested a flag
 
 use constant GLOBAL_EVENTS => EVT_FLAG_REQUESTED, EVT_REQUESTED_FLAG;
 
@@ -392,10 +416,12 @@ use constant GLOBAL_EVENTS => EVT_FLAG_REQUESTED, EVT_REQUESTED_FLAG;
 use constant ADMIN_GROUP_NAME => 'admin';
 
 # Privileges which can be per-product.
-use constant PER_PRODUCT_PRIVILEGES => ('editcomponents', 'editbugs', 'canconfirm');
+use constant PER_PRODUCT_PRIVILEGES =>
+  ('editcomponents', 'editbugs', 'canconfirm');
 
 # Path to sendmail.exe (Windows only)
 use constant SENDMAIL_EXE => '/usr/lib/sendmail.exe';
+
 # Paths to search for the sendmail binary (non-Windows)
 use constant SENDMAIL_PATH => '/usr/lib:/usr/sbin:/usr/ucblib';
 
@@ -406,45 +432,46 @@ use constant SENDMAIL_PATH => '/usr/lib:/usr/sbin:/usr/ucblib';
 # we do more than we would do for a standard integer type (f.e. we might
 # display a user picker).
 
-use constant FIELD_TYPE_UNKNOWN   => 0;
-use constant FIELD_TYPE_FREETEXT  => 1;
+use constant FIELD_TYPE_UNKNOWN       => 0;
+use constant FIELD_TYPE_FREETEXT      => 1;
 use constant FIELD_TYPE_SINGLE_SELECT => 2;
-use constant FIELD_TYPE_MULTI_SELECT => 3;
-use constant FIELD_TYPE_TEXTAREA  => 4;
-use constant FIELD_TYPE_DATETIME  => 5;
-use constant FIELD_TYPE_BUG_ID  => 6;
-use constant FIELD_TYPE_BUG_URLS => 7;
-use constant FIELD_TYPE_KEYWORDS => 8;
-use constant FIELD_TYPE_DATE => 9;
-use constant FIELD_TYPE_INTEGER => 10;
+use constant FIELD_TYPE_MULTI_SELECT  => 3;
+use constant FIELD_TYPE_TEXTAREA      => 4;
+use constant FIELD_TYPE_DATETIME      => 5;
+use constant FIELD_TYPE_BUG_ID        => 6;
+use constant FIELD_TYPE_BUG_URLS      => 7;
+use constant FIELD_TYPE_KEYWORDS      => 8;
+use constant FIELD_TYPE_DATE          => 9;
+use constant FIELD_TYPE_INTEGER       => 10;
+
 # Add new field types above this line, and change the below value in the
 # obvious fashion
 use constant FIELD_TYPE_HIGHEST_PLUS_ONE => 11;
 
-use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/; 
+use constant EMPTY_DATETIME_REGEX => qr/^[0\-:\sA-Za-z]+$/;
 
 # See the POD for Bugzilla::Field/is_abnormal to see why these are listed
 # here.
-use constant ABNORMAL_SELECTS => {
-    classification => 1,
-    component      => 1,
-    product        => 1,
-};
+use constant ABNORMAL_SELECTS =>
+  {classification => 1, component => 1, product => 1,};
 
 # The fields from fielddefs that are blocked from non-timetracking users.
 # work_time is sometimes called actual_time.
 use constant TIMETRACKING_FIELDS =>
-    qw(estimated_time remaining_time work_time actual_time percentage_complete);
+  qw(estimated_time remaining_time work_time actual_time percentage_complete);
 
 # The maximum number of days a token will remain valid.
 use constant MAX_TOKEN_AGE => 3;
+
 # How many days a logincookie will remain valid if not used.
 use constant MAX_LOGINCOOKIE_AGE => 30;
+
 # How many seconds (default is 6 hours) a sudo cookie remains valid.
 use constant MAX_SUDO_TOKEN_AGE => 21600;
 
 # Maximum failed logins to lock account for this IP
 use constant MAX_LOGIN_ATTEMPTS => 5;
+
 # If the maximum login attempts occur during this many minutes, the
 # account is locked.
 use constant LOGIN_LOCKOUT_INTERVAL => 30;
@@ -458,36 +485,39 @@ use constant ACCOUNT_CHANGE_INTERVAL => 10;
 use constant MAX_STS_AGE => 604800;
 
 # Protocols which are considered as safe.
-use constant SAFE_PROTOCOLS => ('afs', 'cid', 'ftp', 'gopher', 'http', 'https',
-                                'irc', 'ircs', 'mid', 'news', 'nntp', 'prospero',
-                                'telnet', 'view-source', 'wais');
+use constant SAFE_PROTOCOLS => (
+  'afs',    'cid',         'ftp', 'gopher', 'http', 'https',
+  'irc',    'ircs',        'mid', 'news',   'nntp', 'prospero',
+  'telnet', 'view-source', 'wais'
+);
 
 # Valid MIME types for attachments.
-use constant LEGAL_CONTENT_TYPES => ('application', 'audio', 'image', 'message',
-                                     'model', 'multipart', 'text', 'video');
-
-use constant contenttypes =>
-  {
-   "html" => "text/html" ,
-   "rdf"  => "application/rdf+xml" ,
-   "atom" => "application/atom+xml" ,
-   "xml"  => "application/xml" ,
-   "dtd"  => "application/xml-dtd" , 
-   "js"   => "application/x-javascript" ,
-   "json" => "application/json" ,
-   "csv"  => "text/csv" ,
-   "png"  => "image/png" ,
-   "ics"  => "text/calendar" ,
-  };
+use constant LEGAL_CONTENT_TYPES => (
+  'application', 'audio',     'image', 'message',
+  'model',       'multipart', 'text',  'video'
+);
+
+use constant contenttypes => {
+  "html" => "text/html",
+  "rdf"  => "application/rdf+xml",
+  "atom" => "application/atom+xml",
+  "xml"  => "application/xml",
+  "dtd"  => "application/xml-dtd",
+  "js"   => "application/x-javascript",
+  "json" => "application/json",
+  "csv"  => "text/csv",
+  "png"  => "image/png",
+  "ics"  => "text/calendar",
+};
 
 # Usage modes. Default USAGE_MODE_BROWSER. Use with Bugzilla->usage_mode.
-use constant USAGE_MODE_BROWSER    => 0;
-use constant USAGE_MODE_CMDLINE    => 1;
-use constant USAGE_MODE_XMLRPC     => 2;
-use constant USAGE_MODE_EMAIL      => 3;
-use constant USAGE_MODE_JSON       => 4;
-use constant USAGE_MODE_TEST       => 5;
-use constant USAGE_MODE_REST       => 6;
+use constant USAGE_MODE_BROWSER => 0;
+use constant USAGE_MODE_CMDLINE => 1;
+use constant USAGE_MODE_XMLRPC  => 2;
+use constant USAGE_MODE_EMAIL   => 3;
+use constant USAGE_MODE_JSON    => 4;
+use constant USAGE_MODE_TEST    => 5;
+use constant USAGE_MODE_REST    => 6;
 
 # Error modes. Default set by Bugzilla->usage_mode (so ERROR_MODE_WEBPAGE
 # usually). Use with Bugzilla->error_mode.
@@ -499,60 +529,42 @@ use constant ERROR_MODE_TEST           => 4;
 use constant ERROR_MODE_REST           => 5;
 
 # The ANSI colors of messages that command-line scripts use
-use constant COLOR_ERROR => 'red';
+use constant COLOR_ERROR   => 'red';
 use constant COLOR_SUCCESS => 'green';
 
 # The various modes that checksetup.pl can run in.
-use constant INSTALLATION_MODE_INTERACTIVE => 0;
+use constant INSTALLATION_MODE_INTERACTIVE     => 0;
 use constant INSTALLATION_MODE_NON_INTERACTIVE => 1;
 
 # Data about what we require for different databases.
 use constant DB_MODULE => {
-    # MySQL 5.0.15 was the first production 5.0.x release.
-    'mysql' => {db => 'Bugzilla::DB::Mysql', db_version => '5.0.15',
-                dbd => { 
-                    package => 'DBD-mysql',
-                    module  => 'DBD::mysql',
-                    # Disallow development versions
-                    blacklist => ['_'],
-                    # For UTF-8 support. 4.001 makes sure that blobs aren't
-                    # marked as UTF-8.
-                    version => '4.001',
-                },
-                name => 'MySQL'},
-    # Also see Bugzilla::DB::Pg::bz_check_server_version, which has special
-    # code to require DBD::Pg 2.17.2 for PostgreSQL 9 and above.
-    'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.03.0000',
-                dbd => {
-                    package => 'DBD-Pg',
-                    module  => 'DBD::Pg',
-                    # 2.7.0 fixes a problem with quoting strings
-                    # containing backslashes in them.
-                    version => '2.7.0',
-                },
-                name => 'PostgreSQL'},
-     'oracle'=> {db => 'Bugzilla::DB::Oracle', db_version => '10.02.0',
-                dbd => {
-                     package => 'DBD-Oracle',
-                     module  => 'DBD::Oracle',
-                     version => '1.19',
-                },
-                name => 'Oracle'},
-     # SQLite 3.6.22 fixes a WHERE clause problem that may affect us.
-    sqlite => {db => 'Bugzilla::DB::Sqlite', db_version => '3.6.22',
-               dbd => {
-                   package => 'DBD-SQLite',
-                   module  => 'DBD::SQLite',
-                   # 1.29 is the version that contains 3.6.22.
-                   version => '1.29',
-               },
-               name => 'SQLite'},
+
+  # MySQL 5.0.15 was the first production 5.0.x release.
+  # We blocklist MySQL 8.0 and newer, and explicitly list MariaDB as an
+  # alternative. The db_blklst_str is shown in the auto-generated release notes
+  # instead of the regexp. We can't tell Maria apart from MySQL in our check
+  # and MariaDB skipped versions from 5 to 10, so we'll blocklist 8 and 9 for
+  # MariaDB as well just in case someone configured for 'mariadb' but actually
+  # has MySQL installed. See https://bugzilla.mozilla.org/show_bug.cgi?id=1851354
+  mysql => {db => 'Bugzilla::DB::Mysql', db_version => '5.0.15', name => 'MySQL',
+            db_blocklist => ['^[89]\.'], db_blklst_str => '>= 8.0'},
+  mariadb => {db => 'Bugzilla::DB::Mysql', db_version => '5.1', name => 'MariaDB',
+            db_blocklist => ['^[89]\.']},
+  pg =>
+    {db => 'Bugzilla::DB::Pg', db_version => '9.00.0000', name => 'PostgreSQL'},
+  oracle =>
+    {db => 'Bugzilla::DB::Oracle', db_version => '10.02.0', name => 'Oracle'},
+
+  # SQLite 3.6.22 fixes a WHERE clause problem that may affect us.
+  sqlite =>
+    {db => 'Bugzilla::DB::Sqlite', db_version => '3.6.22', name => 'SQLite'},
 };
 
 # True if we're on Win32.
-use constant ON_WINDOWS => ($^O =~ /MSWin32/i) ? 1 : 0;
+use constant ON_WINDOWS => $^O eq 'MSWin32' ? 1 : 0;
+
 # True if we're using ActiveState Perl (as opposed to Strawberry) on Windows.
-use constant ON_ACTIVESTATE => eval { &Win32::BuildNumber };
+use constant ON_ACTIVESTATE => eval {&Win32::BuildNumber};
 
 # The user who should be considered "root" when we're giving
 # instructions to Bugzilla administrators.
@@ -560,7 +572,7 @@ use constant ROOT_USER => ON_WINDOWS ? 'Administrator' : 'root';
 
 use constant MIN_SMALLINT => -32768;
 use constant MAX_SMALLINT => 32767;
-use constant MAX_INT_32 => 2147483647;
+use constant MAX_INT_32   => 2147483647;
 
 # The longest that a saved search name can be.
 use constant MAX_LEN_QUERY_NAME => 64;
@@ -609,6 +621,7 @@ use constant MAX_WEBDOT_BUGS => 2000;
 # Perl's "Digest" module. Note that if you change this, it won't take
 # effect until a user logs in or changes their password.
 use constant PASSWORD_DIGEST_ALGORITHM => 'SHA-256';
+
 # How long of a salt should we use? Note that if you change this, it
 # won't take effect until a user logs in or changes their password.
 use constant PASSWORD_SALT_LENGTH => 8;
@@ -617,7 +630,9 @@ use constant PASSWORD_SALT_LENGTH => 8;
 # via POST such as buglist.cgi. This value determines whether the redirect
 # can be safely done or not based on the web server's URI length setting.
 # See http://support.microsoft.com/kb/208427 for why MSIE is different
-use constant CGI_URI_LIMIT => ($ENV{'HTTP_USER_AGENT'} || '') =~ /MSIE/ ? 2083 : 8000;
+use constant CGI_URI_LIMIT => ($ENV{'HTTP_USER_AGENT'} || '') =~ /MSIE/
+  ? 2083
+  : 8000;
 
 # If the user isn't allowed to change a field, we must tell them who can.
 # We store the required permission set into the $PrivilegesRequired
@@ -641,74 +656,94 @@ use constant MOST_FREQUENT_THRESHOLD => 2;
 # by Markdown engine
 use constant MARKDOWN_TAB_WIDTH => 2;
 
+# The maximum number of emails per minute and hour a recipient can receive.
+# Email will be queued/backlogged to avoid exceeeding these limits.
+# Setting a limit to 0 will disable this feature.
+use constant EMAIL_LIMIT_PER_MINUTE => 1000;
+use constant EMAIL_LIMIT_PER_HOUR   => 2500;
+
+# Don't change this exception message.
+use constant EMAIL_LIMIT_EXCEPTION => "email_limit_exceeded\n";
+
+# The maximum number of jobs to show when viewing the job queue
+# (view_job_queue.cgi).
+use constant JOB_QUEUE_VIEW_MAX_JOBS => 500;
+
 sub bz_locations {
-    # Force memoize() to re-compute data per project, to avoid
-    # sharing the same data across different installations.
-    return _bz_locations($ENV{'PROJECT'});
+
+  # Force $memoize to re-compute data per project, to avoid
+  # sharing the same data across different installations.
+  state $memoize = {};
+  my $project = $ENV{PROJECT};
+  my $key     = $project // '__DEFAULT';
+
+  return $memoize->{$key} //= _bz_locations($project);
 }
 
 sub _bz_locations {
-    my $project = shift;
-    # We know that Bugzilla/Constants.pm must be in %INC at this point.
-    # So the only question is, what's the name of the directory
-    # above it? This is the most reliable way to get our current working
-    # directory under both mod_cgi and mod_perl. We call dirname twice
-    # to get the name of the directory above the "Bugzilla/" directory.
-    #
-    # Calling dirname twice like that won't work on VMS or AmigaOS
-    # but I doubt anybody runs Bugzilla on those.
-    #
-    # On mod_cgi this will be a relative path. On mod_perl it will be an
-    # absolute path.
-    my $libpath = dirname(dirname($INC{'Bugzilla/Constants.pm'}));
-    # We have to detaint $libpath, but we can't use Bugzilla::Util here.
-    $libpath =~ /(.*)/;
-    $libpath = $1;
-
-    my ($localconfig, $datadir);
-    if ($project && $project =~ /^(\w+)$/) {
-        $project = $1;
-        $localconfig = "localconfig.$project";
-        $datadir = "data/$project";
-    } else {
-        $project = undef;
-        $localconfig = "localconfig";
-        $datadir = "data";
-    }
-
-    $datadir = "$libpath/$datadir";
-    # We have to return absolute paths for mod_perl. 
-    # That means that if you modify these paths, they must be absolute paths.
-    return {
-        'libpath'     => $libpath,
-        'ext_libpath' => "$libpath/lib",
-        # If you put the libraries in a different location than the CGIs,
-        # make sure this still points to the CGIs.
-        'cgi_path'    => $libpath,
-        'templatedir' => "$libpath/template",
-        'template_cache' => "$datadir/template",
-        'project'     => $project,
-        'localconfig' => "$libpath/$localconfig",
-        'datadir'     => $datadir,
-        'attachdir'   => "$datadir/attachments",
-        'skinsdir'    => "$libpath/skins",
-        'graphsdir'   => "$libpath/graphs",
-        # $webdotdir must be in the web server's tree somewhere. Even if you use a 
-        # local dot, we output images to there. Also, if $webdotdir is 
-        # not relative to the bugzilla root directory, you'll need to 
-        # change showdependencygraph.cgi to set image_url to the correct 
-        # location.
-        # The script should really generate these graphs directly...
-        'webdotdir'   => "$datadir/webdot",
-        'extensionsdir' => "$libpath/extensions",
-        'assetsdir'   => "$datadir/assets",
-    };
+  my $project = shift;
+
+  # We know that Bugzilla/Constants.pm must be in %INC at this point.
+  # So the only question is, what's the name of the directory
+  # above it? This is the most reliable way to get our current working
+  # directory under both mod_cgi and mod_perl. We call dirname twice
+  # to get the name of the directory above the "Bugzilla/" directory.
+  #
+  # Calling dirname twice like that won't work on VMS or AmigaOS
+  # but I doubt anybody runs Bugzilla on those.
+  #
+  # On mod_cgi this will be a relative path. On mod_perl it will be an
+  # absolute path.
+  my $libpath = dirname(dirname($INC{'Bugzilla/Constants.pm'}));
+
+  # We have to detaint $libpath, but we can't use Bugzilla::Util here.
+  $libpath =~ /(.*)/;
+  $libpath = $1;
+
+  my ($localconfig, $datadir);
+  if ($project && $project =~ /^([\w-]+)$/) {
+    $project     = $1;
+    $localconfig = "localconfig.$project";
+    $datadir     = "data/$project";
+  }
+  else {
+    $project     = undef;
+    $localconfig = "localconfig";
+    $datadir     = "data";
+  }
+
+  $datadir = "$libpath/$datadir";
+
+  # We have to return absolute paths for mod_perl.
+  # That means that if you modify these paths, they must be absolute paths.
+  return {
+    'libpath'     => $libpath,
+    'ext_libpath' => "$libpath/lib",
+
+    # If you put the libraries in a different location than the CGIs,
+    # make sure this still points to the CGIs.
+    'cgi_path'       => $libpath,
+    'templatedir'    => "$libpath/template",
+    'template_cache' => "$datadir/template",
+    'project'        => $project,
+    'localconfig'    => "$libpath/$localconfig",
+    'datadir'        => $datadir,
+    'attachdir'      => "$datadir/attachments",
+    'skinsdir'       => "$libpath/skins",
+    'graphsdir'      => "$libpath/graphs",
+
+    # $webdotdir must be in the web server's tree somewhere. Even if you use a
+    # local dot, we output images to there. Also, if $webdotdir is
+    # not relative to the bugzilla root directory, you'll need to
+    # change showdependencygraph.cgi to set image_url to the correct
+    # location.
+    # The script should really generate these graphs directly...
+    'webdotdir'     => "$datadir/webdot",
+    'extensionsdir' => "$libpath/extensions",
+    'assetsdir'     => "$datadir/assets",
+  };
 }
 
-# This makes us not re-compute all the bz_locations data every time it's
-# called.
-BEGIN { memoize('_bz_locations') };
-
 1;
 
 =head1 B<Methods in need of POD>
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 29f431b12a..cb9557a0a3 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::DB;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -33,7 +33,7 @@ use Storable qw(dclone);
 # Constants
 #####################################################################
 
-use constant BLOB_TYPE => DBI::SQL_BLOB;
+use constant BLOB_TYPE       => DBI::SQL_BLOB;
 use constant ISOLATION_LEVEL => 'REPEATABLE READ';
 
 # Set default values for what used to be the enum types.  These values
@@ -46,14 +46,14 @@ use constant ISOLATION_LEVEL => 'REPEATABLE READ';
 # Bugzilla with enums. After that, they are either controlled through
 # the Bugzilla UI or through the DB.
 use constant ENUM_DEFAULTS => {
-    bug_severity  => ['blocker', 'critical', 'major', 'normal',
-                      'minor', 'trivial', 'enhancement'],
-    priority     => ["Highest", "High", "Normal", "Low", "Lowest", "---"],
-    op_sys       => ["All","Windows","Mac OS","Linux","Other"],
-    rep_platform => ["All","PC","Macintosh","Other"],
-    bug_status   => ["UNCONFIRMED","CONFIRMED","IN_PROGRESS","RESOLVED",
-                     "VERIFIED"],
-    resolution   => ["","FIXED","INVALID","WONTFIX", "DUPLICATE","WORKSFORME"],
+  bug_severity =>
+    ['blocker', 'critical', 'major', 'normal', 'minor', 'trivial', 'enhancement'],
+  priority     => ["Highest", "High",    "Normal",    "Low",   "Lowest", "---"],
+  op_sys       => ["All",     "Windows", "Mac OS",    "Linux", "Other"],
+  rep_platform => ["All",     "PC",      "Macintosh", "Other"],
+  bug_status =>
+    ["UNCONFIRMED", "CONFIRMED", "IN_PROGRESS", "RESOLVED", "VERIFIED"],
+  resolution => ["", "FIXED", "INVALID", "WONTFIX", "DUPLICATE", "WORKSFORME"],
 };
 
 # The character that means "OR" in a boolean fulltext search. If empty,
@@ -83,14 +83,14 @@ use constant WORD_END   => '($|[^[:alnum:]])';
 use constant INDEX_DROPS_REQUIRE_FK_DROPS => 1;
 
 #####################################################################
-# Overridden Superclass Methods 
+# Overridden Superclass Methods
 #####################################################################
 
 sub quote {
-    my $self = shift;
-    my $retval = $self->SUPER::quote(@_);
-    trick_taint($retval) if defined $retval;
-    return $retval;
+  my $self   = shift;
+  my $retval = $self->SUPER::quote(@_);
+  trick_taint($retval) if defined $retval;
+  return $retval;
 }
 
 #####################################################################
@@ -98,199 +98,201 @@ sub quote {
 #####################################################################
 
 sub connect_shadow {
-    my $params = Bugzilla->params;
-    die "Tried to connect to non-existent shadowdb" 
-        unless $params->{'shadowdb'};
+  my $params = Bugzilla->params;
+  die "Tried to connect to non-existent shadowdb" unless $params->{'shadowdb'};
 
-    # Instead of just passing in a new hashref, we locally modify the
-    # values of "localconfig", because some drivers access it while
-    # connecting.
-    my %connect_params = %{ Bugzilla->localconfig };
-    $connect_params{db_host} = $params->{'shadowdbhost'};
-    $connect_params{db_name} = $params->{'shadowdb'};
-    $connect_params{db_port} = $params->{'shadowdbport'};
-    $connect_params{db_sock} = $params->{'shadowdbsock'};
+  # Instead of just passing in a new hashref, we locally modify the
+  # values of "localconfig", because some drivers access it while
+  # connecting.
+  my %connect_params = %{Bugzilla->localconfig};
+  $connect_params{db_host} = $params->{'shadowdbhost'};
+  $connect_params{db_name} = $params->{'shadowdb'};
+  $connect_params{db_port} = $params->{'shadowdbport'};
+  $connect_params{db_sock} = $params->{'shadowdbsock'};
 
-    return _connect(\%connect_params);
+  return _connect(\%connect_params);
 }
 
 sub connect_main {
-    my $lc = Bugzilla->localconfig;
-    return _connect(Bugzilla->localconfig); 
+  return _connect(Bugzilla->localconfig);
 }
 
 sub _connect {
-    my ($params) = @_;
+  my ($params) = @_;
 
-    my $driver = $params->{db_driver};
-    my $pkg_module = DB_MODULE->{lc($driver)}->{db};
+  my $driver     = $params->{db_driver};
+  my $pkg_module = DB_MODULE->{lc($driver)}->{db};
 
-    # do the actual import
-    eval ("require $pkg_module")
-        || die ("'$driver' is not a valid choice for \$db_driver in "
-                . " localconfig: " . $@);
+  # do the actual import
+  eval("require $pkg_module")
+    || die(
+    "'$driver' is not a valid choice for \$db_driver in " . " localconfig: " . $@);
 
-    # instantiate the correct DB specific module
-    my $dbh = $pkg_module->new($params);
+  # instantiate the correct DB specific module
+  my $dbh = $pkg_module->new($params);
 
-    return $dbh;
+  return $dbh;
 }
 
 sub _handle_error {
-    require Carp;
+  require Carp;
 
-    # Cut down the error string to a reasonable size
-    $_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000)
-        if length($_[0]) > 4000;
-    $_[0] = Carp::longmess($_[0]);
-    return 0; # Now let DBI handle raising the error
-}
+  # Cut down the error string to a reasonable size
+  $_[0] = substr($_[0], 0, 2000) . ' ... ' . substr($_[0], -2000)
+    if length($_[0]) > 4000;
+  $_[0] = Carp::longmess($_[0]);
 
-sub bz_check_requirements {
-    my ($output) = @_;
+  if (!Bugzilla->request_cache->{in_error}
+    && Bugzilla->usage_mode == USAGE_MODE_BROWSER)
+  {
+    Bugzilla->request_cache->{in_error} = 1;
+    ThrowCodeError("db_error", {err_message => $_[0]});
+  }
 
-    my $lc = Bugzilla->localconfig;
-    my $db = DB_MODULE->{lc($lc->{db_driver})};
+  Bugzilla->request_cache->{in_error} = undef;
 
-    # Only certain values are allowed for $db_driver.
-    if (!defined $db) {
-        die "$lc->{db_driver} is not a valid choice for \$db_driver in"
-            . bz_locations()->{'localconfig'};
-    }
+  return 0;    # Now let DBI handle raising the error
+}
 
-    # Check the existence and version of the DBD that we need.
-    my $dbd = $db->{dbd};
-    _bz_check_dbd($db, $output);
+sub bz_check_requirements {
+  my ($output) = @_;
 
-    # We don't try to connect to the actual database if $db_check is
-    # disabled.
-    unless ($lc->{db_check}) {
-        print "\n" if $output;
-        return;
-    }
+  my $lc = Bugzilla->localconfig;
+  my $db = DB_MODULE->{lc($lc->{db_driver})};
 
-    # And now check the version of the database server itself.
-    my $dbh = _get_no_db_connection();
-    $dbh->bz_check_server_version($db, $output);
+  # Only certain values are allowed for $db_driver.
+  if (!defined $db) {
+    die "$lc->{db_driver} is not a valid choice for \$db_driver in"
+      . bz_locations()->{'localconfig'};
+  }
 
+  # We don't try to connect to the actual database if $db_check is
+  # disabled.
+  unless ($lc->{db_check}) {
     print "\n" if $output;
-}
-
-sub _bz_check_dbd {
-    my ($db, $output) = @_;
+    return;
+  }
 
-    my $dbd = $db->{dbd};
-    unless (have_vers($dbd, $output)) {
-        my $sql_server = $db->{name};
-        my $command = install_command($dbd);
-        my $root    = ROOT_USER;
-        my $dbd_mod = $dbd->{module};
-        my $dbd_ver = $dbd->{version};
-        die <<EOT;
+  # And now check the version of the database server itself.
+  my $dbh = _get_no_db_connection();
+  $dbh->bz_check_server_version($db, $output);
 
-For $sql_server, Bugzilla requires that perl's $dbd_mod $dbd_ver or later be
-installed. To install this module, run the following command (as $root):
-
-    $command
-
-EOT
-    }
+  print "\n" if $output;
 }
 
 sub bz_check_server_version {
-    my ($self, $db, $output) = @_;
-
-    my $sql_vers = $self->bz_server_version;
-    $self->disconnect;
-
-    my $sql_want = $db->{db_version};
-    my $version_ok = vers_cmp($sql_vers, $sql_want) > -1 ? 1 : 0;
-
-    my $sql_server = $db->{name};
-    if ($output) {
-        Bugzilla::Install::Requirements::_checking_for({
-            package => $sql_server, wanted => $sql_want,
-            found   => $sql_vers, ok => $version_ok });
-    }
+  my ($self, $db, $output) = @_;
+
+  my $sql_vers = $self->bz_server_version;
+  $self->disconnect;
+
+  my $sql_want = $db->{db_version};
+  my $sql_dontwant = exists $db->{db_blocklist} ? $db->{db_blocklist} : [];
+  my $version_ok = vers_cmp($sql_vers, $sql_want) > -1 ? 1 : 0;
+  my $blocklisted;
+  if ($version_ok) {
+    $blocklisted = grep($sql_vers =~ /$_/, @$sql_dontwant);
+    $version_ok = 0 if $blocklisted;
+  }
+
+  my $sql_server = $db->{name};
+  if ($output) {
+    Bugzilla::Install::Requirements::_checking_for({
+      package => $sql_server,
+      wanted  => $sql_want,
+      found   => $sql_vers,
+      ok      => $version_ok,
+      blocklisted => $blocklisted
+    });
+  }
+
+  # Check what version of the database server is installed and let
+  # the user know if the version is too old to be used with Bugzilla.
+  if ($blocklisted) {
+    die <<EOT;
+
+Your $sql_server v$sql_vers is blocklisted. Please check the
+release notes for details or try a different database engine
+or version.
 
-    # Check what version of the database server is installed and let
-    # the user know if the version is too old to be used with Bugzilla.
-    if (!$version_ok) {
-        die <<EOT;
+EOT
+  }
+  if (!$version_ok) {
+    die <<EOT;
 
 Your $sql_server v$sql_vers is too old. Bugzilla requires version
 $sql_want or later of $sql_server. Please download and install a
 newer version.
 
 EOT
-    }
+  }
 
-    # This is used by subclasses.
-    return $sql_vers;
+  # This is used by subclasses.
+  return $sql_vers;
 }
 
 # Note that this function requires that localconfig exist and
 # be valid.
 sub bz_create_database {
-    my $dbh;
-    # See if we can connect to the actual Bugzilla database.
-    my $conn_success = eval { $dbh = connect_main() };
-    my $db_name = Bugzilla->localconfig->{db_name};
-
-    if (!$conn_success) {
-        $dbh = _get_no_db_connection();
-        say "Creating database $db_name...";
-
-        # Try to create the DB, and if we fail print a friendly error.
-        my $success  = eval {
-            my @sql = $dbh->_bz_schema->get_create_database_sql($db_name);
-            # This ends with 1 because this particular do doesn't always
-            # return something.
-            $dbh->do($_) foreach @sql; 1;
-        };
-        if (!$success) {
-            my $error = $dbh->errstr || $@;
-            chomp($error);
-            die "The '$db_name' database could not be created.",
-                " The error returned was:\n\n    $error\n\n",
-                _bz_connect_error_reasons();
-        }
+  my $dbh;
+
+  # See if we can connect to the actual Bugzilla database.
+  my $conn_success = eval { $dbh = connect_main() };
+  my $db_name = Bugzilla->localconfig->{db_name};
+
+  if (!$conn_success) {
+    $dbh = _get_no_db_connection();
+    say "Creating database $db_name...";
+
+    # Try to create the DB, and if we fail print a friendly error.
+    my $success = eval {
+      my @sql = $dbh->_bz_schema->get_create_database_sql($db_name);
+
+      # This ends with 1 because this particular do doesn't always
+      # return something.
+      $dbh->do($_) foreach @sql;
+      1;
+    };
+    if (!$success) {
+      my $error = $dbh->errstr || $@;
+      chomp($error);
+      die "The '$db_name' database could not be created.",
+        " The error returned was:\n\n    $error\n\n", _bz_connect_error_reasons();
     }
+  }
 
-    $dbh->disconnect;
+  $dbh->disconnect;
 }
 
 # A helper for bz_create_database and bz_check_requirements.
 sub _get_no_db_connection {
-    my ($sql_server) = @_;
-    my $dbh;
-    my %connect_params = %{ Bugzilla->localconfig };
-    $connect_params{db_name} = '';
-    my $conn_success = eval {
-        $dbh = _connect(\%connect_params);
-    };
-    if (!$conn_success) {
-        my $driver = $connect_params{db_driver};
-        my $sql_server = DB_MODULE->{lc($driver)}->{name};
-        # Can't use $dbh->errstr because $dbh is undef.
-        my $error = $DBI::errstr || $@;
-        chomp($error);
-        die "There was an error connecting to $sql_server:\n\n",
-            "    $error\n\n", _bz_connect_error_reasons(), "\n";
-    }
-    return $dbh;    
+  my ($sql_server) = @_;
+  my $dbh;
+  my %connect_params = %{Bugzilla->localconfig};
+  my $conn_success = eval { $dbh = _connect(\%connect_params); };
+  if (!$conn_success) {
+    my $driver     = $connect_params{db_driver};
+    my $sql_server = DB_MODULE->{lc($driver)}->{name};
+
+    # Can't use $dbh->errstr because $dbh is undef.
+    my $error = $DBI::errstr || $@;
+    chomp($error);
+    die "There was an error connecting to $sql_server:\n\n", "    $error\n\n",
+      _bz_connect_error_reasons(), "\n";
+  }
+  return $dbh;
 }
 
 # Just a helper because we have to re-use this text.
 # We don't use this in db_new because it gives away the database
 # username, and db_new errors can show up on CGIs.
 sub _bz_connect_error_reasons {
-    my $lc_file = bz_locations()->{'localconfig'};
-    my $lc      = Bugzilla->localconfig;
-    my $db      = DB_MODULE->{lc($lc->{db_driver})};
-    my $server  = $db->{name};
+  my $lc_file = bz_locations()->{'localconfig'};
+  my $lc      = Bugzilla->localconfig;
+  my $db      = DB_MODULE->{lc($lc->{db_driver})};
+  my $server  = $db->{name};
 
-return <<EOT;
+  return <<EOT;
 This might have several reasons:
 
 * $server is not running.
@@ -309,129 +311,157 @@ EOT
 
 # List of abstract methods we are checking the derived class implements
 our @_abstract_methods = qw(new sql_regexp sql_not_regexp sql_limit sql_to_days
-                            sql_date_format sql_date_math bz_explain
-                            sql_group_concat);
+  sql_date_format sql_date_math bz_explain
+  sql_group_concat);
 
 # This overridden import method will check implementation of inherited classes
 # for missing implementation of abstract methods
 # See http://perlmonks.thepen.com/44265.html
 sub import {
-    my $pkg = shift;
-
-    # do not check this module
-    if ($pkg ne __PACKAGE__) {
-        # make sure all abstract methods are implemented
-        foreach my $meth (@_abstract_methods) {
-            $pkg->can($meth)
-                or die("Class $pkg does not define method $meth");
-        }
+  my $pkg = shift;
+
+  # do not check this module
+  if ($pkg ne __PACKAGE__) {
+
+    # make sure all abstract methods are implemented
+    foreach my $meth (@_abstract_methods) {
+      $pkg->can($meth) or die("Class $pkg does not define method $meth");
     }
+  }
 
-    # Now we want to call our superclass implementation.
-    # If our superclass is Exporter, which is using caller() to find
-    # a namespace to populate, we need to adjust for this extra call.
-    # All this can go when we stop using deprecated functions.
-    my $is_exporter = $pkg->isa('Exporter');
-    $Exporter::ExportLevel++ if $is_exporter;
-    $pkg->SUPER::import(@_);
-    $Exporter::ExportLevel-- if $is_exporter;
+  # Now we want to call our superclass implementation.
+  # If our superclass is Exporter, which is using caller() to find
+  # a namespace to populate, we need to adjust for this extra call.
+  # All this can go when we stop using deprecated functions.
+  my $is_exporter = $pkg->isa('Exporter');
+  $Exporter::ExportLevel++ if $is_exporter;
+  $pkg->SUPER::import(@_);
+  $Exporter::ExportLevel-- if $is_exporter;
 }
 
 sub sql_istrcmp {
-    my ($self, $left, $right, $op) = @_;
-    $op ||= "=";
+  my ($self, $left, $right, $op) = @_;
+  $op ||= "=";
 
-    return $self->sql_istring($left) . " $op " . $self->sql_istring($right);
+  return $self->sql_istring($left) . " $op " . $self->sql_istring($right);
 }
 
 sub sql_istring {
-    my ($self, $string) = @_;
+  my ($self, $string) = @_;
 
-    return "LOWER($string)";
+  return "LOWER($string)";
 }
 
 sub sql_iposition {
-    my ($self, $fragment, $text) = @_;
-    $fragment = $self->sql_istring($fragment);
-    $text = $self->sql_istring($text);
-    return $self->sql_position($fragment, $text);
+  my ($self, $fragment, $text) = @_;
+  $fragment = $self->sql_istring($fragment);
+  $text     = $self->sql_istring($text);
+  return $self->sql_position($fragment, $text);
 }
 
 sub sql_position {
-    my ($self, $fragment, $text) = @_;
+  my ($self, $fragment, $text) = @_;
 
-    return "POSITION($fragment IN $text)";
+  return "POSITION($fragment IN $text)";
 }
 
+sub sql_like {
+  my ($self, $fragment, $column) = @_;
+
+  my $quoted = $self->quote($fragment);
+
+  return $self->sql_position($quoted, $column) . " > 0";
+}
+
+sub sql_ilike {
+  my ($self, $fragment, $column) = @_;
+
+  my $quoted = $self->quote($fragment);
+
+  return $self->sql_iposition($quoted, $column) . " > 0";
+}
+
+sub sql_not_ilike {
+  my ($self, $fragment, $column) = @_;
+
+  my $quoted = $self->quote($fragment);
+
+  return $self->sql_iposition($quoted, $column) . " = 0";
+}
+
+
 sub sql_group_by {
-    my ($self, $needed_columns, $optional_columns) = @_;
+  my ($self, $needed_columns, $optional_columns) = @_;
 
-    my $expression = "GROUP BY $needed_columns";
-    $expression .= ", " . $optional_columns if $optional_columns;
-    
-    return $expression;
+  my $expression = "GROUP BY $needed_columns";
+  $expression .= ", " . $optional_columns if $optional_columns;
+
+  return $expression;
 }
 
 sub sql_string_concat {
-    my ($self, @params) = @_;
-    
-    return '(' . join(' || ', @params) . ')';
+  my ($self, @params) = @_;
+
+  return '(' . join(' || ', @params) . ')';
 }
 
 sub sql_string_until {
-    my ($self, $string, $substring) = @_;
+  my ($self, $string, $substring) = @_;
 
-    my $position = $self->sql_position($substring, $string);
-    return "CASE WHEN $position != 0"
-             . " THEN SUBSTR($string, 1, $position - 1)"
-             . " ELSE $string END";
+  my $position = $self->sql_position($substring, $string);
+  return
+      "CASE WHEN $position != 0"
+    . " THEN SUBSTR($string, 1, $position - 1)"
+    . " ELSE $string END";
 }
 
 sub sql_in {
-    my ($self, $column_name, $in_list_ref, $negate) = @_;
-    return " $column_name "
-             . ($negate ? "NOT " : "")
-             . "IN (" . join(',', @$in_list_ref) . ") ";
+  my ($self, $column_name, $in_list_ref, $negate) = @_;
+  return
+      " $column_name "
+    . ($negate ? "NOT " : "") . "IN ("
+    . join(',', @$in_list_ref) . ") ";
 }
 
 sub sql_fulltext_search {
-    my ($self, $column, $text) = @_;
-
-    # This is as close as we can get to doing full text search using
-    # standard ANSI SQL, without real full text search support. DB specific
-    # modules should override this, as this will be always much slower.
-
-    # make the string lowercase to do case insensitive search
-    my $lower_text = lc($text);
-
-    # split the text we're searching for into separate words. As a hack
-    # to allow quicksearch to work, if the field starts and ends with
-    # a double-quote, then we don't split it into words. We can't use
-    # Text::ParseWords here because it gets very confused by unbalanced
-    # quotes, which breaks searches like "don't try this" (because of the
-    # unbalanced single-quote in "don't").
-    my @words;
-    if ($lower_text =~ /^"/ and $lower_text =~ /"$/) {
-        $lower_text =~ s/^"//;
-        $lower_text =~ s/"$//;
-        @words = ($lower_text);
-    }
-    else {
-        @words = split(/\s+/, $lower_text);
-    }
-
-    # surround the words with wildcards and SQL quotes so we can use them
-    # in LIKE search clauses
-    @words = map($self->quote("\%$_\%"), @words);
-
-    # untaint words, since they are safe to use now that we've quoted them
-    trick_taint($_) foreach @words;
-
-    # turn the words into a set of LIKE search clauses
-    @words = map("LOWER($column) LIKE $_", @words);
-
-    # search for occurrences of all specified words in the column
-    return join (" AND ", @words), "CASE WHEN (" . join(" AND ", @words) . ") THEN 1 ELSE 0 END";
+  my ($self, $column, $text) = @_;
+
+  # This is as close as we can get to doing full text search using
+  # standard ANSI SQL, without real full text search support. DB specific
+  # modules should override this, as this will be always much slower.
+
+  # make the string lowercase to do case insensitive search
+  my $lower_text = lc($text);
+
+  # split the text we're searching for into separate words. As a hack
+  # to allow quicksearch to work, if the field starts and ends with
+  # a double-quote, then we don't split it into words. We can't use
+  # Text::ParseWords here because it gets very confused by unbalanced
+  # quotes, which breaks searches like "don't try this" (because of the
+  # unbalanced single-quote in "don't").
+  my @words;
+  if ($lower_text =~ /^"/ and $lower_text =~ /"$/) {
+    $lower_text =~ s/^"//;
+    $lower_text =~ s/"$//;
+    @words = ($lower_text);
+  }
+  else {
+    @words = split(/\s+/, $lower_text);
+  }
+
+  # surround the words with wildcards and SQL quotes so we can use them
+  # in LIKE search clauses
+  @words = map($self->quote("\%$_\%"), @words);
+
+  # untaint words, since they are safe to use now that we've quoted them
+  trick_taint($_) foreach @words;
+
+  # turn the words into a set of LIKE search clauses
+  @words = map("LOWER($column) LIKE $_", @words);
+
+  # search for occurrences of all specified words in the column
+  return join(" AND ", @words),
+    "CASE WHEN (" . join(" AND ", @words) . ") THEN 1 ELSE 0 END";
 }
 
 #####################################################################
@@ -440,24 +470,27 @@ sub sql_fulltext_search {
 
 # XXX - Needs to be documented.
 sub bz_server_version {
-    my ($self) = @_;
-    return $self->get_info(18); # SQL_DBMS_VER
+  my ($self) = @_;
+  return $self->get_info(18);    # SQL_DBMS_VER
 }
 
 sub bz_last_key {
-    my ($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    return $self->last_insert_id(Bugzilla->localconfig->{db_name}, undef, 
-                                 $table, $column);
+  return $self->last_insert_id(Bugzilla->localconfig->{db_name},
+    undef, $table, $column);
 }
 
 sub bz_check_regexp {
-    my ($self, $pattern) = @_;
+  my ($self, $pattern) = @_;
 
-    eval { $self->do("SELECT " . $self->sql_regexp($self->quote("a"), $pattern, 1)) };
+  eval {
+    $self->do("SELECT " . $self->sql_regexp($self->quote("a"), $pattern, 1));
+  };
 
-    $@ && ThrowUserError('illegal_regexp', 
-        { value => $pattern, dberror => $self->errstr }); 
+  $@
+    && ThrowUserError('illegal_regexp',
+    {value => $pattern, dberror => $self->errstr});
 }
 
 #####################################################################
@@ -465,99 +498,100 @@ sub bz_check_regexp {
 #####################################################################
 
 sub bz_setup_database {
-    my ($self) = @_;
-
-    # If we haven't ever stored a serialized schema,
-    # set up the bz_schema table and store it.
-    $self->_bz_init_schema_storage();
-   
-    # We don't use bz_table_list here, because that uses _bz_real_schema.
-    # We actually want the table list from the ABSTRACT_SCHEMA in
-    # Bugzilla::DB::Schema.
-    my @desired_tables = $self->_bz_schema->get_table_list();
-    my $bugs_exists = $self->bz_table_info('bugs');
-    if (!$bugs_exists) {
-        say install_string('db_table_setup');
-    }
+  my ($self) = @_;
 
-    foreach my $table_name (@desired_tables) {
-        $self->bz_add_table($table_name, { silently => !$bugs_exists });
-    }
+  # If we haven't ever stored a serialized schema,
+  # set up the bz_schema table and store it.
+  $self->_bz_init_schema_storage();
+
+  # We don't use bz_table_list here, because that uses _bz_real_schema.
+  # We actually want the table list from the ABSTRACT_SCHEMA in
+  # Bugzilla::DB::Schema.
+  my @desired_tables = $self->_bz_schema->get_table_list();
+  my $bugs_exists    = $self->bz_table_info('bugs');
+  if (!$bugs_exists) {
+    say install_string('db_table_setup');
+  }
+
+  foreach my $table_name (@desired_tables) {
+    $self->bz_add_table($table_name, {silently => !$bugs_exists});
+  }
 }
 
 # This really just exists to get overridden in Bugzilla::DB::Mysql.
 sub bz_enum_initial_values {
-    return ENUM_DEFAULTS;
+  return ENUM_DEFAULTS;
 }
 
 sub bz_populate_enum_tables {
-    my ($self) = @_; 
+  my ($self) = @_;
 
-    my $any_severities = $self->selectrow_array(
-        'SELECT 1 FROM bug_severity ' . $self->sql_limit(1));
-    print install_string('db_enum_setup'), "\n  " if !$any_severities;
+  my $any_severities
+    = $self->selectrow_array('SELECT 1 FROM bug_severity ' . $self->sql_limit(1));
+  print install_string('db_enum_setup'), "\n  " if !$any_severities;
 
-    my $enum_values = $self->bz_enum_initial_values();
-    while (my ($table, $values) = each %$enum_values) {
-        $self->_bz_populate_enum_table($table, $values);
-    }
+  my $enum_values = $self->bz_enum_initial_values();
+  while (my ($table, $values) = each %$enum_values) {
+    $self->_bz_populate_enum_table($table, $values);
+  }
 
-    print "\n" if !$any_severities;
+  print "\n" if !$any_severities;
 }
 
 sub bz_setup_foreign_keys {
-    my ($self) = @_;
-
-    # profiles_activity was the first table to get foreign keys,
-    # so if it doesn't have them, then we're setting up FKs
-    # for the first time, and should be quieter about it.
-    my $activity_fk = $self->bz_fk_info('profiles_activity', 'userid');
-    my $any_fks = $activity_fk && $activity_fk->{created};
-    if (!$any_fks) {
-        say get_text('install_fk_setup');
-    }
+  my ($self) = @_;
+
+  # profiles_activity was the first table to get foreign keys,
+  # so if it doesn't have them, then we're setting up FKs
+  # for the first time, and should be quieter about it.
+  my $activity_fk = $self->bz_fk_info('profiles_activity', 'userid');
+  my $any_fks = $activity_fk && $activity_fk->{created};
+  if (!$any_fks) {
+    say get_text('install_fk_setup');
+  }
+
+  my @tables = $self->bz_table_list();
+  foreach my $table (@tables) {
+    my @columns = $self->bz_table_columns($table);
+    my %add_fks;
+    foreach my $column (@columns) {
 
-    my @tables = $self->bz_table_list();
-    foreach my $table (@tables) {
-        my @columns = $self->bz_table_columns($table);
-        my %add_fks;
-        foreach my $column (@columns) {
-            # First we check for any FKs that have created => 0,
-            # in the _bz_real_schema. This also picks up FKs with
-            # created => 1, but bz_add_fks will ignore those.
-            my $fk = $self->bz_fk_info($table, $column);
-            # Then we check the abstract schema to see if there
-            # should be an FK on this column, but one wasn't set in the
-            # _bz_real_schema for some reason. We do this to handle
-            # various problems caused by upgrading from versions
-            # prior to 4.2, and also to handle problems caused
-            # by enabling an extension pre-4.2, disabling it for
-            # the 4.2 upgrade, and then re-enabling it later.
-            unless ($fk && $fk->{created}) {
-                my $standard_def = 
-                    $self->_bz_schema->get_column_abstract($table, $column);
-                if (exists $standard_def->{REFERENCES}) {
-                    $fk = dclone($standard_def->{REFERENCES});
-                }
-            }
-
-            $add_fks{$column} = $fk if $fk;
+      # First we check for any FKs that have created => 0,
+      # in the _bz_real_schema. This also picks up FKs with
+      # created => 1, but bz_add_fks will ignore those.
+      my $fk = $self->bz_fk_info($table, $column);
+
+      # Then we check the abstract schema to see if there
+      # should be an FK on this column, but one wasn't set in the
+      # _bz_real_schema for some reason. We do this to handle
+      # various problems caused by upgrading from versions
+      # prior to 4.2, and also to handle problems caused
+      # by enabling an extension pre-4.2, disabling it for
+      # the 4.2 upgrade, and then re-enabling it later.
+      unless ($fk && $fk->{created}) {
+        my $standard_def = $self->_bz_schema->get_column_abstract($table, $column);
+        if (exists $standard_def->{REFERENCES}) {
+          $fk = dclone($standard_def->{REFERENCES});
         }
-        $self->bz_add_fks($table, \%add_fks, { silently => !$any_fks });
+      }
+
+      $add_fks{$column} = $fk if $fk;
     }
+    $self->bz_add_fks($table, \%add_fks, {silently => !$any_fks});
+  }
 }
 
 # This is used by contrib/bzdbcopy.pl, mostly.
 sub bz_drop_foreign_keys {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    my @tables = $self->bz_table_list();
-    foreach my $table (@tables) {
-        my @columns = $self->bz_table_columns($table);
-        foreach my $column (@columns) {
-            $self->bz_drop_fk($table, $column);
-        }
+  my @tables = $self->bz_table_list();
+  foreach my $table (@tables) {
+    my @columns = $self->bz_table_columns($table);
+    foreach my $column (@columns) {
+      $self->bz_drop_fk($table, $column);
     }
+  }
 }
 
 #####################################################################
@@ -565,116 +599,121 @@ sub bz_drop_foreign_keys {
 #####################################################################
 
 sub bz_add_column {
-    my ($self, $table, $name, $new_def, $init_value) = @_;
-
-    # You can't add a NOT NULL column to a table with
-    # no DEFAULT statement, unless you have an init_value.
-    # SERIAL types are an exception, though, because they can
-    # auto-populate.
-    if ( $new_def->{NOTNULL} && !exists $new_def->{DEFAULT} 
-         && !defined $init_value && $new_def->{TYPE} !~ /SERIAL/)
-    {
-        ThrowCodeError('column_not_null_without_default',
-                       { name => "$table.$name" });
+  my ($self, $table, $name, $new_def, $init_value) = @_;
+
+  # You can't add a NOT NULL column to a table with
+  # no DEFAULT statement, unless you have an init_value.
+  # SERIAL types are an exception, though, because they can
+  # auto-populate.
+  if ( $new_def->{NOTNULL}
+    && !exists $new_def->{DEFAULT}
+    && !defined $init_value
+    && $new_def->{TYPE} !~ /SERIAL/)
+  {
+    ThrowCodeError('column_not_null_without_default', {name => "$table.$name"});
+  }
+
+  my $current_def = $self->bz_column_info($table, $name);
+
+  if (!$current_def) {
+
+    # REFERENCES need to happen later and not be created right away
+    my $trimmed_def = dclone($new_def);
+    delete $trimmed_def->{REFERENCES};
+    my @statements
+      = $self->_bz_real_schema->get_add_column_ddl($table, $name, $trimmed_def,
+      defined $init_value ? $self->quote($init_value) : undef);
+    print get_text('install_column_add', {column => $name, table => $table}) . "\n"
+      if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
+    foreach my $sql (@statements) {
+      $self->do($sql);
     }
 
-    my $current_def = $self->bz_column_info($table, $name);
-
-    if (!$current_def) {
-        my @statements = $self->_bz_real_schema->get_add_column_ddl(
-            $table, $name, $new_def, 
-            defined $init_value ? $self->quote($init_value) : undef);
-        print get_text('install_column_add',
-                       { column => $name, table => $table }) . "\n"
-            if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
-        foreach my $sql (@statements) {
-            $self->do($sql);
-        }
-
-        # To make things easier for callers, if they don't specify
-        # a REFERENCES item, we pull it from the _bz_schema if the
-        # column exists there and has a REFERENCES item.
-        # bz_setup_foreign_keys will then add this FK at the end of
-        # Install::DB.
-        my $col_abstract = 
-            $self->_bz_schema->get_column_abstract($table, $name);
-        if (exists $col_abstract->{REFERENCES}) {
-            my $new_fk = dclone($col_abstract->{REFERENCES});
-            $new_fk->{created} = 0;
-            $new_def->{REFERENCES} = $new_fk;
-        }
-        
-        $self->_bz_real_schema->set_column($table, $name, $new_def);
-        $self->_bz_store_real_schema;
+    # To make things easier for callers, if they don't specify
+    # a REFERENCES item, we pull it from the _bz_schema if the
+    # column exists there and has a REFERENCES item.
+    # bz_setup_foreign_keys will then add this FK at the end of
+    # Install::DB.
+    my $col_abstract = $self->_bz_schema->get_column_abstract($table, $name);
+    if (exists $col_abstract->{REFERENCES}) {
+      my $new_fk = dclone($col_abstract->{REFERENCES});
+      $new_fk->{created}     = 0;
+      $new_def->{REFERENCES} = $new_fk;
     }
+
+    $self->_bz_real_schema->set_column($table, $name, $new_def);
+    $self->_bz_store_real_schema;
+  }
 }
 
 sub bz_add_fk {
-    my ($self, $table, $column, $def) = @_;
-    $self->bz_add_fks($table, { $column => $def });
+  my ($self, $table, $column, $def) = @_;
+  $self->bz_add_fks($table, {$column => $def});
 }
 
 sub bz_add_fks {
-    my ($self, $table, $column_fks, $options) = @_;
-
-    my %add_these;
-    foreach my $column (keys %$column_fks) {
-        my $current_fk = $self->bz_fk_info($table, $column);
-        next if ($current_fk and $current_fk->{created});
-        my $new_fk = $column_fks->{$column};
-        $self->_check_references($table, $column, $new_fk);
-        $add_these{$column} = $new_fk;
-        if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE 
-            and !$options->{silently}) 
-        {
-            print get_text('install_fk_add',
-                           { table => $table, column => $column, 
-                             fk    => $new_fk }), "\n";
-        }
+  my ($self, $table, $column_fks, $options) = @_;
+
+  my %add_these;
+  foreach my $column (keys %$column_fks) {
+    my $current_fk = $self->bz_fk_info($table, $column);
+    next if ($current_fk and $current_fk->{created});
+    my $new_fk = $column_fks->{$column};
+    $self->_check_references($table, $column, $new_fk);
+    $add_these{$column} = $new_fk;
+    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE and !$options->{silently}) {
+      print get_text(
+        'install_fk_add', {table => $table, column => $column, fk => $new_fk}
+        ),
+        "\n";
     }
+  }
 
-    return if !scalar(keys %add_these);
+  return if !scalar(keys %add_these);
 
-    my @sql = $self->_bz_real_schema->get_add_fks_sql($table, \%add_these);
-    $self->do($_) foreach @sql;
+  my @sql = $self->_bz_real_schema->get_add_fks_sql($table, \%add_these);
+  $self->do($_) foreach @sql;
 
-    foreach my $column (keys %add_these) {
-        my $fk_def = $add_these{$column};
-        $fk_def->{created} = 1;
-        $self->_bz_real_schema->set_fk($table, $column, $fk_def);
-    }
+  foreach my $column (keys %add_these) {
+    my $fk_def = $add_these{$column};
+    $fk_def->{created} = 1;
+    $self->_bz_real_schema->set_fk($table, $column, $fk_def);
+  }
 
-    $self->_bz_store_real_schema();
+  $self->_bz_store_real_schema();
 }
 
 sub bz_alter_column {
-    my ($self, $table, $name, $new_def, $set_nulls_to) = @_;
+  my ($self, $table, $name, $new_def, $set_nulls_to) = @_;
 
-    my $current_def = $self->bz_column_info($table, $name);
+  my $current_def = $self->bz_column_info($table, $name);
 
-    if (!$self->_bz_schema->columns_equal($current_def, $new_def)) {
-        # You can't change a column to be NOT NULL if you have no DEFAULT
-        # and no value for $set_nulls_to, if there are any NULL values 
-        # in that column.
-        if ($new_def->{NOTNULL} && 
-            !exists $new_def->{DEFAULT} && !defined $set_nulls_to)
-        {
-            # Check for NULLs
-            my $any_nulls = $self->selectrow_array(
-                "SELECT 1 FROM $table WHERE $name IS NULL");
-            ThrowCodeError('column_not_null_no_default_alter', 
-                           { name => "$table.$name" }) if ($any_nulls);
-        }
-        # Preserve foreign key definitions in the Schema object when altering
-        # types.
-        if (my $fk = $self->bz_fk_info($table, $name)) {
-            $new_def->{REFERENCES} = $fk;
-        }
-        $self->bz_alter_column_raw($table, $name, $new_def, $current_def,
-                                   $set_nulls_to);
-        $self->_bz_real_schema->set_column($table, $name, $new_def);
-        $self->_bz_store_real_schema;
+  if (!$self->_bz_schema->columns_equal($current_def, $new_def)) {
+
+    # You can't change a column to be NOT NULL if you have no DEFAULT
+    # and no value for $set_nulls_to, if there are any NULL values
+    # in that column.
+    if ( $new_def->{NOTNULL}
+      && !exists $new_def->{DEFAULT}
+      && !defined $set_nulls_to)
+    {
+      # Check for NULLs
+      my $any_nulls
+        = $self->selectrow_array("SELECT 1 FROM $table WHERE $name IS NULL");
+      ThrowCodeError('column_not_null_no_default_alter', {name => "$table.$name"})
+        if ($any_nulls);
     }
+
+    # Preserve foreign key definitions in the Schema object when altering
+    # types.
+    if (my $fk = $self->bz_fk_info($table, $name)) {
+      $new_def->{REFERENCES} = $fk;
+    }
+    $self->bz_alter_column_raw($table, $name, $new_def, $current_def,
+      $set_nulls_to);
+    $self->_bz_real_schema->set_column($table, $name, $new_def);
+    $self->_bz_store_real_schema;
+  }
 }
 
 
@@ -700,39 +739,40 @@ sub bz_alter_column {
 # Returns:     nothing
 #
 sub bz_alter_column_raw {
-    my ($self, $table, $name, $new_def, $current_def, $set_nulls_to) = @_;
-    my @statements = $self->_bz_real_schema->get_alter_column_ddl(
-        $table, $name, $new_def,
-        defined $set_nulls_to ? $self->quote($set_nulls_to) : undef);
-    my $new_ddl = $self->_bz_schema->get_type_ddl($new_def);
-    say "Updating column $name in table $table ...";
-    if (defined $current_def) {
-        my $old_ddl = $self->_bz_schema->get_type_ddl($current_def);
-        say "Old: $old_ddl";
-    }
-    say "New: $new_ddl";
-    $self->do($_) foreach (@statements);
+  my ($self, $table, $name, $new_def, $current_def, $set_nulls_to) = @_;
+  my @statements
+    = $self->_bz_real_schema->get_alter_column_ddl($table, $name, $new_def,
+    defined $set_nulls_to ? $self->quote($set_nulls_to) : undef);
+  my $new_ddl = $self->_bz_schema->get_type_ddl($new_def);
+  say "Updating column $name in table $table ...";
+  if (defined $current_def) {
+    my $old_ddl = $self->_bz_schema->get_type_ddl($current_def);
+    say "Old: $old_ddl";
+  }
+  say "New: $new_ddl";
+  $self->do($_) foreach (@statements);
 }
 
 sub bz_alter_fk {
-    my ($self, $table, $column, $fk_def) = @_;
-    my $current_fk = $self->bz_fk_info($table, $column);
-    ThrowCodeError('column_alter_nonexistent_fk',
-                   { table => $table, column => $column }) if !$current_fk;
-    $self->bz_drop_fk($table, $column);
-    $self->bz_add_fk($table, $column, $fk_def);
+  my ($self, $table, $column, $fk_def) = @_;
+  my $current_fk = $self->bz_fk_info($table, $column);
+  ThrowCodeError('column_alter_nonexistent_fk',
+    {table => $table, column => $column})
+    if !$current_fk;
+  $self->bz_drop_fk($table, $column);
+  $self->bz_add_fk($table, $column, $fk_def);
 }
 
 sub bz_add_index {
-    my ($self, $table, $name, $definition) = @_;
+  my ($self, $table, $name, $definition) = @_;
 
-    my $index_exists = $self->bz_index_info($table, $name);
+  my $index_exists = $self->bz_index_info($table, $name);
 
-    if (!$index_exists) {
-        $self->bz_add_index_raw($table, $name, $definition);
-        $self->_bz_real_schema->set_index($table, $name, $definition);
-        $self->_bz_store_real_schema;
-    }
+  if (!$index_exists) {
+    $self->bz_add_index_raw($table, $name, $definition);
+    $self->_bz_real_schema->set_index($table, $name, $definition);
+    $self->_bz_store_real_schema;
+  }
 }
 
 # bz_add_index_raw($table, $name, $silent)
@@ -752,36 +792,36 @@ sub bz_add_index {
 # Returns:     nothing
 #
 sub bz_add_index_raw {
-    my ($self, $table, $name, $definition, $silent) = @_;
-    my @statements = $self->_bz_schema->get_add_index_ddl(
-        $table, $name, $definition);
-    print "Adding new index '$name' to the $table table ...\n" unless $silent;
-    $self->do($_) foreach (@statements);
+  my ($self, $table, $name, $definition, $silent) = @_;
+  my @statements
+    = $self->_bz_schema->get_add_index_ddl($table, $name, $definition);
+  print "Adding new index '$name' to the $table table ...\n" unless $silent;
+  $self->do($_) foreach (@statements);
 }
 
 sub bz_add_table {
-    my ($self, $name, $options) = @_;
-
-    my $table_exists = $self->bz_table_info($name);
-
-    if (!$table_exists) {
-        $self->_bz_add_table_raw($name, $options);
-        my $table_def = dclone($self->_bz_schema->get_table_abstract($name));
-
-        my %fields = @{$table_def->{FIELDS}};
-        foreach my $col (keys %fields) {
-            # Foreign Key references have to be added by Install::DB after
-            # initial table creation, because column names have changed
-            # over history and it's impossible to keep track of that info
-            # in ABSTRACT_SCHEMA.
-            next unless exists $fields{$col}->{REFERENCES};
-            $fields{$col}->{REFERENCES}->{created} =
-                $self->_bz_real_schema->FK_ON_CREATE;
-        }
-        
-        $self->_bz_real_schema->add_table($name, $table_def);
-        $self->_bz_store_real_schema;
+  my ($self, $name, $options) = @_;
+
+  my $table_exists = $self->bz_table_info($name);
+
+  if (!$table_exists) {
+    $self->_bz_add_table_raw($name, $options);
+    my $table_def = dclone($self->_bz_schema->get_table_abstract($name));
+
+    my %fields = @{$table_def->{FIELDS}};
+    foreach my $col (keys %fields) {
+
+      # Foreign Key references have to be added by Install::DB after
+      # initial table creation, because column names have changed
+      # over history and it's impossible to keep track of that info
+      # in ABSTRACT_SCHEMA.
+      next unless exists $fields{$col}->{REFERENCES};
+      $fields{$col}->{REFERENCES}->{created} = $self->_bz_real_schema->FK_ON_CREATE;
     }
+
+    $self->_bz_real_schema->add_table($name, $table_def);
+    $self->_bz_store_real_schema;
+  }
 }
 
 # _bz_add_table_raw($name) - Private
@@ -793,164 +833,174 @@ sub bz_add_table {
 #              _bz_init_schema_storage. Used when you don't
 #              yet have a Schema object but you need to
 #              add a table, for some reason.
-# Params:      $name - The name of the table you're creating. 
-#                  The definition for the table is pulled from 
+# Params:      $name - The name of the table you're creating.
+#                  The definition for the table is pulled from
 #                  _bz_schema.
 # Returns:     nothing
 #
 sub _bz_add_table_raw {
-    my ($self, $name, $options) = @_;
-    my @statements = $self->_bz_schema->get_table_ddl($name);
-    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE
-        and !$options->{silently})
-    {
-        say install_string('db_table_new', { table => $name });
-    }
-    $self->do($_) foreach (@statements);
+  my ($self, $name, $options) = @_;
+  my @statements = $self->_bz_schema->get_table_ddl($name);
+  if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE and !$options->{silently}) {
+    say install_string('db_table_new', {table => $name});
+  }
+  $self->do($_) foreach (@statements);
 }
 
 sub _bz_add_field_table {
-    my ($self, $name, $schema_ref) = @_;
-    # We do nothing if the table already exists.
-    return if $self->bz_table_info($name);
-
-    # Copy this so that we're not modifying the passed reference.
-    # (This avoids modifying a constant in Bugzilla::DB::Schema.)
-    my %table_schema = %$schema_ref;
-    my %indexes = @{ $table_schema{INDEXES} };
-    my %fixed_indexes;
-    foreach my $key (keys %indexes) {
-        $fixed_indexes{$name . "_" . $key} = $indexes{$key};
-    }
-    # INDEXES is supposed to be an arrayref, so we have to convert back.
-    my @indexes_array = %fixed_indexes;
-    $table_schema{INDEXES} = \@indexes_array;
-    # We add this to the abstract schema so that bz_add_table can find it.
-    $self->_bz_schema->add_table($name, \%table_schema);
-    $self->bz_add_table($name);
+  my ($self, $name, $schema_ref) = @_;
+
+  # We do nothing if the table already exists.
+  return if $self->bz_table_info($name);
+
+  # Copy this so that we're not modifying the passed reference.
+  # (This avoids modifying a constant in Bugzilla::DB::Schema.)
+  my %table_schema = %$schema_ref;
+  my %indexes      = @{$table_schema{INDEXES}};
+  my %fixed_indexes;
+  foreach my $key (keys %indexes) {
+    $fixed_indexes{$name . "_" . $key} = $indexes{$key};
+  }
+
+  # INDEXES is supposed to be an arrayref, so we have to convert back.
+  my @indexes_array = %fixed_indexes;
+  $table_schema{INDEXES} = \@indexes_array;
+
+  # We add this to the abstract schema so that bz_add_table can find it.
+  $self->_bz_schema->add_table($name, \%table_schema);
+  $self->bz_add_table($name);
 }
 
 sub bz_add_field_tables {
-    my ($self, $field) = @_;
-    
-    $self->_bz_add_field_table($field->name,
-                               $self->_bz_schema->FIELD_TABLE_SCHEMA, $field->type);
-    if ($field->type == FIELD_TYPE_MULTI_SELECT) {
-        my $ms_table = "bug_" . $field->name;
-        $self->_bz_add_field_table($ms_table,
-            $self->_bz_schema->MULTI_SELECT_VALUE_TABLE);
-
-        $self->bz_add_fks($ms_table, 
-            { bug_id => {TABLE => 'bugs', COLUMN => 'bug_id',
-                         DELETE => 'CASCADE'},
-
-              value  => {TABLE  => $field->name, COLUMN => 'value'} });
-    }
+  my ($self, $field) = @_;
+
+  $self->_bz_add_field_table($field->name, $self->_bz_schema->FIELD_TABLE_SCHEMA,
+    $field->type);
+  if ($field->type == FIELD_TYPE_MULTI_SELECT) {
+    my $ms_table = "bug_" . $field->name;
+    $self->_bz_add_field_table($ms_table,
+      $self->_bz_schema->MULTI_SELECT_VALUE_TABLE);
+
+    $self->bz_add_fks(
+      $ms_table,
+      {
+        bug_id => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'},
+
+        value => {TABLE => $field->name, COLUMN => 'value'}
+      }
+    );
+  }
 }
 
 sub bz_drop_field_tables {
-    my ($self, $field) = @_;
-    if ($field->type == FIELD_TYPE_MULTI_SELECT) {
-        $self->bz_drop_table('bug_' . $field->name);
-    }
-    $self->bz_drop_table($field->name);
+  my ($self, $field) = @_;
+  if ($field->type == FIELD_TYPE_MULTI_SELECT) {
+    $self->bz_drop_table('bug_' . $field->name);
+  }
+  $self->bz_drop_table($field->name);
 }
 
 sub bz_drop_column {
-    my ($self, $table, $column) = @_;
-
-    my $current_def = $self->bz_column_info($table, $column);
-
-    if ($current_def) {
-        my @statements = $self->_bz_real_schema->get_drop_column_ddl(
-            $table, $column);
-        print get_text('install_column_drop', 
-                       { table => $table, column => $column }) . "\n"
-            if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
-        foreach my $sql (@statements) {
-            # Because this is a deletion, we don't want to die hard if
-            # we fail because of some local customization. If something
-            # is already gone, that's fine with us!
-            eval { $self->do($sql); } or warn "Failed SQL: [$sql] Error: $@";
-        }
-        $self->_bz_real_schema->delete_column($table, $column);
-        $self->_bz_store_real_schema;
+  my ($self, $table, $column) = @_;
+
+  my $current_def = $self->bz_column_info($table, $column);
+
+  if ($current_def) {
+    my @statements = $self->_bz_real_schema->get_drop_column_ddl($table, $column);
+    print get_text('install_column_drop', {table => $table, column => $column})
+      . "\n"
+      if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
+    foreach my $sql (@statements) {
+
+      # Because this is a deletion, we don't want to die hard if
+      # we fail because of some local customization. If something
+      # is already gone, that's fine with us!
+      eval { $self->do($sql); } or warn "Failed SQL: [$sql] Error: $@";
     }
+    $self->_bz_real_schema->delete_column($table, $column);
+    $self->_bz_store_real_schema;
+  }
 }
 
 sub bz_drop_fk {
-    my ($self, $table, $column) = @_;
-
-    my $fk_def = $self->bz_fk_info($table, $column);
-    if ($fk_def and $fk_def->{created}) {
-        print get_text('install_fk_drop',
-                       { table => $table, column => $column, fk => $fk_def })
-            . "\n" if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
-        my @statements = 
-            $self->_bz_real_schema->get_drop_fk_sql($table, $column, $fk_def);
-        foreach my $sql (@statements) {
-            # Because this is a deletion, we don't want to die hard if
-            # we fail because of some local customization. If something
-            # is already gone, that's fine with us!
-            eval { $self->do($sql); } or warn "Failed SQL: [$sql] Error: $@";
-        }
-        # Under normal circumstances, we don't permanently drop the fk--
-        # we want checksetup to re-create it again later. The only
-        # time that FKs get permanently dropped is if the column gets
-        # dropped.
-        $fk_def->{created} = 0;
-        $self->_bz_real_schema->set_fk($table, $column, $fk_def);
-        $self->_bz_store_real_schema;
+  my ($self, $table, $column) = @_;
+
+  my $fk_def = $self->bz_fk_info($table, $column);
+  if ($fk_def and $fk_def->{created}) {
+    print get_text('install_fk_drop',
+      {table => $table, column => $column, fk => $fk_def})
+      . "\n"
+      if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
+    my @statements
+      = $self->_bz_real_schema->get_drop_fk_sql($table, $column, $fk_def);
+    foreach my $sql (@statements) {
+
+      # Because this is a deletion, we don't want to die hard if
+      # we fail because of some local customization. If something
+      # is already gone, that's fine with us!
+      eval { $self->do($sql); } or warn "Failed SQL: [$sql] Error: $@";
     }
 
+    # Under normal circumstances, we don't permanently drop the fk--
+    # we want checksetup to re-create it again later. The only
+    # time that FKs get permanently dropped is if the column gets
+    # dropped.
+    $fk_def->{created} = 0;
+    $self->_bz_real_schema->set_fk($table, $column, $fk_def);
+    $self->_bz_store_real_schema;
+  }
+
 }
 
 sub bz_get_related_fks {
-    my ($self, $table, $column) = @_;
-    my @tables = $self->_bz_real_schema->get_table_list();
-    my @related;
-    foreach my $check_table (@tables) {
-        my @columns = $self->bz_table_columns($check_table);
-        foreach my $check_column (@columns) {
-            my $fk = $self->bz_fk_info($check_table, $check_column);
-            if ($fk 
-                and (($fk->{TABLE} eq $table and $fk->{COLUMN} eq $column)
-                     or ($check_column eq $column and $check_table eq $table)))
-            {
-                push(@related, [$check_table, $check_column, $fk]);
-            }
-        } # foreach $column
-    } # foreach $table
-
-    return \@related;
+  my ($self, $table, $column) = @_;
+  my @tables = $self->_bz_real_schema->get_table_list();
+  my @related;
+  foreach my $check_table (@tables) {
+    my @columns = $self->bz_table_columns($check_table);
+    foreach my $check_column (@columns) {
+      my $fk = $self->bz_fk_info($check_table, $check_column);
+      if (
+        $fk
+        and (($fk->{TABLE} eq $table and $fk->{COLUMN} eq $column)
+          or ($check_column eq $column and $check_table eq $table))
+        )
+      {
+        push(@related, [$check_table, $check_column, $fk]);
+      }
+    }    # foreach $column
+  }    # foreach $table
+
+  return \@related;
 }
 
 sub bz_drop_related_fks {
-    my $self = shift;
-    my $related = $self->bz_get_related_fks(@_);
-    foreach my $item (@$related) {
-        my ($table, $column) = @$item;
-        $self->bz_drop_fk($table, $column);
-    }
-    return $related;
+  my $self    = shift;
+  my $related = $self->bz_get_related_fks(@_);
+  foreach my $item (@$related) {
+    my ($table, $column) = @$item;
+    $self->bz_drop_fk($table, $column);
+  }
+  return $related;
 }
 
 sub bz_drop_index {
-    my ($self, $table, $name) = @_;
+  my ($self, $table, $name) = @_;
 
-    my $index_exists = $self->bz_index_info($table, $name);
+  my $index_exists = $self->bz_index_info($table, $name);
 
-    if ($index_exists) {
-        if ($self->INDEX_DROPS_REQUIRE_FK_DROPS) {
-            # We cannot delete an index used by a FK.
-            foreach my $column (@{$index_exists->{FIELDS}}) {
-                $self->bz_drop_related_fks($table, $column);
-            }
-        }
-        $self->bz_drop_index_raw($table, $name);
-        $self->_bz_real_schema->delete_index($table, $name);
-        $self->_bz_store_real_schema;        
+  if ($index_exists) {
+    if ($self->INDEX_DROPS_REQUIRE_FK_DROPS) {
+
+      # We cannot delete an index used by a FK.
+      foreach my $column (@{$index_exists->{FIELDS}}) {
+        $self->bz_drop_related_fks($table, $column);
+      }
     }
+    $self->bz_drop_index_raw($table, $name);
+    $self->_bz_real_schema->delete_index($table, $name);
+    $self->_bz_store_real_schema;
+  }
 }
 
 # bz_drop_index_raw($table, $name, $silent)
@@ -959,7 +1009,7 @@ sub bz_drop_index {
 #              Drops an index from the database
 #              without updating any Schema object. Generally
 #              should only be called by bz_drop_index.
-#              Used when either: (1) You don't yet have a Schema 
+#              Used when either: (1) You don't yet have a Schema
 #              object but you need to drop an index, for some reason.
 #              (2) You need to drop an index that somehow got into the
 #              database but doesn't exist in Schema.
@@ -970,108 +1020,111 @@ sub bz_drop_index {
 # Returns:     nothing
 #
 sub bz_drop_index_raw {
-    my ($self, $table, $name, $silent) = @_;
-    my @statements = $self->_bz_schema->get_drop_index_ddl(
-        $table, $name);
-    print "Removing index '$name' from the $table table...\n" unless $silent;
-    foreach my $sql (@statements) {
-        # Because this is a deletion, we don't want to die hard if
-        # we fail because of some local customization. If something
-        # is already gone, that's fine with us!
-        eval { $self->do($sql) } or warn "Failed SQL: [$sql] Error: $@";
-    }
+  my ($self, $table, $name, $silent) = @_;
+  my @statements = $self->_bz_schema->get_drop_index_ddl($table, $name);
+  print "Removing index '$name' from the $table table...\n" unless $silent;
+  foreach my $sql (@statements) {
+
+    # Because this is a deletion, we don't want to die hard if
+    # we fail because of some local customization. If something
+    # is already gone, that's fine with us!
+    eval { $self->do($sql) } or warn "Failed SQL: [$sql] Error: $@";
+  }
 }
 
 sub bz_drop_table {
-    my ($self, $name) = @_;
-
-    my $table_exists = $self->bz_table_info($name);
-
-    if ($table_exists) {
-        my @statements = $self->_bz_schema->get_drop_table_ddl($name);
-        print get_text('install_table_drop', { name => $name }) . "\n"
-            if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
-        foreach my $sql (@statements) {
-            # Because this is a deletion, we don't want to die hard if
-            # we fail because of some local customization. If something
-            # is already gone, that's fine with us!
-            eval { $self->do($sql); } or warn "Failed SQL: [$sql] Error: $@";
-        }
-        $self->_bz_real_schema->delete_table($name);
-        $self->_bz_store_real_schema;
+  my ($self, $name) = @_;
+
+  my $table_exists = $self->bz_table_info($name);
+
+  if ($table_exists) {
+    my @statements = $self->_bz_schema->get_drop_table_ddl($name);
+    print get_text('install_table_drop', {name => $name}) . "\n"
+      if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
+    foreach my $sql (@statements) {
+
+      # Because this is a deletion, we don't want to die hard if
+      # we fail because of some local customization. If something
+      # is already gone, that's fine with us!
+      eval { $self->do($sql); } or warn "Failed SQL: [$sql] Error: $@";
     }
+    $self->_bz_real_schema->delete_table($name);
+    $self->_bz_store_real_schema;
+  }
 }
 
 sub bz_fk_info {
-    my ($self, $table, $column) = @_;
-    my $col_info = $self->bz_column_info($table, $column);
-    return undef if !$col_info;
-    my $fk = $col_info->{REFERENCES};
-    return $fk;
+  my ($self, $table, $column) = @_;
+  my $col_info = $self->bz_column_info($table, $column);
+  return undef if !$col_info;
+  my $fk = $col_info->{REFERENCES};
+  return $fk;
 }
 
 sub bz_rename_column {
-    my ($self, $table, $old_name, $new_name) = @_;
+  my ($self, $table, $old_name, $new_name) = @_;
 
-    my $old_col_exists  = $self->bz_column_info($table, $old_name);
+  my $old_col_exists = $self->bz_column_info($table, $old_name);
 
-    if ($old_col_exists) {
-        my $already_renamed = $self->bz_column_info($table, $new_name);
-            ThrowCodeError('db_rename_conflict',
-                           { old => "$table.$old_name", 
-                             new => "$table.$new_name" }) if $already_renamed;
-        my @statements = $self->_bz_real_schema->get_rename_column_ddl(
-            $table, $old_name, $new_name);
+  if ($old_col_exists) {
+    my $already_renamed = $self->bz_column_info($table, $new_name);
+    ThrowCodeError('db_rename_conflict',
+      {old => "$table.$old_name", new => "$table.$new_name"})
+      if $already_renamed;
+    my @statements
+      = $self->_bz_real_schema->get_rename_column_ddl($table, $old_name, $new_name);
 
-        print get_text('install_column_rename', 
-                       { old => "$table.$old_name", new => "$table.$new_name" })
-               . "\n" if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
+    print get_text('install_column_rename',
+      {old => "$table.$old_name", new => "$table.$new_name"})
+      . "\n"
+      if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
 
-        foreach my $sql (@statements) {
-            $self->do($sql);
-        }
-        $self->_bz_real_schema->rename_column($table, $old_name, $new_name);
-        $self->_bz_store_real_schema;
+    foreach my $sql (@statements) {
+      $self->do($sql);
     }
+    $self->_bz_real_schema->rename_column($table, $old_name, $new_name);
+    $self->_bz_store_real_schema;
+  }
 }
 
 sub bz_rename_table {
-    my ($self, $old_name, $new_name) = @_;
-    my $old_table = $self->bz_table_info($old_name);
-    return if !$old_table;
-
-    my $new = $self->bz_table_info($new_name);
-    ThrowCodeError('db_rename_conflict', { old => $old_name,
-                                           new => $new_name }) if $new;
-
-    # FKs will all have the wrong names unless we drop and then let them
-    # be re-created later. Under normal circumstances, checksetup.pl will
-    # automatically re-create these dropped FKs at the end of its DB upgrade
-    # run, so we don't need to re-create them in this method.
-    my @columns = $self->bz_table_columns($old_name);
-    foreach my $column (@columns) {
-        # these just return silently if there's no FK to drop
-        $self->bz_drop_fk($old_name, $column);
-        $self->bz_drop_related_fks($old_name, $column);
-    }
-
-    my @sql = $self->_bz_real_schema->get_rename_table_sql($old_name, $new_name);
-    print get_text('install_table_rename', 
-                   { old => $old_name, new => $new_name }) . "\n"
-        if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
-    $self->do($_) foreach @sql;
-    $self->_bz_real_schema->rename_table($old_name, $new_name);
-    $self->_bz_store_real_schema;
+  my ($self, $old_name, $new_name) = @_;
+  my $old_table = $self->bz_table_info($old_name);
+  return if !$old_table;
+
+  my $new = $self->bz_table_info($new_name);
+  ThrowCodeError('db_rename_conflict', {old => $old_name, new => $new_name})
+    if $new;
+
+  # FKs will all have the wrong names unless we drop and then let them
+  # be re-created later. Under normal circumstances, checksetup.pl will
+  # automatically re-create these dropped FKs at the end of its DB upgrade
+  # run, so we don't need to re-create them in this method.
+  my @columns = $self->bz_table_columns($old_name);
+  foreach my $column (@columns) {
+
+    # these just return silently if there's no FK to drop
+    $self->bz_drop_fk($old_name, $column);
+    $self->bz_drop_related_fks($old_name, $column);
+  }
+
+  my @sql = $self->_bz_real_schema->get_rename_table_sql($old_name, $new_name);
+  print get_text('install_table_rename', {old => $old_name, new => $new_name})
+    . "\n"
+    if Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
+  $self->do($_) foreach @sql;
+  $self->_bz_real_schema->rename_table($old_name, $new_name);
+  $self->_bz_store_real_schema;
 }
 
 sub bz_set_next_serial_value {
-    my ($self, $table, $column, $value) = @_;
-    if (!$value) {
-        $value = $self->selectrow_array("SELECT MAX($column) FROM $table") || 0;
-        $value++;
-    }
-    my @sql = $self->_bz_real_schema->get_set_serial_sql($table, $column, $value);
-    $self->do($_) foreach @sql;
+  my ($self, $table, $column, $value) = @_;
+  if (!$value) {
+    $value = $self->selectrow_array("SELECT MAX($column) FROM $table") || 0;
+    $value++;
+  }
+  my @sql = $self->_bz_real_schema->get_set_serial_sql($table, $column, $value);
+  $self->do($_) foreach @sql;
 }
 
 #####################################################################
@@ -1079,12 +1132,12 @@ sub bz_set_next_serial_value {
 #####################################################################
 
 sub _bz_schema {
-    my ($self) = @_;
-    return $self->{private_bz_schema} if exists $self->{private_bz_schema};
-    my @module_parts = split('::', ref $self);
-    my $module_name  = pop @module_parts;
-    $self->{private_bz_schema} = Bugzilla::DB::Schema->new($module_name);
-    return $self->{private_bz_schema};
+  my ($self) = @_;
+  return $self->{private_bz_schema} if exists $self->{private_bz_schema};
+  my @module_parts = split('::', ref $self);
+  my $module_name = pop @module_parts;
+  $self->{private_bz_schema} = Bugzilla::DB::Schema->new($module_name);
+  return $self->{private_bz_schema};
 }
 
 # _bz_get_initial_schema()
@@ -1098,53 +1151,54 @@ sub _bz_schema {
 # Returns:     A Schema object that can be serialized and written to disk
 #              for _bz_init_schema_storage.
 sub _bz_get_initial_schema {
-    my ($self) = @_;
-    return $self->_bz_schema->get_empty_schema();
+  my ($self) = @_;
+  return $self->_bz_schema->get_empty_schema();
 }
 
 sub bz_column_info {
-    my ($self, $table, $column) = @_;
-    my $def = $self->_bz_real_schema->get_column_abstract($table, $column);
-    # We dclone it so callers can't modify the Schema.
-    $def = dclone($def) if defined $def;
-    return $def;
+  my ($self, $table, $column) = @_;
+  my $def = $self->_bz_real_schema->get_column_abstract($table, $column);
+
+  # We dclone it so callers can't modify the Schema.
+  $def = dclone($def) if defined $def;
+  return $def;
 }
 
 sub bz_index_info {
-    my ($self, $table, $index) = @_;
-    my $index_def =
-        $self->_bz_real_schema->get_index_abstract($table, $index);
-    if (ref($index_def) eq 'ARRAY') {
-        $index_def = {FIELDS => $index_def, TYPE => ''};
-    }
-    return $index_def;
+  my ($self, $table, $index) = @_;
+  my $index_def = $self->_bz_real_schema->get_index_abstract($table, $index);
+  if (ref($index_def) eq 'ARRAY') {
+    $index_def = {FIELDS => $index_def, TYPE => ''};
+  }
+  return $index_def;
 }
 
 sub bz_table_info {
-    my ($self, $table) = @_;
-    return $self->_bz_real_schema->get_table_abstract($table);
+  my ($self, $table) = @_;
+  return $self->_bz_real_schema->get_table_abstract($table);
 }
 
 
 sub bz_table_columns {
-    my ($self, $table) = @_;
-    return $self->_bz_real_schema->get_table_columns($table);
+  my ($self, $table) = @_;
+  return $self->_bz_real_schema->get_table_columns($table);
 }
 
 sub bz_table_indexes {
-    my ($self, $table) = @_;
-    my $indexes = $self->_bz_real_schema->get_table_indexes_abstract($table);
-    my %return_indexes;
-    # We do this so that they're always hashes.
-    foreach my $name (keys %$indexes) {
-        $return_indexes{$name} = $self->bz_index_info($table, $name);
-    }
-    return \%return_indexes;
+  my ($self, $table) = @_;
+  my $indexes = $self->_bz_real_schema->get_table_indexes_abstract($table);
+  my %return_indexes;
+
+  # We do this so that they're always hashes.
+  foreach my $name (keys %$indexes) {
+    $return_indexes{$name} = $self->bz_index_info($table, $name);
+  }
+  return \%return_indexes;
 }
 
 sub bz_table_list {
-    my ($self) = @_;
-    return $self->_bz_real_schema->get_table_list();
+  my ($self) = @_;
+  return $self->_bz_real_schema->get_table_list();
 }
 
 #####################################################################
@@ -1163,9 +1217,9 @@ sub bz_table_list {
 # Returns:     An array of column names.
 #
 sub bz_table_columns_real {
-    my ($self, $table) = @_;
-    my $sth = $self->column_info(undef, undef, $table, '%');
-    return @{ $self->selectcol_arrayref($sth, {Columns => [4]}) };
+  my ($self, $table) = @_;
+  my $sth = $self->column_info(undef, undef, $table, '%');
+  return @{$self->selectcol_arrayref($sth, {Columns => [4]})};
 }
 
 # bz_table_list_real()
@@ -1175,9 +1229,25 @@ sub bz_table_columns_real {
 # Params:      none
 # Returns:     An array containing table names.
 sub bz_table_list_real {
-    my ($self) = @_;
-    my $table_sth = $self->table_info(undef, undef, undef, "TABLE");
-    return @{$self->selectcol_arrayref($table_sth, { Columns => [3] })};
+  my ($self) = @_;
+  my $table_sth = $self->table_info(undef, undef, undef, "TABLE");
+  return @{$self->selectcol_arrayref($table_sth, {Columns => [3]})};
+}
+
+sub bz_column_length {
+  my ($self, $table, $column) = @_;
+  state %column_length;
+
+  if (not exists $column_length{$table}) {
+    my $csr = $self->column_info(undef, undef, $table, undef);
+    my $cols = $csr->fetchall_arrayref({COLUMN_NAME => 1, COLUMN_SIZE => 1});
+
+    foreach my $col (@$cols) {
+      $column_length{$table}{$col->{COLUMN_NAME}} = $col->{COLUMN_SIZE} // MAX_INT_32;
+    }
+  }
+
+  return $column_length{$table}{$column} // 0;
 }
 
 #####################################################################
@@ -1185,55 +1255,59 @@ sub bz_table_list_real {
 #####################################################################
 
 sub bz_in_transaction {
-    return $_[0]->{private_bz_transaction_count} ? 1 : 0;
+  return $_[0]->{private_bz_transaction_count} ? 1 : 0;
 }
 
 sub bz_start_transaction {
-    my ($self) = @_;
-
-    if ($self->bz_in_transaction) {
-        $self->{private_bz_transaction_count}++;
-    } else {
-        # Turn AutoCommit off and start a new transaction
-        $self->begin_work();
-        # REPEATABLE READ means "We work on a snapshot of the DB that
-        # is created when we execute our first SQL statement." It's
-        # what we need in Bugzilla to be safe, for what we do.
-        # Different DBs have different defaults for their isolation
-        # level, so we just set it here manually.
-        if ($self->ISOLATION_LEVEL) {
-            $self->do('SET TRANSACTION ISOLATION LEVEL ' 
-                      . $self->ISOLATION_LEVEL);
-        }
-        $self->{private_bz_transaction_count} = 1;
+  my ($self) = @_;
+
+  if ($self->bz_in_transaction) {
+    $self->{private_bz_transaction_count}++;
+  }
+  else {
+    # Turn AutoCommit off and start a new transaction
+    $self->begin_work();
+
+    # REPEATABLE READ means "We work on a snapshot of the DB that
+    # is created when we execute our first SQL statement." It's
+    # what we need in Bugzilla to be safe, for what we do.
+    # Different DBs have different defaults for their isolation
+    # level, so we just set it here manually.
+    if ($self->ISOLATION_LEVEL) {
+      $self->do('SET TRANSACTION ISOLATION LEVEL ' . $self->ISOLATION_LEVEL);
     }
+    $self->{private_bz_transaction_count} = 1;
+  }
 }
 
 sub bz_commit_transaction {
-    my ($self) = @_;
-
-    if ($self->{private_bz_transaction_count} > 1) {
-        $self->{private_bz_transaction_count}--;
-    } elsif ($self->bz_in_transaction) {
-        $self->commit();
-        $self->{private_bz_transaction_count} = 0;
-        Bugzilla::Mailer->send_staged_mail();
-    } else {
-       ThrowCodeError('not_in_transaction');
-    }
+  my ($self) = @_;
+
+  if ($self->{private_bz_transaction_count} > 1) {
+    $self->{private_bz_transaction_count}--;
+  }
+  elsif ($self->bz_in_transaction) {
+    $self->commit();
+    $self->{private_bz_transaction_count} = 0;
+    Bugzilla::Mailer->send_staged_mail();
+  }
+  else {
+    ThrowCodeError('not_in_transaction');
+  }
 }
 
 sub bz_rollback_transaction {
-    my ($self) = @_;
-
-    # Unlike start and commit, if we rollback at any point it happens
-    # instantly, even if we're in a nested transaction.
-    if (!$self->bz_in_transaction) {
-        ThrowCodeError("not_in_transaction");
-    } else {
-        $self->rollback();
-        $self->{private_bz_transaction_count} = 0;
-    }
+  my ($self) = @_;
+
+  # Unlike start and commit, if we rollback at any point it happens
+  # instantly, even if we're in a nested transaction.
+  if (!$self->bz_in_transaction) {
+    ThrowCodeError("not_in_transaction");
+  }
+  else {
+    $self->rollback();
+    $self->{private_bz_transaction_count} = 0;
+  }
 }
 
 #####################################################################
@@ -1241,42 +1315,43 @@ sub bz_rollback_transaction {
 #####################################################################
 
 sub db_new {
-    my ($class, $params) = @_;
-    my ($dsn, $user, $pass, $override_attrs) = 
-        @$params{qw(dsn user pass attrs)};
-
-    # set up default attributes used to connect to the database
-    # (may be overridden by DB driver implementations)
-    my $attributes = { RaiseError => 0,
-                       AutoCommit => 1,
-                       PrintError => 0,
-                       ShowErrorStatement => 1,
-                       HandleError => \&_handle_error,
-                       TaintIn => 1,
-                       # See https://rt.perl.org/rt3/Public/Bug/Display.html?id=30933
-                       # for the reason to use NAME instead of NAME_lc (bug 253696).
-                       FetchHashKeyName => 'NAME',
-                     };
-
-    if ($override_attrs) {
-        foreach my $key (keys %$override_attrs) {
-            $attributes->{$key} = $override_attrs->{$key};
-        }
+  my ($class, $params) = @_;
+  my ($dsn, $user, $pass, $override_attrs) = @$params{qw(dsn user pass attrs)};
+
+  # set up default attributes used to connect to the database
+  # (may be overridden by DB driver implementations)
+  my $attributes = {
+    RaiseError         => 0,
+    AutoCommit         => 1,
+    PrintError         => 0,
+    ShowErrorStatement => 1,
+    HandleError        => \&_handle_error,
+    TaintIn            => 1,
+
+    # See https://rt.perl.org/rt3/Public/Bug/Display.html?id=30933
+    # for the reason to use NAME instead of NAME_lc (bug 253696).
+    FetchHashKeyName => 'NAME',
+  };
+
+  if ($override_attrs) {
+    foreach my $key (keys %$override_attrs) {
+      $attributes->{$key} = $override_attrs->{$key};
     }
+  }
 
-    # connect using our known info to the specified db
-    my $self = DBI->connect($dsn, $user, $pass, $attributes)
-        or die "\nCan't connect to the database.\nError: $DBI::errstr\n"
-        . "  Is your database installed and up and running?\n  Do you have"
-        . " the correct username and password selected in localconfig?\n\n";
+  # connect using our known info to the specified db
+  my $self = DBI->connect($dsn, $user, $pass, $attributes)
+    or die "\nCan't connect to the database.\nError: $DBI::errstr\n"
+    . "  Is your database installed and up and running?\n  Do you have"
+    . " the correct username and password selected in localconfig?\n\n";
 
-    # RaiseError was only set to 0 so that we could catch the 
-    # above "die" condition.
-    $self->{RaiseError} = 1;
+  # RaiseError was only set to 0 so that we could catch the
+  # above "die" condition.
+  $self->{RaiseError} = 1;
 
-    bless ($self, $class);
+  bless($self, $class);
 
-    return $self;
+  return $self;
 }
 
 #####################################################################
@@ -1300,55 +1375,54 @@ These methods really are private. Do not override them in subclasses.
 =cut
 
 sub _bz_init_schema_storage {
-    my ($self) = @_;
-
-    my $table_size;
-    eval {
-        $table_size = 
-            $self->selectrow_array("SELECT COUNT(*) FROM bz_schema");
-    };
+  my ($self) = @_;
+
+  my $table_size;
+  eval { $table_size = $self->selectrow_array("SELECT COUNT(*) FROM bz_schema"); };
+
+  if (!$table_size) {
+    my $init_schema    = $self->_bz_get_initial_schema;
+    my $store_me       = $init_schema->serialize_abstract();
+    my $schema_version = $init_schema->SCHEMA_VERSION;
+
+    # If table_size is not defined, then we hit an error reading the
+    # bz_schema table, which means it probably doesn't exist yet. So,
+    # we have to create it. If we failed above for some other reason,
+    # we'll see the failure here.
+    # However, we must create the table after we do get_initial_schema,
+    # because some versions of get_initial_schema read that the table
+    # exists and then add it to the Schema, where other versions don't.
+    if (!defined $table_size) {
+      $self->_bz_add_table_raw('bz_schema');
+    }
 
-    if (!$table_size) {
-        my $init_schema = $self->_bz_get_initial_schema;
-        my $store_me = $init_schema->serialize_abstract();
-        my $schema_version = $init_schema->SCHEMA_VERSION;
-
-        # If table_size is not defined, then we hit an error reading the
-        # bz_schema table, which means it probably doesn't exist yet. So,
-        # we have to create it. If we failed above for some other reason,
-        # we'll see the failure here.
-        # However, we must create the table after we do get_initial_schema,
-        # because some versions of get_initial_schema read that the table
-        # exists and then add it to the Schema, where other versions don't.
-        if (!defined $table_size) {
-            $self->_bz_add_table_raw('bz_schema');
-        }
+    say install_string('db_schema_init');
+    my $sth = $self->prepare(
+      "INSERT INTO bz_schema " . " (schema_data, version) VALUES (?,?)");
+    $sth->bind_param(1, $store_me, $self->BLOB_TYPE);
+    $sth->bind_param(2, $schema_version);
+    $sth->execute();
 
-        say install_string('db_schema_init');
-        my $sth = $self->prepare("INSERT INTO bz_schema "
-                                 ." (schema_data, version) VALUES (?,?)");
-        $sth->bind_param(1, $store_me, $self->BLOB_TYPE);
-        $sth->bind_param(2, $schema_version);
-        $sth->execute();
-
-        # And now we have to update the on-disk schema to hold the bz_schema
-        # table, if the bz_schema table didn't exist when we were called.
-        if (!defined $table_size) {
-            $self->_bz_real_schema->add_table('bz_schema',
-                $self->_bz_schema->get_table_abstract('bz_schema'));
-            $self->_bz_store_real_schema;
-        }
-    } 
-    # Sanity check
-    elsif ($table_size > 1) {
-        # We tell them to delete the newer one. Better to have checksetup
-        # run migration code too many times than to have it not run the
-        # correct migration code at all.
-        die "Attempted to initialize the schema but there are already "
-            . " $table_size copies of it stored.\nThis should never happen.\n"
-            . " Compare the rows of the bz_schema table and delete the "
-            . "newer one(s).";
+    # And now we have to update the on-disk schema to hold the bz_schema
+    # table, if the bz_schema table didn't exist when we were called.
+    if (!defined $table_size) {
+      $self->_bz_real_schema->add_table('bz_schema',
+        $self->_bz_schema->get_table_abstract('bz_schema'));
+      $self->_bz_store_real_schema;
     }
+  }
+
+  # Sanity check
+  elsif ($table_size > 1) {
+
+    # We tell them to delete the newer one. Better to have checksetup
+    # run migration code too many times than to have it not run the
+    # correct migration code at all.
+    die "Attempted to initialize the schema but there are already "
+      . " $table_size copies of it stored.\nThis should never happen.\n"
+      . " Compare the rows of the bz_schema table and delete the "
+      . "newer one(s).";
+  }
 }
 
 =item C<_bz_real_schema()>
@@ -1362,24 +1436,23 @@ sub _bz_init_schema_storage {
 =cut
 
 sub _bz_real_schema {
-    my ($self) = @_;
-    return $self->{private_real_schema} if exists $self->{private_real_schema};
-
-    my $bz_schema;
-    unless ($bz_schema = Bugzilla->memcached->get({ key => 'bz_schema' })) {
-        $bz_schema = $self->selectrow_arrayref(
-            "SELECT schema_data, version FROM bz_schema"
-        );
-        Bugzilla->memcached->set({ key => 'bz_schema', value => $bz_schema });
-    }
+  my ($self) = @_;
+  return $self->{private_real_schema} if exists $self->{private_real_schema};
 
-    (die "_bz_real_schema tried to read the bz_schema table but it's empty!")
-        if !$bz_schema;
+  my $bz_schema;
+  unless ($bz_schema = Bugzilla->memcached->get({key => 'bz_schema'})) {
+    $bz_schema
+      = $self->selectrow_arrayref("SELECT schema_data, version FROM bz_schema");
+    Bugzilla->memcached->set({key => 'bz_schema', value => $bz_schema});
+  }
 
-    $self->{private_real_schema} =
-        $self->_bz_schema->deserialize_abstract($bz_schema->[0], $bz_schema->[1]);
+  (die "_bz_real_schema tried to read the bz_schema table but it's empty!")
+    if !$bz_schema;
 
-    return $self->{private_real_schema};
+  $self->{private_real_schema}
+    = $self->_bz_schema->deserialize_abstract($bz_schema->[0], $bz_schema->[1]);
+
+  return $self->{private_real_schema};
 }
 
 =item C<_bz_store_real_schema()>
@@ -1399,106 +1472,135 @@ sub _bz_real_schema {
 =cut
 
 sub _bz_store_real_schema {
-    my ($self) = @_;
-
-    # Make sure that there's a schema to update
-    my $table_size = $self->selectrow_array("SELECT COUNT(*) FROM bz_schema");
-
-    die "Attempted to update the bz_schema table but there's nothing "
-        . "there to update. Run checksetup." unless $table_size;
-
-    # We want to store the current object, not one
-    # that we read from the database. So we use the actual hash
-    # member instead of the subroutine call. If the hash
-    # member is not defined, we will (and should) fail.
-    my $update_schema = $self->{private_real_schema};
-    my $store_me = $update_schema->serialize_abstract();
-    my $schema_version = $update_schema->SCHEMA_VERSION;
-    my $sth = $self->prepare("UPDATE bz_schema 
-                                 SET schema_data = ?, version = ?");
-    $sth->bind_param(1, $store_me, $self->BLOB_TYPE);
-    $sth->bind_param(2, $schema_version);
-    $sth->execute();
+  my ($self) = @_;
+
+  # Make sure that there's a schema to update
+  my $table_size = $self->selectrow_array("SELECT COUNT(*) FROM bz_schema");
+
+  die "Attempted to update the bz_schema table but there's nothing "
+    . "there to update. Run checksetup."
+    unless $table_size;
 
-    Bugzilla->memcached->clear({ key => 'bz_schema' });
+  # We want to store the current object, not one
+  # that we read from the database. So we use the actual hash
+  # member instead of the subroutine call. If the hash
+  # member is not defined, we will (and should) fail.
+  my $update_schema  = $self->{private_real_schema};
+  my $store_me       = $update_schema->serialize_abstract();
+  my $schema_version = $update_schema->SCHEMA_VERSION;
+  my $sth            = $self->prepare(
+    "UPDATE bz_schema 
+                                 SET schema_data = ?, version = ?"
+  );
+  $sth->bind_param(1, $store_me, $self->BLOB_TYPE);
+  $sth->bind_param(2, $schema_version);
+  $sth->execute();
+
+  Bugzilla->memcached->clear({key => 'bz_schema'});
 }
 
 # For bz_populate_enum_tables
 sub _bz_populate_enum_table {
-    my ($self, $table, $valuelist) = @_;
-
-    my $sql_table = $self->quote_identifier($table);
-
-    # Check if there are any table entries
-    my $table_size = $self->selectrow_array("SELECT COUNT(*) FROM $sql_table");
-
-    # If the table is empty...
-    if (!$table_size) {
-        print " $table";
-        my $insert = $self->prepare(
-            "INSERT INTO $sql_table (value,sortkey) VALUES (?,?)");
-        my $sortorder = 0;
-        my $maxlen    = max(map(length($_), @$valuelist)) + 2;
-        foreach my $value (@$valuelist) {
-            $sortorder += 100;
-            $insert->execute($value, $sortorder);
-        }
+  my ($self, $table, $valuelist) = @_;
+
+  my $sql_table = $self->quote_identifier($table);
+
+  # Check if there are any table entries
+  my $table_size = $self->selectrow_array("SELECT COUNT(*) FROM $sql_table");
+
+  # If the table is empty...
+  if (!$table_size) {
+    print " $table";
+    my $insert
+      = $self->prepare("INSERT INTO $sql_table (value,sortkey) VALUES (?,?)");
+    my $sortorder = 0;
+    my $maxlen = max(map(length($_), @$valuelist)) + 2;
+    foreach my $value (@$valuelist) {
+      $sortorder += 100;
+      $insert->execute($value, $sortorder);
     }
+  }
 }
 
 # This is used before adding a foreign key to a column, to make sure
 # that the database won't fail adding the key.
 sub _check_references {
-    my ($self, $table, $column, $fk) = @_;
-    my $foreign_table = $fk->{TABLE};
-    my $foreign_column = $fk->{COLUMN};
-
-    # We use table aliases because sometimes we join a table to itself,
-    # and we can't use the same table name on both sides of the join.
-    # We also can't use the words "table" or "foreign" because those are
-    # reserved words.
-    my $bad_values = $self->selectcol_arrayref(
-        "SELECT DISTINCT tabl.$column 
+  my ($self, $table, $column, $fk) = @_;
+  my $foreign_table  = $fk->{TABLE};
+  my $foreign_column = $fk->{COLUMN};
+
+  # We use table aliases because sometimes we join a table to itself,
+  # and we can't use the same table name on both sides of the join.
+  # We also can't use the words "table" or "foreign" because those are
+  # reserved words.
+  my $bad_values = $self->selectcol_arrayref(
+    "SELECT DISTINCT tabl.$column 
            FROM $table AS tabl LEFT JOIN $foreign_table AS forn
                 ON tabl.$column = forn.$foreign_column
           WHERE forn.$foreign_column IS NULL
-                AND tabl.$column IS NOT NULL");
-
-    if (@$bad_values) {
-        my $delete_action = $fk->{DELETE} || '';
-        if ($delete_action eq 'CASCADE') {
-            $self->do("DELETE FROM $table WHERE $column IN (" 
-                      . join(',', ('?') x @$bad_values)  . ")",
-                      undef, @$bad_values);
-            if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-                print "\n", get_text('install_fk_invalid_fixed',
-                    { table => $table, column => $column,
-                      foreign_table => $foreign_table,
-                      foreign_column => $foreign_column,
-                      'values' => $bad_values, action => 'delete' }), "\n";
-            }
-        }
-        elsif ($delete_action eq 'SET NULL') {
-            $self->do("UPDATE $table SET $column = NULL
+                AND tabl.$column IS NOT NULL"
+  );
+
+  if (@$bad_values) {
+    my $delete_action = $fk->{DELETE} || '';
+    if ($delete_action eq 'CASCADE') {
+      $self->do(
+        "DELETE FROM $table WHERE $column IN (" . join(',', ('?') x @$bad_values) . ")",
+        undef, @$bad_values
+      );
+      if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+        print "\n",
+          get_text(
+          'install_fk_invalid_fixed',
+          {
+            table          => $table,
+            column         => $column,
+            foreign_table  => $foreign_table,
+            foreign_column => $foreign_column,
+            'values'       => $bad_values,
+            action         => 'delete'
+          }
+          ),
+          "\n";
+      }
+    }
+    elsif ($delete_action eq 'SET NULL') {
+      $self->do(
+        "UPDATE $table SET $column = NULL
                         WHERE $column IN ("
-                      . join(',', ('?') x @$bad_values)  . ")",
-                      undef, @$bad_values);
-            if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-                print "\n", get_text('install_fk_invalid_fixed',
-                    { table => $table, column => $column,
-                      foreign_table => $foreign_table, 
-                      foreign_column => $foreign_column,
-                      'values' => $bad_values, action => 'null' }), "\n";
-            }
-        }
-        else {
-            die "\n", get_text('install_fk_invalid',
-                { table => $table, column => $column,
-                  foreign_table => $foreign_table,
-                  foreign_column => $foreign_column,
-                 'values' => $bad_values }), "\n";
+          . join(',', ('?') x @$bad_values) . ")", undef, @$bad_values
+      );
+      if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+        print "\n",
+          get_text(
+          'install_fk_invalid_fixed',
+          {
+            table          => $table,
+            column         => $column,
+            foreign_table  => $foreign_table,
+            foreign_column => $foreign_column,
+            'values'       => $bad_values,
+            action         => 'null'
+          }
+          ),
+          "\n";
+      }
+    }
+    else {
+      die "\n",
+        get_text(
+        'install_fk_invalid',
+        {
+          table          => $table,
+          column         => $column,
+          foreign_table  => $foreign_table,
+          foreign_column => $foreign_column,
+          'values'       => $bad_values
         }
+        ),
+        "\n";
     }
+  }
 }
 
 1;
@@ -1507,7 +1609,7 @@ __END__
 
 =head1 NAME
 
-Bugzilla::DB - Database access routines, using L<DBI>
+Bugzilla::DB - Database access routines, using L<DBI|https://metacpan.org/pod/DBI>
 
 =head1 SYNOPSIS
 
@@ -1768,7 +1870,7 @@ The constructor should create a DSN from the parameters provided and
 then call C<db_new()> method of its super class to create a new
 class instance. See L<db_new> description in this module. As per
 DBI documentation, all class variables must be prefixed with
-"private_". See L<DBI>.
+"private_". See L<DBI|https://metacpan.org/pod/DBI>.
 
 =back
 
@@ -1841,7 +1943,7 @@ Formatted SQL for negative regular expression search (e.g. NOT REGEXP)
 =item B<Description>
 
 Returns SQL syntax for limiting results to some number of rows
-with optional offset if not starting from the begining.
+with optional offset if not starting from the beginning.
 
 Abstract method, should be overridden by database specific code.
 
@@ -1985,7 +2087,7 @@ Formatted SQL for adding or subtracting a date and some amount of time (scalar)
 =item B<Description>
 
 Outputs proper SQL syntax determining position of a substring
-(fragment) withing a string (text). Note: if the substring or
+(fragment) within a string (text). Note: if the substring or
 text are string constants, they must be properly quoted (e.g. "'pattern'").
 
 It searches for the string in a case-sensitive manner. If you want to do
@@ -2011,6 +2113,73 @@ Formatted SQL for substring search (scalar)
 
 Just like L</sql_position>, but case-insensitive.
 
+=item C<sql_like>
+
+=over
+
+=item B<Description>
+
+Outputs SQL to search for an instance of a string (fragment)
+in a table column (column).
+
+Note that the fragment must not be quoted. L</sql_like> will
+quote the fragment itself.
+
+This is a case sensitive search.
+
+Note: This does not necessarily generate an ANSI LIKE statement, but
+could be overridden to do so in a database subclass if required.
+
+=item B<Params>
+
+=over
+
+=item C<$fragment> - the string fragment that we are searching for (scalar)
+
+=item C<$column> - the column to search
+
+=back
+
+=item B<Returns>
+
+Formatted SQL to return results from columns that contain the fragment.
+
+=back
+
+=item C<sql_ilike>
+
+Just like L</sql_like>, but case-insensitive.
+
+=item C<sql_not_ilike>
+
+=over
+
+=item B<Description>
+
+Outputs SQL to search for columns (column) that I<do not> contain
+instances of the string (fragment).
+
+Note that the fragment must not be quoted. L</sql_not_ilike> will
+quote the fragment itself.
+
+This is a case insensitive search.
+
+=item B<Params>
+
+=over
+
+=item C<$fragment> - the string fragment that we are searching for (scalar)
+
+=item C<$column> - the column to search
+
+=back
+
+=item B<Returns>
+
+Formatted sql to return results from columns that do not contain the fragment
+
+=back
+
 =item C<sql_group_by>
 
 =over
@@ -2096,7 +2265,7 @@ specified text on a given column.
 
 If one value is returned, it is a numeric expression that indicates
 a match with a positive value and a non-match with zero. In this case,
-the DB must support casting numeric expresions to booleans.
+the DB must support casting numeric expressions to booleans.
 
 If two values are returned, then the first value is a boolean expression
 that indicates the presence of a match, and the second value is a numeric
@@ -2239,7 +2408,8 @@ These methods return information about data in the database.
 Returns the last serial number, usually from a previous INSERT.
 
 Must be executed directly following the relevant INSERT.
-This base implementation uses L<DBI/last_insert_id>. If the
+This base implementation uses DBI's
+L<last_insert_id|https://metacpan.org/pod/DBI#last_insert_id>. If the
 DBD supports it, it is the preffered way to obtain the last
 serial index. If it is not supported, the DB-specific code
 needs to override this function.
@@ -2262,6 +2432,38 @@ Last inserted ID (scalar)
 
 =back
 
+=over
+
+=item C<bz_column_length>
+
+=over
+
+=item B<Description>
+
+Returns the length of the specified column as specified by the database
+
+only really useful for text based strings.
+This implementation uses DBI's
+L<column_info|https://metacpan.org/pod/DBI#column_info>.
+
+=item B<Params>
+
+=over
+
+=item C<$table> - name of table (scalar)
+
+=item C<$column> - name of column type (scalar)
+
+=back
+
+=item B<Returns>
+
+The length of the field, 0 if it does not exist.
+
+=back
+
+=back
+
 =head2 Database Setup Methods
 
 These methods are used by the Bugzilla installation programs to set up
@@ -2318,7 +2520,11 @@ values to.
 
 =item C<$name> - the name of the new column
 
-=item C<\%definition> - Abstract column definition for the new column
+=item C<$definition> - A hashref abstract column definition for the new column.
+Note, if a  C<REFERENCES> definition is included to create a foreign key
+relationship, it will be created later instead of when the column is added.
+Normally foreign keys are added by C<checksetup.pl> at the end all at the same
+time.
 
 =item C<$init_value> (optional) - An initial value to set the column
 to. Required if your column is NOT NULL and has no DEFAULT set.
@@ -2631,7 +2837,7 @@ Returns nothing and takes no parameters.
 
 =item C<bz_commit_transaction>
 
-Ends a transaction, commiting all changes. Returns nothing and takes
+Ends a transaction, committing all changes. Returns nothing and takes
 no parameters.
 
 =item C<bz_rollback_transaction>
@@ -2689,7 +2895,7 @@ our check for implementation of C<new> by derived class useless.
 
 =head1 SEE ALSO
 
-L<DBI>
+L<DBI|https://metacpan.org/pod/DBI>
 
 L<Bugzilla::Constants/DB_MODULE>
 
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 02cc8bc100..71649e0190 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -21,7 +21,7 @@ For interface details see L<Bugzilla::DB> and L<DBI>.
 
 package Bugzilla::DB::Mysql;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -37,254 +37,264 @@ use List::Util qw(max);
 use Text::ParseWords;
 
 # This is how many comments of MAX_COMMENT_LENGTH we expect on a single bug.
-# In reality, you could have a LOT more comments than this, because 
+# In reality, you could have a LOT more comments than this, because
 # MAX_COMMENT_LENGTH is big.
 use constant MAX_COMMENTS => 50;
 
 use constant FULLTEXT_OR => '|';
 
 sub new {
-    my ($class, $params) = @_;
-    my ($user, $pass, $host, $dbname, $port, $sock) =
-        @$params{qw(db_user db_pass db_host db_name db_port db_sock)};
-
-    # construct the DSN from the parameters we got
-    my $dsn = "dbi:mysql:host=$host;database=$dbname";
-    $dsn .= ";port=$port" if $port;
-    $dsn .= ";mysql_socket=$sock" if $sock;
-
-    my %attrs = (
-        mysql_enable_utf8 => Bugzilla->params->{'utf8'},
-        # Needs to be explicitly specified for command-line processes.
-        mysql_auto_reconnect => 1,
-    );
-    
-    # MySQL SSL options
-    my ($ssl_ca_file, $ssl_ca_path, $ssl_cert, $ssl_key) =
-        @$params{qw(db_mysql_ssl_ca_file db_mysql_ssl_ca_path
-                    db_mysql_ssl_client_cert db_mysql_ssl_client_key)};
-    if ($ssl_ca_file || $ssl_ca_path || $ssl_cert || $ssl_key) {
-        $attrs{'mysql_ssl'}             = 1;
-        $attrs{'mysql_ssl_ca_file'}     = $ssl_ca_file if $ssl_ca_file;
-        $attrs{'mysql_ssl_ca_path'}     = $ssl_ca_path if $ssl_ca_path;
-        $attrs{'mysql_ssl_client_cert'} = $ssl_cert    if $ssl_cert;
-        $attrs{'mysql_ssl_client_key'}  = $ssl_key     if $ssl_key;
+  my ($class, $params) = @_;
+  my ($user, $pass, $host, $dbname, $port, $sock)
+    = @$params{qw(db_user db_pass db_host db_name db_port db_sock)};
+
+  # construct the DSN from the parameters we got
+  my $dsn = "dbi:mysql:host=$host;database=$dbname";
+  $dsn .= ";port=$port"         if $port;
+  $dsn .= ";mysql_socket=$sock" if $sock;
+
+  my %attrs = (
+    mysql_enable_utf8 => 1,
+
+    # Needs to be explicitly specified for command-line processes.
+    mysql_auto_reconnect => 1,
+  );
+
+  # MySQL SSL options
+  my ($ssl_ca_file, $ssl_ca_path, $ssl_cert, $ssl_key) = @$params{
+    qw(db_mysql_ssl_ca_file db_mysql_ssl_ca_path
+      db_mysql_ssl_client_cert db_mysql_ssl_client_key)
+  };
+  if ($ssl_ca_file || $ssl_ca_path || $ssl_cert || $ssl_key) {
+    $attrs{'mysql_ssl'}             = 1;
+    $attrs{'mysql_ssl_ca_file'}     = $ssl_ca_file if $ssl_ca_file;
+    $attrs{'mysql_ssl_ca_path'}     = $ssl_ca_path if $ssl_ca_path;
+    $attrs{'mysql_ssl_client_cert'} = $ssl_cert if $ssl_cert;
+    $attrs{'mysql_ssl_client_key'}  = $ssl_key if $ssl_key;
+  }
+
+  my $self = $class->db_new(
+    {dsn => $dsn, user => $user, pass => $pass, attrs => \%attrs});
+
+  # This makes sure that we return table names correctly.
+  $self->do("SET NAMES utf8");
+
+  # all class local variables stored in DBI derived class needs to have
+  # a prefix 'private_'. See DBI documentation.
+  $self->{private_bz_tables_locked} = "";
+
+  # Needed by TheSchwartz
+  $self->{private_bz_dsn} = $dsn;
+
+  bless($self, $class);
+
+  # Check for MySQL modes.
+  my ($var, $sql_mode)
+    = $self->selectrow_array("SHOW VARIABLES LIKE 'sql\\_mode'");
+
+  # Disable ANSI and strict modes, else Bugzilla will crash.
+  if ($sql_mode) {
+
+    # STRICT_TRANS_TABLE or STRICT_ALL_TABLES enable MySQL strict mode,
+    # causing bug 321645. TRADITIONAL sets these modes (among others) as
+    # well, so it has to be stipped as well
+    my $new_sql_mode = join(",",
+      grep { $_ !~ /^(?:ANSI|STRICT_(?:TRANS|ALL)_TABLES|TRADITIONAL)$/ }
+        split(/,/, $sql_mode));
+
+    if ($sql_mode ne $new_sql_mode) {
+      $self->do("SET SESSION sql_mode = ?", undef, $new_sql_mode);
     }
+  }
 
-    my $self = $class->db_new({ dsn => $dsn, user => $user, 
-                                pass => $pass, attrs => \%attrs });
-
-    # This makes sure that if the tables are encoded as UTF-8, we
-    # return their data correctly.
-    $self->do("SET NAMES utf8") if Bugzilla->params->{'utf8'};
-
-    # all class local variables stored in DBI derived class needs to have
-    # a prefix 'private_'. See DBI documentation.
-    $self->{private_bz_tables_locked} = "";
-
-    # Needed by TheSchwartz
-    $self->{private_bz_dsn} = $dsn;
+  # Allow large GROUP_CONCATs (largely for inserting comments
+  # into bugs_fulltext).
+  $self->do('SET SESSION group_concat_max_len = 128000000');
 
-    bless ($self, $class);
+  # MySQL 5.5.2 and older have this variable set to true, which causes
+  # trouble, see bug 870369.
+  $self->do('SET SESSION sql_auto_is_null = 0');
 
-    # Check for MySQL modes.
-    my ($var, $sql_mode) = $self->selectrow_array(
-        "SHOW VARIABLES LIKE 'sql\\_mode'");
-
-    # Disable ANSI and strict modes, else Bugzilla will crash.
-    if ($sql_mode) {
-        # STRICT_TRANS_TABLE or STRICT_ALL_TABLES enable MySQL strict mode,
-        # causing bug 321645. TRADITIONAL sets these modes (among others) as
-        # well, so it has to be stipped as well
-        my $new_sql_mode =
-            join(",", grep {$_ !~ /^(?:ANSI|STRICT_(?:TRANS|ALL)_TABLES|TRADITIONAL)$/}
-                            split(/,/, $sql_mode));
-
-        if ($sql_mode ne $new_sql_mode) {
-            $self->do("SET SESSION sql_mode = ?", undef, $new_sql_mode);
-        }
-    }
-
-    # Allow large GROUP_CONCATs (largely for inserting comments 
-    # into bugs_fulltext).
-    $self->do('SET SESSION group_concat_max_len = 128000000');
-
-    # MySQL 5.5.2 and older have this variable set to true, which causes
-    # trouble, see bug 870369.
-    $self->do('SET SESSION sql_auto_is_null = 0');
-
-    return $self;
+  return $self;
 }
 
 # when last_insert_id() is supported on MySQL by lowest DBI/DBD version
 # required by Bugzilla, this implementation can be removed.
 sub bz_last_key {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    my ($last_insert_id) = $self->selectrow_array('SELECT LAST_INSERT_ID()');
+  my ($last_insert_id) = $self->selectrow_array('SELECT LAST_INSERT_ID()');
 
-    return $last_insert_id;
+  return $last_insert_id;
 }
 
 sub sql_group_concat {
-    my ($self, $column, $separator, $sort, $order_by) = @_;
-    $separator = $self->quote(', ') if !defined $separator;
-    $sort = 1 if !defined $sort;
-    if ($order_by) {
-        $column .= " ORDER BY $order_by";
-    }
-    elsif ($sort) {
-        my $sort_order = $column;
-        $sort_order =~ s/^DISTINCT\s+//i;
-        $column = "$column ORDER BY $sort_order";
-    }
-    return "GROUP_CONCAT($column SEPARATOR $separator)";
+  my ($self, $column, $separator, $sort, $order_by) = @_;
+  $separator = $self->quote(', ') if !defined $separator;
+  $sort = 1 if !defined $sort;
+  if ($order_by) {
+    $column .= " ORDER BY $order_by";
+  }
+  elsif ($sort) {
+    my $sort_order = $column;
+    $sort_order =~ s/^DISTINCT\s+//i;
+    $column = "$column ORDER BY $sort_order";
+  }
+  return "GROUP_CONCAT($column SEPARATOR $separator)";
 }
 
 sub sql_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "$expr REGEXP $pattern";
+  return "$expr REGEXP $pattern";
 }
 
 sub sql_not_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "$expr NOT REGEXP $pattern";
+  return "$expr NOT REGEXP $pattern";
 }
 
 sub sql_limit {
-    my ($self, $limit, $offset) = @_;
-
-    if (defined($offset)) {
-        return "LIMIT $offset, $limit";
-    } else {
-        return "LIMIT $limit";
-    }
+  my ($self, $limit, $offset) = @_;
+
+  if (defined($offset)) {
+    return "LIMIT $offset, $limit";
+  }
+  else {
+    return "LIMIT $limit";
+  }
 }
 
 sub sql_string_concat {
-    my ($self, @params) = @_;
-    
-    return 'CONCAT(' . join(', ', @params) . ')';
+  my ($self, @params) = @_;
+
+  return 'CONCAT(' . join(', ', @params) . ')';
 }
 
 sub sql_fulltext_search {
-    my ($self, $column, $text) = @_;
-
-    # Add the boolean mode modifier if the search string contains
-    # boolean operators at the start or end of a word.
-    my $mode = '';
-    if ($text =~ /(?:^|\W)[+\-<>~"()]/ || $text =~ /[()"*](?:$|\W)/) {
-        $mode = 'IN BOOLEAN MODE';
-
-        # quote un-quoted compound words
-        my @words = quotewords('[\s()]+', 'delimiters', $text);
-        foreach my $word (@words) {
-            # match words that have non-word chars in the middle of them
-            if ($word =~ /\w\W+\w/ && $word !~ m/"/) {
-                $word = '"' . $word . '"';
-            }
+  my ($self, $column, $text) = @_;
+
+  # Add the boolean mode modifier if the search string contains
+  # boolean operators at the start or end of a word.
+  my $mode = '';
+  if ($text =~ /(?:^|\W)[+\-<>~"()]/ || $text =~ /[()"*](?:$|\W)/) {
+    $mode = 'IN BOOLEAN MODE';
+
+    my @terms = split(quotemeta(FULLTEXT_OR), $text);
+    foreach my $term (@terms) {
+
+      # quote un-quoted compound words
+      my @words = quotewords('[\s()]+', 'delimiters', $term);
+      foreach my $word (@words) {
+
+        # match words that have non-word chars in the middle of them
+        if ($word =~ /\w\W+\w/ && $word !~ m/"/) {
+          $word = '"' . $word . '"';
         }
-        $text = join('', @words);
+      }
+      $term = join('', @words);
     }
+    $text = join(FULLTEXT_OR, @terms);
+  }
 
-    # quote the text for use in the MATCH AGAINST expression
-    $text = $self->quote($text);
+  # quote the text for use in the MATCH AGAINST expression
+  $text = $self->quote($text);
 
-    # untaint the text, since it's safe to use now that we've quoted it
-    trick_taint($text);
+  # untaint the text, since it's safe to use now that we've quoted it
+  trick_taint($text);
 
-    return "MATCH($column) AGAINST($text $mode)";
+  return "MATCH($column) AGAINST($text $mode)";
 }
 
 sub sql_istring {
-    my ($self, $string) = @_;
-    
-    return $string;
+  my ($self, $string) = @_;
+
+  return $string;
 }
 
 sub sql_from_days {
-    my ($self, $days) = @_;
+  my ($self, $days) = @_;
 
-    return "FROM_DAYS($days)";
+  return "FROM_DAYS($days)";
 }
 
 sub sql_to_days {
-    my ($self, $date) = @_;
+  my ($self, $date) = @_;
 
-    return "TO_DAYS($date)";
+  return "TO_DAYS($date)";
 }
 
 sub sql_date_format {
-    my ($self, $date, $format) = @_;
+  my ($self, $date, $format) = @_;
+
+  $format = "%Y.%m.%d %H:%i:%s" if !$format;
 
-    $format = "%Y.%m.%d %H:%i:%s" if !$format;
-    
-    return "DATE_FORMAT($date, " . $self->quote($format) . ")";
+  return "DATE_FORMAT($date, " . $self->quote($format) . ")";
 }
 
 sub sql_date_math {
-    my ($self, $date, $operator, $interval, $units) = @_;
-    
-    return "$date $operator INTERVAL $interval $units";
+  my ($self, $date, $operator, $interval, $units) = @_;
+
+  return "$date $operator INTERVAL $interval $units";
 }
 
 sub sql_iposition {
-    my ($self, $fragment, $text) = @_;
-    return "INSTR($text, $fragment)";
+  my ($self, $fragment, $text) = @_;
+  return "INSTR($text, $fragment)";
 }
 
 sub sql_position {
-    my ($self, $fragment, $text) = @_;
+  my ($self, $fragment, $text) = @_;
 
-    return "INSTR(CAST($text AS BINARY), CAST($fragment AS BINARY))";
+  return "INSTR(CAST($text AS BINARY), CAST($fragment AS BINARY))";
 }
 
 sub sql_group_by {
-    my ($self, $needed_columns, $optional_columns) = @_;
+  my ($self, $needed_columns, $optional_columns) = @_;
 
-    # MySQL allows you to specify the minimal subset of columns to get
-    # a unique result. While it does allow specifying all columns as
-    # ANSI SQL requires, according to MySQL documentation, the fewer
-    # columns you specify, the faster the query runs.
-    return "GROUP BY $needed_columns";
+  # MySQL allows you to specify the minimal subset of columns to get
+  # a unique result. While it does allow specifying all columns as
+  # ANSI SQL requires, according to MySQL documentation, the fewer
+  # columns you specify, the faster the query runs.
+  return "GROUP BY $needed_columns";
 }
 
 sub bz_explain {
-    my ($self, $sql) = @_;
-    my $sth  = $self->prepare("EXPLAIN $sql");
-    $sth->execute();
-    my $columns = $sth->{'NAME'};
-    my $lengths = $sth->{'mysql_max_length'};
-    my $format_string = '|';
-    my $i = 0;
-    foreach my $column (@$columns) {
-        # Sometimes the column name is longer than the contents.
-        my $length = max($lengths->[$i], length($column));
-        $format_string .= ' %-' . $length . 's |';
-        $i++;
-    }
-
-    my $first_row = sprintf($format_string, @$columns);
-    my @explain_rows = ($first_row, '-' x length($first_row));
-    while (my $row = $sth->fetchrow_arrayref) {
-        my @fixed = map { defined $_ ? $_ : 'NULL' } @$row;
-        push(@explain_rows, sprintf($format_string, @fixed));
-    }
-
-    return join("\n", @explain_rows);
+  my ($self, $sql) = @_;
+  my $sth = $self->prepare("EXPLAIN $sql");
+  $sth->execute();
+  my $columns       = $sth->{'NAME'};
+  my $lengths       = $sth->{'mysql_max_length'};
+  my $format_string = '|';
+  my $i             = 0;
+  foreach my $column (@$columns) {
+
+    # Sometimes the column name is longer than the contents.
+    my $length = max($lengths->[$i], length($column));
+    $format_string .= ' %-' . $length . 's |';
+    $i++;
+  }
+
+  my $first_row = sprintf($format_string, @$columns);
+  my @explain_rows = ($first_row, '-' x length($first_row));
+  while (my $row = $sth->fetchrow_arrayref) {
+    my @fixed = map { defined $_ ? $_ : 'NULL' } @$row;
+    push(@explain_rows, sprintf($format_string, @fixed));
+  }
+
+  return join("\n", @explain_rows);
 }
 
 sub _bz_get_initial_schema {
-    my ($self) = @_;
-    return $self->_bz_build_schema_from_disk();
+  my ($self) = @_;
+  return $self->_bz_build_schema_from_disk();
 }
 
 #####################################################################
@@ -292,493 +302,497 @@ sub _bz_get_initial_schema {
 #####################################################################
 
 sub bz_check_server_version {
-    my $self = shift;
+  my $self = shift;
 
-    my $lc = Bugzilla->localconfig;
-    if (lc(Bugzilla->localconfig->{db_name}) eq 'mysql') {
-        die "It is not safe to run Bugzilla inside a database named 'mysql'.\n"
-            . " Please pick a different value for \$db_name in localconfig.\n";
-    }
+  if (lc(Bugzilla->localconfig->{db_name}) eq 'mysql') {
+    die "It is not safe to run Bugzilla inside a database named 'mysql'.\n"
+      . " Please pick a different value for \$db_name in localconfig.\n";
+  }
 
-    $self->SUPER::bz_check_server_version(@_);
+  $self->SUPER::bz_check_server_version(@_);
 }
 
 sub bz_setup_database {
-    my ($self) = @_;
-
-    # The "comments" field of the bugs_fulltext table could easily exceed
-    # MySQL's default max_allowed_packet. Also, MySQL should never have
-    # a max_allowed_packet smaller than our max_attachment_size. So, we
-    # warn the user here if max_allowed_packet is too small.
-    my $min_max_allowed = MAX_COMMENTS * MAX_COMMENT_LENGTH;
-    my (undef, $current_max_allowed) = $self->selectrow_array(
-        q{SHOW VARIABLES LIKE 'max\_allowed\_packet'});
-    # This parameter is not yet defined when the DB is being built for
-    # the very first time. The code below still works properly, however,
-    # because the default maxattachmentsize is smaller than $min_max_allowed.
-    my $max_attachment = (Bugzilla->params->{'maxattachmentsize'} || 0) * 1024;
-    my $needed_max_allowed = max($min_max_allowed, $max_attachment);
-    if ($current_max_allowed < $needed_max_allowed) {
-        warn install_string('max_allowed_packet',
-                            { current => $current_max_allowed,
-                              needed  => $needed_max_allowed }) . "\n";
+  my ($self) = @_;
+
+  # The "comments" field of the bugs_fulltext table could easily exceed
+  # MySQL's default max_allowed_packet. Also, MySQL should never have
+  # a max_allowed_packet smaller than our max_attachment_size. So, we
+  # warn the user here if max_allowed_packet is too small.
+  my $min_max_allowed = MAX_COMMENTS * MAX_COMMENT_LENGTH;
+  my (undef, $current_max_allowed)
+    = $self->selectrow_array(q{SHOW VARIABLES LIKE 'max\_allowed\_packet'});
+
+  # This parameter is not yet defined when the DB is being built for
+  # the very first time. The code below still works properly, however,
+  # because the default maxattachmentsize is smaller than $min_max_allowed.
+  my $max_attachment = (Bugzilla->params->{'maxattachmentsize'} || 0) * 1024;
+  my $needed_max_allowed = max($min_max_allowed, $max_attachment);
+  if ($current_max_allowed < $needed_max_allowed) {
+    warn install_string('max_allowed_packet',
+      {current => $current_max_allowed, needed => $needed_max_allowed})
+      . "\n";
+  }
+
+  # Make sure the installation has InnoDB turned on, or we're going to be
+  # doing silly things like making foreign keys on MyISAM tables, which is
+  # hard to fix later. We do this up here because none of the code below
+  # works if InnoDB is off. (Particularly if we've already converted the
+  # tables to InnoDB.)
+  my %engines = @{$self->selectcol_arrayref('SHOW ENGINES', {Columns => [1, 2]})};
+  if (!$engines{InnoDB} || $engines{InnoDB} !~ /^(YES|DEFAULT)$/) {
+    die install_string('mysql_innodb_disabled');
+  }
+
+
+  my ($sd_index_deleted, $longdescs_index_deleted);
+  my @tables = $self->bz_table_list_real();
+
+  # We want to convert tables to InnoDB, but it's possible that they have
+  # fulltext indexes on them, and conversion will fail unless we remove
+  # the indexes.
+  if (grep($_ eq 'bugs', @tables) and !grep($_ eq 'bugs_fulltext', @tables)) {
+    if ($self->bz_index_info_real('bugs', 'short_desc')) {
+      $self->bz_drop_index_raw('bugs', 'short_desc');
     }
-
-    # Make sure the installation has InnoDB turned on, or we're going to be
-    # doing silly things like making foreign keys on MyISAM tables, which is
-    # hard to fix later. We do this up here because none of the code below
-    # works if InnoDB is off. (Particularly if we've already converted the
-    # tables to InnoDB.)
-    my %engines = @{$self->selectcol_arrayref('SHOW ENGINES', {Columns => [1,2]})};
-    if (!$engines{InnoDB} || $engines{InnoDB} !~ /^(YES|DEFAULT)$/) {
-        die install_string('mysql_innodb_disabled');
+    if ($self->bz_index_info_real('bugs', 'bugs_short_desc_idx')) {
+      $self->bz_drop_index_raw('bugs', 'bugs_short_desc_idx');
+      $sd_index_deleted = 1;    # Used for later schema cleanup.
     }
-
-
-    my ($sd_index_deleted, $longdescs_index_deleted);
-    my @tables = $self->bz_table_list_real();
-    # We want to convert tables to InnoDB, but it's possible that they have 
-    # fulltext indexes on them, and conversion will fail unless we remove
-    # the indexes.
-    if (grep($_ eq 'bugs', @tables)
-        and !grep($_ eq 'bugs_fulltext', @tables))
-    {
-        if ($self->bz_index_info_real('bugs', 'short_desc')) {
-            $self->bz_drop_index_raw('bugs', 'short_desc');
-        }
-        if ($self->bz_index_info_real('bugs', 'bugs_short_desc_idx')) {
-            $self->bz_drop_index_raw('bugs', 'bugs_short_desc_idx');
-            $sd_index_deleted = 1; # Used for later schema cleanup.
-        }
+  }
+  if (grep($_ eq 'longdescs', @tables) and !grep($_ eq 'bugs_fulltext', @tables))
+  {
+    if ($self->bz_index_info_real('longdescs', 'thetext')) {
+      $self->bz_drop_index_raw('longdescs', 'thetext');
     }
-    if (grep($_ eq 'longdescs', @tables)
-        and !grep($_ eq 'bugs_fulltext', @tables))
-    {
-        if ($self->bz_index_info_real('longdescs', 'thetext')) {
-            $self->bz_drop_index_raw('longdescs', 'thetext');
-        }
-        if ($self->bz_index_info_real('longdescs', 'longdescs_thetext_idx')) {
-            $self->bz_drop_index_raw('longdescs', 'longdescs_thetext_idx');
-            $longdescs_index_deleted = 1; # For later schema cleanup.
-        }
+    if ($self->bz_index_info_real('longdescs', 'longdescs_thetext_idx')) {
+      $self->bz_drop_index_raw('longdescs', 'longdescs_thetext_idx');
+      $longdescs_index_deleted = 1;    # For later schema cleanup.
     }
-
-    # Upgrade tables from MyISAM to InnoDB
-    my $db_name = Bugzilla->localconfig->{db_name};
-    my $myisam_tables = $self->selectcol_arrayref(
-        'SELECT TABLE_NAME FROM information_schema.TABLES 
-          WHERE TABLE_SCHEMA = ? AND ENGINE = ?',
-        undef, $db_name, 'MyISAM');
-    foreach my $should_be_myisam (Bugzilla::DB::Schema::Mysql::MYISAM_TABLES) {
-        @$myisam_tables = grep { $_ ne $should_be_myisam } @$myisam_tables;
+  }
+
+  # Upgrade tables from MyISAM to InnoDB
+  my $db_name       = Bugzilla->localconfig->{db_name};
+  my $myisam_tables = $self->selectcol_arrayref(
+    'SELECT TABLE_NAME FROM information_schema.TABLES 
+          WHERE TABLE_SCHEMA = ? AND ENGINE = ?', undef, $db_name, 'MyISAM'
+  );
+  foreach my $should_be_myisam (Bugzilla::DB::Schema::Mysql::MYISAM_TABLES) {
+    @$myisam_tables = grep { $_ ne $should_be_myisam } @$myisam_tables;
+  }
+
+  if (scalar @$myisam_tables) {
+    print "Bugzilla now uses the InnoDB storage engine in MySQL for",
+      " most tables.\nConverting tables to InnoDB:\n";
+    foreach my $table (@$myisam_tables) {
+      print "Converting table $table... ";
+      $self->do("ALTER TABLE $table ENGINE = InnoDB");
+      print "done.\n";
     }
-
-    if (scalar @$myisam_tables) {
-        print "Bugzilla now uses the InnoDB storage engine in MySQL for",
-              " most tables.\nConverting tables to InnoDB:\n";
-        foreach my $table (@$myisam_tables) {
-            print "Converting table $table... ";
-            $self->do("ALTER TABLE $table ENGINE = InnoDB");
-            print "done.\n";
-        }
+  }
+
+  # Versions of Bugzilla before the existence of Bugzilla::DB::Schema did
+  # not provide explicit names for the table indexes. This means
+  # that our upgrades will not be reliable, because we look for the name
+  # of the index, not what fields it is on, when doing upgrades.
+  # (using the name is much better for cross-database compatibility
+  # and general reliability). It's also very important that our
+  # Schema object be consistent with what is on the disk.
+  #
+  # While we're at it, we also fix some inconsistent index naming
+  # from the original checkin of Bugzilla::DB::Schema.
+
+  # We check for the existence of a particular "short name" index that
+  # has existed at least since Bugzilla 2.8, and probably earlier.
+  # For fixing the inconsistent naming of Schema indexes,
+  # we also check for one of those inconsistently-named indexes.
+  if (
+    grep($_ eq 'bugs', @tables)
+    && ( $self->bz_index_info_real('bugs', 'assigned_to')
+      || $self->bz_index_info_real('flags', 'flags_bidattid_idx'))
+    )
+  {
+
+    # This is a check unrelated to the indexes, to see if people are
+    # upgrading from 2.18 or below, but somehow have a bz_schema table
+    # already. This only happens if they have done a mysqldump into
+    # a database without doing a DROP DATABASE first.
+    # We just do the check here since this check is a reliable way
+    # of telling that we are upgrading from a version pre-2.20.
+    if (grep($_ eq 'bz_schema', $self->bz_table_list_real())) {
+      die install_string('bz_schema_exists_before_220');
     }
-    
-    # Versions of Bugzilla before the existence of Bugzilla::DB::Schema did 
-    # not provide explicit names for the table indexes. This means
-    # that our upgrades will not be reliable, because we look for the name
-    # of the index, not what fields it is on, when doing upgrades.
-    # (using the name is much better for cross-database compatibility 
-    # and general reliability). It's also very important that our
-    # Schema object be consistent with what is on the disk.
-    #
-    # While we're at it, we also fix some inconsistent index naming
-    # from the original checkin of Bugzilla::DB::Schema.
-
-    # We check for the existence of a particular "short name" index that
-    # has existed at least since Bugzilla 2.8, and probably earlier.
-    # For fixing the inconsistent naming of Schema indexes,
-    # we also check for one of those inconsistently-named indexes.
-    if (grep($_ eq 'bugs', @tables)
-        && ($self->bz_index_info_real('bugs', 'assigned_to')
-            || $self->bz_index_info_real('flags', 'flags_bidattid_idx')) )
-    {
 
-        # This is a check unrelated to the indexes, to see if people are
-        # upgrading from 2.18 or below, but somehow have a bz_schema table
-        # already. This only happens if they have done a mysqldump into
-        # a database without doing a DROP DATABASE first.
-        # We just do the check here since this check is a reliable way
-        # of telling that we are upgrading from a version pre-2.20.
-        if (grep($_ eq 'bz_schema', $self->bz_table_list_real())) {
-            die install_string('bz_schema_exists_before_220');
-        }
+    my $bug_count = $self->selectrow_array("SELECT COUNT(*) FROM bugs");
 
-        my $bug_count = $self->selectrow_array("SELECT COUNT(*) FROM bugs");
-        # We estimate one minute for each 3000 bugs, plus 3 minutes just
-        # to handle basic MySQL stuff.
-        my $rename_time = int($bug_count / 3000) + 3;
-        # And 45 minutes for every 15,000 attachments, per some experiments.
-        my ($attachment_count) = 
-            $self->selectrow_array("SELECT COUNT(*) FROM attachments");
-        $rename_time += int(($attachment_count * 45) / 15000);
-        # If we're going to take longer than 5 minutes, we let the user know
-        # and allow them to abort.
-        if ($rename_time > 5) {
-            print "\n", install_string('mysql_index_renaming',
-                                       { minutes => $rename_time });
-            # Wait 45 seconds for them to respond.
-            sleep(45) unless Bugzilla->installation_answers->{NO_PAUSE};
-        }
-        print "Renaming indexes...\n";
-
-        # We can't be interrupted, because of how the "if"
-        # works above.
-        local $SIG{INT}  = 'IGNORE';
-        local $SIG{TERM} = 'IGNORE';
-        local $SIG{PIPE} = 'IGNORE';
-
-        # Certain indexes had names in Schema that did not easily conform
-        # to a standard. We store those names here, so that they
-        # can be properly renamed.
-        # Also, sometimes an old mysqldump would incorrectly rename
-        # unique indexes to "PRIMARY", so we address that here, also.
-        my $bad_names = {
-            # 'when' is a possible leftover from Bugzillas before 2.8
-            bugs_activity => ['when', 'bugs_activity_bugid_idx',
-                'bugs_activity_bugwhen_idx'],
-            cc => ['PRIMARY'],
-            longdescs => ['longdescs_bugid_idx',
-               'longdescs_bugwhen_idx'],
-            flags => ['flags_bidattid_idx'],
-            flaginclusions => ['flaginclusions_tpcid_idx'],
-            flagexclusions => ['flagexclusions_tpc_id_idx'],
-            keywords => ['PRIMARY'],
-            milestones => ['PRIMARY'],
-            profiles_activity => ['profiles_activity_when_idx'],
-            group_control_map => ['group_control_map_gid_idx', 'PRIMARY'],
-            user_group_map => ['PRIMARY'],
-            group_group_map => ['PRIMARY'],
-            email_setting => ['PRIMARY'],
-            bug_group_map => ['PRIMARY'],
-            category_group_map => ['PRIMARY'],
-            watch => ['PRIMARY'],
-            namedqueries => ['PRIMARY'],
-            series_data => ['PRIMARY'],
-            # series_categories is dealt with below, not here.
-        };
-
-        # The series table is broken and needs to have one index
-        # dropped before we begin the renaming, because it had a
-        # useless index on it that would cause a naming conflict here.
-        if (grep($_ eq 'series', @tables)) {
-            my $dropname;
-            # This is what the bad index was called before Schema.
-            if ($self->bz_index_info_real('series', 'creator_2')) {
-                $dropname = 'creator_2';
-            }
-            # This is what the bad index is called in Schema.
-            elsif ($self->bz_index_info_real('series', 'series_creator_idx')) {
-                    $dropname = 'series_creator_idx';
-            }
-            $self->bz_drop_index_raw('series', $dropname) if $dropname;
-        }
+    # We estimate one minute for each 3000 bugs, plus 3 minutes just
+    # to handle basic MySQL stuff.
+    my $rename_time = int($bug_count / 3000) + 3;
 
-        # The email_setting table also had the same problem.
-        if( grep($_ eq 'email_setting', @tables) 
-            && $self->bz_index_info_real('email_setting', 
-                                         'email_settings_user_id_idx') ) 
-        {
-            $self->bz_drop_index_raw('email_setting', 
-                                     'email_settings_user_id_idx');
-        }
-
-        # Go through all the tables.
-        foreach my $table (@tables) {
-            # Will contain the names of old indexes as keys, and the 
-            # definition of the new indexes as a value. The values
-            # include an extra hash key, NAME, with the new name of 
-            # the index.
-            my %rename_indexes;
-            # And go through all the columns on each table.
-            my @columns = $self->bz_table_columns_real($table);
-
-            # We also want to fix the silly naming of unique indexes
-            # that happened when we first checked-in Bugzilla::DB::Schema.
-            if ($table eq 'series_categories') {
-                # The series_categories index had a nonstandard name.
-                push(@columns, 'series_cats_unique_idx');
-            } 
-            elsif ($table eq 'email_setting') { 
-                # The email_setting table had a similar problem.
-                push(@columns, 'email_settings_unique_idx');
-            }
-            else {
-                push(@columns, "${table}_unique_idx");
-            }
-            # And this is how we fix the other inconsistent Schema naming.
-            push(@columns, @{$bad_names->{$table}})
-                if (exists $bad_names->{$table});
-            foreach my $column (@columns) {
-                # If we have an index named after this column, it's an 
-                # old-style-name index.
-                if (my $index = $self->bz_index_info_real($table, $column)) {
-                    # Fix the name to fit in with the new naming scheme.
-                    $index->{NAME} = $table . "_" .
-                                     $index->{FIELDS}->[0] . "_idx";
-                    print "Renaming index $column to " 
-                          . $index->{NAME} . "...\n";
-                    $rename_indexes{$column} = $index;
-                } # if
-            } # foreach column
-
-            my @rename_sql = $self->_bz_schema->get_rename_indexes_ddl(
-                $table, %rename_indexes);
-            $self->do($_) foreach (@rename_sql);
-
-        } # foreach table
-    } # if old-name indexes
-
-    # If there are no tables, but the DB isn't utf8 and it should be,
-    # then we should alter the database to be utf8. We know it should be
-    # if the utf8 parameter is true or there are no params at all.
-    # This kind of situation happens when people create the database
-    # themselves, and if we don't do this they will get the big
-    # scary WARNING statement about conversion to UTF8.
-    if ( !$self->bz_db_is_utf8 && !@tables 
-         && (Bugzilla->params->{'utf8'} || !scalar keys %{Bugzilla->params}) )
-    {
-        $self->_alter_db_charset_to_utf8();
-    }
+    # And 45 minutes for every 15,000 attachments, per some experiments.
+    my ($attachment_count)
+      = $self->selectrow_array("SELECT COUNT(*) FROM attachments");
+    $rename_time += int(($attachment_count * 45) / 15000);
 
-    # And now we create the tables and the Schema object.
-    $self->SUPER::bz_setup_database();
+    # If we're going to take longer than 5 minutes, we let the user know
+    # and allow them to abort.
+    if ($rename_time > 5) {
+      print "\n", install_string('mysql_index_renaming', {minutes => $rename_time});
 
-    if ($sd_index_deleted) {
-        $self->_bz_real_schema->delete_index('bugs', 'bugs_short_desc_idx');
-        $self->_bz_store_real_schema;
+      # Wait 45 seconds for them to respond.
+      sleep(45) unless Bugzilla->installation_answers->{NO_PAUSE};
     }
-    if ($longdescs_index_deleted) {
-        $self->_bz_real_schema->delete_index('longdescs', 
-                                             'longdescs_thetext_idx');
-        $self->_bz_store_real_schema;
+    print "Renaming indexes...\n";
+
+    # We can't be interrupted, because of how the "if"
+    # works above.
+    local $SIG{INT}  = 'IGNORE';
+    local $SIG{TERM} = 'IGNORE';
+    local $SIG{PIPE} = 'IGNORE';
+
+    # Certain indexes had names in Schema that did not easily conform
+    # to a standard. We store those names here, so that they
+    # can be properly renamed.
+    # Also, sometimes an old mysqldump would incorrectly rename
+    # unique indexes to "PRIMARY", so we address that here, also.
+    my $bad_names = {
+
+      # 'when' is a possible leftover from Bugzillas before 2.8
+      bugs_activity =>
+        ['when', 'bugs_activity_bugid_idx', 'bugs_activity_bugwhen_idx'],
+      cc                 => ['PRIMARY'],
+      longdescs          => ['longdescs_bugid_idx', 'longdescs_bugwhen_idx'],
+      flags              => ['flags_bidattid_idx'],
+      flaginclusions     => ['flaginclusions_tpcid_idx'],
+      flagexclusions     => ['flagexclusions_tpc_id_idx'],
+      keywords           => ['PRIMARY'],
+      milestones         => ['PRIMARY'],
+      profiles_activity  => ['profiles_activity_when_idx'],
+      group_control_map  => ['group_control_map_gid_idx', 'PRIMARY'],
+      user_group_map     => ['PRIMARY'],
+      group_group_map    => ['PRIMARY'],
+      email_setting      => ['PRIMARY'],
+      bug_group_map      => ['PRIMARY'],
+      category_group_map => ['PRIMARY'],
+      watch              => ['PRIMARY'],
+      namedqueries       => ['PRIMARY'],
+      series_data        => ['PRIMARY'],
+
+      # series_categories is dealt with below, not here.
+    };
+
+    # The series table is broken and needs to have one index
+    # dropped before we begin the renaming, because it had a
+    # useless index on it that would cause a naming conflict here.
+    if (grep($_ eq 'series', @tables)) {
+      my $dropname;
+
+      # This is what the bad index was called before Schema.
+      if ($self->bz_index_info_real('series', 'creator_2')) {
+        $dropname = 'creator_2';
+      }
+
+      # This is what the bad index is called in Schema.
+      elsif ($self->bz_index_info_real('series', 'series_creator_idx')) {
+        $dropname = 'series_creator_idx';
+      }
+      $self->bz_drop_index_raw('series', $dropname) if $dropname;
     }
 
-    # The old timestamp fields need to be adjusted here instead of in
-    # checksetup. Otherwise the UPDATE statements inside of bz_add_column
-    # will cause accidental timestamp updates.
-    # The code that does this was moved here from checksetup.
-
-    # 2002-08-14 - bbaetz@student.usyd.edu.au - bug 153578
-    # attachments creation time needs to be a datetime, not a timestamp
-    my $attach_creation = 
-        $self->bz_column_info("attachments", "creation_ts");
-    if ($attach_creation && $attach_creation->{TYPE} =~ /^TIMESTAMP/i) {
-        print "Fixing creation time on attachments...\n";
+    # The email_setting table also had the same problem.
+    if (grep($_ eq 'email_setting', @tables)
+      && $self->bz_index_info_real('email_setting', 'email_settings_user_id_idx'))
+    {
+      $self->bz_drop_index_raw('email_setting', 'email_settings_user_id_idx');
+    }
 
-        my $sth = $self->prepare("SELECT COUNT(attach_id) FROM attachments");
-        $sth->execute();
-        my ($attach_count) = $sth->fetchrow_array();
+    # Go through all the tables.
+    foreach my $table (@tables) {
 
-        if ($attach_count > 1000) {
-            print "This may take a while...\n";
-        }
-        my $i = 0;
-
-        # This isn't just as simple as changing the field type, because
-        # the creation_ts was previously updated when an attachment was made
-        # obsolete from the attachment creation screen. So we have to go
-        # and recreate these times from the comments..
-        $sth = $self->prepare("SELECT bug_id, attach_id, submitter_id " .
-                               "FROM attachments");
-        $sth->execute();
-
-        # Restrict this as much as possible in order to avoid false 
-        # positives, and keep the db search time down
-        my $sth2 = $self->prepare("SELECT bug_when FROM longdescs 
-                                    WHERE bug_id=? AND who=? 
-                                          AND thetext LIKE ?
-                                 ORDER BY bug_when " . $self->sql_limit(1));
-        while (my ($bug_id, $attach_id, $submitter_id) 
-                  = $sth->fetchrow_array()) 
-        {
-            $sth2->execute($bug_id, $submitter_id, 
-                "Created an attachment (id=$attach_id)%");
-            my ($when) = $sth2->fetchrow_array();
-            if ($when) {
-                $self->do("UPDATE attachments " .
-                             "SET creation_ts='$when' " .
-                           "WHERE attach_id=$attach_id");
-            } else {
-                print "Warning - could not determine correct creation"
-                      . " time for attachment $attach_id on bug $bug_id\n";
-            }
-            ++$i;
-            print "Converted $i of $attach_count attachments\n" if !($i % 1000);
-        }
-        print "Done - converted $i attachments\n";
+      # Will contain the names of old indexes as keys, and the
+      # definition of the new indexes as a value. The values
+      # include an extra hash key, NAME, with the new name of
+      # the index.
+      my %rename_indexes;
+
+      # And go through all the columns on each table.
+      my @columns = $self->bz_table_columns_real($table);
+
+      # We also want to fix the silly naming of unique indexes
+      # that happened when we first checked-in Bugzilla::DB::Schema.
+      if ($table eq 'series_categories') {
+
+        # The series_categories index had a nonstandard name.
+        push(@columns, 'series_cats_unique_idx');
+      }
+      elsif ($table eq 'email_setting') {
+
+        # The email_setting table had a similar problem.
+        push(@columns, 'email_settings_unique_idx');
+      }
+      else {
+        push(@columns, "${table}_unique_idx");
+      }
+
+      # And this is how we fix the other inconsistent Schema naming.
+      push(@columns, @{$bad_names->{$table}}) if (exists $bad_names->{$table});
+      foreach my $column (@columns) {
+
+        # If we have an index named after this column, it's an
+        # old-style-name index.
+        if (my $index = $self->bz_index_info_real($table, $column)) {
+
+          # Fix the name to fit in with the new naming scheme.
+          $index->{NAME} = $table . "_" . $index->{FIELDS}->[0] . "_idx";
+          print "Renaming index $column to " . $index->{NAME} . "...\n";
+          $rename_indexes{$column} = $index;
+        }    # if
+      }    # foreach column
+
+      my @rename_sql
+        = $self->_bz_schema->get_rename_indexes_ddl($table, %rename_indexes);
+      $self->do($_) foreach (@rename_sql);
+
+    }    # foreach table
+  }    # if old-name indexes
+
+  # If there are no tables, but the DB isn't utf8 and it should be,
+  # then we should alter the database to be utf8. We know it should be
+  # if there are no params at all.
+  # This kind of situation happens when people create the database
+  # themselves, and if we don't do this they will get the big
+  # scary WARNING statement about conversion to UTF8.
+  if (!$self->bz_db_is_utf8 && !@tables) {
+    $self->_alter_db_charset_to_utf8();
+  }
+
+  # And now we create the tables and the Schema object.
+  $self->SUPER::bz_setup_database();
+
+  if ($sd_index_deleted) {
+    $self->_bz_real_schema->delete_index('bugs', 'bugs_short_desc_idx');
+    $self->_bz_store_real_schema;
+  }
+  if ($longdescs_index_deleted) {
+    $self->_bz_real_schema->delete_index('longdescs', 'longdescs_thetext_idx');
+    $self->_bz_store_real_schema;
+  }
+
+  # The old timestamp fields need to be adjusted here instead of in
+  # checksetup. Otherwise the UPDATE statements inside of bz_add_column
+  # will cause accidental timestamp updates.
+  # The code that does this was moved here from checksetup.
+
+  # 2002-08-14 - bbaetz@student.usyd.edu.au - bug 153578
+  # attachments creation time needs to be a datetime, not a timestamp
+  my $attach_creation = $self->bz_column_info("attachments", "creation_ts");
+  if ($attach_creation && $attach_creation->{TYPE} =~ /^TIMESTAMP/i) {
+    print "Fixing creation time on attachments...\n";
+
+    my $sth = $self->prepare("SELECT COUNT(attach_id) FROM attachments");
+    $sth->execute();
+    my ($attach_count) = $sth->fetchrow_array();
 
-        $self->bz_alter_column("attachments", "creation_ts", 
-                               {TYPE => 'DATETIME', NOTNULL => 1});
+    if ($attach_count > 1000) {
+      print "This may take a while...\n";
     }
+    my $i = 0;
 
-    # 2004-08-29 - Tomas.Kopal@altap.cz, bug 257303
-    # Change logincookies.lastused type from timestamp to datetime
-    my $login_lastused = $self->bz_column_info("logincookies", "lastused");
-    if ($login_lastused && $login_lastused->{TYPE} =~ /^TIMESTAMP/i) {
-        $self->bz_alter_column('logincookies', 'lastused', 
-                               { TYPE => 'DATETIME',  NOTNULL => 1});
-    }
+    # This isn't just as simple as changing the field type, because
+    # the creation_ts was previously updated when an attachment was made
+    # obsolete from the attachment creation screen. So we have to go
+    # and recreate these times from the comments..
+    $sth = $self->prepare(
+      "SELECT bug_id, attach_id, submitter_id " . "FROM attachments");
+    $sth->execute();
 
-    # 2005-01-17 - Tomas.Kopal@altap.cz, bug 257315
-    # Change bugs.delta_ts type from timestamp to datetime 
-    my $bugs_deltats = $self->bz_column_info("bugs", "delta_ts");
-    if ($bugs_deltats && $bugs_deltats->{TYPE} =~ /^TIMESTAMP/i) {
-        $self->bz_alter_column('bugs', 'delta_ts', 
-                               {TYPE => 'DATETIME', NOTNULL => 1});
+    # Restrict this as much as possible in order to avoid false
+    # positives, and keep the db search time down
+    my $sth2 = $self->prepare(
+      "SELECT bug_when FROM longdescs 
+                                    WHERE bug_id=? AND who=? 
+                                          AND thetext LIKE ?
+                                 ORDER BY bug_when " . $self->sql_limit(1)
+    );
+    while (my ($bug_id, $attach_id, $submitter_id) = $sth->fetchrow_array()) {
+      $sth2->execute($bug_id, $submitter_id,
+        "Created an attachment (id=$attach_id)%");
+      my ($when) = $sth2->fetchrow_array();
+      if ($when) {
+        $self->do("UPDATE attachments "
+            . "SET creation_ts='$when' "
+            . "WHERE attach_id=$attach_id");
+      }
+      else {
+        print "Warning - could not determine correct creation"
+          . " time for attachment $attach_id on bug $bug_id\n";
+      }
+      ++$i;
+      print "Converted $i of $attach_count attachments\n" if !($i % 1000);
     }
-
-    # 2005-09-24 - bugreport@peshkin.net, bug 307602
-    # Make sure that default 4G table limit is overridden
-    my $attach_data_create = $self->selectrow_array(
-        'SELECT CREATE_OPTIONS FROM information_schema.TABLES 
-          WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?',
-        undef, $db_name, 'attach_data');
-    if ($attach_data_create !~ /MAX_ROWS/i) {
-        print "Converting attach_data maximum size to 100G...\n";
-        $self->do("ALTER TABLE attach_data
+    print "Done - converted $i attachments\n";
+
+    $self->bz_alter_column("attachments", "creation_ts",
+      {TYPE => 'DATETIME', NOTNULL => 1});
+  }
+
+  # 2004-08-29 - Tomas.Kopal@altap.cz, bug 257303
+  # Change logincookies.lastused type from timestamp to datetime
+  my $login_lastused = $self->bz_column_info("logincookies", "lastused");
+  if ($login_lastused && $login_lastused->{TYPE} =~ /^TIMESTAMP/i) {
+    $self->bz_alter_column('logincookies', 'lastused',
+      {TYPE => 'DATETIME', NOTNULL => 1});
+  }
+
+  # 2005-01-17 - Tomas.Kopal@altap.cz, bug 257315
+  # Change bugs.delta_ts type from timestamp to datetime
+  my $bugs_deltats = $self->bz_column_info("bugs", "delta_ts");
+  if ($bugs_deltats && $bugs_deltats->{TYPE} =~ /^TIMESTAMP/i) {
+    $self->bz_alter_column('bugs', 'delta_ts', {TYPE => 'DATETIME', NOTNULL => 1});
+  }
+
+  # 2005-09-24 - bugreport@peshkin.net, bug 307602
+  # Make sure that default 4G table limit is overridden
+  my $attach_data_create = $self->selectrow_array(
+    'SELECT CREATE_OPTIONS FROM information_schema.TABLES 
+          WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?', undef, $db_name, 'attach_data'
+  );
+  if ($attach_data_create !~ /MAX_ROWS/i) {
+    print "Converting attach_data maximum size to 100G...\n";
+    $self->do(
+      "ALTER TABLE attach_data
                    AVG_ROW_LENGTH=1000000,
-                   MAX_ROWS=100000");
-    }
-
-    # Convert the database to UTF-8 if the utf8 parameter is on.
-    # We check if any table isn't utf8, because lots of crazy
-    # partial-conversion situations can happen, and this handles anything
-    # that could come up (including having the DB charset be utf8 but not
-    # the table charsets.
-    #
-    # TABLE_COLLATION IS NOT NULL prevents us from trying to convert views.
-    my $non_utf8_tables = $self->selectrow_array(
-        "SELECT 1 FROM information_schema.TABLES 
+                   MAX_ROWS=100000"
+    );
+  }
+
+  # Convert the database to UTF-8.
+  # We check if any table isn't utf8, because lots of crazy
+  # partial-conversion situations can happen, and this handles anything
+  # that could come up (including having the DB charset be utf8 but not
+  # the table charsets.
+  #
+  # TABLE_COLLATION IS NOT NULL prevents us from trying to convert views.
+  my $non_utf8_tables = $self->selectrow_array(
+    "SELECT 1 FROM information_schema.TABLES 
           WHERE TABLE_SCHEMA = ? AND TABLE_COLLATION IS NOT NULL 
                 AND TABLE_COLLATION NOT LIKE 'utf8%' 
-          LIMIT 1", undef, $db_name);
-    
-    if (Bugzilla->params->{'utf8'} && $non_utf8_tables) {
-        print "\n", install_string('mysql_utf8_conversion');
-
-        if (!Bugzilla->installation_answers->{NO_PAUSE}) {
-            if (Bugzilla->installation_mode == 
-                INSTALLATION_MODE_NON_INTERACTIVE) 
-            {
-                die install_string('continue_without_answers'), "\n";
-            }
-            else {
-                print "\n         " . install_string('enter_or_ctrl_c');
-                getc;
-            }
-        }
-
-        print "Converting table storage format to UTF-8. This may take a",
-              " while.\n";
-        foreach my $table ($self->bz_table_list_real) {
-            my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM $table");
-            $info_sth->execute();
-            my (@binary_sql, @utf8_sql);
-            while (my $column = $info_sth->fetchrow_hashref) {
-                # Our conversion code doesn't work on enum fields, but they
-                # all go away later in checksetup anyway.
-                next if $column->{Type} =~ /enum/i;
-
-                # If this particular column isn't stored in utf-8
-                if ($column->{Collation}
-                    && $column->{Collation} ne 'NULL' 
-                    && $column->{Collation} !~ /utf8/) 
-                {
-                    my $name = $column->{Field};
-
-                    print "$table.$name needs to be converted to UTF-8...\n";
-
-                    # These will be automatically re-created at the end
-                    # of checksetup.
-                    $self->bz_drop_related_fks($table, $name);
-
-                    my $col_info =
-                        $self->bz_column_info_real($table, $name);
-                    # CHANGE COLUMN doesn't take PRIMARY KEY
-                    delete $col_info->{PRIMARYKEY};
-                    my $sql_def = $self->_bz_schema->get_type_ddl($col_info);
-                    # We don't want MySQL to actually try to *convert*
-                    # from our current charset to UTF-8, we just want to
-                    # transfer the bytes directly. This is how we do that.
-
-                    # The CHARACTER SET part of the definition has to come
-                    # right after the type, which will always come first.
-                    my ($binary, $utf8) = ($sql_def, $sql_def);
-                    my $type = $self->_bz_schema->convert_type($col_info->{TYPE});
-                    $binary =~ s/(\Q$type\E)/$1 CHARACTER SET binary/;
-                    $utf8   =~ s/(\Q$type\E)/$1 CHARACTER SET utf8/;
-                    push(@binary_sql, "MODIFY COLUMN $name $binary");
-                    push(@utf8_sql, "MODIFY COLUMN $name $utf8");
-                }
-            } # foreach column
-
-            if (@binary_sql) {
-                my %indexes = %{ $self->bz_table_indexes($table) };
-                foreach my $index_name (keys %indexes) {
-                    my $index = $indexes{$index_name};
-                    if ($index->{TYPE} and $index->{TYPE} eq 'FULLTEXT') {
-                        $self->bz_drop_index($table, $index_name);
-                    }
-                    else {
-                        delete $indexes{$index_name};
-                    }
-                }
-
-                print "Converting the $table table to UTF-8...\n";
-                my $bin = "ALTER TABLE $table " . join(', ', @binary_sql);
-                my $utf = "ALTER TABLE $table " . join(', ', @utf8_sql,
-                          'DEFAULT CHARACTER SET utf8');
-                $self->do($bin);
-                $self->do($utf);
-
-                # Re-add any removed FULLTEXT indexes.
-                foreach my $index (keys %indexes) {
-                    $self->bz_add_index($table, $index, $indexes{$index});
-                }
-            }
-            else {
-                $self->do("ALTER TABLE $table DEFAULT CHARACTER SET utf8");
-            }
-
-        } # foreach my $table (@tables)
+          LIMIT 1", undef, $db_name
+  );
+
+  if ($non_utf8_tables) {
+    print "\n", install_string('mysql_utf8_conversion');
+
+    if (!Bugzilla->installation_answers->{NO_PAUSE}) {
+      if (Bugzilla->installation_mode == INSTALLATION_MODE_NON_INTERACTIVE) {
+        die install_string('continue_without_answers'), "\n";
+      }
+      else {
+        print "\n         " . install_string('enter_or_ctrl_c');
+        getc;
+      }
     }
 
-    # Sometimes you can have a situation where all the tables are utf8,
-    # but the database isn't. (This tends to happen when you've done
-    # a mysqldump.) So we have this change outside of the above block,
-    # so that it just happens silently if no actual *table* conversion
-    # needs to happen.
-    if (Bugzilla->params->{'utf8'} && !$self->bz_db_is_utf8) {
-        $self->_alter_db_charset_to_utf8();
-    }
+    say 'Converting table storage format to UTF-8. This may take a while.';
+    foreach my $table ($self->bz_table_list_real) {
+      my $info_sth = $self->prepare("SHOW FULL COLUMNS FROM $table");
+      $info_sth->execute();
+      my (@binary_sql, @utf8_sql);
+      while (my $column = $info_sth->fetchrow_hashref) {
+
+        # Our conversion code doesn't work on enum fields, but they
+        # all go away later in checksetup anyway.
+        next if $column->{Type} =~ /enum/i;
+
+        # If this particular column isn't stored in utf-8
+        if ( $column->{Collation}
+          && $column->{Collation} ne 'NULL'
+          && $column->{Collation} !~ /utf8/)
+        {
+          my $name = $column->{Field};
 
-     $self->_fix_defaults();
+          say "$table.$name needs to be converted to UTF-8...";
 
-    # Bug 451735 highlighted a bug in bz_drop_index() which didn't
-    # check for FKs before trying to delete an index. Consequently,
-    # the series_creator_idx index was considered to be deleted
-    # despite it was still present in the DB. That's why we have to
-    # force the deletion, bypassing the DB schema.
-    if (!$self->bz_index_info('series', 'series_category_idx')) {
-        if (!$self->bz_index_info('series', 'series_creator_idx')
-            && $self->bz_index_info_real('series', 'series_creator_idx'))
-        {
-            foreach my $column (qw(creator category subcategory name)) {
-                $self->bz_drop_related_fks('series', $column);
-            }
-            $self->bz_drop_index_raw('series', 'series_creator_idx');
+          # These will be automatically re-created at the end
+          # of checksetup.
+          $self->bz_drop_related_fks($table, $name);
+
+          my $col_info = $self->bz_column_info_real($table, $name);
+
+          # CHANGE COLUMN doesn't take PRIMARY KEY
+          delete $col_info->{PRIMARYKEY};
+          my $sql_def = $self->_bz_schema->get_type_ddl($col_info);
+
+          # We don't want MySQL to actually try to *convert*
+          # from our current charset to UTF-8, we just want to
+          # transfer the bytes directly. This is how we do that.
+
+          # The CHARACTER SET part of the definition has to come
+          # right after the type, which will always come first.
+          my ($binary, $utf8) = ($sql_def, $sql_def);
+          my $type = $self->_bz_schema->convert_type($col_info->{TYPE});
+          $binary =~ s/(\Q$type\E)/$1 CHARACTER SET binary/;
+          $utf8 =~ s/(\Q$type\E)/$1 CHARACTER SET utf8/;
+          push(@binary_sql, "MODIFY COLUMN $name $binary");
+          push(@utf8_sql,   "MODIFY COLUMN $name $utf8");
         }
+      }    # foreach column
+
+      if (@binary_sql) {
+        my %indexes = %{$self->bz_table_indexes($table)};
+        foreach my $index_name (keys %indexes) {
+          my $index = $indexes{$index_name};
+          if ($index->{TYPE} and $index->{TYPE} eq 'FULLTEXT') {
+            $self->bz_drop_index($table, $index_name);
+          }
+          else {
+            delete $indexes{$index_name};
+          }
+        }
+
+        say "Converting the $table table to UTF-8...";
+        my $bin = "ALTER TABLE $table " . join(', ', @binary_sql);
+        my $utf
+          = "ALTER TABLE $table " . join(', ', @utf8_sql, 'DEFAULT CHARACTER SET utf8');
+        $self->do($bin);
+        $self->do($utf);
+
+        # Re-add any removed FULLTEXT indexes.
+        foreach my $index (keys %indexes) {
+          $self->bz_add_index($table, $index, $indexes{$index});
+        }
+      }
+      else {
+        $self->do("ALTER TABLE $table DEFAULT CHARACTER SET utf8");
+      }
+
+    }    # foreach my $table (@tables)
+  }
+
+  # Sometimes you can have a situation where all the tables are utf8,
+  # but the database isn't. (This tends to happen when you've done
+  # a mysqldump.) So we have this change outside of the above block,
+  # so that it just happens silently if no actual *table* conversion
+  # needs to happen.
+  $self->_alter_db_charset_to_utf8() unless $self->bz_db_is_utf8;
+
+  $self->_fix_defaults();
+
+  # Bug 451735 highlighted a bug in bz_drop_index() which didn't
+  # check for FKs before trying to delete an index. Consequently,
+  # the series_creator_idx index was considered to be deleted
+  # despite it was still present in the DB. That's why we have to
+  # force the deletion, bypassing the DB schema.
+  if (!$self->bz_index_info('series', 'series_category_idx')) {
+    if (!$self->bz_index_info('series', 'series_creator_idx')
+      && $self->bz_index_info_real('series', 'series_creator_idx'))
+    {
+      foreach my $column (qw(creator category subcategory name)) {
+        $self->bz_drop_related_fks('series', $column);
+      }
+      $self->bz_drop_index_raw('series', 'series_creator_idx');
     }
+  }
 }
 
 # When you import a MySQL 3/4 mysqldump into MySQL 5, columns that
@@ -788,100 +802,109 @@ sub bz_setup_database {
 # looks like. So we remove defaults from columns that aren't supposed
 # to have them
 sub _fix_defaults {
-    my $self = shift;
-    my $maj_version = substr($self->bz_server_version, 0, 1);
-    return if $maj_version < 5;
-
-    # The oldest column that could have this problem is bugs.assigned_to,
-    # so if it doesn't have the problem, we just skip doing this entirely.
-    my $assi_def = $self->_bz_raw_column_info('bugs', 'assigned_to');
-    my $assi_default = $assi_def->{COLUMN_DEF};
-    # This "ne ''" thing is necessary because _raw_column_info seems to
-    # return COLUMN_DEF as an empty string for columns that don't have
-    # a default.
-    return unless (defined $assi_default && $assi_default ne '');
-
-    my %fix_columns;
-    foreach my $table ($self->_bz_real_schema->get_table_list()) {
-        foreach my $column ($self->bz_table_columns($table)) {
-            my $abs_def = $self->bz_column_info($table, $column);
-            # BLOB/TEXT columns never have defaults
-            next if $abs_def->{TYPE} =~ /BLOB|TEXT/i;
-            if (!defined $abs_def->{DEFAULT}) {
-                # Get the exact default from the database without any
-                # "fixing" by bz_column_info_real.
-                my $raw_info = $self->_bz_raw_column_info($table, $column);
-                my $raw_default = $raw_info->{COLUMN_DEF};
-                if (defined $raw_default) {
-                    if ($raw_default eq '') {
-                        # Only (var)char columns can have empty strings as 
-                        # defaults, so if we got an empty string for some
-                        # other default type, then it's bogus.
-                        next unless $abs_def->{TYPE} =~ /char/i;
-                        $raw_default = "''";
-                    }
-                    $fix_columns{$table} ||= [];
-                    push(@{ $fix_columns{$table} }, $column);
-                    print "$table.$column has incorrect DB default: $raw_default\n";
-                }
-            }
-        } # foreach $column
-    } # foreach $table
-
-    print "Fixing defaults...\n";
-    foreach my $table (reverse sort keys %fix_columns) {
-        my @alters = map("ALTER COLUMN $_ DROP DEFAULT", 
-                         @{ $fix_columns{$table} });
-        my $sql = "ALTER TABLE $table " . join(',', @alters);
-        $self->do($sql);
-    }
+  my $self = shift;
+  my $maj_version = substr($self->bz_server_version, 0, 1);
+  return if $maj_version < 5;
+
+  # The oldest column that could have this problem is bugs.assigned_to,
+  # so if it doesn't have the problem, we just skip doing this entirely.
+  my $assi_def = $self->_bz_raw_column_info('bugs', 'assigned_to');
+  my $assi_default = $assi_def->{COLUMN_DEF};
+
+  # This "ne ''" thing is necessary because _raw_column_info seems to
+  # return COLUMN_DEF as an empty string for columns that don't have
+  # a default.
+  return unless (defined $assi_default && $assi_default ne '');
+
+  my %fix_columns;
+  foreach my $table ($self->_bz_real_schema->get_table_list()) {
+    foreach my $column ($self->bz_table_columns($table)) {
+      my $abs_def = $self->bz_column_info($table, $column);
+
+      # BLOB/TEXT columns never have defaults
+      next if $abs_def->{TYPE} =~ /BLOB|TEXT/i;
+      if (!defined $abs_def->{DEFAULT}) {
+
+        # Get the exact default from the database without any
+        # "fixing" by bz_column_info_real.
+        my $raw_info = $self->_bz_raw_column_info($table, $column);
+        my $raw_default = $raw_info->{COLUMN_DEF};
+        if (defined $raw_default) {
+          if ($raw_default eq '') {
+
+            # Only (var)char columns can have empty strings as
+            # defaults, so if we got an empty string for some
+            # other default type, then it's bogus.
+            next unless $abs_def->{TYPE} =~ /char/i;
+            $raw_default = "''";
+          }
+          $fix_columns{$table} ||= [];
+          push(@{$fix_columns{$table}}, $column);
+          print "$table.$column has incorrect DB default: $raw_default\n";
+        }
+      }
+    }    # foreach $column
+  }    # foreach $table
+
+  print "Fixing defaults...\n";
+  foreach my $table (reverse sort keys %fix_columns) {
+    my @alters = map("ALTER COLUMN $_ DROP DEFAULT", @{$fix_columns{$table}});
+    my $sql = "ALTER TABLE $table " . join(',', @alters);
+    $self->do($sql);
+  }
 }
 
 sub _alter_db_charset_to_utf8 {
-    my $self = shift;
-    my $db_name = Bugzilla->localconfig->{db_name};
-    $self->do("ALTER DATABASE $db_name CHARACTER SET utf8"); 
+  my $self    = shift;
+  my $db_name = Bugzilla->localconfig->{db_name};
+  $self->do("ALTER DATABASE `$db_name` CHARACTER SET utf8");
 }
 
 sub bz_db_is_utf8 {
-    my $self = shift;
-    my $db_collation = $self->selectrow_arrayref(
-        "SHOW VARIABLES LIKE 'character_set_database'");
-    # First column holds the variable name, second column holds the value.
-    return $db_collation->[1] =~ /utf8/ ? 1 : 0;
+  my $self = shift;
+  my $db_collation
+    = $self->selectrow_arrayref("SHOW VARIABLES LIKE 'character_set_database'");
+
+  # First column holds the variable name, second column holds the value.
+  return $db_collation->[1] =~ /utf8/ ? 1 : 0;
 }
 
 
 sub bz_enum_initial_values {
-    my ($self) = @_;
-    my %enum_values = %{$self->ENUM_DEFAULTS};
-    # Get a complete description of the 'bugs' table; with DBD::MySQL
-    # there isn't a column-by-column way of doing this.  Could use
-    # $dbh->column_info, but it would go slower and we would have to
-    # use the undocumented mysql_type_name accessor to get the type
-    # of each row.
-    my $sth = $self->prepare("DESCRIBE bugs");
-    $sth->execute();
-    # Look for the particular columns we are interested in.
-    while (my ($thiscol, $thistype) = $sth->fetchrow_array()) {
-        if (defined $enum_values{$thiscol}) {
-            # this is a column of interest.
-            my @value_list;
-            if ($thistype and ($thistype =~ /^enum\(/)) {
-                # it has an enum type; get the set of values.
-                while ($thistype =~ /'([^']*)'(.*)/) {
-                    push(@value_list, $1);
-                    $thistype = $2;
-                }
-            }
-            if (@value_list) {
-                # record the enum values found.
-                $enum_values{$thiscol} = \@value_list;
-            }
+  my ($self) = @_;
+  my %enum_values = %{$self->ENUM_DEFAULTS};
+
+  # Get a complete description of the 'bugs' table; with DBD::MySQL
+  # there isn't a column-by-column way of doing this.  Could use
+  # $dbh->column_info, but it would go slower and we would have to
+  # use the undocumented mysql_type_name accessor to get the type
+  # of each row.
+  my $sth = $self->prepare("DESCRIBE bugs");
+  $sth->execute();
+
+  # Look for the particular columns we are interested in.
+  while (my ($thiscol, $thistype) = $sth->fetchrow_array()) {
+    if (defined $enum_values{$thiscol}) {
+
+      # this is a column of interest.
+      my @value_list;
+      if ($thistype and ($thistype =~ /^enum\(/)) {
+
+        # it has an enum type; get the set of values.
+        while ($thistype =~ /'([^']*)'(.*)/) {
+          push(@value_list, $1);
+          $thistype = $2;
         }
+      }
+      if (@value_list) {
+
+        # record the enum values found.
+        $enum_values{$thiscol} = \@value_list;
+      }
     }
+  }
 
-    return \%enum_values;
+  return \%enum_values;
 }
 
 #####################################################################
@@ -912,29 +935,29 @@ backwards-compatibility anyway, for versions of Bugzilla before 2.20.
 =cut
 
 sub bz_column_info_real {
-    my ($self, $table, $column) = @_;
-    my $col_data = $self->_bz_raw_column_info($table, $column);
-    return $self->_bz_schema->column_info_to_column($col_data);
+  my ($self, $table, $column) = @_;
+  my $col_data = $self->_bz_raw_column_info($table, $column);
+  return $self->_bz_schema->column_info_to_column($col_data);
 }
 
 sub _bz_raw_column_info {
-    my ($self, $table, $column) = @_;
-
-    # DBD::mysql does not support selecting a specific column,
-    # so we have to get all the columns on the table and find 
-    # the one we want.
-    my $info_sth = $self->column_info(undef, undef, $table, '%');
-
-    # Don't use fetchall_hashref as there's a Win32 DBI bug (292821)
-    my $col_data;
-    while ($col_data = $info_sth->fetchrow_hashref) {
-        last if $col_data->{'COLUMN_NAME'} eq $column;
-    }
-
-    if (!defined $col_data) {
-        return undef;
-    }
-    return $col_data;
+  my ($self, $table, $column) = @_;
+
+  # DBD::mysql does not support selecting a specific column,
+  # so we have to get all the columns on the table and find
+  # the one we want.
+  my $info_sth = $self->column_info(undef, undef, $table, '%');
+
+  # Don't use fetchall_hashref as there's a Win32 DBI bug (292821)
+  my $col_data;
+  while ($col_data = $info_sth->fetchrow_hashref) {
+    last if $col_data->{'COLUMN_NAME'} eq $column;
+  }
+
+  if (!defined $col_data) {
+    return undef;
+  }
+  return $col_data;
 }
 
 =item C<bz_index_info_real($table, $index)>
@@ -948,42 +971,43 @@ sub _bz_raw_column_info {
 =cut
 
 sub bz_index_info_real {
-    my ($self, $table, $index) = @_;
-
-    my $sth = $self->prepare("SHOW INDEX FROM $table");
-    $sth->execute;
-
-    my @fields;
-    my $index_type;
-    # $raw_def will be an arrayref containing the following information:
-    # 0 = name of the table that the index is on
-    # 1 = 0 if unique, 1 if not unique
-    # 2 = name of the index
-    # 3 = seq_in_index (The order of the current field in the index).
-    # 4 = Name of ONE column that the index is on
-    # 5 = 'Collation' of the index. Usually 'A'.
-    # 6 = Cardinality. Either a number or undef.
-    # 7 = sub_part. Usually undef. Sometimes 1.
-    # 8 = "packed". Usually undef.
-    # 9 = Null. Sometimes undef, sometimes 'YES'.
-    # 10 = Index_type. The type of the index. Usually either 'BTREE' or 'FULLTEXT'
-    # 11 = 'Comment.' Usually undef.
-    while (my $raw_def = $sth->fetchrow_arrayref) {
-        if ($raw_def->[2] eq $index) {
-            push(@fields, $raw_def->[4]);
-            # No index can be both UNIQUE and FULLTEXT, that's why
-            # this is written this way.
-            $index_type = $raw_def->[1] ? '' : 'UNIQUE';
-            $index_type = $raw_def->[10] eq 'FULLTEXT'
-                ? 'FULLTEXT' : $index_type;
-        }
+  my ($self, $table, $index) = @_;
+
+  my $sth = $self->prepare("SHOW INDEX FROM $table");
+  $sth->execute;
+
+  my @fields;
+  my $index_type;
+
+  # $raw_def will be an arrayref containing the following information:
+  # 0 = name of the table that the index is on
+  # 1 = 0 if unique, 1 if not unique
+  # 2 = name of the index
+  # 3 = seq_in_index (The order of the current field in the index).
+  # 4 = Name of ONE column that the index is on
+  # 5 = 'Collation' of the index. Usually 'A'.
+  # 6 = Cardinality. Either a number or undef.
+  # 7 = sub_part. Usually undef. Sometimes 1.
+  # 8 = "packed". Usually undef.
+  # 9 = Null. Sometimes undef, sometimes 'YES'.
+  # 10 = Index_type. The type of the index. Usually either 'BTREE' or 'FULLTEXT'
+  # 11 = 'Comment.' Usually undef.
+  while (my $raw_def = $sth->fetchrow_arrayref) {
+    if ($raw_def->[2] eq $index) {
+      push(@fields, $raw_def->[4]);
+
+      # No index can be both UNIQUE and FULLTEXT, that's why
+      # this is written this way.
+      $index_type = $raw_def->[1] ? '' : 'UNIQUE';
+      $index_type = $raw_def->[10] eq 'FULLTEXT' ? 'FULLTEXT' : $index_type;
     }
+  }
 
-    my $retval;
-    if (scalar(@fields)) {
-        $retval = {FIELDS => \@fields, TYPE => $index_type};
-    }
-    return $retval;
+  my $retval;
+  if (scalar(@fields)) {
+    $retval = {FIELDS => \@fields, TYPE => $index_type};
+  }
+  return $retval;
 }
 
 =item C<bz_index_list_real($table)>
@@ -996,10 +1020,11 @@ sub bz_index_info_real {
 =cut
 
 sub bz_index_list_real {
-    my ($self, $table) = @_;
-    my $sth = $self->prepare("SHOW INDEX FROM $table");
-    # Column 3 of a SHOW INDEX statement contains the name of the index.
-    return @{ $self->selectcol_arrayref($sth, {Columns => [3]}) };
+  my ($self, $table) = @_;
+  my $sth = $self->prepare("SHOW INDEX FROM $table");
+
+  # Column 3 of a SHOW INDEX statement contains the name of the index.
+  return @{$self->selectcol_arrayref($sth, {Columns => [3]})};
 }
 
 #####################################################################
@@ -1023,34 +1048,33 @@ this code does.
 # bz_column_info_real function would be very difficult to create
 # properly for any other DB besides MySQL.
 sub _bz_build_schema_from_disk {
-    my ($self) = @_;
-
-    my $schema = $self->_bz_schema->get_empty_schema();
-
-    my @tables = $self->bz_table_list_real();
-    if (@tables) {
-        print "Building Schema object from database...\n"; 
+  my ($self) = @_;
+
+  my $schema = $self->_bz_schema->get_empty_schema();
+
+  my @tables = $self->bz_table_list_real();
+  if (@tables) {
+    print "Building Schema object from database...\n";
+  }
+  foreach my $table (@tables) {
+    $schema->add_table($table);
+    my @columns = $self->bz_table_columns_real($table);
+    foreach my $column (@columns) {
+      my $type_info = $self->bz_column_info_real($table, $column);
+      $schema->set_column($table, $column, $type_info);
     }
-    foreach my $table (@tables) {
-        $schema->add_table($table);
-        my @columns = $self->bz_table_columns_real($table);
-        foreach my $column (@columns) {
-            my $type_info = $self->bz_column_info_real($table, $column);
-            $schema->set_column($table, $column, $type_info);
-        }
 
-        my @indexes = $self->bz_index_list_real($table);
-        foreach my $index (@indexes) {
-            unless ($index eq 'PRIMARY') {
-                my $index_info = $self->bz_index_info_real($table, $index);
-                ($index_info = $index_info->{FIELDS}) 
-                    if (!$index_info->{TYPE});
-                $schema->set_index($table, $index, $index_info);
-            }
-        }
+    my @indexes = $self->bz_index_list_real($table);
+    foreach my $index (@indexes) {
+      unless ($index eq 'PRIMARY') {
+        my $index_info = $self->bz_index_info_real($table, $index);
+        ($index_info = $index_info->{FIELDS}) if (!$index_info->{TYPE});
+        $schema->set_index($table, $index, $index_info);
+      }
     }
+  }
 
-    return $schema;
+  return $schema;
 }
 
 1;
diff --git a/Bugzilla/DB/Oracle.pm b/Bugzilla/DB/Oracle.pm
index 7424019ac7..b888e30fdc 100644
--- a/Bugzilla/DB/Oracle.pm
+++ b/Bugzilla/DB/Oracle.pm
@@ -21,7 +21,7 @@ For interface details see L<Bugzilla::DB> and L<DBI>.
 
 package Bugzilla::DB::Oracle;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -38,461 +38,472 @@ use Bugzilla::Util;
 #####################################################################
 # Constants
 #####################################################################
-use constant EMPTY_STRING  => '__BZ_EMPTY_STR__';
+use constant EMPTY_STRING    => '__BZ_EMPTY_STR__';
 use constant ISOLATION_LEVEL => 'READ COMMITTED';
-use constant BLOB_TYPE => { ora_type => ORA_BLOB };
+use constant BLOB_TYPE       => {ora_type => ORA_BLOB};
+
 # The max size allowed for LOB fields, in kilobytes.
 use constant MIN_LONG_READ_LEN => 32 * 1024;
-use constant FULLTEXT_OR => ' OR ';
+use constant FULLTEXT_OR       => ' OR ';
 
 sub new {
-    my ($class, $params) = @_;
-    my ($user, $pass, $host, $dbname, $port) = 
-        @$params{qw(db_user db_pass db_host db_name db_port)};
-
-    # You can never connect to Oracle without a DB name,
-    # and there is no default DB.
-    $dbname ||= Bugzilla->localconfig->{db_name};
-
-    # Set the language enviroment
-    $ENV{'NLS_LANG'} = '.AL32UTF8' if Bugzilla->params->{'utf8'};
-
-    # construct the DSN from the parameters we got
-    my $dsn = "dbi:Oracle:host=$host;sid=$dbname";
-    $dsn .= ";port=$port" if $port;
-    my $attrs = { FetchHashKeyName => 'NAME_lc',  
-                  LongReadLen => max(Bugzilla->params->{'maxattachmentsize'} || 0,
-                                     MIN_LONG_READ_LEN) * 1024,
-                };
-    my $self = $class->db_new({ dsn => $dsn, user => $user, 
-                                pass => $pass, attrs => $attrs });
-    # Needed by TheSchwartz
-    $self->{private_bz_dsn} = $dsn;
-
-    bless ($self, $class);
-
-    # Set the session's default date format to match MySQL
-    $self->do("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-    $self->do("ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS'");
-    $self->do("ALTER SESSION SET NLS_LENGTH_SEMANTICS='CHAR'") 
-        if Bugzilla->params->{'utf8'};
-    # To allow case insensitive query.
-    $self->do("ALTER SESSION SET NLS_COMP='ANSI'");
-    $self->do("ALTER SESSION SET NLS_SORT='BINARY_AI'");
-    return $self;
+  my ($class, $params) = @_;
+  my ($user, $pass, $host, $dbname, $port)
+    = @$params{qw(db_user db_pass db_host db_name db_port)};
+
+  # You can never connect to Oracle without a DB name,
+  # and there is no default DB.
+  $dbname ||= Bugzilla->localconfig->{db_name};
+
+  # Set the language environment
+  $ENV{'NLS_LANG'} = '.AL32UTF8';
+
+  # construct the DSN from the parameters we got
+  my $dsn = "dbi:Oracle:host=$host;sid=$dbname";
+  $dsn .= ";port=$port" if $port;
+  my $attrs = {
+    FetchHashKeyName => 'NAME_lc',
+    LongReadLen =>
+      max(Bugzilla->params->{'maxattachmentsize'} || 0, MIN_LONG_READ_LEN) * 1024,
+  };
+  my $self = $class->db_new(
+    {dsn => $dsn, user => $user, pass => $pass, attrs => $attrs});
+
+  # Needed by TheSchwartz
+  $self->{private_bz_dsn} = $dsn;
+
+  bless($self, $class);
+
+  # Set the session's default date format to match MySQL
+  $self->do("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+  $self->do("ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+  $self->do("ALTER SESSION SET NLS_LENGTH_SEMANTICS='CHAR'");
+
+  # To allow case insensitive query.
+  $self->do("ALTER SESSION SET NLS_COMP='ANSI'");
+  $self->do("ALTER SESSION SET NLS_SORT='BINARY_AI'");
+  return $self;
 }
 
 sub bz_last_key {
-    my ($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    my $seq = $table . "_" . $column . "_SEQ";
-    my ($last_insert_id) = $self->selectrow_array("SELECT $seq.CURRVAL "
-                                                  . " FROM DUAL");
-    return $last_insert_id;
+  my $seq = $table . "_" . $column . "_SEQ";
+  my ($last_insert_id)
+    = $self->selectrow_array("SELECT $seq.CURRVAL " . " FROM DUAL");
+  return $last_insert_id;
 }
 
 sub bz_check_regexp {
-    my ($self, $pattern) = @_;
+  my ($self, $pattern) = @_;
 
-    eval { $self->do("SELECT 1 FROM DUAL WHERE "
-          . $self->sql_regexp($self->quote("a"), $pattern, 1)) };
+  eval {
+    $self->do("SELECT 1 FROM DUAL WHERE "
+        . $self->sql_regexp($self->quote("a"), $pattern, 1));
+  };
 
-    $@ && ThrowUserError('illegal_regexp',
-        { value => $pattern, dberror => $self->errstr });
+  $@
+    && ThrowUserError('illegal_regexp',
+    {value => $pattern, dberror => $self->errstr});
 }
 
-sub bz_explain { 
-     my ($self, $sql) = @_; 
-     my $sth = $self->prepare("EXPLAIN PLAN FOR $sql"); 
-     $sth->execute();
-     my $explain = $self->selectcol_arrayref(
-         "SELECT PLAN_TABLE_OUTPUT FROM TABLE(DBMS_XPLAN.DISPLAY)");
-     return join("\n", @$explain); 
-} 
+sub bz_explain {
+  my ($self, $sql) = @_;
+  my $sth = $self->prepare("EXPLAIN PLAN FOR $sql");
+  $sth->execute();
+  my $explain = $self->selectcol_arrayref(
+    "SELECT PLAN_TABLE_OUTPUT FROM TABLE(DBMS_XPLAN.DISPLAY)");
+  return join("\n", @$explain);
+}
 
 sub sql_group_concat {
-    my ($self, $text, $separator) = @_;
-    $separator = $self->quote(', ') if !defined $separator;
-    my ($distinct, $rest) = $text =~/^(\s*DISTINCT\s|)(.+)$/i;
-    return "group_concat($distinct T_CLOB_DELIM(NVL($rest, ' '), $separator))";
+  my ($self, $text, $separator) = @_;
+  $separator = $self->quote(', ') if !defined $separator;
+  my ($distinct, $rest) = $text =~ /^(\s*DISTINCT\s|)(.+)$/i;
+  return "group_concat($distinct T_CLOB_DELIM(NVL($rest, ' '), $separator))";
 }
 
 sub sql_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "REGEXP_LIKE($expr, $pattern)";
+  return "REGEXP_LIKE($expr, $pattern)";
 }
 
 sub sql_not_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "NOT REGEXP_LIKE($expr, $pattern)" 
+  return "NOT REGEXP_LIKE($expr, $pattern)";
 }
 
 sub sql_limit {
-    my ($self, $limit, $offset) = @_;
+  my ($self, $limit, $offset) = @_;
 
-    if(defined $offset) {
-        return  "/* LIMIT $limit $offset */";
-    }
-    return "/* LIMIT $limit */";
+  if (defined $offset) {
+    return "/* LIMIT $limit $offset */";
+  }
+  return "/* LIMIT $limit */";
 }
 
 sub sql_string_concat {
-    my ($self, @params) = @_;
+  my ($self, @params) = @_;
 
-    return 'CONCAT(' . join(', ', @params) . ')';
+  return 'CONCAT(' . join(', ', @params) . ')';
 }
 
 sub sql_to_days {
-    my ($self, $date) = @_;
+  my ($self, $date) = @_;
 
-    return " TO_CHAR(TO_DATE($date),'J') ";
+  return " TO_CHAR(TO_DATE($date),'J') ";
 }
-sub sql_from_days{
-    my ($self, $date) = @_;
 
-    return " TO_DATE($date,'J') ";
+sub sql_from_days {
+  my ($self, $date) = @_;
+
+  return " TO_DATE($date,'J') ";
 }
 
 sub sql_fulltext_search {
-    my ($self, $column, $text) = @_;
-    state $label = 0;
-    $text = $self->quote($text);
-    trick_taint($text);
-    $label++;
-    return "CONTAINS($column,$text,$label) > 0", "SCORE($label)";
+  my ($self, $column, $text) = @_;
+  state $label = 0;
+  $text = $self->quote($text);
+  trick_taint($text);
+  $label++;
+  return "CONTAINS($column,$text,$label) > 0", "SCORE($label)";
 }
 
 sub sql_date_format {
-    my ($self, $date, $format) = @_;
-    
-    $format = "%Y.%m.%d %H:%i:%s" if !$format;
+  my ($self, $date, $format) = @_;
+
+  $format = "%Y.%m.%d %H:%i:%s" if !$format;
 
-    $format =~ s/\%Y/YYYY/g;
-    $format =~ s/\%y/YY/g;
-    $format =~ s/\%m/MM/g;
-    $format =~ s/\%d/DD/g;
-    $format =~ s/\%a/Dy/g;
-    $format =~ s/\%H/HH24/g;
-    $format =~ s/\%i/MI/g;
-    $format =~ s/\%s/SS/g;
+  $format =~ s/\%Y/YYYY/g;
+  $format =~ s/\%y/YY/g;
+  $format =~ s/\%m/MM/g;
+  $format =~ s/\%d/DD/g;
+  $format =~ s/\%a/Dy/g;
+  $format =~ s/\%H/HH24/g;
+  $format =~ s/\%i/MI/g;
+  $format =~ s/\%s/SS/g;
 
-    return "TO_CHAR($date, " . $self->quote($format) . ")";
+  return "TO_CHAR($date, " . $self->quote($format) . ")";
 }
 
 sub sql_date_math {
-    my ($self, $date, $operator, $interval, $units) = @_;
-    my $time_sql;
-    if ($units =~ /YEAR|MONTH/i) {
-        $time_sql = "NUMTOYMINTERVAL($interval,'$units')";
-    } else{
-        $time_sql = "NUMTODSINTERVAL($interval,'$units')";
-    }
-   return "$date $operator $time_sql";
+  my ($self, $date, $operator, $interval, $units) = @_;
+  my $time_sql;
+  if ($units =~ /YEAR|MONTH/i) {
+    $time_sql = "NUMTOYMINTERVAL($interval,'$units')";
+  }
+  else {
+    $time_sql = "NUMTODSINTERVAL($interval,'$units')";
+  }
+  return "$date $operator $time_sql";
 }
 
 sub sql_position {
-    my ($self, $fragment, $text) = @_;
-    return "INSTR($text, $fragment)";
+  my ($self, $fragment, $text) = @_;
+  return "INSTR($text, $fragment)";
 }
 
 sub sql_in {
-    my ($self, $column_name, $in_list_ref, $negate) = @_;
-    my @in_list = @$in_list_ref;
-    return $self->SUPER::sql_in($column_name, $in_list_ref, $negate) if $#in_list < 1000;
-    my @in_str;
-    while (@in_list) {
-        my $length = $#in_list + 1;
-        my $splice = $length > 1000 ? 1000 : $length;
-        my @sub_in_list = splice(@in_list, 0, $splice);
-        push(@in_str, 
-             $self->SUPER::sql_in($column_name, \@sub_in_list, $negate));
-    }
-    return "( " . join(" OR ", @in_str) . " )";
+  my ($self, $column_name, $in_list_ref, $negate) = @_;
+  my @in_list = @$in_list_ref;
+  return $self->SUPER::sql_in($column_name, $in_list_ref, $negate)
+    if $#in_list < 1000;
+  my @in_str;
+  while (@in_list) {
+    my $length      = $#in_list + 1;
+    my $splice      = $length > 1000 ? 1000 : $length;
+    my @sub_in_list = splice(@in_list, 0, $splice);
+    push(@in_str, $self->SUPER::sql_in($column_name, \@sub_in_list, $negate));
+  }
+  return "( " . join(" OR ", @in_str) . " )";
 }
 
 sub _bz_add_field_table {
-    my ($self, $name, $schema_ref, $type) = @_;
-    $self->SUPER::_bz_add_field_table($name, $schema_ref);
-    if (defined($type) && $type == FIELD_TYPE_MULTI_SELECT) {
-        my $uk_name = "UK_" . $self->_bz_schema->_hash_identifier($name . '_value');
-        $self->do("ALTER TABLE $name ADD CONSTRAINT $uk_name UNIQUE(value)");
-    }
+  my ($self, $name, $schema_ref, $type) = @_;
+  $self->SUPER::_bz_add_field_table($name, $schema_ref);
+  if (defined($type) && $type == FIELD_TYPE_MULTI_SELECT) {
+    my $uk_name = "UK_" . $self->_bz_schema->_hash_identifier($name . '_value');
+    $self->do("ALTER TABLE $name ADD CONSTRAINT $uk_name UNIQUE(value)");
+  }
 }
 
 sub bz_drop_table {
-     my ($self, $name) = @_;
-     my $table_exists = $self->bz_table_info($name);
-     if ($table_exists) {
-         $self->_bz_drop_fks($name);
-         $self->SUPER::bz_drop_table($name);
-     }
+  my ($self, $name) = @_;
+  my $table_exists = $self->bz_table_info($name);
+  if ($table_exists) {
+    $self->_bz_drop_fks($name);
+    $self->SUPER::bz_drop_table($name);
+  }
 }
 
-# Dropping all FKs for a specified table. 
+# Dropping all FKs for a specified table.
 sub _bz_drop_fks {
-    my ($self, $table) = @_;
-    my @columns = $self->bz_table_columns($table);
-    foreach my $column (@columns) {
-        $self->bz_drop_fk($table, $column);
-    }
+  my ($self, $table) = @_;
+  my @columns = $self->bz_table_columns($table);
+  foreach my $column (@columns) {
+    $self->bz_drop_fk($table, $column);
+  }
 }
 
 sub _fix_empty {
-    my ($string) = @_;
-    $string = '' if $string eq EMPTY_STRING;
-    return $string;
+  my ($string) = @_;
+  $string = '' if $string eq EMPTY_STRING;
+  return $string;
 }
 
 sub _fix_arrayref {
-    my ($row) = @_;
-    return undef if !defined $row;
-    foreach my $field (@$row) {
-        $field = _fix_empty($field) if defined $field;
-    }
-    return $row;
+  my ($row) = @_;
+  return undef if !defined $row;
+  foreach my $field (@$row) {
+    $field = _fix_empty($field) if defined $field;
+  }
+  return $row;
 }
 
 sub _fix_hashref {
-     my ($row) = @_;
-     return undef if !defined $row;
-     foreach my $value (values %$row) {
-       $value = _fix_empty($value) if defined $value;
-     }
-     return $row;
+  my ($row) = @_;
+  return undef if !defined $row;
+  foreach my $value (values %$row) {
+    $value = _fix_empty($value) if defined $value;
+  }
+  return $row;
 }
 
 sub adjust_statement {
-    my ($sql) = @_;
-    
-    if ($sql =~ /^CREATE OR REPLACE.*/i){
-        return $sql;
-    } 
-
-    # We can't just assume any occurrence of "''" in $sql is an empty
-    # string, since "''" can occur inside a string literal as a way of
-    # escaping a single "'" in the literal.  Therefore we must be trickier...
-
-    # split the statement into parts by single-quotes.  The negative value
-    # at the end to the split operator from dropping trailing empty strings
-    # (e.g., when $sql ends in "''")
-    my @parts = split /'/, $sql, -1;
-
-    if( !(@parts % 2) ) {
-        # Either the string is empty or the quotes are mismatched
-        # Returning input unmodified.
-        return $sql;
+  my ($sql) = @_;
+
+  if ($sql =~ /^CREATE OR REPLACE.*/i) {
+    return $sql;
+  }
+
+  # We can't just assume any occurrence of "''" in $sql is an empty
+  # string, since "''" can occur inside a string literal as a way of
+  # escaping a single "'" in the literal.  Therefore we must be trickier...
+
+  # split the statement into parts by single-quotes.  The negative value
+  # at the end to the split operator from dropping trailing empty strings
+  # (e.g., when $sql ends in "''")
+  my @parts = split /'/, $sql, -1;
+
+  if (!(@parts % 2)) {
+
+    # Either the string is empty or the quotes are mismatched
+    # Returning input unmodified.
+    return $sql;
+  }
+
+  # We already verified that we have an odd number of parts.  If we take
+  # the first part off now, we know we're entering the loop with an even
+  # number of parts
+  my @result;
+  my $part = shift @parts;
+
+  # Oracle requires a FROM clause in all SELECT statements, so append
+  # "FROM dual" to queries without one (e.g., "SELECT NOW()")
+  my $is_select = ($part =~ m/^\s*SELECT\b/io);
+  my $has_from = ($part =~ m/\bFROM\b/io) if $is_select;
+
+  # Oracle includes the time in CURRENT_DATE.
+  $part =~ s/\bCURRENT_DATE\b/TRUNC(CURRENT_DATE)/io;
+
+  # Oracle use SUBSTR instead of SUBSTRING
+  $part =~ s/\bSUBSTRING\b/SUBSTR/io;
+
+  # Oracle need no 'AS'
+  $part =~ s/\bAS\b//ig;
+
+  # Oracle doesn't have LIMIT, so if we find the LIMIT comment, wrap the
+  # query with "SELECT * FROM (...) WHERE rownum < $limit"
+  my ($limit, $offset) = ($part =~ m{/\* LIMIT (\d*) (\d*) \*/}o);
+
+  push @result, $part;
+  while (@parts) {
+    my $string    = shift @parts;
+    my $nonstring = shift @parts;
+
+    # if the non-string part is zero-length and there are more parts left,
+    # then this is an escaped quote inside a string literal
+    while (!(length $nonstring) && @parts) {
+
+      # we know it's safe to remove two parts at a time, since we
+      # entered the loop with an even number of parts
+      $string .= "''" . shift @parts;
+      $nonstring = shift @parts;
     }
 
-    # We already verified that we have an odd number of parts.  If we take
-    # the first part off now, we know we're entering the loop with an even
-    # number of parts
-    my @result;
-    my $part = shift @parts;
-    
-    # Oracle requires a FROM clause in all SELECT statements, so append
-    # "FROM dual" to queries without one (e.g., "SELECT NOW()")
-    my $is_select = ($part =~ m/^\s*SELECT\b/io);
-    my $has_from =  ($part =~ m/\bFROM\b/io) if $is_select;
+    # Look for a FROM if this is a SELECT and we haven't found one yet
+    $has_from = ($nonstring =~ m/\bFROM\b/io) if ($is_select and !$has_from);
 
     # Oracle includes the time in CURRENT_DATE.
-    $part =~ s/\bCURRENT_DATE\b/TRUNC(CURRENT_DATE)/io;
+    $nonstring =~ s/\bCURRENT_DATE\b/TRUNC(CURRENT_DATE)/io;
 
     # Oracle use SUBSTR instead of SUBSTRING
-    $part =~ s/\bSUBSTRING\b/SUBSTR/io;
-   
+    $nonstring =~ s/\bSUBSTRING\b/SUBSTR/io;
+
     # Oracle need no 'AS'
-    $part =~ s/\bAS\b//ig;
-    
-    # Oracle doesn't have LIMIT, so if we find the LIMIT comment, wrap the
-    # query with "SELECT * FROM (...) WHERE rownum < $limit"
-    my ($limit,$offset) = ($part =~ m{/\* LIMIT (\d*) (\d*) \*/}o);
-    
-    push @result, $part;
-    while( @parts ) {
-        my $string = shift @parts;
-        my $nonstring = shift @parts;
-    
-        # if the non-string part is zero-length and there are more parts left,
-        # then this is an escaped quote inside a string literal   
-        while( !(length $nonstring) && @parts  ) {
-            # we know it's safe to remove two parts at a time, since we
-            # entered the loop with an even number of parts
-            $string .= "''" . shift @parts;
-            $nonstring = shift @parts;
-        }
+    $nonstring =~ s/\bAS\b//ig;
 
-        # Look for a FROM if this is a SELECT and we haven't found one yet
-        $has_from = ($nonstring =~ m/\bFROM\b/io) 
-                    if ($is_select and !$has_from);
+    # Look for a LIMIT clause
+    ($limit) = ($nonstring =~ m(/\* LIMIT (\d*) \*/)o);
 
-        # Oracle includes the time in CURRENT_DATE.
-        $nonstring =~ s/\bCURRENT_DATE\b/TRUNC(CURRENT_DATE)/io;
+    if (!length($string)) {
+      push @result, EMPTY_STRING;
+      push @result, $nonstring;
+    }
+    else {
+      push @result, $string;
+      push @result, $nonstring;
+    }
+  }
 
-        # Oracle use SUBSTR instead of SUBSTRING
-        $nonstring =~ s/\bSUBSTRING\b/SUBSTR/io;
+  my $new_sql = join "'", @result;
 
-        # Oracle need no 'AS'
-        $nonstring =~ s/\bAS\b//ig;
+  # Append "FROM dual" if this is a SELECT without a FROM clause
+  $new_sql .= " FROM DUAL" if ($is_select and !$has_from);
 
-        # Look for a LIMIT clause
-        ($limit) = ($nonstring =~ m(/\* LIMIT (\d*) \*/)o);
+  # Wrap the query with a "WHERE rownum <= ..." if we found LIMIT
 
-        if(!length($string)){
-           push @result, EMPTY_STRING;
-           push @result, $nonstring;
-        } else {
-           push @result, $string;
-           push @result, $nonstring;
-        }
+  if (defined($limit)) {
+    if ($new_sql !~ /\bWHERE\b/) {
+      $new_sql = $new_sql . " WHERE 1=1";
     }
-
-    my $new_sql = join "'", @result;
-
-    # Append "FROM dual" if this is a SELECT without a FROM clause
-    $new_sql .= " FROM DUAL" if ($is_select and !$has_from);
-
-    # Wrap the query with a "WHERE rownum <= ..." if we found LIMIT
-    
-    if (defined($limit)) {
-        if ($new_sql !~ /\bWHERE\b/) {
-            $new_sql = $new_sql." WHERE 1=1";
-        }
-        my ($before_where, $after_where) = split(/\bWHERE\b/i, $new_sql, 2);
-        if (defined($offset)) {
-            my ($before_from, $after_from) = split(/\bFROM\b/i, $new_sql, 2);
-            $before_where = "$before_from FROM ($before_from,"
-                          . " ROW_NUMBER() OVER (ORDER BY 1) R "
-                          . " FROM $after_from ) "; 
-            $after_where = " R BETWEEN $offset+1 AND $limit+$offset";
-        } else {
-            $after_where = " rownum <=$limit AND ".$after_where;
-        }
-        $new_sql = $before_where." WHERE ".$after_where;
+    my ($before_where, $after_where) = split(/\bWHERE\b/i, $new_sql, 2);
+    if (defined($offset)) {
+      my ($before_from, $after_from) = split(/\bFROM\b/i, $new_sql, 2);
+      $before_where
+        = "$before_from FROM ($before_from,"
+        . " ROW_NUMBER() OVER (ORDER BY 1) R "
+        . " FROM $after_from ) ";
+      $after_where = " R BETWEEN $offset+1 AND $limit+$offset";
+    }
+    else {
+      $after_where = " rownum <=$limit AND " . $after_where;
     }
-    return $new_sql;
+    $new_sql = $before_where . " WHERE " . $after_where;
+  }
+  return $new_sql;
 }
 
 sub do {
-    my $self = shift;
-    my $sql  = shift;
-    $sql = adjust_statement($sql);
-    unshift @_, $sql;
-    return $self->SUPER::do(@_);
+  my $self = shift;
+  my $sql  = shift;
+  $sql = adjust_statement($sql);
+  unshift @_, $sql;
+  return $self->SUPER::do(@_);
 }
 
 sub selectrow_array {
-    my $self = shift;
-    my $stmt = shift;
-    my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
-    unshift @_, $new_stmt;
-    if ( wantarray ) {
-        my @row = $self->SUPER::selectrow_array(@_);
-        _fix_arrayref(\@row);
-        return @row;
-    } else {
-        my $row = $self->SUPER::selectrow_array(@_);
-        $row = _fix_empty($row) if defined $row;
-        return $row;
-    }
+  my $self     = shift;
+  my $stmt     = shift;
+  my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
+  unshift @_, $new_stmt;
+  if (wantarray) {
+    my @row = $self->SUPER::selectrow_array(@_);
+    _fix_arrayref(\@row);
+    return @row;
+  }
+  else {
+    my $row = $self->SUPER::selectrow_array(@_);
+    $row = _fix_empty($row) if defined $row;
+    return $row;
+  }
 }
 
 sub selectrow_arrayref {
-    my $self = shift;
-    my $stmt = shift;
-    my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
-    unshift @_, $new_stmt;
-    my $ref = $self->SUPER::selectrow_arrayref(@_);
-    return undef if !defined $ref;
+  my $self     = shift;
+  my $stmt     = shift;
+  my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
+  unshift @_, $new_stmt;
+  my $ref = $self->SUPER::selectrow_arrayref(@_);
+  return undef if !defined $ref;
 
-    _fix_arrayref($ref);
-    return $ref;
+  _fix_arrayref($ref);
+  return $ref;
 }
 
 sub selectrow_hashref {
-    my $self = shift;
-    my $stmt = shift;
-    my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
-    unshift @_, $new_stmt;
-    my $ref = $self->SUPER::selectrow_hashref(@_);
-    return undef if !defined $ref;
+  my $self     = shift;
+  my $stmt     = shift;
+  my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
+  unshift @_, $new_stmt;
+  my $ref = $self->SUPER::selectrow_hashref(@_);
+  return undef if !defined $ref;
 
-    _fix_hashref($ref);
-    return $ref;
+  _fix_hashref($ref);
+  return $ref;
 }
 
 sub selectall_arrayref {
-    my $self = shift;
-    my $stmt = shift;
-    my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
-    unshift @_, $new_stmt;
-    my $ref = $self->SUPER::selectall_arrayref(@_);
-    return undef if !defined $ref;
-    
-    foreach my $row (@$ref) {
-       if (ref($row) eq 'ARRAY') {
-            _fix_arrayref($row);
-       }
-       elsif (ref($row) eq 'HASH') {
-            _fix_hashref($row);
-       }
+  my $self     = shift;
+  my $stmt     = shift;
+  my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
+  unshift @_, $new_stmt;
+  my $ref = $self->SUPER::selectall_arrayref(@_);
+  return undef if !defined $ref;
+
+  foreach my $row (@$ref) {
+    if (ref($row) eq 'ARRAY') {
+      _fix_arrayref($row);
     }
+    elsif (ref($row) eq 'HASH') {
+      _fix_hashref($row);
+    }
+  }
 
-    return $ref;
+  return $ref;
 }
 
 sub selectall_hashref {
-    my $self = shift;
-    my $stmt = shift;
-    my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
-    unshift @_, $new_stmt;
-    my $rows = $self->SUPER::selectall_hashref(@_);
-    return undef if !defined $rows;
-    foreach my $row (values %$rows) { 
-          _fix_hashref($row);
-    }
-    return $rows;
+  my $self     = shift;
+  my $stmt     = shift;
+  my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
+  unshift @_, $new_stmt;
+  my $rows = $self->SUPER::selectall_hashref(@_);
+  return undef if !defined $rows;
+  foreach my $row (values %$rows) {
+    _fix_hashref($row);
+  }
+  return $rows;
 }
 
 sub selectcol_arrayref {
-    my $self = shift;
-    my $stmt = shift;
-    my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
-    unshift @_, $new_stmt;
-    my $ref = $self->SUPER::selectcol_arrayref(@_);
-    return undef if !defined $ref;
-    _fix_arrayref($ref);
-    return $ref;
+  my $self     = shift;
+  my $stmt     = shift;
+  my $new_stmt = (ref $stmt) ? $stmt : adjust_statement($stmt);
+  unshift @_, $new_stmt;
+  my $ref = $self->SUPER::selectcol_arrayref(@_);
+  return undef if !defined $ref;
+  _fix_arrayref($ref);
+  return $ref;
 }
 
 sub prepare {
-    my $self = shift;
-    my $sql  = shift;
-    my $new_sql = adjust_statement($sql);
-    unshift @_, $new_sql;
-    return bless $self->SUPER::prepare(@_),
-                        'Bugzilla::DB::Oracle::st';
+  my $self    = shift;
+  my $sql     = shift;
+  my $new_sql = adjust_statement($sql);
+  unshift @_, $new_sql;
+  return bless $self->SUPER::prepare(@_), 'Bugzilla::DB::Oracle::st';
 }
 
 sub prepare_cached {
-    my $self = shift;
-    my $sql  = shift;
-    my $new_sql = adjust_statement($sql);
-    unshift @_, $new_sql;
-    return bless $self->SUPER::prepare_cached(@_),
-                      'Bugzilla::DB::Oracle::st';
+  my $self    = shift;
+  my $sql     = shift;
+  my $new_sql = adjust_statement($sql);
+  unshift @_, $new_sql;
+  return bless $self->SUPER::prepare_cached(@_), 'Bugzilla::DB::Oracle::st';
 }
 
 sub quote_identifier {
-     my ($self,$id) = @_;
-     return $id;
+  my ($self, $id) = @_;
+  return $id;
 }
 
 #####################################################################
@@ -500,20 +511,23 @@ sub quote_identifier {
 #####################################################################
 
 sub bz_table_columns_real {
-    my ($self, $table) = @_;
-    $table = uc($table);
-    my $cols = $self->selectcol_arrayref(
-        "SELECT LOWER(COLUMN_NAME) FROM USER_TAB_COLUMNS WHERE 
-         TABLE_NAME = ?  ORDER BY COLUMN_NAME", undef, $table);
-    return @$cols;
+  my ($self, $table) = @_;
+  $table = uc($table);
+  my $cols = $self->selectcol_arrayref(
+    "SELECT LOWER(COLUMN_NAME) FROM USER_TAB_COLUMNS WHERE 
+         TABLE_NAME = ?  ORDER BY COLUMN_NAME", undef, $table
+  );
+  return @$cols;
 }
 
 sub bz_table_list_real {
-    my ($self) = @_;
-    my $tables = $self->selectcol_arrayref(
-        "SELECT LOWER(TABLE_NAME) FROM USER_TABLES WHERE 
-        TABLE_NAME NOT LIKE ?  ORDER BY TABLE_NAME", undef, 'DR$%');
-    return @$tables;
+  my ($self) = @_;
+  my $tables = $self->selectcol_arrayref(
+    "SELECT LOWER(TABLE_NAME) FROM USER_TABLES WHERE 
+        TABLE_NAME NOT LIKE ? AND TABLE_NAME NOT LIKE ?
+        ORDER BY TABLE_NAME", undef, 'DR$%', 'APEX$%'
+  );
+  return @$tables;
 }
 
 #####################################################################
@@ -521,32 +535,37 @@ sub bz_table_list_real {
 #####################################################################
 
 sub bz_setup_database {
-    my $self = shift;
-    
-    # Create a function that returns SYSDATE to emulate MySQL's "NOW()".
-    # Function NOW() is used widely in Bugzilla SQLs, but Oracle does not 
-    # have that function, So we have to create one ourself. 
-    $self->do("CREATE OR REPLACE FUNCTION NOW "
-              . " RETURN DATE IS BEGIN RETURN SYSDATE; END;");
-    $self->do("CREATE OR REPLACE FUNCTION CHAR_LENGTH(COLUMN_NAME VARCHAR2)" 
-              . " RETURN NUMBER IS BEGIN RETURN LENGTH(COLUMN_NAME); END;");
-    
-    # Create types for group_concat
-    my $type_exists = $self->selectrow_array("SELECT 1 FROM user_types
-                                              WHERE type_name = 'T_GROUP_CONCAT'");
-    $self->do("DROP TYPE T_GROUP_CONCAT") if $type_exists;
-    $self->do("CREATE OR REPLACE TYPE T_CLOB_DELIM AS OBJECT "
-          . "( p_CONTENT CLOB, p_DELIMITER VARCHAR2(256)"
-          . ", MAP MEMBER FUNCTION T_CLOB_DELIM_ToVarchar return VARCHAR2"
-          . ");");
-    $self->do("CREATE OR REPLACE TYPE BODY T_CLOB_DELIM IS
+  my $self = shift;
+
+  # Create a function that returns SYSDATE to emulate MySQL's "NOW()".
+  # Function NOW() is used widely in Bugzilla SQLs, but Oracle does not
+  # have that function, So we have to create one ourself.
+  $self->do("CREATE OR REPLACE FUNCTION NOW "
+      . " RETURN DATE IS BEGIN RETURN SYSDATE; END;");
+  $self->do("CREATE OR REPLACE FUNCTION CHAR_LENGTH(COLUMN_NAME VARCHAR2)"
+      . " RETURN NUMBER IS BEGIN RETURN LENGTH(COLUMN_NAME); END;");
+
+  # Create types for group_concat
+  my $type_exists = $self->selectrow_array(
+    "SELECT 1 FROM user_types
+                                              WHERE type_name = 'T_GROUP_CONCAT'"
+  );
+  $self->do("DROP TYPE T_GROUP_CONCAT") if $type_exists;
+  $self->do("CREATE OR REPLACE TYPE T_CLOB_DELIM AS OBJECT "
+      . "( p_CONTENT CLOB, p_DELIMITER VARCHAR2(256)"
+      . ", MAP MEMBER FUNCTION T_CLOB_DELIM_ToVarchar return VARCHAR2"
+      . ");");
+  $self->do(
+    "CREATE OR REPLACE TYPE BODY T_CLOB_DELIM IS
                   MAP MEMBER FUNCTION T_CLOB_DELIM_ToVarchar return VARCHAR2 is
                   BEGIN
                       RETURN p_CONTENT;
                   END;
-              END;");
+              END;"
+  );
 
-    $self->do("CREATE OR REPLACE TYPE T_GROUP_CONCAT AS OBJECT 
+  $self->do(
+    "CREATE OR REPLACE TYPE T_GROUP_CONCAT AS OBJECT 
                (  CLOB_CONTENT CLOB,
                   DELIMITER    VARCHAR2(256),
                   STATIC FUNCTION ODCIAGGREGATEINITIALIZE(
@@ -564,9 +583,11 @@ sub bz_setup_database {
                   MEMBER FUNCTION ODCIAGGREGATEMERGE(
                       SELF IN OUT NOCOPY T_GROUP_CONCAT,
                       CTX2 IN T_GROUP_CONCAT) 
-                  RETURN NUMBER);");
+                  RETURN NUMBER);"
+  );
 
-    $self->do("CREATE OR REPLACE TYPE BODY T_GROUP_CONCAT IS
+  $self->do(
+    "CREATE OR REPLACE TYPE BODY T_GROUP_CONCAT IS
                   STATIC FUNCTION ODCIAGGREGATEINITIALIZE(
                   SCTX IN OUT NOCOPY T_GROUP_CONCAT)
                   RETURN NUMBER IS
@@ -610,183 +631,191 @@ sub bz_setup_database {
                       DBMS_LOB.APPEND(SELF.CLOB_CONTENT, CTX2.CLOB_CONTENT);
                       RETURN ODCICONST.SUCCESS;
                   END;
-               END;");
+               END;"
+  );
 
-    # Create user-defined aggregate function group_concat
-    $self->do("CREATE OR REPLACE FUNCTION GROUP_CONCAT(P_INPUT T_CLOB_DELIM) 
+  # Create user-defined aggregate function group_concat
+  $self->do(
+    "CREATE OR REPLACE FUNCTION GROUP_CONCAT(P_INPUT T_CLOB_DELIM) 
                RETURN CLOB 
-               DETERMINISTIC PARALLEL_ENABLE AGGREGATE USING T_GROUP_CONCAT;");
-
-    # Create a WORLD_LEXER named BZ_LEX for multilingual fulltext search
-    my $lexer = $self->selectcol_arrayref(
-       "SELECT pre_name FROM CTXSYS.CTX_PREFERENCES WHERE pre_name = ? AND
-          pre_owner = ?",
-          undef,'BZ_LEX',uc(Bugzilla->localconfig->{db_user}));
-    if(!@$lexer) {
-       $self->do("BEGIN CTX_DDL.CREATE_PREFERENCE
-                        ('BZ_LEX', 'WORLD_LEXER'); END;");
-    }
-
-    $self->SUPER::bz_setup_database(@_);
-
-    my $sth = $self->prepare("SELECT OBJECT_NAME FROM USER_OBJECTS WHERE OBJECT_NAME = ?");
-    my @tables = $self->bz_table_list_real();
-
-    foreach my $table (@tables) {
-        my @columns = $self->bz_table_columns_real($table);
-        foreach my $column (@columns) {
-            my $def = $self->bz_column_info($table, $column);
-            # bz_add_column() before Bugzilla 4.2.3 didn't handle primary keys
-            # correctly (bug 731156). We have to add missing sequences and
-            # triggers ourselves.
-            if ($def->{TYPE} =~ /SERIAL/i) {
-                my $sequence = "${table}_${column}_SEQ";
-                my $exists = $self->selectrow_array($sth, undef, $sequence);
-                if (!$exists) {
-                    my @sql = $self->_get_create_seq_ddl($table, $column);
-                    $self->do($_) foreach @sql;
-                }
-            }
-
-            if ($def->{REFERENCES}) {
-                my $references = $def->{REFERENCES};
-                my $update = $references->{UPDATE} || 'CASCADE';
-                my $to_table  = $references->{TABLE};
-                my $to_column = $references->{COLUMN};
-                my $fk_name = $self->_bz_schema->_get_fk_name($table,
-                                                              $column,
-                                                              $references);
-                # bz_rename_table didn't rename the trigger correctly.
-                if ($table eq 'bug_tag' && $to_table eq 'tags') {
-                    $to_table = 'tag';
-                }
-                if ( $update =~ /CASCADE/i ){
-                    my $trigger_name = uc($fk_name . "_UC");
-                    my $exist_trigger = $self->selectcol_arrayref($sth, undef, $trigger_name);
-                    if(@$exist_trigger) {
-                        $self->do("DROP TRIGGER $trigger_name");
-                    }
-  
-                    my $tr_str = "CREATE OR REPLACE TRIGGER $trigger_name"
-                         . " AFTER UPDATE OF $to_column ON $to_table "
-                         . " REFERENCING "
-                         . " NEW AS NEW "
-                         . " OLD AS OLD "
-                         . " FOR EACH ROW "
-                         . " BEGIN "
-                         . "     UPDATE $table"
-                         . "        SET $column = :NEW.$to_column"
-                         . "      WHERE $column = :OLD.$to_column;"
-                         . " END $trigger_name;";
-                    $self->do($tr_str);
-                }
-            }
+               DETERMINISTIC PARALLEL_ENABLE AGGREGATE USING T_GROUP_CONCAT;"
+  );
+
+  # Create a WORLD_LEXER named BZ_LEX for multilingual fulltext search
+  my $lexer = $self->selectcol_arrayref(
+    "SELECT pre_name FROM CTXSYS.CTX_PREFERENCES WHERE pre_name = ? AND
+          pre_owner = ?", undef, 'BZ_LEX', uc(Bugzilla->localconfig->{db_user})
+  );
+  if (!@$lexer) {
+    $self->do(
+      "BEGIN CTX_DDL.CREATE_PREFERENCE
+                        ('BZ_LEX', 'WORLD_LEXER'); END;"
+    );
+  }
+
+  $self->SUPER::bz_setup_database(@_);
+
+  my $sth = $self->prepare(
+    "SELECT OBJECT_NAME FROM USER_OBJECTS WHERE OBJECT_NAME = ?");
+  my @tables = $self->bz_table_list_real();
+
+  foreach my $table (@tables) {
+    my @columns = $self->bz_table_columns_real($table);
+    foreach my $column (@columns) {
+      my $def = $self->bz_column_info($table, $column);
+
+      # bz_add_column() before Bugzilla 4.2.3 didn't handle primary keys
+      # correctly (bug 731156). We have to add missing sequences and
+      # triggers ourselves.
+      if ($def->{TYPE} =~ /SERIAL/i) {
+        my $sequence = "${table}_${column}_SEQ";
+        my $exists = $self->selectrow_array($sth, undef, $sequence);
+        if (!$exists) {
+          my @sql = $self->_get_create_seq_ddl($table, $column);
+          $self->do($_) foreach @sql;
         }
+      }
+
+      if ($def->{REFERENCES}) {
+        my $references = $def->{REFERENCES};
+        my $update     = $references->{UPDATE} || 'CASCADE';
+        my $to_table   = $references->{TABLE};
+        my $to_column  = $references->{COLUMN};
+        my $fk_name    = $self->_bz_schema->_get_fk_name($table, $column, $references);
+
+        # bz_rename_table didn't rename the trigger correctly.
+        if ($table eq 'bug_tag' && $to_table eq 'tags') {
+          $to_table = 'tag';
+        }
+        if ($update =~ /CASCADE/i) {
+          my $trigger_name = uc($fk_name . "_UC");
+          my $exist_trigger = $self->selectcol_arrayref($sth, undef, $trigger_name);
+          if (@$exist_trigger) {
+            $self->do("DROP TRIGGER $trigger_name");
+          }
+
+          my $tr_str
+            = "CREATE OR REPLACE TRIGGER $trigger_name"
+            . " AFTER UPDATE OF $to_column ON $to_table "
+            . " REFERENCING "
+            . " NEW AS NEW "
+            . " OLD AS OLD "
+            . " FOR EACH ROW "
+            . " BEGIN "
+            . "     UPDATE $table"
+            . "        SET $column = :NEW.$to_column"
+            . "      WHERE $column = :OLD.$to_column;"
+            . " END $trigger_name;";
+          $self->do($tr_str);
+        }
+      }
     }
+  }
 
-   # Drop the trigger which causes bug 541553
-   my $trigger_name = "PRODUCTS_MILESTONEURL";
-   my $exist_trigger = $self->selectcol_arrayref($sth, undef, $trigger_name);
-   if(@$exist_trigger) {
-       $self->do("DROP TRIGGER $trigger_name");
-   }
+  # Drop the trigger which causes bug 541553
+  my $trigger_name = "PRODUCTS_MILESTONEURL";
+  my $exist_trigger = $self->selectcol_arrayref($sth, undef, $trigger_name);
+  if (@$exist_trigger) {
+    $self->do("DROP TRIGGER $trigger_name");
+  }
 }
 
 # These two methods have been copied from Bugzilla::DB::Schema::Oracle.
 sub _get_create_seq_ddl {
-    my ($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    my $seq_name = "${table}_${column}_SEQ";
-    my $seq_sql = "CREATE SEQUENCE $seq_name INCREMENT BY 1 START WITH 1 " .
-                  "NOMAXVALUE NOCYCLE NOCACHE";
-    my $trigger_sql = $self->_get_create_trigger_ddl($table, $column, $seq_name);
-    return ($seq_sql, $trigger_sql);
+  my $seq_name = "${table}_${column}_SEQ";
+  my $seq_sql  = "CREATE SEQUENCE $seq_name INCREMENT BY 1 START WITH 1 "
+    . "NOMAXVALUE NOCYCLE NOCACHE";
+  my $trigger_sql = $self->_get_create_trigger_ddl($table, $column, $seq_name);
+  return ($seq_sql, $trigger_sql);
 }
 
 sub _get_create_trigger_ddl {
-    my ($self, $table, $column, $seq_name) = @_;
+  my ($self, $table, $column, $seq_name) = @_;
 
-    my $trigger_sql = "CREATE OR REPLACE TRIGGER ${table}_${column}_TR "
-                    . " BEFORE INSERT ON $table "
-                    . " FOR EACH ROW "
-                    . " BEGIN "
-                    . "   SELECT ${seq_name}.NEXTVAL "
-                    . "   INTO :NEW.$column FROM DUAL; "
-                    . " END;";
-    return $trigger_sql;
+  my $trigger_sql
+    = "CREATE OR REPLACE TRIGGER ${table}_${column}_TR "
+    . " BEFORE INSERT ON $table "
+    . " FOR EACH ROW "
+    . " BEGIN "
+    . "   SELECT ${seq_name}.NEXTVAL "
+    . "   INTO :NEW.$column FROM DUAL; " . " END;";
+  return $trigger_sql;
 }
 
 ############################################################################
 
 package Bugzilla::DB::Oracle::st;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent -norequire, qw(DBI::st);
- 
+
 sub fetchrow_arrayref {
-    my $self = shift;
-    my $ref = $self->SUPER::fetchrow_arrayref(@_);
-    return undef if !defined $ref;
-    Bugzilla::DB::Oracle::_fix_arrayref($ref);
-    return $ref;
+  my $self = shift;
+  my $ref  = $self->SUPER::fetchrow_arrayref(@_);
+  return undef if !defined $ref;
+  Bugzilla::DB::Oracle::_fix_arrayref($ref);
+  return $ref;
 }
 
 sub fetchrow_array {
-    my $self = shift;
-    if ( wantarray ) {
-        my @row = $self->SUPER::fetchrow_array(@_);
-        Bugzilla::DB::Oracle::_fix_arrayref(\@row);
-        return @row;
-    } else {
-        my $row = $self->SUPER::fetchrow_array(@_);
-        $row = Bugzilla::DB::Oracle::_fix_empty($row) if defined $row;
-        return $row;
-    }
+  my $self = shift;
+  if (wantarray) {
+    my @row = $self->SUPER::fetchrow_array(@_);
+    Bugzilla::DB::Oracle::_fix_arrayref(\@row);
+    return @row;
+  }
+  else {
+    my $row = $self->SUPER::fetchrow_array(@_);
+    $row = Bugzilla::DB::Oracle::_fix_empty($row) if defined $row;
+    return $row;
+  }
 }
 
 sub fetchrow_hashref {
-    my $self = shift;
-    my $ref = $self->SUPER::fetchrow_hashref(@_);
-    return undef if !defined $ref;
-    Bugzilla::DB::Oracle::_fix_hashref($ref);
-    return $ref;
+  my $self = shift;
+  my $ref  = $self->SUPER::fetchrow_hashref(@_);
+  return undef if !defined $ref;
+  Bugzilla::DB::Oracle::_fix_hashref($ref);
+  return $ref;
 }
 
 sub fetchall_arrayref {
-    my $self = shift;
-    my $ref = $self->SUPER::fetchall_arrayref(@_);
-    return undef if !defined $ref;
-    foreach my $row (@$ref) {
-        if (ref($row) eq 'ARRAY') {
-             Bugzilla::DB::Oracle::_fix_arrayref($row);
-        }
-        elsif (ref($row) eq 'HASH') {
-            Bugzilla::DB::Oracle::_fix_hashref($row);
-        }
+  my $self = shift;
+  my $ref  = $self->SUPER::fetchall_arrayref(@_);
+  return undef if !defined $ref;
+  foreach my $row (@$ref) {
+    if (ref($row) eq 'ARRAY') {
+      Bugzilla::DB::Oracle::_fix_arrayref($row);
     }
-    return $ref;
+    elsif (ref($row) eq 'HASH') {
+      Bugzilla::DB::Oracle::_fix_hashref($row);
+    }
+  }
+  return $ref;
 }
 
 sub fetchall_hashref {
-    my $self = shift;
-    my $ref = $self->SUPER::fetchall_hashref(@_);
-    return undef if !defined $ref;
-    foreach my $row (values %$ref) {
-         Bugzilla::DB::Oracle::_fix_hashref($row);
-    }
-     return $ref;
+  my $self = shift;
+  my $ref  = $self->SUPER::fetchall_hashref(@_);
+  return undef if !defined $ref;
+  foreach my $row (values %$ref) {
+    Bugzilla::DB::Oracle::_fix_hashref($row);
+  }
+  return $ref;
 }
 
 sub fetch {
-    my $self = shift;
-    my $row = $self->SUPER::fetch(@_);
-    if ($row) {
-      Bugzilla::DB::Oracle::_fix_arrayref($row);
-    }
-   return $row;
+  my $self = shift;
+  my $row  = $self->SUPER::fetch(@_);
+  if ($row) {
+    Bugzilla::DB::Oracle::_fix_arrayref($row);
+  }
+  return $row;
 }
 1;
 
diff --git a/Bugzilla/DB/Pg.pm b/Bugzilla/DB/Pg.pm
index 4ec95725de..bfbf80e764 100644
--- a/Bugzilla/DB/Pg.pm
+++ b/Bugzilla/DB/Pg.pm
@@ -21,7 +21,7 @@ For interface details see L<Bugzilla::DB> and L<DBI>.
 
 package Bugzilla::DB::Pg;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -32,231 +32,251 @@ use DBD::Pg;
 # This module extends the DB interface via inheritance
 use parent qw(Bugzilla::DB);
 
-use constant BLOB_TYPE => { pg_type => DBD::Pg::PG_BYTEA };
+use constant BLOB_TYPE => {pg_type => DBD::Pg::PG_BYTEA};
 
 sub new {
-    my ($class, $params) = @_;
-    my ($user, $pass, $host, $dbname, $port) = 
-        @$params{qw(db_user db_pass db_host db_name db_port)};
+  my ($class, $params) = @_;
+  my ($user, $pass, $host, $dbname, $port)
+    = @$params{qw(db_user db_pass db_host db_name db_port)};
 
-    # The default database name for PostgreSQL. We have
-    # to connect to SOME database, even if we have
-    # no $dbname parameter.
-    $dbname ||= 'template1';
+  # construct the DSN from the parameters we got
+  my $dsn = "dbi:Pg:dbname=$dbname";
+  $dsn .= ";host=$host" if $host;
+  $dsn .= ";port=$port" if $port;
 
-    # construct the DSN from the parameters we got
-    my $dsn = "dbi:Pg:dbname=$dbname";
-    $dsn .= ";host=$host" if $host;
-    $dsn .= ";port=$port" if $port;
+  # This stops Pg from printing out lots of "NOTICE" messages when
+  # creating tables.
+  $dsn .= ";options='-c client_min_messages=warning'";
 
-    # This stops Pg from printing out lots of "NOTICE" messages when
-    # creating tables.
-    $dsn .= ";options='-c client_min_messages=warning'";
+  my $attrs = {pg_enable_utf8 => 1};
 
-    my $attrs = { pg_enable_utf8 => Bugzilla->params->{'utf8'} };
+  my $self = $class->db_new(
+    {dsn => $dsn, user => $user, pass => $pass, attrs => $attrs});
 
-    my $self = $class->db_new({ dsn => $dsn, user => $user, 
-                                pass => $pass, attrs => $attrs });
+  # all class local variables stored in DBI derived class needs to have
+  # a prefix 'private_'. See DBI documentation.
+  $self->{private_bz_tables_locked} = "";
 
-    # all class local variables stored in DBI derived class needs to have
-    # a prefix 'private_'. See DBI documentation.
-    $self->{private_bz_tables_locked} = "";
-    # Needed by TheSchwartz
-    $self->{private_bz_dsn} = $dsn;
+  # Needed by TheSchwartz
+  $self->{private_bz_dsn} = $dsn;
 
-    bless ($self, $class);
+  bless($self, $class);
 
-    return $self;
+  return $self;
 }
 
 # if last_insert_id is supported on PostgreSQL by lowest DBI/DBD version
 # supported by Bugzilla, this implementation can be removed.
 sub bz_last_key {
-    my ($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    my $seq = $table . "_" . $column . "_seq";
-    my ($last_insert_id) = $self->selectrow_array("SELECT CURRVAL('$seq')");
+  my $seq = $table . "_" . $column . "_seq";
+  my ($last_insert_id) = $self->selectrow_array("SELECT CURRVAL('$seq')");
 
-    return $last_insert_id;
+  return $last_insert_id;
 }
 
 sub sql_group_concat {
-    my ($self, $text, $separator, $sort, $order_by) = @_;
-    $sort = 1 if !defined $sort;
-    $separator = $self->quote(', ') if !defined $separator;
-
-    if ($order_by && $text =~ /^DISTINCT\s*(.+)$/i) {
-        # Since Postgres (quite rightly) doesn't support "SELECT DISTINCT x
-        # ORDER BY y", we need to sort the list, and then get the unique
-        # values
-        return "ARRAY_TO_STRING(ANYARRAY_UNIQ(ARRAY_AGG($1 ORDER BY $order_by)), $separator)";
-    }
+  my ($self, $text, $separator, $sort, $order_by) = @_;
+  $sort = 1 if !defined $sort;
+  $separator = $self->quote(', ') if !defined $separator;
+
+  if ($order_by && $text =~ /^DISTINCT\s*(.+)$/i) {
+
+    # Since Postgres (quite rightly) doesn't support "SELECT DISTINCT x
+    # ORDER BY y", we need to sort the list, and then get the unique
+    # values
+    return
+      "ARRAY_TO_STRING(ANYARRAY_UNIQ(ARRAY_AGG($1 ORDER BY $order_by)), $separator)";
+  }
+
+  # Determine the ORDER BY clause (if any)
+  if ($order_by) {
+    $order_by = " ORDER BY $order_by";
+  }
+  elsif ($sort) {
+
+    # We don't include the DISTINCT keyword in an order by
+    $text =~ /^(?:DISTINCT\s*)?(.+)$/i;
+    $order_by = " ORDER BY $1";
+  }
+
+  return "STRING_AGG(${text}::text, $separator${order_by}::text)";
+}
 
-    # Determine the ORDER BY clause (if any)
-    if ($order_by) {
-        $order_by = " ORDER BY $order_by";
-    }
-    elsif ($sort) {
-        # We don't include the DISTINCT keyword in an order by
-        $text =~ /^(?:DISTINCT\s*)?(.+)$/i;
-        $order_by = " ORDER BY $1";
-    }
+sub sql_istring {
+  my ($self, $string) = @_;
 
-    if (vers_cmp($self->bz_server_version, 9) < 0) {
-        # PostgreSQL 8.x doesn't support STRING_AGG
-        return "ARRAY_TO_STRING(ARRAY_AGG($text$order_by), $separator)";
-    }
+  return "LOWER(${string}::text)";
+}
 
-    return "STRING_AGG($text, $separator$order_by)";
+sub sql_position {
+  my ($self, $fragment, $text) = @_;
+
+  return "POSITION(${fragment}::text IN ${text}::text)";
 }
 
-sub sql_istring {
-    my ($self, $string) = @_;
+sub sql_like {
+  my ($self, $fragment, $column, $not) = @_;
+  $not //= '';
 
-    return "LOWER(${string}::text)";
+  return
+      "${column}::text $not LIKE "
+    . $self->sql_like_escape($fragment)
+    . " ESCAPE '|'";
 }
 
-sub sql_position {
-    my ($self, $fragment, $text) = @_;
+sub sql_ilike {
+  my ($self, $fragment, $column, $not) = @_;
+  $not //= '';
 
-    return "POSITION(${fragment}::text IN ${text}::text)";
+  return
+      "${column}::text $not ILIKE "
+    . $self->sql_like_escape($fragment)
+    . " ESCAPE '|'";
+}
+
+sub sql_not_ilike {
+  return shift->sql_ilike(@_, 'NOT');
+}
+
+# Escapes any % or _ characters which are special in a LIKE match.
+# Also performs a $dbh->quote to escape any quote characters.
+sub sql_like_escape {
+  my ($self, $fragment) = @_;
+
+  $fragment =~ s/\|/\|\|/g;    # escape the escape character if it appears
+  $fragment =~ s/%/\|%/g;      # percent and underscore are the special match
+  $fragment =~ s/_/\|_/g;      # characters in SQL.
+
+  return $self->quote("%$fragment%");
 }
 
 sub sql_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "${expr}::text ~* $pattern";
+  return "${expr}::text ~* $pattern";
 }
 
 sub sql_not_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "${expr}::text !~* $pattern" 
+  return "${expr}::text !~* $pattern";
 }
 
 sub sql_limit {
-    my ($self, $limit, $offset) = @_;
-
-    if (defined($offset)) {
-        return "LIMIT $limit OFFSET $offset";
-    } else {
-        return "LIMIT $limit";
-    }
+  my ($self, $limit, $offset) = @_;
+
+  if (defined($offset)) {
+    return "LIMIT $limit OFFSET $offset";
+  }
+  else {
+    return "LIMIT $limit";
+  }
 }
 
 sub sql_from_days {
-    my ($self, $days) = @_;
+  my ($self, $days) = @_;
 
-    return "TO_TIMESTAMP('$days', 'J')::date";
+  return "TO_TIMESTAMP('$days', 'J')::date";
 }
 
 sub sql_to_days {
-    my ($self, $date) = @_;
+  my ($self, $date) = @_;
 
-    return "TO_CHAR(${date}::date, 'J')::int";
+  return "TO_CHAR(${date}::date, 'J')::int";
 }
 
 sub sql_date_format {
-    my ($self, $date, $format) = @_;
-    
-    $format = "%Y.%m.%d %H:%i:%s" if !$format;
-
-    $format =~ s/\%Y/YYYY/g;
-    $format =~ s/\%y/YY/g;
-    $format =~ s/\%m/MM/g;
-    $format =~ s/\%d/DD/g;
-    $format =~ s/\%a/Dy/g;
-    $format =~ s/\%H/HH24/g;
-    $format =~ s/\%i/MI/g;
-    $format =~ s/\%s/SS/g;
-
-    return "TO_CHAR($date, " . $self->quote($format) . ")";
+  my ($self, $date, $format) = @_;
+
+  $format = "%Y.%m.%d %H:%i:%s" if !$format;
+
+  $format =~ s/\%Y/YYYY/g;
+  $format =~ s/\%y/YY/g;
+  $format =~ s/\%m/MM/g;
+  $format =~ s/\%d/DD/g;
+  $format =~ s/\%a/Dy/g;
+  $format =~ s/\%H/HH24/g;
+  $format =~ s/\%i/MI/g;
+  $format =~ s/\%s/SS/g;
+
+  return "TO_CHAR($date, " . $self->quote($format) . ")";
 }
 
 sub sql_date_math {
-    my ($self, $date, $operator, $interval, $units) = @_;
-    
-    return "$date $operator $interval * INTERVAL '1 $units'";
+  my ($self, $date, $operator, $interval, $units) = @_;
+
+  return "$date $operator $interval * INTERVAL '1 $units'";
 }
 
 sub sql_string_concat {
-    my ($self, @params) = @_;
-    
-    # Postgres 7.3 does not support concatenating of different types, so we
-    # need to cast both parameters to text. Version 7.4 seems to handle this
-    # properly, so when we stop support 7.3, this can be removed.
-    return '(CAST(' . join(' AS text) || CAST(', @params) . ' AS text))';
+  my ($self, @params) = @_;
+
+  # PostgreSQL 8.3 and newer require an explicit coercion to text
+  # to support concatenation of different data types.
+  return '(CAST(' . join(' AS text) || CAST(', @params) . ' AS text))';
 }
 
 # Tell us whether or not a particular sequence exists in the DB.
 sub bz_sequence_exists {
-    my ($self, $seq_name) = @_;
-    my $exists = $self->selectrow_array(
-        'SELECT 1 FROM pg_statio_user_sequences WHERE relname = ?',
-        undef, $seq_name);
-    return $exists || 0;
+  my ($self, $seq_name) = @_;
+  my $exists
+    = $self->selectrow_array(
+    'SELECT 1 FROM pg_statio_user_sequences WHERE relname = ?',
+    undef, $seq_name);
+  return $exists || 0;
 }
 
 sub bz_explain {
-    my ($self, $sql) = @_;
-    my $explain = $self->selectcol_arrayref("EXPLAIN ANALYZE $sql");
-    return join("\n", @$explain);
+  my ($self, $sql) = @_;
+  my $explain = $self->selectcol_arrayref("EXPLAIN ANALYZE $sql");
+  return join("\n", @$explain);
 }
 
 #####################################################################
 # Custom Database Setup
 #####################################################################
 
-sub bz_check_server_version {
-    my $self = shift;
-    my ($db) = @_;
-    my $server_version = $self->SUPER::bz_check_server_version(@_);
-    my ($major_version, $minor_version) = $server_version =~ /^0*(\d+)\.0*(\d+)/;
-    # Pg 9.0 requires DBD::Pg 2.17.2 in order to properly read bytea values.
-    # Pg 9.2 requires DBD::Pg 2.19.3 as spclocation no longer exists.
-    if ($major_version >= 9) {
-        local $db->{dbd}->{version} = ($minor_version >= 2) ? '2.19.3' : '2.17.2';
-        local $db->{name} = $db->{name} . " ${major_version}.$minor_version";
-        Bugzilla::DB::_bz_check_dbd(@_);
-    }
-}
-
 sub bz_setup_database {
-    my $self = shift;
-    $self->SUPER::bz_setup_database(@_);
-
-    my ($has_plpgsql) = $self->selectrow_array("SELECT COUNT(*) FROM pg_language WHERE lanname = 'plpgsql'");
-    $self->do('CREATE LANGUAGE plpgsql') unless $has_plpgsql;
-
-    # Custom Functions
-
-    # -Copyright © 2013 Joshua D. Burns (JDBurnZ) and Message In Action LLC
-    # JDBurnZ: https://github.com/JDBurnZ
-    # Message In Action: https://www.messageinaction.com
-    #
-    #Permission is hereby granted, free of charge, to any person obtaining a copy of
-    #this software and associated documentation files (the "Software"), to deal in
-    #the Software without restriction, including without limitation the rights to
-    #use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-    #the Software, and to permit persons to whom the Software is furnished to do so,
-    #subject to the following conditions:
-    #
-    #The above copyright notice and this permission notice shall be included in all
-    #copies or substantial portions of the Software.
-    #
-    #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    #IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-    #FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-    #COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-    #IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-    #CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    $self->do(q|
+  my $self = shift;
+  $self->SUPER::bz_setup_database(@_);
+
+  my ($has_plpgsql)
+    = $self->selectrow_array(
+    "SELECT COUNT(*) FROM pg_language WHERE lanname = 'plpgsql'");
+  $self->do('CREATE LANGUAGE plpgsql') unless $has_plpgsql;
+
+  # Custom Functions
+
+ # -Copyright © 2013 Joshua D. Burns (JDBurnZ) and Message In Action LLC
+ # JDBurnZ: https://github.com/JDBurnZ
+ # Message In Action: https://www.messageinaction.com
+ #
+ #Permission is hereby granted, free of charge, to any person obtaining a copy of
+ #this software and associated documentation files (the "Software"), to deal in
+ #the Software without restriction, including without limitation the rights to
+ #use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ #the Software, and to permit persons to whom the Software is furnished to do so,
+ #subject to the following conditions:
+ #
+ #The above copyright notice and this permission notice shall be included in all
+ #copies or substantial portions of the Software.
+ #
+ #THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ #IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ #FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ #COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ #IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ #CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+  $self->do(
+    q|
         DROP FUNCTION IF EXISTS anyarray_uniq(anyarray);
         CREATE OR REPLACE FUNCTION anyarray_uniq(with_array anyarray)
         RETURNS anyarray AS $BODY$
@@ -281,138 +301,188 @@ sub bz_setup_database {
             RETURN return_array;
         END;
         $BODY$ LANGUAGE plpgsql;
-    |);
-
-    # PostgreSQL doesn't like having *any* index on the thetext
-    # field, because it can't have index data longer than 2770
-    # characters on that field.
-    $self->bz_drop_index('longdescs', 'longdescs_thetext_idx');
-    # Same for all the comments fields in the fulltext table.
-    $self->bz_drop_index('bugs_fulltext', 'bugs_fulltext_comments_idx');
-    $self->bz_drop_index('bugs_fulltext', 
-                         'bugs_fulltext_comments_noprivate_idx');
-
-    # PostgreSQL also wants an index for calling LOWER on
-    # login_name, which we do with sql_istrcmp all over the place.
-    $self->bz_add_index('profiles', 'profiles_login_name_lower_idx', 
-        {FIELDS => ['LOWER(login_name)'], TYPE => 'UNIQUE'});
-
-    # Now that Bugzilla::Object uses sql_istrcmp, other tables
-    # also need a LOWER() index.
-    _fix_case_differences('fielddefs', 'name');
-    $self->bz_add_index('fielddefs', 'fielddefs_name_lower_idx',
-        {FIELDS => ['LOWER(name)'], TYPE => 'UNIQUE'});
-    _fix_case_differences('keyworddefs', 'name');
-    $self->bz_add_index('keyworddefs', 'keyworddefs_name_lower_idx',
-        {FIELDS => ['LOWER(name)'], TYPE => 'UNIQUE'});
-    _fix_case_differences('products', 'name');
-    $self->bz_add_index('products', 'products_name_lower_idx',
-        {FIELDS => ['LOWER(name)'], TYPE => 'UNIQUE'});
-
-    # bz_rename_column and bz_rename_table didn't correctly rename
-    # the sequence.
-    $self->_fix_bad_sequence('fielddefs', 'id', 'fielddefs_fieldid_seq', 'fielddefs_id_seq');
-    # If the 'tags' table still exists, then bz_rename_table()
-    # will fix the sequence for us.
-    if (!$self->bz_table_info('tags')) {
-        my $res = $self->_fix_bad_sequence('tag', 'id', 'tags_id_seq', 'tag_id_seq');
-        # If $res is true, then the sequence has been renamed, meaning that
-        # the primary key must be renamed too.
-        if ($res) {
-            $self->do('ALTER INDEX tags_pkey RENAME TO tag_pkey');
-        }
+    |
+  );
+
+  # PostgreSQL doesn't like having *any* index on the thetext
+  # field, because it can't have index data longer than 2770
+  # characters on that field.
+  $self->bz_drop_index('longdescs', 'longdescs_thetext_idx');
+
+  # Same for all the comments fields in the fulltext table.
+  $self->bz_drop_index('bugs_fulltext', 'bugs_fulltext_comments_idx');
+  $self->bz_drop_index('bugs_fulltext', 'bugs_fulltext_comments_noprivate_idx');
+
+  # PostgreSQL also wants an index for calling LOWER on
+  # login_name, which we do with sql_istrcmp all over the place.
+  $self->bz_add_index(
+    'profiles',
+    'profiles_login_name_lower_idx',
+    {FIELDS => ['LOWER(login_name)'], TYPE => 'UNIQUE'}
+  );
+
+  # Now that Bugzilla::Object uses sql_istrcmp, other tables
+  # also need a LOWER() index.
+  _fix_case_differences('fielddefs', 'name');
+  $self->bz_add_index('fielddefs', 'fielddefs_name_lower_idx',
+    {FIELDS => ['LOWER(name)'], TYPE => 'UNIQUE'});
+  _fix_case_differences('keyworddefs', 'name');
+  $self->bz_add_index('keyworddefs', 'keyworddefs_name_lower_idx',
+    {FIELDS => ['LOWER(name)'], TYPE => 'UNIQUE'});
+  _fix_case_differences('products', 'name');
+  $self->bz_add_index('products', 'products_name_lower_idx',
+    {FIELDS => ['LOWER(name)'], TYPE => 'UNIQUE'});
+
+  # bz_rename_column and bz_rename_table didn't correctly rename
+  # the sequence.
+  $self->_fix_bad_sequence('fielddefs', 'id', 'fielddefs_fieldid_seq',
+    'fielddefs_id_seq');
+
+  # If the 'tags' table still exists, then bz_rename_table()
+  # will fix the sequence for us.
+  if (!$self->bz_table_info('tags')) {
+    my $res = $self->_fix_bad_sequence('tag', 'id', 'tags_id_seq', 'tag_id_seq');
+
+    # If $res is true, then the sequence has been renamed, meaning that
+    # the primary key must be renamed too.
+    if ($res) {
+      $self->do('ALTER INDEX tags_pkey RENAME TO tag_pkey');
     }
-
-    # Certain sequences got upgraded before we required Pg 8.3, and
-    # so they were not properly associated with their columns.
-    my @tables = $self->bz_table_list_real;
-    foreach my $table (@tables) {
-        my @columns = $self->bz_table_columns_real($table);
-        foreach my $column (@columns) {
-            # All our SERIAL pks have "id" in their name at the end.
-            next unless $column =~ /id$/;
-            my $sequence = "${table}_${column}_seq";
-            if ($self->bz_sequence_exists($sequence)) {
-                my $is_associated = $self->selectrow_array(
-                    'SELECT pg_get_serial_sequence(?,?)',
-                    undef, $table, $column);
-                next if $is_associated;
-                print "Fixing $sequence to be associated"
-                      . " with $table.$column...\n";
-                $self->do("ALTER SEQUENCE $sequence OWNED BY $table.$column");
-                # In order to produce an exactly identical schema to what
-                # a brand-new checksetup.pl run would produce, we also need
-                # to re-set the default on this column.
-                $self->do("ALTER TABLE $table
+  }
+
+  # Certain sequences got upgraded before we required Pg 8.3, and
+  # so they were not properly associated with their columns.
+  my @tables = $self->bz_table_list_real;
+  foreach my $table (@tables) {
+    my @columns = $self->bz_table_columns_real($table);
+    foreach my $column (@columns) {
+
+      # All our SERIAL pks have "id" in their name at the end.
+      next unless $column =~ /id$/;
+      my $sequence = "${table}_${column}_seq";
+      if ($self->bz_sequence_exists($sequence)) {
+        my $is_associated = $self->selectrow_array('SELECT pg_get_serial_sequence(?,?)',
+          undef, $table, $column);
+        next if $is_associated;
+        print "Fixing $sequence to be associated" . " with $table.$column...\n";
+        $self->do("ALTER SEQUENCE $sequence OWNED BY $table.$column");
+
+        # In order to produce an exactly identical schema to what
+        # a brand-new checksetup.pl run would produce, we also need
+        # to re-set the default on this column.
+        $self->do(
+          "ALTER TABLE $table
                           ALTER COLUMN $column
-                           SET DEFAULT nextval('$sequence')");
-            }
-        }
+                           SET DEFAULT nextval('$sequence')"
+        );
+      }
     }
+  }
 }
 
 sub _fix_bad_sequence {
-    my ($self, $table, $column, $old_seq, $new_seq) = @_;
-    if ($self->bz_column_info($table, $column)
-        && $self->bz_sequence_exists($old_seq))
-    {
-        print "Fixing $old_seq sequence...\n";
-        $self->do("ALTER SEQUENCE $old_seq RENAME TO $new_seq");
-        $self->do("ALTER TABLE $table ALTER COLUMN $column
-                    SET DEFAULT NEXTVAL('$new_seq')");
-        return 1;
-    }
-    return 0;
+  my ($self, $table, $column, $old_seq, $new_seq) = @_;
+  if ( $self->bz_column_info($table, $column)
+    && $self->bz_sequence_exists($old_seq))
+  {
+    print "Fixing $old_seq sequence...\n";
+    $self->do("ALTER SEQUENCE $old_seq RENAME TO $new_seq");
+    $self->do(
+      "ALTER TABLE $table ALTER COLUMN $column
+                    SET DEFAULT NEXTVAL('$new_seq')"
+    );
+    return 1;
+  }
+  return 0;
 }
 
 # Renames things that differ only in case.
 sub _fix_case_differences {
-    my ($table, $field) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my $duplicates = $dbh->selectcol_arrayref(
-          "SELECT DISTINCT LOWER($field) FROM $table 
-        GROUP BY LOWER($field) HAVING COUNT(LOWER($field)) > 1");
-
-    foreach my $name (@$duplicates) {
-        my $dups = $dbh->selectcol_arrayref(
-            "SELECT $field FROM $table WHERE LOWER($field) = ?",
-            undef, $name);
-        my $primary = shift @$dups;
-        foreach my $dup (@$dups) {
-            my $new_name = "${dup}_";
-            # Make sure the new name isn't *also* a duplicate.
-            while (1) {
-                last if (!$dbh->selectrow_array(
-                             "SELECT 1 FROM $table WHERE LOWER($field) = ?",
-                              undef, lc($new_name)));
-                $new_name .= "_";
-            }
-            print "$table '$primary' and '$dup' have names that differ",
-                  " only in case.\nRenaming '$dup' to '$new_name'...\n";
-            $dbh->do("UPDATE $table SET $field = ? WHERE $field = ?",
-                     undef, $new_name, $dup);
-        }
+  my ($table, $field) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $duplicates = $dbh->selectcol_arrayref(
+    "SELECT DISTINCT LOWER($field) FROM $table 
+        GROUP BY LOWER($field) HAVING COUNT(LOWER($field)) > 1"
+  );
+
+  foreach my $name (@$duplicates) {
+    my $dups
+      = $dbh->selectcol_arrayref(
+      "SELECT $field FROM $table WHERE LOWER($field) = ?",
+      undef, $name);
+    my $primary = shift @$dups;
+    foreach my $dup (@$dups) {
+      my $new_name = "${dup}_";
+
+      # Make sure the new name isn't *also* a duplicate.
+      while (1) {
+        last
+          if (!$dbh->selectrow_array(
+          "SELECT 1 FROM $table WHERE LOWER($field) = ?",
+          undef, lc($new_name)
+          ));
+        $new_name .= "_";
+      }
+      print "$table '$primary' and '$dup' have names that differ",
+        " only in case.\nRenaming '$dup' to '$new_name'...\n";
+      $dbh->do("UPDATE $table SET $field = ? WHERE $field = ?",
+        undef, $new_name, $dup);
     }
+  }
 }
 
 #####################################################################
 # Custom Schema Information Functions
 #####################################################################
 
-# Pg includes the PostgreSQL system tables in table_list_real, so 
+# Pg includes the PostgreSQL system tables in table_list_real, so
 # we need to remove those.
 sub bz_table_list_real {
-    my $self = shift;
+  my $self = shift;
 
-    my @full_table_list = $self->SUPER::bz_table_list_real(@_);
-    # All PostgreSQL system tables start with "pg_" or "sql_"
-    my @table_list = grep(!/(^pg_)|(^sql_)/, @full_table_list);
-    return @table_list;
+  my @full_table_list = $self->SUPER::bz_table_list_real(@_);
+
+  # All PostgreSQL system tables start with "pg_" or "sql_"
+  my @table_list = grep(!/(^pg_)|(^sql_)/, @full_table_list);
+  return @table_list;
 }
 
 1;
 
+=head2 Functions
+
+=over
+
+=item C<sql_like_escape>
+
+=over
+
+=item B<Description>
+
+The postgres versions of the sql_like methods use the ANSI SQL LIKE
+statements to perform substring searching.  To prevent issues with
+users attempting to search for strings containing special characters
+associated with LIKE, we escape them out so they don't affect the search
+terms.
+
+=item B<Params>
+
+=over
+
+=item C<$fragment> - The string fragment in need of escaping and quoting
+
+=back
+
+=item B<Returns>
+
+The fragment with any pre existing %,_,| characters escaped out, wrapped in
+percent characters and quoted.
+
+=back
+
+=back
+
 =head1 B<Methods in need of POD>
 
 =over
@@ -427,6 +497,12 @@ sub bz_table_list_real {
 
 =item sql_position
 
+=item sql_like
+
+=item sql_ilike
+
+=item sql_not_ilike
+
 =item sql_limit
 
 =item sql_not_regexp
@@ -437,8 +513,6 @@ sub bz_table_list_real {
 
 =item sql_to_days
 
-=item bz_check_server_version
-
 =item sql_from_days
 
 =item bz_table_list_real
diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index ebe2cb4264..e9dfa1a3fe 100644
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -15,7 +15,7 @@ package Bugzilla::DB::Schema;
 #
 ###########################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -28,7 +28,11 @@ use Carp qw(confess);
 use Digest::MD5 qw(md5_hex);
 use Hash::Util qw(lock_value unlock_hash lock_keys unlock_keys);
 use List::MoreUtils qw(firstidx natatime);
+
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
+
 # Historical, needed for SCHEMA_VERSION = '1.00'
 use Storable qw(dclone freeze thaw);
 
@@ -197,1597 +201,1560 @@ update this column in this table."
 
 =cut
 
-use constant SCHEMA_VERSION  => 3;
-use constant ADD_COLUMN      => 'ADD COLUMN';
+use constant SCHEMA_VERSION => 3;
+use constant ADD_COLUMN     => 'ADD COLUMN';
+
 # Multiple FKs can be added using ALTER TABLE ADD CONSTRAINT in one
 # SQL statement. This isn't true for all databases.
 use constant MULTIPLE_FKS_IN_ALTER => 1;
+
 # This is a reasonable default that's true for both PostgreSQL and MySQL.
 use constant MAX_IDENTIFIER_LEN => 63;
 
 use constant FIELD_TABLE_SCHEMA => {
+  FIELDS => [
+    id                  => {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+    value               => {TYPE => 'varchar(64)', NOTNULL => 1},
+    sortkey             => {TYPE => 'INT2',        NOTNULL => 1, DEFAULT => 0},
+    isactive            => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'TRUE'},
+    visibility_value_id => {TYPE => 'INT2'},
+  ],
+
+  # Note that bz_add_field_table should prepend the table name
+  # to these index names.
+  INDEXES => [
+    value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+    sortkey_idx             => ['sortkey',           'value'],
+    visibility_value_id_idx => ['visibility_value_id'],
+  ],
+};
+
+use constant ABSTRACT_SCHEMA => {
+
+  # BUG-RELATED TABLES
+  # ------------------
+
+  # General Bug Information
+  # -----------------------
+  bugs => {
     FIELDS => [
-        id       => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
-                     PRIMARYKEY => 1},
-        value    => {TYPE => 'varchar(64)', NOTNULL => 1},
-        sortkey  => {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0},
-        isactive => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                     DEFAULT => 'TRUE'},
-        visibility_value_id => {TYPE => 'INT2'},
+      bug_id      => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      assigned_to => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      bug_file_loc => {TYPE => 'MEDIUMTEXT',   NOTNULL => 1, DEFAULT => "''"},
+      bug_severity => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      bug_status   => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      creation_ts  => {TYPE => 'DATETIME'},
+      delta_ts     => {TYPE => 'DATETIME',     NOTNULL => 1},
+      short_desc   => {TYPE => 'varchar(255)', NOTNULL => 1},
+      op_sys       => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      priority     => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      product_id   => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'products', COLUMN => 'id'}
+      },
+      rep_platform => {TYPE => 'varchar(64)', NOTNULL => 1},
+      reporter     => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      version      => {TYPE => 'varchar(64)', NOTNULL => 1},
+      component_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'components', COLUMN => 'id'}
+      },
+      resolution       => {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "''"},
+      target_milestone => {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"},
+      qa_contact =>
+        {TYPE => 'INT3', REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}},
+      status_whiteboard   => {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"},
+      lastdiffed          => {TYPE => 'DATETIME'},
+      everconfirmed       => {TYPE => 'BOOLEAN', NOTNULL => 1},
+      reporter_accessible => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'},
+      cclist_accessible   => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'},
+      estimated_time      => {TYPE => 'decimal(7,2)', NOTNULL => 1, DEFAULT => '0'},
+      remaining_time      => {TYPE => 'decimal(7,2)', NOTNULL => 1, DEFAULT => '0'},
+      deadline            => {TYPE => 'DATETIME'},
     ],
-    # Note that bz_add_field_table should prepend the table name
-    # to these index names.
     INDEXES => [
-        value_idx   => {FIELDS => ['value'], TYPE => 'UNIQUE'},
-        sortkey_idx => ['sortkey', 'value'],
-        visibility_value_id_idx => ['visibility_value_id'],
+      bugs_assigned_to_idx      => ['assigned_to'],
+      bugs_creation_ts_idx      => ['creation_ts'],
+      bugs_delta_ts_idx         => ['delta_ts'],
+      bugs_bug_severity_idx     => ['bug_severity'],
+      bugs_bug_status_idx       => ['bug_status'],
+      bugs_op_sys_idx           => ['op_sys'],
+      bugs_priority_idx         => ['priority'],
+      bugs_product_id_idx       => ['product_id'],
+      bugs_reporter_idx         => ['reporter'],
+      bugs_version_idx          => ['version'],
+      bugs_component_id_idx     => ['component_id'],
+      bugs_resolution_idx       => ['resolution'],
+      bugs_target_milestone_idx => ['target_milestone'],
+      bugs_qa_contact_idx       => ['qa_contact'],
     ],
-};
+  },
 
-use constant ABSTRACT_SCHEMA => {
+  bugs_fulltext => {
+    FIELDS => [
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        PRIMARYKEY => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      short_desc => {TYPE => 'varchar(255)', NOTNULL => 1},
+
+      # Comments are stored all together in one column for searching.
+      # This allows us to examine all comments together when deciding
+      # the relevance of a bug in fulltext search.
+      comments           => {TYPE => 'LONGTEXT'},
+      comments_noprivate => {TYPE => 'LONGTEXT'},
+    ],
+    INDEXES => [
+      bugs_fulltext_short_desc_idx => {FIELDS => ['short_desc'], TYPE => 'FULLTEXT'},
+      bugs_fulltext_comments_idx   => {FIELDS => ['comments'],   TYPE => 'FULLTEXT'},
+      bugs_fulltext_comments_noprivate_idx =>
+        {FIELDS => ['comments_noprivate'], TYPE => 'FULLTEXT'},
+    ],
+  },
 
-    # BUG-RELATED TABLES
-    # ------------------
-
-    # General Bug Information
-    # -----------------------
-    bugs => {
-        FIELDS => [
-            bug_id              => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                                    PRIMARYKEY => 1},
-            assigned_to         => {TYPE => 'INT3', NOTNULL => 1,
-                                    REFERENCES => {TABLE  => 'profiles',
-                                                   COLUMN => 'userid'}},
-            bug_file_loc        => {TYPE => 'MEDIUMTEXT', 
-                                    NOTNULL => 1, DEFAULT => "''"},
-            bug_severity        => {TYPE => 'varchar(64)', NOTNULL => 1},
-            bug_status          => {TYPE => 'varchar(64)', NOTNULL => 1},
-            creation_ts         => {TYPE => 'DATETIME'},
-            delta_ts            => {TYPE => 'DATETIME', NOTNULL => 1},
-            short_desc          => {TYPE => 'varchar(255)', NOTNULL => 1},
-            op_sys              => {TYPE => 'varchar(64)', NOTNULL => 1},
-            priority            => {TYPE => 'varchar(64)', NOTNULL => 1},
-            product_id          => {TYPE => 'INT2', NOTNULL => 1,
-                                    REFERENCES => {TABLE  => 'products',
-                                                   COLUMN => 'id'}},
-            rep_platform        => {TYPE => 'varchar(64)', NOTNULL => 1},
-            reporter            => {TYPE => 'INT3', NOTNULL => 1,
-                                    REFERENCES => {TABLE  => 'profiles',
-                                                   COLUMN => 'userid'}},
-            version             => {TYPE => 'varchar(64)', NOTNULL => 1},
-            component_id        => {TYPE => 'INT3', NOTNULL => 1,
-                                    REFERENCES => {TABLE  => 'components',
-                                                   COLUMN => 'id'}},
-            resolution          => {TYPE => 'varchar(64)',
-                                    NOTNULL => 1, DEFAULT => "''"},
-            target_milestone    => {TYPE => 'varchar(64)',
-                                    NOTNULL => 1, DEFAULT => "'---'"},
-            qa_contact          => {TYPE => 'INT3',
-                                    REFERENCES => {TABLE  => 'profiles',
-                                                   COLUMN => 'userid'}},
-            status_whiteboard   => {TYPE => 'MEDIUMTEXT', NOTNULL => 1,
-                                    DEFAULT => "''"},
-            lastdiffed          => {TYPE => 'DATETIME'},
-            everconfirmed       => {TYPE => 'BOOLEAN', NOTNULL => 1},
-            reporter_accessible => {TYPE => 'BOOLEAN',
-                                    NOTNULL => 1, DEFAULT => 'TRUE'},
-            cclist_accessible   => {TYPE => 'BOOLEAN',
-                                    NOTNULL => 1, DEFAULT => 'TRUE'},
-            estimated_time      => {TYPE => 'decimal(7,2)',
-                                    NOTNULL => 1, DEFAULT => '0'},
-            remaining_time      => {TYPE => 'decimal(7,2)',
-                                    NOTNULL => 1, DEFAULT => '0'},
-            deadline            => {TYPE => 'DATETIME'},
-        ],
-        INDEXES => [
-            bugs_assigned_to_idx      => ['assigned_to'],
-            bugs_creation_ts_idx      => ['creation_ts'],
-            bugs_delta_ts_idx         => ['delta_ts'],
-            bugs_bug_severity_idx     => ['bug_severity'],
-            bugs_bug_status_idx       => ['bug_status'],
-            bugs_op_sys_idx           => ['op_sys'],
-            bugs_priority_idx         => ['priority'],
-            bugs_product_id_idx       => ['product_id'],
-            bugs_reporter_idx         => ['reporter'],
-            bugs_version_idx          => ['version'],
-            bugs_component_id_idx     => ['component_id'],
-            bugs_resolution_idx       => ['resolution'],
-            bugs_target_milestone_idx => ['target_milestone'],
-            bugs_qa_contact_idx       => ['qa_contact'],
-        ],
-    },
-
-    bugs_fulltext => {
-        FIELDS => [
-            bug_id     => {TYPE => 'INT3', NOTNULL => 1, PRIMARYKEY => 1,
-                           REFERENCES => {TABLE  => 'bugs',
-                                          COLUMN => 'bug_id',
-                                          DELETE => 'CASCADE'}},
-            short_desc => {TYPE => 'varchar(255)', NOTNULL => 1},
-            # Comments are stored all together in one column for searching.
-            # This allows us to examine all comments together when deciding
-            # the relevance of a bug in fulltext search.
-            comments   => {TYPE => 'LONGTEXT'},
-            comments_noprivate => {TYPE => 'LONGTEXT'},
-        ],
-        INDEXES => [
-            bugs_fulltext_short_desc_idx => {FIELDS => ['short_desc'],
-                                               TYPE => 'FULLTEXT'},
-            bugs_fulltext_comments_idx   => {FIELDS => ['comments'],
-                                               TYPE => 'FULLTEXT'},
-            bugs_fulltext_comments_noprivate_idx => {
-                FIELDS => ['comments_noprivate'], TYPE => 'FULLTEXT'},
-        ],
-    },
-
-    bugs_activity => {
-        FIELDS => [
-            id        => {TYPE => 'INTSERIAL', NOTNULL => 1, 
-                          PRIMARYKEY => 1}, 
-            bug_id    => {TYPE => 'INT3', NOTNULL => 1,
-                          REFERENCES    =>  {TABLE  =>  'bugs',
-                                             COLUMN =>  'bug_id',
-                                             DELETE => 'CASCADE'}},
-            attach_id => {TYPE => 'INT3',
-                          REFERENCES    =>  {TABLE  =>  'attachments',
-                                            COLUMN  =>  'attach_id',
-                                            DELETE => 'CASCADE'}},
-            who       => {TYPE => 'INT3', NOTNULL => 1,
-                          REFERENCES => {TABLE  => 'profiles',
-                                         COLUMN => 'userid'}},
-            bug_when  => {TYPE => 'DATETIME', NOTNULL => 1},
-            fieldid   => {TYPE => 'INT3', NOTNULL => 1,
-                          REFERENCES    =>  {TABLE  =>  'fielddefs',
-                                             COLUMN =>  'id'}},
-            added     => {TYPE => 'varchar(255)'},
-            removed   => {TYPE => 'varchar(255)'},
-            comment_id => {TYPE => 'INT4', 
-                           REFERENCES => { TABLE  => 'longdescs',
-                                           COLUMN => 'comment_id',
-                                           DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            bugs_activity_bug_id_idx  => ['bug_id'],
-            bugs_activity_who_idx     => ['who'],
-            bugs_activity_bug_when_idx => ['bug_when'],
-            bugs_activity_fieldid_idx => ['fieldid'],
-            bugs_activity_added_idx   => ['added'],
-            bugs_activity_removed_idx => ['removed'], 
-        ],
-    },
-
-    bugs_aliases => {
-        FIELDS => [
-            alias     => {TYPE => 'varchar(40)', NOTNULL => 1},
-            bug_id    => {TYPE => 'INT3',
-                          REFERENCES => {TABLE  => 'bugs',
-                                         COLUMN => 'bug_id',
-                                         DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            bugs_aliases_bug_id_idx => ['bug_id'],
-            bugs_aliases_alias_idx  => {FIELDS => ['alias'],
-                                        TYPE => 'UNIQUE'},
-        ],
-    },
-
-    cc => {
-        FIELDS => [
-            bug_id => {TYPE => 'INT3', NOTNULL => 1,
-                       REFERENCES => {TABLE  => 'bugs',
-                                      COLUMN => 'bug_id',
-                                      DELETE => 'CASCADE'}},
-            who    => {TYPE => 'INT3', NOTNULL => 1,
-                       REFERENCES => {TABLE  => 'profiles',
-                                      COLUMN => 'userid',
-                                      DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            cc_bug_id_idx => {FIELDS => [qw(bug_id who)],
-                              TYPE => 'UNIQUE'},
-            cc_who_idx    => ['who'],
-        ],
-    },
-
-    longdescs => {
-        FIELDS => [
-            comment_id      => {TYPE => 'INTSERIAL',  NOTNULL => 1,
-                                PRIMARYKEY => 1},
-            bug_id          => {TYPE => 'INT3',  NOTNULL => 1,
-                                REFERENCES => {TABLE => 'bugs',
-                                               COLUMN => 'bug_id',
-                                               DELETE => 'CASCADE'}},
-            who             => {TYPE => 'INT3', NOTNULL => 1,
-                                REFERENCES => {TABLE => 'profiles',
-                                               COLUMN => 'userid'}},
-            bug_when        => {TYPE => 'DATETIME', NOTNULL => 1},
-            work_time       => {TYPE => 'decimal(7,2)', NOTNULL => 1,
-                                DEFAULT => '0'},
-            thetext         => {TYPE => 'LONGTEXT', NOTNULL => 1},
-            isprivate       => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                DEFAULT => 'FALSE'},
-            already_wrapped => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                DEFAULT => 'FALSE'},
-            type            => {TYPE => 'INT2', NOTNULL => 1,
-                                DEFAULT => '0'},
-            extra_data      => {TYPE => 'varchar(255)'},
-            is_markdown     => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}
-        ],
-        INDEXES => [
-            longdescs_bug_id_idx   => [qw(bug_id work_time)],
-            longdescs_who_idx     => [qw(who bug_id)],
-            longdescs_bug_when_idx => ['bug_when'],
-        ],
-    },
-
-    longdescs_tags => {
-        FIELDS => [
-            id         => { TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1 },
-            comment_id => { TYPE => 'INT4',
-                            REFERENCES => { TABLE  => 'longdescs',
-                                            COLUMN => 'comment_id',
-                                            DELETE => 'CASCADE' }},
-            tag        => { TYPE => 'varchar(24)',  NOTNULL => 1 },
-        ],
-        INDEXES => [
-            longdescs_tags_idx => { FIELDS => ['comment_id', 'tag'], TYPE => 'UNIQUE' },
-        ],
-    },
-
-    longdescs_tags_weights => {
-        FIELDS => [
-            id     => { TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1 },
-            tag    => { TYPE => 'varchar(24)',  NOTNULL => 1 },
-            weight => { TYPE => 'INT3',         NOTNULL => 1 },
-        ],
-        INDEXES => [
-            longdescs_tags_weights_tag_idx => { FIELDS => ['tag'], TYPE => 'UNIQUE' },
-        ],
-    },
-
-    longdescs_tags_activity => {
-        FIELDS => [
-            id         => { TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1 },
-            bug_id     => { TYPE => 'INT3', NOTNULL => 1,
-                            REFERENCES =>  { TABLE  =>  'bugs',
-                                             COLUMN =>  'bug_id',
-                                             DELETE => 'CASCADE' }},
-            comment_id => { TYPE => 'INT4',
-                            REFERENCES => { TABLE  => 'longdescs',
-                                            COLUMN => 'comment_id',
-                                            DELETE => 'CASCADE' }},
-            who        => { TYPE => 'INT3', NOTNULL => 1,
-                            REFERENCES => { TABLE  => 'profiles',
-                                            COLUMN => 'userid' }},
-            bug_when  => { TYPE => 'DATETIME', NOTNULL => 1 },
-            added     => { TYPE => 'varchar(24)' },
-            removed   => { TYPE => 'varchar(24)' },
-        ],
-        INDEXES => [
-            longdescs_tags_activity_bug_id_idx  => ['bug_id'],
-        ],
-    },
-
-    dependencies => {
-        FIELDS => [
-            blocked   => {TYPE => 'INT3', NOTNULL => 1,
-                          REFERENCES    =>  {TABLE  =>   'bugs',
-                                            COLUMN  =>  'bug_id',
-                                            DELETE => 'CASCADE'}},
-            dependson => {TYPE => 'INT3', NOTNULL => 1,
-                          REFERENCES    =>  {TABLE  =>   'bugs',
-                                            COLUMN  =>  'bug_id',
-                                            DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            dependencies_blocked_idx => {FIELDS => [qw(blocked dependson)],
-                                         TYPE   => 'UNIQUE'},
-            dependencies_dependson_idx => ['dependson'],
-        ],
-    },
-
-    attachments => {
-        FIELDS => [
-            attach_id    => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                             PRIMARYKEY => 1},
-            bug_id       => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES    =>  {TABLE  => 'bugs',
-                                                COLUMN => 'bug_id',
-                                                DELETE => 'CASCADE'}},
-            creation_ts  => {TYPE => 'DATETIME', NOTNULL => 1},
-            modification_time => {TYPE => 'DATETIME', NOTNULL => 1},
-            description  => {TYPE => 'TINYTEXT', NOTNULL => 1},
-            mimetype     => {TYPE => 'TINYTEXT', NOTNULL => 1},
-            ispatch      => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'FALSE'},
-            filename     => {TYPE => 'varchar(255)', NOTNULL => 1},
-            submitter_id => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE => 'profiles',
-                                            COLUMN => 'userid'}},
-            isobsolete   => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'FALSE'},
-            isprivate    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'FALSE'},
-        ],
-        INDEXES => [
-            attachments_bug_id_idx => ['bug_id'],
-            attachments_creation_ts_idx => ['creation_ts'],
-            attachments_modification_time_idx => ['modification_time'],
-            attachments_submitter_id_idx => ['submitter_id', 'bug_id'],
-        ],
-    },
-    attach_data => {
-        FIELDS => [
-            id      => {TYPE => 'INT3', NOTNULL => 1,
-                        PRIMARYKEY => 1,
-                        REFERENCES  =>  {TABLE  => 'attachments',
-                                         COLUMN => 'attach_id',
-                                         DELETE => 'CASCADE'}},
-            thedata => {TYPE => 'LONGBLOB', NOTNULL => 1},
-        ],
-    },
-
-    duplicates => {
-        FIELDS => [
-            dupe_of => {TYPE => 'INT3', NOTNULL => 1,
-                        REFERENCES => {TABLE  =>  'bugs',
-                                       COLUMN =>  'bug_id',
-                                       DELETE =>  'CASCADE'}},
-            dupe    => {TYPE => 'INT3', NOTNULL => 1,
-                        PRIMARYKEY => 1,
-                        REFERENCES => {TABLE  =>  'bugs',
-                                       COLUMN =>  'bug_id',
-                                       DELETE =>  'CASCADE'}},
-        ],
-    },
-
-    bug_see_also => {
-        FIELDS => [
-            id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                       PRIMARYKEY => 1},
-            bug_id => {TYPE => 'INT3', NOTNULL => 1,
-                       REFERENCES => {TABLE  => 'bugs',
-                                      COLUMN => 'bug_id',
-                                      DELETE => 'CASCADE'}},
-            value  => {TYPE => 'varchar(255)', NOTNULL => 1},
-            class  => {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
-        ],
-        INDEXES => [
-            bug_see_also_bug_id_idx => {FIELDS => [qw(bug_id value)], 
-                                        TYPE   => 'UNIQUE'},
-        ],
-    },
-
-    # Auditing
-    # --------
-
-    audit_log => {
-        FIELDS => [
-            user_id   => {TYPE => 'INT3',
-                          REFERENCES => {TABLE  => 'profiles',
-                                         COLUMN => 'userid',
-                                         DELETE => 'SET NULL'}},
-            class     => {TYPE => 'varchar(255)', NOTNULL => 1},
-            object_id => {TYPE => 'INT4', NOTNULL => 1},
-            field     => {TYPE => 'varchar(64)', NOTNULL => 1},
-            removed   => {TYPE => 'MEDIUMTEXT'},
-            added     => {TYPE => 'MEDIUMTEXT'},
-            at_time   => {TYPE => 'DATETIME', NOTNULL => 1},
-        ],
-        INDEXES => [
-                    audit_log_class_idx => ['class', 'at_time'],
-        ],
-    },
-
-    # Keywords
-    # --------
-
-    keyworddefs => {
-        FIELDS => [
-            id          => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
-                            PRIMARYKEY => 1},
-            name        => {TYPE => 'varchar(64)', NOTNULL => 1},
-            description => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-        ],
-        INDEXES => [
-            keyworddefs_name_idx   => {FIELDS => ['name'],
-                                       TYPE => 'UNIQUE'},
-        ],
-    },
-
-    keywords => {
-        FIELDS => [
-            bug_id    => {TYPE => 'INT3', NOTNULL => 1,
-                          REFERENCES => {TABLE  => 'bugs',
-                                         COLUMN => 'bug_id',
-                                         DELETE => 'CASCADE'}},
-            keywordid => {TYPE => 'INT2', NOTNULL => 1,
-                          REFERENCES => {TABLE  => 'keyworddefs',
-                                         COLUMN => 'id',
-                                         DELETE => 'CASCADE'}},
-
-        ],
-        INDEXES => [
-            keywords_bug_id_idx    => {FIELDS => [qw(bug_id keywordid)],
-                                       TYPE => 'UNIQUE'},
-            keywords_keywordid_idx => ['keywordid'],
-        ],
-    },
-
-    # Flags
-    # -----
-
-    # "flags" stores one record for each flag on each bug/attachment.
-    flags => {
-        FIELDS => [
-            id                => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                                  PRIMARYKEY => 1},
-            type_id           => {TYPE => 'INT2', NOTNULL => 1,
-                                  REFERENCES => {TABLE  => 'flagtypes',
-                                                 COLUMN => 'id',
-                                                 DELETE => 'CASCADE'}},
-            status            => {TYPE => 'char(1)', NOTNULL => 1},
-            bug_id            => {TYPE => 'INT3', NOTNULL => 1,
-                                  REFERENCES => {TABLE  => 'bugs',
-                                                 COLUMN => 'bug_id',
-                                                 DELETE => 'CASCADE'}},
-            attach_id         => {TYPE => 'INT3',
-                                  REFERENCES => {TABLE  => 'attachments',
-                                                 COLUMN => 'attach_id',
-                                                 DELETE => 'CASCADE'}},
-            creation_date     => {TYPE => 'DATETIME', NOTNULL => 1},
-            modification_date => {TYPE => 'DATETIME'},
-            setter_id         => {TYPE => 'INT3', NOTNULL => 1,
-                                  REFERENCES => {TABLE  => 'profiles',
-                                                 COLUMN => 'userid'}},
-            requestee_id      => {TYPE => 'INT3',
-                                  REFERENCES => {TABLE  => 'profiles',
-                                                 COLUMN => 'userid'}},
-        ],
-        INDEXES => [
-            flags_bug_id_idx       => [qw(bug_id attach_id)],
-            flags_setter_id_idx    => ['setter_id'],
-            flags_requestee_id_idx => ['requestee_id'],
-            flags_type_id_idx      => ['type_id'],
-        ],
-    },
-
-    # "flagtypes" defines the types of flags that can be set.
-    flagtypes => {
-        FIELDS => [
-            id               => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
-                                 PRIMARYKEY => 1},
-            name             => {TYPE => 'varchar(50)', NOTNULL => 1},
-            description      => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            cc_list          => {TYPE => 'varchar(200)'},
-            target_type      => {TYPE => 'char(1)', NOTNULL => 1,
-                                 DEFAULT => "'b'"},
-            is_active        => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                 DEFAULT => 'TRUE'},
-            is_requestable   => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                 DEFAULT => 'FALSE'},
-            is_requesteeble  => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                 DEFAULT => 'FALSE'},
-            is_multiplicable => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                 DEFAULT => 'FALSE'},
-            sortkey          => {TYPE => 'INT2', NOTNULL => 1,
-                                 DEFAULT => '0'},
-            grant_group_id   => {TYPE => 'INT3',
-                                 REFERENCES => {TABLE  => 'groups',
-                                                COLUMN => 'id',
-                                                DELETE => 'SET NULL'}},
-            request_group_id => {TYPE => 'INT3',
-                                 REFERENCES => {TABLE  => 'groups',
-                                                COLUMN => 'id',
-                                                DELETE => 'SET NULL'}},
-        ],
-    },
-
-    # "flaginclusions" and "flagexclusions" specify the products/components
-    #     a bug/attachment must belong to in order for flags of a given type
-    #     to be set for them.
-    flaginclusions => {
-        FIELDS => [
-            type_id      => {TYPE => 'INT2', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'flagtypes',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-            product_id   => {TYPE => 'INT2',
-                             REFERENCES => {TABLE  => 'products',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-            component_id => {TYPE => 'INT3',
-                             REFERENCES => {TABLE  => 'components',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            flaginclusions_type_id_idx => { FIELDS => [qw(type_id product_id component_id)],
-                                            TYPE   => 'UNIQUE' },
-        ],
-    },
-
-    flagexclusions => {
-        FIELDS => [
-            type_id      => {TYPE => 'INT2', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'flagtypes',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-            product_id   => {TYPE => 'INT2',
-                             REFERENCES => {TABLE  => 'products',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-            component_id => {TYPE => 'INT3',
-                             REFERENCES => {TABLE  => 'components',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            flagexclusions_type_id_idx => { FIELDS => [qw(type_id product_id component_id)],
-                                            TYPE   => 'UNIQUE' },
-        ],
-    },
-
-    # General Field Information
-    # -------------------------
-
-    fielddefs => {
-        FIELDS => [
-            id          => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                            PRIMARYKEY => 1},
-            name        => {TYPE => 'varchar(64)', NOTNULL => 1},
-            type        => {TYPE => 'INT2', NOTNULL => 1,
-                            DEFAULT => FIELD_TYPE_UNKNOWN},
-            custom      => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                            DEFAULT => 'FALSE'},
-            description => {TYPE => 'TINYTEXT', NOTNULL => 1},
-            long_desc   => {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
-            mailhead    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                            DEFAULT => 'FALSE'},
-            sortkey     => {TYPE => 'INT2', NOTNULL => 1},
-            obsolete    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                            DEFAULT => 'FALSE'},
-            enter_bug   => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                            DEFAULT => 'FALSE'},
-            buglist     => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                            DEFAULT => 'FALSE'},
-            visibility_field_id => {TYPE => 'INT3', 
-                                    REFERENCES => {TABLE  => 'fielddefs',
-                                                   COLUMN => 'id'}},
-            value_field_id => {TYPE => 'INT3',
-                               REFERENCES => {TABLE  => 'fielddefs',
-                                              COLUMN => 'id'}},
-            reverse_desc => {TYPE => 'TINYTEXT'},
-            is_mandatory => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'FALSE'},
-            is_numeric    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'FALSE'},
-        ],
-        INDEXES => [
-            fielddefs_name_idx    => {FIELDS => ['name'],
-                                      TYPE => 'UNIQUE'},
-            fielddefs_sortkey_idx => ['sortkey'],
-            fielddefs_value_field_id_idx => ['value_field_id'],
-            fielddefs_is_mandatory_idx => ['is_mandatory'],
-        ],
-    },
-
-    # Field Visibility Information
-    # -------------------------
-
-    field_visibility => {
-        FIELDS => [
-            field_id => {TYPE => 'INT3', 
-                         REFERENCES => {TABLE  => 'fielddefs',
-                                        COLUMN => 'id',
-                                        DELETE => 'CASCADE'}},
-            value_id => {TYPE => 'INT2', NOTNULL => 1}
-        ],
-        INDEXES => [
-            field_visibility_field_id_idx => {
-                FIELDS => [qw(field_id value_id)],
-                TYPE   => 'UNIQUE'
-            },
-        ],
-    },
-
-    # Per-product Field Values
-    # ------------------------
-
-    versions => {
-        FIELDS => [
-            id         =>  {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                            PRIMARYKEY => 1},
-            value      =>  {TYPE => 'varchar(64)', NOTNULL => 1},
-            product_id =>  {TYPE => 'INT2', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'products',
-                                           COLUMN => 'id',
-                                           DELETE => 'CASCADE'}},
-            isactive   =>  {TYPE => 'BOOLEAN', NOTNULL => 1, 
-                            DEFAULT => 'TRUE'},
-        ],
-        INDEXES => [
-            versions_product_id_idx => {FIELDS => [qw(product_id value)],
-                                        TYPE => 'UNIQUE'},
-        ],
-    },
-
-    milestones => {
-        FIELDS => [
-            id         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, 
-                           PRIMARYKEY => 1},
-            product_id => {TYPE => 'INT2', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'products',
-                                          COLUMN => 'id',
-                                          DELETE => 'CASCADE'}},
-            value      => {TYPE => 'varchar(64)', NOTNULL => 1},
-            sortkey    => {TYPE => 'INT2', NOTNULL => 1,
-                           DEFAULT => 0},
-            isactive   => {TYPE => 'BOOLEAN', NOTNULL => 1, 
-                           DEFAULT => 'TRUE'},
-        ],
-        INDEXES => [
-            milestones_product_id_idx => {FIELDS => [qw(product_id value)],
-                                          TYPE => 'UNIQUE'},
-        ],
-    },
-
-    # Global Field Values
-    # -------------------
-
-    bug_status => {
-        FIELDS => [
-            @{ dclone(FIELD_TABLE_SCHEMA->{FIELDS}) },
-            is_open  => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'},
-
-        ],
-        INDEXES => [
-            bug_status_value_idx  => {FIELDS => ['value'],
-                                       TYPE => 'UNIQUE'},
-            bug_status_sortkey_idx => ['sortkey', 'value'],
-            bug_status_visibility_value_id_idx => ['visibility_value_id'],
-        ],
-    },
-
-    resolution => {
-        FIELDS => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
-        INDEXES => [
-            resolution_value_idx   => {FIELDS => ['value'],
-                                       TYPE => 'UNIQUE'},
-            resolution_sortkey_idx => ['sortkey', 'value'],
-            resolution_visibility_value_id_idx => ['visibility_value_id'],
-        ],
-    },
-
-    bug_severity => {
-        FIELDS => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
-        INDEXES => [
-            bug_severity_value_idx   => {FIELDS => ['value'],
-                                         TYPE => 'UNIQUE'},
-            bug_severity_sortkey_idx => ['sortkey', 'value'],
-            bug_severity_visibility_value_id_idx => ['visibility_value_id'],
-        ],
-    },
-
-    priority => {
-        FIELDS => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
-        INDEXES => [
-            priority_value_idx   => {FIELDS => ['value'],
-                                     TYPE => 'UNIQUE'},
-            priority_sortkey_idx => ['sortkey', 'value'],
-            priority_visibility_value_id_idx => ['visibility_value_id'],
-        ],
-    },
-
-    rep_platform => {
-        FIELDS => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
-        INDEXES => [
-            rep_platform_value_idx   => {FIELDS => ['value'],
-                                         TYPE => 'UNIQUE'},
-            rep_platform_sortkey_idx => ['sortkey', 'value'],
-            rep_platform_visibility_value_id_idx => ['visibility_value_id'],
-        ],
-    },
-
-    op_sys => {
-        FIELDS => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
-        INDEXES => [
-            op_sys_value_idx   => {FIELDS => ['value'],
-                                   TYPE => 'UNIQUE'},
-            op_sys_sortkey_idx => ['sortkey', 'value'],
-            op_sys_visibility_value_id_idx => ['visibility_value_id'],
-        ],
-    },
-
-    status_workflow => {
-        FIELDS => [
-            # On bug creation, there is no old value.
-            old_status      => {TYPE => 'INT2',
-                                REFERENCES => {TABLE  => 'bug_status', 
-                                               COLUMN => 'id',
-                                               DELETE => 'CASCADE'}},
-            new_status      => {TYPE => 'INT2', NOTNULL => 1,
-                                REFERENCES => {TABLE  => 'bug_status', 
-                                               COLUMN => 'id',
-                                               DELETE => 'CASCADE'}},
-            require_comment => {TYPE => 'INT1', NOTNULL => 1, DEFAULT => 0},
-        ],
-        INDEXES => [
-            status_workflow_idx  => {FIELDS => ['old_status', 'new_status'],
-                                     TYPE => 'UNIQUE'},
-        ],
-    },
-
-    # USER INFO
-    # ---------
-
-    # General User Information
-    # ------------------------
-
-    profiles => {
-        FIELDS => [
-            userid         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                               PRIMARYKEY => 1},
-            login_name     => {TYPE => 'varchar(255)', NOTNULL => 1},
-            cryptpassword  => {TYPE => 'varchar(128)'},
-            realname       => {TYPE => 'varchar(255)', NOTNULL => 1,
-                               DEFAULT => "''"},
-            disabledtext   => {TYPE => 'MEDIUMTEXT', NOTNULL => 1,
-                               DEFAULT => "''"},
-            disable_mail   => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                               DEFAULT => 'FALSE'},
-            mybugslink     => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                               DEFAULT => 'TRUE'},
-            extern_id      => {TYPE => 'varchar(64)'},
-            is_enabled     => {TYPE => 'BOOLEAN', NOTNULL => 1, 
-                               DEFAULT => 'TRUE'}, 
-            last_seen_date => {TYPE => 'DATETIME'},
-        ],
-        INDEXES => [
-            profiles_login_name_idx => {FIELDS => ['login_name'],
-                                        TYPE => 'UNIQUE'},
-            profiles_extern_id_idx => {FIELDS => ['extern_id'],
-                                       TYPE   => 'UNIQUE'}
-        ],
-    },
-
-    profile_search => {
-        FIELDS => [
-            id         => {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
-            user_id    => {TYPE => 'INT3', NOTNULL => 1, 
-                           REFERENCES => {TABLE  => 'profiles', 
-                                          COLUMN => 'userid', 
-                                          DELETE => 'CASCADE'}},
-            bug_list   => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            list_order => {TYPE => 'MEDIUMTEXT'},
-        ],
-        INDEXES => [
-            profile_search_user_id_idx => [qw(user_id)],
-        ],
-    },
-
-    profiles_activity => {
-        FIELDS => [
-            id            => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, 
-                              PRIMARYKEY => 1}, 
-            userid        => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'profiles', 
-                                             COLUMN => 'userid',
-                                             DELETE => 'CASCADE'}},
-            who           => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'profiles',
-                                             COLUMN => 'userid'}},
-            profiles_when => {TYPE => 'DATETIME', NOTNULL => 1},
-            fieldid       => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'fielddefs',
-                                             COLUMN => 'id'}},
-            oldvalue      => {TYPE => 'TINYTEXT'},
-            newvalue      => {TYPE => 'TINYTEXT'},
-        ],
-        INDEXES => [
-            profiles_activity_userid_idx  => ['userid'],
-            profiles_activity_profiles_when_idx => ['profiles_when'],
-            profiles_activity_fieldid_idx => ['fieldid'],
-        ],
-    },
-
-    email_setting => {
-        FIELDS => [
-            user_id      => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'profiles',
-                                            COLUMN => 'userid',
-                                            DELETE => 'CASCADE'}},
-            relationship => {TYPE => 'INT1', NOTNULL => 1},
-            event        => {TYPE => 'INT1', NOTNULL => 1},
-        ],
-        INDEXES => [
-            email_setting_user_id_idx  =>
-                                    {FIELDS => [qw(user_id relationship event)],
-                                     TYPE => 'UNIQUE'},
-        ],
-    },
-
-    email_bug_ignore => {
-        FIELDS => [
-            user_id => {TYPE => 'INT3', NOTNULL => 1,
-                        REFERENCES => {TABLE  => 'profiles',
-                                       COLUMN => 'userid',
-                                       DELETE => 'CASCADE'}},
-            bug_id  => {TYPE => 'INT3', NOTNULL => 1,
-                        REFERENCES => {TABLE  => 'bugs',
-                                       COLUMN => 'bug_id',
-                                       DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            email_bug_ignore_user_id_idx => {FIELDS => [qw(user_id bug_id)],
-                                             TYPE   => 'UNIQUE'},
-        ],
-    },
-
-    watch => {
-        FIELDS => [
-            watcher => {TYPE => 'INT3', NOTNULL => 1,
-                        REFERENCES => {TABLE  => 'profiles',
-                                       COLUMN => 'userid',
-                                       DELETE => 'CASCADE'}},
-            watched => {TYPE => 'INT3', NOTNULL => 1,
-                        REFERENCES => {TABLE  => 'profiles',
-                                       COLUMN => 'userid',
-                                       DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            watch_watcher_idx => {FIELDS => [qw(watcher watched)],
-                                  TYPE => 'UNIQUE'},
-            watch_watched_idx => ['watched'],
-        ],
-    },
-
-    namedqueries => {
-        FIELDS => [
-            id           => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                             PRIMARYKEY => 1},
-            userid       => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'profiles',
-                                            COLUMN => 'userid',
-                                            DELETE => 'CASCADE'}},
-            name         => {TYPE => 'varchar(64)', NOTNULL => 1},
-            query        => {TYPE => 'LONGTEXT', NOTNULL => 1},
-        ],
-        INDEXES => [
-            namedqueries_userid_idx => {FIELDS => [qw(userid name)],
-                                        TYPE => 'UNIQUE'},
-        ],
-    },
-
-    namedqueries_link_in_footer => {
-        FIELDS => [
-            namedquery_id => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'namedqueries',
-                                             COLUMN => 'id',
-                                             DELETE => 'CASCADE'}},
-            user_id       => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'profiles',
-                                             COLUMN => 'userid',
-                                             DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            namedqueries_link_in_footer_id_idx => {FIELDS => [qw(namedquery_id user_id)],
-                                                   TYPE => 'UNIQUE'},
-            namedqueries_link_in_footer_userid_idx => ['user_id'],
-        ],
-    },
-
-    tag => {
-        FIELDS => [
-            id   => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
-            name => {TYPE => 'varchar(64)', NOTNULL => 1},
-            user_id  => {TYPE => 'INT3', NOTNULL => 1,
-                         REFERENCES => {TABLE  => 'profiles',
-                                        COLUMN => 'userid',
-                                        DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            tag_user_id_idx => {FIELDS => [qw(user_id name)], TYPE => 'UNIQUE'},
-        ],
-    },
-
-    bug_tag => {
-        FIELDS => [
-            bug_id => {TYPE => 'INT3', NOTNULL => 1,
-                       REFERENCES => {TABLE  => 'bugs',
-                                      COLUMN => 'bug_id',
-                                      DELETE => 'CASCADE'}},
-            tag_id => {TYPE => 'INT3', NOTNULL => 1,
-                       REFERENCES => {TABLE  => 'tag',
-                                      COLUMN => 'id',
-                                      DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            bug_tag_bug_id_idx => {FIELDS => [qw(bug_id tag_id)], TYPE => 'UNIQUE'},
-        ],
-    },
-
-    reports => {
-        FIELDS => [
-            id      => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                        PRIMARYKEY => 1},
-            user_id => {TYPE => 'INT3', NOTNULL => 1,
-                        REFERENCES => {TABLE  => 'profiles',
-                                       COLUMN => 'userid',
-                                       DELETE => 'CASCADE'}},
-            name    => {TYPE => 'varchar(64)', NOTNULL => 1},
-            query   => {TYPE => 'LONGTEXT', NOTNULL => 1},
-        ],
-        INDEXES => [
-            reports_user_id_idx => {FIELDS => [qw(user_id name)],
-                                   TYPE => 'UNIQUE'},
-        ],
-    },
-
-    component_cc => {
-
-        FIELDS => [
-            user_id      => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'profiles',
-                                            COLUMN => 'userid',
-                                            DELETE => 'CASCADE'}},
-            component_id => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'components',
-                                            COLUMN => 'id',
-                                            DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            component_cc_user_id_idx => {FIELDS => [qw(component_id user_id)],
-                                         TYPE => 'UNIQUE'},
-        ],
-    },
-
-    # Authentication
-    # --------------
-
-    logincookies => {
-        FIELDS => [
-            cookie   => {TYPE => 'varchar(16)', NOTNULL => 1,
-                         PRIMARYKEY => 1},
-            userid   => {TYPE => 'INT3', NOTNULL => 1,
-                         REFERENCES => {TABLE  => 'profiles',
-                                        COLUMN => 'userid',
-                                        DELETE => 'CASCADE'}},
-            ipaddr   => {TYPE => 'varchar(40)'},
-            lastused => {TYPE => 'DATETIME', NOTNULL => 1},
-        ],
-        INDEXES => [
-            logincookies_lastused_idx => ['lastused'],
-        ],
-    },
-
-    login_failure => {
-        FIELDS => [
-            user_id    => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'profiles',
-                                          COLUMN => 'userid',
-                                          DELETE => 'CASCADE'}},
-            login_time => {TYPE => 'DATETIME', NOTNULL => 1},
-            ip_addr    => {TYPE => 'varchar(40)', NOTNULL => 1},
-        ],
-        INDEXES => [
-            # We do lookups by every item in the table simultaneously, but 
-            # having an index with all three items would be the same size as
-            # the table. So instead we have an index on just the smallest item, 
-            # to speed lookups.
-            login_failure_user_id_idx => ['user_id'],
-        ],
-    },
-
-
-    # "tokens" stores the tokens users receive when a password or email
-    #     change is requested.  Tokens provide an extra measure of security
-    #     for these changes.
-    tokens => {
-        FIELDS => [
-            userid    => {TYPE => 'INT3', REFERENCES => {TABLE  => 'profiles',
-                                                         COLUMN => 'userid',
-                                                         DELETE => 'CASCADE'}},
-            issuedate => {TYPE => 'DATETIME', NOTNULL => 1} ,
-            token     => {TYPE => 'varchar(16)', NOTNULL => 1,
-                          PRIMARYKEY => 1},
-            tokentype => {TYPE => 'varchar(16)', NOTNULL => 1} ,
-            eventdata => {TYPE => 'TINYTEXT'},
-        ],
-        INDEXES => [
-            tokens_userid_idx => ['userid'],
-        ],
-    },
-
-    # GROUPS
-    # ------
-
-    groups => {
-        FIELDS => [
-            id           => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                             PRIMARYKEY => 1},
-            name         => {TYPE => 'varchar(255)', NOTNULL => 1},
-            description  => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            isbuggroup   => {TYPE => 'BOOLEAN', NOTNULL => 1},
-            userregexp   => {TYPE => 'TINYTEXT', NOTNULL => 1,
-                             DEFAULT => "''"},
-            isactive     => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'TRUE'},
-            icon_url     => {TYPE => 'TINYTEXT'},
-        ],
-        INDEXES => [
-            groups_name_idx => {FIELDS => ['name'], TYPE => 'UNIQUE'},
-        ],
-    },
-
-    group_control_map => {
-        FIELDS => [
-            group_id      => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'groups',
-                                             COLUMN => 'id',
-                                             DELETE => 'CASCADE'}},
-            product_id    => {TYPE => 'INT2', NOTNULL => 1,
-                              REFERENCES => {TABLE  =>  'products',
-                                             COLUMN =>  'id',
-                                             DELETE =>  'CASCADE'}},
-            entry         => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'FALSE'},
-            membercontrol => {TYPE => 'INT1', NOTNULL => 1,
-                              DEFAULT => CONTROLMAPNA},
-            othercontrol  => {TYPE => 'INT1', NOTNULL => 1,
-                              DEFAULT => CONTROLMAPNA},
-            canedit       => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'FALSE'},
-            editcomponents => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                               DEFAULT => 'FALSE'},
-            editbugs      => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'FALSE'},
-            canconfirm    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'FALSE'},
-        ],
-        INDEXES => [
-            group_control_map_product_id_idx =>
-            {FIELDS => [qw(product_id group_id)], TYPE => 'UNIQUE'},
-            group_control_map_group_id_idx    => ['group_id'],
-        ],
-    },
-
-    # "user_group_map" determines the groups that a user belongs to
-    # directly or due to regexp and which groups can be blessed by a user.
-    #
-    # grant_type:
-    # if GRANT_DIRECT - record was explicitly granted
-    # if GRANT_DERIVED - record was derived from expanding a group hierarchy
-    # if GRANT_REGEXP - record was created by evaluating a regexp
-    user_group_map => {
-        FIELDS => [
-            user_id    => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'profiles',
-                                          COLUMN => 'userid',
-                                          DELETE => 'CASCADE'}},
-            group_id   => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'groups',
-                                          COLUMN => 'id',
-                                          DELETE => 'CASCADE'}},
-            isbless    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                           DEFAULT => 'FALSE'},
-            grant_type => {TYPE => 'INT1', NOTNULL => 1,
-                           DEFAULT => GRANT_DIRECT},
-        ],
-        INDEXES => [
-            user_group_map_user_id_idx =>
-                {FIELDS => [qw(user_id group_id grant_type isbless)],
-                 TYPE => 'UNIQUE'},
-        ],
-    },
-
-    # This table determines which groups are made a member of another
-    # group, given the ability to bless another group, or given
-    # visibility to another groups existence and membership
-    # grant_type:
-    # if GROUP_MEMBERSHIP - member groups are made members of grantor
-    # if GROUP_BLESS - member groups may grant membership in grantor
-    # if GROUP_VISIBLE - member groups may see grantor group
-    group_group_map => {
-        FIELDS => [
-            member_id  => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'groups',
-                                          COLUMN => 'id',
-                                          DELETE => 'CASCADE'}},
-            grantor_id => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'groups',
-                                          COLUMN => 'id',
-                                          DELETE => 'CASCADE'}},
-            grant_type => {TYPE => 'INT1', NOTNULL => 1,
-                           DEFAULT => GROUP_MEMBERSHIP},
-        ],
-        INDEXES => [
-            group_group_map_member_id_idx =>
-                {FIELDS => [qw(member_id grantor_id grant_type)],
-                 TYPE => 'UNIQUE'},
-        ],
-    },
-
-    # This table determines which groups a user must be a member of
-    # in order to see a bug.
-    bug_group_map => {
-        FIELDS => [
-            bug_id   => {TYPE => 'INT3', NOTNULL => 1,
-                         REFERENCES => {TABLE  => 'bugs',
-                                        COLUMN => 'bug_id',
-                                        DELETE => 'CASCADE'}},
-            group_id => {TYPE => 'INT3', NOTNULL => 1,
-                         REFERENCES => {TABLE  => 'groups',
-                                        COLUMN => 'id',
-                                        DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            bug_group_map_bug_id_idx   =>
-                {FIELDS => [qw(bug_id group_id)], TYPE => 'UNIQUE'},
-            bug_group_map_group_id_idx => ['group_id'],
-        ],
-    },
-
-    # This table determines which groups a user must be a member of
-    # in order to see a named query somebody else shares.
-    namedquery_group_map => {
-        FIELDS => [
-            namedquery_id => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'namedqueries',
-                                             COLUMN => 'id',
-                                             DELETE => 'CASCADE'}},
-            group_id      => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'groups',
-                                             COLUMN => 'id',
-                                             DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            namedquery_group_map_namedquery_id_idx   =>
-                {FIELDS => [qw(namedquery_id)], TYPE => 'UNIQUE'},
-            namedquery_group_map_group_id_idx => ['group_id'],
-        ],
-    },
-
-    category_group_map => {
-        FIELDS => [
-            category_id => {TYPE => 'INT2', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'series_categories',
-                                           COLUMN =>  'id',
-                                           DELETE => 'CASCADE'}},
-            group_id    => {TYPE => 'INT3', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'groups',
-                                           COLUMN => 'id',
-                                           DELETE => 'CASCADE'}},
-        ],
-        INDEXES => [
-            category_group_map_category_id_idx =>
-                {FIELDS => [qw(category_id group_id)], TYPE => 'UNIQUE'},
-        ],
-    },
-
-
-    # PRODUCTS
-    # --------
-
-    classifications => {
-        FIELDS => [
-            id          => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
-                            PRIMARYKEY => 1},
-            name        => {TYPE => 'varchar(64)', NOTNULL => 1},
-            description => {TYPE => 'MEDIUMTEXT'},
-            sortkey     => {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'},
-        ],
-        INDEXES => [
-            classifications_name_idx => {FIELDS => ['name'],
-                                           TYPE => 'UNIQUE'},
-        ],
-    },
-
-    products => {
-        FIELDS => [
-            id                => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
-                                  PRIMARYKEY => 1},
-            name              => {TYPE => 'varchar(64)', NOTNULL => 1},
-            classification_id => {TYPE => 'INT2', NOTNULL => 1,
-                                  DEFAULT => '1',
-                                  REFERENCES => {TABLE  => 'classifications',
-                                                 COLUMN => 'id',
-                                                 DELETE => 'CASCADE'}},
-            description       => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            isactive          => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                  DEFAULT => 1},
-            defaultmilestone  => {TYPE => 'varchar(64)',
-                                  NOTNULL => 1, DEFAULT => "'---'"},
-            allows_unconfirmed => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                                   DEFAULT => 'TRUE'},
-        ],
-        INDEXES => [
-            products_name_idx   => {FIELDS => ['name'],
-                                    TYPE => 'UNIQUE'},
-        ],
-    },
-
-    components => {
-        FIELDS => [
-            id               => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                                 PRIMARYKEY => 1},
-            name             => {TYPE => 'varchar(64)', NOTNULL => 1},
-            product_id       => {TYPE => 'INT2', NOTNULL => 1,
-                                 REFERENCES => {TABLE  => 'products',
-                                                COLUMN => 'id',
-                                                DELETE => 'CASCADE'}},
-            initialowner     => {TYPE => 'INT3', NOTNULL => 1,
-                                 REFERENCES => {TABLE  => 'profiles',
-                                                COLUMN => 'userid'}},
-            initialqacontact => {TYPE => 'INT3',
-                                 REFERENCES => {TABLE  => 'profiles',
-                                                COLUMN => 'userid',
-                                                DELETE => 'SET NULL'}},
-            description      => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            isactive         => {TYPE => 'BOOLEAN', NOTNULL => 1, 
-                                 DEFAULT => 'TRUE'},
-        ],
-        INDEXES => [
-            components_product_id_idx => {FIELDS => [qw(product_id name)],
-                                          TYPE => 'UNIQUE'},
-            components_name_idx   => ['name'],
-        ],
-    },
-
-    # CHARTS
-    # ------
-
-    series => {
-        FIELDS => [
-            series_id   => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                            PRIMARYKEY => 1},
-            creator     => {TYPE => 'INT3',
-                            REFERENCES => {TABLE  => 'profiles',
-                                           COLUMN => 'userid',
-                                           DELETE => 'CASCADE'}},
-            category    => {TYPE => 'INT2', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'series_categories',
-                                           COLUMN => 'id',
-                                           DELETE => 'CASCADE'}},
-            subcategory => {TYPE => 'INT2', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'series_categories',
-                                           COLUMN => 'id',
-                                           DELETE => 'CASCADE'}},
-            name        => {TYPE => 'varchar(64)', NOTNULL => 1},
-            frequency   => {TYPE => 'INT2', NOTNULL => 1},
-            query       => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
-            is_public   => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                            DEFAULT => 'FALSE'},
-        ],
-        INDEXES => [
-            series_creator_idx  => ['creator'],
-            series_category_idx => {FIELDS => [qw(category subcategory name)],
-                                    TYPE => 'UNIQUE'},
-        ],
-    },
-
-    series_data => {
-        FIELDS => [
-            series_id    => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'series',
-                                            COLUMN => 'series_id',
-                                            DELETE => 'CASCADE'}},
-            series_date  => {TYPE => 'DATETIME', NOTNULL => 1},
-            series_value => {TYPE => 'INT3', NOTNULL => 1},
-        ],
-        INDEXES => [
-            series_data_series_id_idx =>
-                {FIELDS => [qw(series_id series_date)],
-                 TYPE => 'UNIQUE'},
-        ],
-    },
-
-    series_categories => {
-        FIELDS => [
-            id   => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
-                     PRIMARYKEY => 1},
-            name => {TYPE => 'varchar(64)', NOTNULL => 1},
-        ],
-        INDEXES => [
-            series_categories_name_idx => {FIELDS => ['name'],
-                                           TYPE => 'UNIQUE'},
-        ],
-    },
-
-    # WHINE SYSTEM
-    # ------------
-
-    whine_queries => {
-        FIELDS => [
-            id            => {TYPE => 'MEDIUMSERIAL', PRIMARYKEY => 1,
-                              NOTNULL => 1},
-            eventid       => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE => 'whine_events',
-                                             COLUMN => 'id',
-                                             DELETE => 'CASCADE'}},
-            query_name    => {TYPE => 'varchar(64)', NOTNULL => 1,
-                              DEFAULT => "''"},
-            sortkey       => {TYPE => 'INT2', NOTNULL => 1,
-                              DEFAULT => '0'},
-            onemailperbug => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'FALSE'},
-            title         => {TYPE => 'varchar(128)', NOTNULL => 1,
-                              DEFAULT => "''"},
-        ],
-        INDEXES => [
-            whine_queries_eventid_idx => ['eventid'],
-        ],
-    },
-
-    whine_schedules => {
-        FIELDS => [
-            id          => {TYPE => 'MEDIUMSERIAL', PRIMARYKEY => 1,
-                            NOTNULL => 1},
-            eventid     => {TYPE => 'INT3', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'whine_events',
-                                           COLUMN => 'id',
-                                           DELETE => 'CASCADE'}},
-            run_day     => {TYPE => 'varchar(32)'},
-            run_time    => {TYPE => 'varchar(32)'},
-            run_next    => {TYPE => 'DATETIME'},
-            mailto      => {TYPE => 'INT3', NOTNULL => 1},
-            mailto_type => {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'},
-        ],
-        INDEXES => [
-            whine_schedules_run_next_idx => ['run_next'],
-            whine_schedules_eventid_idx  => ['eventid'],
-        ],
-    },
-
-    whine_events => {
-        FIELDS => [
-            id           => {TYPE => 'MEDIUMSERIAL', PRIMARYKEY => 1,
-                             NOTNULL => 1},
-            owner_userid => {TYPE => 'INT3', NOTNULL => 1,
-                             REFERENCES => {TABLE  => 'profiles', 
-                                            COLUMN => 'userid',
-                                            DELETE => 'CASCADE'}},
-            subject      => {TYPE => 'varchar(128)'},
-            body         => {TYPE => 'MEDIUMTEXT'},
-            mailifnobugs => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                             DEFAULT => 'FALSE'},
-        ],
-    },
-
-    # QUIPS
-    # -----
-
-    quips => {
-        FIELDS => [
-            quipid   => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1,
-                         PRIMARYKEY => 1},
-            userid   => {TYPE => 'INT3',
-                         REFERENCES => {TABLE  => 'profiles', 
-                                        COLUMN => 'userid',
-                                        DELETE => 'SET NULL'}},
-            quip     => {TYPE => 'varchar(512)', NOTNULL => 1},
-            approved => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                         DEFAULT => 'TRUE'},
-        ],
-    },
-
-    # SETTINGS
-    # --------
-    # setting          - each global setting will have exactly one entry
-    #                    in this table.
-    # setting_value    - stores the list of acceptable values for each
-    #                    setting, and a sort index that controls the order
-    #                    in which the values are displayed.
-    # profile_setting  - If a user has chosen to use a value other than the
-    #                    global default for a given setting, it will be
-    #                    stored in this table. Note: even if a setting is
-    #                    later changed so is_enabled = false, the stored
-    #                    value will remain in case it is ever enabled again.
-    #
-    setting => {
-        FIELDS => [
-            name          => {TYPE => 'varchar(32)', NOTNULL => 1,
-                              PRIMARYKEY => 1}, 
-            default_value => {TYPE => 'varchar(32)', NOTNULL => 1},
-            is_enabled    => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'TRUE'},
-            subclass      => {TYPE => 'varchar(32)'},
-        ],
-    },
-
-    setting_value => {
-        FIELDS => [
-            name        => {TYPE => 'varchar(32)', NOTNULL => 1,
-                            REFERENCES => {TABLE  => 'setting', 
-                                           COLUMN => 'name',
-                                           DELETE => 'CASCADE'}},
-            value       => {TYPE => 'varchar(32)', NOTNULL => 1},
-            sortindex   => {TYPE => 'INT2', NOTNULL => 1},
-        ],
-        INDEXES => [
-            setting_value_nv_unique_idx  => {FIELDS => [qw(name value)],
-                                             TYPE => 'UNIQUE'},
-            setting_value_ns_unique_idx  => {FIELDS => [qw(name sortindex)],
-                                             TYPE => 'UNIQUE'},
-        ],
-     },
-
-    profile_setting => {
-        FIELDS => [
-            user_id       => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'profiles',
-                                             COLUMN => 'userid',
-                                             DELETE => 'CASCADE'}},
-            setting_name  => {TYPE => 'varchar(32)', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'setting',
-                                             COLUMN => 'name',
-                                             DELETE => 'CASCADE'}},
-            setting_value => {TYPE => 'varchar(32)', NOTNULL => 1},
-        ],
-        INDEXES => [
-            profile_setting_value_unique_idx  => {FIELDS => [qw(user_id setting_name)],
-                                                  TYPE => 'UNIQUE'},
-        ],
-     },
-
-    # BUGMAIL
-    # -------
-
-    mail_staging => {
-        FIELDS => [
-            id      => {TYPE => 'INTSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
-            message => {TYPE => 'LONGBLOB', NOTNULL => 1},
-        ],
-    },
-
-    # THESCHWARTZ TABLES
-    # ------------------
-    # Note: In the standard TheSchwartz schema, most integers are unsigned,
-    # but we didn't implement unsigned ints for Bugzilla schemas, so we
-    # just create signed ints, which should be fine.
-
-    ts_funcmap => {
-        FIELDS => [
-            funcid   => {TYPE => 'INTSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
-            funcname => {TYPE => 'varchar(255)', NOTNULL => 1},
-        ],
-        INDEXES => [
-            ts_funcmap_funcname_idx => {FIELDS => ['funcname'], 
-                                          TYPE => 'UNIQUE'},
-        ],
-    },
-
-    ts_job => {
-        FIELDS => [
-            # In a standard TheSchwartz schema, this is a BIGINT, but we
-            # don't have those and I didn't want to add them just for this.
-            jobid         => {TYPE => 'INTSERIAL', PRIMARYKEY => 1, 
-                              NOTNULL => 1},
-            funcid        => {TYPE => 'INT4', NOTNULL => 1},
-            # In standard TheSchwartz, this is a MEDIUMBLOB.
-            arg           => {TYPE => 'LONGBLOB'},
-            uniqkey       => {TYPE => 'varchar(255)'},
-            insert_time   => {TYPE => 'INT4'},
-            run_after     => {TYPE => 'INT4', NOTNULL => 1},
-            grabbed_until => {TYPE => 'INT4', NOTNULL => 1},
-            priority      => {TYPE => 'INT2'},
-            coalesce      => {TYPE => 'varchar(255)'},
-        ],
-        INDEXES => [
-            ts_job_funcid_idx => {FIELDS => [qw(funcid uniqkey)],
-                                  TYPE   => 'UNIQUE'},
-            # In a standard TheSchewartz schema, these both go in the other
-            # direction, but there's no reason to have three indexes that
-            # all start with the same column, and our naming scheme doesn't
-            # allow it anyhow.
-            ts_job_run_after_idx => [qw(run_after funcid)],
-            ts_job_coalesce_idx  => [qw(coalesce funcid)],
-        ],
-    },
-
-    ts_note => {
-        FIELDS => [
-            # This is a BIGINT in standard TheSchwartz schemas.
-            jobid   => {TYPE => 'INT4', NOTNULL => 1},
-            notekey => {TYPE => 'varchar(255)'},
-            value   => {TYPE => 'LONGBLOB'},
-        ],
-        INDEXES => [
-            ts_note_jobid_idx => {FIELDS => [qw(jobid notekey)], 
-                                    TYPE => 'UNIQUE'},
-        ],
-    },
-
-    ts_error => {
-        FIELDS => [
-            error_time => {TYPE => 'INT4', NOTNULL => 1},
-            jobid      => {TYPE => 'INT4', NOTNULL => 1},
-            message    => {TYPE => 'varchar(255)', NOTNULL => 1},
-            funcid     => {TYPE => 'INT4', NOTNULL => 1, DEFAULT => 0},
-        ],
-        INDEXES => [
-            ts_error_funcid_idx     => [qw(funcid error_time)],
-            ts_error_error_time_idx => ['error_time'],
-            ts_error_jobid_idx      => ['jobid'],
-        ],
-    },
-
-    ts_exitstatus => {
-        FIELDS => [
-            jobid           => {TYPE => 'INTSERIAL', PRIMARYKEY => 1,
-                                NOTNULL => 1},
-            funcid          => {TYPE => 'INT4', NOTNULL => 1, DEFAULT => 0},
-            status          => {TYPE => 'INT2'},
-            completion_time => {TYPE => 'INT4'},
-            delete_after    => {TYPE => 'INT4'},
-        ],
-        INDEXES => [
-            ts_exitstatus_funcid_idx       => ['funcid'],
-            ts_exitstatus_delete_after_idx => ['delete_after'],
-        ],
-    },
-
-    # SCHEMA STORAGE
-    # --------------
-
-    bz_schema => {
-        FIELDS => [
-            schema_data => {TYPE => 'LONGBLOB', NOTNULL => 1},
-            version     => {TYPE => 'decimal(3,2)', NOTNULL => 1},
-        ],
-    },
-
-    bug_user_last_visit => {
-        FIELDS => [
-            id            => {TYPE => 'INTSERIAL', NOTNULL => 1,
-                              PRIMARYKEY => 1},
-            user_id       => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'profiles',
-                                             COLUMN => 'userid',
-                                             DELETE => 'CASCADE'}},
-            bug_id        => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'bugs',
-                                             COLUMN => 'bug_id',
-                                             DELETE => 'CASCADE'}},
-            last_visit_ts => {TYPE => 'DATETIME', NOTNULL => 1},
-        ],
-        INDEXES => [
-            bug_user_last_visit_idx => {FIELDS => ['user_id', 'bug_id'],
-                                        TYPE => 'UNIQUE'},
-            bug_user_last_visit_last_visit_ts_idx => ['last_visit_ts'],
-        ],
-    },
-
-    user_api_keys => {
-        FIELDS => [
-            id            => {TYPE => 'INTSERIAL', NOTNULL => 1,
-                              PRIMARYKEY => 1},
-            user_id       => {TYPE => 'INT3', NOTNULL => 1,
-                              REFERENCES => {TABLE  => 'profiles',
-                                             COLUMN => 'userid',
-                                             DELETE => 'CASCADE'}},
-            api_key       => {TYPE => 'VARCHAR(40)', NOTNULL => 1},
-            description   => {TYPE => 'VARCHAR(255)'},
-            revoked       => {TYPE => 'BOOLEAN', NOTNULL => 1,
-                              DEFAULT => 'FALSE'},
-            last_used     => {TYPE => 'DATETIME'},
-        ],
-        INDEXES => [
-            user_api_keys_api_key_idx => {FIELDS => ['api_key'], TYPE => 'UNIQUE'},
-            user_api_keys_user_id_idx => ['user_id'],
-        ],
-    },
-};
+  bugs_activity => {
+    FIELDS => [
+      id     => {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      attach_id => {
+        TYPE => 'INT3',
+        REFERENCES =>
+          {TABLE => 'attachments', COLUMN => 'attach_id', DELETE => 'CASCADE'}
+      },
+      who => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      bug_when => {TYPE => 'DATETIME', NOTNULL => 1},
+      fieldid  => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'fielddefs', COLUMN => 'id'}
+      },
+      added      => {TYPE => 'varchar(255)'},
+      removed    => {TYPE => 'varchar(255)'},
+      comment_id => {
+        TYPE => 'INT4',
+        REFERENCES =>
+          {TABLE => 'longdescs', COLUMN => 'comment_id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      bugs_activity_bug_id_idx   => ['bug_id'],
+      bugs_activity_who_idx      => ['who'],
+      bugs_activity_bug_when_idx => ['bug_when'],
+      bugs_activity_fieldid_idx  => ['fieldid'],
+      bugs_activity_added_idx    => ['added'],
+      bugs_activity_removed_idx  => ['removed'],
+    ],
+  },
 
-# Foreign Keys are added in Bugzilla::DB::bz_add_field_tables
-use constant MULTI_SELECT_VALUE_TABLE => {
+  bugs_aliases => {
     FIELDS => [
-        bug_id => {TYPE => 'INT3', NOTNULL => 1},
-        value  => {TYPE => 'varchar(64)', NOTNULL => 1},
+      alias  => {TYPE => 'varchar(40)', NOTNULL => 1},
+      bug_id => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
     ],
     INDEXES => [
-        bug_id_idx => {FIELDS => [qw( bug_id value)], TYPE => 'UNIQUE'},
+      bugs_aliases_bug_id_idx => ['bug_id'],
+      bugs_aliases_alias_idx  => {FIELDS => ['alias'], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  cc => {
+    FIELDS => [
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      who => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      cc_bug_id_idx => {FIELDS => [qw(bug_id who)], TYPE => 'UNIQUE'},
+      cc_who_idx    => ['who'],
+    ],
+  },
+
+  longdescs => {
+    FIELDS => [
+      comment_id => {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      bug_id     => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      who => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      bug_when        => {TYPE => 'DATETIME',     NOTNULL => 1},
+      work_time       => {TYPE => 'decimal(7,2)', NOTNULL => 1, DEFAULT => '0'},
+      thetext         => {TYPE => 'LONGTEXT',     NOTNULL => 1},
+      isprivate       => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      already_wrapped => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      type            => {TYPE => 'INT2',         NOTNULL => 1, DEFAULT => '0'},
+      extra_data  => {TYPE => 'varchar(255)'},
+      is_markdown => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}
+    ],
+    INDEXES => [
+      longdescs_bug_id_idx   => [qw(bug_id work_time)],
+      longdescs_who_idx      => [qw(who bug_id)],
+      longdescs_bug_when_idx => ['bug_when'],
+    ],
+  },
+
+  longdescs_tags => {
+    FIELDS => [
+      id         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      comment_id => {
+        TYPE => 'INT4',
+        REFERENCES =>
+          {TABLE => 'longdescs', COLUMN => 'comment_id', DELETE => 'CASCADE'}
+      },
+      tag => {TYPE => 'varchar(24)', NOTNULL => 1},
+    ],
+    INDEXES =>
+      [longdescs_tags_idx => {FIELDS => ['comment_id', 'tag'], TYPE => 'UNIQUE'},],
+  },
+
+  longdescs_tags_weights => {
+    FIELDS => [
+      id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      tag    => {TYPE => 'varchar(24)',  NOTNULL => 1},
+      weight => {TYPE => 'INT3',         NOTNULL => 1},
+    ],
+    INDEXES =>
+      [longdescs_tags_weights_tag_idx => {FIELDS => ['tag'], TYPE => 'UNIQUE'},],
+  },
+
+  longdescs_tags_activity => {
+    FIELDS => [
+      id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      comment_id => {
+        TYPE => 'INT4',
+        REFERENCES =>
+          {TABLE => 'longdescs', COLUMN => 'comment_id', DELETE => 'CASCADE'}
+      },
+      who => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      bug_when => {TYPE => 'DATETIME', NOTNULL => 1},
+      added    => {TYPE => 'varchar(24)'},
+      removed  => {TYPE => 'varchar(24)'},
+    ],
+    INDEXES => [longdescs_tags_activity_bug_id_idx => ['bug_id'],],
+  },
+
+  dependencies => {
+    FIELDS => [
+      blocked => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      dependson => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      dependencies_blocked_idx =>
+        {FIELDS => [qw(blocked dependson)], TYPE => 'UNIQUE'},
+      dependencies_dependson_idx => ['dependson'],
+    ],
+  },
+
+  attachments => {
+    FIELDS => [
+      attach_id => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      bug_id    => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      creation_ts       => {TYPE => 'DATETIME',     NOTNULL => 1},
+      modification_time => {TYPE => 'DATETIME',     NOTNULL => 1},
+      description       => {TYPE => 'TINYTEXT',     NOTNULL => 1},
+      mimetype          => {TYPE => 'TINYTEXT',     NOTNULL => 1},
+      ispatch           => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      filename          => {TYPE => 'varchar(255)', NOTNULL => 1},
+      submitter_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      isobsolete => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      isprivate  => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+    ],
+    INDEXES => [
+      attachments_bug_id_idx            => ['bug_id'],
+      attachments_creation_ts_idx       => ['creation_ts'],
+      attachments_modification_time_idx => ['modification_time'],
+      attachments_submitter_id_idx      => ['submitter_id', 'bug_id'],
+    ],
+  },
+  attach_data => {
+    FIELDS => [
+      id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        PRIMARYKEY => 1,
+        REFERENCES =>
+          {TABLE => 'attachments', COLUMN => 'attach_id', DELETE => 'CASCADE'}
+      },
+      thedata => {TYPE => 'LONGBLOB', NOTNULL => 1},
+    ],
+  },
+
+  duplicates => {
+    FIELDS => [
+      dupe_of => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      dupe => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        PRIMARYKEY => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+    ],
+  },
+
+  bug_see_also => {
+    FIELDS => [
+      id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      value => {TYPE => 'varchar(255)', NOTNULL => 1},
+      class => {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
+    ],
+    INDEXES => [
+      bug_see_also_bug_id_idx => {FIELDS => [qw(bug_id value)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # Auditing
+  # --------
+
+  audit_log => {
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'SET NULL'}
+      },
+      class     => {TYPE => 'varchar(255)', NOTNULL => 1},
+      object_id => {TYPE => 'INT4',         NOTNULL => 1},
+      field     => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      removed   => {TYPE => 'MEDIUMTEXT'},
+      added     => {TYPE => 'MEDIUMTEXT'},
+      at_time   => {TYPE => 'DATETIME',     NOTNULL => 1},
+    ],
+    INDEXES => [audit_log_class_idx => ['class', 'at_time'],],
+  },
+
+  # Keywords
+  # --------
+
+  keyworddefs => {
+    FIELDS => [
+      id          => {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name        => {TYPE => 'varchar(64)', NOTNULL => 1},
+      description => {TYPE => 'MEDIUMTEXT',  NOTNULL => 1},
+      is_active   => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'TRUE'},
+    ],
+    INDEXES => [keyworddefs_name_idx => {FIELDS => ['name'], TYPE => 'UNIQUE'},],
+  },
+
+  keywords => {
+    FIELDS => [
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      keywordid => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'keyworddefs', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      keywords_bug_id_idx    => {FIELDS => [qw(bug_id keywordid)], TYPE => 'UNIQUE'},
+      keywords_keywordid_idx => ['keywordid'],
+    ],
+  },
+
+  # Flags
+  # -----
+
+  # "flags" stores one record for each flag on each bug/attachment.
+  flags => {
+    FIELDS => [
+      id      => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      type_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'flagtypes', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      status => {TYPE => 'char(1)', NOTNULL => 1},
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      attach_id => {
+        TYPE => 'INT3',
+        REFERENCES =>
+          {TABLE => 'attachments', COLUMN => 'attach_id', DELETE => 'CASCADE'}
+      },
+      creation_date     => {TYPE => 'DATETIME', NOTNULL => 1},
+      modification_date => {TYPE => 'DATETIME'},
+      setter_id         => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      requestee_id =>
+        {TYPE => 'INT3', REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}},
+    ],
+    INDEXES => [
+      flags_bug_id_idx       => [qw(bug_id attach_id)],
+      flags_setter_id_idx    => ['setter_id'],
+      flags_requestee_id_idx => ['requestee_id'],
+      flags_type_id_idx      => ['type_id'],
+    ],
+  },
+
+  # "flagtypes" defines the types of flags that can be set.
+  flagtypes => {
+    FIELDS => [
+      id               => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name             => {TYPE => 'varchar(50)', NOTNULL => 1},
+      description      => {TYPE => 'MEDIUMTEXT',  NOTNULL => 1},
+      cc_list          => {TYPE => 'varchar(200)'},
+      target_type      => {TYPE => 'char(1)',     NOTNULL => 1, DEFAULT => "'b'"},
+      is_active        => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'TRUE'},
+      is_requestable   => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'FALSE'},
+      is_requesteeble  => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'FALSE'},
+      is_multiplicable => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'FALSE'},
+      sortkey          => {TYPE => 'INT2',        NOTNULL => 1, DEFAULT => '0'},
+      grant_group_id   => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'SET NULL'}
+      },
+      request_group_id => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'SET NULL'}
+      },
+    ],
+  },
+
+  # "flaginclusions" and "flagexclusions" specify the products/components
+  #     a bug/attachment must belong to in order for flags of a given type
+  #     to be set for them.
+  flaginclusions => {
+    FIELDS => [
+      type_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'flagtypes', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      product_id => {
+        TYPE       => 'INT2',
+        REFERENCES => {TABLE => 'products', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      component_id => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'components', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      flaginclusions_type_id_idx =>
+        {FIELDS => [qw(type_id product_id component_id)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  flagexclusions => {
+    FIELDS => [
+      type_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'flagtypes', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      product_id => {
+        TYPE       => 'INT2',
+        REFERENCES => {TABLE => 'products', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      component_id => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'components', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      flagexclusions_type_id_idx =>
+        {FIELDS => [qw(type_id product_id component_id)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # General Field Information
+  # -------------------------
+
+  fielddefs => {
+    FIELDS => [
+      id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name   => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      type   => {TYPE => 'INT2',         NOTNULL => 1, DEFAULT => FIELD_TYPE_UNKNOWN},
+      custom => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      description => {TYPE => 'TINYTEXT',     NOTNULL => 1},
+      long_desc   => {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
+      mailhead    => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      sortkey     => {TYPE => 'INT2',         NOTNULL => 1},
+      obsolete    => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      enter_bug   => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      buglist     => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      visibility_field_id =>
+        {TYPE => 'INT3', REFERENCES => {TABLE => 'fielddefs', COLUMN => 'id'}},
+      value_field_id =>
+        {TYPE => 'INT3', REFERENCES => {TABLE => 'fielddefs', COLUMN => 'id'}},
+      reverse_desc => {TYPE => 'TINYTEXT'},
+      is_mandatory => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      is_numeric   => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+    ],
+    INDEXES => [
+      fielddefs_name_idx           => {FIELDS => ['name'], TYPE => 'UNIQUE'},
+      fielddefs_sortkey_idx        => ['sortkey'],
+      fielddefs_value_field_id_idx => ['value_field_id'],
+      fielddefs_is_mandatory_idx   => ['is_mandatory'],
+    ],
+  },
+
+  # Field Visibility Information
+  # -------------------------
+
+  field_visibility => {
+    FIELDS => [
+      field_id => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'fielddefs', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      value_id => {TYPE => 'INT2', NOTNULL => 1}
+    ],
+    INDEXES => [
+      field_visibility_field_id_idx =>
+        {FIELDS => [qw(field_id value_id)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # Per-product Field Values
+  # ------------------------
+
+  versions => {
+    FIELDS => [
+      id         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      value      => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      product_id => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'products', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      isactive => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'},
     ],
+    INDEXES => [
+      versions_product_id_idx => {FIELDS => [qw(product_id value)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  milestones => {
+    FIELDS => [
+      id         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      product_id => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'products', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      value    => {TYPE => 'varchar(64)', NOTNULL => 1},
+      sortkey  => {TYPE => 'INT2',        NOTNULL => 1, DEFAULT => 0},
+      isactive => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'TRUE'},
+    ],
+    INDEXES => [
+      milestones_product_id_idx =>
+        {FIELDS => [qw(product_id value)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # Global Field Values
+  # -------------------
+
+  bug_status => {
+    FIELDS => [
+      @{dclone(FIELD_TABLE_SCHEMA->{FIELDS})},
+      is_open => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'},
+
+    ],
+    INDEXES => [
+      bug_status_value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+      bug_status_sortkey_idx             => ['sortkey',           'value'],
+      bug_status_visibility_value_id_idx => ['visibility_value_id'],
+    ],
+  },
+
+  resolution => {
+    FIELDS  => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
+    INDEXES => [
+      resolution_value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+      resolution_sortkey_idx             => ['sortkey',           'value'],
+      resolution_visibility_value_id_idx => ['visibility_value_id'],
+    ],
+  },
+
+  bug_severity => {
+    FIELDS  => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
+    INDEXES => [
+      bug_severity_value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+      bug_severity_sortkey_idx             => ['sortkey',           'value'],
+      bug_severity_visibility_value_id_idx => ['visibility_value_id'],
+    ],
+  },
+
+  priority => {
+    FIELDS  => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
+    INDEXES => [
+      priority_value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+      priority_sortkey_idx             => ['sortkey',           'value'],
+      priority_visibility_value_id_idx => ['visibility_value_id'],
+    ],
+  },
+
+  rep_platform => {
+    FIELDS  => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
+    INDEXES => [
+      rep_platform_value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+      rep_platform_sortkey_idx             => ['sortkey',           'value'],
+      rep_platform_visibility_value_id_idx => ['visibility_value_id'],
+    ],
+  },
+
+  op_sys => {
+    FIELDS  => dclone(FIELD_TABLE_SCHEMA->{FIELDS}),
+    INDEXES => [
+      op_sys_value_idx               => {FIELDS => ['value'], TYPE => 'UNIQUE'},
+      op_sys_sortkey_idx             => ['sortkey',           'value'],
+      op_sys_visibility_value_id_idx => ['visibility_value_id'],
+    ],
+  },
+
+  status_workflow => {
+    FIELDS => [
+
+      # On bug creation, there is no old value.
+      old_status => {
+        TYPE       => 'INT2',
+        REFERENCES => {TABLE => 'bug_status', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      new_status => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bug_status', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      require_comment => {TYPE => 'INT1', NOTNULL => 1, DEFAULT => 0},
+    ],
+    INDEXES => [
+      status_workflow_idx =>
+        {FIELDS => ['old_status', 'new_status'], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # USER INFO
+  # ---------
+
+  # General User Information
+  # ------------------------
+
+  profiles => {
+    FIELDS => [
+      userid         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      login_name     => {TYPE => 'varchar(255)', NOTNULL => 1},
+      email          => {TYPE => 'varchar(255)', NOTNULL => 1},
+      cryptpassword  => {TYPE => 'varchar(128)'},
+      realname       => {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
+      disabledtext   => {TYPE => 'MEDIUMTEXT',   NOTNULL => 1, DEFAULT => "''"},
+      disable_mail   => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      mybugslink     => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'TRUE'},
+      extern_id      => {TYPE => 'varchar(64)'},
+      is_enabled     => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'TRUE'},
+      last_seen_date => {TYPE => 'DATETIME'},
+    ],
+    INDEXES => [
+      profiles_login_name_idx => {FIELDS => ['login_name'], TYPE => 'UNIQUE'},
+      profiles_extern_id_idx  => {FIELDS => ['extern_id'],  TYPE => 'UNIQUE'},
+      profiles_email_idx      => {FIELDS => ['email'],      TYPE => 'UNIQUE'}
+    ],
+  },
+
+  profile_search => {
+    FIELDS => [
+      id      => {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      bug_list   => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
+      list_order => {TYPE => 'MEDIUMTEXT'},
+    ],
+    INDEXES => [profile_search_user_id_idx => [qw(user_id)],],
+  },
+
+  profiles_activity => {
+    FIELDS => [
+      id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      userid => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      who => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      profiles_when => {TYPE => 'DATETIME', NOTNULL => 1},
+      fieldid       => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'fielddefs', COLUMN => 'id'}
+      },
+      oldvalue => {TYPE => 'TINYTEXT'},
+      newvalue => {TYPE => 'TINYTEXT'},
+    ],
+    INDEXES => [
+      profiles_activity_userid_idx        => ['userid'],
+      profiles_activity_profiles_when_idx => ['profiles_when'],
+      profiles_activity_fieldid_idx       => ['fieldid'],
+    ],
+  },
+
+  email_setting => {
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      relationship => {TYPE => 'INT1', NOTNULL => 1},
+      event        => {TYPE => 'INT1', NOTNULL => 1},
+    ],
+    INDEXES => [
+      email_setting_user_id_idx =>
+        {FIELDS => [qw(user_id relationship event)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  email_bug_ignore => {
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      email_bug_ignore_user_id_idx =>
+        {FIELDS => [qw(user_id bug_id)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  watch => {
+    FIELDS => [
+      watcher => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      watched => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      watch_watcher_idx => {FIELDS => [qw(watcher watched)], TYPE => 'UNIQUE'},
+      watch_watched_idx => ['watched'],
+    ],
+  },
+
+  namedqueries => {
+    FIELDS => [
+      id     => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      userid => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      name  => {TYPE => 'varchar(64)', NOTNULL => 1},
+      query => {TYPE => 'LONGTEXT',    NOTNULL => 1},
+    ],
+    INDEXES =>
+      [namedqueries_userid_idx => {FIELDS => [qw(userid name)], TYPE => 'UNIQUE'},],
+  },
+
+  namedqueries_link_in_footer => {
+    FIELDS => [
+      namedquery_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'namedqueries', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      namedqueries_link_in_footer_id_idx =>
+        {FIELDS => [qw(namedquery_id user_id)], TYPE => 'UNIQUE'},
+      namedqueries_link_in_footer_userid_idx => ['user_id'],
+    ],
+  },
+
+  tag => {
+    FIELDS => [
+      id      => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name    => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES =>
+      [tag_user_id_idx => {FIELDS => [qw(user_id name)], TYPE => 'UNIQUE'},],
+  },
+
+  bug_tag => {
+    FIELDS => [
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      tag_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'tag', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES =>
+      [bug_tag_bug_id_idx => {FIELDS => [qw(bug_id tag_id)], TYPE => 'UNIQUE'},],
+  },
+
+  reports => {
+    FIELDS => [
+      id      => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      name  => {TYPE => 'varchar(64)', NOTNULL => 1},
+      query => {TYPE => 'LONGTEXT',    NOTNULL => 1},
+    ],
+    INDEXES =>
+      [reports_user_id_idx => {FIELDS => [qw(user_id name)], TYPE => 'UNIQUE'},],
+  },
+
+  component_cc => {
+
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      component_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'components', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      component_cc_user_id_idx =>
+        {FIELDS => [qw(component_id user_id)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # Authentication
+  # --------------
+
+  logincookies => {
+    FIELDS => [
+      cookie => {TYPE => 'varchar(22)', NOTNULL => 1, PRIMARYKEY => 1},
+      userid => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      ipaddr   => {TYPE => 'varchar(40)'},
+      lastused => {TYPE => 'DATETIME', NOTNULL => 1},
+    ],
+    INDEXES => [logincookies_lastused_idx => ['lastused'],],
+  },
+
+  login_failure => {
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      login_time => {TYPE => 'DATETIME',    NOTNULL => 1},
+      ip_addr    => {TYPE => 'varchar(40)', NOTNULL => 1},
+    ],
+    INDEXES => [
+
+      # We do lookups by every item in the table simultaneously, but
+      # having an index with all three items would be the same size as
+      # the table. So instead we have an index on just the smallest item,
+      # to speed lookups.
+      login_failure_user_id_idx => ['user_id'],
+    ],
+  },
+
+
+  # "tokens" stores the tokens users receive when a password or email
+  #     change is requested.  Tokens provide an extra measure of security
+  #     for these changes.
+  tokens => {
+    FIELDS => [
+      userid => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      issuedate => {TYPE => 'DATETIME',    NOTNULL => 1},
+      token     => {TYPE => 'varchar(22)', NOTNULL => 1, PRIMARYKEY => 1},
+      tokentype => {TYPE => 'varchar(16)', NOTNULL => 1},
+      eventdata => {TYPE => 'TINYTEXT'},
+    ],
+    INDEXES => [tokens_userid_idx => ['userid'],],
+  },
+
+  # GROUPS
+  # ------
+
+  groups => {
+    FIELDS => [
+      id          => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name        => {TYPE => 'varchar(255)', NOTNULL => 1},
+      description => {TYPE => 'MEDIUMTEXT',   NOTNULL => 1},
+      isbuggroup  => {TYPE => 'BOOLEAN',      NOTNULL => 1},
+      userregexp  => {TYPE => 'TINYTEXT',     NOTNULL => 1, DEFAULT => "''"},
+      isactive    => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'TRUE'},
+      icon_url    => {TYPE => 'TINYTEXT'},
+    ],
+    INDEXES => [groups_name_idx => {FIELDS => ['name'], TYPE => 'UNIQUE'},],
+  },
+
+  group_control_map => {
+    FIELDS => [
+      group_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      product_id => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'products', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      entry          => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      membercontrol  => {TYPE => 'INT1',    NOTNULL => 1, DEFAULT => CONTROLMAPNA},
+      othercontrol   => {TYPE => 'INT1',    NOTNULL => 1, DEFAULT => CONTROLMAPNA},
+      canedit        => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      editcomponents => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      editbugs       => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      canconfirm     => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+    ],
+    INDEXES => [
+      group_control_map_product_id_idx =>
+        {FIELDS => [qw(product_id group_id)], TYPE => 'UNIQUE'},
+      group_control_map_group_id_idx => ['group_id'],
+    ],
+  },
+
+  # "user_group_map" determines the groups that a user belongs to
+  # directly or due to regexp and which groups can be blessed by a user.
+  #
+  # grant_type:
+  # if GRANT_DIRECT - record was explicitly granted
+  # if GRANT_DERIVED - record was derived from expanding a group hierarchy
+  # if GRANT_REGEXP - record was created by evaluating a regexp
+  user_group_map => {
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      group_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      isbless    => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      grant_type => {TYPE => 'INT1',    NOTNULL => 1, DEFAULT => GRANT_DIRECT},
+    ],
+    INDEXES => [
+      user_group_map_user_id_idx =>
+        {FIELDS => [qw(user_id group_id grant_type isbless)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # This table determines which groups are made a member of another
+  # group, given the ability to bless another group, or given
+  # visibility to another groups existence and membership
+  # grant_type:
+  # if GROUP_MEMBERSHIP - member groups are made members of grantor
+  # if GROUP_BLESS - member groups may grant membership in grantor
+  # if GROUP_VISIBLE - member groups may see grantor group
+  group_group_map => {
+    FIELDS => [
+      member_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      grantor_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      grant_type => {TYPE => 'INT1', NOTNULL => 1, DEFAULT => GROUP_MEMBERSHIP},
+    ],
+    INDEXES => [
+      group_group_map_member_id_idx =>
+        {FIELDS => [qw(member_id grantor_id grant_type)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # This table determines which groups a user must be a member of
+  # in order to see a bug.
+  bug_group_map => {
+    FIELDS => [
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      group_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      bug_group_map_bug_id_idx => {FIELDS => [qw(bug_id group_id)], TYPE => 'UNIQUE'},
+      bug_group_map_group_id_idx => ['group_id'],
+    ],
+  },
+
+  # This table determines which groups a user must be a member of
+  # in order to see a named query somebody else shares.
+  namedquery_group_map => {
+    FIELDS => [
+      namedquery_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'namedqueries', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      group_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      namedquery_group_map_namedquery_id_idx =>
+        {FIELDS => [qw(namedquery_id)], TYPE => 'UNIQUE'},
+      namedquery_group_map_group_id_idx => ['group_id'],
+    ],
+  },
+
+  category_group_map => {
+    FIELDS => [
+      category_id => {
+        TYPE    => 'INT2',
+        NOTNULL => 1,
+        REFERENCES =>
+          {TABLE => 'series_categories', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      group_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'groups', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+    ],
+    INDEXES => [
+      category_group_map_category_id_idx =>
+        {FIELDS => [qw(category_id group_id)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+
+  # PRODUCTS
+  # --------
+
+  classifications => {
+    FIELDS => [
+      id          => {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name        => {TYPE => 'varchar(64)', NOTNULL => 1},
+      description => {TYPE => 'MEDIUMTEXT'},
+      sortkey     => {TYPE => 'INT2',        NOTNULL => 1, DEFAULT => '0'},
+    ],
+    INDEXES =>
+      [classifications_name_idx => {FIELDS => ['name'], TYPE => 'UNIQUE'},],
+  },
+
+  products => {
+    FIELDS => [
+      id                => {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name              => {TYPE => 'varchar(64)', NOTNULL => 1},
+      classification_id => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        DEFAULT    => '1',
+        REFERENCES => {TABLE => 'classifications', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      description        => {TYPE => 'MEDIUMTEXT',  NOTNULL => 1},
+      isactive           => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 1},
+      defaultmilestone   => {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"},
+      allows_unconfirmed => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'TRUE'},
+    ],
+    INDEXES => [products_name_idx => {FIELDS => ['name'], TYPE => 'UNIQUE'},],
+  },
+
+  components => {
+    FIELDS => [
+      id         => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name       => {TYPE => 'varchar(64)',  NOTNULL => 1},
+      product_id => {
+        TYPE       => 'INT2',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'products', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      initialowner => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid'}
+      },
+      initialqacontact => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'SET NULL'}
+      },
+      description => {TYPE => 'MEDIUMTEXT', NOTNULL => 1},
+      isactive    => {TYPE => 'BOOLEAN',    NOTNULL => 1, DEFAULT => 'TRUE'},
+    ],
+    INDEXES => [
+      components_product_id_idx =>
+        {FIELDS => [qw(product_id name)], TYPE => 'UNIQUE'},
+      components_name_idx => ['name'],
+    ],
+  },
+
+  # CHARTS
+  # ------
+
+  series => {
+    FIELDS => [
+      series_id => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      creator   => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      category => {
+        TYPE    => 'INT2',
+        NOTNULL => 1,
+        REFERENCES =>
+          {TABLE => 'series_categories', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      subcategory => {
+        TYPE    => 'INT2',
+        NOTNULL => 1,
+        REFERENCES =>
+          {TABLE => 'series_categories', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      name      => {TYPE => 'varchar(64)', NOTNULL => 1},
+      frequency => {TYPE => 'INT2',        NOTNULL => 1},
+      query     => {TYPE => 'MEDIUMTEXT',  NOTNULL => 1},
+      is_public => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'FALSE'},
+    ],
+    INDEXES => [
+      series_creator_idx => ['creator'],
+      series_category_idx =>
+        {FIELDS => [qw(category subcategory name)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  series_data => {
+    FIELDS => [
+      series_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'series', COLUMN => 'series_id', DELETE => 'CASCADE'}
+      },
+      series_date  => {TYPE => 'DATETIME', NOTNULL => 1},
+      series_value => {TYPE => 'INT3',     NOTNULL => 1},
+    ],
+    INDEXES => [
+      series_data_series_id_idx =>
+        {FIELDS => [qw(series_id series_date)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  series_categories => {
+    FIELDS => [
+      id   => {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      name => {TYPE => 'varchar(64)', NOTNULL => 1},
+    ],
+    INDEXES =>
+      [series_categories_name_idx => {FIELDS => ['name'], TYPE => 'UNIQUE'},],
+  },
+
+  # WHINE SYSTEM
+  # ------------
+
+  whine_queries => {
+    FIELDS => [
+      id      => {TYPE => 'MEDIUMSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
+      eventid => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'whine_events', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      query_name    => {TYPE => 'varchar(64)',  NOTNULL => 1, DEFAULT => "''"},
+      sortkey       => {TYPE => 'INT2',         NOTNULL => 1, DEFAULT => '0'},
+      onemailperbug => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'FALSE'},
+      title         => {TYPE => 'varchar(128)', NOTNULL => 1, DEFAULT => "''"},
+    ],
+    INDEXES => [whine_queries_eventid_idx => ['eventid'],],
+  },
+
+  whine_schedules => {
+    FIELDS => [
+      id      => {TYPE => 'MEDIUMSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
+      eventid => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'whine_events', COLUMN => 'id', DELETE => 'CASCADE'}
+      },
+      run_day     => {TYPE => 'varchar(32)'},
+      run_time    => {TYPE => 'varchar(32)'},
+      run_next    => {TYPE => 'DATETIME'},
+      mailto      => {TYPE => 'INT3', NOTNULL => 1},
+      mailto_type => {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'},
+    ],
+    INDEXES => [
+      whine_schedules_run_next_idx => ['run_next'],
+      whine_schedules_eventid_idx  => ['eventid'],
+    ],
+  },
+
+  whine_events => {
+    FIELDS => [
+      id           => {TYPE => 'MEDIUMSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
+      owner_userid => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      subject      => {TYPE => 'varchar(128)'},
+      body         => {TYPE => 'MEDIUMTEXT'},
+      mailifnobugs => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+    ],
+  },
+
+  # QUIPS
+  # -----
+
+  quips => {
+    FIELDS => [
+      quipid => {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      userid => {
+        TYPE       => 'INT3',
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'SET NULL'}
+      },
+      quip     => {TYPE => 'varchar(512)', NOTNULL => 1},
+      approved => {TYPE => 'BOOLEAN',      NOTNULL => 1, DEFAULT => 'TRUE'},
+    ],
+  },
+
+  # SETTINGS
+  # --------
+  # setting          - each global setting will have exactly one entry
+  #                    in this table.
+  # setting_value    - stores the list of acceptable values for each
+  #                    setting, and a sort index that controls the order
+  #                    in which the values are displayed.
+  # profile_setting  - If a user has chosen to use a value other than the
+  #                    global default for a given setting, it will be
+  #                    stored in this table. Note: even if a setting is
+  #                    later changed so is_enabled = false, the stored
+  #                    value will remain in case it is ever enabled again.
+  #
+  setting => {
+    FIELDS => [
+      name          => {TYPE => 'varchar(32)', NOTNULL => 1, PRIMARYKEY => 1},
+      default_value => {TYPE => 'varchar(32)', NOTNULL => 1},
+      is_enabled    => {TYPE => 'BOOLEAN',     NOTNULL => 1, DEFAULT => 'TRUE'},
+      subclass      => {TYPE => 'varchar(32)'},
+    ],
+  },
+
+  setting_value => {
+    FIELDS => [
+      name => {
+        TYPE       => 'varchar(32)',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'setting', COLUMN => 'name', DELETE => 'CASCADE'}
+      },
+      value     => {TYPE => 'varchar(32)', NOTNULL => 1},
+      sortindex => {TYPE => 'INT2',        NOTNULL => 1},
+    ],
+    INDEXES => [
+      setting_value_nv_unique_idx => {FIELDS => [qw(name value)], TYPE => 'UNIQUE'},
+      setting_value_ns_unique_idx =>
+        {FIELDS => [qw(name sortindex)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  profile_setting => {
+    FIELDS => [
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      setting_name => {
+        TYPE       => 'varchar(32)',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'setting', COLUMN => 'name', DELETE => 'CASCADE'}
+      },
+      setting_value => {TYPE => 'varchar(32)', NOTNULL => 1},
+    ],
+    INDEXES => [
+      profile_setting_value_unique_idx =>
+        {FIELDS => [qw(user_id setting_name)], TYPE => 'UNIQUE'},
+    ],
+  },
+
+  # BUGMAIL
+  # -------
+
+  mail_staging => {
+    FIELDS => [
+      id      => {TYPE => 'INTSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
+      message => {TYPE => 'LONGBLOB',  NOTNULL    => 1},
+    ],
+  },
+
+  email_rates => {
+    FIELDS => [
+      id         => {TYPE => 'INTSERIAL',    NOTNULL => 1, PRIMARYKEY => 1},
+      recipient  => {TYPE => 'varchar(255)', NOTNULL => 1},
+      message_ts => {TYPE => 'DATETIME',     NOTNULL => 1},
+    ],
+    INDEXES => [email_rates_idx => [qw(recipient message_ts)],],
+  },
+
+  # THESCHWARTZ TABLES
+  # ------------------
+  # Note: In the standard TheSchwartz schema, most integers are unsigned,
+  # but we didn't implement unsigned ints for Bugzilla schemas, so we
+  # just create signed ints, which should be fine.
+
+  ts_funcmap => {
+    FIELDS => [
+      funcid   => {TYPE => 'INTSERIAL',    PRIMARYKEY => 1, NOTNULL => 1},
+      funcname => {TYPE => 'varchar(255)', NOTNULL    => 1},
+    ],
+    INDEXES =>
+      [ts_funcmap_funcname_idx => {FIELDS => ['funcname'], TYPE => 'UNIQUE'},],
+  },
+
+  ts_job => {
+    FIELDS => [
+
+      # In a standard TheSchwartz schema, this is a BIGINT, but we
+      # don't have those and I didn't want to add them just for this.
+      jobid  => {TYPE => 'INTSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
+      funcid => {TYPE => 'INT4',      NOTNULL    => 1},
+
+      # In standard TheSchwartz, this is a MEDIUMBLOB.
+      arg           => {TYPE => 'LONGBLOB'},
+      uniqkey       => {TYPE => 'varchar(255)'},
+      insert_time   => {TYPE => 'INT4'},
+      run_after     => {TYPE => 'INT4', NOTNULL => 1},
+      grabbed_until => {TYPE => 'INT4', NOTNULL => 1},
+      priority      => {TYPE => 'INT2'},
+      coalesce      => {TYPE => 'varchar(255)'},
+    ],
+    INDEXES => [
+      ts_job_funcid_idx => {FIELDS => [qw(funcid uniqkey)], TYPE => 'UNIQUE'},
+
+      # In a standard TheSchewartz schema, these both go in the other
+      # direction, but there's no reason to have three indexes that
+      # all start with the same column, and our naming scheme doesn't
+      # allow it anyhow.
+      ts_job_run_after_idx => [qw(run_after funcid)],
+      ts_job_coalesce_idx  => [qw(coalesce funcid)],
+    ],
+  },
+
+  ts_note => {
+    FIELDS => [
+
+      # This is a BIGINT in standard TheSchwartz schemas.
+      jobid   => {TYPE => 'INT4', NOTNULL => 1},
+      notekey => {TYPE => 'varchar(255)'},
+      value   => {TYPE => 'LONGBLOB'},
+    ],
+    INDEXES =>
+      [ts_note_jobid_idx => {FIELDS => [qw(jobid notekey)], TYPE => 'UNIQUE'},],
+  },
+
+  ts_error => {
+    FIELDS => [
+      error_time => {TYPE => 'INT4',         NOTNULL => 1},
+      jobid      => {TYPE => 'INT4',         NOTNULL => 1},
+      message    => {TYPE => 'varchar(255)', NOTNULL => 1},
+      funcid     => {TYPE => 'INT4',         NOTNULL => 1, DEFAULT => 0},
+    ],
+    INDEXES => [
+      ts_error_funcid_idx     => [qw(funcid error_time)],
+      ts_error_error_time_idx => ['error_time'],
+      ts_error_jobid_idx      => ['jobid'],
+    ],
+  },
+
+  ts_exitstatus => {
+    FIELDS => [
+      jobid           => {TYPE => 'INTSERIAL', PRIMARYKEY => 1, NOTNULL => 1},
+      funcid          => {TYPE => 'INT4',      NOTNULL    => 1, DEFAULT => 0},
+      status          => {TYPE => 'INT2'},
+      completion_time => {TYPE => 'INT4'},
+      delete_after    => {TYPE => 'INT4'},
+    ],
+    INDEXES => [
+      ts_exitstatus_funcid_idx       => ['funcid'],
+      ts_exitstatus_delete_after_idx => ['delete_after'],
+    ],
+  },
+
+  # SCHEMA STORAGE
+  # --------------
+
+  bz_schema => {
+    FIELDS => [
+      schema_data => {TYPE => 'LONGBLOB',     NOTNULL => 1},
+      version     => {TYPE => 'decimal(3,2)', NOTNULL => 1},
+    ],
+    INDEXES =>
+      [bz_schema_version_idx => {FIELDS => ['version'], TYPE => 'UNIQUE'},],
+  },
+
+  bug_user_last_visit => {
+    FIELDS => [
+      id      => {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      last_visit_ts => {TYPE => 'DATETIME', NOTNULL => 1},
+    ],
+    INDEXES => [
+      bug_user_last_visit_idx => {FIELDS => ['user_id', 'bug_id'], TYPE => 'UNIQUE'},
+      bug_user_last_visit_last_visit_ts_idx => ['last_visit_ts'],
+    ],
+  },
+
+  user_api_keys => {
+    FIELDS => [
+      id      => {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1},
+      user_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      api_key     => {TYPE => 'varchar(40)', NOTNULL => 1},
+      description => {TYPE => 'varchar(255)'},
+      revoked     => {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'},
+      last_used   => {TYPE => 'DATETIME'},
+      app_id      => {TYPE => 'varchar(64)'},
+    ],
+    INDEXES => [
+      user_api_keys_api_key_idx        => {FIELDS => ['api_key'], TYPE => 'UNIQUE'},
+      user_api_keys_user_id_idx        => ['user_id'],
+      user_api_keys_user_id_app_id_idx => ['user_id', 'app_id'],
+    ],
+  },
+};
+
+# Foreign Keys are added in Bugzilla::DB::bz_add_field_tables
+use constant MULTI_SELECT_VALUE_TABLE => {
+  FIELDS => [
+    bug_id => {TYPE => 'INT3',        NOTNULL => 1},
+    value  => {TYPE => 'varchar(64)', NOTNULL => 1},
+  ],
+  INDEXES => [bug_id_idx => {FIELDS => [qw( bug_id value)], TYPE => 'UNIQUE'},],
 };
 
 #--------------------------------------------------------------------------
@@ -1822,27 +1789,28 @@ sub new {
 
 =cut
 
-    my $this = shift;
-    my $class = ref($this) || $this;
-    my $driver = shift;
+  my $this   = shift;
+  my $class  = ref($this) || $this;
+  my $driver = shift;
 
-    if ($driver) {
-        (my $subclass = $driver) =~ s/^(\S)/\U$1/;
-        $class .= '::' . $subclass;
-        eval "require $class;";
-        die "The $class class could not be found ($subclass " .
-            "not supported?): $@" if ($@);
-    }
-    die "$class is an abstract base class. Instantiate a subclass instead."
-      if ($class eq __PACKAGE__);
+  if ($driver) {
+    (my $subclass = $driver) =~ s/^(\S)/\U$1/;
+    $class .= '::' . $subclass;
+    eval "require $class;";
+    die "The $class class could not be found ($subclass " . "not supported?): $@"
+      if ($@);
+  }
+  die "$class is an abstract base class. Instantiate a subclass instead."
+    if ($class eq __PACKAGE__);
+
+  my $self = {};
+  bless $self, $class;
+  $self = $self->_initialize(@_);
 
-    my $self = {};
-    bless $self, $class;
-    $self = $self->_initialize(@_);
+  return ($self);
 
-    return($self);
+}    #eosub--new
 
-} #eosub--new
 #--------------------------------------------------------------------------
 sub _initialize {
 
@@ -1865,33 +1833,34 @@ sub _initialize {
 
 =cut
 
-    my $self = shift;
-    my $abstract_schema = shift;
+  my $self            = shift;
+  my $abstract_schema = shift;
 
-    if (!$abstract_schema) {
-        # While ABSTRACT_SCHEMA cannot be modified, $abstract_schema can be.
-        # So, we dclone it to prevent anything from mucking with the constant.
-        $abstract_schema = dclone(ABSTRACT_SCHEMA);
+  if (!$abstract_schema) {
 
-        # Let extensions add tables, but make sure they can't modify existing
-        # tables. If we don't lock/unlock keys, lock_value complains.
-        lock_keys(%$abstract_schema);
-        foreach my $table (keys %{ABSTRACT_SCHEMA()}) {
-            lock_value(%$abstract_schema, $table) 
-                if exists $abstract_schema->{$table};
-        }
-        unlock_keys(%$abstract_schema);
-        Bugzilla::Hook::process('db_schema_abstract_schema', 
-                                { schema => $abstract_schema });
-        unlock_hash(%$abstract_schema);
+    # While ABSTRACT_SCHEMA cannot be modified, $abstract_schema can be.
+    # So, we dclone it to prevent anything from mucking with the constant.
+    $abstract_schema = dclone(ABSTRACT_SCHEMA);
+
+    # Let extensions add tables, but make sure they can't modify existing
+    # tables. If we don't lock/unlock keys, lock_value complains.
+    lock_keys(%$abstract_schema);
+    foreach my $table (keys %{ABSTRACT_SCHEMA()}) {
+      lock_value(%$abstract_schema, $table) if exists $abstract_schema->{$table};
     }
+    unlock_keys(%$abstract_schema);
+    Bugzilla::Hook::process('db_schema_abstract_schema',
+      {schema => $abstract_schema});
+    unlock_hash(%$abstract_schema);
+  }
+
+  $self->{schema}          = dclone($abstract_schema);
+  $self->{abstract_schema} = $abstract_schema;
 
-    $self->{schema} = dclone($abstract_schema);
-    $self->{abstract_schema} = $abstract_schema;
+  return $self;
 
-    return $self;
+}    #eosub--_initialize
 
-} #eosub--_initialize
 #--------------------------------------------------------------------------
 sub _adjust_schema {
 
@@ -1907,36 +1876,41 @@ sub _adjust_schema {
 
 =cut
 
-    my $self = shift;
-
-    # The _initialize method has already set up the db_specific hash with
-    # the information on how to implement the abstract data types for the
-    # instantiated DBMS-specific subclass.
-    my $db_specific = $self->{db_specific};
-
-    # Loop over each table in the abstract database schema.
-    foreach my $table (keys %{ $self->{schema} }) {
-        my %fields = (@{ $self->{schema}{$table}{FIELDS} });
-        # Loop over the field definitions in each table.
-        foreach my $field_def (values %fields) {
-            # If the field type is an abstract data type defined in the
-            # $db_specific hash, replace it with the DBMS-specific data type
-            # that implements it.
-            if (exists($db_specific->{$field_def->{TYPE}})) {
-                $field_def->{TYPE} = $db_specific->{$field_def->{TYPE}};
-            }
-            # Replace abstract default values (such as 'TRUE' and 'FALSE')
-            # with their database-specific implementations.
-            if (exists($field_def->{DEFAULT})
-                && exists($db_specific->{$field_def->{DEFAULT}})) {
-                $field_def->{DEFAULT} = $db_specific->{$field_def->{DEFAULT}};
-            }
-        }
+  my $self = shift;
+
+  # The _initialize method has already set up the db_specific hash with
+  # the information on how to implement the abstract data types for the
+  # instantiated DBMS-specific subclass.
+  my $db_specific = $self->{db_specific};
+
+  # Loop over each table in the abstract database schema.
+  foreach my $table (keys %{$self->{schema}}) {
+    my %fields = (@{$self->{schema}{$table}{FIELDS}});
+
+    # Loop over the field definitions in each table.
+    foreach my $field_def (values %fields) {
+
+      # If the field type is an abstract data type defined in the
+      # $db_specific hash, replace it with the DBMS-specific data type
+      # that implements it.
+      if (exists($db_specific->{$field_def->{TYPE}})) {
+        $field_def->{TYPE} = $db_specific->{$field_def->{TYPE}};
+      }
+
+      # Replace abstract default values (such as 'TRUE' and 'FALSE')
+      # with their database-specific implementations.
+      if ( exists($field_def->{DEFAULT})
+        && exists($db_specific->{$field_def->{DEFAULT}}))
+      {
+        $field_def->{DEFAULT} = $db_specific->{$field_def->{DEFAULT}};
+      }
     }
+  }
+
+  return $self;
 
-    return $self;
+}    #eosub--_adjust_schema
 
-} #eosub--_adjust_schema
 #--------------------------------------------------------------------------
 sub get_type_ddl {
 
@@ -1948,7 +1922,7 @@ sub get_type_ddl {
 
 Public method to convert abstract (database-generic) field specifiers to
 database-specific data types suitable for use in a C<CREATE TABLE> or 
-C<ALTER TABLE> SQL statment. If no database-specific field type has been
+C<ALTER TABLE> SQL statement. If no database-specific field type has been
 defined for the given field type, then it will just return the same field type.
 
 =item B<Parameters>
@@ -1970,30 +1944,34 @@ C<ALTER TABLE> SQL statement
 
 =cut
 
-    my $self = shift;
-    my $finfo = (@_ == 1 && ref($_[0]) eq 'HASH') ? $_[0] : { @_ };
-    my $type = $finfo->{TYPE};
-    confess "A valid TYPE was not specified for this column (got " 
-            . Dumper($finfo) . ")" unless ($type);
-
-    my $default = $finfo->{DEFAULT};
-    # Replace any abstract default value (such as 'TRUE' or 'FALSE')
-    # with its database-specific implementation.
-    if ( defined $default && exists($self->{db_specific}->{$default}) ) {
-        $default = $self->{db_specific}->{$default};
-    }
+  my $self  = shift;
+  my $finfo = (@_ == 1 && ref($_[0]) eq 'HASH') ? $_[0] : {@_};
+  my $type  = $finfo->{TYPE};
+  confess "A valid TYPE was not specified for this column (got "
+    . Dumper($finfo) . ")"
+    unless ($type);
+
+  my $default = $finfo->{DEFAULT};
+
+  # Replace any abstract default value (such as 'TRUE' or 'FALSE')
+  # with its database-specific implementation.
+  if (defined $default && exists($self->{db_specific}->{$default})) {
+    $default = $self->{db_specific}->{$default};
+  }
+
+  my $type_ddl = $self->convert_type($type);
+
+  # DEFAULT attribute must appear before any column constraints
+  # (e.g., NOT NULL), for Oracle
+  $type_ddl .= " DEFAULT $default" if (defined($default));
 
-    my $type_ddl = $self->convert_type($type);
-    # DEFAULT attribute must appear before any column constraints
-    # (e.g., NOT NULL), for Oracle
-    $type_ddl .= " DEFAULT $default" if (defined($default));
-    # PRIMARY KEY must appear before NOT NULL for SQLite.
-    $type_ddl .= " PRIMARY KEY" if ($finfo->{PRIMARYKEY});
-    $type_ddl .= " NOT NULL" if ($finfo->{NOTNULL});
+  # PRIMARY KEY must appear before NOT NULL for SQLite.
+  $type_ddl .= " PRIMARY KEY" if ($finfo->{PRIMARYKEY});
+  $type_ddl .= " NOT NULL"    if ($finfo->{NOTNULL});
 
-    return($type_ddl);
+  return ($type_ddl);
 
-} #eosub--get_type_ddl
+}    #eosub--get_type_ddl
 
 
 sub get_fk_ddl {
@@ -2027,78 +2005,80 @@ is undefined.
 
 =cut
 
-    my ($self, $table, $column, $references) = @_;
-    return "" if !$references;
+  my ($self, $table, $column, $references) = @_;
+  return "" if !$references;
 
-    my $update    = $references->{UPDATE} || 'CASCADE';
-    my $delete    = $references->{DELETE} || 'RESTRICT';
-    my $to_table  = $references->{TABLE}  || confess "No table in reference";
-    my $to_column = $references->{COLUMN} || confess "No column in reference";
-    my $fk_name   = $self->_get_fk_name($table, $column, $references);
+  my $update    = $references->{UPDATE} || 'CASCADE';
+  my $delete    = $references->{DELETE} || 'RESTRICT';
+  my $to_table  = $references->{TABLE}  || confess "No table in reference";
+  my $to_column = $references->{COLUMN} || confess "No column in reference";
+  my $fk_name = $self->_get_fk_name($table, $column, $references);
 
-    return "\n     CONSTRAINT $fk_name FOREIGN KEY ($column)\n"
-         . "     REFERENCES $to_table($to_column)\n"
-         . "      ON UPDATE $update ON DELETE $delete";
+  return
+      "\n     CONSTRAINT $fk_name FOREIGN KEY ($column)\n"
+    . "     REFERENCES $to_table($to_column)\n"
+    . "      ON UPDATE $update ON DELETE $delete";
 }
 
 # Generates a name for a Foreign Key. It's separate from get_fk_ddl
 # so that certain databases can override it (for shorter identifiers or
 # other reasons).
 sub _get_fk_name {
-    my ($self, $table, $column, $references) = @_;
-    my $to_table  = $references->{TABLE}; 
-    my $to_column = $references->{COLUMN};
-    my $name = "fk_${table}_${column}_${to_table}_${to_column}";
+  my ($self, $table, $column, $references) = @_;
+  my $to_table  = $references->{TABLE};
+  my $to_column = $references->{COLUMN};
+  my $name      = "fk_${table}_${column}_${to_table}_${to_column}";
 
-    if (length($name) > $self->MAX_IDENTIFIER_LEN) {
-        $name = 'fk_' . $self->_hash_identifier($name);
-    }
+  if (length($name) > $self->MAX_IDENTIFIER_LEN) {
+    $name = 'fk_' . $self->_hash_identifier($name);
+  }
 
-    return $name;
+  return $name;
 }
 
 sub _hash_identifier {
-    my ($invocant, $value) = @_;
-    # We do -7 to allow prefixes like "idx_" or "fk_", or perhaps something
-    # longer in the future.
-    return substr(md5_hex($value), 0, $invocant->MAX_IDENTIFIER_LEN - 7);
+  my ($invocant, $value) = @_;
+
+  # We do -7 to allow prefixes like "idx_" or "fk_", or perhaps something
+  # longer in the future.
+  return substr(md5_hex($value), 0, $invocant->MAX_IDENTIFIER_LEN - 7);
 }
 
 
 sub get_add_fks_sql {
-    my ($self, $table, $column_fks) = @_;
-
-    my @add = $self->_column_fks_to_ddl($table, $column_fks);
-
-    my @sql;
-    if ($self->MULTIPLE_FKS_IN_ALTER) {
-        my $alter = "ALTER TABLE $table ADD " . join(', ADD ', @add);
-        push(@sql, $alter);
+  my ($self, $table, $column_fks) = @_;
+
+  my @add = $self->_column_fks_to_ddl($table, $column_fks);
+
+  my @sql;
+  if ($self->MULTIPLE_FKS_IN_ALTER) {
+    my $alter = "ALTER TABLE $table ADD " . join(', ADD ', @add);
+    push(@sql, $alter);
+  }
+  else {
+    foreach my $fk_string (@add) {
+      push(@sql, "ALTER TABLE $table ADD $fk_string");
     }
-    else {
-        foreach my $fk_string (@add) {
-            push(@sql, "ALTER TABLE $table ADD $fk_string");
-        }
-    }
-    return @sql;
+  }
+  return @sql;
 }
 
 sub _column_fks_to_ddl {
-    my ($self, $table, $column_fks) = @_;
-    my @ddl;
-    foreach my $column (keys %$column_fks) {
-        my $def = $column_fks->{$column};
-        my $fk_string = $self->get_fk_ddl($table, $column, $def);
-        push(@ddl, $fk_string);
-    }
-    return @ddl;
+  my ($self, $table, $column_fks) = @_;
+  my @ddl;
+  foreach my $column (keys %$column_fks) {
+    my $def = $column_fks->{$column};
+    my $fk_string = $self->get_fk_ddl($table, $column, $def);
+    push(@ddl, $fk_string);
+  }
+  return @ddl;
 }
 
-sub get_drop_fk_sql { 
-    my ($self, $table, $column, $references) = @_;
-    my $fk_name = $self->_get_fk_name($table, $column, $references);
+sub get_drop_fk_sql {
+  my ($self, $table, $column, $references) = @_;
+  my $fk_name = $self->_get_fk_name($table, $column, $references);
 
-    return ("ALTER TABLE $table DROP CONSTRAINT $fk_name");
+  return ("ALTER TABLE $table DROP CONSTRAINT $fk_name");
 }
 
 sub convert_type {
@@ -2109,8 +2089,8 @@ Converts a TYPE from the L</ABSTRACT_SCHEMA> format into the real SQL type.
 
 =cut
 
-    my ($self, $type) = @_;
-    return $self->{db_specific}->{$type} || $type;
+  my ($self, $type) = @_;
+  return $self->{db_specific}->{$type} || $type;
 }
 
 sub get_column {
@@ -2127,16 +2107,16 @@ sub get_column {
 
 =cut
 
-    my($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    # Prevent a possible dereferencing of an undef hash, if the
-    # table doesn't exist.
-    if (exists $self->{schema}->{$table}) {
-        my %fields = (@{ $self->{schema}{$table}{FIELDS} });
-        return $fields{$column};
-    }
-    return undef;
-} #eosub--get_column
+  # Prevent a possible dereferencing of an undef hash, if the
+  # table doesn't exist.
+  if (exists $self->{schema}->{$table}) {
+    my %fields = (@{$self->{schema}{$table}{FIELDS}});
+    return $fields{$column};
+  }
+  return undef;
+}    #eosub--get_column
 
 sub get_table_list {
 
@@ -2151,8 +2131,8 @@ sub get_table_list {
 
 =cut
 
-    my $self = shift;
-    return sort keys %{$self->{schema}};   
+  my $self = shift;
+  return sort keys %{$self->{schema}};
 }
 
 sub get_table_columns {
@@ -2166,34 +2146,33 @@ sub get_table_columns {
 
 =cut
 
-    my($self, $table) = @_;
-    my @ddl = ();
+  my ($self, $table) = @_;
+  my @ddl = ();
 
-    my $thash = $self->{schema}{$table};
-    die "Table $table does not exist in the database schema."
-        unless (ref($thash));
+  my $thash = $self->{schema}{$table};
+  die "Table $table does not exist in the database schema." unless (ref($thash));
 
-    my @columns = ();
-    my @fields = @{ $thash->{FIELDS} };
-    while (@fields) {
-        push(@columns, shift(@fields));
-        shift(@fields);
-    }
+  my @columns = ();
+  my @fields  = @{$thash->{FIELDS}};
+  while (@fields) {
+    push(@columns, shift(@fields));
+    shift(@fields);
+  }
 
-    return @columns;
+  return @columns;
 
-} #eosub--get_table_columns
+}    #eosub--get_table_columns
 
 sub get_table_indexes_abstract {
-    my ($self, $table) = @_;
-    my $table_def = $self->get_table_abstract($table);
-    my %indexes = @{$table_def->{INDEXES} || []};
-    return \%indexes;
+  my ($self, $table) = @_;
+  my $table_def = $self->get_table_abstract($table);
+  my %indexes = @{$table_def->{INDEXES} || []};
+  return \%indexes;
 }
 
 sub get_create_database_sql {
-    my ($self, $name) = @_;
-    return ("CREATE DATABASE $name");
+  my ($self, $name) = @_;
+  return ("CREATE DATABASE \"$name\"");
 }
 
 sub get_table_ddl {
@@ -2210,30 +2189,29 @@ sub get_table_ddl {
 
 =cut
 
-    my($self, $table) = @_;
-    my @ddl = ();
+  my ($self, $table) = @_;
+  my @ddl = ();
 
-    die "Table $table does not exist in the database schema."
-        unless (ref($self->{schema}{$table}));
+  die "Table $table does not exist in the database schema."
+    unless (ref($self->{schema}{$table}));
 
-    my $create_table = $self->_get_create_table_ddl($table);
-    push(@ddl, $create_table) if $create_table;
+  my $create_table = $self->_get_create_table_ddl($table);
+  push(@ddl, $create_table) if $create_table;
 
-    my @indexes = @{ $self->{schema}{$table}{INDEXES} || [] };
-    while (@indexes) {
-        my $index_name = shift(@indexes);
-        my $index_info = shift(@indexes);
-        my $index_sql  = $self->get_add_index_ddl($table, $index_name, 
-                                                  $index_info);
-        push(@ddl, $index_sql) if $index_sql;
-    }
+  my @indexes = @{$self->{schema}{$table}{INDEXES} || []};
+  while (@indexes) {
+    my $index_name = shift(@indexes);
+    my $index_info = shift(@indexes);
+    my $index_sql  = $self->get_add_index_ddl($table, $index_name, $index_info);
+    push(@ddl, $index_sql) if $index_sql;
+  }
 
-    push(@ddl, @{ $self->{schema}{$table}{DB_EXTRAS} })
-      if (ref($self->{schema}{$table}{DB_EXTRAS}));
+  push(@ddl, @{$self->{schema}{$table}{DB_EXTRAS}})
+    if (ref($self->{schema}{$table}{DB_EXTRAS}));
 
-    return @ddl;
+  return @ddl;
 
-} #eosub--get_table_ddl
+}    #eosub--get_table_ddl
 
 sub _get_create_table_ddl {
 
@@ -2246,30 +2224,29 @@ sub _get_create_table_ddl {
 
 =cut
 
-    my($self, $table) = @_;
-
-    my $thash = $self->{schema}{$table};
-    die "Table $table does not exist in the database schema."
-        unless ref $thash;
-
-    my (@col_lines, @fk_lines);
-    my @fields = @{ $thash->{FIELDS} };
-    while (@fields) {
-        my $field = shift(@fields);
-        my $finfo = shift(@fields);
-        push(@col_lines, "\t$field\t" . $self->get_type_ddl($finfo));
-        if ($self->FK_ON_CREATE and $finfo->{REFERENCES}) {
-            my $fk = $finfo->{REFERENCES};
-            my $fk_ddl = $self->get_fk_ddl($table, $field, $fk);
-            push(@fk_lines, $fk_ddl);
-        }
+  my ($self, $table) = @_;
+
+  my $thash = $self->{schema}{$table};
+  die "Table $table does not exist in the database schema." unless ref $thash;
+
+  my (@col_lines, @fk_lines);
+  my @fields = @{$thash->{FIELDS}};
+  while (@fields) {
+    my $field = shift(@fields);
+    my $finfo = shift(@fields);
+    push(@col_lines, "\t$field\t" . $self->get_type_ddl($finfo));
+    if ($self->FK_ON_CREATE and $finfo->{REFERENCES}) {
+      my $fk = $finfo->{REFERENCES};
+      my $fk_ddl = $self->get_fk_ddl($table, $field, $fk);
+      push(@fk_lines, $fk_ddl);
     }
-    
-    my $sql = "CREATE TABLE $table (\n" . join(",\n", @col_lines, @fk_lines)
-              . "\n)";
-    return $sql
+  }
 
-} 
+  my $sql
+    = "CREATE TABLE $table (\n" . join(",\n", @col_lines, @fk_lines) . "\n)";
+  return $sql;
+
+}
 
 sub _get_create_index_ddl {
 
@@ -2285,16 +2262,17 @@ sub _get_create_index_ddl {
 
 =cut
 
-    my ($self, $table_name, $index_name, $index_fields, $index_type) = @_;
+  my ($self, $table_name, $index_name, $index_fields, $index_type) = @_;
+
+  my $sql = "CREATE ";
+  $sql .= "$index_type " if ($index_type && $index_type eq 'UNIQUE');
+  $sql
+    .= "INDEX $index_name ON $table_name \(" . join(", ", @$index_fields) . "\)";
 
-    my $sql = "CREATE ";
-    $sql .= "$index_type " if ($index_type && $index_type eq 'UNIQUE');
-    $sql .= "INDEX $index_name ON $table_name \(" .
-      join(", ", @$index_fields) . "\)";
+  return ($sql);
 
-    return($sql);
+}    #eosub--_get_create_index_ddl
 
-} #eosub--_get_create_index_ddl
 #--------------------------------------------------------------------------
 
 sub get_add_column_ddl {
@@ -2313,22 +2291,52 @@ sub get_add_column_ddl {
 
 =cut
 
-    my ($self, $table, $column, $definition, $init_value) = @_;
-    my @statements;
-    push(@statements, "ALTER TABLE $table ". $self->ADD_COLUMN ." $column " .
-        $self->get_type_ddl($definition));
+  my ($self, $table, $column, $definition, $init_value) = @_;
+  my @statements;
+
+  # If DEFAULT is undefined and the column is enforced to be NOT NULL,
+  # then we use the init value as a temporary default value.
+  my $temp_default = 0;
+  if ( $definition->{NOTNULL}
+    && !exists $definition->{DEFAULT}
+    && defined $init_value)
+  {
+    $temp_default = 1;
+    $definition->{DEFAULT} = $init_value;
+  }
+
+  push(@statements,
+        "ALTER TABLE $table "
+      . $self->ADD_COLUMN
+      . " $column "
+      . $self->get_type_ddl($definition));
+
+  if ($temp_default) {
+    push(@statements, $self->get_drop_default_ddl($table, $column));
+    delete $definition->{DEFAULT};
+  }
+
+  if (defined $definition->{REFERENCES}) {
+    push(@statements,
+      $self->get_add_fks_sql($table, {$column => $definition->{REFERENCES}}));
+  }
+
+  return (@statements);
+}
 
-    # XXX - Note that although this works for MySQL, most databases will fail
-    # before this point, if we haven't set a default.
-    (push(@statements, "UPDATE $table SET $column = $init_value"))
-        if defined $init_value;
+sub get_drop_default_ddl {
 
-    if (defined $definition->{REFERENCES}) {
-        push(@statements, $self->get_add_fks_sql($table, { $column =>
-                                                           $definition->{REFERENCES} }));
-    }
+=item C<get_drop_default_ddl>
+
+ Description: Gets SQL to drop the default value of a column.
+ Params:      $table  - The table containing the column.
+              $column - The name of the column whose default value must be dropped.
+ Returns:     A string containing the SQL to drop the default value.
 
-    return (@statements);
+=cut
+
+  my ($self, $table, $column) = @_;
+  return "ALTER TABLE $table ALTER COLUMN $column DROP DEFAULT";
 }
 
 sub get_add_index_ddl {
@@ -2349,20 +2357,21 @@ sub get_add_index_ddl {
 
 =cut
 
-    my ($self, $table, $name, $definition) = @_;
+  my ($self, $table, $name, $definition) = @_;
 
-    my ($index_fields, $index_type);
-    # Index defs can be arrays or hashes
-    if (ref($definition) eq 'HASH') {
-        $index_fields = $definition->{FIELDS};
-        $index_type = $definition->{TYPE};
-    } else {
-        $index_fields = $definition;
-        $index_type = '';
-    }
-    
-    return $self->_get_create_index_ddl($table, $name, $index_fields, 
-                                        $index_type);
+  my ($index_fields, $index_type);
+
+  # Index defs can be arrays or hashes
+  if (ref($definition) eq 'HASH') {
+    $index_fields = $definition->{FIELDS};
+    $index_type   = $definition->{TYPE};
+  }
+  else {
+    $index_fields = $definition;
+    $index_type   = '';
+  }
+
+  return $self->_get_create_index_ddl($table, $name, $index_fields, $index_type);
 }
 
 sub get_alter_column_ddl {
@@ -2385,85 +2394,88 @@ sub get_alter_column_ddl {
 
 =cut
 
-    my $self = shift;
-    my ($table, $column, $new_def, $set_nulls_to) = @_;
-
-    my @statements;
-    my $old_def = $self->get_column_abstract($table, $column);
-    my $specific = $self->{db_specific};
-
-    # If the types have changed, we have to deal with that.
-    if (uc(trim($old_def->{TYPE})) ne uc(trim($new_def->{TYPE}))) {
-        push(@statements, $self->_get_alter_type_sql($table, $column, 
-                                                     $new_def, $old_def));
-    }
-
-    my $default = $new_def->{DEFAULT};
-    my $default_old = $old_def->{DEFAULT};
-
-    if (defined $default) {
-        $default = $specific->{$default} if exists $specific->{$default};
-    }
-    # This first condition prevents "uninitialized value" errors.
-    if (!defined $default && !defined $default_old) {
-        # Do Nothing
-    }
-    # If we went from having a default to not having one
-    elsif (!defined $default && defined $default_old) {
-        push(@statements, "ALTER TABLE $table ALTER COLUMN $column"
-                        . " DROP DEFAULT");
-    }
-    # If we went from no default to a default, or we changed the default.
-    elsif ( (defined $default && !defined $default_old) || 
-            ($default ne $default_old) ) 
-    {
-        push(@statements, "ALTER TABLE $table ALTER COLUMN $column "
-                         . " SET DEFAULT $default");
-    }
-
-    # If we went from NULL to NOT NULL.
-    if (!$old_def->{NOTNULL} && $new_def->{NOTNULL}) {
-        push(@statements, $self->_set_nulls_sql(@_));
-        push(@statements, "ALTER TABLE $table ALTER COLUMN $column"
-                        . " SET NOT NULL");
-    }
-    # If we went from NOT NULL to NULL
-    elsif ($old_def->{NOTNULL} && !$new_def->{NOTNULL}) {
-        push(@statements, "ALTER TABLE $table ALTER COLUMN $column"
-                        . " DROP NOT NULL");
-    }
-
-    # If we went from not being a PRIMARY KEY to being a PRIMARY KEY.
-    if (!$old_def->{PRIMARYKEY} && $new_def->{PRIMARYKEY}) {
-        push(@statements, "ALTER TABLE $table ADD PRIMARY KEY ($column)");
-    }
-    # If we went from being a PK to not being a PK
-    elsif ( $old_def->{PRIMARYKEY} && !$new_def->{PRIMARYKEY} ) {
-        push(@statements, "ALTER TABLE $table DROP PRIMARY KEY");
-    }
-
-    return @statements;
+  my $self = shift;
+  my ($table, $column, $new_def, $set_nulls_to) = @_;
+
+  my @statements;
+  my $old_def = $self->get_column_abstract($table, $column);
+  my $specific = $self->{db_specific};
+
+  # If the types have changed, we have to deal with that.
+  if (uc(trim($old_def->{TYPE})) ne uc(trim($new_def->{TYPE}))) {
+    push(@statements,
+      $self->_get_alter_type_sql($table, $column, $new_def, $old_def));
+  }
+
+  my $default     = $new_def->{DEFAULT};
+  my $default_old = $old_def->{DEFAULT};
+
+  if (defined $default) {
+    $default = $specific->{$default} if exists $specific->{$default};
+  }
+
+  # This first condition prevents "uninitialized value" errors.
+  if (!defined $default && !defined $default_old) {
+
+    # Do Nothing
+  }
+
+  # If we went from having a default to not having one
+  elsif (!defined $default && defined $default_old) {
+    push(@statements, $self->get_drop_default_ddl($table, $column));
+  }
+
+  # If we went from no default to a default, or we changed the default.
+  elsif ((defined $default && !defined $default_old)
+    || ($default ne $default_old))
+  {
+    push(@statements,
+      "ALTER TABLE $table ALTER COLUMN $column " . " SET DEFAULT $default");
+  }
+
+  # If we went from NULL to NOT NULL.
+  if (!$old_def->{NOTNULL} && $new_def->{NOTNULL}) {
+    push(@statements, $self->_set_nulls_sql(@_));
+    push(@statements, "ALTER TABLE $table ALTER COLUMN $column" . " SET NOT NULL");
+  }
+
+  # If we went from NOT NULL to NULL
+  elsif ($old_def->{NOTNULL} && !$new_def->{NOTNULL}) {
+    push(@statements, "ALTER TABLE $table ALTER COLUMN $column" . " DROP NOT NULL");
+  }
+
+  # If we went from not being a PRIMARY KEY to being a PRIMARY KEY.
+  if (!$old_def->{PRIMARYKEY} && $new_def->{PRIMARYKEY}) {
+    push(@statements, "ALTER TABLE $table ADD PRIMARY KEY ($column)");
+  }
+
+  # If we went from being a PK to not being a PK
+  elsif ($old_def->{PRIMARYKEY} && !$new_def->{PRIMARYKEY}) {
+    push(@statements, "ALTER TABLE $table DROP PRIMARY KEY");
+  }
+
+  return @statements;
 }
 
 # Helps handle any fields that were NULL before, if we have a default,
 # when doing an ALTER COLUMN.
 sub _set_nulls_sql {
-    my ($self, $table, $column, $new_def, $set_nulls_to) = @_;
-    my $default = $new_def->{DEFAULT};
-    # If we have a set_nulls_to, that overrides the DEFAULT 
-    # (although nobody would usually specify both a default and 
-    # a set_nulls_to.)
-    $default = $set_nulls_to if defined $set_nulls_to;
-    if (defined $default) {
-         my $specific = $self->{db_specific};
-         $default = $specific->{$default} if exists $specific->{$default};
-    }
-    my @sql;
-    if (defined $default) {
-        push(@sql, "UPDATE $table SET $column = $default"
-                . "  WHERE $column IS NULL");
-    }
-    return @sql;
+  my ($self, $table, $column, $new_def, $set_nulls_to) = @_;
+  my $default = $new_def->{DEFAULT};
+
+  # If we have a set_nulls_to, that overrides the DEFAULT
+  # (although nobody would usually specify both a default and
+  # a set_nulls_to.)
+  $default = $set_nulls_to if defined $set_nulls_to;
+  if (defined $default) {
+    my $specific = $self->{db_specific};
+    $default = $specific->{$default} if exists $specific->{$default};
+  }
+  my @sql;
+  if (defined $default) {
+    push(@sql, "UPDATE $table SET $column = $default" . "  WHERE $column IS NULL");
+  }
+  return @sql;
 }
 
 sub get_drop_index_ddl {
@@ -2477,11 +2489,11 @@ sub get_drop_index_ddl {
 
 =cut
 
-    my ($self, $table, $name) = @_;
+  my ($self, $table, $name) = @_;
 
-    # Although ANSI SQL-92 doesn't specify a method of dropping an index,
-    # many DBs support this syntax.
-    return ("DROP INDEX $name");
+  # Although ANSI SQL-92 doesn't specify a method of dropping an index,
+  # many DBs support this syntax.
+  return ("DROP INDEX $name");
 }
 
 sub get_drop_column_ddl {
@@ -2495,8 +2507,8 @@ sub get_drop_column_ddl {
 
 =cut
 
-    my ($self, $table, $column) = @_;
-    return ("ALTER TABLE $table DROP COLUMN $column");
+  my ($self, $table, $column) = @_;
+  return ("ALTER TABLE $table DROP COLUMN $column");
 }
 
 =item C<get_drop_table_ddl($table)>
@@ -2508,8 +2520,8 @@ sub get_drop_column_ddl {
 =cut
 
 sub get_drop_table_ddl {
-    my ($self, $table) = @_;
-    return ("DROP TABLE $table");
+  my ($self, $table) = @_;
+  return ("DROP TABLE $table");
 }
 
 sub get_rename_column_ddl {
@@ -2527,8 +2539,8 @@ sub get_rename_column_ddl {
 
 =cut
 
-    die "ANSI SQL has no way to rename a column, and your database driver\n"
-        . " has not implemented a method.";
+  die "ANSI SQL has no way to rename a column, and your database driver\n"
+    . " has not implemented a method.";
 }
 
 
@@ -2558,8 +2570,8 @@ Gets SQL to rename a table in the database.
 
 =cut
 
-    my ($self, $old_name, $new_name) = @_;
-    return ("ALTER TABLE $old_name RENAME TO $new_name");
+  my ($self, $old_name, $new_name) = @_;
+  return ("ALTER TABLE $old_name RENAME TO $new_name");
 }
 
 =item C<delete_table($name)>
@@ -2572,13 +2584,13 @@ Gets SQL to rename a table in the database.
 =cut
 
 sub delete_table {
-    my ($self, $name) = @_;
+  my ($self, $name) = @_;
 
-    die "Attempted to delete nonexistent table '$name'." unless
-        $self->get_table_abstract($name);
+  die "Attempted to delete nonexistent table '$name'."
+    unless $self->get_table_abstract($name);
 
-    delete $self->{abstract_schema}->{$name};
-    delete $self->{schema}->{$name};
+  delete $self->{abstract_schema}->{$name};
+  delete $self->{schema}->{$name};
 }
 
 sub get_column_abstract {
@@ -2595,15 +2607,15 @@ sub get_column_abstract {
 
 =cut
 
-    my ($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    # Prevent a possible dereferencing of an undef hash, if the
-    # table doesn't exist.
-    if ($self->get_table_abstract($table)) {
-        my %fields = (@{ $self->{abstract_schema}{$table}{FIELDS} });
-        return $fields{$column};
-    }
-    return undef;
+  # Prevent a possible dereferencing of an undef hash, if the
+  # table doesn't exist.
+  if ($self->get_table_abstract($table)) {
+    my %fields = (@{$self->{abstract_schema}{$table}{FIELDS}});
+    return $fields{$column};
+  }
+  return undef;
 }
 
 =item C<get_indexes_on_column_abstract($table, $column)>
@@ -2621,29 +2633,31 @@ sub get_column_abstract {
 =cut
 
 sub get_indexes_on_column_abstract {
-    my ($self, $table, $column) = @_;
-    my %ret_hash;
-
-    my $table_def = $self->get_table_abstract($table);
-    if ($table_def && exists $table_def->{INDEXES}) {
-        my %indexes = (@{ $table_def->{INDEXES} });
-        foreach my $index_name (keys %indexes) {
-            my $col_list;
-            # Get the column list, depending on whether the index
-            # is in hashref or arrayref format.
-            if (ref($indexes{$index_name}) eq 'HASH') {
-                $col_list = $indexes{$index_name}->{FIELDS};
-            } else {
-                $col_list = $indexes{$index_name};
-            }
-
-            if(grep($_ eq $column, @$col_list)) {
-                $ret_hash{$index_name} = dclone($indexes{$index_name});
-            }
-        }
+  my ($self, $table, $column) = @_;
+  my %ret_hash;
+
+  my $table_def = $self->get_table_abstract($table);
+  if ($table_def && exists $table_def->{INDEXES}) {
+    my %indexes = (@{$table_def->{INDEXES}});
+    foreach my $index_name (keys %indexes) {
+      my $col_list;
+
+      # Get the column list, depending on whether the index
+      # is in hashref or arrayref format.
+      if (ref($indexes{$index_name}) eq 'HASH') {
+        $col_list = $indexes{$index_name}->{FIELDS};
+      }
+      else {
+        $col_list = $indexes{$index_name};
+      }
+
+      if (grep($_ eq $column, @$col_list)) {
+        $ret_hash{$index_name} = dclone($indexes{$index_name});
+      }
     }
+  }
 
-    return %ret_hash;
+  return %ret_hash;
 }
 
 sub get_index_abstract {
@@ -2659,16 +2673,16 @@ sub get_index_abstract {
 
 =cut
 
-    my ($self, $table, $index) = @_;
+  my ($self, $table, $index) = @_;
 
-    # Prevent a possible dereferencing of an undef hash, if the
-    # table doesn't exist.
-    my $index_table = $self->get_table_abstract($table);
-    if ($index_table && exists $index_table->{INDEXES}) {
-        my %indexes = (@{ $index_table->{INDEXES} });
-        return $indexes{$index};
-    }
-    return undef;
+  # Prevent a possible dereferencing of an undef hash, if the
+  # table doesn't exist.
+  my $index_table = $self->get_table_abstract($table);
+  if ($index_table && exists $index_table->{INDEXES}) {
+    my %indexes = (@{$index_table->{INDEXES}});
+    return $indexes{$index};
+  }
+  return undef;
 }
 
 =item C<get_table_abstract($table)>
@@ -2682,8 +2696,8 @@ sub get_index_abstract {
 =cut
 
 sub get_table_abstract {
-    my ($self, $table) = @_;
-    return $self->{abstract_schema}->{$table};
+  my ($self, $table) = @_;
+  return $self->{abstract_schema}->{$table};
 }
 
 =item C<add_table($name, \%definition)>
@@ -2699,22 +2713,20 @@ sub get_table_abstract {
 =cut
 
 sub add_table {
-    my ($self, $name, $definition) = @_;
-    (die "Table already exists: $name")
-        if exists $self->{abstract_schema}->{$name};
-    if ($definition) {
-        $self->{abstract_schema}->{$name} = dclone($definition);
-        $self->{schema} = dclone($self->{abstract_schema});
-        $self->_adjust_schema();
-    }
-    else {
-        $self->{abstract_schema}->{$name} = {FIELDS => []};
-        $self->{schema}->{$name}          = {FIELDS => []};
-    }
+  my ($self, $name, $definition) = @_;
+  (die "Table already exists: $name") if exists $self->{abstract_schema}->{$name};
+  if ($definition) {
+    $self->{abstract_schema}->{$name} = dclone($definition);
+    $self->{schema} = dclone($self->{abstract_schema});
+    $self->_adjust_schema();
+  }
+  else {
+    $self->{abstract_schema}->{$name} = {FIELDS => []};
+    $self->{schema}->{$name}          = {FIELDS => []};
+  }
 }
 
 
-
 sub rename_table {
 
 =item C<rename_table>
@@ -2724,10 +2736,10 @@ Renames a table from C<$old_name> to C<$new_name> in this Schema object.
 =cut
 
 
-    my ($self, $old_name, $new_name) = @_;
-    my $table = $self->get_table_abstract($old_name);
-    $self->delete_table($old_name);
-    $self->add_table($new_name, $table);
+  my ($self, $old_name, $new_name) = @_;
+  my $table = $self->get_table_abstract($old_name);
+  $self->delete_table($old_name);
+  $self->add_table($new_name, $table);
 }
 
 sub delete_column {
@@ -2742,17 +2754,18 @@ sub delete_column {
 
 =cut
 
-    my ($self, $table, $column) = @_;
+  my ($self, $table, $column) = @_;
 
-    my $abstract_fields = $self->{abstract_schema}{$table}{FIELDS};
-    my $name_position = firstidx { $_ eq $column } @$abstract_fields;
-    die "Attempted to delete nonexistent column ${table}.${column}" 
-        if $name_position == -1;
-    # Delete the key/value pair from the array.
-    splice(@$abstract_fields, $name_position, 2);
+  my $abstract_fields = $self->{abstract_schema}{$table}{FIELDS};
+  my $name_position = firstidx { $_ eq $column } @$abstract_fields;
+  die "Attempted to delete nonexistent column ${table}.${column}"
+    if $name_position == -1;
 
-    $self->{schema} = dclone($self->{abstract_schema});
-    $self->_adjust_schema();
+  # Delete the key/value pair from the array.
+  splice(@$abstract_fields, $name_position, 2);
+
+  $self->{schema} = dclone($self->{abstract_schema});
+  $self->_adjust_schema();
 }
 
 sub rename_column {
@@ -2768,11 +2781,11 @@ sub rename_column {
 
 =cut
 
-    my ($self, $table, $old_name, $new_name) = @_;
-    my $def = $self->get_column_abstract($table, $old_name);
-    die "Renaming a column that doesn't exist" if !$def;
-    $self->delete_column($table, $old_name);
-    $self->set_column($table, $new_name, $def);
+  my ($self, $table, $old_name, $new_name) = @_;
+  my $def = $self->get_column_abstract($table, $old_name);
+  die "Renaming a column that doesn't exist" if !$def;
+  $self->delete_column($table, $old_name);
+  $self->set_column($table, $new_name, $def);
 }
 
 sub set_column {
@@ -2793,10 +2806,10 @@ sub set_column {
 
 =cut
 
-    my ($self, $table, $column, $new_def) = @_;
+  my ($self, $table, $column, $new_def) = @_;
 
-    my $fields = $self->{abstract_schema}{$table}{FIELDS};
-    $self->_set_object($table, $column, $new_def, $fields);
+  my $fields = $self->{abstract_schema}{$table}{FIELDS};
+  $self->_set_object($table, $column, $new_def, $fields);
 }
 
 =item C<set_fk($table, $column \%fk_def)>
@@ -2806,19 +2819,20 @@ Sets the C<REFERENCES> item on the specified column.
 =cut
 
 sub set_fk {
-    my ($self, $table, $column, $fk_def) = @_;
-    # Don't want to modify the source def before we explicitly set it below.
-    # This is just us being extra-cautious.
-    my $column_def = dclone($self->get_column_abstract($table, $column));
-    die "Tried to set an fk on $table.$column, but that column doesn't exist"
-        if !$column_def;
-    if ($fk_def) {
-        $column_def->{REFERENCES} = $fk_def;
-    }
-    else {
-        delete $column_def->{REFERENCES};
-    }
-    $self->set_column($table, $column, $column_def);
+  my ($self, $table, $column, $fk_def) = @_;
+
+  # Don't want to modify the source def before we explicitly set it below.
+  # This is just us being extra-cautious.
+  my $column_def = dclone($self->get_column_abstract($table, $column));
+  die "Tried to set an fk on $table.$column, but that column doesn't exist"
+    if !$column_def;
+  if ($fk_def) {
+    $column_def->{REFERENCES} = $fk_def;
+  }
+  else {
+    delete $column_def->{REFERENCES};
+  }
+  $self->set_column($table, $column, $column_def);
 }
 
 sub set_index {
@@ -2839,36 +2853,39 @@ sub set_index {
 
 =cut
 
-    my ($self, $table, $name, $definition) = @_;
+  my ($self, $table, $name, $definition) = @_;
 
-    if ( exists $self->{abstract_schema}{$table}
-         && !exists $self->{abstract_schema}{$table}{INDEXES} ) {
-        $self->{abstract_schema}{$table}{INDEXES} = [];
-    }
+  if (exists $self->{abstract_schema}{$table}
+    && !exists $self->{abstract_schema}{$table}{INDEXES})
+  {
+    $self->{abstract_schema}{$table}{INDEXES} = [];
+  }
 
-    my $indexes = $self->{abstract_schema}{$table}{INDEXES};
-    $self->_set_object($table, $name, $definition, $indexes);
+  my $indexes = $self->{abstract_schema}{$table}{INDEXES};
+  $self->_set_object($table, $name, $definition, $indexes);
 }
 
 # A private helper for set_index and set_column.
 # This does the actual "work" of those two functions.
 # $array_to_change is an arrayref.
 sub _set_object {
-    my ($self, $table, $name, $definition, $array_to_change) = @_;
+  my ($self, $table, $name, $definition, $array_to_change) = @_;
 
-    my $obj_position = (firstidx { $_ eq $name } @$array_to_change) + 1;
-    # If the object doesn't exist, then add it.
-    if (!$obj_position) {
-        push(@$array_to_change, $name);
-        push(@$array_to_change, $definition);
-    }
-    # We're modifying an existing object in the Schema.
-    else {
-        splice(@$array_to_change, $obj_position, 1, $definition);
-    }
+  my $obj_position = (firstidx { $_ eq $name } @$array_to_change) + 1;
 
-    $self->{schema} = dclone($self->{abstract_schema});
-    $self->_adjust_schema();
+  # If the object doesn't exist, then add it.
+  if (!$obj_position) {
+    push(@$array_to_change, $name);
+    push(@$array_to_change, $definition);
+  }
+
+  # We're modifying an existing object in the Schema.
+  else {
+    splice(@$array_to_change, $obj_position, 1, $definition);
+  }
+
+  $self->{schema} = dclone($self->{abstract_schema});
+  $self->_adjust_schema();
 }
 
 =item C<delete_index($table, $name)>
@@ -2886,16 +2903,17 @@ sub _set_object {
 =cut
 
 sub delete_index {
-    my ($self, $table, $name) = @_;
-
-    my $indexes = $self->{abstract_schema}{$table}{INDEXES};
-    my $name_position = firstidx { $_ eq $name } @$indexes;
-    die "Attempted to delete nonexistent index $name on the $table table" 
-        if $name_position == -1;
-    # Delete the key/value pair from the array.
-    splice(@$indexes, $name_position, 2);
-    $self->{schema} = dclone($self->{abstract_schema});
-    $self->_adjust_schema();
+  my ($self, $table, $name) = @_;
+
+  my $indexes = $self->{abstract_schema}{$table}{INDEXES};
+  my $name_position = firstidx { $_ eq $name } @$indexes;
+  die "Attempted to delete nonexistent index $name on the $table table"
+    if $name_position == -1;
+
+  # Delete the key/value pair from the array.
+  splice(@$indexes, $name_position, 2);
+  $self->{schema} = dclone($self->{abstract_schema});
+  $self->_adjust_schema();
 }
 
 sub columns_equal {
@@ -2913,24 +2931,24 @@ sub columns_equal {
 
 =cut
 
-    my $self = shift;
-    my $col_one = dclone(shift);
-    my $col_two = dclone(shift);
+  my $self    = shift;
+  my $col_one = dclone(shift);
+  my $col_two = dclone(shift);
 
-    $col_one->{TYPE} = uc($col_one->{TYPE});
-    $col_two->{TYPE} = uc($col_two->{TYPE});
+  $col_one->{TYPE} = uc($col_one->{TYPE});
+  $col_two->{TYPE} = uc($col_two->{TYPE});
 
-    # We don't care about foreign keys when comparing column definitions.
-    delete $col_one->{REFERENCES};
-    delete $col_two->{REFERENCES};
+  # We don't care about foreign keys when comparing column definitions.
+  delete $col_one->{REFERENCES};
+  delete $col_two->{REFERENCES};
 
-    my @col_one_array = %$col_one;
-    my @col_two_array = %$col_two;
+  my @col_one_array = %$col_one;
+  my @col_two_array = %$col_two;
 
-    my ($removed, $added) = diff_arrays(\@col_one_array, \@col_two_array);
+  my ($removed, $added) = diff_arrays(\@col_one_array, \@col_two_array);
 
-    # If there are no differences between the arrays, then they are equal.
-    return !scalar(@$removed) && !scalar(@$added) ? 1 : 0;
+  # If there are no differences between the arrays, then they are equal.
+  return !scalar(@$removed) && !scalar(@$added) ? 1 : 0;
 }
 
 
@@ -2954,18 +2972,18 @@ sub columns_equal {
 =cut
 
 sub serialize_abstract {
-    my ($self) = @_;
-    
-    # Make it ok to eval
-    local $Data::Dumper::Purity = 1;
-    
-    # Avoid cross-refs
-    local $Data::Dumper::Deepcopy = 1;
-    
-    # Always sort keys to allow textual compare
-    local $Data::Dumper::Sortkeys = 1;
-    
-    return Dumper($self->{abstract_schema});
+  my ($self) = @_;
+
+  # Make it ok to eval
+  local $Data::Dumper::Purity = 1;
+
+  # Avoid cross-refs
+  local $Data::Dumper::Deepcopy = 1;
+
+  # Always sort keys to allow textual compare
+  local $Data::Dumper::Sortkeys = 1;
+
+  return Dumper($self->{abstract_schema});
 }
 
 =item C<deserialize_abstract($serialized, $version)>
@@ -2984,36 +3002,34 @@ sub serialize_abstract {
 =cut
 
 sub deserialize_abstract {
-    my ($class, $serialized, $version) = @_;
-
-    my $thawed_hash;
-    if ($version < 2) {
-        $thawed_hash = thaw($serialized);
-    }
-    else {
-        my $cpt = new Safe;
-        $cpt->reval($serialized) ||
-            die "Unable to restore cached schema: " . $@;
-        $thawed_hash = ${$cpt->varglob('VAR1')};
-    }
-
-    # Version 2 didn't have the "created" key for REFERENCES items.
-    if ($version < 3) {
-        my $standard = $class->new()->{abstract_schema};
-        foreach my $table_name (keys %$thawed_hash) {
-            my %standard_fields = 
-                @{ $standard->{$table_name}->{FIELDS} || [] };
-            my $table = $thawed_hash->{$table_name};
-            my %fields = @{ $table->{FIELDS} || [] };
-            while (my ($field, $def) = each %fields) {
-                if (exists $def->{REFERENCES}) {
-                    $def->{REFERENCES}->{created} = 1;
-                }
-            }
+  my ($class, $serialized, $version) = @_;
+
+  my $thawed_hash;
+  if ($version < 2) {
+    $thawed_hash = thaw($serialized);
+  }
+  else {
+    my $cpt = new Safe;
+    $cpt->reval($serialized) || die "Unable to restore cached schema: " . $@;
+    $thawed_hash = ${$cpt->varglob('VAR1')};
+  }
+
+  # Version 2 didn't have the "created" key for REFERENCES items.
+  if ($version < 3) {
+    my $standard = $class->new()->{abstract_schema};
+    foreach my $table_name (keys %$thawed_hash) {
+      my %standard_fields = @{$standard->{$table_name}->{FIELDS} || []};
+      my $table           = $thawed_hash->{$table_name};
+      my %fields          = @{$table->{FIELDS} || []};
+      while (my ($field, $def) = each %fields) {
+        if (exists $def->{REFERENCES}) {
+          $def->{REFERENCES}->{created} = 1;
         }
+      }
     }
+  }
 
-    return $class->new(undef, $thawed_hash);
+  return $class->new(undef, $thawed_hash);
 }
 
 #####################################################################
@@ -3041,8 +3057,8 @@ object.
 =cut
 
 sub get_empty_schema {
-    my ($class) = @_;
-    return $class->deserialize_abstract(Dumper({}), SCHEMA_VERSION);
+  my ($class) = @_;
+  return $class->deserialize_abstract(Dumper({}), SCHEMA_VERSION);
 }
 
 1;
diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm
index 0195fcb06c..a6399430d3 100644
--- a/Bugzilla/DB/Schema/Mysql.pm
+++ b/Bugzilla/DB/Schema/Mysql.pm
@@ -13,7 +13,7 @@ package Bugzilla::DB::Schema::Mysql;
 #
 ###############################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,7 +21,7 @@ use Bugzilla::Error;
 
 use parent qw(Bugzilla::DB::Schema);
 
-# This is for column_info_to_column, to know when a tinyint is a 
+# This is for column_info_to_column, to know when a tinyint is a
 # boolean and when it's really a tinyint. This only has to be accurate
 # up to and through 2.19.3, because that's the only time we need
 # column_info_to_column.
@@ -30,50 +30,59 @@ use parent qw(Bugzilla::DB::Schema);
 # that should be interpreted as a BOOLEAN instead of as an INT1 when
 # reading in the Schema from the disk. The values are discarded; I just
 # used "1" for simplicity.
-# 
+#
 # THIS CONSTANT IS ONLY USED FOR UPGRADES FROM 2.18 OR EARLIER. DON'T
 # UPDATE IT TO MODERN COLUMN NAMES OR DEFINITIONS.
 use constant BOOLEAN_MAP => {
-    bugs           => {everconfirmed => 1, reporter_accessible => 1,
-                       cclist_accessible => 1, qacontact_accessible => 1,
-                       assignee_accessible => 1},
-    longdescs      => {isprivate => 1, already_wrapped => 1},
-    attachments    => {ispatch => 1, isobsolete => 1, isprivate => 1},
-    flags          => {is_active => 1},
-    flagtypes      => {is_active => 1, is_requestable => 1, 
-                       is_requesteeble => 1, is_multiplicable => 1},
-    fielddefs      => {mailhead => 1, obsolete => 1},
-    bug_status     => {isactive => 1},
-    resolution     => {isactive => 1},
-    bug_severity   => {isactive => 1},
-    priority       => {isactive => 1},
-    rep_platform   => {isactive => 1},
-    op_sys         => {isactive => 1},
-    profiles       => {mybugslink => 1, newemailtech => 1},
-    namedqueries   => {linkinfooter => 1, watchfordiffs => 1},
-    groups         => {isbuggroup => 1, isactive => 1},
-    group_control_map => {entry => 1, membercontrol => 1, othercontrol => 1,
-                          canedit => 1},
-    group_group_map => {isbless => 1},
-    user_group_map => {isbless => 1, isderived => 1},
-    products       => {disallownew => 1},
-    series         => {public => 1},
-    whine_queries  => {onemailperbug => 1},
-    quips          => {approved => 1},
-    setting        => {is_enabled => 1}
+  bugs => {
+    everconfirmed        => 1,
+    reporter_accessible  => 1,
+    cclist_accessible    => 1,
+    qacontact_accessible => 1,
+    assignee_accessible  => 1
+  },
+  longdescs   => {isprivate => 1, already_wrapped => 1},
+  attachments => {ispatch   => 1, isobsolete      => 1, isprivate => 1},
+  flags     => {is_active => 1},
+  flagtypes => {
+    is_active        => 1,
+    is_requestable   => 1,
+    is_requesteeble  => 1,
+    is_multiplicable => 1
+  },
+  fielddefs    => {mailhead     => 1, obsolete => 1},
+  bug_status   => {isactive     => 1},
+  resolution   => {isactive     => 1},
+  bug_severity => {isactive     => 1},
+  priority     => {isactive     => 1},
+  rep_platform => {isactive     => 1},
+  op_sys       => {isactive     => 1},
+  profiles     => {mybugslink   => 1, newemailtech => 1},
+  namedqueries => {linkinfooter => 1, watchfordiffs => 1},
+  groups       => {isbuggroup   => 1, isactive => 1},
+  group_control_map =>
+    {entry => 1, membercontrol => 1, othercontrol => 1, canedit => 1},
+  group_group_map => {isbless       => 1},
+  user_group_map  => {isbless       => 1, isderived => 1},
+  products        => {disallownew   => 1},
+  series          => {public        => 1},
+  whine_queries   => {onemailperbug => 1},
+  quips           => {approved      => 1},
+  setting         => {is_enabled    => 1}
 };
 
 # Maps the db_specific hash backwards, for use in column_info_to_column.
 use constant REVERSE_MAPPING => {
-    # Boolean and the SERIAL fields are handled in column_info_to_column,
-    # and so don't have an entry here.
-    TINYINT   => 'INT1',
-    SMALLINT  => 'INT2',
-    MEDIUMINT => 'INT3',
-    INTEGER   => 'INT4',
-
-    # All the other types have the same name in their abstract version
-    # as in their db-specific version, so no reverse mapping is needed.
+
+  # Boolean and the SERIAL fields are handled in column_info_to_column,
+  # and so don't have an entry here.
+  TINYINT   => 'INT1',
+  SMALLINT  => 'INT2',
+  MEDIUMINT => 'INT3',
+  INTEGER   => 'INT4',
+
+  # All the other types have the same name in their abstract version
+  # as in their db-specific version, so no reverse mapping is needed.
 };
 
 use constant MYISAM_TABLES => qw(bugs_fulltext);
@@ -81,181 +90,190 @@ use constant MYISAM_TABLES => qw(bugs_fulltext);
 #------------------------------------------------------------------------------
 sub _initialize {
 
-    my $self = shift;
+  my $self = shift;
+
+  $self = $self->SUPER::_initialize(@_);
 
-    $self = $self->SUPER::_initialize(@_);
+  $self->{db_specific} = {
 
-    $self->{db_specific} = {
+    BOOLEAN => 'tinyint',
+    FALSE   => '0',
+    TRUE    => '1',
 
-        BOOLEAN =>      'tinyint',
-        FALSE =>        '0', 
-        TRUE =>         '1',
+    INT1 => 'tinyint',
+    INT2 => 'smallint',
+    INT3 => 'mediumint',
+    INT4 => 'integer',
 
-        INT1 =>         'tinyint',
-        INT2 =>         'smallint',
-        INT3 =>         'mediumint',
-        INT4 =>         'integer',
+    SMALLSERIAL  => 'smallint auto_increment',
+    MEDIUMSERIAL => 'mediumint auto_increment',
+    INTSERIAL    => 'integer auto_increment',
 
-        SMALLSERIAL =>  'smallint auto_increment',
-        MEDIUMSERIAL => 'mediumint auto_increment',
-        INTSERIAL =>    'integer auto_increment',
+    TINYTEXT   => 'tinytext',
+    MEDIUMTEXT => 'mediumtext',
+    LONGTEXT   => 'mediumtext',
 
-        TINYTEXT =>     'tinytext',
-        MEDIUMTEXT =>   'mediumtext',
-        LONGTEXT =>     'mediumtext',
+    LONGBLOB => 'longblob',
 
-        LONGBLOB =>     'longblob',
+    DATETIME => 'datetime',
+    DATE     => 'date',
+  };
 
-        DATETIME =>     'datetime',
-        DATE     =>     'date',
-    };
+  $self->_adjust_schema;
 
-    $self->_adjust_schema;
+  return $self;
 
-    return $self;
+}    #eosub--_initialize
 
-} #eosub--_initialize
 #------------------------------------------------------------------------------
 sub _get_create_table_ddl {
-    # Extend superclass method to specify the MYISAM storage engine.
-    # Returns a "create table" SQL statement.
 
-    my($self, $table) = @_;
+  # Extend superclass method to specify the MYISAM storage engine.
+  # Returns a "create table" SQL statement.
 
-    my $charset = Bugzilla->dbh->bz_db_is_utf8 ? "CHARACTER SET utf8" : '';
-    my $type    = grep($_ eq $table, MYISAM_TABLES) ? 'MYISAM' : 'InnoDB';
-    return($self->SUPER::_get_create_table_ddl($table) 
-           . " ENGINE = $type $charset");
+  my ($self, $table) = @_;
+
+  my $charset = Bugzilla->dbh->bz_db_is_utf8 ? "CHARACTER SET utf8" : '';
+  my $type = grep($_ eq $table, MYISAM_TABLES) ? 'MYISAM' : 'InnoDB';
+  return (
+    $self->SUPER::_get_create_table_ddl($table) . " ENGINE = $type $charset");
+
+}    #eosub--_get_create_table_ddl
 
-} #eosub--_get_create_table_ddl
 #------------------------------------------------------------------------------
 sub _get_create_index_ddl {
-    # Extend superclass method to create FULLTEXT indexes on text fields.
-    # Returns a "create index" SQL statement.
 
-    my($self, $table_name, $index_name, $index_fields, $index_type) = @_;
+  # Extend superclass method to create FULLTEXT indexes on text fields.
+  # Returns a "create index" SQL statement.
+
+  my ($self, $table_name, $index_name, $index_fields, $index_type) = @_;
+
+  my $sql = "CREATE ";
+  $sql .= "$index_type "
+    if ($index_type eq 'UNIQUE' || $index_type eq 'FULLTEXT');
+  $sql .= "INDEX \`$index_name\` ON $table_name \("
+    . join(", ", @$index_fields) . "\)";
 
-    my $sql = "CREATE ";
-    $sql .= "$index_type " if ($index_type eq 'UNIQUE'
-                               || $index_type eq 'FULLTEXT');
-    $sql .= "INDEX \`$index_name\` ON $table_name \(" .
-      join(", ", @$index_fields) . "\)";
+  return ($sql);
 
-    return($sql);
+}    #eosub--_get_create_index_ddl
 
-} #eosub--_get_create_index_ddl
 #--------------------------------------------------------------------
 
 sub get_create_database_sql {
-    my ($self, $name) = @_;
-    # We only create as utf8 if we have no params (meaning we're doing
-    # a new installation) or if the utf8 param is on.
-    my $create_utf8 = Bugzilla->params->{'utf8'} 
-                      || !defined Bugzilla->params->{'utf8'};
-    my $charset = $create_utf8 ? "CHARACTER SET utf8" : '';
-    return ("CREATE DATABASE $name $charset");
+  my ($self, $name) = @_;
+  return ("CREATE DATABASE `$name` CHARACTER SET utf8");
 }
 
 # MySQL has a simpler ALTER TABLE syntax than ANSI.
 sub get_alter_column_ddl {
-    my ($self, $table, $column, $new_def, $set_nulls_to) = @_;
-    my $old_def = $self->get_column($table, $column);
-    my %new_def_copy = %$new_def;
-    if ($old_def->{PRIMARYKEY} && $new_def->{PRIMARYKEY}) {
-        # If a column stays a primary key do NOT specify PRIMARY KEY in the
-        # ALTER TABLE statement. This avoids a MySQL error that two primary
-        # keys are not allowed.
-        delete $new_def_copy{PRIMARYKEY};
-    }
-
-    my @statements;
-
-    push(@statements, "UPDATE $table SET $column = $set_nulls_to
-                        WHERE $column IS NULL") if defined $set_nulls_to;
-
-    # Calling SET DEFAULT or DROP DEFAULT is *way* faster than calling
-    # CHANGE COLUMN, so just do that if we're just changing the default.
-    my %old_defaultless = %$old_def;
-    my %new_defaultless = %$new_def;
-    delete $old_defaultless{DEFAULT};
-    delete $new_defaultless{DEFAULT};
-    if (!$self->columns_equal($old_def, $new_def)
-        && $self->columns_equal(\%new_defaultless, \%old_defaultless)) 
-    {
-        if (!defined $new_def->{DEFAULT}) {
-            push(@statements,
-                 "ALTER TABLE $table ALTER COLUMN $column DROP DEFAULT");
-        }
-        else {
-            push(@statements, "ALTER TABLE $table ALTER COLUMN $column
-                               SET DEFAULT " . $new_def->{DEFAULT});
-        }
+  my ($self, $table, $column, $new_def, $set_nulls_to) = @_;
+  my $old_def = $self->get_column($table, $column);
+  my %new_def_copy = %$new_def;
+  if ($old_def->{PRIMARYKEY} && $new_def->{PRIMARYKEY}) {
+
+    # If a column stays a primary key do NOT specify PRIMARY KEY in the
+    # ALTER TABLE statement. This avoids a MySQL error that two primary
+    # keys are not allowed.
+    delete $new_def_copy{PRIMARYKEY};
+  }
+
+  my @statements;
+
+  push(
+    @statements, "UPDATE $table SET $column = $set_nulls_to
+                        WHERE $column IS NULL"
+  ) if defined $set_nulls_to;
+
+  # Calling SET DEFAULT or DROP DEFAULT is *way* faster than calling
+  # CHANGE COLUMN, so just do that if we're just changing the default.
+  my %old_defaultless = %$old_def;
+  my %new_defaultless = %$new_def;
+  delete $old_defaultless{DEFAULT};
+  delete $new_defaultless{DEFAULT};
+  if (!$self->columns_equal($old_def, $new_def)
+    && $self->columns_equal(\%new_defaultless, \%old_defaultless))
+  {
+    if (!defined $new_def->{DEFAULT}) {
+      push(@statements, "ALTER TABLE $table ALTER COLUMN $column DROP DEFAULT");
     }
     else {
-        my $new_ddl = $self->get_type_ddl(\%new_def_copy);
-        push(@statements, "ALTER TABLE $table CHANGE COLUMN 
-                       $column $column $new_ddl");
-    }
-
-    if ($old_def->{PRIMARYKEY} && !$new_def->{PRIMARYKEY}) {
-        # Dropping a PRIMARY KEY needs an explicit DROP PRIMARY KEY
-        push(@statements, "ALTER TABLE $table DROP PRIMARY KEY");
+      push(
+        @statements, "ALTER TABLE $table ALTER COLUMN $column
+                               SET DEFAULT " . $new_def->{DEFAULT}
+      );
     }
-
-    return @statements;
+  }
+  else {
+    my $new_ddl = $self->get_type_ddl(\%new_def_copy);
+    push(
+      @statements, "ALTER TABLE $table CHANGE COLUMN 
+                       $column $column $new_ddl"
+    );
+  }
+
+  if ($old_def->{PRIMARYKEY} && !$new_def->{PRIMARYKEY}) {
+
+    # Dropping a PRIMARY KEY needs an explicit DROP PRIMARY KEY
+    push(@statements, "ALTER TABLE $table DROP PRIMARY KEY");
+  }
+
+  return @statements;
 }
 
 sub get_drop_fk_sql {
-    my ($self, $table, $column, $references) = @_;
-    my $fk_name = $self->_get_fk_name($table, $column, $references);
-    my @sql = ("ALTER TABLE $table DROP FOREIGN KEY $fk_name");
-    my $dbh = Bugzilla->dbh;
-
-    # MySQL requires, and will create, an index on any column with
-    # an FK. It will name it after the fk, which we never do.
-    # So if there's an index named after the fk, we also have to delete it. 
-    if ($dbh->bz_index_info_real($table, $fk_name)) {
-        push(@sql, $self->get_drop_index_ddl($table, $fk_name));
-    }
-
-    return @sql;
+  my ($self, $table, $column, $references) = @_;
+  my $fk_name = $self->_get_fk_name($table, $column, $references);
+  my @sql     = ("ALTER TABLE $table DROP FOREIGN KEY $fk_name");
+  my $dbh     = Bugzilla->dbh;
+
+  # MySQL requires, and will create, an index on any column with
+  # an FK. It will name it after the fk, which we never do.
+  # So if there's an index named after the fk, we also have to delete it.
+  if ($dbh->bz_index_info_real($table, $fk_name)) {
+    push(@sql, $self->get_drop_index_ddl($table, $fk_name));
+  }
+
+  return @sql;
 }
 
 sub get_drop_index_ddl {
-    my ($self, $table, $name) = @_;
-    return ("DROP INDEX \`$name\` ON $table");
+  my ($self, $table, $name) = @_;
+  return ("DROP INDEX \`$name\` ON $table");
 }
 
 # A special function for MySQL, for renaming a lot of indexes.
-# Index renames is a hash, where the key is a string - the 
+# Index renames is a hash, where the key is a string - the
 # old names of the index, and the value is a hash - the index
 # definition that we're renaming to, with an extra key of "NAME"
 # that contains the new index name.
 # The indexes in %indexes must be in hashref format.
 sub get_rename_indexes_ddl {
-    my ($self, $table, %indexes) = @_;
-    my @keys = keys %indexes or return ();
-
-    my $sql = "ALTER TABLE $table ";
-
-    foreach my $old_name (@keys) {
-        my $name = $indexes{$old_name}->{NAME};
-        my $type = $indexes{$old_name}->{TYPE};
-        $type ||= 'INDEX';
-        my $fields = join(',', @{$indexes{$old_name}->{FIELDS}});
-        # $old_name needs to be escaped, sometimes, because it was
-        # a reserved word.
-        $old_name = '`' . $old_name . '`';
-        $sql .= " ADD $type $name ($fields), DROP INDEX $old_name,";
-    }
-    # Remove the last comma.
-    chop($sql);
-    return ($sql);
+  my ($self, $table, %indexes) = @_;
+  my @keys = keys %indexes or return ();
+
+  my $sql = "ALTER TABLE $table ";
+
+  foreach my $old_name (@keys) {
+    my $name = $indexes{$old_name}->{NAME};
+    my $type = $indexes{$old_name}->{TYPE};
+    $type ||= 'INDEX';
+    my $fields = join(',', @{$indexes{$old_name}->{FIELDS}});
+
+    # $old_name needs to be escaped, sometimes, because it was
+    # a reserved word.
+    $old_name = '`' . $old_name . '`';
+    $sql .= " ADD $type $name ($fields), DROP INDEX $old_name,";
+  }
+
+  # Remove the last comma.
+  chop($sql);
+  return ($sql);
 }
 
 sub get_set_serial_sql {
-    my ($self, $table, $column, $value) = @_;
-    return ("ALTER TABLE $table AUTO_INCREMENT = $value");
+  my ($self, $table, $column, $value) = @_;
+  return ("ALTER TABLE $table AUTO_INCREMENT = $value");
 }
 
 # Converts a DBI column_info output to an abstract column definition.
@@ -263,124 +281,137 @@ sub get_set_serial_sql {
 # although there's a chance that it will also work properly if called
 # elsewhere.
 sub column_info_to_column {
-    my ($self, $column_info) = @_;
-
-    # Unfortunately, we have to break Schema's normal "no database"
-    # barrier a few times in this function.
-    my $dbh = Bugzilla->dbh;
-
-    my $table = $column_info->{TABLE_NAME};
-    my $col_name = $column_info->{COLUMN_NAME};
-
-    my $column = {};
-
-    ($column->{NOTNULL} = 1) if $column_info->{NULLABLE} == 0;
-
-    if ($column_info->{mysql_is_pri_key}) {
-        # In MySQL, if a table has no PK, but it has a UNIQUE index,
-        # that index will show up as the PK. So we have to eliminate
-        # that possibility.
-        # Unfortunately, the only way to definitely solve this is
-        # to break Schema's standard of not touching the live database
-        # and check if the index called PRIMARY is on that field.
-        my $pri_index = $dbh->bz_index_info_real($table, 'PRIMARY');
-        if ( $pri_index && grep($_ eq $col_name, @{$pri_index->{FIELDS}}) ) {
-            $column->{PRIMARYKEY} = 1;
-        }
-    }
+  my ($self, $column_info) = @_;
 
-    # MySQL frequently defines a default for a field even when we
-    # didn't explicitly set one. So we have to have some special
-    # hacks to determine whether or not we should actually put
-    # a default in the abstract schema for this field.
-    if (defined $column_info->{COLUMN_DEF}) {
-        # The defaults that MySQL inputs automatically are usually
-        # something that would be considered "false" by perl, either
-        # a 0 or an empty string. (Except for datetime and decimal
-        # fields, which have their own special auto-defaults.)
-        #
-        # Here's how we handle this: If it exists in the schema
-        # without a default, then we don't use the default. If it
-        # doesn't exist in the schema, then we're either going to
-        # be dropping it soon, or it's a custom end-user column, in which
-        # case having a bogus default won't harm anything.
-        my $schema_column = $self->get_column($table, $col_name);
-        unless ( (!$column_info->{COLUMN_DEF} 
-                  || $column_info->{COLUMN_DEF} eq '0000-00-00 00:00:00'
-                  || $column_info->{COLUMN_DEF} eq '0.00')
-                && $schema_column 
-                && !exists $schema_column->{DEFAULT}) {
-            
-            my $default = $column_info->{COLUMN_DEF};
-            # Schema uses '0' for the defaults for decimal fields. 
-            $default = 0 if $default =~ /^0\.0+$/;
-            # If we're not a number, we're a string and need to be
-            # quoted.
-            $default = $dbh->quote($default) if !($default =~ /^(-)?(\d+)(.\d+)?$/);
-            $column->{DEFAULT} = $default;
-        }
-    }
+  # Unfortunately, we have to break Schema's normal "no database"
+  # barrier a few times in this function.
+  my $dbh = Bugzilla->dbh;
 
-    my $type = $column_info->{TYPE_NAME};
+  my $table    = $column_info->{TABLE_NAME};
+  my $col_name = $column_info->{COLUMN_NAME};
 
-    # Certain types of columns need the size/precision appended.
-    if ($type =~ /CHAR$/ || $type eq 'DECIMAL') {
-        # This is nicely lowercase and has the size/precision appended.
-        $type = $column_info->{mysql_type_name};
-    }
+  my $column = {};
 
-    # If we're a tinyint, we could be either a BOOLEAN or an INT1.
-    # Only the BOOLEAN_MAP knows the difference.
-    elsif ($type eq 'TINYINT' && exists BOOLEAN_MAP->{$table}
-           && exists BOOLEAN_MAP->{$table}->{$col_name}) {
-        $type = 'BOOLEAN';
-        if (exists $column->{DEFAULT}) {
-            $column->{DEFAULT} = $column->{DEFAULT} ? 'TRUE' : 'FALSE';
-        }
-    }
+  ($column->{NOTNULL} = 1) if $column_info->{NULLABLE} == 0;
 
-    # We also need to check if we're an auto_increment field.
-    elsif ($type =~ /INT/) {
-        # Unfortunately, the only way to do this in DBI is to query the
-        # database, so we have to break the rule here that Schema normally
-        # doesn't touch the live DB.
-        my $ref_sth = $dbh->prepare(
-            "SELECT $col_name FROM $table LIMIT 1");
-        $ref_sth->execute;
-        if ($ref_sth->{mysql_is_auto_increment}->[0]) {
-            if ($type eq 'MEDIUMINT') {
-                $type = 'MEDIUMSERIAL';
-            }
-            elsif ($type eq 'SMALLINT') {
-                $type = 'SMALLSERIAL';
-            } 
-            else {
-                $type = 'INTSERIAL';
-            }
-        }
-        $ref_sth->finish;
+  if ($column_info->{mysql_is_pri_key}) {
 
+    # In MySQL, if a table has no PK, but it has a UNIQUE index,
+    # that index will show up as the PK. So we have to eliminate
+    # that possibility.
+    # Unfortunately, the only way to definitely solve this is
+    # to break Schema's standard of not touching the live database
+    # and check if the index called PRIMARY is on that field.
+    my $pri_index = $dbh->bz_index_info_real($table, 'PRIMARY');
+    if ($pri_index && grep($_ eq $col_name, @{$pri_index->{FIELDS}})) {
+      $column->{PRIMARYKEY} = 1;
     }
+  }
+
+  # MySQL frequently defines a default for a field even when we
+  # didn't explicitly set one. So we have to have some special
+  # hacks to determine whether or not we should actually put
+  # a default in the abstract schema for this field.
+  if (defined $column_info->{COLUMN_DEF}) {
+
+    # The defaults that MySQL inputs automatically are usually
+    # something that would be considered "false" by perl, either
+    # a 0 or an empty string. (Except for datetime and decimal
+    # fields, which have their own special auto-defaults.)
+    #
+    # Here's how we handle this: If it exists in the schema
+    # without a default, then we don't use the default. If it
+    # doesn't exist in the schema, then we're either going to
+    # be dropping it soon, or it's a custom end-user column, in which
+    # case having a bogus default won't harm anything.
+    my $schema_column = $self->get_column($table, $col_name);
+    unless (
+      (
+          !$column_info->{COLUMN_DEF}
+        || $column_info->{COLUMN_DEF} eq '0000-00-00 00:00:00'
+        || $column_info->{COLUMN_DEF} eq '0.00'
+      )
+      && $schema_column
+      && !exists $schema_column->{DEFAULT}
+      )
+    {
 
-    # For all other db-specific types, check if they exist in 
-    # REVERSE_MAPPING and use the type found there.
-    if (exists REVERSE_MAPPING->{$type}) {
-        $type = REVERSE_MAPPING->{$type};
+      my $default = $column_info->{COLUMN_DEF};
+
+      # Schema uses '0' for the defaults for decimal fields.
+      $default = 0 if $default =~ /^0\.0+$/;
+
+      # If we're not a number, we're a string and need to be
+      # quoted.
+      $default = $dbh->quote($default) if !($default =~ /^(-)?(\d+)(\.\d+)?$/a);
+      $column->{DEFAULT} = $default;
+    }
+  }
+
+  my $type = $column_info->{TYPE_NAME};
+
+  # Certain types of columns need the size/precision appended.
+  if ($type =~ /CHAR$/ || $type eq 'DECIMAL') {
+
+    # This is nicely lowercase and has the size/precision appended.
+    $type = $column_info->{mysql_type_name};
+  }
+
+  # If we're a tinyint, we could be either a BOOLEAN or an INT1.
+  # Only the BOOLEAN_MAP knows the difference.
+  elsif ($type eq 'TINYINT'
+    && exists BOOLEAN_MAP->{$table}
+    && exists BOOLEAN_MAP->{$table}->{$col_name})
+  {
+    $type = 'BOOLEAN';
+    if (exists $column->{DEFAULT}) {
+      $column->{DEFAULT} = $column->{DEFAULT} ? 'TRUE' : 'FALSE';
+    }
+  }
+
+  # We also need to check if we're an auto_increment field.
+  elsif ($type =~ /INT/) {
+
+    # Unfortunately, the only way to do this in DBI is to query the
+    # database, so we have to break the rule here that Schema normally
+    # doesn't touch the live DB.
+    my $ref_sth = $dbh->prepare("SELECT $col_name FROM $table LIMIT 1");
+    $ref_sth->execute;
+    if ($ref_sth->{mysql_is_auto_increment}->[0]) {
+      if ($type eq 'MEDIUMINT') {
+        $type = 'MEDIUMSERIAL';
+      }
+      elsif ($type eq 'SMALLINT') {
+        $type = 'SMALLSERIAL';
+      }
+      else {
+        $type = 'INTSERIAL';
+      }
     }
+    $ref_sth->finish;
 
-    $column->{TYPE} = $type;
+  }
 
-    #print "$table.$col_name: " . Data::Dumper->Dump([$column]) . "\n";
+  # For all other db-specific types, check if they exist in
+  # REVERSE_MAPPING and use the type found there.
+  if (exists REVERSE_MAPPING->{$type}) {
+    $type = REVERSE_MAPPING->{$type};
+  }
 
-    return $column;
+  $column->{TYPE} = $type;
+
+  #print "$table.$col_name: " . Data::Dumper->Dump([$column]) . "\n";
+
+  return $column;
 }
 
 sub get_rename_column_ddl {
-    my ($self, $table, $old_name, $new_name) = @_;
-    my $def = $self->get_type_ddl($self->get_column($table, $old_name));
-    # MySQL doesn't like having the PRIMARY KEY statement in a rename.
-    $def =~ s/PRIMARY KEY//i;
-    return ("ALTER TABLE $table CHANGE COLUMN $old_name $new_name $def");
+  my ($self, $table, $old_name, $new_name) = @_;
+  my $def = $self->get_type_ddl($self->get_column($table, $old_name));
+
+  # MySQL doesn't like having the PRIMARY KEY statement in a rename.
+  $def =~ s/PRIMARY KEY//i;
+  return ("ALTER TABLE $table CHANGE COLUMN $old_name $new_name $def");
 }
 
 1;
diff --git a/Bugzilla/DB/Schema/Oracle.pm b/Bugzilla/DB/Schema/Oracle.pm
index 8fb5479b1d..92ffb65c2c 100644
--- a/Bugzilla/DB/Schema/Oracle.pm
+++ b/Bugzilla/DB/Schema/Oracle.pm
@@ -13,7 +13,7 @@ package Bugzilla::DB::Schema::Oracle;
 #
 ###############################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,8 +21,9 @@ use parent qw(Bugzilla::DB::Schema);
 use Carp qw(confess);
 use Bugzilla::Util;
 
-use constant ADD_COLUMN => 'ADD';
+use constant ADD_COLUMN            => 'ADD';
 use constant MULTIPLE_FKS_IN_ALTER => 0;
+
 # Whether this is true or not, this is what it needs to be in order for
 # hash_identifier to maintain backwards compatibility with versions before
 # 3.2rc2.
@@ -31,123 +32,128 @@ use constant MAX_IDENTIFIER_LEN => 27;
 #------------------------------------------------------------------------------
 sub _initialize {
 
-    my $self = shift;
+  my $self = shift;
+
+  $self = $self->SUPER::_initialize(@_);
 
-    $self = $self->SUPER::_initialize(@_);
+  $self->{db_specific} = {
 
-    $self->{db_specific} = {
+    BOOLEAN => 'integer',
+    FALSE   => '0',
+    TRUE    => '1',
 
-        BOOLEAN =>      'integer',
-        FALSE =>        '0', 
-        TRUE =>         '1',
+    INT1 => 'integer',
+    INT2 => 'integer',
+    INT3 => 'integer',
+    INT4 => 'integer',
 
-        INT1 =>         'integer',
-        INT2 =>         'integer',
-        INT3 =>         'integer',
-        INT4 =>         'integer',
+    SMALLSERIAL  => 'integer',
+    MEDIUMSERIAL => 'integer',
+    INTSERIAL    => 'integer',
 
-        SMALLSERIAL  => 'integer',
-        MEDIUMSERIAL => 'integer',
-        INTSERIAL    => 'integer',
+    TINYTEXT   => 'varchar(255)',
+    MEDIUMTEXT => 'varchar(4000)',
+    LONGTEXT   => 'clob',
 
-        TINYTEXT   =>   'varchar(255)',
-        MEDIUMTEXT =>   'varchar(4000)',
-        LONGTEXT   =>   'clob',
+    LONGBLOB => 'blob',
 
-        LONGBLOB =>     'blob',
+    DATETIME => 'date',
+    DATE     => 'date',
+  };
 
-        DATETIME =>     'date',
-        DATE     =>     'date',
-    };
+  $self->_adjust_schema;
 
-    $self->_adjust_schema;
+  return $self;
 
-    return $self;
+}    #eosub--_initialize
 
-} #eosub--_initialize
 #--------------------------------------------------------------------
 
 sub get_table_ddl {
-    my $self = shift;
-    my $table = shift;
-    unshift @_, $table;
-    my @ddl = $self->SUPER::get_table_ddl(@_);
-
-    my @fields = @{ $self->{abstract_schema}{$table}{FIELDS} || [] };
-    while (@fields) {
-        my $field_name = shift @fields;
-        my $field_info = shift @fields;
-        # Create triggers to deal with empty string. 
-        if ( $field_info->{TYPE} =~ /varchar|TEXT/i 
-                && $field_info->{NOTNULL} ) {
-             push (@ddl, _get_notnull_trigger_ddl($table, $field_name));
-        }
-        # Create sequences and triggers to emulate SERIAL datatypes.
-        if ( $field_info->{TYPE} =~ /SERIAL/i ) {
-            push (@ddl, $self->_get_create_seq_ddl($table, $field_name));
-        }
+  my $self  = shift;
+  my $table = shift;
+  unshift @_, $table;
+  my @ddl = $self->SUPER::get_table_ddl(@_);
+
+  my @fields = @{$self->{abstract_schema}{$table}{FIELDS} || []};
+  while (@fields) {
+    my $field_name = shift @fields;
+    my $field_info = shift @fields;
+
+    # Create triggers to deal with empty string.
+    if ($field_info->{TYPE} =~ /varchar|TEXT/i && $field_info->{NOTNULL}) {
+      push(@ddl, _get_notnull_trigger_ddl($table, $field_name));
     }
-    return @ddl;
 
-} #eosub--get_table_ddl
+    # Create sequences and triggers to emulate SERIAL datatypes.
+    if ($field_info->{TYPE} =~ /SERIAL/i) {
+      push(@ddl, $self->_get_create_seq_ddl($table, $field_name));
+    }
+  }
+  return @ddl;
 
-# Extend superclass method to create Oracle Text indexes if index type 
+}    #eosub--get_table_ddl
+
+# Extend superclass method to create Oracle Text indexes if index type
 # is FULLTEXT from schema. Returns a "create index" SQL statement.
 sub _get_create_index_ddl {
 
-    my ($self, $table_name, $index_name, $index_fields, $index_type) = @_;
-    $index_name = "idx_" . $self->_hash_identifier($index_name);
-    if ($index_type eq 'FULLTEXT') {
-        my $sql = "CREATE INDEX $index_name ON $table_name (" 
-                  . join(',',@$index_fields)
-                  . ") INDEXTYPE IS CTXSYS.CONTEXT "
-                  . " PARAMETERS('LEXER BZ_LEX SYNC(ON COMMIT)')" ;
-        return $sql;
-    }
-
-    return($self->SUPER::_get_create_index_ddl($table_name, $index_name, 
-                                               $index_fields, $index_type));
+  my ($self, $table_name, $index_name, $index_fields, $index_type) = @_;
+  $index_name = "idx_" . $self->_hash_identifier($index_name);
+  if ($index_type eq 'FULLTEXT') {
+    my $sql
+      = "CREATE INDEX $index_name ON $table_name ("
+      . join(',', @$index_fields)
+      . ") INDEXTYPE IS CTXSYS.CONTEXT "
+      . " PARAMETERS('LEXER BZ_LEX SYNC(ON COMMIT)')";
+    return $sql;
+  }
+
+  return ($self->SUPER::_get_create_index_ddl(
+    $table_name, $index_name, $index_fields, $index_type
+  ));
 
 }
 
 sub get_drop_index_ddl {
-    my $self = shift;
-    my ($table, $name) = @_;
+  my $self = shift;
+  my ($table, $name) = @_;
 
-    $name = 'idx_' . $self->_hash_identifier($name);
-    return $self->SUPER::get_drop_index_ddl($table, $name);
+  $name = 'idx_' . $self->_hash_identifier($name);
+  return $self->SUPER::get_drop_index_ddl($table, $name);
 }
 
-# Oracle supports the use of FOREIGN KEY integrity constraints 
+# Oracle supports the use of FOREIGN KEY integrity constraints
 # to define the referential integrity actions, including:
 # - Update and delete No Action (default)
 # - Delete CASCADE
 # - Delete SET NULL
 sub get_fk_ddl {
-    my $self = shift;
-    my $ddl = $self->SUPER::get_fk_ddl(@_);
+  my $self = shift;
+  my $ddl  = $self->SUPER::get_fk_ddl(@_);
 
-    # iThe Bugzilla Oracle driver implements UPDATE via a trigger.
-    $ddl =~ s/ON UPDATE \S+//i;
-    # RESTRICT is the default for DELETE on Oracle and may not be specified.
-    $ddl =~ s/ON DELETE RESTRICT//i;
+  # iThe Bugzilla Oracle driver implements UPDATE via a trigger.
+  $ddl =~ s/ON UPDATE \S+//i;
 
-    return $ddl;
+  # RESTRICT is the default for DELETE on Oracle and may not be specified.
+  $ddl =~ s/ON DELETE RESTRICT//i;
+
+  return $ddl;
 }
 
 sub get_add_fks_sql {
-    my $self = shift;
-    my ($table, $column_fks) = @_;
-    my @sql = $self->SUPER::get_add_fks_sql(@_);
-
-    foreach my $column (keys %$column_fks) {
-        my $fk = $column_fks->{$column};
-        next if $fk->{UPDATE} && uc($fk->{UPDATE}) ne 'CASCADE';
-        my $fk_name   = $self->_get_fk_name($table, $column, $fk);
-        my $to_column = $fk->{COLUMN};
-        my $to_table  = $fk->{TABLE};
-
-        my $trigger = <<END;
+  my $self = shift;
+  my ($table, $column_fks) = @_;
+  my @sql = $self->SUPER::get_add_fks_sql(@_);
+
+  foreach my $column (keys %$column_fks) {
+    my $fk = $column_fks->{$column};
+    next if $fk->{UPDATE} && uc($fk->{UPDATE}) ne 'CASCADE';
+    my $fk_name   = $self->_get_fk_name($table, $column, $fk);
+    my $to_column = $fk->{COLUMN};
+    my $to_table  = $fk->{TABLE};
+
+    my $trigger = <<END;
 CREATE OR REPLACE TRIGGER ${fk_name}_UC
           AFTER UPDATE OF $to_column ON $to_table
               REFERENCING NEW AS NEW OLD AS OLD
@@ -158,351 +164,376 @@ CREATE OR REPLACE TRIGGER ${fk_name}_UC
                     WHERE $column = :OLD.$to_column;
                       END ${fk_name}_UC;
 END
-        push(@sql, $trigger);
-    }
+    push(@sql, $trigger);
+  }
 
-    return @sql;
+  return @sql;
 }
 
 sub get_drop_fk_sql {
-    my $self = shift;
-    my ($table, $column, $references) = @_;
-    my $fk_name = $self->_get_fk_name(@_);
-    my @sql;
-    if (!$references->{UPDATE} || $references->{UPDATE} =~ /CASCADE/i) {
-        push(@sql, "DROP TRIGGER ${fk_name}_uc");
-    }
-    push(@sql, $self->SUPER::get_drop_fk_sql(@_));
-    return @sql;
+  my $self = shift;
+  my ($table, $column, $references) = @_;
+  my $fk_name = $self->_get_fk_name(@_);
+  my @sql;
+  if (!$references->{UPDATE} || $references->{UPDATE} =~ /CASCADE/i) {
+    push(@sql, "DROP TRIGGER ${fk_name}_uc");
+  }
+  push(@sql, $self->SUPER::get_drop_fk_sql(@_));
+  return @sql;
 }
 
 sub _get_fk_name {
-    my ($self, $table, $column, $references) = @_;
-    my $to_table  = $references->{TABLE};
-    my $to_column = $references->{COLUMN};
-    my $fk_name   = "${table}_${column}_${to_table}_${to_column}";
-    $fk_name      = "fk_" . $self->_hash_identifier($fk_name);
-    
-    return $fk_name;
+  my ($self, $table, $column, $references) = @_;
+  my $to_table  = $references->{TABLE};
+  my $to_column = $references->{COLUMN};
+  my $fk_name   = "${table}_${column}_${to_table}_${to_column}";
+  $fk_name = "fk_" . $self->_hash_identifier($fk_name);
+
+  return $fk_name;
 }
 
 sub get_add_column_ddl {
-    my $self = shift;
-    my ($table, $column, $definition, $init_value) = @_;
-    my @sql;
-
-    # Create sequences and triggers to emulate SERIAL datatypes.
-    if ($definition->{TYPE} =~ /SERIAL/i) {
-        # Clone the definition to not alter the original one.
-        my %def = %$definition;
-        # Oracle requires to define the column is several steps.
-        my $pk = delete $def{PRIMARYKEY};
-        my $notnull = delete $def{NOTNULL};
-        @sql = $self->SUPER::get_add_column_ddl($table, $column, \%def, $init_value);
-        push(@sql, $self->_get_create_seq_ddl($table, $column));
-        push(@sql, "UPDATE $table SET $column = ${table}_${column}_SEQ.NEXTVAL");
-        push(@sql, "ALTER TABLE $table MODIFY $column NOT NULL") if $notnull;
-        push(@sql, "ALTER TABLE $table ADD PRIMARY KEY ($column)") if $pk;
-    }
-    else {
-        @sql = $self->SUPER::get_add_column_ddl(@_);
-        # Create triggers to deal with empty string. 
-        if ($definition->{TYPE} =~ /varchar|TEXT/i && $definition->{NOTNULL}) {
-            push(@sql, _get_notnull_trigger_ddl($table, $column));
-        }
+  my $self = shift;
+  my ($table, $column, $definition, $init_value) = @_;
+  my @sql;
+
+  # Create sequences and triggers to emulate SERIAL datatypes.
+  if ($definition->{TYPE} =~ /SERIAL/i) {
+
+    # Clone the definition to not alter the original one.
+    my %def = %$definition;
+
+    # Oracle requires to define the column is several steps.
+    my $pk      = delete $def{PRIMARYKEY};
+    my $notnull = delete $def{NOTNULL};
+    @sql = $self->SUPER::get_add_column_ddl($table, $column, \%def, $init_value);
+    push(@sql, $self->_get_create_seq_ddl($table, $column));
+    push(@sql, "UPDATE $table SET $column = ${table}_${column}_SEQ.NEXTVAL");
+    push(@sql, "ALTER TABLE $table MODIFY $column NOT NULL") if $notnull;
+    push(@sql, "ALTER TABLE $table ADD PRIMARY KEY ($column)") if $pk;
+  }
+  else {
+    @sql = $self->SUPER::get_add_column_ddl(@_);
+
+    # Create triggers to deal with empty string.
+    if ($definition->{TYPE} =~ /varchar|TEXT/i && $definition->{NOTNULL}) {
+      push(@sql, _get_notnull_trigger_ddl($table, $column));
     }
+  }
 
-    return @sql;
+  return @sql;
 }
 
-sub get_alter_column_ddl {
-    my ($self, $table, $column, $new_def, $set_nulls_to) = @_;
-
-    my @statements;
-    my $old_def = $self->get_column_abstract($table, $column);
-    my $specific = $self->{db_specific};
-
-    # If the types have changed, we have to deal with that.
-    if (uc(trim($old_def->{TYPE})) ne uc(trim($new_def->{TYPE}))) {
-        push(@statements, $self->_get_alter_type_sql($table, $column, 
-                                                     $new_def, $old_def));
-    }
-
-    my $default = $new_def->{DEFAULT};
-    my $default_old = $old_def->{DEFAULT};
-
-    if (defined $default) {
-        $default = $specific->{$default} if exists $specific->{$default};
-    }
-    # This first condition prevents "uninitialized value" errors.
-    if (!defined $default && !defined $default_old) {
-        # Do Nothing
-    }
-    # If we went from having a default to not having one
-    elsif (!defined $default && defined $default_old) {
-        push(@statements, "ALTER TABLE $table MODIFY $column"
-                        . " DEFAULT NULL");
-    }
-    # If we went from no default to a default, or we changed the default.
-    elsif ( (defined $default && !defined $default_old) || 
-            ($default ne $default_old) ) 
-    {
-        push(@statements, "ALTER TABLE $table MODIFY $column "
-                         . " DEFAULT $default");
-    }
-
-    # If we went from NULL to NOT NULL.
-    if (!$old_def->{NOTNULL} && $new_def->{NOTNULL}) {
-        my $setdefault;
-        # Handle any fields that were NULL before, if we have a default,
-        $setdefault = $default if defined $default;
-        # But if we have a set_nulls_to, that overrides the DEFAULT 
-        # (although nobody would usually specify both a default and 
-        # a set_nulls_to.)
-        $setdefault = $set_nulls_to if defined $set_nulls_to;
-        if (defined $setdefault) {
-            push(@statements, "UPDATE $table SET $column = $setdefault"
-                            . "  WHERE $column IS NULL");
-        }
-        push(@statements, "ALTER TABLE $table MODIFY $column"
-                        . " NOT NULL");
-        push (@statements, _get_notnull_trigger_ddl($table, $column))
-                                   if $old_def->{TYPE} =~ /varchar|text/i
-                                     && $new_def->{TYPE} =~ /varchar|text/i;
-    }
-    # If we went from NOT NULL to NULL
-    elsif ($old_def->{NOTNULL} && !$new_def->{NOTNULL}) {
-        push(@statements, "ALTER TABLE $table MODIFY $column"
-                        . " NULL");
-        push(@statements, "DROP TRIGGER ${table}_${column}")
-                           if $new_def->{TYPE} =~ /varchar|text/i 
-                             && $old_def->{TYPE} =~ /varchar|text/i;
-    }
+sub get_drop_default_ddl {
+  my ($self, $table, $column) = @_;
+  return "ALTER TABLE $table MODIFY $column DEFAULT NULL";
+}
 
-    # If we went from not being a PRIMARY KEY to being a PRIMARY KEY.
-    if (!$old_def->{PRIMARYKEY} && $new_def->{PRIMARYKEY}) {
-        push(@statements, "ALTER TABLE $table ADD PRIMARY KEY ($column)");
-    }
-    # If we went from being a PK to not being a PK
-    elsif ( $old_def->{PRIMARYKEY} && !$new_def->{PRIMARYKEY} ) {
-        push(@statements, "ALTER TABLE $table DROP PRIMARY KEY");
+sub get_alter_column_ddl {
+  my ($self, $table, $column, $new_def, $set_nulls_to) = @_;
+
+  my @statements;
+  my $old_def = $self->get_column_abstract($table, $column);
+  my $specific = $self->{db_specific};
+
+  # If the types have changed, we have to deal with that.
+  if (uc(trim($old_def->{TYPE})) ne uc(trim($new_def->{TYPE}))) {
+    push(@statements,
+      $self->_get_alter_type_sql($table, $column, $new_def, $old_def));
+  }
+
+  my $default     = $new_def->{DEFAULT};
+  my $default_old = $old_def->{DEFAULT};
+
+  if (defined $default) {
+    $default = $specific->{$default} if exists $specific->{$default};
+  }
+
+  # This first condition prevents "uninitialized value" errors.
+  if (!defined $default && !defined $default_old) {
+
+    # Do Nothing
+  }
+
+  # If we went from having a default to not having one
+  elsif (!defined $default && defined $default_old) {
+    push(@statements, $self->get_drop_default_ddl($table, $column));
+  }
+
+  # If we went from no default to a default, or we changed the default.
+  elsif ((defined $default && !defined $default_old)
+    || ($default ne $default_old))
+  {
+    push(@statements, "ALTER TABLE $table MODIFY $column " . " DEFAULT $default");
+  }
+
+  # If we went from NULL to NOT NULL.
+  if (!$old_def->{NOTNULL} && $new_def->{NOTNULL}) {
+    my $setdefault;
+
+    # Handle any fields that were NULL before, if we have a default,
+    $setdefault = $default if defined $default;
+
+    # But if we have a set_nulls_to, that overrides the DEFAULT
+    # (although nobody would usually specify both a default and
+    # a set_nulls_to.)
+    $setdefault = $set_nulls_to if defined $set_nulls_to;
+    if (defined $setdefault) {
+      push(@statements,
+        "UPDATE $table SET $column = $setdefault" . "  WHERE $column IS NULL");
     }
-
-    return @statements;
+    push(@statements, "ALTER TABLE $table MODIFY $column" . " NOT NULL");
+    push(@statements, _get_notnull_trigger_ddl($table, $column))
+      if $old_def->{TYPE} =~ /varchar|text/i && $new_def->{TYPE} =~ /varchar|text/i;
+  }
+
+  # If we went from NOT NULL to NULL
+  elsif ($old_def->{NOTNULL} && !$new_def->{NOTNULL}) {
+    push(@statements, "ALTER TABLE $table MODIFY $column" . " NULL");
+    push(@statements, "DROP TRIGGER ${table}_${column}")
+      if $new_def->{TYPE} =~ /varchar|text/i && $old_def->{TYPE} =~ /varchar|text/i;
+  }
+
+  # If we went from not being a PRIMARY KEY to being a PRIMARY KEY.
+  if (!$old_def->{PRIMARYKEY} && $new_def->{PRIMARYKEY}) {
+    push(@statements, "ALTER TABLE $table ADD PRIMARY KEY ($column)");
+  }
+
+  # If we went from being a PK to not being a PK
+  elsif ($old_def->{PRIMARYKEY} && !$new_def->{PRIMARYKEY}) {
+    push(@statements, "ALTER TABLE $table DROP PRIMARY KEY");
+  }
+
+  return @statements;
 }
 
 sub _get_alter_type_sql {
-    my ($self, $table, $column, $new_def, $old_def) = @_;
-    my @statements;
-
-    my $type = $new_def->{TYPE};
-    $type = $self->{db_specific}->{$type} 
-        if exists $self->{db_specific}->{$type};
-
-    if ($type =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
-        die("You cannot specify a DEFAULT on a SERIAL-type column.") 
-            if $new_def->{DEFAULT};
-    }
-
-    if ( ($old_def->{TYPE} =~ /LONGTEXT/i && $new_def->{TYPE} !~ /LONGTEXT/i) 
-         || ($old_def->{TYPE} !~ /LONGTEXT/i && $new_def->{TYPE} =~ /LONGTEXT/i)
-       ) {
-        # LONG to VARCHAR or VARCHAR to LONG is not allowed in Oracle, 
-        # just a way to work around.
-        # Determine whether column_temp is already exist.
-        my $dbh=Bugzilla->dbh;
-        my $column_exist = $dbh->selectcol_arrayref(
-                          "SELECT CNAME FROM COL WHERE TNAME = UPPER(?) AND 
-                             CNAME = UPPER(?)", undef,$table,$column . "_temp");
-        if(!@$column_exist) {
-        push(@statements, 
-            "ALTER TABLE $table ADD ${column}_temp $type");  
-        }
-        push(@statements, "UPDATE $table SET ${column}_temp = $column");
-        push(@statements, "COMMIT");
-        push(@statements, "ALTER TABLE $table DROP COLUMN $column");
-        push(@statements, 
-            "ALTER TABLE $table RENAME COLUMN ${column}_temp TO $column");
-    } else {  
-        push(@statements, "ALTER TABLE $table MODIFY $column $type");
+  my ($self, $table, $column, $new_def, $old_def) = @_;
+  my @statements;
+
+  my $type = $new_def->{TYPE};
+  $type = $self->{db_specific}->{$type} if exists $self->{db_specific}->{$type};
+
+  if ($type =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
+    die("You cannot specify a DEFAULT on a SERIAL-type column.")
+      if $new_def->{DEFAULT};
+  }
+
+  if ( ($old_def->{TYPE} =~ /LONGTEXT/i && $new_def->{TYPE} !~ /LONGTEXT/i)
+    || ($old_def->{TYPE} !~ /LONGTEXT/i && $new_def->{TYPE} =~ /LONGTEXT/i))
+  {
+    # LONG to VARCHAR or VARCHAR to LONG is not allowed in Oracle,
+    # just a way to work around.
+    # Determine whether column_temp is already exist.
+    my $dbh          = Bugzilla->dbh;
+    my $column_exist = $dbh->selectcol_arrayref(
+      "SELECT CNAME FROM COL WHERE TNAME = UPPER(?) AND 
+                             CNAME = UPPER(?)", undef, $table, $column . "_temp"
+    );
+    if (!@$column_exist) {
+      push(@statements, "ALTER TABLE $table ADD ${column}_temp $type");
     }
-
-    if ($new_def->{TYPE} =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
-         push(@statements, _get_create_seq_ddl($table, $column));
-    }
-
-    # If this column is no longer SERIAL, we need to drop the sequence
-    # that went along with it.
-    if ($old_def->{TYPE} =~ /serial/i && $new_def->{TYPE} !~ /serial/i) {
-        push(@statements, "DROP SEQUENCE ${table}_${column}_SEQ");
-        push(@statements, "DROP TRIGGER ${table}_${column}_TR");
-    }
-    
-    # If this column is changed to type TEXT/VARCHAR, we need to deal with
-    # empty string.
-    if ( $old_def->{TYPE} !~ /varchar|text/i 
-            && $new_def->{TYPE} =~ /varchar|text/i 
-            && $new_def->{NOTNULL} )
-    {
-             push (@statements, _get_notnull_trigger_ddl($table, $column));
-    } 
-    # If this column is no longer TEXT/VARCHAR, we need to drop the trigger
-    # that went along with it.
-    if ( $old_def->{TYPE} =~ /varchar|text/i
-            && $old_def->{NOTNULL}
-            && $new_def->{TYPE} !~ /varchar|text/i )
-    {
-        push(@statements, "DROP TRIGGER ${table}_${column}");
-    } 
-    return @statements;
+    push(@statements, "UPDATE $table SET ${column}_temp = $column");
+    push(@statements, "COMMIT");
+    push(@statements, "ALTER TABLE $table DROP COLUMN $column");
+    push(@statements, "ALTER TABLE $table RENAME COLUMN ${column}_temp TO $column");
+  }
+  else {
+    push(@statements, "ALTER TABLE $table MODIFY $column $type");
+  }
+
+  if ($new_def->{TYPE} =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
+    push(@statements, _get_create_seq_ddl($table, $column));
+  }
+
+  # If this column is no longer SERIAL, we need to drop the sequence
+  # that went along with it.
+  if ($old_def->{TYPE} =~ /serial/i && $new_def->{TYPE} !~ /serial/i) {
+    push(@statements, "DROP SEQUENCE ${table}_${column}_SEQ");
+    push(@statements, "DROP TRIGGER ${table}_${column}_TR");
+  }
+
+  # If this column is changed to type TEXT/VARCHAR, we need to deal with
+  # empty string.
+  if ( $old_def->{TYPE} !~ /varchar|text/i
+    && $new_def->{TYPE} =~ /varchar|text/i
+    && $new_def->{NOTNULL})
+  {
+    push(@statements, _get_notnull_trigger_ddl($table, $column));
+  }
+
+  # If this column is no longer TEXT/VARCHAR, we need to drop the trigger
+  # that went along with it.
+  if ( $old_def->{TYPE} =~ /varchar|text/i
+    && $old_def->{NOTNULL}
+    && $new_def->{TYPE} !~ /varchar|text/i)
+  {
+    push(@statements, "DROP TRIGGER ${table}_${column}");
+  }
+  return @statements;
 }
 
 sub get_rename_column_ddl {
-    my ($self, $table, $old_name, $new_name) = @_;
-    if (lc($old_name) eq lc($new_name)) {
-        # if the only change is a case change, return an empty list.
-        return ();
-    }
-    my @sql = ("ALTER TABLE $table RENAME COLUMN $old_name TO $new_name");
-    my $def = $self->get_column_abstract($table, $old_name);
-    if ($def->{TYPE} =~ /SERIAL/i) {
-        # We have to rename the series also, and fix the default of the series.
-        my $old_seq = "${table}_${old_name}_SEQ";
-        my $new_seq = "${table}_${new_name}_SEQ";
-        push(@sql, "RENAME $old_seq TO $new_seq");
-        push(@sql, $self->_get_create_trigger_ddl($table, $new_name, $new_seq));
-        push(@sql, "DROP TRIGGER ${table}_${old_name}_TR");
-    }
-    if ($def->{TYPE} =~ /varchar|text/i && $def->{NOTNULL} ) {
-        push(@sql, _get_notnull_trigger_ddl($table,$new_name));
-        push(@sql, "DROP TRIGGER ${table}_${old_name}");
-    }
-    return @sql;
+  my ($self, $table, $old_name, $new_name) = @_;
+  if (lc($old_name) eq lc($new_name)) {
+
+    # if the only change is a case change, return an empty list.
+    return ();
+  }
+  my @sql = ("ALTER TABLE $table RENAME COLUMN $old_name TO $new_name");
+  my $def = $self->get_column_abstract($table, $old_name);
+  if ($def->{TYPE} =~ /SERIAL/i) {
+
+    # We have to rename the series also, and fix the default of the series.
+    my $old_seq = "${table}_${old_name}_SEQ";
+    my $new_seq = "${table}_${new_name}_SEQ";
+    push(@sql, "RENAME $old_seq TO $new_seq");
+    push(@sql, $self->_get_create_trigger_ddl($table, $new_name, $new_seq));
+    push(@sql, "DROP TRIGGER ${table}_${old_name}_TR");
+  }
+  if ($def->{TYPE} =~ /varchar|text/i && $def->{NOTNULL}) {
+    push(@sql, _get_notnull_trigger_ddl($table, $new_name));
+    push(@sql, "DROP TRIGGER ${table}_${old_name}");
+  }
+  return @sql;
 }
 
 sub get_drop_column_ddl {
-    my $self = shift;
-    my ($table, $column) = @_;
-    my @sql;
-    push(@sql, $self->SUPER::get_drop_column_ddl(@_));
-    my $dbh=Bugzilla->dbh;
-    my $trigger_name = uc($table . "_" . $column);
-    my $exist_trigger = $dbh->selectcol_arrayref(
-        "SELECT OBJECT_NAME FROM USER_OBJECTS
-         WHERE OBJECT_NAME = ?", undef, $trigger_name);
-    if(@$exist_trigger) {
-        push(@sql, "DROP TRIGGER $trigger_name");
-    }
-    # If this column is of type SERIAL, we need to drop the sequence
-    # and trigger that went along with it.
-    my $def = $self->get_column_abstract($table, $column);
-    if ($def->{TYPE} =~ /SERIAL/i) {
-        push(@sql, "DROP SEQUENCE ${table}_${column}_SEQ");
-        push(@sql, "DROP TRIGGER ${table}_${column}_TR");
-    }
-    return @sql;
+  my $self = shift;
+  my ($table, $column) = @_;
+  my @sql;
+  push(@sql, $self->SUPER::get_drop_column_ddl(@_));
+  my $dbh           = Bugzilla->dbh;
+  my $trigger_name  = uc($table . "_" . $column);
+  my $exist_trigger = $dbh->selectcol_arrayref(
+    "SELECT OBJECT_NAME FROM USER_OBJECTS
+         WHERE OBJECT_NAME = ?", undef, $trigger_name
+  );
+  if (@$exist_trigger) {
+    push(@sql, "DROP TRIGGER $trigger_name");
+  }
+
+  # If this column is of type SERIAL, we need to drop the sequence
+  # and trigger that went along with it.
+  my $def = $self->get_column_abstract($table, $column);
+  if ($def->{TYPE} =~ /SERIAL/i) {
+    push(@sql, "DROP SEQUENCE ${table}_${column}_SEQ");
+    push(@sql, "DROP TRIGGER ${table}_${column}_TR");
+  }
+  return @sql;
 }
 
 sub get_rename_table_sql {
-    my ($self, $old_name, $new_name) = @_;
-    if (lc($old_name) eq lc($new_name)) {
-        # if the only change is a case change, return an empty list.
-        return ();
-    }
+  my ($self, $old_name, $new_name) = @_;
+  if (lc($old_name) eq lc($new_name)) {
+
+    # if the only change is a case change, return an empty list.
+    return ();
+  }
+
+  my @sql     = ("ALTER TABLE $old_name RENAME TO $new_name");
+  my @columns = $self->get_table_columns($old_name);
+  foreach my $column (@columns) {
+    my $def = $self->get_column_abstract($old_name, $column);
+    if ($def->{TYPE} =~ /SERIAL/i) {
 
-    my @sql = ("ALTER TABLE $old_name RENAME TO $new_name");
-    my @columns = $self->get_table_columns($old_name);
-    foreach my $column (@columns) {
-        my $def = $self->get_column_abstract($old_name, $column);
-        if ($def->{TYPE} =~ /SERIAL/i) {
-            # If there's a SERIAL column on this table, we also need
-            # to rename the sequence.
-            my $old_seq = "${old_name}_${column}_SEQ";
-            my $new_seq = "${new_name}_${column}_SEQ";
-            push(@sql, "RENAME $old_seq TO $new_seq");
-            push(@sql, $self->_get_create_trigger_ddl($new_name, $column, $new_seq));
-            push(@sql, "DROP TRIGGER ${old_name}_${column}_TR");
-        }
-        if ($def->{TYPE} =~ /varchar|text/i && $def->{NOTNULL}) {
-            push(@sql, _get_notnull_trigger_ddl($new_name, $column));
-            push(@sql, "DROP TRIGGER ${old_name}_${column}");
-        }
+      # If there's a SERIAL column on this table, we also need
+      # to rename the sequence.
+      my $old_seq = "${old_name}_${column}_SEQ";
+      my $new_seq = "${new_name}_${column}_SEQ";
+      push(@sql, "RENAME $old_seq TO $new_seq");
+      push(@sql, $self->_get_create_trigger_ddl($new_name, $column, $new_seq));
+      push(@sql, "DROP TRIGGER ${old_name}_${column}_TR");
+    }
+    if ($def->{TYPE} =~ /varchar|text/i && $def->{NOTNULL}) {
+      push(@sql, _get_notnull_trigger_ddl($new_name, $column));
+      push(@sql, "DROP TRIGGER ${old_name}_${column}");
     }
+  }
 
-    return @sql;
+  return @sql;
 }
 
 sub get_drop_table_ddl {
-    my ($self, $name) = @_;
-    my @sql;
-
-    my @columns = $self->get_table_columns($name);
-    foreach my $column (@columns) {
-        my $def = $self->get_column_abstract($name, $column);
-        if ($def->{TYPE} =~ /SERIAL/i) {
-            # If there's a SERIAL column on this table, we also need
-            # to remove the sequence.
-            push(@sql, "DROP SEQUENCE ${name}_${column}_SEQ");
-        }
+  my ($self, $name) = @_;
+  my @sql;
+
+  my @columns = $self->get_table_columns($name);
+  foreach my $column (@columns) {
+    my $def = $self->get_column_abstract($name, $column);
+    if ($def->{TYPE} =~ /SERIAL/i) {
+
+      # If there's a SERIAL column on this table, we also need
+      # to remove the sequence.
+      push(@sql, "DROP SEQUENCE ${name}_${column}_SEQ");
     }
-    push(@sql, "DROP TABLE $name CASCADE CONSTRAINTS PURGE");
+  }
+  push(@sql, "DROP TABLE $name CASCADE CONSTRAINTS PURGE");
 
-    return @sql;
+  return @sql;
 }
 
 sub _get_notnull_trigger_ddl {
-      my ($table, $column) = @_;
-
-      my $notnull_sql = "CREATE OR REPLACE TRIGGER "
-                        . " ${table}_${column}"
-                        . " BEFORE INSERT OR UPDATE ON ". $table
-                        . " FOR EACH ROW"
-                        . " BEGIN "
-                        . " IF :NEW.". $column ." IS NULL THEN  "
-                        . " SELECT '" . Bugzilla::DB::Oracle->EMPTY_STRING
-                        . "' INTO :NEW.". $column ." FROM DUAL; "
-                        . " END IF; "
-                        . " END ".$table.";";
-     return $notnull_sql;
+  my ($table, $column) = @_;
+
+  my $notnull_sql
+    = "CREATE OR REPLACE TRIGGER "
+    . " ${table}_${column}"
+    . " BEFORE INSERT OR UPDATE ON "
+    . $table
+    . " FOR EACH ROW"
+    . " BEGIN "
+    . " IF :NEW."
+    . $column
+    . " IS NULL THEN  "
+    . " SELECT '"
+    . Bugzilla::DB::Oracle->EMPTY_STRING
+    . "' INTO :NEW."
+    . $column
+    . " FROM DUAL; "
+    . " END IF; " . " END "
+    . $table . ";";
+  return $notnull_sql;
 }
 
 sub _get_create_seq_ddl {
-     my ($self, $table, $column, $start_with) = @_;
-     $start_with ||= 1;
-     my @ddl;
-     my $seq_name = "${table}_${column}_SEQ";
-     my $seq_sql = "CREATE SEQUENCE $seq_name "
-                   . " INCREMENT BY 1 "
-                   . " START WITH $start_with "
-                   . " NOMAXVALUE "
-                   . " NOCYCLE "
-                   . " NOCACHE";
-    push (@ddl, $seq_sql);
-    push(@ddl, $self->_get_create_trigger_ddl($table, $column, $seq_name));
-
-    return @ddl;
+  my ($self, $table, $column, $start_with) = @_;
+  $start_with ||= 1;
+  my @ddl;
+  my $seq_name = "${table}_${column}_SEQ";
+  my $seq_sql
+    = "CREATE SEQUENCE $seq_name "
+    . " INCREMENT BY 1 "
+    . " START WITH $start_with "
+    . " NOMAXVALUE "
+    . " NOCYCLE "
+    . " NOCACHE";
+  push(@ddl, $seq_sql);
+  push(@ddl, $self->_get_create_trigger_ddl($table, $column, $seq_name));
+
+  return @ddl;
 }
 
 sub _get_create_trigger_ddl {
-    my ($self, $table, $column, $seq_name) = @_;
-    my $serial_sql = "CREATE OR REPLACE TRIGGER ${table}_${column}_TR "
-                   . " BEFORE INSERT ON $table "
-                   . " FOR EACH ROW "
-                   . " BEGIN "
-                   . "   SELECT ${seq_name}.NEXTVAL "
-                   . "   INTO :NEW.$column FROM DUAL; "
-                   . " END;";
-    return $serial_sql;
+  my ($self, $table, $column, $seq_name) = @_;
+  my $serial_sql
+    = "CREATE OR REPLACE TRIGGER ${table}_${column}_TR "
+    . " BEFORE INSERT ON $table "
+    . " FOR EACH ROW "
+    . " BEGIN "
+    . "   SELECT ${seq_name}.NEXTVAL "
+    . "   INTO :NEW.$column FROM DUAL; " . " END;";
+  return $serial_sql;
 }
 
-sub get_set_serial_sql { 
-    my ($self, $table, $column, $value) = @_; 
-    my @sql;
-    my $seq_name = "${table}_${column}_SEQ";
-    push(@sql, "DROP SEQUENCE ${seq_name}");
-    push(@sql, $self->_get_create_seq_ddl($table, $column, $value));       
-    return @sql;
-} 
+sub get_set_serial_sql {
+  my ($self, $table, $column, $value) = @_;
+  my @sql;
+  my $seq_name = "${table}_${column}_SEQ";
+  push(@sql, "DROP SEQUENCE ${seq_name}");
+  push(@sql, $self->_get_create_seq_ddl($table, $column, $value));
+  return @sql;
+}
 
 1;
 
@@ -524,6 +555,8 @@ sub get_set_serial_sql {
 
 =item get_drop_column_ddl
 
+=item get_drop_default_ddl
+
 =item get_drop_table_ddl
 
 =item get_drop_fk_sql
diff --git a/Bugzilla/DB/Schema/Pg.pm b/Bugzilla/DB/Schema/Pg.pm
index 55a9322728..c933b2a893 100644
--- a/Bugzilla/DB/Schema/Pg.pm
+++ b/Bugzilla/DB/Schema/Pg.pm
@@ -13,7 +13,7 @@ package Bugzilla::DB::Schema::Pg;
 #
 ###############################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -23,169 +23,185 @@ use Storable qw(dclone);
 #------------------------------------------------------------------------------
 sub _initialize {
 
-    my $self = shift;
-
-    $self = $self->SUPER::_initialize(@_);
-
-    # Remove FULLTEXT index types from the schemas.
-    foreach my $table (keys %{ $self->{schema} }) {
-        if ($self->{schema}{$table}{INDEXES}) {
-            foreach my $index (@{ $self->{schema}{$table}{INDEXES} }) {
-                if (ref($index) eq 'HASH') {
-                    delete($index->{TYPE}) if (exists $index->{TYPE} 
-                        && $index->{TYPE} eq 'FULLTEXT');
-                }
-            }
-            foreach my $index (@{ $self->{abstract_schema}{$table}{INDEXES} }) {
-                if (ref($index) eq 'HASH') {
-                    delete($index->{TYPE}) if (exists $index->{TYPE} 
-                        && $index->{TYPE} eq 'FULLTEXT');
-                }
-            }
+  my $self = shift;
+
+  $self = $self->SUPER::_initialize(@_);
+
+  # Remove FULLTEXT index types from the schemas.
+  foreach my $table (keys %{$self->{schema}}) {
+    if ($self->{schema}{$table}{INDEXES}) {
+      foreach my $index (@{$self->{schema}{$table}{INDEXES}}) {
+        if (ref($index) eq 'HASH') {
+          delete($index->{TYPE})
+            if (exists $index->{TYPE} && $index->{TYPE} eq 'FULLTEXT');
+        }
+      }
+      foreach my $index (@{$self->{abstract_schema}{$table}{INDEXES}}) {
+        if (ref($index) eq 'HASH') {
+          delete($index->{TYPE})
+            if (exists $index->{TYPE} && $index->{TYPE} eq 'FULLTEXT');
         }
+      }
     }
+  }
 
-    $self->{db_specific} = {
+  $self->{db_specific} = {
 
-        BOOLEAN =>      'smallint',
-        FALSE =>        '0', 
-        TRUE =>         '1',
+    BOOLEAN => 'smallint',
+    FALSE   => '0',
+    TRUE    => '1',
 
-        INT1 =>         'integer',
-        INT2 =>         'integer',
-        INT3 =>         'integer',
-        INT4 =>         'integer',
+    INT1 => 'integer',
+    INT2 => 'integer',
+    INT3 => 'integer',
+    INT4 => 'integer',
 
-        SMALLSERIAL =>  'serial unique',
-        MEDIUMSERIAL => 'serial unique',
-        INTSERIAL =>    'serial unique',
+    SMALLSERIAL  => 'serial unique',
+    MEDIUMSERIAL => 'serial unique',
+    INTSERIAL    => 'serial unique',
 
-        TINYTEXT =>     'varchar(255)',
-        MEDIUMTEXT =>   'text',
-        LONGTEXT =>     'text',
+    TINYTEXT   => 'varchar(255)',
+    MEDIUMTEXT => 'text',
+    LONGTEXT   => 'text',
 
-        LONGBLOB =>     'bytea',
+    LONGBLOB => 'bytea',
 
-        DATETIME =>     'timestamp(0) without time zone',
-        DATE     =>     'date',
-    };
+    DATETIME => 'timestamp(0) without time zone',
+    DATE     => 'date',
+  };
 
-    $self->_adjust_schema;
+  $self->_adjust_schema;
 
-    return $self;
+  return $self;
+
+}    #eosub--_initialize
 
-} #eosub--_initialize
 #--------------------------------------------------------------------
 
 sub get_create_database_sql {
-    my ($self, $name) = @_;
-    # We only create as utf8 if we have no params (meaning we're doing
-    # a new installation) or if the utf8 param is on.
-    my $create_utf8 = Bugzilla->params->{'utf8'}
-                      || !defined Bugzilla->params->{'utf8'};
-    my $charset = $create_utf8 ? "ENCODING 'UTF8' TEMPLATE template0" : '';
-    return ("CREATE DATABASE $name $charset");
+  my ($self, $name) = @_;
+  return ("CREATE DATABASE \"$name\" ENCODING 'UTF8' TEMPLATE template0");
 }
 
 sub get_rename_column_ddl {
-    my ($self, $table, $old_name, $new_name) = @_;
-    if (lc($old_name) eq lc($new_name)) {
-        # if the only change is a case change, return an empty list, since Pg
-        # is case-insensitive and will return an error about a duplicate name
-        return ();
-    }
-    my @sql = ("ALTER TABLE $table RENAME COLUMN $old_name TO $new_name");
-    my $def = $self->get_column_abstract($table, $old_name);
-    if ($def->{TYPE} =~ /SERIAL/i) {
-        # We have to rename the series also.
-        push(@sql, "ALTER SEQUENCE ${table}_${old_name}_seq 
-                         RENAME TO ${table}_${new_name}_seq");
-    }
-    return @sql;
+  my ($self, $table, $old_name, $new_name) = @_;
+  if (lc($old_name) eq lc($new_name)) {
+
+    # if the only change is a case change, return an empty list, since Pg
+    # is case-insensitive and will return an error about a duplicate name
+    return ();
+  }
+  my @sql = ("ALTER TABLE $table RENAME COLUMN $old_name TO $new_name");
+  my $def = $self->get_column_abstract($table, $old_name);
+  if ($def->{TYPE} =~ /SERIAL/i) {
+
+    # We have to rename the series also.
+    push(
+      @sql, "ALTER SEQUENCE ${table}_${old_name}_seq 
+                         RENAME TO ${table}_${new_name}_seq"
+    );
+  }
+  return @sql;
 }
 
 sub get_rename_table_sql {
-    my ($self, $old_name, $new_name) = @_;
-    if (lc($old_name) eq lc($new_name)) {
-        # if the only change is a case change, return an empty list, since Pg
-        # is case-insensitive and will return an error about a duplicate name
-        return ();
+  my ($self, $old_name, $new_name) = @_;
+  if (lc($old_name) eq lc($new_name)) {
+
+    # if the only change is a case change, return an empty list, since Pg
+    # is case-insensitive and will return an error about a duplicate name
+    return ();
+  }
+
+  my @sql = ("ALTER TABLE $old_name RENAME TO $new_name");
+
+  # If there's a SERIAL column on this table, we also need to rename the
+  # sequence.
+  # If there is a PRIMARY KEY, we need to rename it too.
+  my @columns = $self->get_table_columns($old_name);
+  foreach my $column (@columns) {
+    my $def = $self->get_column_abstract($old_name, $column);
+    if ($def->{TYPE} =~ /SERIAL/i) {
+      my $old_seq = "${old_name}_${column}_seq";
+      my $new_seq = "${new_name}_${column}_seq";
+      push(@sql, "ALTER SEQUENCE $old_seq RENAME TO $new_seq");
+      push(
+        @sql, "ALTER TABLE $new_name ALTER COLUMN $column
+                             SET DEFAULT NEXTVAL('$new_seq')"
+      );
     }
-
-    my @sql = ("ALTER TABLE $old_name RENAME TO $new_name");
-
-    # If there's a SERIAL column on this table, we also need to rename the
-    # sequence.
-    # If there is a PRIMARY KEY, we need to rename it too.
-    my @columns = $self->get_table_columns($old_name);
-    foreach my $column (@columns) {
-        my $def = $self->get_column_abstract($old_name, $column);
-        if ($def->{TYPE} =~ /SERIAL/i) {
-            my $old_seq = "${old_name}_${column}_seq";
-            my $new_seq = "${new_name}_${column}_seq";
-            push(@sql, "ALTER SEQUENCE $old_seq RENAME TO $new_seq");
-            push(@sql, "ALTER TABLE $new_name ALTER COLUMN $column
-                             SET DEFAULT NEXTVAL('$new_seq')");
-        }
-        if ($def->{PRIMARYKEY}) {
-            my $old_pk = "${old_name}_pkey";
-            my $new_pk = "${new_name}_pkey";
-            push(@sql, "ALTER INDEX $old_pk RENAME to $new_pk");
-        }
+    if ($def->{PRIMARYKEY}) {
+      my $old_pk = "${old_name}_pkey";
+      my $new_pk = "${new_name}_pkey";
+      push(@sql, "ALTER INDEX $old_pk RENAME to $new_pk");
     }
+  }
 
-    return @sql;
+  return @sql;
 }
 
 sub get_set_serial_sql {
-    my ($self, $table, $column, $value) = @_;
-    return ("SELECT setval('${table}_${column}_seq', $value, false)
-               FROM $table");
+  my ($self, $table, $column, $value) = @_;
+  return (
+    "SELECT setval('${table}_${column}_seq', $value, false)
+               FROM $table"
+  );
 }
 
 sub _get_alter_type_sql {
-    my ($self, $table, $column, $new_def, $old_def) = @_;
-    my @statements;
-
-    my $type = $new_def->{TYPE};
-    $type = $self->{db_specific}->{$type} 
-        if exists $self->{db_specific}->{$type};
-
-    if ($type =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
-        die("You cannot specify a DEFAULT on a SERIAL-type column.") 
-            if $new_def->{DEFAULT};
-    }
-
-    $type =~ s/\bserial\b/integer/i;
-
-    # On Pg, you don't need UNIQUE if you're a PK--it creates
-    # two identical indexes otherwise.
-    $type =~ s/unique//i if $new_def->{PRIMARYKEY};
-
-    push(@statements, "ALTER TABLE $table ALTER COLUMN $column
-                              TYPE $type");
-
-    if ($new_def->{TYPE} =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
-        push(@statements, "CREATE SEQUENCE ${table}_${column}_seq
-                                  OWNED BY $table.$column");
-        push(@statements, "SELECT setval('${table}_${column}_seq',
+  my ($self, $table, $column, $new_def, $old_def) = @_;
+  my @statements;
+
+  my $type = $new_def->{TYPE};
+  $type = $self->{db_specific}->{$type} if exists $self->{db_specific}->{$type};
+
+  if ($type =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
+    die("You cannot specify a DEFAULT on a SERIAL-type column.")
+      if $new_def->{DEFAULT};
+  }
+
+  $type =~ s/\bserial\b/integer/i;
+
+  # On Pg, you don't need UNIQUE if you're a PK--it creates
+  # two identical indexes otherwise.
+  $type =~ s/unique//i if $new_def->{PRIMARYKEY};
+
+  push(
+    @statements, "ALTER TABLE $table ALTER COLUMN $column
+                              TYPE $type"
+  );
+
+  if ($new_def->{TYPE} =~ /serial/i && $old_def->{TYPE} !~ /serial/i) {
+    push(
+      @statements, "CREATE SEQUENCE ${table}_${column}_seq
+                                  OWNED BY $table.$column"
+    );
+    push(
+      @statements, "SELECT setval('${table}_${column}_seq',
                                          MAX($table.$column))
-                             FROM $table");
-        push(@statements, "ALTER TABLE $table ALTER COLUMN $column 
-                           SET DEFAULT nextval('${table}_${column}_seq')");
-    }
-
-    # If this column is no longer SERIAL, we need to drop the sequence
-    # that went along with it.
-    if ($old_def->{TYPE} =~ /serial/i && $new_def->{TYPE} !~ /serial/i) {
-        push(@statements, "ALTER TABLE $table ALTER COLUMN $column 
-                           DROP DEFAULT");
-        push(@statements, "ALTER SEQUENCE ${table}_${column}_seq 
-                           OWNED BY NONE");
-        push(@statements, "DROP SEQUENCE ${table}_${column}_seq");
-    }
-
-    return @statements;
+                             FROM $table"
+    );
+    push(
+      @statements, "ALTER TABLE $table ALTER COLUMN $column 
+                           SET DEFAULT nextval('${table}_${column}_seq')"
+    );
+  }
+
+  # If this column is no longer SERIAL, we need to drop the sequence
+  # that went along with it.
+  if ($old_def->{TYPE} =~ /serial/i && $new_def->{TYPE} !~ /serial/i) {
+    push(
+      @statements, "ALTER TABLE $table ALTER COLUMN $column 
+                           DROP DEFAULT"
+    );
+    push(
+      @statements, "ALTER SEQUENCE ${table}_${column}_seq 
+                           OWNED BY NONE"
+    );
+    push(@statements, "DROP SEQUENCE ${table}_${column}_seq");
+  }
+
+  return @statements;
 }
 
 1;
diff --git a/Bugzilla/DB/Schema/Sqlite.pm b/Bugzilla/DB/Schema/Sqlite.pm
index ccdbfd8aaa..e7f805d0c5 100644
--- a/Bugzilla/DB/Schema/Sqlite.pm
+++ b/Bugzilla/DB/Schema/Sqlite.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::DB::Schema::Sqlite;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -22,37 +22,37 @@ use constant FK_ON_CREATE => 1;
 
 sub _initialize {
 
-    my $self = shift;
+  my $self = shift;
 
-    $self = $self->SUPER::_initialize(@_);
+  $self = $self->SUPER::_initialize(@_);
 
-    $self->{db_specific} = {
-        BOOLEAN =>      'integer',
-        FALSE =>        '0', 
-        TRUE =>         '1',
+  $self->{db_specific} = {
+    BOOLEAN => 'integer',
+    FALSE   => '0',
+    TRUE    => '1',
 
-        INT1 =>         'integer',
-        INT2 =>         'integer',
-        INT3 =>         'integer',
-        INT4 =>         'integer',
+    INT1 => 'integer',
+    INT2 => 'integer',
+    INT3 => 'integer',
+    INT4 => 'integer',
 
-        SMALLSERIAL =>  'SERIAL',
-        MEDIUMSERIAL => 'SERIAL',
-        INTSERIAL =>    'SERIAL',
+    SMALLSERIAL  => 'SERIAL',
+    MEDIUMSERIAL => 'SERIAL',
+    INTSERIAL    => 'SERIAL',
 
-        TINYTEXT =>     'text',
-        MEDIUMTEXT =>   'text',
-        LONGTEXT =>     'text',
+    TINYTEXT   => 'text',
+    MEDIUMTEXT => 'text',
+    LONGTEXT   => 'text',
 
-        LONGBLOB =>     'blob',
+    LONGBLOB => 'blob',
 
-        DATETIME =>     'DATETIME',
-        DATE     =>     'DATETIME',
-    };
+    DATETIME => 'DATETIME',
+    DATE     => 'DATETIME',
+  };
 
-    $self->_adjust_schema;
+  $self->_adjust_schema;
 
-    return $self;
+  return $self;
 
 }
 
@@ -61,83 +61,86 @@ sub _initialize {
 #################################
 
 sub _sqlite_create_table {
-    my ($self, $table) = @_;
-    return scalar Bugzilla->dbh->selectrow_array(
-        "SELECT sql FROM sqlite_master WHERE name = ? AND type = 'table'",
-        undef, $table);
+  my ($self, $table) = @_;
+  return
+    scalar Bugzilla->dbh->selectrow_array(
+    "SELECT sql FROM sqlite_master WHERE name = ? AND type = 'table'",
+    undef, $table);
 }
 
 sub _sqlite_table_lines {
-    my $self = shift;
-    my $table_sql = $self->_sqlite_create_table(@_);
-    $table_sql =~ s/\n*\)$//s;
-    # The $ makes this work even if people some day add crazy stuff to their
-    # schema like multi-column foreign keys.
-    return split(/,\s*$/m, $table_sql);
+  my $self      = shift;
+  my $table_sql = $self->_sqlite_create_table(@_);
+  $table_sql =~ s/\n*\)$//s;
+
+  # The $ makes this work even if people some day add crazy stuff to their
+  # schema like multi-column foreign keys.
+  return split(/,\s*$/m, $table_sql);
 }
 
 # This does most of the "heavy lifting" of the schema-altering functions.
 sub _sqlite_alter_schema {
-    my ($self, $table, $create_table, $options) = @_;
-    
-    # $create_table is sometimes an array in the form that _sqlite_table_lines
-    # returns.
-    if (ref $create_table) {
-        $create_table = join(',', @$create_table) . "\n)";
-    }
-    
-    my $dbh = Bugzilla->dbh;
-    
-    my $random = generate_random_password(5);
-    my $rename_to = "${table}_$random";
-
-    my @columns = $dbh->bz_table_columns_real($table);
-    push(@columns, $options->{extra_column}) if $options->{extra_column};
-    if (my $exclude = $options->{exclude_column}) {
-        @columns = grep { $_ ne $exclude } @columns;
-    }
-    my @insert_cols = @columns;
-    my @select_cols = @columns;
-    if (my $rename = $options->{rename}) {
-        foreach my $from (keys %$rename) {
-            my $to = $rename->{$from};
-            @insert_cols = map { $_ eq $from ? $to : $_ } @insert_cols;
-        }
+  my ($self, $table, $create_table, $options) = @_;
+
+  # $create_table is sometimes an array in the form that _sqlite_table_lines
+  # returns.
+  if (ref $create_table) {
+    $create_table = join(',', @$create_table) . "\n)";
+  }
+
+  my $dbh = Bugzilla->dbh;
+
+  my $random    = generate_random_password(5);
+  my $rename_to = "${table}_$random";
+
+  my @columns = $dbh->bz_table_columns_real($table);
+  push(@columns, $options->{extra_column}) if $options->{extra_column};
+  if (my $exclude = $options->{exclude_column}) {
+    @columns = grep { $_ ne $exclude } @columns;
+  }
+  my @insert_cols = @columns;
+  my @select_cols = @columns;
+  if (my $rename = $options->{rename}) {
+    foreach my $from (keys %$rename) {
+      my $to = $rename->{$from};
+      @insert_cols = map { $_ eq $from ? $to : $_ } @insert_cols;
     }
-    
-    my $insert_str = join(',', @insert_cols);
-    my $select_str = join(',', @select_cols);
-    my $copy_sql = "INSERT INTO $table ($insert_str)"
-                   . " SELECT $select_str FROM $rename_to";
-                   
-    # We have to turn FKs off before doing this. Otherwise, when we rename
-    # the table, all of the FKs in the other tables will be automatically
-    # updated to point to the renamed table. Note that PRAGMA foreign_keys
-    # can only be set outside of a transaction--otherwise it is a no-op.
-    if ($dbh->bz_in_transaction) {
-        die "can't alter the schema inside of a transaction";
-    }
-    my @sql = (
-        'PRAGMA foreign_keys = OFF',
-        'BEGIN EXCLUSIVE TRANSACTION',
-        @{ $options->{pre_sql} || [] },
-        "ALTER TABLE $table RENAME TO $rename_to",
-        $create_table,
-        $copy_sql,
-        "DROP TABLE $rename_to",
-        'COMMIT TRANSACTION',
-        'PRAGMA foreign_keys = ON',
-    );    
+  }
+
+  my $insert_str = join(',', @insert_cols);
+  my $select_str = join(',', @select_cols);
+  my $copy_sql
+    = "INSERT INTO $table ($insert_str)" . " SELECT $select_str FROM $rename_to";
+
+  # We have to turn FKs off before doing this. Otherwise, when we rename
+  # the table, all of the FKs in the other tables will be automatically
+  # updated to point to the renamed table. Note that PRAGMA foreign_keys
+  # can only be set outside of a transaction--otherwise it is a no-op.
+  if ($dbh->bz_in_transaction) {
+    die "can't alter the schema inside of a transaction";
+  }
+  my @sql = (
+    'PRAGMA foreign_keys = OFF',
+    'BEGIN EXCLUSIVE TRANSACTION',
+    @{$options->{pre_sql} || []},
+    "ALTER TABLE $table RENAME TO $rename_to",
+    $create_table,
+    $copy_sql,
+    "DROP TABLE $rename_to",
+    'COMMIT TRANSACTION',
+    'PRAGMA foreign_keys = ON',
+  );
 }
 
 # For finding a particular column's definition in a CREATE TABLE statement.
 sub _sqlite_column_regex {
-    my ($column) = @_;
-    # 1 = Comma at start
-    # 2 = Column name + Space
-    # 3 = Definition
-    # 4 = Ending comma
-    return qr/(^|,)(\s\Q$column\E\s+)(.*?)(,|$)/m;
+  my ($column) = @_;
+
+  # 1 = Comma at start
+  # 2 = Column name + Space
+  # 3 = Definition
+  # 4 = Ending comma
+  return qr/(^|,)(\s\Q$column\E\s+)(.*?)(,|$)/m;
 }
 
 #############################
@@ -145,133 +148,137 @@ sub _sqlite_column_regex {
 #############################
 
 sub get_create_database_sql {
-    # If we get here, it means there was some error creating the
-    # database file during bz_create_database in Bugzilla::DB,
-    # and we just want to display that error instead of doing
-    # anything else.
-    Bugzilla->dbh;
-    die "Reached an unreachable point";
+
+  # If we get here, it means there was some error creating the
+  # database file during bz_create_database in Bugzilla::DB,
+  # and we just want to display that error instead of doing
+  # anything else.
+  Bugzilla->dbh;
+  die "Reached an unreachable point";
 }
 
 sub _get_create_table_ddl {
-    my $self = shift;
-    my ($table) = @_;
-    my $ddl = $self->SUPER::_get_create_table_ddl(@_);
-
-    # TheSchwartz uses its own driver to access its tables, meaning
-    # that it doesn't understand "COLLATE bugzilla" and in fact
-    # SQLite throws an error when TheSchwartz tries to access its
-    # own tables, if COLLATE bugzilla is on them. We don't have
-    # to fix this elsewhere currently, because we only create
-    # TheSchwartz's tables, we never modify them.
-    if ($table =~ /^ts_/) {
-        $ddl =~ s/ COLLATE bugzilla//g;
-    }
-    return $ddl;
+  my $self    = shift;
+  my ($table) = @_;
+  my $ddl     = $self->SUPER::_get_create_table_ddl(@_);
+
+  # TheSchwartz uses its own driver to access its tables, meaning
+  # that it doesn't understand "COLLATE bugzilla" and in fact
+  # SQLite throws an error when TheSchwartz tries to access its
+  # own tables, if COLLATE bugzilla is on them. We don't have
+  # to fix this elsewhere currently, because we only create
+  # TheSchwartz's tables, we never modify them.
+  if ($table =~ /^ts_/) {
+    $ddl =~ s/ COLLATE bugzilla//g;
+  }
+  return $ddl;
 }
 
 sub get_type_ddl {
-    my $self = shift;
-    my $def = dclone($_[0]);
-    
-    my $ddl = $self->SUPER::get_type_ddl(@_);
-    if ($def->{PRIMARYKEY} and $def->{TYPE} =~ /SERIAL/i) {
-        $ddl =~ s/\bSERIAL\b/integer/;
-        $ddl =~ s/\bPRIMARY KEY\b/PRIMARY KEY AUTOINCREMENT/;
-    }
-    if ($def->{TYPE} =~ /text/i or $def->{TYPE} =~ /char/i) {
-        $ddl .= " COLLATE bugzilla";
-    }
-    # Don't collate DATETIME fields.
-    if ($def->{TYPE} eq 'DATETIME') {
-        $ddl =~ s/\bDATETIME\b/text COLLATE BINARY/;
-    }
-    return $ddl;
+  my $self = shift;
+  my $def  = dclone($_[0]);
+
+  my $ddl = $self->SUPER::get_type_ddl(@_);
+  if ($def->{PRIMARYKEY} and $def->{TYPE} =~ /SERIAL/i) {
+    $ddl =~ s/\bSERIAL\b/integer/;
+    $ddl =~ s/\bPRIMARY KEY\b/PRIMARY KEY AUTOINCREMENT/;
+  }
+  if ($def->{TYPE} =~ /text/i or $def->{TYPE} =~ /char/i) {
+    $ddl .= " COLLATE bugzilla";
+  }
+
+  # Don't collate DATETIME fields.
+  if ($def->{TYPE} eq 'DATETIME') {
+    $ddl =~ s/\bDATETIME\b/text COLLATE BINARY/;
+  }
+  return $ddl;
 }
 
 sub get_alter_column_ddl {
-    my $self = shift;
-    my ($table, $column, $new_def, $set_nulls_to) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    my $table_sql = $self->_sqlite_create_table($table);
-    my $new_ddl = $self->get_type_ddl($new_def);
-    # When we do ADD COLUMN, columns can show up all on one line separated
-    # by commas, so we have to account for that.
-    my $column_regex = _sqlite_column_regex($column);
-    $table_sql =~ s/$column_regex/$1$2$new_ddl$4/
-        || die "couldn't find $column in $table:\n$table_sql";
-    my @pre_sql = $self->_set_nulls_sql(@_);
-    return $self->_sqlite_alter_schema($table, $table_sql,
-                                       { pre_sql => \@pre_sql });
+  my $self = shift;
+  my ($table, $column, $new_def, $set_nulls_to) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $table_sql = $self->_sqlite_create_table($table);
+  my $new_ddl   = $self->get_type_ddl($new_def);
+
+  # When we do ADD COLUMN, columns can show up all on one line separated
+  # by commas, so we have to account for that.
+  my $column_regex = _sqlite_column_regex($column);
+  $table_sql =~ s/$column_regex/$1$2$new_ddl$4/
+    || die "couldn't find $column in $table:\n$table_sql";
+  my @pre_sql = $self->_set_nulls_sql(@_);
+  return $self->_sqlite_alter_schema($table, $table_sql, {pre_sql => \@pre_sql});
 }
 
 sub get_add_column_ddl {
-    my $self = shift;
-    my ($table, $column, $definition, $init_value) = @_;
-    # SQLite can use the normal ADD COLUMN when:
-    # * The column isn't a PK
-    if ($definition->{PRIMARYKEY}) {
-        if ($definition->{NOTNULL} and $definition->{TYPE} !~ /SERIAL/i) {
-            die "You can only add new SERIAL type PKs with SQLite";
-        }
-        my $table_sql = $self->_sqlite_new_column_sql(@_);
-        # This works because _sqlite_alter_schema will exclude the new column
-        # in its INSERT ... SELECT statement, meaning that when the "new"
-        # table is populated, it will have AUTOINCREMENT values generated
-        # for it.
-        return $self->_sqlite_alter_schema($table, $table_sql);
-    }
-    # * The column has a default one way or another. Either it
-    #   defaults to NULL (it lacks NOT NULL) or it has a DEFAULT
-    #   clause. Since we also require this when doing bz_add_column (in
-    #   the way of forcing an init_value for NOT NULL columns with no
-    #   default), we first set the init_value as the default and then
-    #   alter the column.
-    if ($definition->{NOTNULL} and !defined $definition->{DEFAULT}) {
-        my %with_default = %$definition;
-        $with_default{DEFAULT} = $init_value;
-        my @pre_sql =
-            $self->SUPER::get_add_column_ddl($table, $column, \%with_default);
-        my $table_sql = $self->_sqlite_new_column_sql(@_);
-        return $self->_sqlite_alter_schema($table, $table_sql,
-            { pre_sql => \@pre_sql, extra_column => $column });
+  my $self = shift;
+  my ($table, $column, $definition, $init_value) = @_;
+
+  # SQLite can use the normal ADD COLUMN when:
+  # * The column isn't a PK
+  if ($definition->{PRIMARYKEY}) {
+    if ($definition->{NOTNULL} and $definition->{TYPE} !~ /SERIAL/i) {
+      die "You can only add new SERIAL type PKs with SQLite";
     }
-    
-    return $self->SUPER::get_add_column_ddl(@_);
+    my $table_sql = $self->_sqlite_new_column_sql(@_);
+
+    # This works because _sqlite_alter_schema will exclude the new column
+    # in its INSERT ... SELECT statement, meaning that when the "new"
+    # table is populated, it will have AUTOINCREMENT values generated
+    # for it.
+    return $self->_sqlite_alter_schema($table, $table_sql);
+  }
+
+  # * The column has a default one way or another. Either it
+  #   defaults to NULL (it lacks NOT NULL) or it has a DEFAULT
+  #   clause. Since we also require this when doing bz_add_column (in
+  #   the way of forcing an init_value for NOT NULL columns with no
+  #   default), we first set the init_value as the default and then
+  #   alter the column.
+  if ($definition->{NOTNULL} and !defined $definition->{DEFAULT}) {
+    my %with_default = %$definition;
+    $with_default{DEFAULT} = $init_value;
+    my @pre_sql = $self->SUPER::get_add_column_ddl($table, $column, \%with_default);
+    my $table_sql = $self->_sqlite_new_column_sql(@_);
+    return $self->_sqlite_alter_schema($table, $table_sql,
+      {pre_sql => \@pre_sql, extra_column => $column});
+  }
+
+  return $self->SUPER::get_add_column_ddl(@_);
 }
 
 sub _sqlite_new_column_sql {
-    my ($self, $table, $column, $def) = @_;
-    my $table_sql = $self->_sqlite_create_table($table);
-    my $new_ddl = $self->get_type_ddl($def);
-    my $new_line = "\t$column\t$new_ddl";
-    $table_sql =~ s/^(CREATE TABLE \w+ \()/$1\n$new_line,/s
-        || die "Can't find start of CREATE TABLE:\n$table_sql";
-    return $table_sql;
+  my ($self, $table, $column, $def) = @_;
+  my $table_sql = $self->_sqlite_create_table($table);
+  my $new_ddl   = $self->get_type_ddl($def);
+  my $new_line  = "\t$column\t$new_ddl";
+  $table_sql =~ s/^(CREATE TABLE \w+ \()/$1\n$new_line,/s
+    || die "Can't find start of CREATE TABLE:\n$table_sql";
+  return $table_sql;
 }
 
 sub get_drop_column_ddl {
-    my ($self, $table, $column) = @_;
-    my $table_sql = $self->_sqlite_create_table($table);
-    my $column_regex = _sqlite_column_regex($column);
-    $table_sql =~ s/$column_regex/$1/
-        || die "Can't find column $column: $table_sql";
-    # Make sure we don't end up with a comma at the end of the definition.
-    $table_sql =~ s/,\s+\)$/\n)/s;
-    return $self->_sqlite_alter_schema($table, $table_sql,
-                                       { exclude_column => $column });
+  my ($self, $table, $column) = @_;
+  my $table_sql    = $self->_sqlite_create_table($table);
+  my $column_regex = _sqlite_column_regex($column);
+  $table_sql =~ s/$column_regex/$1/
+    || die "Can't find column $column: $table_sql";
+
+  # Make sure we don't end up with a comma at the end of the definition.
+  $table_sql =~ s/,\s+\)$/\n)/s;
+  return $self->_sqlite_alter_schema($table, $table_sql,
+    {exclude_column => $column});
 }
 
 sub get_rename_column_ddl {
-    my ($self, $table, $old_name, $new_name) = @_;
-    my $table_sql = $self->_sqlite_create_table($table);
-    my $column_regex = _sqlite_column_regex($old_name);
-    $table_sql =~ s/$column_regex/$1\t$new_name\t$3$4/
-        || die "Can't find $old_name: $table_sql";
-    my %rename = ($old_name => $new_name);
-    return $self->_sqlite_alter_schema($table, $table_sql,
-                                       { rename => \%rename });
+  my ($self, $table, $old_name, $new_name) = @_;
+  my $table_sql    = $self->_sqlite_create_table($table);
+  my $column_regex = _sqlite_column_regex($old_name);
+  $table_sql =~ s/$column_regex/$1\t$new_name\t$3$4/
+    || die "Can't find $old_name: $table_sql";
+  my %rename = ($old_name => $new_name);
+  return $self->_sqlite_alter_schema($table, $table_sql, {rename => \%rename});
 }
 
 ################
@@ -279,24 +286,23 @@ sub get_rename_column_ddl {
 ################
 
 sub get_add_fks_sql {
-    my ($self, $table, $column_fks) = @_;
-    my @clauses = $self->_sqlite_table_lines($table);
-    my @add = $self->_column_fks_to_ddl($table, $column_fks);
-    push(@clauses, @add);
-    return $self->_sqlite_alter_schema($table, \@clauses);
+  my ($self, $table, $column_fks) = @_;
+  my @clauses = $self->_sqlite_table_lines($table);
+  my @add = $self->_column_fks_to_ddl($table, $column_fks);
+  push(@clauses, @add);
+  return $self->_sqlite_alter_schema($table, \@clauses);
 }
 
 sub get_drop_fk_sql {
-    my ($self, $table, $column, $references) = @_;
-    my @clauses = $self->_sqlite_table_lines($table);
-    my $fk_name = $self->_get_fk_name($table, $column, $references);
-    
-    my $line_re = qr/^\s+CONSTRAINT $fk_name /s;
-    grep { $line_re } @clauses
-        or die "Can't find $fk_name: " . join(',', @clauses);
-    @clauses = grep { $_ !~ $line_re } @clauses;
-    
-    return $self->_sqlite_alter_schema($table, \@clauses);
+  my ($self, $table, $column, $references) = @_;
+  my @clauses = $self->_sqlite_table_lines($table);
+  my $fk_name = $self->_get_fk_name($table, $column, $references);
+
+  my $line_re = qr/^\s+CONSTRAINT $fk_name /s;
+  grep {$line_re} @clauses or die "Can't find $fk_name: " . join(',', @clauses);
+  @clauses = grep { $_ !~ $line_re } @clauses;
+
+  return $self->_sqlite_alter_schema($table, \@clauses);
 }
 
 
diff --git a/Bugzilla/DB/Sqlite.pm b/Bugzilla/DB/Sqlite.pm
index ddafc16962..e05476b768 100644
--- a/Bugzilla/DB/Sqlite.pm
+++ b/Bugzilla/DB/Sqlite.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::DB::Sqlite;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -46,23 +46,23 @@ sub _sqlite_collate_ci { lc($_[0]) cmp lc($_[1]) }
 sub _sqlite_mod { $_[0] % $_[1] }
 
 sub _sqlite_now {
-    my $now = DateTime->now(time_zone => Bugzilla->local_timezone);
-    return $now->ymd . ' ' . $now->hms;
+  my $now = DateTime->now(time_zone => Bugzilla->local_timezone);
+  return $now->ymd . ' ' . $now->hms;
 }
 
 # SQL's POSITION starts its values from 1 instead of 0 (so we add 1).
 sub _sqlite_position {
-    my ($text, $fragment) = @_;
-    if (!defined $text or !defined $fragment) {
-        return undef;
-    }
-    my $pos = index $text, $fragment;
-    return $pos + 1;
+  my ($text, $fragment) = @_;
+  if (!defined $text or !defined $fragment) {
+    return undef;
+  }
+  my $pos = index $text, $fragment;
+  return $pos + 1;
 }
 
 sub _sqlite_position_ci {
-    my ($text, $fragment) = @_;
-    return _sqlite_position(lc($text), lc($fragment));
+  my ($text, $fragment) = @_;
+  return _sqlite_position(lc($text), lc($fragment));
 }
 
 ###############
@@ -70,76 +70,80 @@ sub _sqlite_position_ci {
 ###############
 
 sub new {
-    my ($class, $params) = @_;
-    my $db_name = $params->{db_name};
-    
-    # Let people specify paths intead of data/ for the DB.
-    if ($db_name and $db_name !~ m{[\\/]}) {
-        # When the DB is first created, there's a chance that the
-        # data directory doesn't exist at all, because the Install::Filesystem
-        # code happens after DB creation. So we create the directory ourselves
-        # if it doesn't exist.
-        my $datadir = bz_locations()->{datadir};
-        if (!-d $datadir) {
-            mkdir $datadir or warn "$datadir: $!";
-        }
-        if (!-d "$datadir/db/") {
-            mkdir "$datadir/db/" or warn "$datadir/db: $!";
-        }
-        $db_name = bz_locations()->{datadir} . "/db/$db_name";
+  my ($class, $params) = @_;
+  my $db_name = $params->{db_name};
+
+  # Let people specify paths instead of data/ for the DB.
+  if ($db_name and $db_name !~ m{[\\/]}) {
+
+    # When the DB is first created, there's a chance that the
+    # data directory doesn't exist at all, because the Install::Filesystem
+    # code happens after DB creation. So we create the directory ourselves
+    # if it doesn't exist.
+    my $datadir = bz_locations()->{datadir};
+    if (!-d $datadir) {
+      mkdir $datadir or warn "$datadir: $!";
     }
-
-    # construct the DSN from the parameters we got
-    my $dsn = "dbi:SQLite:dbname=$db_name";
-
-    my $attrs = {
-        # XXX Should we just enforce this to be always on?
-        sqlite_unicode => Bugzilla->params->{'utf8'},
-    };
-
-    my $self = $class->db_new({ dsn => $dsn, user => '', 
-                                pass => '', attrs => $attrs });
-    # Needed by TheSchwartz
-    $self->{private_bz_dsn} = $dsn;
-    
-    my %pragmas = (
-        # Make sure that the sqlite file doesn't grow without bound.
-        auto_vacuum => 1,
-        encoding => "'UTF-8'",
-        foreign_keys => 'ON',
-        # We want the latest file format.
-        legacy_file_format => 'OFF',
-        # This guarantees that we get column names like "foo"
-        # instead of "table.foo" in selectrow_hashref.
-        short_column_names => 'ON',
-        # The write-ahead log mode in SQLite 3.7 gets us better concurrency,
-        # but breaks backwards-compatibility with older versions of
-        # SQLite. (Which is important because people may also want to use
-        # command-line clients to access and back up their DB.) If you need
-        # better concurrency and don't need 3.6 compatibility, then you can
-        # uncomment this line.
-        #journal_mode => "'WAL'",
-    );
-    
-    while (my ($name, $value) = each %pragmas) {
-        $self->do("PRAGMA $name = $value");
+    if (!-d "$datadir/db/") {
+      mkdir "$datadir/db/" or warn "$datadir/db: $!";
     }
-    
-    $self->sqlite_create_collation('bugzilla', \&_sqlite_collate_ci);
-    $self->sqlite_create_function('position', 2, \&_sqlite_position);
-    $self->sqlite_create_function('iposition', 2, \&_sqlite_position_ci);
-    # SQLite has a "substr" function, but other DBs call it "SUBSTRING"
-    # so that's what we use, and I don't know of any way in SQLite to
-    # alias the SQL "substr" function to be called "SUBSTRING".
-    $self->sqlite_create_function('substring', 3, \&CORE::substr);
-    $self->sqlite_create_function('char_length', 1, sub { length($_[0]) });
-    $self->sqlite_create_function('mod', 2, \&_sqlite_mod);
-    $self->sqlite_create_function('now', 0, \&_sqlite_now);
-    $self->sqlite_create_function('localtimestamp', 1, \&_sqlite_now);
-    $self->sqlite_create_function('floor', 1, \&POSIX::floor);
-
-    bless ($self, $class);
-    return $self;
+    $db_name = bz_locations()->{datadir} . "/db/$db_name";
+  }
+
+  # construct the DSN from the parameters we got
+  my $dsn = "dbi:SQLite:dbname=$db_name";
+
+  my $attrs = {sqlite_unicode => 1,};
+
+  my $self
+    = $class->db_new({dsn => $dsn, user => '', pass => '', attrs => $attrs});
+
+  # Needed by TheSchwartz
+  $self->{private_bz_dsn} = $dsn;
+
+  my %pragmas = (
+
+    # Make sure that the sqlite file doesn't grow without bound.
+    auto_vacuum  => 1,
+    encoding     => "'UTF-8'",
+    foreign_keys => 'ON',
+
+    # We want the latest file format.
+    legacy_file_format => 'OFF',
+
+    # This guarantees that we get column names like "foo"
+    # instead of "table.foo" in selectrow_hashref.
+    short_column_names => 'ON',
+
+    # The write-ahead log mode in SQLite 3.7 gets us better concurrency,
+    # but breaks backwards-compatibility with older versions of
+    # SQLite. (Which is important because people may also want to use
+    # command-line clients to access and back up their DB.) If you need
+    # better concurrency and don't need 3.6 compatibility, then you can
+    # uncomment this line.
+    #journal_mode => "'WAL'",
+  );
+
+  while (my ($name, $value) = each %pragmas) {
+    $self->do("PRAGMA $name = $value");
+  }
+
+  $self->sqlite_create_collation('bugzilla', \&_sqlite_collate_ci);
+  $self->sqlite_create_function('position',  2, \&_sqlite_position);
+  $self->sqlite_create_function('iposition', 2, \&_sqlite_position_ci);
+
+  # SQLite has a "substr" function, but other DBs call it "SUBSTRING"
+  # so that's what we use, and I don't know of any way in SQLite to
+  # alias the SQL "substr" function to be called "SUBSTRING".
+  $self->sqlite_create_function('substring',      3, \&CORE::substr);
+  $self->sqlite_create_function('char_length',    1, sub { length($_[0]) });
+  $self->sqlite_create_function('mod',            2, \&_sqlite_mod);
+  $self->sqlite_create_function('now',            0, \&_sqlite_now);
+  $self->sqlite_create_function('localtimestamp', 1, \&_sqlite_now);
+  $self->sqlite_create_function('floor',          1, \&POSIX::floor);
+
+  bless($self, $class);
+  return $self;
 }
 
 ###############
@@ -147,85 +151,89 @@ sub new {
 ###############
 
 sub sql_position {
-    my ($self, $fragment, $text) = @_;
-    return "POSITION($text, $fragment)";
+  my ($self, $fragment, $text) = @_;
+  return "POSITION($text, $fragment)";
 }
 
 sub sql_iposition {
-    my ($self, $fragment, $text) = @_;
-    return "IPOSITION($text, $fragment)";
+  my ($self, $fragment, $text) = @_;
+  return "IPOSITION($text, $fragment)";
 }
 
 # SQLite does not have to GROUP BY the optional columns.
 sub sql_group_by {
-    my ($self, $needed_columns, $optional_columns) = @_;
-    my $expression = "GROUP BY $needed_columns";
-    return $expression;
+  my ($self, $needed_columns, $optional_columns) = @_;
+  my $expression = "GROUP BY $needed_columns";
+  return $expression;
 }
 
 # XXX SQLite does not support sorting a GROUP_CONCAT, so $sort is unimplemented.
 sub sql_group_concat {
-    my ($self, $column, $separator, $sort) = @_;
-    $separator = $self->quote(', ') if !defined $separator;
-    # In SQLite, a GROUP_CONCAT call with a DISTINCT argument can't
-    # specify its separator, and has to accept the default of ",".
-    if ($column =~ /^DISTINCT/) {
-        return "GROUP_CONCAT($column)";
-    }
-    return "GROUP_CONCAT($column, $separator)";
+  my ($self, $column, $separator, $sort) = @_;
+  $separator = $self->quote(', ') if !defined $separator;
+
+  # In SQLite, a GROUP_CONCAT call with a DISTINCT argument can't
+  # specify its separator, and has to accept the default of ",".
+  if ($column =~ /^DISTINCT/) {
+    return "GROUP_CONCAT($column)";
+  }
+  return "GROUP_CONCAT($column, $separator)";
 }
 
 sub sql_istring {
-    my ($self, $string) = @_;
-    return $string;
+  my ($self, $string) = @_;
+  return $string;
 }
 
 sub sql_regexp {
-    my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
-    $real_pattern ||= $pattern;
+  my ($self, $expr, $pattern, $nocheck, $real_pattern) = @_;
+  $real_pattern ||= $pattern;
 
-    $self->bz_check_regexp($real_pattern) if !$nocheck;
+  $self->bz_check_regexp($real_pattern) if !$nocheck;
 
-    return "$expr REGEXP $pattern";
+  return "$expr REGEXP $pattern";
 }
 
 sub sql_not_regexp {
-    my $self = shift;
-    my $re_expression = $self->sql_regexp(@_);
-    return "NOT($re_expression)";
+  my $self          = shift;
+  my $re_expression = $self->sql_regexp(@_);
+  return "NOT($re_expression)";
 }
 
 sub sql_limit {
-    my ($self, $limit, $offset) = @_;
-
-    if (defined($offset)) {
-        return "LIMIT $limit OFFSET $offset";
-    } else {
-        return "LIMIT $limit";
-    }
+  my ($self, $limit, $offset) = @_;
+
+  if (defined($offset)) {
+    return "LIMIT $limit OFFSET $offset";
+  }
+  else {
+    return "LIMIT $limit";
+  }
 }
 
 sub sql_from_days {
-    my ($self, $days) = @_;
-    return "DATETIME($days)";
+  my ($self, $days) = @_;
+  return "DATETIME($days)";
 }
 
 sub sql_to_days {
-    my ($self, $date) = @_;
-    return "JULIANDAY($date)";
+  my ($self, $date) = @_;
+  return "JULIANDAY($date)";
 }
 
 sub sql_date_format {
-    my ($self, $date, $format) = @_;
-    $format = "%Y.%m.%d %H:%M:%S" if !$format;
-    $format =~ s/\%i/\%M/g;
-    return "STRFTIME(" . $self->quote($format) . ", $date)";
+  my ($self, $date, $format) = @_;
+  $format = "%Y.%m.%d %H:%M:%S" if !$format;
+  $format =~ s/\%i/\%M/g;
+  $format =~ s/\%s/\%S/g;
+  return "STRFTIME(" . $self->quote($format) . ", $date)";
 }
 
 sub sql_date_math {
-    my ($self, $date, $operator, $interval, $units) = @_;
-    # We do the || thing (concatenation) so that placeholders work properly.
-    return "DATETIME($date, '$operator' || $interval || ' $units')";
+  my ($self, $date, $operator, $interval, $units) = @_;
+
+  # We do the || thing (concatenation) so that placeholders work properly.
+  return "DATETIME($date, '$operator' || $interval || ' $units')";
 }
 
 ###############
@@ -233,56 +241,57 @@ sub sql_date_math {
 ###############
 
 sub bz_setup_database {
-    my $self = shift;
-    $self->SUPER::bz_setup_database(@_);
-
-    # If we created TheSchwartz tables with COLLATE bugzilla (during the
-    # 4.1.x development series) re-create them without it.
-    my @tables = $self->bz_table_list();
-    my @ts_tables = grep { /^ts_/ } @tables;
-    my $drop_ok;
-    foreach my $table (@ts_tables) {
-        my $create_table =
-            $self->_bz_real_schema->_sqlite_create_table($table);
-        if ($create_table =~ /COLLATE bugzilla/) {
-            if (!$drop_ok) {
-                _sqlite_jobqueue_drop_message();
-                $drop_ok = 1;
-            }
-            $self->bz_drop_table($table);
-            $self->bz_add_table($table);
-        }
+  my $self = shift;
+  $self->SUPER::bz_setup_database(@_);
+
+  # If we created TheSchwartz tables with COLLATE bugzilla (during the
+  # 4.1.x development series) re-create them without it.
+  my @tables = $self->bz_table_list();
+  my @ts_tables = grep {/^ts_/} @tables;
+  my $drop_ok;
+  foreach my $table (@ts_tables) {
+    my $create_table = $self->_bz_real_schema->_sqlite_create_table($table);
+    if ($create_table =~ /COLLATE bugzilla/) {
+      if (!$drop_ok) {
+        _sqlite_jobqueue_drop_message();
+        $drop_ok = 1;
+      }
+      $self->bz_drop_table($table);
+      $self->bz_add_table($table);
     }
+  }
 }
 
 sub _sqlite_jobqueue_drop_message {
-    # This is not translated because this situation will only happen if
-    # you are updating from a 4.1.x development version of Bugzilla using
-    # SQLite, and we don't want to maintain this string in strings.txt.pl
-    # forever for just this one uncommon circumstance.
-    print <<END;
+
+  # This is not translated because this situation will only happen if
+  # you are updating from a 4.1.x development version of Bugzilla using
+  # SQLite, and we don't want to maintain this string in strings.txt.pl
+  # forever for just this one uncommon circumstance.
+  print <<END;
 WARNING: We have to re-create all the database tables used by jobqueue.pl.
 If there are any pending jobs in the database (that is, emails that
 haven't been sent), they will be deleted.
 
 END
-    unless (Bugzilla->installation_answers->{NO_PAUSE}) {
-        print install_string('enter_or_ctrl_c');
-        getc;
-    }
+  unless (Bugzilla->installation_answers->{NO_PAUSE}) {
+    print install_string('enter_or_ctrl_c');
+    getc;
+  }
 }
 
 # XXX This needs to be implemented.
 sub bz_explain { }
 
 sub bz_table_list_real {
-    my $self = shift;
-    my @tables = $self->SUPER::bz_table_list_real(@_);
-    # SQLite includes a sqlite_sequence table in every database that isn't
-    # one of our real tables. We exclude any table that starts with sqlite_,
-    # just to be safe.
-    @tables = grep { $_ !~ /^sqlite_/ } @tables;
-    return @tables;
+  my $self   = shift;
+  my @tables = $self->SUPER::bz_table_list_real(@_);
+
+  # SQLite includes a sqlite_sequence table in every database that isn't
+  # one of our real tables. We exclude any table that starts with sqlite_,
+  # just to be safe.
+  @tables = grep { $_ !~ /^sqlite_/ } @tables;
+  return @tables;
 }
 
 1;
diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index 05a7ce7b3a..50e53f5e03 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Error;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -22,180 +22,191 @@ use Bugzilla::Hook;
 use Carp;
 use Data::Dumper;
 use Date::Format;
-
-# We cannot use $^S to detect if we are in an eval(), because mod_perl
-# already eval'uates everything, so $^S = 1 in all cases under mod_perl!
-sub _in_eval {
-    my $in_eval = 0;
-    for (my $stack = 1; my $sub = (caller($stack))[3]; $stack++) {
-        last if $sub =~ /^ModPerl/;
-        $in_eval = 1 if $sub =~ /^\(eval\)/;
-    }
-    return $in_eval;
-}
+use Scalar::Util qw(blessed);
 
 sub _throw_error {
-    my ($name, $error, $vars) = @_;
-    my $dbh = Bugzilla->dbh;
-    $vars ||= {};
-
-    $vars->{error} = $error;
-
-    # Make sure any transaction is rolled back (if supported).
-    # If we are within an eval(), do not roll back transactions as we are
-    # eval'uating some test on purpose.
-    $dbh->bz_rollback_transaction() if ($dbh->bz_in_transaction() && !_in_eval());
-
-    my $datadir = bz_locations()->{'datadir'};
-    # If a writable $datadir/errorlog exists, log error details there.
-    if (-w "$datadir/errorlog") {
-        require Bugzilla::Util;
-        require Data::Dumper;
-        my $mesg = "";
-        for (1..75) { $mesg .= "-"; };
-        $mesg .= "\n[$$] " . time2str("%D %H:%M:%S ", time());
-        $mesg .= "$name $error ";
-        $mesg .= Bugzilla::Util::remote_ip();
-        $mesg .= Bugzilla->user->login;
-        $mesg .= (' actually ' . Bugzilla->sudoer->login) if Bugzilla->sudoer;
-        $mesg .= "\n";
-        my %params = Bugzilla->cgi->Vars;
-        $Data::Dumper::Useqq = 1;
-        for my $param (sort keys %params) {
-            my $val = $params{$param};
-            # obscure passwords
-            $val = "*****" if $param =~ /password/i;
-            # limit line length
-            $val =~ s/^(.{512}).*$/$1\[CHOP\]/;
-            $mesg .= "[$$] " . Data::Dumper->Dump([$val],["param($param)"]);
-        }
-        for my $var (sort keys %ENV) {
-            my $val = $ENV{$var};
-            $val = "*****" if $val =~ /password|http_pass/i;
-            $mesg .= "[$$] " . Data::Dumper->Dump([$val],["env($var)"]);
-        }
-        open(ERRORLOGFID, ">>$datadir/errorlog");
-        print ERRORLOGFID "$mesg\n";
-        close ERRORLOGFID;
+  my ($name, $error, $vars) = @_;
+  my $cache = Bugzilla->request_cache;
+  $vars ||= {};
+
+  $vars->{error} = $error;
+
+  my $datadir = bz_locations()->{'datadir'};
+
+  # If a writable $datadir/errorlog exists, log error details there.
+  if (-w "$datadir/errorlog") {
+    require Bugzilla::Util;
+    require Data::Dumper;
+    my $mesg = "";
+    for (1 .. 75) { $mesg .= "-"; }
+    $mesg .= "\n[$$] " . time2str("%D %H:%M:%S ", time());
+    $mesg .= "$name $error ";
+    $mesg .= Bugzilla::Util::remote_ip();
+    $mesg .= Bugzilla->user->login;
+    $mesg .= (' actually ' . Bugzilla->sudoer->login) if Bugzilla->sudoer;
+    $mesg .= "\n";
+    my %params = Bugzilla->cgi->Vars;
+    $Data::Dumper::Useqq = 1;
+
+    for my $param (sort keys %params) {
+      my $val = $params{$param};
+
+      # obscure passwords
+      $val = "*****" if $param =~ /password/i;
+
+      # limit line length
+      $val =~ s/^(.{512}).*$/$1\[CHOP\]/;
+      $mesg .= "[$$] " . Data::Dumper->Dump([$val], ["param($param)"]);
     }
-
-    my $template = Bugzilla->template;
-    my $message;
-    # There are some tests that throw and catch a lot of errors,
-    # and calling $template->process over and over for those errors
-    # is too slow. So instead, we just "die" with a dump of the arguments.
-    if (Bugzilla->error_mode != ERROR_MODE_TEST) {
-        $template->process($name, $vars, \$message)
-          || ThrowTemplateError($template->error());
+    for my $var (sort keys %ENV) {
+      my $val = $ENV{$var};
+      $val = "*****" if $val =~ /password|http_pass/i;
+      $mesg .= "[$$] " . Data::Dumper->Dump([$val], ["env($var)"]);
     }
-
-    # Let's call the hook first, so that extensions can override
-    # or extend the default behavior, or add their own error codes.
-    Bugzilla::Hook::process('error_catch', { error => $error, vars => $vars,
-                                             message => \$message });
-
-    if (Bugzilla->error_mode == ERROR_MODE_WEBPAGE) {
-        my $cgi = Bugzilla->cgi;
-        $cgi->close_standby_message('text/html', 'inline', 'error', 'html');
-        print $message;
-        print $cgi->multipart_final() if $cgi->{_multipart_in_progress};
+    open(ERRORLOGFID, ">>", "$datadir/errorlog");
+    print ERRORLOGFID "$mesg\n";
+    close ERRORLOGFID;
+  }
+
+  my $template = Bugzilla->template;
+  my $message;
+
+  # There are some tests that throw and catch a lot of errors,
+  # and calling $template->process over and over for those errors
+  # is too slow. So instead, we just "die" with a dump of the arguments.
+  if (Bugzilla->error_mode != ERROR_MODE_TEST
+    && !$Bugzilla::Template::is_processing)
+  {
+    $template->process($name, $vars, \$message)
+      || ThrowTemplateError($template->error());
+  }
+
+  # Let's call the hook first, so that extensions can override
+  # or extend the default behavior, or add their own error codes.
+  Bugzilla::Hook::process('error_catch',
+    {error => $error, vars => $vars, message => \$message});
+
+  if ($Bugzilla::Template::is_processing) {
+    $name =~ /^global\/(user|code)-error/;
+    my $type = $1 // 'unknown';
+    die Template::Exception->new("bugzilla.$type.$error", $vars);
+  }
+
+  if (Bugzilla->error_mode == ERROR_MODE_WEBPAGE) {
+    my $cgi = Bugzilla->cgi;
+    $cgi->close_standby_message('text/html', 'inline', 'error', 'html');
+    print $message;
+    print $cgi->multipart_final() if $cgi->{_multipart_in_progress};
+  }
+  elsif (Bugzilla->error_mode == ERROR_MODE_TEST) {
+    die Dumper($vars);
+  }
+  elsif (Bugzilla->error_mode == ERROR_MODE_DIE) {
+    die("$message\n");
+  }
+  elsif (Bugzilla->error_mode == ERROR_MODE_DIE_SOAP_FAULT
+    || Bugzilla->error_mode == ERROR_MODE_JSON_RPC
+    || Bugzilla->error_mode == ERROR_MODE_REST)
+  {
+    # Clone the hash so we aren't modifying the constant.
+    my %error_map = %{WS_ERROR_CODE()};
+    Bugzilla::Hook::process('webservice_error_codes', {error_map => \%error_map});
+    my $code = $error_map{$error};
+    if (!$code) {
+      $code = ERROR_UNKNOWN_FATAL     if $name =~ /code/i;
+      $code = ERROR_UNKNOWN_TRANSIENT if $name =~ /user/i;
     }
-    elsif (Bugzilla->error_mode == ERROR_MODE_TEST) {
-        die Dumper($vars);
+
+    if (Bugzilla->error_mode == ERROR_MODE_DIE_SOAP_FAULT) {
+      die SOAP::Fault->faultcode($code)->faultstring($message);
     }
-    elsif (Bugzilla->error_mode == ERROR_MODE_DIE) {
-        die("$message\n");
+    elsif (Bugzilla->error_mode == ERROR_MODE_JSON_RPC) {
+      my $server = Bugzilla->_json_server;
+
+      # Technically JSON-RPC isn't allowed to have error numbers
+      # higher than 999, but we do this to avoid conflicts with
+      # the internal JSON::RPC error codes.
+      $server->raise_error(
+        code    => 100000 + $code,
+        message => $message,
+        id      => $server->{_bz_request_id},
+        version => $server->version
+      );
+
+      # Most JSON-RPC Throw*Error calls happen within an eval inside
+      # of JSON::RPC. So, in that circumstance, instead of exiting,
+      # we die with no message. JSON::RPC checks raise_error before
+      # it checks $@, so it returns the proper error.
+      die if $cache->{in_eval};
+      $server->response($server->error_response_header);
     }
-    elsif (Bugzilla->error_mode == ERROR_MODE_DIE_SOAP_FAULT
-           || Bugzilla->error_mode == ERROR_MODE_JSON_RPC
-           || Bugzilla->error_mode == ERROR_MODE_REST)
-    {
-        # Clone the hash so we aren't modifying the constant.
-        my %error_map = %{ WS_ERROR_CODE() };
-        Bugzilla::Hook::process('webservice_error_codes',
-                                { error_map => \%error_map });
-        my $code = $error_map{$error};
-        if (!$code) {
-            $code = ERROR_UNKNOWN_FATAL if $name =~ /code/i;
-            $code = ERROR_UNKNOWN_TRANSIENT if $name =~ /user/i;
-        }
-
-        if (Bugzilla->error_mode == ERROR_MODE_DIE_SOAP_FAULT) {
-            die SOAP::Fault->faultcode($code)->faultstring($message);
-        }
-        else {
-            my $server = Bugzilla->_json_server;
-
-            my $status_code = 0;
-            if (Bugzilla->error_mode == ERROR_MODE_REST) {
-                my %status_code_map = %{ REST_STATUS_CODE_MAP() };
-                $status_code = $status_code_map{$code} || $status_code_map{'_default'};
-            }
-            # Technically JSON-RPC isn't allowed to have error numbers
-            # higher than 999, but we do this to avoid conflicts with
-            # the internal JSON::RPC error codes.
-            $server->raise_error(code        => 100000 + $code,
-                                 status_code => $status_code,
-                                 message     => $message,
-                                 id          => $server->{_bz_request_id},
-                                 version     => $server->version);
-            # Most JSON-RPC Throw*Error calls happen within an eval inside
-            # of JSON::RPC. So, in that circumstance, instead of exiting,
-            # we die with no message. JSON::RPC checks raise_error before
-            # it checks $@, so it returns the proper error.
-            die if _in_eval();
-            $server->response($server->error_response_header);
-        }
+    else {
+      my $server          = Bugzilla->api_server;
+      my %status_code_map = %{$server->constants->{REST_STATUS_CODE_MAP}};
+      my $status_code     = $status_code_map{$code} || $status_code_map{'_default'};
+      $server->return_error($status_code, $message, $code);
+      die if $cache->{in_eval};
+      $server->response;
     }
-    exit;
+  }
+  exit;
 }
 
 sub ThrowUserError {
-    _throw_error("global/user-error.html.tmpl", @_);
+  _throw_error("global/user-error.html.tmpl", @_);
 }
 
 sub ThrowCodeError {
-    my (undef, $vars) = @_;
+  my (undef, $vars) = @_;
+
+  # Don't show function arguments, in case they contain
+  # confidential data.
+  local $Carp::MaxArgNums = -1;
 
-    # Don't show function arguments, in case they contain
-    # confidential data.
-    local $Carp::MaxArgNums = -1;
-    # Don't show the error as coming from Bugzilla::Error, show it
-    # as coming from the caller.
-    local $Carp::CarpInternal{'Bugzilla::Error'} = 1;
-    $vars->{traceback} = Carp::longmess();
+  # Don't show the error as coming from Bugzilla::Error, show it
+  # as coming from the caller.
+  local $Carp::CarpInternal{'Bugzilla::Error'} = 1;
+  $vars->{traceback} //= Carp::longmess();
 
-    _throw_error("global/code-error.html.tmpl", @_);
+  _throw_error("global/code-error.html.tmpl", @_);
 }
 
 sub ThrowTemplateError {
-    my ($template_err) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($template_err) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    # Make sure the transaction is rolled back (if supported).
-    $dbh->bz_rollback_transaction() if $dbh->bz_in_transaction();
+  # Make sure the transaction is rolled back (if supported).
+  $dbh->bz_rollback_transaction() if $dbh->bz_in_transaction();
 
-    my $vars = {};
-    if (Bugzilla->error_mode == ERROR_MODE_DIE) {
-        die("error: template error: $template_err");
+  if (blessed($template_err) && $template_err->isa('Template::Exception')) {
+    my $type = $template_err->type;
+    if ($type =~ /^bugzilla\.(code|user)\.(.+)/) {
+      _throw_error("global/$1-error.html.tmpl", $2, $template_err->info);
+      return;
     }
+  }
 
-    $vars->{'template_error_msg'} = $template_err;
-    $vars->{'error'} = "template_error";
+  my $vars = {};
+  if (Bugzilla->error_mode == ERROR_MODE_DIE) {
+    die("error: template error: $template_err");
+  }
 
-    my $template = Bugzilla->template;
+  $vars->{'template_error_msg'} = $template_err;
+  $vars->{'error'}              = "template_error";
 
-    # Try a template first; but if this one fails too, fall back
-    # on plain old print statements.
-    if (!$template->process("global/code-error.html.tmpl", $vars)) {
-        require Bugzilla::Util;
-        import Bugzilla::Util qw(html_quote);
-        my $maintainer = Bugzilla->params->{'maintainer'};
-        my $error = html_quote($vars->{'template_error_msg'});
-        my $error2 = html_quote($template->error());
-        my $url = html_quote(Bugzilla->cgi->self_url);
+  my $template = Bugzilla->template;
 
-        print <<END;
+  # Try a template first; but if this one fails too, fall back
+  # on plain old print statements.
+  if (!$template->process("global/code-error.html.tmpl", $vars)) {
+    require Bugzilla::Util;
+    import Bugzilla::Util qw(html_quote);
+    my $maintainer = Bugzilla->params->{'maintainer'};
+    my $error      = html_quote($vars->{'template_error_msg'});
+    my $error2     = html_quote($template->error());
+    my $url        = html_quote(Bugzilla->cgi->self_url);
+
+    print <<END;
           <p>
             Bugzilla has suffered an internal error. Please save this page and 
             send it to $maintainer with details of what you were doing at the 
@@ -206,8 +217,8 @@ sub ThrowTemplateError {
           First error: $error<br>
           Second error: $error2</p>
 END
-    }
-    exit;
+  }
+  exit;
 }
 
 1;
diff --git a/Bugzilla/Extension.pm b/Bugzilla/Extension.pm
index 17193f1b67..c60a3aa768 100644
--- a/Bugzilla/Extension.pm
+++ b/Bugzilla/Extension.pm
@@ -7,15 +7,15 @@
 
 package Bugzilla::Extension;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Install::Util qw(
-    extension_code_files extension_template_directory 
-    extension_package_directory extension_web_directory);
+  extension_code_files extension_template_directory
+  extension_package_directory extension_web_directory);
 
 use File::Basename;
 use File::Spec;
@@ -25,10 +25,10 @@ use File::Spec;
 ####################
 
 sub new {
-    my ($class, $params) = @_;
-    $params ||= {};
-    bless $params, $class;
-    return $params;
+  my ($class, $params) = @_;
+  $params ||= {};
+  bless $params, $class;
+  return $params;
 }
 
 #######################################
@@ -36,148 +36,151 @@ sub new {
 #######################################
 
 sub load {
-    my ($class, $extension_file, $config_file) = @_;
-    my $package;
-
-    # This is needed during checksetup.pl, because Extension packages can 
-    # only be loaded once (they return "1" the second time they're loaded,
-    # instead of their name). During checksetup.pl, extensions are loaded
-    # once by Bugzilla::Install::Requirements, and then later again via
-    # Bugzilla->extensions (because of hooks).
-    my $map = Bugzilla->request_cache->{extension_requirement_package_map};
-
-    if ($config_file) {
-        if ($map and defined $map->{$config_file}) {
-            $package = $map->{$config_file};
-        }
-        else {
-            my $name = require $config_file;
-            if ($name =~ /^\d+$/) {
-                ThrowCodeError('extension_must_return_name',
-                               { extension => $config_file, 
-                                 returned  => $name });
-            }
-            $package = "${class}::$name";
-        }
-
-        __do_call($package, 'modify_inc', $config_file);
-    }
-
-    if ($map and defined $map->{$extension_file}) {
-        $package = $map->{$extension_file};
-        $package->modify_inc($extension_file) if !$config_file;
+  my ($class, $extension_file, $config_file) = @_;
+  my $package;
+
+  # This is needed during checksetup.pl, because Extension packages can
+  # only be loaded once (they return "1" the second time they're loaded,
+  # instead of their name). During checksetup.pl, extensions are loaded
+  # once by Bugzilla::Install::Requirements, and then later again via
+  # Bugzilla->extensions (because of hooks).
+  my $map = Bugzilla->request_cache->{extension_requirement_package_map};
+
+  if ($config_file) {
+    if ($map and defined $map->{$config_file}) {
+      $package = $map->{$config_file};
     }
     else {
-        my $name = require $extension_file;
-        if ($name =~ /^\d+$/) {
-            ThrowCodeError('extension_must_return_name', 
-                           { extension => $extension_file, returned => $name });
-        }
-        $package = "${class}::$name";
-        $package->modify_inc($extension_file) if !$config_file;
+      my $name = require $config_file;
+      if ($name =~ /^\d+$/) {
+        ThrowCodeError('extension_must_return_name',
+          {extension => $config_file, returned => $name});
+      }
+      $package = "${class}::$name";
     }
 
-    $class->_validate_package($package, $extension_file);
-    return $package;
-}
-
-sub _validate_package {
-    my ($class, $package, $extension_file) = @_;
-
-    # For extensions from data/extensions/additional, we don't have a file
-    # name, so we fake it.
-    if (!$extension_file) {
-        $extension_file = $package;
-        $extension_file =~ s/::/\//g;
-        $extension_file .= '.pm';
+    __do_call($package, 'modify_inc', $config_file);
+  }
+
+  if ($map and defined $map->{$extension_file}) {
+    $package = $map->{$extension_file};
+    $package->modify_inc($extension_file) if !$config_file;
+  }
+  else {
+    my $name = require $extension_file;
+    if ($name =~ /^\d+$/) {
+      ThrowCodeError('extension_must_return_name',
+        {extension => $extension_file, returned => $name});
     }
+    $package = "${class}::$name";
+    $package->modify_inc($extension_file) if !$config_file;
+  }
 
-    if (!eval { $package->NAME }) {
-        ThrowCodeError('extension_no_name', 
-                       { filename => $extension_file, package => $package });
-    }
+  $class->_validate_package($package, $extension_file);
+  return $package;
+}
 
-    if (!$package->isa($class)) {
-        ThrowCodeError('extension_must_be_subclass',
-                       { filename => $extension_file,
-                         package  => $package,
-                         class    => $class });
-    }
+sub _validate_package {
+  my ($class, $package, $extension_file) = @_;
+
+  # For extensions from data/extensions/additional, we don't have a file
+  # name, so we fake it.
+  if (!$extension_file) {
+    $extension_file = $package;
+    $extension_file =~ s/::/\//g;
+    $extension_file .= '.pm';
+  }
+
+  if (!eval { $package->NAME }) {
+    ThrowCodeError('extension_no_name',
+      {filename => $extension_file, package => $package});
+  }
+
+  if (!$package->isa($class)) {
+    ThrowCodeError('extension_must_be_subclass',
+      {filename => $extension_file, package => $package, class => $class});
+  }
 }
 
 sub load_all {
-    my $class = shift;
-    my ($file_sets, $extra_packages) = extension_code_files();
-    my @packages;
-    foreach my $file_set (@$file_sets) {
-        my $package = $class->load(@$file_set);
-        push(@packages, $package);
-    }
-
-    # Extensions from data/extensions/additional
-    foreach my $package (@$extra_packages) {
-        # Don't load an "additional" extension if we already have an extension
-        # loaded with that name.
-        next if grep($_ eq $package, @packages);
-        # Untaint the package name
-        $package =~ /([\w:]+)/;
-        $package = $1;
-        eval("require $package") || die $@;
-        $package->_validate_package($package);
-        push(@packages, $package);
-    }
-
-    return \@packages;
+  my $class = shift;
+  my ($file_sets, $extra_packages) = extension_code_files();
+  my @packages;
+  foreach my $file_set (@$file_sets) {
+    my $package = $class->load(@$file_set);
+    push(@packages, $package);
+  }
+
+  # Extensions from data/extensions/additional
+  foreach my $package (@$extra_packages) {
+
+    # Don't load an "additional" extension if we already have an extension
+    # loaded with that name.
+    next if grep($_ eq $package, @packages);
+
+    # Untaint the package name
+    $package =~ /([\w:]+)/;
+    $package = $1;
+    eval("require $package") || die $@;
+    $package->_validate_package($package);
+    push(@packages, $package);
+  }
+
+  return \@packages;
 }
 
 # Modifies @INC so that extensions can use modules like
 # "use Bugzilla::Extension::Foo::Bar", when Bar.pm is in the lib/
 # directory of the extension.
 sub modify_inc {
-    my ($class, $file) = @_;
-
-    # Note that this package_dir call is necessary to set things up
-    # for my_inc, even if we didn't take its return value.
-    my $package_dir = __do_call($class, 'package_dir', $file);
-    # Don't modify @INC for extensions that are just files in the extensions/
-    # directory. We don't want Bugzilla's base lib/CGI.pm being loaded as 
-    # Bugzilla::Extension::Foo::CGI or any other confusing thing like that.
-    return if $package_dir eq bz_locations->{'extensionsdir'};
-    unshift(@INC, sub { __do_call($class, 'my_inc', @_) });
+  my ($class, $file) = @_;
+
+  # Note that this package_dir call is necessary to set things up
+  # for my_inc, even if we didn't take its return value.
+  my $package_dir = __do_call($class, 'package_dir', $file);
+
+  # Don't modify @INC for extensions that are just files in the extensions/
+  # directory. We don't want Bugzilla's base lib/CGI.pm being loaded as
+  # Bugzilla::Extension::Foo::CGI or any other confusing thing like that.
+  return if $package_dir eq bz_locations->{'extensionsdir'};
+  push(@INC, sub { __do_call($class, 'my_inc', @_) });
 }
 
 # This is what gets put into @INC by modify_inc.
 sub my_inc {
-    my ($class, undef, $file) = @_;
-    
-    # This avoids infinite recursion in case anything inside of this function
-    # does a "require". (I know for sure that File::Spec->case_tolerant does
-    # a "require" on Windows, for example.)
-    return if $file !~ /^Bugzilla/;
-
-    my $lib_dir = __do_call($class, 'lib_dir');
-    my @class_parts = split('::', $class);
-    my ($vol, $dir, $file_name) = File::Spec->splitpath($file);
-    my @dir_parts = File::Spec->splitdir($dir);
-    # File::Spec::Win32 (any maybe other OSes) add an empty directory at the
-    # end of @dir_parts.
-    @dir_parts = grep { $_ ne '' } @dir_parts;
-    # Validate that this is a sub-package of Bugzilla::Extension::Foo ($class).
-    for (my $i = 0; $i < scalar(@class_parts); $i++) {
-        return if !@dir_parts;
-        if (File::Spec->case_tolerant) {
-            return if lc($class_parts[$i]) ne lc($dir_parts[0]);
-        }
-        else {
-            return if $class_parts[$i] ne $dir_parts[0];
-        }
-        shift(@dir_parts);
+  my ($class, undef, $file) = @_;
+
+  # This avoids infinite recursion in case anything inside of this function
+  # does a "require". (I know for sure that File::Spec->case_tolerant does
+  # a "require" on Windows, for example.)
+  return if $file !~ /^Bugzilla/;
+
+  my $lib_dir = __do_call($class, 'lib_dir');
+  my @class_parts = split('::', $class);
+  my ($vol, $dir, $file_name) = File::Spec->splitpath($file);
+  my @dir_parts = File::Spec->splitdir($dir);
+
+  # File::Spec::Win32 (any maybe other OSes) add an empty directory at the
+  # end of @dir_parts.
+  @dir_parts = grep { $_ ne '' } @dir_parts;
+
+  # Validate that this is a sub-package of Bugzilla::Extension::Foo ($class).
+  for (my $i = 0; $i < scalar(@class_parts); $i++) {
+    return if !@dir_parts;
+    if (File::Spec->case_tolerant) {
+      return if lc($class_parts[$i]) ne lc($dir_parts[0]);
+    }
+    else {
+      return if $class_parts[$i] ne $dir_parts[0];
     }
-    # For Bugzilla::Extension::Foo::Bar, this would look something like
-    # extensions/Example/lib/Bar.pm
-    my $resolved_path = File::Spec->catfile($lib_dir, @dir_parts, $file_name);
-    open(my $fh, '<', $resolved_path);
-    return $fh;
+    shift(@dir_parts);
+  }
+
+  # For Bugzilla::Extension::Foo::Bar, this would look something like
+  # extensions/Example/lib/Bar.pm
+  my $resolved_path = File::Spec->catfile($lib_dir, @dir_parts, $file_name);
+  open(my $fh, '<', $resolved_path);
+  return $fh;
 }
 
 ####################
@@ -187,23 +190,24 @@ sub my_inc {
 use constant enabled => 1;
 
 sub lib_dir {
-    my $invocant = shift;
-    my $package_dir = __do_call($invocant, 'package_dir');
-    # For extensions that are just files in the extensions/ directory,
-    # use the base lib/ dir as our "lib_dir". Note that Bugzilla never
-    # uses lib_dir in this case, though, because modify_inc is prevented
-    # from modifying @INC when we're just a file in the extensions/ directory.
-    # So this particular code block exists just to make lib_dir return
-    # something right in case an extension needs it for some odd reason.
-    if ($package_dir eq bz_locations()->{'extensionsdir'}) {
-        return bz_locations->{'ext_libpath'};
-    }
-    return File::Spec->catdir($package_dir, 'lib');
+  my $invocant = shift;
+  my $package_dir = __do_call($invocant, 'package_dir');
+
+  # For extensions that are just files in the extensions/ directory,
+  # use the base lib/ dir as our "lib_dir". Note that Bugzilla never
+  # uses lib_dir in this case, though, because modify_inc is prevented
+  # from modifying @INC when we're just a file in the extensions/ directory.
+  # So this particular code block exists just to make lib_dir return
+  # something right in case an extension needs it for some odd reason.
+  if ($package_dir eq bz_locations()->{'extensionsdir'}) {
+    return bz_locations->{'ext_libpath'};
+  }
+  return File::Spec->catdir($package_dir, 'lib');
 }
 
 sub template_dir { return extension_template_directory(@_); }
-sub package_dir  { return extension_package_directory(@_);  }
-sub web_dir      { return extension_web_directory(@_);      }
+sub package_dir  { return extension_package_directory(@_); }
+sub web_dir      { return extension_web_directory(@_); }
 
 ######################
 # Helper Subroutines #
@@ -217,13 +221,13 @@ sub web_dir      { return extension_web_directory(@_);      }
 # the method. This is necessary because Config.pm is not a subclass of
 # Bugzilla::Extension.
 sub __do_call {
-    my ($class, $method, @args) = @_;
-    if ($class->can($method)) {
-        return $class->$method(@args);
-    }
-    my $function_ref;
-    { no strict 'refs'; $function_ref = \&{$method}; }
-    return $function_ref->($class, @args);
+  my ($class, $method, @args) = @_;
+  if ($class->can($method)) {
+    return $class->$method(@args);
+  }
+  my $function_ref;
+  { no strict 'refs'; $function_ref = \&{$method}; }
+  return $function_ref->($class, @args);
 }
 
 1;
@@ -651,6 +655,21 @@ So, for example, if you had a CSS file called F<style.css> and your
 extension was called F<Foo>, your file would go into 
 F<extensions/Foo/web/style.css>.
 
+=head2 Documenting Extensions
+
+Documentation goes in F<extensions/Foo/docs/en/rst/>, if it's in English, or
+change "en" to something else if it's not. The user documentation index file
+must be called index-user.rst; the admin documentation must be called
+index-admin.rst. These will end up in the User Guide and the Administration
+Guide respectively. Both documentation types are optional. You can use various
+Sphinx constructs such as :toctree: or :include: to include further reST files
+if you need more than one page of docs.
+
+When documenting extensions to the Bugzilla API, if your extension provides
+them, the index file would be F<extensions/Foo/docs/en/rst/api/v1/index.rst>.
+When and if your API has more than one version, increment the version number.
+These docs will get included in the WebService API Reference.
+
 =head2 Disabling Your Extension
 
 If you want your extension to be totally ignored by Bugzilla (it will
diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 761f7b94e9..8567b6dfcf 100644
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -57,7 +57,7 @@ in addition to what is documented here.
 
 package Bugzilla::Field;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -81,82 +81,80 @@ use constant DB_TABLE   => 'fielddefs';
 use constant LIST_ORDER => 'sortkey, name';
 
 use constant DB_COLUMNS => qw(
-    id
-    name
-    description
-    long_desc
-    type
-    custom
-    mailhead
-    sortkey
-    obsolete
-    enter_bug
-    buglist
-    visibility_field_id
-    value_field_id
-    reverse_desc
-    is_mandatory
-    is_numeric
+  id
+  name
+  description
+  long_desc
+  type
+  custom
+  mailhead
+  sortkey
+  obsolete
+  enter_bug
+  buglist
+  visibility_field_id
+  value_field_id
+  reverse_desc
+  is_mandatory
+  is_numeric
 );
 
 use constant VALIDATORS => {
-    custom       => \&_check_custom,
-    description  => \&_check_description,
-    long_desc    => \&_check_long_desc,
-    enter_bug    => \&_check_enter_bug,
-    buglist      => \&Bugzilla::Object::check_boolean,
-    mailhead     => \&_check_mailhead,
-    name         => \&_check_name,
-    obsolete     => \&_check_obsolete,
-    reverse_desc => \&_check_reverse_desc,
-    sortkey      => \&_check_sortkey,
-    type         => \&_check_type,
-    value_field_id      => \&_check_value_field_id,
-    visibility_field_id => \&_check_visibility_field_id,
-    visibility_values => \&_check_visibility_values,
-    is_mandatory => \&Bugzilla::Object::check_boolean,
-    is_numeric   => \&_check_is_numeric,
+  custom              => \&_check_custom,
+  description         => \&_check_description,
+  long_desc           => \&_check_long_desc,
+  enter_bug           => \&_check_enter_bug,
+  buglist             => \&Bugzilla::Object::check_boolean,
+  mailhead            => \&_check_mailhead,
+  name                => \&_check_name,
+  obsolete            => \&_check_obsolete,
+  reverse_desc        => \&_check_reverse_desc,
+  sortkey             => \&_check_sortkey,
+  type                => \&_check_type,
+  value_field_id      => \&_check_value_field_id,
+  visibility_field_id => \&_check_visibility_field_id,
+  visibility_values   => \&_check_visibility_values,
+  is_mandatory        => \&Bugzilla::Object::check_boolean,
+  is_numeric          => \&_check_is_numeric,
 };
 
 use constant VALIDATOR_DEPENDENCIES => {
-    is_numeric => ['type'],
-    name => ['custom'],
-    type => ['custom'],
-    reverse_desc => ['type'],
-    value_field_id => ['type'],
-    visibility_values => ['visibility_field_id'],
+  is_numeric        => ['type'],
+  name              => ['custom'],
+  type              => ['custom'],
+  reverse_desc      => ['type'],
+  value_field_id    => ['type'],
+  visibility_values => ['visibility_field_id'],
 };
 
 use constant UPDATE_COLUMNS => qw(
-    description
-    long_desc
-    mailhead
-    sortkey
-    obsolete
-    enter_bug
-    buglist
-    visibility_field_id
-    value_field_id
-    reverse_desc
-    is_mandatory
-    is_numeric
-    type
+  description
+  long_desc
+  mailhead
+  sortkey
+  obsolete
+  enter_bug
+  buglist
+  visibility_field_id
+  value_field_id
+  reverse_desc
+  is_mandatory
+  is_numeric
+  type
 );
 
 # How various field types translate into SQL data definitions.
 use constant SQL_DEFINITIONS => {
-    # Using commas because these are constants and they shouldn't
-    # be auto-quoted by the "=>" operator.
-    FIELD_TYPE_FREETEXT,      { TYPE => 'varchar(255)', 
-                                NOTNULL => 1, DEFAULT => "''"},
-    FIELD_TYPE_SINGLE_SELECT, { TYPE => 'varchar(64)', NOTNULL => 1,
-                                DEFAULT => "'---'" },
-    FIELD_TYPE_TEXTAREA,      { TYPE => 'MEDIUMTEXT', 
-                                NOTNULL => 1, DEFAULT => "''"},
-    FIELD_TYPE_DATETIME,      { TYPE => 'DATETIME'   },
-    FIELD_TYPE_DATE,          { TYPE => 'DATE'       },
-    FIELD_TYPE_BUG_ID,        { TYPE => 'INT3'       },
-    FIELD_TYPE_INTEGER,       { TYPE => 'INT4',  NOTNULL => 1, DEFAULT => 0 },
+
+  # Using commas because these are constants and they shouldn't
+  # be auto-quoted by the "=>" operator.
+  FIELD_TYPE_FREETEXT, {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"},
+  FIELD_TYPE_SINGLE_SELECT,
+  {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"}, FIELD_TYPE_TEXTAREA,
+  {TYPE => 'MEDIUMTEXT',  NOTNULL => 1, DEFAULT => "''"},    FIELD_TYPE_DATETIME,
+  {TYPE => 'DATETIME'}, FIELD_TYPE_DATE, {TYPE => 'DATE'}, FIELD_TYPE_BUG_ID,
+  {TYPE => 'INT3'}, FIELD_TYPE_INTEGER,
+  {TYPE => 'INT4', NOTNULL => 1, DEFAULT => 0},
 };
 
 # Field definitions for the fields that ship with Bugzilla.
@@ -164,110 +162,233 @@ use constant SQL_DEFINITIONS => {
 # the fielddefs table.
 # 'days_elapsed' is set in populate_field_definitions() itself.
 use constant DEFAULT_FIELDS => (
-    {name => 'bug_id',       desc => 'Bug #',      in_new_bugmail => 1,
-     buglist => 1, is_numeric => 1},
-    {name => 'short_desc',   desc => 'Summary',    in_new_bugmail => 1,
-     is_mandatory => 1, buglist => 1},
-    {name => 'classification', desc => 'Classification', in_new_bugmail => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'product',      desc => 'Product',    in_new_bugmail => 1,
-     is_mandatory => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'version',      desc => 'Version',    in_new_bugmail => 1,
-     is_mandatory => 1, buglist => 1},
-    {name => 'rep_platform', desc => 'Platform',   in_new_bugmail => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'bug_file_loc', desc => 'URL',        in_new_bugmail => 1,
-     buglist => 1},
-    {name => 'op_sys',       desc => 'OS/Version', in_new_bugmail => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'bug_status',   desc => 'Status',     in_new_bugmail => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'status_whiteboard', desc => 'Status Whiteboard',
-     in_new_bugmail => 1, buglist => 1},
-    {name => 'keywords',     desc => 'Keywords',   in_new_bugmail => 1,
-     type => FIELD_TYPE_KEYWORDS, buglist => 1},
-    {name => 'resolution',   desc => 'Resolution',
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'bug_severity', desc => 'Severity',   in_new_bugmail => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'priority',     desc => 'Priority',   in_new_bugmail => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'component',    desc => 'Component',  in_new_bugmail => 1,
-     is_mandatory => 1,
-     type => FIELD_TYPE_SINGLE_SELECT, buglist => 1},
-    {name => 'assigned_to',  desc => 'AssignedTo', in_new_bugmail => 1,
-     buglist => 1},
-    {name => 'reporter',     desc => 'ReportedBy', in_new_bugmail => 1,
-     buglist => 1},
-    {name => 'qa_contact',   desc => 'QAContact',  in_new_bugmail => 1,
-     buglist => 1},
-    {name => 'assigned_to_realname',  desc => 'AssignedToName',
-     in_new_bugmail => 0, buglist => 1},
-    {name => 'reporter_realname',     desc => 'ReportedByName',
-     in_new_bugmail => 0, buglist => 1},
-    {name => 'qa_contact_realname',   desc => 'QAContactName',
-     in_new_bugmail => 0, buglist => 1},
-    {name => 'cc',           desc => 'CC',         in_new_bugmail => 1},
-    {name => 'dependson',    desc => 'Depends on', in_new_bugmail => 1,
-     is_numeric => 1, buglist => 1},
-    {name => 'blocked',      desc => 'Blocks',     in_new_bugmail => 1,
-     is_numeric => 1, buglist => 1},
-
-    {name => 'attachments.description', desc => 'Attachment description'},
-    {name => 'attachments.filename',    desc => 'Attachment filename'},
-    {name => 'attachments.mimetype',    desc => 'Attachment mime type'},
-    {name => 'attachments.ispatch',     desc => 'Attachment is patch',
-     is_numeric => 1},
-    {name => 'attachments.isobsolete',  desc => 'Attachment is obsolete',
-     is_numeric => 1},
-    {name => 'attachments.isprivate',   desc => 'Attachment is private',
-     is_numeric => 1},
-    {name => 'attachments.submitter',   desc => 'Attachment creator'},
-
-    {name => 'target_milestone',      desc => 'Target Milestone',
-     in_new_bugmail => 1, buglist => 1},
-    {name => 'creation_ts',           desc => 'Creation date',
-     buglist => 1},
-    {name => 'delta_ts',              desc => 'Last changed date',
-     buglist => 1},
-    {name => 'longdesc',              desc => 'Comment'},
-    {name => 'longdescs.isprivate',   desc => 'Comment is private',
-     is_numeric => 1},
-    {name => 'longdescs.count',       desc => 'Number of Comments',
-     buglist => 1, is_numeric => 1},
-    {name => 'alias',                 desc => 'Alias', buglist => 1},
-    {name => 'everconfirmed',         desc => 'Ever Confirmed',
-     is_numeric => 1},
-    {name => 'reporter_accessible',   desc => 'Reporter Accessible',
-     is_numeric => 1},
-    {name => 'cclist_accessible',     desc => 'CC Accessible',
-     is_numeric => 1},
-    {name => 'bug_group',             desc => 'Group', in_new_bugmail => 1},
-    {name => 'estimated_time',        desc => 'Estimated Hours',
-     in_new_bugmail => 1, buglist => 1, is_numeric => 1},
-    {name => 'remaining_time',        desc => 'Remaining Hours', buglist => 1,
-     is_numeric => 1},
-    {name => 'deadline',              desc => 'Deadline',
-     type => FIELD_TYPE_DATETIME, in_new_bugmail => 1, buglist => 1},
-    {name => 'commenter',             desc => 'Commenter'},
-    {name => 'flagtypes.name',        desc => 'Flags', buglist => 1},
-    {name => 'requestees.login_name', desc => 'Flag Requestee'},
-    {name => 'setters.login_name',    desc => 'Flag Setter'},
-    {name => 'work_time',             desc => 'Hours Worked', buglist => 1,
-     is_numeric => 1},
-    {name => 'percentage_complete',   desc => 'Percentage Complete',
-     buglist => 1, is_numeric => 1},
-    {name => 'content',               desc => 'Content'},
-    {name => 'attach_data.thedata',   desc => 'Attachment data'},
-    {name => "owner_idle_time",       desc => "Time Since Assignee Touched"},
-    {name => 'see_also',              desc => "See Also",
-     type => FIELD_TYPE_BUG_URLS},
-    {name => 'tag',                   desc => 'Personal Tags', buglist => 1,
-     type => FIELD_TYPE_KEYWORDS},
-    {name => 'last_visit_ts',         desc => 'Last Visit', buglist => 1,
-     type => FIELD_TYPE_DATETIME},
-    {name => 'comment_tag',           desc => 'Comment Tag'},
+  {
+    name           => 'bug_id',
+    desc           => 'Bug #',
+    in_new_bugmail => 1,
+    buglist        => 1,
+    is_numeric     => 1
+  },
+  {
+    name           => 'short_desc',
+    desc           => 'Summary',
+    in_new_bugmail => 1,
+    is_mandatory   => 1,
+    buglist        => 1
+  },
+  {
+    name           => 'classification',
+    desc           => 'Classification',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'product',
+    desc           => 'Product',
+    in_new_bugmail => 1,
+    is_mandatory   => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'version',
+    desc           => 'Version',
+    in_new_bugmail => 1,
+    is_mandatory   => 1,
+    buglist        => 1
+  },
+  {
+    name           => 'rep_platform',
+    desc           => 'Platform',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {name => 'bug_file_loc', desc => 'URL', in_new_bugmail => 1, buglist => 1},
+  {
+    name           => 'op_sys',
+    desc           => 'OS/Version',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'bug_status',
+    desc           => 'Status',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'status_whiteboard',
+    desc           => 'Status Whiteboard',
+    in_new_bugmail => 1,
+    buglist        => 1
+  },
+  {
+    name           => 'keywords',
+    desc           => 'Keywords',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_KEYWORDS,
+    buglist        => 1
+  },
+  {
+    name    => 'resolution',
+    desc    => 'Resolution',
+    type    => FIELD_TYPE_SINGLE_SELECT,
+    buglist => 1
+  },
+  {
+    name           => 'bug_severity',
+    desc           => 'Severity',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'priority',
+    desc           => 'Priority',
+    in_new_bugmail => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'component',
+    desc           => 'Component',
+    in_new_bugmail => 1,
+    is_mandatory   => 1,
+    type           => FIELD_TYPE_SINGLE_SELECT,
+    buglist        => 1
+  },
+  {
+    name           => 'assigned_to',
+    desc           => 'AssignedTo',
+    in_new_bugmail => 1,
+    buglist        => 1
+  },
+  {name => 'reporter',   desc => 'ReportedBy', in_new_bugmail => 1, buglist => 1},
+  {name => 'qa_contact', desc => 'QAContact',  in_new_bugmail => 1, buglist => 1},
+  {
+    name           => 'assigned_to_realname',
+    desc           => 'AssignedToName',
+    in_new_bugmail => 0,
+    buglist        => 1
+  },
+  {
+    name           => 'reporter_realname',
+    desc           => 'ReportedByName',
+    in_new_bugmail => 0,
+    buglist        => 1
+  },
+  {
+    name           => 'qa_contact_realname',
+    desc           => 'QAContactName',
+    in_new_bugmail => 0,
+    buglist        => 1
+  },
+  {name => 'cc', desc => 'CC', in_new_bugmail => 1},
+  {
+    name           => 'dependson',
+    desc           => 'Depends on',
+    in_new_bugmail => 1,
+    is_numeric     => 1,
+    buglist        => 1
+  },
+  {
+    name           => 'blocked',
+    desc           => 'Blocks',
+    in_new_bugmail => 1,
+    is_numeric     => 1,
+    buglist        => 1
+  },
+
+  {name => 'attachments.description', desc => 'Attachment description'},
+  {name => 'attachments.filename',    desc => 'Attachment filename'},
+  {name => 'attachments.mimetype',    desc => 'Attachment mime type'},
+  {name => 'attachments.ispatch', desc => 'Attachment is patch', is_numeric => 1},
+  {
+    name       => 'attachments.isobsolete',
+    desc       => 'Attachment is obsolete',
+    is_numeric => 1
+  },
+  {
+    name       => 'attachments.isprivate',
+    desc       => 'Attachment is private',
+    is_numeric => 1
+  },
+  {name => 'attachments.submitter', desc => 'Attachment creator'},
+
+  {
+    name           => 'target_milestone',
+    desc           => 'Target Milestone',
+    in_new_bugmail => 1,
+    buglist        => 1
+  },
+  {name => 'creation_ts',         desc => 'Creation date',      buglist    => 1},
+  {name => 'delta_ts',            desc => 'Last changed date',  buglist    => 1},
+  {name => 'longdesc',            desc => 'Comment'},
+  {name => 'longdescs.isprivate', desc => 'Comment is private', is_numeric => 1},
+  {
+    name       => 'longdescs.count',
+    desc       => 'Number of Comments',
+    buglist    => 1,
+    is_numeric => 1
+  },
+  {name => 'alias',               desc => 'Alias',               buglist    => 1},
+  {name => 'everconfirmed',       desc => 'Ever Confirmed',      is_numeric => 1},
+  {name => 'reporter_accessible', desc => 'Reporter Accessible', is_numeric => 1},
+  {name => 'cclist_accessible',   desc => 'CC Accessible',       is_numeric => 1},
+  {name => 'bug_group', desc => 'Group', in_new_bugmail => 1},
+  {
+    name           => 'estimated_time',
+    desc           => 'Estimated Hours',
+    in_new_bugmail => 1,
+    buglist        => 1,
+    is_numeric     => 1
+  },
+  {
+    name       => 'remaining_time',
+    desc       => 'Remaining Hours',
+    buglist    => 1,
+    is_numeric => 1
+  },
+  {
+    name           => 'deadline',
+    desc           => 'Deadline',
+    type           => FIELD_TYPE_DATETIME,
+    in_new_bugmail => 1,
+    buglist        => 1
+  },
+  {name => 'commenter',             desc => 'Commenter'},
+  {name => 'flagtypes.name',        desc => 'Flags', buglist => 1},
+  {name => 'requestees.login_name', desc => 'Flag Requestee'},
+  {name => 'setters.login_name',    desc => 'Flag Setter'},
+  {name => 'work_time', desc => 'Hours Worked', buglist => 1, is_numeric => 1},
+  {
+    name       => 'percentage_complete',
+    desc       => 'Percentage Complete',
+    buglist    => 1,
+    is_numeric => 1
+  },
+  {name => 'content',             desc => 'Content'},
+  {name => 'attach_data.thedata', desc => 'Attachment data'},
+  {name => "owner_idle_time",     desc => "Time Since Assignee Touched"},
+  {name => 'see_also', desc => "See Also", type => FIELD_TYPE_BUG_URLS},
+  {
+    name    => 'tag',
+    desc    => 'Personal Tags',
+    buglist => 1,
+    type    => FIELD_TYPE_KEYWORDS
+  },
+  {
+    name    => 'last_visit_ts',
+    desc    => 'Last Visit',
+    buglist => 1,
+    type    => FIELD_TYPE_DATETIME
+  },
+  {name => 'comment_tag', desc => 'Comment Tag'},
+  {name => 'dupe_of',     desc => 'Duplicate of'},
 );
 
 ################
@@ -276,12 +397,12 @@ use constant DEFAULT_FIELDS => (
 
 # Override match to add is_select.
 sub match {
-    my $self = shift;
-    my ($params) = @_;
-    if (delete $params->{is_select}) {
-        $params->{type} = [FIELD_TYPE_SINGLE_SELECT, FIELD_TYPE_MULTI_SELECT];
-    }
-    return $self->SUPER::match(@_);
+  my $self = shift;
+  my ($params) = @_;
+  if (delete $params->{is_select}) {
+    $params->{type} = [FIELD_TYPE_SINGLE_SELECT, FIELD_TYPE_MULTI_SELECT];
+  }
+  return $self->SUPER::match(@_);
 }
 
 ##############
@@ -291,151 +412,153 @@ sub match {
 sub _check_custom { return $_[1] ? 1 : 0; }
 
 sub _check_description {
-    my ($invocant, $desc) = @_;
-    $desc = clean_text($desc);
-    $desc || ThrowUserError('field_missing_description');
-    return $desc;
+  my ($invocant, $desc) = @_;
+  $desc = clean_text($desc);
+  $desc || ThrowUserError('field_missing_description');
+  return $desc;
 }
 
 sub _check_long_desc {
-    my ($invocant, $long_desc) = @_;
-    $long_desc = clean_text($long_desc || '');
-    if (length($long_desc) > MAX_FIELD_LONG_DESC_LENGTH) {
-        ThrowUserError('field_long_desc_too_long');
-    }
-    return $long_desc;
+  my ($invocant, $long_desc) = @_;
+  $long_desc = clean_text($long_desc || '');
+  if (length($long_desc) > MAX_FIELD_LONG_DESC_LENGTH) {
+    ThrowUserError('field_long_desc_too_long');
+  }
+  return $long_desc;
 }
 
 sub _check_enter_bug { return $_[1] ? 1 : 0; }
 
 sub _check_is_numeric {
-    my ($invocant, $value, undef, $params) = @_;
-    my $type = blessed($invocant) ? $invocant->type : $params->{type};
-    return 1 if $type == FIELD_TYPE_BUG_ID;
-    return $value ? 1 : 0;
+  my ($invocant, $value, undef, $params) = @_;
+  my $type = blessed($invocant) ? $invocant->type : $params->{type};
+  return 1 if $type == FIELD_TYPE_BUG_ID;
+  return $value ? 1 : 0;
 }
 
 sub _check_mailhead { return $_[1] ? 1 : 0; }
 
 sub _check_name {
-    my ($class, $name, undef, $params) = @_;
-    $name = lc(clean_text($name));
-    $name || ThrowUserError('field_missing_name');
-
-    # Don't want to allow a name that might mess up SQL.
-    my $name_regex = qr/^[\w\.]+$/;
-    # Custom fields have more restrictive name requirements than
-    # standard fields.
-    $name_regex = qr/^[a-zA-Z0-9_]+$/ if $params->{custom};
-    # Custom fields can't be named just "cf_", and there is no normal
-    # field named just "cf_".
-    ($name =~ $name_regex && $name ne "cf_")
-         || ThrowUserError('field_invalid_name', { name => $name });
-
-    # If it's custom, prepend cf_ to the custom field name to distinguish 
-    # it from standard fields.
-    if ($name !~ /^cf_/ && $params->{custom}) {
-        $name = 'cf_' . $name;
-    }
+  my ($class, $name, undef, $params) = @_;
+  $name = lc(clean_text($name));
+  $name || ThrowUserError('field_missing_name');
+
+  # Don't want to allow a name that might mess up SQL.
+  my $name_regex = qr/^[\w\.]+$/;
+
+  # Custom fields have more restrictive name requirements than
+  # standard fields.
+  $name_regex = qr/^[a-zA-Z0-9_]+$/ if $params->{custom};
+
+  # Custom fields can't be named just "cf_", and there is no normal
+  # field named just "cf_".
+  ($name =~ $name_regex && $name ne "cf_")
+    || ThrowUserError('field_invalid_name', {name => $name});
+
+  # If it's custom, prepend cf_ to the custom field name to distinguish
+  # it from standard fields.
+  if ($name !~ /^cf_/ && $params->{custom}) {
+    $name = 'cf_' . $name;
+  }
 
-    # Assure the name is unique. Names can't be changed, so we don't have
-    # to worry about what to do on updates.
-    my $field = new Bugzilla::Field({ name => $name });
-    ThrowUserError('field_already_exists', {'field' => $field }) if $field;
+  # Assure the name is unique. Names can't be changed, so we don't have
+  # to worry about what to do on updates.
+  my $field = new Bugzilla::Field({name => $name});
+  ThrowUserError('field_already_exists', {'field' => $field}) if $field;
 
-    return $name;
+  return $name;
 }
 
 sub _check_obsolete { return $_[1] ? 1 : 0; }
 
 sub _check_sortkey {
-    my ($invocant, $sortkey) = @_;
-    my $skey = $sortkey;
-    if (!defined $skey || $skey eq '') {
-        ($sortkey) = Bugzilla->dbh->selectrow_array(
-            'SELECT MAX(sortkey) + 100 FROM fielddefs') || 100;
-    }
-    detaint_natural($sortkey)
-        || ThrowUserError('field_invalid_sortkey', { sortkey => $skey });
-    return $sortkey;
+  my ($invocant, $sortkey) = @_;
+  my $skey = $sortkey;
+  if (!defined $skey || $skey eq '') {
+    ($sortkey)
+      = Bugzilla->dbh->selectrow_array('SELECT MAX(sortkey) + 100 FROM fielddefs')
+      || 100;
+  }
+  detaint_natural($sortkey)
+    || ThrowUserError('field_invalid_sortkey', {sortkey => $skey});
+  return $sortkey;
 }
 
 sub _check_type {
-    my ($invocant, $type, undef, $params) = @_;
-    my $saved_type = $type;
-    (detaint_natural($type) && $type < FIELD_TYPE_HIGHEST_PLUS_ONE)
-      || ThrowCodeError('invalid_customfield_type', { type => $saved_type });
-
-    my $custom = blessed($invocant) ? $invocant->custom : $params->{custom};
-    if ($custom && !$type) {
-        ThrowCodeError('field_type_not_specified');
-    }
+  my ($invocant, $type, undef, $params) = @_;
+  my $saved_type = $type;
+  (detaint_natural($type) && $type < FIELD_TYPE_HIGHEST_PLUS_ONE)
+    || ThrowCodeError('invalid_customfield_type', {type => $saved_type});
+
+  my $custom = blessed($invocant) ? $invocant->custom : $params->{custom};
+  if ($custom && !$type) {
+    ThrowCodeError('field_type_not_specified');
+  }
 
-    return $type;
+  return $type;
 }
 
 sub _check_value_field_id {
-    my ($invocant, $field_id, undef, $params) = @_;
-    my $is_select = $invocant->is_select($params);
-    if ($field_id && !$is_select) {
-        ThrowUserError('field_value_control_select_only');
-    }
-    return $invocant->_check_visibility_field_id($field_id);
+  my ($invocant, $field_id, undef, $params) = @_;
+  my $is_select = $invocant->is_select($params);
+  if ($field_id && !$is_select) {
+    ThrowUserError('field_value_control_select_only');
+  }
+  return $invocant->_check_visibility_field_id($field_id);
 }
 
 sub _check_visibility_field_id {
-    my ($invocant, $field_id) = @_;
-    $field_id = trim($field_id);
-    return undef if !$field_id;
-    my $field = Bugzilla::Field->check({ id => $field_id });
-    if (blessed($invocant) && $field->id == $invocant->id) {
-        ThrowUserError('field_cant_control_self', { field => $field });
-    }
-    if (!$field->is_select) {
-        ThrowUserError('field_control_must_be_select',
-                       { field => $field });
-    }
-    return $field->id;
+  my ($invocant, $field_id) = @_;
+  $field_id = trim($field_id);
+  return undef if !$field_id;
+  my $field = Bugzilla::Field->check({id => $field_id});
+  if (blessed($invocant) && $field->id == $invocant->id) {
+    ThrowUserError('field_cant_control_self', {field => $field});
+  }
+  if (!$field->is_select) {
+    ThrowUserError('field_control_must_be_select', {field => $field});
+  }
+  return $field->id;
 }
 
 sub _check_visibility_values {
-    my ($invocant, $values, undef, $params) = @_;
-    my $field;
-    if (blessed $invocant) {
-        $field = $invocant->visibility_field;
-    }
-    elsif ($params->{visibility_field_id}) {
-        $field = $invocant->new($params->{visibility_field_id});
-    }
-    # When no field is set, no values are set.
-    return [] if !$field;
+  my ($invocant, $values, undef, $params) = @_;
+  my $field;
+  if (blessed $invocant) {
+    $field = $invocant->visibility_field;
+  }
+  elsif ($params->{visibility_field_id}) {
+    $field = $invocant->new($params->{visibility_field_id});
+  }
 
-    if (!scalar @$values) {
-        ThrowUserError('field_visibility_values_must_be_selected',
-                       { field => $field });
-    }
+  # When no field is set, no values are set.
+  return [] if !$field;
+
+  if (!scalar @$values) {
+    ThrowUserError('field_visibility_values_must_be_selected', {field => $field});
+  }
 
-    my @visibility_values;
-    my $choice = Bugzilla::Field::Choice->type($field);
-    foreach my $value (@$values) {
-        if (!blessed $value) {
-            $value = $choice->check({ id => $value });
-        }
-        push(@visibility_values, $value);
+  my @visibility_values;
+  my $choice = Bugzilla::Field::Choice->type($field);
+  foreach my $value (@$values) {
+    if (!blessed $value) {
+      $value = $choice->check({id => $value});
     }
+    push(@visibility_values, $value);
+  }
 
-    return \@visibility_values;
+  return \@visibility_values;
 }
 
 sub _check_reverse_desc {
-    my ($invocant, $reverse_desc, undef, $params) = @_;
-    my $type = blessed($invocant) ? $invocant->type : $params->{type};
-    if ($type != FIELD_TYPE_BUG_ID) {
-        return undef; # store NULL for non-reversible field types
-    }
-    
-    $reverse_desc = clean_text($reverse_desc);
-    return $reverse_desc;
+  my ($invocant, $reverse_desc, undef, $params) = @_;
+  my $type = blessed($invocant) ? $invocant->type : $params->{type};
+  if ($type != FIELD_TYPE_BUG_ID) {
+    return undef;    # store NULL for non-reversible field types
+  }
+
+  $reverse_desc = clean_text($reverse_desc);
+  return $reverse_desc;
 }
 
 sub _check_is_mandatory { return $_[1] ? 1 : 0; }
@@ -583,11 +706,13 @@ objects.
 =cut
 
 sub is_select {
-    my ($invocant, $params) = @_;
-    # This allows this method to be called by create() validators.
-    my $type = blessed($invocant) ? $invocant->type : $params->{type}; 
-    return ($type == FIELD_TYPE_SINGLE_SELECT 
-            || $type == FIELD_TYPE_MULTI_SELECT) ? 1 : 0 
+  my ($invocant, $params) = @_;
+
+  # This allows this method to be called by create() validators.
+  my $type = blessed($invocant) ? $invocant->type : $params->{type};
+  return ($type == FIELD_TYPE_SINGLE_SELECT || $type == FIELD_TYPE_MULTI_SELECT)
+    ? 1
+    : 0;
 }
 
 =over
@@ -608,19 +733,19 @@ This method returns C<1> if the field is "abnormal", C<0> otherwise.
 =cut
 
 sub is_abnormal {
-    my $self = shift;
-    return ABNORMAL_SELECTS->{$self->name} ? 1 : 0;
+  my $self = shift;
+  return ABNORMAL_SELECTS->{$self->name} ? 1 : 0;
 }
 
 sub legal_values {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'legal_values'}) {
-        require Bugzilla::Field::Choice;
-        my @values = Bugzilla::Field::Choice->type($self)->get_all();
-        $self->{'legal_values'} = \@values;
-    }
-    return $self->{'legal_values'};
+  if (!defined $self->{'legal_values'}) {
+    require Bugzilla::Field::Choice;
+    my @values = Bugzilla::Field::Choice->type($self)->get_all();
+    $self->{'legal_values'} = \@values;
+  }
+  return $self->{'legal_values'};
 }
 
 =pod
@@ -637,8 +762,8 @@ in the C<timetrackinggroup>.
 =cut
 
 sub is_timetracking {
-    my ($self) = @_;
-    return grep($_ eq $self->name, TIMETRACKING_FIELDS) ? 1 : 0;
+  my ($self) = @_;
+  return grep($_ eq $self->name, TIMETRACKING_FIELDS) ? 1 : 0;
 }
 
 =pod
@@ -657,12 +782,11 @@ Returns undef if there is no field that controls this field's visibility.
 =cut
 
 sub visibility_field {
-    my $self = shift;
-    if ($self->{visibility_field_id}) {
-        $self->{visibility_field} ||= 
-            $self->new($self->{visibility_field_id});
-    }
-    return $self->{visibility_field};
+  my $self = shift;
+  if ($self->{visibility_field_id}) {
+    $self->{visibility_field} ||= $self->new($self->{visibility_field_id});
+  }
+  return $self->{visibility_field};
 }
 
 =pod
@@ -680,22 +804,23 @@ or undef if there is no C<visibility_field> set.
 =cut
 
 sub visibility_values {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    
-    return [] if !$self->{visibility_field_id};
-
-    if (!defined $self->{visibility_values}) {
-        my $visibility_value_ids =
-            $dbh->selectcol_arrayref("SELECT value_id FROM field_visibility
-                                      WHERE field_id = ?", undef, $self->id);
-
-        $self->{visibility_values} =
-            Bugzilla::Field::Choice->type($self->visibility_field)
-            ->new_from_list($visibility_value_ids);
-    }
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  return [] if !$self->{visibility_field_id};
+
+  if (!defined $self->{visibility_values}) {
+    my $visibility_value_ids = $dbh->selectcol_arrayref(
+      "SELECT value_id FROM field_visibility
+                                      WHERE field_id = ?", undef, $self->id
+    );
 
-    return $self->{visibility_values};
+    $self->{visibility_values}
+      = Bugzilla::Field::Choice->type($self->visibility_field)
+      ->new_from_list($visibility_value_ids);
+  }
+
+  return $self->{visibility_values};
 }
 
 =pod
@@ -712,10 +837,10 @@ field controls the visibility of.
 =cut
 
 sub controls_visibility_of {
-    my $self = shift;
-    $self->{controls_visibility_of} ||= 
-        Bugzilla::Field->match({ visibility_field_id => $self->id });
-    return $self->{controls_visibility_of};
+  my $self = shift;
+  $self->{controls_visibility_of}
+    ||= Bugzilla::Field->match({visibility_field_id => $self->id});
+  return $self->{controls_visibility_of};
 }
 
 =pod
@@ -733,11 +858,11 @@ Returns undef if there is no field that controls this field's visibility.
 =cut
 
 sub value_field {
-    my $self = shift;
-    if ($self->{value_field_id}) {
-        $self->{value_field} ||= $self->new($self->{value_field_id});
-    }
-    return $self->{value_field};
+  my $self = shift;
+  if ($self->{value_field_id}) {
+    $self->{value_field} ||= $self->new($self->{value_field_id});
+  }
+  return $self->{value_field};
 }
 
 =pod
@@ -754,10 +879,10 @@ field controls the values of.
 =cut
 
 sub controls_values_of {
-    my $self = shift;
-    $self->{controls_values_of} ||=
-        Bugzilla::Field->match({ value_field_id => $self->id });
-    return $self->{controls_values_of};
+  my $self = shift;
+  $self->{controls_values_of}
+    ||= Bugzilla::Field->match({value_field_id => $self->id});
+  return $self->{controls_values_of};
 }
 
 =over
@@ -771,15 +896,15 @@ See L<Bugzilla::Field::ChoiceInterface>.
 =cut
 
 sub is_visible_on_bug {
-    my ($self, $bug) = @_;
+  my ($self, $bug) = @_;
 
-    # Always return visible, if this field is not
-    # visibility controlled.
-    return 1 if !$self->{visibility_field_id};
+  # Always return visible, if this field is not
+  # visibility controlled.
+  return 1 if !$self->{visibility_field_id};
 
-    my $visibility_values = $self->visibility_values;
+  my $visibility_values = $self->visibility_values;
 
-    return (any { $_->is_set_on_bug($bug) } @$visibility_values) ? 1 : 0;
+  return (any { $_->is_set_on_bug($bug) } @$visibility_values) ? 1 : 0;
 }
 
 =over
@@ -795,13 +920,13 @@ dependency tree display, and similar functionality.
 
 =cut
 
-sub is_relationship  {     
-    my $self = shift;
-    my $desc = $self->reverse_desc;
-    if (defined $desc && $desc ne "") {
-        return 1;
-    }
-    return 0;
+sub is_relationship {
+  my $self = shift;
+  my $desc = $self->reverse_desc;
+  if (defined $desc && $desc ne "") {
+    return 1;
+  }
+  return 0;
 }
 
 =over
@@ -888,29 +1013,32 @@ They will throw an error if you try to set the values to something invalid.
 
 =cut
 
-sub set_description    { $_[0]->set('description', $_[1]); }
-sub set_long_desc      { $_[0]->set('long_desc',   $_[1]); }
-sub set_enter_bug      { $_[0]->set('enter_bug',   $_[1]); }
-sub set_is_numeric     { $_[0]->set('is_numeric',  $_[1]); }
-sub set_obsolete       { $_[0]->set('obsolete',    $_[1]); }
-sub set_sortkey        { $_[0]->set('sortkey',     $_[1]); }
-sub set_in_new_bugmail { $_[0]->set('mailhead',    $_[1]); }
-sub set_buglist        { $_[0]->set('buglist',     $_[1]); }
-sub set_reverse_desc    { $_[0]->set('reverse_desc', $_[1]); }
+sub set_description    { $_[0]->set('description',  $_[1]); }
+sub set_long_desc      { $_[0]->set('long_desc',    $_[1]); }
+sub set_enter_bug      { $_[0]->set('enter_bug',    $_[1]); }
+sub set_is_numeric     { $_[0]->set('is_numeric',   $_[1]); }
+sub set_obsolete       { $_[0]->set('obsolete',     $_[1]); }
+sub set_sortkey        { $_[0]->set('sortkey',      $_[1]); }
+sub set_in_new_bugmail { $_[0]->set('mailhead',     $_[1]); }
+sub set_buglist        { $_[0]->set('buglist',      $_[1]); }
+sub set_reverse_desc   { $_[0]->set('reverse_desc', $_[1]); }
+
 sub set_visibility_field {
-    my ($self, $value) = @_;
-    $self->set('visibility_field_id', $value);
-    delete $self->{visibility_field};
-    delete $self->{visibility_values};
+  my ($self, $value) = @_;
+  $self->set('visibility_field_id', $value);
+  delete $self->{visibility_field};
+  delete $self->{visibility_values};
 }
+
 sub set_visibility_values {
-    my ($self, $value_ids) = @_;
-    $self->set('visibility_values', $value_ids);
+  my ($self, $value_ids) = @_;
+  $self->set('visibility_values', $value_ids);
 }
+
 sub set_value_field {
-    my ($self, $value) = @_;
-    $self->set('value_field_id', $value);
-    delete $self->{value_field};
+  my ($self, $value) = @_;
+  $self->set('value_field_id', $value);
+  delete $self->{value_field};
 }
 sub set_is_mandatory { $_[0]->set('is_mandatory', $_[1]); }
 
@@ -934,69 +1062,73 @@ there are no values specified (or EVER specified) for the field.
 =cut
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    my $name = $self->name;
+  my $name = $self->name;
 
-    if (!$self->custom) {
-        ThrowCodeError('field_not_custom', {'name' => $name });
-    }
+  if (!$self->custom) {
+    ThrowCodeError('field_not_custom', {'name' => $name});
+  }
 
-    if (!$self->obsolete) {
-        ThrowUserError('customfield_not_obsolete', {'name' => $self->name });
-    }
+  if (!$self->obsolete) {
+    ThrowUserError('customfield_not_obsolete', {'name' => $self->name});
+  }
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    # Check to see if bug activity table has records (should be fast with index)
-    my $has_activity = $dbh->selectrow_array("SELECT COUNT(*) FROM bugs_activity
-                                      WHERE fieldid = ?", undef, $self->id);
-    if ($has_activity) {
-        ThrowUserError('customfield_has_activity', {'name' => $name });
-    }
+  # Check to see if bug activity table has records (should be fast with index)
+  my $has_activity = $dbh->selectrow_array(
+    "SELECT COUNT(*) FROM bugs_activity
+                                      WHERE fieldid = ?", undef, $self->id
+  );
+  if ($has_activity) {
+    ThrowUserError('customfield_has_activity', {'name' => $name});
+  }
 
-    # Check to see if bugs table has records (slow)
-    my $bugs_query = "";
+  # Check to see if bugs table has records (slow)
+  my $bugs_query = "";
 
-    if ($self->type == FIELD_TYPE_MULTI_SELECT) {
-        $bugs_query = "SELECT COUNT(*) FROM bug_$name";
-    }
-    else {
-        $bugs_query = "SELECT COUNT(*) FROM bugs WHERE $name IS NOT NULL";
-        if ($self->type != FIELD_TYPE_BUG_ID
-            && $self->type != FIELD_TYPE_DATE
-            && $self->type != FIELD_TYPE_DATETIME)
-        {
-            $bugs_query .= " AND $name != ''";
-        }
-        # Ignore the default single select value
-        if ($self->type == FIELD_TYPE_SINGLE_SELECT) {
-            $bugs_query .= " AND $name != '---'";
-        }
+  if ($self->type == FIELD_TYPE_MULTI_SELECT) {
+    $bugs_query = "SELECT COUNT(*) FROM bug_$name";
+  }
+  else {
+    $bugs_query = "SELECT COUNT(*) FROM bugs WHERE $name IS NOT NULL";
+    if ( $self->type != FIELD_TYPE_BUG_ID
+      && $self->type != FIELD_TYPE_DATE
+      && $self->type != FIELD_TYPE_DATETIME)
+    {
+      $bugs_query .= " AND $name != ''";
     }
 
-    my $has_bugs = $dbh->selectrow_array($bugs_query);
-    if ($has_bugs) {
-        ThrowUserError('customfield_has_contents', {'name' => $name });
+    # Ignore the default single select value
+    if ($self->type == FIELD_TYPE_SINGLE_SELECT) {
+      $bugs_query .= " AND $name != '---'";
     }
+  }
 
-    # Once we reach here, we should be OK to delete.
-    $self->SUPER::remove_from_db();
+  my $has_bugs = $dbh->selectrow_array($bugs_query);
+  if ($has_bugs) {
+    ThrowUserError('customfield_has_contents', {'name' => $name});
+  }
 
-    my $type = $self->type;
+  # Once we reach here, we should be OK to delete.
+  $self->SUPER::remove_from_db();
 
-    # the values for multi-select are stored in a seperate table
-    if ($type != FIELD_TYPE_MULTI_SELECT) {
-        $dbh->bz_drop_column('bugs', $name);
-    }
+  my $type = $self->type;
 
-    if ($self->is_select) {
-        # Delete the table that holds the legal values for this field.
-        $dbh->bz_drop_field_tables($self);
-    }
+  # the values for multi-select are stored in a separate table
+  if ($type != FIELD_TYPE_MULTI_SELECT) {
+    $dbh->bz_drop_column('bugs', $name);
+  }
+
+  if ($self->is_select) {
 
-    $dbh->bz_commit_transaction()
+    # Delete the table that holds the legal values for this field.
+    $dbh->bz_drop_field_tables($self);
+  }
+
+  $dbh->bz_commit_transaction();
 }
 
 =pod
@@ -1042,90 +1174,95 @@ C<is_mandatory> - boolean - Whether this field is mandatory. Defaults to 0.
 =cut
 
 sub create {
-    my $class = shift;
-    my ($params) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # This makes sure the "sortkey" validator runs, even if
-    # the parameter isn't sent to create().
-    $params->{sortkey} = undef if !exists $params->{sortkey};
-    $params->{type} ||= 0;
-    # We mark the custom field as obsolete till it has been fully created,
-    # to avoid race conditions when viewing bugs at the same time.
-    my $is_obsolete = $params->{obsolete};
-    $params->{obsolete} = 1 if $params->{custom};
-
-    $dbh->bz_start_transaction();
-    $class->check_required_create_fields(@_);
-    my $field_values      = $class->run_create_validators($params);
-    my $visibility_values = delete $field_values->{visibility_values};
-    my $field             = $class->insert_create_data($field_values);
-    
-    $field->set_visibility_values($visibility_values);
-    $field->_update_visibility_values();
-
-    $dbh->bz_commit_transaction();
-    Bugzilla->memcached->clear_config();
+  my $class    = shift;
+  my ($params) = @_;
+  my $dbh      = Bugzilla->dbh;
+
+  # This makes sure the "sortkey" validator runs, even if
+  # the parameter isn't sent to create().
+  $params->{sortkey} = undef if !exists $params->{sortkey};
+  $params->{type} ||= 0;
+
+  # We mark the custom field as obsolete till it has been fully created,
+  # to avoid race conditions when viewing bugs at the same time.
+  my $is_obsolete = $params->{obsolete};
+  $params->{obsolete} = 1 if $params->{custom};
+
+  $dbh->bz_start_transaction();
+  $class->check_required_create_fields(@_);
+  my $field_values      = $class->run_create_validators($params);
+  my $visibility_values = delete $field_values->{visibility_values};
+  my $field             = $class->insert_create_data($field_values);
+
+  $field->set_visibility_values($visibility_values);
+  $field->_update_visibility_values();
+
+  $dbh->bz_commit_transaction();
+  Bugzilla->memcached->clear_config();
+
+  if ($field->custom) {
+    my $name = $field->name;
+    my $type = $field->type;
+    if (SQL_DEFINITIONS->{$type}) {
+
+      # Create the database column that stores the data for this field.
+      $dbh->bz_add_column('bugs', $name, SQL_DEFINITIONS->{$type});
+    }
+
+    if ($field->is_select) {
 
-    if ($field->custom) {
-        my $name = $field->name;
-        my $type = $field->type;
-        if (SQL_DEFINITIONS->{$type}) {
-            # Create the database column that stores the data for this field.
-            $dbh->bz_add_column('bugs', $name, SQL_DEFINITIONS->{$type});
-        }
-
-        if ($field->is_select) {
-            # Create the table that holds the legal values for this field.
-            $dbh->bz_add_field_tables($field);
-        }
-
-        if ($type == FIELD_TYPE_SINGLE_SELECT) {
-            # Insert a default value of "---" into the legal values table.
-            $dbh->do("INSERT INTO $name (value) VALUES ('---')");
-        }
-
-        # Restore the original obsolete state of the custom field.
-        $dbh->do('UPDATE fielddefs SET obsolete = 0 WHERE id = ?', undef, $field->id)
-          unless $is_obsolete;
-
-        Bugzilla->memcached->clear({ table => 'fielddefs', id => $field->id });
-        Bugzilla->memcached->clear_config();
+      # Create the table that holds the legal values for this field.
+      $dbh->bz_add_field_tables($field);
     }
 
-    return $field;
-}
+    if ($type == FIELD_TYPE_SINGLE_SELECT) {
 
-sub update {
-    my $self = shift;
-    my $changes = $self->SUPER::update(@_);
-    my $dbh = Bugzilla->dbh;
-    if ($changes->{value_field_id} && $self->is_select) {
-        $dbh->do("UPDATE " . $self->name . " SET visibility_value_id = NULL");
+      # Insert a default value of "---" into the legal values table.
+      $dbh->do("INSERT INTO $name (value) VALUES ('---')");
     }
-    $self->_update_visibility_values();
+
+    # Restore the original obsolete state of the custom field.
+    $dbh->do('UPDATE fielddefs SET obsolete = 0 WHERE id = ?', undef, $field->id)
+      unless $is_obsolete;
+
+    Bugzilla->memcached->clear({table => 'fielddefs', id => $field->id});
     Bugzilla->memcached->clear_config();
-    return $changes;
+  }
+
+  return $field;
+}
+
+sub update {
+  my $self    = shift;
+  my $changes = $self->SUPER::update(@_);
+  my $dbh     = Bugzilla->dbh;
+  if ($changes->{value_field_id} && $self->is_select) {
+    $dbh->do("UPDATE " . $self->name . " SET visibility_value_id = NULL");
+  }
+  $self->_update_visibility_values();
+  Bugzilla->memcached->clear_config();
+  return $changes;
 }
 
 sub _update_visibility_values {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    my @visibility_value_ids = map($_->id, @{$self->visibility_values});
-    $self->_delete_visibility_values();
-    for my $value_id (@visibility_value_ids) {
-        $dbh->do("INSERT INTO field_visibility (field_id, value_id)
-                  VALUES (?, ?)", undef, $self->id, $value_id);
-    }
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  my @visibility_value_ids = map($_->id, @{$self->visibility_values});
+  $self->_delete_visibility_values();
+  for my $value_id (@visibility_value_ids) {
+    $dbh->do(
+      "INSERT INTO field_visibility (field_id, value_id)
+                  VALUES (?, ?)", undef, $self->id, $value_id
+    );
+  }
 }
 
 sub _delete_visibility_values {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
-    $dbh->do("DELETE FROM field_visibility WHERE field_id = ?",
-        undef, $self->id);
-    delete $self->{visibility_values};
+  my ($self) = @_;
+  my $dbh = Bugzilla->dbh;
+  $dbh->do("DELETE FROM field_visibility WHERE field_id = ?", undef, $self->id);
+  delete $self->{visibility_values};
 }
 
 =pod
@@ -1148,13 +1285,14 @@ Returns:   a reference to a list of valid values.
 =cut
 
 sub get_legal_field_values {
-    my ($field) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $result_ref = $dbh->selectcol_arrayref(
-         "SELECT value FROM $field
+  my ($field)    = @_;
+  my $dbh        = Bugzilla->dbh;
+  my $result_ref = $dbh->selectcol_arrayref(
+    "SELECT value FROM $field
            WHERE isactive = ?
-        ORDER BY sortkey, value", undef, (1));
-    return $result_ref;
+        ORDER BY sortkey, value", undef, (1)
+  );
+  return $result_ref;
 }
 
 =over
@@ -1173,107 +1311,115 @@ Returns:     nothing
 =cut
 
 sub populate_field_definitions {
-    my $dbh = Bugzilla->dbh;
-
-    # ADD and UPDATE field definitions
-    foreach my $def (DEFAULT_FIELDS) {
-        my $field = new Bugzilla::Field({ name => $def->{name} });
-        if ($field) {
-            $field->set_description($def->{desc});
-            $field->set_in_new_bugmail($def->{in_new_bugmail});
-            $field->set_buglist($def->{buglist});
-            $field->_set_type($def->{type}) if $def->{type};
-            $field->set_is_mandatory($def->{is_mandatory});
-            $field->set_is_numeric($def->{is_numeric});
-            $field->update();
-        }
-        else {
-            if (exists $def->{in_new_bugmail}) {
-                $def->{mailhead} = $def->{in_new_bugmail};
-                delete $def->{in_new_bugmail};
-            }
-            $def->{description} = delete $def->{desc};
-            Bugzilla::Field->create($def);
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # ADD and UPDATE field definitions
+  foreach my $def (DEFAULT_FIELDS) {
+    my $field = new Bugzilla::Field({name => $def->{name}});
+    if ($field) {
+      $field->set_description($def->{desc});
+      $field->set_in_new_bugmail($def->{in_new_bugmail});
+      $field->set_buglist($def->{buglist});
+      $field->_set_type($def->{type}) if $def->{type};
+      $field->set_is_mandatory($def->{is_mandatory});
+      $field->set_is_numeric($def->{is_numeric});
+      $field->update();
     }
+    else {
+      if (exists $def->{in_new_bugmail}) {
+        $def->{mailhead} = $def->{in_new_bugmail};
+        delete $def->{in_new_bugmail};
+      }
+      $def->{description} = delete $def->{desc};
+      Bugzilla::Field->create($def);
+    }
+  }
 
-    # DELETE fields which were added only accidentally, or which
-    # were never tracked in bugs_activity. Note that you can never
-    # delete fields which are used by bugs_activity.
-
-    # Oops. Bug 163299
-    $dbh->do("DELETE FROM fielddefs WHERE name='cc_accessible'");
-    # Oops. Bug 215319
-    $dbh->do("DELETE FROM fielddefs WHERE name='requesters.login_name'");
-    # This field was never tracked in bugs_activity, so it's safe to delete.
-    $dbh->do("DELETE FROM fielddefs WHERE name='attachments.thedata'");
-
-    # MODIFY old field definitions
-
-    # 2005-11-13 LpSolit@gmail.com - Bug 302599
-    # One of the field names was a fragment of SQL code, which is DB dependent.
-    # We have to rename it to a real name, which is DB independent.
-    my $new_field_name = 'days_elapsed';
-    my $field_description = 'Days since bug changed';
-
-    my ($old_field_id, $old_field_name) =
-        $dbh->selectrow_array('SELECT id, name FROM fielddefs
-                                WHERE description = ?',
-                              undef, $field_description);
-
-    if ($old_field_id && ($old_field_name ne $new_field_name)) {
-        say "SQL fragment found in the 'fielddefs' table...";
-        say "Old field name: $old_field_name";
-        # We have to fix saved searches first. Queries have been escaped
-        # before being saved. We have to do the same here to find them.
-        $old_field_name = url_quote($old_field_name);
-        my $broken_named_queries =
-            $dbh->selectall_arrayref('SELECT userid, name, query
-                                        FROM namedqueries WHERE ' .
-                                      $dbh->sql_istrcmp('query', '?', 'LIKE'),
-                                      undef, "%=$old_field_name%");
-
-        my $sth_UpdateQueries = $dbh->prepare('UPDATE namedqueries SET query = ?
-                                                WHERE userid = ? AND name = ?');
-
-        print "Fixing saved searches...\n" if scalar(@$broken_named_queries);
-        foreach my $named_query (@$broken_named_queries) {
-            my ($userid, $name, $query) = @$named_query;
-            $query =~ s/=\Q$old_field_name\E(&|$)/=$new_field_name$1/gi;
-            $sth_UpdateQueries->execute($query, $userid, $name);
-        }
-
-        # We now do the same with saved chart series.
-        my $broken_series =
-            $dbh->selectall_arrayref('SELECT series_id, query
-                                        FROM series WHERE ' .
-                                      $dbh->sql_istrcmp('query', '?', 'LIKE'),
-                                      undef, "%=$old_field_name%");
-
-        my $sth_UpdateSeries = $dbh->prepare('UPDATE series SET query = ?
-                                               WHERE series_id = ?');
-
-        print "Fixing saved chart series...\n" if scalar(@$broken_series);
-        foreach my $series (@$broken_series) {
-            my ($series_id, $query) = @$series;
-            $query =~ s/=\Q$old_field_name\E(&|$)/=$new_field_name$1/gi;
-            $sth_UpdateSeries->execute($query, $series_id);
-        }
-        # Now that saved searches have been fixed, we can fix the field name.
-        say "Fixing the 'fielddefs' table...";
-        say "New field name: $new_field_name";
-        $dbh->do('UPDATE fielddefs SET name = ? WHERE id = ?',
-                  undef, ($new_field_name, $old_field_id));
+  # DELETE fields which were added only accidentally, or which
+  # were never tracked in bugs_activity. Note that you can never
+  # delete fields which are used by bugs_activity.
+
+  # Oops. Bug 163299
+  $dbh->do("DELETE FROM fielddefs WHERE name='cc_accessible'");
+
+  # Oops. Bug 215319
+  $dbh->do("DELETE FROM fielddefs WHERE name='requesters.login_name'");
+
+  # This field was never tracked in bugs_activity, so it's safe to delete.
+  $dbh->do("DELETE FROM fielddefs WHERE name='attachments.thedata'");
+
+  # MODIFY old field definitions
+
+  # 2005-11-13 LpSolit@gmail.com - Bug 302599
+  # One of the field names was a fragment of SQL code, which is DB dependent.
+  # We have to rename it to a real name, which is DB independent.
+  my $new_field_name    = 'days_elapsed';
+  my $field_description = 'Days since bug changed';
+
+  my ($old_field_id, $old_field_name) = $dbh->selectrow_array(
+    'SELECT id, name FROM fielddefs
+                                WHERE description = ?', undef, $field_description
+  );
+
+  if ($old_field_id && ($old_field_name ne $new_field_name)) {
+    say "SQL fragment found in the 'fielddefs' table...";
+    say "Old field name: $old_field_name";
+
+    # We have to fix saved searches first. Queries have been escaped
+    # before being saved. We have to do the same here to find them.
+    $old_field_name = url_quote($old_field_name);
+    my $broken_named_queries = $dbh->selectall_arrayref(
+      'SELECT userid, name, query
+                                        FROM namedqueries WHERE '
+        . $dbh->sql_istrcmp('query', '?', 'LIKE'), undef, "%=$old_field_name%"
+    );
+
+    my $sth_UpdateQueries = $dbh->prepare(
+      'UPDATE namedqueries SET query = ?
+                                                WHERE userid = ? AND name = ?'
+    );
+
+    print "Fixing saved searches...\n" if scalar(@$broken_named_queries);
+    foreach my $named_query (@$broken_named_queries) {
+      my ($userid, $name, $query) = @$named_query;
+      $query =~ s/=\Q$old_field_name\E(&|$)/=$new_field_name$1/gi;
+      $sth_UpdateQueries->execute($query, $userid, $name);
     }
 
-    # This field has to be created separately, or the above upgrade code
-    # might not run properly.
-    Bugzilla::Field->create({ name => $new_field_name, 
-                              description => $field_description })
-        unless new Bugzilla::Field({ name => $new_field_name });
+    # We now do the same with saved chart series.
+    my $broken_series = $dbh->selectall_arrayref(
+      'SELECT series_id, query
+                                        FROM series WHERE '
+        . $dbh->sql_istrcmp('query', '?', 'LIKE'), undef, "%=$old_field_name%"
+    );
+
+    my $sth_UpdateSeries = $dbh->prepare(
+      'UPDATE series SET query = ?
+                                               WHERE series_id = ?'
+    );
+
+    print "Fixing saved chart series...\n" if scalar(@$broken_series);
+    foreach my $series (@$broken_series) {
+      my ($series_id, $query) = @$series;
+      $query =~ s/=\Q$old_field_name\E(&|$)/=$new_field_name$1/gi;
+      $sth_UpdateSeries->execute($query, $series_id);
+    }
 
-}
+    # Now that saved searches have been fixed, we can fix the field name.
+    say "Fixing the 'fielddefs' table...";
+    say "New field name: $new_field_name";
+    $dbh->do('UPDATE fielddefs SET name = ? WHERE id = ?',
+      undef, ($new_field_name, $old_field_id));
+  }
 
+  # This field has to be created separately, or the above upgrade code
+  # might not run properly.
+  Bugzilla::Field->create({
+    name => $new_field_name, description => $field_description
+  })
+    unless new Bugzilla::Field({name => $new_field_name});
+
+}
 
 
 =head2 Data Validation
@@ -1305,32 +1451,32 @@ Returns:     1 on success; 0 on failure if $no_warn is true (else an
 =cut
 
 sub check_field {
-    my ($name, $value, $legalsRef, $no_warn) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # If $legalsRef is undefined, we use the default valid values.
-    # Valid values for this check are all possible values. 
-    # Using get_legal_values would only return active values, but since
-    # some bugs may have inactive values set, we want to check them too. 
-    unless (defined $legalsRef) {
-        $legalsRef = Bugzilla::Field->new({name => $name})->legal_values;
-        my @values = map($_->name, @$legalsRef);
-        $legalsRef = \@values;
+  my ($name, $value, $legalsRef, $no_warn) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # If $legalsRef is undefined, we use the default valid values.
+  # Valid values for this check are all possible values.
+  # Using get_legal_values would only return active values, but since
+  # some bugs may have inactive values set, we want to check them too.
+  unless (defined $legalsRef) {
+    $legalsRef = Bugzilla::Field->new({name => $name})->legal_values;
+    my @values = map($_->name, @$legalsRef);
+    $legalsRef = \@values;
 
-    }
+  }
 
-    if (!defined($value)
-        or trim($value) eq ""
-        or !grep { $_ eq $value } @$legalsRef)
-    {
-        return 0 if $no_warn; # We don't want an error to be thrown; return.
-        trick_taint($name);
+  if ( !defined($value)
+    or trim($value) eq ""
+    or !grep { $_ eq $value } @$legalsRef)
+  {
+    return 0 if $no_warn;    # We don't want an error to be thrown; return.
+    trick_taint($name);
 
-        my $field = new Bugzilla::Field({ name => $name });
-        my $field_desc = $field ? $field->description : $name;
-        ThrowCodeError('illegal_field', { field => $field_desc });
-    }
-    return 1;
+    my $field = new Bugzilla::Field({name => $name});
+    my $field_desc = $field ? $field->description : $name;
+    ThrowCodeError('illegal_field', {field => $field_desc});
+  }
+  return 1;
 }
 
 =pod
@@ -1352,10 +1498,10 @@ Returns:     the corresponding field ID or an error if the field name
 =cut
 
 sub get_field_id {
-    my $field = Bugzilla->fields({ by_name => 1 })->{$_[0]}
-      or ThrowCodeError('invalid_field_name', {field => $_[0]});
+  my $field = Bugzilla->fields({by_name => 1})->{$_[0]}
+    or ThrowCodeError('invalid_field_name', {field => $_[0]});
 
-    return $field->id;
+  return $field->id;
 }
 
 1;
diff --git a/Bugzilla/Field/Choice.pm b/Bugzilla/Field/Choice.pm
index a66f69cee7..cf045613af 100644
--- a/Bugzilla/Field/Choice.pm
+++ b/Bugzilla/Field/Choice.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Field::Choice;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -28,42 +28,43 @@ use Scalar::Util qw(blessed);
 use constant IS_CONFIG => 1;
 
 use constant DB_COLUMNS => qw(
-    id
-    value
-    sortkey
-    isactive
-    visibility_value_id
+  id
+  value
+  sortkey
+  isactive
+  visibility_value_id
 );
 
 use constant UPDATE_COLUMNS => qw(
-    value
-    sortkey
-    isactive
-    visibility_value_id
+  value
+  sortkey
+  isactive
+  visibility_value_id
 );
 
 use constant NAME_FIELD => 'value';
 use constant LIST_ORDER => 'sortkey, value';
 
 use constant VALIDATORS => {
-    value   => \&_check_value,
-    sortkey => \&_check_sortkey,
-    visibility_value_id => \&_check_visibility_value_id,
-    isactive => \&_check_isactive,
+  value               => \&_check_value,
+  sortkey             => \&_check_sortkey,
+  visibility_value_id => \&_check_visibility_value_id,
+  isactive            => \&_check_isactive,
 };
 
 use constant CLASS_MAP => {
-    bug_status => 'Bugzilla::Status',
-    classification => 'Bugzilla::Classification',
-    component  => 'Bugzilla::Component',
-    product    => 'Bugzilla::Product',
+  bug_status       => 'Bugzilla::Status',
+  classification   => 'Bugzilla::Classification',
+  component        => 'Bugzilla::Component',
+  product          => 'Bugzilla::Product',
+  target_milestone => 'Bugzilla::Milestone',
 };
 
 use constant DEFAULT_MAP => {
-    op_sys       => 'defaultopsys',
-    rep_platform => 'defaultplatform',
-    priority     => 'defaultpriority',
-    bug_severity => 'defaultseverity',
+  op_sys       => 'defaultopsys',
+  rep_platform => 'defaultplatform',
+  priority     => 'defaultpriority',
+  bug_severity => 'defaultseverity',
 };
 
 #################
@@ -76,49 +77,50 @@ use constant DEFAULT_MAP => {
 # are Bugzilla::Status objects.
 
 sub type {
-    my ($class, $field) = @_;
-    my $field_obj = blessed $field ? $field : Bugzilla::Field->check($field);
-    my $field_name = $field_obj->name;
-
-    if (my $package = $class->CLASS_MAP->{$field_name}) {
-        # Callers expect the module to be already loaded.
-        eval "require $package";
-        return $package;
-    }
+  my ($class, $field) = @_;
+  my $field_obj = blessed $field ? $field : Bugzilla::Field->check($field);
+  my $field_name = $field_obj->name;
+
+  if (my $package = $class->CLASS_MAP->{$field_name}) {
 
-    # For generic classes, we use a lowercase class name, so as
-    # not to interfere with any real subclasses we might make some day.
-    my $package = "Bugzilla::Field::Choice::$field_name";
-    Bugzilla->request_cache->{"field_$package"} = $field_obj;
-
-    # This package only needs to be created once. We check if the DB_TABLE
-    # glob for this package already exists, which tells us whether or not
-    # we need to create the package (this works even under mod_perl, where
-    # this package definition will persist across requests)).
-    if (!defined *{"${package}::DB_TABLE"}) {
-        eval <<EOC;
+    # Callers expect the module to be already loaded.
+    eval "require $package";
+    return $package;
+  }
+
+  # For generic classes, we use a lowercase class name, so as
+  # not to interfere with any real subclasses we might make some day.
+  my $package = "Bugzilla::Field::Choice::$field_name";
+  Bugzilla->request_cache->{"field_$package"} = $field_obj;
+
+  # This package only needs to be created once. We check if the DB_TABLE
+  # glob for this package already exists, which tells us whether or not
+  # we need to create the package (this works even under mod_perl, where
+  # this package definition will persist across requests)).
+  if (!defined *{"${package}::DB_TABLE"}) {
+    eval <<EOC;
             package $package;
             use parent qw(Bugzilla::Field::Choice);
             use constant DB_TABLE => '$field_name';
 EOC
-    }
+  }
 
-    return $package;
+  return $package;
 }
 
 ################
 # Constructors #
 ################
 
-# We just make new() enforce this, which should give developers 
+# We just make new() enforce this, which should give developers
 # the understanding that you can't use Bugzilla::Field::Choice
 # without calling type().
 sub new {
-    my $class = shift;
-    if ($class eq 'Bugzilla::Field::Choice') {
-        ThrowCodeError('field_choice_must_use_type');
-    }
-    $class->SUPER::new(@_);
+  my $class = shift;
+  if ($class eq 'Bugzilla::Field::Choice') {
+    ThrowCodeError('field_choice_must_use_type');
+  }
+  $class->SUPER::new(@_);
 }
 
 #########################
@@ -130,64 +132,66 @@ sub new {
 # columns. (Normally Bugzilla::Object dies if you pass arguments
 # that aren't valid columns.)
 sub create {
-    my $class = shift;
-    my ($params) = @_;
-    foreach my $key (keys %$params) {
-        if (!grep {$_ eq $key} $class->_get_db_columns) {
-            delete $params->{$key};
-        }
+  my $class = shift;
+  my ($params) = @_;
+  foreach my $key (keys %$params) {
+    if (!grep { $_ eq $key } $class->_get_db_columns) {
+      delete $params->{$key};
     }
-    return $class->SUPER::create(@_);
+  }
+  return $class->SUPER::create(@_);
 }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $fname = $self->field->name;
-
-    $dbh->bz_start_transaction();
-
-    my ($changes, $old_self) = $self->SUPER::update(@_);
-    if (exists $changes->{value}) {
-        my ($old, $new) = @{ $changes->{value} };
-        if ($self->field->type == FIELD_TYPE_MULTI_SELECT) {
-            $dbh->do("UPDATE bug_$fname SET value = ? WHERE value = ?",
-                     undef, $new, $old);
-        }
-        else {
-            $dbh->do("UPDATE bugs SET $fname = ? WHERE $fname = ?",
-                     undef, $new, $old);
-        }
+  my $self  = shift;
+  my $dbh   = Bugzilla->dbh;
+  my $fname = $self->field->name;
 
-        if ($old_self->is_default) {
-            my $param = $self->DEFAULT_MAP->{$self->field->name};
-            SetParam($param, $self->name);
-            write_params();
-        }
+  $dbh->bz_start_transaction();
+
+  my ($changes, $old_self) = $self->SUPER::update(@_);
+  if (exists $changes->{value}) {
+    my ($old, $new) = @{$changes->{value}};
+    if ($self->field->type == FIELD_TYPE_MULTI_SELECT) {
+      $dbh->do("UPDATE bug_$fname SET value = ? WHERE value = ?", undef, $new, $old);
     }
+    else {
+      $dbh->do("UPDATE bugs SET $fname = ? WHERE $fname = ?", undef, $new, $old);
+    }
+
+    if ($old_self->is_default) {
+      my $param = $self->DEFAULT_MAP->{$self->field->name};
+      SetParam($param, $self->name);
+      write_params();
+    }
+  }
 
-    $dbh->bz_commit_transaction();
-    return wantarray ? ($changes, $old_self) : $changes;
+  $dbh->bz_commit_transaction();
+  return wantarray ? ($changes, $old_self) : $changes;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    if ($self->is_default) {
-        ThrowUserError('fieldvalue_is_default',
-                       { field => $self->field, value => $self,
-                         param_name => $self->DEFAULT_MAP->{$self->field->name},
-                       });
-    }
-    if ($self->is_static) {
-        ThrowUserError('fieldvalue_not_deletable', 
-                       { field => $self->field, value => $self });
-    }
-    if ($self->bug_count) {
-        ThrowUserError("fieldvalue_still_has_bugs",
-                       { field => $self->field, value => $self });
-    }
-    $self->_check_if_controller(); # From ChoiceInterface.
-    $self->SUPER::remove_from_db();
+  my $self = shift;
+  if ($self->is_default) {
+    ThrowUserError(
+      'fieldvalue_is_default',
+      {
+        field      => $self->field,
+        value      => $self,
+        param_name => $self->DEFAULT_MAP->{$self->field->name},
+      }
+    );
+  }
+  if ($self->is_static) {
+    ThrowUserError('fieldvalue_not_deletable',
+      {field => $self->field, value => $self});
+  }
+  if ($self->bug_count) {
+    ThrowUserError("fieldvalue_still_has_bugs",
+      {field => $self->field, value => $self});
+  }
+  $self->_check_if_controller();    # From ChoiceInterface.
+  $self->SUPER::remove_from_db();
 }
 
 ############
@@ -195,12 +199,13 @@ sub remove_from_db {
 ############
 
 sub set_is_active { $_[0]->set('isactive', $_[1]); }
-sub set_name      { $_[0]->set('value', $_[1]);    }
-sub set_sortkey   { $_[0]->set('sortkey', $_[1]);  }
+sub set_name      { $_[0]->set('value',    $_[1]); }
+sub set_sortkey   { $_[0]->set('sortkey',  $_[1]); }
+
 sub set_visibility_value {
-    my ($self, $value) = @_;
-    $self->set('visibility_value_id', $value);
-    delete $self->{visibility_value};
+  my ($self, $value) = @_;
+  $self->set('visibility_value_id', $value);
+  delete $self->{visibility_value};
 }
 
 ##############
@@ -208,73 +213,74 @@ sub set_visibility_value {
 ##############
 
 sub _check_isactive {
-    my ($invocant, $value) = @_;
-    $value = Bugzilla::Object::check_boolean($invocant, $value);
-    if (!$value and ref $invocant) {
-        if ($invocant->is_default) {
-            my $field = $invocant->field;
-            ThrowUserError('fieldvalue_is_default', 
-                           { value => $invocant, field => $field,
-                             param_name => $invocant->DEFAULT_MAP->{$field->name}
-                           });
-        }
-        if ($invocant->is_static) {
-            ThrowUserError('fieldvalue_not_deletable',
-                           { value => $invocant, field => $invocant->field });
+  my ($invocant, $value) = @_;
+  $value = Bugzilla::Object::check_boolean($invocant, $value);
+  if (!$value and ref $invocant) {
+    if ($invocant->is_default) {
+      my $field = $invocant->field;
+      ThrowUserError(
+        'fieldvalue_is_default',
+        {
+          value      => $invocant,
+          field      => $field,
+          param_name => $invocant->DEFAULT_MAP->{$field->name}
         }
+      );
+    }
+    if ($invocant->is_static) {
+      ThrowUserError('fieldvalue_not_deletable',
+        {value => $invocant, field => $invocant->field});
     }
-    return $value;
+  }
+  return $value;
 }
 
 sub _check_value {
-    my ($invocant, $value) = @_;
+  my ($invocant, $value) = @_;
 
-    my $field = $invocant->field;
+  my $field = $invocant->field;
 
-    $value = trim($value);
+  $value = trim($value);
 
-    # Make sure people don't rename static values
-    if (blessed($invocant) && $value ne $invocant->name 
-        && $invocant->is_static) 
-    {
-        ThrowUserError('fieldvalue_not_editable',
-                       { field => $field, old_value => $invocant });
-    }
+  # Make sure people don't rename static values
+  if (blessed($invocant) && $value ne $invocant->name && $invocant->is_static) {
+    ThrowUserError('fieldvalue_not_editable',
+      {field => $field, old_value => $invocant});
+  }
 
-    ThrowUserError('fieldvalue_undefined') if !defined $value || $value eq "";
-    ThrowUserError('fieldvalue_name_too_long', { value => $value })
-        if length($value) > MAX_FIELD_VALUE_SIZE;
+  ThrowUserError('fieldvalue_undefined') if !defined $value || $value eq "";
+  ThrowUserError('fieldvalue_name_too_long', {value => $value})
+    if length($value) > MAX_FIELD_VALUE_SIZE;
 
-    my $exists = $invocant->type($field)->new({ name => $value });
-    if ($exists && (!blessed($invocant) || $invocant->id != $exists->id)) {
-        ThrowUserError('fieldvalue_already_exists', 
-                       { field => $field, value => $exists });
-    }
+  my $exists = $invocant->type($field)->new({name => $value});
+  if ($exists && (!blessed($invocant) || $invocant->id != $exists->id)) {
+    ThrowUserError('fieldvalue_already_exists',
+      {field => $field, value => $exists});
+  }
 
-    return $value;
+  return $value;
 }
 
 sub _check_sortkey {
-    my ($invocant, $value) = @_;
-    $value = trim($value);
-    return 0 if !$value;
-    # Store for the error message in case detaint_natural clears it.
-    my $orig_value = $value;
-    (detaint_natural($value) && $value <= MAX_SMALLINT)
-        || ThrowUserError('fieldvalue_sortkey_invalid',
-                          { sortkey => $orig_value,
-                            field   => $invocant->field });
-    return $value;
+  my ($invocant, $value) = @_;
+  $value = trim($value);
+  return 0 if !$value;
+
+  # Store for the error message in case detaint_natural clears it.
+  my $orig_value = $value;
+  (detaint_natural($value) && $value <= MAX_SMALLINT)
+    || ThrowUserError('fieldvalue_sortkey_invalid',
+    {sortkey => $orig_value, field => $invocant->field});
+  return $value;
 }
 
 sub _check_visibility_value_id {
-    my ($invocant, $value_id) = @_;
-    $value_id = trim($value_id);
-    my $field = $invocant->field->value_field;
-    return undef if !$field || !$value_id;
-    my $value_obj = Bugzilla::Field::Choice->type($field)
-                    ->check({ id => $value_id });
-    return $value_obj->id;
+  my ($invocant, $value_id) = @_;
+  $value_id = trim($value_id);
+  my $field = $invocant->field->value_field;
+  return undef if !$field || !$value_id;
+  my $value_obj = Bugzilla::Field::Choice->type($field)->check({id => $value_id});
+  return $value_obj->id;
 }
 
 1;
diff --git a/Bugzilla/Field/ChoiceInterface.pm b/Bugzilla/Field/ChoiceInterface.pm
index 634d36ad12..9d83bb42ad 100644
--- a/Bugzilla/Field/ChoiceInterface.pm
+++ b/Bugzilla/Field/ChoiceInterface.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Field::ChoiceInterface;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,14 +26,19 @@ sub FIELD_NAME { return $_[0]->DB_TABLE; }
 ####################
 
 sub _check_if_controller {
-    my $self = shift;
-    my $vis_fields = $self->controls_visibility_of_fields;
-    my $values = $self->controlled_values_array;
-    if (@$vis_fields || @$values) {
-        ThrowUserError('fieldvalue_is_controller',
-            { value => $self, fields => [map($_->name, @$vis_fields)],
-              vals => $self->controlled_values });
-    }
+  my $self       = shift;
+  my $vis_fields = $self->controls_visibility_of_fields;
+  my $values     = $self->controlled_values_array;
+  if (@$vis_fields || @$values) {
+    ThrowUserError(
+      'fieldvalue_is_controller',
+      {
+        value  => $self,
+        fields => [map($_->name, @$vis_fields)],
+        vals   => $self->controlled_values
+      }
+    );
+  }
 }
 
 
@@ -42,145 +47,149 @@ sub _check_if_controller {
 #############
 
 sub is_active { return $_[0]->{'isactive'}; }
-sub sortkey   { return $_[0]->{'sortkey'};  }
+sub sortkey   { return $_[0]->{'sortkey'}; }
 
 sub bug_count {
-    my $self = shift;
-    return $self->{bug_count} if defined $self->{bug_count};
-    my $dbh = Bugzilla->dbh;
-    my $fname = $self->field->name;
-    my $count;
-    if ($self->field->type == FIELD_TYPE_MULTI_SELECT) {
-        $count = $dbh->selectrow_array("SELECT COUNT(*) FROM bug_$fname
-                                         WHERE value = ?", undef, $self->name);
-    }
-    else {
-        $count = $dbh->selectrow_array("SELECT COUNT(*) FROM bugs 
-                                         WHERE $fname = ?",
-                                       undef, $self->name);
-    }
-    $self->{bug_count} = $count;
-    return $count;
+  my $self = shift;
+  return $self->{bug_count} if defined $self->{bug_count};
+  my $dbh   = Bugzilla->dbh;
+  my $fname = $self->field->name;
+  my $count;
+  if ($self->field->type == FIELD_TYPE_MULTI_SELECT) {
+    $count = $dbh->selectrow_array(
+      "SELECT COUNT(*) FROM bug_$fname
+                                         WHERE value = ?", undef, $self->name
+    );
+  }
+  else {
+    $count = $dbh->selectrow_array(
+      "SELECT COUNT(*) FROM bugs 
+                                         WHERE $fname = ?", undef, $self->name
+    );
+  }
+  $self->{bug_count} = $count;
+  return $count;
 }
 
 sub field {
-    my $invocant = shift;
-    my $class = ref $invocant || $invocant;
-    my $cache = Bugzilla->request_cache;
-    # This is just to make life easier for subclasses. Our auto-generated
-    # subclasses from Bugzilla::Field::Choice->type() already have this set.
-    $cache->{"field_$class"} ||=  
-        new Bugzilla::Field({ name => $class->FIELD_NAME });
-    return $cache->{"field_$class"};
+  my $invocant = shift;
+  my $class    = ref $invocant || $invocant;
+  my $cache    = Bugzilla->request_cache;
+
+  # This is just to make life easier for subclasses. Our auto-generated
+  # subclasses from Bugzilla::Field::Choice->type() already have this set.
+  $cache->{"field_$class"} ||= new Bugzilla::Field({name => $class->FIELD_NAME});
+  return $cache->{"field_$class"};
 }
 
 sub is_default {
-    my $self = shift;
-    my $name = $self->DEFAULT_MAP->{$self->field->name};
-    # If it doesn't exist in DEFAULT_MAP, then there is no parameter
-    # related to this field.
-    return 0 unless $name;
-    return ($self->name eq Bugzilla->params->{$name}) ? 1 : 0;
+  my $self = shift;
+  my $name = $self->DEFAULT_MAP->{$self->field->name};
+
+  # If it doesn't exist in DEFAULT_MAP, then there is no parameter
+  # related to this field.
+  return 0 unless $name;
+  return ($self->name eq Bugzilla->params->{$name}) ? 1 : 0;
 }
 
 sub is_static {
-    my $self = shift;
-    # If we need to special-case Resolution for *anything* else, it should
-    # get its own subclass.
-    if ($self->field->name eq 'resolution') {
-        return grep($_ eq $self->name, ('', 'FIXED', 'DUPLICATE'))
-               ? 1 : 0;
-    }
-    elsif ($self->field->custom) {
-        return $self->name eq '---' ? 1 : 0;
-    }
-    return 0;
+  my $self = shift;
+
+  # If we need to special-case Resolution for *anything* else, it should
+  # get its own subclass.
+  if ($self->field->name eq 'resolution') {
+    return $self->name eq '' || $self->name eq 'DUPLICATE';
+  }
+  elsif ($self->field->custom) {
+    return $self->name eq '---' ? 1 : 0;
+  }
+  return 0;
 }
 
 sub controls_visibility_of_fields {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!$self->{controls_visibility_of_fields}) {
-        my $ids = $dbh->selectcol_arrayref(
-            "SELECT id FROM fielddefs
+  if (!$self->{controls_visibility_of_fields}) {
+    my $ids = $dbh->selectcol_arrayref(
+      "SELECT id FROM fielddefs
                INNER JOIN field_visibility
                  ON fielddefs.id = field_visibility.field_id
-             WHERE value_id = ? AND visibility_field_id = ?", undef,
-            $self->id, $self->field->id);
+             WHERE value_id = ? AND visibility_field_id = ?", undef, $self->id,
+      $self->field->id
+    );
 
-        $self->{controls_visibility_of_fields} =
-            Bugzilla::Field->new_from_list($ids);
-   }
+    $self->{controls_visibility_of_fields} = Bugzilla::Field->new_from_list($ids);
+  }
 
-   return $self->{controls_visibility_of_fields};
+  return $self->{controls_visibility_of_fields};
 }
 
 sub visibility_value {
-    my $self = shift;
-    if ($self->{visibility_value_id}) {
-        require Bugzilla::Field::Choice;
-        $self->{visibility_value} ||=
-            Bugzilla::Field::Choice->type($self->field->value_field)->new(
-                $self->{visibility_value_id});
-    }
-    return $self->{visibility_value};
+  my $self = shift;
+  if ($self->{visibility_value_id}) {
+    require Bugzilla::Field::Choice;
+    $self->{visibility_value}
+      ||= Bugzilla::Field::Choice->type($self->field->value_field)
+      ->new($self->{visibility_value_id});
+  }
+  return $self->{visibility_value};
 }
 
 sub controlled_values {
-    my $self = shift;
-    return $self->{controlled_values} if defined $self->{controlled_values};
-    my $fields = $self->field->controls_values_of;
-    my %controlled_values;
-    require Bugzilla::Field::Choice;
-    foreach my $field (@$fields) {
-        $controlled_values{$field->name} = 
-            Bugzilla::Field::Choice->type($field)
-            ->match({ visibility_value_id => $self->id });
-    }
-    $self->{controlled_values} = \%controlled_values;
-    return $self->{controlled_values};
+  my $self = shift;
+  return $self->{controlled_values} if defined $self->{controlled_values};
+  my $fields = $self->field->controls_values_of;
+  my %controlled_values;
+  require Bugzilla::Field::Choice;
+  foreach my $field (@$fields) {
+    $controlled_values{$field->name} = Bugzilla::Field::Choice->type($field)
+      ->match({visibility_value_id => $self->id});
+  }
+  $self->{controlled_values} = \%controlled_values;
+  return $self->{controlled_values};
 }
 
 sub controlled_values_array {
-    my ($self) = @_;
-    my $values = $self->controlled_values;
-    return [map { @{ $values->{$_} } } keys %$values];
+  my ($self) = @_;
+  my $values = $self->controlled_values;
+  return [map { @{$values->{$_}} } keys %$values];
 }
 
 sub is_visible_on_bug {
-    my ($self, $bug) = @_;
+  my ($self, $bug) = @_;
 
-    # Values currently set on the bug are always shown.
-    return 1 if $self->is_set_on_bug($bug);
+  # Values currently set on the bug are always shown.
+  return 1 if $self->is_set_on_bug($bug);
 
-    # Inactive values are, otherwise, never shown.
-    return 0 if !$self->is_active;
+  # Inactive values are, otherwise, never shown.
+  return 0 if !$self->is_active;
 
-    # Values without a visibility value are, otherwise, always shown.
-    my $visibility_value = $self->visibility_value;
-    return 1 if !$visibility_value;
+  # Values without a visibility value are, otherwise, always shown.
+  my $visibility_value = $self->visibility_value;
+  return 1 if !$visibility_value;
 
-    # Values with a visibility value are only shown if the visibility
-    # value is set on the bug.
-    return $visibility_value->is_set_on_bug($bug); 
+  # Values with a visibility value are only shown if the visibility
+  # value is set on the bug.
+  return $visibility_value->is_set_on_bug($bug);
 }
 
 sub is_set_on_bug {
-    my ($self, $bug) = @_;
-    my $field_name = $self->FIELD_NAME;
-    # This allows bug/create/create.html.tmpl to pass in a hashref that 
-    # looks like a bug object.
-    my $value = blessed($bug) ? $bug->$field_name : $bug->{$field_name};
-    $value = $value->name if blessed($value);
-    return 0 if !defined $value;
-
-    if ($self->field->type == FIELD_TYPE_BUG_URLS
-        or $self->field->type == FIELD_TYPE_MULTI_SELECT)
-    {
-        return grep($_ eq $self->name, @$value) ? 1 : 0;
-    }
-    return $value eq $self->name ? 1 : 0;
+  my ($self, $bug) = @_;
+  my $field_name = $self->FIELD_NAME;
+
+  # This allows bug/create/create.html.tmpl to pass in a hashref that
+  # looks like a bug object.
+  my $value = blessed($bug) ? $bug->$field_name : $bug->{$field_name};
+  $value = $value->name if blessed($value);
+  return 0 if !defined $value;
+
+  if ( $self->field->type == FIELD_TYPE_BUG_URLS
+    or $self->field->type == FIELD_TYPE_MULTI_SELECT)
+  {
+    return grep($_ eq $self->name, @$value) ? 1 : 0;
+  }
+  return $value eq $self->name ? 1 : 0;
 }
 
 1;
diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index 50474b8855..6e5b052938 100644
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Flag;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -58,8 +58,9 @@ use parent qw(Bugzilla::Object Exporter);
 ####    Initialization     ####
 ###############################
 
-use constant DB_TABLE => 'flags';
+use constant DB_TABLE   => 'flags';
 use constant LIST_ORDER => 'id';
+
 # Flags are tracked in bugs_activity.
 use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
@@ -68,35 +69,32 @@ use constant AUDIT_REMOVES => 0;
 use constant SKIP_REQUESTEE_ON_ERROR => 1;
 
 sub DB_COLUMNS {
-    my $dbh = Bugzilla->dbh;
-    return qw(
-        id
-        type_id
-        bug_id
-        attach_id
-        requestee_id
-        setter_id
-        status), 
-        $dbh->sql_date_format('creation_date', '%Y.%m.%d %H:%i:%s') .
-                              ' AS creation_date', 
-        $dbh->sql_date_format('modification_date', '%Y.%m.%d %H:%i:%s') .
-                              ' AS modification_date';
+  my $dbh = Bugzilla->dbh;
+  return qw(
+    id
+    type_id
+    bug_id
+    attach_id
+    requestee_id
+    setter_id
+    status),
+    $dbh->sql_date_format('creation_date', '%Y.%m.%d %H:%i:%s')
+    . ' AS creation_date',
+    $dbh->sql_date_format('modification_date', '%Y.%m.%d %H:%i:%s')
+    . ' AS modification_date';
 }
 
 use constant UPDATE_COLUMNS => qw(
-    requestee_id
-    setter_id
-    status
-    type_id
+  requestee_id
+  setter_id
+  status
+  type_id
 );
 
-use constant VALIDATORS => {
-};
+use constant VALIDATORS => {};
 
-use constant UPDATE_VALIDATORS => {
-    setter => \&_check_setter,
-    status => \&_check_status,
-};
+use constant UPDATE_VALIDATORS =>
+  {setter => \&_check_setter, status => \&_check_status,};
 
 ###############################
 ####      Accessors      ######
@@ -138,15 +136,15 @@ Returns the timestamp when the flag was last modified.
 
 =cut
 
-sub id           { return $_[0]->{'id'};           }
-sub name         { return $_[0]->type->name;       }
-sub type_id      { return $_[0]->{'type_id'};      }
-sub bug_id       { return $_[0]->{'bug_id'};       }
-sub attach_id    { return $_[0]->{'attach_id'};    }
-sub status       { return $_[0]->{'status'};       }
-sub setter_id    { return $_[0]->{'setter_id'};    }
-sub requestee_id { return $_[0]->{'requestee_id'}; }
-sub creation_date     { return $_[0]->{'creation_date'};     }
+sub id                { return $_[0]->{'id'}; }
+sub name              { return $_[0]->type->name; }
+sub type_id           { return $_[0]->{'type_id'}; }
+sub bug_id            { return $_[0]->{'bug_id'}; }
+sub attach_id         { return $_[0]->{'attach_id'}; }
+sub status            { return $_[0]->{'status'}; }
+sub setter_id         { return $_[0]->{'setter_id'}; }
+sub requestee_id      { return $_[0]->{'requestee_id'}; }
+sub creation_date     { return $_[0]->{'creation_date'}; }
 sub modification_date { return $_[0]->{'modification_date'}; }
 
 ###############################
@@ -180,40 +178,42 @@ is an attachment flag, else undefined.
 =cut
 
 sub type {
-    my $self = shift;
+  my $self = shift;
 
-    return $self->{'type'} ||= new Bugzilla::FlagType($self->{'type_id'});
+  return $self->{'type'} ||= new Bugzilla::FlagType($self->{'type_id'});
 }
 
 sub setter {
-    my $self = shift;
+  my $self = shift;
 
-    return $self->{'setter'} ||= new Bugzilla::User({ id => $self->{'setter_id'}, cache => 1 });
+  return $self->{'setter'}
+    ||= new Bugzilla::User({id => $self->{'setter_id'}, cache => 1});
 }
 
 sub requestee {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'requestee'} && $self->{'requestee_id'}) {
-        $self->{'requestee'} = new Bugzilla::User({ id => $self->{'requestee_id'}, cache => 1 });
-    }
-    return $self->{'requestee'};
+  if (!defined $self->{'requestee'} && $self->{'requestee_id'}) {
+    $self->{'requestee'}
+      = new Bugzilla::User({id => $self->{'requestee_id'}, cache => 1});
+  }
+  return $self->{'requestee'};
 }
 
 sub attachment {
-    my $self = shift;
-    return undef unless $self->attach_id;
+  my $self = shift;
+  return undef unless $self->attach_id;
 
-    require Bugzilla::Attachment;
-    return $self->{'attachment'}
-      ||= new Bugzilla::Attachment({ id => $self->attach_id, cache => 1 });
+  require Bugzilla::Attachment;
+  return $self->{'attachment'}
+    ||= new Bugzilla::Attachment({id => $self->attach_id, cache => 1});
 }
 
 sub bug {
-    my $self = shift;
+  my $self = shift;
 
-    require Bugzilla::Bug;
-    return $self->{'bug'} ||= new Bugzilla::Bug({ id => $self->bug_id, cache => 1 });
+  require Bugzilla::Bug;
+  return $self->{'bug'} ||= new Bugzilla::Bug({id => $self->bug_id, cache => 1});
 }
 
 ################################
@@ -235,26 +235,27 @@ and returns an array of matching records.
 =cut
 
 sub match {
-    my $class = shift;
-    my ($criteria) = @_;
-
-    # If the caller specified only bug or attachment flags,
-    # limit the query to those kinds of flags.
-    if (my $type = delete $criteria->{'target_type'}) {
-        if ($type eq 'bug') {
-            $criteria->{'attach_id'} = IS_NULL;
-        }
-        elsif (!defined $criteria->{'attach_id'}) {
-            $criteria->{'attach_id'} = NOT_NULL;
-        }
+  my $class = shift;
+  my ($criteria) = @_;
+
+  # If the caller specified only bug or attachment flags,
+  # limit the query to those kinds of flags.
+  if (my $type = delete $criteria->{'target_type'}) {
+    if ($type eq 'bug') {
+      $criteria->{'attach_id'} = IS_NULL;
     }
-    # Flag->snapshot() calls Flag->match() with bug_id and attach_id
-    # as hash keys, even if attach_id is undefined.
-    if (exists $criteria->{'attach_id'} && !defined $criteria->{'attach_id'}) {
-        $criteria->{'attach_id'} = IS_NULL;
+    elsif (!defined $criteria->{'attach_id'}) {
+      $criteria->{'attach_id'} = NOT_NULL;
     }
+  }
 
-    return $class->SUPER::match(@_);
+  # Flag->snapshot() calls Flag->match() with bug_id and attach_id
+  # as hash keys, even if attach_id is undefined.
+  if (exists $criteria->{'attach_id'} && !defined $criteria->{'attach_id'}) {
+    $criteria->{'attach_id'} = IS_NULL;
+  }
+
+  return $class->SUPER::match(@_);
 }
 
 =pod
@@ -272,8 +273,8 @@ and returns an array of matching records.
 =cut
 
 sub count {
-    my $class = shift;
-    return scalar @{$class->match(@_)};
+  my $class = shift;
+  return scalar @{$class->match(@_)};
 }
 
 ######################################################################
@@ -281,144 +282,156 @@ sub count {
 ######################################################################
 
 sub set_flag {
-    my ($class, $obj, $params) = @_;
-
-    my ($bug, $attachment, $obj_flag, $requestee_changed);
-    if (blessed($obj) && $obj->isa('Bugzilla::Attachment')) {
-        $attachment = $obj;
-        $bug = $attachment->bug;
+  my ($class, $obj, $params) = @_;
+
+  my ($bug, $attachment, $obj_flag, $requestee_changed);
+  if (blessed($obj) && $obj->isa('Bugzilla::Attachment')) {
+    $attachment = $obj;
+    $bug        = $attachment->bug;
+  }
+  elsif (blessed($obj) && $obj->isa('Bugzilla::Bug')) {
+    $bug = $obj;
+  }
+  else {
+    ThrowCodeError('flag_unexpected_object', {'caller' => ref $obj});
+  }
+
+  # Make sure the user can change flags
+  my $privs;
+  $bug->check_can_change_field('flagtypes.name', 0, 1, \$privs)
+    || ThrowUserError('illegal_change',
+    {field => 'flagtypes.name', privs => $privs});
+
+  # Update (or delete) an existing flag.
+  if ($params->{id}) {
+    my $flag = $class->check({id => $params->{id}});
+
+    # Security check: make sure the flag belongs to the bug/attachment.
+    # We don't check that the user editing the flag can see
+    # the bug/attachment. That's the job of the caller.
+    ($attachment && $flag->attach_id && $attachment->id == $flag->attach_id)
+      || (!$attachment && !$flag->attach_id && $bug->id == $flag->bug_id)
+      || ThrowCodeError('invalid_flag_association',
+      {bug_id => $bug->id, attach_id => $attachment ? $attachment->id : undef});
+
+    # Extract the current flag object from the object.
+    my ($obj_flagtype) = grep { $_->id == $flag->type_id } @{$obj->flag_types};
+
+    # If no flagtype can be found for this flag, this means the bug is being
+    # moved into a product/component where the flag is no longer valid.
+    # So either we can attach the flag to another flagtype having the same
+    # name, or we remove the flag.
+    if (!$obj_flagtype) {
+      my $success = $flag->retarget($obj);
+      return unless $success;
+
+      ($obj_flagtype) = grep { $_->id == $flag->type_id } @{$obj->flag_types};
+      push(@{$obj_flagtype->{flags}}, $flag);
     }
-    elsif (blessed($obj) && $obj->isa('Bugzilla::Bug')) {
-        $bug = $obj;
+    ($obj_flag) = grep { $_->id == $flag->id } @{$obj_flagtype->{flags}};
+
+    # If the flag has the correct type but cannot be found above, this means
+    # the flag is going to be removed (e.g. because this is a pending request
+    # and the attachment is being marked as obsolete).
+    return unless $obj_flag;
+
+    ($obj_flag, $requestee_changed)
+      = $class->_validate($obj_flag, $obj_flagtype, $params, $bug, $attachment);
+  }
+
+  # Create a new flag.
+  elsif ($params->{type_id}) {
+
+    # Don't bother validating types the user didn't touch.
+    return if $params->{status} eq 'X';
+
+    my $flagtype = Bugzilla::FlagType->check({id => $params->{type_id}});
+
+    # Security check: make sure the flag type belongs to the bug/attachment.
+    (      $attachment
+        && $flagtype->target_type eq 'attachment'
+        && scalar(grep { $_->id == $flagtype->id } @{$attachment->flag_types}))
+      || (!$attachment
+      && $flagtype->target_type eq 'bug'
+      && scalar(grep { $_->id == $flagtype->id } @{$bug->flag_types}))
+      || ThrowCodeError('invalid_flag_association',
+      {bug_id => $bug->id, attach_id => $attachment ? $attachment->id : undef});
+
+    # Make sure the flag type is active.
+    $flagtype->is_active
+      || ThrowCodeError('flag_type_inactive', {type => $flagtype->name});
+
+    # Extract the current flagtype object from the object.
+    my ($obj_flagtype) = grep { $_->id == $flagtype->id } @{$obj->flag_types};
+
+    # We cannot create a new flag if there is already one and this
+    # flag type is not multiplicable.
+    if (!$flagtype->is_multiplicable) {
+      if (scalar @{$obj_flagtype->{flags}}) {
+        ThrowUserError('flag_type_not_multiplicable', {type => $flagtype});
+      }
     }
-    else {
-        ThrowCodeError('flag_unexpected_object', { 'caller' => ref $obj });
-    }
-
-    # Make sure the user can change flags
-    my $privs;
-    $bug->check_can_change_field('flagtypes.name', 0, 1, \$privs)
-        || ThrowUserError('illegal_change',
-                          { field => 'flagtypes.name', privs => $privs });
-
-    # Update (or delete) an existing flag.
-    if ($params->{id}) {
-        my $flag = $class->check({ id => $params->{id} });
-
-        # Security check: make sure the flag belongs to the bug/attachment.
-        # We don't check that the user editing the flag can see
-        # the bug/attachment. That's the job of the caller.
-        ($attachment && $flag->attach_id && $attachment->id == $flag->attach_id)
-          || (!$attachment && !$flag->attach_id && $bug->id == $flag->bug_id)
-          || ThrowCodeError('invalid_flag_association',
-                            { bug_id    => $bug->id,
-                              attach_id => $attachment ? $attachment->id : undef });
-
-        # Extract the current flag object from the object.
-        my ($obj_flagtype) = grep { $_->id == $flag->type_id } @{$obj->flag_types};
-        # If no flagtype can be found for this flag, this means the bug is being
-        # moved into a product/component where the flag is no longer valid.
-        # So either we can attach the flag to another flagtype having the same
-        # name, or we remove the flag.
-        if (!$obj_flagtype) {
-            my $success = $flag->retarget($obj);
-            return unless $success;
-
-            ($obj_flagtype) = grep { $_->id == $flag->type_id } @{$obj->flag_types};
-            push(@{$obj_flagtype->{flags}}, $flag);
-        }
-        ($obj_flag) = grep { $_->id == $flag->id } @{$obj_flagtype->{flags}};
-        # If the flag has the correct type but cannot be found above, this means
-        # the flag is going to be removed (e.g. because this is a pending request
-        # and the attachment is being marked as obsolete).
-        return unless $obj_flag;
-
-        ($obj_flag, $requestee_changed) =
-            $class->_validate($obj_flag, $obj_flagtype, $params, $bug, $attachment);
-    }
-    # Create a new flag.
-    elsif ($params->{type_id}) {
-        # Don't bother validating types the user didn't touch.
-        return if $params->{status} eq 'X';
-
-        my $flagtype = Bugzilla::FlagType->check({ id => $params->{type_id} });
-        # Security check: make sure the flag type belongs to the bug/attachment.
-        ($attachment && $flagtype->target_type eq 'attachment'
-          && scalar(grep { $_->id == $flagtype->id } @{$attachment->flag_types}))
-          || (!$attachment && $flagtype->target_type eq 'bug'
-                && scalar(grep { $_->id == $flagtype->id } @{$bug->flag_types}))
-          || ThrowCodeError('invalid_flag_association',
-                            { bug_id    => $bug->id,
-                              attach_id => $attachment ? $attachment->id : undef });
-
-        # Make sure the flag type is active.
-        $flagtype->is_active
-          || ThrowCodeError('flag_type_inactive', { type => $flagtype->name });
-
-        # Extract the current flagtype object from the object.
-        my ($obj_flagtype) = grep { $_->id == $flagtype->id } @{$obj->flag_types};
-
-        # We cannot create a new flag if there is already one and this
-        # flag type is not multiplicable.
-        if (!$flagtype->is_multiplicable) {
-            if (scalar @{$obj_flagtype->{flags}}) {
-                ThrowUserError('flag_type_not_multiplicable', { type => $flagtype });
-            }
-        }
 
-        ($obj_flag, $requestee_changed) =
-            $class->_validate(undef, $obj_flagtype, $params, $bug, $attachment);
-    }
-    else {
-        ThrowCodeError('param_required', { function => $class . '->set_flag',
-                                           param    => 'id/type_id' });
-    }
-
-    if ($obj_flag
-        && $requestee_changed
-        && $obj_flag->requestee_id
-        && $obj_flag->requestee->setting('requestee_cc') eq 'on')
-    {
-        $bug->add_cc($obj_flag->requestee);
-    }
+    ($obj_flag, $requestee_changed)
+      = $class->_validate(undef, $obj_flagtype, $params, $bug, $attachment);
+  }
+  else {
+    ThrowCodeError('param_required',
+      {function => $class . '->set_flag', param => 'id/type_id'});
+  }
+
+  if ( $obj_flag
+    && $requestee_changed
+    && $obj_flag->requestee_id
+    && $obj_flag->requestee->setting('requestee_cc') eq 'on')
+  {
+    $bug->add_cc($obj_flag->requestee);
+  }
 }
 
 sub _validate {
-    my ($class, $flag, $flag_type, $params, $bug, $attachment) = @_;
-
-    # If it's a new flag, let's create it now.
-    my $obj_flag = $flag || bless({ type_id   => $flag_type->id,
-                                    status    => '',
-                                    bug_id    => $bug->id,
-                                    attach_id => $attachment ?
-                                                   $attachment->id : undef},
-                                    $class);
-
-    my $old_status = $obj_flag->status;
-    my $old_requestee_id = $obj_flag->requestee_id;
-
-    $obj_flag->_set_status($params->{status});
-    $obj_flag->_set_requestee($params->{requestee}, $bug, $attachment, $params->{skip_roe});
+  my ($class, $flag, $flag_type, $params, $bug, $attachment) = @_;
 
-    # The requestee ID can be undefined.
-    my $requestee_changed = ($obj_flag->requestee_id || 0) != ($old_requestee_id || 0);
-
-    # The setter field MUST NOT be updated if neither the status
-    # nor the requestee fields changed.
-    if (($obj_flag->status ne $old_status) || $requestee_changed) {
-        $obj_flag->_set_setter($params->{setter});
-    }
-
-    # If the flag is deleted, remove it from the list.
-    if ($obj_flag->status eq 'X') {
-        @{$flag_type->{flags}} = grep { $_->id != $obj_flag->id } @{$flag_type->{flags}};
-        return;
-    }
-    # Add the newly created flag to the list.
-    elsif (!$obj_flag->id) {
-        push(@{$flag_type->{flags}}, $obj_flag);
-    }
-    return wantarray ? ($obj_flag, $requestee_changed) : $obj_flag;
+  # If it's a new flag, let's create it now.
+  my $obj_flag = $flag || bless(
+    {
+      type_id   => $flag_type->id,
+      status    => '',
+      bug_id    => $bug->id,
+      attach_id => $attachment ? $attachment->id : undef
+    },
+    $class
+  );
+
+  my $old_status       = $obj_flag->status;
+  my $old_requestee_id = $obj_flag->requestee_id;
+
+  $obj_flag->_set_status($params->{status});
+  $obj_flag->_set_requestee($params->{requestee}, $bug, $attachment,
+    $params->{skip_roe});
+
+  # The requestee ID can be undefined.
+  my $requestee_changed
+    = ($obj_flag->requestee_id || 0) != ($old_requestee_id || 0);
+
+  # The setter field MUST NOT be updated if neither the status
+  # nor the requestee fields changed.
+  if (($obj_flag->status ne $old_status) || $requestee_changed) {
+    $obj_flag->_set_setter($params->{setter});
+  }
+
+  # If the flag is deleted, remove it from the list.
+  if ($obj_flag->status eq 'X') {
+    @{$flag_type->{flags}}
+      = grep { $_->id != $obj_flag->id } @{$flag_type->{flags}};
+    return;
+  }
+
+  # Add the newly created flag to the list.
+  elsif (!$obj_flag->id) {
+    push(@{$flag_type->{flags}}, $obj_flag);
+  }
+  return wantarray ? ($obj_flag, $requestee_changed) : $obj_flag;
 }
 
 =pod
@@ -434,143 +447,151 @@ Creates a flag record in the database.
 =cut
 
 sub create {
-    my ($class, $flag, $timestamp) = @_;
-    $timestamp ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  my ($class, $flag, $timestamp) = @_;
+  $timestamp ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
 
-    my $params = {};
-    my @columns = grep { $_ ne 'id' } $class->_get_db_columns;
+  my $params = {};
+  my @columns = grep { $_ ne 'id' } $class->_get_db_columns;
 
-    # Some columns use date formatting so use alias instead
-    @columns = map { /\s+AS\s+(.*)$/ ? $1 : $_ } @columns;
+  # Some columns use date formatting so use alias instead
+  @columns = map { /\s+AS\s+(.*)$/ ? $1 : $_ } @columns;
 
-    $params->{$_} = $flag->{$_} foreach @columns;
+  $params->{$_} = $flag->{$_} foreach @columns;
 
-    $params->{creation_date} = $params->{modification_date} = $timestamp;
+  $params->{creation_date} = $params->{modification_date} = $timestamp;
 
-    $flag = $class->SUPER::create($params);
-    return $flag;
+  $flag = $class->SUPER::create($params);
+  return $flag;
 }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $timestamp = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-
-    my $changes = $self->SUPER::update(@_);
-
-    if (scalar(keys %$changes)) {
-        $dbh->do('UPDATE flags SET modification_date = ? WHERE id = ?',
-                 undef, ($timestamp, $self->id));
-        $self->{'modification_date'} =
-          format_time($timestamp, '%Y.%m.%d %T', Bugzilla->local_timezone);
-        Bugzilla->memcached->clear({ table => 'flags', id => $self->id });
-    }
-    return $changes;
+  my $self      = shift;
+  my $dbh       = Bugzilla->dbh;
+  my $timestamp = shift || $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+
+  my $changes = $self->SUPER::update(@_);
+
+  if (scalar(keys %$changes)) {
+    $dbh->do('UPDATE flags SET modification_date = ? WHERE id = ?',
+      undef, ($timestamp, $self->id));
+    $self->{'modification_date'}
+      = format_time($timestamp, '%Y.%m.%d %T', Bugzilla->local_timezone);
+    Bugzilla->memcached->clear({table => 'flags', id => $self->id});
+  }
+  return $changes;
 }
 
 sub snapshot {
-    my ($class, $flags) = @_;
-
-    my @summaries;
-    foreach my $flag (@$flags) {
-        my $summary = $flag->setter->nick . ':' . $flag->type->name . $flag->status;
-        $summary .= "(" . $flag->requestee->login . ")" if $flag->requestee;
-        push(@summaries, $summary);
-    }
-    return @summaries;
+  my ($class, $flags) = @_;
+
+  my @summaries;
+  foreach my $flag (@$flags) {
+    my $summary = $flag->setter->nick . ':' . $flag->type->name . $flag->status;
+    $summary .= "(" . $flag->requestee->login . ")" if $flag->requestee;
+    push(@summaries, $summary);
+  }
+  return @summaries;
 }
 
 sub update_activity {
-    my ($class, $old_summaries, $new_summaries) = @_;
+  my ($class, $old_summaries, $new_summaries) = @_;
 
-    my ($removed, $added) = diff_arrays($old_summaries, $new_summaries);
-    if (scalar @$removed || scalar @$added) {
-        # Remove flag requester/setter information
-        foreach (@$removed, @$added) { s/^[^:]+:// }
+  my ($removed, $added) = diff_arrays($old_summaries, $new_summaries);
+  if (scalar @$removed || scalar @$added) {
 
-        $removed = join(", ", @$removed);
-        $added = join(", ", @$added);
-        return ($removed, $added);
-    }
-    return ();
+    # Remove flag requester/setter information
+    foreach (@$removed, @$added) {s/^[^:]+://}
+
+    $removed = join(", ", @$removed);
+    $added   = join(", ", @$added);
+    return ($removed, $added);
+  }
+  return ();
 }
 
 sub update_flags {
-    my ($class, $self, $old_self, $timestamp) = @_;
+  my ($class, $self, $old_self, $timestamp) = @_;
 
-    my @old_summaries = $class->snapshot($old_self->flags);
-    my %old_flags = map { $_->id => $_ } @{$old_self->flags};
+  my @old_summaries = $class->snapshot($old_self->flags);
+  my %old_flags = map { $_->id => $_ } @{$old_self->flags};
 
-    foreach my $new_flag (@{$self->flags}) {
-        if (!$new_flag->id) {
-            # This is a new flag.
-            my $flag = $class->create($new_flag, $timestamp);
-            $new_flag->{id} = $flag->id;
-            $class->notify($new_flag, undef, $self, $timestamp);
-        }
-        else {
-            my $changes = $new_flag->update($timestamp);
-            if (scalar(keys %$changes)) {
-                $class->notify($new_flag, $old_flags{$new_flag->id}, $self, $timestamp);
-            }
-            delete $old_flags{$new_flag->id};
-        }
+  foreach my $new_flag (@{$self->flags}) {
+    if (!$new_flag->id) {
+
+      # This is a new flag.
+      my $flag = $class->create($new_flag, $timestamp);
+      $new_flag->{id} = $flag->id;
+      $class->notify($new_flag, undef, $self, $timestamp);
     }
-    # These flags have been deleted.
-    foreach my $old_flag (values %old_flags) {
-        $class->notify(undef, $old_flag, $self, $timestamp);
-        $old_flag->remove_from_db();
+    else {
+      my $changes = $new_flag->update($timestamp);
+      if (scalar(keys %$changes)) {
+        $class->notify($new_flag, $old_flags{$new_flag->id}, $self, $timestamp);
+      }
+      delete $old_flags{$new_flag->id};
     }
-
-    # If the bug has been moved into another product or component,
-    # we must also take care of attachment flags which are no longer valid,
-    # as well as all bug flags which haven't been forgotten above.
-    if ($self->isa('Bugzilla::Bug')
-        && ($self->{_old_product_name} || $self->{_old_component_name}))
+  }
+
+  # These flags have been deleted.
+  foreach my $old_flag (values %old_flags) {
+    $class->notify(undef, $old_flag, $self, $timestamp);
+    $old_flag->remove_from_db();
+  }
+
+  # If the bug has been moved into another product or component,
+  # we must also take care of attachment flags which are no longer valid,
+  # as well as all bug flags which haven't been forgotten above.
+  if ($self->isa('Bugzilla::Bug')
+    && ($self->{_old_product_name} || $self->{_old_component_name}))
+  {
+    my @removed = $class->force_cleanup($self);
+    push(@old_summaries, @removed);
+  }
+
+  my @new_summaries = $class->snapshot($self->flags);
+  my @changes = $class->update_activity(\@old_summaries, \@new_summaries);
+
+  Bugzilla::Hook::process(
+    'flag_end_of_update',
     {
-        my @removed = $class->force_cleanup($self);
-        push(@old_summaries, @removed);
+      object    => $self,
+      timestamp => $timestamp,
+      old_flags => \@old_summaries,
+      new_flags => \@new_summaries,
     }
-
-    my @new_summaries = $class->snapshot($self->flags);
-    my @changes = $class->update_activity(\@old_summaries, \@new_summaries);
-
-    Bugzilla::Hook::process('flag_end_of_update', { object    => $self,
-                                                    timestamp => $timestamp,
-                                                    old_flags => \@old_summaries,
-                                                    new_flags => \@new_summaries,
-                                                  });
-    return @changes;
+  );
+  return @changes;
 }
 
 sub retarget {
-    my ($self, $obj) = @_;
-
-    my @flagtypes = grep { $_->name eq $self->type->name } @{$obj->flag_types};
-
-    my $success = 0;
-    foreach my $flagtype (@flagtypes) {
-        next if !$flagtype->is_active;
-        next if (!$flagtype->is_multiplicable && scalar @{$flagtype->{flags}});
-        next unless (($self->status eq '?' && $self->setter->can_request_flag($flagtype))
-                     || $self->setter->can_set_flag($flagtype));
-
-        $self->{type_id} = $flagtype->id;
-        delete $self->{type};
-        $success = 1;
-        last;
-    }
-    return $success;
+  my ($self, $obj) = @_;
+
+  my @flagtypes = grep { $_->name eq $self->type->name } @{$obj->flag_types};
+
+  my $success = 0;
+  foreach my $flagtype (@flagtypes) {
+    next if !$flagtype->is_active;
+    next if (!$flagtype->is_multiplicable && scalar @{$flagtype->{flags}});
+    next
+      unless (($self->status eq '?' && $self->setter->can_request_flag($flagtype))
+      || $self->setter->can_set_flag($flagtype));
+
+    $self->{type_id} = $flagtype->id;
+    delete $self->{type};
+    $success = 1;
+    last;
+  }
+  return $success;
 }
 
 # In case the bug's product/component has changed, clear flags that are
 # no longer valid.
 sub force_cleanup {
-    my ($class, $bug) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($class, $bug) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my $flag_ids = $dbh->selectcol_arrayref(
-        'SELECT DISTINCT flags.id
+  my $flag_ids = $dbh->selectcol_arrayref(
+    'SELECT DISTINCT flags.id
            FROM flags
           INNER JOIN bugs
                 ON flags.bug_id = bugs.bug_id
@@ -578,48 +599,50 @@ sub force_cleanup {
                 ON flags.type_id = i.type_id
                 AND (bugs.product_id = i.product_id OR i.product_id IS NULL)
                 AND (bugs.component_id = i.component_id OR i.component_id IS NULL)
-          WHERE bugs.bug_id = ? AND i.type_id IS NULL',
-         undef, $bug->id);
+          WHERE bugs.bug_id = ? AND i.type_id IS NULL', undef, $bug->id
+  );
 
-    my @removed = $class->force_retarget($flag_ids, $bug);
+  my @removed = $class->force_retarget($flag_ids, $bug);
 
-    $flag_ids = $dbh->selectcol_arrayref(
-        'SELECT DISTINCT flags.id
+  $flag_ids = $dbh->selectcol_arrayref(
+    'SELECT DISTINCT flags.id
            FROM flags, bugs, flagexclusions e
           WHERE bugs.bug_id = ?
                 AND flags.bug_id = bugs.bug_id
                 AND flags.type_id = e.type_id
                 AND (bugs.product_id = e.product_id OR e.product_id IS NULL)
                 AND (bugs.component_id = e.component_id OR e.component_id IS NULL)',
-         undef, $bug->id);
+    undef, $bug->id
+  );
 
-    push(@removed , $class->force_retarget($flag_ids, $bug));
-    return @removed;
+  push(@removed, $class->force_retarget($flag_ids, $bug));
+  return @removed;
 }
 
 sub force_retarget {
-    my ($class, $flag_ids, $bug) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my $flags = $class->new_from_list($flag_ids);
-    my @removed;
-    foreach my $flag (@$flags) {
-        # $bug is undefined when e.g. editing inclusion and exclusion lists.
-        my $obj = $flag->attachment || $bug || $flag->bug;
-        my $is_retargetted = $flag->retarget($obj);
-        if ($is_retargetted) {
-            $dbh->do('UPDATE flags SET type_id = ? WHERE id = ?',
-                     undef, ($flag->type_id, $flag->id));
-            Bugzilla->memcached->clear({ table => 'flags', id => $flag->id });
-        }
-        else {
-            # Track deleted attachment flags.
-            push(@removed, $class->snapshot([$flag])) if $flag->attach_id;
-            $class->notify(undef, $flag, $bug || $flag->bug);
-            $flag->remove_from_db();
-        }
+  my ($class, $flag_ids, $bug) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $flags = $class->new_from_list($flag_ids);
+  my @removed;
+  foreach my $flag (@$flags) {
+
+    # $bug is undefined when e.g. editing inclusion and exclusion lists.
+    my $obj = $flag->attachment || $bug || $flag->bug;
+    my $is_retargetted = $flag->retarget($obj);
+    if ($is_retargetted) {
+      $dbh->do('UPDATE flags SET type_id = ? WHERE id = ?',
+        undef, ($flag->type_id, $flag->id));
+      Bugzilla->memcached->clear({table => 'flags', id => $flag->id});
     }
-    return @removed;
+    else {
+      # Track deleted attachment flags.
+      push(@removed, $class->snapshot([$flag])) if $flag->attach_id;
+      $class->notify(undef, $flag, $bug || $flag->bug);
+      $flag->remove_from_db();
+    }
+  }
+  return @removed;
 }
 
 ###############################
@@ -627,164 +650,178 @@ sub force_retarget {
 ###############################
 
 sub _set_requestee {
-    my ($self, $requestee, $bug, $attachment, $skip_requestee_on_error) = @_;
+  my ($self, $requestee, $bug, $attachment, $skip_requestee_on_error) = @_;
 
-    $self->{requestee} =
-      $self->_check_requestee($requestee, $bug, $attachment, $skip_requestee_on_error);
+  $self->{requestee} = $self->_check_requestee($requestee, $bug, $attachment,
+    $skip_requestee_on_error);
 
-    $self->{requestee_id} =
-      $self->{requestee} ? $self->{requestee}->id : undef;
+  $self->{requestee_id} = $self->{requestee} ? $self->{requestee}->id : undef;
 }
 
 sub _set_setter {
-    my ($self, $setter) = @_;
+  my ($self, $setter) = @_;
 
-    $self->set('setter', $setter);
-    $self->{setter_id} = $self->setter->id;
+  $self->set('setter', $setter);
+  $self->{setter_id} = $self->setter->id;
 }
 
 sub _set_status {
-    my ($self, $status) = @_;
+  my ($self, $status) = @_;
 
-    # Store the old flag status. It's needed by _check_setter().
-    $self->{_old_status} = $self->status;
-    $self->set('status', $status);
+  # Store the old flag status. It's needed by _check_setter().
+  $self->{_old_status} = $self->status;
+  $self->set('status', $status);
 }
 
 sub _check_requestee {
-    my ($self, $requestee, $bug, $attachment, $skip_requestee_on_error) = @_;
-
-    # If the flag status is not "?", then no requestee can be defined.
-    return undef if ($self->status ne '?');
-
-    # Store this value before updating the flag object.
-    my $old_requestee = $self->requestee ? $self->requestee->login : '';
-
-    if ($self->status eq '?' && $requestee) {
-        $requestee = Bugzilla::User->check($requestee);
+  my ($self, $requestee, $bug, $attachment, $skip_requestee_on_error) = @_;
+
+  # If the flag status is not "?", then no requestee can be defined.
+  return undef if ($self->status ne '?');
+
+  # Store this value before updating the flag object.
+  my $old_requestee = $self->requestee ? $self->requestee->login : '';
+
+  if ($self->status eq '?' && $requestee) {
+    $requestee = Bugzilla::User->check($requestee);
+  }
+  else {
+    undef $requestee;
+  }
+
+  if ($requestee && $requestee->login ne $old_requestee) {
+
+    # Make sure the user didn't specify a requestee unless the flag
+    # is specifically requestable. For existing flags, if the requestee
+    # was set before the flag became specifically unrequestable, the
+    # user can either remove them or leave them alone.
+    ThrowUserError('flag_type_requestee_disabled', {type => $self->type})
+      if !$self->type->is_requesteeble;
+
+    # You can't ask a disabled account, as they don't have the ability to
+    # set the flag.
+    ThrowUserError('flag_requestee_disabled', {requestee => $requestee})
+      if !$requestee->is_enabled;
+
+    # Make sure the requestee can see the bug.
+    # Note that can_see_bug() will query the DB, so if the bug
+    # is being added/removed from some groups and these changes
+    # haven't been committed to the DB yet, they won't be taken
+    # into account here. In this case, old group restrictions matter.
+    # However, if the user has just been changed to the assignee,
+    # qa_contact, or added to the cc list of the bug and the bug
+    # is cclist_accessible, the requestee is allowed.
+    if (
+      !$requestee->can_see_bug($self->bug_id)
+      && ( !$bug->cclist_accessible
+        || !grep($_->id == $requestee->id, @{$bug->cc_users})
+        && $requestee->id != $bug->assigned_to->id
+        && (!$bug->qa_contact || $requestee->id != $bug->qa_contact->id))
+      )
+    {
+      if ($skip_requestee_on_error) {
+        undef $requestee;
+      }
+      else {
+        ThrowUserError(
+          'flag_requestee_unauthorized',
+          {
+            flag_type => $self->type,
+            requestee => $requestee,
+            bug_id    => $self->bug_id,
+            attach_id => $self->attach_id
+          }
+        );
+      }
     }
-    else {
+
+    # Make sure the requestee can see the private attachment.
+    elsif ($self->attach_id && $attachment->isprivate && !$requestee->is_insider) {
+      if ($skip_requestee_on_error) {
         undef $requestee;
+      }
+      else {
+        ThrowUserError(
+          'flag_requestee_unauthorized_attachment',
+          {
+            flag_type => $self->type,
+            requestee => $requestee,
+            bug_id    => $self->bug_id,
+            attach_id => $self->attach_id
+          }
+        );
+      }
     }
 
-    if ($requestee && $requestee->login ne $old_requestee) {
-        # Make sure the user didn't specify a requestee unless the flag
-        # is specifically requestable. For existing flags, if the requestee
-        # was set before the flag became specifically unrequestable, the
-        # user can either remove them or leave them alone.
-        ThrowUserError('flag_type_requestee_disabled', { type => $self->type })
-          if !$self->type->is_requesteeble;
-
-        # You can't ask a disabled account, as they don't have the ability to
-        # set the flag.
-        ThrowUserError('flag_requestee_disabled', { requestee => $requestee })
-          if !$requestee->is_enabled;
-
-        # Make sure the requestee can see the bug.
-        # Note that can_see_bug() will query the DB, so if the bug
-        # is being added/removed from some groups and these changes
-        # haven't been committed to the DB yet, they won't be taken
-        # into account here. In this case, old group restrictions matter.
-        # However, if the user has just been changed to the assignee,
-        # qa_contact, or added to the cc list of the bug and the bug
-        # is cclist_accessible, the requestee is allowed.
-        if (!$requestee->can_see_bug($self->bug_id)
-            && (!$bug->cclist_accessible
-                || !grep($_->id == $requestee->id, @{ $bug->cc_users })
-            && $requestee->id != $bug->assigned_to->id
-            && (!$bug->qa_contact || $requestee->id != $bug->qa_contact->id)))
-        {
-            if ($skip_requestee_on_error) {
-                undef $requestee;
-            }
-            else {
-                ThrowUserError('flag_requestee_unauthorized',
-                               { flag_type  => $self->type,
-                                 requestee  => $requestee,
-                                 bug_id     => $self->bug_id,
-                                 attach_id  => $self->attach_id });
-            }
-        }
-        # Make sure the requestee can see the private attachment.
-        elsif ($self->attach_id && $attachment->isprivate && !$requestee->is_insider) {
-            if ($skip_requestee_on_error) {
-                undef $requestee;
-            }
-            else {
-                ThrowUserError('flag_requestee_unauthorized_attachment',
-                               { flag_type  => $self->type,
-                                 requestee  => $requestee,
-                                 bug_id     => $self->bug_id,
-                                 attach_id  => $self->attach_id });
-            }
-        }
-        # Make sure the user is allowed to set the flag.
-        elsif (!$requestee->can_set_flag($self->type)) {
-            if ($skip_requestee_on_error) {
-                undef $requestee;
-            }
-            else {
-                ThrowUserError('flag_requestee_needs_privs',
-                               {'requestee' => $requestee,
-                                'flagtype'  => $self->type});
-            }
-        }
+    # Make sure the user is allowed to set the flag.
+    elsif (!$requestee->can_set_flag($self->type)) {
+      if ($skip_requestee_on_error) {
+        undef $requestee;
+      }
+      else {
+        ThrowUserError('flag_requestee_needs_privs',
+          {'requestee' => $requestee, 'flagtype' => $self->type});
+      }
     }
-    return $requestee;
+  }
+  return $requestee;
 }
 
 sub _check_setter {
-    my ($self, $setter) = @_;
-
-    # By default, the currently logged in user is the setter.
-    $setter ||= Bugzilla->user;
-    (blessed($setter) && $setter->isa('Bugzilla::User') && $setter->id)
-      || ThrowUserError('invalid_user');
-
-    # set_status() has already been called. So this refers
-    # to the new flag status.
-    my $status = $self->status;
-
-    # Make sure the user is authorized to modify flags, see bug 180879:
-    # - The flag exists and is unchanged.
-    # - The flag setter can unset flag.
-    # - Users in the request_group can clear pending requests and set flags
-    #   and can rerequest set flags.
-    # - Users in the grant_group can set/clear flags, including "+" and "-".
-    unless (($status eq $self->{_old_status})
-            || ($status eq 'X' && $setter->id == Bugzilla->user->id)
-            || (($status eq 'X' || $status eq '?')
-                && $setter->can_request_flag($self->type))
-            || $setter->can_set_flag($self->type))
-    {
-        ThrowUserError('flag_update_denied',
-                        { name       => $self->type->name,
-                          status     => $status,
-                          old_status => $self->{_old_status} });
-    }
-
-    # If the request is being retargetted, we don't update
-    # the setter, so that the setter gets the notification.
-    if ($status eq '?' && $self->{_old_status} eq '?') {
-        return $self->setter;
-    }
-    return $setter;
+  my ($self, $setter) = @_;
+
+  # By default, the currently logged in user is the setter.
+  $setter ||= Bugzilla->user;
+  (blessed($setter) && $setter->isa('Bugzilla::User') && $setter->id)
+    || ThrowUserError('invalid_user');
+
+  # set_status() has already been called. So this refers
+  # to the new flag status.
+  my $status = $self->status;
+
+  # Make sure the user is authorized to modify flags, see bug 180879:
+  # - The flag exists and is unchanged.
+  # - The flag setter can unset flag.
+  # - Users in the request_group can clear pending requests and set flags
+  #   and can rerequest set flags.
+  # - Users in the grant_group can set/clear flags, including "+" and "-".
+  unless (($status eq $self->{_old_status})
+    || ($status eq 'X' && $setter->id == Bugzilla->user->id)
+    || (($status eq 'X' || $status eq '?')
+      && $setter->can_request_flag($self->type))
+    || $setter->can_set_flag($self->type))
+  {
+    ThrowUserError(
+      'flag_update_denied',
+      {
+        name       => $self->type->name,
+        status     => $status,
+        old_status => $self->{_old_status}
+      }
+    );
+  }
+
+  # If the request is being retargetted, we don't update
+  # the setter, so that the setter gets the notification.
+  if ($status eq '?' && $self->{_old_status} eq '?') {
+    return $self->setter;
+  }
+  return $setter;
 }
 
 sub _check_status {
-    my ($self, $status) = @_;
-
-    # - Make sure the status is valid.
-    # - Make sure the user didn't request the flag unless it's requestable.
-    #   If the flag existed and was requested before it became unrequestable,
-    #   leave it as is.
-    if (!grep($status eq $_ , qw(X + - ?))
-        || ($status eq '?' && $self->status ne '?' && !$self->type->is_requestable))
-    {
-        ThrowUserError('flag_status_invalid', { id     => $self->id,
-                                                status => $status });
-    }
-    return $status;
+  my ($self, $status) = @_;
+
+  # - Make sure the status is valid.
+  # - Make sure the user didn't request the flag unless it's requestable.
+  #   If the flag existed and was requested before it became unrequestable,
+  #   leave it as is.
+  if (!grep($status eq $_, qw(X + - ?))
+    || ($status eq '?' && $self->status ne '?' && !$self->type->is_requestable))
+  {
+    ThrowUserError('flag_status_invalid', {id => $self->id, status => $status});
+  }
+  return $status;
 }
 
 ######################################################################
@@ -795,138 +832,183 @@ sub _check_status {
 
 =over
 
-=item C<extract_flags_from_cgi($bug, $attachment, $hr_vars)>
+=item C<extract_flags_from_cgi($bug, $hr_vars, $skip, $args)>
 
-Checks whether or not there are new flags to create and returns an
-array of hashes. This array is then passed to Flag::create().
+Checks if are new flags to create and returns an array of hashes.
+This array is then passed to Flag::create().
+
+$args is a hash that can be one of two things.
+
+It can contain a bug object, and optionally an attachment object.
+
+OR
+
+It can contain both a product_id AND a component id.
 
 =back
 
 =cut
 
 sub extract_flags_from_cgi {
-    my ($class, $bug, $attachment, $vars, $skip) = @_;
-    my $cgi = Bugzilla->cgi;
-
-    my $match_status = Bugzilla::User::match_field({
-        '^requestee(_type)?-(\d+)$' => { 'type' => 'multi' },
-    }, undef, $skip);
+  my ($class, $vars, $skip, $args) = @_;
+
+  my $cgi = Bugzilla->cgi;
+
+  my ($bug, $attachment, $component_id, $product_id);
+
+  if (defined($args->{bug})) {
+    $bug          = $args->{bug};
+    $component_id = $bug->component_id;
+    $product_id   = $bug->product_id;
+    $attachment   = $args->{attachment} if defined $args->{attachment};
+  }
+  elsif (defined($args->{product_id})) {
+    $product_id   = $args->{product_id};
+    $component_id = $args->{component_id};
+  }
+
+  my $match_status
+    = Bugzilla::User::match_field(
+    {'^requestee(_type)?-(\d+)$' => {'type' => 'multi'},},
+    undef, $skip);
+
+  $vars->{'match_field'} = 'requestee';
+  if ($match_status == USER_MATCH_FAILED) {
+    $vars->{'message'} = 'user_match_failed';
+  }
+  elsif ($match_status == USER_MATCH_MULTIPLE) {
+    $vars->{'message'} = 'user_match_multiple';
+  }
+
+  # Extract a list of flag type IDs from field names.
+  my @flagtype_ids = map { /^flag_type-(\d+)$/a ? $1 : () } $cgi->multi_param();
+  @flagtype_ids = grep($cgi->param("flag_type-$_") ne 'X', @flagtype_ids);
+
+  # Extract a list of existing flag IDs.
+  my @flag_ids = map { /^flag-(\d+)$/a ? $1 : () } $cgi->multi_param();
+
+  return ([], []) unless (scalar(@flagtype_ids) || scalar(@flag_ids));
+
+  my (@new_flags, @flags);
+  foreach my $flag_id (@flag_ids) {
+    my $flag = $class->new($flag_id);
+
+    # If the flag no longer exists, ignore it.
+    next unless $flag;
+
+    my $status = $cgi->param("flag-$flag_id");
+
+    # If the user entered more than one name into the requestee field
+    # (i.e. they want more than one person to set the flag) we can reuse
+    # the existing flag for the first person (who may well be the existing
+    # requestee), but we have to create new flags for each additional requestee.
+    my @requestees = $cgi->multi_param("requestee-$flag_id");
+    my $requestee_email;
+    if ($status eq "?" && scalar(@requestees) > 1 && $flag->type->is_multiplicable)
+    {
+      # The first person, for which we'll reuse the existing flag.
+      $requestee_email = shift(@requestees);
+
+      # Create new flags like the existing one for each additional person.
+      foreach my $login (@requestees) {
+        push(
+          @new_flags,
+          {
+            type_id   => $flag->type_id,
+            status    => "?",
+            requestee => $login,
+            skip_roe  => $skip
+          }
+        );
+      }
+    }
+    elsif ($status eq "?" && scalar(@requestees)) {
 
-    $vars->{'match_field'} = 'requestee';
-    if ($match_status == USER_MATCH_FAILED) {
-        $vars->{'message'} = 'user_match_failed';
+      # If there are several requestees and the flag type is not multiplicable,
+      # this will fail. But that's the job of the validator to complain. All
+      # we do here is to extract and convert data from the CGI.
+      $requestee_email = trim($cgi->param("requestee-$flag_id") || '');
     }
-    elsif ($match_status == USER_MATCH_MULTIPLE) {
-        $vars->{'message'} = 'user_match_multiple';
+
+    push(
+      @flags,
+      {
+        id        => $flag_id,
+        status    => $status,
+        requestee => $requestee_email,
+        skip_roe  => $skip
+      }
+    );
+  }
+
+  # Get a list of active flag types available for this product/component.
+  my $flag_types = Bugzilla::FlagType::match({
+    'product_id'   => $product_id,
+    'component_id' => $component_id,
+    'is_active'    => 1
+  });
+
+  foreach my $flagtype_id (@flagtype_ids) {
+
+    # Checks if there are unexpected flags for the product/component.
+    if (!scalar(grep { $_->id == $flagtype_id } @$flag_types)) {
+      $vars->{'message'} = 'unexpected_flag_types';
+      last;
     }
+  }
 
-    # Extract a list of flag type IDs from field names.
-    my @flagtype_ids = map(/^flag_type-(\d+)$/ ? $1 : (), $cgi->param());
-    @flagtype_ids = grep($cgi->param("flag_type-$_") ne 'X', @flagtype_ids);
-
-    # Extract a list of existing flag IDs.
-    my @flag_ids = map(/^flag-(\d+)$/ ? $1 : (), $cgi->param());
-
-    return ([], []) unless (scalar(@flagtype_ids) || scalar(@flag_ids));
-
-    my (@new_flags, @flags);
-    foreach my $flag_id (@flag_ids) {
-        my $flag = $class->new($flag_id);
-        # If the flag no longer exists, ignore it.
-        next unless $flag;
-
-        my $status = $cgi->param("flag-$flag_id");
-
-        # If the user entered more than one name into the requestee field
-        # (i.e. they want more than one person to set the flag) we can reuse
-        # the existing flag for the first person (who may well be the existing
-        # requestee), but we have to create new flags for each additional requestee.
-        my @requestees = $cgi->param("requestee-$flag_id");
-        my $requestee_email;
-        if ($status eq "?"
-            && scalar(@requestees) > 1
-            && $flag->type->is_multiplicable)
-        {
-            # The first person, for which we'll reuse the existing flag.
-            $requestee_email = shift(@requestees);
-
-            # Create new flags like the existing one for each additional person.
-            foreach my $login (@requestees) {
-                push(@new_flags, { type_id   => $flag->type_id,
-                                   status    => "?",
-                                   requestee => $login,
-                                   skip_roe  => $skip });
-            }
-        }
-        elsif ($status eq "?" && scalar(@requestees)) {
-            # If there are several requestees and the flag type is not multiplicable,
-            # this will fail. But that's the job of the validator to complain. All
-            # we do here is to extract and convert data from the CGI.
-            $requestee_email = trim($cgi->param("requestee-$flag_id") || '');
-        }
+  foreach my $flag_type (@$flag_types) {
+    my $type_id = $flag_type->id;
 
-        push(@flags, { id        => $flag_id,
-                       status    => $status,
-                       requestee => $requestee_email,
-                       skip_roe  => $skip });
-    }
+    # Bug flags are only valid for bugs, and attachment flags are
+    # only valid for attachments. So don't mix both.
+    next unless ($flag_type->target_type eq 'bug' xor $attachment);
 
-    # Get a list of active flag types available for this product/component.
-    my $flag_types = Bugzilla::FlagType::match(
-        { 'product_id'   => $bug->{'product_id'},
-          'component_id' => $bug->{'component_id'},
-          'is_active'    => 1 });
-
-    foreach my $flagtype_id (@flagtype_ids) {
-        # Checks if there are unexpected flags for the product/component.
-        if (!scalar(grep { $_->id == $flagtype_id } @$flag_types)) {
-            $vars->{'message'} = 'unexpected_flag_types';
-            last;
-        }
+    # We are only interested in flags the user tries to create.
+    next unless scalar(grep { $_ == $type_id } @flagtype_ids);
+
+    # If $bug is not defined, then we are creating a flag for an as
+    # yet uncreated bug.
+    if (defined $bug) {
+
+      # Get the number of flags of this type already set for this target.
+      my $has_flags = $class->count({
+        'type_id'     => $type_id,
+        'target_type' => $attachment ? 'attachment' : 'bug',
+        'bug_id'      => $bug->bug_id,
+        'attach_id'   => $attachment ? $attachment->id : undef
+      });
+
+      # Do not create a new flag of this type if this flag type is
+      # not multiplicable and already has a flag set.
+      next if (!$flag_type->is_multiplicable && $has_flags);
     }
 
-    foreach my $flag_type (@$flag_types) {
-        my $type_id = $flag_type->id;
-
-        # Bug flags are only valid for bugs, and attachment flags are
-        # only valid for attachments. So don't mix both.
-        next unless ($flag_type->target_type eq 'bug' xor $attachment);
-
-        # We are only interested in flags the user tries to create.
-        next unless scalar(grep { $_ == $type_id } @flagtype_ids);
-
-        # Get the number of flags of this type already set for this target.
-        my $has_flags = $class->count(
-            { 'type_id'     => $type_id,
-              'target_type' => $attachment ? 'attachment' : 'bug',
-              'bug_id'      => $bug->bug_id,
-              'attach_id'   => $attachment ? $attachment->id : undef });
-
-        # Do not create a new flag of this type if this flag type is
-        # not multiplicable and already has a flag set.
-        next if (!$flag_type->is_multiplicable && $has_flags);
-
-        my $status = $cgi->param("flag_type-$type_id");
-        trick_taint($status);
-
-        my @logins = $cgi->param("requestee_type-$type_id");
-        if ($status eq "?" && scalar(@logins)) {
-            foreach my $login (@logins) {
-                push (@new_flags, { type_id   => $type_id,
-                                    status    => $status,
-                                    requestee => $login,
-                                    skip_roe  => $skip });
-                last unless $flag_type->is_multiplicable;
-            }
-        }
-        else {
-            push (@new_flags, { type_id => $type_id,
-                                status  => $status });
-        }
+    my $status = $cgi->param("flag_type-$type_id");
+    trick_taint($status);
+
+    my @logins = $cgi->multi_param("requestee_type-$type_id");
+    if ($status eq "?" && scalar(@logins)) {
+      foreach my $login (@logins) {
+        push(
+          @new_flags,
+          {
+            type_id   => $type_id,
+            status    => $status,
+            requestee => $login,
+            skip_roe  => $skip
+          }
+        );
+        last unless $flag_type->is_multiplicable;
+      }
+    }
+    else {
+      push(@new_flags, {type_id => $type_id, status => $status});
     }
+  }
 
-    # Return the list of flags to update and/or to create.
-    return (\@flags, \@new_flags);
+  # Return the list of flags to update and/or to create.
+  return (\@flags, \@new_flags);
 }
 
 =pod
@@ -944,100 +1026,111 @@ from the previous sub-routine as it is called for changing multiple bugs
 =cut
 
 sub multi_extract_flags_from_cgi {
-    my ($class, $bug, $vars, $skip) = @_;
-    my $cgi = Bugzilla->cgi;
-
-    my $match_status = Bugzilla::User::match_field({
-        '^requestee(_type)?-(\d+)$' => { 'type' => 'multi' },
-    }, undef, $skip);
-
-    $vars->{'match_field'} = 'requestee';
-    if ($match_status == USER_MATCH_FAILED) {
-        $vars->{'message'} = 'user_match_failed';
-    }
-    elsif ($match_status == USER_MATCH_MULTIPLE) {
-        $vars->{'message'} = 'user_match_multiple';
-    }
-
-    # Extract a list of flag type IDs from field names.
-    my @flagtype_ids = map(/^flag_type-(\d+)$/ ? $1 : (), $cgi->param());
-
-    my (@new_flags, @flags);
-
-    # Get a list of active flag types available for this product/component.
-    my $flag_types = Bugzilla::FlagType::match(
-        { 'product_id'   => $bug->{'product_id'},
-          'component_id' => $bug->{'component_id'},
-          'is_active'    => 1 });
-
-    foreach my $flagtype_id (@flagtype_ids) {
-        # Checks if there are unexpected flags for the product/component.
-        if (!scalar(grep { $_->id == $flagtype_id } @$flag_types)) {
-            $vars->{'message'} = 'unexpected_flag_types';
-            last;
-        }
+  my ($class, $bug, $vars, $skip) = @_;
+  my $cgi = Bugzilla->cgi;
+
+  my $match_status
+    = Bugzilla::User::match_field(
+    {'^requestee(_type)?-(\d+)$' => {'type' => 'multi'},},
+    undef, $skip);
+
+  $vars->{'match_field'} = 'requestee';
+  if ($match_status == USER_MATCH_FAILED) {
+    $vars->{'message'} = 'user_match_failed';
+  }
+  elsif ($match_status == USER_MATCH_MULTIPLE) {
+    $vars->{'message'} = 'user_match_multiple';
+  }
+
+  # Extract a list of flag type IDs from field names.
+  my @flagtype_ids = map { /^flag_type-(\d+)$/a ? $1 : () } $cgi->multi_param();
+
+  my (@new_flags, @flags);
+
+  # Get a list of active flag types available for this product/component.
+  my $flag_types = Bugzilla::FlagType::match({
+    'product_id'   => $bug->{'product_id'},
+    'component_id' => $bug->{'component_id'},
+    'is_active'    => 1
+  });
+
+  foreach my $flagtype_id (@flagtype_ids) {
+
+    # Checks if there are unexpected flags for the product/component.
+    if (!scalar(grep { $_->id == $flagtype_id } @$flag_types)) {
+      $vars->{'message'} = 'unexpected_flag_types';
+      last;
     }
-
-    foreach my $flag_type (@$flag_types) {
-        my $type_id = $flag_type->id;
-
-        # Bug flags are only valid for bugs
-        next unless ($flag_type->target_type eq 'bug');
-
-        # We are only interested in flags the user tries to create.
-        next unless scalar(grep { $_ == $type_id } @flagtype_ids);
-
-        # Get the flags of this type already set for this bug.
-        my $current_flags = $class->match(
-            { 'type_id'     => $type_id,
-              'target_type' => 'bug',
-              'bug_id'      => $bug->bug_id });
-
-        # We will update existing flags (instead of creating new ones)
-        # if the flag exists and the user has not chosen the 'always add'
-        # option
-        my $update = scalar(@$current_flags) && ! $cgi->param("flags_add-$type_id");
-
-        my $status = $cgi->param("flag_type-$type_id");
-        trick_taint($status);
-
-        my @logins = $cgi->param("requestee_type-$type_id");
-        if ($status eq "?" && scalar(@logins)) {
-            foreach my $login (@logins) {
-                if ($update) {
-                foreach my $current_flag (@$current_flags) {
-                    push (@flags, { id        => $current_flag->id,
-                                    status    => $status,
-                                    requestee => $login,
-                                    skip_roe  => $skip });
-                    }
-                }
-                else {
-                    push (@new_flags, { type_id   => $type_id,
-                                        status    => $status,
-                                        requestee => $login,
-                                        skip_roe  => $skip });
-                }
-
-                last unless $flag_type->is_multiplicable;
-            }
+  }
+
+  foreach my $flag_type (@$flag_types) {
+    my $type_id = $flag_type->id;
+
+    # Bug flags are only valid for bugs
+    next unless ($flag_type->target_type eq 'bug');
+
+    # We are only interested in flags the user tries to create.
+    next unless scalar(grep { $_ == $type_id } @flagtype_ids);
+
+    # Get the flags of this type already set for this bug.
+    my $current_flags
+      = $class->match({
+      'type_id' => $type_id, 'target_type' => 'bug', 'bug_id' => $bug->bug_id
+      });
+
+    # We will update existing flags (instead of creating new ones)
+    # if the flag exists and the user has not chosen the 'always add'
+    # option
+    my $update = scalar(@$current_flags) && !$cgi->param("flags_add-$type_id");
+
+    my $status = $cgi->param("flag_type-$type_id");
+    trick_taint($status);
+
+    my @logins = $cgi->multi_param("requestee_type-$type_id");
+    if ($status eq "?" && scalar(@logins)) {
+      foreach my $login (@logins) {
+        if ($update) {
+          foreach my $current_flag (@$current_flags) {
+            push(
+              @flags,
+              {
+                id        => $current_flag->id,
+                status    => $status,
+                requestee => $login,
+                skip_roe  => $skip
+              }
+            );
+          }
         }
         else {
-            if ($update) {
-                foreach my $current_flag (@$current_flags) {
-                    push (@flags, { id      => $current_flag->id,
-                                    status  => $status });
-                }
-            }
-            else {
-                push (@new_flags, { type_id => $type_id,
-                                    status  => $status });
+          push(
+            @new_flags,
+            {
+              type_id   => $type_id,
+              status    => $status,
+              requestee => $login,
+              skip_roe  => $skip
             }
+          );
+        }
+
+        last unless $flag_type->is_multiplicable;
+      }
+    }
+    else {
+      if ($update) {
+        foreach my $current_flag (@$current_flags) {
+          push(@flags, {id => $current_flag->id, status => $status});
         }
+      }
+      else {
+        push(@new_flags, {type_id => $type_id, status => $status});
+      }
     }
+  }
 
-    # Return the list of flags to update and/or to create.
-    return (\@flags, \@new_flags);
+  # Return the list of flags to update and/or to create.
+  return (\@flags, \@new_flags);
 }
 
 =pod
@@ -1054,113 +1147,113 @@ or deleted.
 =cut
 
 sub notify {
-    my ($class, $flag, $old_flag, $obj, $timestamp) = @_;
-
-    my ($bug, $attachment);
-    if (blessed($obj) && $obj->isa('Bugzilla::Attachment')) {
-        $attachment = $obj;
-        $bug = $attachment->bug;
-    }
-    elsif (blessed($obj) && $obj->isa('Bugzilla::Bug')) {
-        $bug = $obj;
-    }
-    else {
-        # Not a good time to throw an error.
-        return;
-    }
-
-    my $addressee;
-    # If the flag is set to '?', maybe the requestee wants a notification.
-    if ($flag && $flag->requestee_id
-        && (!$old_flag || ($old_flag->requestee_id || 0) != $flag->requestee_id))
-    {
-        if ($flag->requestee->wants_mail([EVT_FLAG_REQUESTED])) {
-            $addressee = $flag->requestee;
-        }
+  my ($class, $flag, $old_flag, $obj, $timestamp) = @_;
+
+  my ($bug, $attachment);
+  if (blessed($obj) && $obj->isa('Bugzilla::Attachment')) {
+    $attachment = $obj;
+    $bug        = $attachment->bug;
+  }
+  elsif (blessed($obj) && $obj->isa('Bugzilla::Bug')) {
+    $bug = $obj;
+  }
+  else {
+    # Not a good time to throw an error.
+    return;
+  }
+
+  my $addressee;
+
+  # If the flag is set to '?', maybe the requestee wants a notification.
+  if ( $flag
+    && $flag->requestee_id
+    && (!$old_flag || ($old_flag->requestee_id || 0) != $flag->requestee_id))
+  {
+    if ($flag->requestee->wants_mail([EVT_FLAG_REQUESTED])) {
+      $addressee = $flag->requestee;
     }
-    elsif ($old_flag && $old_flag->status eq '?'
-           && (!$flag || $flag->status ne '?'))
-    {
-        if ($old_flag->setter->wants_mail([EVT_REQUESTED_FLAG])) {
-            $addressee = $old_flag->setter;
-        }
-    }
-
-    my $cc_list = $flag ? $flag->type->cc_list : $old_flag->type->cc_list;
-    # Is there someone to notify?
-    return unless ($addressee || $cc_list);
-
-    # The email client will display the Date: header in the desired timezone,
-    # so we can always use UTC here.
-    $timestamp ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-    $timestamp = format_time($timestamp, '%a, %d %b %Y %T %z', 'UTC');
-
-    # If the target bug is restricted to one or more groups, then we need
-    # to make sure we don't send email about it to unauthorized users
-    # on the request type's CC: list, so we have to trawl the list for users
-    # not in those groups or email addresses that don't have an account.
-    my @bug_in_groups = grep {$_->{'ison'} || $_->{'mandatory'}} @{$bug->groups};
-    my $attachment_is_private = $attachment ? $attachment->isprivate : undef;
-
-    my %recipients;
-    foreach my $cc (split(/[, ]+/, $cc_list)) {
-        my $ccuser = new Bugzilla::User({ name => $cc });
-        next if (scalar(@bug_in_groups) && (!$ccuser || !$ccuser->can_see_bug($bug->bug_id)));
-        next if $attachment_is_private && (!$ccuser || !$ccuser->is_insider);
-        # Prevent duplicated entries due to case sensitivity.
-        $cc = $ccuser ? $ccuser->email : $cc;
-        $recipients{$cc} = $ccuser;
-    }
-
-    # Only notify if the addressee is allowed to receive the email.
-    if ($addressee && $addressee->email_enabled) {
-        $recipients{$addressee->email} = $addressee;
-    }
-    # Process and send notification for each recipient.
-    # If there are users in the CC list who don't have an account,
-    # use the default language for email notifications.
-    my $default_lang;
-    if (grep { !$_ } values %recipients) {
-        $default_lang = Bugzilla::User->new()->setting('lang');
-    }
-
-    # Get comments on the bug
-    my $all_comments = $bug->comments({ after => $bug->lastdiffed });
-    @$all_comments   = grep { $_->type || $_->body =~ /\S/ } @$all_comments;
-
-    # Get public only comments
-    my $public_comments = [ grep { !$_->is_private } @$all_comments ];
-
-    foreach my $to (keys %recipients) {
-        # Add threadingmarker to allow flag notification emails to be the
-        # threaded similar to normal bug change emails.
-        my $thread_user_id = $recipients{$to} ? $recipients{$to}->id : 0;
-
-        # We only want to show private comments to users in the is_insider group
-        my $comments = $recipients{$to} && $recipients{$to}->is_insider
-            ? $all_comments : $public_comments;
-
-        my $vars = {
-            flag            => $flag,
-            old_flag        => $old_flag,
-            to              => $to,
-            date            => $timestamp,
-            bug             => $bug,
-            attachment      => $attachment,
-            threadingmarker => build_thread_marker($bug->id, $thread_user_id),
-            new_comments    => $comments,
-        };
-
-        my $lang = $recipients{$to} ?
-          $recipients{$to}->setting('lang') : $default_lang;
-
-        my $template = Bugzilla->template_inner($lang);
-        my $message;
-        $template->process("email/flagmail.txt.tmpl", $vars, \$message)
-          || ThrowTemplateError($template->error());
-
-        MessageToMTA($message);
+  }
+  elsif ($old_flag
+    && $old_flag->status eq '?'
+    && (!$flag || $flag->status ne '?'))
+  {
+    if ($old_flag->setter->wants_mail([EVT_REQUESTED_FLAG])) {
+      $addressee = $old_flag->setter;
     }
+  }
+
+  my $cc_list = $flag ? $flag->type->cc_list : $old_flag->type->cc_list;
+
+  # Is there someone to notify?
+  return unless ($addressee || $cc_list);
+
+  # The email client will display the Date: header in the desired timezone,
+  # so we can always use UTC here.
+  $timestamp ||= Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  $timestamp = format_time($timestamp, '%a, %d %b %Y %T %z', 'UTC');
+
+  # If the target bug is restricted to one or more groups, then we need
+  # to make sure we don't send email about it to unauthorized users
+  # on the request type's CC: list, so we have to trawl the list for users
+  # not in those groups or email addresses that don't have an account.
+  my @bug_in_groups = grep { $_->{'ison'} || $_->{'mandatory'} } @{$bug->groups};
+  my $attachment_is_private = $attachment ? $attachment->isprivate : undef;
+
+  my %recipients;
+  foreach my $cc (split(/[, ]+/, $cc_list)) {
+    my $ccuser = new Bugzilla::User({name => $cc});
+    next
+      if (scalar(@bug_in_groups)
+      && (!$ccuser || !$ccuser->can_see_bug($bug->bug_id)));
+    next if $attachment_is_private && (!$ccuser || !$ccuser->is_insider);
+
+    # Prevent duplicated entries due to case sensitivity.
+    $cc = $ccuser ? $ccuser->email : $cc;
+    $recipients{$cc} = $ccuser;
+  }
+
+  # Only notify if the addressee is allowed to receive the email.
+  if ($addressee && $addressee->email_enabled) {
+    $recipients{$addressee->email} = $addressee;
+  }
+
+  # Get comments on the bug
+  my $all_comments = $bug->comments({after => $bug->lastdiffed});
+  @$all_comments = grep { $_->type || $_->body =~ /\S/ } @$all_comments;
+
+  # Get public only comments
+  my $public_comments = [grep { !$_->is_private } @$all_comments];
+
+  foreach my $to (keys %recipients) {
+    my $user = $recipients{$to};
+
+    # Add threadingmarker to allow flag notification emails to be the
+    # threaded similar to normal bug change emails.
+    my $thread_user_id = $user ? $user->id : 0;
+
+    # We only want to show private comments to users in the is_insider group
+    my $comments = $user && $user->is_insider ? $all_comments : $public_comments;
+
+    my $vars = {
+      flag            => $flag,
+      old_flag        => $old_flag,
+      to              => $to,
+      to_user         => $user,
+      date            => $timestamp,
+      bug             => $bug,
+      attachment      => $attachment,
+      threadingmarker => build_thread_marker($bug->id, $thread_user_id),
+      new_comments    => $comments,
+    };
+
+    my $templates = {
+      header => "email/flagmail-header.txt.tmpl",
+      text   => "email/flagmail.txt.tmpl",
+      html   => "email/flagmail.html.tmpl",
+    };
+
+    MessageToMTA(generate_email($vars, $templates));
+  }
 }
 
 # This is an internal function used by $bug->flag_types
@@ -1168,39 +1261,42 @@ sub notify {
 # flag types and existing flags set on them. You should never
 # call this function directly.
 sub _flag_types {
-    my ($class, $vars) = @_;
-
-    my $target_type = $vars->{target_type};
-    my $flags;
-
-    # Retrieve all existing flags for this bug/attachment.
-    if ($target_type eq 'bug') {
-        my $bug_id = delete $vars->{bug_id};
-        $flags = $class->match({target_type => 'bug', bug_id => $bug_id});
-    }
-    elsif ($target_type eq 'attachment') {
-        my $attach_id = delete $vars->{attach_id};
-        $flags = $class->match({attach_id => $attach_id});
-    }
-    else {
-        ThrowCodeError('bad_arg', {argument => 'target_type',
-                                   function => $class . '->_flag_types'});
-    }
-
-    # Get all available flag types for the given product and component.
-    my $cache = Bugzilla->request_cache->{flag_types_per_component}->{$vars->{target_type}} ||= {};
-    my $flag_data = $cache->{$vars->{component_id}} ||= Bugzilla::FlagType::match($vars);
-    my $flag_types = dclone($flag_data);
-
-    $_->{flags} = [] foreach @$flag_types;
-    my %flagtypes = map { $_->id => $_ } @$flag_types;
-
-    # Group existing flags per type, and skip those becoming invalid
-    # (which can happen when a bug is being moved into a new product
-    # or component).
-    @$flags = grep { exists $flagtypes{$_->type_id} } @$flags;
-    push(@{$flagtypes{$_->type_id}->{flags}}, $_) foreach @$flags;
-    return $flag_types;
+  my ($class, $vars) = @_;
+
+  my $target_type = $vars->{target_type};
+  my $flags;
+
+  # Retrieve all existing flags for this bug/attachment.
+  if ($target_type eq 'bug') {
+    my $bug_id = delete $vars->{bug_id};
+    $flags = $class->match({target_type => 'bug', bug_id => $bug_id});
+  }
+  elsif ($target_type eq 'attachment') {
+    my $attach_id = delete $vars->{attach_id};
+    $flags = $class->match({attach_id => $attach_id});
+  }
+  else {
+    ThrowCodeError('bad_arg',
+      {argument => 'target_type', function => $class . '->_flag_types'});
+  }
+
+  # Get all available flag types for the given product and component.
+  my $cache
+    = Bugzilla->request_cache->{flag_types_per_component}->{$vars->{target_type}}
+    ||= {};
+  my $flag_data = $cache->{$vars->{component_id}}
+    ||= Bugzilla::FlagType::match($vars);
+  my $flag_types = dclone($flag_data);
+
+  $_->{flags} = [] foreach @$flag_types;
+  my %flagtypes = map { $_->id => $_ } @$flag_types;
+
+  # Group existing flags per type, and skip those becoming invalid
+  # (which can happen when a bug is being moved into a new product
+  # or component).
+  @$flags = grep { exists $flagtypes{$_->type_id} } @$flags;
+  push(@{$flagtypes{$_->type_id}->{flags}}, $_) foreach @$flags;
+  return $flag_types;
 }
 
 1;
diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index 72b3f64c1f..b39fe9d1be 100644
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::FlagType;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -49,113 +49,114 @@ use parent qw(Bugzilla::Object);
 ####    Initialization     ####
 ###############################
 
-use constant DB_TABLE => 'flagtypes';
+use constant DB_TABLE   => 'flagtypes';
 use constant LIST_ORDER => 'sortkey, name';
 
 use constant DB_COLUMNS => qw(
-    id
-    name
-    description
-    cc_list
-    target_type
-    sortkey
-    is_active
-    is_requestable
-    is_requesteeble
-    is_multiplicable
-    grant_group_id
-    request_group_id
+  id
+  name
+  description
+  cc_list
+  target_type
+  sortkey
+  is_active
+  is_requestable
+  is_requesteeble
+  is_multiplicable
+  grant_group_id
+  request_group_id
 );
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    description
-    cc_list
-    sortkey
-    is_active
-    is_requestable
-    is_requesteeble
-    is_multiplicable
-    grant_group_id
-    request_group_id
+  name
+  description
+  cc_list
+  sortkey
+  is_active
+  is_requestable
+  is_requesteeble
+  is_multiplicable
+  grant_group_id
+  request_group_id
 );
 
 use constant VALIDATORS => {
-    name             => \&_check_name,
-    description      => \&_check_description,
-    cc_list          => \&_check_cc_list,
-    target_type      => \&_check_target_type,
-    sortkey          => \&_check_sortkey,
-    is_active        => \&Bugzilla::Object::check_boolean,
-    is_requestable   => \&Bugzilla::Object::check_boolean,
-    is_requesteeble  => \&Bugzilla::Object::check_boolean,
-    is_multiplicable => \&Bugzilla::Object::check_boolean,
-    grant_group      => \&_check_group,
-    request_group    => \&_check_group,
+  name             => \&_check_name,
+  description      => \&_check_description,
+  cc_list          => \&_check_cc_list,
+  target_type      => \&_check_target_type,
+  sortkey          => \&_check_sortkey,
+  is_active        => \&Bugzilla::Object::check_boolean,
+  is_requestable   => \&Bugzilla::Object::check_boolean,
+  is_requesteeble  => \&Bugzilla::Object::check_boolean,
+  is_multiplicable => \&Bugzilla::Object::check_boolean,
+  grant_group      => \&_check_group,
+  request_group    => \&_check_group,
 };
 
-use constant UPDATE_VALIDATORS => {
-    grant_group_id   => \&_check_group,
-    request_group_id => \&_check_group,
-};
+use constant UPDATE_VALIDATORS =>
+  {grant_group_id => \&_check_group, request_group_id => \&_check_group,};
 ###############################
 
 sub create {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
+  my $class = shift;
+  my $dbh   = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
 
-    $dbh->bz_start_transaction();
+  $class->check_required_create_fields(@_);
+  my $params = $class->run_create_validators(@_);
 
-    $class->check_required_create_fields(@_);
-    my $params = $class->run_create_validators(@_);
-    # In the DB, only the first character of the target type is stored.
-    $params->{target_type} = substr($params->{target_type}, 0, 1);
+  # In the DB, only the first character of the target type is stored.
+  $params->{target_type} = substr($params->{target_type}, 0, 1);
 
-    # Extract everything which is not a valid column name.
-    $params->{grant_group_id} = delete $params->{grant_group};
-    $params->{request_group_id} = delete $params->{request_group};
-    my $inclusions = delete $params->{inclusions};
-    my $exclusions = delete $params->{exclusions};
+  # Extract everything which is not a valid column name.
+  $params->{grant_group_id}   = delete $params->{grant_group};
+  $params->{request_group_id} = delete $params->{request_group};
+  my $inclusions = delete $params->{inclusions};
+  my $exclusions = delete $params->{exclusions};
 
-    my $flagtype = $class->insert_create_data($params);
+  my $flagtype = $class->insert_create_data($params);
 
-    $flagtype->set_clusions({ inclusions => $inclusions,
-                              exclusions => $exclusions });
-    $flagtype->update();
+  $flagtype->set_clusions({inclusions => $inclusions, exclusions => $exclusions});
+  $flagtype->update();
 
-    $dbh->bz_commit_transaction();
-    return $flagtype;
+  $dbh->bz_commit_transaction();
+  return $flagtype;
 }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $flag_id = $self->id;
+  my $self    = shift;
+  my $dbh     = Bugzilla->dbh;
+  my $flag_id = $self->id;
 
-    $dbh->bz_start_transaction();
-    my $changes = $self->SUPER::update(@_);
+  $dbh->bz_start_transaction();
+  my $changes = $self->SUPER::update(@_);
 
-    # Update the flaginclusions and flagexclusions tables.
-    foreach my $category ('inclusions', 'exclusions') {
-        next unless delete $self->{"_update_$category"};
+  # Update the flaginclusions and flagexclusions tables.
+  foreach my $category ('inclusions', 'exclusions') {
+    next unless delete $self->{"_update_$category"};
 
-        $dbh->do("DELETE FROM flag$category WHERE type_id = ?", undef, $flag_id);
+    $dbh->do("DELETE FROM flag$category WHERE type_id = ?", undef, $flag_id);
 
-        my $sth = $dbh->prepare("INSERT INTO flag$category
-                                (type_id, product_id, component_id) VALUES (?, ?, ?)");
+    my $sth = $dbh->prepare(
+      "INSERT INTO flag$category
+                                (type_id, product_id, component_id) VALUES (?, ?, ?)"
+    );
 
-        foreach my $prod_comp (values %{$self->{$category}}) {
-            my ($prod_id, $comp_id) = split(':', $prod_comp);
-            $prod_id ||= undef;
-            $comp_id ||= undef;
-            $sth->execute($flag_id, $prod_id, $comp_id);
-        }
-        $changes->{$category} = [0, 1];
+    foreach my $prod_comp (values %{$self->{$category}}) {
+      my ($prod_id, $comp_id) = split(':', $prod_comp);
+      $prod_id ||= undef;
+      $comp_id ||= undef;
+      $sth->execute($flag_id, $prod_id, $comp_id);
     }
+    $changes->{$category} = [0, 1];
+  }
 
-    # Clear existing flags for bugs/attachments in categories no longer on
-    # the list of inclusions or that have been added to the list of exclusions.
-    my $flag_ids = $dbh->selectcol_arrayref('SELECT DISTINCT flags.id
+  # Clear existing flags for bugs/attachments in categories no longer on
+  # the list of inclusions or that have been added to the list of exclusions.
+  my $flag_ids = $dbh->selectcol_arrayref(
+    'SELECT DISTINCT flags.id
                                                FROM flags
                                          INNER JOIN bugs
                                                  ON flags.bug_id = bugs.bug_id
@@ -166,11 +167,13 @@ sub update {
                                                      AND (bugs.component_id = i.component_id
                                                           OR i.component_id IS NULL))
                                               WHERE flags.type_id = ?
-                                                AND i.type_id IS NULL',
-                                             undef, $self->id);
-    Bugzilla::Flag->force_retarget($flag_ids);
+                                                AND i.type_id IS NULL', undef,
+    $self->id
+  );
+  Bugzilla::Flag->force_retarget($flag_ids);
 
-    $flag_ids = $dbh->selectcol_arrayref('SELECT DISTINCT flags.id
+  $flag_ids = $dbh->selectcol_arrayref(
+    'SELECT DISTINCT flags.id
                                             FROM flags
                                       INNER JOIN bugs
                                               ON flags.bug_id = bugs.bug_id
@@ -181,26 +184,29 @@ sub update {
                                                   OR e.product_id IS NULL)
                                              AND (bugs.component_id = e.component_id
                                                   OR e.component_id IS NULL)',
-                                          undef, $self->id);
-    Bugzilla::Flag->force_retarget($flag_ids);
-
-    # Silently remove requestees from flags which are no longer
-    # specifically requestable.
-    if (!$self->is_requesteeble) {
-        my $ids = $dbh->selectcol_arrayref(
-            'SELECT id FROM flags WHERE type_id = ? AND requestee_id IS NOT NULL',
-             undef, $self->id);
-
-        if (@$ids) {
-            $dbh->do('UPDATE flags SET requestee_id = NULL WHERE ' . $dbh->sql_in('id', $ids));
-            foreach my $id (@$ids) {
-                Bugzilla->memcached->clear({ table => 'flags', id => $id });
-            }
-        }
+    undef, $self->id
+  );
+  Bugzilla::Flag->force_retarget($flag_ids);
+
+  # Silently remove requestees from flags which are no longer
+  # specifically requestable.
+  if (!$self->is_requesteeble) {
+    my $ids
+      = $dbh->selectcol_arrayref(
+      'SELECT id FROM flags WHERE type_id = ? AND requestee_id IS NOT NULL',
+      undef, $self->id);
+
+    if (@$ids) {
+      $dbh->do(
+        'UPDATE flags SET requestee_id = NULL WHERE ' . $dbh->sql_in('id', $ids));
+      foreach my $id (@$ids) {
+        Bugzilla->memcached->clear({table => 'flags', id => $id});
+      }
     }
+  }
 
-    $dbh->bz_commit_transaction();
-    return $changes;
+  $dbh->bz_commit_transaction();
+  return $changes;
 }
 
 ###############################
@@ -259,172 +265,174 @@ Returns the sortkey of the flagtype.
 
 =cut
 
-sub id               { return $_[0]->{'id'};               }
-sub name             { return $_[0]->{'name'};             }
-sub description      { return $_[0]->{'description'};      }
-sub cc_list          { return $_[0]->{'cc_list'};          }
-sub target_type      { return $_[0]->{'target_type'} eq 'b' ? 'bug' : 'attachment'; }
-sub is_active        { return $_[0]->{'is_active'};        }
-sub is_requestable   { return $_[0]->{'is_requestable'};   }
-sub is_requesteeble  { return $_[0]->{'is_requesteeble'};  }
+sub id          { return $_[0]->{'id'}; }
+sub name        { return $_[0]->{'name'}; }
+sub description { return $_[0]->{'description'}; }
+sub cc_list     { return $_[0]->{'cc_list'}; }
+sub target_type { return $_[0]->{'target_type'} eq 'b' ? 'bug' : 'attachment'; }
+sub is_active   { return $_[0]->{'is_active'}; }
+sub is_requestable   { return $_[0]->{'is_requestable'}; }
+sub is_requesteeble  { return $_[0]->{'is_requesteeble'}; }
 sub is_multiplicable { return $_[0]->{'is_multiplicable'}; }
-sub sortkey          { return $_[0]->{'sortkey'};          }
+sub sortkey          { return $_[0]->{'sortkey'}; }
 sub request_group_id { return $_[0]->{'request_group_id'}; }
-sub grant_group_id   { return $_[0]->{'grant_group_id'};   }
+sub grant_group_id   { return $_[0]->{'grant_group_id'}; }
 
 ################################
 # Validators
 ################################
 
 sub _check_name {
-    my ($invocant, $name) = @_;
+  my ($invocant, $name) = @_;
 
-    $name = trim($name);
-    ($name && $name !~ /[\s,]/ && length($name) <= 50)
-      || ThrowUserError('flag_type_name_invalid', { name => $name });
-    return $name;
+  $name = trim($name);
+  ($name && $name !~ /[\s,]/ && length($name) <= 50)
+    || ThrowUserError('flag_type_name_invalid', {name => $name});
+  return $name;
 }
 
 sub _check_description {
-    my ($invocant, $desc) = @_;
+  my ($invocant, $desc) = @_;
 
-    $desc = trim($desc);
-    $desc || ThrowUserError('flag_type_description_invalid');
-    return $desc;
+  $desc = trim($desc);
+  $desc || ThrowUserError('flag_type_description_invalid');
+  return $desc;
 }
 
 sub _check_cc_list {
-    my ($invocant, $cc_list) = @_;
-
-    length($cc_list) <= 200
-      || ThrowUserError('flag_type_cc_list_invalid', { cc_list => $cc_list });
-
-    my @addresses = split(/[,\s]+/, $cc_list);
-    my $addr_spec = $Email::Address::addr_spec;
-    # We do not call check_email_syntax() because these addresses do not
-    # require to match 'emailregexp' and do not depend on 'emailsuffix'.
-    foreach my $address (@addresses) {
-        ($address !~ /\P{ASCII}/ && $address =~ /^$addr_spec$/)
-          || ThrowUserError('illegal_email_address',
-                            {addr => $address, default => 1});
-    }
-    return $cc_list;
+  my ($invocant, $cc_list) = @_;
+
+  length($cc_list) <= 200
+    || ThrowUserError('flag_type_cc_list_invalid', {cc_list => $cc_list});
+
+  my @addresses = split(/[,\s]+/, $cc_list);
+  my $addr_spec = $Email::Address::addr_spec;
+
+  # We do not call check_email_syntax() because these addresses are not
+  # required to match 'emailregexp'.
+  foreach my $address (@addresses) {
+    ($address !~ /\P{ASCII}/ && $address =~ /^$addr_spec$/)
+      || ThrowUserError('illegal_email_address', {addr => $address, default => 1});
+  }
+  return $cc_list;
 }
 
 sub _check_target_type {
-    my ($invocant, $target_type) = @_;
+  my ($invocant, $target_type) = @_;
 
-    ($target_type eq 'bug' || $target_type eq 'attachment')
-      || ThrowCodeError('flag_type_target_type_invalid', { target_type => $target_type });
-    return $target_type;
+  ($target_type eq 'bug' || $target_type eq 'attachment')
+    || ThrowCodeError('flag_type_target_type_invalid',
+    {target_type => $target_type});
+  return $target_type;
 }
 
 sub _check_sortkey {
-    my ($invocant, $sortkey) = @_;
+  my ($invocant, $sortkey) = @_;
 
-    (detaint_natural($sortkey) && $sortkey <= MAX_SMALLINT)
-      || ThrowUserError('flag_type_sortkey_invalid', { sortkey => $sortkey });
-    return $sortkey;
+  (detaint_natural($sortkey) && $sortkey <= MAX_SMALLINT)
+    || ThrowUserError('flag_type_sortkey_invalid', {sortkey => $sortkey});
+  return $sortkey;
 }
 
 sub _check_group {
-    my ($invocant, $group) = @_;
-    return unless $group;
+  my ($invocant, $group) = @_;
+  return unless $group;
 
-    trick_taint($group);
-    $group = Bugzilla::Group->check($group);
-    return $group->id;
+  trick_taint($group);
+  $group = Bugzilla::Group->check($group);
+  return $group->id;
 }
 
 ###############################
 ####       Methods         ####
 ###############################
 
-sub set_name             { $_[0]->set('name', $_[1]); }
-sub set_description      { $_[0]->set('description', $_[1]); }
-sub set_cc_list          { $_[0]->set('cc_list', $_[1]); }
-sub set_sortkey          { $_[0]->set('sortkey', $_[1]); }
-sub set_is_active        { $_[0]->set('is_active', $_[1]); }
-sub set_is_requestable   { $_[0]->set('is_requestable', $_[1]); }
-sub set_is_specifically_requestable { $_[0]->set('is_requesteeble', $_[1]); }
-sub set_is_multiplicable { $_[0]->set('is_multiplicable', $_[1]); }
-sub set_grant_group      { $_[0]->set('grant_group_id', $_[1]); }
-sub set_request_group    { $_[0]->set('request_group_id', $_[1]); }
+sub set_name                        { $_[0]->set('name',             $_[1]); }
+sub set_description                 { $_[0]->set('description',      $_[1]); }
+sub set_cc_list                     { $_[0]->set('cc_list',          $_[1]); }
+sub set_sortkey                     { $_[0]->set('sortkey',          $_[1]); }
+sub set_is_active                   { $_[0]->set('is_active',        $_[1]); }
+sub set_is_requestable              { $_[0]->set('is_requestable',   $_[1]); }
+sub set_is_specifically_requestable { $_[0]->set('is_requesteeble',  $_[1]); }
+sub set_is_multiplicable            { $_[0]->set('is_multiplicable', $_[1]); }
+sub set_grant_group                 { $_[0]->set('grant_group_id',   $_[1]); }
+sub set_request_group               { $_[0]->set('request_group_id', $_[1]); }
 
 sub set_clusions {
-    my ($self, $list) = @_;
-    my $user = Bugzilla->user;
-    my %products;
-    my $params = {};
-
-    # If the user has editcomponents privs, then we only need to make sure
-    # that the product exists.
-    if ($user->in_group('editcomponents')) {
-        $params->{allow_inaccessible} = 1;
-    }
-
-    foreach my $category (keys %$list) {
-        my %clusions;
-        my %clusions_as_hash;
-
-        foreach my $prod_comp (@{$list->{$category} || []}) {
-            my ($prod_id, $comp_id) = split(':', $prod_comp);
-            my $prod_name = '__Any__';
-            my $comp_name = '__Any__';
-            # Does the product exist?
-            if ($prod_id) {
-                detaint_natural($prod_id)
-                  || ThrowCodeError('param_must_be_numeric',
-                                    { function => 'Bugzilla::FlagType::set_clusions' });
-
-                if (!$products{$prod_id}) {
-                    $params->{id} = $prod_id;
-                    $products{$prod_id} = Bugzilla::Product->check($params);
-                }
-                $prod_name = $products{$prod_id}->name;
-
-                # Does the component belong to this product?
-                if ($comp_id) {
-                    detaint_natural($comp_id)
-                      || ThrowCodeError('param_must_be_numeric',
-                                        { function => 'Bugzilla::FlagType::set_clusions' });
-
-                    my ($component) = grep { $_->id == $comp_id } @{$products{$prod_id}->components}
-                                        or ThrowUserError('product_unknown_component',
-                                                          { product => $prod_name, comp_id => $comp_id });
-                    $comp_name = $component->name;
-                }
-                else {
-                    $comp_id = 0;
-                }
-            }
-            else {
-                $prod_id = 0;
-                $comp_id = 0;
-            }
-            $clusions{"$prod_name:$comp_name"} = "$prod_id:$comp_id";
-            $clusions_as_hash{$prod_id}->{$comp_id} = 1;
+  my ($self, $list) = @_;
+  my $user = Bugzilla->user;
+  my %products;
+  my $params = {};
+
+  # If the user has editcomponents privs, then we only need to make sure
+  # that the product exists.
+  if ($user->in_group('editcomponents')) {
+    $params->{allow_inaccessible} = 1;
+  }
+
+  foreach my $category (keys %$list) {
+    my %clusions;
+    my %clusions_as_hash;
+
+    foreach my $prod_comp (@{$list->{$category} || []}) {
+      my ($prod_id, $comp_id) = split(':', $prod_comp);
+      my $prod_name = '__Any__';
+      my $comp_name = '__Any__';
+
+      # Does the product exist?
+      if ($prod_id) {
+        detaint_natural($prod_id)
+          || ThrowCodeError('param_must_be_numeric',
+          {function => 'Bugzilla::FlagType::set_clusions'});
+
+        if (!$products{$prod_id}) {
+          $params->{id} = $prod_id;
+          $products{$prod_id} = Bugzilla::Product->check($params);
         }
-
-        # Check the user has the editcomponent permission on products that are changing
-        if (! $user->in_group('editcomponents')) {
-            my $current_clusions = $self->$category;
-            my ($removed, $added)
-                = diff_arrays([ values %$current_clusions ], [ values %clusions ]);
-            my @changed_product_ids
-                = uniq map { substr($_, 0, index($_, ':')) } @$removed, @$added;
-            foreach my $product_id (@changed_product_ids) {
-                $user->in_group('editcomponents', $product_id)
-                    || ThrowUserError('product_access_denied',
-                                      { name => $products{$product_id}->name });
-            }
+        $prod_name = $products{$prod_id}->name;
+
+        # Does the component belong to this product?
+        if ($comp_id) {
+          detaint_natural($comp_id)
+            || ThrowCodeError('param_must_be_numeric',
+            {function => 'Bugzilla::FlagType::set_clusions'});
+
+          my ($component) = grep { $_->id == $comp_id } @{$products{$prod_id}->components}
+            or ThrowUserError('product_unknown_component',
+            {product => $prod_name, comp_id => $comp_id});
+          $comp_name = $component->name;
+        }
+        else {
+          $comp_id = 0;
         }
+      }
+      else {
+        $prod_id = 0;
+        $comp_id = 0;
+      }
+      $clusions{"$prod_name:$comp_name"} = "$prod_id:$comp_id";
+      $clusions_as_hash{$prod_id}->{$comp_id} = 1;
+    }
 
-        # Set the changes
-        $self->{$category} = \%clusions;
-        $self->{"${category}_as_hash"} = \%clusions_as_hash;
-        $self->{"_update_$category"} = 1;
+    # Check the user has the editcomponent permission on products that are changing
+    if (!$user->in_group('editcomponents')) {
+      my $current_clusions = $self->$category;
+      my ($removed, $added)
+        = diff_arrays([values %$current_clusions], [values %clusions]);
+      my @changed_product_ids = uniq map { substr($_, 0, index($_, ':')) } @$removed,
+        @$added;
+      foreach my $product_id (@changed_product_ids) {
+        $user->in_group('editcomponents', $product_id)
+          || ThrowUserError('product_access_denied',
+          {name => $products{$product_id}->name});
+      }
     }
+
+    # Set the changes
+    $self->{$category}             = \%clusions;
+    $self->{"${category}_as_hash"} = \%clusions_as_hash;
+    $self->{"_update_$category"}   = 1;
+  }
 }
 
 =pod
@@ -465,76 +473,79 @@ explicitly excluded from the flagtype.
 =cut
 
 sub grant_list {
-    my $self = shift;
-    require Bugzilla::User;
-    my @custusers;
-    my @allusers = @{Bugzilla->user->get_userlist};
-    foreach my $user (@allusers) {
-        my $user_obj = new Bugzilla::User({name => $user->{login}});
-        push(@custusers, $user) if $user_obj->can_set_flag($self);
-    }
-    return \@custusers;
+  my $self = shift;
+  require Bugzilla::User;
+  my @custusers;
+  my @allusers = @{Bugzilla->user->get_userlist};
+  foreach my $user (@allusers) {
+    my $user_obj = new Bugzilla::User({name => $user->{login}});
+    push(@custusers, $user) if $user_obj->can_set_flag($self);
+  }
+  return \@custusers;
 }
 
 sub grant_group {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'grant_group'} && $self->{'grant_group_id'}) {
-        $self->{'grant_group'} = new Bugzilla::Group($self->{'grant_group_id'});
-    }
-    return $self->{'grant_group'};
+  if (!defined $self->{'grant_group'} && $self->{'grant_group_id'}) {
+    $self->{'grant_group'} = new Bugzilla::Group($self->{'grant_group_id'});
+  }
+  return $self->{'grant_group'};
 }
 
 sub request_group {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'request_group'} && $self->{'request_group_id'}) {
-        $self->{'request_group'} = new Bugzilla::Group($self->{'request_group_id'});
-    }
-    return $self->{'request_group'};
+  if (!defined $self->{'request_group'} && $self->{'request_group_id'}) {
+    $self->{'request_group'} = new Bugzilla::Group($self->{'request_group_id'});
+  }
+  return $self->{'request_group'};
 }
 
 sub flag_count {
-    my $self = shift;
-
-    if (!defined $self->{'flag_count'}) {
-        $self->{'flag_count'} =
-            Bugzilla->dbh->selectrow_array('SELECT COUNT(*) FROM flags
-                                            WHERE type_id = ?', undef, $self->{'id'});
-    }
-    return $self->{'flag_count'};
+  my $self = shift;
+
+  if (!defined $self->{'flag_count'}) {
+    $self->{'flag_count'} = Bugzilla->dbh->selectrow_array(
+      'SELECT COUNT(*) FROM flags
+                                            WHERE type_id = ?', undef, $self->{'id'}
+    );
+  }
+  return $self->{'flag_count'};
 }
 
 sub inclusions {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{inclusions}) {
-        ($self->{inclusions}, $self->{inclusions_as_hash}) = get_clusions($self->id, 'in');
-    }
-    return $self->{inclusions};
+  if (!defined $self->{inclusions}) {
+    ($self->{inclusions}, $self->{inclusions_as_hash})
+      = get_clusions($self->id, 'in');
+  }
+  return $self->{inclusions};
 }
 
 sub inclusions_as_hash {
-    my $self = shift;
+  my $self = shift;
 
-    $self->inclusions unless defined $self->{inclusions_as_hash};
-    return $self->{inclusions_as_hash};
+  $self->inclusions unless defined $self->{inclusions_as_hash};
+  return $self->{inclusions_as_hash};
 }
 
 sub exclusions {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{exclusions}) {
-        ($self->{exclusions}, $self->{exclusions_as_hash}) = get_clusions($self->id, 'ex');
-    }
-    return $self->{exclusions};
+  if (!defined $self->{exclusions}) {
+    ($self->{exclusions}, $self->{exclusions_as_hash})
+      = get_clusions($self->id, 'ex');
+  }
+  return $self->{exclusions};
 }
 
 sub exclusions_as_hash {
-    my $self = shift;
+  my $self = shift;
 
-    $self->exclusions unless defined $self->{exclusions_as_hash};
-    return $self->{exclusions_as_hash};
+  $self->exclusions unless defined $self->{exclusions_as_hash};
+  return $self->{exclusions_as_hash};
 }
 
 ######################################################################
@@ -558,11 +569,11 @@ $clusions{'product_name:component_name'} = "product_ID:component_ID"
 =cut
 
 sub get_clusions {
-    my ($id, $type) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($id, $type) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my $list =
-        $dbh->selectall_arrayref("SELECT products.id, products.name,
+  my $list = $dbh->selectall_arrayref(
+    "SELECT products.id, products.name,
                                          components.id, components.name
                                     FROM flagtypes
                               INNER JOIN flag${type}clusions
@@ -571,19 +582,19 @@ sub get_clusions {
                                       ON flag${type}clusions.product_id = products.id
                                LEFT JOIN components
                                       ON flag${type}clusions.component_id = components.id
-                                   WHERE flagtypes.id = ?",
-                                 undef, $id);
-    my (%clusions, %clusions_as_hash);
-    foreach my $data (@$list) {
-        my ($product_id, $product_name, $component_id, $component_name) = @$data;
-        $product_id ||= 0;
-        $product_name ||= "__Any__";
-        $component_id ||= 0;
-        $component_name ||= "__Any__";
-        $clusions{"$product_name:$component_name"} = "$product_id:$component_id";
-        $clusions_as_hash{$product_id}->{$component_id} = 1;
-    }
-    return (\%clusions, \%clusions_as_hash);
+                                   WHERE flagtypes.id = ?", undef, $id
+  );
+  my (%clusions, %clusions_as_hash);
+  foreach my $data (@$list) {
+    my ($product_id, $product_name, $component_id, $component_name) = @$data;
+    $product_id     ||= 0;
+    $product_name   ||= "__Any__";
+    $component_id   ||= 0;
+    $component_name ||= "__Any__";
+    $clusions{"$product_name:$component_name"} = "$product_id:$component_id";
+    $clusions_as_hash{$product_id}->{$component_id} = 1;
+  }
+  return (\%clusions, \%clusions_as_hash);
 }
 
 =pod
@@ -600,18 +611,19 @@ and returns a list of matching flagtype objects.
 =cut
 
 sub match {
-    my ($criteria) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($criteria) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    # Depending on the criteria, we may have to append additional tables.
-    my $tables = [DB_TABLE];
-    my @criteria = sqlify_criteria($criteria, $tables);
-    $tables = join(' ', @$tables);
-    $criteria = join(' AND ', @criteria);
+  # Depending on the criteria, we may have to append additional tables.
+  my $tables = [DB_TABLE];
+  my @criteria = sqlify_criteria($criteria, $tables);
+  $tables   = join(' ',     @$tables);
+  $criteria = join(' AND ', @criteria);
 
-    my $flagtype_ids = $dbh->selectcol_arrayref("SELECT id FROM $tables WHERE $criteria");
+  my $flagtype_ids
+    = $dbh->selectcol_arrayref("SELECT id FROM $tables WHERE $criteria");
 
-    return Bugzilla::FlagType->new_from_list($flagtype_ids);
+  return Bugzilla::FlagType->new_from_list($flagtype_ids);
 }
 
 =pod
@@ -627,18 +639,20 @@ Returns the total number of flag types matching the given criteria.
 =cut
 
 sub count {
-    my ($criteria) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # Depending on the criteria, we may have to append additional tables.
-    my $tables = [DB_TABLE];
-    my @criteria = sqlify_criteria($criteria, $tables);
-    $tables = join(' ', @$tables);
-    $criteria = join(' AND ', @criteria);
-
-    my $count = $dbh->selectrow_array("SELECT COUNT(flagtypes.id)
-                                       FROM $tables WHERE $criteria");
-    return $count;
+  my ($criteria) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # Depending on the criteria, we may have to append additional tables.
+  my $tables = [DB_TABLE];
+  my @criteria = sqlify_criteria($criteria, $tables);
+  $tables   = join(' ',     @$tables);
+  $criteria = join(' AND ', @criteria);
+
+  my $count = $dbh->selectrow_array(
+    "SELECT COUNT(flagtypes.id)
+                                       FROM $tables WHERE $criteria"
+  );
+  return $count;
 }
 
 ######################################################################
@@ -646,93 +660,98 @@ sub count {
 ######################################################################
 
 # Converts a hash of criteria into a list of SQL criteria.
-# $criteria is a reference to the criteria (field => value), 
-# $tables is a reference to an array of tables being accessed 
+# $criteria is a reference to the criteria (field => value),
+# $tables is a reference to an array of tables being accessed
 # by the query.
 
 sub sqlify_criteria {
-    my ($criteria, $tables) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # the generated list of SQL criteria; "1=1" is a clever way of making sure
-    # there's something in the list so calling code doesn't have to check list
-    # size before building a WHERE clause out of it
-    my @criteria = ("1=1");
-
-    if ($criteria->{name}) {
-        if (ref($criteria->{name}) eq 'ARRAY') {
-            my @names = map { $dbh->quote($_) } @{$criteria->{name}};
-            # Detaint data as we have quoted it.
-            foreach my $name (@names) {
-                trick_taint($name);
-            }
-            push @criteria, $dbh->sql_in('flagtypes.name', \@names);
-        }
-        else {
-            my $name = $dbh->quote($criteria->{name});
-            trick_taint($name); # Detaint data as we have quoted it.
-            push(@criteria, "flagtypes.name = $name");
-        }
+  my ($criteria, $tables) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # the generated list of SQL criteria; "1=1" is a clever way of making sure
+  # there's something in the list so calling code doesn't have to check list
+  # size before building a WHERE clause out of it
+  my @criteria = ("1=1");
+
+  if ($criteria->{name}) {
+    if (ref($criteria->{name}) eq 'ARRAY') {
+      my @names = map { $dbh->quote($_) } @{$criteria->{name}};
+
+      # Detaint data as we have quoted it.
+      foreach my $name (@names) {
+        trick_taint($name);
+      }
+      push @criteria, $dbh->sql_in('flagtypes.name', \@names);
     }
-    if ($criteria->{target_type}) {
-        # The target type is stored in the database as a one-character string
-        # ("a" for attachment and "b" for bug), but this function takes complete
-        # names ("attachment" and "bug") for clarity, so we must convert them.
-        my $target_type = $criteria->{target_type} eq 'bug'? 'b' : 'a';
-        push(@criteria, "flagtypes.target_type = '$target_type'");
+    else {
+      my $name = $dbh->quote($criteria->{name});
+      trick_taint($name);    # Detaint data as we have quoted it.
+      push(@criteria, "flagtypes.name = $name");
     }
-    if (exists($criteria->{is_active})) {
-        my $is_active = $criteria->{is_active} ? "1" : "0";
-        push(@criteria, "flagtypes.is_active = $is_active");
-    }
-    if ($criteria->{product_id}) {
-        my $product_id = $criteria->{product_id};
-        detaint_natural($product_id)
-          || ThrowCodeError('bad_arg', { argument => 'product_id',
-                                         function => 'Bugzilla::FlagType::sqlify_criteria' });
-
-        # Add inclusions to the query, which simply involves joining the table
-        # by flag type ID and target product/component.
-        push(@$tables, "INNER JOIN flaginclusions AS i ON flagtypes.id = i.type_id");
-        push(@criteria, "(i.product_id = $product_id OR i.product_id IS NULL)");
-        
-        # Add exclusions to the query, which is more complicated.  First of all,
-        # we do a LEFT JOIN so we don't miss flag types with no exclusions.
-        # Then, as with inclusions, we join on flag type ID and target product/
-        # component.  However, since we want flag types that *aren't* on the
-        # exclusions list, we add a WHERE criteria to use only records with
-        # NULL exclusion type, i.e. without any exclusions.
-        my $join_clause = "flagtypes.id = e.type_id ";
-
-        my $addl_join_clause = "";
-        if ($criteria->{component_id}) {
-            my $component_id = $criteria->{component_id};
-            detaint_natural($component_id)
-              || ThrowCodeError('bad_arg', { argument => 'component_id',
-                                             function => 'Bugzilla::FlagType::sqlify_criteria' });
-
-            push(@criteria, "(i.component_id = $component_id OR i.component_id IS NULL)");
-            $join_clause .= "AND (e.component_id = $component_id OR e.component_id IS NULL) ";
-        }
-        else {
-            $addl_join_clause = "AND e.component_id IS NULL OR (i.component_id = e.component_id) ";
-        }
-        $join_clause .= "AND ((e.product_id = $product_id $addl_join_clause) OR e.product_id IS NULL)";
-
-        push(@$tables, "LEFT JOIN flagexclusions AS e ON ($join_clause)");
-        push(@criteria, "e.type_id IS NULL");
+  }
+  if ($criteria->{target_type}) {
+
+    # The target type is stored in the database as a one-character string
+    # ("a" for attachment and "b" for bug), but this function takes complete
+    # names ("attachment" and "bug") for clarity, so we must convert them.
+    my $target_type = $criteria->{target_type} eq 'bug' ? 'b' : 'a';
+    push(@criteria, "flagtypes.target_type = '$target_type'");
+  }
+  if (exists($criteria->{is_active})) {
+    my $is_active = $criteria->{is_active} ? "1" : "0";
+    push(@criteria, "flagtypes.is_active = $is_active");
+  }
+  if ($criteria->{product_id}) {
+    my $product_id = $criteria->{product_id};
+    detaint_natural($product_id)
+      || ThrowCodeError('bad_arg',
+      {argument => 'product_id', function => 'Bugzilla::FlagType::sqlify_criteria'});
+
+    # Add inclusions to the query, which simply involves joining the table
+    # by flag type ID and target product/component.
+    push(@$tables,  "INNER JOIN flaginclusions AS i ON flagtypes.id = i.type_id");
+    push(@criteria, "(i.product_id = $product_id OR i.product_id IS NULL)");
+
+    # Add exclusions to the query, which is more complicated.  First of all,
+    # we do a LEFT JOIN so we don't miss flag types with no exclusions.
+    # Then, as with inclusions, we join on flag type ID and target product/
+    # component.  However, since we want flag types that *aren't* on the
+    # exclusions list, we add a WHERE criteria to use only records with
+    # NULL exclusion type, i.e. without any exclusions.
+    my $join_clause = "flagtypes.id = e.type_id ";
+
+    my $addl_join_clause = "";
+    if ($criteria->{component_id}) {
+      my $component_id = $criteria->{component_id};
+      detaint_natural($component_id) || ThrowCodeError('bad_arg',
+        {argument => 'component_id', function => 'Bugzilla::FlagType::sqlify_criteria'}
+      );
+
+      push(@criteria, "(i.component_id = $component_id OR i.component_id IS NULL)");
+      $join_clause
+        .= "AND (e.component_id = $component_id OR e.component_id IS NULL) ";
     }
-    if ($criteria->{group}) {
-        my $gid = $criteria->{group};
-        detaint_natural($gid)
-          || ThrowCodeError('bad_arg', { argument => 'group',
-                                         function => 'Bugzilla::FlagType::sqlify_criteria' });
-
-        push(@criteria, "(flagtypes.grant_group_id = $gid " .
-                        " OR flagtypes.request_group_id = $gid)");
+    else {
+      $addl_join_clause
+        = "AND e.component_id IS NULL OR (i.component_id = e.component_id) ";
     }
-    
-    return @criteria;
+    $join_clause
+      .= "AND ((e.product_id = $product_id $addl_join_clause) OR e.product_id IS NULL)";
+
+    push(@$tables,  "LEFT JOIN flagexclusions AS e ON ($join_clause)");
+    push(@criteria, "e.type_id IS NULL");
+  }
+  if ($criteria->{group}) {
+    my $gid = $criteria->{group};
+    detaint_natural($gid)
+      || ThrowCodeError('bad_arg',
+      {argument => 'group', function => 'Bugzilla::FlagType::sqlify_criteria'});
+
+    push(@criteria,
+      "(flagtypes.grant_group_id = $gid " . " OR flagtypes.request_group_id = $gid)");
+  }
+
+  return @criteria;
 }
 
 1;
diff --git a/Bugzilla/Group.pm b/Bugzilla/Group.pm
index 07b78e3663..8e83293049 100644
--- a/Bugzilla/Group.pm
+++ b/Bugzilla/Group.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Group;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,13 +25,13 @@ use Bugzilla::Config qw(:admin);
 use constant IS_CONFIG => 1;
 
 use constant DB_COLUMNS => qw(
-    groups.id
-    groups.name
-    groups.description
-    groups.isbuggroup
-    groups.userregexp
-    groups.isactive
-    groups.icon_url
+  groups.id
+  groups.name
+  groups.description
+  groups.isbuggroup
+  groups.userregexp
+  groups.isactive
+  groups.icon_url
 );
 
 use constant DB_TABLE => 'groups';
@@ -39,136 +39,136 @@ use constant DB_TABLE => 'groups';
 use constant LIST_ORDER => 'isbuggroup, name';
 
 use constant VALIDATORS => {
-    name        => \&_check_name,
-    description => \&_check_description,
-    userregexp  => \&_check_user_regexp,
-    isactive    => \&_check_is_active,
-    isbuggroup  => \&_check_is_bug_group,
-    icon_url    => \&_check_icon_url,
+  name        => \&_check_name,
+  description => \&_check_description,
+  userregexp  => \&_check_user_regexp,
+  isactive    => \&_check_is_active,
+  isbuggroup  => \&_check_is_bug_group,
+  icon_url    => \&_check_icon_url,
 };
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    description
-    userregexp
-    isactive
-    icon_url
+  name
+  description
+  userregexp
+  isactive
+  icon_url
 );
 
 # Parameters that are lists of groups.
 use constant GROUP_PARAMS => qw(
-    chartgroup comment_taggers_group debug_group insidergroup
-    querysharegroup timetrackinggroup
+  chartgroup comment_taggers_group debug_group insidergroup
+  querysharegroup timetrackinggroup
 );
 
 ###############################
 ####      Accessors      ######
 ###############################
 
-sub description  { return $_[0]->{'description'};  }
-sub is_bug_group { return $_[0]->{'isbuggroup'};   }
-sub user_regexp  { return $_[0]->{'userregexp'};   }
-sub is_active    { return $_[0]->{'isactive'};     }
-sub icon_url     { return $_[0]->{'icon_url'};     }
+sub description  { return $_[0]->{'description'}; }
+sub is_bug_group { return $_[0]->{'isbuggroup'}; }
+sub user_regexp  { return $_[0]->{'userregexp'}; }
+sub is_active    { return $_[0]->{'isactive'}; }
+sub icon_url     { return $_[0]->{'icon_url'}; }
 
 sub bugs {
-    my $self = shift;
-    return $self->{bugs} if exists $self->{bugs};
-    my $bug_ids = Bugzilla->dbh->selectcol_arrayref(
-        'SELECT bug_id FROM bug_group_map WHERE group_id = ?',
-        undef, $self->id);
-    require Bugzilla::Bug;
-    $self->{bugs} = Bugzilla::Bug->new_from_list($bug_ids);
-    return $self->{bugs};
+  my $self = shift;
+  return $self->{bugs} if exists $self->{bugs};
+  my $bug_ids
+    = Bugzilla->dbh->selectcol_arrayref(
+    'SELECT bug_id FROM bug_group_map WHERE group_id = ?',
+    undef, $self->id);
+  require Bugzilla::Bug;
+  $self->{bugs} = Bugzilla::Bug->new_from_list($bug_ids);
+  return $self->{bugs};
 }
 
 sub members_direct {
-    my ($self) = @_;
-    $self->{members_direct} ||= $self->_get_members(GRANT_DIRECT);
-    return $self->{members_direct};
+  my ($self) = @_;
+  $self->{members_direct} ||= $self->_get_members(GRANT_DIRECT);
+  return $self->{members_direct};
 }
 
 sub members_non_inherited {
-    my ($self) = @_;
-    $self->{members_non_inherited} ||= $self->_get_members();
-    return $self->{members_non_inherited};
+  my ($self) = @_;
+  $self->{members_non_inherited} ||= $self->_get_members();
+  return $self->{members_non_inherited};
 }
 
 # A helper for members_direct and members_non_inherited
 sub _get_members {
-    my ($self, $grant_type) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $grant_clause = defined($grant_type) ? "AND grant_type = $grant_type"
-                                            : "";
-    my $user_ids = $dbh->selectcol_arrayref(
-        "SELECT DISTINCT user_id
+  my ($self, $grant_type) = @_;
+  my $dbh          = Bugzilla->dbh;
+  my $grant_clause = defined($grant_type) ? "AND grant_type = $grant_type" : "";
+  my $user_ids     = $dbh->selectcol_arrayref(
+    "SELECT DISTINCT user_id
            FROM user_group_map
-          WHERE isbless = 0 $grant_clause AND group_id = ?", undef, $self->id);
-    require Bugzilla::User;
-    return Bugzilla::User->new_from_list($user_ids);
+          WHERE isbless = 0 $grant_clause AND group_id = ?", undef, $self->id
+  );
+  require Bugzilla::User;
+  return Bugzilla::User->new_from_list($user_ids);
 }
 
 sub flag_types {
-    my $self = shift;
-    require Bugzilla::FlagType;
-    $self->{flag_types} ||= Bugzilla::FlagType::match({ group => $self->id });
-    return $self->{flag_types};
+  my $self = shift;
+  require Bugzilla::FlagType;
+  $self->{flag_types} ||= Bugzilla::FlagType::match({group => $self->id});
+  return $self->{flag_types};
 }
 
 sub grant_direct {
-    my ($self, $type) = @_;
-    $self->{grant_direct} ||= {};
-    return $self->{grant_direct}->{$type} 
-        if defined $self->{grant_direct}->{$type};
-    my $dbh = Bugzilla->dbh;
-
-    my $ids = $dbh->selectcol_arrayref(
-      "SELECT member_id FROM group_group_map
-        WHERE grantor_id = ? AND grant_type = $type", 
-      undef, $self->id) || [];
-
-    $self->{grant_direct}->{$type} = $self->new_from_list($ids);
-    return $self->{grant_direct}->{$type};
+  my ($self, $type) = @_;
+  $self->{grant_direct} ||= {};
+  return $self->{grant_direct}->{$type} if defined $self->{grant_direct}->{$type};
+  my $dbh = Bugzilla->dbh;
+
+  my $ids = $dbh->selectcol_arrayref(
+    "SELECT member_id FROM group_group_map
+        WHERE grantor_id = ? AND grant_type = $type", undef, $self->id
+  ) || [];
+
+  $self->{grant_direct}->{$type} = $self->new_from_list($ids);
+  return $self->{grant_direct}->{$type};
 }
 
 sub granted_by_direct {
-    my ($self, $type) = @_;
-    $self->{granted_by_direct} ||= {};
-    return $self->{granted_by_direct}->{$type}
-         if defined $self->{granted_by_direct}->{$type};
-    my $dbh = Bugzilla->dbh;
-
-    my $ids = $dbh->selectcol_arrayref(
-      "SELECT grantor_id FROM group_group_map
-        WHERE member_id = ? AND grant_type = $type",
-      undef, $self->id) || [];
-
-    $self->{granted_by_direct}->{$type} = $self->new_from_list($ids);
-    return $self->{granted_by_direct}->{$type};
+  my ($self, $type) = @_;
+  $self->{granted_by_direct} ||= {};
+  return $self->{granted_by_direct}->{$type}
+    if defined $self->{granted_by_direct}->{$type};
+  my $dbh = Bugzilla->dbh;
+
+  my $ids = $dbh->selectcol_arrayref(
+    "SELECT grantor_id FROM group_group_map
+        WHERE member_id = ? AND grant_type = $type", undef, $self->id
+  ) || [];
+
+  $self->{granted_by_direct}->{$type} = $self->new_from_list($ids);
+  return $self->{granted_by_direct}->{$type};
 }
 
 sub products {
-    my $self = shift;
-    return $self->{products} if exists $self->{products};
-    my $product_data = Bugzilla->dbh->selectall_arrayref(
-        'SELECT product_id, entry, membercontrol, othercontrol,
+  my $self = shift;
+  return $self->{products} if exists $self->{products};
+  my $product_data = Bugzilla->dbh->selectall_arrayref(
+    'SELECT product_id, entry, membercontrol, othercontrol,
                 canedit, editcomponents, editbugs, canconfirm
-          FROM  group_control_map WHERE group_id = ?', {Slice=>{}},
-        $self->id);
-    my @ids = map { $_->{product_id} } @$product_data;
-    require Bugzilla::Product;
-    my $products = Bugzilla::Product->new_from_list(\@ids); 
-    my %data_map = map { $_->{product_id} => $_ } @$product_data;
-    my @retval;
-    foreach my $product (@$products) {
-        # Data doesn't need to contain product_id--we already have
-        # the product object.
-        delete $data_map{$product->id}->{product_id};
-        push(@retval, { controls => $data_map{$product->id},
-                        product  => $product });
-    }
-    $self->{products} = \@retval;
-    return $self->{products};
+          FROM  group_control_map WHERE group_id = ?', {Slice => {}}, $self->id
+  );
+  my @ids = map { $_->{product_id} } @$product_data;
+  require Bugzilla::Product;
+  my $products = Bugzilla::Product->new_from_list(\@ids);
+  my %data_map = map { $_->{product_id} => $_ } @$product_data;
+  my @retval;
+  foreach my $product (@$products) {
+
+    # Data doesn't need to contain product_id--we already have
+    # the product object.
+    delete $data_map{$product->id}->{product_id};
+    push(@retval, {controls => $data_map{$product->id}, product => $product});
+  }
+  $self->{products} = \@retval;
+  return $self->{products};
 }
 
 ###############################
@@ -176,126 +176,127 @@ sub products {
 ###############################
 
 sub check_members_are_visible {
-    my $self = shift;
-    my $user = Bugzilla->user;
-    return if !Bugzilla->params->{'usevisibilitygroups'};
-
-    my $group_id = $self->id;
-    my $is_visible = grep { $_ == $group_id } @{ $user->visible_groups_inherited };
-    if (!$is_visible) {
-        ThrowUserError('group_not_visible', { group => $self });
-    }
+  my $self = shift;
+  my $user = Bugzilla->user;
+  return if !Bugzilla->params->{'usevisibilitygroups'};
+
+  my $group_id = $self->id;
+  my $is_visible = grep { $_ == $group_id } @{$user->visible_groups_inherited};
+  if (!$is_visible) {
+    ThrowUserError('group_not_visible', {group => $self});
+  }
 }
 
 sub set_description { $_[0]->set('description', $_[1]); }
-sub set_is_active   { $_[0]->set('isactive', $_[1]);    }
-sub set_name        { $_[0]->set('name', $_[1]);        }
-sub set_user_regexp { $_[0]->set('userregexp', $_[1]);  }
-sub set_icon_url    { $_[0]->set('icon_url', $_[1]);    }
+sub set_is_active   { $_[0]->set('isactive',    $_[1]); }
+sub set_name        { $_[0]->set('name',        $_[1]); }
+sub set_user_regexp { $_[0]->set('userregexp',  $_[1]); }
+sub set_icon_url    { $_[0]->set('icon_url',    $_[1]); }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    my $changes = $self->SUPER::update(@_);
-
-    if (exists $changes->{name}) {
-        my ($old_name, $new_name) = @{$changes->{name}};
-        my $update_params;
-        foreach my $group (GROUP_PARAMS) {
-            if ($old_name eq Bugzilla->params->{$group}) {
-                SetParam($group, $new_name);
-                $update_params = 1;
-            }
-        }
-        write_params() if $update_params;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  my $changes = $self->SUPER::update(@_);
+
+  if (exists $changes->{name}) {
+    my ($old_name, $new_name) = @{$changes->{name}};
+    my $update_params;
+    foreach my $group (GROUP_PARAMS) {
+      if ($old_name eq Bugzilla->params->{$group}) {
+        SetParam($group, $new_name);
+        $update_params = 1;
+      }
     }
+    write_params() if $update_params;
+  }
 
-    # If we've changed this group to be active, fix any Mandatory groups.
-    $self->_enforce_mandatory if (exists $changes->{isactive} 
-                                  && $changes->{isactive}->[1]);
+  # If we've changed this group to be active, fix any Mandatory groups.
+  $self->_enforce_mandatory
+    if (exists $changes->{isactive} && $changes->{isactive}->[1]);
 
-    $self->_rederive_regexp() if exists $changes->{userregexp};
+  $self->_rederive_regexp() if exists $changes->{userregexp};
 
-    Bugzilla::Hook::process('group_end_of_update', 
-                            { group => $self, changes => $changes });
-    $dbh->bz_commit_transaction();
-    Bugzilla->memcached->clear_config();
-    return $changes;
+  Bugzilla::Hook::process('group_end_of_update',
+    {group => $self, changes => $changes});
+  $dbh->bz_commit_transaction();
+  Bugzilla->memcached->clear_config();
+  return $changes;
 }
 
 sub check_remove {
-    my ($self, $params) = @_;
-
-    # System groups cannot be deleted!
-    if (!$self->is_bug_group) {
-        ThrowUserError("system_group_not_deletable", { name => $self->name });
+  my ($self, $params) = @_;
+
+  # System groups cannot be deleted!
+  if (!$self->is_bug_group) {
+    ThrowUserError("system_group_not_deletable", {name => $self->name});
+  }
+
+  # Groups having a special role cannot be deleted.
+  my @special_groups;
+  foreach my $special_group (GROUP_PARAMS) {
+    if ($self->name eq Bugzilla->params->{$special_group}) {
+      push(@special_groups, $special_group);
     }
+  }
+  if (scalar(@special_groups)) {
+    ThrowUserError('group_has_special_role',
+      {name => $self->name, groups => \@special_groups});
+  }
 
-    # Groups having a special role cannot be deleted.
-    my @special_groups;
-    foreach my $special_group (GROUP_PARAMS) {
-        if ($self->name eq Bugzilla->params->{$special_group}) {
-            push(@special_groups, $special_group);
-        }
-    }
-    if (scalar(@special_groups)) {
-        ThrowUserError('group_has_special_role',
-                       { name   => $self->name,
-                         groups => \@special_groups });
-    }
+  return if $params->{'test_only'};
 
-    return if $params->{'test_only'};
+  my $cantdelete = 0;
 
-    my $cantdelete = 0;
+  my $users = $self->members_non_inherited;
+  if (scalar(@$users) && !$params->{'remove_from_users'}) {
+    $cantdelete = 1;
+  }
 
-    my $users = $self->members_non_inherited;
-    if (scalar(@$users) && !$params->{'remove_from_users'}) {
-        $cantdelete = 1;
-    }
+  my $bugs = $self->bugs;
+  if (scalar(@$bugs) && !$params->{'remove_from_bugs'}) {
+    $cantdelete = 1;
+  }
 
-    my $bugs = $self->bugs;
-    if (scalar(@$bugs) && !$params->{'remove_from_bugs'}) {
-        $cantdelete = 1;
-    }
-    
-    my $products = $self->products;
-    if (scalar(@$products) && !$params->{'remove_from_products'}) {
-        $cantdelete = 1;
-    }
+  my $products = $self->products;
+  if (scalar(@$products) && !$params->{'remove_from_products'}) {
+    $cantdelete = 1;
+  }
 
-    my $flag_types = $self->flag_types;
-    if (scalar(@$flag_types) && !$params->{'remove_from_flags'}) {
-        $cantdelete = 1;
-    }
+  my $flag_types = $self->flag_types;
+  if (scalar(@$flag_types) && !$params->{'remove_from_flags'}) {
+    $cantdelete = 1;
+  }
 
-    ThrowUserError('group_cannot_delete', { group => $self }) if $cantdelete;
+  ThrowUserError('group_cannot_delete', {group => $self}) if $cantdelete;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    $self->check_remove(@_);
-    $dbh->bz_start_transaction();
-    Bugzilla::Hook::process('group_before_delete', { group => $self });
-    $dbh->do('DELETE FROM whine_schedules
-               WHERE mailto_type = ? AND mailto = ?',
-              undef, MAILTO_GROUP, $self->id);
-    # All the other tables will be handled by foreign keys when we
-    # drop the main "groups" row.
-    $self->SUPER::remove_from_db(@_);
-    $dbh->bz_commit_transaction();
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+  $self->check_remove(@_);
+  $dbh->bz_start_transaction();
+  Bugzilla::Hook::process('group_before_delete', {group => $self});
+  $dbh->do(
+    'DELETE FROM whine_schedules
+               WHERE mailto_type = ? AND mailto = ?', undef, MAILTO_GROUP, $self->id
+  );
+
+  # All the other tables will be handled by foreign keys when we
+  # drop the main "groups" row.
+  $self->SUPER::remove_from_db(@_);
+  $dbh->bz_commit_transaction();
 }
 
 # Add missing entries in bug_group_map for bugs created while
 # a mandatory group was disabled and which is now enabled again.
 sub _enforce_mandatory {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $gid = $self->id;
+  my ($self) = @_;
+  my $dbh    = Bugzilla->dbh;
+  my $gid    = $self->id;
 
-    my $bug_ids =
-      $dbh->selectcol_arrayref('SELECT bugs.bug_id
+  my $bug_ids = $dbh->selectcol_arrayref(
+    'SELECT bugs.bug_id
                                   FROM bugs
                             INNER JOIN group_control_map
                                     ON group_control_map.product_id = bugs.product_id
@@ -304,147 +305,171 @@ sub _enforce_mandatory {
                                    AND bug_group_map.group_id = group_control_map.group_id
                                  WHERE group_control_map.group_id = ?
                                    AND group_control_map.membercontrol = ?
-                                   AND bug_group_map.group_id IS NULL',
-                                 undef, ($gid, CONTROLMAPMANDATORY));
-
-    my $sth = $dbh->prepare('INSERT INTO bug_group_map (bug_id, group_id) VALUES (?, ?)');
-    foreach my $bug_id (@$bug_ids) {
-        $sth->execute($bug_id, $gid);
-    }
+                                   AND bug_group_map.group_id IS NULL', undef,
+    ($gid, CONTROLMAPMANDATORY)
+  );
+
+  my $sth
+    = $dbh->prepare('INSERT INTO bug_group_map (bug_id, group_id) VALUES (?, ?)');
+  foreach my $bug_id (@$bug_ids) {
+    $sth->execute($bug_id, $gid);
+  }
 }
 
 sub is_active_bug_group {
-    my $self = shift;
-    return $self->is_active && $self->is_bug_group;
+  my $self = shift;
+  return $self->is_active && $self->is_bug_group;
 }
 
 sub _rederive_regexp {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    my $dbh = Bugzilla->dbh;
-    my $sth = $dbh->prepare("SELECT userid, login_name, group_id
+  my $dbh = Bugzilla->dbh;
+  my $sth = $dbh->prepare(
+    "SELECT userid, email, group_id
                                FROM profiles
                           LEFT JOIN user_group_map
                                  ON user_group_map.user_id = profiles.userid
                                     AND group_id = ?
                                     AND grant_type = ?
-                                    AND isbless = 0");
-    my $sthadd = $dbh->prepare("INSERT INTO user_group_map
+                                    AND isbless = 0"
+  );
+  my $sthadd = $dbh->prepare(
+    "INSERT INTO user_group_map
                                  (user_id, group_id, grant_type, isbless)
-                                 VALUES (?, ?, ?, 0)");
-    my $sthdel = $dbh->prepare("DELETE FROM user_group_map
+                                 VALUES (?, ?, ?, 0)"
+  );
+  my $sthdel = $dbh->prepare(
+    "DELETE FROM user_group_map
                                  WHERE user_id = ? AND group_id = ?
-                                 AND grant_type = ? and isbless = 0");
-    $sth->execute($self->id, GRANT_REGEXP);
-    my $regexp = $self->user_regexp;
-    while (my ($uid, $login, $present) = $sth->fetchrow_array) {
-        if ($regexp ne '' and $login =~ /$regexp/i) {
-            $sthadd->execute($uid, $self->id, GRANT_REGEXP) unless $present;
-        } else {
-            $sthdel->execute($uid, $self->id, GRANT_REGEXP) if $present;
-        }
+                                 AND grant_type = ? and isbless = 0"
+  );
+  $sth->execute($self->id, GRANT_REGEXP);
+  my $regexp = $self->user_regexp;
+
+  while (my ($uid, $email, $present) = $sth->fetchrow_array) {
+    if ($regexp ne '' and $email =~ /$regexp/i) {
+      $sthadd->execute($uid, $self->id, GRANT_REGEXP) unless $present;
+    }
+    else {
+      $sthdel->execute($uid, $self->id, GRANT_REGEXP) if $present;
     }
+  }
 }
 
 sub flatten_group_membership {
-    my ($self, @groups) = @_;
-
-    my $dbh = Bugzilla->dbh;
-    my $sth;
-    my @groupidstocheck = @groups;
-    my %groupidschecked = ();
-    $sth = $dbh->prepare("SELECT member_id FROM group_group_map
+  my ($self, @groups) = @_;
+
+  my $dbh = Bugzilla->dbh;
+  my $sth;
+  my @groupidstocheck = @groups;
+  my %groupidschecked = ();
+  $sth = $dbh->prepare(
+    "SELECT member_id FROM group_group_map
                              WHERE grantor_id = ? 
-                               AND grant_type = " . GROUP_MEMBERSHIP);
-    while (my $node = shift @groupidstocheck) {
-        $sth->execute($node);
-        my $member;
-        while (($member) = $sth->fetchrow_array) {
-            if (!$groupidschecked{$member}) {
-                $groupidschecked{$member} = 1;
-                push @groupidstocheck, $member;
-                push @groups, $member unless grep $_ == $member, @groups;
-            }
-        }
+                               AND grant_type = " . GROUP_MEMBERSHIP
+  );
+  while (my $node = shift @groupidstocheck) {
+    $sth->execute($node);
+    my $member;
+    while (($member) = $sth->fetchrow_array) {
+      if (!$groupidschecked{$member}) {
+        $groupidschecked{$member} = 1;
+        push @groupidstocheck, $member;
+        push @groups, $member unless grep $_ == $member, @groups;
+      }
     }
-    return \@groups;
+  }
+  return \@groups;
 }
 
 
-
-
 ################################
 #####  Module Subroutines    ###
 ################################
 
 sub create {
-    my $class = shift;
-    my ($params) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my $silently = delete $params->{silently};
-    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE and !$silently) {
-        print get_text('install_group_create', { name => $params->{name} }),
-              "\n";
-    }
+  my $class    = shift;
+  my ($params) = @_;
+  my $dbh      = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  my $silently            = delete $params->{silently};
+  my $use_in_all_products = delete $params->{use_in_all_products};
+  if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE and !$silently) {
+    print get_text('install_group_create', {name => $params->{name}}), "\n";
+  }
 
-    my $group = $class->SUPER::create(@_);
+  $dbh->bz_start_transaction();
 
-    # Since we created a new group, give the "admin" group all privileges
-    # initially.
-    my $admin = new Bugzilla::Group({name => 'admin'});
-    # This function is also used to create the "admin" group itself,
-    # so there's a chance it won't exist yet.
-    if ($admin) {
-        my $sth = $dbh->prepare('INSERT INTO group_group_map
-                                 (member_id, grantor_id, grant_type)
-                                 VALUES (?, ?, ?)');
-        $sth->execute($admin->id, $group->id, GROUP_MEMBERSHIP);
-        $sth->execute($admin->id, $group->id, GROUP_BLESS);
-        $sth->execute($admin->id, $group->id, GROUP_VISIBLE);
-    }
+  my $group = $class->SUPER::create(@_);
 
-    $group->_rederive_regexp() if $group->user_regexp;
+  # Since we created a new group, give the "admin" group all privileges
+  # initially.
+  my $admin = new Bugzilla::Group({name => 'admin'});
 
-    Bugzilla::Hook::process('group_end_of_create', { group => $group });
-    $dbh->bz_commit_transaction();
-    return $group;
+  # This function is also used to create the "admin" group itself,
+  # so there's a chance it won't exist yet.
+  if ($admin) {
+    my $sth = $dbh->prepare(
+      'INSERT INTO group_group_map
+                                 (member_id, grantor_id, grant_type)
+                                 VALUES (?, ?, ?)'
+    );
+    $sth->execute($admin->id, $group->id, GROUP_MEMBERSHIP);
+    $sth->execute($admin->id, $group->id, GROUP_BLESS);
+    $sth->execute($admin->id, $group->id, GROUP_VISIBLE);
+  }
+
+  # Permit all existing products to use the new group if requested.
+  if ($use_in_all_products) {
+    $dbh->do(
+      'INSERT INTO group_control_map
+                  (group_id, product_id, membercontrol, othercontrol)
+                  SELECT ?, products.id, ?, ? FROM products', undef,
+      ($group->id, CONTROLMAPSHOWN, CONTROLMAPNA)
+    );
+  }
+
+  $group->_rederive_regexp() if $group->user_regexp;
+
+  Bugzilla::Hook::process('group_end_of_create', {group => $group});
+  $dbh->bz_commit_transaction();
+  return $group;
 }
 
 sub ValidateGroupName {
-    my ($name, @users) = (@_);
-    my $dbh = Bugzilla->dbh;
-    my $query = "SELECT id FROM groups " .
-                "WHERE name = ?";
-    if (Bugzilla->params->{'usevisibilitygroups'}) {
-        my @visible = (-1);
-        foreach my $user (@users) {
-            $user && push @visible, @{$user->visible_groups_direct};
-        }
-        my $visible = join(', ', @visible);
-        $query .= " AND id IN($visible)";
+  my ($name, @users) = (@_);
+  my $dbh   = Bugzilla->dbh;
+  my $query = "SELECT id FROM groups " . "WHERE name = ?";
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+    my @visible = (-1);
+    foreach my $user (@users) {
+      $user && push @visible, @{$user->visible_groups_direct};
     }
-    my $sth = $dbh->prepare($query);
-    $sth->execute($name);
-    my ($ret) = $sth->fetchrow_array();
-    return $ret;
+    my $visible = join(', ', @visible);
+    $query .= " AND id IN($visible)";
+  }
+  my $sth = $dbh->prepare($query);
+  $sth->execute($name);
+  my ($ret) = $sth->fetchrow_array();
+  return $ret;
 }
 
 sub check_no_disclose {
-    my ($class, $params) = @_;
-    my $action = delete $params->{action};
+  my ($class, $params) = @_;
+  my $action = delete $params->{action};
 
-    $action =~ /^(?:add|remove)$/
-      or ThrowCodeError('bad_arg', { argument => $action,
-                                     function => "${class}::check_no_disclose" });
+  $action =~ /^(?:add|remove)$/
+    or ThrowCodeError('bad_arg',
+    {argument => $action, function => "${class}::check_no_disclose"});
 
-    $params->{_error} = ($action eq 'add') ? 'group_restriction_not_allowed'
-                                           : 'group_invalid_removal';
+  $params->{_error}
+    = ($action eq 'add')
+    ? 'group_restriction_not_allowed'
+    : 'group_invalid_removal';
 
-    my $group = $class->check($params);
-    return $group;
+  my $group = $class->check($params);
+  return $group;
 }
 
 ###############################
@@ -452,34 +477,42 @@ sub check_no_disclose {
 ###############################
 
 sub _check_name {
-    my ($invocant, $name) = @_;
-    $name = trim($name);
-    $name || ThrowUserError("empty_group_name");
-    # If we're creating a Group or changing the name...
-    if (!ref($invocant) || lc($invocant->name) ne lc($name)) {
-        my $exists = new Bugzilla::Group({name => $name });
-        ThrowUserError("group_exists", { name => $name }) if $exists;
-    }
-    return $name;
+  my ($invocant, $name) = @_;
+  $name = trim($name);
+  $name || ThrowUserError("empty_group_name");
+
+  # If we're creating a Group or changing the name...
+  if (!ref($invocant) || lc($invocant->name) ne lc($name)) {
+    my $exists = new Bugzilla::Group({name => $name});
+    ThrowUserError("group_exists", {name => $name}) if $exists;
+  }
+  return $name;
 }
 
 sub _check_description {
-    my ($invocant, $desc) = @_;
-    $desc = trim($desc);
-    $desc || ThrowUserError("empty_group_description");
-    return $desc;
+  my ($invocant, $desc) = @_;
+  $desc = trim($desc);
+  $desc || ThrowUserError("empty_group_description");
+  return $desc;
 }
 
 sub _check_user_regexp {
-    my ($invocant, $regex) = @_;
-    $regex = trim($regex) || '';
-    ThrowUserError("invalid_regexp") unless (eval {qr/$regex/});
-    return $regex;
+  my ($invocant, $regex) = @_;
+  $regex = trim($regex) || '';
+
+  my $max_length = Bugzilla->dbh->bz_column_length('groups', 'userregexp');
+  ThrowUserError("group_regexp_too_long",
+    {text => $regex, max_length => $max_length})
+    if length($regex) > $max_length;
+
+  ThrowUserError("invalid_regexp") unless (eval {qr/$regex/});
+  return $regex;
 }
 
 sub _check_is_active { return $_[1] ? 1 : 0; }
+
 sub _check_is_bug_group {
-    return $_[1] ? 1 : 0;
+  return $_[1] ? 1 : 0;
 }
 
 sub _check_icon_url { return $_[1] ? clean_text($_[1]) : undef; }
@@ -524,8 +557,11 @@ provides, in addition to any methods documented below.
 
 Note that in addition to what L<Bugzilla::Object/create($params)>
 normally does, this function also makes the new group be inherited
-by the C<admin> group. That is, the C<admin> group will automatically
-be a member of this group.
+by the C<admin> group and optionally inserts access controls for
+this group into all existing products. That is, the C<admin> group
+will automatically be a member of this group and bugs for all
+products may optionally be restricted to this group by group
+members.
 
 =item C<ValidateGroupName($name, @users)>
 
diff --git a/Bugzilla/Hook.pm b/Bugzilla/Hook.pm
index 2904acba14..047ea42599 100644
--- a/Bugzilla/Hook.pm
+++ b/Bugzilla/Hook.pm
@@ -7,38 +7,38 @@
 
 package Bugzilla::Hook;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 sub process {
-    my ($name, $args) = @_;
+  my ($name, $args) = @_;
 
-    _entering($name);
+  _entering($name);
 
-    foreach my $extension (@{ Bugzilla->extensions }) {
-        if ($extension->can($name)) {
-            $extension->$name($args);
-        }
+  foreach my $extension (@{Bugzilla->extensions}) {
+    if ($extension->can($name)) {
+      $extension->$name($args);
     }
+  }
 
-    _leaving($name);
+  _leaving($name);
 }
 
 sub in {
-    my $hook_name = shift;
-    my $currently_in = Bugzilla->request_cache->{hook_stack}->[-1] || '';
-    return $hook_name eq $currently_in ? 1 : 0;
+  my $hook_name = shift;
+  my $currently_in = Bugzilla->request_cache->{hook_stack}->[-1] || '';
+  return $hook_name eq $currently_in ? 1 : 0;
 }
 
 sub _entering {
-    my ($hook_name) = @_;
-    my $hook_stack = Bugzilla->request_cache->{hook_stack} ||= [];
-    push(@$hook_stack, $hook_name);
+  my ($hook_name) = @_;
+  my $hook_stack = Bugzilla->request_cache->{hook_stack} ||= [];
+  push(@$hook_stack, $hook_name);
 }
 
 sub _leaving {
-    pop @{ Bugzilla->request_cache->{hook_stack} };
+  pop @{Bugzilla->request_cache->{hook_stack}};
 }
 
 1;
@@ -57,11 +57,11 @@ Bugzilla::Hook - Extendable extension hooks for Bugzilla code
 
 =head1 DESCRIPTION
 
-Bugzilla allows extension modules to drop in and add routines at 
+Bugzilla allows extension modules to drop in and add routines at
 arbitrary points in Bugzilla code. These points are referred to as
 hooks. When a piece of standard Bugzilla code wants to allow an extension
 to perform additional functions, it uses Bugzilla::Hook's L</process>
-subroutine to invoke any extension code if installed. 
+subroutine to invoke any extension code if installed.
 
 The implementation of extensions is described in L<Bugzilla::Extension>.
 
@@ -98,7 +98,7 @@ mechanism.
 
 =item C<$name> - The name of the hook to invoke.
 
-=item C<$args> - A hashref. The named args to pass to the hook. 
+=item C<$args> - A hashref. The named args to pass to the hook.
 They will be passed as arguments to the hook method in the extension.
 
 =back
@@ -170,13 +170,13 @@ Params:
 =item C<modules>
 
 This is a hash--a mapping from login-type "names" to the actual module on
-disk. The keys will be all the values that were passed to 
+disk. The keys will be all the values that were passed to
 L<Bugzilla::Auth/login> for the C<Login> parameter. The values are the
 actual path to the module on disk. (For example, if the key is C<DB>, the
 value is F<Bugzilla/Auth/Login/DB.pm>.)
 
-For your extension, the path will start with 
-F<Bugzilla/Extension/Foo/>, where "Foo" is the name of your Extension. 
+For your extension, the path will start with
+F<Bugzilla/Extension/Foo/>, where "Foo" is the name of your Extension.
 (See the code in the example extension.)
 
 If your login type is in the hash as a key, you should set that key to the
@@ -253,7 +253,7 @@ Params:
 
 =over
 
-=item C<bug> 
+=item C<bug>
 
 The changed bug object, with all fields set to their updated values.
 
@@ -262,12 +262,12 @@ The changed bug object, with all fields set to their updated values.
 A bug object pulled from the database before the fields were set to
 their updated values (so it has the old values available for each field).
 
-=item C<timestamp> 
+=item C<timestamp>
 
 The timestamp used for all updates in this transaction, as a SQL date
 string.
 
-=item C<changes> 
+=item C<changes>
 
 The hash of changed fields. C<< $changes->{field} = [old, new] >>
 
@@ -276,9 +276,9 @@ The hash of changed fields. C<< $changes->{field} = [old, new] >>
 =head2 bug_check_can_change_field
 
 This hook controls what fields users are allowed to change. You can add code
-here for site-specific policy changes and other customizations. 
+here for site-specific policy changes and other customizations.
 
-This hook is only executed if the field's new and old values differ. 
+This hook is only executed if the field's new and old values differ.
 
 Any denies take priority over any allows. So, if another extension denies
 a change but yours allows the change, the other extension's deny will
@@ -373,7 +373,7 @@ An arrayref of hashrefs.
 You should push a hashref containing two keys (C<match> and C<replace>)
 in to this array. C<match> is the regular expression that matches the
 text you want to replace, C<replace> is what you want to replace that
-text with. (This gets passed into a regular expression like 
+text with. (This gets passed into a regular expression like
 C<s/$match/$replace/>.)
 
 Instead of specifying a regular expression for C<replace> you can also
@@ -394,7 +394,7 @@ do so could open a security hole in Bugzilla.
 
 A B<reference> to the exact text that you are parsing.
 
-Generally you should not modify this yourself. Instead you should be 
+Generally you should not modify this yourself. Instead you should be
 returning regular expressions using the C<regexes> array.
 
 The text has not been parsed in any way. (So, for example, it is not
@@ -435,7 +435,7 @@ Params:
 
 =over
 
-=item C<bug> 
+=item C<bug>
 
 The changed bug object, with all fields set to their updated values.
 
@@ -444,12 +444,12 @@ The changed bug object, with all fields set to their updated values.
 A bug object pulled from the database before the fields were set to
 their updated values (so it has the old values available for each field).
 
-=item C<timestamp> 
+=item C<timestamp>
 
 The timestamp used for all updates in this transaction, as a SQL date
 string.
 
-=item C<changes> 
+=item C<changes>
 
 The hash of changed fields. C<< $changes->{field} = [old, new] >>
 
@@ -509,7 +509,7 @@ Params:
 =over
 
 =item C<column_joins> - A hashref containing data to return back to
-L<Bugzilla::Search>. This hashref contains names of the columns as keys and 
+L<Bugzilla::Search>. This hashref contains names of the columns as keys and
 a hashref about table to join as values. This hashref has the following keys:
 
 =over
@@ -533,11 +533,38 @@ table should be joined with the C<bugs> table. If omitted, LEFT is used.
 
 =back
 
+=head2 buglist_format
+
+This happens in F<buglist.cgi>, used to change the template variables before
+processing the associated template hook.
+
+Params:
+
+=over
+
+=item C<vars>
+
+This is the entire set of variables that the current template
+can see.
+
+=item C<file>
+
+The name of the template file being processed. This is
+relative to the main template directory for the language (i.e. for
+F<template/en/default/list/list.html.tmpl>, this variable will contain
+C<list/list.html.tmpl>).
+
+=item C<params>
+
+A hashref. The set of named parameters extracted from cgi.
+
+=back
+
 =head2 search_operator_field_override
 
 This allows you to modify L<Bugzilla::Search/OPERATOR_FIELD_OVERRIDE>,
 which determines the search functions for fields. It allows you to specify
-custom search functionality for certain fields. 
+custom search functionality for certain fields.
 
 See L<Bugzilla::Search/OPERATOR_FIELD_OVERRIDE> for reference and see
 the code in the example extension.
@@ -599,18 +626,18 @@ instead of as a string.)
 
 This is a hash of L<Bugzilla::User> objects, keyed by id. This is so you can
 find out more information about any of the user ids in the C<recipients> hash.
-Every id in the incoming C<recipients> hash will have an object in here. 
-(But if you add additional recipients to the C<recipients> hash, you are 
+Every id in the incoming C<recipients> hash will have an object in here.
+(But if you add additional recipients to the C<recipients> hash, you are
 B<not> required to add them to this hash.)
 
 =item C<diffs>
 
-This is a list of hashes, each hash representing a change to the bug. Each 
-hash has the following members: C<field_name>, C<bug_when>, C<old>, C<new> 
-and C<who> (a L<Bugzilla::User>). If appropriate, there will also be 
-C<attach_id> or C<comment_id>; if either is present, there will be 
-C<isprivate>. See C<_get_diffs> in F<Bugzilla/BugMail.pm> to see exactly how 
-it is populated. Warning: the format and existence of the "diffs" parameter 
+This is a list of hashes, each hash representing a change to the bug. Each
+hash has the following members: C<field_name>, C<bug_when>, C<old>, C<new>
+and C<who> (a L<Bugzilla::User>). If appropriate, there will also be
+C<attach_id> or C<comment_id>; if either is present, there will be
+C<isprivate>. See C<_get_diffs> in F<Bugzilla/BugMail.pm> to see exactly how
+it is populated. Warning: the format and existence of the "diffs" parameter
 is subject to change in future releases of Bugzilla.
 
 =back
@@ -684,7 +711,7 @@ A hashref, where the keys are the "name" of the panel and the value
 is the Perl module representing that panel. For example, if
 the name is C<Auth>, the value would be C<Bugzilla::Config::Auth>.
 
-For your extension, the Perl module would start with 
+For your extension, the Perl module would start with
 C<Bugzilla::Extension::Foo>, where "Foo" is the name of your Extension.
 (See the code in the example extension.)
 
@@ -703,7 +730,7 @@ Params:
 
 =item C<panels>
 
-A hashref, where the keys are lower-case panel "names" (like C<auth>, 
+A hashref, where the keys are lower-case panel "names" (like C<auth>,
 C<admin>, etc.) and the values are hashrefs. The hashref contains a
 single key, C<params>. C<params> is an arrayref--the return value from
 C<get_param_list> for that module. You can modify C<params> and
@@ -838,7 +865,7 @@ Params:
 
 =over
 
-=item C<group> 
+=item C<group>
 
 The new L<Bugzilla::Group> object that was just created.
 
@@ -846,24 +873,24 @@ The new L<Bugzilla::Group> object that was just created.
 
 =head2 group_end_of_update
 
-This happens at the end of L<Bugzilla::Group/update>, after all other 
+This happens at the end of L<Bugzilla::Group/update>, after all other
 changes are made to the database. This occurs inside a database transaction.
 
 Params:
 
 =over
 
-=item C<group> - The changed L<Bugzilla::Group> object, with all fields set 
+=item C<group> - The changed L<Bugzilla::Group> object, with all fields set
 to their updated values.
 
-=item C<changes> - The hash of changed fields. 
+=item C<changes> - The hash of changed fields.
 C<< $changes->{$field} = [$old, $new] >>
 
 =back
 
 =head2 install_before_final_checks
 
-Allows execution of custom code before the final checks are done in 
+Allows execution of custom code before the final checks are done in
 checksetup.pl.
 
 Params:
@@ -884,7 +911,7 @@ time should be printed.
 Allows for additional files and directories to be added to the
 list of files and directories already managed by checksetup.pl.
 You will be able to also set permissions for the files and
-directories using this hook. You can also use this hook to create 
+directories using this hook. You can also use this hook to create
 appropriate .htaccess files for any directory to secure its contents.
 For examples see  L<FILESYSTEM> in L<Bugzilla::Install::Filesystem>.
 
@@ -919,7 +946,7 @@ key's value is the permissions to be set on the directory.
 
 =item C<recurse_dirs>
 
-Hash reference of directories that will have permissions set for each item inside 
+Hash reference of directories that will have permissions set for each item inside
 each of the directories, including the directory itself. Each directory key
 points to another hash reference containing the following settings.
 
@@ -953,7 +980,7 @@ empty file.
 =item C<htaccess>
 
 Hash reference containing htaccess files to be created. You can set the permissions
-for the htaccess as well as the contents of the file. Each file key points to another 
+for the htaccess as well as the contents of the file. Each file key points to another
 hash reference containing the following settings.
 
 Params:
@@ -988,7 +1015,7 @@ the L</install_update_db> hook.
 
 =head2 db_schema_abstract_schema
 
-This allows you to add tables to Bugzilla. Note that we recommend that you 
+This allows you to add tables to Bugzilla. Note that we recommend that you
 prefix the names of your tables with some word (preferably the name of
 your Extension), so that they don't conflict with any future Bugzilla tables.
 
@@ -999,7 +1026,7 @@ Params:
 
 =over
 
-=item C<schema> - A hashref, in the format of 
+=item C<schema> - A hashref, in the format of
 L<Bugzilla::DB::Schema/ABSTRACT_SCHEMA>. Add new hash keys to make new table
 definitions. F<checksetup.pl> will automatically add these tables to the
 database when run.
@@ -1008,18 +1035,18 @@ database when run.
 
 =head2 job_map
 
-Bugzilla has a system - L<Bugzilla::JobQueue> - for running jobs 
-asynchronously, if the administrator has set it up. This hook allows the 
-addition of mappings from job names to handler classes, so an extension can 
+Bugzilla has a system - L<Bugzilla::JobQueue> - for running jobs
+asynchronously, if the administrator has set it up. This hook allows the
+addition of mappings from job names to handler classes, so an extension can
 fire off jobs.
 
 Params:
 
 =over
 
-=item C<job_map> - The job map hash. Key: the name of the job, as should be 
-passed to Bugzilla->job_queue->insert(). Value: the name of the Perl module 
-which implements the task (an instance of L<TheSchwartz::Worker>). 
+=item C<job_map> - The job map hash. Key: the name of the job, as should be
+passed to Bugzilla->job_queue->insert(). Value: the name of the Perl module
+which implements the task (an instance of L<TheSchwartz::Worker>).
 
 =back
 
@@ -1045,7 +1072,7 @@ Params:
 
 =item C<class>
 
-The name of the class that C<create> was called on. You can check this 
+The name of the class that C<create> was called on. You can check this
 like C<< if ($class->isa('Some::Class')) >> in your code, to perform specific
 tasks before C<create> for only certain classes.
 
@@ -1056,6 +1083,34 @@ A hashref. The set of named parameters passed to C<create>.
 =back
 
 
+=head2 migrate_modules
+
+This hook allows you to add modules to Migrate to support additional systems 
+to be imported into Bugzilla
+
+Params:
+
+=over
+
+=item C<modules> - An hashref containing data to be returned to L<Bugzilla::Migrate>.
+This hashref contains the path and prefix for the modules to be used.
+
+=over
+
+=item C<path> - Path to where the modules are kept; on a typical extension this
+would be the lib folder of the extension.
+
+=item C<prefix> - Package prefix of the module to be loaded
+
+=back
+
+The definition is structured as:
+ $modules = { path => $path, prefix => $prefix };
+
+
+=back
+
+
 =head2 object_before_delete
 
 This happens in L<Bugzilla::Object/remove_from_db>, after we've confirmed
@@ -1094,7 +1149,7 @@ limit your changes to only certain subclasses of Bugzilla::Object.
 
 The name of the field being updated in the object.
 
-=item C<value> 
+=item C<value>
 
 The value being set on the object.
 
@@ -1118,17 +1173,17 @@ Params:
 
 =item C<class>
 
-The name of the class that this hook is being called on. You can check this 
+The name of the class that this hook is being called on. You can check this
 like C<< if ($class->isa('Some::Class')) >> in your code, to add new
 fields only for certain classes.
 
 =item C<columns>
 
 An arrayref. Add the string names of columns to this array to add new
-values to objects. 
+values to objects.
 
 For example, if you add an C<example> column to a particular table
-(using L</install_update_db>), and then push the string C<example> into 
+(using L</install_update_db>), and then push the string C<example> into
 this array for the object that uses that table, then you can access the
 information in that column via C<< $object->{example} >> on all objects
 of that type.
@@ -1149,7 +1204,7 @@ Params:
 
 =item C<class>
 
-The name of the class that C<create> was called on. You can check this 
+The name of the class that C<create> was called on. You can check this
 like C<< if ($class->isa('Some::Class')) >> in your code, to perform specific
 tasks for only certain classes.
 
@@ -1173,7 +1228,7 @@ Params:
 
 =item C<class>
 
-The name of the class that C<create> was called on. You can check this 
+The name of the class that C<create> was called on. You can check this
 like C<< if ($class->isa('Some::Class')) >> in your code, to perform specific
 tasks for only certain classes.
 
@@ -1300,7 +1355,7 @@ Params:
 
 =item C<class>
 
-The name of the class that C<VALIDATORS> was called on. You can check this 
+The name of the class that C<VALIDATORS> was called on. You can check this
 like C<< if ($class->isa('Some::Class')) >> in your code, to add
 validators only for certain classes.
 
@@ -1406,7 +1461,7 @@ changes will be rolled back, including the creation of the new product.
 (However, note that such rollbacks should not normally be used, as
 some databases that Bugzilla supports have very bad rollback performance.
 If you want to validate input and throw errors before the Product is created,
-use L</object_end_of_create_validators> instead, or add a validator 
+use L</object_end_of_create_validators> instead, or add a validator
 using L</object_validators>.)
 
 Params:
@@ -1417,17 +1472,56 @@ Params:
 
 =back
 
+=head2 query_default_list
+
+This happens in F<query.cgi>, used to include additional cgi params to be
+searched for in order to create the set of default values.
+
+Params:
+
+=over
+
+=item C<list>
+
+The current list of cgi params to search for.
+
+=back
+
+=head2 query_format
+
+This happens in F<query.cgi>, used to to add/modify $vars before
+processing the template.  For example, one could supply or modify the
+default values for a custom query format.
+
+Params:
+
+=over
+
+=item C<vars>
+
+This is the entire set of variables that the current template
+can see.
+
+=item C<file>
+
+The name of the template file being processed. This is
+relative to the main template directory for the language (i.e. for
+F<template/en/default/list/list.html.tmpl>, this variable will contain
+C<list/list.html.tmpl>).
+
+=back
+
 =head2 quicksearch_map
 
-This hook allows you to alter the Quicksearch syntax to include e.g. special 
+This hook allows you to alter the Quicksearch syntax to include e.g. special
 searches for custom fields you have.
 
 Params:
 
 =over
 
-=item C<map> - a hash where the key is the name you want to use in 
-Quicksearch, and the value is the name from the C<fielddefs> table that you 
+=item C<map> - a hash where the key is the name you want to use in
+Quicksearch, and the value is the name from the C<fielddefs> table that you
 want it to map to. You can modify existing mappings or add new ones.
 
 =back
@@ -1491,7 +1585,7 @@ the template being processed, or to modify the variables that are currently
 in the template. It works exactly as though you inserted code to modify
 template variables at the top of a template.
 
-You probably want to restrict this hook to operating only if a certain 
+You probably want to restrict this hook to operating only if a certain
 file is being processed (which is why you get a C<file> argument
 below). Otherwise, modifying the C<vars> argument will affect every single
 template in Bugzilla.
@@ -1526,6 +1620,28 @@ name), you can get it from here.
 
 =back
 
+=head2 user_check_account_creation
+
+This hook permits you to do extra checks before the creation of a new user
+account. This hook is called after email address validation has been done.
+Note that this hook can also access the IP address of the requester thanks
+to the C<remote_ip()> subroutine exported by C<Bugzilla::Util>.
+
+Params:
+
+=over
+
+=item C<email>
+
+The email address of the new account.
+
+=item C<login>
+
+The login of the new account. This will be the same as the email address if
+the "use_email_as_login" parameter is set, otherwise it may be different.
+
+=back
+
 =head2 user_preferences
 
 This hook allows you to add additional panels to the User Preferences page,
@@ -1581,7 +1697,7 @@ Params:
 =item C<dispatch>
 
 A hashref where you can specify the names of your modules and which Perl
-module handles the functions for that module. (This is actually sent to 
+module handles the functions for that module. (This is actually sent to
 L<SOAP::Lite/dispatch_with>. You can see how that's used in F<xmlrpc.cgi>.)
 
 The Perl module name will most likely start with C<Bugzilla::Extension::Foo::>
@@ -1641,7 +1757,7 @@ they have been obtained from the URL or body of the request.
 =head2 webservice_rest_request
 
 This hook allows for altering any of the parameters provided by the client
-after authentication has occured. You are able to change things like renaming
+after authentication has occurred. You are able to change things like renaming
 of keys, removing values, or adding additional information.
 
 Params:
@@ -1704,6 +1820,26 @@ The current JSONRPC, XMLRPC, or REST object.
 
 =back
 
+=head2 webservice_status_code_map
+
+This hook allows an extension to change the status codes returned by
+specific webservice errors. The valid internal error codes that Bugzilla
+generates, and the status codes they map to by default, are defined in the
+C<WS_ERROR_CODE> constant in C<Bugzilla::WebService::Constants>. When
+remapping an error, you may wish to use an existing status code constant.
+Such constants are also in C<Bugzilla::WebService::Constants> and start
+with C<STATUS_*> such as C<STATUS_BAD_REQUEST>.
+
+Params:
+
+=over
+
+=item C<status_code_map>
+
+A hash reference containing the current status code mapping.
+
+=back
+
 =head1 SEE ALSO
 
 L<Bugzilla::Extension>
diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index 5a2266e36f..3cb64067ef 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Install;
 
-# Functions in this this package can assume that the database 
+# Functions in this this package can assume that the database
 # has been set up, params are available, localconfig is
 # available, and any module can be used.
 #
@@ -15,7 +15,7 @@ package Bugzilla::Install;
 # make those assumptions, then it should go into one of the
 # packages under the Bugzilla::Install namespace.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -31,414 +31,450 @@ use Bugzilla::Util qw(get_text);
 use Bugzilla::Version;
 
 use constant STATUS_WORKFLOW => (
-    [undef, 'UNCONFIRMED'],
-    [undef, 'CONFIRMED'],
-    [undef, 'IN_PROGRESS'],
-    ['UNCONFIRMED', 'CONFIRMED'],
-    ['UNCONFIRMED', 'IN_PROGRESS'],
-    ['UNCONFIRMED', 'RESOLVED'],
-    ['CONFIRMED',   'IN_PROGRESS'],
-    ['CONFIRMED',   'RESOLVED'],
-    ['IN_PROGRESS', 'CONFIRMED'],
-    ['IN_PROGRESS', 'RESOLVED'],
-    ['RESOLVED',    'UNCONFIRMED'],
-    ['RESOLVED',    'CONFIRMED'],
-    ['RESOLVED',    'VERIFIED'],
-    ['VERIFIED',    'UNCONFIRMED'],
-    ['VERIFIED',    'CONFIRMED'],
+  [undef,         'UNCONFIRMED'],
+  [undef,         'CONFIRMED'],
+  [undef,         'IN_PROGRESS'],
+  ['UNCONFIRMED', 'CONFIRMED'],
+  ['UNCONFIRMED', 'IN_PROGRESS'],
+  ['UNCONFIRMED', 'RESOLVED'],
+  ['CONFIRMED',   'IN_PROGRESS'],
+  ['CONFIRMED',   'RESOLVED'],
+  ['IN_PROGRESS', 'CONFIRMED'],
+  ['IN_PROGRESS', 'RESOLVED'],
+  ['RESOLVED',    'UNCONFIRMED'],
+  ['RESOLVED',    'CONFIRMED'],
+  ['RESOLVED',    'VERIFIED'],
+  ['VERIFIED',    'UNCONFIRMED'],
+  ['VERIFIED',    'CONFIRMED'],
 );
 
 sub SETTINGS {
-    return {
+  return {
     # 2005-03-03 travis@sedsystems.ca -- Bug 41972
-    display_quips      => { options => ["on", "off"], default => "on" },
+    display_quips => {options => ["on", "off"], default => "on"},
+
     # 2005-03-10 travis@sedsystems.ca -- Bug 199048
-    comment_sort_order => { options => ["oldest_to_newest", "newest_to_oldest",
-                                        "newest_to_oldest_desc_first"],
-                            default => "oldest_to_newest" },
+    comment_sort_order => {
+      options =>
+        ["oldest_to_newest", "newest_to_oldest", "newest_to_oldest_desc_first"],
+      default => "oldest_to_newest"
+    },
+
     # 2005-05-12 bugzilla@glob.com.au -- Bug 63536
-    post_bug_submit_action => { options => ["next_bug", "same_bug", "nothing"],
-                                default => "next_bug" },
+    post_bug_submit_action =>
+      {options => ["next_bug", "same_bug", "nothing"], default => "next_bug"},
+
     # 2005-06-29 wurblzap@gmail.com -- Bug 257767
-    csv_colsepchar     => { options => [',',';'], default => ',' },
+    csv_colsepchar => {options => [',', ';'], default => ','},
+
     # 2005-10-26 wurblzap@gmail.com -- Bug 291459
-    zoom_textareas     => { options => ["on", "off"], default => "on" },
+    zoom_textareas => {options => ["on", "off"], default => "on"},
+
     # 2006-05-01 olav@bkor.dhs.org -- Bug 7710
-    state_addselfcc    => { options => ['always', 'never',  'cc_unless_role'],
-                            default => 'cc_unless_role' },
+    state_addselfcc => {
+      options => ['always', 'never', 'cc_unless_role'],
+      default => 'cc_unless_role'
+    },
+
     # 2006-08-04 wurblzap@gmail.com -- Bug 322693
-    skin               => { subclass => 'Skin', default => 'Dusk' },
+    skin => {subclass => 'Skin', default => 'Classic'},
+
     # 2006-12-10 LpSolit@gmail.com -- Bug 297186
-    lang               => { subclass => 'Lang',
-                            default => ${Bugzilla->languages}[0] },
+    lang => {subclass => 'Lang', default => ${Bugzilla->languages}[0]},
+
     # 2007-07-02 altlist@gmail.com -- Bug 225731
-    quote_replies      => { options => ['quoted_reply', 'simple_reply', 'off'],
-                            default => "quoted_reply" },
+    quote_replies => {
+      options => ['quoted_reply', 'simple_reply', 'off'],
+      default => "quoted_reply"
+    },
+
     # 2009-02-01 mozilla@matt.mchenryfamily.org -- Bug 398473
-    comment_box_position => { options => ['before_comments', 'after_comments'],
-                              default => 'before_comments' },
+    comment_box_position => {
+      options => ['before_comments', 'after_comments'],
+      default => 'before_comments'
+    },
+
     # 2008-08-27 LpSolit@gmail.com -- Bug 182238
-    timezone           => { subclass => 'Timezone', default => 'local' },
+    timezone => {subclass => 'Timezone', default => 'local'},
+
     # 2011-02-07 dkl@mozilla.com -- Bug 580490
-    quicksearch_fulltext => { options => ['on', 'off'], default => 'on' },
+    quicksearch_fulltext => {options => ['on', 'off'], default => 'on'},
+
     # 2011-06-21 glob@mozilla.com -- Bug 589128
-    email_format       => { options => ['html', 'text_only'],
-                            default => 'html' },
+    email_format => {options => ['html', 'text_only'], default => 'html'},
+
     # 2011-10-11 glob@mozilla.com -- Bug 301656
-    requestee_cc       => { options => ['on', 'off'], default => 'on' },
+    requestee_cc => {options => ['on', 'off'], default => 'on'},
+
     # 2012-04-30 glob@mozilla.com -- Bug 663747
-    bugmail_new_prefix => { options => ['on', 'off'], default => 'on' },
+    bugmail_new_prefix => {options => ['on', 'off'], default => 'on'},
+
     # 2013-07-26 joshi_sunil@in.com -- Bug 669535
-    possible_duplicates => { options => ['on', 'off'], default => 'on' },
+    possible_duplicates => {options => ['on', 'off'], default => 'on'},
+
     # 2014-05-24 koosha.khajeh@gmail.com -- Bug 1014164
-    use_markdown       => { options => ['on', 'off'], default => 'on' },
-    }
-};
+    use_markdown => {options => ['on', 'off'], default => 'on'},
+  };
+}
 
 use constant SYSTEM_GROUPS => (
-    {
-        name        => 'admin',
-        description => 'Administrators'
-    },
-    {
-        name        => 'tweakparams',
-        description => 'Can change Parameters'
-    },
-    {
-        name        => 'editusers',
-        description => 'Can edit or disable users'
-    },
-    {
-        name        => 'creategroups',
-        description => 'Can create and destroy groups'
-    },
-    {
-        name        => 'editclassifications',
-        description => 'Can create, destroy, and edit classifications'
-    },
-    {
-        name        => 'editcomponents',
-        description => 'Can create, destroy, and edit components'
-    },
-    {
-        name        => 'editkeywords',
-        description => 'Can create, destroy, and edit keywords'
-    },
-    {
-        name        => 'editbugs',
-        description => 'Can edit all bug fields',
-        userregexp  => '.*'
-    },
-    {
-        name        => 'canconfirm',
-        description => 'Can confirm a bug or mark it a duplicate'
-    },
-    {
-        name         => 'bz_canusewhineatothers',
-        description  => 'Can configure whine reports for other users',
-    },
-    {
-        name         => 'bz_canusewhines',
-        description  => 'User can configure whine reports for self',
-        # inherited_by means that users in the groups listed below are
-        # automatically members of bz_canusewhines.
-        inherited_by => ['editbugs', 'bz_canusewhineatothers'],
-    },
-    {
-        name        => 'bz_sudoers',
-        description => 'Can perform actions as other users',
-    },
-    {
-        name         => 'bz_sudo_protect',
-        description  => 'Can not be impersonated by other users',
-        inherited_by => ['bz_sudoers'],
-    },
-    {
-        name         => 'bz_quip_moderators',
-        description  => 'Can moderate quips',
-    },
+  {name => 'admin',        description => 'Administrators'},
+  {name => 'tweakparams',  description => 'Can change Parameters'},
+  {name => 'editusers',    description => 'Can edit or disable users'},
+  {name => 'creategroups', description => 'Can create and destroy groups'},
+  {
+    name        => 'editclassifications',
+    description => 'Can create, destroy, and edit classifications'
+  },
+  {
+    name        => 'editcomponents',
+    description => 'Can create, destroy, and edit components'
+  },
+  {
+    name        => 'editkeywords',
+    description => 'Can create, destroy, and edit keywords'
+  },
+  {
+    name        => 'editbugs',
+    description => 'Can edit all bug fields',
+    userregexp  => '.*'
+  },
+  {
+    name        => 'canconfirm',
+    description => 'Can confirm a bug or mark it a duplicate'
+  },
+  {
+    name        => 'bz_canusewhineatothers',
+    description => 'Can configure queries and schedules for periodic'
+      . ' reports to be run and sent via email to other users and groups',
+  },
+  {
+    name        => 'bz_canusewhines',
+    description => 'Can configure queries and schedules for periodic'
+      . ' reports to be run and sent via email to themselves',
+
+    # inherited_by means that users in the groups listed below are
+    # automatically members of bz_canusewhines.
+    inherited_by => ['editbugs', 'bz_canusewhineatothers'],
+  },
+  {name => 'bz_sudoers', description => 'Can perform actions as other users',},
+  {
+    name         => 'bz_sudo_protect',
+    description  => 'Can not be impersonated by other users',
+    inherited_by => ['bz_sudoers'],
+  },
+  {name => 'bz_quip_moderators', description => 'Can moderate quips',},
 );
 
-use constant DEFAULT_CLASSIFICATION => {
-    name        => 'Unclassified',
-    description => 'Not assigned to any classification'
-};
+use constant DEFAULT_CLASSIFICATION =>
+  {name => 'Unclassified', description => 'Not assigned to any classification'};
 
 use constant DEFAULT_PRODUCT => {
-    name => 'TestProduct',
-    description => 'This is a test product.'
-        . ' This ought to be blown away and replaced with real stuff in a'
-        . ' finished installation of bugzilla.',
-    version => Bugzilla::Version::DEFAULT_VERSION,
-    classification => 'Unclassified',
-    defaultmilestone => DEFAULT_MILESTONE,
+  name        => 'TestProduct',
+  description => 'This is a test product.'
+    . ' This ought to be blown away and replaced with real stuff in a'
+    . ' finished installation of bugzilla.',
+  version          => Bugzilla::Version::DEFAULT_VERSION,
+  classification   => 'Unclassified',
+  defaultmilestone => DEFAULT_MILESTONE,
 };
 
 use constant DEFAULT_COMPONENT => {
-    name => 'TestComponent',
-    description => 'This is a test component in the test product database.'
-        . ' This ought to be blown away and replaced with real stuff in'
-        . ' a finished installation of Bugzilla.'
+  name        => 'TestComponent',
+  description => 'This is a test component in the test product database.'
+    . ' This ought to be blown away and replaced with real stuff in'
+    . ' a finished installation of Bugzilla.'
 };
 
 sub update_settings {
-    my $dbh = Bugzilla->dbh;
-    # If we're setting up settings for the first time, we want to be quieter.
-    my $any_settings = $dbh->selectrow_array(
-        'SELECT 1 FROM setting ' . $dbh->sql_limit(1));
-    if (!$any_settings) {
-        say get_text('install_setting_setup');
-    }
-
-    my %settings = %{SETTINGS()};
-    foreach my $setting (keys %settings) {
-        add_setting($setting,
-                    $settings{$setting}->{options}, 
-                    $settings{$setting}->{default},
-                    $settings{$setting}->{subclass}, undef,
-                    !$any_settings);
-    }
-
-    # Delete the obsolete 'per_bug_queries' user preference. Bug 616191.
-    $dbh->do('DELETE FROM setting WHERE name = ?', undef, 'per_bug_queries');
+  my $dbh = Bugzilla->dbh;
+
+  # If we're setting up settings for the first time, we want to be quieter.
+  my $any_settings
+    = $dbh->selectrow_array('SELECT 1 FROM setting ' . $dbh->sql_limit(1));
+  if (!$any_settings) {
+    say get_text('install_setting_setup');
+  }
+
+  my %settings = %{SETTINGS()};
+  foreach my $setting (keys %settings) {
+    add_setting(
+      $setting,
+      $settings{$setting}->{options},
+      $settings{$setting}->{default},
+      $settings{$setting}->{subclass},
+      undef, !$any_settings
+    );
+  }
+
+  # Delete the obsolete 'per_bug_queries' user preference. Bug 616191.
+  $dbh->do('DELETE FROM setting WHERE name = ?', undef, 'per_bug_queries');
 }
 
 sub update_system_groups {
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-
-    # If there is no editbugs group, this is the first time we're
-    # adding groups.
-    my $editbugs_exists = new Bugzilla::Group({ name => 'editbugs' });
-    if (!$editbugs_exists) {
-        say get_text('install_groups_setup');
-    }
-
-    # Create most of the system groups
-    foreach my $definition (SYSTEM_GROUPS) {
-        my $exists = new Bugzilla::Group({ name => $definition->{name} });
-        if (!$exists) {
-            $definition->{isbuggroup} = 0;
-            $definition->{silently} = !$editbugs_exists;
-            my $inherited_by = delete $definition->{inherited_by};
-            my $created = Bugzilla::Group->create($definition);
-            # Each group in inherited_by is automatically a member of this
-            # group.
-            if ($inherited_by) {
-                foreach my $name (@$inherited_by) {
-                    my $member = Bugzilla::Group->check($name);
-                    $dbh->do('INSERT INTO group_group_map (grantor_id, 
-                                          member_id) VALUES (?,?)',
-                             undef, $created->id, $member->id);
-                }
-            }
+  my $dbh = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+
+  # If there is no editbugs group, this is the first time we're
+  # adding groups.
+  my $editbugs_exists = new Bugzilla::Group({name => 'editbugs'});
+  if (!$editbugs_exists) {
+    say get_text('install_groups_setup');
+  }
+
+  # Create most of the system groups
+  foreach my $definition (SYSTEM_GROUPS) {
+    my $group = new Bugzilla::Group({name => $definition->{name}});
+    if (!$group) {
+      $definition->{isbuggroup} = 0;
+      $definition->{silently}   = !$editbugs_exists;
+      my $inherited_by = delete $definition->{inherited_by};
+      my $created      = Bugzilla::Group->create($definition);
+
+      # Each group in inherited_by is automatically a member of this
+      # group.
+      if ($inherited_by) {
+        foreach my $name (@$inherited_by) {
+          my $member = Bugzilla::Group->check($name);
+          $dbh->do(
+            'INSERT INTO group_group_map (grantor_id,
+                                          member_id) VALUES (?,?)', undef, $created->id,
+            $member->id
+          );
         }
+      }
     }
+    elsif ($group->description ne $definition->{description}) {
+      $group->set_description($definition->{description});
+      $group->update();
+    }
+  }
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 }
 
 sub create_default_classification {
-    my $dbh = Bugzilla->dbh;
-
-    # Make the default Classification if it doesn't already exist.
-    if (!$dbh->selectrow_array('SELECT 1 FROM classifications')) {
-        print get_text('install_default_classification',
-                       { name => DEFAULT_CLASSIFICATION->{name} }) . "\n";
-        Bugzilla::Classification->create(DEFAULT_CLASSIFICATION);
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # Make the default Classification if it doesn't already exist.
+  if (!$dbh->selectrow_array('SELECT 1 FROM classifications')) {
+    print get_text('install_default_classification',
+      {name => DEFAULT_CLASSIFICATION->{name}})
+      . "\n";
+    Bugzilla::Classification->create(DEFAULT_CLASSIFICATION);
+  }
 }
 
 # This function should be called only after creating the admin user.
 sub create_default_product {
-    my $dbh = Bugzilla->dbh;
-
-    # And same for the default product/component.
-    if (!$dbh->selectrow_array('SELECT 1 FROM products')) {
-        print get_text('install_default_product', 
-                       { name => DEFAULT_PRODUCT->{name} }) . "\n";
-
-        my $product = Bugzilla::Product->create(DEFAULT_PRODUCT);
-
-        # Get the user who will be the owner of the Component.
-        # We pick the admin with the lowest id, which is probably the
-        # admin checksetup.pl just created.
-        my $admin_group = new Bugzilla::Group({name => 'admin'});
-        my ($admin_id)  = $dbh->selectrow_array(
-            'SELECT user_id FROM user_group_map WHERE group_id = ?
-           ORDER BY user_id ' . $dbh->sql_limit(1),
-            undef, $admin_group->id);
-        my $admin = Bugzilla::User->new($admin_id);
-
-        Bugzilla::Component->create({
-            %{ DEFAULT_COMPONENT() }, product => $product,
-            initialowner => $admin->login });
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # And same for the default product/component.
+  if (!$dbh->selectrow_array('SELECT 1 FROM products')) {
+    print get_text('install_default_product', {name => DEFAULT_PRODUCT->{name}})
+      . "\n";
+
+    my $product = Bugzilla::Product->create(DEFAULT_PRODUCT);
+
+    # Get the user who will be the owner of the Component.
+    # We pick the admin with the lowest id, which is probably the
+    # admin checksetup.pl just created.
+    my $admin_group = new Bugzilla::Group({name => 'admin'});
+    my ($admin_id) = $dbh->selectrow_array(
+      'SELECT user_id FROM user_group_map WHERE group_id = ?
+           ORDER BY user_id ' . $dbh->sql_limit(1), undef, $admin_group->id
+    );
+    my $admin = Bugzilla::User->new($admin_id);
+
+    Bugzilla::Component->create({
+      %{DEFAULT_COMPONENT()}, product => $product, initialowner => $admin->login
+    });
+  }
 
 }
 
 sub init_workflow {
-    my $dbh = Bugzilla->dbh;
-    my $has_workflow = $dbh->selectrow_array('SELECT 1 FROM status_workflow');
-    return if $has_workflow;
-
-    say get_text('install_workflow_init');
-
-    my %status_ids = @{ $dbh->selectcol_arrayref(
-        'SELECT value, id FROM bug_status', {Columns=>[1,2]}) };
-
-    foreach my $pair (STATUS_WORKFLOW) {
-        my $old_id = $pair->[0] ? $status_ids{$pair->[0]} : undef;
-        my $new_id = $status_ids{$pair->[1]};
-        $dbh->do('INSERT INTO status_workflow (old_status, new_status)
-                       VALUES (?,?)', undef, $old_id, $new_id);
-    }
+  my $dbh          = Bugzilla->dbh;
+  my $has_workflow = $dbh->selectrow_array('SELECT 1 FROM status_workflow');
+  return if $has_workflow;
+
+  say get_text('install_workflow_init');
+
+  my %status_ids = @{
+    $dbh->selectcol_arrayref('SELECT value, id FROM bug_status',
+      {Columns => [1, 2]})
+  };
+
+  foreach my $pair (STATUS_WORKFLOW) {
+    my $old_id = $pair->[0] ? $status_ids{$pair->[0]} : undef;
+    my $new_id = $status_ids{$pair->[1]};
+    $dbh->do(
+      'INSERT INTO status_workflow (old_status, new_status)
+                       VALUES (?,?)', undef, $old_id, $new_id
+    );
+  }
 }
 
 sub create_admin {
-    my ($params) = @_;
-    my $dbh      = Bugzilla->dbh;
-    my $template = Bugzilla->template;
-
-    my $admin_group = new Bugzilla::Group({ name => 'admin' });
-    my $admin_inheritors = 
-        Bugzilla::Group->flatten_group_membership($admin_group->id);
-    my $admin_group_ids = join(',', @$admin_inheritors);
-
-    my ($admin_count) = $dbh->selectrow_array(
-        "SELECT COUNT(*) FROM user_group_map 
-          WHERE group_id IN ($admin_group_ids)");
-
-    return if $admin_count;
-
-    my %answer    = %{Bugzilla->installation_answers};
-    my $login     = $answer{'ADMIN_EMAIL'};
-    my $password  = $answer{'ADMIN_PASSWORD'};
-    my $full_name = $answer{'ADMIN_REALNAME'};
-
-    if (!$login || !$password || !$full_name) {
-        say "\n" . get_text('install_admin_setup') . "\n";
-    }
-
-    while (!$login) {
-        print get_text('install_admin_get_email') . ' ';
-        $login = <STDIN>;
-        chomp $login;
-        eval { Bugzilla::User->check_login_name($login); };
-        if ($@) {
-            say $@;
-            undef $login;
-        }
-    }
-
-    while (!defined $full_name) {
-        print get_text('install_admin_get_name') . ' ';
-        $full_name = <STDIN>;
-        chomp($full_name);
-    }
-
-    if (!$password) {
-        $password = _prompt_for_password(
-            get_text('install_admin_get_password'));
-    }
-
-    my $admin = Bugzilla::User->create({ login_name    => $login, 
-                                         realname      => $full_name,
-                                         cryptpassword => $password });
-    make_admin($admin);
+  my ($params) = @_;
+  my $dbh      = Bugzilla->dbh;
+  my $template = Bugzilla->template;
+
+  # We must ensure $/ is set to \r\n on windows.
+  # CGI.pm unsets.
+  local $/ = ON_WINDOWS ? "\x0d\x0a" : "\x0a";
+
+  my $admin_group = new Bugzilla::Group({name => 'admin'});
+  my $admin_inheritors
+    = Bugzilla::Group->flatten_group_membership($admin_group->id);
+  my $admin_group_ids = join(',', @$admin_inheritors);
+
+  my ($admin_count) = $dbh->selectrow_array(
+    "SELECT COUNT(*) FROM user_group_map
+          WHERE group_id IN ($admin_group_ids)"
+  );
+
+  return if $admin_count;
+
+  my %answer    = %{Bugzilla->installation_answers};
+  my $login     = $answer{'ADMIN_LOGIN'};
+  my $email     = $answer{'ADMIN_EMAIL'};
+  my $password  = $answer{'ADMIN_PASSWORD'};
+  my $full_name = $answer{'ADMIN_REALNAME'};
+
+  if ( !($login || Bugzilla->params->{'use_email_as_login'})
+    || !$email
+    || !$password)
+  {
+    say "\n" . get_text('install_admin_setup') . "\n";
+  }
+  if (not $email) {
+    print get_text('install_admin_get_email') . ' ';
+    $email = <STDIN>;
+    chomp $email if defined $email;
+  }
+  Bugzilla::User->check_email($email);
+
+  # Make sure the email address is used as login when required.
+  if (Bugzilla->params->{'use_email_as_login'}) {
+    $login = $email;
+  }
+
+  if (not $login) {
+    print get_text('install_admin_get_login') . ' ';
+    $login = <STDIN>;
+    chomp $login if defined $login;
+  }
+  Bugzilla::User->check_login_name($login, undef, {email => $email});
+
+  if (not defined $full_name) {
+    print get_text('install_admin_get_name') . ' ';
+    $full_name = <STDIN>;
+    chomp $full_name if defined $full_name;
+  }
+
+  if (not $password) {
+    $password = _prompt_for_password(get_text('install_admin_get_password'));
+  }
+
+  my $admin = Bugzilla::User->create({
+    login_name    => $login,
+    email         => $email,
+    realname      => $full_name,
+    cryptpassword => $password
+  });
+  make_admin($admin);
 }
 
 sub make_admin {
-    my ($user) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    $user = ref($user) ? $user 
-            : new Bugzilla::User(login_to_id($user, THROW_ERROR));
-
-    my $group_insert = $dbh->prepare(
-        'INSERT INTO user_group_map (user_id, group_id, isbless, grant_type)
-              VALUES (?, ?, ?, ?)');
-
-    # Admins get explicit membership and bless capability for the admin group
-    my $admin_group = new Bugzilla::Group({ name => 'admin' });
-    # These are run in an eval so that we can ignore the error of somebody
-    # already being granted these things.
-    eval { 
-        $group_insert->execute($user->id, $admin_group->id, 0, GRANT_DIRECT); 
-    };
-    eval {
-        $group_insert->execute($user->id, $admin_group->id, 1, GRANT_DIRECT);
-    };
-
-    # Admins should also have editusers directly, even though they'll usually
-    # inherit it. People could have changed their inheritance structure.
-    my $editusers = new Bugzilla::Group({ name => 'editusers' });
-    eval { 
-        $group_insert->execute($user->id, $editusers->id, 0, GRANT_DIRECT); 
-    };
-
-    # If there is no maintainer set, make this user the maintainer.
-    if (!Bugzilla->params->{'maintainer'}) {
-        SetParam('maintainer', $user->email);
-        write_params();
-    }
-
-    # Make sure the new admin isn't disabled
-    if ($user->disabledtext) {
-        $user->set_disabledtext('');
-        $user->update();
-    }
+  my ($user) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  $user
+    = ref($user) ? $user : new Bugzilla::User(login_to_id($user, THROW_ERROR));
+
+  my $group_insert = $dbh->prepare(
+    'INSERT INTO user_group_map (user_id, group_id, isbless, grant_type)
+              VALUES (?, ?, ?, ?)'
+  );
+
+  # Admins get explicit membership and bless capability for the admin group
+  my $admin_group = new Bugzilla::Group({name => 'admin'});
+
+  # These are run in an eval so that we can ignore the error of somebody
+  # already being granted these things.
+  eval { $group_insert->execute($user->id, $admin_group->id, 0, GRANT_DIRECT); };
+  eval { $group_insert->execute($user->id, $admin_group->id, 1, GRANT_DIRECT); };
+
+  # Admins should also have editusers directly, even though they'll usually
+  # inherit it. People could have changed their inheritance structure.
+  my $editusers = new Bugzilla::Group({name => 'editusers'});
+  eval { $group_insert->execute($user->id, $editusers->id, 0, GRANT_DIRECT); };
+
+  # If there is no maintainer set, make this user the maintainer.
+  if (!Bugzilla->params->{'maintainer'}) {
+    SetParam('maintainer', $user->email);
+    write_params();
+  }
+
+  # Make sure the new admin isn't disabled
+  if ($user->disabledtext) {
+    $user->set_disabledtext('');
+    $user->update();
+  }
 
-    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-        say "\n", get_text('install_admin_created', { user => $user });
-    }
+  if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+    say "\n", get_text('install_admin_created', {user => $user});
+  }
 }
 
 sub _prompt_for_password {
-    my $prompt = shift;
-
-    my $password;
-    while (!$password) {
-        # trap a few interrupts so we can fix the echo if we get aborted.
-        local $SIG{HUP}  = \&_password_prompt_exit;
-        local $SIG{INT}  = \&_password_prompt_exit;
-        local $SIG{QUIT} = \&_password_prompt_exit;
-        local $SIG{TERM} = \&_password_prompt_exit;
-
-        system("stty","-echo") unless ON_WINDOWS;  # disable input echoing
-
-        print $prompt, ' ';
-        $password = <STDIN>;
-        chomp $password;
-        print "\n", get_text('install_confirm_password'), ' ';
-        my $pass2 = <STDIN>;
-        chomp $pass2;
-        eval { validate_password($password, $pass2); };
-        if ($@) {
-            say "\n$@";
-            undef $password;
-        }
-        system("stty","echo") unless ON_WINDOWS;
+  my $prompt = shift;
+
+  my $password;
+  while (!$password) {
+
+    # trap a few interrupts so we can fix the echo if we get aborted.
+    local $SIG{HUP}  = \&_password_prompt_exit;
+    local $SIG{INT}  = \&_password_prompt_exit;
+    local $SIG{QUIT} = \&_password_prompt_exit;
+    local $SIG{TERM} = \&_password_prompt_exit;
+
+    system("stty", "-echo") unless ON_WINDOWS;    # disable input echoing
+
+    print $prompt, ' ';
+    $password = <STDIN>;
+    chomp $password;
+    print "\n", get_text('install_confirm_password'), ' ';
+    my $pass2 = <STDIN>;
+    chomp $pass2;
+    eval { validate_password($password, $pass2); };
+    if ($@) {
+      say "\n$@";
+      undef $password;
     }
-    return $password;
+    system("stty", "echo") unless ON_WINDOWS;
+  }
+  return $password;
 }
 
 # This is just in case we get interrupted while getting a password.
 sub _password_prompt_exit {
-    # re-enable input echoing
-    system("stty","echo") unless ON_WINDOWS;
-    exit 1;
+
+  # re-enable input echoing
+  system("stty", "echo") unless ON_WINDOWS;
+  exit 1;
 }
 
 sub reset_password {
-    my $login = shift;
-    my $user = Bugzilla::User->check($login);
-    my $prompt = "\n" . get_text('install_reset_password', { user => $user });
-    my $password = _prompt_for_password($prompt);
-    $user->set_password($password);
-    $user->update();
-    say "\n", get_text('install_reset_password_done');
+  my $login    = shift;
+  my $user     = Bugzilla::User->check($login);
+  my $prompt   = "\n" . get_text('install_reset_password', {user => $user});
+  my $password = _prompt_for_password($prompt);
+  $user->set_password($password);
+  $user->update();
+  say "\n", get_text('install_reset_password_done');
 }
 
 1;
diff --git a/Bugzilla/Install/CPAN.pm b/Bugzilla/Install/CPAN.pm
deleted file mode 100644
index 19f1431908..0000000000
--- a/Bugzilla/Install/CPAN.pm
+++ /dev/null
@@ -1,339 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::Install::CPAN;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use parent qw(Exporter);
-our @EXPORT = qw(
-    BZ_LIB
-
-    check_cpan_requirements 
-    set_cpan_config
-    install_module 
-);
-
-use Bugzilla::Constants;
-use Bugzilla::Install::Requirements qw(have_vers);
-use Bugzilla::Install::Util qw(bin_loc install_string);
-
-use Config;
-use CPAN;
-use Cwd qw(abs_path);
-use File::Path qw(rmtree);
-
-# These are required for install-module.pl to be able to install
-# all modules properly.
-use constant REQUIREMENTS => (
-    {
-        module  => 'CPAN',
-        package => 'CPAN',
-        version => '1.81',
-    },
-    {
-        # When Module::Build isn't installed, the YAML module allows
-        # CPAN to read META.yml to determine that Module::Build first
-        # needs to be installed to compile a module.
-        module  => 'YAML',
-        package => 'YAML',
-        version => 0,
-    },
-    {
-        # Many modules on CPAN are now built with Dist::Zilla, which
-        # unfortunately means they require this version of EU::MM to install.
-        module  => 'ExtUtils::MakeMaker',
-        package => 'ExtUtils-MakeMaker',
-        version => '6.31',
-    },
-);
-
-# We need the absolute path of ext_libpath, because CPAN chdirs around
-# and so we can't use a relative directory.
-#
-# We need it often enough (and at compile time, in install-module.pl) so 
-# we make it a constant.
-use constant BZ_LIB => abs_path(bz_locations()->{ext_libpath});
-
-# CPAN requires nearly all of its parameters to be set, or it will start
-# asking questions to the user. We want to avoid that, so we have
-# defaults here for most of the required parameters we know about, in case
-# any of them aren't set. The rest are handled by set_cpan_defaults().
-use constant CPAN_DEFAULTS => {
-    auto_commit => 0,
-    # We always force builds, so there's no reason to cache them.
-    build_cache => 0,
-    build_requires_install_policy => 'yes',
-    cache_metadata => 1,
-    colorize_output => 1,
-    colorize_print => 'bold',
-    index_expire => 1,
-    scan_cache => 'atstart',
-
-    inhibit_startup_message => 1,
-
-    bzip2 => bin_loc('bzip2'),
-    curl => bin_loc('curl'),
-    gzip => bin_loc('gzip'),
-    links => bin_loc('links'),
-    lynx => bin_loc('lynx'),
-    make => bin_loc('make'),
-    pager => bin_loc('less'),
-    tar => bin_loc('tar'),
-    unzip => bin_loc('unzip'),
-    wget => bin_loc('wget'),
-
-    urllist => ['http://www.cpan.org/'],
-};
-
-sub check_cpan_requirements {
-    my ($original_dir, $original_args) = @_;
-
-    _require_compiler();
-
-    my @install;
-    foreach my $module (REQUIREMENTS) {
-        my $installed = have_vers($module, 1);
-        push(@install, $module) if !$installed;
-    }
-
-    return if !@install;
-
-    my $restart_required;
-    foreach my $module (@install) {
-        $restart_required = 1 if $module->{module} eq 'CPAN';
-        install_module($module->{module}, 1);
-    }
-
-    if ($restart_required) {
-        chdir $original_dir;
-        exec($^X, $0, @$original_args);
-    }
-}
-
-sub _require_compiler {
-    my @errors;
-
-    my $cc_name = $Config{cc};
-    my $cc_exists = bin_loc($cc_name);
-
-    if (!$cc_exists) {
-        push(@errors, install_string('install_no_compiler'));
-    }
-
-    my $make_name = $CPAN::Config->{make};
-    my $make_exists = bin_loc($make_name);
-
-    if (!$make_exists) {
-        push(@errors, install_string('install_no_make'));
-    }
-
-    die @errors if @errors;
-}
-
-sub install_module {
-    my ($name, $test) = @_;
-    my $bzlib = BZ_LIB;
-
-    # Make Module::AutoInstall install all dependencies and never prompt.
-    local $ENV{PERL_AUTOINSTALL} = '--alldeps';
-    # This makes Net::SSLeay not prompt the user, if it gets installed.
-    # It also makes any other MakeMaker prompts accept their defaults.
-    local $ENV{PERL_MM_USE_DEFAULT} = 1;
-
-    # Certain modules require special stuff in order to not prompt us.
-    my $original_makepl = $CPAN::Config->{makepl_arg};
-    # This one's a regex in case we're doing Template::Plugin::GD and it
-    # pulls in Template-Toolkit as a dependency.
-    if ($name =~ /^Template/) {
-        $CPAN::Config->{makepl_arg} .= " TT_ACCEPT=y TT_EXTRAS=n";
-    }
-    elsif ($name eq 'XML::Twig') {
-        $CPAN::Config->{makepl_arg} = "-n $original_makepl";
-    }
-    elsif ($name eq 'SOAP::Lite') {
-        $CPAN::Config->{makepl_arg} .= " --noprompt";
-    }
-
-    my $module = CPAN::Shell->expand('Module', $name);
-    if (!$module) {
-        die install_string('no_such_module', { module => $name }) . "\n";
-    }
-
-    print install_string('install_module', 
-              { module => $name, version => $module->cpan_version }) . "\n";
-
-    if ($test) {
-        CPAN::Shell->force('install', $name);
-    }
-    else {
-        CPAN::Shell->notest('install', $name);
-    }
-
-    # If it installed any binaries in the Bugzilla directory, delete them.
-    if (-d "$bzlib/bin") {
-        File::Path::rmtree("$bzlib/bin");
-    }
-
-    $CPAN::Config->{makepl_arg} = $original_makepl;
-}
-
-sub set_cpan_config {
-    my $do_global = shift;
-    my $bzlib = BZ_LIB;
-
-    # We set defaults before we do anything, otherwise CPAN will
-    # start asking us questions as soon as we load its configuration.
-    eval { require CPAN::Config; };
-    _set_cpan_defaults();
-
-    # Calling a senseless autoload that does nothing makes us
-    # automatically load any existing configuration.
-    # We want to avoid the "invalid command" message.
-    open(my $saveout, ">&STDOUT");
-    open(STDOUT, '>/dev/null');
-    eval { CPAN->ignore_this_error_message_from_bugzilla; };
-    undef $@;
-    close(STDOUT);
-    open(STDOUT, '>&', $saveout);
-
-    my $dir = $CPAN::Config->{cpan_home};
-    if (!defined $dir || !-w $dir) {
-        # If we can't use the standard CPAN build dir, we try to make one.
-        $dir = "$ENV{HOME}/.cpan";
-        mkdir $dir;
-
-        # If we can't make one, we finally try to use the Bugzilla directory.
-        if (!-w $dir) {
-            print STDERR install_string('cpan_bugzilla_home'), "\n";
-            $dir = "$bzlib/.cpan";
-        }
-    }
-    $CPAN::Config->{cpan_home} = $dir;
-    $CPAN::Config->{build_dir} = "$dir/build";
-    # We always force builds, so there's no reason to cache them.
-    $CPAN::Config->{keep_source_where} = "$dir/source";
-    # This is set both here and in defaults so that it's always true.
-    $CPAN::Config->{inhibit_startup_message} = 1;
-    # Automatically install dependencies.
-    $CPAN::Config->{prerequisites_policy} = 'follow';
-    
-    # Unless specified, we install the modules into the Bugzilla directory.
-    if (!$do_global) {
-        require Config;
-
-        $CPAN::Config->{makepl_arg} .= " LIB=\"$bzlib\""
-            . " INSTALLMAN1DIR=\"$bzlib/man/man1\""
-            . " INSTALLMAN3DIR=\"$bzlib/man/man3\""
-            # The bindirs are here because otherwise we'll try to write to
-            # the system binary dirs, and that will cause CPAN to die.
-            . " INSTALLBIN=\"$bzlib/bin\""
-            . " INSTALLSCRIPT=\"$bzlib/bin\""
-            # INSTALLDIRS=perl is set because that makes sure that MakeMaker
-            # always uses the directories we've specified here.
-            . " INSTALLDIRS=perl";
-        $CPAN::Config->{mbuild_arg} = " --install_base \"$bzlib\""
-            . " --install_path lib=\"$bzlib\""
-            . " --install_path arch=\"$bzlib/$Config::Config{archname}\"";
-        $CPAN::Config->{mbuild_install_arg} = $CPAN::Config->{mbuild_arg};
-
-        # When we're not root, sometimes newer versions of CPAN will
-        # try to read/modify things that belong to root, unless we set
-        # certain config variables.
-        $CPAN::Config->{histfile} = "$dir/histfile";
-        $CPAN::Config->{use_sqlite} = 0;
-        $CPAN::Config->{prefs_dir} = "$dir/prefs";
-
-        # Unless we actually set PERL5LIB, some modules can't install
-        # themselves, like DBD::mysql, DBD::Pg, and XML::Twig.
-        my $current_lib = $ENV{PERL5LIB} ? $ENV{PERL5LIB} . ':' : '';
-        $ENV{PERL5LIB} = $current_lib . $bzlib;
-    }
-}
-
-sub _set_cpan_defaults {
-    # If CPAN hasn't been configured, we try to use some reasonable defaults.
-    foreach my $key (keys %{CPAN_DEFAULTS()}) {
-        $CPAN::Config->{$key} = CPAN_DEFAULTS->{$key}
-            if !defined $CPAN::Config->{$key};
-    }
-
-    my @missing;
-    # In newer CPANs, this is in HandleConfig. In older CPANs, it's in
-    # Config.
-    if (eval { require CPAN::HandleConfig }) {
-        @missing = CPAN::HandleConfig->missing_config_data;
-    }
-    else {
-        @missing = CPAN::Config->missing_config_data;
-    }
-
-    foreach my $key (@missing) {
-        $CPAN::Config->{$key} = '';
-    }
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Install::CPAN - Routines to install Perl modules from CPAN.
-
-=head1 SYNOPSIS
-
- use Bugzilla::Install::CPAN;
-
- set_cpan_config();
- install_module('Module::Name');
-
-=head1 DESCRIPTION
-
-This is primarily used by L<install-module> to do the "hard work" of
-installing CPAN modules.
-
-=head1 SUBROUTINES
-
-=over
-
-=item C<set_cpan_config>
-
-Sets up the configuration of CPAN for this session. Must be called
-before L</install_module>. Takes one boolean parameter. If true,
-L</install_module> will install modules globally instead of to the
-local F<lib/> directory. On most systems, you have to be root to do that.
-
-=item C<install_module>
-
-Installs a module from CPAN. Takes two arguments:
-
-=over
-
-=item C<$name> - The name of the module, just like you'd pass to the
-C<install> command in the CPAN shell.
-
-=item C<$test> - If true, we run tests on this module before installing,
-but we still force the install if the tests fail. This is only used
-when we internally install a newer CPAN module.
-
-=back
-
-Note that calling this function prints a B<lot> of information to
-STDOUT and STDERR.
-
-=back
-
-=head1 B<Methods in need of POD>
-
-=over
-
-=item check_cpan_requirements
-
-=back
diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index ab02fe41db..6a5db1fd1b 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -8,9 +8,9 @@
 package Bugzilla::Install::DB;
 
 # NOTE: This package may "use" any modules that it likes,
-# localconfig is available, and params are up to date. 
+# localconfig is available, and params are up to date.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -34,99 +34,108 @@ use URI::QueryParam;
 # NOTE: This is NOT the function for general table updates. See
 # update_table_definitions for that. This is only for the fielddefs table.
 sub update_fielddefs_definition {
-    my $dbh = Bugzilla->dbh;
-
-    # 2005-02-21 - LpSolit@gmail.com - Bug 279910
-    # qacontact_accessible and assignee_accessible field names no longer exist
-    # in the 'bugs' table. Their corresponding entries in the 'bugs_activity'
-    # table should therefore be marked as obsolete, meaning that they cannot
-    # be used anymore when querying the database - they are not deleted in
-    # order to keep track of these fields in the activity table.
-    if (!$dbh->bz_column_info('fielddefs', 'obsolete')) {
-        $dbh->bz_add_column('fielddefs', 'obsolete',
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-        print "Marking qacontact_accessible and assignee_accessible as",
-              " obsolete fields...\n";
-        $dbh->do("UPDATE fielddefs SET obsolete = 1
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-02-21 - LpSolit@gmail.com - Bug 279910
+  # qacontact_accessible and assignee_accessible field names no longer exist
+  # in the 'bugs' table. Their corresponding entries in the 'bugs_activity'
+  # table should therefore be marked as obsolete, meaning that they cannot
+  # be used anymore when querying the database - they are not deleted in
+  # order to keep track of these fields in the activity table.
+  if (!$dbh->bz_column_info('fielddefs', 'obsolete')) {
+    $dbh->bz_add_column('fielddefs', 'obsolete',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+    print "Marking qacontact_accessible and assignee_accessible as",
+      " obsolete fields...\n";
+    $dbh->do(
+      "UPDATE fielddefs SET obsolete = 1
                   WHERE name = 'qacontact_accessible'
-                        OR name = 'assignee_accessible'");
-    }
-
-    # 2005-08-10 Myk Melez <myk@mozilla.org> bug 287325
-    # Record each field's type and whether or not it's a custom field,
-    # in fielddefs.
-    $dbh->bz_add_column('fielddefs', 'type',
-                        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-    $dbh->bz_add_column('fielddefs', 'custom',
-        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-
-    $dbh->bz_add_column('fielddefs', 'enter_bug',
-        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-
-    # Change the name of the fieldid column to id, so that fielddefs
-    # can use Bugzilla::Object easily. We have to do this up here, because
-    # otherwise adding these field definitions will fail.
-    $dbh->bz_rename_column('fielddefs', 'fieldid', 'id');
-
-    # If the largest fielddefs sortkey is less than 100, then
-    # we're using the old sorting system, and we should convert
-    # it to the new one before adding any new definitions.
-    if (!$dbh->selectrow_arrayref(
-            'SELECT COUNT(id) FROM fielddefs WHERE sortkey >= 100'))
-    {
-        print "Updating the sortkeys for the fielddefs table...\n";
-        my $field_ids = $dbh->selectcol_arrayref(
-            'SELECT id FROM fielddefs ORDER BY sortkey');
-        my $sortkey = 100;
-        foreach my $field_id (@$field_ids) {
-            $dbh->do('UPDATE fielddefs SET sortkey = ? WHERE id = ?',
-                     undef, $sortkey, $field_id);
-            $sortkey += 100;
-        }
+                        OR name = 'assignee_accessible'"
+    );
+  }
+
+  # 2005-08-10 Myk Melez <myk@mozilla.org> bug 287325
+  # Record each field's type and whether or not it's a custom field,
+  # in fielddefs.
+  $dbh->bz_add_column('fielddefs', 'type',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+  $dbh->bz_add_column('fielddefs', 'custom',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+
+  $dbh->bz_add_column('fielddefs', 'enter_bug',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+
+  # Change the name of the fieldid column to id, so that fielddefs
+  # can use Bugzilla::Object easily. We have to do this up here, because
+  # otherwise adding these field definitions will fail.
+  $dbh->bz_rename_column('fielddefs', 'fieldid', 'id');
+
+  # If the largest fielddefs sortkey is less than 100, then
+  # we're using the old sorting system, and we should convert
+  # it to the new one before adding any new definitions.
+  if (!$dbh->selectrow_arrayref(
+    'SELECT COUNT(id) FROM fielddefs WHERE sortkey >= 100'))
+  {
+    print "Updating the sortkeys for the fielddefs table...\n";
+    my $field_ids
+      = $dbh->selectcol_arrayref('SELECT id FROM fielddefs ORDER BY sortkey');
+    my $sortkey = 100;
+    foreach my $field_id (@$field_ids) {
+      $dbh->do('UPDATE fielddefs SET sortkey = ? WHERE id = ?',
+        undef, $sortkey, $field_id);
+      $sortkey += 100;
     }
+  }
 
-    $dbh->bz_add_column('fielddefs', 'visibility_field_id', {TYPE => 'INT3'});
-    $dbh->bz_add_column('fielddefs', 'value_field_id', {TYPE => 'INT3'});
-    $dbh->bz_add_index('fielddefs', 'fielddefs_value_field_id_idx',
-                       ['value_field_id']);
+  $dbh->bz_add_column('fielddefs', 'visibility_field_id', {TYPE => 'INT3'});
+  $dbh->bz_add_column('fielddefs', 'value_field_id',      {TYPE => 'INT3'});
+  $dbh->bz_add_index('fielddefs', 'fielddefs_value_field_id_idx',
+    ['value_field_id']);
 
-    # Bug 344878
-    if (!$dbh->bz_column_info('fielddefs', 'buglist')) {
-        $dbh->bz_add_column('fielddefs', 'buglist',
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-        # Set non-multiselect custom fields as valid buglist fields
-        # Note that default fields will be handled in Field.pm
-        $dbh->do('UPDATE fielddefs SET buglist = 1 WHERE custom = 1 AND type != ' . FIELD_TYPE_MULTI_SELECT);
-    }
+  # Bug 344878
+  if (!$dbh->bz_column_info('fielddefs', 'buglist')) {
+    $dbh->bz_add_column('fielddefs', 'buglist',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
 
-    #2008-08-26 elliotte_martin@yahoo.com - Bug 251556
-    $dbh->bz_add_column('fielddefs', 'reverse_desc', {TYPE => 'TINYTEXT'});
+    # Set non-multiselect custom fields as valid buglist fields
+    # Note that default fields will be handled in Field.pm
+    $dbh->do('UPDATE fielddefs SET buglist = 1 WHERE custom = 1 AND type != '
+        . FIELD_TYPE_MULTI_SELECT);
+  }
 
-    $dbh->do('UPDATE fielddefs SET buglist = 1
-               WHERE custom = 1 AND type = ' . FIELD_TYPE_MULTI_SELECT);
+  #2008-08-26 elliotte_martin@yahoo.com - Bug 251556
+  $dbh->bz_add_column('fielddefs', 'reverse_desc', {TYPE => 'TINYTEXT'});
 
-    $dbh->bz_add_column('fielddefs', 'is_mandatory',
-        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->bz_add_index('fielddefs', 'fielddefs_is_mandatory_idx',
-                       ['is_mandatory']);
+  $dbh->do(
+    'UPDATE fielddefs SET buglist = 1
+               WHERE custom = 1 AND type = ' . FIELD_TYPE_MULTI_SELECT
+  );
 
-    # 2010-04-05 dkl@redhat.com - Bug 479400
-    _migrate_field_visibility_value();
+  $dbh->bz_add_column('fielddefs', 'is_mandatory',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_add_index('fielddefs', 'fielddefs_is_mandatory_idx', ['is_mandatory']);
 
-    $dbh->bz_add_column('fielddefs', 'is_numeric',
-        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->do('UPDATE fielddefs SET is_numeric = 1 WHERE type = '
-             . FIELD_TYPE_BUG_ID);
+  # 2010-04-05 dkl@redhat.com - Bug 479400
+  _migrate_field_visibility_value();
 
-    # 2012-04-12 aliustek@gmail.com - Bug 728138
-    $dbh->bz_add_column('fielddefs', 'long_desc',
-                        {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}, '');
+  $dbh->bz_add_column('fielddefs', 'is_numeric',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->do(
+    'UPDATE fielddefs SET is_numeric = 1 WHERE type = ' . FIELD_TYPE_BUG_ID);
 
-    Bugzilla::Hook::process('install_update_db_fielddefs');
+  # 2012-04-12 aliustek@gmail.com - Bug 728138
+  $dbh->bz_add_column('fielddefs', 'long_desc',
+    {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}, '');
 
-    # Remember, this is not the function for adding general table changes.
-    # That is below. Add new changes to the fielddefs table above this
-    # comment.
+  $dbh->bz_add_column('user_api_keys', 'app_id', {TYPE => 'varchar(64)'});
+  $dbh->bz_add_index('user_api_keys', 'user_api_keys_user_id_app_id_idx',
+    [qw(user_id app_id)]);
+
+  Bugzilla::Hook::process('install_update_db_fielddefs');
+
+  # Remember, this is not the function for adding general table changes.
+  # That is below. Add new changes to the fielddefs table above this
+  # comment.
 }
 
 # Small changes can be put directly into this function.
@@ -136,14 +145,14 @@ sub update_fielddefs_definition {
 #
 # This function runs in historical order--from upgrades that older
 # installations need, to upgrades that newer installations need.
-# The order of items inside this function should only be changed if 
+# The order of items inside this function should only be changed if
 # absolutely necessary.
 #
 # The subroutines should have long, descriptive names, so that you
 # can easily see what is being done, just by reading this function.
 #
 # This function is mostly self-documenting. If you're curious about
-# what each of the added/removed columns does, you should see the schema 
+# what each of the added/removed columns does, you should see the schema
 # docs at:
 # http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/
 #
@@ -152,1060 +161,1129 @@ sub update_fielddefs_definition {
 # the purpose of a column.
 #
 sub update_table_definitions {
-    my $old_params = shift;
-    my $dbh = Bugzilla->dbh;
-    _update_pre_checksetup_bugzillas();
-
-    $dbh->bz_add_column('attachments', 'submitter_id',
-                        {TYPE => 'INT3', NOTNULL => 1}, 0); 
-
-    $dbh->bz_rename_column('bugs_activity', 'when', 'bug_when');
-
-    _add_bug_vote_cache();
-    _update_product_name_definition();
-
-    $dbh->bz_add_column('profiles', 'disabledtext',
-                        {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
-
-    _populate_longdescs();
-    _update_bugs_activity_field_to_fieldid();
-
-    if (!$dbh->bz_column_info('bugs', 'lastdiffed')) {
-        $dbh->bz_add_column('bugs', 'lastdiffed', {TYPE =>'DATETIME'});
-        $dbh->do('UPDATE bugs SET lastdiffed = NOW()');
-    }
-
-    _add_unique_login_name_index_to_profiles();
-
-    $dbh->bz_add_column('profiles', 'mybugslink', 
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-
-    _update_component_user_fields_to_ids();
-
-    $dbh->bz_add_column('bugs', 'everconfirmed',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1}, 1);
-
-    _populate_milestones_table();
-
-    _add_products_defaultmilestone();
-
-    # 2000-03-24 Added unique indexes into the cc and keyword tables.  This
-    # prevents certain database inconsistencies, and, moreover, is required for
-    # new generalized list code to work.
-    if (!$dbh->bz_index_info('cc', 'cc_bug_id_idx')
-        || !$dbh->bz_index_info('cc', 'cc_bug_id_idx')->{TYPE})
-    {
-        $dbh->bz_drop_index('cc', 'cc_bug_id_idx');
-        $dbh->bz_add_index('cc', 'cc_bug_id_idx',
-                           {TYPE => 'UNIQUE', FIELDS => [qw(bug_id who)]});
-    }
-    if (!$dbh->bz_index_info('keywords', 'keywords_bug_id_idx')
-        || !$dbh->bz_index_info('keywords', 'keywords_bug_id_idx')->{TYPE})
-    {
-        $dbh->bz_drop_index('keywords', 'keywords_bug_id_idx');
-        $dbh->bz_add_index('keywords', 'keywords_bug_id_idx',
-            {TYPE => 'UNIQUE', FIELDS => [qw(bug_id keywordid)]});
-    }
-
-    _copy_from_comments_to_longdescs();
-    _populate_duplicates_table();
-
-    if (!$dbh->bz_column_info('email_setting', 'user_id')) {
-        $dbh->bz_add_column('profiles', 'emailflags', {TYPE => 'MEDIUMTEXT'});
-    }
-
-    $dbh->bz_add_column('groups', 'isactive',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-
-    $dbh->bz_add_column('attachments', 'isobsolete',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-
-    $dbh->bz_drop_column("profiles", "emailnotification");
-    $dbh->bz_drop_column("profiles", "newemailtech");
-
-    # 2003-11-19; chicks@chicks.net; bug 225973: fix field size to accommodate
-    # wider algorithms such as Blowfish. Note that this needs to be run
-    # before recrypting passwords in the following block.
-    $dbh->bz_alter_column('profiles', 'cryptpassword',
-                          {TYPE => 'varchar(128)'});
-
-    _recrypt_plaintext_passwords();
+  my $old_params = shift;
+  my $dbh        = Bugzilla->dbh;
+  _update_pre_checksetup_bugzillas();
 
-    # 2001-06-15 kiko@async.com.br - Change bug:version size to avoid
-    # truncates re http://bugzilla.mozilla.org/show_bug.cgi?id=9352
-    $dbh->bz_alter_column('bugs', 'version',
-                          {TYPE => 'varchar(64)', NOTNULL => 1});
+  $dbh->bz_add_column('attachments', 'submitter_id',
+    {TYPE => 'INT3', NOTNULL => 1}, 0);
 
-    _update_bugs_activity_to_only_record_changes();
+  $dbh->bz_rename_column('bugs_activity', 'when', 'bug_when');
 
-    # bug 90933: Make disabledtext NOT NULL
-    if (!$dbh->bz_column_info('profiles', 'disabledtext')->{NOTNULL}) {
-        $dbh->bz_alter_column("profiles", "disabledtext",
-                              {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
-    }
-
-    $dbh->bz_add_column("bugs", "reporter_accessible",
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-    $dbh->bz_add_column("bugs", "cclist_accessible",
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-
-    $dbh->bz_add_column("bugs_activity", "attach_id", {TYPE => 'INT3'});
-
-    _delete_logincookies_cryptpassword_and_handle_invalid_cookies();
+  _add_bug_vote_cache();
+  _update_product_name_definition();
 
-    # qacontact/assignee should always be able to see bugs: bug 97471
-    $dbh->bz_drop_column("bugs", "qacontact_accessible");
-    $dbh->bz_drop_column("bugs", "assignee_accessible");
+  $dbh->bz_add_column('profiles', 'disabledtext',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
 
-    # 2002-02-20 jeff.hedlund@matrixsi.com - bug 24789 time tracking
-    $dbh->bz_add_column("longdescs", "work_time",
-                        {TYPE => 'decimal(5,2)', NOTNULL => 1, DEFAULT => '0'});
-    $dbh->bz_add_column("bugs", "estimated_time",
-                        {TYPE => 'decimal(5,2)', NOTNULL => 1, DEFAULT => '0'});
-    $dbh->bz_add_column("bugs", "remaining_time",
-                        {TYPE => 'decimal(5,2)', NOTNULL => 1, DEFAULT => '0'});
-    $dbh->bz_add_column("bugs", "deadline", {TYPE => 'DATETIME'});
+  _populate_longdescs();
+  _update_bugs_activity_field_to_fieldid();
 
-    _use_ip_instead_of_hostname_in_logincookies();
+  if (!$dbh->bz_column_info('bugs', 'lastdiffed')) {
+    $dbh->bz_add_column('bugs', 'lastdiffed', {TYPE => 'DATETIME'});
+    $dbh->do('UPDATE bugs SET lastdiffed = NOW()');
+  }
 
-    $dbh->bz_add_column('longdescs', 'isprivate',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->bz_add_column('attachments', 'isprivate',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  _add_unique_login_name_index_to_profiles();
 
-    _move_quips_into_db();
+  $dbh->bz_add_column('profiles', 'mybugslink',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
 
-    $dbh->bz_drop_column("namedqueries", "watchfordiffs");
+  _update_component_user_fields_to_ids();
 
-    _use_ids_for_products_and_components();
-    _convert_groups_system_from_groupset();
-    _convert_attachment_statuses_to_flags();
-    _remove_spaces_and_commas_from_flagtypes();
-    _setup_usebuggroups_backward_compatibility();
-    _remove_user_series_map();
+  $dbh->bz_add_column('bugs', 'everconfirmed', {TYPE => 'BOOLEAN', NOTNULL => 1},
+    1);
 
-    # 2006-08-03 remi_zara@mac.com bug 346241, make series.creator nullable
-    # This must happen before calling _copy_old_charts_into_database().
-    if ($dbh->bz_column_info('series', 'creator')->{NOTNULL}) {
-        $dbh->bz_alter_column('series', 'creator', {TYPE => 'INT3'});
-        $dbh->do("UPDATE series SET creator = NULL WHERE creator = 0");
-    }
+  _populate_milestones_table();
 
-    _copy_old_charts_into_database();
+  _add_products_defaultmilestone();
 
-    _add_user_group_map_grant_type();
-    _add_group_group_map_grant_type();
+  # 2000-03-24 Added unique indexes into the cc and keyword tables.  This
+  # prevents certain database inconsistencies, and, moreover, is required for
+  # new generalized list code to work.
+  if ( !$dbh->bz_index_info('cc', 'cc_bug_id_idx')
+    || !$dbh->bz_index_info('cc', 'cc_bug_id_idx')->{TYPE})
+  {
+    $dbh->bz_drop_index('cc', 'cc_bug_id_idx');
+    $dbh->bz_add_index('cc', 'cc_bug_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(bug_id who)]});
+  }
+  if ( !$dbh->bz_index_info('keywords', 'keywords_bug_id_idx')
+    || !$dbh->bz_index_info('keywords', 'keywords_bug_id_idx')->{TYPE})
+  {
+    $dbh->bz_drop_index('keywords', 'keywords_bug_id_idx');
+    $dbh->bz_add_index('keywords', 'keywords_bug_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(bug_id keywordid)]});
+  }
 
-    $dbh->bz_add_column("profiles", "extern_id", {TYPE => 'varchar(64)'});
+  _copy_from_comments_to_longdescs();
+  _populate_duplicates_table();
 
-    $dbh->bz_add_column('flagtypes', 'grant_group_id', {TYPE => 'INT3'});
-    $dbh->bz_add_column('flagtypes', 'request_group_id', {TYPE => 'INT3'});
+  if (!$dbh->bz_column_info('email_setting', 'user_id')) {
+    $dbh->bz_add_column('profiles', 'emailflags', {TYPE => 'MEDIUMTEXT'});
+  }
 
-    # mailto is no longer just userids
-    $dbh->bz_rename_column('whine_schedules', 'mailto_userid', 'mailto');
-    $dbh->bz_add_column('whine_schedules', 'mailto_type',
-        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'});
+  $dbh->bz_add_column('groups', 'isactive',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
 
-    _add_longdescs_already_wrapped();
+  $dbh->bz_add_column('attachments', 'isobsolete',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
 
-    # Moved enum types to separate tables so we need change the old enum 
-    # types to standard varchars in the bugs table.
-    $dbh->bz_alter_column('bugs', 'bug_status',
-                          {TYPE => 'varchar(64)', NOTNULL => 1});
-    # 2005-03-23 Tomas.Kopal@altap.cz - add default value to resolution,
-    # bug 286695
-    $dbh->bz_alter_column('bugs', 'resolution',
-        {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "''"});
-    $dbh->bz_alter_column('bugs', 'priority',
-                          {TYPE => 'varchar(64)', NOTNULL => 1});
-    $dbh->bz_alter_column('bugs', 'bug_severity',
-                          {TYPE => 'varchar(64)', NOTNULL => 1});
-    $dbh->bz_alter_column('bugs', 'rep_platform',
-                          {TYPE => 'varchar(64)', NOTNULL => 1}, '');
-    $dbh->bz_alter_column('bugs', 'op_sys',
-                          {TYPE => 'varchar(64)', NOTNULL => 1});
+  $dbh->bz_drop_column("profiles", "emailnotification");
+  $dbh->bz_drop_column("profiles", "newemailtech");
 
-    # When migrating quips from the '$datadir/comments' file to the DB,
-    # the user ID should be NULL instead of 0 (which is an invalid user ID).
-    if ($dbh->bz_column_info('quips', 'userid')->{NOTNULL}) {
-        $dbh->bz_alter_column('quips', 'userid', {TYPE => 'INT3'});
-        print "Changing owner to NULL for quips where the owner is",
-              " unknown...\n";
-        $dbh->do('UPDATE quips SET userid = NULL WHERE userid = 0');
-    }
+  # 2003-11-19; chicks@chicks.net; bug 225973: fix field size to accommodate
+  # wider algorithms such as Blowfish. Note that this needs to be run
+  # before recrypting passwords in the following block.
+  $dbh->bz_alter_column('profiles', 'cryptpassword', {TYPE => 'varchar(128)'});
+
+  _recrypt_plaintext_passwords();
+
+  # 2001-06-15 kiko@async.com.br - Change bug:version size to avoid
+  # truncates re http://bugzilla.mozilla.org/show_bug.cgi?id=9352
+  $dbh->bz_alter_column('bugs', 'version', {TYPE => 'varchar(64)', NOTNULL => 1});
 
-    _convert_attachments_filename_from_mediumtext();
+  _update_bugs_activity_to_only_record_changes();
 
-    $dbh->bz_add_column('quips', 'approved',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+  # bug 90933: Make disabledtext NOT NULL
+  if (!$dbh->bz_column_info('profiles', 'disabledtext')->{NOTNULL}) {
+    $dbh->bz_alter_column("profiles", "disabledtext",
+      {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
+  }
 
-    # 2002-12-20 Bug 180870 - remove manual shadowdb replication code
-    $dbh->bz_drop_table("shadowlog");
+  $dbh->bz_add_column("bugs", "reporter_accessible",
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+  $dbh->bz_add_column("bugs", "cclist_accessible",
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
 
-    _rename_votes_count_and_force_group_refresh();
+  $dbh->bz_add_column("bugs_activity", "attach_id", {TYPE => 'INT3'});
 
-    # 2004/02/15 - Summaries shouldn't be null - see bug 220232
-    if (!exists $dbh->bz_column_info('bugs', 'short_desc')->{NOTNULL}) {
-        $dbh->bz_alter_column('bugs', 'short_desc',
-                              {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
-    }
+  _delete_logincookies_cryptpassword_and_handle_invalid_cookies();
 
-    $dbh->bz_add_column('products', 'classification_id',
-                        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '1'});
+  # qacontact/assignee should always be able to see bugs: bug 97471
+  $dbh->bz_drop_column("bugs", "qacontact_accessible");
+  $dbh->bz_drop_column("bugs", "assignee_accessible");
 
-    _fix_group_with_empty_name();
+  # 2002-02-20 jeff.hedlund@matrixsi.com - bug 24789 time tracking
+  $dbh->bz_add_column("longdescs", "work_time",
+    {TYPE => 'decimal(5,2)', NOTNULL => 1, DEFAULT => '0'});
+  $dbh->bz_add_column("bugs", "estimated_time",
+    {TYPE => 'decimal(5,2)', NOTNULL => 1, DEFAULT => '0'});
+  $dbh->bz_add_column("bugs", "remaining_time",
+    {TYPE => 'decimal(5,2)', NOTNULL => 1, DEFAULT => '0'});
+  $dbh->bz_add_column("bugs", "deadline", {TYPE => 'DATETIME'});
 
-    $dbh->bz_add_index('bugs_activity', 'bugs_activity_who_idx', [qw(who)]);
+  _use_ip_instead_of_hostname_in_logincookies();
 
-    # Add defaults for some fields that should have them but didn't.
-    $dbh->bz_alter_column('bugs', 'status_whiteboard',
-        {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"});
-    if ($dbh->bz_column_info('bugs', 'votes')) {
-        $dbh->bz_alter_column('bugs', 'votes',
-                              {TYPE => 'INT3', NOTNULL => 1, DEFAULT => '0'});
-    }
+  $dbh->bz_add_column('longdescs', 'isprivate',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_add_column('attachments', 'isprivate',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+
+  _move_quips_into_db();
+
+  $dbh->bz_drop_column("namedqueries", "watchfordiffs");
+
+  _use_ids_for_products_and_components();
+  _convert_groups_system_from_groupset();
+  _convert_attachment_statuses_to_flags();
+  _remove_spaces_and_commas_from_flagtypes();
+  _setup_usebuggroups_backward_compatibility();
+  _remove_user_series_map();
+
+  # 2006-08-03 remi_zara@mac.com bug 346241, make series.creator nullable
+  # This must happen before calling _copy_old_charts_into_database().
+  if ($dbh->bz_column_info('series', 'creator')->{NOTNULL}) {
+    $dbh->bz_alter_column('series', 'creator', {TYPE => 'INT3'});
+    $dbh->do("UPDATE series SET creator = NULL WHERE creator = 0");
+  }
+
+  _copy_old_charts_into_database();
+
+  _add_user_group_map_grant_type();
+  _add_group_group_map_grant_type();
+
+  $dbh->bz_add_column("profiles", "extern_id", {TYPE => 'varchar(64)'});
+
+  $dbh->bz_add_column('flagtypes', 'grant_group_id',   {TYPE => 'INT3'});
+  $dbh->bz_add_column('flagtypes', 'request_group_id', {TYPE => 'INT3'});
+
+  # mailto is no longer just userids
+  $dbh->bz_rename_column('whine_schedules', 'mailto_userid', 'mailto');
+  $dbh->bz_add_column('whine_schedules', 'mailto_type',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'});
+
+  _add_longdescs_already_wrapped();
 
-    $dbh->bz_alter_column('bugs', 'lastdiffed', {TYPE => 'DATETIME'});
+  # Moved enum types to separate tables so we need change the old enum
+  # types to standard varchars in the bugs table.
+  $dbh->bz_alter_column('bugs', 'bug_status',
+    {TYPE => 'varchar(64)', NOTNULL => 1});
+
+  # 2005-03-23 Tomas.Kopal@altap.cz - add default value to resolution,
+  # bug 286695
+  $dbh->bz_alter_column('bugs', 'resolution',
+    {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "''"});
+  $dbh->bz_alter_column('bugs', 'priority',
+    {TYPE => 'varchar(64)', NOTNULL => 1});
+  $dbh->bz_alter_column('bugs', 'bug_severity',
+    {TYPE => 'varchar(64)', NOTNULL => 1});
+  $dbh->bz_alter_column('bugs', 'rep_platform',
+    {TYPE => 'varchar(64)', NOTNULL => 1}, '');
+  $dbh->bz_alter_column('bugs', 'op_sys', {TYPE => 'varchar(64)', NOTNULL => 1});
+
+  # When migrating quips from the '$datadir/comments' file to the DB,
+  # the user ID should be NULL instead of 0 (which is an invalid user ID).
+  if ($dbh->bz_column_info('quips', 'userid')->{NOTNULL}) {
+    $dbh->bz_alter_column('quips', 'userid', {TYPE => 'INT3'});
+    print "Changing owner to NULL for quips where the owner is", " unknown...\n";
+    $dbh->do('UPDATE quips SET userid = NULL WHERE userid = 0');
+  }
+
+  _convert_attachments_filename_from_mediumtext();
+
+  $dbh->bz_add_column('quips', 'approved',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+
+  # 2002-12-20 Bug 180870 - remove manual shadowdb replication code
+  $dbh->bz_drop_table("shadowlog");
+
+  _rename_votes_count_and_force_group_refresh();
+
+  # 2004/02/15 - Summaries shouldn't be null - see bug 220232
+  if (!exists $dbh->bz_column_info('bugs', 'short_desc')->{NOTNULL}) {
+    $dbh->bz_alter_column('bugs', 'short_desc',
+      {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
+  }
 
-    # 2005-03-09 qa_contact should be NULL instead of 0, bug 285534
-    if ($dbh->bz_column_info('bugs', 'qa_contact')->{NOTNULL}) {
-        $dbh->bz_alter_column('bugs', 'qa_contact', {TYPE => 'INT3'});
-        $dbh->do("UPDATE bugs SET qa_contact = NULL WHERE qa_contact = 0");
-    }
+  $dbh->bz_add_column('products', 'classification_id',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '1'});
+
+  _fix_group_with_empty_name();
+
+  $dbh->bz_add_index('bugs_activity', 'bugs_activity_who_idx', [qw(who)]);
+
+  # Add defaults for some fields that should have them but didn't.
+  $dbh->bz_alter_column('bugs', 'status_whiteboard',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"});
+  if ($dbh->bz_column_info('bugs', 'votes')) {
+    $dbh->bz_alter_column('bugs', 'votes',
+      {TYPE => 'INT3', NOTNULL => 1, DEFAULT => '0'});
+  }
+
+  $dbh->bz_alter_column('bugs', 'lastdiffed', {TYPE => 'DATETIME'});
+
+  # 2005-03-09 qa_contact should be NULL instead of 0, bug 285534
+  if ($dbh->bz_column_info('bugs', 'qa_contact')->{NOTNULL}) {
+    $dbh->bz_alter_column('bugs', 'qa_contact', {TYPE => 'INT3'});
+    $dbh->do("UPDATE bugs SET qa_contact = NULL WHERE qa_contact = 0");
+  }
+
+  # 2005-03-27 initialqacontact should be NULL instead of 0, bug 287483
+  if ($dbh->bz_column_info('components', 'initialqacontact')->{NOTNULL}) {
+    $dbh->bz_alter_column('components', 'initialqacontact', {TYPE => 'INT3'});
+  }
+  $dbh->do("UPDATE components SET initialqacontact = NULL "
+      . "WHERE initialqacontact = 0");
+
+  _migrate_email_prefs_to_new_table();
+  _initialize_new_email_prefs();
+  _change_all_mysql_booleans_to_tinyint();
+
+  # make classification_id field type be consistent with DB:Schema
+  $dbh->bz_alter_column('products', 'classification_id',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '1'});
+
+  # initialowner was accidentally NULL when we checked-in Schema,
+  # when it really should be NOT NULL.
+  $dbh->bz_alter_column('components', 'initialowner',
+    {TYPE => 'INT3', NOTNULL => 1}, 0);
+
+  # 2005-03-28 - bug 238800 - index flags.type_id for editflagtypes.cgi
+  $dbh->bz_add_index('flags', 'flags_type_id_idx', [qw(type_id)]);
+
+  # For a short time, the flags_type_id_idx was misnamed in upgraded installs.
+  $dbh->bz_drop_index('flags', 'type_id');
+
+  # 2005-04-28 - LpSolit@gmail.com - Bug 7233: add an index to versions
+  $dbh->bz_alter_column('versions', 'value',
+    {TYPE => 'varchar(64)', NOTNULL => 1});
+  _add_versions_product_id_index();
+
+  if (!exists $dbh->bz_column_info('milestones', 'sortkey')->{DEFAULT}) {
+    $dbh->bz_alter_column('milestones', 'sortkey',
+      {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+  }
+
+  # 2005-06-14 - LpSolit@gmail.com - Bug 292544
+  $dbh->bz_alter_column('bugs', 'creation_ts', {TYPE => 'DATETIME'});
+
+  _fix_whine_queries_title_and_op_sys_value();
+  _fix_attachments_submitter_id_idx();
+  _copy_attachments_thedata_to_attach_data();
+  _fix_broken_all_closed_series();
+
+  # 2005-08-14 bugreport@peshkin.net -- Bug 304583
+  # Get rid of leftover DERIVED group permissions
+  use constant GRANT_DERIVED => 1;
+  $dbh->do("DELETE FROM user_group_map WHERE grant_type = " . GRANT_DERIVED);
+
+  _rederive_regex_groups();
+
+  # PUBLIC is a reserved word in Oracle.
+  $dbh->bz_rename_column('series', 'public', 'is_public');
+
+  # 2005-11-04 LpSolit@gmail.com - Bug 305927
+  $dbh->bz_alter_column('groups', 'userregexp',
+    {TYPE => 'TINYTEXT', NOTNULL => 1, DEFAULT => "''"});
+
+  _clean_control_characters_from_short_desc();
 
-    # 2005-03-27 initialqacontact should be NULL instead of 0, bug 287483
-    if ($dbh->bz_column_info('components', 'initialqacontact')->{NOTNULL}) {
-        $dbh->bz_alter_column('components', 'initialqacontact', 
-                              {TYPE => 'INT3'});
+  # 2005-12-07 altlst@sonic.net -- Bug 225221
+  $dbh->bz_add_column('longdescs', 'comment_id',
+    {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+
+  _stop_storing_inactive_flags();
+  _change_short_desc_from_mediumtext_to_varchar();
+
+  # 2006-07-01 wurblzap@gmail.com -- Bug 69000
+  $dbh->bz_add_column('namedqueries', 'id',
+    {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  _move_namedqueries_linkinfooter_to_its_own_table();
+
+  _add_classifications_sortkey();
+  _move_data_nomail_into_db();
+
+  # The products table lacked sensible defaults.
+  if ($dbh->bz_column_info('products', 'milestoneurl')) {
+    $dbh->bz_alter_column('products', 'milestoneurl',
+      {TYPE => 'TINYTEXT', NOTNULL => 1, DEFAULT => "''"});
+  }
+  if ($dbh->bz_column_info('products', 'disallownew')) {
+    $dbh->bz_alter_column('products', 'disallownew',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 0});
+
+    if ($dbh->bz_column_info('products', 'votesperuser')) {
+      $dbh->bz_alter_column('products', 'votesperuser',
+        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+      $dbh->bz_alter_column('products', 'votestoconfirm',
+        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
     }
-    $dbh->do("UPDATE components SET initialqacontact = NULL " .
-              "WHERE initialqacontact = 0");
-
-    _migrate_email_prefs_to_new_table();
-    _initialize_new_email_prefs();
-    _change_all_mysql_booleans_to_tinyint();
-
-    # make classification_id field type be consistent with DB:Schema
-    $dbh->bz_alter_column('products', 'classification_id',
-                          {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '1'});
-
-    # initialowner was accidentally NULL when we checked-in Schema,
-    # when it really should be NOT NULL.
-    $dbh->bz_alter_column('components', 'initialowner',
-                          {TYPE => 'INT3', NOTNULL => 1}, 0);
-
-    # 2005-03-28 - bug 238800 - index flags.type_id for editflagtypes.cgi
-    $dbh->bz_add_index('flags', 'flags_type_id_idx', [qw(type_id)]);
-
-    # For a short time, the flags_type_id_idx was misnamed in upgraded installs.
-    $dbh->bz_drop_index('flags', 'type_id');
-
-    # 2005-04-28 - LpSolit@gmail.com - Bug 7233: add an index to versions
-    $dbh->bz_alter_column('versions', 'value',
-                          {TYPE => 'varchar(64)', NOTNULL => 1});
-    _add_versions_product_id_index();
-
-    if (!exists $dbh->bz_column_info('milestones', 'sortkey')->{DEFAULT}) {
-        $dbh->bz_alter_column('milestones', 'sortkey',
-                              {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-    }
-
-    # 2005-06-14 - LpSolit@gmail.com - Bug 292544
-    $dbh->bz_alter_column('bugs', 'creation_ts', {TYPE => 'DATETIME'});
+  }
 
-    _fix_whine_queries_title_and_op_sys_value();
-    _fix_attachments_submitter_id_idx();
-    _copy_attachments_thedata_to_attach_data();
-    _fix_broken_all_closed_series();
-    # 2005-08-14 bugreport@peshkin.net -- Bug 304583
-    # Get rid of leftover DERIVED group permissions
-    use constant GRANT_DERIVED => 1;
-    $dbh->do("DELETE FROM user_group_map WHERE grant_type = " . GRANT_DERIVED);
+  # 2006-08-04 LpSolit@gmail.com - Bug 305941
+  $dbh->bz_drop_column('profiles', 'refreshed_when');
+  $dbh->bz_drop_column('groups',   'last_changed');
 
-    _rederive_regex_groups();
+  # 2019-01-31 dylan@hardison.net - Bug TODO
+  _update_flagtypes_id();
 
-    # PUBLIC is a reserved word in Oracle.
-    $dbh->bz_rename_column('series', 'public', 'is_public');
+  $dbh->bz_alter_column('keyworddefs', 'id',
+    {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
 
-    # 2005-11-04 LpSolit@gmail.com - Bug 305927
-    $dbh->bz_alter_column('groups', 'userregexp',
-                          {TYPE => 'TINYTEXT', NOTNULL => 1, DEFAULT => "''"});
+  # 2006-08-19 LpSolit@gmail.com - Bug 87795
+  $dbh->bz_alter_column('tokens', 'userid', {TYPE => 'INT3'});
 
-    # 2005-09-26 - olav@bkor.dhs.org - Bug 119524
-    $dbh->bz_alter_column('logincookies', 'cookie',
-        {TYPE => 'varchar(16)', PRIMARYKEY => 1, NOTNULL => 1}); 
+  $dbh->bz_drop_index('bugs', 'bugs_short_desc_idx');
 
-    _clean_control_characters_from_short_desc();
-    
-    # 2005-12-07 altlst@sonic.net -- Bug 225221
-    $dbh->bz_add_column('longdescs', 'comment_id',
-        {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # The profiles table was missing some defaults.
+  $dbh->bz_alter_column('profiles', 'disabledtext',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"});
+  $dbh->bz_alter_column('profiles', 'realname',
+    {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"});
 
-    _stop_storing_inactive_flags();
-    _change_short_desc_from_mediumtext_to_varchar();
+  _update_longdescs_who_index();
 
-    # 2006-07-01 wurblzap@gmail.com -- Bug 69000
-    $dbh->bz_add_column('namedqueries', 'id',
-        {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
-    _move_namedqueries_linkinfooter_to_its_own_table();
+  $dbh->bz_add_column('setting', 'subclass', {TYPE => 'varchar(32)'});
 
-    _add_classifications_sortkey();
-    _move_data_nomail_into_db();
+  $dbh->bz_alter_column('longdescs', 'thetext',
+    {TYPE => 'LONGTEXT', NOTNULL => 1}, '');
 
-    # The products table lacked sensible defaults.
-    if ($dbh->bz_column_info('products', 'milestoneurl')) {
-        $dbh->bz_alter_column('products', 'milestoneurl',
-            {TYPE => 'TINYTEXT', NOTNULL => 1, DEFAULT => "''"});
-    }
-    if ($dbh->bz_column_info('products', 'disallownew')){
-        $dbh->bz_alter_column('products', 'disallownew',
-                              {TYPE => 'BOOLEAN', NOTNULL => 1,  DEFAULT => 0});
-    
-        if ($dbh->bz_column_info('products', 'votesperuser')) {
-            $dbh->bz_alter_column('products', 'votesperuser', 
-                {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-            $dbh->bz_alter_column('products', 'votestoconfirm',
-                {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-        }
-    }
-
-    # 2006-08-04 LpSolit@gmail.com - Bug 305941
-    $dbh->bz_drop_column('profiles', 'refreshed_when');
-    $dbh->bz_drop_column('groups', 'last_changed');
+  # 2006-10-20 LpSolit@gmail.com - Bug 189627
+  $dbh->bz_add_column('group_control_map', 'editcomponents',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_add_column('group_control_map', 'editbugs',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_add_column('group_control_map', 'canconfirm',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
 
-    # 2006-08-06 LpSolit@gmail.com - Bug 347521
-    $dbh->bz_alter_column('flagtypes', 'id',
-          {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # 2006-11-07 LpSolit@gmail.com - Bug 353656
+  $dbh->bz_add_column('longdescs', 'type',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'});
+  $dbh->bz_add_column('longdescs', 'extra_data', {TYPE => 'varchar(255)'});
 
-    $dbh->bz_alter_column('keyworddefs', 'id',
-        {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  $dbh->bz_add_column('versions', 'id',
+    {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  $dbh->bz_add_column('milestones', 'id',
+    {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
 
-    # 2006-08-19 LpSolit@gmail.com - Bug 87795
-    $dbh->bz_alter_column('tokens', 'userid', {TYPE => 'INT3'});
+  _fix_uppercase_custom_field_names();
+  _fix_uppercase_index_names();
 
-    $dbh->bz_drop_index('bugs', 'bugs_short_desc_idx');
+  # 2007-05-17 LpSolit@gmail.com - Bug 344965
+  _initialize_workflow_for_upgrade($old_params);
 
-    # The profiles table was missing some defaults.
-    $dbh->bz_alter_column('profiles', 'disabledtext',
-        {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"});
-    $dbh->bz_alter_column('profiles', 'realname',
-        {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"});
+  # 2007-08-08 LpSolit@gmail.com - Bug 332149
+  $dbh->bz_add_column('groups', 'icon_url', {TYPE => 'TINYTEXT'});
 
-    _update_longdescs_who_index();
+  # 2007-08-21 wurblzap@gmail.com - Bug 365378
+  _make_lang_setting_dynamic();
 
-    $dbh->bz_add_column('setting', 'subclass', {TYPE => 'varchar(32)'});
+  # 2007-11-29 xiaoou.wu@oracle.com - Bug 153129
+  _change_text_types();
 
-    $dbh->bz_alter_column('longdescs', 'thetext', 
-        {TYPE => 'LONGTEXT', NOTNULL => 1}, '');
+  # 2007-09-09 LpSolit@gmail.com - Bug 99215
+  _fix_attachment_modification_date();
 
-    # 2006-10-20 LpSolit@gmail.com - Bug 189627
-    $dbh->bz_add_column('group_control_map', 'editcomponents',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->bz_add_column('group_control_map', 'editbugs',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->bz_add_column('group_control_map', 'canconfirm',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_drop_index('longdescs', 'longdescs_thetext_idx');
+  _populate_bugs_fulltext();
 
-    # 2006-11-07 LpSolit@gmail.com - Bug 353656
-    $dbh->bz_add_column('longdescs', 'type',
-                        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => '0'});
-    $dbh->bz_add_column('longdescs', 'extra_data', {TYPE => 'varchar(255)'});
+  # 2008-01-18 xiaoou.wu@oracle.com - Bug 414292
+  $dbh->bz_alter_column('series', 'query', {TYPE => 'MEDIUMTEXT', NOTNULL => 1});
 
-    $dbh->bz_add_column('versions', 'id', 
-        {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
-    $dbh->bz_add_column('milestones', 'id',
-        {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # Add FK to multi select field tables
+  _add_foreign_keys_to_multiselects();
 
-    _fix_uppercase_custom_field_names();
-    _fix_uppercase_index_names();
+  # 2008-07-28 tfu@redhat.com - Bug 431669
+  $dbh->bz_alter_column('group_control_map', 'product_id',
+    {TYPE => 'INT2', NOTNULL => 1});
 
-    # 2007-05-17 LpSolit@gmail.com - Bug 344965
-    _initialize_workflow_for_upgrade($old_params);
+  # 2008-09-07 LpSolit@gmail.com - Bug 452893
+  _fix_illegal_flag_modification_dates();
 
-    # 2007-08-08 LpSolit@gmail.com - Bug 332149
-    $dbh->bz_add_column('groups', 'icon_url', {TYPE => 'TINYTEXT'});
+  _add_visiblity_value_to_value_tables();
 
-    # 2007-08-21 wurblzap@gmail.com - Bug 365378
-    _make_lang_setting_dynamic();
-    
-    # 2007-11-29 xiaoou.wu@oracle.com - Bug 153129
-    _change_text_types();
+  # 2009-03-02 arbingersys@gmail.com - Bug 423613
+  _add_extern_id_index();
 
-    # 2007-09-09 LpSolit@gmail.com - Bug 99215
-    _fix_attachment_modification_date();
+  # 2009-03-31 LpSolit@gmail.com - Bug 478972
+  $dbh->bz_alter_column('group_control_map', 'entry',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_alter_column('group_control_map', 'canedit',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
 
-    $dbh->bz_drop_index('longdescs', 'longdescs_thetext_idx');
-    _populate_bugs_fulltext();
+  # 2009-01-16 oreomike@gmail.com - Bug 302420
+  $dbh->bz_add_column('whine_events', 'mailifnobugs',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
 
-    # 2008-01-18 xiaoou.wu@oracle.com - Bug 414292
-    $dbh->bz_alter_column('series', 'query',
-        { TYPE => 'MEDIUMTEXT', NOTNULL => 1 });
+  _convert_disallownew_to_isactive();
 
-    # Add FK to multi select field tables
-    _add_foreign_keys_to_multiselects();
+  $dbh->bz_alter_column('bugs_activity', 'added', {TYPE => 'varchar(255)'});
+  $dbh->bz_add_index('bugs_activity', 'bugs_activity_added_idx', ['added']);
 
-    # 2008-07-28 tfu@redhat.com - Bug 431669
-    $dbh->bz_alter_column('group_control_map', 'product_id',
-        { TYPE => 'INT2', NOTNULL => 1 });
+  # 2009-09-28 LpSolit@gmail.com - Bug 519032
+  $dbh->bz_drop_column('series', 'last_viewed');
 
-    # 2008-09-07 LpSolit@gmail.com - Bug 452893
-    _fix_illegal_flag_modification_dates();
+  # 2009-09-28 LpSolit@gmail.com - Bug 399073
+  _fix_logincookies_ipaddr();
 
-    _add_visiblity_value_to_value_tables();
+  # 2009-11-01 LpSolit@gmail.com - Bug 525025
+  _fix_invalid_custom_field_names();
 
-    # 2009-03-02 arbingersys@gmail.com - Bug 423613
-    _add_extern_id_index();
+  _set_attachment_comment_types();
 
-    # 2009-03-31 LpSolit@gmail.com - Bug 478972
-    $dbh->bz_alter_column('group_control_map', 'entry',
-                          {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->bz_alter_column('group_control_map', 'canedit',
-                          {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_drop_column('products', 'milestoneurl');
 
-    # 2009-01-16 oreomike@gmail.com - Bug 302420
-    $dbh->bz_add_column('whine_events', 'mailifnobugs',
-        { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-        
-    _convert_disallownew_to_isactive();
+  _add_allows_unconfirmed_to_product_table();
+  _convert_flagtypes_fks_to_set_null();
+  _fix_decimal_types();
+  _fix_series_creator_fk();
 
-    $dbh->bz_alter_column('bugs_activity', 'added', 
-        { TYPE => 'varchar(255)' });
-    $dbh->bz_add_index('bugs_activity', 'bugs_activity_added_idx', ['added']);
+  # 2009-11-14 dkl@redhat.com - Bug 310450
+  $dbh->bz_add_column('bugs_activity', 'comment_id', {TYPE => 'INT4'});
 
-    # 2009-09-28 LpSolit@gmail.com - Bug 519032
-    $dbh->bz_drop_column('series', 'last_viewed');
+  # 2010-04-07 LpSolit@gmail.com - Bug 69621
+  $dbh->bz_drop_column('bugs', 'keywords');
 
-    # 2009-09-28 LpSolit@gmail.com - Bug 399073
-    _fix_logincookies_ipaddr();
+  # 2010-05-07 ewong@pw-wspx.org - Bug 463945
+  $dbh->bz_alter_column('group_control_map', 'membercontrol',
+    {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA});
+  $dbh->bz_alter_column('group_control_map', 'othercontrol',
+    {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA});
 
-    # 2009-11-01 LpSolit@gmail.com - Bug 525025
-    _fix_invalid_custom_field_names();
+  # Add NOT NULL to some columns that need it, and DEFAULT to
+  # attachments.ispatch.
+  $dbh->bz_alter_column('attachments', 'ispatch',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  $dbh->bz_alter_column('keyworddefs', 'description',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
+  $dbh->bz_alter_column('products', 'description',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
 
-    _set_attachment_comment_types();
+  # Change the default of allows_unconfirmed to TRUE as part
+  # of the new workflow.
+  $dbh->bz_alter_column('products', 'allows_unconfirmed',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
 
-    $dbh->bz_drop_column('products', 'milestoneurl');
+  # 2010-07-18 LpSolit@gmail.com - Bug 119703
+  _remove_attachment_isurl();
 
-    _add_allows_unconfirmed_to_product_table();
-    _convert_flagtypes_fks_to_set_null();
-    _fix_decimal_types();
-    _fix_series_creator_fk();
+  # 2009-05-07 ghendricks@novell.com - Bug 77193
+  _add_isactive_to_product_fields();
 
-    # 2009-11-14 dkl@redhat.com - Bug 310450
-    $dbh->bz_add_column('bugs_activity', 'comment_id', {TYPE => 'INT4'});
+  # 2010-10-09 LpSolit@gmail.com - Bug 505165
+  $dbh->bz_alter_column('flags', 'setter_id', {TYPE => 'INT3', NOTNULL => 1});
 
-    # 2010-04-07 LpSolit@gmail.com - Bug 69621
-    $dbh->bz_drop_column('bugs', 'keywords');
-    
-    # 2010-05-07 ewong@pw-wspx.org - Bug 463945
-    $dbh->bz_alter_column('group_control_map', 'membercontrol',
-                          {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA});
-    $dbh->bz_alter_column('group_control_map', 'othercontrol',
-                          {TYPE => 'INT1', NOTNULL => 1, DEFAULT => CONTROLMAPNA});
+  # 2010-10-09 LpSolit@gmail.com - Bug 451735
+  _fix_series_indexes();
 
-    # Add NOT NULL to some columns that need it, and DEFAULT to
-    # attachments.ispatch.
-    $dbh->bz_alter_column('attachments', 'ispatch', 
-        { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-    $dbh->bz_alter_column('keyworddefs', 'description',
-                          { TYPE => 'MEDIUMTEXT', NOTNULL => 1 }, '');
-    $dbh->bz_alter_column('products', 'description',
-                          { TYPE => 'MEDIUMTEXT', NOTNULL => 1 }, '');
+  $dbh->bz_add_column('bug_see_also', 'id',
+    {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
 
-    # Change the default of allows_unconfirmed to TRUE as part
-    # of the new workflow.
-    $dbh->bz_alter_column('products', 'allows_unconfirmed',
-        { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE' });
+  _rename_tags_to_tag();
 
-    # 2010-07-18 LpSolit@gmail.com - Bug 119703
-    _remove_attachment_isurl();
+  # 2011-01-29 LpSolit@gmail.com - Bug 616185
+  _migrate_user_tags();
 
-    # 2009-05-07 ghendricks@novell.com - Bug 77193
-    _add_isactive_to_product_fields();
+  _populate_bug_see_also_class();
 
-    # 2010-10-09 LpSolit@gmail.com - Bug 505165
-    $dbh->bz_alter_column('flags', 'setter_id', {TYPE => 'INT3', NOTNULL => 1});
+  # 2011-06-15 dkl@mozilla.com - Bug 658929
+  _migrate_disabledtext_boolean();
 
-    # 2010-10-09 LpSolit@gmail.com - Bug 451735
-    _fix_series_indexes();
+  # 2011-11-01 glob@mozilla.com - Bug 240437
+  $dbh->bz_add_column('profiles', 'last_seen_date', {TYPE => 'DATETIME'});
 
-    $dbh->bz_add_column('bug_see_also', 'id',
-        {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # 2011-10-11 miketosh - Bug 690173
+  _on_delete_set_null_for_audit_log_userid();
 
-    _rename_tags_to_tag();
+  # 2011-11-23 gerv@gerv.net - Bug 705058 - make filenames longer
+  $dbh->bz_alter_column('attachments', 'filename',
+    {TYPE => 'varchar(255)', NOTNULL => 1});
 
-    # 2011-01-29 LpSolit@gmail.com - Bug 616185
-    _migrate_user_tags();
+  # 2011-11-28 dkl@mozilla.com - Bug 685611
+  _fix_notnull_defaults();
 
-    _populate_bug_see_also_class();
+  # 2012-02-15 LpSolit@gmail.com - Bug 722113
+  if ($dbh->bz_index_info('profile_search', 'profile_search_user_id')) {
+    $dbh->bz_drop_index('profile_search', 'profile_search_user_id');
+    $dbh->bz_add_index('profile_search', 'profile_search_user_id_idx',
+      [qw(user_id)]);
+  }
 
-    # 2011-06-15 dkl@mozilla.com - Bug 658929
-    _migrate_disabledtext_boolean();
+  # 2012-03-23 LpSolit@gmail.com - Bug 448551
+  $dbh->bz_alter_column('bugs', 'target_milestone',
+    {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"});
 
-    # 2011-11-01 glob@mozilla.com - Bug 240437
-    $dbh->bz_add_column('profiles', 'last_seen_date', {TYPE => 'DATETIME'});
+  $dbh->bz_alter_column('milestones', 'value',
+    {TYPE => 'varchar(64)', NOTNULL => 1});
 
-    # 2011-10-11 miketosh - Bug 690173
-    _on_delete_set_null_for_audit_log_userid();
-    
-    # 2011-11-23 gerv@gerv.net - Bug 705058 - make filenames longer
-    $dbh->bz_alter_column('attachments', 'filename', 
-                                    { TYPE => 'varchar(255)', NOTNULL => 1 });
+  $dbh->bz_alter_column('products', 'defaultmilestone',
+    {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"});
 
-    # 2011-11-28 dkl@mozilla.com - Bug 685611
-    _fix_notnull_defaults();
+  # 2012-04-15 Frank@Frank-Becker.de - Bug 740536
+  $dbh->bz_add_index('audit_log', 'audit_log_class_idx', ['class', 'at_time']);
 
-    # 2012-02-15 LpSolit@gmail.com - Bug 722113
-    if ($dbh->bz_index_info('profile_search', 'profile_search_user_id')) {
-        $dbh->bz_drop_index('profile_search', 'profile_search_user_id');
-        $dbh->bz_add_index('profile_search', 'profile_search_user_id_idx', [qw(user_id)]);
-    }
+  # 2012-06-06 dkl@mozilla.com - Bug 762288
+  $dbh->bz_alter_column('bugs_activity', 'removed', {TYPE => 'varchar(255)'});
+  $dbh->bz_add_index('bugs_activity', 'bugs_activity_removed_idx', ['removed']);
 
-    # 2012-03-23 LpSolit@gmail.com - Bug 448551
-    $dbh->bz_alter_column('bugs', 'target_milestone',
-                          {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"});
+  # 2012-06-13 dkl@mozilla.com - Bug 764457
+  $dbh->bz_add_column('bugs_activity', 'id',
+    {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
 
-    $dbh->bz_alter_column('milestones', 'value', {TYPE => 'varchar(64)', NOTNULL => 1});
+  # 2012-06-13 dkl@mozilla.com - Bug 764466
+  $dbh->bz_add_column('profiles_activity', 'id',
+    {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
 
-    $dbh->bz_alter_column('products', 'defaultmilestone',
-                          {TYPE => 'varchar(64)', NOTNULL => 1, DEFAULT => "'---'"});
+  # 2012-07-24 dkl@mozilla.com - Bug 776972
+  $dbh->bz_alter_column('bugs_activity', 'id',
+    {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
 
-    # 2012-04-15 Frank@Frank-Becker.de - Bug 740536
-    $dbh->bz_add_index('audit_log', 'audit_log_class_idx', ['class', 'at_time']);
 
-    # 2012-06-06 dkl@mozilla.com - Bug 762288
-    $dbh->bz_alter_column('bugs_activity', 'removed', 
-                          { TYPE => 'varchar(255)' });
-    $dbh->bz_add_index('bugs_activity', 'bugs_activity_removed_idx', ['removed']);
+  # 2012-07-24 dkl@mozilla.com - Bug 776982
+  _fix_longdescs_primary_key();
 
-    # 2012-06-13 dkl@mozilla.com - Bug 764457
-    $dbh->bz_add_column('bugs_activity', 'id', 
-                        {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # 2012-08-02 dkl@mozilla.com - Bug 756953
+  _fix_dependencies_dupes();
 
-    # 2012-06-13 dkl@mozilla.com - Bug 764466
-    $dbh->bz_add_column('profiles_activity', 'id', 
-                        {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # 2012-08-01 koosha.khajeh@gmail.com - Bug 187753
+  _shorten_long_quips();
 
-    # 2012-07-24 dkl@mozilla.com - Bug 776972
-    $dbh->bz_alter_column('bugs_activity', 'id', 
-                          {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # 2012-12-29 reed@reedloden.com - Bug 785283
+  _add_password_salt_separator();
 
+  # 2013-01-02 LpSolit@gmail.com - Bug 824361
+  _fix_longdescs_indexes();
 
-    # 2012-07-24 dkl@mozilla.com - Bug 776982
-    _fix_longdescs_primary_key();
+  # 2013-02-04 dkl@mozilla.com - Bug 824346
+  _fix_flagclusions_indexes();
 
-    # 2012-08-02 dkl@mozilla.com - Bug 756953
-    _fix_dependencies_dupes();
+  # 2013-08-26 sgreen@redhat.com - Bug 903895
+  _fix_components_primary_key();
 
-    # 2012-08-01 koosha.khajeh@gmail.com - Bug 187753
-    _shorten_long_quips();
+  # 2014-06-09 dylan@mozilla.com - Bug 1022923
+  $dbh->bz_add_index('bug_user_last_visit',
+    'bug_user_last_visit_last_visit_ts_idx',
+    ['last_visit_ts']);
 
-    # 2012-12-29 reed@reedloden.com - Bug 785283
-    _add_password_salt_separator();
+  # 2014-07-14 sgreen@redhat.com - Bug 726696
+  $dbh->bz_alter_column('tokens', 'tokentype',
+    {TYPE => 'varchar(16)', NOTNULL => 1});
 
-    # 2013-01-02 LpSolit@gmail.com - Bug 824361
-    _fix_longdescs_indexes();
+  # 2014-07-27 LpSolit@gmail.com - Bug 1044561
+  _fix_user_api_keys_indexes();
 
-    # 2013-02-04 dkl@mozilla.com - Bug 824346
-    _fix_flagclusions_indexes();
+  # 2014-08-11 sgreen@redhat.com - Bug 1012506
+  _update_alias();
 
-    # 2013-08-26 sgreen@redhat.com - Bug 903895
-    _fix_components_primary_key();
+  # 2014-08-14 koosha.khajeh@gmail.com - Bug 330707
+  $dbh->bz_add_column('longdescs', 'is_markdown',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
 
-    # 2014-06-09 dylan@mozilla.com - Bug 1022923
-    $dbh->bz_add_index('bug_user_last_visit',
-                       'bug_user_last_visit_last_visit_ts_idx',
-                       ['last_visit_ts']);
+  # 2014-11-18 dylan@mozilla.com - Bug 69267
+  $dbh->bz_add_column('keyworddefs', 'is_active',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
 
-    # 2014-07-14 sgreen@redhat.com - Bug 726696
-    $dbh->bz_alter_column('tokens', 'tokentype',
-                          {TYPE => 'varchar(16)', NOTNULL => 1});
+  # 2015-07-25 dylan@mozilla.com - Bug 1179856
+  $dbh->bz_alter_column('tokens', 'token',
+    {TYPE => 'varchar(22)', NOTNULL => 1, PRIMARYKEY => 1});
+  $dbh->bz_alter_column('logincookies', 'cookie',
+    {TYPE => 'varchar(22)', NOTNULL => 1, PRIMARYKEY => 1});
 
-    # 2014-07-27 LpSolit@gmail.com - Bug 1044561
-    _fix_user_api_keys_indexes();
+  # 2015-07-16 LpSolit@gmail.com - Bug 946780
+  $dbh->bz_add_index('bz_schema', 'bz_schema_version_idx',
+    {FIELDS => ['version'], TYPE => 'UNIQUE'});
 
-    # 2014-08-11 sgreen@redhat.com - Bug 1012506
-     _update_alias();
+  # 2015-12-16 LpSolit@gmail.com - Bug 1232578
+  _sanitize_audit_log_table();
 
-    # 2014-08-14 koosha.khajeh@gmail.com - Bug 330707
-    $dbh->bz_add_column('longdescs', 'is_markdown',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  # 2016-04-27 wurblzap@gmail.com and gerv@gerv.net - Bug 218917
+  # Split login_name into login_name and email columns
+  _split_login_and_email($old_params);
 
-    ################################################################
-    # New --TABLE-- changes should go *** A B O V E *** this point #
-    ################################################################
+  ################################################################
+  # New --TABLE-- changes should go *** A B O V E *** this point #
+  ################################################################
 
-    Bugzilla::Hook::process('install_update_db');
+  Bugzilla::Hook::process('install_update_db');
 
-    # We do this here because otherwise the foreign key from 
-    # products.classification_id to classifications.id will fail
-    # (because products.classification_id defaults to "1", so on upgraded
-    # installations it's already been set before the first Classification
-    # exists).
-    Bugzilla::Install::create_default_classification();
+  # We do this here because otherwise the foreign key from
+  # products.classification_id to classifications.id will fail
+  # (because products.classification_id defaults to "1", so on upgraded
+  # installations it's already been set before the first Classification
+  # exists).
+  Bugzilla::Install::create_default_classification();
 
-    $dbh->bz_setup_foreign_keys();
+  $dbh->bz_setup_foreign_keys();
 }
 
 # Subroutines should be ordered in the order that they are called.
 # Thus, newer subroutines should be at the bottom.
 
 sub _update_pre_checksetup_bugzillas {
-    my $dbh = Bugzilla->dbh;
-    # really old fields that were added before checksetup.pl existed
-    # but aren't in very old bugzilla's (like 2.1)
-    # Steve Stock (sstock@iconnect-inc.com)
-
-    $dbh->bz_add_column('bugs', 'target_milestone',
-        {TYPE => 'varchar(20)', NOTNULL => 1, DEFAULT => "'---'"});
-    $dbh->bz_add_column('bugs', 'qa_contact', {TYPE => 'INT3'});
-    $dbh->bz_add_column('bugs', 'status_whiteboard',
-                       {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"});
-    if (!$dbh->bz_column_info('products', 'isactive')){
-        $dbh->bz_add_column('products', 'disallownew',
-                            {TYPE => 'BOOLEAN', NOTNULL => 1}, 0);
-    }
-
-    $dbh->bz_add_column('components', 'initialqacontact',
-                        {TYPE => 'TINYTEXT'});
-    $dbh->bz_add_column('components', 'description',
-                        {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
+  my $dbh = Bugzilla->dbh;
+
+  # really old fields that were added before checksetup.pl existed
+  # but aren't in very old bugzilla's (like 2.1)
+  # Steve Stock (sstock@iconnect-inc.com)
+
+  $dbh->bz_add_column('bugs', 'target_milestone',
+    {TYPE => 'varchar(20)', NOTNULL => 1, DEFAULT => "'---'"});
+  $dbh->bz_add_column('bugs', 'qa_contact', {TYPE => 'INT3'});
+  $dbh->bz_add_column('bugs', 'status_whiteboard',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"});
+  if (!$dbh->bz_column_info('products', 'isactive')) {
+    $dbh->bz_add_column('products', 'disallownew',
+      {TYPE => 'BOOLEAN', NOTNULL => 1}, 0);
+  }
+
+  $dbh->bz_add_column('components', 'initialqacontact', {TYPE => 'TINYTEXT'});
+  $dbh->bz_add_column('components', 'description',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
 }
 
 sub _add_bug_vote_cache {
-    my $dbh = Bugzilla->dbh;
-    # 1999-10-11 Restructured voting database to add a cached value in each 
-    # bug recording how many total votes that bug has.  While I'm at it, 
-    # I removed the unused "area" field from the bugs database.  It is 
-    # distressing to realize that the bugs table has reached the maximum 
-    # number of indices allowed by MySQL (16), which may make future 
-    # enhancements awkward.
-    # (P.S. All is not lost; it appears that the latest betas of MySQL 
-    # support a new table format which will allow 32 indices.)
-
-    if ($dbh->bz_column_info('bugs', 'area')) {
-        $dbh->bz_drop_column('bugs', 'area');
-        $dbh->bz_add_column('bugs', 'votes', {TYPE => 'INT3', NOTNULL => 1,
-                                              DEFAULT => 0});
-        $dbh->bz_add_index('bugs', 'bugs_votes_idx', [qw(votes)]);
-        $dbh->bz_add_column('products', 'votesperuser',
-                            {TYPE => 'INT2', NOTNULL => 1}, 0);
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # 1999-10-11 Restructured voting database to add a cached value in each
+  # bug recording how many total votes that bug has.  While I'm at it,
+  # I removed the unused "area" field from the bugs database.  It is
+  # distressing to realize that the bugs table has reached the maximum
+  # number of indices allowed by MySQL (16), which may make future
+  # enhancements awkward.
+  # (P.S. All is not lost; it appears that the latest betas of MySQL
+  # support a new table format which will allow 32 indices.)
+
+  if ($dbh->bz_column_info('bugs', 'area')) {
+    $dbh->bz_drop_column('bugs', 'area');
+    $dbh->bz_add_column('bugs', 'votes',
+      {TYPE => 'INT3', NOTNULL => 1, DEFAULT => 0});
+    $dbh->bz_add_index('bugs', 'bugs_votes_idx', [qw(votes)]);
+    $dbh->bz_add_column('products', 'votesperuser', {TYPE => 'INT2', NOTNULL => 1},
+      0);
+  }
 }
 
 sub _update_product_name_definition {
-    my $dbh = Bugzilla->dbh;
-    # The product name used to be very different in various tables.
-    #
-    # It was   varchar(16)   in bugs
-    #          tinytext      in components
-    #          tinytext      in products
-    #          tinytext      in versions
-    #
-    # tinytext is equivalent to varchar(255), which is quite huge, so I change
-    # them all to varchar(64).
-
-    # Only do this if these fields still exist - they're removed in
-    # a later change
-    if ($dbh->bz_column_info('products', 'product')) {
-        $dbh->bz_alter_column('bugs',       'product',
-                             {TYPE => 'varchar(64)', NOTNULL => 1});
-        $dbh->bz_alter_column('components', 'program', {TYPE => 'varchar(64)'});
-        $dbh->bz_alter_column('products',   'product', {TYPE => 'varchar(64)'});
-        $dbh->bz_alter_column('versions',   'program',
-                              {TYPE => 'varchar(64)', NOTNULL => 1});
+  my $dbh = Bugzilla->dbh;
+
+  # The product name used to be very different in various tables.
+  #
+  # It was   varchar(16)   in bugs
+  #          tinytext      in components
+  #          tinytext      in products
+  #          tinytext      in versions
+  #
+  # tinytext is equivalent to varchar(255), which is quite huge, so I change
+  # them all to varchar(64).
+
+  # Only do this if these fields still exist - they're removed in
+  # a later change
+  if ($dbh->bz_column_info('products', 'product')) {
+    $dbh->bz_alter_column('bugs', 'product', {TYPE => 'varchar(64)', NOTNULL => 1});
+    $dbh->bz_alter_column('components', 'program', {TYPE => 'varchar(64)'});
+    $dbh->bz_alter_column('products',   'product', {TYPE => 'varchar(64)'});
+    $dbh->bz_alter_column('versions', 'program',
+      {TYPE => 'varchar(64)', NOTNULL => 1});
+  }
+}
+
+sub _update_flagtypes_id {
+  my $dbh   = Bugzilla->dbh;
+  my @fixes = (
+    {table => 'flaginclusions', column => 'type_id'},
+    {table => 'flagexclusions', column => 'type_id'},
+    {table => 'flags',          column => 'type_id'},
+  );
+  my $flagtypes_def = $dbh->bz_column_info('flagtypes', 'id');
+  foreach my $fix (@fixes) {
+    my $def = $dbh->bz_column_info($fix->{table}, $fix->{column});
+    if ($def->{TYPE} eq 'INT2') {
+      warn "Dropping $fix->{table}\n";
+      $dbh->bz_drop_related_fks($fix->{table}, $fix->{column});
+      $def->{TYPE} = 'INT3';
+      $dbh->bz_alter_column($fix->{table}, $fix->{column}, $def);
     }
+  }
+
+  if ($flagtypes_def->{TYPE} eq 'SMALLSERIAL') {
+    $flagtypes_def->{TYPE} = 'MEDIUMSERIAL';
+    $dbh->bz_alter_column('flagtypes', 'id', $flagtypes_def);
+  }
 }
 
 # A helper for the function below.
 sub _write_one_longdesc {
-    my ($id, $who, $when, $buffer) = (@_);
-    my $dbh = Bugzilla->dbh;
-    $buffer = trim($buffer);
-    return if !$buffer;
-    $dbh->do("INSERT INTO longdescs (bug_id, who, bug_when, thetext)
-                   VALUES (?,?,?,?)", undef, $id, $who, 
-             time2str("%Y/%m/%d %H:%M:%S", $when), $buffer);
+  my ($id, $who, $when, $buffer) = (@_);
+  my $dbh = Bugzilla->dbh;
+  $buffer = trim($buffer);
+  return if !$buffer;
+  $dbh->do(
+    "INSERT INTO longdescs (bug_id, who, bug_when, thetext)
+                   VALUES (?,?,?,?)", undef, $id, $who,
+    time2str("%Y/%m/%d %H:%M:%S", $when), $buffer
+  );
 }
 
 sub _populate_longdescs {
-    my $dbh = Bugzilla->dbh;
-    # 2000-01-20 Added a new "longdescs" table, which is supposed to have 
-    # all the long descriptions in it, replacing the old long_desc field 
-    # in the bugs table. The below hideous code populates this new table 
-    # with things from the old field, with ugly parsing and heuristics.
-
-    if ($dbh->bz_column_info('bugs', 'long_desc')) {
-        my ($total) = $dbh->selectrow_array("SELECT COUNT(*) FROM bugs");
-
-        print "Populating new long_desc table. This is slow. There are",
-              " $total\nbugs to process; a line of dots will be printed",
-              " for each 50.\n\n";
-        local $| = 1;
-
-        # On MySQL, longdescs doesn't benefit from transactions, but this
-        # doesn't hurt.
-        $dbh->bz_start_transaction();
-
-        $dbh->do('DELETE FROM longdescs');
-
-        my $sth = $dbh->prepare("SELECT bug_id, creation_ts, reporter,
-                                        long_desc FROM bugs ORDER BY bug_id");
-        $sth->execute();
-        my $count = 0;
-        while (my ($id, $createtime, $reporterid, $desc) = 
-                   $sth->fetchrow_array()) 
+  my $dbh = Bugzilla->dbh;
+
+  # 2000-01-20 Added a new "longdescs" table, which is supposed to have
+  # all the long descriptions in it, replacing the old long_desc field
+  # in the bugs table. The below hideous code populates this new table
+  # with things from the old field, with ugly parsing and heuristics.
+
+  if ($dbh->bz_column_info('bugs', 'long_desc')) {
+    my ($total) = $dbh->selectrow_array("SELECT COUNT(*) FROM bugs");
+
+    print "Populating new long_desc table. This is slow. There are",
+      " $total\nbugs to process; a line of dots will be printed",
+      " for each 50.\n\n";
+    local $| = 1;
+
+    # On MySQL, longdescs doesn't benefit from transactions, but this
+    # doesn't hurt.
+    $dbh->bz_start_transaction();
+
+    $dbh->do('DELETE FROM longdescs');
+
+    my $sth = $dbh->prepare(
+      "SELECT bug_id, creation_ts, reporter,
+                                        long_desc FROM bugs ORDER BY bug_id"
+    );
+    $sth->execute();
+    my $count = 0;
+    while (my ($id, $createtime, $reporterid, $desc) = $sth->fetchrow_array()) {
+      $count++;
+      indicate_progress({total => $total, current => $count});
+      $desc =~ s/\r//g;
+      my $who    = $reporterid;
+      my $when   = str2time($createtime);
+      my $buffer = "";
+      foreach my $line (split(/\n/, $desc)) {
+        $line =~ s/\s+$//g;    # Trim trailing whitespace.
+        if ($line =~ /^------- Additional Comments From ([^\s]+)\s+(\d.+\d)\s+-------$/)
         {
-            $count++;
-            indicate_progress({ total => $total, current => $count });
-            $desc =~ s/\r//g;
-            my $who = $reporterid;
-            my $when = str2time($createtime);
-            my $buffer = "";
-            foreach my $line (split(/\n/, $desc)) {
-                $line =~ s/\s+$//g; # Trim trailing whitespace.
-                if ($line =~ /^------- Additional Comments From ([^\s]+)\s+(\d.+\d)\s+-------$/) 
-                {
-                    my $name = $1;
-                    my $date = str2time($2);
-                    # Oy, what a hack.  The creation time is accurate to the
-                    # second. But the long text only contains things accurate
-                    # to the And so, if someone makes a comment within a 
-                    # minute of the original bug creation, then the comment can
-                    # come *before* the bug creation.  So, we add 59 seconds to
-                    # the time of all comments, so that they are always 
-                    # considered to have happened at the *end* of the given
-                    # minute, not the beginning.
-                    $date += 59;
-                    if ($date >= $when) {
-                        _write_one_longdesc($id, $who, $when, $buffer);
-                        $buffer = "";
-                        $when = $date;
-                        my $s2 = $dbh->prepare("SELECT userid FROM profiles " .
-                                                "WHERE login_name = ?");
-                        $s2->execute($name);
-                        ($who) = ($s2->fetchrow_array());
-
-                        if (!$who) {
-                            # This username doesn't exist.  Maybe someone
-                            # renamed them or something.  Invent a new profile
-                            # entry disabled, just to represent them.
-                            $dbh->do("INSERT INTO profiles (login_name, 
+          my $name = $1;
+          my $date = str2time($2);
+
+          # Oy, what a hack.  The creation time is accurate to the
+          # second. But the long text only contains things accurate
+          # to the And so, if someone makes a comment within a
+          # minute of the original bug creation, then the comment can
+          # come *before* the bug creation.  So, we add 59 seconds to
+          # the time of all comments, so that they are always
+          # considered to have happened at the *end* of the given
+          # minute, not the beginning.
+          $date += 59;
+          if ($date >= $when) {
+            _write_one_longdesc($id, $who, $when, $buffer);
+            $buffer = "";
+            $when   = $date;
+            my $s2 = $dbh->prepare("SELECT userid FROM profiles " . "WHERE login_name = ?");
+            $s2->execute($name);
+            ($who) = ($s2->fetchrow_array());
+
+            if (!$who) {
+
+              # This username doesn't exist.  Maybe someone
+              # renamed them or something.  Invent a new profile
+              # entry disabled, just to represent them.
+              $dbh->do(
+                "INSERT INTO profiles (login_name, 
                                       cryptpassword, disabledtext) 
                                       VALUES (?,?,?)", undef, $name, '*',
-                                      "Account created only to maintain"
-                                      . " database integrity");
-                            $who = $dbh->bz_last_key('profiles', 'userid');
-                        }
-                        next;
-                    }
-                }
-                $buffer .= $line . "\n";
+                "Account created only to maintain" . " database integrity"
+              );
+              $who = $dbh->bz_last_key('profiles', 'userid');
             }
-            _write_one_longdesc($id, $who, $when, $buffer);
-        } # while loop
+            next;
+          }
+        }
+        $buffer .= $line . "\n";
+      }
+      _write_one_longdesc($id, $who, $when, $buffer);
+    }    # while loop
 
-        print "\n\n";
-        $dbh->bz_drop_column('bugs', 'long_desc');
-        $dbh->bz_commit_transaction();
-    } # main if
+    print "\n\n";
+    $dbh->bz_drop_column('bugs', 'long_desc');
+    $dbh->bz_commit_transaction();
+  }    # main if
 }
 
 sub _update_bugs_activity_field_to_fieldid {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    # 2000-01-18 Added a new table fielddefs that records information about the
-    # different fields we keep an activity log on.  The bugs_activity table
-    # now has a pointer into that table instead of recording the name directly.
-    if ($dbh->bz_column_info('bugs_activity', 'field')) {
-        $dbh->bz_add_column('bugs_activity', 'fieldid',
-                            {TYPE => 'INT3', NOTNULL => 1}, 0);
+  # 2000-01-18 Added a new table fielddefs that records information about the
+  # different fields we keep an activity log on.  The bugs_activity table
+  # now has a pointer into that table instead of recording the name directly.
+  if ($dbh->bz_column_info('bugs_activity', 'field')) {
+    $dbh->bz_add_column('bugs_activity', 'fieldid', {TYPE => 'INT3', NOTNULL => 1},
+      0);
 
-        $dbh->bz_add_index('bugs_activity', 'bugs_activity_fieldid_idx',
-                           [qw(fieldid)]);
-        print "Populating new bugs_activity.fieldid field...\n";
+    $dbh->bz_add_index('bugs_activity', 'bugs_activity_fieldid_idx', [qw(fieldid)]);
+    print "Populating new bugs_activity.fieldid field...\n";
 
-        $dbh->bz_start_transaction();
+    $dbh->bz_start_transaction();
 
-        my $ids = $dbh->selectall_arrayref(
-            'SELECT DISTINCT fielddefs.id, bugs_activity.field
+    my $ids = $dbh->selectall_arrayref(
+      'SELECT DISTINCT fielddefs.id, bugs_activity.field
                FROM bugs_activity LEFT JOIN fielddefs 
-                    ON bugs_activity.field = fielddefs.name', {Slice=>{}});
-
-        foreach my $item (@$ids) {
-            my $id    = $item->{id};
-            my $field = $item->{field};
-            # If the id is NULL
-            if (!$id) {
-                $dbh->do("INSERT INTO fielddefs (name, description) VALUES " .
-                         "(?, ?)", undef, $field, $field);
-                $id = $dbh->bz_last_key('fielddefs', 'id');
-            }
-            $dbh->do("UPDATE bugs_activity SET fieldid = ? WHERE field = ?",
-                     undef, $id, $field);
-        }
-        $dbh->bz_commit_transaction();
+                    ON bugs_activity.field = fielddefs.name', {Slice => {}}
+    );
 
-        $dbh->bz_drop_column('bugs_activity', 'field');
+    foreach my $item (@$ids) {
+      my $id    = $item->{id};
+      my $field = $item->{field};
+
+      # If the id is NULL
+      if (!$id) {
+        $dbh->do("INSERT INTO fielddefs (name, description) VALUES " . "(?, ?)",
+          undef, $field, $field);
+        $id = $dbh->bz_last_key('fielddefs', 'id');
+      }
+      $dbh->do("UPDATE bugs_activity SET fieldid = ? WHERE field = ?",
+        undef, $id, $field);
     }
+    $dbh->bz_commit_transaction();
+
+    $dbh->bz_drop_column('bugs_activity', 'field');
+  }
 }
 
 sub _add_unique_login_name_index_to_profiles {
-    my $dbh = Bugzilla->dbh;
-
-    # 2000-01-22 The "login_name" field in the "profiles" table was not
-    # declared to be unique.  Sure enough, somehow, I got 22 duplicated entries
-    # in my database.  This code detects that, cleans up the duplicates, and
-    # then tweaks the table to declare the field to be unique.  What a pain.
-    if (!$dbh->bz_index_info('profiles', 'profiles_login_name_idx')
-        || !$dbh->bz_index_info('profiles', 'profiles_login_name_idx')->{TYPE})
-    {
-        print "Searching for duplicate entries in the profiles table...\n";
-        while (1) {
-            # This code is weird in that it loops around and keeps doing this
-            # select again.  That's because I'm paranoid about deleting entries
-            # out from under us in the profiles table.  Things get weird if
-            # there are *three* or more entries for the same user...
-            my $sth = $dbh->prepare("SELECT p1.userid, p2.userid, p1.login_name
+  my $dbh = Bugzilla->dbh;
+
+  # 2000-01-22 The "login_name" field in the "profiles" table was not
+  # declared to be unique.  Sure enough, somehow, I got 22 duplicated entries
+  # in my database.  This code detects that, cleans up the duplicates, and
+  # then tweaks the table to declare the field to be unique.  What a pain.
+  if ( !$dbh->bz_index_info('profiles', 'profiles_login_name_idx')
+    || !$dbh->bz_index_info('profiles', 'profiles_login_name_idx')->{TYPE})
+  {
+    print "Searching for duplicate entries in the profiles table...\n";
+    while (1) {
+
+      # This code is weird in that it loops around and keeps doing this
+      # select again.  That's because I'm paranoid about deleting entries
+      # out from under us in the profiles table.  Things get weird if
+      # there are *three* or more entries for the same user...
+      my $sth = $dbh->prepare(
+        "SELECT p1.userid, p2.userid, p1.login_name
                                        FROM profiles AS p1, profiles AS p2
                                       WHERE p1.userid < p2.userid
                                             AND p1.login_name = p2.login_name
-                                   ORDER BY p1.login_name");
-            $sth->execute();
-            my ($u1, $u2, $n) = ($sth->fetchrow_array);
-            last if !$u1;
-
-            print "Both $u1 & $u2 are ids for $n!  Merging $u2 into $u1...\n";
-            foreach my $i (["bugs", "reporter"],
-                           ["bugs", "assigned_to"],
-                           ["bugs", "qa_contact"],
-                           ["attachments", "submitter_id"],
-                           ["bugs_activity", "who"],
-                           ["cc", "who"],
-                           ["votes", "who"],
-                           ["longdescs", "who"]) {
-                my ($table, $field) = (@$i);
-                if ($dbh->bz_table_info($table)) {
-                    print "   Updating $table.$field...\n";
-                    $dbh->do("UPDATE $table SET $field = $u1 " .
-                              "WHERE $field = $u2");
-                }
-            }
-            $dbh->do("DELETE FROM profiles WHERE userid = $u2");
+                                   ORDER BY p1.login_name"
+      );
+      $sth->execute();
+      my ($u1, $u2, $n) = ($sth->fetchrow_array);
+      last if !$u1;
+
+      print "Both $u1 & $u2 are ids for $n!  Merging $u2 into $u1...\n";
+      foreach my $i (
+        ["bugs",          "reporter"],
+        ["bugs",          "assigned_to"],
+        ["bugs",          "qa_contact"],
+        ["attachments",   "submitter_id"],
+        ["bugs_activity", "who"],
+        ["cc",            "who"],
+        ["votes",         "who"],
+        ["longdescs",     "who"]
+        )
+      {
+        my ($table, $field) = (@$i);
+        if ($dbh->bz_table_info($table)) {
+          print "   Updating $table.$field...\n";
+          $dbh->do("UPDATE $table SET $field = $u1 " . "WHERE $field = $u2");
         }
-        print "OK, changing index type to prevent duplicates in the",
-              " future...\n";
-
-        $dbh->bz_drop_index('profiles', 'profiles_login_name_idx');
-        $dbh->bz_add_index('profiles', 'profiles_login_name_idx',
-                           {TYPE => 'UNIQUE', FIELDS => [qw(login_name)]});
+      }
+      $dbh->do("DELETE FROM profiles WHERE userid = $u2");
     }
+    print "OK, changing index type to prevent duplicates in the", " future...\n";
+
+    $dbh->bz_drop_index('profiles', 'profiles_login_name_idx');
+    $dbh->bz_add_index('profiles', 'profiles_login_name_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(login_name)]});
+  }
 }
 
 sub _update_component_user_fields_to_ids {
-    my $dbh = Bugzilla->dbh;
-
-    # components.initialowner
-    my $comp_init_owner = $dbh->bz_column_info('components', 'initialowner');
-    if ($comp_init_owner && $comp_init_owner->{TYPE} eq 'TINYTEXT') {
-        my $sth = $dbh->prepare("SELECT program, value, initialowner
-                                   FROM components");
-        $sth->execute();
-        while (my ($program, $value, $initialowner) = $sth->fetchrow_array()) {
-            my ($id) = $dbh->selectrow_array(
-                "SELECT userid FROM profiles WHERE login_name = ?",
-                undef, $initialowner);
-
-            unless (defined $id) {
-                print "Warning: You have an invalid default assignee",
-                      " '$initialowner'\n in component '$value' of program",
-                      " '$program'!\n";
-                $id = 0;
-            }
+  my $dbh = Bugzilla->dbh;
 
-            $dbh->do("UPDATE components SET initialowner = ?
-                       WHERE program = ? AND value = ?", undef,
-                     $id, $program, $value);
-        }
-        $dbh->bz_alter_column('components','initialowner',{TYPE => 'INT3'});
+  # components.initialowner
+  my $comp_init_owner = $dbh->bz_column_info('components', 'initialowner');
+  if ($comp_init_owner && $comp_init_owner->{TYPE} eq 'TINYTEXT') {
+    my $sth = $dbh->prepare(
+      "SELECT program, value, initialowner
+                                   FROM components"
+    );
+    $sth->execute();
+    while (my ($program, $value, $initialowner) = $sth->fetchrow_array()) {
+      my ($id)
+        = $dbh->selectrow_array("SELECT userid FROM profiles WHERE login_name = ?",
+        undef, $initialowner);
+
+      unless (defined $id) {
+        print "Warning: You have an invalid default assignee",
+          " '$initialowner'\n in component '$value' of program", " '$program'!\n";
+        $id = 0;
+      }
+
+      $dbh->do(
+        "UPDATE components SET initialowner = ?
+                       WHERE program = ? AND value = ?", undef, $id, $program, $value
+      );
     }
+    $dbh->bz_alter_column('components', 'initialowner', {TYPE => 'INT3'});
+  }
 
-    # components.initialqacontact
-    my $comp_init_qa = $dbh->bz_column_info('components', 'initialqacontact');
-    if ($comp_init_qa && $comp_init_qa->{TYPE} eq 'TINYTEXT') {
-        my $sth = $dbh->prepare("SELECT program, value, initialqacontact
-                                   FROM components");
-        $sth->execute();
-        while (my ($program, $value, $initialqacontact) = 
-                   $sth->fetchrow_array()) 
-        {
-            my ($id) = $dbh->selectrow_array(
-                "SELECT userid FROM profiles WHERE login_name = ?",
-                undef, $initialqacontact);
-
-            unless (defined $id) {
-                if ($initialqacontact) {
-                    print "Warning: You have an invalid default QA contact",
-                          " $initialqacontact' in program '$program',",
-                          " component '$value'!\n";
-                }
-                $id = 0;
-            }
-
-            $dbh->do("UPDATE components SET initialqacontact = ?
-                       WHERE program = ? AND value = ?", undef,
-                     $id, $program, $value);
+  # components.initialqacontact
+  my $comp_init_qa = $dbh->bz_column_info('components', 'initialqacontact');
+  if ($comp_init_qa && $comp_init_qa->{TYPE} eq 'TINYTEXT') {
+    my $sth = $dbh->prepare(
+      "SELECT program, value, initialqacontact
+                                   FROM components"
+    );
+    $sth->execute();
+    while (my ($program, $value, $initialqacontact) = $sth->fetchrow_array()) {
+      my ($id)
+        = $dbh->selectrow_array("SELECT userid FROM profiles WHERE login_name = ?",
+        undef, $initialqacontact);
+
+      unless (defined $id) {
+        if ($initialqacontact) {
+          print "Warning: You have an invalid default QA contact",
+            " $initialqacontact' in program '$program',", " component '$value'!\n";
         }
+        $id = 0;
+      }
 
-        $dbh->bz_alter_column('components','initialqacontact',{TYPE => 'INT3'});
+      $dbh->do(
+        "UPDATE components SET initialqacontact = ?
+                       WHERE program = ? AND value = ?", undef, $id, $program, $value
+      );
     }
+
+    $dbh->bz_alter_column('components', 'initialqacontact', {TYPE => 'INT3'});
+  }
 }
 
 sub _populate_milestones_table {
-    my $dbh = Bugzilla->dbh;
-    # 2000-03-21 Adding a table for target milestones to
-    # database - matthew@zeroknowledge.com
-    # If the milestones table is empty, and we're still back in a Bugzilla
-    # that has a bugs.product field, that means that we just created
-    # the milestones table and it needs to be populated.
-    my $milestones_exist = $dbh->selectrow_array(
-        "SELECT DISTINCT 1 FROM milestones");
-    if (!$milestones_exist && $dbh->bz_column_info('bugs', 'product')) {
-        print "Replacing blank milestones...\n";
-
-        $dbh->do("UPDATE bugs
+  my $dbh = Bugzilla->dbh;
+
+  # 2000-03-21 Adding a table for target milestones to
+  # database - matthew@zeroknowledge.com
+  # If the milestones table is empty, and we're still back in a Bugzilla
+  # that has a bugs.product field, that means that we just created
+  # the milestones table and it needs to be populated.
+  my $milestones_exist
+    = $dbh->selectrow_array("SELECT DISTINCT 1 FROM milestones");
+  if (!$milestones_exist && $dbh->bz_column_info('bugs', 'product')) {
+    print "Replacing blank milestones...\n";
+
+    $dbh->do(
+      "UPDATE bugs
                      SET target_milestone = '---'
-                   WHERE target_milestone = ' '");
-
-        # If we are upgrading from 2.8 or earlier, we will have *created*
-        # the milestones table with a product_id field, but Bugzilla expects
-        # it to have a "product" field. So we change the field backward so
-        # other code can run. The change will be reversed later in checksetup.
-        if ($dbh->bz_column_info('milestones', 'product_id')) {
-            # Dropping the column leaves us with a milestones_product_id_idx
-            # index that is only on the "value" column. We need to drop the
-            # whole index so that it can be correctly re-created later.
-            $dbh->bz_drop_index('milestones', 'milestones_product_id_idx');
-            $dbh->bz_drop_column('milestones', 'product_id');
-            $dbh->bz_add_column('milestones', 'product',
-                                {TYPE => 'varchar(64)', NOTNULL => 1}, '');
-        }
+                   WHERE target_milestone = ' '"
+    );
+
+    # If we are upgrading from 2.8 or earlier, we will have *created*
+    # the milestones table with a product_id field, but Bugzilla expects
+    # it to have a "product" field. So we change the field backward so
+    # other code can run. The change will be reversed later in checksetup.
+    if ($dbh->bz_column_info('milestones', 'product_id')) {
+
+      # Dropping the column leaves us with a milestones_product_id_idx
+      # index that is only on the "value" column. We need to drop the
+      # whole index so that it can be correctly re-created later.
+      $dbh->bz_drop_index('milestones', 'milestones_product_id_idx');
+      $dbh->bz_drop_column('milestones', 'product_id');
+      $dbh->bz_add_column('milestones', 'product',
+        {TYPE => 'varchar(64)', NOTNULL => 1}, '');
+    }
 
-        # Populate the milestone table with all existing values in the database
-        my $sth = $dbh->prepare("SELECT DISTINCT target_milestone, product 
-                                   FROM bugs");
-        $sth->execute();
+    # Populate the milestone table with all existing values in the database
+    my $sth = $dbh->prepare(
+      "SELECT DISTINCT target_milestone, product 
+                                   FROM bugs"
+    );
+    $sth->execute();
 
-        print "Populating milestones table...\n";
+    print "Populating milestones table...\n";
 
-        while (my ($value, $product) = $sth->fetchrow_array()) {
-            # check if the value already exists
-            my $sortkey = substr($value, 1);
-            if ($sortkey !~ /^\d+$/) {
-                $sortkey = 0;
-            } else {
-                $sortkey *= 10;
-            }
-            my $ms_exists = $dbh->selectrow_array(
-                "SELECT value FROM milestones
-                  WHERE value = ? AND product = ?", undef, $value, $product);
+    while (my ($value, $product) = $sth->fetchrow_array()) {
 
-            if (!$ms_exists) {
-                $dbh->do("INSERT INTO milestones(value, product, sortkey) 
-                          VALUES (?,?,?)", undef, $value, $product, $sortkey);
-            }
-        }
+      # check if the value already exists
+      my $sortkey = substr($value, 1);
+      if ($sortkey !~ /^\d+$/) {
+        $sortkey = 0;
+      }
+      else {
+        $sortkey *= 10;
+      }
+      my $ms_exists = $dbh->selectrow_array(
+        "SELECT value FROM milestones
+                  WHERE value = ? AND product = ?", undef, $value, $product
+      );
+
+      if (!$ms_exists) {
+        $dbh->do(
+          "INSERT INTO milestones(value, product, sortkey) 
+                          VALUES (?,?,?)", undef, $value, $product, $sortkey
+        );
+      }
     }
+  }
 }
 
 sub _add_products_defaultmilestone {
-    my $dbh = Bugzilla->dbh;
-
-    # 2000-03-23 Added a defaultmilestone field to the products table, so that
-    # we know which milestone to initially assign bugs to.
-    if (!$dbh->bz_column_info('products', 'defaultmilestone')) {
-        $dbh->bz_add_column('products', 'defaultmilestone',
-                 {TYPE => 'varchar(20)', NOTNULL => 1, DEFAULT => "'---'"});
-        my $sth = $dbh->prepare(
-            "SELECT product, defaultmilestone FROM products");
-        $sth->execute();
-        while (my ($product, $default_ms) = $sth->fetchrow_array()) {
-            my $exists = $dbh->selectrow_array(
-                "SELECT value FROM milestones
-                  WHERE value = ? AND product = ?", 
-                undef, $default_ms, $product);
-            if (!$exists) {
-                $dbh->do("INSERT INTO milestones(value, product) " .
-                         "VALUES (?, ?)", undef, $default_ms, $product);
-            }
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # 2000-03-23 Added a defaultmilestone field to the products table, so that
+  # we know which milestone to initially assign bugs to.
+  if (!$dbh->bz_column_info('products', 'defaultmilestone')) {
+    $dbh->bz_add_column('products', 'defaultmilestone',
+      {TYPE => 'varchar(20)', NOTNULL => 1, DEFAULT => "'---'"});
+    my $sth = $dbh->prepare("SELECT product, defaultmilestone FROM products");
+    $sth->execute();
+    while (my ($product, $default_ms) = $sth->fetchrow_array()) {
+      my $exists = $dbh->selectrow_array(
+        "SELECT value FROM milestones
+                  WHERE value = ? AND product = ?", undef, $default_ms, $product
+      );
+      if (!$exists) {
+        $dbh->do("INSERT INTO milestones(value, product) " . "VALUES (?, ?)",
+          undef, $default_ms, $product);
+      }
     }
+  }
 }
 
 sub _copy_from_comments_to_longdescs {
-    my $dbh = Bugzilla->dbh;
-    # 2000-11-27 For Bugzilla 2.5 and later. Copy data from 'comments' to
-    # 'longdescs' - the new name of the comments table.
-    if ($dbh->bz_table_info('comments')) {
-        print "Copying data from 'comments' to 'longdescs'...\n";
-        my $quoted_when = $dbh->quote_identifier('when');
-        $dbh->do("INSERT INTO longdescs (bug_when, bug_id, who, thetext)
+  my $dbh = Bugzilla->dbh;
+
+  # 2000-11-27 For Bugzilla 2.5 and later. Copy data from 'comments' to
+  # 'longdescs' - the new name of the comments table.
+  if ($dbh->bz_table_info('comments')) {
+    print "Copying data from 'comments' to 'longdescs'...\n";
+    my $quoted_when = $dbh->quote_identifier('when');
+    $dbh->do(
+      "INSERT INTO longdescs (bug_when, bug_id, who, thetext)
                   SELECT $quoted_when, bug_id, who, comment
-                    FROM comments");
-        $dbh->bz_drop_table("comments");
-    }
+                    FROM comments"
+    );
+    $dbh->bz_drop_table("comments");
+  }
 }
 
 sub _populate_duplicates_table {
-    my $dbh = Bugzilla->dbh;
-    # 2000-07-15 Added duplicates table so Bugzilla tracks duplicates in a
-    # better way than it used to. This code searches the comments to populate
-    # the table initially. It's executed if the table is empty; if it's 
-    # empty because there are no dupes (as opposed to having just created 
-    # the table) it won't have any effect anyway, so it doesn't matter.
-    my ($dups_exist) = $dbh->selectrow_array(
-        "SELECT DISTINCT 1 FROM duplicates");
-    # We also check against a schema change that happened later.
-    if (!$dups_exist && !$dbh->bz_column_info('groups', 'isactive')) {
-        # populate table
-        print "Populating duplicates table from comments...\n";
-
-        my $sth = $dbh->prepare(
-             "SELECT longdescs.bug_id, thetext
+  my $dbh = Bugzilla->dbh;
+
+  # 2000-07-15 Added duplicates table so Bugzilla tracks duplicates in a
+  # better way than it used to. This code searches the comments to populate
+  # the table initially. It's executed if the table is empty; if it's
+  # empty because there are no dupes (as opposed to having just created
+  # the table) it won't have any effect anyway, so it doesn't matter.
+  my ($dups_exist) = $dbh->selectrow_array("SELECT DISTINCT 1 FROM duplicates");
+
+  # We also check against a schema change that happened later.
+  if (!$dups_exist && !$dbh->bz_column_info('groups', 'isactive')) {
+
+    # populate table
+    print "Populating duplicates table from comments...\n";
+
+    my $sth = $dbh->prepare(
+      "SELECT longdescs.bug_id, thetext
                 FROM longdescs LEFT JOIN bugs 
                      ON longdescs.bug_id = bugs.bug_id
-               WHERE (" . $dbh->sql_regexp("thetext", 
-                          "'[.*.]{3} This bug has been marked as a duplicate"
-                          . " of [[:digit:]]+ [.*.]{3}'") 
-                  . ")
+               WHERE ("
+        . $dbh->sql_regexp("thetext",
+            "'[.*.]{3} This bug has been marked as a duplicate"
+          . " of [[:digit:]]+ [.*.]{3}'")
+        . ")
                      AND resolution = 'DUPLICATE'
-            ORDER BY longdescs.bug_when");
-        $sth->execute();
-
-        my (%dupes, $key);
-        # Because of the way hashes work, this loop removes all but the 
-        # last dupe resolution found for a given bug.
-        while (my ($dupe, $dupe_of) = $sth->fetchrow_array()) {
-            $dupes{$dupe} = $dupe_of;
-        }
+            ORDER BY longdescs.bug_when"
+    );
+    $sth->execute();
 
-        foreach $key (keys(%dupes)){
-            $dupes{$key} =~ /^.*\*\*\* This bug has been marked as a duplicate of (\d+) \*\*\*$/ms;
-            $dupes{$key} = $1;
-            $dbh->do("INSERT INTO duplicates VALUES(?, ?)", undef,
-                     $dupes{$key},  $key);
-            #        BugItsADupeOf  Dupe
-        }
+    my (%dupes, $key);
+
+    # Because of the way hashes work, this loop removes all but the
+    # last dupe resolution found for a given bug.
+    while (my ($dupe, $dupe_of) = $sth->fetchrow_array()) {
+      $dupes{$dupe} = $dupe_of;
     }
+
+    foreach $key (keys(%dupes)) {
+      $dupes{$key}
+        =~ /^.*\*\*\* This bug has been marked as a duplicate of (\d+) \*\*\*$/ms;
+      $dupes{$key} = $1;
+      $dbh->do("INSERT INTO duplicates VALUES(?, ?)", undef, $dupes{$key}, $key);
+
+      #        BugItsADupeOf  Dupe
+    }
+  }
 }
 
 sub _recrypt_plaintext_passwords {
-    my $dbh = Bugzilla->dbh;
-    # 2001-06-12; myk@mozilla.org; bugs 74032, 77473:
-    # Recrypt passwords using Perl &crypt instead of the mysql equivalent
-    # and delete plaintext passwords from the database.
-    if ($dbh->bz_column_info('profiles', 'password')) {
+  my $dbh = Bugzilla->dbh;
+
+  # 2001-06-12; myk@mozilla.org; bugs 74032, 77473:
+  # Recrypt passwords using Perl &crypt instead of the mysql equivalent
+  # and delete plaintext passwords from the database.
+  if ($dbh->bz_column_info('profiles', 'password')) {
 
-        print <<ENDTEXT;
+    print <<ENDTEXT;
 Your current installation of Bugzilla stores passwords in plaintext
 in the database and uses mysql's encrypt function instead of Perl's
 crypt function to crypt passwords.  Passwords are now going to be
@@ -1214,299 +1292,315 @@ deleted from the database.  This could take a while if your
 installation has many users.
 ENDTEXT
 
-        # Re-crypt everyone's password.
-        my $total = $dbh->selectrow_array('SELECT COUNT(*) FROM profiles');
-        my $sth = $dbh->prepare("SELECT userid, password FROM profiles");
-        $sth->execute();
-
-        my $i = 1;
+    # Re-crypt everyone's password.
+    my $total = $dbh->selectrow_array('SELECT COUNT(*) FROM profiles');
+    my $sth   = $dbh->prepare("SELECT userid, password FROM profiles");
+    $sth->execute();
 
-        print "Fixing passwords...\n";
-        while (my ($userid, $password) = $sth->fetchrow_array()) {
-            my $cryptpassword = $dbh->quote(bz_crypt($password));
-            $dbh->do("UPDATE profiles " .
-                        "SET cryptpassword = $cryptpassword " .
-                      "WHERE userid = $userid");
-            indicate_progress({ total => $total, current => $i, every => 10 });
-        }
-        print "\n";
+    my $i = 1;
 
-        # Drop the plaintext password field.
-        $dbh->bz_drop_column('profiles', 'password');
+    print "Fixing passwords...\n";
+    while (my ($userid, $password) = $sth->fetchrow_array()) {
+      my $cryptpassword = $dbh->quote(bz_crypt($password));
+      $dbh->do("UPDATE profiles "
+          . "SET cryptpassword = $cryptpassword "
+          . "WHERE userid = $userid");
+      indicate_progress({total => $total, current => $i, every => 10});
     }
+    print "\n";
+
+    # Drop the plaintext password field.
+    $dbh->bz_drop_column('profiles', 'password');
+  }
 }
 
 sub _update_bugs_activity_to_only_record_changes {
-    my $dbh = Bugzilla->dbh;
-    # 2001-07-20 jake@bugzilla.org - Change bugs_activity to only record changes
-    #  http://bugzilla.mozilla.org/show_bug.cgi?id=55161
-    if ($dbh->bz_column_info('bugs_activity', 'oldvalue')) {
-        $dbh->bz_add_column("bugs_activity", "removed", {TYPE => "TINYTEXT"});
-        $dbh->bz_add_column("bugs_activity", "added", {TYPE => "TINYTEXT"});
-
-        # Need to get field id's for the fields that have multiple values
-        my @multi;
-        foreach my $f ("cc", "dependson", "blocked", "keywords") {
-            my $sth = $dbh->prepare("SELECT id " .
-                                    "FROM fielddefs " .
-                                    "WHERE name = '$f'");
-            $sth->execute();
-            my ($fid) = $sth->fetchrow_array();
-            push (@multi, $fid);
+  my $dbh = Bugzilla->dbh;
+
+  # 2001-07-20 jake@bugzilla.org - Change bugs_activity to only record changes
+  #  http://bugzilla.mozilla.org/show_bug.cgi?id=55161
+  if ($dbh->bz_column_info('bugs_activity', 'oldvalue')) {
+    $dbh->bz_add_column("bugs_activity", "removed", {TYPE => "TINYTEXT"});
+    $dbh->bz_add_column("bugs_activity", "added",   {TYPE => "TINYTEXT"});
+
+    # Need to get field id's for the fields that have multiple values
+    my @multi;
+    foreach my $f ("cc", "dependson", "blocked", "keywords") {
+      my $sth = $dbh->prepare("SELECT id " . "FROM fielddefs " . "WHERE name = '$f'");
+      $sth->execute();
+      my ($fid) = $sth->fetchrow_array();
+      push(@multi, $fid);
+    }
+
+    # Now we need to process the bugs_activity table and reformat the data
+    print "Fixing activity log...\n";
+    my $total = $dbh->selectrow_array('SELECT COUNT(*) FROM bugs_activity');
+    my $sth   = $dbh->prepare(
+      "SELECT bug_id, who, bug_when, fieldid,
+                                oldvalue, newvalue FROM bugs_activity"
+    );
+    $sth->execute;
+    my $i = 0;
+    while (my ($bug_id, $who, $bug_when, $fieldid, $oldvalue, $newvalue)
+      = $sth->fetchrow_array())
+    {
+      $i++;
+      indicate_progress({total => $total, current => $i, every => 10});
+
+      # Make sure (old|new)value isn't null (to suppress warnings)
+      $oldvalue ||= "";
+      $newvalue ||= "";
+      my ($added, $removed) = "";
+      if (grep ($_ eq $fieldid, @multi)) {
+        $oldvalue =~ s/[\s,]+/ /g;
+        $newvalue =~ s/[\s,]+/ /g;
+        my @old = split(" ", $oldvalue);
+        my @new = split(" ", $newvalue);
+        my (@add, @remove) = ();
+
+        # Find values that were "added"
+        foreach my $value (@new) {
+          if (!grep ($_ eq $value, @old)) {
+            push(@add, $value);
+          }
         }
 
-        # Now we need to process the bugs_activity table and reformat the data
-        print "Fixing activity log...\n";
-        my $total = $dbh->selectrow_array('SELECT COUNT(*) FROM bugs_activity');
-        my $sth = $dbh->prepare("SELECT bug_id, who, bug_when, fieldid,
-                                oldvalue, newvalue FROM bugs_activity");
-        $sth->execute;
-        my $i = 0;
-        while (my ($bug_id, $who, $bug_when, $fieldid, $oldvalue, $newvalue)
-                   = $sth->fetchrow_array()) 
-        {
-            $i++;
-            indicate_progress({ total => $total, current => $i, every => 10 });
-            # Make sure (old|new)value isn't null (to suppress warnings)
-            $oldvalue ||= "";
-            $newvalue ||= "";
-            my ($added, $removed) = "";
-            if (grep ($_ eq $fieldid, @multi)) {
-                $oldvalue =~ s/[\s,]+/ /g;
-                $newvalue =~ s/[\s,]+/ /g;
-                my @old = split(" ", $oldvalue);
-                my @new = split(" ", $newvalue);
-                my (@add, @remove) = ();
-                # Find values that were "added"
-                foreach my $value(@new) {
-                    if (! grep ($_ eq $value, @old)) {
-                        push (@add, $value);
-                    }
-                }
-                # Find values that were removed
-                foreach my $value(@old) {
-                    if (! grep ($_ eq $value, @new)) {
-                        push (@remove, $value);
-                    }
-                }
-                $added = join (", ", @add);
-                $removed = join (", ", @remove);
-                # If we can't determine what changed, put a ? in both fields
-                unless ($added || $removed) {
-                    $added = "?";
-                    $removed = "?";
-                }
-                # If the original field (old|new)value was full, then this
-                # could be incomplete data.
-                if (length($oldvalue) == 255 || length($newvalue) == 255) {
-                    $added = "? $added";
-                    $removed = "? $removed";
-                }
-            } else {
-                $removed = $oldvalue;
-                $added = $newvalue;
-            }
-            $added = $dbh->quote($added);
-            $removed = $dbh->quote($removed);
-            $dbh->do("UPDATE bugs_activity 
+        # Find values that were removed
+        foreach my $value (@old) {
+          if (!grep ($_ eq $value, @new)) {
+            push(@remove, $value);
+          }
+        }
+        $added   = join(", ", @add);
+        $removed = join(", ", @remove);
+
+        # If we can't determine what changed, put a ? in both fields
+        unless ($added || $removed) {
+          $added   = "?";
+          $removed = "?";
+        }
+
+        # If the original field (old|new)value was full, then this
+        # could be incomplete data.
+        if (length($oldvalue) == 255 || length($newvalue) == 255) {
+          $added   = "? $added";
+          $removed = "? $removed";
+        }
+      }
+      else {
+        $removed = $oldvalue;
+        $added   = $newvalue;
+      }
+      $added   = $dbh->quote($added);
+      $removed = $dbh->quote($removed);
+      $dbh->do(
+        "UPDATE bugs_activity 
                          SET removed = $removed, added = $added
                        WHERE bug_id = $bug_id AND who = $who
                              AND bug_when = '$bug_when' 
-                             AND fieldid = $fieldid");
-        }
-        print "\n";
-        $dbh->bz_drop_column("bugs_activity", "oldvalue");
-        $dbh->bz_drop_column("bugs_activity", "newvalue");
+                             AND fieldid = $fieldid"
+      );
     }
+    print "\n";
+    $dbh->bz_drop_column("bugs_activity", "oldvalue");
+    $dbh->bz_drop_column("bugs_activity", "newvalue");
+  }
 }
 
 sub _delete_logincookies_cryptpassword_and_handle_invalid_cookies {
-    my $dbh = Bugzilla->dbh;
-    # 2002-02-04 bbaetz@student.usyd.edu.au bug 95732
-    # Remove logincookies.cryptpassword, and delete entries which become
-    # invalid
-    if ($dbh->bz_column_info("logincookies", "cryptpassword")) {
-        # We need to delete any cookies which are invalid before dropping the
-        # column
-        print "Removing invalid login cookies...\n";
-
-        # mysql doesn't support DELETE with multi-table queries, so we have
-        # to iterate
-        my $sth = $dbh->prepare("SELECT cookie FROM logincookies, profiles " .
-                                "WHERE logincookies.cryptpassword != " .
-                                "profiles.cryptpassword AND " .
-                                "logincookies.userid = profiles.userid");
-        $sth->execute();
-        while (my ($cookie) = $sth->fetchrow_array()) {
-            $dbh->do("DELETE FROM logincookies WHERE cookie = $cookie");
-        }
-
-        $dbh->bz_drop_column("logincookies", "cryptpassword");
+  my $dbh = Bugzilla->dbh;
+
+  # 2002-02-04 bbaetz@student.usyd.edu.au bug 95732
+  # Remove logincookies.cryptpassword, and delete entries which become
+  # invalid
+  if ($dbh->bz_column_info("logincookies", "cryptpassword")) {
+
+    # We need to delete any cookies which are invalid before dropping the
+    # column
+    print "Removing invalid login cookies...\n";
+
+    # mysql doesn't support DELETE with multi-table queries, so we have
+    # to iterate
+    my $sth
+      = $dbh->prepare("SELECT cookie FROM logincookies, profiles "
+        . "WHERE logincookies.cryptpassword != "
+        . "profiles.cryptpassword AND "
+        . "logincookies.userid = profiles.userid");
+    $sth->execute();
+    while (my ($cookie) = $sth->fetchrow_array()) {
+      $dbh->do("DELETE FROM logincookies WHERE cookie = $cookie");
     }
+
+    $dbh->bz_drop_column("logincookies", "cryptpassword");
+  }
 }
 
 sub _use_ip_instead_of_hostname_in_logincookies {
-    my $dbh = Bugzilla->dbh;
-
-    # 2002-03-15 bbaetz@student.usyd.edu.au - bug 129466
-    # 2002-05-13 preed@sigkill.com - bug 129446 patch backported to the
-    #  BUGZILLA-2_14_1-BRANCH as a security blocker for the 2.14.2 release
-    #
-    # Use the ip, not the hostname, in the logincookies table
-    if ($dbh->bz_column_info("logincookies", "hostname")) {
-        print "Clearing the logincookies table...\n";
-        # We've changed what we match against, so all entries are now invalid
-        $dbh->do("DELETE FROM logincookies");
-
-        # Now update the logincookies schema
-        $dbh->bz_drop_column("logincookies", "hostname");
-        $dbh->bz_add_column("logincookies", "ipaddr",
-                            {TYPE => 'varchar(40)'});
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # 2002-03-15 bbaetz@student.usyd.edu.au - bug 129466
+  # 2002-05-13 preed@sigkill.com - bug 129446 patch backported to the
+  #  BUGZILLA-2_14_1-BRANCH as a security blocker for the 2.14.2 release
+  #
+  # Use the ip, not the hostname, in the logincookies table
+  if ($dbh->bz_column_info("logincookies", "hostname")) {
+    print "Clearing the logincookies table...\n";
+
+    # We've changed what we match against, so all entries are now invalid
+    $dbh->do("DELETE FROM logincookies");
+
+    # Now update the logincookies schema
+    $dbh->bz_drop_column("logincookies", "hostname");
+    $dbh->bz_add_column("logincookies", "ipaddr", {TYPE => 'varchar(40)'});
+  }
 }
 
 sub _move_quips_into_db {
-    my $dbh = Bugzilla->dbh;
-    my $datadir = bz_locations->{'datadir'};
-    # 2002-07-15 davef@tetsubo.com - bug 67950
-    # Move quips to the db.
-    if (-e "$datadir/comments") {
-        print "Populating quips table from $datadir/comments...\n";
-        my $comments = new IO::File("$datadir/comments", 'r')
-            || die "$datadir/comments: $!";
-        $comments->untaint;
-        while (<$comments>) {
-            chomp;
-            $dbh->do("INSERT INTO quips (quip) VALUES (?)", undef, $_);
-        }
-
-        print "\n", install_string('update_quips', { data => $datadir }), "\n";
-        $comments->close;
-        rename("$datadir/comments", "$datadir/comments.bak")
-            || warn "Failed to rename: $!";
+  my $dbh     = Bugzilla->dbh;
+  my $datadir = bz_locations->{'datadir'};
+
+  # 2002-07-15 davef@tetsubo.com - bug 67950
+  # Move quips to the db.
+  if (-e "$datadir/comments") {
+    print "Populating quips table from $datadir/comments...\n";
+    my $comments = new IO::File("$datadir/comments", 'r')
+      || die "$datadir/comments: $!";
+    $comments->untaint;
+    while (<$comments>) {
+      chomp;
+      $dbh->do("INSERT INTO quips (quip) VALUES (?)", undef, $_);
     }
+
+    print "\n", install_string('update_quips', {data => $datadir}), "\n";
+    $comments->close;
+    rename("$datadir/comments", "$datadir/comments.bak")
+      || warn "Failed to rename: $!";
+  }
 }
 
 sub _use_ids_for_products_and_components {
-    my $dbh = Bugzilla->dbh;
-    # 2002-08-12 jake@bugzilla.org/bbaetz@student.usyd.edu.au - bug 43600
-    # Use integer IDs for products and components.
-    if ($dbh->bz_column_info("products", "product")) {
-        print "Updating database to use product IDs.\n";
-
-        # First, we need to remove possible NULL entries
-        # NULLs may exist, but won't have been used, since all the uses of them
-        # are in NOT NULL fields in other tables
-        $dbh->do("DELETE FROM products WHERE product IS NULL");
-        $dbh->do("DELETE FROM components WHERE value IS NULL");
-
-        $dbh->bz_add_column("products", "id",
-            {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
-        $dbh->bz_add_column("components", "product_id",
-            {TYPE => 'INT2', NOTNULL => 1}, 0);
-        $dbh->bz_add_column("versions", "product_id",
-            {TYPE => 'INT2', NOTNULL => 1}, 0);
-        $dbh->bz_add_column("milestones", "product_id",
-            {TYPE => 'INT2', NOTNULL => 1}, 0);
-        $dbh->bz_add_column("bugs", "product_id",
-            {TYPE => 'INT2', NOTNULL => 1}, 0);
-
-        # The attachstatusdefs table was added in version 2.15, but 
-        # removed again in early 2.17.  If it exists now, we still need 
-        # to perform this change with product_id because the code later on
-        # which converts the attachment statuses to flags depends on it.
-        # But we need to avoid this if the user is upgrading from 2.14
-        # or earlier (because it won't be there to convert).
-        if ($dbh->bz_table_info("attachstatusdefs")) {
-            $dbh->bz_add_column("attachstatusdefs", "product_id",
-                {TYPE => 'INT2', NOTNULL => 1}, 0);
-        }
-
-        my %products;
-        my $sth = $dbh->prepare("SELECT id, product FROM products");
-        $sth->execute;
-        while (my ($product_id, $product) = $sth->fetchrow_array()) {
-            if (exists $products{$product}) {
-                print "Ignoring duplicate product $product\n";
-                $dbh->do("DELETE FROM products WHERE id = $product_id");
-                next;
-            }
-            $products{$product} = 1;
-            $dbh->do("UPDATE components SET product_id = $product_id " .
-                     "WHERE program = " . $dbh->quote($product));
-            $dbh->do("UPDATE versions SET product_id = $product_id " .
-                     "WHERE program = " . $dbh->quote($product));
-            $dbh->do("UPDATE milestones SET product_id = $product_id " .
-                     "WHERE product = " . $dbh->quote($product));
-            $dbh->do("UPDATE bugs SET product_id = $product_id " .
-                     "WHERE product = " . $dbh->quote($product));
-            $dbh->do("UPDATE attachstatusdefs SET product_id = $product_id " .
-                     "WHERE product = " . $dbh->quote($product))
-                if $dbh->bz_table_info("attachstatusdefs");
-        }
-
-        print "Updating the database to use component IDs.\n";
+  my $dbh = Bugzilla->dbh;
+
+  # 2002-08-12 jake@bugzilla.org/bbaetz@student.usyd.edu.au - bug 43600
+  # Use integer IDs for products and components.
+  if ($dbh->bz_column_info("products", "product")) {
+    print "Updating database to use product IDs.\n";
+
+    # First, we need to remove possible NULL entries
+    # NULLs may exist, but won't have been used, since all the uses of them
+    # are in NOT NULL fields in other tables
+    $dbh->do("DELETE FROM products WHERE product IS NULL");
+    $dbh->do("DELETE FROM components WHERE value IS NULL");
+
+    $dbh->bz_add_column("products", "id",
+      {TYPE => 'SMALLSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+    $dbh->bz_add_column("components", "product_id", {TYPE => 'INT2', NOTNULL => 1},
+      0);
+    $dbh->bz_add_column("versions", "product_id", {TYPE => 'INT2', NOTNULL => 1},
+      0);
+    $dbh->bz_add_column("milestones", "product_id", {TYPE => 'INT2', NOTNULL => 1},
+      0);
+    $dbh->bz_add_column("bugs", "product_id", {TYPE => 'INT2', NOTNULL => 1}, 0);
+
+    # The attachstatusdefs table was added in version 2.15, but
+    # removed again in early 2.17.  If it exists now, we still need
+    # to perform this change with product_id because the code later on
+    # which converts the attachment statuses to flags depends on it.
+    # But we need to avoid this if the user is upgrading from 2.14
+    # or earlier (because it won't be there to convert).
+    if ($dbh->bz_table_info("attachstatusdefs")) {
+      $dbh->bz_add_column("attachstatusdefs", "product_id",
+        {TYPE => 'INT2', NOTNULL => 1}, 0);
+    }
 
-        $dbh->bz_add_column("components", "id",
-            {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
-        $dbh->bz_add_column("bugs", "component_id",
-                            {TYPE => 'INT3', NOTNULL => 1}, 0);
+    my %products;
+    my $sth = $dbh->prepare("SELECT id, product FROM products");
+    $sth->execute;
+    while (my ($product_id, $product) = $sth->fetchrow_array()) {
+      if (exists $products{$product}) {
+        print "Ignoring duplicate product $product\n";
+        $dbh->do("DELETE FROM products WHERE id = $product_id");
+        next;
+      }
+      $products{$product} = 1;
+      $dbh->do("UPDATE components SET product_id = $product_id "
+          . "WHERE program = "
+          . $dbh->quote($product));
+      $dbh->do("UPDATE versions SET product_id = $product_id "
+          . "WHERE program = "
+          . $dbh->quote($product));
+      $dbh->do("UPDATE milestones SET product_id = $product_id "
+          . "WHERE product = "
+          . $dbh->quote($product));
+      $dbh->do("UPDATE bugs SET product_id = $product_id "
+          . "WHERE product = "
+          . $dbh->quote($product));
+      $dbh->do("UPDATE attachstatusdefs SET product_id = $product_id "
+          . "WHERE product = "
+          . $dbh->quote($product))
+        if $dbh->bz_table_info("attachstatusdefs");
+    }
 
-        my %components;
-        $sth = $dbh->prepare("SELECT id, value, product_id FROM components");
-        $sth->execute;
-        while (my ($component_id, $component, $product_id) 
-            = $sth->fetchrow_array()) 
-        {
-            if (exists $components{$component}) {
-                if (exists $components{$component}{$product_id}) {
-                    print "Ignoring duplicate component $component for",
-                          " product $product_id\n";
-                    $dbh->do("DELETE FROM components WHERE id = $component_id");
-                    next;
-                }
-            } else {
-                $components{$component} = {};
-            }
-            $components{$component}{$product_id} = 1;
-            $dbh->do("UPDATE bugs SET component_id = $component_id " .
-                      "WHERE component = " . $dbh->quote($component) .
-                       " AND product_id = $product_id");
+    print "Updating the database to use component IDs.\n";
+
+    $dbh->bz_add_column("components", "id",
+      {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+    $dbh->bz_add_column("bugs", "component_id", {TYPE => 'INT3', NOTNULL => 1}, 0);
+
+    my %components;
+    $sth = $dbh->prepare("SELECT id, value, product_id FROM components");
+    $sth->execute;
+    while (my ($component_id, $component, $product_id) = $sth->fetchrow_array()) {
+      if (exists $components{$component}) {
+        if (exists $components{$component}{$product_id}) {
+          print "Ignoring duplicate component $component for", " product $product_id\n";
+          $dbh->do("DELETE FROM components WHERE id = $component_id");
+          next;
         }
-        print "Fixing Indexes and Uniqueness.\n";
-        $dbh->bz_drop_index('milestones', 'milestones_product_idx');
-
-        $dbh->bz_add_index('milestones', 'milestones_product_id_idx',
-            {TYPE => 'UNIQUE', FIELDS => [qw(product_id value)]});
-
-        $dbh->bz_drop_index('bugs', 'bugs_product_idx');
-        $dbh->bz_add_index('bugs', 'bugs_product_id_idx', [qw(product_id)]);
-        $dbh->bz_drop_index('bugs', 'bugs_component_idx');
-        $dbh->bz_add_index('bugs', 'bugs_component_id_idx', [qw(component_id)]);
-
-        print "Removing, renaming, and retyping old product and",
-              " component fields.\n";
-        $dbh->bz_drop_column("components", "program");
-        $dbh->bz_drop_column("versions", "program");
-        $dbh->bz_drop_column("milestones", "product");
-        $dbh->bz_drop_column("bugs", "product");
-        $dbh->bz_drop_column("bugs", "component");
-        $dbh->bz_drop_column("attachstatusdefs", "product")
-            if $dbh->bz_table_info("attachstatusdefs");
-        $dbh->bz_rename_column("products", "product", "name");
-        $dbh->bz_alter_column("products", "name",
-                              {TYPE => 'varchar(64)', NOTNULL => 1});
-        $dbh->bz_rename_column("components", "value", "name");
-        $dbh->bz_alter_column("components", "name",
-                              {TYPE => 'varchar(64)', NOTNULL => 1});
-
-        print "Adding indexes for products and components tables.\n";
-        $dbh->bz_add_index('products', 'products_name_idx',
-                           {TYPE => 'UNIQUE', FIELDS => [qw(name)]});
-        $dbh->bz_add_index('components', 'components_product_id_idx',
-            {TYPE => 'UNIQUE', FIELDS => [qw(product_id name)]});
-        $dbh->bz_add_index('components', 'components_name_idx', [qw(name)]);
+      }
+      else {
+        $components{$component} = {};
+      }
+      $components{$component}{$product_id} = 1;
+      $dbh->do("UPDATE bugs SET component_id = $component_id "
+          . "WHERE component = "
+          . $dbh->quote($component)
+          . " AND product_id = $product_id");
     }
+    print "Fixing Indexes and Uniqueness.\n";
+    $dbh->bz_drop_index('milestones', 'milestones_product_idx');
+
+    $dbh->bz_add_index('milestones', 'milestones_product_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(product_id value)]});
+
+    $dbh->bz_drop_index('bugs', 'bugs_product_idx');
+    $dbh->bz_add_index('bugs', 'bugs_product_id_idx', [qw(product_id)]);
+    $dbh->bz_drop_index('bugs', 'bugs_component_idx');
+    $dbh->bz_add_index('bugs', 'bugs_component_id_idx', [qw(component_id)]);
+
+    print "Removing, renaming, and retyping old product and",
+      " component fields.\n";
+    $dbh->bz_drop_column("components",       "program");
+    $dbh->bz_drop_column("versions",         "program");
+    $dbh->bz_drop_column("milestones",       "product");
+    $dbh->bz_drop_column("bugs",             "product");
+    $dbh->bz_drop_column("bugs",             "component");
+    $dbh->bz_drop_column("attachstatusdefs", "product")
+      if $dbh->bz_table_info("attachstatusdefs");
+    $dbh->bz_rename_column("products", "product", "name");
+    $dbh->bz_alter_column("products", "name",
+      {TYPE => 'varchar(64)', NOTNULL => 1});
+    $dbh->bz_rename_column("components", "value", "name");
+    $dbh->bz_alter_column("components", "name",
+      {TYPE => 'varchar(64)', NOTNULL => 1});
+
+    print "Adding indexes for products and components tables.\n";
+    $dbh->bz_add_index('products', 'products_name_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(name)]});
+    $dbh->bz_add_index('components', 'components_product_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(product_id name)]});
+    $dbh->bz_add_index('components', 'components_name_idx', [qw(name)]);
+  }
 }
 
 # Helper for the below function.
@@ -1517,1211 +1611,1341 @@ sub _use_ids_for_products_and_components {
 # group names, _list_bits is used to fill in a list of references
 # to groupset bits for groups that no longer exist.
 sub _list_bits {
-    my ($num) = @_;
-    my $dbh = Bugzilla->dbh;
-    my @res;
-    my $curr = 1;
-    while (1) {
-        # Convert a big integer to a list of bits
-        my $sth = $dbh->prepare("SELECT ($num & ~$curr) > 0,
+  my ($num) = @_;
+  my $dbh = Bugzilla->dbh;
+  my @res;
+  my $curr = 1;
+  while (1) {
+
+    # Convert a big integer to a list of bits
+    my $sth = $dbh->prepare(
+      "SELECT ($num & ~$curr) > 0,
                                         ($num & $curr),
                                         ($num & ~$curr),
-                                        $curr << 1");
-        $sth->execute;
-        my ($more, $thisbit, $remain, $nval) = $sth->fetchrow_array;
-        push @res,"UNKNOWN<$curr>" if ($thisbit);
-        $curr = $nval;
-        $num = $remain;
-        last if !$more;
-    }
-    return @res;
+                                        $curr << 1"
+    );
+    $sth->execute;
+    my ($more, $thisbit, $remain, $nval) = $sth->fetchrow_array;
+    push @res, "UNKNOWN<$curr>" if ($thisbit);
+    $curr = $nval;
+    $num  = $remain;
+    last if !$more;
+  }
+  return @res;
 }
 
 sub _convert_groups_system_from_groupset {
-    my $dbh = Bugzilla->dbh;
-    # 2002-09-22 - bugreport@peshkin.net - bug 157756
-    #
-    # If the whole groups system is new, but the installation isn't,
-    # convert all the old groupset groups, etc...
-    #
-    # This requires:
-    # 1) define groups ids in group table
-    # 2) populate user_group_map with grants from old groupsets 
-    #    and blessgroupsets
-    # 3) populate bug_group_map with data converted from old bug groupsets
-    # 4) convert activity logs to use group names instead of numbers
-    # 5) identify the admin from the old all-ones groupset
-
-    # The groups system needs to be converted if groupset exists
-    if ($dbh->bz_column_info("profiles", "groupset")) {
-        # Some mysql versions will promote any unique key to primary key
-        # so all unique keys are removed first and then added back in
-        $dbh->bz_drop_index('groups', 'groups_bit_idx');
-        $dbh->bz_drop_index('groups', 'groups_name_idx');
-        my @primary_key = $dbh->primary_key(undef, undef, 'groups');
-        if (@primary_key) {
-            $dbh->do("ALTER TABLE groups DROP PRIMARY KEY");
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # 2002-09-22 - bugreport@peshkin.net - bug 157756
+  #
+  # If the whole groups system is new, but the installation isn't,
+  # convert all the old groupset groups, etc...
+  #
+  # This requires:
+  # 1) define groups ids in group table
+  # 2) populate user_group_map with grants from old groupsets
+  #    and blessgroupsets
+  # 3) populate bug_group_map with data converted from old bug groupsets
+  # 4) convert activity logs to use group names instead of numbers
+  # 5) identify the admin from the old all-ones groupset
+
+  # The groups system needs to be converted if groupset exists
+  if ($dbh->bz_column_info("profiles", "groupset")) {
+
+    # Some mysql versions will promote any unique key to primary key
+    # so all unique keys are removed first and then added back in
+    $dbh->bz_drop_index('groups', 'groups_bit_idx');
+    $dbh->bz_drop_index('groups', 'groups_name_idx');
+    my @primary_key = $dbh->primary_key(undef, undef, 'groups');
+    if (@primary_key) {
+      $dbh->do("ALTER TABLE groups DROP PRIMARY KEY");
+    }
+
+    $dbh->bz_add_column('groups', 'id',
+      {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+
+    $dbh->bz_add_index('groups', 'groups_name_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(name)]});
 
-        $dbh->bz_add_column('groups', 'id',
-            {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
-
-        $dbh->bz_add_index('groups', 'groups_name_idx',
-                           {TYPE => 'UNIQUE', FIELDS => [qw(name)]});
-
-        # Convert all existing groupset records to map entries before removing
-        # groupset fields or removing "bit" from groups.
-        my $sth = $dbh->prepare("SELECT bit, id FROM groups WHERE bit > 0");
-        $sth->execute();
-        while (my ($bit, $gid) = $sth->fetchrow_array) {
-            # Create user_group_map membership grants for old groupsets.
-            # Get each user with the old groupset bit set
-            my $sth2 = $dbh->prepare("SELECT userid FROM profiles
-                                       WHERE (groupset & $bit) != 0");
-            $sth2->execute();
-            while (my ($uid) = $sth2->fetchrow_array) {
-                # Check to see if the user is already a member of the group
-                # and, if not, insert a new record.
-                my $query = "SELECT user_id FROM user_group_map
+    # Convert all existing groupset records to map entries before removing
+    # groupset fields or removing "bit" from groups.
+    my $sth = $dbh->prepare("SELECT bit, id FROM groups WHERE bit > 0");
+    $sth->execute();
+    while (my ($bit, $gid) = $sth->fetchrow_array) {
+
+      # Create user_group_map membership grants for old groupsets.
+      # Get each user with the old groupset bit set
+      my $sth2 = $dbh->prepare(
+        "SELECT userid FROM profiles
+                                       WHERE (groupset & $bit) != 0"
+      );
+      $sth2->execute();
+      while (my ($uid) = $sth2->fetchrow_array) {
+
+        # Check to see if the user is already a member of the group
+        # and, if not, insert a new record.
+        my $query = "SELECT user_id FROM user_group_map
                               WHERE group_id = $gid AND user_id = $uid
                                     AND isbless = 0";
-                my $sth3 = $dbh->prepare($query);
-                $sth3->execute();
-                if ( !$sth3->fetchrow_array() ) {
-                    $dbh->do("INSERT INTO user_group_map
+        my $sth3 = $dbh->prepare($query);
+        $sth3->execute();
+        if (!$sth3->fetchrow_array()) {
+          $dbh->do(
+            "INSERT INTO user_group_map
                               (user_id, group_id, isbless, grant_type)
-                              VALUES ($uid, $gid, 0, " . GRANT_DIRECT . ")");
-                }
-            }
-            # Create user can bless group grants for old groupsets, but only
-            # if we're upgrading from a Bugzilla that had blessing.
-            if($dbh->bz_column_info('profiles', 'blessgroupset')) {
-                # Get each user with the old blessgroupset bit set
-                $sth2 = $dbh->prepare("SELECT userid FROM profiles
-                                        WHERE (blessgroupset & $bit) != 0");
-                $sth2->execute();
-                while (my ($uid) = $sth2->fetchrow_array) {
-                    $dbh->do("INSERT INTO user_group_map
+                              VALUES ($uid, $gid, 0, " . GRANT_DIRECT . ")"
+          );
+        }
+      }
+
+      # Create user can bless group grants for old groupsets, but only
+      # if we're upgrading from a Bugzilla that had blessing.
+      if ($dbh->bz_column_info('profiles', 'blessgroupset')) {
+
+        # Get each user with the old blessgroupset bit set
+        $sth2 = $dbh->prepare(
+          "SELECT userid FROM profiles
+                                        WHERE (blessgroupset & $bit) != 0"
+        );
+        $sth2->execute();
+        while (my ($uid) = $sth2->fetchrow_array) {
+          $dbh->do(
+            "INSERT INTO user_group_map
                               (user_id, group_id, isbless, grant_type)
-                              VALUES ($uid, $gid, 1, " . GRANT_DIRECT . ")");
-                }
-            }
-            # Create bug_group_map records for old groupsets.
-            # Get each bug with the old group bit set.
-            $sth2 = $dbh->prepare("SELECT bug_id FROM bugs
-                                    WHERE (groupset & $bit) != 0");
-            $sth2->execute();
-            while (my ($bug_id) = $sth2->fetchrow_array) {
-               # Insert the bug, group pair into the bug_group_map.
-                $dbh->do("INSERT INTO bug_group_map (bug_id, group_id)
-                          VALUES ($bug_id, $gid)");
-            }
+                              VALUES ($uid, $gid, 1, " . GRANT_DIRECT . ")"
+          );
         }
-        # Replace old activity log groupset records with lists of names 
-        # of groups.
-        $sth = $dbh->prepare("SELECT id FROM fielddefs
-                               WHERE name = " . $dbh->quote('bug_group'));
-        $sth->execute();
-        my ($bgfid) = $sth->fetchrow_array;
-        # Get the field id for the old groupset field
-        $sth = $dbh->prepare("SELECT id FROM fielddefs
-                               WHERE name = " . $dbh->quote('groupset'));
-        $sth->execute();
-        my ($gsid) = $sth->fetchrow_array;
-        # Get all bugs_activity records from groupset changes
-        if ($gsid) {
-            $sth = $dbh->prepare("SELECT bug_id, bug_when, who, added, removed
-                                    FROM bugs_activity WHERE fieldid = $gsid");
-            $sth->execute();
-            while (my ($bug_id, $bug_when, $who, $added, $removed) = 
-                       $sth->fetchrow_array) 
-            {
-                $added ||= 0;
-                $removed ||= 0;
-                # Get names of groups added.
-                my $sth2 = $dbh->prepare("SELECT name FROM groups
-                                           WHERE (bit & $added) != 0
-                                                 AND (bit & $removed) = 0");
-                $sth2->execute();
-                my @logadd;
-                while (my ($n) = $sth2->fetchrow_array) {
-                    push @logadd, $n;
-                }
-                # Get names of groups removed.
-                $sth2 = $dbh->prepare("SELECT name FROM groups
-                                        WHERE (bit & $removed) != 0
-                                              AND (bit & $added) = 0");
-                $sth2->execute();
-                my @logrem;
-                while (my ($n) = $sth2->fetchrow_array) {
-                    push @logrem, $n;
-                }
-                # Get list of group bits added that correspond to 
-                # missing groups.
-                $sth2 = $dbh->prepare("SELECT ($added & ~BIT_OR(bit)) 
-                                         FROM groups");
-                $sth2->execute();
-                my ($miss) = $sth2->fetchrow_array;
-                if ($miss) {
-                    push @logadd, _list_bits($miss);
-                    print "\nWARNING - GROUPSET ACTIVITY ON BUG $bug_id",
-                          " CONTAINS DELETED GROUPS\n";
-                }
-                # Get list of group bits deleted that correspond to 
-                # missing groups.
-                $sth2 = $dbh->prepare("SELECT ($removed & ~BIT_OR(bit)) 
-                                         FROM groups");
-                $sth2->execute();
-                ($miss) = $sth2->fetchrow_array;
-                if ($miss) {
-                    push @logrem, _list_bits($miss);
-                    print "\nWARNING - GROUPSET ACTIVITY ON BUG $bug_id",
-                          " CONTAINS DELETED GROUPS\n";
-                }
-                my $logr = "";
-                my $loga = "";
-                $logr = join(", ", @logrem) . '?' if @logrem;
-                $loga = join(", ", @logadd) . '?' if @logadd;
-                # Replace to old activity record with the converted data.
-                $dbh->do("UPDATE bugs_activity SET fieldid = $bgfid, added = " .
-                          $dbh->quote($loga) . ", removed = " .
-                          $dbh->quote($logr) .
-                         " WHERE bug_id = $bug_id AND bug_when = " .
-                          $dbh->quote($bug_when) .
-                         " AND who = $who AND fieldid = $gsid");
-            }
-            # Replace groupset changes with group name changes in
-            # profiles_activity. Get profiles_activity records for groupset.
-            $sth = $dbh->prepare(
-                 "SELECT userid, profiles_when, who, newvalue, oldvalue " .
-                   "FROM profiles_activity " .
-                  "WHERE fieldid = $gsid");
-            $sth->execute();
-            while (my ($uid, $uwhen, $uwho, $added, $removed) = 
-                       $sth->fetchrow_array) 
-            {
-                $added ||= 0;
-                $removed ||= 0;
-                # Get names of groups added.
-                my $sth2 = $dbh->prepare("SELECT name FROM groups
+      }
+
+      # Create bug_group_map records for old groupsets.
+      # Get each bug with the old group bit set.
+      $sth2 = $dbh->prepare(
+        "SELECT bug_id FROM bugs
+                                    WHERE (groupset & $bit) != 0"
+      );
+      $sth2->execute();
+      while (my ($bug_id) = $sth2->fetchrow_array) {
+
+        # Insert the bug, group pair into the bug_group_map.
+        $dbh->do(
+          "INSERT INTO bug_group_map (bug_id, group_id)
+                          VALUES ($bug_id, $gid)"
+        );
+      }
+    }
+
+    # Replace old activity log groupset records with lists of names
+    # of groups.
+    $sth = $dbh->prepare(
+      "SELECT id FROM fielddefs
+                               WHERE name = " . $dbh->quote('bug_group')
+    );
+    $sth->execute();
+    my ($bgfid) = $sth->fetchrow_array;
+
+    # Get the field id for the old groupset field
+    $sth = $dbh->prepare(
+      "SELECT id FROM fielddefs
+                               WHERE name = " . $dbh->quote('groupset')
+    );
+    $sth->execute();
+    my ($gsid) = $sth->fetchrow_array;
+
+    # Get all bugs_activity records from groupset changes
+    if ($gsid) {
+      $sth = $dbh->prepare(
+        "SELECT bug_id, bug_when, who, added, removed
+                                    FROM bugs_activity WHERE fieldid = $gsid"
+      );
+      $sth->execute();
+      while (my ($bug_id, $bug_when, $who, $added, $removed) = $sth->fetchrow_array) {
+        $added   ||= 0;
+        $removed ||= 0;
+
+        # Get names of groups added.
+        my $sth2 = $dbh->prepare(
+          "SELECT name FROM groups
                                            WHERE (bit & $added) != 0
-                                                 AND (bit & $removed) = 0");
-                $sth2->execute();
-                my @logadd;
-                while (my ($n) = $sth2->fetchrow_array) {
-                    push @logadd, $n;
-                }
-                # Get names of groups removed.
-                $sth2 = $dbh->prepare("SELECT name FROM groups
+                                                 AND (bit & $removed) = 0"
+        );
+        $sth2->execute();
+        my @logadd;
+        while (my ($n) = $sth2->fetchrow_array) {
+          push @logadd, $n;
+        }
+
+        # Get names of groups removed.
+        $sth2 = $dbh->prepare(
+          "SELECT name FROM groups
                                         WHERE (bit & $removed) != 0
-                                              AND (bit & $added) = 0");
-                $sth2->execute();
-                my @logrem;
-                while (my ($n) = $sth2->fetchrow_array) {
-                    push @logrem, $n;
-                }
-                my $ladd = "";
-                my $lrem = "";
-                $ladd = join(", ", @logadd) . '?' if @logadd;
-                $lrem = join(", ", @logrem) . '?' if @logrem;
-                # Replace profiles_activity record for groupset change
-                # with group list.
-                $dbh->do("UPDATE profiles_activity " .
-                            "SET fieldid = $bgfid, newvalue = " .
-                          $dbh->quote($ladd) . ", oldvalue = " .
-                          $dbh->quote($lrem) .
-                         " WHERE userid = $uid AND profiles_when = " .
-                          $dbh->quote($uwhen) .
-                               " AND who = $uwho AND fieldid = $gsid");
-            }
+                                              AND (bit & $added) = 0"
+        );
+        $sth2->execute();
+        my @logrem;
+        while (my ($n) = $sth2->fetchrow_array) {
+          push @logrem, $n;
         }
 
-        # Identify admin group.
-        my ($admin_gid) = $dbh->selectrow_array(
-            "SELECT id FROM groups WHERE name = 'admin'");
-        if (!$admin_gid) {
-            $dbh->do(q{INSERT INTO groups (name, description)
-                                   VALUES ('admin', 'Administrators')});
-            $admin_gid = $dbh->bz_last_key('groups', 'id');
+        # Get list of group bits added that correspond to
+        # missing groups.
+        $sth2 = $dbh->prepare(
+          "SELECT ($added & ~BIT_OR(bit)) 
+                                         FROM groups"
+        );
+        $sth2->execute();
+        my ($miss) = $sth2->fetchrow_array;
+        if ($miss) {
+          push @logadd, _list_bits($miss);
+          print "\nWARNING - GROUPSET ACTIVITY ON BUG $bug_id",
+            " CONTAINS DELETED GROUPS\n";
         }
-        # Find current admins
-        my @admins;
-        # Don't lose admins from DBs where Bug 157704 applies
-        $sth = $dbh->prepare(
-               "SELECT userid, (groupset & 65536), login_name " .
-                 "FROM profiles " .
-                "WHERE (groupset | 65536) = 9223372036854775807");
-        $sth->execute();
-        while ( my ($userid, $iscomplete, $login_name) 
-                    = $sth->fetchrow_array() ) 
-        {
-            # existing administrators are made members of group "admin"
-            print "\nWARNING - $login_name IS AN ADMIN IN SPITE OF BUG",
-                  " 157704\n\n" if (!$iscomplete);
-            push(@admins, $userid) unless grep($_ eq $userid, @admins);
+
+        # Get list of group bits deleted that correspond to
+        # missing groups.
+        $sth2 = $dbh->prepare(
+          "SELECT ($removed & ~BIT_OR(bit)) 
+                                         FROM groups"
+        );
+        $sth2->execute();
+        ($miss) = $sth2->fetchrow_array;
+        if ($miss) {
+          push @logrem, _list_bits($miss);
+          print "\nWARNING - GROUPSET ACTIVITY ON BUG $bug_id",
+            " CONTAINS DELETED GROUPS\n";
         }
-        # Now make all those users admins directly. They were already
-        # added to every other group, above, because of their groupset.
-        foreach my $admin_id (@admins) {
-            $dbh->do("INSERT INTO user_group_map
-                                  (user_id, group_id, isbless, grant_type)
-                           VALUES (?, ?, ?, ?)", 
-                      undef, $admin_id, $admin_gid, $_, GRANT_DIRECT)
-                foreach (0, 1);
+        my $logr = "";
+        my $loga = "";
+        $logr = join(", ", @logrem) . '?' if @logrem;
+        $loga = join(", ", @logadd) . '?' if @logadd;
+
+        # Replace to old activity record with the converted data.
+        $dbh->do("UPDATE bugs_activity SET fieldid = $bgfid, added = "
+            . $dbh->quote($loga)
+            . ", removed = "
+            . $dbh->quote($logr)
+            . " WHERE bug_id = $bug_id AND bug_when = "
+            . $dbh->quote($bug_when)
+            . " AND who = $who AND fieldid = $gsid");
+      }
+
+      # Replace groupset changes with group name changes in
+      # profiles_activity. Get profiles_activity records for groupset.
+      $sth
+        = $dbh->prepare("SELECT userid, profiles_when, who, newvalue, oldvalue "
+          . "FROM profiles_activity "
+          . "WHERE fieldid = $gsid");
+      $sth->execute();
+      while (my ($uid, $uwhen, $uwho, $added, $removed) = $sth->fetchrow_array) {
+        $added   ||= 0;
+        $removed ||= 0;
+
+        # Get names of groups added.
+        my $sth2 = $dbh->prepare(
+          "SELECT name FROM groups
+                                           WHERE (bit & $added) != 0
+                                                 AND (bit & $removed) = 0"
+        );
+        $sth2->execute();
+        my @logadd;
+        while (my ($n) = $sth2->fetchrow_array) {
+          push @logadd, $n;
+        }
+
+        # Get names of groups removed.
+        $sth2 = $dbh->prepare(
+          "SELECT name FROM groups
+                                        WHERE (bit & $removed) != 0
+                                              AND (bit & $added) = 0"
+        );
+        $sth2->execute();
+        my @logrem;
+        while (my ($n) = $sth2->fetchrow_array) {
+          push @logrem, $n;
         }
+        my $ladd = "";
+        my $lrem = "";
+        $ladd = join(", ", @logadd) . '?' if @logadd;
+        $lrem = join(", ", @logrem) . '?' if @logrem;
+
+        # Replace profiles_activity record for groupset change
+        # with group list.
+        $dbh->do("UPDATE profiles_activity "
+            . "SET fieldid = $bgfid, newvalue = "
+            . $dbh->quote($ladd)
+            . ", oldvalue = "
+            . $dbh->quote($lrem)
+            . " WHERE userid = $uid AND profiles_when = "
+            . $dbh->quote($uwhen)
+            . " AND who = $uwho AND fieldid = $gsid");
+      }
+    }
+
+    # Identify admin group.
+    my ($admin_gid)
+      = $dbh->selectrow_array("SELECT id FROM groups WHERE name = 'admin'");
+    if (!$admin_gid) {
+      $dbh->do(
+        q{INSERT INTO groups (name, description)
+                                   VALUES ('admin', 'Administrators')}
+      );
+      $admin_gid = $dbh->bz_last_key('groups', 'id');
+    }
+
+    # Find current admins
+    my @admins;
+
+    # Don't lose admins from DBs where Bug 157704 applies
+    $sth
+      = $dbh->prepare("SELECT userid, (groupset & 65536), login_name "
+        . "FROM profiles "
+        . "WHERE (groupset | 65536) = 9223372036854775807");
+    $sth->execute();
+    while (my ($userid, $iscomplete, $login_name) = $sth->fetchrow_array()) {
 
-        $dbh->bz_drop_column('profiles','groupset');
-        $dbh->bz_drop_column('profiles','blessgroupset');
-        $dbh->bz_drop_column('bugs','groupset');
-        $dbh->bz_drop_column('groups','bit');
-        $dbh->do("DELETE FROM fielddefs WHERE name = " 
-            . $dbh->quote('groupset'));
+      # existing administrators are made members of group "admin"
+      print "\nWARNING - $login_name IS AN ADMIN IN SPITE OF BUG", " 157704\n\n"
+        if (!$iscomplete);
+      push(@admins, $userid) unless grep($_ eq $userid, @admins);
     }
+
+    # Now make all those users admins directly. They were already
+    # added to every other group, above, because of their groupset.
+    foreach my $admin_id (@admins) {
+      $dbh->do(
+        "INSERT INTO user_group_map
+                                  (user_id, group_id, isbless, grant_type)
+                           VALUES (?, ?, ?, ?)", undef, $admin_id, $admin_gid, $_,
+        GRANT_DIRECT
+      ) foreach (0, 1);
+    }
+
+    $dbh->bz_drop_column('profiles', 'groupset');
+    $dbh->bz_drop_column('profiles', 'blessgroupset');
+    $dbh->bz_drop_column('bugs',     'groupset');
+    $dbh->bz_drop_column('groups',   'bit');
+    $dbh->do("DELETE FROM fielddefs WHERE name = " . $dbh->quote('groupset'));
+  }
 }
 
 sub _convert_attachment_statuses_to_flags {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
+
+  # September 2002 myk@mozilla.org bug 98801
+  # Convert the attachment statuses tables into flags tables.
+  if ( $dbh->bz_table_info("attachstatuses")
+    && $dbh->bz_table_info("attachstatusdefs"))
+  {
+    print "Converting attachment statuses to flags...\n";
+
+    # Get IDs for the old attachment status and new flag fields.
+    my ($old_field_id)
+      = $dbh->selectrow_array(
+      "SELECT id FROM fielddefs WHERE name='attachstatusdefs.name'")
+      || 0;
+    my ($new_field_id)
+      = $dbh->selectrow_array(
+      "SELECT id FROM fielddefs WHERE name = 'flagtypes.name'");
+
+    # Convert attachment status definitions to flag types.  If more than one
+    # status has the same name and description, it is merged into a single
+    # status with multiple inclusion records.
 
-    # September 2002 myk@mozilla.org bug 98801
-    # Convert the attachment statuses tables into flags tables.
-    if ($dbh->bz_table_info("attachstatuses") 
-        && $dbh->bz_table_info("attachstatusdefs")) 
-    {
-        print "Converting attachment statuses to flags...\n";
-
-        # Get IDs for the old attachment status and new flag fields.
-        my ($old_field_id) = $dbh->selectrow_array(
-            "SELECT id FROM fielddefs WHERE name='attachstatusdefs.name'")
-            || 0;
-        my ($new_field_id) = $dbh->selectrow_array(
-            "SELECT id FROM fielddefs WHERE name = 'flagtypes.name'");
-
-        # Convert attachment status definitions to flag types.  If more than one
-        # status has the same name and description, it is merged into a single
-        # status with multiple inclusion records.     
-
-        my $sth = $dbh->prepare(
-            "SELECT id, name, description, sortkey, product_id  
-               FROM attachstatusdefs");
-
-        # status definition IDs indexed by name/description
-        my $def_ids = {};
-
-        # merged IDs and the IDs they were merged into.  The key is the old ID,
-        # the value is the new one.  This allows us to give statuses the right
-        # ID when we convert them over to flags.  This map includes IDs that
-        # weren't merged (in this case the old and new IDs are the same), since
-        # it makes the code simpler.
-        my $def_id_map = {};
-
-        $sth->execute();
-        while (my ($id, $name, $desc, $sortkey, $prod_id) = 
-                   $sth->fetchrow_array()) 
-        {
-            my $key = $name . $desc;
-            if (!$def_ids->{$key}) {
-                $def_ids->{$key} = $id;
-                my $quoted_name = $dbh->quote($name);
-                my $quoted_desc = $dbh->quote($desc);
-                $dbh->do("INSERT INTO flagtypes (id, name, description, 
+    my $sth = $dbh->prepare(
+      "SELECT id, name, description, sortkey, product_id  
+               FROM attachstatusdefs"
+    );
+
+    # status definition IDs indexed by name/description
+    my $def_ids = {};
+
+    # merged IDs and the IDs they were merged into.  The key is the old ID,
+    # the value is the new one.  This allows us to give statuses the right
+    # ID when we convert them over to flags.  This map includes IDs that
+    # weren't merged (in this case the old and new IDs are the same), since
+    # it makes the code simpler.
+    my $def_id_map = {};
+
+    $sth->execute();
+    while (my ($id, $name, $desc, $sortkey, $prod_id) = $sth->fetchrow_array()) {
+      my $key = $name . $desc;
+      if (!$def_ids->{$key}) {
+        $def_ids->{$key} = $id;
+        my $quoted_name = $dbh->quote($name);
+        my $quoted_desc = $dbh->quote($desc);
+        $dbh->do(
+          "INSERT INTO flagtypes (id, name, description, 
                                                  sortkey, target_type) 
                           VALUES ($id, $quoted_name, $quoted_desc, 
-                                  $sortkey,'a')");
-            }
-            $def_id_map->{$id} = $def_ids->{$key};
-            $dbh->do("INSERT INTO flaginclusions (type_id, product_id)
-                      VALUES ($def_id_map->{$id}, $prod_id)");
-        }
+                                  $sortkey,'a')"
+        );
+      }
+      $def_id_map->{$id} = $def_ids->{$key};
+      $dbh->do(
+        "INSERT INTO flaginclusions (type_id, product_id)
+                      VALUES ($def_id_map->{$id}, $prod_id)"
+      );
+    }
 
-        # Note: even though we've converted status definitions, we still
-        # can't drop the table because we need it to convert the statuses 
-        # themselves.
-
-        # Convert attachment statuses to flags.  To do this we select 
-        # the statuses from the status table and then, for each one, 
-        # figure out who set it and when they set it from the bugs 
-        # activity table.
-        my $id = 0;
-        $sth = $dbh->prepare(
-            "SELECT attachstatuses.attach_id, attachstatusdefs.id,
+    # Note: even though we've converted status definitions, we still
+    # can't drop the table because we need it to convert the statuses
+    # themselves.
+
+    # Convert attachment statuses to flags.  To do this we select
+    # the statuses from the status table and then, for each one,
+    # figure out who set it and when they set it from the bugs
+    # activity table.
+    my $id = 0;
+    $sth = $dbh->prepare(
+      "SELECT attachstatuses.attach_id, attachstatusdefs.id,
                     attachstatusdefs.name, attachments.bug_id
                FROM attachstatuses, attachstatusdefs, attachments
               WHERE attachstatuses.statusid = attachstatusdefs.id
-                    AND attachstatuses.attach_id = attachments.attach_id");
+                    AND attachstatuses.attach_id = attachments.attach_id"
+    );
 
-        # a query to determine when the attachment status was set and who set it
-        my $sth2 = $dbh->prepare("SELECT added, who, bug_when
+    # a query to determine when the attachment status was set and who set it
+    my $sth2 = $dbh->prepare(
+      "SELECT added, who, bug_when
                                     FROM bugs_activity
                                    WHERE bug_id = ? AND attach_id = ?
                                          AND fieldid = $old_field_id
-                                ORDER BY bug_when DESC");
-
-        $sth->execute();
-        while (my ($attach_id, $def_id, $status, $bug_id) = 
-                   $sth->fetchrow_array()) 
-        {
-            ++$id;
-
-            # Determine when the attachment status was set and who set it.
-            # We should always be able to find out this info from the bug
-            # activity, but we fall back to default values just in case.
-            $sth2->execute($bug_id, $attach_id);
-            my ($added, $who, $when);
-            while (($added, $who, $when) = $sth2->fetchrow_array()) {
-                last if $added =~ /(^|[, ]+)\Q$status\E([, ]+|$)/;
-            }
-            $who = $dbh->quote($who); # "NULL" by default if $who is undefined
-            $when = $when ? $dbh->quote($when) : "NOW()";
-
+                                ORDER BY bug_when DESC"
+    );
 
-            $dbh->do("INSERT INTO flags (id, type_id, status, bug_id, 
+    $sth->execute();
+    while (my ($attach_id, $def_id, $status, $bug_id) = $sth->fetchrow_array()) {
+      ++$id;
+
+      # Determine when the attachment status was set and who set it.
+      # We should always be able to find out this info from the bug
+      # activity, but we fall back to default values just in case.
+      $sth2->execute($bug_id, $attach_id);
+      my ($added, $who, $when);
+      while (($added, $who, $when) = $sth2->fetchrow_array()) {
+        last if $added =~ /(^|[, ]+)\Q$status\E([, ]+|$)/;
+      }
+      $who = $dbh->quote($who);    # "NULL" by default if $who is undefined
+      $when = $when ? $dbh->quote($when) : "NOW()";
+
+
+      $dbh->do(
+        "INSERT INTO flags (id, type_id, status, bug_id, 
                       attach_id, creation_date, modification_date, 
                       requestee_id, setter_id)
                       VALUES ($id, $def_id_map->{$def_id}, '+', $bug_id,
-                              $attach_id, $when, $when, NULL, $who)");
-        }
+                              $attach_id, $when, $when, NULL, $who)"
+      );
+    }
 
-        # Now that we've converted both tables we can drop them.
-        $dbh->bz_drop_table("attachstatuses");
-        $dbh->bz_drop_table("attachstatusdefs");
+    # Now that we've converted both tables we can drop them.
+    $dbh->bz_drop_table("attachstatuses");
+    $dbh->bz_drop_table("attachstatusdefs");
 
-        # Convert activity records for attachment statuses into records 
-        # for flags.
-        $sth = $dbh->prepare("SELECT attach_id, who, bug_when, added, 
+    # Convert activity records for attachment statuses into records
+    # for flags.
+    $sth = $dbh->prepare(
+      "SELECT attach_id, who, bug_when, added, 
                                      removed 
                                 FROM bugs_activity 
-                               WHERE fieldid = $old_field_id");
-        $sth->execute();
-        while (my ($attach_id, $who, $when, $old_added, $old_removed) =
-                   $sth->fetchrow_array())
-        {
-            my @additions = split(/[, ]+/, $old_added);
-            @additions = map("$_+", @additions);
-            my $new_added = $dbh->quote(join(", ", @additions));
-
-            my @removals = split(/[, ]+/, $old_removed);
-            @removals = map("$_+", @removals);
-            my $new_removed = $dbh->quote(join(", ", @removals));
-
-            $old_added = $dbh->quote($old_added);
-            $old_removed = $dbh->quote($old_removed);
-            $who = $dbh->quote($who);
-            $when = $dbh->quote($when);
-
-            $dbh->do("UPDATE bugs_activity SET fieldid = $new_field_id, " .
-                     "added = $new_added, removed = $new_removed " .
-                     "WHERE attach_id = $attach_id AND who = $who " .
-                     "AND bug_when = $when AND fieldid = $old_field_id " .
-                     "AND added = $old_added AND removed = $old_removed");
-        }
+                               WHERE fieldid = $old_field_id"
+    );
+    $sth->execute();
+    while (my ($attach_id, $who, $when, $old_added, $old_removed)
+      = $sth->fetchrow_array())
+    {
+      my @additions = split(/[, ]+/, $old_added);
+      @additions = map("$_+", @additions);
+      my $new_added = $dbh->quote(join(", ", @additions));
+
+      my @removals = split(/[, ]+/, $old_removed);
+      @removals = map("$_+", @removals);
+      my $new_removed = $dbh->quote(join(", ", @removals));
+
+      $old_added   = $dbh->quote($old_added);
+      $old_removed = $dbh->quote($old_removed);
+      $who         = $dbh->quote($who);
+      $when        = $dbh->quote($when);
+
+      $dbh->do("UPDATE bugs_activity SET fieldid = $new_field_id, "
+          . "added = $new_added, removed = $new_removed "
+          . "WHERE attach_id = $attach_id AND who = $who "
+          . "AND bug_when = $when AND fieldid = $old_field_id "
+          . "AND added = $old_added AND removed = $old_removed");
+    }
 
-        # Remove the attachment status field from the field definitions.
-        $dbh->do("DELETE FROM fielddefs WHERE name='attachstatusdefs.name'");
+    # Remove the attachment status field from the field definitions.
+    $dbh->do("DELETE FROM fielddefs WHERE name='attachstatusdefs.name'");
 
-        print "done.\n";
-    }
+    print "done.\n";
+  }
 }
 
 sub _remove_spaces_and_commas_from_flagtypes {
-    my $dbh = Bugzilla->dbh;
-    # Get all names and IDs, to find broken ones and to
-    # check for collisions when renaming.
-    my $sth = $dbh->prepare("SELECT name, id FROM flagtypes");
-    $sth->execute();
-
-    my %flagtypes;
-    my @badflagnames; 
-    # find broken flagtype names, and populate a hash table
-    # to check for collisions.
-    while (my ($name, $id) = $sth->fetchrow_array()) {
-        $flagtypes{$name} = $id;
-        if ($name =~ /[ ,]/) {
-            push(@badflagnames, $name);
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # Get all names and IDs, to find broken ones and to
+  # check for collisions when renaming.
+  my $sth = $dbh->prepare("SELECT name, id FROM flagtypes");
+  $sth->execute();
+
+  my %flagtypes;
+  my @badflagnames;
+
+  # find broken flagtype names, and populate a hash table
+  # to check for collisions.
+  while (my ($name, $id) = $sth->fetchrow_array()) {
+    $flagtypes{$name} = $id;
+    if ($name =~ /[ ,]/) {
+      push(@badflagnames, $name);
     }
-    if (@badflagnames) {
-        print "Removing spaces and commas from flag names...\n";
-        my ($flagname, $tryflagname);
-        my $sth = $dbh->prepare("UPDATE flagtypes SET name = ? WHERE id = ?");
-        foreach $flagname (@badflagnames) {
-            print "  Bad flag type name \"$flagname\" ...\n";
-            # find a new name for this flagtype.
-            ($tryflagname = $flagname) =~ tr/ ,/__/;
-            # avoid collisions with existing flagtype names.
-            while (defined($flagtypes{$tryflagname})) {
-                print "  ... can't rename as \"$tryflagname\" ...\n";
-                $tryflagname .= "'";
-                if (length($tryflagname) > 50) {
-                    my $lastchanceflagname = (substr $tryflagname, 0, 47) . '...';
-                    if (defined($flagtypes{$lastchanceflagname})) {
-                        print "  ... last attempt as \"$lastchanceflagname\" still failed.'\n";
-                        die install_string('update_flags_bad_name',
-                                           { flag => $flagname }), "\n";
-                    }
-                    $tryflagname = $lastchanceflagname;
-                }
-            }
-            $sth->execute($tryflagname, $flagtypes{$flagname});
-            print "  renamed flag type \"$flagname\" as \"$tryflagname\"\n";
-            $flagtypes{$tryflagname} = $flagtypes{$flagname};
-            delete $flagtypes{$flagname};
+  }
+  if (@badflagnames) {
+    print "Removing spaces and commas from flag names...\n";
+    my ($flagname, $tryflagname);
+    my $sth = $dbh->prepare("UPDATE flagtypes SET name = ? WHERE id = ?");
+    foreach $flagname (@badflagnames) {
+      print "  Bad flag type name \"$flagname\" ...\n";
+
+      # find a new name for this flagtype.
+      ($tryflagname = $flagname) =~ tr/ ,/__/;
+
+      # avoid collisions with existing flagtype names.
+      while (defined($flagtypes{$tryflagname})) {
+        print "  ... can't rename as \"$tryflagname\" ...\n";
+        $tryflagname .= "'";
+        if (length($tryflagname) > 50) {
+          my $lastchanceflagname = (substr $tryflagname, 0, 47) . '...';
+          if (defined($flagtypes{$lastchanceflagname})) {
+            print "  ... last attempt as \"$lastchanceflagname\" still failed.'\n";
+            die install_string('update_flags_bad_name', {flag => $flagname}), "\n";
+          }
+          $tryflagname = $lastchanceflagname;
         }
-        print "... done.\n";
+      }
+      $sth->execute($tryflagname, $flagtypes{$flagname});
+      print "  renamed flag type \"$flagname\" as \"$tryflagname\"\n";
+      $flagtypes{$tryflagname} = $flagtypes{$flagname};
+      delete $flagtypes{$flagname};
     }
+    print "... done.\n";
+  }
 }
 
 sub _setup_usebuggroups_backward_compatibility {
-    my $dbh = Bugzilla->dbh;
-
-    # Don't run this on newer Bugzillas. This is a reliable test because
-    # the longdescs table existed in 2.16 (which had usebuggroups)
-    # but not in 2.18, and this code happens between 2.16 and 2.18.
-    return if $dbh->bz_column_info('longdescs', 'already_wrapped');
-
-    # 2002-11-24 - bugreport@peshkin.net - bug 147275
-    #
-    # If group_control_map is empty, backward-compatibility
-    # usebuggroups-equivalent records should be created.
-    my ($maps_exist) = $dbh->selectrow_array(
-        "SELECT DISTINCT 1 FROM group_control_map");
-    if (!$maps_exist) {
-        print "Converting old usebuggroups controls...\n";
-        # Initially populate group_control_map.
-        # First, get all the existing products and their groups.
-        my $sth = $dbh->prepare("SELECT groups.id, products.id, groups.name,
+  my $dbh = Bugzilla->dbh;
+
+  # Don't run this on newer Bugzillas. This is a reliable test because
+  # the longdescs table existed in 2.16 (which had usebuggroups)
+  # but not in 2.18, and this code happens between 2.16 and 2.18.
+  return if $dbh->bz_column_info('longdescs', 'already_wrapped');
+
+  # 2002-11-24 - bugreport@peshkin.net - bug 147275
+  #
+  # If group_control_map is empty, backward-compatibility
+  # usebuggroups-equivalent records should be created.
+  my ($maps_exist)
+    = $dbh->selectrow_array("SELECT DISTINCT 1 FROM group_control_map");
+  if (!$maps_exist) {
+    print "Converting old usebuggroups controls...\n";
+
+    # Initially populate group_control_map.
+    # First, get all the existing products and their groups.
+    my $sth = $dbh->prepare(
+      "SELECT groups.id, products.id, groups.name,
                                         products.name 
                                   FROM groups, products
-                                 WHERE isbuggroup != 0");
-        $sth->execute();
-        while (my ($groupid, $productid, $groupname, $productname)
-                = $sth->fetchrow_array()) 
-        {
-            if ($groupname eq $productname) {
-                # Product and group have same name.
-                $dbh->do("INSERT INTO group_control_map " .
-                         "(group_id, product_id, membercontrol, othercontrol) " .
-                         "VALUES (?, ?, ?, ?)", undef,
-                         ($groupid, $productid, CONTROLMAPDEFAULT, CONTROLMAPNA));
-            } else {
-                # See if this group is a product group at all.
-                my $sth2 = $dbh->prepare("SELECT id FROM products 
-                    WHERE name = " .$dbh->quote($groupname));
-                $sth2->execute();
-                my ($id) = $sth2->fetchrow_array();
-                if (!$id) {
-                    # If there is no product with the same name as this
-                    # group, then it is permitted for all products.
-                    $dbh->do("INSERT INTO group_control_map " .
-                             "(group_id, product_id, membercontrol, othercontrol) " .
-                             "VALUES (?, ?, ?, ?)", undef,
-                             ($groupid, $productid, CONTROLMAPSHOWN, CONTROLMAPNA));
-                }
-            }
+                                 WHERE isbuggroup != 0"
+    );
+    $sth->execute();
+    while (my ($groupid, $productid, $groupname, $productname)
+      = $sth->fetchrow_array())
+    {
+      if ($groupname eq $productname) {
+
+        # Product and group have same name.
+        $dbh->do(
+          "INSERT INTO group_control_map "
+            . "(group_id, product_id, membercontrol, othercontrol) "
+            . "VALUES (?, ?, ?, ?)",
+          undef,
+          ($groupid, $productid, CONTROLMAPDEFAULT, CONTROLMAPNA)
+        );
+      }
+      else {
+        # See if this group is a product group at all.
+        my $sth2 = $dbh->prepare(
+          "SELECT id FROM products 
+                    WHERE name = " . $dbh->quote($groupname)
+        );
+        $sth2->execute();
+        my ($id) = $sth2->fetchrow_array();
+        if (!$id) {
+
+          # If there is no product with the same name as this
+          # group, then it is permitted for all products.
+          $dbh->do(
+            "INSERT INTO group_control_map "
+              . "(group_id, product_id, membercontrol, othercontrol) "
+              . "VALUES (?, ?, ?, ?)",
+            undef,
+            ($groupid, $productid, CONTROLMAPSHOWN, CONTROLMAPNA)
+          );
         }
+      }
     }
+  }
 }
 
 sub _remove_user_series_map {
-    my $dbh = Bugzilla->dbh;
-    # 2004-07-17 GRM - Remove "subscriptions" concept from charting, and add
-    # group-based security instead.
-    if ($dbh->bz_table_info("user_series_map")) {
-        # Oracle doesn't like "date" as a column name, and apparently some DBs
-        # don't like 'value' either. We use the changes to subscriptions as
-        # something to hang these renamings off.
-        $dbh->bz_rename_column('series_data', 'date', 'series_date');
-        $dbh->bz_rename_column('series_data', 'value', 'series_value');
-
-        # series_categories.category_id produces a too-long column name for the
-        # auto-incrementing sequence (Oracle again).
-        $dbh->bz_rename_column('series_categories', 'category_id', 'id');
-
-        $dbh->bz_add_column("series", "public",
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
-
-        # Migrate public-ness across from user_series_map to new field
-        my $sth = $dbh->prepare("SELECT series_id from user_series_map " .
-                                 "WHERE user_id = 0");
-        $sth->execute();
-        while (my ($public_series_id) = $sth->fetchrow_array()) {
-            $dbh->do("UPDATE series SET public = 1 " .
-                     "WHERE series_id = $public_series_id");
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # 2004-07-17 GRM - Remove "subscriptions" concept from charting, and add
+  # group-based security instead.
+  if ($dbh->bz_table_info("user_series_map")) {
+
+    # Oracle doesn't like "date" as a column name, and apparently some DBs
+    # don't like 'value' either. We use the changes to subscriptions as
+    # something to hang these renamings off.
+    $dbh->bz_rename_column('series_data', 'date',  'series_date');
+    $dbh->bz_rename_column('series_data', 'value', 'series_value');
 
-        $dbh->bz_drop_table("user_series_map");
+    # series_categories.category_id produces a too-long column name for the
+    # auto-incrementing sequence (Oracle again).
+    $dbh->bz_rename_column('series_categories', 'category_id', 'id');
+
+    $dbh->bz_add_column("series", "public",
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+
+    # Migrate public-ness across from user_series_map to new field
+    my $sth = $dbh->prepare(
+      "SELECT series_id from user_series_map " . "WHERE user_id = 0");
+    $sth->execute();
+    while (my ($public_series_id) = $sth->fetchrow_array()) {
+      $dbh->do(
+        "UPDATE series SET public = 1 " . "WHERE series_id = $public_series_id");
     }
+
+    $dbh->bz_drop_table("user_series_map");
+  }
 }
 
 sub _copy_old_charts_into_database {
-    my $dbh = Bugzilla->dbh;
-    my $datadir = bz_locations()->{'datadir'};
-    # 2003-06-26 Copy the old charting data into the database, and create the
-    # queries that will keep it all running. When the old charting system goes
-    # away, if this code ever runs, it'll just find no files and do nothing.
-    my $series_exists = $dbh->selectrow_array("SELECT 1 FROM series " .
-                                              $dbh->sql_limit(1));
-    if (!$series_exists && -d "$datadir/mining" && -e "$datadir/mining/-All-") {
-        print "Migrating old chart data into database...\n";
-
-        # We prepare the handle to insert the series data
-        my $seriesdatasth = $dbh->prepare(
-            "INSERT INTO series_data (series_id, series_date, series_value)
-                  VALUES (?, ?, ?)");
-
-        my $deletesth = $dbh->prepare(
-            "DELETE FROM series_data WHERE series_id = ? AND series_date = ?");
-
-        my $groupmapsth = $dbh->prepare(
-            "INSERT INTO category_group_map (category_id, group_id)
-                  VALUES (?, ?)");
-
-        # Fields in the data file (matches the current collectstats.pl)
-        my @statuses =
-            qw(NEW ASSIGNED REOPENED UNCONFIRMED RESOLVED VERIFIED CLOSED);
-        my @resolutions =
-            qw(FIXED INVALID WONTFIX LATER REMIND DUPLICATE WORKSFORME MOVED);
-        my @fields = (@statuses, @resolutions);
-
-        # We have a localization problem here. Where do we get these values?
-        my $all_name = "-All-";
-        my $open_name = "All Open";
-
-        $dbh->bz_start_transaction();
-        my $products = $dbh->selectall_arrayref("SELECT name FROM products");
-
-        foreach my $product ((map { $_->[0] } @$products), "-All-") {
-            print "$product:\n";
-            # First, create the series
-            my %queries;
-            my %seriesids;
-
-            my $query_prod = "";
-            if ($product ne "-All-") {
-                $query_prod = "product=" . html_quote($product) . "&";
-            }
+  my $dbh     = Bugzilla->dbh;
+  my $datadir = bz_locations()->{'datadir'};
+
+  # 2003-06-26 Copy the old charting data into the database, and create the
+  # queries that will keep it all running. When the old charting system goes
+  # away, if this code ever runs, it'll just find no files and do nothing.
+  my $series_exists
+    = $dbh->selectrow_array("SELECT 1 FROM series " . $dbh->sql_limit(1));
+  if (!$series_exists && -d "$datadir/mining" && -e "$datadir/mining/-All-") {
+    print "Migrating old chart data into database...\n";
+
+    # We prepare the handle to insert the series data
+    my $seriesdatasth = $dbh->prepare(
+      "INSERT INTO series_data (series_id, series_date, series_value)
+                  VALUES (?, ?, ?)"
+    );
 
-            # The query for statuses is different to that for resolutions.
-            $queries{$_} = ($query_prod . "bug_status=$_") foreach (@statuses);
-            $queries{$_} = ($query_prod . "resolution=$_") 
-                foreach (@resolutions);
-
-            foreach my $field (@fields) {
-                # Create a Series for each field in this product.
-                my $series = new Bugzilla::Series(undef, $product, $all_name,
-                                                  $field, undef, 1,
-                                                  $queries{$field}, 1);
-                $series->writeToDatabase();
-                $seriesids{$field} = $series->{'series_id'};
-            }
+    my $deletesth = $dbh->prepare(
+      "DELETE FROM series_data WHERE series_id = ? AND series_date = ?");
 
-            # We also add a new query for "Open", so that migrated products get
-            # the same set as new products (see editproducts.cgi.)
-            my @openedstatuses = ("UNCONFIRMED", "NEW", "ASSIGNED", "REOPENED");
-            my $query = join("&", map { "bug_status=$_" } @openedstatuses);
-            my $series = new Bugzilla::Series(undef, $product, $all_name,
-                                              $open_name, undef, 1,
-                                              $query_prod . $query, 1);
-            $series->writeToDatabase();
-            $seriesids{$open_name} = $series->{'series_id'};
-
-            # Now, we attempt to read in historical data, if any
-            # Convert the name in the same way that collectstats.pl does
-            my $product_file = $product;
-            $product_file =~ s/\//-/gs;
-            $product_file = "$datadir/mining/$product_file";
-
-            # There are many reasons that this might fail (e.g. no stats 
-            # for this product), so we don't worry if it does.
-            my $in = new IO::File($product_file) or next;
-
-            # The data files should be in a standard format, even for old
-            # Bugzillas, because of the conversion code further up this file.
-            my %data;
-            my $last_date = "";
-
-            my @lines = <$in>;
-            while (my $line = shift @lines) {
-                if ($line =~ /^(\d+\|.*)/) {
-                    my @numbers = split(/\||\r/, $1);
-
-                    # Only take the first line for each date; it was possible to
-                    # run collectstats.pl more than once in a day.
-                    next if $numbers[0] eq $last_date;
-
-                    for my $i (0 .. $#fields) {
-                        # $numbers[0] is the date
-                        $data{$fields[$i]}{$numbers[0]} = $numbers[$i + 1];
-
-                        # Keep a total of the number of open bugs for this day
-                        if (grep { $_ eq $fields[$i] } @openedstatuses) {
-                            $data{$open_name}{$numbers[0]} += $numbers[$i + 1];
-                        }
-                    }
-
-                    $last_date = $numbers[0];
-                }
-            }
+    my $groupmapsth = $dbh->prepare(
+      "INSERT INTO category_group_map (category_id, group_id)
+                  VALUES (?, ?)"
+    );
 
-            $in->close;
-
-            my $total_items = (scalar(@fields) + 1) 
-                              * scalar(keys %{ $data{'NEW'} });
-            my $count = 0;
-            foreach my $field (@fields, $open_name) {
-                # Insert values into series_data: series_id, date, value
-                my %fielddata = %{$data{$field}};
-                foreach my $date (keys %fielddata) {
-                    # We need to delete in case the text file had duplicate 
-                    # entries in it.
-                    $deletesth->execute($seriesids{$field}, $date);
-
-                    # We prepared this above
-                    $seriesdatasth->execute($seriesids{$field},
-                                            $date, $fielddata{$date} || 0);
-                    indicate_progress({ total => $total_items, 
-                                        current => ++$count, every => 100 });
-                }
-            }
+    # Fields in the data file (matches the current collectstats.pl)
+    my @statuses = qw(NEW ASSIGNED REOPENED UNCONFIRMED RESOLVED VERIFIED CLOSED);
+    my @resolutions
+      = qw(FIXED INVALID WONTFIX LATER REMIND DUPLICATE WORKSFORME MOVED);
+    my @fields = (@statuses, @resolutions);
+
+    # We have a localization problem here. Where do we get these values?
+    my $all_name  = "-All-";
+    my $open_name = "All Open";
 
-            # Create the groupsets for the category
-            my $category_id =
-                $dbh->selectrow_array("SELECT id FROM series_categories " .
-                                   "WHERE name = " . $dbh->quote($product));
-            my $product_id =
-                $dbh->selectrow_array("SELECT id FROM products " .
-                                   "WHERE name = " . $dbh->quote($product));
-
-            if (defined($category_id) && defined($product_id)) {
-
-                # Get all the mandatory groups for this product
-                my $group_ids =
-                    $dbh->selectcol_arrayref("SELECT group_id " .
-                         "FROM group_control_map " .
-                         "WHERE product_id = $product_id " .
-                         "AND (membercontrol = " . CONTROLMAPMANDATORY .
-                           " OR othercontrol = " . CONTROLMAPMANDATORY . ")");
-
-                foreach my $group_id (@$group_ids) {
-                    $groupmapsth->execute($category_id, $group_id);
-                }
+    $dbh->bz_start_transaction();
+    my $products = $dbh->selectall_arrayref("SELECT name FROM products");
+
+    foreach my $product ((map { $_->[0] } @$products), "-All-") {
+      print "$product:\n";
+
+      # First, create the series
+      my %queries;
+      my %seriesids;
+
+      my $query_prod = "";
+      if ($product ne "-All-") {
+        $query_prod = "product=" . html_quote($product) . "&";
+      }
+
+      # The query for statuses is different to that for resolutions.
+      $queries{$_} = ($query_prod . "bug_status=$_") foreach (@statuses);
+      $queries{$_} = ($query_prod . "resolution=$_") foreach (@resolutions);
+
+      foreach my $field (@fields) {
+
+        # Create a Series for each field in this product.
+        my $series = new Bugzilla::Series(undef, $product, $all_name, $field, undef, 1,
+          $queries{$field}, 1);
+        $series->writeToDatabase();
+        $seriesids{$field} = $series->{'series_id'};
+      }
+
+      # We also add a new query for "Open", so that migrated products get
+      # the same set as new products (see editproducts.cgi.)
+      my @openedstatuses = ("UNCONFIRMED", "NEW", "ASSIGNED", "REOPENED");
+      my $query = join("&", map {"bug_status=$_"} @openedstatuses);
+      my $series
+        = new Bugzilla::Series(undef, $product, $all_name, $open_name, undef, 1,
+        $query_prod . $query, 1);
+      $series->writeToDatabase();
+      $seriesids{$open_name} = $series->{'series_id'};
+
+      # Now, we attempt to read in historical data, if any
+      # Convert the name in the same way that collectstats.pl does
+      my $product_file = $product;
+      $product_file =~ s/\//-/gs;
+      $product_file = "$datadir/mining/$product_file";
+
+      # There are many reasons that this might fail (e.g. no stats
+      # for this product), so we don't worry if it does.
+      my $in = new IO::File($product_file) or next;
+
+      # The data files should be in a standard format, even for old
+      # Bugzillas, because of the conversion code further up this file.
+      my %data;
+      my $last_date = "";
+
+      my @lines = <$in>;
+      while (my $line = shift @lines) {
+        if ($line =~ /^(\d+\|.*)/) {
+          my @numbers = split(/\||\r/, $1);
+
+          # Only take the first line for each date; it was possible to
+          # run collectstats.pl more than once in a day.
+          next if $numbers[0] eq $last_date;
+
+          for my $i (0 .. $#fields) {
+
+            # $numbers[0] is the date
+            $data{$fields[$i]}{$numbers[0]} = $numbers[$i + 1];
+
+            # Keep a total of the number of open bugs for this day
+            if (grep { $_ eq $fields[$i] } @openedstatuses) {
+              $data{$open_name}{$numbers[0]} += $numbers[$i + 1];
             }
+          }
+
+          $last_date = $numbers[0];
         }
+      }
+
+      $in->close;
+
+      my $total_items = (scalar(@fields) + 1) * scalar(keys %{$data{'NEW'}});
+      my $count       = 0;
+      foreach my $field (@fields, $open_name) {
 
-        $dbh->bz_commit_transaction();
+        # Insert values into series_data: series_id, date, value
+        my %fielddata = %{$data{$field}};
+        foreach my $date (keys %fielddata) {
+
+          # We need to delete in case the text file had duplicate
+          # entries in it.
+          $deletesth->execute($seriesids{$field}, $date);
+
+          # We prepared this above
+          $seriesdatasth->execute($seriesids{$field}, $date, $fielddata{$date} || 0);
+          indicate_progress({total => $total_items, current => ++$count, every => 100});
+        }
+      }
+
+      # Create the groupsets for the category
+      my $category_id = $dbh->selectrow_array(
+        "SELECT id FROM series_categories " . "WHERE name = " . $dbh->quote($product));
+      my $product_id = $dbh->selectrow_array(
+        "SELECT id FROM products " . "WHERE name = " . $dbh->quote($product));
+
+      if (defined($category_id) && defined($product_id)) {
+
+        # Get all the mandatory groups for this product
+        my $group_ids
+          = $dbh->selectcol_arrayref("SELECT group_id "
+            . "FROM group_control_map "
+            . "WHERE product_id = $product_id "
+            . "AND (membercontrol = "
+            . CONTROLMAPMANDATORY
+            . " OR othercontrol = "
+            . CONTROLMAPMANDATORY
+            . ")");
+
+        foreach my $group_id (@$group_ids) {
+          $groupmapsth->execute($category_id, $group_id);
+        }
+      }
     }
+
+    $dbh->bz_commit_transaction();
+  }
 }
 
 sub _add_user_group_map_grant_type {
-    my $dbh = Bugzilla->dbh;
-    # 2004-04-12 - Keep regexp-based group permissions up-to-date - Bug 240325
-    if ($dbh->bz_column_info("user_group_map", "isderived")) {
-        $dbh->bz_add_column('user_group_map', 'grant_type',
-            {TYPE => 'INT1', NOTNULL => 1, DEFAULT => '0'});
-        $dbh->do("DELETE FROM user_group_map WHERE isderived != 0");
-        $dbh->do("UPDATE user_group_map SET grant_type = " . GRANT_DIRECT);
-        $dbh->bz_drop_column("user_group_map", "isderived");
-
-        $dbh->bz_drop_index('user_group_map', 'user_group_map_user_id_idx');
-        $dbh->bz_add_index('user_group_map', 'user_group_map_user_id_idx',
-            {TYPE => 'UNIQUE',
-             FIELDS => [qw(user_id group_id grant_type isbless)]});
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # 2004-04-12 - Keep regexp-based group permissions up-to-date - Bug 240325
+  if ($dbh->bz_column_info("user_group_map", "isderived")) {
+    $dbh->bz_add_column('user_group_map', 'grant_type',
+      {TYPE => 'INT1', NOTNULL => 1, DEFAULT => '0'});
+    $dbh->do("DELETE FROM user_group_map WHERE isderived != 0");
+    $dbh->do("UPDATE user_group_map SET grant_type = " . GRANT_DIRECT);
+    $dbh->bz_drop_column("user_group_map", "isderived");
+
+    $dbh->bz_drop_index('user_group_map', 'user_group_map_user_id_idx');
+    $dbh->bz_add_index('user_group_map', 'user_group_map_user_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(user_id group_id grant_type isbless)]});
+  }
 }
 
 sub _add_group_group_map_grant_type {
-    my $dbh = Bugzilla->dbh;
-    # 2004-07-16 - Make it possible to have group-group relationships other than
-    # membership and bless.
-    if ($dbh->bz_column_info("group_group_map", "isbless")) {
-        $dbh->bz_add_column('group_group_map', 'grant_type',
-            {TYPE => 'INT1', NOTNULL => 1, DEFAULT => '0'});
-        $dbh->do("UPDATE group_group_map SET grant_type = " .
-                 "IF(isbless, " . GROUP_BLESS . ", " .
-                  GROUP_MEMBERSHIP . ")");
-        $dbh->bz_drop_index('group_group_map', 'group_group_map_member_id_idx');
-        $dbh->bz_drop_column("group_group_map", "isbless");
-        $dbh->bz_add_index('group_group_map', 'group_group_map_member_id_idx',
-            {TYPE => 'UNIQUE', 
-             FIELDS => [qw(member_id grantor_id grant_type)]});
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # 2004-07-16 - Make it possible to have group-group relationships other than
+  # membership and bless.
+  if ($dbh->bz_column_info("group_group_map", "isbless")) {
+    $dbh->bz_add_column('group_group_map', 'grant_type',
+      {TYPE => 'INT1', NOTNULL => 1, DEFAULT => '0'});
+    $dbh->do("UPDATE group_group_map SET grant_type = "
+        . "IF(isbless, "
+        . GROUP_BLESS . ", "
+        . GROUP_MEMBERSHIP
+        . ")");
+    $dbh->bz_drop_index('group_group_map', 'group_group_map_member_id_idx');
+    $dbh->bz_drop_column("group_group_map", "isbless");
+    $dbh->bz_add_index(
+      'group_group_map',
+      'group_group_map_member_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(member_id grantor_id grant_type)]}
+    );
+  }
 }
 
 sub _add_longdescs_already_wrapped {
-    my $dbh = Bugzilla->dbh;
-    # 2005-01-29 - mkanat@bugzilla.org
-    if (!$dbh->bz_column_info('longdescs', 'already_wrapped')) {
-        # Old, pre-wrapped comments should not be auto-wrapped
-        $dbh->bz_add_column('longdescs', 'already_wrapped',
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}, 1);
-        # If an old comment doesn't have a newline in the first 81 characters,
-        # (or doesn't contain a newline at all) and it contains a space,
-        # then it's probably a mis-wrapped comment and we should wrap it
-        # at display-time.
-        print "Fixing old, mis-wrapped comments...\n";
-        $dbh->do(q{UPDATE longdescs SET already_wrapped = 0
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-01-29 - mkanat@bugzilla.org
+  if (!$dbh->bz_column_info('longdescs', 'already_wrapped')) {
+
+    # Old, pre-wrapped comments should not be auto-wrapped
+    $dbh->bz_add_column('longdescs', 'already_wrapped',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'}, 1);
+
+    # If an old comment doesn't have a newline in the first 81 characters,
+    # (or doesn't contain a newline at all) and it contains a space,
+    # then it's probably a mis-wrapped comment and we should wrap it
+    # at display-time.
+    print "Fixing old, mis-wrapped comments...\n";
+    $dbh->do(
+      q{UPDATE longdescs SET already_wrapped = 0
                     WHERE (} . $dbh->sql_position(q{'\n'}, 'thetext') . q{ > 81
                        OR } . $dbh->sql_position(q{'\n'}, 'thetext') . q{ = 0)
-                      AND SUBSTRING(thetext FROM 1 FOR 80) LIKE '% %'});
-    }
+                      AND SUBSTRING(thetext FROM 1 FOR 80) LIKE '% %'}
+    );
+  }
 }
 
 sub _convert_attachments_filename_from_mediumtext {
-    my $dbh = Bugzilla->dbh;
-    # 2002 November, myk@mozilla.org, bug 178841:
-    #
-    # Convert the "attachments.filename" column from a ridiculously large
-    # "mediumtext" to a much more sensible "varchar(100)".  Also takes
-    # the opportunity to remove paths from existing filenames, since they
-    # shouldn't be there for security.  Buggy browsers include them,
-    # and attachment.cgi now takes them out, but old ones need converting.
-    my $ref = $dbh->bz_column_info("attachments", "filename");
-    if ($ref->{TYPE} ne 'varchar(100)' && $ref->{TYPE} ne 'varchar(255)') {
-        print "Removing paths from filenames in attachments table...";
-
-        my $sth = $dbh->prepare("SELECT attach_id, filename FROM attachments " .
-            "WHERE " . $dbh->sql_position(q{'/'}, 'filename') . " > 0 OR " .
-            $dbh->sql_position(q{'\\\\'}, 'filename') . " > 0");
-        $sth->execute;
-
-        while (my ($attach_id, $filename) = $sth->fetchrow_array) {
-            $filename =~ s/^.*[\/\\]//;
-            my $quoted_filename = $dbh->quote($filename);
-            $dbh->do("UPDATE attachments SET filename = $quoted_filename " .
-                     "WHERE attach_id = $attach_id");
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # 2002 November, myk@mozilla.org, bug 178841:
+  #
+  # Convert the "attachments.filename" column from a ridiculously large
+  # "mediumtext" to a much more sensible "varchar(100)".  Also takes
+  # the opportunity to remove paths from existing filenames, since they
+  # shouldn't be there for security.  Buggy browsers include them,
+  # and attachment.cgi now takes them out, but old ones need converting.
+  my $ref = $dbh->bz_column_info("attachments", "filename");
+  if ($ref->{TYPE} ne 'varchar(100)' && $ref->{TYPE} ne 'varchar(255)') {
+    print "Removing paths from filenames in attachments table...";
+
+    my $sth
+      = $dbh->prepare("SELECT attach_id, filename FROM attachments "
+        . "WHERE "
+        . $dbh->sql_position(q{'/'}, 'filename')
+        . " > 0 OR "
+        . $dbh->sql_position(q{'\\\\'}, 'filename')
+        . " > 0");
+    $sth->execute;
+
+    while (my ($attach_id, $filename) = $sth->fetchrow_array) {
+      $filename =~ s/^.*[\/\\]//;
+      my $quoted_filename = $dbh->quote($filename);
+      $dbh->do("UPDATE attachments SET filename = $quoted_filename "
+          . "WHERE attach_id = $attach_id");
+    }
 
-        print "Done.\n";
+    print "Done.\n";
 
-        $dbh->bz_alter_column("attachments", "filename",
-                              {TYPE => 'varchar(100)', NOTNULL => 1});
-    }
+    $dbh->bz_alter_column("attachments", "filename",
+      {TYPE => 'varchar(100)', NOTNULL => 1});
+  }
 }
 
 sub _rename_votes_count_and_force_group_refresh {
-    my $dbh = Bugzilla->dbh;
-    # 2003-04-27 - bugzilla@chimpychompy.org (GavinS)
-    #
-    # Bug 180086 (http://bugzilla.mozilla.org/show_bug.cgi?id=180086)
-    #
-    # Renaming the 'count' column in the votes table because Sybase doesn't
-    # like it
-    return if !$dbh->bz_table_info('votes');
-    return if $dbh->bz_column_info('votes', 'count');
-    $dbh->bz_rename_column('votes', 'count', 'vote_count');
+  my $dbh = Bugzilla->dbh;
+
+  # 2003-04-27 - bugzilla@chimpychompy.org (GavinS)
+  #
+  # Bug 180086 (http://bugzilla.mozilla.org/show_bug.cgi?id=180086)
+  #
+  # Renaming the 'count' column in the votes table because Sybase doesn't
+  # like it
+  return if !$dbh->bz_table_info('votes');
+  return if $dbh->bz_column_info('votes', 'count');
+  $dbh->bz_rename_column('votes', 'count', 'vote_count');
 }
 
 sub _fix_group_with_empty_name {
-    my $dbh = Bugzilla->dbh;
-    # 2005-01-12 Nick Barnes <nb@ravenbrook.com> bug 278010
-    # Rename any group which has an empty name.
-    # Note that there can be at most one such group (because of
-    # the SQL index on the name column).
-    my ($emptygroupid) = $dbh->selectrow_array(
-        "SELECT id FROM groups where name = ''");
-    if ($emptygroupid) {
-        # There is a group with an empty name; find a name to rename it
-        # as.  Must avoid collisions with existing names.  Start with
-        # group_$gid and add _<n> if necessary.
-        my $trycount = 0;
-        my $trygroupname;
-        my $sth = $dbh->prepare("SELECT 1 FROM groups where name = ?");
-        my $name_exists = 1;
-
-        while ($name_exists) {
-            $trygroupname = "group_$emptygroupid";
-            if ($trycount > 0) {
-               $trygroupname .= "_$trycount";
-            }
-            $name_exists = $dbh->selectrow_array($sth, undef, $trygroupname);
-            $trycount++;
-        }
-        $dbh->do("UPDATE groups SET name = ? WHERE id = ?",
-                 undef, $trygroupname, $emptygroupid);
-        print "Group $emptygroupid had an empty name; renamed as",
-              " '$trygroupname'.\n";
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-01-12 Nick Barnes <nb@ravenbrook.com> bug 278010
+  # Rename any group which has an empty name.
+  # Note that there can be at most one such group (because of
+  # the SQL index on the name column).
+  my ($emptygroupid)
+    = $dbh->selectrow_array("SELECT id FROM groups where name = ''");
+  if ($emptygroupid) {
+
+    # There is a group with an empty name; find a name to rename it
+    # as.  Must avoid collisions with existing names.  Start with
+    # group_$gid and add _<n> if necessary.
+    my $trycount = 0;
+    my $trygroupname;
+    my $sth         = $dbh->prepare("SELECT 1 FROM groups where name = ?");
+    my $name_exists = 1;
+
+    while ($name_exists) {
+      $trygroupname = "group_$emptygroupid";
+      if ($trycount > 0) {
+        $trygroupname .= "_$trycount";
+      }
+      $name_exists = $dbh->selectrow_array($sth, undef, $trygroupname);
+      $trycount++;
     }
+    $dbh->do("UPDATE groups SET name = ? WHERE id = ?",
+      undef, $trygroupname, $emptygroupid);
+    print "Group $emptygroupid had an empty name; renamed as",
+      " '$trygroupname'.\n";
+  }
 }
 
 # A helper for the emailprefs subs below
 sub _clone_email_event {
-    my ($source, $target) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($source, $target) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    $dbh->do("INSERT INTO email_setting (user_id, relationship, event)
+  $dbh->do(
+    "INSERT INTO email_setting (user_id, relationship, event)
                    SELECT user_id, relationship, $target FROM email_setting
-                    WHERE event = $source");
+                    WHERE event = $source"
+  );
 }
 
 sub _migrate_email_prefs_to_new_table {
-    my $dbh = Bugzilla->dbh;
-    # 2005-03-29 - gerv@gerv.net - bug 73665.
-    # Migrate email preferences to new email prefs table.
-    if ($dbh->bz_column_info("profiles", "emailflags")) {
-        print "Migrating email preferences to new table...\n";
-
-        # These are the "roles" and "reasons" from the original code, mapped to
-        # the new terminology of relationships and events.
-        my %relationships = ("Owner"     => REL_ASSIGNEE,
-                             "Reporter"  => REL_REPORTER,
-                             "QAcontact" => REL_QA,
-                             "CClist"    => REL_CC,
-                             # REL_VOTER was "4" before it was moved to an
-                             #  extension.
-                             "Voter"     => 4);
-
-        my %events = ("Removeme"    => EVT_ADDED_REMOVED,
-                      "Comments"    => EVT_COMMENT,
-                      "Attachments" => EVT_ATTACHMENT,
-                      "Status"      => EVT_PROJ_MANAGEMENT,
-                      "Resolved"    => EVT_OPENED_CLOSED,
-                      "Keywords"    => EVT_KEYWORD,
-                      "CC"          => EVT_CC,
-                      "Other"       => EVT_OTHER,
-                      "Unconfirmed" => EVT_UNCONFIRMED);
-
-        # Request preferences
-        my %requestprefs = ("FlagRequestee" => EVT_FLAG_REQUESTED,
-                            "FlagRequester" => EVT_REQUESTED_FLAG);
-
-        # We run the below code in a transaction to speed things up.
-        $dbh->bz_start_transaction();
-
-        # Select all emailflags flag strings
-        my $total = $dbh->selectrow_array('SELECT COUNT(*) FROM profiles');
-        my $sth = $dbh->prepare("SELECT userid, emailflags FROM profiles");
-        $sth->execute();
-        my $i = 0;
-
-        while (my ($userid, $flagstring) = $sth->fetchrow_array()) {
-            $i++;
-            indicate_progress({ total => $total, current => $i, every => 10 });
-            # If the user has never logged in since emailprefs arrived, and the
-            # temporary code to give them a default string never ran, then
-            # $flagstring will be null. In this case, they just get all mail.
-            $flagstring ||= "";
-
-            # The 255 param is here, because without a third param, split will
-            # trim any trailing null fields, which causes Perl to eject lots of
-            # warnings. Any suitably large number would do.
-            my %emailflags = split(/~/, $flagstring, 255);
-
-            my $sth2 = $dbh->prepare("INSERT into email_setting " .
-                                     "(user_id, relationship, event) VALUES (" .
-                                     "$userid, ?, ?)");
-            foreach my $relationship (keys %relationships) {
-                foreach my $event (keys %events) {
-                    my $key = "email$relationship$event";
-                    if (!exists($emailflags{$key}) 
-                        || $emailflags{$key} eq 'on') 
-                    {
-                        $sth2->execute($relationships{$relationship},
-                                       $events{$event});
-                    }
-                }
-            }
-            # Note that in the old system, the value of "excludeself" is 
-            # assumed to be off if the preference does not exist in the 
-            # user's list, unlike other preferences whose value is 
-            # assumed to be on if they do not exist.
-            #
-            # This preference has changed from global to per-relationship.
-            if (!exists($emailflags{'ExcludeSelf'})
-                || $emailflags{'ExcludeSelf'} ne 'on')
-            {
-                foreach my $relationship (keys %relationships) {
-                    $dbh->do("INSERT into email_setting " .
-                             "(user_id, relationship, event) VALUES (" .
-                             $userid . ", " .
-                             $relationships{$relationship}. ", " .
-                             EVT_CHANGED_BY_ME . ")");
-                }
-            }
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-03-29 - gerv@gerv.net - bug 73665.
+  # Migrate email preferences to new email prefs table.
+  if ($dbh->bz_column_info("profiles", "emailflags")) {
+    print "Migrating email preferences to new table...\n";
+
+    # These are the "roles" and "reasons" from the original code, mapped to
+    # the new terminology of relationships and events.
+    my %relationships = (
+      "Owner"     => REL_ASSIGNEE,
+      "Reporter"  => REL_REPORTER,
+      "QAcontact" => REL_QA,
+      "CClist"    => REL_CC,
+
+      # REL_VOTER was "4" before it was moved to an
+      #  extension.
+      "Voter" => 4
+    );
 
-            foreach my $key (keys %requestprefs) {
-                if (!exists($emailflags{$key}) || $emailflags{$key} eq 'on') {
-                  $dbh->do("INSERT into email_setting " .
-                           "(user_id, relationship, event) VALUES (" .
-                           $userid . ", " . REL_ANY . ", " .
-                           $requestprefs{$key} . ")");
-                }
-            }
-        }
-        print "\n";
+    my %events = (
+      "Removeme"    => EVT_ADDED_REMOVED,
+      "Comments"    => EVT_COMMENT,
+      "Attachments" => EVT_ATTACHMENT,
+      "Status"      => EVT_PROJ_MANAGEMENT,
+      "Resolved"    => EVT_OPENED_CLOSED,
+      "Keywords"    => EVT_KEYWORD,
+      "CC"          => EVT_CC,
+      "Other"       => EVT_OTHER,
+      "Unconfirmed" => EVT_UNCONFIRMED
+    );
 
-        # EVT_ATTACHMENT_DATA should initially have identical settings to
-        # EVT_ATTACHMENT.
-        _clone_email_event(EVT_ATTACHMENT, EVT_ATTACHMENT_DATA);
+    # Request preferences
+    my %requestprefs = (
+      "FlagRequestee" => EVT_FLAG_REQUESTED,
+      "FlagRequester" => EVT_REQUESTED_FLAG
+    );
+
+    # We run the below code in a transaction to speed things up.
+    $dbh->bz_start_transaction();
 
-        $dbh->bz_commit_transaction();
-        $dbh->bz_drop_column("profiles", "emailflags");
+    # Select all emailflags flag strings
+    my $total = $dbh->selectrow_array('SELECT COUNT(*) FROM profiles');
+    my $sth   = $dbh->prepare("SELECT userid, emailflags FROM profiles");
+    $sth->execute();
+    my $i = 0;
+
+    while (my ($userid, $flagstring) = $sth->fetchrow_array()) {
+      $i++;
+      indicate_progress({total => $total, current => $i, every => 10});
+
+      # If the user has never logged in since emailprefs arrived, and the
+      # temporary code to give them a default string never ran, then
+      # $flagstring will be null. In this case, they just get all mail.
+      $flagstring ||= "";
+
+      # The 255 param is here, because without a third param, split will
+      # trim any trailing null fields, which causes Perl to eject lots of
+      # warnings. Any suitably large number would do.
+      my %emailflags = split(/~/, $flagstring, 255);
+
+      my $sth2
+        = $dbh->prepare("INSERT into email_setting "
+          . "(user_id, relationship, event) VALUES ("
+          . "$userid, ?, ?)");
+      foreach my $relationship (keys %relationships) {
+        foreach my $event (keys %events) {
+          my $key = "email$relationship$event";
+          if (!exists($emailflags{$key}) || $emailflags{$key} eq 'on') {
+            $sth2->execute($relationships{$relationship}, $events{$event});
+          }
+        }
+      }
+
+      # Note that in the old system, the value of "excludeself" is
+      # assumed to be off if the preference does not exist in the
+      # user's list, unlike other preferences whose value is
+      # assumed to be on if they do not exist.
+      #
+      # This preference has changed from global to per-relationship.
+      if (!exists($emailflags{'ExcludeSelf'}) || $emailflags{'ExcludeSelf'} ne 'on') {
+        foreach my $relationship (keys %relationships) {
+          $dbh->do("INSERT into email_setting "
+              . "(user_id, relationship, event) VALUES ("
+              . $userid . ", "
+              . $relationships{$relationship} . ", "
+              . EVT_CHANGED_BY_ME
+              . ")");
+        }
+      }
+
+      foreach my $key (keys %requestprefs) {
+        if (!exists($emailflags{$key}) || $emailflags{$key} eq 'on') {
+          $dbh->do("INSERT into email_setting "
+              . "(user_id, relationship, event) VALUES ("
+              . $userid . ", "
+              . REL_ANY . ", "
+              . $requestprefs{$key}
+              . ")");
+        }
+      }
     }
+    print "\n";
+
+    # EVT_ATTACHMENT_DATA should initially have identical settings to
+    # EVT_ATTACHMENT.
+    _clone_email_event(EVT_ATTACHMENT, EVT_ATTACHMENT_DATA);
+
+    $dbh->bz_commit_transaction();
+    $dbh->bz_drop_column("profiles", "emailflags");
+  }
 }
 
 sub _initialize_new_email_prefs {
-    my $dbh = Bugzilla->dbh;
-    # Check for any "new" email settings that wouldn't have been ported over
-    # during the block above.  Since these settings would have otherwise
-    # fallen under EVT_OTHER, we'll just clone those settings.  That way if
-    # folks have already disabled all of that mail, there won't be any change.
-    my %events = (
-        "Dependency Tree Changes" => EVT_DEPEND_BLOCK,
-        "Product/Component Changes" => EVT_COMPONENT,
-    );
-
-    foreach my $desc (keys %events) {
-        my $event = $events{$desc};
-        my $have_events = $dbh->selectrow_array(
-            "SELECT 1 FROM email_setting WHERE event = $event "
-            . $dbh->sql_limit(1));
-
-        if (!$have_events) {
-            # No settings in the table yet, so we assume that this is the
-            # first time it's being set.
-            print "Initializing \"$desc\" email_setting ...\n";
-            _clone_email_event(EVT_OTHER, $event);
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # Check for any "new" email settings that wouldn't have been ported over
+  # during the block above.  Since these settings would have otherwise
+  # fallen under EVT_OTHER, we'll just clone those settings.  That way if
+  # folks have already disabled all of that mail, there won't be any change.
+  my %events = (
+    "Dependency Tree Changes"   => EVT_DEPEND_BLOCK,
+    "Product/Component Changes" => EVT_COMPONENT,
+  );
+
+  foreach my $desc (keys %events) {
+    my $event       = $events{$desc};
+    my $have_events = $dbh->selectrow_array(
+      "SELECT 1 FROM email_setting WHERE event = $event " . $dbh->sql_limit(1));
+
+    if (!$have_events) {
+
+      # No settings in the table yet, so we assume that this is the
+      # first time it's being set.
+      print "Initializing \"$desc\" email_setting ...\n";
+      _clone_email_event(EVT_OTHER, $event);
     }
+  }
 }
 
 sub _change_all_mysql_booleans_to_tinyint {
-    my $dbh = Bugzilla->dbh;
-    # 2005-03-27: Standardize all boolean fields to plain "tinyint"
-    if ( $dbh->isa('Bugzilla::DB::Mysql') ) {
-        # This is a change to make things consistent with Schema, so we use
-        # direct-database access methods.
-        my $quip_info_sth = $dbh->column_info(undef, undef, 'quips', '%');
-        my $quips_cols    = $quip_info_sth->fetchall_hashref("COLUMN_NAME");
-        my $approved_col  = $quips_cols->{'approved'};
-        if ( $approved_col->{TYPE_NAME} eq 'TINYINT'
-             and $approved_col->{COLUMN_SIZE} == 1 )
-        {
-            # series.public could have been renamed to series.is_public,
-            # and so wouldn't need to be fixed manually.
-            if ($dbh->bz_column_info('series', 'public')) {
-                $dbh->bz_alter_column_raw('series', 'public',
-                    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '0'});
-            }
-            $dbh->bz_alter_column_raw('bug_status', 'isactive',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-            $dbh->bz_alter_column_raw('rep_platform', 'isactive',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-            $dbh->bz_alter_column_raw('resolution', 'isactive',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-            $dbh->bz_alter_column_raw('op_sys', 'isactive',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-            $dbh->bz_alter_column_raw('bug_severity', 'isactive',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-            $dbh->bz_alter_column_raw('priority', 'isactive',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-            $dbh->bz_alter_column_raw('quips', 'approved',
-                {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
-        }
-   }
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-03-27: Standardize all boolean fields to plain "tinyint"
+  if ($dbh->isa('Bugzilla::DB::Mysql')) {
+
+    # This is a change to make things consistent with Schema, so we use
+    # direct-database access methods.
+    my $quip_info_sth = $dbh->column_info(undef, undef, 'quips', '%');
+    my $quips_cols    = $quip_info_sth->fetchall_hashref("COLUMN_NAME");
+    my $approved_col  = $quips_cols->{'approved'};
+    if (  $approved_col->{TYPE_NAME} eq 'TINYINT'
+      and $approved_col->{COLUMN_SIZE} == 1)
+    {
+      # series.public could have been renamed to series.is_public,
+      # and so wouldn't need to be fixed manually.
+      if ($dbh->bz_column_info('series', 'public')) {
+        $dbh->bz_alter_column_raw('series', 'public',
+          {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '0'});
+      }
+      $dbh->bz_alter_column_raw('bug_status', 'isactive',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+      $dbh->bz_alter_column_raw('rep_platform', 'isactive',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+      $dbh->bz_alter_column_raw('resolution', 'isactive',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+      $dbh->bz_alter_column_raw('op_sys', 'isactive',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+      $dbh->bz_alter_column_raw('bug_severity', 'isactive',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+      $dbh->bz_alter_column_raw('priority', 'isactive',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+      $dbh->bz_alter_column_raw('quips', 'approved',
+        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => '1'});
+    }
+  }
 }
 
 # A helper for the below function.
 sub _de_dup_version {
-    my ($product_id, $version) = @_;
-    my $dbh = Bugzilla->dbh;
-    print "Fixing duplicate version $version in product_id $product_id...\n";
-    $dbh->do('DELETE FROM versions WHERE product_id = ? AND value = ?',
-             undef, $product_id, $version);
-    $dbh->do('INSERT INTO versions (product_id, value) VALUES (?,?)',
-             undef, $product_id, $version);
+  my ($product_id, $version) = @_;
+  my $dbh = Bugzilla->dbh;
+  print "Fixing duplicate version $version in product_id $product_id...\n";
+  $dbh->do('DELETE FROM versions WHERE product_id = ? AND value = ?',
+    undef, $product_id, $version);
+  $dbh->do('INSERT INTO versions (product_id, value) VALUES (?,?)',
+    undef, $product_id, $version);
 }
 
 sub _add_versions_product_id_index {
-    my $dbh = Bugzilla->dbh;
-    if (!$dbh->bz_index_info('versions', 'versions_product_id_idx')) {
-        my $dup_versions = $dbh->selectall_arrayref(
-            'SELECT product_id, value FROM versions
-           GROUP BY product_id, value HAVING COUNT(value) > 1', {Slice=>{}});
-        foreach my $dup_version (@$dup_versions) {
-            _de_dup_version($dup_version->{product_id}, $dup_version->{value});
-        }
-
-        $dbh->bz_add_index('versions', 'versions_product_id_idx',
-            {TYPE => 'UNIQUE', FIELDS => [qw(product_id value)]});
+  my $dbh = Bugzilla->dbh;
+  if (!$dbh->bz_index_info('versions', 'versions_product_id_idx')) {
+    my $dup_versions = $dbh->selectall_arrayref(
+      'SELECT product_id, value FROM versions
+           GROUP BY product_id, value HAVING COUNT(value) > 1', {Slice => {}}
+    );
+    foreach my $dup_version (@$dup_versions) {
+      _de_dup_version($dup_version->{product_id}, $dup_version->{value});
     }
+
+    $dbh->bz_add_index('versions', 'versions_product_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(product_id value)]});
+  }
 }
 
 sub _fix_whine_queries_title_and_op_sys_value {
-    my $dbh = Bugzilla->dbh;
-    if (!exists $dbh->bz_column_info('whine_queries', 'title')->{DEFAULT}) {
-        # The below change actually has nothing to do with the whine_queries
-        # change, it just has to be contained within a schema change so that
-        # it doesn't run every time we run checksetup.
-
-        # Old Bugzillas have "other" as an OS choice, new ones have "Other"
-        # (capital O).
-        print "Setting any 'other' op_sys to 'Other'...\n";
-        $dbh->do('UPDATE op_sys SET value = ? WHERE value = ?',
-                 undef, "Other", "other");
-        $dbh->do('UPDATE bugs SET op_sys = ? WHERE op_sys = ?',
-                 undef, "Other", "other");
-        if (Bugzilla->params->{'defaultopsys'} eq 'other') {
-            # We can't actually fix the param here, because WriteParams() will
-            # make $datadir/params.json unwriteable to the webservergroup.
-            # It's too much of an ugly hack to copy the permission-fixing code
-            # down to here. (It would create more potential future bugs than
-            # it would solve problems.)
-            print "WARNING: Your 'defaultopsys' param is set to 'other', but"
-                . " Bugzilla now\n"
-                . "         uses 'Other' (capital O).\n";
-        }
-
-        # Add a DEFAULT to whine_queries stuff so that editwhines.cgi
-        # works on PostgreSQL.
-        $dbh->bz_alter_column('whine_queries', 'title', {TYPE => 'varchar(128)',
-                              NOTNULL => 1, DEFAULT => "''"});
+  my $dbh = Bugzilla->dbh;
+  if (!exists $dbh->bz_column_info('whine_queries', 'title')->{DEFAULT}) {
+
+    # The below change actually has nothing to do with the whine_queries
+    # change, it just has to be contained within a schema change so that
+    # it doesn't run every time we run checksetup.
+
+    # Old Bugzillas have "other" as an OS choice, new ones have "Other"
+    # (capital O).
+    print "Setting any 'other' op_sys to 'Other'...\n";
+    $dbh->do('UPDATE op_sys SET value = ? WHERE value = ?', undef, "Other",
+      "other");
+    $dbh->do('UPDATE bugs SET op_sys = ? WHERE op_sys = ?', undef, "Other",
+      "other");
+    if (Bugzilla->params->{'defaultopsys'} eq 'other') {
+
+      # We can't actually fix the param here, because WriteParams() will
+      # make $datadir/params.json unwriteable to the webservergroup.
+      # It's too much of an ugly hack to copy the permission-fixing code
+      # down to here. (It would create more potential future bugs than
+      # it would solve problems.)
+      print "WARNING: Your 'defaultopsys' param is set to 'other', but"
+        . " Bugzilla now\n"
+        . "         uses 'Other' (capital O).\n";
     }
+
+    # Add a DEFAULT to whine_queries stuff so that editwhines.cgi
+    # works on PostgreSQL.
+    $dbh->bz_alter_column('whine_queries', 'title',
+      {TYPE => 'varchar(128)', NOTNULL => 1, DEFAULT => "''"});
+  }
 }
 
 sub _fix_attachments_submitter_id_idx {
-    my $dbh = Bugzilla->dbh;
-    # 2005-06-29 bugreport@peshkin.net, bug 299156
-    if ($dbh->bz_index_info('attachments', 'attachments_submitter_id_idx')
-        && (scalar(@{$dbh->bz_index_info('attachments',
-                                         'attachments_submitter_id_idx'
-                                        )->{FIELDS}}) < 2)) 
-    {
-        $dbh->bz_drop_index('attachments', 'attachments_submitter_id_idx');
-    }
-    $dbh->bz_add_index('attachments', 'attachments_submitter_id_idx',
-                       [qw(submitter_id bug_id)]);
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-06-29 bugreport@peshkin.net, bug 299156
+  if (
+    $dbh->bz_index_info('attachments', 'attachments_submitter_id_idx')
+    && (
+      scalar(@{
+        $dbh->bz_index_info('attachments', 'attachments_submitter_id_idx')->{FIELDS}
+      }) < 2
+    )
+    )
+  {
+    $dbh->bz_drop_index('attachments', 'attachments_submitter_id_idx');
+  }
+  $dbh->bz_add_index('attachments', 'attachments_submitter_id_idx',
+    [qw(submitter_id bug_id)]);
 }
 
 sub _copy_attachments_thedata_to_attach_data {
-    my $dbh = Bugzilla->dbh;
-    # 2005-08-25 - bugreport@peshkin.net - Bug 305333
-    if ($dbh->bz_column_info("attachments", "thedata")) {
-        print "Migrating attachment data to its own table...\n";
-        print "(This may take a very long time)\n";
-        $dbh->do("INSERT INTO attach_data (id, thedata)
-                       SELECT attach_id, thedata FROM attachments");
-        $dbh->bz_drop_column("attachments", "thedata");
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-08-25 - bugreport@peshkin.net - Bug 305333
+  if ($dbh->bz_column_info("attachments", "thedata")) {
+    print "Migrating attachment data to its own table...\n";
+    print "(This may take a very long time)\n";
+    $dbh->do(
+      "INSERT INTO attach_data (id, thedata)
+                       SELECT attach_id, thedata FROM attachments"
+    );
+    $dbh->bz_drop_column("attachments", "thedata");
+  }
 }
 
 sub _fix_broken_all_closed_series {
-    my $dbh = Bugzilla->dbh;
-
-    # 2005-11-26 - wurblzap@gmail.com - Bug 300473
-    # Repair broken automatically generated series queries for non-open bugs.
-    my $broken_series_indicator =
-        'field0-0-0=resolution&type0-0-0=notequals&value0-0-0=---';
-    my $broken_nonopen_series =
-        $dbh->selectall_arrayref("SELECT series_id, query FROM series
-                                 WHERE query LIKE '$broken_series_indicator%'");
-    if (@$broken_nonopen_series) {
-        print 'Repairing broken series...';
-        my $sth_nuke =
-            $dbh->prepare('DELETE FROM series_data WHERE series_id = ?');
-        # This statement is used to repair a series by replacing the broken
-        # query with the correct one.
-        my $sth_repair =
-            $dbh->prepare('UPDATE series SET query = ? WHERE series_id = ?');
-        # The corresponding series for open bugs look like one of these two
-        # variations (bug 225687 changed the order of bug states).
-        # This depends on the set of bug states representing open bugs not
-        # to have changed since series creation.
-        my $open_bugs_query_base_old =
-            join("&", map { "bug_status=" . url_quote($_) }
-                          ('UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED'));
-        my $open_bugs_query_base_new =
-            join("&", map { "bug_status=" . url_quote($_) }
-                          ('NEW', 'REOPENED', 'ASSIGNED', 'UNCONFIRMED'));
-        my $sth_openbugs_series =
-            $dbh->prepare("SELECT series_id FROM series WHERE query IN (?, ?)");
-        # Statement to find the series which has collected the most data.
-        my $sth_data_collected =
-            $dbh->prepare('SELECT count(*) FROM series_data 
-                            WHERE series_id = ?');
-        # Statement to select a broken non-open bugs count data entry.
-        my $sth_select_broken_nonopen_data =
-            $dbh->prepare('SELECT series_date, series_value FROM series_data' .
-                          ' WHERE series_id = ?');
-        # Statement to select an open bugs count data entry.
-        my $sth_select_open_data =
-            $dbh->prepare('SELECT series_value FROM series_data' .
-                          ' WHERE series_id = ? AND series_date = ?');
-        # Statement to fix a broken non-open bugs count data entry.
-        my $sth_fix_broken_nonopen_data =
-            $dbh->prepare('UPDATE series_data SET series_value = ?' .
-                          ' WHERE series_id = ? AND series_date = ?');
-        # Statement to delete an unfixable broken non-open bugs count data 
-        # entry.
-        my $sth_delete_broken_nonopen_data =
-            $dbh->prepare('DELETE FROM series_data' .
-                          ' WHERE series_id = ? AND series_date = ?');
-        foreach (@$broken_nonopen_series) {
-            my ($broken_series_id, $nonopen_bugs_query) = @$_;
-
-            # Determine the product-and-component part of the query.
-            if ($nonopen_bugs_query =~ /^$broken_series_indicator(.*)$/) {
-                my $prodcomp = $1;
-
-                # If there is more than one series for the corresponding 
-                # open-bugs series, we pick the one with the most data,
-                # which should be the one which was generated on creation.
-                # It's a pity we can't do subselects.
-                $sth_openbugs_series->execute(
-                    $open_bugs_query_base_old . $prodcomp,
-                    $open_bugs_query_base_new . $prodcomp);
-
-                my ($found_open_series_id, $datacount) = (undef, -1);
-                foreach my $open_ser_id ($sth_openbugs_series->fetchrow_array) {
-                    $sth_data_collected->execute($open_ser_id);
-                    my ($this_datacount) = $sth_data_collected->fetchrow_array;
-                    if ($this_datacount > $datacount) {
-                        $datacount = $this_datacount;
-                        $found_open_series_id = $open_ser_id;
-                    }
-                }
-
-                if ($found_open_series_id) {
-                    # Move along corrupted series data and correct it. The
-                    # corruption consists of it being the number of all bugs
-                    # instead of the number of non-open bugs, so we calculate
-                    # the correct count by subtracting the number of open bugs.
-                    # If there is no corresponding open-bugs count for some
-                    # reason (shouldn't happen), we drop the data entry.
-                    print " $broken_series_id...";
-                    $sth_select_broken_nonopen_data->execute($broken_series_id);
-                    while (my $rowref =
-                           $sth_select_broken_nonopen_data->fetchrow_arrayref) 
-                    {
-                        my ($date, $broken_value) = @$rowref;
-                        my ($openbugs_value) =
-                            $dbh->selectrow_array($sth_select_open_data, undef,
-                                                  $found_open_series_id, $date);
-                        if (defined($openbugs_value)) {
-                            $sth_fix_broken_nonopen_data->execute
-                                ($broken_value - $openbugs_value,
-                                 $broken_series_id, $date);
-                        }
-                        else {
-                            print <<EOT;
+  my $dbh = Bugzilla->dbh;
+
+  # 2005-11-26 - wurblzap@gmail.com - Bug 300473
+  # Repair broken automatically generated series queries for non-open bugs.
+  my $broken_series_indicator
+    = 'field0-0-0=resolution&type0-0-0=notequals&value0-0-0=---';
+  my $broken_nonopen_series = $dbh->selectall_arrayref(
+    "SELECT series_id, query FROM series
+                                 WHERE query LIKE '$broken_series_indicator%'"
+  );
+  if (@$broken_nonopen_series) {
+    print 'Repairing broken series...';
+    my $sth_nuke = $dbh->prepare('DELETE FROM series_data WHERE series_id = ?');
+
+    # This statement is used to repair a series by replacing the broken
+    # query with the correct one.
+    my $sth_repair
+      = $dbh->prepare('UPDATE series SET query = ? WHERE series_id = ?');
+
+    # The corresponding series for open bugs look like one of these two
+    # variations (bug 225687 changed the order of bug states).
+    # This depends on the set of bug states representing open bugs not
+    # to have changed since series creation.
+    my $open_bugs_query_base_old = join("&",
+      map { "bug_status=" . url_quote($_) }
+        ('UNCONFIRMED', 'NEW', 'ASSIGNED', 'REOPENED'));
+    my $open_bugs_query_base_new = join("&",
+      map { "bug_status=" . url_quote($_) }
+        ('NEW', 'REOPENED', 'ASSIGNED', 'UNCONFIRMED'));
+    my $sth_openbugs_series
+      = $dbh->prepare("SELECT series_id FROM series WHERE query IN (?, ?)");
+
+    # Statement to find the series which has collected the most data.
+    my $sth_data_collected = $dbh->prepare(
+      'SELECT count(*) FROM series_data 
+                            WHERE series_id = ?'
+    );
+
+    # Statement to select a broken non-open bugs count data entry.
+    my $sth_select_broken_nonopen_data = $dbh->prepare(
+      'SELECT series_date, series_value FROM series_data' . ' WHERE series_id = ?');
+
+    # Statement to select an open bugs count data entry.
+    my $sth_select_open_data = $dbh->prepare('SELECT series_value FROM series_data'
+        . ' WHERE series_id = ? AND series_date = ?');
+
+    # Statement to fix a broken non-open bugs count data entry.
+    my $sth_fix_broken_nonopen_data
+      = $dbh->prepare('UPDATE series_data SET series_value = ?'
+        . ' WHERE series_id = ? AND series_date = ?');
+
+    # Statement to delete an unfixable broken non-open bugs count data
+    # entry.
+    my $sth_delete_broken_nonopen_data = $dbh->prepare(
+      'DELETE FROM series_data' . ' WHERE series_id = ? AND series_date = ?');
+    foreach (@$broken_nonopen_series) {
+      my ($broken_series_id, $nonopen_bugs_query) = @$_;
+
+      # Determine the product-and-component part of the query.
+      if ($nonopen_bugs_query =~ /^$broken_series_indicator(.*)$/) {
+        my $prodcomp = $1;
+
+        # If there is more than one series for the corresponding
+        # open-bugs series, we pick the one with the most data,
+        # which should be the one which was generated on creation.
+        # It's a pity we can't do subselects.
+        $sth_openbugs_series->execute($open_bugs_query_base_old . $prodcomp,
+          $open_bugs_query_base_new . $prodcomp);
+
+        my ($found_open_series_id, $datacount) = (undef, -1);
+        foreach my $open_ser_id ($sth_openbugs_series->fetchrow_array) {
+          $sth_data_collected->execute($open_ser_id);
+          my ($this_datacount) = $sth_data_collected->fetchrow_array;
+          if ($this_datacount > $datacount) {
+            $datacount            = $this_datacount;
+            $found_open_series_id = $open_ser_id;
+          }
+        }
+
+        if ($found_open_series_id) {
+
+          # Move along corrupted series data and correct it. The
+          # corruption consists of it being the number of all bugs
+          # instead of the number of non-open bugs, so we calculate
+          # the correct count by subtracting the number of open bugs.
+          # If there is no corresponding open-bugs count for some
+          # reason (shouldn't happen), we drop the data entry.
+          print " $broken_series_id...";
+          $sth_select_broken_nonopen_data->execute($broken_series_id);
+          while (my $rowref = $sth_select_broken_nonopen_data->fetchrow_arrayref) {
+            my ($date, $broken_value) = @$rowref;
+            my ($openbugs_value)
+              = $dbh->selectrow_array($sth_select_open_data, undef, $found_open_series_id,
+              $date);
+            if (defined($openbugs_value)) {
+              $sth_fix_broken_nonopen_data->execute($broken_value - $openbugs_value,
+                $broken_series_id, $date);
+            }
+            else {
+              print <<EOT;
 
 WARNING - During repairs of series $broken_series_id, the irreparable data
 entry for date $date was encountered and is being deleted.
 
 Continuing repairs...
 EOT
-                            $sth_delete_broken_nonopen_data->execute
-                                ($broken_series_id, $date);
-                        }
-                    }
-
-                    # Fix the broken query so that it collects correct data 
-                    # in the future.
-                    $nonopen_bugs_query =~
-                        s/^$broken_series_indicator/field0-0-0=resolution&type0-0-0=regexp&value0-0-0=./;
-                    $sth_repair->execute($nonopen_bugs_query, 
-                                         $broken_series_id);
-                }
-                else {
-                    print <<EOT;
+              $sth_delete_broken_nonopen_data->execute($broken_series_id, $date);
+            }
+          }
+
+          # Fix the broken query so that it collects correct data
+          # in the future.
+          $nonopen_bugs_query
+            =~ s/^$broken_series_indicator/field0-0-0=resolution&type0-0-0=regexp&value0-0-0=./;
+          $sth_repair->execute($nonopen_bugs_query, $broken_series_id);
+        }
+        else {
+          print <<EOT;
 
 WARNING - Series $broken_series_id was meant to collect non-open bug 
 counts, but it has counted all bugs instead. It cannot be repaired
@@ -2731,518 +2955,576 @@ series $broken_series_id manually
 
 Continuing repairs...
 EOT
-                } #  if ($found_open_series_id)
-            } #  if ($nonopen_bugs_query =~
-        } # foreach (@$broken_nonopen_series)
-        print " done.\n";
-    } # if (@$broken_nonopen_series)
+        }    #  if ($found_open_series_id)
+      }    #  if ($nonopen_bugs_query =~
+    }    # foreach (@$broken_nonopen_series)
+    print " done.\n";
+  }    # if (@$broken_nonopen_series)
 }
 
-# This needs to happen at two times: when we upgrade from 2.16 (thus creating 
+# This needs to happen at two times: when we upgrade from 2.16 (thus creating
 # user_group_map), and when we kill derived gruops in the DB.
 sub _rederive_regex_groups {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    my $regex_groups_exist = $dbh->selectrow_array(
-        "SELECT 1 FROM groups WHERE userregexp = '' " . $dbh->sql_limit(1));
-    return if !$regex_groups_exist;
+  my $regex_groups_exist = $dbh->selectrow_array(
+    "SELECT 1 FROM groups WHERE userregexp = '' " . $dbh->sql_limit(1));
+  return if !$regex_groups_exist;
 
-    my $regex_derivations = $dbh->selectrow_array(
-        'SELECT 1 FROM user_group_map WHERE grant_type = ' . GRANT_REGEXP 
-        . ' ' . $dbh->sql_limit(1));
-    return if $regex_derivations;
+  my $regex_derivations
+    = $dbh->selectrow_array('SELECT 1 FROM user_group_map WHERE grant_type = '
+      . GRANT_REGEXP . ' '
+      . $dbh->sql_limit(1));
+  return if $regex_derivations;
 
-    print "Deriving regex group memberships...\n";
+  print "Deriving regex group memberships...\n";
 
-    # Re-evaluate all regexps, to keep them up-to-date.
-    my $sth = $dbh->prepare(
-        "SELECT profiles.userid, profiles.login_name, groups.id, 
+  # Re-evaluate all regexps, to keep them up-to-date.
+  my $sth = $dbh->prepare(
+    "SELECT profiles.userid, profiles.login_name, groups.id, 
                 groups.userregexp, user_group_map.group_id
            FROM (profiles CROSS JOIN groups)
                 LEFT JOIN user_group_map
                        ON user_group_map.user_id = profiles.userid
                           AND user_group_map.group_id = groups.id
                           AND user_group_map.grant_type = ?
-          WHERE userregexp != '' OR user_group_map.group_id IS NOT NULL");
+          WHERE userregexp != '' OR user_group_map.group_id IS NOT NULL"
+  );
 
-    my $sth_add = $dbh->prepare(
-        "INSERT INTO user_group_map (user_id, group_id, isbless, grant_type)
-              VALUES (?, ?, 0, " . GRANT_REGEXP . ")");
+  my $sth_add = $dbh->prepare(
+    "INSERT INTO user_group_map (user_id, group_id, isbless, grant_type)
+              VALUES (?, ?, 0, " . GRANT_REGEXP . ")"
+  );
 
-    my $sth_del = $dbh->prepare(
-        "DELETE FROM user_group_map
+  my $sth_del = $dbh->prepare(
+    "DELETE FROM user_group_map
           WHERE user_id  = ? AND group_id = ? AND isbless = 0 
-                AND grant_type = " . GRANT_REGEXP);
+                AND grant_type = " . GRANT_REGEXP
+  );
 
-    $sth->execute(GRANT_REGEXP);
-    while (my ($uid, $login, $gid, $rexp, $present) = 
-               $sth->fetchrow_array()) 
-    {
-        if ($login =~ m/$rexp/i) {
-            $sth_add->execute($uid, $gid) unless $present;
-        } else {
-            $sth_del->execute($uid, $gid) if $present;
-        }
+  $sth->execute(GRANT_REGEXP);
+  while (my ($uid, $login, $gid, $rexp, $present) = $sth->fetchrow_array()) {
+    if ($login =~ m/$rexp/i) {
+      $sth_add->execute($uid, $gid) unless $present;
+    }
+    else {
+      $sth_del->execute($uid, $gid) if $present;
     }
+  }
 }
 
 sub _clean_control_characters_from_short_desc {
-    my $dbh = Bugzilla->dbh;
-
-    # Fixup for Bug 101380
-    # "Newlines, nulls, leading/trailing spaces are getting into summaries"
-
-    my $controlchar_bugs =
-        $dbh->selectall_arrayref("SELECT short_desc, bug_id FROM bugs WHERE " .
-            $dbh->sql_regexp('short_desc', "'[[:cntrl:]]'"));
-    if (scalar(@$controlchar_bugs)) {
-        my $msg = 'Cleaning control characters from bug summaries...';
-        my $found = 0;
-        foreach (@$controlchar_bugs) {
-            my ($short_desc, $bug_id) = @$_;
-            my $clean_short_desc = clean_text($short_desc);
-            if ($clean_short_desc ne $short_desc) {
-                print $msg if !$found;
-                $found = 1;
-                print " $bug_id...";
-                $dbh->do("UPDATE bugs SET short_desc = ? WHERE bug_id = ?",
-                          undef, $clean_short_desc, $bug_id);
-            }
-        }
-        print " done.\n" if $found;
+  my $dbh = Bugzilla->dbh;
+
+  # Fixup for Bug 101380
+  # "Newlines, nulls, leading/trailing spaces are getting into summaries"
+
+  my $controlchar_bugs
+    = $dbh->selectall_arrayref("SELECT short_desc, bug_id FROM bugs WHERE "
+      . $dbh->sql_regexp('short_desc', "'[[:cntrl:]]'"));
+  if (scalar(@$controlchar_bugs)) {
+    my $msg   = 'Cleaning control characters from bug summaries...';
+    my $found = 0;
+    foreach (@$controlchar_bugs) {
+      my ($short_desc, $bug_id) = @$_;
+      my $clean_short_desc = clean_text($short_desc);
+      if ($clean_short_desc ne $short_desc) {
+        print $msg if !$found;
+        $found = 1;
+        print " $bug_id...";
+        $dbh->do("UPDATE bugs SET short_desc = ? WHERE bug_id = ?",
+          undef, $clean_short_desc, $bug_id);
+      }
     }
+    print " done.\n" if $found;
+  }
 }
 
 sub _stop_storing_inactive_flags {
-    my $dbh = Bugzilla->dbh;
-    # 2006-03-02 LpSolit@gmail.com - Bug 322285
-    # Do not store inactive flags in the DB anymore.
-    if ($dbh->bz_column_info('flags', 'id')->{'TYPE'} eq 'INT3') {
-        # We first have to remove all existing inactive flags.
-        if ($dbh->bz_column_info('flags', 'is_active')) {
-            $dbh->do('DELETE FROM flags WHERE is_active = 0');
-        }
+  my $dbh = Bugzilla->dbh;
 
-       # Now we convert the id column to the auto_increment format.
-        $dbh->bz_alter_column('flags', 'id',
-           {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  # 2006-03-02 LpSolit@gmail.com - Bug 322285
+  # Do not store inactive flags in the DB anymore.
+  if ($dbh->bz_column_info('flags', 'id')->{'TYPE'} eq 'INT3') {
 
-        # And finally, we remove the is_active column.
-        $dbh->bz_drop_column('flags', 'is_active');
+    # We first have to remove all existing inactive flags.
+    if ($dbh->bz_column_info('flags', 'is_active')) {
+      $dbh->do('DELETE FROM flags WHERE is_active = 0');
     }
+
+    # Now we convert the id column to the auto_increment format.
+    $dbh->bz_alter_column('flags', 'id',
+      {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+
+    # And finally, we remove the is_active column.
+    $dbh->bz_drop_column('flags', 'is_active');
+  }
 }
 
 sub _change_short_desc_from_mediumtext_to_varchar {
-    my $dbh = Bugzilla->dbh;
-    # short_desc should not be a mediumtext, fix anything longer than 255 chars.
-    if($dbh->bz_column_info('bugs', 'short_desc')->{TYPE} eq 'MEDIUMTEXT') {
-        # Move extremely long summaries into a comment ("from" the Reporter),
-        # and then truncate the summary.
-        my $long_summary_bugs = $dbh->selectall_arrayref(
-            'SELECT bug_id, short_desc, reporter
-               FROM bugs WHERE CHAR_LENGTH(short_desc) > 255');
-
-        if (@$long_summary_bugs) {
-            print "\n", install_string('update_summary_truncated');
-            my $comment_sth = $dbh->prepare(
-                'INSERT INTO longdescs (bug_id, who, thetext, bug_when)
-                      VALUES (?, ?, ?, NOW())');
-            my $desc_sth = $dbh->prepare('UPDATE bugs SET short_desc = ?
-                                           WHERE bug_id = ?');
-            my @affected_bugs;
-            foreach my $bug (@$long_summary_bugs) {
-                my ($bug_id, $summary, $reporter_id) = @$bug;
-                my $summary_comment =
-                    install_string('update_summary_truncate_comment',
-                                   { summary => $summary });
-                $comment_sth->execute($bug_id, $reporter_id, $summary_comment);
-                my $short_summary = substr($summary, 0, 252) . "...";
-                $desc_sth->execute($short_summary, $bug_id);
-                push(@affected_bugs, $bug_id);
-            }
-            print join(', ', @affected_bugs) . "\n\n";
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # short_desc should not be a mediumtext, fix anything longer than 255 chars.
+  if ($dbh->bz_column_info('bugs', 'short_desc')->{TYPE} eq 'MEDIUMTEXT') {
 
-        $dbh->bz_alter_column('bugs', 'short_desc', {TYPE => 'varchar(255)',
-                                                     NOTNULL => 1});
+    # Move extremely long summaries into a comment ("from" the Reporter),
+    # and then truncate the summary.
+    my $long_summary_bugs = $dbh->selectall_arrayref(
+      'SELECT bug_id, short_desc, reporter
+               FROM bugs WHERE CHAR_LENGTH(short_desc) > 255'
+    );
+
+    if (@$long_summary_bugs) {
+      print "\n", install_string('update_summary_truncated');
+      my $comment_sth = $dbh->prepare(
+        'INSERT INTO longdescs (bug_id, who, thetext, bug_when)
+                      VALUES (?, ?, ?, NOW())'
+      );
+      my $desc_sth = $dbh->prepare(
+        'UPDATE bugs SET short_desc = ?
+                                           WHERE bug_id = ?'
+      );
+      my @affected_bugs;
+      foreach my $bug (@$long_summary_bugs) {
+        my ($bug_id, $summary, $reporter_id) = @$bug;
+        my $summary_comment
+          = install_string('update_summary_truncate_comment', {summary => $summary});
+        $comment_sth->execute($bug_id, $reporter_id, $summary_comment);
+        my $short_summary = substr($summary, 0, 252) . "...";
+        $desc_sth->execute($short_summary, $bug_id);
+        push(@affected_bugs, $bug_id);
+      }
+      print join(', ', @affected_bugs) . "\n\n";
     }
+
+    $dbh->bz_alter_column('bugs', 'short_desc',
+      {TYPE => 'varchar(255)', NOTNULL => 1});
+  }
 }
 
 sub _move_namedqueries_linkinfooter_to_its_own_table {
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->bz_column_info("namedqueries", "linkinfooter")) {
-        # Move link-in-footer information into a table of its own.
-        my $sth_read = $dbh->prepare('SELECT id, userid
+  my $dbh = Bugzilla->dbh;
+  if ($dbh->bz_column_info("namedqueries", "linkinfooter")) {
+
+    # Move link-in-footer information into a table of its own.
+    my $sth_read = $dbh->prepare(
+      'SELECT id, userid
                                         FROM namedqueries
-                                       WHERE linkinfooter = 1');
-        my $sth_write = $dbh->prepare('INSERT INTO namedqueries_link_in_footer
-                                       (namedquery_id, user_id) VALUES (?, ?)');
-        $sth_read->execute();
-        while (my ($id, $userid) = $sth_read->fetchrow_array()) {
-            $sth_write->execute($id, $userid);
-        }
-        $dbh->bz_drop_column("namedqueries", "linkinfooter");
+                                       WHERE linkinfooter = 1'
+    );
+    my $sth_write = $dbh->prepare(
+      'INSERT INTO namedqueries_link_in_footer
+                                       (namedquery_id, user_id) VALUES (?, ?)'
+    );
+    $sth_read->execute();
+    while (my ($id, $userid) = $sth_read->fetchrow_array()) {
+      $sth_write->execute($id, $userid);
     }
+    $dbh->bz_drop_column("namedqueries", "linkinfooter");
+  }
 }
 
 sub _add_classifications_sortkey {
-    my $dbh = Bugzilla->dbh;
-    # 2006-07-07 olav@bkor.dhs.org - Bug 277377
-    # Add a sortkey to the classifications
-    if (!$dbh->bz_column_info('classifications', 'sortkey')) {
-        $dbh->bz_add_column('classifications', 'sortkey',
-                            {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-
-        my $class_ids = $dbh->selectcol_arrayref(
-            'SELECT id FROM classifications ORDER BY name');
-        my $sth = $dbh->prepare('UPDATE classifications SET sortkey = ? ' .
-                                 'WHERE id = ?');
-        my $sortkey = 0;
-        foreach my $class_id (@$class_ids) {
-            $sth->execute($sortkey, $class_id);
-            $sortkey += 100;
-        }
+  my $dbh = Bugzilla->dbh;
+
+  # 2006-07-07 olav@bkor.dhs.org - Bug 277377
+  # Add a sortkey to the classifications
+  if (!$dbh->bz_column_info('classifications', 'sortkey')) {
+    $dbh->bz_add_column('classifications', 'sortkey',
+      {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+
+    my $class_ids
+      = $dbh->selectcol_arrayref('SELECT id FROM classifications ORDER BY name');
+    my $sth
+      = $dbh->prepare('UPDATE classifications SET sortkey = ? ' . 'WHERE id = ?');
+    my $sortkey = 0;
+    foreach my $class_id (@$class_ids) {
+      $sth->execute($sortkey, $class_id);
+      $sortkey += 100;
     }
+  }
 }
 
 sub _move_data_nomail_into_db {
-    my $dbh = Bugzilla->dbh;
-    my $datadir = bz_locations()->{'datadir'};
-    # 2006-07-14 karl@kornel.name - Bug 100953
-    # If a nomail file exists, move its contents into the DB
-    $dbh->bz_add_column('profiles', 'disable_mail',
-        { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE' });
-    if (-e "$datadir/nomail") {
-        # We have a data/nomail file, read it in and delete it
-        my %nomail;
-        print "Found a data/nomail file.  Moving nomail entries into DB...\n";
-        my $nomail_file = new IO::File("$datadir/nomail", 'r');
-        while (<$nomail_file>) {
-            $nomail{trim($_)} = 1;
-        }
-        $nomail_file->close;
+  my $dbh     = Bugzilla->dbh;
+  my $datadir = bz_locations()->{'datadir'};
+
+  # 2006-07-14 karl@kornel.name - Bug 100953
+  # If a nomail file exists, move its contents into the DB
+  $dbh->bz_add_column('profiles', 'disable_mail',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+  if (-e "$datadir/nomail") {
+
+    # We have a data/nomail file, read it in and delete it
+    my %nomail;
+    print "Found a data/nomail file.  Moving nomail entries into DB...\n";
+    my $nomail_file = new IO::File("$datadir/nomail", 'r');
+    while (<$nomail_file>) {
+      $nomail{trim($_)} = 1;
+    }
+    $nomail_file->close;
 
-        # Go through each entry read.  If a user exists, set disable_mail.
-        my $query = $dbh->prepare('UPDATE profiles
+    # Go through each entry read.  If a user exists, set disable_mail.
+    my $query = $dbh->prepare(
+      'UPDATE profiles
                                       SET disable_mail = 1
-                                    WHERE userid = ?');
-        foreach my $user_to_check (keys %nomail) {
-            my $uid = $dbh->selectrow_array(
-                'SELECT userid FROM profiles WHERE login_name = ?',
-                undef, $user_to_check);
-            next if !$uid;
-            print "\tDisabling email for user $user_to_check\n";
-            $query->execute($uid);
-            delete $nomail{$user_to_check};
-        }
-
-        # If there are any nomail entries remaining, move them to nomail.bad
-        # and say something to the user.
-        if (scalar(keys %nomail)) {
-            print "\n", install_string('update_nomail_bad',
-                                       { data => $datadir }), "\n";
-            my $nomail_bad = new IO::File("$datadir/nomail.bad", '>>');
-            foreach my $unknown_user (keys %nomail) {
-                print "\t$unknown_user\n";
-                print $nomail_bad "$unknown_user\n";
-                delete $nomail{$unknown_user};
-            }
-            $nomail_bad->close;
-            print "\n";
-        }
+                                    WHERE userid = ?'
+    );
+    foreach my $user_to_check (keys %nomail) {
+      my $uid
+        = $dbh->selectrow_array('SELECT userid FROM profiles WHERE login_name = ?',
+        undef, $user_to_check);
+      next if !$uid;
+      print "\tDisabling email for user $user_to_check\n";
+      $query->execute($uid);
+      delete $nomail{$user_to_check};
+    }
 
-        # Now that we don't need it, get rid of the nomail file.
-        unlink "$datadir/nomail";
+    # If there are any nomail entries remaining, move them to nomail.bad
+    # and say something to the user.
+    if (scalar(keys %nomail)) {
+      print "\n", install_string('update_nomail_bad', {data => $datadir}), "\n";
+      my $nomail_bad = new IO::File("$datadir/nomail.bad", '>>');
+      foreach my $unknown_user (keys %nomail) {
+        print "\t$unknown_user\n";
+        print $nomail_bad "$unknown_user\n";
+        delete $nomail{$unknown_user};
+      }
+      $nomail_bad->close;
+      print "\n";
     }
+
+    # Now that we don't need it, get rid of the nomail file.
+    unlink "$datadir/nomail";
+  }
 }
 
 sub _update_longdescs_who_index {
-    my $dbh = Bugzilla->dbh;
-    # When doing a search on who posted a comment, longdescs is joined
-    # against the bugs table. So we need an index on both of these,
-    # not just on "who".
-    my $who_index = $dbh->bz_index_info('longdescs', 'longdescs_who_idx');
-    if (!$who_index || scalar @{$who_index->{FIELDS}} == 1) {
-        # If the index doesn't exist, this will harmlessly do nothing.
-        $dbh->bz_drop_index('longdescs', 'longdescs_who_idx');
-        $dbh->bz_add_index('longdescs', 'longdescs_who_idx', [qw(who bug_id)]);
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # When doing a search on who posted a comment, longdescs is joined
+  # against the bugs table. So we need an index on both of these,
+  # not just on "who".
+  my $who_index = $dbh->bz_index_info('longdescs', 'longdescs_who_idx');
+  if (!$who_index || scalar @{$who_index->{FIELDS}} == 1) {
+
+    # If the index doesn't exist, this will harmlessly do nothing.
+    $dbh->bz_drop_index('longdescs', 'longdescs_who_idx');
+    $dbh->bz_add_index('longdescs', 'longdescs_who_idx', [qw(who bug_id)]);
+  }
 }
 
 sub _fix_uppercase_custom_field_names {
-    # Before the final release of 3.0, custom fields could be
-    # created with mixed-case names.
-    my $dbh = Bugzilla->dbh;
-    my $fields = $dbh->selectall_arrayref(
-        'SELECT name, type FROM fielddefs WHERE custom = 1');
-    foreach my $row (@$fields) {
-        my ($name, $type) = @$row;
-        if ($name ne lc($name)) {
-            $dbh->bz_rename_column('bugs', $name, lc($name));
-            $dbh->bz_rename_table($name, lc($name))
-                if $type == FIELD_TYPE_SINGLE_SELECT;
-            $dbh->do('UPDATE fielddefs SET name = ? WHERE name = ?',
-                     undef, lc($name), $name);
-        }
+
+  # Before the final release of 3.0, custom fields could be
+  # created with mixed-case names.
+  my $dbh    = Bugzilla->dbh;
+  my $fields = $dbh->selectall_arrayref(
+    'SELECT name, type FROM fielddefs WHERE custom = 1');
+  foreach my $row (@$fields) {
+    my ($name, $type) = @$row;
+    if ($name ne lc($name)) {
+      $dbh->bz_rename_column('bugs', $name, lc($name));
+      $dbh->bz_rename_table($name, lc($name)) if $type == FIELD_TYPE_SINGLE_SELECT;
+      $dbh->do('UPDATE fielddefs SET name = ? WHERE name = ?',
+        undef, lc($name), $name);
     }
+  }
 }
 
 sub _fix_uppercase_index_names {
-    # We forgot to fix indexes in the above code.
-    my $dbh = Bugzilla->dbh;
-    my $fields = $dbh->selectcol_arrayref(
-        'SELECT name FROM fielddefs WHERE type = ? AND custom = 1',
-        undef, FIELD_TYPE_SINGLE_SELECT);
-    foreach my $field (@$fields) {
-        my $indexes = $dbh->bz_table_indexes($field);
-        foreach my $name (keys %$indexes) {
-            next if $name eq lc($name);
-            my $index = $indexes->{$name};
-            # Lowercase the name and everything in the definition.
-            my $new_name   = lc($name);
-            my @new_fields = map {lc($_)} @{$index->{FIELDS}};
-            my $new_def = {FIELDS => \@new_fields, TYPE => $index->{TYPE}};
-            $new_def = \@new_fields if !$index->{TYPE};
-            $dbh->bz_drop_index($field, $name);
-            $dbh->bz_add_index($field, $new_name, $new_def);
-        }
+
+  # We forgot to fix indexes in the above code.
+  my $dbh = Bugzilla->dbh;
+  my $fields
+    = $dbh->selectcol_arrayref(
+    'SELECT name FROM fielddefs WHERE type = ? AND custom = 1',
+    undef, FIELD_TYPE_SINGLE_SELECT);
+  foreach my $field (@$fields) {
+    my $indexes = $dbh->bz_table_indexes($field);
+    foreach my $name (keys %$indexes) {
+      next if $name eq lc($name);
+      my $index = $indexes->{$name};
+
+      # Lowercase the name and everything in the definition.
+      my $new_name   = lc($name);
+      my @new_fields = map { lc($_) } @{$index->{FIELDS}};
+      my $new_def    = {FIELDS => \@new_fields, TYPE => $index->{TYPE}};
+      $new_def = \@new_fields if !$index->{TYPE};
+      $dbh->bz_drop_index($field, $name);
+      $dbh->bz_add_index($field, $new_name, $new_def);
     }
+  }
 }
 
 sub _initialize_workflow_for_upgrade {
-    my $old_params = shift;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_add_column('bug_status', 'is_open',
-                        {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-
-    # Till now, bug statuses were not customizable. Nevertheless, local
-    # changes are possible and so we will try to respect these changes.
-    # This means: get the status of bugs having a resolution different from ''
-    # and mark these statuses as 'closed', even if some of these statuses are
-    # expected to be open statuses. Bug statuses we have no information about
-    # are left as 'open'.
-    #
-    # We append the default list of closed statuses *unless* we detect at least
-    # one closed state in the DB (i.e. with is_open = 0). This would mean that
-    # the DB has already been updated at least once and maybe the admin decided
-    # that e.g. 'RESOLVED' is now an open state, in which case we don't want to
-    # override this attribute. At least one bug status has to be a closed state
-    # anyway (due to the 'duplicate_or_move_bug_status' parameter) so it's safe
-    # to use this criteria.
-    my $num_closed_states = $dbh->selectrow_array('SELECT COUNT(*) FROM bug_status
-                                                   WHERE is_open = 0');
-
-    if (!$num_closed_states) {
-        my @closed_statuses =
-            @{$dbh->selectcol_arrayref('SELECT DISTINCT bug_status FROM bugs
-                                         WHERE resolution != ?', undef, '')};
-        @closed_statuses =
-          map {$dbh->quote($_)} (@closed_statuses, qw(RESOLVED VERIFIED CLOSED));
-
-        print "Marking closed bug statuses as such...\n";
-        $dbh->do('UPDATE bug_status SET is_open = 0 WHERE value IN (' .
-                  join(', ', @closed_statuses) . ')');
-    }
-
-    # We only populate the workflow here if we're upgrading from a version
-    # before 4.0 (which is where init_workflow was added). This was the
-    # first schema change done for 4.0, so we check this.
-    return if $dbh->bz_column_info('bugs_activity', 'comment_id');
-
-    # Populate the status_workflow table. We do nothing if the table already
-    # has entries. If all bug status transitions have been deleted, the
-    # workflow will be restored to its default schema.
-    my $count = $dbh->selectrow_array('SELECT COUNT(*) FROM status_workflow');
-
-    if (!$count) {
-        # Make sure the variables below are defined as
-        # status_workflow.require_comment cannot be NULL.
-        my $create = $old_params->{'commentoncreate'} || 0;
-        my $confirm = $old_params->{'commentonconfirm'} || 0;
-        my $accept = $old_params->{'commentonaccept'} || 0;
-        my $resolve = $old_params->{'commentonresolve'} || 0;
-        my $verify = $old_params->{'commentonverify'} || 0;
-        my $close = $old_params->{'commentonclose'} || 0;
-        my $reopen = $old_params->{'commentonreopen'} || 0;
-        # This was till recently the only way to get back to NEW for
-        # confirmed bugs, so we use this parameter here.
-        my $reassign = $old_params->{'commentonreassign'} || 0;
-
-        # This is the default workflow for upgrading installations.
-        my @workflow = ([undef, 'UNCONFIRMED', $create],
-                        [undef, 'NEW', $create],
-                        [undef, 'ASSIGNED', $create],
-                        ['UNCONFIRMED', 'NEW', $confirm],
-                        ['UNCONFIRMED', 'ASSIGNED', $accept],
-                        ['UNCONFIRMED', 'RESOLVED', $resolve],
-                        ['NEW', 'ASSIGNED', $accept],
-                        ['NEW', 'RESOLVED', $resolve],
-                        ['ASSIGNED', 'NEW', $reassign],
-                        ['ASSIGNED', 'RESOLVED', $resolve],
-                        ['REOPENED', 'NEW', $reassign],
-                        ['REOPENED', 'ASSIGNED', $accept],
-                        ['REOPENED', 'RESOLVED', $resolve],
-                        ['RESOLVED', 'UNCONFIRMED', $reopen],
-                        ['RESOLVED', 'REOPENED', $reopen],
-                        ['RESOLVED', 'VERIFIED', $verify],
-                        ['RESOLVED', 'CLOSED', $close],
-                        ['VERIFIED', 'UNCONFIRMED', $reopen],
-                        ['VERIFIED', 'REOPENED', $reopen],
-                        ['VERIFIED', 'CLOSED', $close],
-                        ['CLOSED', 'UNCONFIRMED', $reopen],
-                        ['CLOSED', 'REOPENED', $reopen]);
-
-        print "Now filling the 'status_workflow' table with valid bug status transitions...\n";
-        my $sth_select = $dbh->prepare('SELECT id FROM bug_status WHERE value = ?');
-        my $sth = $dbh->prepare('INSERT INTO status_workflow (old_status, new_status,
-                                             require_comment) VALUES (?, ?, ?)');
-
-        foreach my $transition (@workflow) {
-            my ($from, $to);
-            # If it's an initial state, there is no "old" value.
-            $from = $dbh->selectrow_array($sth_select, undef, $transition->[0])
-              if $transition->[0];
-            $to = $dbh->selectrow_array($sth_select, undef, $transition->[1]);
-            # If one of the bug statuses doesn't exist, the transition is invalid.
-            next if (($transition->[0] && !$from) || !$to);
-
-            $sth->execute($from, $to, $transition->[2] ? 1 : 0);
-        }
-    }
+  my $old_params = shift;
+  my $dbh        = Bugzilla->dbh;
+
+  $dbh->bz_add_column('bug_status', 'is_open',
+    {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+
+  # Till now, bug statuses were not customizable. Nevertheless, local
+  # changes are possible and so we will try to respect these changes.
+  # This means: get the status of bugs having a resolution different from ''
+  # and mark these statuses as 'closed', even if some of these statuses are
+  # expected to be open statuses. Bug statuses we have no information about
+  # are left as 'open'.
+  #
+  # We append the default list of closed statuses *unless* we detect at least
+  # one closed state in the DB (i.e. with is_open = 0). This would mean that
+  # the DB has already been updated at least once and maybe the admin decided
+  # that e.g. 'RESOLVED' is now an open state, in which case we don't want to
+  # override this attribute. At least one bug status has to be a closed state
+  # anyway (due to the 'duplicate_or_move_bug_status' parameter) so it's safe
+  # to use this criteria.
+  my $num_closed_states = $dbh->selectrow_array(
+    'SELECT COUNT(*) FROM bug_status
+                                                   WHERE is_open = 0'
+  );
+
+  if (!$num_closed_states) {
+    my @closed_statuses = @{
+      $dbh->selectcol_arrayref(
+        'SELECT DISTINCT bug_status FROM bugs
+                                         WHERE resolution != ?', undef, ''
+      )
+    };
+    @closed_statuses
+      = map { $dbh->quote($_) } (@closed_statuses, qw(RESOLVED VERIFIED CLOSED));
+
+    print "Marking closed bug statuses as such...\n";
+    $dbh->do('UPDATE bug_status SET is_open = 0 WHERE value IN ('
+        . join(', ', @closed_statuses)
+        . ')');
+  }
+
+  # We only populate the workflow here if we're upgrading from a version
+  # before 4.0 (which is where init_workflow was added). This was the
+  # first schema change done for 4.0, so we check this.
+  return if $dbh->bz_column_info('bugs_activity', 'comment_id');
+
+  # Populate the status_workflow table. We do nothing if the table already
+  # has entries. If all bug status transitions have been deleted, the
+  # workflow will be restored to its default schema.
+  my $count = $dbh->selectrow_array('SELECT COUNT(*) FROM status_workflow');
+
+  if (!$count) {
+
+    # Make sure the variables below are defined as
+    # status_workflow.require_comment cannot be NULL.
+    my $create  = $old_params->{'commentoncreate'}  || 0;
+    my $confirm = $old_params->{'commentonconfirm'} || 0;
+    my $accept  = $old_params->{'commentonaccept'}  || 0;
+    my $resolve = $old_params->{'commentonresolve'} || 0;
+    my $verify  = $old_params->{'commentonverify'}  || 0;
+    my $close   = $old_params->{'commentonclose'}   || 0;
+    my $reopen  = $old_params->{'commentonreopen'}  || 0;
+
+    # This was till recently the only way to get back to NEW for
+    # confirmed bugs, so we use this parameter here.
+    my $reassign = $old_params->{'commentonreassign'} || 0;
+
+    # This is the default workflow for upgrading installations.
+    my @workflow = (
+      [undef,         'UNCONFIRMED', $create],
+      [undef,         'NEW',         $create],
+      [undef,         'ASSIGNED',    $create],
+      ['UNCONFIRMED', 'NEW',         $confirm],
+      ['UNCONFIRMED', 'ASSIGNED',    $accept],
+      ['UNCONFIRMED', 'RESOLVED',    $resolve],
+      ['NEW',         'ASSIGNED',    $accept],
+      ['NEW',         'RESOLVED',    $resolve],
+      ['ASSIGNED',    'NEW',         $reassign],
+      ['ASSIGNED',    'RESOLVED',    $resolve],
+      ['REOPENED',    'NEW',         $reassign],
+      ['REOPENED',    'ASSIGNED',    $accept],
+      ['REOPENED',    'RESOLVED',    $resolve],
+      ['RESOLVED',    'UNCONFIRMED', $reopen],
+      ['RESOLVED',    'REOPENED',    $reopen],
+      ['RESOLVED',    'VERIFIED',    $verify],
+      ['RESOLVED',    'CLOSED',      $close],
+      ['VERIFIED',    'UNCONFIRMED', $reopen],
+      ['VERIFIED',    'REOPENED',    $reopen],
+      ['VERIFIED',    'CLOSED',      $close],
+      ['CLOSED',      'UNCONFIRMED', $reopen],
+      ['CLOSED',      'REOPENED',    $reopen]
+    );
 
-    # Make sure the bug status used by the 'duplicate_or_move_bug_status'
-    # parameter has all the required transitions set.
-    my $dup_status = Bugzilla->params->{'duplicate_or_move_bug_status'};
-    my $status_id = $dbh->selectrow_array(
-        'SELECT id FROM bug_status WHERE value = ?', undef, $dup_status);
-    # There's a minor chance that this status isn't in the DB.
-    $status_id || return;
+    print
+      "Now filling the 'status_workflow' table with valid bug status transitions...\n";
+    my $sth_select = $dbh->prepare('SELECT id FROM bug_status WHERE value = ?');
+    my $sth        = $dbh->prepare(
+      'INSERT INTO status_workflow (old_status, new_status,
+                                             require_comment) VALUES (?, ?, ?)'
+    );
 
-    my $missing_statuses = $dbh->selectcol_arrayref(
-        'SELECT id FROM bug_status
-                        LEFT JOIN status_workflow ON old_status = id
-                                                     AND new_status = ?
-          WHERE old_status IS NULL', undef, $status_id);
+    foreach my $transition (@workflow) {
+      my ($from, $to);
 
-    my $sth = $dbh->prepare('INSERT INTO status_workflow
-                             (old_status, new_status) VALUES (?, ?)');
+      # If it's an initial state, there is no "old" value.
+      $from = $dbh->selectrow_array($sth_select, undef, $transition->[0])
+        if $transition->[0];
+      $to = $dbh->selectrow_array($sth_select, undef, $transition->[1]);
 
-    foreach my $old_status_id (@$missing_statuses) {
-        next if ($old_status_id == $status_id);
-        $sth->execute($old_status_id, $status_id);
+      # If one of the bug statuses doesn't exist, the transition is invalid.
+      next if (($transition->[0] && !$from) || !$to);
+
+      $sth->execute($from, $to, $transition->[2] ? 1 : 0);
     }
+  }
+
+  # Make sure the bug status used by the 'duplicate_or_move_bug_status'
+  # parameter has all the required transitions set.
+  my $dup_status = Bugzilla->params->{'duplicate_or_move_bug_status'};
+  my $status_id
+    = $dbh->selectrow_array('SELECT id FROM bug_status WHERE value = ?',
+    undef, $dup_status);
+
+  # There's a minor chance that this status isn't in the DB.
+  $status_id || return;
+
+  my $missing_statuses = $dbh->selectcol_arrayref(
+    'SELECT id FROM bug_status
+                        LEFT JOIN status_workflow ON old_status = id
+                                                     AND new_status = ?
+          WHERE old_status IS NULL', undef, $status_id
+  );
+
+  my $sth = $dbh->prepare(
+    'INSERT INTO status_workflow
+                             (old_status, new_status) VALUES (?, ?)'
+  );
+
+  foreach my $old_status_id (@$missing_statuses) {
+    next if ($old_status_id == $status_id);
+    $sth->execute($old_status_id, $status_id);
+  }
 }
 
 sub _make_lang_setting_dynamic {
-    my $dbh = Bugzilla->dbh;
-    my $count = $dbh->selectrow_array(q{SELECT 1 FROM setting
+  my $dbh   = Bugzilla->dbh;
+  my $count = $dbh->selectrow_array(
+    q{SELECT 1 FROM setting
                                          WHERE name = 'lang'
-                                           AND subclass IS NULL});
-    if ($count) {
-        $dbh->do(q{UPDATE setting SET subclass = 'Lang' WHERE name = 'lang'});
-        $dbh->do(q{DELETE FROM setting_value WHERE name = 'lang'});
-    }
+                                           AND subclass IS NULL}
+  );
+  if ($count) {
+    $dbh->do(q{UPDATE setting SET subclass = 'Lang' WHERE name = 'lang'});
+    $dbh->do(q{DELETE FROM setting_value WHERE name = 'lang'});
+  }
 }
 
 sub _fix_attachment_modification_date {
-    my $dbh = Bugzilla->dbh;
-    if (!$dbh->bz_column_info('attachments', 'modification_time')) {
-        # Allow NULL values till the modification time has been set.
-        $dbh->bz_add_column('attachments', 'modification_time', {TYPE => 'DATETIME'});
+  my $dbh = Bugzilla->dbh;
+  if (!$dbh->bz_column_info('attachments', 'modification_time')) {
 
-        print "Setting the modification time for attachments...\n";
-        $dbh->do('UPDATE attachments SET modification_time = creation_ts');
+    # Allow NULL values till the modification time has been set.
+    $dbh->bz_add_column('attachments', 'modification_time', {TYPE => 'DATETIME'});
 
-        # Now force values to be always defined.
-        $dbh->bz_alter_column('attachments', 'modification_time',
-                              {TYPE => 'DATETIME', NOTNULL => 1});
+    print "Setting the modification time for attachments...\n";
+    $dbh->do('UPDATE attachments SET modification_time = creation_ts');
 
-        # Update the modification time for attachments which have been modified.
-        my $attachments =
-          $dbh->selectall_arrayref('SELECT attach_id, MAX(bug_when) FROM bugs_activity
-                                    WHERE attach_id IS NOT NULL ' .
-                                    $dbh->sql_group_by('attach_id'));
+    # Now force values to be always defined.
+    $dbh->bz_alter_column('attachments', 'modification_time',
+      {TYPE => 'DATETIME', NOTNULL => 1});
 
-        my $sth = $dbh->prepare('UPDATE attachments SET modification_time = ?
-                                 WHERE attach_id = ?');
-        $sth->execute($_->[1], $_->[0]) foreach (@$attachments);
-    }
-    # We add this here to be sure to have the index being added, due to the original
-    # patch omitting it.
-    $dbh->bz_add_index('attachments', 'attachments_modification_time_idx',
-                       [qw(modification_time)]);
+    # Update the modification time for attachments which have been modified.
+    my $attachments = $dbh->selectall_arrayref(
+      'SELECT attach_id, MAX(bug_when) FROM bugs_activity
+                                    WHERE attach_id IS NOT NULL '
+        . $dbh->sql_group_by('attach_id')
+    );
+
+    my $sth = $dbh->prepare(
+      'UPDATE attachments SET modification_time = ?
+                                 WHERE attach_id = ?'
+    );
+    $sth->execute($_->[1], $_->[0]) foreach (@$attachments);
+  }
+
+  # We add this here to be sure to have the index being added, due to the original
+  # patch omitting it.
+  $dbh->bz_add_index('attachments', 'attachments_modification_time_idx',
+    [qw(modification_time)]);
 }
 
 sub _change_text_types {
-    my $dbh = Bugzilla->dbh; 
-    return if 
-        $dbh->bz_column_info('namedqueries', 'query')->{TYPE} eq 'LONGTEXT';
-    _check_content_length('attachments', 'mimetype',    255, 'attach_id');
-    _check_content_length('fielddefs',   'description', 255, 'id');
-    _check_content_length('attachments', 'description', 255, 'attach_id');
-
-    $dbh->bz_alter_column('bugs', 'bug_file_loc',
-        { TYPE => 'MEDIUMTEXT'});
-    $dbh->bz_alter_column('longdescs', 'thetext',
-        { TYPE => 'LONGTEXT', NOTNULL => 1 });
-    $dbh->bz_alter_column('attachments', 'description',
-        { TYPE => 'TINYTEXT', NOTNULL => 1 });
-    $dbh->bz_alter_column('attachments', 'mimetype',
-        { TYPE => 'TINYTEXT', NOTNULL => 1 });
-    # This also changes NULL to NOT NULL.
-    $dbh->bz_alter_column('flagtypes', 'description',
-        { TYPE => 'MEDIUMTEXT', NOTNULL => 1 }, '');
-    $dbh->bz_alter_column('fielddefs', 'description',
-        { TYPE => 'TINYTEXT', NOTNULL => 1 });
-    $dbh->bz_alter_column('groups', 'description',
-        { TYPE => 'MEDIUMTEXT', NOTNULL => 1 });
-    $dbh->bz_alter_column('namedqueries', 'query',
-        { TYPE => 'LONGTEXT', NOTNULL => 1 });
-
-} 
+  my $dbh = Bugzilla->dbh;
+  return if $dbh->bz_column_info('namedqueries', 'query')->{TYPE} eq 'LONGTEXT';
+  _check_content_length('attachments', 'mimetype',    255, 'attach_id');
+  _check_content_length('fielddefs',   'description', 255, 'id');
+  _check_content_length('attachments', 'description', 255, 'attach_id');
+
+  $dbh->bz_alter_column('bugs', 'bug_file_loc', {TYPE => 'MEDIUMTEXT'});
+  $dbh->bz_alter_column('longdescs', 'thetext',
+    {TYPE => 'LONGTEXT', NOTNULL => 1});
+  $dbh->bz_alter_column('attachments', 'description',
+    {TYPE => 'TINYTEXT', NOTNULL => 1});
+  $dbh->bz_alter_column('attachments', 'mimetype',
+    {TYPE => 'TINYTEXT', NOTNULL => 1});
+
+  # This also changes NULL to NOT NULL.
+  $dbh->bz_alter_column('flagtypes', 'description',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1}, '');
+  $dbh->bz_alter_column('fielddefs', 'description',
+    {TYPE => 'TINYTEXT', NOTNULL => 1});
+  $dbh->bz_alter_column('groups', 'description',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1});
+  $dbh->bz_alter_column('namedqueries', 'query',
+    {TYPE => 'LONGTEXT', NOTNULL => 1});
+
+}
 
 sub _check_content_length {
-    my ($table_name, $field_name, $max_length, $id_field) = @_;
-    my $dbh = Bugzilla->dbh;
-    my %contents = @{ $dbh->selectcol_arrayref(
-        "SELECT $id_field, $field_name FROM $table_name 
-          WHERE CHAR_LENGTH($field_name) > ?", {Columns=>[1,2]}, $max_length) };
-
-    if (scalar keys %contents) {
-        my $error = install_string('install_data_too_long',
-                                   { column     => $field_name,
-                                     id_column  => $id_field,
-                                     table      => $table_name,
-                                     max_length => $max_length });
-        foreach my $id (keys %contents) {
-            my $string = $contents{$id};
-            # Don't dump the whole string--it could be 16MB.
-            if (length($string) > 80) {
-                $string = substr($string, 0, 30) . "..." 
-                         . substr($string, -30) . "\n";
-            }
-            $error .= "$id: $string\n";
-        }
-        die $error;
+  my ($table_name, $field_name, $max_length, $id_field) = @_;
+  my $dbh      = Bugzilla->dbh;
+  my %contents = @{
+    $dbh->selectcol_arrayref(
+      "SELECT $id_field, $field_name FROM $table_name 
+          WHERE CHAR_LENGTH($field_name) > ?", {Columns => [1, 2]}, $max_length
+    )
+  };
+
+  if (scalar keys %contents) {
+    my $error = install_string(
+      'install_data_too_long',
+      {
+        column     => $field_name,
+        id_column  => $id_field,
+        table      => $table_name,
+        max_length => $max_length
+      }
+    );
+    foreach my $id (keys %contents) {
+      my $string = $contents{$id};
+
+      # Don't dump the whole string--it could be 16MB.
+      if (length($string) > 80) {
+        $string = substr($string, 0, 30) . "..." . substr($string, -30) . "\n";
+      }
+      $error .= "$id: $string\n";
     }
+    die $error;
+  }
 }
 
 sub _add_foreign_keys_to_multiselects {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    my $names = $dbh->selectcol_arrayref(
-        'SELECT name 
+  my $names = $dbh->selectcol_arrayref(
+    'SELECT name 
            FROM fielddefs 
-          WHERE type = ' . FIELD_TYPE_MULTI_SELECT);
+          WHERE type = ' . FIELD_TYPE_MULTI_SELECT
+  );
 
-    foreach my $name (@$names) {
-        $dbh->bz_add_fk("bug_$name", "bug_id", 
-            {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'});
-                                                
-        $dbh->bz_add_fk("bug_$name", "value",
-            {TABLE  => $name, COLUMN => 'value', DELETE => 'RESTRICT'});
-    }
+  foreach my $name (@$names) {
+    $dbh->bz_add_fk("bug_$name", "bug_id",
+      {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'});
+
+    $dbh->bz_add_fk("bug_$name", "value",
+      {TABLE => $name, COLUMN => 'value', DELETE => 'RESTRICT'});
+  }
 }
 
 # This subroutine is used in multiple places (for times when we update
@@ -3250,671 +3532,763 @@ sub _add_foreign_keys_to_multiselects {
 # it to update bugs_fulltext for those bug_ids instead of populating the
 # whole table.
 sub _populate_bugs_fulltext {
-    my $bug_ids = shift;
-    my $dbh = Bugzilla->dbh;
-    my $fulltext = $dbh->selectrow_array('SELECT 1 FROM bugs_fulltext '
-                                         . $dbh->sql_limit(1));
-    # We only populate the table if it's empty or if we've been given a
-    # set of bug ids.
-    if ($bug_ids or !$fulltext) {
-        $bug_ids ||= $dbh->selectcol_arrayref('SELECT bug_id FROM bugs');
-        # If there are no bugs in the bugs table, there's nothing to populate.
-        return if !@$bug_ids;
-        my $num_bugs = scalar @$bug_ids;
-
-        my $command = "INSERT";
-        my $where = "";
-        if ($fulltext) {
-            print "Updating bugs_fulltext for $num_bugs bugs...\n";
-            $where = "WHERE " . $dbh->sql_in('bugs.bug_id', $bug_ids);
-            # It turns out that doing a REPLACE INTO is up to 10x faster
-            # than any other possible method of updating the table, in MySQL,
-            # which matters a LOT for large installations.
-            if ($dbh->isa('Bugzilla::DB::Mysql')) {
-                $command = "REPLACE";
-            }
-            else {
-                $dbh->do("DELETE FROM bugs_fulltext WHERE " 
-                         . $dbh->sql_in('bug_id', $bug_ids));
-            }
-        }
-        else {
-            print "Populating bugs_fulltext with $num_bugs entries...";
-            print " (this can take a long time.)\n";
-        }
-        my $newline = $dbh->quote("\n");
-        $dbh->do(
-         qq{$command INTO bugs_fulltext (bug_id, short_desc, comments, 
+  my $bug_ids = shift;
+  my $dbh     = Bugzilla->dbh;
+  my $fulltext
+    = $dbh->selectrow_array('SELECT 1 FROM bugs_fulltext ' . $dbh->sql_limit(1));
+
+  # We only populate the table if it's empty or if we've been given a
+  # set of bug ids.
+  if ($bug_ids or !$fulltext) {
+    $bug_ids ||= $dbh->selectcol_arrayref('SELECT bug_id FROM bugs');
+
+    # If there are no bugs in the bugs table, there's nothing to populate.
+    return if !@$bug_ids;
+    my $num_bugs = scalar @$bug_ids;
+
+    my $command = "INSERT";
+    my $where   = "";
+    if ($fulltext) {
+      print "Updating bugs_fulltext for $num_bugs bugs...\n";
+      $where = "WHERE " . $dbh->sql_in('bugs.bug_id', $bug_ids);
+
+      # It turns out that doing a REPLACE INTO is up to 10x faster
+      # than any other possible method of updating the table, in MySQL,
+      # which matters a LOT for large installations.
+      if ($dbh->isa('Bugzilla::DB::Mysql')) {
+        $command = "REPLACE";
+      }
+      else {
+        $dbh->do("DELETE FROM bugs_fulltext WHERE " . $dbh->sql_in('bug_id', $bug_ids));
+      }
+    }
+    else {
+      print "Populating bugs_fulltext with $num_bugs entries...";
+      print " (this can take a long time.)\n";
+    }
+    my $newline = $dbh->quote("\n");
+    $dbh->do(
+      qq{$command INTO bugs_fulltext (bug_id, short_desc, comments, 
                                          comments_noprivate)
                    SELECT bugs.bug_id, bugs.short_desc, }
-                 . $dbh->sql_group_concat('longdescs.thetext', $newline, 0)
-          . ', ' . $dbh->sql_group_concat('nopriv.thetext',    $newline, 0) .
-                 qq{ FROM bugs 
+        . $dbh->sql_group_concat('longdescs.thetext', $newline, 0) . ', '
+        . $dbh->sql_group_concat('nopriv.thetext',    $newline, 0)
+        . qq{ FROM bugs 
                           LEFT JOIN longdescs
                                  ON bugs.bug_id = longdescs.bug_id
                           LEFT JOIN longdescs AS nopriv
                                  ON longdescs.comment_id = nopriv.comment_id
                                     AND nopriv.isprivate = 0 
                      $where }
-                 . $dbh->sql_group_by('bugs.bug_id', 'bugs.short_desc'));
-    }
+        . $dbh->sql_group_by('bugs.bug_id', 'bugs.short_desc')
+    );
+  }
 }
 
 sub _fix_illegal_flag_modification_dates {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    my $rows = $dbh->do('UPDATE flags SET modification_date = creation_date
-                         WHERE modification_date < creation_date');
-    # If no rows are affected, $dbh->do returns 0E0 instead of 0.
-    print "$rows flags had an illegal modification date. Fixed!\n" if ($rows =~ /^\d+$/);
+  my $rows = $dbh->do(
+    'UPDATE flags SET modification_date = creation_date
+                         WHERE modification_date < creation_date'
+  );
+
+  # If no rows are affected, $dbh->do returns 0E0 instead of 0.
+  print "$rows flags had an illegal modification date. Fixed!\n"
+    if ($rows =~ /^\d+$/);
 }
 
 sub _add_visiblity_value_to_value_tables {
-    my $dbh = Bugzilla->dbh;
-    my @standard_fields = 
-        qw(bug_status resolution priority bug_severity op_sys rep_platform);
-    my $custom_fields = $dbh->selectcol_arrayref(
-        'SELECT name FROM fielddefs WHERE custom = 1 AND type IN(?,?)',
-        undef, FIELD_TYPE_SINGLE_SELECT, FIELD_TYPE_MULTI_SELECT);
-    foreach my $field (@standard_fields, @$custom_fields) {
-        $dbh->bz_add_column($field, 'visibility_value_id', {TYPE => 'INT2'});
-        $dbh->bz_add_index($field, "${field}_visibility_value_id_idx",
-                           ['visibility_value_id']);
-    }
+  my $dbh = Bugzilla->dbh;
+  my @standard_fields
+    = qw(bug_status resolution priority bug_severity op_sys rep_platform);
+  my $custom_fields
+    = $dbh->selectcol_arrayref(
+    'SELECT name FROM fielddefs WHERE custom = 1 AND type IN(?,?)',
+    undef, FIELD_TYPE_SINGLE_SELECT, FIELD_TYPE_MULTI_SELECT);
+  foreach my $field (@standard_fields, @$custom_fields) {
+    $dbh->bz_add_column($field, 'visibility_value_id', {TYPE => 'INT2'});
+    $dbh->bz_add_index($field, "${field}_visibility_value_id_idx",
+      ['visibility_value_id']);
+  }
 }
 
 sub _add_extern_id_index {
-    my $dbh = Bugzilla->dbh;
-    if (!$dbh->bz_index_info('profiles', 'profiles_extern_id_idx')) {
-        # Some Bugzillas have a multiple empty strings in extern_id,
-        # which need to be converted to NULLs before we add the index.
-        $dbh->do("UPDATE profiles SET extern_id = NULL WHERE extern_id = ''");
-        $dbh->bz_add_index('profiles', 'profiles_extern_id_idx',
-                           {TYPE => 'UNIQUE', FIELDS => [qw(extern_id)]});
-    }
+  my $dbh = Bugzilla->dbh;
+  if (!$dbh->bz_index_info('profiles', 'profiles_extern_id_idx')) {
+
+    # Some Bugzillas have a multiple empty strings in extern_id,
+    # which need to be converted to NULLs before we add the index.
+    $dbh->do("UPDATE profiles SET extern_id = NULL WHERE extern_id = ''");
+    $dbh->bz_add_index('profiles', 'profiles_extern_id_idx',
+      {TYPE => 'UNIQUE', FIELDS => [qw(extern_id)]});
+  }
 }
 
 sub _convert_disallownew_to_isactive {
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->bz_column_info('products', 'disallownew')){
-        $dbh->bz_add_column('products', 'isactive', 
-                            { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-        
-        # isactive is the boolean reverse of disallownew.
-        $dbh->do('UPDATE products SET isactive = 0 WHERE disallownew = 1');
-        $dbh->do('UPDATE products SET isactive = 1 WHERE disallownew = 0');
-        
-        $dbh->bz_drop_column('products','disallownew');
-    }
+  my $dbh = Bugzilla->dbh;
+  if ($dbh->bz_column_info('products', 'disallownew')) {
+    $dbh->bz_add_column('products', 'isactive',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+
+    # isactive is the boolean reverse of disallownew.
+    $dbh->do('UPDATE products SET isactive = 0 WHERE disallownew = 1');
+    $dbh->do('UPDATE products SET isactive = 1 WHERE disallownew = 0');
+
+    $dbh->bz_drop_column('products', 'disallownew');
+  }
 }
 
 sub _fix_logincookies_ipaddr {
-    my $dbh = Bugzilla->dbh;
-    return if !$dbh->bz_column_info('logincookies', 'ipaddr')->{NOTNULL};
+  my $dbh = Bugzilla->dbh;
+  return if !$dbh->bz_column_info('logincookies', 'ipaddr')->{NOTNULL};
 
-    $dbh->bz_alter_column('logincookies', 'ipaddr', {TYPE => 'varchar(40)'});
-    $dbh->do('UPDATE logincookies SET ipaddr = NULL WHERE ipaddr = ?',
-             undef, '0.0.0.0');
+  $dbh->bz_alter_column('logincookies', 'ipaddr', {TYPE => 'varchar(40)'});
+  $dbh->do('UPDATE logincookies SET ipaddr = NULL WHERE ipaddr = ?',
+    undef, '0.0.0.0');
 }
 
 sub _fix_invalid_custom_field_names {
-    my $fields = Bugzilla->fields({ custom => 1 });
+  my $fields = Bugzilla->fields({custom => 1});
 
-    foreach my $field (@$fields) {
-        next if $field->name =~ /^[a-zA-Z0-9_]+$/;
-        # The field name is illegal and can break the DB. Kill the field!
-        $field->set_obsolete(1);
-        print install_string('update_cf_invalid_name',
-                             { field => $field->name }), "\n";
-        eval { $field->remove_from_db(); };
-        warn $@ if $@;
-    }
+  foreach my $field (@$fields) {
+    next if $field->name =~ /^[a-zA-Z0-9_]+$/;
+
+    # The field name is illegal and can break the DB. Kill the field!
+    $field->set_obsolete(1);
+    print install_string('update_cf_invalid_name', {field => $field->name}), "\n";
+    eval { $field->remove_from_db(); };
+    warn $@ if $@;
+  }
 }
 
 sub _set_attachment_comment_type {
-    my ($type, $string) = @_;
-    my $dbh = Bugzilla->dbh;
-    # We check if there are any comments of this type already, first, 
-    # because this is faster than a full LIKE search on the comments,
-    # and currently this will run every time we run checksetup.
-    my $test = $dbh->selectrow_array(
-        "SELECT 1 FROM longdescs WHERE type = $type " . $dbh->sql_limit(1));
-    return [] if $test;
-    my %comments = @{ $dbh->selectcol_arrayref(
-        "SELECT comment_id, thetext FROM longdescs
-          WHERE thetext LIKE '$string%'", 
-        {Columns=>[1,2]}) };
-    my @comment_ids = keys %comments;
-    return [] if !scalar @comment_ids;
-    my $what = "update";
+  my ($type, $string) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # We check if there are any comments of this type already, first,
+  # because this is faster than a full LIKE search on the comments,
+  # and currently this will run every time we run checksetup.
+  my $test = $dbh->selectrow_array(
+    "SELECT 1 FROM longdescs WHERE type = $type " . $dbh->sql_limit(1));
+  return [] if $test;
+  my %comments = @{
+    $dbh->selectcol_arrayref(
+      "SELECT comment_id, thetext FROM longdescs
+          WHERE thetext LIKE '$string%'", {Columns => [1, 2]}
+    )
+  };
+  my @comment_ids = keys %comments;
+  return [] if !scalar @comment_ids;
+  my $what = "update";
+  if ($type == CMT_ATTACHMENT_CREATED) {
+    $what = "creation";
+  }
+  print "Setting the type field on attachment $what comments...\n";
+  my $sth = $dbh->prepare(
+    'UPDATE longdescs SET thetext = ?, type = ?, extra_data = ?
+          WHERE comment_id = ?'
+  );
+  my $count = 0;
+  my $total = scalar @comment_ids;
+  foreach my $id (@comment_ids) {
+    $count++;
+    my $text = $comments{$id};
+    next if $text !~ /^\Q$string\E(\d+)/;
+    my $attachment_id = $1;
+    my @lines = split("\n", $text);
     if ($type == CMT_ATTACHMENT_CREATED) {
-        $what = "creation";
+
+      # Now we have to remove the text up until we find a line that's
+      # just a single newline, because the old "Created an attachment"
+      # text included the attachment description underneath it, and in
+      # Bugzillas before 2.20, that could be wrapped into multiple lines,
+      # in the database.
+      while (1) {
+        my $line = shift @lines;
+        last if (!defined $line or trim($line) eq '');
+      }
     }
-    print "Setting the type field on attachment $what comments...\n";
-    my $sth = $dbh->prepare(
-        'UPDATE longdescs SET thetext = ?, type = ?, extra_data = ?
-          WHERE comment_id = ?');
-    my $count = 0;
-    my $total = scalar @comment_ids;
-    foreach my $id (@comment_ids) {
-        $count++;
-        my $text = $comments{$id};
-        next if $text !~ /^\Q$string\E(\d+)/;
-        my $attachment_id = $1;
-        my @lines = split("\n", $text);
-        if ($type == CMT_ATTACHMENT_CREATED) {
-            # Now we have to remove the text up until we find a line that's
-            # just a single newline, because the old "Created an attachment"
-            # text included the attachment description underneath it, and in
-            # Bugzillas before 2.20, that could be wrapped into multiple lines,
-            # in the database.
-            while (1) {
-                my $line = shift @lines;
-                last if (!defined $line or trim($line) eq '');
-            }
-        }
-        else {
-            # However, the "From update of attachment" line is always just
-            # one line--the first line of the comment.
-            shift @lines;
-        }
-        $text = join("\n", @lines);
-        $sth->execute($text, $type, $attachment_id, $id);
-        indicate_progress({ total => $total, current => $count, 
-                            every => 25 });
+    else {
+      # However, the "From update of attachment" line is always just
+      # one line--the first line of the comment.
+      shift @lines;
     }
-    return \@comment_ids;
+    $text = join("\n", @lines);
+    $sth->execute($text, $type, $attachment_id, $id);
+    indicate_progress({total => $total, current => $count, every => 25});
+  }
+  return \@comment_ids;
 }
 
 sub _set_attachment_comment_types {
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    my $created_ids = _set_attachment_comment_type(
-        CMT_ATTACHMENT_CREATED, 'Created an attachment (id=');
-    my $updated_ids = _set_attachment_comment_type(
-        CMT_ATTACHMENT_UPDATED, '(From update of attachment ');
-    $dbh->bz_commit_transaction();
-    return unless (@$created_ids or @$updated_ids);
-
-    my @comment_ids = (@$created_ids, @$updated_ids);
-
-    my $bug_ids = $dbh->selectcol_arrayref(
-        'SELECT DISTINCT bug_id FROM longdescs WHERE '
-        . $dbh->sql_in('comment_id', \@comment_ids));
-    _populate_bugs_fulltext($bug_ids);
+  my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  my $created_ids = _set_attachment_comment_type(CMT_ATTACHMENT_CREATED,
+    'Created an attachment (id=');
+  my $updated_ids = _set_attachment_comment_type(CMT_ATTACHMENT_UPDATED,
+    '(From update of attachment ');
+  $dbh->bz_commit_transaction();
+  return unless (@$created_ids or @$updated_ids);
+
+  my @comment_ids = (@$created_ids, @$updated_ids);
+
+  my $bug_ids
+    = $dbh->selectcol_arrayref('SELECT DISTINCT bug_id FROM longdescs WHERE '
+      . $dbh->sql_in('comment_id', \@comment_ids));
+  _populate_bugs_fulltext($bug_ids);
 }
 
 sub _add_allows_unconfirmed_to_product_table {
-    my $dbh = Bugzilla->dbh;
-    if (!$dbh->bz_column_info('products', 'allows_unconfirmed')) {
-        $dbh->bz_add_column('products', 'allows_unconfirmed',
-            { TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE' });
-        if ($dbh->bz_column_info('products', 'votestoconfirm')) {
-            $dbh->do('UPDATE products SET allows_unconfirmed = 1 
-                       WHERE votestoconfirm > 0');
-        }
+  my $dbh = Bugzilla->dbh;
+  if (!$dbh->bz_column_info('products', 'allows_unconfirmed')) {
+    $dbh->bz_add_column('products', 'allows_unconfirmed',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
+    if ($dbh->bz_column_info('products', 'votestoconfirm')) {
+      $dbh->do(
+        'UPDATE products SET allows_unconfirmed = 1 
+                       WHERE votestoconfirm > 0'
+      );
     }
+  }
 }
 
 sub _convert_flagtypes_fks_to_set_null {
-    my $dbh = Bugzilla->dbh;
-    foreach my $column (qw(request_group_id grant_group_id)) {
-        my $fk = $dbh->bz_fk_info('flagtypes', $column);
-        if ($fk and !defined $fk->{DELETE}) {
-            $fk->{DELETE} = 'SET NULL';
-            $dbh->bz_alter_fk('flagtypes', $column, $fk);
-        }
+  my $dbh = Bugzilla->dbh;
+  foreach my $column (qw(request_group_id grant_group_id)) {
+    my $fk = $dbh->bz_fk_info('flagtypes', $column);
+    if ($fk and !defined $fk->{DELETE}) {
+      $fk->{DELETE} = 'SET NULL';
+      $dbh->bz_alter_fk('flagtypes', $column, $fk);
     }
+  }
 }
 
 sub _fix_decimal_types {
-    my $dbh = Bugzilla->dbh;
-    my $type = {TYPE => 'decimal(7,2)', NOTNULL => 1, DEFAULT => '0'};
-    $dbh->bz_alter_column('bugs', 'estimated_time', $type);
-    $dbh->bz_alter_column('bugs', 'remaining_time', $type);
-    $dbh->bz_alter_column('longdescs', 'work_time', $type);
+  my $dbh = Bugzilla->dbh;
+  my $type = {TYPE => 'decimal(7,2)', NOTNULL => 1, DEFAULT => '0'};
+  $dbh->bz_alter_column('bugs',      'estimated_time', $type);
+  $dbh->bz_alter_column('bugs',      'remaining_time', $type);
+  $dbh->bz_alter_column('longdescs', 'work_time',      $type);
 }
 
 sub _fix_series_creator_fk {
-    my $dbh = Bugzilla->dbh;
-    my $fk = $dbh->bz_fk_info('series', 'creator');
-    if ($fk and $fk->{DELETE} eq 'SET NULL') {
-        $fk->{DELETE} = 'CASCADE';
-        $dbh->bz_alter_fk('series', 'creator', $fk);
-    }
+  my $dbh = Bugzilla->dbh;
+  my $fk = $dbh->bz_fk_info('series', 'creator');
+  if ($fk and $fk->{DELETE} eq 'SET NULL') {
+    $fk->{DELETE} = 'CASCADE';
+    $dbh->bz_alter_fk('series', 'creator', $fk);
+  }
 }
 
 sub _remove_attachment_isurl {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    if ($dbh->bz_column_info('attachments', 'isurl')) {
-        # Now all attachments must have a filename.
-        $dbh->do('UPDATE attachments SET filename = ? WHERE isurl = 1',
-                 undef, 'url.txt');
-        $dbh->bz_drop_column('attachments', 'isurl');
-        $dbh->do("DELETE FROM fielddefs WHERE name='attachments.isurl'");
-    }
+  if ($dbh->bz_column_info('attachments', 'isurl')) {
+
+    # Now all attachments must have a filename.
+    $dbh->do('UPDATE attachments SET filename = ? WHERE isurl = 1',
+      undef, 'url.txt');
+    $dbh->bz_drop_column('attachments', 'isurl');
+    $dbh->do("DELETE FROM fielddefs WHERE name='attachments.isurl'");
+  }
 }
 
 sub _add_isactive_to_product_fields {
-    my $dbh = Bugzilla->dbh;
-
-    # If we add the isactive column all values should start off as active
-    if (!$dbh->bz_column_info('components', 'isactive')) {
-        $dbh->bz_add_column('components', 'isactive', 
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-    }
-    
-    if (!$dbh->bz_column_info('versions', 'isactive')) {
-        $dbh->bz_add_column('versions', 'isactive', 
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-    }
-
-    if (!$dbh->bz_column_info('milestones', 'isactive')) {
-        $dbh->bz_add_column('milestones', 'isactive', 
-            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # If we add the isactive column all values should start off as active
+  if (!$dbh->bz_column_info('components', 'isactive')) {
+    $dbh->bz_add_column('components', 'isactive',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+  }
+
+  if (!$dbh->bz_column_info('versions', 'isactive')) {
+    $dbh->bz_add_column('versions', 'isactive',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+  }
+
+  if (!$dbh->bz_column_info('milestones', 'isactive')) {
+    $dbh->bz_add_column('milestones', 'isactive',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+  }
 }
 
 sub _migrate_field_visibility_value {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    if ($dbh->bz_column_info('fielddefs', 'visibility_value_id')) {
-        print "Populating new field_visibility table...\n";
+  if ($dbh->bz_column_info('fielddefs', 'visibility_value_id')) {
+    print "Populating new field_visibility table...\n";
 
-        $dbh->bz_start_transaction();
-
-        my %results =
-            @{ $dbh->selectcol_arrayref(
-                "SELECT id, visibility_value_id FROM fielddefs
-                 WHERE visibility_value_id IS NOT NULL",
-               { Columns => [1,2] }) };
+    $dbh->bz_start_transaction();
 
-        my $insert_sth =
-            $dbh->prepare("INSERT INTO field_visibility (field_id, value_id)
-                           VALUES (?, ?)");
+    my %results = @{
+      $dbh->selectcol_arrayref(
+        "SELECT id, visibility_value_id FROM fielddefs
+                 WHERE visibility_value_id IS NOT NULL", {Columns => [1, 2]}
+      )
+    };
 
-        foreach my $id (keys %results) {
-            $insert_sth->execute($id, $results{$id});
-        }
+    my $insert_sth = $dbh->prepare(
+      "INSERT INTO field_visibility (field_id, value_id)
+                           VALUES (?, ?)"
+    );
 
-        $dbh->bz_commit_transaction();
-        $dbh->bz_drop_column('fielddefs', 'visibility_value_id');
+    foreach my $id (keys %results) {
+      $insert_sth->execute($id, $results{$id});
     }
+
+    $dbh->bz_commit_transaction();
+    $dbh->bz_drop_column('fielddefs', 'visibility_value_id');
+  }
 }
 
 sub _fix_series_indexes {
-    my $dbh = Bugzilla->dbh;
-    return if $dbh->bz_index_info('series', 'series_category_idx');
+  my $dbh = Bugzilla->dbh;
+  return if $dbh->bz_index_info('series', 'series_category_idx');
 
-    $dbh->bz_drop_index('series', 'series_creator_idx');
+  $dbh->bz_drop_index('series', 'series_creator_idx');
 
-    # Fix duplicated names under the same category/subcategory before
-    # adding the more restrictive index.
-    my $duplicated_series = $dbh->selectall_arrayref(
-         'SELECT s1.series_id, s1.category, s1.subcategory, s1.name
+  # Fix duplicated names under the same category/subcategory before
+  # adding the more restrictive index.
+  my $duplicated_series = $dbh->selectall_arrayref(
+    'SELECT s1.series_id, s1.category, s1.subcategory, s1.name
             FROM series AS s1
       INNER JOIN series AS s2
               ON s1.category = s2.category
              AND s1.subcategory = s2.subcategory
              AND s1.name = s2.name
-           WHERE s1.series_id != s2.series_id');
-    my $sth_series_update = $dbh->prepare('UPDATE series SET name = ? WHERE series_id = ?');
-    my $sth_series_query = $dbh->prepare('SELECT 1 FROM series WHERE name = ?
-                                          AND category = ? AND subcategory = ?');
-
-    my %renamed_series;
-    foreach my $series (@$duplicated_series) {
-        my ($series_id, $category, $subcategory, $name) = @$series;
-        # Leave the first series alone, then rename duplicated ones.
-        if ($renamed_series{"${category}_${subcategory}_${name}"}++) {
-            print "Renaming series ${category}/${subcategory}/${name}...\n";
-            my $c = 0;
-            my $exists = 1;
-            while ($exists) {
-                $sth_series_query->execute($name . ++$c, $category, $subcategory);
-                $exists = $sth_series_query->fetchrow_array;
-            }
-            $sth_series_update->execute($name . $c, $series_id);
-        }
+           WHERE s1.series_id != s2.series_id'
+  );
+  my $sth_series_update
+    = $dbh->prepare('UPDATE series SET name = ? WHERE series_id = ?');
+  my $sth_series_query = $dbh->prepare(
+    'SELECT 1 FROM series WHERE name = ?
+                                          AND category = ? AND subcategory = ?'
+  );
+
+  my %renamed_series;
+  foreach my $series (@$duplicated_series) {
+    my ($series_id, $category, $subcategory, $name) = @$series;
+
+    # Leave the first series alone, then rename duplicated ones.
+    if ($renamed_series{"${category}_${subcategory}_${name}"}++) {
+      print "Renaming series ${category}/${subcategory}/${name}...\n";
+      my $c      = 0;
+      my $exists = 1;
+      while ($exists) {
+        $sth_series_query->execute($name . ++$c, $category, $subcategory);
+        $exists = $sth_series_query->fetchrow_array;
+      }
+      $sth_series_update->execute($name . $c, $series_id);
     }
+  }
 
-    $dbh->bz_add_index('series', 'series_creator_idx', ['creator']);
-    $dbh->bz_add_index('series', 'series_category_idx',
-        {FIELDS => [qw(category subcategory name)], TYPE => 'UNIQUE'});
+  $dbh->bz_add_index('series', 'series_creator_idx', ['creator']);
+  $dbh->bz_add_index('series', 'series_category_idx',
+    {FIELDS => [qw(category subcategory name)], TYPE => 'UNIQUE'});
 }
 
 sub _migrate_user_tags {
-    my $dbh = Bugzilla->dbh;
-    return unless $dbh->bz_column_info('namedqueries', 'query_type');
+  my $dbh = Bugzilla->dbh;
+  return unless $dbh->bz_column_info('namedqueries', 'query_type');
 
-    my $tags = $dbh->selectall_arrayref('SELECT id, userid, name, query
+  my $tags = $dbh->selectall_arrayref(
+    'SELECT id, userid, name, query
                                            FROM namedqueries
-                                          WHERE query_type != 0');
-
-    my $sth_tags = $dbh->prepare(
-        'INSERT INTO tag (user_id, name) VALUES (?, ?)');
-    my $sth_tag_id = $dbh->prepare(
-        'SELECT id FROM tag WHERE user_id = ? AND name = ?');
-    my $sth_bug_tag = $dbh->prepare('INSERT INTO bug_tag (bug_id, tag_id)
-                                     VALUES (?, ?)');
-    my $sth_nq = $dbh->prepare('UPDATE namedqueries SET query = ?
-                                WHERE id = ?');
-
-    if (scalar @$tags) {
-        print install_string('update_queries_to_tags'), "\n";
+                                          WHERE query_type != 0'
+  );
+
+  my $sth_tags = $dbh->prepare('INSERT INTO tag (user_id, name) VALUES (?, ?)');
+  my $sth_tag_id
+    = $dbh->prepare('SELECT id FROM tag WHERE user_id = ? AND name = ?');
+  my $sth_bug_tag = $dbh->prepare(
+    'INSERT INTO bug_tag (bug_id, tag_id)
+                                     VALUES (?, ?)'
+  );
+  my $sth_nq = $dbh->prepare(
+    'UPDATE namedqueries SET query = ?
+                                WHERE id = ?'
+  );
+
+  if (scalar @$tags) {
+    print install_string('update_queries_to_tags'), "\n";
+  }
+
+  my $total   = scalar(@$tags);
+  my $current = 0;
+
+  $dbh->bz_start_transaction();
+  foreach my $tag (@$tags) {
+    my ($query_id, $user_id, $name, $query) = @$tag;
+
+    # Tags are all lowercase.
+    my $tag_name = lc($name);
+
+    $sth_tags->execute($user_id, $tag_name);
+
+    my $tag_id = $dbh->selectrow_array($sth_tag_id, undef, $user_id, $tag_name);
+
+    indicate_progress({current => ++$current, total => $total, every => 25});
+
+    my $uri = URI->new("buglist.cgi?$query", 'http');
+    my $bug_id_list = $uri->query_param_delete('bug_id');
+    if (!$bug_id_list) {
+      warn "No bug_id param for tag $name from user $user_id: $query";
+      next;
     }
+    my @bug_ids = split(/[\s,]+/, $bug_id_list);
 
-    my $total = scalar(@$tags);
-    my $current = 0;
+    # Make sure that things like "001" get converted to "1"
+    @bug_ids = map { int($_) } @bug_ids;
 
-    $dbh->bz_start_transaction();
-    foreach my $tag (@$tags) {
-        my ($query_id, $user_id, $name, $query) = @$tag;
-        # Tags are all lowercase.
-        my $tag_name = lc($name);
-
-        $sth_tags->execute($user_id, $tag_name);
-
-        my $tag_id = $dbh->selectrow_array($sth_tag_id,
-            undef, $user_id, $tag_name);
-
-        indicate_progress({ current => ++$current, total => $total,
-                            every => 25 });
-
-        my $uri = URI->new("buglist.cgi?$query", 'http');
-        my $bug_id_list = $uri->query_param_delete('bug_id');
-        if (!$bug_id_list) {
-            warn "No bug_id param for tag $name from user $user_id: $query";
-            next;
-        }
-        my @bug_ids = split(/[\s,]+/, $bug_id_list);
-        # Make sure that things like "001" get converted to "1"
-        @bug_ids = map { int($_) } @bug_ids;
-        # And remove duplicates
-        @bug_ids = uniq @bug_ids;
-        foreach my $bug_id (@bug_ids) {
-            # If "int" above failed this might be undef. We also
-            # don't want to accept bug 0.
-            next if !$bug_id;
-            $sth_bug_tag->execute($bug_id, $tag_id);
-        }
+    # And remove duplicates
+    @bug_ids = uniq @bug_ids;
+    foreach my $bug_id (@bug_ids) {
 
-        # Existing tags may be used in whines, or shared with
-        # other users. So we convert them rather than delete them.
-        $uri->query_param('tag', $tag_name);
-        $sth_nq->execute($uri->query, $query_id);
+      # If "int" above failed this might be undef. We also
+      # don't want to accept bug 0.
+      next if !$bug_id;
+      $sth_bug_tag->execute($bug_id, $tag_id);
     }
 
-    $dbh->bz_commit_transaction();
+    # Existing tags may be used in whines, or shared with
+    # other users. So we convert them rather than delete them.
+    $uri->query_param('tag', $tag_name);
+    $sth_nq->execute($uri->query, $query_id);
+  }
+
+  $dbh->bz_commit_transaction();
 
-    $dbh->bz_drop_column('namedqueries', 'query_type');
+  $dbh->bz_drop_column('namedqueries', 'query_type');
 }
 
 sub _populate_bug_see_also_class {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    if ($dbh->bz_column_info('bug_see_also', 'class')) {
-        # The length was incorrectly set to 64 instead of 255.
-        $dbh->bz_alter_column('bug_see_also', 'class',
-                {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"});
-        return;
-    }
+  if ($dbh->bz_column_info('bug_see_also', 'class')) {
 
-    $dbh->bz_add_column('bug_see_also', 'class',
-        {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}, '');
+    # The length was incorrectly set to 64 instead of 255.
+    $dbh->bz_alter_column('bug_see_also', 'class',
+      {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"});
+    return;
+  }
 
-    my $result = $dbh->selectall_arrayref(
-        "SELECT id, value FROM bug_see_also");
+  $dbh->bz_add_column('bug_see_also', 'class',
+    {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}, '');
 
-    my $update_sth =
-        $dbh->prepare("UPDATE bug_see_also SET class = ? WHERE id = ?");
-    
-    $dbh->bz_start_transaction();
-    foreach my $see_also (@$result) {
-        my ($id, $value) = @$see_also;
-        my $class = Bugzilla::BugUrl->class_for($value);
-        $update_sth->execute($class, $id);
-    }
-    $dbh->bz_commit_transaction();
+  my $result = $dbh->selectall_arrayref("SELECT id, value FROM bug_see_also");
+
+  my $update_sth
+    = $dbh->prepare("UPDATE bug_see_also SET class = ? WHERE id = ?");
+
+  $dbh->bz_start_transaction();
+  foreach my $see_also (@$result) {
+    my ($id, $value) = @$see_also;
+    my $class = Bugzilla::BugUrl->class_for($value);
+    $update_sth->execute($class, $id);
+  }
+  $dbh->bz_commit_transaction();
 }
 
 sub _migrate_disabledtext_boolean {
-    my $dbh = Bugzilla->dbh;
-    if (!$dbh->bz_column_info('profiles', 'is_enabled')) {
-        $dbh->bz_add_column("profiles", 'is_enabled',
-                            {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
-        $dbh->do("UPDATE profiles SET is_enabled = 0 
-                  WHERE disabledtext != ''");
-    }
+  my $dbh = Bugzilla->dbh;
+  if (!$dbh->bz_column_info('profiles', 'is_enabled')) {
+    $dbh->bz_add_column("profiles", 'is_enabled',
+      {TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'TRUE'});
+    $dbh->do(
+      "UPDATE profiles SET is_enabled = 0 
+                  WHERE disabledtext != ''"
+    );
+  }
 }
 
 sub _rename_tags_to_tag {
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->bz_table_info('tags')) {
-        # If we get here, it's because the schema created "tag" as an empty
-        # table while "tags" still exists. We get rid of the empty
-        # tag table so we can do the rename over the top of it.
-        $dbh->bz_drop_table('tag');
-        $dbh->bz_drop_index('tags', 'tags_user_id_idx');
-        $dbh->bz_rename_table('tags','tag');
-        $dbh->bz_add_index('tag', 'tag_user_id_idx',
-                           {FIELDS => [qw(user_id name)], TYPE => 'UNIQUE'});
-    }
-    if (my $bug_tag_fk = $dbh->bz_fk_info('bug_tag', 'tag_id')) {
-        # bz_rename_table() didn't handle FKs correctly.
-        if ($bug_tag_fk->{TABLE} eq 'tags') {
-            $bug_tag_fk->{TABLE} = 'tag';
-            $dbh->bz_alter_fk('bug_tag', 'tag_id', $bug_tag_fk);
-        }
+  my $dbh = Bugzilla->dbh;
+  if ($dbh->bz_table_info('tags')) {
+
+    # If we get here, it's because the schema created "tag" as an empty
+    # table while "tags" still exists. We get rid of the empty
+    # tag table so we can do the rename over the top of it.
+    $dbh->bz_drop_table('tag');
+    $dbh->bz_drop_index('tags', 'tags_user_id_idx');
+    $dbh->bz_rename_table('tags', 'tag');
+    $dbh->bz_add_index('tag', 'tag_user_id_idx',
+      {FIELDS => [qw(user_id name)], TYPE => 'UNIQUE'});
+  }
+  if (my $bug_tag_fk = $dbh->bz_fk_info('bug_tag', 'tag_id')) {
+
+    # bz_rename_table() didn't handle FKs correctly.
+    if ($bug_tag_fk->{TABLE} eq 'tags') {
+      $bug_tag_fk->{TABLE} = 'tag';
+      $dbh->bz_alter_fk('bug_tag', 'tag_id', $bug_tag_fk);
     }
+  }
 }
 
 sub _on_delete_set_null_for_audit_log_userid {
-    my $dbh = Bugzilla->dbh;
-    my $fk = $dbh->bz_fk_info('audit_log', 'user_id');
-    if ($fk and !defined $fk->{DELETE}) {
-        $fk->{DELETE} = 'SET NULL';
-        $dbh->bz_alter_fk('audit_log', 'user_id', $fk);
-    }
+  my $dbh = Bugzilla->dbh;
+  my $fk = $dbh->bz_fk_info('audit_log', 'user_id');
+  if ($fk and !defined $fk->{DELETE}) {
+    $fk->{DELETE} = 'SET NULL';
+    $dbh->bz_alter_fk('audit_log', 'user_id', $fk);
+  }
 }
 
 sub _fix_notnull_defaults {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    $dbh->bz_alter_column('bugs', 'bug_file_loc', 
-                          {TYPE => 'MEDIUMTEXT', NOTNULL => 1,  
-                           DEFAULT => "''"}, '');
+  $dbh->bz_alter_column('bugs', 'bug_file_loc',
+    {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"}, '');
 
-    my $custom_fields = Bugzilla::Field->match({ 
-        custom => 1, type => [ FIELD_TYPE_FREETEXT, FIELD_TYPE_TEXTAREA ] 
+  my $custom_fields
+    = Bugzilla::Field->match({
+    custom => 1, type => [FIELD_TYPE_FREETEXT, FIELD_TYPE_TEXTAREA]
     });
 
-    foreach my $field (@$custom_fields) {
-        if ($field->type == FIELD_TYPE_FREETEXT) {
-            $dbh->bz_alter_column('bugs', $field->name,
-                                  {TYPE => 'varchar(255)', NOTNULL => 1,
-                                   DEFAULT => "''"}, '');
-        }
-        if ($field->type == FIELD_TYPE_TEXTAREA) {
-            $dbh->bz_alter_column('bugs', $field->name,
-                                  {TYPE => 'MEDIUMTEXT', NOTNULL => 1,
-                                   DEFAULT => "''"}, '');
-        }
+  foreach my $field (@$custom_fields) {
+    if ($field->type == FIELD_TYPE_FREETEXT) {
+      $dbh->bz_alter_column('bugs', $field->name,
+        {TYPE => 'varchar(255)', NOTNULL => 1, DEFAULT => "''"}, '');
+    }
+    if ($field->type == FIELD_TYPE_TEXTAREA) {
+      $dbh->bz_alter_column('bugs', $field->name,
+        {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => "''"}, '');
     }
+  }
 }
 
 sub _fix_longdescs_primary_key {
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->bz_column_info('longdescs', 'comment_id')->{TYPE} ne 'INTSERIAL') {
-        $dbh->bz_drop_related_fks('longdescs', 'comment_id');
-        $dbh->bz_alter_column('bugs_activity', 'comment_id', {TYPE => 'INT4'});
-        $dbh->bz_alter_column('longdescs', 'comment_id',
-                              {TYPE => 'INTSERIAL',  NOTNULL => 1,  PRIMARYKEY => 1});
-    }
+  my $dbh = Bugzilla->dbh;
+  if ($dbh->bz_column_info('longdescs', 'comment_id')->{TYPE} ne 'INTSERIAL') {
+    $dbh->bz_drop_related_fks('longdescs', 'comment_id');
+    $dbh->bz_alter_column('bugs_activity', 'comment_id', {TYPE => 'INT4'});
+    $dbh->bz_alter_column('longdescs', 'comment_id',
+      {TYPE => 'INTSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+  }
 }
 
 sub _fix_longdescs_indexes {
-    my $dbh = Bugzilla->dbh;
-    my $bug_id_idx = $dbh->bz_index_info('longdescs', 'longdescs_bug_id_idx');
-    if ($bug_id_idx && scalar @{$bug_id_idx->{'FIELDS'}} < 2) {
-        $dbh->bz_drop_index('longdescs', 'longdescs_bug_id_idx');
-        $dbh->bz_add_index('longdescs', 'longdescs_bug_id_idx', [qw(bug_id work_time)]);
-    }
+  my $dbh = Bugzilla->dbh;
+  my $bug_id_idx = $dbh->bz_index_info('longdescs', 'longdescs_bug_id_idx');
+  if ($bug_id_idx && scalar @{$bug_id_idx->{'FIELDS'}} < 2) {
+    $dbh->bz_drop_index('longdescs', 'longdescs_bug_id_idx');
+    $dbh->bz_add_index('longdescs', 'longdescs_bug_id_idx', [qw(bug_id work_time)]);
+  }
 }
 
 sub _fix_dependencies_dupes {
-    my $dbh = Bugzilla->dbh;
-    my $blocked_idx = $dbh->bz_index_info('dependencies', 'dependencies_blocked_idx');
-    if ($blocked_idx && scalar @{$blocked_idx->{'FIELDS'}} < 2) {
-        # Remove duplicated entries
-        my $dupes = $dbh->selectall_arrayref("
+  my $dbh = Bugzilla->dbh;
+  my $blocked_idx
+    = $dbh->bz_index_info('dependencies', 'dependencies_blocked_idx');
+  if ($blocked_idx && scalar @{$blocked_idx->{'FIELDS'}} < 2) {
+
+    # Remove duplicated entries
+    my $dupes = $dbh->selectall_arrayref("
             SELECT blocked, dependson, COUNT(*) AS count
-              FROM dependencies " .
-            $dbh->sql_group_by('blocked, dependson') . "
-            HAVING COUNT(*) > 1",
-            { Slice => {} });
-        print "Removing duplicated entries from the 'dependencies' table...\n" if @$dupes;
-        foreach my $dupe (@$dupes) {
-            $dbh->do("DELETE FROM dependencies
-                      WHERE blocked = ? AND dependson = ?",
-                     undef, $dupe->{blocked}, $dupe->{dependson});
-            $dbh->do("INSERT INTO dependencies (blocked, dependson) VALUES (?, ?)",
-                     undef, $dupe->{blocked}, $dupe->{dependson});
-        }
-        $dbh->bz_drop_index('dependencies', 'dependencies_blocked_idx');
-        $dbh->bz_add_index('dependencies', 'dependencies_blocked_idx',
-                           { FIELDS => [qw(blocked dependson)], TYPE => 'UNIQUE' });
-    }   
+              FROM dependencies " . $dbh->sql_group_by('blocked, dependson') . "
+            HAVING COUNT(*) > 1", {Slice => {}});
+    print "Removing duplicated entries from the 'dependencies' table...\n"
+      if @$dupes;
+    foreach my $dupe (@$dupes) {
+      $dbh->do(
+        "DELETE FROM dependencies
+                      WHERE blocked = ? AND dependson = ?", undef, $dupe->{blocked},
+        $dupe->{dependson}
+      );
+      $dbh->do("INSERT INTO dependencies (blocked, dependson) VALUES (?, ?)",
+        undef, $dupe->{blocked}, $dupe->{dependson});
+    }
+    $dbh->bz_drop_index('dependencies', 'dependencies_blocked_idx');
+    $dbh->bz_add_index('dependencies', 'dependencies_blocked_idx',
+      {FIELDS => [qw(blocked dependson)], TYPE => 'UNIQUE'});
+  }
 }
 
 sub _shorten_long_quips {
-    my $dbh = Bugzilla->dbh;
-    my $quips = $dbh->selectall_arrayref("SELECT quipid, quip FROM quips
-                                          WHERE CHAR_LENGTH(quip) > 512");
-
-    if (@$quips) {
-        print "Shortening quips longer than 512 characters:";
-
-        my $query = $dbh->prepare("UPDATE quips SET quip = ? WHERE quipid = ?");
-
-        foreach my $quip (@$quips) {
-            my ($quipid, $quip_str) = @$quip;
-            $quip_str = substr($quip_str, 0, 509) . "...";
-            print " $quipid";
-            $query->execute($quip_str, $quipid);
-        }
-        print "\n";
+  my $dbh   = Bugzilla->dbh;
+  my $quips = $dbh->selectall_arrayref(
+    "SELECT quipid, quip FROM quips
+                                          WHERE CHAR_LENGTH(quip) > 512"
+  );
+
+  if (@$quips) {
+    print "Shortening quips longer than 512 characters:";
+
+    my $query = $dbh->prepare("UPDATE quips SET quip = ? WHERE quipid = ?");
+
+    foreach my $quip (@$quips) {
+      my ($quipid, $quip_str) = @$quip;
+      $quip_str = substr($quip_str, 0, 509) . "...";
+      print " $quipid";
+      $query->execute($quip_str, $quipid);
     }
-    $dbh->bz_alter_column('quips', 'quip', { TYPE => 'varchar(512)', NOTNULL => 1});
+    print "\n";
+  }
+  $dbh->bz_alter_column('quips', 'quip', {TYPE => 'varchar(512)', NOTNULL => 1});
 }
 
 sub _add_password_salt_separator {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    my $profiles = $dbh->selectall_arrayref("SELECT userid, cryptpassword FROM profiles WHERE ("
-        . $dbh->sql_regexp("cryptpassword", "'^[^,]+{'") . ")");
+  my $profiles
+    = $dbh->selectall_arrayref(
+        "SELECT userid, cryptpassword FROM profiles WHERE ("
+      . $dbh->sql_regexp("cryptpassword", "'^[^,]+{'")
+      . ")");
 
-    if (@$profiles) {
-        say "Adding salt separator to password hashes...";
+  if (@$profiles) {
+    say "Adding salt separator to password hashes...";
 
-        my $query = $dbh->prepare("UPDATE profiles SET cryptpassword = ? WHERE userid = ?");
-        my %algo_sizes;
+    my $query
+      = $dbh->prepare("UPDATE profiles SET cryptpassword = ? WHERE userid = ?");
+    my %algo_sizes;
 
-        foreach my $profile (@$profiles) {
-            my ($userid, $hash) = @$profile;
-            my ($algorithm) = $hash =~ /{([^}]+)}$/;
+    foreach my $profile (@$profiles) {
+      my ($userid, $hash) = @$profile;
+      my ($algorithm) = $hash =~ /{([^}]+)}$/;
 
-            $algo_sizes{$algorithm} ||= length(Digest->new($algorithm)->b64digest);
+      $algo_sizes{$algorithm} ||= length(Digest->new($algorithm)->b64digest);
 
-            # Calculate the salt length by taking the stored hash and
-            # subtracting the combined lengths of the hash size, the
-            # algorithm name, and 2 for the {} surrounding the name.
-            my $not_salt_len = $algo_sizes{$algorithm} + length($algorithm) + 2;
-            my $salt_len = length($hash) - $not_salt_len;
+      # Calculate the salt length by taking the stored hash and
+      # subtracting the combined lengths of the hash size, the
+      # algorithm name, and 2 for the {} surrounding the name.
+      my $not_salt_len = $algo_sizes{$algorithm} + length($algorithm) + 2;
+      my $salt_len     = length($hash) - $not_salt_len;
 
-            substr($hash, $salt_len, 0, ',');
-            $query->execute($hash, $userid);
-        }
+      substr($hash, $salt_len, 0, ',');
+      $query->execute($hash, $userid);
     }
-    $dbh->bz_commit_transaction();
+  }
+  $dbh->bz_commit_transaction();
 }
 
 sub _fix_flagclusions_indexes {
-    my $dbh = Bugzilla->dbh;
-    foreach my $table ('flaginclusions', 'flagexclusions') {
-        my $index = $table . '_type_id_idx';
-        my $idx_info = $dbh->bz_index_info($table, $index);
-        if ($idx_info && $idx_info->{'TYPE'} ne 'UNIQUE') {
-            # Remove duplicated entries
-            my $dupes = $dbh->selectall_arrayref("
+  my $dbh = Bugzilla->dbh;
+  foreach my $table ('flaginclusions', 'flagexclusions') {
+    my $index = $table . '_type_id_idx';
+    my $idx_info = $dbh->bz_index_info($table, $index);
+    if ($idx_info && $idx_info->{'TYPE'} ne 'UNIQUE') {
+
+      # Remove duplicated entries
+      my $dupes = $dbh->selectall_arrayref("
                 SELECT type_id, product_id, component_id, COUNT(*) AS count
-                  FROM $table " .
-                $dbh->sql_group_by('type_id, product_id, component_id') . "
-                HAVING COUNT(*) > 1",
-                { Slice => {} });
-            say "Removing duplicated entries from the '$table' table..." if @$dupes;
-            foreach my $dupe (@$dupes) {
-                $dbh->do("DELETE FROM $table 
+                  FROM $table "
+          . $dbh->sql_group_by('type_id, product_id, component_id') . "
+                HAVING COUNT(*) > 1", {Slice => {}});
+      say "Removing duplicated entries from the '$table' table..." if @$dupes;
+      foreach my $dupe (@$dupes) {
+        $dbh->do(
+          "DELETE FROM $table 
                           WHERE type_id = ? AND product_id = ? AND component_id = ?",
-                         undef, $dupe->{type_id}, $dupe->{product_id}, $dupe->{component_id});
-                $dbh->do("INSERT INTO $table (type_id, product_id, component_id) VALUES (?, ?, ?)",
-                         undef, $dupe->{type_id}, $dupe->{product_id}, $dupe->{component_id});
-            }
-            $dbh->bz_drop_index($table, $index);
-            $dbh->bz_add_index($table, $index,
-                { FIELDS => [qw(type_id product_id component_id)],
-                  TYPE   => 'UNIQUE' });
-        }
+          undef, $dupe->{type_id}, $dupe->{product_id}, $dupe->{component_id}
+        );
+        $dbh->do(
+          "INSERT INTO $table (type_id, product_id, component_id) VALUES (?, ?, ?)",
+          undef, $dupe->{type_id}, $dupe->{product_id}, $dupe->{component_id});
+      }
+      $dbh->bz_drop_index($table, $index);
+      $dbh->bz_add_index($table, $index,
+        {FIELDS => [qw(type_id product_id component_id)], TYPE => 'UNIQUE'});
     }
+  }
 }
 
 sub _fix_components_primary_key {
-    my $dbh = Bugzilla->dbh;
-    if ($dbh->bz_column_info('components', 'id')->{TYPE} ne 'MEDIUMSERIAL') {
-        $dbh->bz_drop_related_fks('components', 'id');
-        $dbh->bz_alter_column("components", "id",
-                              {TYPE => 'MEDIUMSERIAL',  NOTNULL => 1,  PRIMARYKEY => 1});
-        $dbh->bz_alter_column("flaginclusions", "component_id",
-                              {TYPE => 'INT3'});
-        $dbh->bz_alter_column("flagexclusions", "component_id",
-                              {TYPE => 'INT3'});
-        $dbh->bz_alter_column("bugs", "component_id",
-                              {TYPE => 'INT3', NOTNULL => 1});
-        $dbh->bz_alter_column("component_cc", "component_id",
-                              {TYPE => 'INT3', NOTNULL => 1});
-    }
+  my $dbh = Bugzilla->dbh;
+  if ($dbh->bz_column_info('components', 'id')->{TYPE} ne 'MEDIUMSERIAL') {
+    $dbh->bz_drop_related_fks('components', 'id');
+    $dbh->bz_alter_column("components", "id",
+      {TYPE => 'MEDIUMSERIAL', NOTNULL => 1, PRIMARYKEY => 1});
+    $dbh->bz_alter_column("flaginclusions", "component_id", {TYPE => 'INT3'});
+    $dbh->bz_alter_column("flagexclusions", "component_id", {TYPE => 'INT3'});
+    $dbh->bz_alter_column("bugs", "component_id", {TYPE => 'INT3', NOTNULL => 1});
+    $dbh->bz_alter_column("component_cc", "component_id",
+      {TYPE => 'INT3', NOTNULL => 1});
+  }
 }
 
 sub _fix_user_api_keys_indexes {
-    my $dbh = Bugzilla->dbh;
-
-    if ($dbh->bz_index_info('user_api_keys', 'user_api_keys_key')) {
-        $dbh->bz_drop_index('user_api_keys', 'user_api_keys_key');
-        $dbh->bz_add_index('user_api_keys', 'user_api_keys_api_key_idx',
-                           { FIELDS => ['api_key'], TYPE => 'UNIQUE' });
-    }
-    if ($dbh->bz_index_info('user_api_keys', 'user_api_keys_user_id')) {
-        $dbh->bz_drop_index('user_api_keys', 'user_api_keys_user_id');
-        $dbh->bz_add_index('user_api_keys', 'user_api_keys_user_id_idx', ['user_id']);
-    }
+  my $dbh = Bugzilla->dbh;
+
+  if ($dbh->bz_index_info('user_api_keys', 'user_api_keys_key')) {
+    $dbh->bz_drop_index('user_api_keys', 'user_api_keys_key');
+    $dbh->bz_add_index('user_api_keys', 'user_api_keys_api_key_idx',
+      {FIELDS => ['api_key'], TYPE => 'UNIQUE'});
+  }
+  if ($dbh->bz_index_info('user_api_keys', 'user_api_keys_user_id')) {
+    $dbh->bz_drop_index('user_api_keys', 'user_api_keys_user_id');
+    $dbh->bz_add_index('user_api_keys', 'user_api_keys_user_id_idx', ['user_id']);
+  }
 }
 
 sub _update_alias {
-    my $dbh = Bugzilla->dbh;
-    return unless $dbh->bz_column_info('bugs', 'alias');
+  my $dbh = Bugzilla->dbh;
+  return unless $dbh->bz_column_info('bugs', 'alias');
 
-    # We need to move the aliases from the bugs table to the bugs_aliases table
-    $dbh->do(q{
+  # We need to move the aliases from the bugs table to the bugs_aliases table
+  $dbh->do(
+    q{
         INSERT INTO bugs_aliases (bug_id, alias)
         SELECT bug_id, alias FROM bugs WHERE alias IS NOT NULL
-    });
+    }
+  );
 
-    $dbh->bz_drop_column('bugs', 'alias');
+  $dbh->bz_drop_column('bugs', 'alias');
 }
 
+sub _sanitize_audit_log_table {
+  my $dbh = Bugzilla->dbh;
+
+  # Replace hashed passwords by a generic comment.
+  my $class = 'Bugzilla::User';
+  my $field = 'cryptpassword';
+
+  my $hashed_passwd = $dbh->selectcol_arrayref(
+    'SELECT added FROM audit_log WHERE class = ? AND field = ?
+                                AND '
+      . $dbh->sql_not_ilike('hashed_with_', 'added'), undef, ($class, $field)
+  );
+  if (@$hashed_passwd) {
+    say "Sanitizing hashed passwords stored in the 'audit_log' table...";
+    my $sth = $dbh->prepare(
+      'UPDATE audit_log SET added = ?
+                                 WHERE class = ? AND field = ? AND added = ?'
+    );
+
+    foreach my $passwd (@$hashed_passwd) {
+      my (undef, $sanitized_passwd)
+        = Bugzilla::Object::_sanitize_audit_log($class, $field, [undef, $passwd]);
+      $sth->execute($sanitized_passwd, $class, $field, $passwd);
+    }
+  }
+}
+
+sub _split_login_and_email {
+  my ($old_params) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  return if $dbh->bz_column_info('profiles', 'email');
+
+  $dbh->bz_add_column('profiles', 'email',
+    {TYPE => 'varchar(255)', NOTNULL => 1}, '');
+  $dbh->do('UPDATE profiles SET email = login_name');
+
+  # This change obsoletes the 'emailsuffix' parameter. If it is in use,
+  # append it to all the values in the 'email' column.
+  my $suffix = $old_params->{'emailsuffix'};
+  if ($suffix) {
+    $dbh->do('UPDATE profiles SET email = ' . $dbh->sql_string_concat('email', '?'),
+      undef, $suffix);
+  }
+
+  $dbh->bz_add_index('profiles', 'profiles_email_idx',
+    {TYPE => 'UNIQUE', FIELDS => ['email']});
+}
+
+
 1;
 
 __END__
diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm
index 061ca53c72..167218a5e3 100644
--- a/Bugzilla/Install/Filesystem.pm
+++ b/Bugzilla/Install/Filesystem.pm
@@ -15,7 +15,7 @@ package Bugzilla::Install::Filesystem;
 # * Files do not have the correct permissions.
 # * The database does not exist.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -31,23 +31,32 @@ use File::Path;
 use File::Basename;
 use File::Copy qw(move);
 use File::Spec;
-use File::Slurp;
 use IO::File;
 use POSIX ();
 
 use parent qw(Exporter);
 our @EXPORT = qw(
-    update_filesystem
-    create_htaccess
-    fix_all_file_permissions
-    fix_dir_permissions
-    fix_file_permissions
+  update_filesystem
+  create_htaccess
+  fix_all_file_permissions
+  fix_dir_permissions
+  fix_file_permissions
 );
 
 use constant HT_DEFAULT_DENY => <<EOT;
 # nothing in this directory is retrievable unless overridden by an .htaccess
 # in a subdirectory
-deny from all
+<IfModule mod_version.c>
+  <IfVersion < 2.4>
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.4>
+    Require all denied
+  </IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+    Deny from all
+</IfModule>
 EOT
 
 ###############
@@ -55,52 +64,60 @@ EOT
 ###############
 
 # Used by the permissions "constants" below.
-sub _suexec { Bugzilla->localconfig->{'use_suexec'}     };
-sub _group  { Bugzilla->localconfig->{'webservergroup'} };
+sub _suexec { Bugzilla->localconfig->{'use_suexec'} }
+sub _group  { Bugzilla->localconfig->{'webservergroup'} }
 
 # Writeable by the owner only.
 use constant OWNER_WRITE => 0600;
+
 # Executable by the owner only.
 use constant OWNER_EXECUTE => 0700;
+
 # A directory which is only writeable by the owner.
 use constant DIR_OWNER_WRITE => 0700;
 
 # A cgi script that the webserver can execute.
-sub WS_EXECUTE { _group() ? 0750 : 0755 };
+sub WS_EXECUTE { _group() ? 0750 : 0755 }
+
 # A file that is read by cgi scripts, but is not ever read
 # directly by the webserver.
-sub CGI_READ { _group() ? 0640 : 0644 };
+sub CGI_READ { _group() ? 0640 : 0644 }
+
 # A file that is written to by cgi scripts, but is not ever
 # read or written directly by the webserver.
-sub CGI_WRITE { _group() ? 0660 : 0666 };
+sub CGI_WRITE { _group() ? 0660 : 0666 }
+
 # A file that is served directly by the web server.
-sub WS_SERVE { (_group() and !_suexec()) ? 0640 : 0644 };
+sub WS_SERVE { (_group() and !_suexec()) ? 0640 : 0644 }
 
 # A directory whose contents can be read or served by the
 # webserver (so even directories containing cgi scripts
 # would have this permission).
-sub DIR_WS_SERVE { (_group() and !_suexec()) ? 0750 : 0755 };
+sub DIR_WS_SERVE { (_group() and !_suexec()) ? 0750 : 0755 }
+
 # A directory that is read by cgi scripts, but is never accessed
 # directly by the webserver
-sub DIR_CGI_READ { _group() ? 0750 : 0755 };
+sub DIR_CGI_READ { _group() ? 0750 : 0755 }
+
 # A directory that is written to by cgi scripts, but where the
 # scripts never needs to overwrite files created by other
 # users.
-sub DIR_CGI_WRITE { _group() ? 0770 : 01777 };
+sub DIR_CGI_WRITE { _group() ? 0770 : 01777 }
+
 # A directory that is written to by cgi scripts, where the
 # scripts need to overwrite files created by other users.
-sub DIR_CGI_OVERWRITE { _group() ? 0770 : 0777 };
+sub DIR_CGI_OVERWRITE { _group() ? 0770 : 0777 }
 
-# This can be combined (using "|") with other permissions for 
+# This can be combined (using "|") with other permissions for
 # directories that, in addition to their normal permissions (such
 # as DIR_CGI_WRITE) also have content served directly from them
 # (or their subdirectories) to the user, via the webserver.
-sub DIR_ALSO_WS_SERVE { _suexec() ? 0001 : 0 };
+sub DIR_ALSO_WS_SERVE { _suexec() ? 0001 : 0 }
 
 # This looks like a constant because it effectively is, but
 # it has to call other subroutines and read the current filesystem,
 # so it's defined as a sub. This is not exported, so it doesn't have
-# a perldoc. However, look at the various hashes defined inside this 
+# a perldoc. However, look at the various hashes defined inside this
 # function to understand what it returns. (There are comments throughout.)
 #
 # The rationale for the file permissions is that there is a group the
@@ -108,196 +125,180 @@ sub DIR_ALSO_WS_SERVE { _suexec() ? 0001 : 0 };
 # by this group. Otherwise someone may find it possible to change the cgis
 # when exploiting some security flaw somewhere (not necessarily in Bugzilla!)
 sub FILESYSTEM {
-    my $datadir       = bz_locations()->{'datadir'};
-    my $attachdir     = bz_locations()->{'attachdir'};
-    my $extensionsdir = bz_locations()->{'extensionsdir'};
-    my $webdotdir     = bz_locations()->{'webdotdir'};
-    my $templatedir   = bz_locations()->{'templatedir'};
-    my $libdir        = bz_locations()->{'libpath'};
-    my $extlib        = bz_locations()->{'ext_libpath'};
-    my $skinsdir      = bz_locations()->{'skinsdir'};
-    my $localconfig   = bz_locations()->{'localconfig'};
-    my $template_cache = bz_locations()->{'template_cache'};
-    my $graphsdir     = bz_locations()->{'graphsdir'};
-    my $assetsdir     = bz_locations()->{'assetsdir'};
-
-    # We want to set the permissions the same for all localconfig files
-    # across all PROJECTs, so we do something special with $localconfig,
-    # lower down in the permissions section.
-    if ($ENV{PROJECT}) {
-        $localconfig =~ s/\.\Q$ENV{PROJECT}\E$//;
-    }
-
-    # Note: When being processed by checksetup, these have their permissions
-    # set in this order: %all_dirs, %recurse_dirs, %all_files.
-    #
-    # Each is processed in alphabetical order of keys, so shorter keys
-    # will have their permissions set before longer keys (thus setting
-    # the permissions on parent directories before setting permissions
-    # on their children).
-
-    # --- FILE PERMISSIONS (Non-created files) --- #
-    my %files = (
-        '*'               => { perms => OWNER_WRITE },
-        # Some .pl files are WS_EXECUTE because we want
-        # users to be able to cron them or otherwise run
-        # them as a secure user, like the webserver owner.
-        '*.cgi'           => { perms => WS_EXECUTE },
-        'whineatnews.pl'  => { perms => WS_EXECUTE },
-        'collectstats.pl' => { perms => WS_EXECUTE },
-        'importxml.pl'    => { perms => WS_EXECUTE },
-        'testserver.pl'   => { perms => WS_EXECUTE },
-        'whine.pl'        => { perms => WS_EXECUTE },
-        'email_in.pl'     => { perms => WS_EXECUTE },
-        'sanitycheck.pl'  => { perms => WS_EXECUTE },
-        'checksetup.pl'   => { perms => OWNER_EXECUTE },
-        'runtests.pl'     => { perms => OWNER_EXECUTE },
-        'jobqueue.pl'     => { perms => OWNER_EXECUTE },
-        'migrate.pl'      => { perms => OWNER_EXECUTE },
-        'install-module.pl' => { perms => OWNER_EXECUTE },
-        'clean-bug-user-last-visit.pl' => { perms => WS_EXECUTE },
-
-        'Bugzilla.pm'   => { perms => CGI_READ },
-        "$localconfig*" => { perms => CGI_READ },
-        'bugzilla.dtd'  => { perms => WS_SERVE },
-        'mod_perl.pl'   => { perms => WS_SERVE },
-        'robots.txt'    => { perms => WS_SERVE },
-        '.htaccess'     => { perms => WS_SERVE },
-
-        'contrib/README'       => { perms => OWNER_WRITE },
-        'contrib/*/README'     => { perms => OWNER_WRITE },
-        'contrib/Bugzilla.pm'  => { perms => OWNER_WRITE },
-        'docs/bugzilla.ent'    => { perms => OWNER_WRITE },
-        'docs/makedocs.pl'     => { perms => OWNER_EXECUTE },
-        'docs/style.css'       => { perms => WS_SERVE },
-        'docs/*/rel_notes.txt' => { perms => WS_SERVE },
-        'docs/*/README.docs'   => { perms => OWNER_WRITE },
-        "$datadir/params.json" => { perms => CGI_WRITE },
-        "$datadir/old-params.txt"  => { perms => OWNER_WRITE },
-        "$extensionsdir/create.pl" => { perms => OWNER_EXECUTE },
-        "$extensionsdir/*/*.pl"    => { perms => WS_EXECUTE },
-    );
-
-    # Directories that we want to set the perms on, but not
-    # recurse through. These are directories we didn't create
-    # in checkesetup.pl.
-    my %non_recurse_dirs = (
-        '.'  => DIR_WS_SERVE,
-        docs => DIR_WS_SERVE,
-    );
-
-    # This sets the permissions for each item inside each of these 
-    # directories, including the directory itself. 
-    # 'CVS' directories are special, though, and are never readable by 
-    # the webserver.
-    my %recurse_dirs = (
-        # Writeable directories
-         $template_cache    => { files => CGI_READ,
-                                  dirs => DIR_CGI_OVERWRITE },
-         $attachdir         => { files => CGI_WRITE,
-                                  dirs => DIR_CGI_WRITE },
-         $webdotdir         => { files => WS_SERVE,
-                                  dirs => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE },
-         $graphsdir         => { files => WS_SERVE,
-                                  dirs => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE },
-         "$datadir/db"      => { files => CGI_WRITE,
-                                  dirs => DIR_CGI_WRITE },
-         $assetsdir         => { files => WS_SERVE,
-                                  dirs => DIR_CGI_OVERWRITE | DIR_ALSO_WS_SERVE },
-
-         # Readable directories
-         "$datadir/mining"     => { files => CGI_READ,
-                                     dirs => DIR_CGI_READ },
-         "$libdir/Bugzilla"    => { files => CGI_READ,
-                                     dirs => DIR_CGI_READ },
-         $extlib               => { files => CGI_READ,
-                                     dirs => DIR_CGI_READ },
-         $templatedir          => { files => CGI_READ,
-                                     dirs => DIR_CGI_READ },
-         # Directories in the extensions/ dir are WS_SERVE so that
-         # the web/ directories can be served by the web server.
-         # But, for extra security, we deny direct webserver access to
-         # the lib/ and template/ directories of extensions.
-         $extensionsdir        => { files => CGI_READ,
-                                     dirs => DIR_WS_SERVE },
-         "$extensionsdir/*/lib" => { files => CGI_READ,
-                                      dirs => DIR_CGI_READ },
-         "$extensionsdir/*/template" => { files => CGI_READ,
-                                           dirs => DIR_CGI_READ },
-
-         # Content served directly by the webserver
-         images                => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         js                    => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         $skinsdir             => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         'docs/*/html'         => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         'docs/*/pdf'          => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         'docs/*/txt'          => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         'docs/*/images'       => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-         "$extensionsdir/*/web" => { files => WS_SERVE,
-                                     dirs => DIR_WS_SERVE },
-
-         # Directories only for the owner, not for the webserver.
-         '.bzr'                => { files => OWNER_WRITE,
-                                    dirs  => DIR_OWNER_WRITE },
-         t                     => { files => OWNER_WRITE,
-                                     dirs => DIR_OWNER_WRITE },
-         xt                    => { files => OWNER_WRITE,
-                                     dirs => DIR_OWNER_WRITE },
-         'docs/lib'            => { files => OWNER_WRITE,
-                                     dirs => DIR_OWNER_WRITE },
-         'docs/*/xml'          => { files => OWNER_WRITE,
-                                     dirs => DIR_OWNER_WRITE },
-         'contrib'             => { files => OWNER_EXECUTE,
-                                     dirs => DIR_OWNER_WRITE, },
-    );
-
-    # --- FILES TO CREATE --- #
-
-    # The name of each directory that we should actually *create*,
-    # pointing at its default permissions.
-    my %create_dirs = (
-        # This is DIR_ALSO_WS_SERVE because it contains $webdotdir and
-        # $assetsdir.
-        $datadir                => DIR_CGI_OVERWRITE | DIR_ALSO_WS_SERVE,
-        # Directories that are read-only for cgi scripts
-        "$datadir/mining"       => DIR_CGI_READ,
-        "$datadir/extensions"   => DIR_CGI_READ,
-        $extensionsdir          => DIR_CGI_READ,
-        # Directories that cgi scripts can write to.
-        "$datadir/db"           => DIR_CGI_WRITE,
-        $attachdir              => DIR_CGI_WRITE,
-        $graphsdir              => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
-        $webdotdir              => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
-        $assetsdir              => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
-        # Directories that contain content served directly by the web server.
-        "$skinsdir/custom"      => DIR_WS_SERVE,
-        "$skinsdir/contrib"     => DIR_WS_SERVE,
-    );
-
-    # The name of each file, pointing at its default permissions and
-    # default contents.
-    my %create_files = (
-        "$datadir/extensions/additional" => { perms    => CGI_READ, 
-                                              contents => '' },
-        # We create this file so that it always has the right owner
-        # and permissions. Otherwise, the webserver creates it as
-        # owned by itself, which can cause problems if jobqueue.pl
-        # or something else is not running as the webserver or root.
-        "$datadir/mailer.testfile" => { perms    => CGI_WRITE,
-                                        contents => '' },
-    );
-
-    # Because checksetup controls the creation of index.html separately
-    # from all other files, it gets its very own hash.
-    my %index_html = (
-        'index.html' => { perms => WS_SERVE, contents => <<EOT
+  my $datadir        = bz_locations()->{'datadir'};
+  my $attachdir      = bz_locations()->{'attachdir'};
+  my $extensionsdir  = bz_locations()->{'extensionsdir'};
+  my $webdotdir      = bz_locations()->{'webdotdir'};
+  my $templatedir    = bz_locations()->{'templatedir'};
+  my $libdir         = bz_locations()->{'libpath'};
+  my $extlib         = bz_locations()->{'ext_libpath'};
+  my $skinsdir       = bz_locations()->{'skinsdir'};
+  my $localconfig    = bz_locations()->{'localconfig'};
+  my $template_cache = bz_locations()->{'template_cache'};
+  my $graphsdir      = bz_locations()->{'graphsdir'};
+  my $assetsdir      = bz_locations()->{'assetsdir'};
+
+  # We want to set the permissions the same for all localconfig files
+  # across all PROJECTs, so we do something special with $localconfig,
+  # lower down in the permissions section.
+  if ($ENV{PROJECT}) {
+    $localconfig =~ s/\.\Q$ENV{PROJECT}\E$//;
+  }
+
+  # Note: When being processed by checksetup, these have their permissions
+  # set in this order: %all_dirs, %recurse_dirs, %all_files.
+  #
+  # Each is processed in alphabetical order of keys, so shorter keys
+  # will have their permissions set before longer keys (thus setting
+  # the permissions on parent directories before setting permissions
+  # on their children).
+
+  # --- FILE PERMISSIONS (Non-created files) --- #
+  my %files = (
+    '*' => {perms => OWNER_WRITE},
+
+    # Some .pl files are WS_EXECUTE because we want
+    # users to be able to cron them or otherwise run
+    # them as a secure user, like the webserver owner.
+    '*.cgi'                        => {perms => WS_EXECUTE},
+    'whineatnews.pl'               => {perms => WS_EXECUTE},
+    'collectstats.pl'              => {perms => WS_EXECUTE},
+    'importxml.pl'                 => {perms => WS_EXECUTE},
+    'testserver.pl'                => {perms => WS_EXECUTE},
+    'whine.pl'                     => {perms => WS_EXECUTE},
+    'email_in.pl'                  => {perms => WS_EXECUTE},
+    'sanitycheck.pl'               => {perms => WS_EXECUTE},
+    'checksetup.pl'                => {perms => OWNER_EXECUTE},
+    'jobqueue.pl'                  => {perms => OWNER_EXECUTE},
+    'migrate.pl'                   => {perms => OWNER_EXECUTE},
+    'Makefile.PL'                  => {perms => OWNER_WRITE},
+    'gen-cpanfile.pl'              => {perms => OWNER_EXECUTE},
+    'clean-bug-user-last-visit.pl' => {perms => WS_EXECUTE},
+
+    'app.psgi'      => {perms => CGI_READ},
+    'Bugzilla.pm'   => {perms => CGI_READ},
+    "$localconfig*" => {perms => CGI_READ},
+    'META.*'        => {perms => CGI_READ},
+    'MYMETA.*'      => {perms => CGI_READ},
+    'bugzilla.dtd'  => {perms => WS_SERVE},
+    'mod_perl.pl'   => {perms => WS_SERVE},
+    'robots.txt'    => {perms => WS_SERVE},
+    '.htaccess'     => {perms => WS_SERVE},
+
+    'contrib/README'                  => {perms => OWNER_WRITE},
+    'contrib/*/README'                => {perms => OWNER_WRITE},
+    'contrib/Bugzilla.pm'             => {perms => OWNER_WRITE},
+    'contrib/replyrc'                 => {perms => OWNER_WRITE},
+    'docs/bugzilla.ent'               => {perms => OWNER_WRITE},
+    'docs/makedocs.pl'                => {perms => OWNER_EXECUTE},
+    'docs/style.css'                  => {perms => WS_SERVE},
+    'docs/*/rel_notes.txt'            => {perms => WS_SERVE},
+    'docs/*/README.docs'              => {perms => OWNER_WRITE},
+    "$datadir/params.json"            => {perms => CGI_WRITE},
+    "$datadir/old-params.txt"         => {perms => OWNER_WRITE},
+    "$extensionsdir/create.pl"        => {perms => OWNER_EXECUTE},
+    "$extensionsdir/*/*.pl"           => {perms => WS_EXECUTE},
+    'xt/config/generate_test_data.pl' => {perms => OWNER_EXECUTE},
+  );
+
+  # Directories that we want to set the perms on, but not
+  # recurse through. These are directories we didn't create
+  # in checkesetup.pl.
+  my %non_recurse_dirs = ('.' => DIR_WS_SERVE, docs => DIR_WS_SERVE,);
+
+  # This sets the permissions for each item inside each of these
+  # directories, including the directory itself.
+  # 'CVS' directories are special, though, and are never readable by
+  # the webserver.
+  my %recurse_dirs = (
+
+    # Writeable directories
+    $template_cache => {files => CGI_READ,  dirs => DIR_CGI_OVERWRITE},
+    $attachdir      => {files => CGI_WRITE, dirs => DIR_CGI_WRITE},
+    $webdotdir => {files => WS_SERVE, dirs => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE},
+    $graphsdir => {files => WS_SERVE, dirs => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE},
+    "$datadir/db" => {files => CGI_WRITE, dirs => DIR_CGI_WRITE},
+    $assetsdir =>
+      {files => WS_SERVE, dirs => DIR_CGI_OVERWRITE | DIR_ALSO_WS_SERVE},
+
+    # Readable directories
+    "$datadir/mining"  => {files => CGI_READ, dirs => DIR_CGI_READ},
+    "$libdir/Bugzilla" => {files => CGI_READ, dirs => DIR_CGI_READ},
+    $extlib            => {files => CGI_READ, dirs => DIR_CGI_READ},
+    $templatedir       => {files => CGI_READ, dirs => DIR_CGI_READ},
+
+    # Directories in the extensions/ dir are WS_SERVE so that
+    # the web/ directories can be served by the web server.
+    # But, for extra security, we deny direct webserver access to
+    # the lib/ and template/ directories of extensions.
+    $extensionsdir              => {files => CGI_READ, dirs => DIR_WS_SERVE},
+    "$extensionsdir/*/lib"      => {files => CGI_READ, dirs => DIR_CGI_READ},
+    "$extensionsdir/*/template" => {files => CGI_READ, dirs => DIR_CGI_READ},
+
+    # Content served directly by the webserver
+    images                 => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    js                     => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    $skinsdir              => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    'docs/*/html'          => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    'docs/*/pdf'           => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    'docs/*/txt'           => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    'docs/*/images'        => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+    "$extensionsdir/*/web" => {files => WS_SERVE, dirs => DIR_WS_SERVE},
+
+    # Directories only for the owner, not for the webserver.
+    '.bzr'       => {files => OWNER_WRITE,   dirs => DIR_OWNER_WRITE},
+    t            => {files => OWNER_WRITE,   dirs => DIR_OWNER_WRITE},
+    xt           => {files => OWNER_WRITE,   dirs => DIR_OWNER_WRITE},
+    'docs/lib'   => {files => OWNER_WRITE,   dirs => DIR_OWNER_WRITE},
+    'docs/*/xml' => {files => OWNER_WRITE,   dirs => DIR_OWNER_WRITE},
+    'contrib'    => {files => OWNER_EXECUTE, dirs => DIR_OWNER_WRITE,},
+  );
+
+  # --- FILES TO CREATE --- #
+
+  # The name of each directory that we should actually *create*,
+  # pointing at its default permissions.
+  my %create_dirs = (
+
+    # This is DIR_ALSO_WS_SERVE because it contains $webdotdir and
+    # $assetsdir.
+    $datadir => DIR_CGI_OVERWRITE | DIR_ALSO_WS_SERVE,
+
+    # Directories that are read-only for cgi scripts
+    "$datadir/mining"     => DIR_CGI_READ,
+    "$datadir/extensions" => DIR_CGI_READ,
+    $extensionsdir        => DIR_CGI_READ,
+
+    # Directories that cgi scripts can write to.
+    "$datadir/db" => DIR_CGI_WRITE,
+    $attachdir    => DIR_CGI_WRITE,
+    $graphsdir    => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
+    $webdotdir    => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
+    $assetsdir    => DIR_CGI_WRITE | DIR_ALSO_WS_SERVE,
+
+    # Directories that contain content served directly by the web server.
+    "$skinsdir/custom"  => DIR_WS_SERVE,
+    "$skinsdir/contrib" => DIR_WS_SERVE,
+  );
+
+  # The name of each file, pointing at its default permissions and
+  # default contents.
+  my %create_files = (
+    "$datadir/extensions/additional" => {perms => CGI_READ, contents => ''},
+
+    # We create this file so that it always has the right owner
+    # and permissions. Otherwise, the webserver creates it as
+    # owned by itself, which can cause problems if jobqueue.pl
+    # or something else is not running as the webserver or root.
+    "$datadir/mailer.testfile" => {perms => CGI_WRITE, contents => ''},
+  );
+
+  # Because checksetup controls the creation of index.html separately
+  # from all other files, it gets its very own hash.
+  my %index_html = (
+    'index.html' => {
+      perms    => WS_SERVE,
+      contents => <<EOT
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
@@ -308,164 +309,240 @@ sub FILESYSTEM {
 </body>
 </html>
 EOT
-        }
-    );
-
-    # Because checksetup controls the .htaccess creation separately
-    # by a localconfig variable, these go in a separate variable from
-    # %create_files.
-    #
-    # Note that these get WS_SERVE as their permission
-    # because they're *read* by the webserver, even though they're not
-    # actually, themselves, served.
-    my %htaccess = (
-        "$attachdir/.htaccess"       => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        "$libdir/Bugzilla/.htaccess" => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        "$extlib/.htaccess"          => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        "$templatedir/.htaccess"     => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        'contrib/.htaccess'          => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        't/.htaccess'                => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        'xt/.htaccess'               => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-        "$datadir/.htaccess"         => { perms    => WS_SERVE,
-                                          contents => HT_DEFAULT_DENY },
-
-        "$graphsdir/.htaccess" => { perms => WS_SERVE, contents => <<EOT
+    }
+  );
+
+  # Because checksetup controls the .htaccess creation separately
+  # by a localconfig variable, these go in a separate variable from
+  # %create_files.
+  #
+  # Note that these get WS_SERVE as their permission
+  # because they're *read* by the webserver, even though they're not
+  # actually, themselves, served.
+  my %htaccess = (
+    "$attachdir/.htaccess" => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    "$libdir/Bugzilla/.htaccess" =>
+      {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    "$extlib/.htaccess"      => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    "$templatedir/.htaccess" => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    'contrib/.htaccess'      => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    't/.htaccess'            => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    'xt/.htaccess'           => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+    "$datadir/.htaccess"     => {perms => WS_SERVE, contents => HT_DEFAULT_DENY},
+
+    "$graphsdir/.htaccess" => {
+      perms    => WS_SERVE,
+      contents => <<EOT
 # Allow access to .png and .gif files.
 <FilesMatch (\\.gif|\\.png)\$>
-  Allow from all
+  <IfModule mod_version.c>
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </IfModule>
+  <IfModule !mod_version.c>
+    Allow from all
+  </IfModule>
 </FilesMatch>
 
 # And no directory listings, either.
-Deny from all
-EOT
-        },
-
-        "$webdotdir/.htaccess" => { perms => WS_SERVE, contents => <<EOT
-# Restrict access to .dot files to the public webdot server at research.att.com
-# if research.att.com ever changes their IP, or if you use a different
-# webdot server, you'll need to edit this
-<FilesMatch \\.dot\$>
-  Allow from 192.20.225.0/24
+<IfModule mod_version.c>
+  <IfVersion < 2.4>
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.4>
+    Require all denied
+  </IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
   Deny from all
-</FilesMatch>
+</IfModule>
+EOT
+    },
+
+    "$webdotdir/.htaccess" => {
+      perms    => WS_SERVE,
+      contents => <<EOT
+# If you run a local webdot server, you will need to allow it access to
+# generated .dot files. Uncomment this section and replace the IP address with
+# the IP address of your webdot server.
+#<FilesMatch \\.dot\$>
+#  <IfModule mod_version.c>
+#    <IfVersion < 2.4>
+#      Allow from 127.0.0.1/24
+#      Deny from all
+#    </IfVersion>
+#    <IfVersion >= 2.4>
+#      Require ip 127.0.0.1/24
+#      Require all denied
+#    </IfVersion>
+#  </IfModule>
+#  <IfModule !mod_version.c>
+#    Allow from 127.0.0.1/24
+#    Deny from all
+#  </IfModule>
+#</FilesMatch>
 
 # Allow access to .png files created by a local copy of 'dot'
 <FilesMatch \\.png\$>
-  Allow from all
+  <IfModule mod_version.c>
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </IfModule>
+  <IfModule !mod_version.c>
+     Allow from all
+  </IfModule>
 </FilesMatch>
 
 # And no directory listings, either.
-Deny from all
+<IfModule mod_version.c>
+  <IfVersion < 2.4>
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.4>
+    Require all denied
+  </IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+  Deny from all
+</IfModule>
 EOT
-        },
+    },
 
-        "$assetsdir/.htaccess" => { perms => WS_SERVE, contents => <<EOT
+    "$assetsdir/.htaccess" => {
+      perms    => WS_SERVE,
+      contents => <<EOT
 # Allow access to .css files
 <FilesMatch \\.(css|js)\$>
-  Allow from all
+  <IfModule mod_version.c>
+    <IfVersion < 2.4>
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
+  </IfModule>
+  <IfModule !mod_version.c>
+     Allow from all
+  </IfModule>
 </FilesMatch>
 
 # And no directory listings, either.
-Deny from all
+<IfModule mod_version.c>
+  <IfVersion < 2.4>
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.4>
+    Require all denied
+  </IfVersion>
+</IfModule>
+<IfModule !mod_version.c>
+  Deny from all
+</IfModule>
 EOT
-        },
-
-    );
-
-    Bugzilla::Hook::process('install_filesystem', {
-        files            => \%files,
-        create_dirs      => \%create_dirs,
-        non_recurse_dirs => \%non_recurse_dirs,
-        recurse_dirs     => \%recurse_dirs,
-        create_files     => \%create_files,
-        htaccess         => \%htaccess,
-    });
-
-    my %all_files = (%create_files, %htaccess, %index_html, %files);
-    my %all_dirs  = (%create_dirs, %non_recurse_dirs);
-
-    return {
-        create_dirs  => \%create_dirs,
-        recurse_dirs => \%recurse_dirs,
-        all_dirs     => \%all_dirs,
-
-        create_files => \%create_files,
-        htaccess     => \%htaccess,
-        index_html   => \%index_html,
-        all_files    => \%all_files,
-    };
-}
+    },
 
-sub update_filesystem {
-    my ($params) = @_;
-    my $fs = FILESYSTEM();
-    my %dirs  = %{$fs->{create_dirs}};
-    my %files = %{$fs->{create_files}};
-
-    my $datadir = bz_locations->{'datadir'};
-    my $graphsdir = bz_locations->{'graphsdir'};
-    my $assetsdir = bz_locations->{'assetsdir'};
-    # If the graphs/ directory doesn't exist, we're upgrading from
-    # a version old enough that we need to update the $datadir/mining 
-    # format.
-    if (-d "$datadir/mining" && !-d $graphsdir) {
-        _update_old_charts($datadir);
-    }
+  );
 
-    # If there is a file named '-All-' in $datadir/mining, then we're still
-    # having mining files named by product name, and we need to convert them to
-    # files named by product ID.
-    if (-e File::Spec->catfile($datadir, 'mining', '-All-')) {
-        _update_old_mining_filenames(File::Spec->catdir($datadir, 'mining'));
+  Bugzilla::Hook::process(
+    'install_filesystem',
+    {
+      files            => \%files,
+      create_dirs      => \%create_dirs,
+      non_recurse_dirs => \%non_recurse_dirs,
+      recurse_dirs     => \%recurse_dirs,
+      create_files     => \%create_files,
+      htaccess         => \%htaccess,
     }
+  );
 
-    # By sorting the dirs, we assure that shorter-named directories
-    # (meaning parent directories) are always created before their
-    # child directories.
-    foreach my $dir (sort keys %dirs) {
-        unless (-d $dir) {
-            print "Creating $dir directory...\n";
-            mkdir $dir or die "mkdir $dir failed: $!";
-            # For some reason, passing in the permissions to "mkdir"
-            # doesn't work right, but doing a "chmod" does.
-            chmod $dirs{$dir}, $dir or warn "Cannot chmod $dir: $!";
-        }
-    }
+  my %all_files = (%create_files, %htaccess, %index_html, %files);
+  my %all_dirs = (%create_dirs, %non_recurse_dirs);
 
-    # Move the testfile if we can't write to it, so that we can re-create
-    # it with the correct permissions below.
-    my $testfile = "$datadir/mailer.testfile";
-    if (-e $testfile and !-w $testfile) {
-        _rename_file($testfile, "$testfile.old");
-    }
+  return {
+    create_dirs  => \%create_dirs,
+    recurse_dirs => \%recurse_dirs,
+    all_dirs     => \%all_dirs,
 
-    # If old-params.txt exists in the root directory, move it to datadir.
-    my $oldparamsfile = "old_params.txt";
-    if (-e $oldparamsfile) {
-        _rename_file($oldparamsfile, "$datadir/$oldparamsfile");
-    }
+    create_files => \%create_files,
+    htaccess     => \%htaccess,
+    index_html   => \%index_html,
+    all_files    => \%all_files,
+  };
+}
 
-    # Remove old assets htaccess file to force recreation with correct values.
-    if (-e "$assetsdir/.htaccess") {
-        if (read_file("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
-            unlink("$assetsdir/.htaccess");
-        }
+sub update_filesystem {
+  my ($params) = @_;
+  my $fs       = FILESYSTEM();
+  my %dirs     = %{$fs->{create_dirs}};
+  my %files    = %{$fs->{create_files}};
+
+  my $datadir   = bz_locations->{'datadir'};
+  my $graphsdir = bz_locations->{'graphsdir'};
+  my $assetsdir = bz_locations->{'assetsdir'};
+
+  # If the graphs/ directory doesn't exist, we're upgrading from
+  # a version old enough that we need to update the $datadir/mining
+  # format.
+  if (-d "$datadir/mining" && !-d $graphsdir) {
+    _update_old_charts($datadir);
+  }
+
+  # If there is a file named '-All-' in $datadir/mining, then we're still
+  # having mining files named by product name, and we need to convert them to
+  # files named by product ID.
+  if (-e File::Spec->catfile($datadir, 'mining', '-All-')) {
+    _update_old_mining_filenames(File::Spec->catdir($datadir, 'mining'));
+  }
+
+  # By sorting the dirs, we assure that shorter-named directories
+  # (meaning parent directories) are always created before their
+  # child directories.
+  foreach my $dir (sort keys %dirs) {
+    unless (-d $dir) {
+      print "Creating $dir directory...\n";
+      mkdir $dir or die "mkdir $dir failed: $!";
+
+      # For some reason, passing in the permissions to "mkdir"
+      # doesn't work right, but doing a "chmod" does.
+      chmod $dirs{$dir}, $dir or warn "Cannot chmod $dir: $!";
     }
-
-    _create_files(%files);
-    if ($params->{index_html}) {
-        _create_files(%{$fs->{index_html}});
+  }
+
+  # Move the testfile if we can't write to it, so that we can re-create
+  # it with the correct permissions below.
+  my $testfile = "$datadir/mailer.testfile";
+  if (-e $testfile and !-w $testfile) {
+    _rename_file($testfile, "$testfile.old");
+  }
+
+  # If old-params.txt exists in the root directory, move it to datadir.
+  my $oldparamsfile = "old_params.txt";
+  if (-e $oldparamsfile) {
+    _rename_file($oldparamsfile, "$datadir/$oldparamsfile");
+  }
+
+  # Remove old assets htaccess file to force recreation with correct values.
+  if (-e "$assetsdir/.htaccess") {
+    if (read_text("$assetsdir/.htaccess") =~ /<FilesMatch \\\.css\$>/) {
+      unlink("$assetsdir/.htaccess");
     }
-    elsif (-e 'index.html') {
-        my $templatedir = bz_locations()->{'templatedir'};
-        print <<EOT;
+  }
+
+  _create_files(%files);
+  if ($params->{index_html}) {
+    _create_files(%{$fs->{index_html}});
+  }
+  elsif (-e 'index.html') {
+    my $templatedir = bz_locations()->{'templatedir'};
+    print <<EOT;
 
 *** It appears that you still have an old index.html hanging around.
     Either the contents of this file should be moved into a template and 
@@ -473,446 +550,477 @@ sub update_filesystem {
     the file.
 
 EOT
-    }
-
-    # Delete old files that no longer need to exist
-
-    # 2001-04-29 jake@bugzilla.org - Remove oldemailtech
-    #   http://bugzilla.mozilla.org/show_bugs.cgi?id=71552
-    if (-d 'shadow') {
-        print "Removing shadow directory...\n";
-        rmtree("shadow");
-    }
-
-    if (-e "$datadir/versioncache") {
-        print "Removing versioncache...\n";
-        unlink "$datadir/versioncache";
-    }
-
-    if (-e "$datadir/duplicates.rdf") {
-        print "Removing duplicates.rdf...\n";
-        unlink "$datadir/duplicates.rdf";
-        unlink "$datadir/duplicates-old.rdf";
-    }
-
-    if (-e "$datadir/duplicates") {
-        print "Removing duplicates directory...\n";
-        rmtree("$datadir/duplicates");
-    }
-
-    _remove_empty_css_files();
-    _convert_single_file_skins();
-    _remove_dynamic_assets();
+  }
+
+  # Delete old files that no longer need to exist
+
+  # 2001-04-29 jake@bugzilla.org - Remove oldemailtech
+  #   http://bugzilla.mozilla.org/show_bugs.cgi?id=71552
+  if (-d 'shadow') {
+    print "Removing shadow directory...\n";
+    rmtree("shadow");
+  }
+
+  if (-e "$datadir/versioncache") {
+    print "Removing versioncache...\n";
+    unlink "$datadir/versioncache";
+  }
+
+  if (-e "$datadir/duplicates.rdf") {
+    print "Removing duplicates.rdf...\n";
+    unlink "$datadir/duplicates.rdf";
+    unlink "$datadir/duplicates-old.rdf";
+  }
+
+  if (-e "$datadir/duplicates") {
+    print "Removing duplicates directory...\n";
+    rmtree("$datadir/duplicates");
+  }
+
+  _remove_empty_css_files();
+  _convert_single_file_skins();
+  _remove_dynamic_assets();
 }
 
 sub _remove_empty_css_files {
-    my $skinsdir = bz_locations()->{'skinsdir'};
-    foreach my $css_file (glob("$skinsdir/custom/*.css"),
-                          glob("$skinsdir/contrib/*/*.css"))
-    {
-        _remove_empty_css($css_file);
-    }
+  my $skinsdir = bz_locations()->{'skinsdir'};
+  foreach my $css_file (glob("$skinsdir/custom/*.css"),
+    glob("$skinsdir/contrib/*/*.css"))
+  {
+    _remove_empty_css($css_file);
+  }
 }
 
 # A simple helper for the update code that removes "empty" CSS files.
 sub _remove_empty_css {
-    my ($file) = @_;
-    my $basename = basename($file);
-    my $empty_contents = <<EOT;
+  my ($file)         = @_;
+  my $basename       = basename($file);
+  my $empty_contents = <<EOT;
 /*
  * Custom rules for $basename.
  * The rules you put here override rules in that stylesheet.
  */
 EOT
-    if (length($empty_contents) == -s $file) {
-        open(my $fh, '<', $file) or warn "$file: $!";
-        my $file_contents;
-        { local $/; $file_contents = <$fh>; }
-        if ($file_contents eq $empty_contents) {
-            print install_string('file_remove', { name => $file }), "\n";
-            unlink $file or warn "$file: $!";
-        }
-    };
+  if (length($empty_contents) == -s $file) {
+    open(my $fh, '<', $file) or warn "$file: $!";
+    my $file_contents;
+    { local $/; $file_contents = <$fh>; }
+    if ($file_contents eq $empty_contents) {
+      print install_string('file_remove', {name => $file}), "\n";
+      unlink $file or warn "$file: $!";
+    }
+  }
 }
 
 # We used to allow a single css file in the skins/contrib/ directory
 # to be a whole skin.
 sub _convert_single_file_skins {
-    my $skinsdir = bz_locations()->{'skinsdir'};
-    foreach my $skin_file (glob "$skinsdir/contrib/*.css") {
-        my $dir_name = $skin_file;
-        $dir_name =~ s/\.css$//;
-        mkdir $dir_name or warn "$dir_name: $!";
-        _rename_file($skin_file, "$dir_name/global.css");
-    }
+  my $skinsdir = bz_locations()->{'skinsdir'};
+  foreach my $skin_file (glob "$skinsdir/contrib/*.css") {
+    my $dir_name = $skin_file;
+    $dir_name =~ s/\.css$//;
+    mkdir $dir_name or warn "$dir_name: $!";
+    _rename_file($skin_file, "$dir_name/global.css");
+  }
 }
 
 # delete all automatically generated css/js files to force recreation at the
 # next request.
 sub _remove_dynamic_assets {
-    my @files = (
-        glob(bz_locations()->{assetsdir} . '/*.css'),
-        glob(bz_locations()->{assetsdir} . '/*.js'),
-    );
-    foreach my $file (@files) {
-        unlink($file);
-    }
-
-    # remove old skins/assets directory
-    my $old_path = bz_locations()->{skinsdir} . '/assets';
-    if (-d $old_path) {
-        foreach my $file (glob("$old_path/*.css")) {
-            unlink($file);
-        }
-        rmdir($old_path);
+  my @files = (
+    glob(bz_locations()->{assetsdir} . '/*.css'),
+    glob(bz_locations()->{assetsdir} . '/*.js'),
+  );
+  foreach my $file (@files) {
+    unlink($file);
+  }
+
+  # remove old skins/assets directory
+  my $old_path = bz_locations()->{skinsdir} . '/assets';
+  if (-d $old_path) {
+    foreach my $file (glob("$old_path/*.css")) {
+      unlink($file);
     }
+    rmdir($old_path);
+  }
 }
 
 sub create_htaccess {
-    _create_files(%{FILESYSTEM()->{htaccess}});
-
-    # Repair old .htaccess files
-
-    my $webdot_dir = bz_locations()->{'webdotdir'};
-    # The public webdot IP address changed.
-    my $webdot = new IO::File("$webdot_dir/.htaccess", 'r')
-        || die "$webdot_dir/.htaccess: $!";
-    my $webdot_data;
-    { local $/; $webdot_data = <$webdot>; }
+  _create_files(%{FILESYSTEM()->{htaccess}});
+
+  # Repair old .htaccess files
+
+  my $webdot_dir = bz_locations()->{'webdotdir'};
+
+  # The public webdot IP address changed.
+  my $webdot = new IO::File("$webdot_dir/.htaccess", 'r')
+    || die "$webdot_dir/.htaccess: $!";
+  my $webdot_data;
+  { local $/; $webdot_data = <$webdot>; }
+  $webdot->close;
+  if ($webdot_data =~ /192\.20\.225\.10/) {
+    print "Repairing $webdot_dir/.htaccess...\n";
+    $webdot_data =~ s/192\.20\.225\.10/192.20.225.0\/24/g;
+    $webdot = new IO::File("$webdot_dir/.htaccess", 'w') || die $!;
+    print $webdot $webdot_data;
     $webdot->close;
-    if ($webdot_data =~ /192\.20\.225\.10/) {
-        print "Repairing $webdot_dir/.htaccess...\n";
-        $webdot_data =~ s/192\.20\.225\.10/192.20.225.0\/24/g;
-        $webdot = new IO::File("$webdot_dir/.htaccess", 'w') || die $!;
-        print $webdot $webdot_data;
-        $webdot->close;
-    }
+  }
 }
 
 sub _rename_file {
-    my ($from, $to) = @_;
-    print install_string('file_rename', { from => $from, to => $to }), "\n";
-    if (-e $to) {
-        warn "$to already exists, not moving\n";
-    }
-    else {
-        move($from, $to) or warn $!;
-    }
+  my ($from, $to) = @_;
+  print install_string('file_rename', {from => $from, to => $to}), "\n";
+  if (-e $to) {
+    warn "$to already exists, not moving\n";
+  }
+  else {
+    move($from, $to) or warn $!;
+  }
 }
 
 # A helper for the above functions.
 sub _create_files {
-    my (%files) = @_;
-
-    # It's not necessary to sort these, but it does make the
-    # output of checksetup.pl look a bit nicer.
-    foreach my $file (sort keys %files) {
-        unless (-e $file) {
-            print "Creating $file...\n";
-            my $info = $files{$file};
-            my $fh = new IO::File($file, O_WRONLY | O_CREAT, $info->{perms})
-                || die $!;
-            print $fh $info->{contents} if $info->{contents};
-            $fh->close;
-        }
+  my (%files) = @_;
+
+  # It's not necessary to sort these, but it does make the
+  # output of checksetup.pl look a bit nicer.
+  foreach my $file (sort keys %files) {
+    unless (-e $file) {
+      print "Creating $file...\n";
+      my $info = $files{$file};
+      my $fh = new IO::File($file, O_WRONLY | O_CREAT, $info->{perms}) || die $!;
+      print $fh $info->{contents} if $info->{contents};
+      $fh->close;
     }
+  }
 }
 
 # If you ran a REALLY old version of Bugzilla, your chart files are in the
 # wrong format. This code is a little messy, because it's very old, and
-# when moving it into this module, I couldn't test it so I left it almost 
+# when moving it into this module, I couldn't test it so I left it almost
 # completely alone.
 sub _update_old_charts {
-    my ($datadir) = @_;
-    print "Updating old chart storage format...\n";
-    foreach my $in_file (glob("$datadir/mining/*")) {
-        # Don't try and upgrade image or db files!
-        next if (($in_file =~ /\.gif$/i) ||
-                 ($in_file =~ /\.png$/i) ||
-                 ($in_file =~ /\.db$/i) ||
-                 ($in_file =~ /\.orig$/i));
-
-        rename("$in_file", "$in_file.orig") or next;
-        open(IN, "$in_file.orig") or next;
-        open(OUT, '>', $in_file) or next;
-
-        # Fields in the header
-        my @declared_fields;
-
-        # Fields we changed to half way through by mistake
-        # This list comes from an old version of collectstats.pl
-        # This part is only for people who ran later versions of 2.11 (devel)
-        my @intermediate_fields = qw(DATE UNCONFIRMED NEW ASSIGNED REOPENED
-                                     RESOLVED VERIFIED CLOSED);
-
-        # Fields we actually want (matches the current collectstats.pl)
-        my @out_fields = qw(DATE NEW ASSIGNED REOPENED UNCONFIRMED RESOLVED
-                            VERIFIED CLOSED FIXED INVALID WONTFIX LATER REMIND
-                            DUPLICATE WORKSFORME MOVED);
-
-         while (<IN>) {
-            if (/^# fields?: (.*)\s$/) {
-                @declared_fields = map uc, (split /\||\r/, $1);
-                print OUT "# fields: ", join('|', @out_fields), "\n";
-            }
-            elsif (/^(\d+\|.*)/) {
-                my @data = split(/\||\r/, $1);
-                my %data;
-                if (@data == @declared_fields) {
-                    # old format
-                    for my $i (0 .. $#declared_fields) {
-                        $data{$declared_fields[$i]} = $data[$i];
-                    }
-                }
-                elsif (@data == @intermediate_fields) {
-                    # Must have changed over at this point
-                    for my $i (0 .. $#intermediate_fields) {
-                        $data{$intermediate_fields[$i]} = $data[$i];
-                    }
-                }
-                elsif (@data == @out_fields) {
-                    # This line's fine - it has the right number of entries
-                    for my $i (0 .. $#out_fields) {
-                        $data{$out_fields[$i]} = $data[$i];
-                    }
-                }
-                else {
-                    print "Oh dear, input line $. of $in_file had " .
-                          scalar(@data) . " fields\nThis was unexpected.",
-                          " You may want to check your data files.\n";
-                }
-
-                print OUT join('|', 
-                    map { defined ($data{$_}) ? ($data{$_}) : "" } @out_fields),
-                    "\n";
-            }
-            else {
-                print OUT;
-            }
+  my ($datadir) = @_;
+  print "Updating old chart storage format...\n";
+  foreach my $in_file (glob("$datadir/mining/*")) {
+
+    # Don't try and upgrade image or db files!
+    next
+      if (($in_file =~ /\.gif$/i)
+      || ($in_file =~ /\.png$/i)
+      || ($in_file =~ /\.db$/i)
+      || ($in_file =~ /\.orig$/i));
+
+    rename("$in_file", "$in_file.orig") or next;
+    open(IN,  "<", "$in_file.orig") or next;
+    open(OUT, '>', $in_file)        or next;
+
+    # Fields in the header
+    my @declared_fields;
+
+    # Fields we changed to half way through by mistake
+    # This list comes from an old version of collectstats.pl
+    # This part is only for people who ran later versions of 2.11 (devel)
+    my @intermediate_fields = qw(DATE UNCONFIRMED NEW ASSIGNED REOPENED
+      RESOLVED VERIFIED CLOSED);
+
+    # Fields we actually want (matches the current collectstats.pl)
+    my @out_fields = qw(DATE NEW ASSIGNED REOPENED UNCONFIRMED RESOLVED
+      VERIFIED CLOSED FIXED INVALID WONTFIX LATER REMIND
+      DUPLICATE WORKSFORME MOVED);
+
+    while (<IN>) {
+      if (/^# fields?: (.*)\s$/) {
+        @declared_fields = map uc, (split /\||\r/, $1);
+        print OUT "# fields: ", join('|', @out_fields), "\n";
+      }
+      elsif (/^(\d+\|.*)/) {
+        my @data = split(/\||\r/, $1);
+        my %data;
+        if (@data == @declared_fields) {
+
+          # old format
+          for my $i (0 .. $#declared_fields) {
+            $data{$declared_fields[$i]} = $data[$i];
+          }
+        }
+        elsif (@data == @intermediate_fields) {
+
+          # Must have changed over at this point
+          for my $i (0 .. $#intermediate_fields) {
+            $data{$intermediate_fields[$i]} = $data[$i];
+          }
+        }
+        elsif (@data == @out_fields) {
+
+          # This line's fine - it has the right number of entries
+          for my $i (0 .. $#out_fields) {
+            $data{$out_fields[$i]} = $data[$i];
+          }
+        }
+        else {
+          print "Oh dear, input line $. of $in_file had "
+            . scalar(@data)
+            . " fields\nThis was unexpected.",
+            " You may want to check your data files.\n";
         }
 
-        close(IN);
-        close(OUT);
-    } 
+        print OUT join('|', map { defined($data{$_}) ? ($data{$_}) : "" } @out_fields),
+          "\n";
+      }
+      else {
+        print OUT;
+      }
+    }
+
+    close(IN);
+    close(OUT);
+  }
 }
 
 # The old naming scheme has product names as mining file names; we rename them
 # to product IDs.
 sub _update_old_mining_filenames {
-    my ($miningdir) = @_;
-    my @conversion_errors;
-
-    require Bugzilla::Product;
-
-    # We use a dummy product instance with ID 0, representing all products
-    my $product_all = {id => 0, name => '-All-'};
-    bless($product_all, 'Bugzilla::Product');
-
-    print "Updating old charting data file names...";
-    my @products = Bugzilla::Product->get_all();
-    push(@products, $product_all);
-    foreach my $product (@products) {
-        if (-e File::Spec->catfile($miningdir, $product->id)) {
-            push(@conversion_errors,
-                 { product => $product,
-                   message => 'A file named "' . $product->id .
-                              '" already exists.' });
+  my ($miningdir) = @_;
+  my $dbh = Bugzilla->dbh;
+  my @conversion_errors;
+
+  # We use a dummy product instance with ID 0, representing all products
+  my $product_all = {id => 0, name => '-All-'};
+
+  print "Updating old charting data file names...";
+  my @products = @{
+    $dbh->selectall_arrayref(
+      'SELECT id, name FROM products
+                                                ORDER BY name', {Slice => {}}
+    )
+  };
+  push(@products, $product_all);
+  foreach my $product (@products) {
+    if (-e File::Spec->catfile($miningdir, $product->{id})) {
+      push(
+        @conversion_errors,
+        {
+          product => $product,
+          message => 'A file named "' . $product->{id} . '" already exists.'
         }
+      );
     }
+  }
 
-    if (! @conversion_errors) {
-        # Renaming mining files should work now without a hitch.
-        foreach my $product (@products) {
-            if (! rename(File::Spec->catfile($miningdir, $product->name),
-                         File::Spec->catfile($miningdir, $product->id))) {
-                push(@conversion_errors,
-                     { product => $product,
-                       message => $! });
-            }
-        }
-    }
+  if (!@conversion_errors) {
 
-    # Error reporting
-    if (! @conversion_errors) {
-        print " done.\n";
+    # Renaming mining files should work now without a hitch.
+    foreach my $product (@products) {
+      if (
+        !rename(
+          File::Spec->catfile($miningdir, $product->{name}),
+          File::Spec->catfile($miningdir, $product->{id})
+        )
+        )
+      {
+        push(@conversion_errors, {product => $product, message => $!});
+      }
     }
-    else {
-        print " FAILED:\n";
-        foreach my $error (@conversion_errors) {
-            printf "Cannot rename charting data file for product %d (%s): %s\n",
-                   $error->{product}->id, $error->{product}->name,
-                   $error->{message};
-        }
-        print "You need to empty the \"$miningdir\" directory, then run\n",
-              "   collectstats.pl --regenerate\n",
-              "in order to clean this up.\n";
+  }
+
+  # Error reporting
+  if (!@conversion_errors) {
+    print " done.\n";
+  }
+  else {
+    print " FAILED:\n";
+    foreach my $error (@conversion_errors) {
+      printf "Cannot rename charting data file for product %d (%s): %s\n",
+        $error->{product}->{id}, $error->{product}->{name}, $error->{message};
     }
+    print "You need to empty the \"$miningdir\" directory, then run\n",
+      "   collectstats.pl --regenerate\n", "in order to clean this up.\n";
+  }
 }
 
 sub fix_dir_permissions {
-    my ($dir) = @_;
-    return if ON_WINDOWS;
-    # Note that _get_owner_and_group is always silent here.
-    my ($owner_id, $group_id) = _get_owner_and_group();
-
-    my $perms;
-    my $fs = FILESYSTEM();
-    if ($perms = $fs->{recurse_dirs}->{$dir}) {
-        _fix_perms_recursively($dir, $owner_id, $group_id, $perms);
-    }
-    elsif ($perms = $fs->{all_dirs}->{$dir}) {
-        _fix_perms($dir, $owner_id, $group_id, $perms);
-    }
-    else {
-        # Do nothing. We know nothing about this directory.
-        warn "Unknown directory $dir";
-    }
+  my ($dir) = @_;
+  return if ON_WINDOWS;
+
+  # Note that _get_owner_and_group is always silent here.
+  my ($owner_id, $group_id) = _get_owner_and_group();
+
+  my $perms;
+  my $fs = FILESYSTEM();
+  if ($perms = $fs->{recurse_dirs}->{$dir}) {
+    _fix_perms_recursively($dir, $owner_id, $group_id, $perms);
+  }
+  elsif ($perms = $fs->{all_dirs}->{$dir}) {
+    _fix_perms($dir, $owner_id, $group_id, $perms);
+  }
+  else {
+    # Do nothing. We know nothing about this directory.
+    warn "Unknown directory $dir";
+  }
 }
 
 sub fix_file_permissions {
-    my ($file) = @_;
-    return if ON_WINDOWS;
-    my $perms = FILESYSTEM()->{all_files}->{$file}->{perms};
-    # Note that _get_owner_and_group is always silent here.
-    my ($owner_id, $group_id) = _get_owner_and_group();
-    _fix_perms($file, $owner_id, $group_id, $perms);
+  my ($file) = @_;
+  return if ON_WINDOWS;
+  my $perms = FILESYSTEM()->{all_files}->{$file}->{perms};
+
+  # Note that _get_owner_and_group is always silent here.
+  my ($owner_id, $group_id) = _get_owner_and_group();
+  _fix_perms($file, $owner_id, $group_id, $perms);
 }
 
 sub fix_all_file_permissions {
-    my ($output) = @_;
+  my ($output) = @_;
 
-    # _get_owner_and_group also checks that the webservergroup is valid.
-    my ($owner_id, $group_id) = _get_owner_and_group($output);
+  # _get_owner_and_group also checks that the webservergroup is valid.
+  my ($owner_id, $group_id) = _get_owner_and_group($output);
 
-    return if ON_WINDOWS;
+  return if ON_WINDOWS;
 
-    my $fs = FILESYSTEM();
-    my %files = %{$fs->{all_files}};
-    my %dirs  = %{$fs->{all_dirs}};
-    my %recurse_dirs = %{$fs->{recurse_dirs}};
+  my $fs           = FILESYSTEM();
+  my %files        = %{$fs->{all_files}};
+  my %dirs         = %{$fs->{all_dirs}};
+  my %recurse_dirs = %{$fs->{recurse_dirs}};
 
-    print get_text('install_file_perms_fix') . "\n" if $output;
+  print get_text('install_file_perms_fix') . "\n" if $output;
 
-    foreach my $dir (sort keys %dirs) {
-        next unless -d $dir;
-        _fix_perms($dir, $owner_id, $group_id, $dirs{$dir});
-    }
+  foreach my $dir (sort keys %dirs) {
+    next unless -d $dir;
+    _fix_perms($dir, $owner_id, $group_id, $dirs{$dir});
+  }
 
-    foreach my $pattern (sort keys %recurse_dirs) {
-        my $perms = $recurse_dirs{$pattern};
-        # %recurse_dirs supports globs
-        foreach my $dir (glob $pattern) {
-            next unless -d $dir;
-            _fix_perms_recursively($dir, $owner_id, $group_id, $perms);
-        }
+  foreach my $pattern (sort keys %recurse_dirs) {
+    my $perms = $recurse_dirs{$pattern};
+
+    # %recurse_dirs supports globs
+    foreach my $dir (glob $pattern) {
+      next unless -d $dir;
+      _fix_perms_recursively($dir, $owner_id, $group_id, $perms);
     }
+  }
 
-    foreach my $file (sort keys %files) {
-        # %files supports globs
-        foreach my $filename (glob $file) {
-            # Don't touch directories.
-            next if -d $filename || !-e $filename;
-            _fix_perms($filename, $owner_id, $group_id, 
-                       $files{$file}->{perms});
-        }
+  foreach my $file (sort keys %files) {
+
+    # %files supports globs
+    foreach my $filename (glob $file) {
+
+      # Don't touch directories.
+      next if -d $filename || !-e $filename;
+      _fix_perms($filename, $owner_id, $group_id, $files{$file}->{perms});
     }
+  }
 
-    _fix_cvs_dirs($owner_id, '.');
+  _fix_cvs_dirs($owner_id, '.');
 }
 
 sub _get_owner_and_group {
-    my ($output) = @_;
-    my $group_id = _check_web_server_group($output);
-    return () if ON_WINDOWS;
+  my ($output) = @_;
+  my $group_id = _check_web_server_group($output);
+  return () if ON_WINDOWS;
 
-    my $owner_id = POSIX::getuid();
-    $group_id = POSIX::getgid() unless defined $group_id;
-    return ($owner_id, $group_id);
+  my $owner_id = POSIX::getuid();
+  $group_id = POSIX::getgid() unless defined $group_id;
+  return ($owner_id, $group_id);
 }
 
 # A helper for fix_all_file_permissions
 sub _fix_cvs_dirs {
-    my ($owner_id, $dir) = @_;
-    my $owner_gid = POSIX::getgid();
-    find({ no_chdir => 1, wanted => sub {
+  my ($owner_id, $dir) = @_;
+  my $owner_gid = POSIX::getgid();
+  find(
+    {
+      no_chdir => 1,
+      wanted   => sub {
         my $name = $File::Find::name;
-        if ($File::Find::dir =~ /\/CVS/ || $_ eq '.cvsignore'
-            || (-d $name && $_ =~ /CVS$/)) 
+        if ( $File::Find::dir =~ /\/CVS/
+          || $_ eq '.cvsignore'
+          || (-d $name && $_ =~ /CVS$/))
         {
-            my $perms = 0600;
-            if (-d $name) {
-                $perms = 0700;
-            }
-            _fix_perms($name, $owner_id, $owner_gid, $perms);
+          my $perms = 0600;
+          if (-d $name) {
+            $perms = 0700;
+          }
+          _fix_perms($name, $owner_id, $owner_gid, $perms);
         }
-    }}, $dir);
+      }
+    },
+    $dir
+  );
 }
 
 sub _fix_perms {
-    my ($name, $owner, $group, $perms) = @_;
-    #printf ("Changing $name to %o\n", $perms);
-
-    # The webserver should never try to chown files.
-    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-        chown $owner, $group, $name
-            or warn install_string('chown_failed', { path => $name, 
-                                                     error => $! }) . "\n";
-    }
-    chmod $perms, $name
-        or warn install_string('chmod_failed', { path => $name, 
-                                                 error => $! }) . "\n";
+  my ($name, $owner, $group, $perms) = @_;
+
+  #printf ("Changing $name to %o\n", $perms);
+
+  # The webserver should never try to chown files.
+  if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+    chown $owner, $group, $name
+      or warn install_string('chown_failed', {path => $name, error => $!}) . "\n";
+  }
+  chmod $perms, $name
+    or warn install_string('chmod_failed', {path => $name, error => $!}) . "\n";
 }
 
 sub _fix_perms_recursively {
-    my ($dir, $owner_id, $group_id, $perms) = @_;
-    # Set permissions on the directory itself.
-    _fix_perms($dir, $owner_id, $group_id, $perms->{dirs});
-    # Now recurse through the directory and set the correct permissions
-    # on subdirectories and files.
-    find({ no_chdir => 1, wanted => sub {
+  my ($dir, $owner_id, $group_id, $perms) = @_;
+
+  # Set permissions on the directory itself.
+  _fix_perms($dir, $owner_id, $group_id, $perms->{dirs});
+
+  # Now recurse through the directory and set the correct permissions
+  # on subdirectories and files.
+  find(
+    {
+      no_chdir => 1,
+      wanted   => sub {
         my $name = $File::Find::name;
         if (-d $name) {
-            _fix_perms($name, $owner_id, $group_id, $perms->{dirs});
+          _fix_perms($name, $owner_id, $group_id, $perms->{dirs});
         }
         else {
-            _fix_perms($name, $owner_id, $group_id, $perms->{files});
+          _fix_perms($name, $owner_id, $group_id, $perms->{files});
         }
-    }}, $dir);
+      }
+    },
+    $dir
+  );
 }
 
 sub _check_web_server_group {
-    my ($output) = @_;
-
-    my $group    = Bugzilla->localconfig->{'webservergroup'};
-    my $filename = bz_locations()->{'localconfig'};
-    my $group_id;
-
-    # If we are on Windows, webservergroup does nothing
-    if (ON_WINDOWS && $group && $output) {
-        print "\n\n" . get_text('install_webservergroup_windows') . "\n\n";
-    }
-
-    # If we're not on Windows, make sure that webservergroup isn't
-    # empty.
-    elsif (!ON_WINDOWS && !$group && $output) {
-        print "\n\n" . get_text('install_webservergroup_empty') . "\n\n";
-    }
-
-    # If we're not on Windows, make sure we are actually a member of
-    # the webservergroup.
-    elsif (!ON_WINDOWS && $group) {
-        $group_id = getgrnam($group);
-        ThrowCodeError('invalid_webservergroup', { group => $group }) 
-            unless defined $group_id;
-
-        # If on unix, see if we need to print a warning about a webservergroup
-        # that we can't chgrp to
-        if ($output && $< != 0 && !grep($_ eq $group_id, split(" ", $)))) {
-            print "\n\n" . get_text('install_webservergroup_not_in') . "\n\n";
-        }
+  my ($output) = @_;
+
+  my $group    = Bugzilla->localconfig->{'webservergroup'};
+  my $filename = bz_locations()->{'localconfig'};
+  my $group_id;
+
+  # If we are on Windows, webservergroup does nothing
+  if (ON_WINDOWS && $group && $output) {
+    print "\n\n" . get_text('install_webservergroup_windows') . "\n\n";
+  }
+
+  # If we're not on Windows, make sure that webservergroup isn't
+  # empty.
+  elsif (!ON_WINDOWS && !$group && $output) {
+    print "\n\n" . get_text('install_webservergroup_empty') . "\n\n";
+  }
+
+  # If we're not on Windows, make sure we are actually a member of
+  # the webservergroup.
+  elsif (!ON_WINDOWS && $group) {
+    $group_id = getgrnam($group);
+    ThrowCodeError('invalid_webservergroup', {group => $group})
+      unless defined $group_id;
+
+    # If on unix, see if we need to print a warning about a webservergroup
+    # that we can't chgrp to
+    if ($output && $< != 0 && !grep($_ eq $group_id, split(" ", $)))) {
+      print "\n\n" . get_text('install_webservergroup_not_in') . "\n\n";
     }
+  }
 
-    return $group_id;
+  return $group_id;
 }
 
 1;
diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 7f473cc77f..811bfada64 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -15,7 +15,7 @@ package Bugzilla::Install::Localconfig;
 # * Files do not have the correct permissions
 # * The database is not up to date
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,157 +25,145 @@ use Bugzilla::Util qw(generate_random_password wrap_hard);
 
 use Data::Dumper;
 use File::Basename qw(dirname);
+use English qw($EGID);
+use List::Util qw(first);
+use Tie::Hash::NamedCapture;
 use Safe;
 use Term::ANSIColor;
 
 use parent qw(Exporter);
 
 our @EXPORT_OK = qw(
-    read_localconfig
-    update_localconfig
+  read_localconfig
+  update_localconfig
 );
 
+sub _sensible_group {
+  return '' if ON_WINDOWS;
+  my @groups = qw( apache www-data _www );
+  my $sensible_group = first { return getgrnam($_) } @groups;
+
+  return $sensible_group // getgrgid($EGID) // '';
+}
+
 use constant LOCALCONFIG_VARS => (
-    {
-        name    => 'create_htaccess',
-        default => 1,
-    },
-    {
-        name    => 'webservergroup',
-        default => ON_WINDOWS ? '' : 'apache',
-    },
-    {
-        name    => 'use_suexec',
-        default => 0,
-    },
-    {
-        name    => 'db_driver',
-        default => 'mysql',
-    },
-    {
-        name    => 'db_host',
-        default => 'localhost',           
-    },
-    {
-        name    => 'db_name',
-        default => 'bugs',
-    },
-    {
-        name    => 'db_user',
-        default => 'bugs',
-    },
-    {
-        name    => 'db_pass',
-        default => '',
-    },
-    {
-        name    => 'db_port',
-        default => 0,
-    },
-    {
-        name    => 'db_sock',
-        default => '',
-    },
-    {
-        name    => 'db_check',
-        default => 1,
-    },
-    {
-        name    => 'db_mysql_ssl_ca_file',
-        default => '',
-    },
-    {
-        name    => 'db_mysql_ssl_ca_path',
-        default => '',
-    },
-    {
-        name    => 'db_mysql_ssl_client_cert',
-        default => '',
-    },
-    {
-        name    => 'db_mysql_ssl_client_key',
-        default => '',
-    },
-    {
-        name    => 'index_html',
-        default => 0,
-    },
-    {
-        name    => 'interdiffbin',
-        default => sub { bin_loc('interdiff') },
-    },
-    {
-        name    => 'diffpath',
-        default => sub { dirname(bin_loc('diff')) },
-    },
-    {
-        name    => 'site_wide_secret',
-        # 64 characters is roughly the equivalent of a 384-bit key, which
-        # is larger than anybody would ever be able to brute-force.
-        default => sub { generate_random_password(64) },
-    },
+  {name => 'create_htaccess',          default => 1,},
+  {name => 'webservergroup',           default => _sensible_group(),},
+  {name => 'use_suexec',               default => 0,},
+  {name => 'db_from_env',              default => 0,},
+  {name => 'db_driver',                default => 'sqlite',},
+  {name => 'db_host',                  default => 'localhost',},
+  {name => 'db_name',                  default => 'bugs',},
+  {name => 'db_user',                  default => 'bugs',},
+  {name => 'db_pass',                  default => '',},
+  {name => 'db_port',                  default => 0,},
+  {name => 'db_sock',                  default => '',},
+  {name => 'db_check',                 default => 1,},
+  {name => 'db_mysql_ssl_ca_file',     default => '',},
+  {name => 'db_mysql_ssl_ca_path',     default => '',},
+  {name => 'db_mysql_ssl_client_cert', default => '',},
+  {name => 'db_mysql_ssl_client_key',  default => '',},
+  {name => 'index_html',               default => 0,},
+  {name => 'interdiffbin',             default => sub { bin_loc('interdiff') },},
+  {name => 'diffpath',   default => sub { dirname(bin_loc('diff')) },},
+  {name => 'font_file',  default => '',},
+  {name => 'webdotbase', default => '',},
+  {
+    name => 'site_wide_secret',
+
+    # 64 characters is roughly the equivalent of a 384-bit key, which
+    # is larger than anybody would ever be able to brute-force.
+    default => sub { generate_random_password(64) },
+  },
+  {name => 'apache_size_limit', default => 250000,},
 );
 
+
 sub read_localconfig {
-    my ($include_deprecated) = @_;
-    my $filename = bz_locations()->{'localconfig'};
-
-    my %localconfig;
-    if (-e $filename) {
-        my $s = new Safe;
-        # Some people like to store their database password in another file.
-        $s->permit('dofile');
-
-        $s->rdo($filename);
-        if ($@ || $!) {
-            my $err_msg = $@ ? $@ : $!;
-            die install_string('error_localconfig_read',
-                    { error => $err_msg, localconfig => $filename }), "\n";
-        }
+  my ($include_deprecated) = @_;
+  my $filename = bz_locations()->{'localconfig'};
+
+  my %localconfig;
+  if (-e $filename) {
+    my $s = new Safe;
+
+    # Some people like to store their database password in another file.
+    $s->permit('dofile');
+
+    $s->rdo($filename);
+    if ($@ || $!) {
+      my $err_msg = $@ ? $@ : $!;
+      die install_string(
+        'error_localconfig_read', {error => $err_msg, localconfig => $filename}
+        ),
+        "\n";
+    }
 
-        my @read_symbols;
-        if ($include_deprecated) {
-            # First we have to get the whole symbol table
-            my $safe_root = $s->root;
-            my %safe_package;
-            { no strict 'refs'; %safe_package = %{$safe_root . "::"}; }
-            # And now we read the contents of every var in the symbol table.
-            # However:
-            # * We only include symbols that start with an alphanumeric
-            #   character. This excludes symbols like "_<./localconfig"
-            #   that show up in some perls.
-            # * We ignore the INC symbol, which exists in every package.
-            # * Perl 5.10 imports a lot of random symbols that all
-            #   contain "::", and we want to ignore those.
-            @read_symbols = grep { /^[A-Za-z0-1]/ and !/^INC$/ and !/::/ }
-                                 (keys %safe_package);
-        }
-        else {
-            @read_symbols = map($_->{name}, LOCALCONFIG_VARS);
-        }
-        foreach my $var (@read_symbols) {
-            my $glob = $s->varglob($var);
-            # We can't get the type of a variable out of a Safe automatically.
-            # We can only get the glob itself. So we figure out its type this
-            # way, by trying first a scalar, then an array, then a hash.
-            #
-            # The interesting thing is that this converts all deprecated 
-            # array or hash vars into hashrefs or arrayrefs, but that's 
-            # fine since as I write this all modern localconfig vars are 
-            # actually scalars.
-            if (defined $$glob) {
-                $localconfig{$var} = $$glob;
-            }
-            elsif (@$glob) {
-                $localconfig{$var} = \@$glob;
-            }
-            elsif (%$glob) {
-                $localconfig{$var} = \%$glob;
-            }
-        }
+    my @read_symbols;
+    if ($include_deprecated) {
+
+      # First we have to get the whole symbol table
+      my $safe_root = $s->root;
+      my %safe_package;
+      { no strict 'refs'; %safe_package = %{$safe_root . "::"}; }
+
+      # And now we read the contents of every var in the symbol table.
+      # However:
+      # * We only include symbols that start with an alphanumeric
+      #   character. This excludes symbols like "_<./localconfig"
+      #   that show up in some perls.
+      # * We ignore the INC symbol, which exists in every package.
+      # * Perl 5.10 imports a lot of random symbols that all
+      #   contain "::", and we want to ignore those.
+      @read_symbols
+        = grep { /^[A-Za-z0-1]/ and !/^INC$/ and !/::/ } (keys %safe_package);
+    }
+    else {
+      @read_symbols = map($_->{name}, LOCALCONFIG_VARS);
+    }
+    foreach my $var (@read_symbols) {
+      my $glob = $s->varglob($var);
+
+      # We can't get the type of a variable out of a Safe automatically.
+      # We can only get the glob itself. So we figure out its type this
+      # way, by trying first a scalar, then an array, then a hash.
+      #
+      # The interesting thing is that this converts all deprecated
+      # array or hash vars into hashrefs or arrayrefs, but that's
+      # fine since as I write this all modern localconfig vars are
+      # actually scalars.
+      if (defined $$glob) {
+        $localconfig{$var} = $$glob;
+      }
+      elsif (@$glob) {
+        $localconfig{$var} = \@$glob;
+      }
+      elsif (%$glob) {
+        $localconfig{$var} = \%$glob;
+      }
     }
+  }
+  require Bugzilla::Error;
+  if ($localconfig{db_from_env}) {
+    if (Bugzilla->has_feature('db_from_env')) {
+      require URI::db;
+      unless ($ENV{DATABASE_URL}) {
+        Bugzilla::Error::ThrowUserError('missing_database_url');
+      }
+      my $uri = URI::db->new($ENV{DATABASE_URL});
+      $localconfig{db_driver} = $uri->canonical_engine;
+      $localconfig{db_name}   = $uri->dbname;
+      $localconfig{db_host}   = $uri->host;
+      $localconfig{db_user}   = $uri->user;
+      $localconfig{db_pass}   = $uri->password;
+      $localconfig{db_port}   = $uri->port // 0;
+    }
+    else {
+      Bugzilla::Error::ThrowUserError('feature_disabled', {feature => 'db_from_env'});
+    }
+  }
 
-    return \%localconfig;
+  return \%localconfig;
 }
 
 
@@ -204,94 +192,107 @@ sub read_localconfig {
 # Cute, ey?
 #
 sub update_localconfig {
-    my ($params) = @_;
-
-    my $output      = $params->{output} || 0;
-    my $answer      = Bugzilla->installation_answers;
-    my $localconfig = read_localconfig('include deprecated');
-
-    my @new_vars;
-    foreach my $var (LOCALCONFIG_VARS) {
-        my $name = $var->{name};
-        my $value = $localconfig->{$name};
-        # Regenerate site_wide_secret if it was made by our old, weak
-        # generate_random_password. Previously we used to generate
-        # a 256-character string for site_wide_secret.
-        $value = undef if ($name eq 'site_wide_secret' and defined $value
-                           and length($value) == 256);
-
-        if (!defined $value) {
-            $var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
-            if (exists $answer->{$name}) {
-                $localconfig->{$name} = $answer->{$name};
-            }
-            else {
-                # If the user did not supply an answers file, then they get
-                # notified about every variable that gets added. If there was
-                # an answer file, then we don't notify about site_wide_secret
-                # because we assume the intent was to auto-generate it anyway.
-                if (!scalar(keys %$answer) || $name ne 'site_wide_secret') {
-                    push(@new_vars, $name);
-                }
-                $localconfig->{$name} = $var->{default};
-            }
+  my ($params) = @_;
+
+  my $output      = $params->{output} || 0;
+  my $answer      = Bugzilla->installation_answers;
+  my $localconfig = read_localconfig('include deprecated');
+  my $db_from_env = Bugzilla->localconfig->{db_from_env};
+
+  my @new_vars;
+  foreach my $var (LOCALCONFIG_VARS) {
+    my $name  = $var->{name};
+    my $value = $localconfig->{$name};
+
+    # Regenerate site_wide_secret if it was made by our old, weak
+    # generate_random_password. Previously we used to generate
+    # a 256-character string for site_wide_secret.
+    $value = undef
+      if ($name eq 'site_wide_secret' and defined $value and length($value) == 256);
+
+    if (!defined $value) {
+      $var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
+      if (exists $answer->{$name}) {
+        $localconfig->{$name} = $answer->{$name};
+      }
+      elsif (exists Bugzilla->params->{$name}) {
+        $localconfig->{$name} = Bugzilla->params->{$name};
+      }
+      else {
+        # If the user did not supply an answers file, then they get
+        # notified about every variable that gets added. If there was
+        # an answer file, then we don't notify about site_wide_secret
+        # because we assume the intent was to auto-generate it anyway.
+        if (!scalar(keys %$answer) || $name ne 'site_wide_secret') {
+          push(@new_vars, $name) unless $db_from_env && $name =~ /^db_(?!from_env)/;
         }
+        $localconfig->{$name} = $var->{default};
+      }
     }
-
-    if (!$localconfig->{'interdiffbin'} && $output) {
-        print "\n", install_string('patchutils_missing'), "\n";
+  }
+
+  if (!$localconfig->{'interdiffbin'} && $output) {
+    print "\n", install_string('patchutils_missing'), "\n";
+  }
+
+  my @old_vars;
+  foreach my $var (keys %$localconfig) {
+    push(@old_vars, $var) if !grep($_->{name} eq $var, LOCALCONFIG_VARS);
+  }
+
+  my $filename = bz_locations->{'localconfig'};
+
+  # Move any custom or old variables into a separate file.
+  if (scalar @old_vars) {
+    my $filename_old = "$filename.old";
+    open(my $old_file, ">>:utf8", $filename_old) or die "$filename_old: $!";
+    local $Data::Dumper::Purity = 1;
+    foreach my $var (@old_vars) {
+      print $old_file Data::Dumper->Dump([$localconfig->{$var}], ["*$var"]) . "\n\n";
     }
-
-    my @old_vars;
-    foreach my $var (keys %$localconfig) {
-        push(@old_vars, $var) if !grep($_->{name} eq $var, LOCALCONFIG_VARS);
+    close $old_file;
+    my $oldstuff = join(', ', @old_vars);
+    print install_string('lc_old_vars',
+      {localconfig => $filename, old_file => $filename_old, vars => $oldstuff}),
+      "\n";
+  }
+
+  # Re-write localconfig
+  open(my $fh, ">:utf8", $filename) or die "$filename: $!";
+  foreach my $var (LOCALCONFIG_VARS) {
+    my $name = $var->{name};
+    my $desc = $var->{desc};
+
+    next if $db_from_env && $name =~ /^db_(?!from_env)/;
+
+    if (!length $desc) {
+      $desc = install_string("localconfig_$name", {root => ROOT_USER});
+      chomp($desc);
+
+      # Make the description into a comment.
+      $desc =~ s/^/# /mg;
+      $desc .= "\n";
     }
-
-    my $filename = bz_locations->{'localconfig'};
-
-    # Move any custom or old variables into a separate file.
-    if (scalar @old_vars) {
-        my $filename_old = "$filename.old";
-        open(my $old_file, ">>:utf8", $filename_old) 
-            or die "$filename_old: $!";
-        local $Data::Dumper::Purity = 1;
-        foreach my $var (@old_vars) {
-            print $old_file Data::Dumper->Dump([$localconfig->{$var}], 
-                                               ["*$var"]) . "\n\n";
-        }
-        close $old_file;
-        my $oldstuff = join(', ', @old_vars);
-        print install_string('lc_old_vars',
-            { localconfig => $filename, old_file => $filename_old,
-              vars => $oldstuff }), "\n";
-    }
-
-    # Re-write localconfig
-    open(my $fh, ">:utf8", $filename) or die "$filename: $!";
-    foreach my $var (LOCALCONFIG_VARS) {
-        my $name = $var->{name};
-        my $desc = install_string("localconfig_$name", { root => ROOT_USER });
-        chomp($desc);
-        # Make the description into a comment.
-        $desc =~ s/^/# /mg;
-        print $fh $desc, "\n",
-                  Data::Dumper->Dump([$localconfig->{$name}],
-                                     ["*$name"]), "\n";
-   }
-
-    if (@new_vars) {
-        my $newstuff = join(', ', @new_vars);
-        print "\n";
-        print colored(install_string('lc_new_vars', { localconfig => $filename,
-                                                      new_vars => wrap_hard($newstuff, 70) }),
-                      COLOR_ERROR), "\n";
-        exit;
-    }
-
-    # Reset the cache for Bugzilla->localconfig so that it will be re-read
-    delete Bugzilla->request_cache->{localconfig};
-
-    return { old_vars => \@old_vars, new_vars => \@new_vars };
+    print $fh $desc, Data::Dumper->Dump([$localconfig->{$name}], ["*$name"]), "\n";
+  }
+
+  if (@new_vars) {
+    my $newstuff = join(', ', @new_vars);
+    print "\n";
+    print colored(
+      install_string(
+        'lc_new_vars', {localconfig => $filename, new_vars => wrap_hard($newstuff, 70)}
+      ),
+      COLOR_ERROR
+      ),
+      "\n";
+    exit;
+  }
+
+  # Reset the cache for Bugzilla->localconfig so that it will be re-read
+  delete Bugzilla->request_cache->{localconfig};
+
+  return {old_vars => \@old_vars, new_vars => \@new_vars};
 }
 
 1;
@@ -320,15 +321,16 @@ to access localconfig variables.
 
 =item C<LOCALCONFIG_VARS>
 
-An array of hashrefs. These hashrefs contain three keys:
+An array of hashrefs. These hashrefs contain two or three keys:
 
  name    - The name of the variable.
  default - The default value for the variable. Should always be
            something that can fit in a scalar.
- desc    - Additional text to put in localconfig before the variable
+ desc    - If present, additional text to put in localconfig before the variable
            definition. Must end in a newline. Each line should start
            with "#" unless you have some REALLY good reason not
-           to do that.
+           to do that.  If not present, the description is taken from
+           F<template/en/default/setup/strings.txt>.
 
 =item C<OLD_LOCALCONFIG_VARS>
 
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index db3d7b0286..fbd74b320f 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -13,29 +13,37 @@ package Bugzilla::Install::Requirements;
 # Subroutines may "require" and "import" from modules, but they
 # MUST NOT "use."
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Constants;
-use Bugzilla::Install::Util qw(install_string bin_loc
-                               extension_requirement_packages);
+use Bugzilla::Install::Util qw(install_string bin_loc success
+  extension_requirement_packages);
 use List::Util qw(max);
 use Term::ANSIColor;
+use CPAN::Meta;
+use CPAN::Meta::Prereqs;
+use CPAN::Meta::Requirements;
+use Module::Metadata;
 
 use parent qw(Exporter);
+use autodie;
+
 our @EXPORT = qw(
-    REQUIRED_MODULES
-    OPTIONAL_MODULES
-    FEATURE_FILES
-
-    check_requirements
-    check_graphviz
-    have_vers
-    install_command
-    map_files_to_features
+  FEATURE_FILES
+
+  load_cpan_meta
+  check_cpan_requirements
+  check_cpan_feature
+  check_all_cpan_features
+  check_webdotbase
+  check_font_file
+  map_files_to_features
 );
 
+our $checking_for_indent = 0;
+
 # This is how many *'s are in the top of each "box" message printed
 # by checksetup.pl.
 use constant TABLE_WIDTH => 71;
@@ -45,10 +53,12 @@ use constant TABLE_WIDTH => 71;
 #
 # The keys are the names of the modules, the values are what the module
 # is called in the output of "apachectl -t -D DUMP_MODULES".
-use constant APACHE_MODULES => { 
-    mod_headers => 'headers_module',
-    mod_env     => 'env_module',
-    mod_expires => 'expires_module',
+use constant APACHE_MODULES => {
+  mod_headers => 'headers_module',
+  mod_env     => 'env_module',
+  mod_expires => 'expires_module',
+  mod_rewrite => 'rewrite_module',
+  mod_version => 'version_module'
 };
 
 # These are all of the binaries that we could possibly use that can
@@ -61,745 +71,282 @@ use constant APACHE => qw(apachectl httpd apache2 apache);
 
 # If we don't find any of the above binaries in the normal PATH,
 # these are extra places we look.
-use constant APACHE_PATH => [qw(
-    /usr/sbin 
+use constant APACHE_PATH => [
+  qw(
+    /usr/sbin
     /usr/local/sbin
     /usr/libexec
     /usr/local/libexec
-)];
-
-# The below two constants are subroutines so that they can implement
-# a hook. Other than that they are actually constants.
-
-# "package" is the perl package we're checking for. "module" is the name
-# of the actual module we load with "require" to see if the package is
-# installed or not. "version" is the version we need, or 0 if we'll accept
-# any version.
-#
-# "blacklist" is an arrayref of regular expressions that describe versions that
-# are 'blacklisted'--that is, even if the version is high enough, Bugzilla
-# will refuse to say that it's OK to run with that version.
-sub REQUIRED_MODULES {
-    my @modules = (
-    {
-        package => 'CGI.pm',
-        module  => 'CGI',
-        # 3.51 fixes a security problem that affects Bugzilla.
-        # (bug 591165)
-        version => '3.51',
-    },
-    {
-        package => 'Digest-SHA',
-        module  => 'Digest::SHA',
-        version => 0
-    },
-    # 0.23 fixes incorrect handling of 1/2 & 3/4 timezones.
-    {
-        package => 'TimeDate',
-        module  => 'Date::Format',
-        version => '2.23'
-    },
-    # 0.75 fixes a warning thrown with Perl 5.17 and newer.
-    {
-        package => 'DateTime',
-        module  => 'DateTime',
-        version => '0.75'
-    },
-    # 1.64 fixes a taint issue preventing the local timezone from
-    # being determined on some systems.
-    {
-        package => 'DateTime-TimeZone',
-        module  => 'DateTime::TimeZone',
-        version => '1.64'
-    },
-    # 1.54 is required for Perl 5.10+. It also makes DBD::Oracle happy.
-    {
-        package => 'DBI',
-        module  => 'DBI',
-        version => ($^V >= v5.13.3) ? '1.614' : '1.54'
-    },
-    # 2.24 contains several useful text virtual methods.
-    {
-        package => 'Template-Toolkit',
-        module  => 'Template',
-        version => '2.24'
-    },
-    # 1.300011 has a debug mode for SMTP and automatically pass -i to sendmail.
-    {
-        package => 'Email-Sender',
-        module  => 'Email::Sender',
-        version => '1.300011',
-    },
-    {
-        package => 'Email-MIME',
-        module  => 'Email::MIME',
-        # This fixes a memory leak in walk_parts that affected jobqueue.pl.
-        version => '1.904'
-    },
-    {
-        package => 'URI',
-        module  => 'URI',
-        # Follows RFC 3986 to escape characters in URI::Escape.
-        version => '1.55',
-    },
-    # 0.32 fixes several memory leaks in the XS version of some functions.
-    {
-        package => 'List-MoreUtils',
-        module  => 'List::MoreUtils',
-        version => 0.32,
-    },
-    {
-        package => 'Math-Random-ISAAC',
-        module  => 'Math::Random::ISAAC',
-        version => '1.0.1',
-    },
-    {
-        package => 'File-Slurp',
-        module  => 'File::Slurp',
-        version => '9999.13',
-    },
-    {
-        package => 'JSON-XS',
-        module  => 'JSON::XS',
-        # 2.0 is the first version that will work with JSON::RPC.
-        version => '2.01',
-    },
-    );
-
-    if (ON_WINDOWS) {
-        push(@modules, {
-            package => 'Win32',
-            module  => 'Win32',
-            # 0.35 fixes a memory leak in GetOSVersion, which we use.
-            version => 0.35,
-        }, 
-        {
-            package => 'Win32-API',
-            module  => 'Win32::API',
-            # 0.55 fixes a bug with char* that might affect Bugzilla::RNG.
-            version => '0.55',
-        });
-    }
-
-    my $extra_modules = _get_extension_requirements('REQUIRED_MODULES');
-    push(@modules, @$extra_modules);
-    return \@modules;
-};
-
-sub OPTIONAL_MODULES {
-    my @modules = (
-    {
-        package => 'GD',
-        module  => 'GD',
-        version => '1.20',
-        feature => [qw(graphical_reports new_charts old_charts)],
-    },
-    {
-        package => 'Chart',
-        module  => 'Chart::Lines',
-        # Versions below 2.4.1 cannot be compared accurately, see
-        # https://rt.cpan.org/Public/Bug/Display.html?id=28218.
-        version => '2.4.1',
-        feature => [qw(new_charts old_charts)],
-    },
-    {
-        package => 'Template-GD',
-        # This module tells us whether or not Template-GD is installed
-        # on Template-Toolkits after 2.14, and still works with 2.14 and lower.
-        module  => 'Template::Plugin::GD::Image',
-        version => 0,
-        feature => ['graphical_reports'],
-    },
-    {
-        package => 'GDTextUtil',
-        module  => 'GD::Text',
-        version => 0,
-        feature => ['graphical_reports'],
-    },
-    {
-        package => 'GDGraph',
-        module  => 'GD::Graph',
-        version => 0,
-        feature => ['graphical_reports'],
-    },
-    {
-        package => 'MIME-tools',
-        # MIME::Parser is packaged as MIME::Tools on ActiveState Perl
-        module  => ON_WINDOWS ? 'MIME::Tools' : 'MIME::Parser',
-        version => '5.406',
-        feature => ['moving'],
-    },
-    {
-        package => 'libwww-perl',
-        module  => 'LWP::UserAgent',
-        version => 0,
-        feature => ['updates'],
-    },
-    {
-        package => 'XML-Twig',
-        module  => 'XML::Twig',
-        version => 0,
-        feature => ['moving', 'updates'],
-    },
-    {
-        package => 'PatchReader',
-        module  => 'PatchReader',
-        # 0.9.6 fixes two notable bugs and significantly improves the UX.
-        version => '0.9.6',
-        feature => ['patch_viewer'],
-    },
-    {
-        package => 'perl-ldap',
-        module  => 'Net::LDAP',
-        version => 0,
-        feature => ['auth_ldap'],
-    },
-    {
-        package => 'Authen-SASL',
-        module  => 'Authen::SASL',
-        version => 0,
-        feature => ['smtp_auth'],
-    },
-    {
-        package => 'Net-SMTP-SSL',
-        module  => 'Net::SMTP::SSL',
-        version => 1.01,
-        feature => ['smtp_ssl'],
-    },
-    {
-        package => 'RadiusPerl',
-        module  => 'Authen::Radius',
-        version => 0,
-        feature => ['auth_radius'],
-    },
-    # XXX - Once we require XMLRPC::Lite 0.717 or higher, we can
-    # remove SOAP::Lite from the list.
-    {
-        package => 'SOAP-Lite',
-        module  => 'SOAP::Lite',
-        # Fixes various bugs, including 542931 and 552353 + stops
-        # throwing warnings with Perl 5.12.
-        version => '0.712',
-        feature => ['xmlrpc'],
-    },
-    # Since SOAP::Lite 1.0, XMLRPC::Lite is no longer included
-    # and so it must be checked separately.
-    {
-        package => 'XMLRPC-Lite',
-        module  => 'XMLRPC::Lite',
-        version => '0.712',
-        feature => ['xmlrpc'],
-    },
-    {
-        package => 'JSON-RPC',
-        module  => 'JSON::RPC',
-        version => 0,
-        feature => ['jsonrpc', 'rest'],
-    },
-    {
-        package => 'Test-Taint',
-        module  => 'Test::Taint',
-        # 1.06 no longer throws warnings with Perl 5.10+.
-        version => 1.06,
-        feature => ['jsonrpc', 'xmlrpc', 'rest'],
-    },
-    {
-        # We need the 'utf8_mode' method of HTML::Parser, for HTML::Scrubber.
-        package => 'HTML-Parser',
-        module  => 'HTML::Parser',
-        version => ($^V >= v5.13.3) ? '3.67' : '3.40',
-        feature => ['html_desc'],
-    },
-    {
-        package => 'HTML-Scrubber',
-        module  => 'HTML::Scrubber',
-        version => 0,
-        feature => ['html_desc'],
-    },
-    {
-        # we need version 2.21 of Encode for mime_name
-        package => 'Encode',
-        module  => 'Encode',
-        version => 2.21,
-        feature => ['detect_charset'],
-    },
-    {
-        package => 'Encode-Detect',
-        module  => 'Encode::Detect',
-        version => 0,
-        feature => ['detect_charset'],
-    },
-
-    # Inbound Email
-    {
-        package => 'Email-Reply',
-        module  => 'Email::Reply',
-        version => 0,
-        feature => ['inbound_email'],
-    },
-    {
-        package => 'HTML-FormatText-WithLinks',
-        module  => 'HTML::FormatText::WithLinks',
-        # We need 0.13 to set the "bold" marker to "*".
-        version => '0.13',
-        feature => ['inbound_email'],
-    },
-
-    # Mail Queueing
-    {
-        package => 'TheSchwartz',
-        module  => 'TheSchwartz',
-        # 1.07 supports the prioritization of jobs.
-        version => 1.07,
-        feature => ['jobqueue'],
-    },
-    {
-        package => 'Daemon-Generic',
-        module  => 'Daemon::Generic',
-        version => 0,
-        feature => ['jobqueue'],
-    },
-
-    # mod_perl
-    {
-        package => 'mod_perl',
-        module  => 'mod_perl2',
-        version => '1.999022',
-        feature => ['mod_perl'],
-    },
-    {
-        package => 'Apache-SizeLimit',
-        module  => 'Apache2::SizeLimit',
-        # 0.96 properly determines process size on Linux.
-        version => '0.96',
-        feature => ['mod_perl'],
-    },
-
-    # typesniffer
-    {
-        package => 'File-MimeInfo',
-        module  => 'File::MimeInfo::Magic',
-        version => '0',
-        feature => ['typesniffer'],
-    },
-    {
-        package => 'IO-stringy',
-        module  => 'IO::Scalar',
-        version => '0',
-        feature => ['typesniffer'],
-    },
-
-    # memcached
-    {
-        package => 'Cache-Memcached',
-        module  => 'Cache::Memcached',
-        version => '0',
-        feature => ['memcached'],
-    },
-
-    # Markdown
-    {
-        package => 'Text-Markdown',
-        module  => 'Text::Markdown',
-        version => '1.0.26',
-        feature => ['markdown'],
-    }
-    );
-
-    my $extra_modules = _get_extension_requirements('OPTIONAL_MODULES');
-    push(@modules, @$extra_modules);
-    return \@modules;
-};
+    )
+];
 
 # This maps features to the files that require that feature in order
 # to compile. It is used by t/001compile.t and mod_perl.pl.
 use constant FEATURE_FILES => (
-    jsonrpc       => ['Bugzilla/WebService/Server/JSONRPC.pm', 'jsonrpc.cgi'],
-    xmlrpc        => ['Bugzilla/WebService/Server/XMLRPC.pm', 'xmlrpc.cgi',
-                      'Bugzilla/WebService.pm', 'Bugzilla/WebService/*.pm'],
-    rest          => ['Bugzilla/WebService/Server/REST.pm', 'rest.cgi',
-                      'Bugzilla/WebService/Server/REST/Resources/*.pm'],
-    moving        => ['importxml.pl'],
-    auth_ldap     => ['Bugzilla/Auth/Verify/LDAP.pm'],
-    auth_radius   => ['Bugzilla/Auth/Verify/RADIUS.pm'],
-    inbound_email => ['email_in.pl'],
-    jobqueue      => ['Bugzilla/Job/*', 'Bugzilla/JobQueue.pm',
-                      'Bugzilla/JobQueue/*', 'jobqueue.pl'],
-    patch_viewer  => ['Bugzilla/Attachment/PatchReader.pm'],
-    updates       => ['Bugzilla/Update.pm'],
-    markdown      => ['Bugzilla/Markdown.pm'],
-    memcached     => ['Bugzilla/Memcache.pm'],
+  jsonrpc => ['Bugzilla/WebService/Server/JSONRPC.pm', 'jsonrpc.cgi'],
+  xmlrpc  => [
+    'Bugzilla/WebService/Server/XMLRPC.pm', 'xmlrpc.cgi',
+    'Bugzilla/WebService.pm',               'Bugzilla/WebService/*.pm'
+  ],
+  csp           => ['Bugzilla/CGI/ContentSecurityPolicy.pm'],
+  psgi          => ['app.psgi'],
+  moving        => ['importxml.pl'],
+  auth_ldap     => ['Bugzilla/Auth/Verify/LDAP.pm'],
+  auth_radius   => ['Bugzilla/Auth/Verify/RADIUS.pm'],
+  documentation => ['docs/makedocs.pl'],
+  inbound_email => ['email_in.pl'],
+  jobqueue      => [
+    'Bugzilla/Job/*',      'Bugzilla/JobQueue.pm',
+    'Bugzilla/JobQueue/*', 'jobqueue.pl'
+  ],
+  patch_viewer    => ['Bugzilla/Attachment/PatchReader.pm'],
+  updates         => ['Bugzilla/Update.pm'],
+  markdown        => ['Bugzilla/Markdown.pm', 't/100markdown.t'],
+  memcached       => ['Bugzilla/Memcache.pm'],
+  auth_delegation => ['auth.cgi'],
 );
 
-# This implements the REQUIRED_MODULES and OPTIONAL_MODULES stuff
-# described in in Bugzilla::Extension.
-sub _get_extension_requirements {
-    my ($function) = @_;
-
-    my $packages = extension_requirement_packages();
-    my @modules;
-    foreach my $package (@$packages) {
-        if ($package->can($function)) {
-            my $extra_modules = $package->$function;
-            push(@modules, @$extra_modules);
-        }
-    }
-    return \@modules;
-};
+sub load_cpan_meta {
+  my $dir = bz_locations()->{libpath};
+  my @meta_json
+    = map { File::Spec->catfile($dir, $_) } qw( MYMETA.json META.json );
+  my ($file) = grep { -f $_ } @meta_json;
+
+  if ($file) {
+    open my $meta_fh, '<', $file or die "unable to open $file: $!";
+    my $str = do { local $/ = undef; scalar <$meta_fh> };
+
+    # detaint
+    $str =~ /^(.+)$/s;
+    $str = $1;
+    close $meta_fh;
+
+    return CPAN::Meta->load_json_string($str);
+  }
+  else {
+    ThrowCodeError('cpan_meta_missing');
+  }
+}
 
-sub check_requirements {
-    my ($output) = @_;
+sub check_all_cpan_features {
+  my ($meta, $dirs, $output) = @_;
+  my %report;
 
-    print "\n", install_string('checking_modules'), "\n" if $output;
-    my $root = ROOT_USER;
-    my $missing = _check_missing(REQUIRED_MODULES, $output);
+  local $checking_for_indent = 2;
 
-    print "\n", install_string('checking_dbd'), "\n" if $output;
-    my $have_one_dbd = 0;
-    my $db_modules = DB_MODULE;
-    foreach my $db (keys %$db_modules) {
-        my $dbd = $db_modules->{$db}->{dbd};
-        $have_one_dbd = 1 if have_vers($dbd, $output);
-    }
+  print "\nOptional features:\n" if $output;
+  my @features = sort { $a->identifier cmp $b->identifier } $meta->features;
+  foreach my $feature (@features) {
+    next if $feature->identifier eq 'features';
+    printf "Feature '%s': %s\n", $feature->identifier, $feature->description
+      if $output;
+    my $result = check_cpan_feature($feature, $dirs, $output);
+    print "\n" if $output;
 
-    print "\n", install_string('checking_optional'), "\n" if $output;
-    my $missing_optional = _check_missing(OPTIONAL_MODULES, $output);
+    $report{$feature->identifier}
+      = {description => $feature->description, result => $result,};
+  }
 
-    my $missing_apache = _missing_apache_modules(APACHE_MODULES, $output);
+  print install_string('all_optional_features_require'), "\n" if $output;
+  my $features = check_cpan_feature($meta->feature('features'), $dirs, $output);
+  print "\n" if $output;
 
-    # If we're running on Windows, reset the input line terminator so that
-    # console input works properly - loading CGI tends to mess it up
-    $/ = "\015\012" if ON_WINDOWS;
+  $report{features} = {
+    description => $meta->feature('features')->description,
+    result      => $features,
+  };
 
-    my $pass = !scalar(@$missing) && $have_one_dbd;
-    return {
-        pass     => $pass,
-        one_dbd  => $have_one_dbd,
-        missing  => $missing,
-        optional => $missing_optional,
-        apache   => $missing_apache,
-        any_missing => !$pass || scalar(@$missing_optional),
-    };
+  return \%report;
 }
 
-# A helper for check_requirements
-sub _check_missing {
-    my ($modules, $output) = @_;
+sub check_cpan_feature {
+  my ($feature, $dirs, $output) = @_;
 
-    my @missing;
-    foreach my $module (@$modules) {
-        unless (have_vers($module, $output)) {
-            push(@missing, $module);
-        }
-    }
-
-    return \@missing;
+  return _check_prereqs($feature->prereqs, $dirs, $output);
 }
 
-sub _missing_apache_modules {
-    my ($modules, $output) = @_;
-    my $apachectl = _get_apachectl();
-    return [] if !$apachectl;
-    my $command = "$apachectl -t -D DUMP_MODULES";
-    my $cmd_info = `$command 2>&1`;
-    # If apachectl returned a value greater than 0, then there was an
-    # error parsing Apache's configuration, and we can't check modules.
-    my $retval = $?;
-    if ($retval > 0) {
-        print STDERR install_string('apachectl_failed', 
-            { command => $command, root => ROOT_USER }), "\n";
-        return [];
-    }
-    my @missing;
-    foreach my $module (keys %$modules) {
-        my $ok = _check_apache_module($module, $modules->{$module}, 
-                                      $cmd_info, $output);
-        push(@missing, $module) if !$ok;
-    }
-    return \@missing;
-}
+sub check_cpan_requirements {
+  my ($meta, $dirs, $output) = @_;
 
-sub _get_apachectl {
-    foreach my $bin_name (APACHE) {
-        my $bin = bin_loc($bin_name);
-        return $bin if $bin;
-    }
-    # Try again with a possibly different path.
-    foreach my $bin_name (APACHE) {
-        my $bin = bin_loc($bin_name, APACHE_PATH);
-        return $bin if $bin;
-    }
-    return undef;
+  my $result = _check_prereqs($meta->effective_prereqs, $dirs, $output);
+  print colored(install_string('installation_failed'), COLOR_ERROR), "\n"
+    if !$result->{ok} && $output;
+  return $result;
 }
 
-sub _check_apache_module {
-    my ($module, $config_name, $mod_info, $output) = @_;
-    my $ok;
-    if ($mod_info =~ /^\s+\Q$config_name\E\b/m) {
-        $ok = 1;
+sub _check_prereqs {
+  my ($prereqs, $dirs, $output) = @_;
+  $dirs //= \@INC;
+  my $reqs
+    = $prereqs->merged_requirements(['configure', 'runtime'], ['requires']);
+  my @found;
+  my @missing;
+
+  foreach my $module (sort $reqs->required_modules) {
+    my $ok = _check_module($reqs, $module, $dirs, $output);
+    if ($ok) {
+      push @found, $module;
     }
-    if ($output) {
-        _checking_for({ package => $module, ok => $ok });
+    else {
+      push @missing, $module;
     }
-    return $ok;
-}
+  }
 
-sub print_module_instructions {
-    my ($check_results, $output) = @_;
+  return {ok => (@missing == 0), found => \@found, missing => \@missing};
+}
 
-    # First we print the long explanatory messages.
+sub _check_module {
+  my ($reqs, $module, $dirs, $output) = @_;
+  my $required_version = $reqs->requirements_for_module($module);
 
-    if (scalar @{$check_results->{missing}}) {
-        print install_string('modules_message_required');
-    }
+  if ($module eq 'perl') {
+    my $ok = $reqs->accepts_module($module, $]);
+    _checking_for(
+      {package => "perl", found => $], wanted => $required_version, ok => $ok})
+      if $output;
+    return $ok;
+  }
+  else {
+    my $metadata = Module::Metadata->new_from_module($module, inc => $dirs);
+    my $version = eval { $metadata->version };
+    my $ok = $metadata && $version && $reqs->accepts_module($module, $version || 0);
+    _checking_for({
+      package => $module,
+      $version ? (found => $version) : (),
+      wanted => $required_version,
+      ok     => $ok
+    })
+      if $output;
 
-    if (!$check_results->{one_dbd}) {
-        print install_string('modules_message_db');
-    }
+    return $ok;
+  }
+}
 
-    if (my @missing = @{$check_results->{optional}} and $output) {
-        print install_string('modules_message_optional');
-        # Now we have to determine how large the table cols will be.
-        my $longest_name = max(map(length($_->{package}), @missing));
-
-        # The first column header is at least 11 characters long.
-        $longest_name = 11 if $longest_name < 11;
-
-        # The table is TABLE_WIDTH characters long. There are seven mandatory
-        # characters (* and space) in the string. So, we have a total
-        # of TABLE_WIDTH - 7 characters to work with.
-        my $remaining_space = (TABLE_WIDTH - 7) - $longest_name;
-        print '*' x TABLE_WIDTH . "\n";
-        printf "* \%${longest_name}s * %-${remaining_space}s *\n",
-               'MODULE NAME', 'ENABLES FEATURE(S)';
-        print '*' x TABLE_WIDTH . "\n";
-        foreach my $package (@missing) {
-            printf "* \%${longest_name}s * %-${remaining_space}s *\n",
-                   $package->{package}, 
-                   _translate_feature($package->{feature});
-        }
-    }
 
-    if (my @missing = @{ $check_results->{apache} }) {
-        print install_string('modules_message_apache');
-        my $missing_string = join(', ', @missing);
-        my $size = TABLE_WIDTH - 7;
-        printf "*    \%-${size}s *\n", $missing_string;
-        my $spaces = TABLE_WIDTH - 2;
-        print "*", (' ' x $spaces), "*\n";
-    }
+sub _get_apachectl {
+  foreach my $bin_name (APACHE) {
+    my $bin = bin_loc($bin_name);
+    return $bin if $bin;
+  }
+
+  # Try again with a possibly different path.
+  foreach my $bin_name (APACHE) {
+    my $bin = bin_loc($bin_name, APACHE_PATH);
+    return $bin if $bin;
+  }
+  return undef;
+}
 
-    my $need_module_instructions =  
-        ( (!$output and @{$check_results->{missing}})
-          or ($output and $check_results->{any_missing}) ) ? 1 : 0;
+sub check_webdotbase {
+  my ($output) = @_;
 
-    if ($need_module_instructions or @{ $check_results->{apache} }) {
-        # If any output was required, we want to close the "table"
-        print "*" x TABLE_WIDTH . "\n";
-    }
+  my $webdotbase = Bugzilla->localconfig->{'webdotbase'};
+  return 1 if $webdotbase =~ /^https?:/;
 
-    # And now we print the actual installation commands.
+  my $return;
+  $return = 1 if -x $webdotbase;
 
-    if (my @missing = @{$check_results->{optional}} and $output) {
-        print install_string('commands_optional') . "\n\n";
-        foreach my $module (@missing) {
-            my $command = install_command($module);
-            printf "%15s: $command\n", $module->{package};
-        }
-        print "\n";
-    }
+  if ($output) {
+    _checking_for({package => 'GraphViz', ok => $return});
+  }
 
-    if (!$check_results->{one_dbd}) {
-        print install_string('commands_dbd') . "\n";
-        my %db_modules = %{DB_MODULE()};
-        foreach my $db (keys %db_modules) {
-            my $command = install_command($db_modules{$db}->{dbd});
-            printf "%10s: \%s\n", $db_modules{$db}->{name}, $command;
-        }
-        print "\n";
-    }
+  if (!$return) {
+    print install_string('bad_executable', {bin => $webdotbase}), "\n";
+  }
 
-    if (my @missing = @{$check_results->{missing}}) {
-        print colored(install_string('commands_required'), COLOR_ERROR), "\n";
-        foreach my $package (@missing) {
-            my $command = install_command($package);
-            print "    $command\n";
-        }
-    }
+  my $webdotdir = bz_locations()->{'webdotdir'};
 
-    if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE
-        && !$check_results->{hide_all}) 
-    {
-        print install_string('install_all', { perl => $^X });
+  # Check .htaccess allows access to generated images
+  if (-e "$webdotdir/.htaccess") {
+    my $htaccess = new IO::File("$webdotdir/.htaccess", 'r')
+      || die "$webdotdir/.htaccess: " . $!;
+    if (!grep(/ \\\.png\$/, $htaccess->getlines)) {
+      print STDERR install_string('webdot_bad_htaccess', {dir => $webdotdir}), "\n";
     }
-    if (!$check_results->{pass}) {
-        print colored(install_string('installation_failed'), COLOR_ERROR),
-              "\n\n";
-    }
-}
+    $htaccess->close;
+  }
 
-sub _translate_feature {
-    my $features = shift;
-    my @strings;
-    foreach my $feature (@$features) {
-        push(@strings, install_string("feature_$feature"));
-    }
-    return join(', ', @strings);
+  return $return;
 }
 
-sub check_graphviz {
-    my ($output) = @_;
+sub check_font_file {
+  my ($output) = @_;
 
-    my $webdotbase = Bugzilla->params->{'webdotbase'};
-    return 1 if $webdotbase =~ /^https?:/;
+  my $font_file = Bugzilla->localconfig->{'font_file'};
 
-    my $return;
-    $return = 1 if -x $webdotbase;
+  my $readable;
+  $readable = 1 if -r $font_file;
 
-    if ($output) {
-        _checking_for({ package => 'GraphViz', ok => $return });
-    }
+  my $ttf;
+  $ttf = 1 if $font_file =~ /\.(ttf|otf)$/;
 
-    if (!$return) {
-        print install_string('bad_executable', { bin => $webdotbase }), "\n";
-    }
+  if ($output) {
+    _checking_for({package => 'Font file', ok => $readable && $ttf});
+  }
 
-    my $webdotdir = bz_locations()->{'webdotdir'};
-    # Check .htaccess allows access to generated images
-    if (-e "$webdotdir/.htaccess") {
-        my $htaccess = new IO::File("$webdotdir/.htaccess", 'r') 
-            || die "$webdotdir/.htaccess: " . $!;
-        if (!grep(/png/, $htaccess->getlines)) {
-            print STDERR install_string('webdot_bad_htaccess',
-                                        { dir => $webdotdir }), "\n";
-        }
-        $htaccess->close;
-    }
+  if (!$readable) {
+    print install_string('bad_font_file', {file => $font_file}), "\n";
+  }
+  elsif (!$ttf) {
+    print install_string('bad_font_file_name', {file => $font_file}), "\n";
+  }
 
-    return $return;
-}
-
-# This was originally clipped from the libnet Makefile.PL, adapted here for
-# accurate version checking.
-sub have_vers {
-    my ($params, $output) = @_;
-    my $module  = $params->{module};
-    my $package = $params->{package};
-    if (!$package) {
-        $package = $module;
-        $package =~ s/::/-/g;
-    }
-    my $wanted  = $params->{version};
-
-    eval "require $module;";
-    # Don't let loading a module change the output-encoding of STDOUT
-    # or STDERR. (CGI.pm tries to set "binmode" on these file handles when
-    # it's loaded, and other modules may do the same in the future.)
-    Bugzilla::Install::Util::set_output_encoding();
-
-    # VERSION is provided by UNIVERSAL::, and can be called even if
-    # the module isn't loaded. We eval'uate ->VERSION because it can die
-    # when the version is not valid (yes, this happens from time to time).
-    # In that case, we use an uglier method to get the version.
-    my $vnum = eval { $module->VERSION };
-    if ($@) {
-        no strict 'refs';
-        $vnum = ${"${module}::VERSION"};
-
-        # If we come here, then the version is not a valid one.
-        # We try to sanitize it.
-        if ($vnum =~ /^((\d+)(\.\d+)*)/) {
-            $vnum = $1;
-        }
-    }
-    $vnum ||= -1;
-
-    # Must do a string comparison as $vnum may be of the form 5.10.1.
-    my $vok = ($vnum ne '-1' && version->new($vnum) >= version->new($wanted)) ? 1 : 0;
-    my $blacklisted;
-    if ($vok && $params->{blacklist}) {
-        $blacklisted = grep($vnum =~ /$_/, @{$params->{blacklist}});
-        $vok = 0 if $blacklisted;
-    }
-
-    if ($output) {
-        _checking_for({ 
-            package => $package, ok => $vok, wanted => $wanted,
-            found   => $vnum, blacklisted => $blacklisted
-        });
-    }
-    
-    return $vok ? 1 : 0;
+  return $readable && $ttf;
 }
 
 sub _checking_for {
-    my ($params) = @_;
-    my ($package, $ok, $wanted, $blacklisted, $found) = 
-        @$params{qw(package ok wanted blacklisted found)};
-
-    my $ok_string = $ok ? install_string('module_ok') : '';
-
-    # If we're actually checking versions (like for Perl modules), then
-    # we have some rather complex logic to determine what we want to 
-    # show. If we're not checking versions (like for GraphViz) we just
-    # show "ok" or "not found".
-    if (exists $params->{found}) {
-        my $found_string;
-        # We do a string compare in case it's non-numeric. We make sure
-        # it's not a version object as negative versions are forbidden.
-        if ($found && !ref($found) && $found eq '-1') {
-            $found_string = install_string('module_not_found');
-        }
-        elsif ($found) {
-            $found_string = install_string('module_found', { ver => $found });
-        }
-        else {
-            $found_string = install_string('module_unknown_version');
-        }
-        $ok_string = $ok ? "$ok_string: $found_string" : $found_string;
-    }
-    elsif (!$ok) {
-        $ok_string = install_string('module_not_found');
-    }
-
-    my $black_string = $blacklisted ? install_string('blacklisted') : '';
-    my $want_string  = $wanted ? "v$wanted" : install_string('any');
+  my ($params) = @_;
+  my ($package, $ok, $wanted, $blocklisted, $found)
+    = @$params{qw(package ok wanted blocklisted found)};
 
-    my $str = sprintf "%s %20s %-11s $ok_string $black_string\n",
-                install_string('checking_for'), $package, "($want_string)";
-    print $ok ? $str : colored($str, COLOR_ERROR);
-}
+  my $ok_string = $ok ? install_string('module_ok') : '';
 
-sub install_command {
-    my $module = shift;
-    my ($command, $package);
+  # If we're actually checking versions (like for Perl modules), then
+  # we have some rather complex logic to determine what we want to
+  # show. If we're not checking versions (like for GraphViz) we just
+  # show "ok" or "not found".
+  if (exists $params->{found}) {
+    my $found_string;
 
-    if (ON_ACTIVESTATE) {
-        $command = 'ppm install %s';
-        $package = $module->{package};
+    # We do a string compare in case it's non-numeric. We make sure
+    # it's not a version object as negative versions are forbidden.
+    if ($found && !ref($found) && $found eq '-1') {
+      $found_string = install_string('module_not_found');
+    }
+    elsif ($found) {
+      $found_string = install_string('module_found', {ver => $found});
     }
     else {
-        $command = "$^X install-module.pl \%s";
-        # Non-Windows installations need to use module names, because
-        # CPAN doesn't understand package names.
-        $package = $module->{module};
+      $found_string = install_string('module_unknown_version');
     }
-    return sprintf $command, $package;
+    $ok_string = $ok ? "$ok_string: $found_string" : $found_string;
+  }
+  elsif (!$ok) {
+    $ok_string = install_string('module_not_found');
+  }
+
+  my $block_string = $blocklisted ? install_string('blocklisted') : '';
+  my $want_string = $wanted ? "$wanted" : install_string('any');
+
+  my $str = sprintf "%s %20s %-11s $ok_string $block_string\n",
+    (' ' x $checking_for_indent) . install_string('checking_for'), $package,
+    "($want_string)";
+  print $ok ? $str : colored($str, COLOR_ERROR);
 }
 
 # This does a reverse mapping for FEATURE_FILES.
 sub map_files_to_features {
-    my %features = FEATURE_FILES;
-    my %files;
-    foreach my $feature (keys %features) {
-        my @my_files = @{ $features{$feature} };
-        foreach my $pattern (@my_files) {
-            foreach my $file (glob $pattern) {
-                $files{$file} = $feature;
-            }
-        }
-    }
-    return \%files;
+  my %features = FEATURE_FILES;
+  my %files;
+  foreach my $feature (keys %features) {
+    my @my_files = @{$features{$feature}};
+    foreach my $pattern (@my_files) {
+      foreach my $file (glob $pattern) {
+        $files{$file} = $feature;
+      }
+    }
+  }
+  return \%files;
 }
 
 1;
@@ -821,59 +368,73 @@ perl modules it requires.)
 
 =over
 
-=item C<REQUIRED_MODULES>
+=item C<FEATURE_FILES>
+
+A hashref that describes what files should only be compiled if a certain
+feature is enabled. The feature is the key, and the values are arrayrefs
+of file names (which are passed to C<glob>, so shell patterns work).
+
+=back
+
+=head1 SUBROUTINES
+
+=over 4
+
+=item C<check_cpan_requirements>
+
+=over
+
+=item B<Description>
+
+This checks what required perl modules are installed, like
+C<checksetup.pl> does.
 
-An arrayref of hashrefs that describes the perl modules required by 
-Bugzilla. The hashes have three keys: 
+=item B<Params>
 
 =over
 
-=item C<package> - The name of the Perl package that you'd find on
-CPAN for this requirement. 
+=item C<$meta> - A C<CPAN::Meta> object.
 
-=item C<module> - The name of a module that can be passed to the
-C<install> command in C<CPAN.pm> to install this module.
+=item C<$dirs> - the include dirs to search for modules, defaults to @INC.
 
-=item C<version> - The version of this module that we require, or C<0>
-if any version is acceptable.
+=item C<$output> - C<true> if you want the function to print out information
+about what it's doing, and the versions of everything installed.
 
 =back
 
-=item C<OPTIONAL_MODULES>
+=item B<Returns>
 
-An arrayref of hashrefs that describes the perl modules that add
-additional features to Bugzilla if installed. Its hashes have all
-the fields of L</REQUIRED_MODULES>, plus a C<feature> item--an arrayref
-of strings that describe what features require this module.
+A hashref containing these values:
 
-=item C<FEATURE_FILES>
+=over
 
-A hashref that describes what files should only be compiled if a certain
-feature is enabled. The feature is the key, and the values are arrayrefs
-of file names (which are passed to C<glob>, so shell patterns work).
+=item C<ok> - if all the requirements are met, this is true.
 
-=back
+=item C<found> - an arrayref of found modules
 
+=item C<missing> - an arrayref of missing modules
 
-=head1 SUBROUTINES
+=back
 
-=over 4
+=back
 
-=item C<check_requirements>
+=item C<check_cpan_feature>
 
 =over
 
 =item B<Description>
 
-This checks what optional or required perl modules are installed, like
-C<checksetup.pl> does.
+This checks that the optional Perl modules required for a feature are installed.
 
 =item B<Params>
 
 =over
 
-=item C<$output> - C<true> if you want the function to print out information
-about what it's doing, and the versions of everything installed.
+=item C<$feature> - A C<CPAN::Meta::Feature> object.
+
+=item C<$dirs> - the include dirs to search for modules, defaults to @INC.
+
+=item C<$output> - C<true> if you want the function to print out information about what it's doing, and the versions of everything installed.
 
 =back
 
@@ -883,28 +444,50 @@ A hashref containing these values:
 
 =over
 
-=item C<pass> - Whether or not we have all the mandatory requirements.
+=item C<ok> - if all the requirements are met, this is true.
 
-=item C<missing> - An arrayref containing any required modules that
-are not installed or that are not up-to-date. Each item in the array is
-a hashref in the format of items from L</REQUIRED_MODULES>.
+=item C<found> - an arrayref of found modules
 
-=item C<optional> - The same as C<missing>, but for optional modules.
+=item C<missing> - an arrayref of missing modules
 
-=item C<apache> - The name of each optional Apache module that is missing.
+=back
 
-=item C<have_one_dbd> - True if at least one C<DBD::> module is installed.
+=item C<check_all_cpan_features>
+
+=over
 
-=item C<any_missing> - True if there are any missing Perl modules, even
-optional modules.
+=item B<Description>
+
+This checks which optional Perl modules are currently installed which can enable optional features.
+
+=item B<Params>
+
+=over
+
+=item C<$meta> - A C<CPAN::Meta> object.
+
+=item C<$dirs> - the include dirs to search for modules, defaults to @INC.
+
+=item C<$output> - C<true> if you want the function to print out information
+about what it's doing, and the versions of everything installed.
 
 =back
 
+=item B<Returns>
+
+A hashref keyed on the feature name. The values
+are hashrefs containing C<description> and C<result> keys.
+
+C<description> is the English description of the feature.
+
+C<result> is a hashref in the same format as the return value of C<check_cpan_requirements()>,
+described previously.
+
 =back
 
-=item C<check_graphviz($output)>
+=item C<check_webdotbase($output)>
 
-Description: Checks if the graphviz binary specified in the 
+Description: Checks if the graphviz binary specified in the
   C<webdotbase> parameter is a valid binary, or a valid URL.
 
 Params:      C<$output> - C<$true> if you want the function to
@@ -912,44 +495,26 @@ Params:      C<$output> - C<$true> if you want the function to
 
 Returns:     C<1> if the check was successful, C<0> otherwise.
 
-=item C<have_vers($module, $output)>
-
- Description: Tells you whether or not you have the appropriate
-              version of the module requested. It also prints
-              out a message to the user explaining the check
-              and the result.
-
- Params:      C<$module> - A hashref, in the format of an item from 
-                           L</REQUIRED_MODULES>.
-              C<$output> - Set to true if you want this function to
-                           print information to STDOUT about what it's
-                           doing.
-
- Returns:   C<1> if you have the module installed and you have the
-            appropriate version. C<0> otherwise.
-
-=item C<install_command($module)>
+=item C<check_font_file($output)>
 
- Description: Prints out the appropriate command to install the
-              module specified, depending on whether you're
-              on Windows or Linux.
+Description: Checks if the font file specified in the C<font_type> parameter
+  is a valid-looking font file.
 
- Params:      C<$module> - A hashref, in the format of an item from
-                           L</REQUIRED_MODULES>.
+Params:      C<$output> - C<$true> if you want the function to
+                 print out information about what it's doing.
 
- Returns:     nothing
+Returns:     C<1> if the check was successful, C<0> otherwise.
 
 =item C<map_files_to_features>
 
 Returns a hashref where file names are the keys and the value is the feature
 that must be enabled in order to compile that file.
 
-=back
-
-=head1 B<Methods in need of POD>
+=item C<load_cpan_meta>
 
-=over
+Load MYMETA.json or META.json from the bugzilla directory, and a return a L<CPAN::Meta> object.
 
-=item print_module_instructions
+=back
 
 =back
+
diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index c05037061f..91555f8296 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -11,7 +11,7 @@ package Bugzilla::Install::Util;
 # module may require *only* Bugzilla::Constants and built-in
 # perl modules.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -24,198 +24,213 @@ use POSIX qw(setlocale LC_CTYPE);
 use Scalar::Util qw(tainted);
 use Term::ANSIColor qw(colored);
 use PerlIO;
+use if ON_WINDOWS, 'Win32';
+use if ON_WINDOWS, 'Win32::API';
 
 use parent qw(Exporter);
 our @EXPORT_OK = qw(
-    bin_loc
-    get_version_and_os
-    extension_code_files
-    extension_package_directory
-    extension_requirement_packages
-    extension_template_directory
-    extension_web_directory
-    indicate_progress
-    install_string
-    include_languages
-    success
-    template_include_path
-    init_console
+  bin_loc
+  get_version_and_os
+  extension_code_files
+  extension_package_directory
+  extension_requirement_packages
+  extension_template_directory
+  extension_web_directory
+  i_am_persistent
+  indicate_progress
+  install_string
+  include_languages
+  success
+  template_include_path
+  init_console
 );
 
 sub bin_loc {
-    my ($bin, $path) = @_;
-    # This module is not needed most of the time and is a bit slow,
-    # so we only load it when calling bin_loc().
-    require ExtUtils::MM;
-
-    # If the binary is a full path...
-    if ($bin =~ m{[/\\]}) {
-        return MM->maybe_command($bin) || '';
-    }
+  my ($bin, $path) = @_;
+
+  # This module is not needed most of the time and is a bit slow,
+  # so we only load it when calling bin_loc().
+  require ExtUtils::MM;
+
+  # If the binary is a full path...
+  if ($bin =~ m{[/\\]}) {
+    return MM->maybe_command($bin) || '';
+  }
+
+  # Otherwise we look for it in the path in a cross-platform way.
+  my @path = $path ? @$path : File::Spec->path;
+  foreach my $dir (@path) {
+    next if !-d $dir;
+    my $full_path = File::Spec->catfile($dir, $bin);
+
+    # MM is an alias for ExtUtils::MM. maybe_command is nice
+    # because it checks .com, .bat, .exe (etc.) on Windows.
+    my $command = MM->maybe_command($full_path);
+    return $command if $command;
+  }
+
+  return '';
+}
 
-    # Otherwise we look for it in the path in a cross-platform way.
-    my @path = $path ? @$path : File::Spec->path;
-    foreach my $dir (@path) {
-        next if !-d $dir;
-        my $full_path = File::Spec->catfile($dir, $bin);
-        # MM is an alias for ExtUtils::MM. maybe_command is nice
-        # because it checks .com, .bat, .exe (etc.) on Windows.
-        my $command = MM->maybe_command($full_path);
-        return $command if $command;
-    }
+sub get_version_and_os {
+
+  # Display version information
+  my @os_details = POSIX::uname;
+
+  # 0 is the name of the OS, 2 is the major version,
+  my $os_name = $os_details[0] . ' ' . $os_details[2];
+  $os_name = Win32::GetOSName() if ON_WINDOWS;
 
-    return '';
+  # $os_details[3] is the minor version.
+  return {
+    bz_ver   => BUGZILLA_VERSION,
+    perl_ver => sprintf('%vd', $^V),
+    os_name  => $os_name,
+    os_ver   => $os_details[3]
+  };
 }
 
-sub get_version_and_os {
-    # Display version information
-    my @os_details = POSIX::uname;
-    # 0 is the name of the OS, 2 is the major version,
-    my $os_name = $os_details[0] . ' ' . $os_details[2];
-    if (ON_WINDOWS) {
-        require Win32;
-        $os_name = Win32::GetOSName();
-    }
-    # $os_details[3] is the minor version.
-    return { bz_ver   => BUGZILLA_VERSION,
-             perl_ver => sprintf('%vd', $^V),
-             os_name  => $os_name,
-             os_ver   => $os_details[3] };
+sub i_am_persistent {
+  return ($ENV{MOD_PERL} || $ENV{BZ_PLACK}) ? 1 : 0;
 }
 
 sub _extension_paths {
-    my $dir = bz_locations()->{'extensionsdir'};
-    my @extension_items = glob("$dir/*");
-    my @paths;
-    foreach my $item (@extension_items) {
-        my $basename = basename($item);
-        # Skip CVS directories and any hidden files/dirs.
-        next if ($basename eq 'CVS' or $basename =~ /^\./);
-        if (-d $item) {
-            if (!-e "$item/disabled") {
-                push(@paths, $item);
-            }
-        }
-        elsif ($item =~ /\.pm$/i) {
-            push(@paths, $item);
-        }
-    }
-    return @paths;
+  my $dir             = bz_locations()->{'extensionsdir'};
+  my @extension_items = glob("$dir/*");
+  my @paths;
+  foreach my $item (@extension_items) {
+    my $basename = basename($item);
+
+    # Skip CVS directories and any hidden files/dirs.
+    next if ($basename eq 'CVS' or $basename =~ /^\./);
+    if (-d $item) {
+      if (!-e "$item/disabled") {
+        push(@paths, $item);
+      }
+    }
+    elsif ($item =~ /\.pm$/i) {
+      push(@paths, $item);
+    }
+  }
+  return @paths;
 }
 
 sub extension_code_files {
-    my ($requirements_only) = @_;
-    my @files;
-    foreach my $path (_extension_paths()) {
-        my @load_files;
-        if (-d $path) {
-            my $extension_file = "$path/Extension.pm";
-            my $config_file    = "$path/Config.pm";
-            if (-e $extension_file) {
-                push(@load_files, $extension_file);
-            }
-            if (-e $config_file) {
-                push(@load_files, $config_file);
-            }
-
-            # Don't load Extension.pm if we just want Config.pm and
-            # we found both.
-            if ($requirements_only and scalar(@load_files) == 2) {
-                shift(@load_files);
-            }
-        }
-        else {
-            push(@load_files, $path);
-        }
-        next if !scalar(@load_files);
-        # We know that these paths are safe, because they came from
-        # extensionsdir and we checked them specifically for their format.
-        # Also, the only thing we ever do with them is pass them to "require".
-        trick_taint($_) foreach @load_files;
-        push(@files, \@load_files);
+  my ($requirements_only) = @_;
+  my @files;
+  foreach my $path (_extension_paths()) {
+    my @load_files;
+    if (-d $path) {
+      my $extension_file = "$path/Extension.pm";
+      my $config_file    = "$path/Config.pm";
+      if (-e $extension_file) {
+        push(@load_files, $extension_file);
+      }
+      if (-e $config_file) {
+        push(@load_files, $config_file);
+      }
+
+      # Don't load Extension.pm if we just want Config.pm and
+      # we found both.
+      if ($requirements_only and scalar(@load_files) == 2) {
+        shift(@load_files);
+      }
     }
-
-    my @additional;
-    my $datadir = bz_locations()->{'datadir'};
-    my $addl_file = "$datadir/extensions/additional";
-    if (-e $addl_file) {
-        open(my $fh, '<', $addl_file) || die "$addl_file: $!";
-        @additional = map { trim($_) } <$fh>;
-        close($fh);
-    }
-    return (\@files, \@additional);
+    else {
+      push(@load_files, $path);
+    }
+    next if !scalar(@load_files);
+
+    # We know that these paths are safe, because they came from
+    # extensionsdir and we checked them specifically for their format.
+    # Also, the only thing we ever do with them is pass them to "require".
+    trick_taint($_) foreach @load_files;
+    push(@files, \@load_files);
+  }
+
+  my @additional;
+  my $datadir   = bz_locations()->{'datadir'};
+  my $addl_file = "$datadir/extensions/additional";
+  if (-e $addl_file) {
+    open(my $fh, '<', $addl_file) || die "$addl_file: $!";
+    @additional = map { trim($_) } <$fh>;
+    close($fh);
+  }
+  return (\@files, \@additional);
 }
 
 # Used by _get_extension_requirements in Bugzilla::Install::Requirements.
 sub extension_requirement_packages {
-    # If we're in a .cgi script or some time that's not the requirements phase,
-    # just use Bugzilla->extensions. This avoids running the below code during
-    # a normal Bugzilla page, which is important because the below code
-    # doesn't actually function right if it runs after 
-    # Bugzilla::Extension->load_all (because stuff has already been loaded).
-    # (This matters because almost every page calls Bugzilla->feature, which
-    # calls OPTIONAL_MODULES, which calls this method.)
-    #
-    # We check if Bugzilla.pm is already loaded, instead of doing a "require",
-    # because we *do* want the code lower down to run during the Requirements
-    # phase of checksetup.pl, instead of Bugzilla->extensions, and Bugzilla.pm
-    # actually *can* be loaded during the Requirements phase if all the
-    # requirements have already been installed.
-    if ($INC{'Bugzilla.pm'}) {
-        return Bugzilla->extensions;
-    }
-    my $packages = _cache()->{extension_requirement_packages};
-    return $packages if $packages;
-    $packages = [];
-    my %package_map;
-    
-    my ($file_sets, $extra_packages) = extension_code_files('requirements only');
-    foreach my $file_set (@$file_sets) {
-        my $file = shift @$file_set;
-        my $name = require $file;
-        if ($name =~ /^\d+$/) {
-            die install_string('extension_must_return_name',
-                               { file => $file, returned => $name });
-        }
-        my $package = "Bugzilla::Extension::$name";
-        if ($package->can('package_dir')) {
-            $package->package_dir($file);
-        }
-        else {
-            extension_package_directory($package, $file);
-        }
-        $package_map{$file} = $package;
-        push(@$packages, $package);
-    }
-    foreach my $package (@$extra_packages) {
-        eval("require $package") || die $@;
-        push(@$packages, $package);
-    }
 
-    _cache()->{extension_requirement_packages} = $packages;
-    # Used by Bugzilla::Extension->load if it's called after this method
-    # (which only happens during checksetup.pl, currently).
-    _cache()->{extension_requirement_package_map} = \%package_map;
-    return $packages;
+  # If we're in a .cgi script or some time that's not the requirements phase,
+  # just use Bugzilla->extensions. This avoids running the below code during
+  # a normal Bugzilla page, which is important because the below code
+  # doesn't actually function right if it runs after
+  # Bugzilla::Extension->load_all (because stuff has already been loaded).
+  # (This matters because almost every page calls Bugzilla->feature, which
+  # calls OPTIONAL_MODULES, which calls this method.)
+  #
+  # We check if Bugzilla.pm is already loaded, instead of doing a "require",
+  # because we *do* want the code lower down to run during the Requirements
+  # phase of checksetup.pl, instead of Bugzilla->extensions, and Bugzilla.pm
+  # actually *can* be loaded during the Requirements phase if all the
+  # requirements have already been installed.
+  if ($INC{'Bugzilla.pm'}) {
+    return Bugzilla->extensions;
+  }
+  my $packages = _cache()->{extension_requirement_packages};
+  return $packages if $packages;
+  $packages = [];
+  my %package_map;
+
+  my ($file_sets, $extra_packages) = extension_code_files('requirements only');
+  foreach my $file_set (@$file_sets) {
+    my $file = shift @$file_set;
+    my $name = require $file;
+    if ($name =~ /^\d+$/) {
+      die install_string('extension_must_return_name',
+        {file => $file, returned => $name});
+    }
+    my $package = "Bugzilla::Extension::$name";
+    if ($package->can('package_dir')) {
+      $package->package_dir($file);
+    }
+    else {
+      extension_package_directory($package, $file);
+    }
+    $package_map{$file} = $package;
+    push(@$packages, $package);
+  }
+  foreach my $package (@$extra_packages) {
+    eval("require $package") || die $@;
+    push(@$packages, $package);
+  }
+
+  _cache()->{extension_requirement_packages} = $packages;
+
+  # Used by Bugzilla::Extension->load if it's called after this method
+  # (which only happens during checksetup.pl, currently).
+  _cache()->{extension_requirement_package_map} = \%package_map;
+  return $packages;
 }
 
 # Used in this file and in Bugzilla::Extension.
 sub extension_template_directory {
-    my $extension = shift;
-    my $class = ref($extension) || $extension;
-    my $base_dir = extension_package_directory($class);
-    if ($base_dir eq bz_locations->{'extensionsdir'}) {
-        return bz_locations->{'templatedir'};
-    }
-    return "$base_dir/template";
+  my $extension = shift;
+  my $class     = ref($extension) || $extension;
+  my $base_dir  = extension_package_directory($class);
+  if ($base_dir eq bz_locations->{'extensionsdir'}) {
+    return bz_locations->{'templatedir'};
+  }
+  return "$base_dir/template";
 }
 
 # Used in this file and in Bugzilla::Extension.
 sub extension_web_directory {
-    my $extension = shift;
-    my $class = ref($extension) || $extension;
-    my $base_dir = extension_package_directory($class);
-    return "$base_dir/web";
+  my $extension = shift;
+  my $class     = ref($extension) || $extension;
+  my $base_dir  = extension_package_directory($class);
+  return "$base_dir/web";
 }
 
 # For extensions that are in the extensions/ dir, this both sets and fetches
@@ -223,263 +238,281 @@ sub extension_web_directory {
 # when determining the template directory for extensions (or other things
 # that are relative to the extension's base directory).
 sub extension_package_directory {
-    my ($invocant, $file) = @_;
-    my $class = ref($invocant) || $invocant;
-
-    # $file is set on the first invocation, store the value in the extension's
-    # package for retrieval on subsequent calls
-    my $var;
-    {
-        no warnings 'once';
-        no strict 'refs';
-        $var = \${"${class}::EXTENSION_PACKAGE_DIR"};
-    }
-    if ($file) {
-        $$var = dirname($file);
-    }
-    my $value = $$var;
-
-    # This is for extensions loaded from data/extensions/additional.
-    if (!$value) {
-        my $short_path = $class;
-        $short_path =~ s/::/\//g;
-        $short_path .= ".pm";
-        my $long_path = $INC{$short_path};
-        die "$short_path is not in \%INC" if !$long_path;
-        $value = $long_path;
-        $value =~ s/\.pm//;
-    }
-    return $value;
+  my ($invocant, $file) = @_;
+  my $class = ref($invocant) || $invocant;
+
+  # $file is set on the first invocation, store the value in the extension's
+  # package for retrieval on subsequent calls
+  my $var;
+  {
+    no warnings 'once';
+    no strict 'refs';
+    $var = \${"${class}::EXTENSION_PACKAGE_DIR"};
+  }
+  if ($file) {
+    $$var = dirname($file);
+  }
+  my $value = $$var;
+
+  # This is for extensions loaded from data/extensions/additional.
+  if (!$value) {
+    my $short_path = $class;
+    $short_path =~ s/::/\//g;
+    $short_path .= ".pm";
+    my $long_path = $INC{$short_path};
+    die "$short_path is not in \%INC" if !$long_path;
+    $value = $long_path;
+    $value =~ s/\.pm//;
+  }
+  return $value;
 }
 
 sub indicate_progress {
-    my ($params) = @_;
-    my $current = $params->{current};
-    my $total   = $params->{total};
-    my $every   = $params->{every} || 1;
-
-    print "." if !($current % $every);
-    if ($current == $total || $current % ($every * 60) == 0) {
-        print "$current/$total (" . int($current * 100 / $total) . "%)\n";
-    }
+  my ($params) = @_;
+  my $current  = $params->{current};
+  my $total    = $params->{total};
+  my $every = $params->{every} || 1;
+
+  print "." if !($current % $every);
+  if ($current == $total || $current % ($every * 60) == 0) {
+    print "$current/$total (" . int($current * 100 / $total) . "%)\n";
+  }
 }
 
-sub install_string {
-    my ($string_id, $vars) = @_;
-    _cache()->{install_string_path} ||= template_include_path();
-    my $path = _cache()->{install_string_path};
-    
-    my $string_template;
-    # Find the first template that defines this string.
-    foreach my $dir (@$path) {
-        my $base = "$dir/setup/strings";
-        $string_template = _get_string_from_file($string_id, "$base.txt.pl")
-            if !defined $string_template;
-        last if defined $string_template;
-    }
-    
-    die "No language defines the string '$string_id'"
-        if !defined $string_template;
-
-    utf8::decode($string_template) if !utf8::is_utf8($string_template);
-
-    $vars ||= {};
-    my @replace_keys = keys %$vars;
-    foreach my $key (@replace_keys) {
-        my $replacement = $vars->{$key};
-        die "'$key' in '$string_id' is tainted: '$replacement'"
-            if tainted($replacement);
-        # We don't want people to start getting clever and inserting
-        # ##variable## into their values. So we check if any other
-        # key is listed in the *replacement* string, before doing
-        # the replacement. This is mostly to protect programmers from
-        # making mistakes.
-        if (grep($replacement =~ /##$key##/, @replace_keys)) {
-            die "Unsafe replacement for '$key' in '$string_id': '$replacement'";
-        }
-        $string_template =~ s/\Q##$key##\E/$replacement/g;
-    }
+sub feature_description {
+  my ($feature_name) = @_;
+  eval {
+    my $meta = _cache()->{cpan_meta}
+      //= Bugzilla::Install::Requirements::load_cpan_meta();
 
-    return $string_template;
+    return $meta->feature($feature_name)->description;
+  } or warn $@;
 }
 
-sub _wanted_languages {
-    my ($requested, @wanted);
-
-    # Checking SERVER_SOFTWARE is the same as i_am_cgi() in Bugzilla::Util.
-    if (exists $ENV{'SERVER_SOFTWARE'}) {
-        my $cgi = eval { Bugzilla->cgi } || eval { require CGI; return CGI->new() };
-        $requested = $cgi->http('Accept-Language') || '';
-        my $lang = $cgi->cookie('LANG');
-        push(@wanted, $lang) if $lang;
-    }
-    else {
-        $requested = get_console_locale();
-    }
+sub install_string {
+  my ($string_id, $vars) = @_;
+  _cache()->{install_string_path} ||= template_include_path();
+  my $path = _cache()->{install_string_path};
+
+  my $string_template;
+
+  # Find the first template that defines this string.
+  foreach my $dir (@$path) {
+    my $base = "$dir/setup/strings";
+    $string_template = _get_string_from_file($string_id, "$base.txt.pl")
+      if !defined $string_template;
+    last if defined $string_template;
+  }
+
+  die "No language defines the string '$string_id'" if !defined $string_template;
+
+  utf8::decode($string_template) if !utf8::is_utf8($string_template);
+
+  $vars ||= {};
+  my @replace_keys = keys %$vars;
+  foreach my $key (@replace_keys) {
+    my $replacement = $vars->{$key};
+    die "'$key' in '$string_id' is tainted: '$replacement'"
+      if tainted($replacement);
+
+    # We don't want people to start getting clever and inserting
+    # ##variable## into their values. So we check if any other
+    # key is listed in the *replacement* string, before doing
+    # the replacement. This is mostly to protect programmers from
+    # making mistakes.
+    if (grep($replacement =~ /##$key##/, @replace_keys)) {
+      die "Unsafe replacement for '$key' in '$string_id': '$replacement'";
+    }
+    $string_template =~ s/\Q##$key##\E/$replacement/g;
+  }
+
+  return $string_template;
+}
 
-    push(@wanted, _sort_accept_language($requested));
-    return \@wanted;
+sub _wanted_languages {
+  my ($requested, @wanted);
+
+  # Checking SERVER_SOFTWARE is the same as i_am_cgi() in Bugzilla::Util.
+  if (exists $ENV{'SERVER_SOFTWARE'}) {
+    my $cgi = eval { Bugzilla->cgi } || eval { require CGI; return CGI->new() };
+    $requested = $cgi->http('Accept-Language') || '';
+    my $lang = $cgi->cookie('LANG');
+    push(@wanted, $lang) if $lang;
+  }
+  else {
+    $requested = get_console_locale();
+  }
+
+  push(@wanted, _sort_accept_language($requested));
+  return \@wanted;
 }
 
 sub _wanted_to_actual_languages {
-    my ($wanted, $supported) = @_;
-
-    my @actual;
-    foreach my $lang (@$wanted) {
-        # If we support the language we want, or *any version* of
-        # the language we want, it gets pushed into @actual.
-        #
-        # Per RFC 1766 and RFC 2616, things like 'en' match 'en-us' and
-        # 'en-uk', but not the other way around. (This is unfortunately
-        # not very clearly stated in those RFC; see comment just over 14.5
-        # in http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
-        my @found = grep(/^\Q$lang\E(-.+)?$/i, @$supported);
-        push(@actual, @found) if @found;
-    }
+  my ($wanted, $supported) = @_;
 
-    # We always include English at the bottom if it's not there, even if
-    # it wasn't selected by the user.
-    if (!grep($_ eq 'en', @actual)) {
-        push(@actual, 'en');
-    }
+  my @actual;
+  foreach my $lang (@$wanted) {
 
-    return \@actual;
+    # If we support the language we want, or *any version* of
+    # the language we want, it gets pushed into @actual.
+    #
+    # Per RFC 1766 and RFC 2616, things like 'en' match 'en-us' and
+    # 'en-uk', but not the other way around. (This is unfortunately
+    # not very clearly stated in those RFC; see comment just over 14.5
+    # in http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4)
+    my @found = grep(/^\Q$lang\E(-.+)?$/i, @$supported);
+    push(@actual, @found) if @found;
+  }
+
+  # We always include English at the bottom if it's not there, even if
+  # it wasn't selected by the user.
+  if (!grep($_ eq 'en', @actual)) {
+    push(@actual, 'en');
+  }
+
+  return \@actual;
 }
 
 sub supported_languages {
-    my $cache = _cache();
-    return $cache->{supported_languages} if $cache->{supported_languages};
-
-    my @dirs = glob(bz_locations()->{'templatedir'} . "/*");
-    my @languages;
-    foreach my $dir (@dirs) {
-        # It's a language directory only if it contains "default" or
-        # "custom". This auto-excludes CVS directories as well.
-        next if (!-d "$dir/default" and !-d "$dir/custom");
-        my $lang = basename($dir);
-        # Check for language tag format conforming to RFC 1766.
-        next unless $lang =~ /^[a-zA-Z]{1,8}(-[a-zA-Z]{1,8})?$/;
-        push(@languages, $lang);
-    }
+  my $cache = _cache();
+  return $cache->{supported_languages} if $cache->{supported_languages};
+
+  my @dirs = glob(bz_locations()->{'templatedir'} . "/*");
+  my @languages;
+  foreach my $dir (@dirs) {
+
+    # It's a language directory only if it contains "default" or
+    # "custom". This auto-excludes CVS directories as well.
+    next if (!-d "$dir/default" and !-d "$dir/custom");
+    my $lang = basename($dir);
 
-    $cache->{supported_languages} = \@languages;
-    return \@languages;
+    # Check for language tag format conforming to RFC 1766.
+    next unless $lang =~ /^[a-zA-Z]{1,8}(-[a-zA-Z]{1,8})?$/;
+    push(@languages, $lang);
+  }
+
+  $cache->{supported_languages} = \@languages;
+  return \@languages;
 }
 
 sub include_languages {
-    my ($params) = @_;
-
-    # Basically, the way this works is that we have a list of languages
-    # that we *want*, and a list of languages that Bugzilla actually
-    # supports. If there is only one language installed, we take it.
-    my $supported = supported_languages();
-    return @$supported if @$supported == 1;
-
-    my $wanted;
-    if ($params->{language}) {
-        # We can pass several languages at once as an arrayref
-        # or a single language.
-        $wanted = $params->{language};
-        $wanted = [$wanted] unless ref $wanted;
-    }
-    else {
-        $wanted = _wanted_languages();
-    }
-    my $actual    = _wanted_to_actual_languages($wanted, $supported);
-    return @$actual;
+  my ($params) = @_;
+
+  # Basically, the way this works is that we have a list of languages
+  # that we *want*, and a list of languages that Bugzilla actually
+  # supports. If there is only one language installed, we take it.
+  my $supported = supported_languages();
+  return @$supported if @$supported == 1;
+
+  my $wanted;
+  if ($params->{language}) {
+
+    # We can pass several languages at once as an arrayref
+    # or a single language.
+    $wanted = $params->{language};
+    $wanted = [$wanted] unless ref $wanted;
+  }
+  else {
+    $wanted = _wanted_languages();
+  }
+  my $actual = _wanted_to_actual_languages($wanted, $supported);
+  return @$actual;
 }
 
 # Used by template_include_path
 sub _template_lang_directories {
-    my ($languages, $templatedir) = @_;
-    
-    my @add = qw(custom default);
-    my $project = bz_locations->{'project'};
-    unshift(@add, $project) if $project;
-
-    my @result;
-    foreach my $lang (@$languages) {
-        foreach my $dir (@add) {
-            my $full_dir = "$templatedir/$lang/$dir";
-            if (-d $full_dir) {
-                trick_taint($full_dir);
-                push(@result, $full_dir);
-            }
-        }
-    }
-    return @result;
+  my ($languages, $templatedir) = @_;
+
+  my @add     = qw(custom default);
+  my $project = bz_locations->{'project'};
+  unshift(@add, $project) if $project;
+
+  my @result;
+  foreach my $lang (@$languages) {
+    foreach my $dir (@add) {
+      my $full_dir = "$templatedir/$lang/$dir";
+      if (-d $full_dir) {
+        trick_taint($full_dir);
+        push(@result, $full_dir);
+      }
+    }
+  }
+  return @result;
 }
 
 # Used by template_include_path.
 sub _template_base_directories {
-    # First, we add extension template directories, because extension templates
-    # override standard templates. Extensions may be localized in the same way
-    # that Bugzilla templates are localized.
-    #
-    # We use extension_requirement_packages instead of Bugzilla->extensions
-    # because this fucntion is called during the requirements phase of 
-    # installation (so Bugzilla->extensions isn't available).
-    my $extensions = extension_requirement_packages();
-    my @template_dirs;
-    foreach my $extension (@$extensions) {
-        my $dir;
-        # If there's a template_dir method available in the extension
-        # package, then call it. Note that this has to be defined in
-        # Config.pm for extensions that have a Config.pm, to be effective
-        # during the Requirements phase of checksetup.pl.
-        if ($extension->can('template_dir')) {
-            $dir = $extension->template_dir;
-        }
-        else {
-            $dir = extension_template_directory($extension);
-        }
-        if (-d $dir) {
-            push(@template_dirs, $dir);
-        }
+
+  # First, we add extension template directories, because extension templates
+  # override standard templates. Extensions may be localized in the same way
+  # that Bugzilla templates are localized.
+  #
+  # We use extension_requirement_packages instead of Bugzilla->extensions
+  # because this function is called during the requirements phase of
+  # installation (so Bugzilla->extensions isn't available).
+  my $extensions = extension_requirement_packages();
+  my @template_dirs;
+  foreach my $extension (@$extensions) {
+    my $dir;
+
+    # If there's a template_dir method available in the extension
+    # package, then call it. Note that this has to be defined in
+    # Config.pm for extensions that have a Config.pm, to be effective
+    # during the Requirements phase of checksetup.pl.
+    if ($extension->can('template_dir')) {
+      $dir = $extension->template_dir;
+    }
+    else {
+      $dir = extension_template_directory($extension);
+    }
+    if (-d $dir) {
+      push(@template_dirs, $dir);
     }
+  }
 
-    # Extensions may also contain *only* templates, in which case they
-    # won't show up in extension_requirement_packages.
-    foreach my $path (_extension_paths()) {
-        next if !-d $path;
-        if (!-e "$path/Extension.pm" and !-e "$path/Config.pm"
-            and -d "$path/template") 
-        {
-            push(@template_dirs, "$path/template");
-        }
+  # Extensions may also contain *only* templates, in which case they
+  # won't show up in extension_requirement_packages.
+  foreach my $path (_extension_paths()) {
+    next if !-d $path;
+    if (!-e "$path/Extension.pm" and !-e "$path/Config.pm" and -d "$path/template")
+    {
+      push(@template_dirs, "$path/template");
     }
+  }
 
 
-    push(@template_dirs, bz_locations()->{'templatedir'});
-    return \@template_dirs;
+  push(@template_dirs, bz_locations()->{'templatedir'});
+  return \@template_dirs;
 }
 
 sub template_include_path {
-    my ($params) = @_;
-    my @used_languages = include_languages($params);
-    # Now, we add template directories in the order they will be searched:
-    my $template_dirs = _template_base_directories(); 
-
-    my @include_path;
-    foreach my $template_dir (@$template_dirs) {
-        my @lang_dirs = _template_lang_directories(\@used_languages, 
-                                                   $template_dir);
-        # Hooks get each set of extension directories separately.
-        if ($params->{hook}) {
-            push(@include_path, \@lang_dirs);
-        }
-        # Whereas everything else just gets a whole INCLUDE_PATH.
-        else {
-            push(@include_path, @lang_dirs);
-        }
+  my ($params) = @_;
+  my @used_languages = include_languages($params);
+
+  # Now, we add template directories in the order they will be searched:
+  my $template_dirs = _template_base_directories();
+
+  my @include_path;
+  foreach my $template_dir (@$template_dirs) {
+    my @lang_dirs = _template_lang_directories(\@used_languages, $template_dir);
+
+    # Hooks get each set of extension directories separately.
+    if ($params->{hook}) {
+      push(@include_path, \@lang_dirs);
+    }
+
+    # Whereas everything else just gets a whole INCLUDE_PATH.
+    else {
+      push(@include_path, @lang_dirs);
     }
-    return \@include_path;
+  }
+  return \@include_path;
 }
 
 sub no_checksetup_from_cgi {
-    print "Content-Type: text/html; charset=UTF-8\r\n\r\n";
-    print install_string('no_checksetup_from_cgi');
-    exit;
+  print "Content-Type: text/html; charset=UTF-8\r\n\r\n";
+  print install_string('no_checksetup_from_cgi');
+  exit;
 }
 
 ######################
@@ -488,193 +521,191 @@ sub no_checksetup_from_cgi {
 
 # Used by install_string
 sub _get_string_from_file {
-    my ($string_id, $file) = @_;
-    # If we already loaded the file, then use its copy from the cache.
-    if (my $strings = _cache()->{strings_from_file}->{$file}) {
-        return $strings->{$string_id};
-    }
-
-    # This module is only needed by checksetup.pl,
-    # so only load it when needed.
-    require Safe;
-
-    return undef if !-e $file;
-    my $safe = new Safe;
-    $safe->rdo($file);
-    my %strings = %{$safe->varglob('strings')};
-    _cache()->{strings_from_file}->{$file} = \%strings;
-    return $strings{$string_id};
+  my ($string_id, $file) = @_;
+
+  # If we already loaded the file, then use its copy from the cache.
+  if (my $strings = _cache()->{strings_from_file}->{$file}) {
+    return $strings->{$string_id};
+  }
+
+  # This module is only needed by checksetup.pl,
+  # so only load it when needed.
+  require Safe;
+
+  return undef if !-e $file;
+  my $safe = new Safe;
+  $safe->rdo($file);
+  my %strings = %{$safe->varglob('strings')};
+  _cache()->{strings_from_file}->{$file} = \%strings;
+  return $strings{$string_id};
 }
 
 # Make an ordered list out of a HTTP Accept-Language header (see RFC 2616, 14.4)
 # We ignore '*' and <language-range>;q=0
 # For languages with the same priority q the order remains unchanged.
 sub _sort_accept_language {
-    sub sortQvalue { $b->{'qvalue'} <=> $a->{'qvalue'} }
-    my $accept_language = $_[0];
-
-    # clean up string.
-    $accept_language =~ s/[^A-Za-z;q=0-9\.\-,]//g;
-    my @qlanguages;
-    my @languages;
-    foreach(split /,/, $accept_language) {
-        if (m/([A-Za-z\-]+)(?:;q=(\d(?:\.\d+)))?/) {
-            my $lang   = $1;
-            my $qvalue = $2;
-            $qvalue = 1 if not defined $qvalue;
-            next if $qvalue == 0;
-            $qvalue = 1 if $qvalue > 1;
-            push(@qlanguages, {'qvalue' => $qvalue, 'language' => $lang});
-        }
-    }
-
-    return map($_->{'language'}, (sort sortQvalue @qlanguages));
+  sub sortQvalue { $b->{'qvalue'} <=> $a->{'qvalue'} }
+  my $accept_language = $_[0];
+
+  # clean up string.
+  $accept_language =~ s/[^A-Za-z;q=0-9\.\-,]//g;
+  my @qlanguages;
+  my @languages;
+  foreach (split /,/, $accept_language) {
+    if (m/([A-Za-z\-]+)(?:;q=(\d(?:\.\d+)))?/) {
+      my $lang   = $1;
+      my $qvalue = $2;
+      $qvalue = 1 if not defined $qvalue;
+      next if $qvalue == 0;
+      $qvalue = 1 if $qvalue > 1;
+      push(@qlanguages, {'qvalue' => $qvalue, 'language' => $lang});
+    }
+  }
+
+  return map($_->{'language'}, (sort sortQvalue @qlanguages));
 }
 
 sub get_console_locale {
-    require Locale::Language;
-    my $locale = setlocale(LC_CTYPE);
-    my $language;
-    # Some distros set e.g. LC_CTYPE = fr_CH.UTF-8. We clean it up.
-    if ($locale =~ /^([^\.]+)/) {
-        $locale = $1;
-    }
-    $locale =~ s/_/-/;
-    # It's pretty sure that there is no language pack of the form fr-CH
-    # installed, so we also include fr as a wanted language.
-    if ($locale =~ /^(\S+)\-/) {
-        $language = $1;
-        $locale .= ",$language";
-    }
-    else {
-        $language = $locale;
-    }
-
-    # Some OSs or distributions may have setlocale return a string of the form
-    # German_Germany.1252 (this example taken from a Windows XP system), which
-    # is unsuitable for our needs because Bugzilla works on language codes.
-    # We try and convert them here.
-    if ($language = Locale::Language::language2code($language)) {
-        $locale .= ",$language";
-    }
-
-    return $locale;
+  require Locale::Language;
+  my $locale = setlocale(LC_CTYPE);
+  my $language;
+
+  # Some distros set e.g. LC_CTYPE = fr_CH.UTF-8. We clean it up.
+  if ($locale =~ /^([^\.]+)/) {
+    $locale = $1;
+  }
+  $locale =~ s/_/-/;
+
+  # It's pretty sure that there is no language pack of the form fr-CH
+  # installed, so we also include fr as a wanted language.
+  if ($locale =~ /^(\S+)\-/) {
+    $language = $1;
+    $locale .= ",$language";
+  }
+  else {
+    $language = $locale;
+  }
+
+  # Some OSs or distributions may have setlocale return a string of the form
+  # German_Germany.1252 (this example taken from a Windows XP system), which
+  # is unsuitable for our needs because Bugzilla works on language codes.
+  # We try and convert them here.
+  if ($language = Locale::Language::language2code($language)) {
+    $locale .= ",$language";
+  }
+
+  return $locale;
 }
 
 sub set_output_encoding {
-    # If we've already set an encoding layer on STDOUT, don't
-    # add another one.
-    my @stdout_layers = PerlIO::get_layers(STDOUT);
-    return if grep(/^encoding/, @stdout_layers);
-
-    my $encoding;
-    if (ON_WINDOWS and eval { require Win32::Console }) {
-        # Although setlocale() works on Windows, it doesn't always return
-        # the current *console's* encoding. So we use OutputCP here instead,
-        # when we can.
-        $encoding = Win32::Console::OutputCP();
-    }
-    else {
-        my $locale = setlocale(LC_CTYPE);
-        if ($locale =~ /\.([^\.]+)$/) {
-            $encoding = $1;
-        }
-    }
-    $encoding = "cp$encoding" if ON_WINDOWS;
 
-    $encoding = Encode::resolve_alias($encoding) if $encoding;
-    if ($encoding and $encoding !~ /utf-8/i) {
-        binmode STDOUT, ":encoding($encoding)";
-        binmode STDERR, ":encoding($encoding)";
-    }
-    else {
-        binmode STDOUT, ':utf8';
-        binmode STDERR, ':utf8';
-    }
+  # If we've already set an encoding layer on STDOUT, don't
+  # add another one.
+  my @stdout_layers = PerlIO::get_layers(STDOUT);
+  return if grep(/^encoding/, @stdout_layers);
+
+  my $encoding;
+  if (ON_WINDOWS) {
+
+    # Although setlocale() works on Windows, it doesn't always return
+    # the current *console's* encoding.
+    $encoding = Win32::GetConsoleOutputCP();
+  }
+  else {
+    my $locale = setlocale(LC_CTYPE);
+    if ($locale =~ /\.([^\.]+)$/) {
+      $encoding = $1;
+    }
+  }
+  $encoding = "cp$encoding" if ON_WINDOWS;
+
+  $encoding = Encode::resolve_alias($encoding) if $encoding;
+  if ($encoding and $encoding !~ /utf-8/i) {
+    binmode STDOUT, ":encoding($encoding)";
+    binmode STDERR, ":encoding($encoding)";
+  }
+  else {
+    binmode STDOUT, ':utf8';
+    binmode STDERR, ':utf8';
+  }
 }
 
 sub init_console {
-    eval { ON_WINDOWS && require Win32::Console::ANSI; };
-    $ENV{'ANSI_COLORS_DISABLED'} = 1 if ($@ || !-t *STDOUT);
-    $SIG{__DIE__} = \&_console_die;
-    prevent_windows_dialog_boxes();
-    set_output_encoding();
+  eval { ON_WINDOWS && require Win32::Console::ANSI; };
+  $ENV{'ANSI_COLORS_DISABLED'} = 1 if ($@ || !-t *STDOUT);
+  $SIG{__DIE__} = \&_console_die;
+  prevent_windows_dialog_boxes();
+  set_output_encoding();
 }
 
 sub _console_die {
-    my ($message) = @_;
-    # $^S means "we are in an eval"
-    if ($^S) {
-        die $message;
-    }
-    # Remove newlines from the message before we color it, and then
-    # add them back in on display. Otherwise the ANSI escape code
-    # for resetting the color comes after the newline, and Perl thinks
-    # that it should put "at Bugzilla/Install.pm line 1234" after the
-    # message.
-    $message =~ s/\n+$//;
-    # We put quotes around the message to stringify any object exceptions,
-    # like Template::Exception.
-    die colored("$message", COLOR_ERROR) . "\n";
+  my ($message) = @_;
+
+  # $^S means "we are in an eval"
+  if ($^S) {
+    die $message;
+  }
+
+  # Remove newlines from the message before we color it, and then
+  # add them back in on display. Otherwise the ANSI escape code
+  # for resetting the color comes after the newline, and Perl thinks
+  # that it should put "at Bugzilla/Install.pm line 1234" after the
+  # message.
+  $message =~ s/\n+$//;
+
+  # We put quotes around the message to stringify any object exceptions,
+  # like Template::Exception.
+  die colored("$message", COLOR_ERROR) . "\n";
 }
 
 sub success {
-    my ($message) = @_;
-    print colored($message, COLOR_SUCCESS), "\n";
+  my ($message) = @_;
+  print colored($message, COLOR_SUCCESS), "\n";
 }
 
 sub prevent_windows_dialog_boxes {
-    # This code comes from http://bugs.activestate.com/show_bug.cgi?id=82183
-    # and prevents Perl modules from popping up dialog boxes, particularly
-    # during checksetup (since loading DBD::Oracle during checksetup when
-    # Oracle isn't installed causes a scary popup and pauses checksetup).
-    #
-    # Win32::API ships with ActiveState by default, though there could 
-    # theoretically be a Windows installation without it, I suppose.
-    if (ON_WINDOWS and eval { require Win32::API }) {
-        # Call kernel32.SetErrorMode with arguments that mean:
-        # "The system does not display the critical-error-handler message box.
-        # Instead, the system sends the error to the calling process." and
-        # "A child process inherits the error mode of its parent process."
-        my $SetErrorMode = Win32::API->new('kernel32', 'SetErrorMode', 
-                                           'I', 'I');
-        my $SEM_FAILCRITICALERRORS = 0x0001;
-        my $SEM_NOGPFAULTERRORBOX  = 0x0002;
-        $SetErrorMode->Call($SEM_FAILCRITICALERRORS | $SEM_NOGPFAULTERRORBOX);
-    }
+
+  # This code comes from http://bugs.activestate.com/show_bug.cgi?id=82183
+  # and prevents Perl modules from popping up dialog boxes, particularly
+  # during checksetup (since loading DBD::Oracle during checksetup when
+  # Oracle isn't installed causes a scary popup and pauses checksetup).
+  #
+  if (ON_WINDOWS) {
+
+    # Call kernel32.SetErrorMode with arguments that mean:
+    # "The system does not display the critical-error-handler message box.
+    # Instead, the system sends the error to the calling process." and
+    # "A child process inherits the error mode of its parent process."
+    my $SetErrorMode = Win32::API->new('kernel32', 'SetErrorMode', 'I', 'I');
+    my $SEM_FAILCRITICALERRORS = 0x0001;
+    my $SEM_NOGPFAULTERRORBOX  = 0x0002;
+    $SetErrorMode->Call($SEM_FAILCRITICALERRORS | $SEM_NOGPFAULTERRORBOX);
+  }
 }
 
 # This is like request_cache, but it's used only by installation code
 # for checksetup.pl and things like that.
-our $_cache = {};
-sub _cache {
-    # If the normal request_cache is available (which happens any time
-    # after the requirements phase) then we should use that.
-    if (eval { Bugzilla->request_cache; }) {
-        return Bugzilla->request_cache;
-    }
-    return $_cache;
-}
+use constant _cache => {};
 
 ###############################
 # Copied from Bugzilla::Util #
 ##############################
 
 sub trick_taint {
-    require Carp;
-    Carp::confess("Undef to trick_taint") unless defined $_[0];
-    my $match = $_[0] =~ /^(.*)$/s;
-    $_[0] = $match ? $1 : undef;
-    return (defined($_[0]));
+  require Carp;
+  Carp::confess("Undef to trick_taint") unless defined $_[0];
+  my $match = $_[0] =~ /^(.*)$/s;
+  $_[0] = $match ? $1 : undef;
+  return (defined($_[0]));
 }
 
 sub trim {
-    my ($str) = @_;
-    if ($str) {
-      $str =~ s/^\s+//g;
-      $str =~ s/\s+$//g;
-    }
-    return $str;
+  my ($str) = @_;
+  if ($str) {
+    $str =~ s/^\s+//g;
+    $str =~ s/\s+$//g;
+  }
+  return $str;
 }
 
 __END__
@@ -711,6 +742,11 @@ binary, if the binary is in the C<PATH>.
 Returns a hash containing information about what version of Bugzilla we're
 running, what perl version we're using, and what OS we're running on.
 
+=item C<i_am_persistent>
+
+Returns true if Bugzilla is running in a persistent environment, such as
+mod_perl or PSGI. Returns false if running in mod_cgi mode.
+
 =item C<get_console_locale>
 
 Returns the language to use based on the LC_CTYPE value returned by the OS.
@@ -851,6 +887,10 @@ Used by L<Bugzilla::Template> to determine the languages' list which
 are compiled with the browser's I<Accept-Language> and the languages 
 of installed templates.
 
+=item C<feature_description>
+
+Return the English-language description of a feature from the (MY)META.json files.
+
 =back
 
 =head1 B<Methods in need of POD>
diff --git a/Bugzilla/Job/BugMail.pm b/Bugzilla/Job/BugMail.pm
index e0b7f54482..415bf41cdf 100644
--- a/Bugzilla/Job/BugMail.pm
+++ b/Bugzilla/Job/BugMail.pm
@@ -7,26 +7,16 @@
 
 package Bugzilla::Job::BugMail;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::BugMail;
 BEGIN { eval "use parent qw(Bugzilla::Job::Mailer)"; }
 
-sub work {
-    my ($class, $job) = @_;
-    my $success = eval {
-        Bugzilla::BugMail::dequeue($job->arg->{vars});
-        1;
-    };
-    if (!$success) {
-        $job->failed($@);
-        undef $@;
-    }
-    else {
-        $job->completed;
-    }
+sub process_job {
+  my ($class, $arg) = @_;
+  Bugzilla::BugMail::dequeue($arg->{vars});
 }
 
 1;
diff --git a/Bugzilla/Job/Mailer.pm b/Bugzilla/Job/Mailer.pm
index cd1c23445a..0ed5255307 100644
--- a/Bugzilla/Job/Mailer.pm
+++ b/Bugzilla/Job/Mailer.pm
@@ -7,40 +7,52 @@
 
 package Bugzilla::Job::Mailer;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
+use Bugzilla::Constants;
 use Bugzilla::Mailer;
 BEGIN { eval "use parent qw(TheSchwartz::Worker)"; }
 
 # The longest we expect a job to possibly take, in seconds.
 use constant grab_for => 300;
+
 # We don't want email to fail permanently very easily. Retry for 30 days.
 use constant max_retries => 725;
 
 # The first few retries happen quickly, but after that we wait an hour for
 # each retry.
 sub retry_delay {
-    my ($class, $num_retries) = @_;
-    if ($num_retries < 5) {
-        return (10, 30, 60, 300, 600)[$num_retries];
-    }
-    # One hour
-    return 60*60;
+  my ($class, $num_retries) = @_;
+  if ($num_retries < 5) {
+    return (10, 30, 60, 300, 600)[$num_retries];
+  }
+
+  # One hour
+  return 60 * 60;
 }
 
 sub work {
-    my ($class, $job) = @_;
-    my $msg = $job->arg->{msg};
-    my $success = eval { MessageToMTA($msg, 1); 1; };
-    if (!$success) {
-        $job->failed($@);
-        undef $@;
-    } 
+  my ($class, $job) = @_;
+  eval { $class->process_job($job->arg) };
+  if (my $error = $@) {
+    if ($error eq EMAIL_LIMIT_EXCEPTION) {
+      $job->declined();
+    }
     else {
-        $job->completed;
+      $job->failed($error);
     }
+    undef $@;
+  }
+  else {
+    $job->completed;
+  }
+}
+
+sub process_job {
+  my ($class, $arg) = @_;
+  MessageToMTA($arg->{msg}, 1);
 }
 
 1;
diff --git a/Bugzilla/JobQueue.pm b/Bugzilla/JobQueue.pm
index d5ceda8e9f..200b9e4466 100644
--- a/Bugzilla/JobQueue.pm
+++ b/Bugzilla/JobQueue.pm
@@ -7,167 +7,169 @@
 
 package Bugzilla::JobQueue;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Install::Util qw(install_string);
+use Bugzilla::Util qw(read_text);
 use File::Basename;
-use File::Slurp;
 use base qw(TheSchwartz);
 use fields qw(_worker_pidfile);
 
 # This maps job names for Bugzilla::JobQueue to the appropriate modules.
 # If you add new types of jobs, you should add a mapping here.
-use constant JOB_MAP => {
-    send_mail => 'Bugzilla::Job::Mailer',
-    bug_mail  => 'Bugzilla::Job::BugMail',
-};
+use constant JOB_MAP =>
+  {send_mail => 'Bugzilla::Job::Mailer', bug_mail => 'Bugzilla::Job::BugMail',};
 
 # Without a driver cache TheSchwartz opens a new database connection
 # for each email it sends.  This cached connection doesn't persist
 # across requests.
-use constant DRIVER_CACHE_TIME => 300; # 5 minutes
+use constant DRIVER_CACHE_TIME => 300;    # 5 minutes
 
 # To avoid memory leak/fragmentation, a worker process won't process more than
 # MAX_MESSAGES messages.
 use constant MAX_MESSAGES => 1000;
 
 sub job_map {
-    if (!defined(Bugzilla->request_cache->{job_map})) {
-        my $job_map = JOB_MAP;
-        Bugzilla::Hook::process('job_map', { job_map => $job_map });
-        Bugzilla->request_cache->{job_map} = $job_map;
-    }
-    
-    return Bugzilla->request_cache->{job_map};
+  if (!defined(Bugzilla->request_cache->{job_map})) {
+    my $job_map = JOB_MAP;
+    Bugzilla::Hook::process('job_map', {job_map => $job_map});
+    Bugzilla->request_cache->{job_map} = $job_map;
+  }
+
+  return Bugzilla->request_cache->{job_map};
 }
 
 sub new {
-    my $class = shift;
-
-    if (!Bugzilla->feature('jobqueue')) {
-        ThrowUserError('feature_disabled', { feature => 'jobqueue' });
-    }
-
-    my $lc = Bugzilla->localconfig;
-    # We need to use the main DB as TheSchwartz module is going
-    # to write to it.
-    my $self = $class->SUPER::new(
-        databases => [{
-            dsn    => Bugzilla->dbh_main->{private_bz_dsn},
-            user   => $lc->{db_user},
-            pass   => $lc->{db_pass},
-            prefix => 'ts_',
-        }],
-        driver_cache_expiration => DRIVER_CACHE_TIME,
-        prioritize => 1,
-    );
-
-    return $self;
+  my $class = shift;
+
+  if (!Bugzilla->feature('jobqueue')) {
+    ThrowUserError('feature_disabled', {feature => 'jobqueue'});
+  }
+
+  my $lc = Bugzilla->localconfig;
+
+  # We need to use the main DB as TheSchwartz module is going
+  # to write to it.
+  my $self = $class->SUPER::new(
+    databases => [{
+      dsn    => Bugzilla->dbh_main->{private_bz_dsn},
+      user   => $lc->{db_user},
+      pass   => $lc->{db_pass},
+      prefix => 'ts_',
+    }],
+    driver_cache_expiration => DRIVER_CACHE_TIME,
+    prioritize              => 1,
+  );
+
+  return $self;
 }
 
 # A way to get access to the underlying databases directly.
 sub bz_databases {
-    my $self = shift;
-    my @hashes = keys %{ $self->{databases} };
-    return map { $self->driver_for($_) } @hashes;
+  my $self   = shift;
+  my @hashes = keys %{$self->{databases}};
+  return map { $self->driver_for($_) } @hashes;
 }
 
 # inserts a job into the queue to be processed and returns immediately
 sub insert {
-    my $self = shift;
-    my $job = shift;
-
-    if (!ref($job)) {
-        my $mapped_job = Bugzilla::JobQueue->job_map()->{$job};
-        ThrowCodeError('jobqueue_no_job_mapping', { job => $job })
-            if !$mapped_job;
-
-        $job = new TheSchwartz::Job(
-            funcname => $mapped_job,
-            arg      => $_[0],
-            priority => $_[1] || 5
-        );
-    }
-    
-    my $retval = $self->SUPER::insert($job);
-    # XXX Need to get an error message here if insert fails, but
-    # I don't see any way to do that in TheSchwartz.
-    ThrowCodeError('jobqueue_insert_failed', { job => $job, errmsg => $@ })
-        if !$retval;
- 
-    return $retval;
+  my $self = shift;
+  my $job  = shift;
+
+  if (!ref($job)) {
+    my $mapped_job = Bugzilla::JobQueue->job_map()->{$job};
+    ThrowCodeError('jobqueue_no_job_mapping', {job => $job}) if !$mapped_job;
+
+    $job = new TheSchwartz::Job(
+      funcname => $mapped_job,
+      arg      => $_[0],
+      priority => $_[1] || 5
+    );
+  }
+
+  my $retval = $self->SUPER::insert($job);
+
+  # XXX Need to get an error message here if insert fails, but
+  # I don't see any way to do that in TheSchwartz.
+  ThrowCodeError('jobqueue_insert_failed', {job => $job, errmsg => $@})
+    if !$retval;
+
+  return $retval;
 }
 
 # To avoid memory leaks/fragmentation which tends to happen for long running
 # perl processes; check for jobs, and spawn a new process to empty the queue.
 sub subprocess_worker {
-    my $self = shift;
-
-    my $command = "$0 -d -p '" . $self->{_worker_pidfile} . "' onepass";
-
-    while (1) {
-        my $time = (time);
-        my @jobs = $self->list_jobs({
-            funcname      => $self->{all_abilities},
-            run_after     => $time,
-            grabbed_until => $time,
-            limit         => 1,
-        });
-        if (@jobs) {
-            $self->debug("Spawning queue worker process");
-            # Run the worker as a daemon
-            system $command;
-            # And poll the PID to detect when the working has finished.
-            # We do this instead of system() to allow for the INT signal to
-            # interrup us and trigger kill_worker().
-            my $pid = read_file($self->{_worker_pidfile}, err_mode => 'quiet');
-            if ($pid) {
-                sleep(3) while(kill(0, $pid));
-            }
-            $self->debug("Queue worker process completed");
-        } else {
-            $self->debug("No jobs found");
-        }
-        sleep(5);
+  my $self = shift;
+
+  my $command = "$0 -d -p '" . $self->{_worker_pidfile} . "' onepass";
+
+  while (1) {
+    my $time = (time);
+    my @jobs = $self->list_jobs({
+      funcname      => $self->{all_abilities},
+      run_after     => $time,
+      grabbed_until => $time,
+      limit         => 1,
+    });
+    if (@jobs) {
+      $self->debug("Spawning queue worker process");
+
+      # Run the worker as a daemon
+      system $command;
+
+      # And poll the PID to detect when the working has finished.
+      # We do this instead of system() to allow for the INT signal to
+      # interrup us and trigger kill_worker().
+      my $pid = read_text($self->{_worker_pidfile}, err_mode => 'quiet');
+      if ($pid) {
+        sleep(3) while (kill(0, $pid));
+      }
+      $self->debug("Queue worker process completed");
     }
+    else {
+      $self->debug("No jobs found");
+    }
+    sleep(5);
+  }
 }
 
 sub kill_worker {
-    my $self = Bugzilla->job_queue();
-    if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) {
-        my $worker_pid = read_file($self->{_worker_pidfile});
-        if ($worker_pid && kill(0, $worker_pid)) {
-            $self->debug("Stopping worker process");
-            system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop";
-        }
+  my $self = Bugzilla->job_queue();
+  if ($self->{_worker_pidfile} && -e $self->{_worker_pidfile}) {
+    my $worker_pid = read_text($self->{_worker_pidfile});
+    if ($worker_pid && kill(0, $worker_pid)) {
+      $self->debug("Stopping worker process");
+      system "$0 -f -p '" . $self->{_worker_pidfile} . "' stop";
     }
+  }
 }
 
 sub set_pidfile {
-    my ($self, $pidfile) = @_;
-    $self->{_worker_pidfile} = bz_locations->{'datadir'} .
-                               '/worker-' . basename($pidfile);
+  my ($self, $pidfile) = @_;
+  $self->{_worker_pidfile}
+    = bz_locations->{'datadir'} . '/worker-' . basename($pidfile);
 }
 
 # Clear the request cache at the start of each run.
 sub work_once {
-    my $self = shift;
-    Bugzilla->clear_request_cache();
-    return $self->SUPER::work_once(@_);
+  my $self = shift;
+  Bugzilla->clear_request_cache();
+  return $self->SUPER::work_once(@_);
 }
 
 # Never process more than MAX_MESSAGES in one batch, to avoid memory
 # leak/fragmentation issues.
 sub work_until_done {
-    my $self = shift;
-    my $count = 0;
-    while ($count++ < MAX_MESSAGES) {
-        $self->work_once or last;
-    }
+  my $self  = shift;
+  my $count = 0;
+  while ($count++ < MAX_MESSAGES) {
+    $self->work_once or last;
+  }
 }
 
 1;
diff --git a/Bugzilla/JobQueue/Runner.pm b/Bugzilla/JobQueue/Runner.pm
index 104a97b0ba..a64d080069 100644
--- a/Bugzilla/JobQueue/Runner.pm
+++ b/Bugzilla/JobQueue/Runner.pm
@@ -11,7 +11,7 @@
 
 package Bugzilla::JobQueue::Runner;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -28,8 +28,8 @@ BEGIN { eval "use parent qw(Daemon::Generic)"; }
 our $VERSION = BUGZILLA_VERSION;
 
 # Info we need to install/uninstall the daemon.
-our $chkconfig = "/sbin/chkconfig";
-our $initd = "/etc/init.d";
+our $chkconfig  = "/sbin/chkconfig";
+our $initd      = "/etc/init.d";
 our $initscript = "bugzilla-queue";
 
 # The Daemon::Generic docs say that it uses all sorts of
@@ -37,187 +37,191 @@ our $initscript = "bugzilla-queue";
 # only thing it uses from gd_preconfig is the "pidfile"
 # config parameter.
 sub gd_preconfig {
-    my $self = shift;
-
-    $self->{_run_command} = 'subprocess_worker';
-    my $pidfile = $self->{gd_args}{pidfile};
-    if (!$pidfile) {
-        $pidfile = bz_locations()->{datadir} . '/' . $self->{gd_progname} 
-                   . ".pid";
-    }
-    return (pidfile => $pidfile);
+  my $self = shift;
+
+  $self->{_run_command} = 'subprocess_worker';
+  my $pidfile = $self->{gd_args}{pidfile};
+  if (!$pidfile) {
+    $pidfile = bz_locations()->{datadir} . '/' . $self->{gd_progname} . ".pid";
+  }
+  return (pidfile => $pidfile);
 }
 
 # All config other than the pidfile has to be done in gd_getopt
 # in order for it to be set up early enough.
 sub gd_getopt {
-    my $self = shift;
+  my $self = shift;
 
-    $self->SUPER::gd_getopt();
+  $self->SUPER::gd_getopt();
 
-    if ($self->{gd_args}{progname}) {
-        $self->{gd_progname} = $self->{gd_args}{progname};
-    }
-    else {
-        $self->{gd_progname} = basename($0);
-    }
+  if ($self->{gd_args}{progname}) {
+    $self->{gd_progname} = $self->{gd_args}{progname};
+  }
+  else {
+    $self->{gd_progname} = basename($0);
+  }
 
-    # There are places that Daemon Generic's new() uses $0 instead of
-    # gd_progname, which it really shouldn't, but this hack fixes it.
-    $self->{_original_zero} = $0;
-    $0 = $self->{gd_progname};
+  # There are places that Daemon Generic's new() uses $0 instead of
+  # gd_progname, which it really shouldn't, but this hack fixes it.
+  $self->{_original_zero} = $0;
+  $0 = $self->{gd_progname};
 }
 
 sub gd_postconfig {
-    my $self = shift;
-    # See the hack above in gd_getopt. This just reverses it
-    # in case anything else needs the accurate $0.
-    $0 = delete $self->{_original_zero};
+  my $self = shift;
+
+  # See the hack above in gd_getopt. This just reverses it
+  # in case anything else needs the accurate $0.
+  $0 = delete $self->{_original_zero};
 }
 
 sub gd_more_opt {
-    my $self = shift;
-    return (
-        'pidfile=s' => \$self->{gd_args}{pidfile},
-        'n=s'       => \$self->{gd_args}{progname},
-    );
+  my $self = shift;
+  return (
+    'pidfile=s' => \$self->{gd_args}{pidfile},
+    'n=s'       => \$self->{gd_args}{progname},
+    'j=s@'      => \$self->{gd_args}{job_name},
+  );
 }
 
 sub gd_usage {
-    pod2usage({ -verbose => 0, -exitval => 'NOEXIT' });
-    return 0
+  pod2usage({-verbose => 0, -exitval => 'NOEXIT'});
+  return 0;
 }
 
 sub gd_can_install {
-    my $self = shift;
+  my $self = shift;
+
+  my $source_file;
+  if (-e "/etc/SuSE-release") {
+    $source_file = "contrib/$initscript.suse";
+  }
+  else {
+    $source_file = "contrib/$initscript.rhel";
+  }
+  my $dest_file   = "$initd/$initscript";
+  my $sysconfig   = '/etc/sysconfig';
+  my $config_file = "$sysconfig/$initscript";
+
+  if (!-x $chkconfig or !-d $initd) {
+    return $self->SUPER::gd_can_install(@_);
+  }
 
-    my $source_file;
-    if ( -e "/etc/SuSE-release" ) {
-        $source_file = "contrib/$initscript.suse";
-    } else {
-        $source_file = "contrib/$initscript.rhel";
+  return sub {
+    if (!-w $initd) {
+      print "You must run the 'install' command as root.\n";
+      return;
     }
-    my $dest_file = "$initd/$initscript";
-    my $sysconfig = '/etc/sysconfig';
-    my $config_file = "$sysconfig/$initscript";
-
-    if (!-x $chkconfig  or !-d $initd) {
-        return $self->SUPER::gd_can_install(@_);
+    if (-e $dest_file) {
+      print "$initscript already in $initd.\n";
+    }
+    else {
+      copy($source_file, $dest_file)
+        or die "Could not copy $source_file to $dest_file: $!";
+      chmod(0755, $dest_file) or die "Could not change permissions on $dest_file: $!";
     }
 
-    return sub {
-        if (!-w $initd) {
-            print "You must run the 'install' command as root.\n";
-            return;
-        }
-        if (-e $dest_file) {
-            print "$initscript already in $initd.\n";
-        }
-        else {
-            copy($source_file, $dest_file)
-                or die "Could not copy $source_file to $dest_file: $!";
-            chmod(0755, $dest_file)
-                or die "Could not change permissions on $dest_file: $!";
-        }
-
-        system($chkconfig, '--add', $initscript);
-        print "$initscript installed.",
-              " To start the daemon, do \"$dest_file start\" as root.\n";
-
-        if (-d $sysconfig and -w $sysconfig) {
-            if (-e $config_file) {
-                print "$config_file already exists.\n";
-                return;
-            }
-
-            open(my $config_fh, ">", $config_file)
-                or die "Could not write to $config_file: $!";
-            my $directory = abs_path(dirname($self->{_original_zero}));
-            my $owner_id = (stat $self->{_original_zero})[4];
-            my $owner = getpwuid($owner_id);
-            print $config_fh <<END;
+    system($chkconfig, '--add', $initscript);
+    print "$initscript installed.",
+      " To start the daemon, do \"$dest_file start\" as root.\n";
+
+    if (-d $sysconfig and -w $sysconfig) {
+      if (-e $config_file) {
+        print "$config_file already exists.\n";
+        return;
+      }
+
+      open(my $config_fh, ">", $config_file)
+        or die "Could not write to $config_file: $!";
+      my $directory = abs_path(dirname($self->{_original_zero}));
+      my $owner_id  = (stat $self->{_original_zero})[4];
+      my $owner     = getpwuid($owner_id);
+      print $config_fh <<END;
 #!/bin/sh
 BUGZILLA="$directory"
 # This user must have write access to Bugzilla's data/ directory.
 USER=$owner
 END
-            close($config_fh);
-        }
-        else {
-            print "Please edit $dest_file to configure the daemon.\n";
-        }
+      close($config_fh);
+    }
+    else {
+      print "Please edit $dest_file to configure the daemon.\n";
+    }
     }
 }
 
 sub gd_can_uninstall {
-    my $self = shift;
-
-    if (-x $chkconfig and -d $initd) {
-        return sub {
-            if (!-e "$initd/$initscript") {
-                print "$initscript not installed.\n";
-                return;
-            }
-            system($chkconfig, '--del', $initscript);
-            print "$initscript disabled.",
-                  " To stop it, run: $initd/$initscript stop\n";
-        }
-    }
+  my $self = shift;
 
-    return $self->SUPER::gd_can_install(@_);
+  if (-x $chkconfig and -d $initd) {
+    return sub {
+      if (!-e "$initd/$initscript") {
+        print "$initscript not installed.\n";
+        return;
+      }
+      system($chkconfig, '--del', $initscript);
+      print "$initscript disabled.", " To stop it, run: $initd/$initscript stop\n";
+      }
+  }
+
+  return $self->SUPER::gd_can_install(@_);
 }
 
 sub gd_check {
-    my $self = shift;
-
-    # Get a count of all the jobs currently in the queue.
-    my $jq = Bugzilla->job_queue();
-    my @dbs = $jq->bz_databases();
-    my $count = 0;
-    foreach my $driver (@dbs) {
-        $count += $driver->select_one('SELECT COUNT(*) FROM ts_job', []);
-    }
-    print get_text('job_queue_depth', { count => $count }) . "\n";
+  my $self = shift;
+
+  # Get a count of all the jobs currently in the queue.
+  my $jq    = Bugzilla->job_queue();
+  my @dbs   = $jq->bz_databases();
+  my $count = 0;
+  foreach my $driver (@dbs) {
+    $count += $driver->select_one('SELECT COUNT(*) FROM ts_job', []);
+  }
+  print get_text('job_queue_depth', {count => $count}) . "\n";
 }
 
 sub gd_setup_signals {
-    my $self = shift;
-    $self->SUPER::gd_setup_signals();
-    $SIG{TERM} = sub { $self->gd_quit_event(); }
+  my $self = shift;
+  $self->SUPER::gd_setup_signals();
+  $SIG{TERM} = sub { $self->gd_quit_event(); }
 }
 
 sub gd_quit_event {
-    Bugzilla->job_queue->kill_worker();
-    exit(1);
+  Bugzilla->job_queue->kill_worker();
+  exit(1);
 }
 
 sub gd_other_cmd {
-    my ($self, $do, $locked) = @_;
-    if ($do eq "once") {
-        $self->{_run_command} = 'work_once';
-    } elsif ($do eq "onepass") {
-        $self->{_run_command} = 'work_until_done';
-    } else {
-        $self->SUPER::gd_other_cmd($do, $locked);
-    }
+  my ($self, $do, $locked) = @_;
+  if ($do eq "once") {
+    $self->{_run_command} = 'work_once';
+  }
+  elsif ($do eq "onepass") {
+    $self->{_run_command} = 'work_until_done';
+  }
+  else {
+    $self->SUPER::gd_other_cmd($do, $locked);
+  }
 }
 
 sub gd_run {
-    my $self = shift;
-    $self->_do_work($self->{_run_command});
+  my $self = shift;
+  $self->_do_work($self->{_run_command});
 }
 
 sub _do_work {
-    my ($self, $fn) = @_;
-
-    my $jq = Bugzilla->job_queue();
-    $jq->set_verbose($self->{debug});
-    $jq->set_pidfile($self->{gd_pidfile});
-    foreach my $module (values %{ Bugzilla::JobQueue->job_map() }) {
-        eval "use $module";
-        $jq->can_do($module);
-    }
-    $jq->$fn;
+  my ($self, $fn) = @_;
+
+  my @job_name = @{$self->{gd_args}{job_name} // []};
+  my $jq = Bugzilla->job_queue();
+  $jq->set_verbose($self->{debug});
+  $jq->set_pidfile($self->{gd_pidfile});
+  while (my ($key, $module) = each %{Bugzilla::JobQueue->job_map()}) {
+    next if @job_name and !grep { $_ eq $key } @job_name;
+    eval "use $module";
+    $jq->can_do($module);
+  }
+  $jq->$fn;
 }
 
 1;
diff --git a/Bugzilla/Keyword.pm b/Bugzilla/Keyword.pm
index afa93e1e9a..ff8c45e18e 100644
--- a/Bugzilla/Keyword.pm
+++ b/Bugzilla/Keyword.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Keyword;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -23,72 +23,78 @@ use Bugzilla::Util;
 use constant IS_CONFIG => 1;
 
 use constant DB_COLUMNS => qw(
-   keyworddefs.id
-   keyworddefs.name
-   keyworddefs.description
+  keyworddefs.id
+  keyworddefs.name
+  keyworddefs.description
+  keyworddefs.is_active
 );
 
 use constant DB_TABLE => 'keyworddefs';
 
 use constant VALIDATORS => {
-    name        => \&_check_name,
-    description => \&_check_description,
+  name        => \&_check_name,
+  description => \&_check_description,
+  is_active   => \&_check_is_active,
 };
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    description
+  name
+  description
+  is_active
 );
 
 ###############################
 ####      Accessors      ######
 ###############################
 
-sub description       { return $_[0]->{'description'}; }
+sub description { return $_[0]->{'description'}; }
 
 sub bug_count {
-    my ($self) = @_;
-    return $self->{'bug_count'} if defined $self->{'bug_count'};
-    ($self->{'bug_count'}) =
-      Bugzilla->dbh->selectrow_array(
-          'SELECT COUNT(*) FROM keywords WHERE keywordid = ?', 
-          undef, $self->id);
-    return $self->{'bug_count'};
+  my ($self) = @_;
+  return $self->{'bug_count'} if defined $self->{'bug_count'};
+  ($self->{'bug_count'})
+    = Bugzilla->dbh->selectrow_array(
+    'SELECT COUNT(*) FROM keywords WHERE keywordid = ?',
+    undef, $self->id);
+  return $self->{'bug_count'};
 }
 
 ###############################
 ####       Mutators       #####
 ###############################
 
-sub set_name        { $_[0]->set('name', $_[1]); }
+sub set_name        { $_[0]->set('name',        $_[1]); }
 sub set_description { $_[0]->set('description', $_[1]); }
+sub set_is_active   { $_[0]->set('is_active',   $_[1]); }
 
 ###############################
 ####      Subroutines    ######
 ###############################
 
 sub get_all_with_bug_count {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
-    my $keywords =
-      $dbh->selectall_arrayref('SELECT ' 
-                                      . join(', ', $class->_get_db_columns) . ',
+  my $class    = shift;
+  my $dbh      = Bugzilla->dbh;
+  my $keywords = $dbh->selectall_arrayref(
+    'SELECT ' . join(', ', $class->_get_db_columns) . ',
                                        COUNT(keywords.bug_id) AS bug_count
                                   FROM keyworddefs
                              LEFT JOIN keywords
-                                    ON keyworddefs.id = keywords.keywordid ' .
-                                  $dbh->sql_group_by('keyworddefs.id',
-                                                     'keyworddefs.name,
-                                                      keyworddefs.description') . '
-                                 ORDER BY keyworddefs.name', {'Slice' => {}});
-    if (!$keywords) {
-        return [];
-    }
-    
-    foreach my $keyword (@$keywords) {
-        bless($keyword, $class);
-    }
-    return $keywords;
+                                    ON keyworddefs.id = keywords.keywordid '
+      . $dbh->sql_group_by(
+      'keyworddefs.id', 'keyworddefs.name,
+                                                      keyworddefs.description'
+      ) . '
+                                 ORDER BY keyworddefs.name',
+    {'Slice' => {}}
+  );
+  if (!$keywords) {
+    return [];
+  }
+
+  foreach my $keyword (@$keywords) {
+    bless($keyword, $class);
+  }
+  return $keywords;
 }
 
 ###############################
@@ -96,35 +102,39 @@ sub get_all_with_bug_count {
 ###############################
 
 sub _check_name {
-    my ($self, $name) = @_;
-
-    $name = trim($name);
-    if (!defined $name or $name eq "") {
-        ThrowUserError("keyword_blank_name");
-    }
-    if ($name =~ /[\s,]/) {
-        ThrowUserError("keyword_invalid_name");
-    }
-
-    # We only want to validate the non-existence of the name if
-    # we're creating a new Keyword or actually renaming the keyword.
-    if (!ref($self) || lc($self->name) ne lc($name)) {
-        my $keyword = new Bugzilla::Keyword({ name => $name });
-        ThrowUserError("keyword_already_exists", { name => $name }) if $keyword;
-    }
-
-    return $name;
+  my ($self, $name) = @_;
+
+  $name = trim($name);
+  if (!defined $name or $name eq "") {
+    ThrowUserError("keyword_blank_name");
+  }
+  if ($name =~ /[\s,]/) {
+    ThrowUserError("keyword_invalid_name");
+  }
+
+  # We only want to validate the non-existence of the name if
+  # we're creating a new Keyword or actually renaming the keyword.
+  if (!ref($self) || lc($self->name) ne lc($name)) {
+    my $keyword = new Bugzilla::Keyword({name => $name});
+    ThrowUserError("keyword_already_exists", {name => $name}) if $keyword;
+  }
+
+  return $name;
 }
 
 sub _check_description {
-    my ($self, $desc) = @_;
-    $desc = trim($desc);
-    if (!defined $desc or $desc eq '') {
-        ThrowUserError("keyword_blank_description");
-    }
-    return $desc;
+  my ($self, $desc) = @_;
+  $desc = trim($desc);
+  if (!defined $desc or $desc eq '') {
+    ThrowUserError("keyword_blank_description");
+  }
+  return $desc;
 }
 
+sub _check_is_active { return $_[1] ? 1 : 0 }
+
+sub is_active { return $_[0]->{is_active} }
+
 1;
 
 __END__
@@ -145,13 +155,13 @@ Bugzilla::Keyword - A Keyword that can be added to a bug.
 
 Bugzilla::Keyword represents a keyword that can be added to a bug.
 
-This implements all standard C<Bugzilla::Object> methods. See 
+This implements all standard C<Bugzilla::Object> methods. See
 L<Bugzilla::Object> for more details.
 
-=head1 SUBROUTINES
+=head1 METHODS
 
-This is only a list of subroutines specific to C<Bugzilla::Keyword>.
-See L<Bugzilla::Object> for more subroutines that this object 
+This is only a list of methods specific to C<Bugzilla::Keyword>.
+See L<Bugzilla::Object> for more methods that this object
 implements.
 
 =over
@@ -166,6 +176,18 @@ implements.
  Returns:     A reference to an array of Keyword objects, or an empty
               arrayref if there are no keywords.
 
+=item C<is_active>
+
+ Description: Indicates if the keyword may be used on a bug
+ Params:      none
+ Returns:     a boolean value that is true if the keyword can be applied to bugs.
+
+=item C<set_is_active($is_active)>
+
+ Description: Set the is_active property to a boolean value
+ Params:      the new value of the is_active property.
+ Returns:     nothing
+
 =back
 
 =cut
diff --git a/Bugzilla/MIME.pm b/Bugzilla/MIME.pm
new file mode 100644
index 0000000000..dd6aeaedfb
--- /dev/null
+++ b/Bugzilla/MIME.pm
@@ -0,0 +1,121 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::MIME;
+use strict;
+use warnings;
+
+use 5.14.0;
+use parent qw(Email::MIME);
+
+sub new {
+  my ($class, $msg, $args) = @_;
+
+  # Template-Toolkit trims trailing newlines, which is problematic when
+  # parsing headers.
+  $msg =~ s/\n*$/\n/;
+
+  # Because the encoding headers are not present in our email templates, we
+  # need to treat them as binary UTF-8 when parsing.
+  my ($in_header, $has_type, $has_encoding, $has_body) = (1);
+  foreach my $line (split(/\n/, $msg)) {
+    if ($line eq '') {
+      $in_header = 0;
+      next;
+    }
+    if (!$in_header) {
+      $has_body = 1;
+      last;
+    }
+    $has_type     = 1 if $line =~ /^Content-Type:/i;
+    $has_encoding = 1 if $line =~ /^Content-Transfer-Encoding:/i;
+  }
+  if ($has_body) {
+    if (!$has_type) {
+      $msg = qq#Content-Type: text/plain; charset="UTF-8"\n# . $msg;
+    }
+    if (!$has_encoding) {
+      $msg = qq#Content-Transfer-Encoding: binary\n# . $msg;
+    }
+  }
+  if (utf8::is_utf8($msg)) {
+    utf8::encode($msg);
+  }
+
+  # RFC 2822 requires us to have CRLF for our line endings and
+  # Email::MIME doesn't do this for us. We use \015 (CR) and \012 (LF)
+  # directly because Perl translates "\n" depending on what platform
+  # you're running on. See http://perldoc.perl.org/perlport.html#Newlines
+  $msg =~ s/(?:\015+)?\012/\015\012/msg;
+
+  return $class->SUPER::new($msg, $args);
+}
+
+sub as_string {
+  my $self = shift;
+
+  # We add this header to uniquely identify all email that we
+  # send as coming from this Bugzilla installation.
+  #
+  # We don't use correct_urlbase, because we want this URL to
+  # *always* be the same for this Bugzilla, in every email,
+  # even if the admin changes the "ssl_redirect" parameter some day.
+  $self->header_set('X-Bugzilla-URL', Bugzilla->params->{'urlbase'});
+
+  # We add this header to mark the mail as "auto-generated" and
+  # thus to hopefully avoid auto replies.
+  $self->header_set('Auto-Submitted', 'auto-generated');
+
+  # Exchange does not respect the Auto-Submitted, but uses this.
+  $self->header_set('X-Auto-Response-Suppress', 'All');
+
+  # MIME-Version must be set otherwise some mailsystems ignore the charset
+  $self->header_set('MIME-Version', '1.0') if !$self->header('MIME-Version');
+
+  # Encode the headers correctly in quoted-printable
+  foreach my $header ($self->header_names) {
+    my @values = $self->header($header);
+    map { utf8::decode($_) if defined($_) && !utf8::is_utf8($_) } @values;
+
+    $self->header_str_set($header, @values);
+  }
+
+  # Ensure the character-set and encoding is set correctly on single part
+  # emails.  Multipart emails should have these already set when the parts
+  # are assembled.
+  if (scalar($self->parts) == 1) {
+    $self->charset_set('UTF-8');
+    $self->encoding_set('quoted-printable');
+  }
+
+  # Ensure we always return the encoded string
+  my $value = $self->SUPER::as_string();
+  if (utf8::is_utf8($value)) {
+    utf8::encode($value);
+  }
+
+  return $value;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+Bugzilla::MIME - Wrapper around Email::MIME for unifying MIME related
+workarounds.
+
+=head1 SYNOPSIS
+
+  use Bugzilla::MIME;
+  my $email = Bugzilla::MIME->new($message, $args);
+
+=head1 DESCRIPTION
+
+Bugzilla::MIME subclasses Email::MIME and performs various fixes when parsing
+and generating email.
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 4447d40462..f035f2476c 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -7,225 +7,277 @@
 
 package Bugzilla::Mailer;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Exporter);
-@Bugzilla::Mailer::EXPORT = qw(MessageToMTA build_thread_marker);
+@Bugzilla::Mailer::EXPORT = qw(MessageToMTA build_thread_marker generate_email);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Hook;
+use Bugzilla::MIME;
+use Bugzilla::User;
 use Bugzilla::Util;
 
+use Encode qw();
 use Date::Format qw(time2str);
 
-use Encode qw(encode);
-use Encode::MIME::Header;
-use Email::MIME;
 use Email::Sender::Simple qw(sendmail);
 use Email::Sender::Transport::SMTP::Persistent;
 use Bugzilla::Sender::Transport::Sendmail;
 
+sub generate_email {
+  my ($vars, $templates) = @_;
+  my ($lang, $email_format, $msg_text, $msg_html, $msg_header);
+
+  if ($vars->{to_user}) {
+    $lang         = $vars->{to_user}->setting('lang');
+    $email_format = $vars->{to_user}->setting('email_format');
+  }
+  else {
+    # If there are users in the CC list who don't have an account,
+    # use the default language for email notifications.
+    $lang = Bugzilla::User->new()->setting('lang');
+
+    # However we cannot fall back to the default email_format, since
+    # it may be HTML, and many of the includes used in the HTML
+    # template require a valid user object. Instead we fall back to
+    # the plaintext template.
+    $email_format = 'text_only';
+  }
+
+  my $template = Bugzilla->template_inner($lang);
+
+  $template->process($templates->{header}, $vars, \$msg_header)
+    || ThrowTemplateError($template->error());
+  $template->process($templates->{text}, $vars, \$msg_text)
+    || ThrowTemplateError($template->error());
+
+  my @parts = (Bugzilla::MIME->create(
+    attributes => {
+      content_type => 'text/plain',
+      charset      => 'UTF-8',
+      encoding     => 'quoted-printable',
+    },
+    body_str => $msg_text,
+    encode_check => Encode::FB_DEFAULT
+  ));
+  if ($templates->{html} && $email_format eq 'html') {
+    $template->process($templates->{html}, $vars, \$msg_html)
+      || ThrowTemplateError($template->error());
+    push @parts,
+      Bugzilla::MIME->create(
+      attributes => {
+        content_type => 'text/html',
+        charset      => 'UTF-8',
+        encoding     => 'quoted-printable',
+      },
+      body_str => $msg_html,
+      encode_check => Encode::FB_DEFAULT
+      );
+  }
+
+  my $email = Bugzilla::MIME->new($msg_header);
+
+  # If there's only one part, we don't need to set the overall content type
+  # because Email::MIME will automatically take it from that part (bug 1657496)
+  if (scalar(@parts) > 1) {
+    $email->content_type_set('multipart/alternative');
+
+    # Some mail clients need same encoding for each part, even empty ones.
+    $email->charset_set('UTF-8');
+  }
+  $email->parts_set(\@parts);
+  return $email;
+}
+
 sub MessageToMTA {
-    my ($msg, $send_now) = (@_);
-    my $method = Bugzilla->params->{'mail_delivery_method'};
-    return if $method eq 'None';
-
-    if (Bugzilla->params->{'use_mailer_queue'}
-        && ! $send_now
-        && ! Bugzilla->dbh->bz_in_transaction()
-    ) {
-        Bugzilla->job_queue->insert('send_mail', { msg => $msg });
-        return;
+  my ($msg, $send_now) = (@_);
+  my $method = Bugzilla->params->{'mail_delivery_method'};
+  return if $method eq 'None';
+
+  if ( Bugzilla->params->{'use_mailer_queue'}
+    && !$send_now
+    && !Bugzilla->dbh->bz_in_transaction())
+  {
+    Bugzilla->job_queue->insert('send_mail', {msg => $msg});
+    return;
+  }
+
+  my $dbh = Bugzilla->dbh;
+
+  my $email = ref($msg) ? $msg : Bugzilla::MIME->new($msg);
+
+  # If we're called from within a transaction, we don't want to send the
+  # email immediately, in case the transaction is rolled back. Instead we
+  # insert it into the mail_staging table, and bz_commit_transaction calls
+  # send_staged_mail() after the transaction is committed.
+  if (!$send_now && $dbh->bz_in_transaction()) {
+
+    # The e-mail string may contain tainted values.
+    my $string = $email->as_string;
+    trick_taint($string);
+
+    my $sth = $dbh->prepare("INSERT INTO mail_staging (message) VALUES (?)");
+    $sth->bind_param(1, $string, $dbh->BLOB_TYPE);
+    $sth->execute;
+    return;
+  }
+
+  # Ensure that we are not sending emails too quickly to recipients.
+  if (Bugzilla->params->{use_mailer_queue}
+    && (EMAIL_LIMIT_PER_MINUTE || EMAIL_LIMIT_PER_HOUR))
+  {
+    $dbh->do("DELETE FROM email_rates WHERE message_ts < "
+        . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', '1', 'HOUR'));
+
+    my $recipient = $email->header('To');
+
+    if (EMAIL_LIMIT_PER_MINUTE) {
+      my $minute_rate = $dbh->selectrow_array(
+        "SELECT COUNT(*)
+                   FROM email_rates
+                  WHERE recipient = ?  AND message_ts >= "
+          . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', '1', 'MINUTE'), undef,
+        $recipient
+      );
+      if ($minute_rate >= EMAIL_LIMIT_PER_MINUTE) {
+        die EMAIL_LIMIT_EXCEPTION;
+      }
     }
-
-    my $email;
-    if (ref $msg) {
-        $email = $msg;
-    }
-    else {
-        # RFC 2822 requires us to have CRLF for our line endings and
-        # Email::MIME doesn't do this for us. We use \015 (CR) and \012 (LF)
-        # directly because Perl translates "\n" depending on what platform
-        # you're running on. See http://perldoc.perl.org/perlport.html#Newlines
-        $msg =~ s/(?:\015+)?\012/\015\012/msg;
-        $email = new Email::MIME($msg);
+    if (EMAIL_LIMIT_PER_HOUR) {
+      my $hour_rate = $dbh->selectrow_array(
+        "SELECT COUNT(*)
+                   FROM email_rates
+                  WHERE recipient = ?  AND message_ts >= "
+          . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', '1', 'HOUR'), undef,
+        $recipient
+      );
+      if ($hour_rate >= EMAIL_LIMIT_PER_HOUR) {
+        die EMAIL_LIMIT_EXCEPTION;
+      }
     }
+  }
 
-    # If we're called from within a transaction, we don't want to send the
-    # email immediately, in case the transaction is rolled back. Instead we
-    # insert it into the mail_staging table, and bz_commit_transaction calls
-    # send_staged_mail() after the transaction is committed.
-    if (! $send_now && Bugzilla->dbh->bz_in_transaction()) {
-        # The e-mail string may contain tainted values.
-        my $string = $email->as_string;
-        trick_taint($string);
-        Bugzilla->dbh->do("INSERT INTO mail_staging (message) VALUES(?)", undef, $string);
-        return;
-    }
+  my $from = $email->header('From');
 
-    # We add this header to uniquely identify all email that we
-    # send as coming from this Bugzilla installation.
-    #
-    # We don't use correct_urlbase, because we want this URL to
-    # *always* be the same for this Bugzilla, in every email,
-    # even if the admin changes the "ssl_redirect" parameter some day.
-    $email->header_set('X-Bugzilla-URL', Bugzilla->params->{'urlbase'});
-
-    # We add this header to mark the mail as "auto-generated" and
-    # thus to hopefully avoid auto replies.
-    $email->header_set('Auto-Submitted', 'auto-generated');
-
-    # MIME-Version must be set otherwise some mailsystems ignore the charset
-    $email->header_set('MIME-Version', '1.0') if !$email->header('MIME-Version');
-
-    # Encode the headers correctly in quoted-printable
-    foreach my $header ($email->header_names) {
-        my @values = $email->header($header);
-        # We don't recode headers that happen multiple times.
-        next if scalar(@values) > 1;
-        if (my $value = $values[0]) {
-            if (Bugzilla->params->{'utf8'} && !utf8::is_utf8($value)) {
-                utf8::decode($value);
-            }
-
-            # avoid excessive line wrapping done by Encode.
-            local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 998;
-
-            my $encoded = encode('MIME-Q', $value);
-            $email->header_set($header, $encoded);
-        }
-    }
-
-    my $from = $email->header('From');
-
-    my $hostname;
-    my $transport;
-    if ($method eq "Sendmail") {
-        if (ON_WINDOWS) {
-            $transport = Bugzilla::Sender::Transport::Sendmail->new({ sendmail => SENDMAIL_EXE });
-        }
-        else {
-            $transport = Bugzilla::Sender::Transport::Sendmail->new();
-        }
+  my $hostname;
+  my $transport;
+  if ($method eq "Sendmail") {
+    if (ON_WINDOWS) {
+      $transport
+        = Bugzilla::Sender::Transport::Sendmail->new({sendmail => SENDMAIL_EXE});
     }
     else {
-        # Sendmail will automatically append our hostname to the From
-        # address, but other mailers won't.
-        my $urlbase = Bugzilla->params->{'urlbase'};
-        $urlbase =~ m|//([^:/]+)[:/]?|;
-        $hostname = $1;
-        $from .= "\@$hostname" if $from !~ /@/;
-        $email->header_set('From', $from);
-        
-        # Sendmail adds a Date: header also, but others may not.
-        if (!defined $email->header('Date')) {
-            $email->header_set('Date', time2str("%a, %d %b %Y %T %z", time()));
-        }
-    }
-
-    if ($method eq "SMTP") {
-        my ($host, $port) = split(/:/, Bugzilla->params->{'smtpserver'}, 2);
-        $transport = Bugzilla->request_cache->{smtp} //=
-          Email::Sender::Transport::SMTP::Persistent->new({
-            host  => $host,
-            defined($port) ? (port => $port) : (),
-            sasl_username => Bugzilla->params->{'smtp_username'},
-            sasl_password => Bugzilla->params->{'smtp_password'},
-            helo => $hostname,
-            ssl => Bugzilla->params->{'smtp_ssl'},
-            debug => Bugzilla->params->{'smtp_debug'} });
+      $transport = Bugzilla::Sender::Transport::Sendmail->new();
     }
-
-    Bugzilla::Hook::process('mailer_before_send', { email => $email });
-
-    return if $email->header('to') eq '';
-
-    $email->walk_parts(sub {
-        my ($part) = @_;
-        return if $part->parts > 1; # Top-level
-        my $content_type = $part->content_type || '';
-        $content_type =~ /charset=['"](.+)['"]/;
-        # If no charset is defined or is the default us-ascii,
-        # then we encode the email to UTF-8 if Bugzilla has utf8 enabled.
-        # XXX - This is a hack to workaround bug 723944.
-        if (!$1 || $1 eq 'us-ascii') {
-            my $body = $part->body;
-            if (Bugzilla->params->{'utf8'}) {
-                $part->charset_set('UTF-8');
-                # encoding_set works only with bytes, not with utf8 strings.
-                my $raw = $part->body_raw;
-                if (utf8::is_utf8($raw)) {
-                    utf8::encode($raw);
-                    $part->body_set($raw);
-                }
-            }
-            $part->encoding_set('quoted-printable') if !is_7bit_clean($body);
-        }
-    });
-
-    if ($method eq "Test") {
-        my $filename = bz_locations()->{'datadir'} . '/mailer.testfile';
-        open TESTFILE, '>>', $filename;
-        # From - <date> is required to be a valid mbox file.
-        print TESTFILE "\n\nFrom - " . $email->header('Date') . "\n" . $email->as_string;
-        close TESTFILE;
+  }
+  else {
+    # Sendmail will automatically append our hostname to the From
+    # address, but other mailers won't.
+    my $urlbase = Bugzilla->params->{'urlbase'};
+    $urlbase =~ m|//([^:/]+)[:/]?|;
+    $hostname = $1 || 'localhost';
+    $from .= "\@$hostname" if $from !~ /@/;
+    $email->header_set('From', $from);
+
+    # Sendmail adds a Date: header also, but others may not.
+    if (!defined $email->header('Date')) {
+      $email->header_set('Date', time2str("%a, %d %b %Y %T %z", time()));
     }
-    else {
-        # This is useful for Sendmail, so we put it out here.
-        local $ENV{PATH} = SENDMAIL_PATH;
-        eval { sendmail($email, { transport => $transport }) };
-        if ($@) {
-            ThrowCodeError('mail_send_error', { msg => $@->message, mail => $email });
-        }
+  }
+
+  if ($method eq "SMTP") {
+    my ($host, $port) = split(/:/, Bugzilla->params->{'smtpserver'}, 2);
+    $transport = Bugzilla->request_cache->{smtp}
+      //= Email::Sender::Transport::SMTP::Persistent->new({
+      host => $host,
+      defined($port) ? (port => $port) : (),
+      sasl_username => Bugzilla->params->{'smtp_username'},
+      sasl_password => Bugzilla->params->{'smtp_password'},
+      helo          => $hostname,
+      ssl           => Bugzilla->params->{'smtp_ssl'},
+      debug         => Bugzilla->params->{'smtp_debug'}
+      });
+  }
+
+  Bugzilla::Hook::process('mailer_before_send', {email => $email});
+
+  return if $email->header('to') eq '';
+
+  if ($method eq "Test") {
+    my $filename = bz_locations()->{'datadir'} . '/mailer.testfile';
+    open TESTFILE, '>>:encoding(UTF-8)', $filename;
+
+    # From - <date> is required to be a valid mbox file.
+    print TESTFILE "\n\nFrom - "
+      . $email->header('Date') . "\n"
+      . $email->as_string;
+    close TESTFILE;
+  }
+  else {
+    # This is useful for Sendmail, so we put it out here.
+    local $ENV{PATH} = SENDMAIL_PATH;
+    eval { sendmail($email, {transport => $transport}) };
+    if ($@) {
+      ThrowCodeError('mail_send_error', {msg => $@->message, mail => $email});
     }
+  }
+
+  # insert into email_rates
+  if (Bugzilla->params->{use_mailer_queue}
+    && (EMAIL_LIMIT_PER_MINUTE || EMAIL_LIMIT_PER_HOUR))
+  {
+    $dbh->do(
+      "INSERT INTO email_rates(recipient, message_ts) VALUES (?, LOCALTIMESTAMP(0))",
+      undef, $email->header('To')
+    );
+  }
 }
 
 # Builds header suitable for use as a threading marker in email notifications
 sub build_thread_marker {
-    my ($bug_id, $user_id, $is_new) = @_;
-
-    if (!defined $user_id) {
-        $user_id = Bugzilla->user->id;
-    }
-
-    my $sitespec = '@' . Bugzilla->params->{'urlbase'};
-    $sitespec =~ s/:\/\//\./; # Make the protocol look like part of the domain
-    $sitespec =~ s/^([^:\/]+):(\d+)/$1/; # Remove a port number, to relocate
-    if ($2) {
-        $sitespec = "-$2$sitespec"; # Put the port number back in, before the '@'
-    }
-
-    my $threadingmarker;
-    if ($is_new) {
-        $threadingmarker = "Message-ID: <bug-$bug_id-$user_id$sitespec>";
-    }
-    else {
-        my $rand_bits = generate_random_password(10);
-        $threadingmarker = "Message-ID: <bug-$bug_id-$user_id-$rand_bits$sitespec>" .
-                           "\nIn-Reply-To: <bug-$bug_id-$user_id$sitespec>" .
-                           "\nReferences: <bug-$bug_id-$user_id$sitespec>";
-    }
-
-    return $threadingmarker;
+  my ($bug_id, $user_id, $is_new) = @_;
+
+  if (!defined $user_id) {
+    $user_id = Bugzilla->user->id;
+  }
+
+  my $sitespec = '@' . Bugzilla->params->{'urlbase'};
+  $sitespec =~ s/:\/\//\./;    # Make the protocol look like part of the domain
+  $sitespec =~ s/^([^:\/]+):(\d+)/$1/;    # Remove a port number, to relocate
+  if ($2) {
+    $sitespec = "-$2$sitespec";    # Put the port number back in, before the '@'
+  }
+
+  my $threadingmarker;
+  if ($is_new) {
+    $threadingmarker = "Message-ID: <bug-$bug_id-$user_id$sitespec>";
+  }
+  else {
+    my $rand_bits = generate_random_password(10);
+    $threadingmarker
+      = "Message-ID: <bug-$bug_id-$user_id-$rand_bits$sitespec>"
+      . "\nIn-Reply-To: <bug-$bug_id-$user_id$sitespec>"
+      . "\nReferences: <bug-$bug_id-$user_id$sitespec>";
+  }
+
+  return $threadingmarker;
 }
 
 sub send_staged_mail {
-    my $dbh = Bugzilla->dbh;
-    my @ids;
-    my $emails
-        = $dbh->selectall_arrayref("SELECT id, message FROM mail_staging");
-
-    foreach my $row (@$emails) {
-        MessageToMTA($row->[1]);
-        push(@ids, $row->[0]);
-    }
+  my $dbh = Bugzilla->dbh;
 
-    if (@ids) {
-        $dbh->do("DELETE FROM mail_staging WHERE " . $dbh->sql_in('id', \@ids));
-    }
+  my $emails = $dbh->selectall_arrayref('SELECT id, message FROM mail_staging');
+  my $sth    = $dbh->prepare('DELETE FROM mail_staging WHERE id = ?');
+
+  foreach my $email (@$emails) {
+    my ($id, $message) = @$email;
+    MessageToMTA($message);
+    $sth->execute($id);
+  }
 }
 
 1;
@@ -240,6 +292,10 @@ Bugzilla::Mailer - Provides methods for sending email
 
 =over
 
+=item C<generate_email>
+
+Generates a multi-part email message, using the supplied list of templates.
+
 =item C<MessageToMTA>
 
 Sends the passed message to the mail transfer agent.
diff --git a/Bugzilla/Markdown.pm b/Bugzilla/Markdown.pm
index 3023d98e24..a0c8c671b2 100644
--- a/Bugzilla/Markdown.pm
+++ b/Bugzilla/Markdown.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Markdown;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,9 +16,11 @@ use Bugzilla::Template;
 
 use Digest::MD5 qw(md5_hex);
 
-use parent qw(Text::Markdown);
+use parent qw(Text::MultiMarkdown);
 
-@Bugzilla::Markdown::EXPORT = qw(new);
+# use private code points
+use constant FENCED_BLOCK          => "\N{U+F111}";
+use constant INDENTED_FENCED_BLOCK => "\N{U+F222}";
 
 # Regex to match balanced [brackets]. See Friedl's
 # "Mastering Regular Expressions", 2nd Ed., pp. 328-331.
@@ -32,6 +34,7 @@ $g_nested_brackets = qr{
        \]
     )*
 }x;
+
 # Doesn't allow for whitespace, because we're using it to match URLs:
 $g_nested_parens = qr{
     (?>                                 # Atomic matching
@@ -44,77 +47,127 @@ $g_nested_parens = qr{
 }x;
 
 our %g_escape_table;
+
 foreach my $char (split //, '\\`*_{}[]()>#+-.!~') {
-    $g_escape_table{$char} = md5_hex($char);
+  $g_escape_table{$char} = md5_hex($char);
 }
 $g_escape_table{'&lt;'} = md5_hex('&lt;');
 
 sub new {
-    my $invocant = shift;
-    my $class = ref $invocant || $invocant;
-    return $class->SUPER::new(tab_width => MARKDOWN_TAB_WIDTH,
-                              # Bugzilla uses HTML not XHTML
-                              empty_element_suffix => '>');
+  my $invocant = shift;
+  my $class    = ref $invocant || $invocant;
+  my $obj      = $class->SUPER::new(
+    tab_width => MARKDOWN_TAB_WIDTH,
+
+    # Bugzilla uses HTML not XHTML
+    empty_element_suffix => '>'
+  );
+  $obj->{tab_width}            = MARKDOWN_TAB_WIDTH;
+  $obj->{empty_element_suffix} = '>';
+  return $obj;
 }
 
 sub markdown {
-    my $self = shift;
-    my $text = shift;
-    my $user = Bugzilla->user;
-
-    if ($user->settings->{use_markdown}->{is_enabled}
-        && $user->setting('use_markdown') eq 'on')
-    {
-        return $self->SUPER::markdown($text, @_);
-    }
-
-    return Bugzilla::Template::quoteUrls($text);
+  my ($self, $text, $bug, $comment) = @_;
+  my $user = Bugzilla->user;
+
+  if ( $user->settings->{use_markdown}->{is_enabled}
+    && $user->setting('use_markdown') eq 'on')
+  {
+    $text = $self->_removeFencedCodeBlocks($text);
+    $text = Bugzilla::Template::quoteUrls($text, $bug, $comment, $user, 1);
+    return $self->SUPER::markdown($text);
+  }
+
+  return Bugzilla::Template::quoteUrls($text, $bug, $comment, $user);
 }
 
-sub _Markdown {
-    my $self = shift;
-    my $text = shift;
-
-    $text = Bugzilla::Template::quoteUrls($text, undef, undef, undef, undef, 1);
+sub _code_blocks {
+  my ($self) = @_;
+  $self->{code_blocks} = $self->{params}->{code_blocks} ||= [];
+  return $self->{code_blocks};
+}
 
-    return $self->SUPER::_Markdown($text, @_);
+sub _indented_code_blocks {
+  my ($self) = @_;
+  $self->{indented_code_blocks} = $self->{params}->{indented_code_blocks} ||= [];
+  return $self->{indented_code_blocks};
 }
 
 sub _RunSpanGamut {
-    # These are all the transformations that occur *within* block-level
-    # tags like paragraphs, headers, and list items.
 
-    my ($self, $text) = @_;
+  # These are all the transformations that occur *within* block-level
+  # tags like paragraphs, headers, and list items.
+
+  my ($self, $text) = @_;
 
-    $text = $self->_DoCodeSpans($text);
-    $text = $self->_EscapeSpecialCharsWithinTagAttributes($text);
-    $text = $self->_EscapeSpecialChars($text);
+  $text = $self->_DoCodeSpans($text);
+  $text = $self->_EscapeSpecialCharsWithinTagAttributes($text);
+  $text = $self->_EscapeSpecialChars($text);
 
-    $text = $self->_DoAnchors($text);
+  $text = $self->_DoAnchors($text);
 
-    # Strikethroughs is Bugzilla's extension
-    $text = $self->_DoStrikethroughs($text);
+  # Strikethroughs is Bugzilla's extension
+  $text = $self->_DoStrikethroughs($text);
 
-    $text = $self->_DoAutoLinks($text);
-    $text = $self->_EncodeAmpsAndAngles($text);
-    $text = $self->_DoItalicsAndBold($text);
+  $text = $self->_DoAutoLinks($text);
+  $text = $self->_EncodeAmpsAndAngles($text);
+  $text = $self->_DoItalicsAndBold($text);
 
-    $text =~ s/ {2,}\n/ <br$self->{empty_element_suffix}\n/g;
+  $text =~ s/\n/<br$self->{empty_element_suffix}\n/g;
 
-    return $text;
+  return $text;
+}
+
+# We first replace all fenced code blocks with just their
+# surrounding backticks and an empty body to know where
+# they are exactly for later processing. The bodies of
+# blocks will be in an array. This measure is taken to not
+# interpret fenced code blocks contents as possible markdown
+# structures. The contents of the body will be processed after
+# processing markdown structures.
+sub _removeFencedCodeBlocks {
+  my ($self, $text) = @_;
+  $text =~ s{
+        ^ `{3,} [\s\t]* \n
+        (                # $1 = the entire code block
+          (?: .* \n+)+?
+        )
+        `{3,} [\s\t]* $
+        }{
+            push @{$self->_code_blocks}, $1;
+            "${\FENCED_BLOCK}\n";
+        }egmx;
+
+  $text =~ s{
+        (?:\n\n|\A)
+        (                # $1 = the code block -- one or more lines, starting with a space/tab
+          (?:
+            (?:[ ]{$self->{tab_width}} | \t)   # Lines must start with a tab or a tab-width of spaces
+            .*\n+
+          )+
+        )
+        ((?=^[ ]{0,$self->{tab_width}}\S)|\Z)    # Lookahead for non-space at line-start, or end of doc
+        }{
+            push @{$self->_indented_code_blocks}, $1;
+            "\n${\INDENTED_FENCED_BLOCK}\n";
+        }egmx;
+  return $text;
 }
 
 # Override to check for HTML-escaped <>" chars.
 sub _StripLinkDefinitions {
-#
-# Strips link definitions from text, stores the URLs and titles in
-# hash references.
-#
-    my ($self, $text) = @_;
-    my $less_than_tab = $self->{tab_width} - 1;
+  my ($self, $text) = @_;
+
+  #
+  # Strips link definitions from text, stores the URLs and titles in
+  # hash references.
+  #
+  my $less_than_tab = $self->{tab_width} - 1;
 
-    # Link defs are in the form: ^[id]: url "optional title"
-    while ($text =~ s{
+  # Link defs are in the form: ^[id]: url "optional title"
+  while (
+    $text =~ s{
             ^[ ]{0,$less_than_tab}\[(.+)\]: # id = \$1
               [ \t]*
               \n?               # maybe *one* newline
@@ -131,26 +184,29 @@ sub _StripLinkDefinitions {
                 [ \t]*
             )?  # title is optional
             (?:\n+|\Z)
-        }{}omx) {
-        $self->{_urls}{lc $1} = $self->_EncodeAmpsAndAngles( $2 );    # Link IDs are case-insensitive
-        if ($3) {
-            $self->{_titles}{lc $1} = $3;
-            $self->{_titles}{lc $1} =~ s/"/&quot;/g;
-        }
-
+        }{}omx
+    )
+  {
+    $self->{_urls}{lc $1} = $self->_EncodeAmpsAndAngles($2); # Link IDs are case-insensitive
+    if ($3) {
+      $self->{_titles}{lc $1} = $3;
+      $self->{_titles}{lc $1} =~ s/"/&quot;/g;
     }
 
-    return $text;
+  }
+
+  return $text;
 }
 
 # We need to look for HTML-escaped '<' and '>' (i.e. &lt; and &gt;).
 # We also remove Email linkification from the original implementation
 # as it is already done in Bugzilla's quoteUrls().
 sub _DoAutoLinks {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text =~ s{(?:<|&lt;)((?:https?|ftp):[^'">\s]+?)(?:>|&gt;)}{<a href="$1">$1</a>}gi;
-    return $text;
+  $text
+    =~ s{(?:<|&lt;)((?:https?|ftp):[^'">\s]+?)(?:>|&gt;)}{<a href="$1">$1</a>}gi;
+  return $text;
 }
 
 # The main reasons for overriding this method are
@@ -160,17 +216,17 @@ sub _DoAnchors {
 #
 # Turn Markdown link shortcuts into <a> tags.
 #
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    # We revert linkifications of non-email links and only
-    # those links whose URL and title are the same because
-    # this way we can be sure that link is generated by quoteUrls()
-    $text =~ s@<a \s+ href="(?! mailto ) (.+?)">\1</a>@$1@xmg;
+  # We revert linkifications of non-email links and only
+  # those links whose URL and title are the same because
+  # this way we can be sure that link is generated by quoteUrls()
+  $text =~ s@<a \s+ href="(?! mailto ) (.+?)">\1</a>@$1@xmg;
 
-    #
-    # First, handle reference-style links: [link text] [id]
-    #
-    $text =~ s{
+  #
+  # First, handle reference-style links: [link text] [id]
+  #
+  $text =~ s{
         (                   # wrap whole match in $1
           \[
             ($g_nested_brackets)    # link text = $2
@@ -197,10 +253,10 @@ sub _DoAnchors {
         $self->_GenerateAnchor($whole_match, $link_text, $link_id);
     }xsge;
 
-    #
-    # Next, inline-style links: [link text](url "optional title")
-    #
-    $text =~ s{
+  #
+  # Next, inline-style links: [link text](url "optional title")
+  #
+  $text =~ s{
         (               # wrap whole match in $1
           \[
             ($g_nested_brackets)    # link text = $2
@@ -230,18 +286,18 @@ sub _DoAnchors {
             $url =~ s@</a$@@;
         }
 
-        # Limit URL to HTTP/HTTPS links
-        $url = "http://$url" unless $url =~ m!^https?://!i;
+        my $safe_url_regexp = Bugzilla::Template::SAFE_URL_REGEXP();
+        $url = "http://$url" unless $url =~ /^$safe_url_regexp$/;
 
         $self->_GenerateAnchor($whole_match, $link_text, undef, $url, $title);
     }xsge;
 
-    #
-    # Last, handle reference-style shortcuts: [link text]
-    # These must come last in case you've also got [link test][1]
-    # or [link test](/foo)
-    #
-    $text =~ s{
+  #
+  # Handle reference-style shortcuts: [link text]
+  # These must come last in case you've also got [link test][1]
+  # or [link test](/foo)
+  #
+  $text =~ s{
         (                    # wrap whole match in $1
           \[
             ([^\[\]]+)        # link text = $2; can't contain '[' or ']'
@@ -256,7 +312,23 @@ sub _DoAnchors {
         $self->_GenerateAnchor($whole_match, $link_text, $link_id);
     }xsge;
 
-    return $text;
+  # Last, handle "naked" references
+  # Caveat, does not handle ;http://amazon.com
+  my $safe_url_regexp = Bugzilla::Template::SAFE_URL_REGEXP();
+  $text =~ s{
+        (
+          (^|(?<![;^"'<>]))  # negative lookbehind, including ';' in '&lt;'
+          (                  # wrap url in $3
+             (?:https?|ftp):[^'">\s]+\w
+          )
+        )
+    }{
+        my $whole_match = $3;
+        my $url = $whole_match;
+        $self->_GenerateAnchor($whole_match, $url, undef, $url, undef);
+    }xsge;
+
+  return $text;
 }
 
 # The purpose of overriding this function is to add support
@@ -267,76 +339,72 @@ sub _DoAnchors {
 # and we do not want a part of those variables to look emphasized/bold.
 # Instead, we render them as the way they originally are.
 sub _DoItalicsAndBold {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    # Handle at beginning of lines:
-    $text =~ s{ (^__ (?=\S) (.+?[*_]*) (?<=\S) __ (?!\S)) }
+  # Handle at beginning of lines:
+  $text =~ s{ (^__ (?=\S) (.+?[*_]*) (?<=\S) __ (?!\S)) }
               {
                   my $result = _has_multiple_underscores($2) ? $1 : "<strong>$2</strong>";
                   $result;
               }gsxe;
 
-    $text =~ s{ ^\*\* (?=\S) (.+?[*_]*) (?<=\S) \*\* }{<strong>$1</strong>}gsx;
+  $text =~ s{ ^\*\* (?=\S) (.+?[*_]*) (?<=\S) \*\* }{<strong>$1</strong>}gsx;
 
-    $text =~ s{ (^_ (?=\S) (.+?) (?<=\S) _ (?!\S)) }
+  $text =~ s{ (^_ (?=\S) (.+?) (?<=\S) _ (?!\S)) }
               {
                   my $result = _has_multiple_underscores($2) ? $1 : "<em>$2</em>";
                   $result;
               }gsxe;
 
-    $text =~ s{ ^\* (?=\S) (.+?) (?<=\S) \* }{<em>$1</em>}gsx;
+  $text =~ s{ ^\* (?=\S) (.+?) (?<=\S) \* }{<em>$1</em>}gsx;
 
-    # <strong> must go first:
-    $text =~ s{ ( (?<=\W) __ (?=\S) (.+?[*_]*) (?<=\S) __ (?!\S) ) }
+  # <strong> must go first:
+  $text =~ s{ ( (?<=\s) __ (?=\S) (.+?[*_]*) (?<=\S) __ (?!\S) ) }
               {
                   my $result = _has_multiple_underscores($2) ? $1 : "<strong>$2</strong>";
                   $result;
               }gsxe;
 
 
-    $text =~ s{ (?<=\W) \*\* (?=\S) (.+?[*_]*) (?<=\S) \*\* }{<strong>$1</strong>}gsx;
+  $text
+    =~ s{ (?<=\s) \*\* (?=\S) (.+?[*_]*) (?<=\S) \*\* }{<strong>$1</strong>}gsx;
 
-    $text =~ s{ ( (?<=\W) _ (?=\S) (.+?) (?<=\S) _ (?!\S) ) }
+  $text =~ s{ ( (?<=\s) _ (?=\S) (.+?) (?<=\S) _ (?!\S) ) }
               {
                   my $result = _has_multiple_underscores($2) ? $1 : "<em>$2</em>";
                   $result;
               }gsxe;
 
-    $text =~ s{ (?<=\W) \* (?=\S) (.+?) (?<=\S) \* }{<em>$1</em>}gsx;
+  $text =~ s{ (?<=\s) \* (?=\S) (.+?) (?<=\S) \* }{<em>$1</em>}gsx;
 
-    # And now, a second pass to catch nested strong and emphasis special cases
-    $text =~ s{ ( (?<=\W) __ (?=\S) (.+?[*_]*) (?<=\S) __ (\S*) ) }
+  # And now, a second pass to catch nested strong and emphasis special cases
+  $text =~ s{ ( (?<=\s) __ (?=\S) (.+?[*_]*) (?<=\S) __ (\S*) ) }
               {
                   my $result = _has_multiple_underscores($3) ? $1 : "<strong>$2</strong>$3";
                   $result;
               }gsxe;
 
-    $text =~ s{ (?<=\W) \*\* (?=\S) (.+?[*_]*) (?<=\S) \*\* }{<strong>$1</strong>}gsx;
-    $text =~ s{ ( (?<=\W) _ (?=\S) (.+?) (?<=\S) _ (\S*) ) }
+  $text
+    =~ s{ (?<=\s) \*\* (?=\S) (.+?[*_]*) (?<=\S) \*\* }{<strong>$1</strong>}gsx;
+  $text =~ s{ ( (?<=\s) _ (?=\S) (.+?) (?<=\S) _ (\S*) ) }
               {
                   my $result = _has_multiple_underscores($3) ? $1 : "<em>$2</em>$3";
                   $result;
               }gsxe;
 
-    $text =~ s{ (?<=\W) \* (?=\S) (.+?) (?<=\S) \* }{<em>$1</em>}gsx;
-
-    return $text;
-}
+  $text =~ s{ (?<=\s) \* (?=\S) (.+?) (?<=\S) \* }{<em>$1</em>}gsx;
 
-# Override this function to ignore 'wrap_in_p_tags' from
-# the caller and to not generate <p> tags around the output.
-sub _FormParagraphs {
-    my ($self, $text) = @_;
-    return $self->SUPER::_FormParagraphs($text, { wrap_in_p_tags => 0 });
+  return $text;
 }
 
 sub _DoStrikethroughs {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text =~ s{ ^ ~~ (?=\S) ([^~]+?) (?<=\S) ~~ (?!~) }{<del>$1</del>}gsx;
-    $text =~ s{ (?<=_|[^~\w]) ~~ (?=\S) ([^~]+?) (?<=\S) ~~ (?!~) }{<del>$1</del>}gsx;
+  $text =~ s{ ^ ~~ (?=\S) ([^~]+?) (?<=\S) ~~ (?!~) }{<del>$1</del>}gsx;
+  $text
+    =~ s{ (?<=_|[^~\w]) ~~ (?=\S) ([^~]+?) (?<=\S) ~~ (?!~) }{<del>$1</del>}gsx;
 
-    return $text;
+  return $text;
 }
 
 # The original _DoCodeSpans() uses the 's' modifier in its regex
@@ -344,9 +412,9 @@ sub _DoStrikethroughs {
 # We copy the code from the original implementation and remove the
 # 's' modifier from it.
 sub _DoCodeSpans {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text =~ s@
+  $text =~ s@
             (?<!\\)     # Character before opening ` can't be a backslash
             (`+)        # $1 = Opening run of `
             (.+?)       # $2 = The code block
@@ -361,21 +429,25 @@ sub _DoCodeSpans {
             "<code>$c</code>";
         @egx;
 
-    return $text;
+  return $text;
 }
 
-# Override to add GFM Fenced Code Blocks
+# Override to delay after DoBlockQuotes
 sub _DoCodeBlocks {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text =~ s{
-        ^ `{3,} [\s\t]* \n
-        (                # $1 = the entire code block
-          (?: .* \n+)+?
-        )
-        `{3,} [\s\t]* $
+  return $text;
+}
+
+# add GFM Fenced Code Blocks
+sub _DoDelayCodeBlocks {
+  my ($self, $text) = @_;
+
+  $text =~ s{
+        ^ (${\FENCED_BLOCK}|${\INDENTED_FENCED_BLOCK})
         }{
-            my $codeblock = $1;
+            my $aref = ($1 eq FENCED_BLOCK) ? $self->_code_blocks : $self->_indented_code_blocks;
+            my $codeblock = shift @$aref;
             my $result;
 
             $codeblock = $self->_EncodeCode($codeblock);
@@ -386,16 +458,13 @@ sub _DoCodeBlocks {
             $result;
         }egmx;
 
-    # And now do the standard code blocks
-    $text = $self->SUPER::_DoCodeBlocks($text);
-
-    return $text;
+  return $text;
 }
 
 sub _DoBlockQuotes {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text =~ s{
+  $text =~ s{
           (                             # Wrap whole match in $1
             (?:
               ^[ \t]*&gt;[ \t]?         # '>' at the start of a line
@@ -416,52 +485,66 @@ sub _DoBlockQuotes {
                         $pre =~ s/^  //mg;
                         $pre;
                     }egs;
-            "<blockquote>\n$bq\n</blockquote>\n\n";
+            "<blockquote class=\"markdown\">\n$bq\n</blockquote>\n\n";
         }egmx;
 
-    return $text;
+  $text = $self->_DoDelayCodeBlocks($text);
+  return $text;
+}
+
+sub _DoLists {
+  my ($self, $text) = @_;
+
+  $text = $self->SUPER::_DoLists($text);
+
+  # strip trailing newlines created by DoLists
+  $text =~ s/\n</</g;
+
+  return $text;
 }
 
 sub _EncodeCode {
-    my ($self, $text) = @_;
-
-    # We need to unescape the escaped HTML characters in code blocks.
-    # These are the reverse of the escapings done in Bugzilla::Util::html_quote()
-    $text =~ s/&lt;/</g;
-    $text =~ s/&gt;/>/g;
-    $text =~ s/&quot;/"/g;
-    $text =~ s/&#64;/@/g;
-    # '&amp;' substitution must be the last one, otherwise a literal like '&gt;'
-    # will turn to '>' because '&' is already changed to '&amp;' in Bugzilla::Util::html_quote().
-    # In other words, html_quote() will change '&gt;' to '&amp;gt;' and then we will
-    # change '&amp;gt' -> '&gt;' -> '>' if we write this substitution as the first one.
-    $text =~ s/&amp;/&/g;
-    $text =~ s{<a \s+ href="(?:mailto:)? (.+?)"> \1 </a>}{$1}xmgi;
-    $text = $self->SUPER::_EncodeCode($text);
-    $text =~ s/~/$g_escape_table{'~'}/go;
-    # Encode '&lt;' to prevent URLs from getting linkified in code spans
-    $text =~ s/&lt;/$g_escape_table{'&lt;'}/go;
-
-    return $text;
+  my ($self, $text) = @_;
+
+  # We need to unescape the escaped HTML characters in code blocks.
+  # These are the reverse of the escapings done in Bugzilla::Util::html_quote()
+  $text =~ s/&lt;/</g;
+  $text =~ s/&gt;/>/g;
+  $text =~ s/&quot;/"/g;
+  $text =~ s/&#64;/@/g;
+
+# '&amp;' substitution must be the last one, otherwise a literal like '&gt;'
+# will turn to '>' because '&' is already changed to '&amp;' in Bugzilla::Util::html_quote().
+# In other words, html_quote() will change '&gt;' to '&amp;gt;' and then we will
+# change '&amp;gt' -> '&gt;' -> '>' if we write this substitution as the first one.
+  $text =~ s/&amp;/&/g;
+  $text =~ s{<a \s+ href="(?:mailto:)? (.+?)"> \1 </a>}{$1}xmgi;
+  $text = $self->SUPER::_EncodeCode($text);
+  $text =~ s/~/$g_escape_table{'~'}/go;
+
+  # Encode '&lt;' to prevent URLs from getting linkified in code spans
+  $text =~ s/&lt;/$g_escape_table{'&lt;'}/go;
+
+  return $text;
 }
 
 sub _EncodeBackslashEscapes {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text = $self->SUPER::_EncodeBackslashEscapes($text);
-    $text =~ s/\\~/$g_escape_table{'~'}/go;
+  $text = $self->SUPER::_EncodeBackslashEscapes($text);
+  $text =~ s/\\~/$g_escape_table{'~'}/go;
 
-    return $text;
+  return $text;
 }
 
 sub _UnescapeSpecialChars {
-    my ($self, $text) = @_;
+  my ($self, $text) = @_;
 
-    $text = $self->SUPER::_UnescapeSpecialChars($text);
-    $text =~ s/$g_escape_table{'~'}/~/go;
-    $text =~ s/$g_escape_table{'&lt;'}/&lt;/go;
+  $text = $self->SUPER::_UnescapeSpecialChars($text);
+  $text =~ s/$g_escape_table{'~'}/~/go;
+  $text =~ s/$g_escape_table{'&lt;'}/&lt;/go;
 
-    return $text;
+  return $text;
 }
 
 # Check if the passed string is of the form multiple_underscores_in_a_word.
@@ -469,11 +552,11 @@ sub _UnescapeSpecialChars {
 # any white-space. Then, if the string is composed of non-space chunks which
 # are bound together with underscores, the string has the desired form.
 sub _has_multiple_underscores {
-    my $string = shift;
-    return 0 unless defined($string) && length($string);
-    return 0 if $string =~ /[\t\s]+/;
-    return 1 if scalar (split /_/, $string) > 1;
-    return 0;
+  my $string = shift;
+  return 0 unless $string;
+  return 0 if $string =~ /\s/;
+  return 1 if $string =~ /_/;
+  return 0;
 }
 
 1;
@@ -496,7 +579,7 @@ Bugzilla::Markdown - Generates HTML output from structured plain-text input.
 Bugzilla::Markdown implements a Markdown engine that produces
 an HTML-based output from a given plain-text input.
 
-The majority of the implementation is done by C<Text::Markdown>
+The majority of the implementation is done by C<Text::MultiMarkdown>
 CPAN module. It also applies the linkifications done in L<Bugzilla::Template>
 to the input resulting in an output which is a combination of both Markdown
 structures and those defined by Bugzilla itself.
diff --git a/Bugzilla/Memcached.pm b/Bugzilla/Memcached.pm
index df90fef934..f71ff2572b 100644
--- a/Bugzilla/Memcached.pm
+++ b/Bugzilla/Memcached.pm
@@ -7,294 +7,247 @@
 
 package Bugzilla::Memcached;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Error;
-use Bugzilla::Util qw(trick_taint);
 use Scalar::Util qw(blessed);
+use Bugzilla::Util qw(trick_taint);
 use URI::Escape;
 
 # memcached keys have a maximum length of 250 bytes
 use constant MAX_KEY_LENGTH => 250;
 
 sub _new {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $self = {};
-
-    # always return an object to simplify calling code when memcached is
-    # disabled.
-    if (Bugzilla->feature('memcached')
-        && Bugzilla->params->{memcached_servers})
-    {
-        require Cache::Memcached;
-        $self->{namespace} = Bugzilla->params->{memcached_namespace} || '';
-        $self->{memcached} =
-            Cache::Memcached->new({
-                servers   => [ split(/[, ]+/, Bugzilla->params->{memcached_servers}) ],
-                namespace => $self->{namespace},
-            });
-    }
-    return bless($self, $class);
+  my $invocant = shift;
+  my $class    = ref($invocant) || $invocant;
+  my $self     = {};
+
+  # always return an object to simplify calling code when memcached is
+  # disabled.
+  if (Bugzilla->feature('memcached') && Bugzilla->params->{memcached_servers}) {
+    require Cache::Memcached::Fast;
+    $self->{namespace} = Bugzilla->params->{memcached_namespace} || '';
+    $self->{memcached} = Cache::Memcached::Fast->new({
+      servers   => [split(/[, ]+/, Bugzilla->params->{memcached_servers})],
+      namespace => $self->{namespace},
+    });
+  }
+  return bless($self, $class);
 }
 
 sub enabled {
-    return $_[0]->{memcached} ? 1 : 0;
+  return $_[0]->{memcached} ? 1 : 0;
 }
 
 sub set {
-    my ($self, $args) = @_;
-    return unless $self->{memcached};
-
-    # { key => $key, value => $value }
-    if (exists $args->{key}) {
-        $self->_set($args->{key}, $args->{value});
-    }
-
-    # { table => $table, id => $id, name => $name, data => $data }
-    elsif (exists $args->{table} && exists $args->{id} && exists $args->{name}) {
-        # For caching of Bugzilla::Object, we have to be able to clear the
-        # cached values when given either the object's id or name.
-        my ($table, $id, $name, $data) = @$args{qw(table id name data)};
-        $self->_set("$table.id.$id", $data);
-        if (defined $name) {
-            $self->_set("$table.name_id.$name", $id);
-            $self->_set("$table.id_name.$id", $name);
-        }
+  my ($self, $args) = @_;
+  return unless $self->{memcached};
+
+  # { key => $key, value => $value }
+  if (exists $args->{key}) {
+    $self->_set($args->{key}, $args->{value});
+  }
+
+  # { table => $table, id => $id, name => $name, data => $data }
+  elsif (exists $args->{table} && exists $args->{id} && exists $args->{name}) {
+
+    # For caching of Bugzilla::Object, we have to be able to clear the
+    # cached values when given either the object's id or name.
+    my ($table, $id, $name, $data) = @$args{qw(table id name data)};
+    $self->_set("$table.id.$id", $data);
+    if (defined $name) {
+      $self->_set("$table.name_id.$name", $id);
+      $self->_set("$table.id_name.$id",   $name);
     }
+  }
 
-    else {
-        ThrowCodeError('params_required', { function => "Bugzilla::Memcached::set",
-                                            params   => [ 'key', 'table' ] });
-    }
+  else {
+    ThrowCodeError('params_required',
+      {function => "Bugzilla::Memcached::set", params => ['key', 'table']});
+  }
 }
 
 sub get {
-    my ($self, $args) = @_;
-    return unless $self->{memcached};
-
-    # { key => $key }
-    if (exists $args->{key}) {
-        return $self->_get($args->{key});
-    }
-
-    # { table => $table, id => $id }
-    elsif (exists $args->{table} && exists $args->{id}) {
-        my ($table, $id) = @$args{qw(table id)};
-        return $self->_get("$table.id.$id");
-    }
-
-    # { table => $table, name => $name }
-    elsif (exists $args->{table} && exists $args->{name}) {
-        my ($table, $name) = @$args{qw(table name)};
-        return unless my $id = $self->_get("$table.name_id.$name");
-        return $self->_get("$table.id.$id");
-    }
-
-    else {
-        ThrowCodeError('params_required', { function => "Bugzilla::Memcached::get",
-                                            params   => [ 'key', 'table' ] });
-    }
+  my ($self, $args) = @_;
+  return unless $self->{memcached};
+
+  # { key => $key }
+  if (exists $args->{key}) {
+    return $self->_get($args->{key});
+  }
+
+  # { table => $table, id => $id }
+  elsif (exists $args->{table} && exists $args->{id}) {
+    my ($table, $id) = @$args{qw(table id)};
+    return $self->_get("$table.id.$id");
+  }
+
+  # { table => $table, name => $name }
+  elsif (exists $args->{table} && exists $args->{name}) {
+    my ($table, $name) = @$args{qw(table name)};
+    return unless my $id = $self->_get("$table.name_id.$name");
+    return $self->_get("$table.id.$id");
+  }
+
+  else {
+    ThrowCodeError('params_required',
+      {function => "Bugzilla::Memcached::get", params => ['key', 'table']});
+  }
 }
 
 sub set_config {
-    my ($self, $args) = @_;
-    return unless $self->{memcached};
-
-    if (exists $args->{key}) {
-        return $self->_set($self->_config_prefix . '.' . $args->{key}, $args->{data});
-    }
-    else {
-        ThrowCodeError('params_required', { function => "Bugzilla::Memcached::set_config",
-                                            params   => [ 'key' ] });
-    }
+  my ($self, $args) = @_;
+  return unless $self->{memcached};
+
+  if (exists $args->{key}) {
+    return $self->_set($self->_config_prefix . '.' . $args->{key}, $args->{data});
+  }
+  else {
+    ThrowCodeError('params_required',
+      {function => "Bugzilla::Memcached::set_config", params => ['key']});
+  }
 }
 
 sub get_config {
-    my ($self, $args) = @_;
-    return unless $self->{memcached};
-
-    if (exists $args->{key}) {
-        return $self->_get($self->_config_prefix . '.' . $args->{key});
-    }
-    else {
-        ThrowCodeError('params_required', { function => "Bugzilla::Memcached::get_config",
-                                            params   => [ 'key' ] });
-    }
+  my ($self, $args) = @_;
+  return unless $self->{memcached};
+
+  if (exists $args->{key}) {
+    return $self->_get($self->_config_prefix . '.' . $args->{key});
+  }
+  else {
+    ThrowCodeError('params_required',
+      {function => "Bugzilla::Memcached::get_config", params => ['key']});
+  }
 }
 
 sub clear {
-    my ($self, $args) = @_;
-    return unless $self->{memcached};
-
-    # { key => $key }
-    if (exists $args->{key}) {
-        $self->_delete($args->{key});
-    }
-
-    # { table => $table, id => $id }
-    elsif (exists $args->{table} && exists $args->{id}) {
-        my ($table, $id) = @$args{qw(table id)};
-        my $name = $self->_get("$table.id_name.$id");
-        $self->_delete("$table.id.$id");
-        $self->_delete("$table.name_id.$name") if defined $name;
-        $self->_delete("$table.id_name.$id");
-    }
-
-    # { table => $table, name => $name }
-    elsif (exists $args->{table} && exists $args->{name}) {
-        my ($table, $name) = @$args{qw(table name)};
-        return unless my $id = $self->_get("$table.name_id.$name");
-        $self->_delete("$table.id.$id");
-        $self->_delete("$table.name_id.$name");
-        $self->_delete("$table.id_name.$id");
-    }
-
-    else {
-        ThrowCodeError('params_required', { function => "Bugzilla::Memcached::clear",
-                                            params   => [ 'key', 'table' ] });
-    }
+  my ($self, $args) = @_;
+  return unless $self->{memcached};
+
+  # { key => $key }
+  if (exists $args->{key}) {
+    $self->_delete($args->{key});
+  }
+
+  # { table => $table, id => $id }
+  elsif (exists $args->{table} && exists $args->{id}) {
+    my ($table, $id) = @$args{qw(table id)};
+    my $name = $self->_get("$table.id_name.$id");
+    $self->_delete("$table.id.$id");
+    $self->_delete("$table.name_id.$name") if defined $name;
+    $self->_delete("$table.id_name.$id");
+  }
+
+  # { table => $table, name => $name }
+  elsif (exists $args->{table} && exists $args->{name}) {
+    my ($table, $name) = @$args{qw(table name)};
+    return unless my $id = $self->_get("$table.name_id.$name");
+    $self->_delete("$table.id.$id");
+    $self->_delete("$table.name_id.$name");
+    $self->_delete("$table.id_name.$id");
+  }
+
+  else {
+    ThrowCodeError('params_required',
+      {function => "Bugzilla::Memcached::clear", params => ['key', 'table']});
+  }
 }
 
 sub clear_all {
-    my ($self) = @_;
-    return unless $self->{memcached};
-    $self->_inc_prefix("global");
+  my ($self) = @_;
+  return unless $self->{memcached};
+  $self->_inc_prefix("global");
 }
 
 sub clear_config {
-    my ($self, $args) = @_;
-    return unless $self->{memcached};
-    if ($args && exists $args->{key}) {
-        $self->_delete($self->_config_prefix . '.' . $args->{key});
-    }
-    else {
-        $self->_inc_prefix("config");
-    }
+  my ($self, $args) = @_;
+  return unless $self->{memcached};
+  if ($args && exists $args->{key}) {
+    $self->_delete($self->_config_prefix . '.' . $args->{key});
+  }
+  else {
+    $self->_inc_prefix("config");
+  }
 }
 
 # in order to clear all our keys, we add a prefix to all our keys.  when we
 # need to "clear" all current keys, we increment the prefix.
 sub _prefix {
-    my ($self, $name) = @_;
-    # we don't want to change prefixes in the middle of a request
-    my $request_cache = Bugzilla->request_cache;
-    my $request_cache_key = "memcached_prefix_$name";
-    if (!$request_cache->{$request_cache_key}) {
-        my $memcached = $self->{memcached};
-        my $prefix = $memcached->get($name);
-        if (!$prefix) {
-            $prefix = time();
-            if (!$memcached->add($name, $prefix)) {
-                # if this failed, either another process set the prefix, or
-                # memcached is down.  assume we lost the race, and get the new
-                # value.  if that fails, memcached is down so use a dummy
-                # prefix for this request.
-                $prefix = $memcached->get($name) || 0;
-            }
-        }
-        $request_cache->{$request_cache_key} = $prefix;
+  my ($self, $name) = @_;
+
+  # we don't want to change prefixes in the middle of a request
+  my $request_cache     = Bugzilla->request_cache;
+  my $request_cache_key = "memcached_prefix_$name";
+  if (!$request_cache->{$request_cache_key}) {
+    my $memcached = $self->{memcached};
+    my $prefix    = $memcached->get($name);
+    if (!$prefix) {
+      $prefix = time();
+      if (!$memcached->add($name, $prefix)) {
+
+        # if this failed, either another process set the prefix, or
+        # memcached is down.  assume we lost the race, and get the new
+        # value.  if that fails, memcached is down so use a dummy
+        # prefix for this request.
+        $prefix = $memcached->get($name) || 0;
+      }
     }
-    return $request_cache->{$request_cache_key};
+    $request_cache->{$request_cache_key} = $prefix;
+  }
+  return $request_cache->{$request_cache_key};
 }
 
 sub _inc_prefix {
-    my ($self, $name) = @_;
-    my $memcached = $self->{memcached};
-    if (!$memcached->incr($name, 1)) {
-        $memcached->add($name, time());
-    }
-    delete Bugzilla->request_cache->{"memcached_prefix_$name"};
+  my ($self, $name) = @_;
+  my $memcached = $self->{memcached};
+  if (!$memcached->incr($name, 1)) {
+    $memcached->add($name, time());
+  }
+  delete Bugzilla->request_cache->{"memcached_prefix_$name"};
 }
 
 sub _global_prefix {
-    return $_[0]->_prefix("global");
+  return $_[0]->_prefix("global");
 }
 
 sub _config_prefix {
-    return $_[0]->_prefix("config");
+  return $_[0]->_prefix("config");
 }
 
 sub _encode_key {
-    my ($self, $key) = @_;
-    $key = $self->_global_prefix . '.' . uri_escape_utf8($key);
-    return length($self->{namespace} . $key) > MAX_KEY_LENGTH
-        ? undef
-        : $key;
+  my ($self, $key) = @_;
+  $key = $self->_global_prefix . '.' . uri_escape_utf8($key);
+  trick_taint($key) if defined $key;
+  return length($self->{namespace} . $key) > MAX_KEY_LENGTH ? undef : $key;
 }
 
 sub _set {
-    my ($self, $key, $value) = @_;
-    if (blessed($value)) {
-        # we don't support blessed objects
-        ThrowCodeError('param_invalid', { function => "Bugzilla::Memcached::set",
-                                          param    => "value" });
-    }
+  my ($self, $key, $value) = @_;
+  if (blessed($value)) {
 
-    $key = $self->_encode_key($key)
-        or return;
-    return $self->{memcached}->set($key, $value);
-}
-
-sub _get {
-    my ($self, $key) = @_;
+    # we don't support blessed objects
+    ThrowCodeError('param_invalid',
+      {function => "Bugzilla::Memcached::set", param => "value"});
+  }
 
-    $key = $self->_encode_key($key)
-        or return;
-    my $value = $self->{memcached}->get($key);
-    return unless defined $value;
-
-    # detaint returned values
-    # hashes and arrays are detainted just one level deep
-    if (ref($value) eq 'HASH') {
-        _detaint_hashref($value);
-    }
-    elsif (ref($value) eq 'ARRAY') {
-        foreach my $value (@$value) {
-            next unless defined $value;
-            # arrays of hashes and arrays are common
-            if (ref($value) eq 'HASH') {
-                _detaint_hashref($value);
-            }
-            elsif (ref($value) eq 'ARRAY') {
-                _detaint_arrayref($value);
-            }
-            elsif (!ref($value)) {
-                trick_taint($value);
-            }
-        }
-    }
-    elsif (!ref($value)) {
-        trick_taint($value);
-    }
-    return $value;
+  $key = $self->_encode_key($key) or return;
+  return $self->{memcached}->set($key, $value);
 }
 
-sub _detaint_hashref {
-    my ($hashref) = @_;
-    foreach my $value (values %$hashref) {
-        if (defined($value) && !ref($value)) {
-            trick_taint($value);
-        }
-    }
-}
+sub _get {
+  my ($self, $key) = @_;
 
-sub _detaint_arrayref {
-    my ($arrayref) = @_;
-    foreach my $value (@$arrayref) {
-        if (defined($value) && !ref($value)) {
-            trick_taint($value);
-        }
-    }
+  $key = $self->_encode_key($key) or return;
+  return $self->{memcached}->get($key);
 }
 
 sub _delete {
-    my ($self, $key) = @_;
-    $key = $self->_encode_key($key)
-        or return;
-    return $self->{memcached}->delete($key);
+  my ($self, $key) = @_;
+  $key = $self->_encode_key($key) or return;
+  return $self->{memcached}->delete($key);
 }
 
 1;
@@ -340,9 +293,7 @@ L<Bugzilla::Memcached> provides an interface to a Memcached server/servers, with
 the ability to get, set, or clear entries from the cache.
 
 The stored value must be an unblessed hashref, unblessed array ref, or a
-scalar.  Currently nested data structures are supported but require manual
-de-tainting after reading from Memcached (flat data structures are automatically
-de-tainted).
+scalar. 
 
 All values are stored in the Memcached systems using the prefix configured with
 the C<memcached_namespace> parameter, as well as an additional prefix managed
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index 0731d4fedf..cf558c90c4 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Migrate;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,7 +20,7 @@ use Bugzilla::Install::Requirements ();
 use Bugzilla::Install::Util qw(indicate_progress);
 use Bugzilla::Product;
 use Bugzilla::Util qw(get_text trim generate_random_password);
-use Bugzilla::User ();
+use Bugzilla::User   ();
 use Bugzilla::Status ();
 use Bugzilla::Version;
 
@@ -30,6 +30,9 @@ use DateTime;
 use Fcntl qw(SEEK_SET);
 use File::Basename;
 use List::Util qw(first);
+
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
 
 use constant CUSTOM_FIELDS      => {};
@@ -37,10 +40,10 @@ use constant REQUIRED_MODULES   => [];
 use constant NON_COMMENT_FIELDS => ();
 
 use constant CONFIG_VARS => (
-    {
-        name    => 'translate_fields',
-        default => {},
-        desc    => <<'END',
+  {
+    name    => 'translate_fields',
+    default => {},
+    desc    => <<'END',
 # This maps field names in your bug-tracker to Bugzilla field names. If a field
 # has the same name in your bug-tracker and Bugzilla (case-insensitively), it
 # doesn't need a mapping here. If a field isn't listed here and doesn't have
@@ -64,11 +67,11 @@ use constant CONFIG_VARS => (
 # variable by default, then that field will be automatically created by
 # the migrator and you don't have to worry about it.
 END
-    },
-    {
-        name    => 'translate_values',
-        default => {},
-        desc    => <<'END',
+  },
+  {
+    name    => 'translate_values',
+    default => {},
+    desc    => <<'END',
 # This configuration variable allows you to say that a particular field
 # value in your current bug-tracker should be translated to a different
 # value when it's imported into Bugzilla.
@@ -108,22 +111,22 @@ END
 #
 # Values that don't get translated will be imported as-is.
 END
-    },
-    {
-        name    => 'starting_bug_id',
-        default => 0,
-        desc    => <<'END',
+  },
+  {
+    name    => 'starting_bug_id',
+    default => 0,
+    desc    => <<'END',
 # What bug ID do you want the first imported bug to get? If you set this to
 # 0, then the imported bug ids will just start right after the current
 # bug ids. If you use this configuration variable, you must make sure that
 # nobody else is using your Bugzilla while you run the migration, or a new
 # bug filed by a user might take this ID instead.
 END
-    },
-    {
-        name    => 'timezone',
-        default => 'local',
-        desc => <<'END',
+  },
+  {
+    name    => 'timezone',
+    default => 'local',
+    desc    => <<'END',
 # If migrate.pl comes across any dates without timezones, while doing the
 # migration, what timezone should we assume those dates are in? 
 # The best format for this variable is something like "America/Los Angeles".
@@ -133,7 +136,7 @@ END
 # The special value "local" means "use the same timezone as the system I
 # am running this script on now".
 END
-    },
+  },
 );
 
 use constant USER_FIELDS => qw(user assigned_to qa_contact reporter cc);
@@ -143,43 +146,46 @@ use constant USER_FIELDS => qw(user assigned_to qa_contact reporter cc);
 #########################
 
 sub do_migration {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    # On MySQL, setting serial values implicitly commits a transaction,
-    # so we want to do it up here, outside of any transaction. This also
-    # has the advantage of loading the config before anything else is done.
-    if ($self->config('starting_bug_id')) {
-        $dbh->bz_set_next_serial_value('bugs', 'bug_id',
-                                       $self->config('starting_bug_id'));
-    }    
-    $dbh->bz_start_transaction();
-
-    $self->before_read();
-    # Read Other Database
-    my $users    = $self->users;
-    my $products = $self->products;
-    my $bugs     = $self->bugs;
-    $self->after_read();
-    
-    $self->translate_all_bugs($bugs);
-
-    Bugzilla->set_user(Bugzilla::User->super_user);
-    
-    # Insert into Bugzilla
-    $self->before_insert();
-    $self->insert_users($users);
-    $self->insert_products($products);
-    $self->create_custom_fields();
-    $self->create_legal_values($bugs);
-    $self->insert_bugs($bugs);
-    $self->after_insert();
-    if ($self->dry_run) {
-        $dbh->bz_rollback_transaction();
-        $self->reset_serial_values();
-    }
-    else {
-        $dbh->bz_commit_transaction();
-    }
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  # On MySQL, setting serial values implicitly commits a transaction,
+  # so we want to do it up here, outside of any transaction. This also
+  # has the advantage of loading the config before anything else is done.
+  if ($self->config('starting_bug_id')) {
+    $dbh->bz_set_next_serial_value('bugs', 'bug_id',
+      $self->config('starting_bug_id'));
+  }
+  $dbh->bz_start_transaction();
+
+  $self->before_read();
+
+  # Read Other Database
+  my $users    = $self->users;
+  my $products = $self->products;
+  my $bugs     = $self->bugs;
+  $self->after_read();
+
+  $self->translate_all_bugs($bugs);
+
+  Bugzilla->set_user(Bugzilla::User->super_user);
+
+  # Insert into Bugzilla
+  $self->before_insert();
+  $self->insert_users($users);
+  $self->insert_products($products);
+  $self->create_custom_fields();
+  $self->create_legal_values($bugs);
+  $self->insert_bugs($bugs);
+  $self->after_insert();
+
+  if ($self->dry_run) {
+    $dbh->bz_rollback_transaction();
+    $self->reset_serial_values();
+  }
+  else {
+    $dbh->bz_commit_transaction();
+  }
 }
 
 ################
@@ -187,24 +193,34 @@ sub do_migration {
 ################
 
 sub new {
-    my ($class) = @_;
-    my $self = { };
-    bless $self, $class;
-    return $self;
+  my ($class) = @_;
+  my $self = {};
+  bless $self, $class;
+  return $self;
 }
 
 sub load {
-    my ($class, $from) = @_;
-    my $libdir = bz_locations()->{libpath};
-    my @migration_modules = glob("$libdir/Bugzilla/Migrate/*");
-    my ($module) = grep { basename($_) =~ /^\Q$from\E\.pm$/i }
-                          @migration_modules;
+  my ($class, $from) = @_;
+  my $libdir            = bz_locations()->{libpath};
+  my @migration_modules = glob("$libdir/Bugzilla/Migrate/*");
+  my ($module) = grep { basename($_) =~ /^\Q$from\E\.pm$/i } @migration_modules;
+  if ($module) {
+    require $module;
+    my $canonical_name = _canonical_name($module);
+    return "Bugzilla::Migrate::$canonical_name"->new;
+  }
+  else {
+    my $migrate_module = {};
+    Bugzilla::Hook::process('migrate_modules', $migrate_module);
+    @migration_modules = glob($migrate_module->{path} . "/*");
+    ($module) = grep { basename($_) =~ /^\Q$from\E\.pm$/i } @migration_modules;
     if (!$module) {
-        ThrowUserError('migrate_from_invalid', { from => $from });
+      ThrowUserError('migrate_from_invalid', {from => $from});
     }
     require $module;
     my $canonical_name = _canonical_name($module);
-    return "Bugzilla::Migrate::$canonical_name"->new;
+    return "$migrate_module->{prefix}::$canonical_name"->new;
+  }
 }
 
 #############
@@ -212,67 +228,67 @@ sub load {
 #############
 
 sub name {
-    my $self = shift;
-    return _canonical_name(ref $self);
+  my $self = shift;
+  return _canonical_name(ref $self);
 }
 
 sub dry_run {
-    my ($self, $value) = @_;
-    if (scalar(@_) > 1) {
-        $self->{dry_run} = $value;
-    }
-    return $self->{dry_run} || 0;
+  my ($self, $value) = @_;
+  if (scalar(@_) > 1) {
+    $self->{dry_run} = $value;
+  }
+  return $self->{dry_run} || 0;
 }
 
 
 sub verbose {
-    my ($self, $value) = @_;
-    if (scalar(@_) > 1) {
-        $self->{verbose} = $value;
-    }
-    return $self->{verbose} || 0;
+  my ($self, $value) = @_;
+  if (scalar(@_) > 1) {
+    $self->{verbose} = $value;
+  }
+  return $self->{verbose} || 0;
 }
 
 sub debug {
-    my ($self, $value, $level) = @_;
-    $level ||= 1;
-    if ($self->verbose >= $level) {
-        $value = Dumper($value) if ref $value;
-        print STDERR $value, "\n";
-    }
+  my ($self, $value, $level) = @_;
+  $level ||= 1;
+  if ($self->verbose >= $level) {
+    $value = Dumper($value) if ref $value;
+    print STDERR $value, "\n";
+  }
 }
 
 sub bug_fields {
-    my $self = shift;
-    $self->{bug_fields} ||= Bugzilla->fields({ by_name => 1 });
-    return $self->{bug_fields};
+  my $self = shift;
+  $self->{bug_fields} ||= Bugzilla->fields({by_name => 1});
+  return $self->{bug_fields};
 }
 
 sub users {
-    my $self = shift;
-    if (!exists $self->{users}) {
-        say get_text('migrate_reading_users');
-        $self->{users} = $self->_read_users();
-    }
-    return $self->{users};
+  my $self = shift;
+  if (!exists $self->{users}) {
+    say get_text('migrate_reading_users');
+    $self->{users} = $self->_read_users();
+  }
+  return $self->{users};
 }
 
 sub products {
-    my $self = shift;
-    if (!exists $self->{products}) {
-        say get_text('migrate_reading_products');
-        $self->{products} = $self->_read_products();
-    }
-    return $self->{products};
+  my $self = shift;
+  if (!exists $self->{products}) {
+    say get_text('migrate_reading_products');
+    $self->{products} = $self->_read_products();
+  }
+  return $self->{products};
 }
 
 sub bugs {
-    my $self = shift;
-    if (!exists $self->{bugs}) {
-        say get_text('migrate_reading_bugs');
-        $self->{bugs} = $self->_read_bugs();
-    }
-    return $self->{bugs};
+  my $self = shift;
+  if (!exists $self->{bugs}) {
+    say get_text('migrate_reading_bugs');
+    $self->{bugs} = $self->_read_bugs();
+  }
+  return $self->{bugs};
 }
 
 ###########
@@ -280,49 +296,49 @@ sub bugs {
 ###########
 
 sub check_requirements {
-    my $self = shift;
-    my $missing = Bugzilla::Install::Requirements::_check_missing(
-        $self->REQUIRED_MODULES, 1);
-    my %results = (
-        apache      => [],
-        pass        => @$missing ? 0 : 1,
-        missing     => $missing,
-        any_missing => @$missing ? 1 : 0,
-        hide_all    => 1,
-        # These are just for compatibility with print_module_instructions
-        one_dbd  => 1,
-        optional => [],
-    );
-    Bugzilla::Install::Requirements::print_module_instructions(
-        \%results, 1);
-    exit(1) if @$missing;
+  my $self = shift;
+  my $missing
+    = Bugzilla::Install::Requirements::_check_missing($self->REQUIRED_MODULES, 1);
+  my %results = (
+    apache      => [],
+    pass        => @$missing ? 0 : 1,
+    missing     => $missing,
+    any_missing => @$missing ? 1 : 0,
+    hide_all    => 1,
+
+    # These are just for compatibility with print_module_instructions
+    one_dbd  => 1,
+    optional => [],
+  );
+  Bugzilla::Install::Requirements::print_module_instructions(\%results, 1);
+  exit(1) if @$missing;
 }
 
 sub reset_serial_values {
-    my $self = shift;
-    return if $self->{serial_values_reset};
-    my $dbh = Bugzilla->dbh;
-    my %reset = (
-        'bugs'        => 'bug_id',
-        'attachments' => 'attach_id',
-        'profiles'    => 'userid',
-        'longdescs'   => 'comment_id',
-        'products'    => 'id',
-        'components'  => 'id',
-        'versions'    => 'id',
-        'milestones'  => 'id',
-    );
-    my @select_fields = grep { $_->is_select } (values %{ $self->bug_fields });
-    foreach my $field (@select_fields) {
-        next if $field->is_abnormal;
-        $reset{$field->name} = 'id';
-    }
-    
-    while (my ($table, $column) = each %reset) {
-        $dbh->bz_set_next_serial_value($table, $column);
-    }
-    
-    $self->{serial_values_reset} = 1;
+  my $self = shift;
+  return if $self->{serial_values_reset};
+  my $dbh   = Bugzilla->dbh;
+  my %reset = (
+    'bugs'        => 'bug_id',
+    'attachments' => 'attach_id',
+    'profiles'    => 'userid',
+    'longdescs'   => 'comment_id',
+    'products'    => 'id',
+    'components'  => 'id',
+    'versions'    => 'id',
+    'milestones'  => 'id',
+  );
+  my @select_fields = grep { $_->is_select } (values %{$self->bug_fields});
+  foreach my $field (@select_fields) {
+    next if $field->is_abnormal;
+    $reset{$field->name} = 'id';
+  }
+
+  while (my ($table, $column) = each %reset) {
+    $dbh->bz_set_next_serial_value($table, $column);
+  }
+
+  $self->{serial_values_reset} = 1;
 }
 
 ###################
@@ -330,160 +346,167 @@ sub reset_serial_values {
 ###################
 
 sub translate_all_bugs {
-    my ($self, $bugs) = @_;
-    say get_text('migrate_translating_bugs');
-    # We modify the array in place so that $self->bugs will return the
-    # modified bugs, in case $self->before_insert wants them.
-    my $num_bugs = scalar(@$bugs);
-    for (my $i = 0; $i < $num_bugs; $i++) {
-        $bugs->[$i] = $self->translate_bug($bugs->[$i]);
-    }
+  my ($self, $bugs) = @_;
+  say get_text('migrate_translating_bugs');
+
+  # We modify the array in place so that $self->bugs will return the
+  # modified bugs, in case $self->before_insert wants them.
+  my $num_bugs = scalar(@$bugs);
+  for (my $i = 0; $i < $num_bugs; $i++) {
+    $bugs->[$i] = $self->translate_bug($bugs->[$i]);
+  }
 }
 
 sub translate_bug {
-    my ($self, $fields) = @_;
-    my (%bug, %other_fields);
-    my $original_status;
-    foreach my $field (keys %$fields) {
-        my $value = delete $fields->{$field};
-        my $bz_field = $self->translate_field($field);
-        if ($bz_field) {
-            $bug{$bz_field} = $self->translate_value($bz_field, $value);
-            if ($bz_field eq 'bug_status') {
-                $original_status = $value;
-            }
-        }
-        else {
-            $other_fields{$field} = $value;
-        }
+  my ($self, $fields) = @_;
+  my (%bug, %other_fields);
+  my $original_status;
+  foreach my $field (keys %$fields) {
+    my $value    = delete $fields->{$field};
+    my $bz_field = $self->translate_field($field);
+    if ($bz_field) {
+      $bug{$bz_field} = $self->translate_value($bz_field, $value);
+      if ($bz_field eq 'bug_status') {
+        $original_status = $value;
+      }
     }
-    
-    if (defined $original_status and !defined $bug{resolution}
-        and $self->map_value('bug_status_resolution', $original_status))
-    {
-        $bug{resolution} = $self->map_value('bug_status_resolution',
-                                            $original_status);
+    else {
+      $other_fields{$field} = $value;
     }
-    
-    $bug{comment} = $self->_generate_description(\%bug, \%other_fields);
-    
-    return wantarray ? (\%bug, \%other_fields) : \%bug;
+  }
+
+  if (  defined $original_status
+    and !defined $bug{resolution}
+    and $self->map_value('bug_status_resolution', $original_status))
+  {
+    $bug{resolution} = $self->map_value('bug_status_resolution', $original_status);
+  }
+
+  $bug{comment} = $self->_generate_description(\%bug, \%other_fields);
+
+  return wantarray ? (\%bug, \%other_fields) : \%bug;
 }
 
 sub _generate_description {
-    my ($self, $bug, $fields) = @_;
-    
-    my $description = "";
-    foreach my $field (sort keys %$fields) {
-        next if grep($_ eq $field, $self->NON_COMMENT_FIELDS);
-        my $value = delete $fields->{$field};
-        next if $value eq '';
-        $description .= "$field: $value\n";
-    }
-    $description .= "\n" if $description;
-
-    return $description . $bug->{comment};
+  my ($self, $bug, $fields) = @_;
+
+  my $description = "";
+  foreach my $field (sort keys %$fields) {
+    next if grep($_ eq $field, $self->NON_COMMENT_FIELDS);
+    my $value = delete $fields->{$field};
+    next if $value eq '';
+    $description .= "$field: $value\n";
+  }
+  $description .= "\n" if $description;
+
+  return $description . $bug->{comment};
 }
 
 sub translate_field {
-    my ($self, $field) = @_;
-    my $mapped = $self->config('translate_fields')->{$field};
-    return $mapped if defined $mapped;
-    ($mapped) = grep { lc($_) eq lc($field) } (keys %{ $self->bug_fields });
-    return $mapped;
+  my ($self, $field) = @_;
+  my $mapped = $self->config('translate_fields')->{$field};
+  return $mapped if defined $mapped;
+  ($mapped) = grep { lc($_) eq lc($field) } (keys %{$self->bug_fields});
+  return $mapped;
 }
 
 sub parse_date {
-    my ($self, $date) = @_;
-    my @time = strptime($date);
-    # Handle times with timezones that strptime doesn't know about.
-    if (!scalar @time) {
-        $date =~ s/\s+\S+$//;
-        @time = strptime($date);
-    }
-    my $tz;
-    if ($time[6]) {
-        $tz = Bugzilla->local_timezone->offset_as_string($time[6]);
-    }
-    else {
-        $tz = $self->config('timezone');
-        $tz =~ s/\s/_/g;
-        if ($tz eq 'local') {
-            $tz = Bugzilla->local_timezone;
-        }
+  my ($self, $date) = @_;
+  my @time = strptime($date);
+
+  # Handle times with timezones that strptime doesn't know about.
+  if (!scalar @time) {
+    $date =~ s/\s+\S+$//;
+    @time = strptime($date);
+  }
+  my $tz;
+  if ($time[6]) {
+    $tz = DateTime::TimeZone->offset_as_string($time[6]);
+  }
+  else {
+    $tz = $self->config('timezone');
+    $tz =~ s/\s/_/g;
+    if ($tz eq 'local') {
+      $tz = Bugzilla->local_timezone;
     }
-    my $dt = DateTime->new({
-        year   => $time[5] + 1900,
-        month  => $time[4] + 1,
-        day    => $time[3],
-        hour   => $time[2],
-        minute => $time[1],
-        second => int($time[0]),
-        time_zone => $tz, 
-    });
-    $dt->set_time_zone(Bugzilla->local_timezone);
-    return $dt->iso8601;
+  }
+  my $dt = DateTime->new({
+    year      => $time[5] + 1900,
+    month     => $time[4] + 1,
+    day       => $time[3],
+    hour      => $time[2],
+    minute    => $time[1],
+    second    => int($time[0]),
+    time_zone => $tz,
+  });
+  $dt->set_time_zone(Bugzilla->local_timezone);
+  return $dt->iso8601;
 }
 
 sub translate_value {
-    my ($self, $field, $value) = @_;
-    
-    if (!defined $value) {
-        warn("Got undefined value for $field\n");
-        $value = '';
-    }
-    
-    if (ref($value) eq 'ARRAY') {
-        return [ map($self->translate_value($field, $_), @$value) ];
-    }
+  my ($self, $field, $value) = @_;
 
-    
-    if (defined $self->map_value($field, $value)) {
-        return $self->map_value($field, $value);
-    }
-    
-    if (grep($_ eq $field, USER_FIELDS)) {
-        if (defined $self->map_value('user', $value)) {
-            return $self->map_value('user', $value);
-        }
-    }
+  if (!defined $value) {
+    warn("Got undefined value for $field\n");
+    $value = '';
+  }
 
-    my $field_obj = $self->bug_fields->{$field};
-    if ($field eq 'creation_ts'
-        or $field eq 'delta_ts'
-        or ($field_obj and
-             ($field_obj->type == FIELD_TYPE_DATETIME
-              or $field_obj->type == FIELD_TYPE_DATE)))
-    {
-        $value = trim($value);
-        return undef if !$value;
-        return $self->parse_date($value);
+  if (ref($value) eq 'ARRAY') {
+    return [map($self->translate_value($field, $_), @$value)];
+  }
+
+
+  if (defined $self->map_value($field, $value)) {
+    return $self->map_value($field, $value);
+  }
+
+  if (grep($_ eq $field, USER_FIELDS)) {
+    if (defined $self->map_value('user', $value)) {
+      return $self->map_value('user', $value);
     }
-    
-    return $value;
+  }
+
+  my $field_obj = $self->bug_fields->{$field};
+  if (
+       $field eq 'creation_ts'
+    or $field eq 'delta_ts'
+    or (
+      $field_obj
+      and
+      ($field_obj->type == FIELD_TYPE_DATETIME or $field_obj->type == FIELD_TYPE_DATE)
+    )
+    )
+  {
+    $value = trim($value);
+    return undef if !$value;
+    return $self->parse_date($value);
+  }
+
+  return $value;
 }
 
 
 sub map_value {
-    my ($self, $field, $value) = @_;
-    return $self->_value_map->{$field}->{lc($value)};
+  my ($self, $field, $value) = @_;
+  return $self->_value_map->{$field}->{lc($value)};
 }
 
 sub _value_map {
-    my $self = shift;
-    if (!defined $self->{_value_map}) {
-        # Lowercase all values to make them case-insensitive.
-        my %map;
-        my $translation = $self->config('translate_values');
-        foreach my $field (keys %$translation) {
-            my $value_mapping = $translation->{$field};
-            foreach my $value (keys %$value_mapping) {
-                $map{$field}->{lc($value)} = $value_mapping->{$value};
-            }
-        }
-        $self->{_value_map} = \%map;
+  my $self = shift;
+  if (!defined $self->{_value_map}) {
+
+    # Lowercase all values to make them case-insensitive.
+    my %map;
+    my $translation = $self->config('translate_values');
+    foreach my $field (keys %$translation) {
+      my $value_mapping = $translation->{$field};
+      foreach my $value (keys %$value_mapping) {
+        $map{$field}->{lc($value)} = $value_mapping->{$value};
+      }
     }
-    return $self->{_value_map};
+    $self->{_value_map} = \%map;
+  }
+  return $self->{_value_map};
 }
 
 #################
@@ -491,387 +514,402 @@ sub _value_map {
 #################
 
 sub config {
-    my ($self, $var) = @_;
-    if (!exists $self->{config}) {
-        $self->{config} = $self->read_config;
-    }
-    return $self->{config}->{$var};
+  my ($self, $var) = @_;
+  if (!exists $self->{config}) {
+    $self->{config} = $self->read_config;
+  }
+  return $self->{config}->{$var};
 }
 
 sub config_file_name {
-    my $self = shift;
-    my $name = $self->name;
-    my $dir = bz_locations()->{datadir};
-    return "$dir/migrate-$name.cfg"
+  my $self = shift;
+  my $name = $self->name;
+  my $dir  = bz_locations()->{datadir};
+  return "$dir/migrate-$name.cfg";
 }
 
 sub read_config {
-    my ($self) = @_;
-    my $file = $self->config_file_name;
-    if (!-e $file) {
-        $self->write_config();
-        ThrowUserError('migrate_config_created', { file => $file });
-    }
-    open(my $fh, "<", $file) || die "$file: $!";
-    my $safe = new Safe;
-    $safe->rdo($file);
-    my @read_symbols = map($_->{name}, $self->CONFIG_VARS);
-    my %config;
-    foreach my $var (@read_symbols) {
-        my $glob = $safe->varglob($var);
-        $config{$var} = $$glob;
-    }
-    return \%config;
+  my ($self) = @_;
+  my $file = $self->config_file_name;
+  if (!-e $file) {
+    $self->write_config();
+    ThrowUserError('migrate_config_created', {file => $file});
+  }
+  open(my $fh, "<", $file) || die "$file: $!";
+  my $safe = new Safe;
+  $safe->rdo($file);
+  my @read_symbols = map($_->{name}, $self->CONFIG_VARS);
+  my %config;
+  foreach my $var (@read_symbols) {
+    my $glob = $safe->varglob($var);
+    $config{$var} = $$glob;
+  }
+  return \%config;
 }
 
 sub write_config {
-    my ($self) = @_;
-    my $file = $self->config_file_name;
-    open(my $fh, ">", $file) || die "$file: $!";
-    # Fixed indentation
-    local $Data::Dumper::Indent = 1;
-    local $Data::Dumper::Quotekeys = 0;
-    local $Data::Dumper::Sortkeys = 1;
-    foreach my $var ($self->CONFIG_VARS) {
-        print $fh "\n", $var->{desc},
-        Data::Dumper->Dump([$var->{default}], [$var->{name}]);
-    }
-    close($fh);
+  my ($self) = @_;
+  my $file = $self->config_file_name;
+  open(my $fh, ">", $file) || die "$file: $!";
+
+  # Fixed indentation
+  local $Data::Dumper::Indent    = 1;
+  local $Data::Dumper::Quotekeys = 0;
+  local $Data::Dumper::Sortkeys  = 1;
+  foreach my $var ($self->CONFIG_VARS) {
+    print $fh "\n", $var->{desc},
+      Data::Dumper->Dump([$var->{default}], [$var->{name}]);
+  }
+  close($fh);
 }
 
 ####################################
 # Default Implementations of Hooks #
 ####################################
 
-sub after_insert  {}
-sub before_insert {}
-sub after_read    {}
-sub before_read   {}
+sub after_insert  { }
+sub before_insert { }
+sub after_read    { }
+sub before_read   { }
 
 #############
 # Inserters #
 #############
 
 sub insert_users {
-    my ($self, $users) = @_;
-    foreach my $user (@$users) {
-        next if new Bugzilla::User({ name => $user->{login_name} });
-        my $generated_password;
-        if (!defined $user->{cryptpassword}) {
-            $generated_password = lc(generate_random_password());
-            $user->{cryptpassword} = $generated_password;
-        }
-        my $created = Bugzilla::User->create($user);
-        print get_text('migrate_user_created',
-                       { created  => $created,
-                         password => $generated_password }), "\n";
+  my ($self, $users) = @_;
+  foreach my $user (@$users) {
+    next if new Bugzilla::User({name => $user->{login_name}});
+    my $generated_password;
+    if (!defined $user->{cryptpassword}) {
+      $generated_password = lc(generate_random_password());
+      $user->{cryptpassword} = $generated_password;
     }
+    my $created = Bugzilla::User->create($user);
+    print get_text('migrate_user_created',
+      {created => $created, password => $generated_password}),
+      "\n";
+  }
 }
 
 # XXX This should also insert Classifications.
 sub insert_products {
-    my ($self, $products) = @_;
-    foreach my $product (@$products) {
-        my $components = delete $product->{components};
-        
-        my $created_prod = new Bugzilla::Product({ name => $product->{name} });
-        if (!$created_prod) {
-            $created_prod = Bugzilla::Product->create($product);
-            print get_text('migrate_product_created',
-                           { created => $created_prod }), "\n";
-        }
-        
-        foreach my $component (@$components) {
-            next if new Bugzilla::Component({ product => $created_prod,
-                                              name    => $component->{name} });
-            my $created_comp = Bugzilla::Component->create(
-                { %$component, product => $created_prod });
-            print '  ', get_text('migrate_component_created',
-                                 { comp => $created_comp,
-                                   product => $created_prod }), "\n";
-        }
+  my ($self, $products) = @_;
+  foreach my $product (@$products) {
+    my $components = delete $product->{components};
+
+    my $created_prod = new Bugzilla::Product({name => $product->{name}});
+    if (!$created_prod) {
+      $created_prod = Bugzilla::Product->create($product);
+      print get_text('migrate_product_created', {created => $created_prod}), "\n";
+    }
+
+    foreach my $component (@$components) {
+      next
+        if new Bugzilla::Component({
+        product => $created_prod, name => $component->{name}
+        });
+      my $created_comp
+        = Bugzilla::Component->create({%$component, product => $created_prod});
+      print '  ',
+        get_text('migrate_component_created',
+        {comp => $created_comp, product => $created_prod}),
+        "\n";
     }
+  }
 }
 
 sub create_custom_fields {
-    my $self = shift;
-    foreach my $field (keys %{ $self->CUSTOM_FIELDS }) {
-        next if new Bugzilla::Field({ name => $field });
-        my %values = %{ $self->CUSTOM_FIELDS->{$field} };
-        # We set these all here for the dry-run case.
-        my $created = { %values, name => $field, custom => 1 };
-        if (!$self->dry_run) {
-            $created = Bugzilla::Field->create($created);
-        }
-        say get_text('migrate_field_created', { field => $created });
+  my $self = shift;
+  foreach my $field (keys %{$self->CUSTOM_FIELDS}) {
+    next if new Bugzilla::Field({name => $field});
+    my %values = %{$self->CUSTOM_FIELDS->{$field}};
+
+    # We set these all here for the dry-run case.
+    my $created = {%values, name => $field, custom => 1};
+    if (!$self->dry_run) {
+      $created = Bugzilla::Field->create($created);
     }
-    delete $self->{bug_fields};
+    say get_text('migrate_field_created', {field => $created});
+  }
+  delete $self->{bug_fields};
 }
 
 sub create_legal_values {
-    my ($self, $bugs) = @_;
-    my @select_fields = grep($_->is_select, values %{ $self->bug_fields });
-
-    # Get all the values in use on all the bugs we're importing.
-    my (%values, %product_values);
-    foreach my $bug (@$bugs) {
-        foreach my $field (@select_fields) {
-            my $name = $field->name;
-            next if !defined $bug->{$name};
-            $values{$name}->{$bug->{$name}} = 1;
-        }
-        foreach my $field (qw(version target_milestone)) {
-            # Fix per-product bug values here, because it's easier than
-            # doing it during _insert_bugs.
-            if (!defined $bug->{$field} or trim($bug->{$field}) eq '') {
-                my $accessor = $field;
-                $accessor =~ s/^target_//; $accessor .= "s";
-                my $product = Bugzilla::Product->check($bug->{product});
-                $bug->{$field} = $product->$accessor->[0]->name;
-                next;
-            }
-            $product_values{$bug->{product}}->{$field}->{$bug->{$field}} = 1;
-        }
-    }
-    
+  my ($self, $bugs) = @_;
+  my @select_fields = grep($_->is_select, values %{$self->bug_fields});
+
+  # Get all the values in use on all the bugs we're importing.
+  my (%values, %product_values);
+  foreach my $bug (@$bugs) {
     foreach my $field (@select_fields) {
-        next if $field->is_abnormal;
-        my $name = $field->name;
-        foreach my $value (keys %{ $values{$name} }) {
-            next if Bugzilla::Field::Choice->type($field)->new({ name => $value });
-            Bugzilla::Field::Choice->type($field)->create({ value => $value });
-            print get_text('migrate_value_created',
-                           { field => $field, value => $value }), "\n";
-        }
+      my $name = $field->name;
+      next if !defined $bug->{$name};
+      $values{$name}->{$bug->{$name}} = 1;
     }
-    
-    foreach my $product (keys %product_values) {
-        my $prod_obj = Bugzilla::Product->check($product);
-        foreach my $version (keys %{ $product_values{$product}->{version} }) {
-            next if new Bugzilla::Version({ product => $prod_obj,
-                                            name    => $version });
-            my $created = Bugzilla::Version->create({ product => $prod_obj,
-                                                      value   => $version });
-            my $field = $self->bug_fields->{version};
-            print get_text('migrate_value_created', { product => $prod_obj,
-                                                      field   => $field,
-                                                      value   => $created->name }), "\n";
-        }
-        foreach my $milestone (keys %{ $product_values{$product}->{target_milestone} }) {
-            next if new Bugzilla::Milestone({ product => $prod_obj,
-                                              name    => $milestone });
-            my $created = Bugzilla::Milestone->create(
-                { product => $prod_obj, value => $milestone });
-            my $field = $self->bug_fields->{target_milestone};
-            print get_text('migrate_value_created', { product => $prod_obj,
-                                                      field   => $field,
-                                                      value   => $created->name }), "\n";
-            
-        }
+    foreach my $field (qw(version target_milestone)) {
+
+      # Fix per-product bug values here, because it's easier than
+      # doing it during _insert_bugs.
+      if (!defined $bug->{$field} or trim($bug->{$field}) eq '') {
+        my $accessor = $field;
+        $accessor =~ s/^target_//;
+        $accessor .= "s";
+        my $product = Bugzilla::Product->check($bug->{product});
+        $bug->{$field} = $product->$accessor->[0]->name;
+        next;
+      }
+      $product_values{$bug->{product}}->{$field}->{$bug->{$field}} = 1;
     }
-    
+  }
+
+  foreach my $field (@select_fields) {
+    next if $field->is_abnormal;
+    my $name = $field->name;
+    foreach my $value (keys %{$values{$name}}) {
+      next if Bugzilla::Field::Choice->type($field)->new({name => $value});
+      Bugzilla::Field::Choice->type($field)->create({value => $value});
+      print get_text('migrate_value_created', {field => $field, value => $value}),
+        "\n";
+    }
+  }
+
+  foreach my $product (keys %product_values) {
+    my $prod_obj = Bugzilla::Product->check($product);
+    foreach my $version (keys %{$product_values{$product}->{version}}) {
+      next if new Bugzilla::Version({product => $prod_obj, name => $version});
+      my $created
+        = Bugzilla::Version->create({product => $prod_obj, value => $version});
+      my $field = $self->bug_fields->{version};
+      print get_text('migrate_value_created',
+        {product => $prod_obj, field => $field, value => $created->name}),
+        "\n";
+    }
+    foreach my $milestone (keys %{$product_values{$product}->{target_milestone}}) {
+      next if new Bugzilla::Milestone({product => $prod_obj, name => $milestone});
+      my $created
+        = Bugzilla::Milestone->create({product => $prod_obj, value => $milestone});
+      my $field = $self->bug_fields->{target_milestone};
+      print get_text('migrate_value_created',
+        {product => $prod_obj, field => $field, value => $created->name}),
+        "\n";
+
+    }
+  }
+
 }
 
 sub insert_bugs {
-    my ($self, $bugs) = @_;
-    my $dbh = Bugzilla->dbh;
-    say get_text('migrate_creating_bugs');
-
-    my $init_statuses = Bugzilla::Status->can_change_to();
-    my %allowed_statuses = map { lc($_->name) => 1 } @$init_statuses;
-    # Bypass the question of whether or not we can file UNCONFIRMED
-    # in any product by simply picking a non-UNCONFIRMED status as our
-    # default for bugs that don't have a status specified.
-    my $default_status = first { $_->name ne 'UNCONFIRMED' } @$init_statuses;
-    # Use the first resolution that's not blank.
-    my $default_resolution =
-        first { $_->name ne '' }
-              @{ $self->bug_fields->{resolution}->legal_values };
-
-    # Set the values of any required drop-down fields that aren't set.
-    my @standard_drop_downs = grep { !$_->custom and $_->is_select }
-                                   (values %{ $self->bug_fields });
-    # Make bug_status get set before resolution.
-    @standard_drop_downs = sort { $a->name cmp $b->name } @standard_drop_downs;
-    # Cache all statuses for setting the resolution.
-    my %statuses = map { lc($_->name) => $_ } Bugzilla::Status->get_all;
-
-    my $total = scalar @$bugs;
-    my $count = 1;
-    foreach my $bug (@$bugs) {
-        my $comments    = delete $bug->{comments};
-        my $history     = delete $bug->{history};
-        my $attachments = delete $bug->{attachments};
-
-        $self->debug($bug, 3);
-
-        foreach my $field (@standard_drop_downs) {
-            next if $field->is_abnormal;
-            my $field_name = $field->name;
-            if (!defined $bug->{$field_name}) {
-                # If there's a default value for this, then just let create()
-                # pick it.
-                next if grep($_->is_default, @{ $field->legal_values });
-                # Otherwise, pick the first valid value if this is a required
-                # field.
-                if ($field_name eq 'bug_status') {
-                    $bug->{bug_status} = $default_status;
-                }
-                elsif ($field_name eq 'resolution') {
-                    my $status = $statuses{lc($bug->{bug_status})};
-                    if (!$status->is_open) {
-                        $bug->{resolution} =  $default_resolution;
-                    }
-                }
-                else {
-                    $bug->{$field_name} = $field->legal_values->[0]->name;
-                }
-            }
-        }
-        
-        my $product = Bugzilla::Product->check($bug->{product});
-        
-        # If this isn't a legal starting status, or if the bug has a
-        # resolution, then those will have to be set after creating the bug.
-        # We make them into objects so that we can normalize their names.
-        my ($set_status, $set_resolution);
-        if (defined $bug->{resolution}) {
-            $set_resolution = Bugzilla::Field::Choice->type('resolution')
-                              ->new({ name => delete $bug->{resolution} });
+  my ($self, $bugs) = @_;
+  my $dbh = Bugzilla->dbh;
+  say get_text('migrate_creating_bugs');
+
+  my $init_statuses = Bugzilla::Status->can_change_to();
+  my %allowed_statuses = map { lc($_->name) => 1 } @$init_statuses;
+
+  # Bypass the question of whether or not we can file UNCONFIRMED
+  # in any product by simply picking a non-UNCONFIRMED status as our
+  # default for bugs that don't have a status specified.
+  my $default_status = first { $_->name ne 'UNCONFIRMED' } @$init_statuses;
+
+  # Use the first resolution that's not blank.
+  my $default_resolution = first { $_->name ne '' }
+  @{$self->bug_fields->{resolution}->legal_values};
+
+  # Set the values of any required drop-down fields that aren't set.
+  my @standard_drop_downs
+    = grep { !$_->custom and $_->is_select } (values %{$self->bug_fields});
+
+  # Make bug_status get set before resolution.
+  @standard_drop_downs = sort { $a->name cmp $b->name } @standard_drop_downs;
+
+  # Cache all statuses for setting the resolution.
+  my %statuses = map { lc($_->name) => $_ } Bugzilla::Status->get_all;
+
+  my $total = scalar @$bugs;
+  my $count = 1;
+  foreach my $bug (@$bugs) {
+    my $comments    = delete $bug->{comments};
+    my $history     = delete $bug->{history};
+    my $attachments = delete $bug->{attachments};
+
+    $self->debug($bug, 3);
+
+    foreach my $field (@standard_drop_downs) {
+      next if $field->is_abnormal;
+      my $field_name = $field->name;
+      if (!defined $bug->{$field_name}) {
+
+        # If there's a default value for this, then just let create()
+        # pick it.
+        next if grep($_->is_default, @{$field->legal_values});
+
+        # Otherwise, pick the first valid value if this is a required
+        # field.
+        if ($field_name eq 'bug_status') {
+          $bug->{bug_status} = $default_status;
         }
-        if (!$allowed_statuses{lc($bug->{bug_status})}) {
-            $set_status = new Bugzilla::Status({ name => $bug->{bug_status} });
-            # Set the starting status to some status that Bugzilla will
-            # accept. We're going to overwrite it immediately afterward.
-            $bug->{bug_status} = $default_status;
+        elsif ($field_name eq 'resolution') {
+          my $status = $statuses{lc($bug->{bug_status})};
+          if (!$status->is_open) {
+            $bug->{resolution} = $default_resolution;
+          }
         }
-        
-        # If we're in dry-run mode, our custom fields haven't been created
-        # yet, so we shouldn't try to set them on creation.
-        if ($self->dry_run) {
-            foreach my $field (keys %{ $self->CUSTOM_FIELDS }) {
-                delete $bug->{$field};
-            }
+        else {
+          $bug->{$field_name} = $field->legal_values->[0]->name;
         }
-        
-        # File the bug as the reporter.
-        my $super_user = Bugzilla->user;
-        my $reporter = Bugzilla::User->check($bug->{reporter});
-        # Allow the user to file a bug in any product, no matter their current
-        # permissions.
-        $reporter->{groups} = $super_user->groups;
-        Bugzilla->set_user($reporter);
-        my $created = Bugzilla::Bug->create($bug);
-        $self->debug('Created bug ' . $created->id);
-        Bugzilla->set_user($super_user);
-
-        if (defined $bug->{creation_ts}) {
-            $dbh->do('UPDATE bugs SET creation_ts = ?, delta_ts = ? 
+      }
+    }
+
+    my $product = Bugzilla::Product->check($bug->{product});
+
+    # If this isn't a legal starting status, or if the bug has a
+    # resolution, then those will have to be set after creating the bug.
+    # We make them into objects so that we can normalize their names.
+    my ($set_status, $set_resolution);
+    if (defined $bug->{resolution}) {
+      $set_resolution = Bugzilla::Field::Choice->type('resolution')
+        ->new({name => delete $bug->{resolution}});
+    }
+    if (!$allowed_statuses{lc($bug->{bug_status})}) {
+      $set_status = new Bugzilla::Status({name => $bug->{bug_status}});
+
+      # Set the starting status to some status that Bugzilla will
+      # accept. We're going to overwrite it immediately afterward.
+      $bug->{bug_status} = $default_status;
+    }
+
+    # If we're in dry-run mode, our custom fields haven't been created
+    # yet, so we shouldn't try to set them on creation.
+    if ($self->dry_run) {
+      foreach my $field (keys %{$self->CUSTOM_FIELDS}) {
+        delete $bug->{$field};
+      }
+    }
+
+    # File the bug as the reporter.
+    my $super_user = Bugzilla->user;
+    my $reporter   = Bugzilla::User->check($bug->{reporter});
+
+    # Allow the user to file a bug in any product, no matter their current
+    # permissions.
+    $reporter->{groups} = $super_user->groups;
+    Bugzilla->set_user($reporter);
+    my $created = Bugzilla::Bug->create($bug);
+    $self->debug('Created bug ' . $created->id);
+    Bugzilla->set_user($super_user);
+
+    if (defined $bug->{creation_ts}) {
+      $dbh->do(
+        'UPDATE bugs SET creation_ts = ?, delta_ts = ? 
                        WHERE bug_id = ?', undef, $bug->{creation_ts},
-                     $bug->{creation_ts}, $created->id);
-        }
-        if (defined $bug->{delta_ts}) {
-            $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
-                     undef, $bug->{delta_ts}, $created->id);
-        }
-        # We don't need to send email for imported bugs.
-        $dbh->do('UPDATE bugs SET lastdiffed = delta_ts WHERE bug_id = ?',
-                 undef, $created->id);
-
-        # We don't use set_ and update() because that would create
-        # a bugs_activity entry that we don't want.
-        if ($set_status) {
-            $dbh->do('UPDATE bugs SET bug_status = ? WHERE bug_id = ?',
-                     undef, $set_status->name, $created->id);
-        }
-        if ($set_resolution) {
-            $dbh->do('UPDATE bugs SET resolution = ? WHERE bug_id = ?',
-                     undef, $set_resolution->name, $created->id);
-        }
-        
-        $self->_insert_comments($created, $comments);
-        $self->_insert_history($created, $history);
-        $self->_insert_attachments($created, $attachments);
-
-        # bugs_fulltext isn't transactional, so if we're in a dry-run we
-        # need to delete anything that we put in there.
-        if ($self->dry_run) {
-            $dbh->do('DELETE FROM bugs_fulltext WHERE bug_id = ?',
-                     undef, $created->id);
-        }
+        $bug->{creation_ts}, $created->id
+      );
+    }
+    if (defined $bug->{delta_ts}) {
+      $dbh->do('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?',
+        undef, $bug->{delta_ts}, $created->id);
+    }
 
-        if (!$self->verbose) {
-            indicate_progress({ current => $count++, every => 5, total => $total });
-        }
+    # We don't need to send email for imported bugs.
+    $dbh->do('UPDATE bugs SET lastdiffed = delta_ts WHERE bug_id = ?',
+      undef, $created->id);
+
+    # We don't use set_ and update() because that would create
+    # a bugs_activity entry that we don't want.
+    if ($set_status) {
+      $dbh->do('UPDATE bugs SET bug_status = ? WHERE bug_id = ?',
+        undef, $set_status->name, $created->id);
     }
+    if ($set_resolution) {
+      $dbh->do('UPDATE bugs SET resolution = ? WHERE bug_id = ?',
+        undef, $set_resolution->name, $created->id);
+    }
+
+    $self->_insert_comments($created, $comments);
+    $self->_insert_history($created, $history);
+    $self->_insert_attachments($created, $attachments);
+
+    # bugs_fulltext isn't transactional, so if we're in a dry-run we
+    # need to delete anything that we put in there.
+    if ($self->dry_run) {
+      $dbh->do('DELETE FROM bugs_fulltext WHERE bug_id = ?', undef, $created->id);
+    }
+
+    if (!$self->verbose) {
+      indicate_progress({current => $count++, every => 5, total => $total});
+    }
+  }
 }
 
 sub _insert_comments {
-    my ($self, $bug, $comments) = @_;
-    return if !$comments;
-    $self->debug(' Inserting comments:', 2);
-    foreach my $comment (@$comments) {
-        $self->debug($comment, 3);
-        my %copy = %$comment;
-        # XXX In the future, if we have a Bugzilla::Comment->create, this
-        # should use it.
-        my $who = Bugzilla::User->check(delete $copy{who});
-        $copy{who} = $who->id;
-        $copy{bug_id} = $bug->id;
-        $self->_do_table_insert('longdescs', \%copy);
-        $self->debug("  Inserted comment from " . $who->login, 2);
-    }
-    $bug->_sync_fulltext( update_comments => 1 );
+  my ($self, $bug, $comments) = @_;
+  return if !$comments;
+  $self->debug(' Inserting comments:', 2);
+  foreach my $comment (@$comments) {
+    $self->debug($comment, 3);
+    my %copy = %$comment;
+
+    # XXX In the future, if we have a Bugzilla::Comment->create, this
+    # should use it.
+    my $who = Bugzilla::User->check(delete $copy{who});
+    $copy{who}    = $who->id;
+    $copy{bug_id} = $bug->id;
+    $self->_do_table_insert('longdescs', \%copy);
+    $self->debug("  Inserted comment from " . $who->login, 2);
+  }
+  $bug->_sync_fulltext(update_comments => 1);
 }
 
 sub _insert_history {
-    my ($self, $bug, $history) = @_;
-    return if !$history;
-    $self->debug(' Inserting history:', 2);
-    foreach my $item (@$history) {
-        $self->debug($item, 3);
-        my $who = Bugzilla::User->check($item->{who});
-        LogActivityEntry($bug->id, $item->{field}, $item->{removed},
-                         $item->{added}, $who->id, $item->{bug_when});
-        $self->debug("  $item->{field} change from " . $who->login, 2);
-    }
+  my ($self, $bug, $history) = @_;
+  return if !$history;
+  $self->debug(' Inserting history:', 2);
+  foreach my $item (@$history) {
+    $self->debug($item, 3);
+    my $who = Bugzilla::User->check($item->{who});
+    LogActivityEntry($bug->id, $item->{field}, $item->{removed}, $item->{added},
+      $who->id, $item->{bug_when});
+    $self->debug("  $item->{field} change from " . $who->login, 2);
+  }
 }
 
 sub _insert_attachments {
-    my ($self, $bug, $attachments) = @_;
-    return if !$attachments;
-    $self->debug(' Inserting attachments:', 2);
-    foreach my $attachment (@$attachments) {
-        $self->debug($attachment, 3);
-        # Make sure that our pointer is at the beginning of the file,
-        # because usually it will be at the end, having just been fully
-        # written to.
-        if (ref $attachment->{data}) {
-            $attachment->{data}->seek(0, SEEK_SET);
-        }
-
-        my $submitter = Bugzilla::User->check(delete $attachment->{submitter});
-        my $super_user = Bugzilla->user;
-        # Make sure the submitter can attach this attachment no matter what.
-        $submitter->{groups} = $super_user->groups;
-        Bugzilla->set_user($submitter);
-        my $created =
-            Bugzilla::Attachment->create({ %$attachment, bug => $bug });
-        $self->debug('  Attachment ' . $created->description . ' from '
-                     . $submitter->login, 2);
-        Bugzilla->set_user($super_user);
+  my ($self, $bug, $attachments) = @_;
+  return if !$attachments;
+  $self->debug(' Inserting attachments:', 2);
+  foreach my $attachment (@$attachments) {
+    $self->debug($attachment, 3);
+
+    # Make sure that our pointer is at the beginning of the file,
+    # because usually it will be at the end, having just been fully
+    # written to.
+    if (ref $attachment->{data}) {
+      $attachment->{data}->seek(0, SEEK_SET);
     }
+
+    my $submitter  = Bugzilla::User->check(delete $attachment->{submitter});
+    my $super_user = Bugzilla->user;
+
+    # Make sure the submitter can attach this attachment no matter what.
+    $submitter->{groups} = $super_user->groups;
+    Bugzilla->set_user($submitter);
+    my $created = Bugzilla::Attachment->create({%$attachment, bug => $bug});
+    $self->debug(
+      '  Attachment ' . $created->description . ' from ' . $submitter->login, 2);
+    Bugzilla->set_user($super_user);
+  }
 }
 
 sub _do_table_insert {
-    my ($self, $table, $hash) = @_;
-    my @fields    = keys %$hash;
-    my @questions = ('?') x @fields;
-    my @values    = map { $hash->{$_} } @fields;
-    my $field_sql    = join(',', @fields);
-    my $question_sql = join(',', @questions);
-    Bugzilla->dbh->do("INSERT INTO $table ($field_sql) VALUES ($question_sql)",
-                      undef, @values);
+  my ($self, $table, $hash) = @_;
+  my @fields       = keys %$hash;
+  my @questions    = ('?') x @fields;
+  my @values       = map { $hash->{$_} } @fields;
+  my $field_sql    = join(',', @fields);
+  my $question_sql = join(',', @questions);
+  Bugzilla->dbh->do("INSERT INTO $table ($field_sql) VALUES ($question_sql)",
+    undef, @values);
 }
 
 ######################
@@ -879,11 +917,11 @@ sub _do_table_insert {
 ######################
 
 sub _canonical_name {
-    my ($module) = @_;
-    $module =~ s{::}{/}g;
-    $module = basename($module);
-    $module =~ s/\.pm$//g;
-    return $module;
+  my ($module) = @_;
+  $module =~ s{::}{/}g;
+  $module = basename($module);
+  $module =~ s/\.pm$//g;
+  return $module;
 }
 
 1;
diff --git a/Bugzilla/Migrate/Gnats.pm b/Bugzilla/Migrate/Gnats.pm
index 5feda4b8db..34e6cad2d4 100644
--- a/Bugzilla/Migrate/Gnats.pm
+++ b/Bugzilla/Migrate/Gnats.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Migrate::Gnats;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,88 +25,87 @@ use List::MoreUtils qw(firstidx);
 use List::Util qw(first);
 
 use constant REQUIRED_MODULES => [
-    {
-        package => 'Email-Simple-FromHandle',
-        module  => 'Email::Simple::FromHandle',
-        # This version added seekable handles.
-        version => 0.050,
-    },
+  {
+    package => 'Email-Simple-FromHandle',
+    module  => 'Email::Simple::FromHandle',
+
+    # This version added seekable handles.
+    version => 0.050,
+  },
 ];
 
 use constant FIELD_MAP => {
-    'Number'         => 'bug_id',
-    'Category'       => 'product',
-    'Synopsis'       => 'short_desc',
-    'Responsible'    => 'assigned_to',
-    'State'          => 'bug_status',
-    'Class'          => 'cf_type',
-    'Classification' => '',
-    'Originator'     => 'reporter',
-    'Arrival-Date'   => 'creation_ts',
-    'Last-Modified'  => 'delta_ts',
-    'Release'        => 'version',
-    'Severity'       => 'bug_severity',
-    'Description'    => 'comment',
+  'Number'         => 'bug_id',
+  'Category'       => 'product',
+  'Synopsis'       => 'short_desc',
+  'Responsible'    => 'assigned_to',
+  'State'          => 'bug_status',
+  'Class'          => 'cf_type',
+  'Classification' => '',
+  'Originator'     => 'reporter',
+  'Arrival-Date'   => 'creation_ts',
+  'Last-Modified'  => 'delta_ts',
+  'Release'        => 'version',
+  'Severity'       => 'bug_severity',
+  'Description'    => 'comment',
 };
 
 use constant VALUE_MAP => {
-    bug_severity => {
-        'serious'      => 'major',
-        'cosmetic'     => 'trivial',
-        'new-feature'  => 'enhancement',
-        'non-critical' => 'normal',
-    },
-    bug_status => {
-        'open'      => 'CONFIRMED',
-        'analyzed'  => 'IN_PROGRESS',
-        'suspended' => 'RESOLVED',
-        'feedback'  => 'RESOLVED',
-        'released'  => 'VERIFIED',
-    },
-    bug_status_resolution => {
-        'feedback'  => 'FIXED',
-        'released'  => 'FIXED',
-        'closed'    => 'FIXED',
-        'suspended' => 'LATER',
-    },
-    priority => {
-        'medium' => 'Normal',
-    },
+  bug_severity => {
+    'serious'      => 'major',
+    'cosmetic'     => 'trivial',
+    'new-feature'  => 'enhancement',
+    'non-critical' => 'normal',
+  },
+  bug_status => {
+    'open'      => 'CONFIRMED',
+    'analyzed'  => 'IN_PROGRESS',
+    'suspended' => 'RESOLVED',
+    'feedback'  => 'RESOLVED',
+    'released'  => 'VERIFIED',
+  },
+  bug_status_resolution => {
+    'feedback'  => 'FIXED',
+    'released'  => 'FIXED',
+    'closed'    => 'FIXED',
+    'suspended' => 'LATER',
+  },
+  priority => {'medium' => 'Normal',},
 };
 
 use constant GNATS_CONFIG_VARS => (
-    {
-        name    => 'gnats_path',
-        default => '/var/lib/gnats',
-        desc    => <<END,
+  {
+    name    => 'gnats_path',
+    default => '/var/lib/gnats',
+    desc    => <<END,
 # The path to the directory that contains the GNATS database.
 END
-    },
-    {
-        name    => 'default_email_domain',
-        default => 'example.com',
-        desc    => <<'END',
+  },
+  {
+    name    => 'default_email_domain',
+    default => 'example.com',
+    desc    => <<'END',
 # Some GNATS users do not have full email addresses, but Bugzilla requires
 # every user to have an email address. What domain should be appended to
 # usernames that don't have emails, to make them into email addresses?
 # (For example, if you leave this at the default, "unknown" would become
 # "unknown@example.com".)
 END
-    },
-    {
-        name    => 'component_name',
-        default => 'General',
-        desc    => <<'END',
+  },
+  {
+    name    => 'component_name',
+    default => 'General',
+    desc    => <<'END',
 # GNATS has only "Category" to classify bugs. However, Bugzilla has a
 # multi-level system of Products that contain Components. When importing
 # GNATS categories, they become a Product with one Component. What should
 # the name of that Component be?
 END
-    },
-    {
-        name    => 'version_regex',
-        default => '',
-        desc    => <<'END',
+  },
+  {
+    name    => 'version_regex',
+    default => '',
+    desc    => <<'END',
 # In GNATS, the "version" field can contain almost anything. However, in
 # Bugzilla, it's a drop-down, so you don't want too many choices in there.
 # If you specify a regular expression here, versions will be tested against
@@ -115,43 +114,43 @@ END
 # as the version value for the bug instead of the full version value specified
 # in GNATS.
 END
-    },
-    {
-        name    => 'default_originator',
-        default => 'gnats-admin',
-        desc    => <<'END',
+  },
+  {
+    name    => 'default_originator',
+    default => 'gnats-admin',
+    desc    => <<'END',
 # Sometimes, a PR has no valid Originator, so we fall back to the From
 # header of the email. If the From header also isn't a valid username
 # (is just a name with spaces in it--we can't convert that to an email
 # address) then this username (which can either be a GNATS username or an
 # email address) will be considered to be the Originator of the PR.
 END
-    }
+  }
 );
 
 sub CONFIG_VARS {
-    my $self = shift;
-    my @vars = (GNATS_CONFIG_VARS, $self->SUPER::CONFIG_VARS);
-    my $field_map = first { $_->{name} eq 'translate_fields' } @vars;
-    $field_map->{default} = FIELD_MAP;
-    my $value_map = first { $_->{name} eq 'translate_values' } @vars;
-    $value_map->{default} = VALUE_MAP;
-    return @vars;
+  my $self      = shift;
+  my @vars      = (GNATS_CONFIG_VARS, $self->SUPER::CONFIG_VARS);
+  my $field_map = first { $_->{name} eq 'translate_fields' } @vars;
+  $field_map->{default} = FIELD_MAP;
+  my $value_map = first { $_->{name} eq 'translate_values' } @vars;
+  $value_map->{default} = VALUE_MAP;
+  return @vars;
 }
 
 # Directories that aren't projects, or that we shouldn't be parsing
 use constant SKIP_DIRECTORIES => qw(
-    gnats-adm
-    gnats-queue
-    pending
+  gnats-adm
+  gnats-queue
+  pending
 );
 
 use constant NON_COMMENT_FIELDS => qw(
-    Audit-Trail
-    Closed-Date
-    Confidential
-    Unformatted
-    attachments
+  Audit-Trail
+  Closed-Date
+  Confidential
+  Unformatted
+  attachments
 );
 
 # Certain fields can contain things that look like fields in them,
@@ -160,20 +159,16 @@ use constant NON_COMMENT_FIELDS => qw(
 # and wait for the next field to consider that we actually have
 # a field to parse.
 use constant END_FIELD_ORDER => qw(
-    Description
-    How-To-Repeat
-    Fix
-    Release-Note
-    Audit-Trail
-    Unformatted
+  Description
+  How-To-Repeat
+  Fix
+  Release-Note
+  Audit-Trail
+  Unformatted
 );
 
-use constant CUSTOM_FIELDS => {
-    cf_type => {
-        type        => FIELD_TYPE_SINGLE_SELECT,
-        description => 'Type',
-    },
-};
+use constant CUSTOM_FIELDS =>
+  {cf_type => {type => FIELD_TYPE_SINGLE_SELECT, description => 'Type',},};
 
 use constant FIELD_REGEX => qr/^>(\S+):\s*(.*)$/;
 
@@ -192,24 +187,24 @@ use constant LONG_VERSION_LENGTH => 32;
 #########
 
 sub before_insert {
-    my $self = shift;
-
-    # gnats_id isn't a valid User::create field, and we don't need it
-    # anymore now.
-    delete $_->{gnats_id} foreach @{ $self->users };
-
-    # Grab a version out of a bug for each product, so that there is a
-    # valid "version" argument for Bugzilla::Product->create.
-    foreach my $product (@{ $self->products }) {
-        my $bug = first { $_->{product} eq $product->{name} and $_->{version} }
-                        @{ $self->bugs };
-        if (defined $bug) {
-            $product->{version} = $bug->{version};
-        }
-        else {
-            $product->{version} = 'unspecified';
-        }
+  my $self = shift;
+
+  # gnats_id isn't a valid User::create field, and we don't need it
+  # anymore now.
+  delete $_->{gnats_id} foreach @{$self->users};
+
+  # Grab a version out of a bug for each product, so that there is a
+  # valid "version" argument for Bugzilla::Product->create.
+  foreach my $product (@{$self->products}) {
+    my $bug = first { $_->{product} eq $product->{name} and $_->{version} }
+    @{$self->bugs};
+    if (defined $bug) {
+      $product->{version} = $bug->{version};
+    }
+    else {
+      $product->{version} = 'unspecified';
     }
+  }
 }
 
 #########
@@ -217,53 +212,53 @@ sub before_insert {
 #########
 
 sub _read_users {
-    my $self = shift;
-    my $path = $self->config('gnats_path');
-    my $file =  "$path/gnats-adm/responsible";
-    $self->debug("Reading users from $file");
-    my $default_domain = $self->config('default_email_domain');
-    open(my $users_fh, '<', $file) || die "$file: $!";
-    my @users;
-    foreach my $line (<$users_fh>) {
-        $line = trim($line);
-        next if $line =~ /^#/;
-        my ($id, $name, $email) = split(':', $line, 3);
-        $email ||= "$id\@$default_domain";
-        # We can't call our own translate_value, because that depends on
-        # the existence of user_map, which doesn't exist until after
-        # this method. However, we still want to translate any users found.
-        $email = $self->SUPER::translate_value('user', $email);
-        push(@users, { realname => $name, login_name => $email,
-                       gnats_id => $id });
-    }
-    close($users_fh);
-    return \@users;
+  my $self = shift;
+  my $path = $self->config('gnats_path');
+  my $file = "$path/gnats-adm/responsible";
+  $self->debug("Reading users from $file");
+  my $default_domain = $self->config('default_email_domain');
+  open(my $users_fh, '<', $file) || die "$file: $!";
+  my @users;
+  foreach my $line (<$users_fh>) {
+    $line = trim($line);
+    next if $line =~ /^#/;
+    my ($id, $name, $email) = split(':', $line, 3);
+    $email ||= "$id\@$default_domain";
+
+    # We can't call our own translate_value, because that depends on
+    # the existence of user_map, which doesn't exist until after
+    # this method. However, we still want to translate any users found.
+    $email = $self->SUPER::translate_value('user', $email);
+    push(@users, {realname => $name, login_name => $email, gnats_id => $id});
+  }
+  close($users_fh);
+  return \@users;
 }
 
 sub user_map {
-    my $self = shift;
-    $self->{user_map} ||= { map { $_->{gnats_id} => $_->{login_name} }
-                                @{ $self->users } };
-    return $self->{user_map};
+  my $self = shift;
+  $self->{user_map}
+    ||= {map { $_->{gnats_id} => $_->{login_name} } @{$self->users}};
+  return $self->{user_map};
 }
 
 sub add_user {
-    my ($self, $id, $email) = @_;
-    return if defined $self->user_map->{$id};
-    $self->user_map->{$id} = $email;
-    push(@{ $self->users }, { login_name => $email, gnats_id => $id });
+  my ($self, $id, $email) = @_;
+  return if defined $self->user_map->{$id};
+  $self->user_map->{$id} = $email;
+  push(@{$self->users}, {login_name => $email, gnats_id => $id});
 }
 
 sub user_to_email {
-    my ($self, $value) = @_;
-    if (defined $self->user_map->{$value}) {
-        $value = $self->user_map->{$value};
-    }
-    elsif ($value !~ /@/) {
-        my $domain = $self->config('default_email_domain');
-        $value = "$value\@$domain";
-    }
-    return $value;
+  my ($self, $value) = @_;
+  if (defined $self->user_map->{$value}) {
+    $value = $self->user_map->{$value};
+  }
+  elsif ($value !~ /@/) {
+    my $domain = $self->config('default_email_domain');
+    $value = "$value\@$domain";
+  }
+  return $value;
 }
 
 ############
@@ -271,31 +266,33 @@ sub user_to_email {
 ############
 
 sub _read_products {
-    my $self = shift;
-    my $path = $self->config('gnats_path');
-    my $file =  "$path/gnats-adm/categories";
-    $self->debug("Reading categories from $file");
-
-    open(my $categories_fh, '<', $file) || die "$file: $!";    
-    my @products;
-    foreach my $line (<$categories_fh>) {
-        $line = trim($line);
-        next if $line =~ /^#/;
-        my ($name, $description, $assigned_to, $cc) = split(':', $line, 4);
-        my %product = ( name => $name, description => $description );
-        
-        my @initial_cc = split(',', $cc);
-        @initial_cc = @{ $self->translate_value('user', \@initial_cc) };
-        $assigned_to = $self->translate_value('user', $assigned_to);
-        my %component = ( name         => $self->config('component_name'),
-                          description  => $description,
-                          initialowner => $assigned_to,
-                          initial_cc   => \@initial_cc );
-        $product{components} = [\%component];
-        push(@products, \%product);
-    }
-    close($categories_fh);
-    return \@products;
+  my $self = shift;
+  my $path = $self->config('gnats_path');
+  my $file = "$path/gnats-adm/categories";
+  $self->debug("Reading categories from $file");
+
+  open(my $categories_fh, '<', $file) || die "$file: $!";
+  my @products;
+  foreach my $line (<$categories_fh>) {
+    $line = trim($line);
+    next if $line =~ /^#/;
+    my ($name, $description, $assigned_to, $cc) = split(':', $line, 4);
+    my %product = (name => $name, description => $description);
+
+    my @initial_cc = split(',', $cc);
+    @initial_cc = @{$self->translate_value('user', \@initial_cc)};
+    $assigned_to = $self->translate_value('user', $assigned_to);
+    my %component = (
+      name         => $self->config('component_name'),
+      description  => $description,
+      initialowner => $assigned_to,
+      initial_cc   => \@initial_cc
+    );
+    $product{components} = [\%component];
+    push(@products, \%product);
+  }
+  close($categories_fh);
+  return \@products;
 }
 
 ################
@@ -303,128 +300,131 @@ sub _read_products {
 ################
 
 sub _read_bugs {
-    my $self = shift;
-    my $path = $self->config('gnats_path');
-    my @directories = glob("$path/*");
-    my @bugs;
-    foreach my $directory (@directories) {
-        next if !-d $directory;
-        my $name = basename($directory);
-        next if grep($_ eq $name, SKIP_DIRECTORIES);
-        push(@bugs, @{ $self->_parse_project($directory) });
-    }
-    @bugs = sort { $a->{Number} <=> $b->{Number} } @bugs;
-    return \@bugs;
+  my $self        = shift;
+  my $path        = $self->config('gnats_path');
+  my @directories = glob("$path/*");
+  my @bugs;
+  foreach my $directory (@directories) {
+    next if !-d $directory;
+    my $name = basename($directory);
+    next if grep($_ eq $name, SKIP_DIRECTORIES);
+    push(@bugs, @{$self->_parse_project($directory)});
+  }
+  @bugs = sort { $a->{Number} <=> $b->{Number} } @bugs;
+  return \@bugs;
 }
 
 sub _parse_project {
-    my ($self, $directory) = @_;
-    my @files = glob("$directory/*");
-
-    $self->debug("Reading Project: $directory");
-    # Sometimes other files get into gnats directories.
-    @files = grep { basename($_) =~ /^\d+$/ } @files;
-    my @bugs;
-    my $count = 1;
-    my $total = scalar @files;
-    print basename($directory) . ":\n";
-    foreach my $file (@files) {
-        push(@bugs, $self->_parse_bug_file($file));
-        if (!$self->verbose) {
-            indicate_progress({ current => $count++, every => 5,
-                                total => $total });
-        }
+  my ($self, $directory) = @_;
+  my @files = glob("$directory/*");
+
+  $self->debug("Reading Project: $directory");
+
+  # Sometimes other files get into gnats directories.
+  @files = grep { basename($_) =~ /^\d+$/ } @files;
+  my @bugs;
+  my $count = 1;
+  my $total = scalar @files;
+  print basename($directory) . ":\n";
+  foreach my $file (@files) {
+    push(@bugs, $self->_parse_bug_file($file));
+    if (!$self->verbose) {
+      indicate_progress({current => $count++, every => 5, total => $total});
     }
-    return \@bugs;
+  }
+  return \@bugs;
 }
 
 sub _parse_bug_file {
-    my ($self, $file) = @_;
-    $self->debug("Reading $file");
-    open(my $fh, "<", $file) || die "$file: $!";
-    my $email = Email::Simple::FromHandle->new($fh);
-    my $fields = $self->_get_gnats_field_data($email);
-    # We parse attachments here instead of during translate_bug,
-    # because otherwise we'd be taking up huge amounts of memory storing
-    # all the raw attachment data in memory.
-    $fields->{attachments} = $self->_parse_attachments($fields);
-    close($fh);
-    return $fields;
+  my ($self, $file) = @_;
+  $self->debug("Reading $file");
+  open(my $fh, "<", $file) || die "$file: $!";
+  my $email  = Email::Simple::FromHandle->new($fh);
+  my $fields = $self->_get_gnats_field_data($email);
+
+  # We parse attachments here instead of during translate_bug,
+  # because otherwise we'd be taking up huge amounts of memory storing
+  # all the raw attachment data in memory.
+  $fields->{attachments} = $self->_parse_attachments($fields);
+  close($fh);
+  return $fields;
 }
 
 sub _get_gnats_field_data {
-    my ($self, $email) = @_;
-    my ($current_field, @value_lines, %fields);
-    $email->reset_handle();
-    my $handle = $email->handle;
-    foreach my $line (<$handle>) {
-        # If this line starts a field name
-        if ($line =~ FIELD_REGEX) {
-            my ($new_field, $rest_of_line) = ($1, $2);
-            
-            # If this is one of the last few PR fields, then make sure
-            # that we're getting our fields in the right order.
-            my $new_field_valid = 1;
-            my $search_for = $current_field || '';
-            my $current_field_pos = firstidx { $_ eq $search_for }
-                                             END_FIELD_ORDER;
-            if ($current_field_pos > -1) {
-                my $new_field_pos = firstidx { $_ eq $new_field } 
-                                             END_FIELD_ORDER;
-                # We accept any field, as long as it's later than this one.
-                $new_field_valid = $new_field_pos > $current_field_pos ? 1 : 0;
-            }
-            
-            if ($new_field_valid) {
-                if ($current_field) {
-                    $fields{$current_field} = _handle_lines(\@value_lines);
-                    @value_lines = ();
-                }
-                $current_field = $new_field;
-                $line = $rest_of_line;
-            }
+  my ($self, $email) = @_;
+  my ($current_field, @value_lines, %fields);
+  $email->reset_handle();
+  my $handle = $email->handle;
+  foreach my $line (<$handle>) {
+
+    # If this line starts a field name
+    if ($line =~ FIELD_REGEX) {
+      my ($new_field, $rest_of_line) = ($1, $2);
+
+      # If this is one of the last few PR fields, then make sure
+      # that we're getting our fields in the right order.
+      my $new_field_valid   = 1;
+      my $search_for        = $current_field || '';
+      my $current_field_pos = firstidx { $_ eq $search_for }
+      END_FIELD_ORDER;
+      if ($current_field_pos > -1) {
+        my $new_field_pos = firstidx { $_ eq $new_field }
+        END_FIELD_ORDER;
+
+        # We accept any field, as long as it's later than this one.
+        $new_field_valid = $new_field_pos > $current_field_pos ? 1 : 0;
+      }
+
+      if ($new_field_valid) {
+        if ($current_field) {
+          $fields{$current_field} = _handle_lines(\@value_lines);
+          @value_lines = ();
         }
-        push(@value_lines, $line) if defined $line;
+        $current_field = $new_field;
+        $line          = $rest_of_line;
+      }
     }
-    $fields{$current_field} = _handle_lines(\@value_lines);
-    $fields{cc} = [$email->header('Cc')] if $email->header('Cc');
-    
-    # If the Originator is invalid and we don't have a translation for it,
-    # use the From header instead.
-    my $originator = $self->translate_value('reporter', $fields{Originator},
-                                            { check_only => 1 });
-    if ($originator !~ Bugzilla->params->{emailregexp}) {
-        # We use the raw header sometimes, because it looks like "From: user"
-        # which Email::Address won't parse but we can still use.
-        my $address = $email->header('From');
-        my ($parsed) = Email::Address->parse($address);
-        if ($parsed) {
-            $address = $parsed->address;
-        }
-        if ($address) {
-            $self->debug(
-                "PR $fields{Number} had an Originator that was not a valid"
-                . " user ($fields{Originator}). Using From ($address)"
-                . " instead.\n");
-            my $address_email = $self->translate_value('reporter', $address,
-                                                       { check_only => 1 });
-            if ($address_email !~ Bugzilla->params->{emailregexp}) {
-                $self->debug(" From was also invalid, using default_originator.\n");
-                $address = $self->config('default_originator');
-            }
-            $fields{Originator} = $address;
-        }
+    push(@value_lines, $line) if defined $line;
+  }
+  $fields{$current_field} = _handle_lines(\@value_lines);
+  $fields{cc} = [$email->header('Cc')] if $email->header('Cc');
+
+  # If the Originator is invalid and we don't have a translation for it,
+  # use the From header instead.
+  my $originator
+    = $self->translate_value('reporter', $fields{Originator}, {check_only => 1});
+  if ($originator !~ Bugzilla->params->{emailregexp}) {
+
+    # We use the raw header sometimes, because it looks like "From: user"
+    # which Email::Address won't parse but we can still use.
+    my $address = $email->header('From');
+    my ($parsed) = Email::Address->parse($address);
+    if ($parsed) {
+      $address = $parsed->address;
+    }
+    if ($address) {
+      $self->debug("PR $fields{Number} had an Originator that was not a valid"
+          . " user ($fields{Originator}). Using From ($address)"
+          . " instead.\n");
+      my $address_email
+        = $self->translate_value('reporter', $address, {check_only => 1});
+      if ($address_email !~ Bugzilla->params->{emailregexp}) {
+        $self->debug(" From was also invalid, using default_originator.\n");
+        $address = $self->config('default_originator');
+      }
+      $fields{Originator} = $address;
     }
+  }
 
-    $self->debug(\%fields, 3);
-    return \%fields;
+  $self->debug(\%fields, 3);
+  return \%fields;
 }
 
 sub _handle_lines {
-    my ($lines) = @_;
-    my $value = join('', @$lines);
-    $value =~ s/\s+$//;
-    return $value;
+  my ($lines) = @_;
+  my $value = join('', @$lines);
+  $value =~ s/\s+$//;
+  return $value;
 }
 
 ####################
@@ -432,169 +432,188 @@ sub _handle_lines {
 ####################
 
 sub translate_bug {
-    my ($self, $fields) = @_;
+  my ($self, $fields) = @_;
 
-    my ($bug, $other_fields) = $self->SUPER::translate_bug($fields);
+  my ($bug, $other_fields) = $self->SUPER::translate_bug($fields);
 
-    $bug->{attachments} = delete $other_fields->{attachments};
+  $bug->{attachments} = delete $other_fields->{attachments};
 
-    if (defined $other_fields->{_add_to_comment}) {
-        $bug->{comment} .= delete $other_fields->{_add_to_comment};
-    }
+  if (defined $other_fields->{_add_to_comment}) {
+    $bug->{comment} .= delete $other_fields->{_add_to_comment};
+  }
 
-    my ($changes, $extra_comment) =
-        $self->_parse_audit_trail($bug, $other_fields->{'Audit-Trail'});
-
-    my @comments;
-    foreach my $change (@$changes) {
-        if (exists $change->{comment}) {
-            push(@comments, {
-                thetext  => $change->{comment},
-                who      => $change->{who},
-                bug_when => $change->{bug_when} });
-            delete $change->{comment};
-        }
-    }
-    $bug->{history}  = $changes;
+  my ($changes, $extra_comment)
+    = $self->_parse_audit_trail($bug, $other_fields->{'Audit-Trail'});
 
-    if (trim($extra_comment)) {
-        push(@comments, { thetext => $extra_comment, who => $bug->{reporter},
-                          bug_when => $bug->{delta_ts} || $bug->{creation_ts} });
-    }
-    $bug->{comments} = \@comments;
-    
-    $bug->{component} = $self->config('component_name');
-    if (!$bug->{short_desc}) {
-        $bug->{short_desc} = NO_SUBJECT;
-    }
-    
-    foreach my $attachment (@{ $bug->{attachments} || [] }) {
-        $attachment->{submitter} = $bug->{reporter};
-        $attachment->{creation_ts} = $bug->{creation_ts};
+  my @comments;
+  foreach my $change (@$changes) {
+    if (exists $change->{comment}) {
+      push(
+        @comments,
+        {
+          thetext  => $change->{comment},
+          who      => $change->{who},
+          bug_when => $change->{bug_when}
+        }
+      );
+      delete $change->{comment};
     }
-
-    $self->debug($bug, 3);
-    return $bug;
+  }
+  $bug->{history} = $changes;
+
+  if (trim($extra_comment)) {
+    push(
+      @comments,
+      {
+        thetext  => $extra_comment,
+        who      => $bug->{reporter},
+        bug_when => $bug->{delta_ts} || $bug->{creation_ts}
+      }
+    );
+  }
+  $bug->{comments} = \@comments;
+
+  $bug->{component} = $self->config('component_name');
+  if (!$bug->{short_desc}) {
+    $bug->{short_desc} = NO_SUBJECT;
+  }
+
+  foreach my $attachment (@{$bug->{attachments} || []}) {
+    $attachment->{submitter}   = $bug->{reporter};
+    $attachment->{creation_ts} = $bug->{creation_ts};
+  }
+
+  $self->debug($bug, 3);
+  return $bug;
 }
 
 sub _parse_audit_trail {
-    my ($self, $bug, $audit_trail) = @_;
-    return [] if !trim($audit_trail);
-    $self->debug(" Parsing audit trail...", 2);
-    
-    if ($audit_trail !~ /^\S+-Changed-\S+:/ms) {
-        # This is just a comment from the bug's creator.
-        $self->debug("  Audit trail is just a comment.", 2);
-        return ([], $audit_trail);
-    }
-    
-    my (@changes, %current_data, $current_column, $on_why);
-    my $extra_comment = '';
-    my $current_field;
-    my @all_lines = split("\n", $audit_trail);
-    foreach my $line (@all_lines) {
-        # GNATS history looks like:
-        # Status-Changed-From-To: open->closed
-        # Status-Changed-By: jack
-        # Status-Changed-When: Mon May 12 14:46:59 2003
-        # Status-Changed-Why:
-        #     This is some comment here about the change.
-        if ($line =~ /^(\S+)-Changed-(\S+):(.*)/) {
-            my ($field, $column, $value) = ($1, $2, $3);
-            my $bz_field = $self->translate_field($field);
-            # If it's not a field we're importing, we don't care about
-            # its history.
-            next if !$bz_field;
-            # GNATS doesn't track values for description changes,
-            # unfortunately, and that's the only information we'd be able to
-            # use in Bugzilla for the audit trail on that field.
-            next if $bz_field eq 'comment';
-            $current_field = $bz_field if !$current_field;
-            if ($bz_field ne $current_field) {
-                $self->_store_audit_change(
-                    \@changes, $current_field, \%current_data);
-                %current_data = ();
-                $current_field = $bz_field;
-            }
-            $value = trim($value);
-            $self->debug("  $bz_field $column: $value", 3);
-            if ($column eq 'From-To') {
-                my ($from, $to) = split('->', $value, 2);
-                # Sometimes there's just a - instead of a -> between the values.
-                if (!defined($to)) {
-                    ($from, $to) = split('-', $value, 2);
-                }
-                $current_data{added} = $to;
-                $current_data{removed} = $from;
-            }
-            elsif ($column eq 'By') {
-                my $email = $self->translate_value('user', $value);
-                # Sometimes we hit users in the audit trail that we haven't
-                # seen anywhere else.
-                $current_data{who} = $email;
-            }
-            elsif ($column eq 'When') {
-                $current_data{bug_when} = $self->parse_date($value);
-            }
-            if ($column eq 'Why') {
-                $value = '' if !defined $value;
-                $current_data{comment} = $value;
-                $on_why = 1;
-            }
-            else {
-                $on_why = 0;
-            }
-        }
-        elsif ($on_why) {
-            # "Why" lines are indented four characters.
-            $line =~ s/^\s{4}//;
-            $current_data{comment} .= "$line\n";
-        }
-        else {
-            $self->debug(
-                "Extra Audit-Trail line on $bug->{product} $bug->{bug_id}:"
-                 . " $line\n", 2);
-            $extra_comment .= "$line\n";
+  my ($self, $bug, $audit_trail) = @_;
+  return [] if !trim($audit_trail);
+  $self->debug(" Parsing audit trail...", 2);
+
+  if ($audit_trail !~ /^\S+-Changed-\S+:/ms) {
+
+    # This is just a comment from the bug's creator.
+    $self->debug("  Audit trail is just a comment.", 2);
+    return ([], $audit_trail);
+  }
+
+  my (@changes, %current_data, $current_column, $on_why);
+  my $extra_comment = '';
+  my $current_field;
+  my @all_lines = split("\n", $audit_trail);
+  foreach my $line (@all_lines) {
+
+    # GNATS history looks like:
+    # Status-Changed-From-To: open->closed
+    # Status-Changed-By: jack
+    # Status-Changed-When: Mon May 12 14:46:59 2003
+    # Status-Changed-Why:
+    #     This is some comment here about the change.
+    if ($line =~ /^(\S+)-Changed-(\S+):(.*)/) {
+      my ($field, $column, $value) = ($1, $2, $3);
+      my $bz_field = $self->translate_field($field);
+
+      # If it's not a field we're importing, we don't care about
+      # its history.
+      next if !$bz_field;
+
+      # GNATS doesn't track values for description changes,
+      # unfortunately, and that's the only information we'd be able to
+      # use in Bugzilla for the audit trail on that field.
+      next if $bz_field eq 'comment';
+      $current_field = $bz_field if !$current_field;
+      if ($bz_field ne $current_field) {
+        $self->_store_audit_change(\@changes, $current_field, \%current_data);
+        %current_data  = ();
+        $current_field = $bz_field;
+      }
+      $value = trim($value);
+      $self->debug("  $bz_field $column: $value", 3);
+      if ($column eq 'From-To') {
+        my ($from, $to) = split('->', $value, 2);
+
+        # Sometimes there's just a - instead of a -> between the values.
+        if (!defined($to)) {
+          ($from, $to) = split('-', $value, 2);
         }
+        $current_data{added}   = $to;
+        $current_data{removed} = $from;
+      }
+      elsif ($column eq 'By') {
+        my $email = $self->translate_value('user', $value);
+
+        # Sometimes we hit users in the audit trail that we haven't
+        # seen anywhere else.
+        $current_data{who} = $email;
+      }
+      elsif ($column eq 'When') {
+        $current_data{bug_when} = $self->parse_date($value);
+      }
+      if ($column eq 'Why') {
+        $value = '' if !defined $value;
+        $current_data{comment} = $value;
+        $on_why = 1;
+      }
+      else {
+        $on_why = 0;
+      }
+    }
+    elsif ($on_why) {
+
+      # "Why" lines are indented four characters.
+      $line =~ s/^\s{4}//;
+      $current_data{comment} .= "$line\n";
+    }
+    else {
+      $self->debug(
+        "Extra Audit-Trail line on $bug->{product} $bug->{bug_id}:" . " $line\n", 2);
+      $extra_comment .= "$line\n";
     }
-    $self->_store_audit_change(\@changes, $current_field, \%current_data);
-    return (\@changes, $extra_comment);
+  }
+  $self->_store_audit_change(\@changes, $current_field, \%current_data);
+  return (\@changes, $extra_comment);
 }
 
 sub _store_audit_change {
-    my ($self, $changes, $old_field, $current_data) = @_;
-
-    $current_data->{field} = $old_field;
-    $current_data->{removed} = 
-        $self->translate_value($old_field, $current_data->{removed});
-    $current_data->{added} =
-        $self->translate_value($old_field, $current_data->{added});
-    push(@$changes, { %$current_data });
+  my ($self, $changes, $old_field, $current_data) = @_;
+
+  $current_data->{field} = $old_field;
+  $current_data->{removed}
+    = $self->translate_value($old_field, $current_data->{removed});
+  $current_data->{added}
+    = $self->translate_value($old_field, $current_data->{added});
+  push(@$changes, {%$current_data});
 }
 
 sub _parse_attachments {
-    my ($self, $fields) = @_;
-    my $unformatted = delete $fields->{'Unformatted'};
-    my $gnats_boundary = GNATS_BOUNDARY;
-    # A sanity checker to make sure that we're parsing attachments right.
-    my $num_attachments = 0;
-    $num_attachments++ while ($unformatted =~ /\Q$gnats_boundary\E/g);
-    # Sometimes there's a GNATS_BOUNDARY that is on the same line as other data.
-    $unformatted =~ s/(\S\s*)\Q$gnats_boundary\E$/$1\n$gnats_boundary/mg;
-    # Often the "Unformatted" section starts with stuff before
-    # ----gnatsweb-attachment---- that isn't necessary.
-    $unformatted =~ s/^\s*From:.+?Reply-to:[^\n]+//s;
-    $unformatted = trim($unformatted);
-    return [] if !$unformatted;
-    $self->debug('Reading attachments...', 2);
-    my $boundary = generate_random_password(48);
-    $unformatted =~ s/\Q$gnats_boundary\E/--$boundary/g;
-    # Sometimes the whole Unformatted section is indented by exactly
-    # one space, and needs to be fixed.
-    if ($unformatted =~ /--\Q$boundary\E\n /) {
-        $unformatted =~ s/^ //mg;
-    }
-    $unformatted = <<END;
+  my ($self, $fields) = @_;
+  my $unformatted    = delete $fields->{'Unformatted'};
+  my $gnats_boundary = GNATS_BOUNDARY;
+
+  # A sanity checker to make sure that we're parsing attachments right.
+  my $num_attachments = 0;
+  $num_attachments++ while ($unformatted =~ /\Q$gnats_boundary\E/g);
+
+  # Sometimes there's a GNATS_BOUNDARY that is on the same line as other data.
+  $unformatted =~ s/(\S\s*)\Q$gnats_boundary\E$/$1\n$gnats_boundary/mg;
+
+  # Often the "Unformatted" section starts with stuff before
+  # ----gnatsweb-attachment---- that isn't necessary.
+  $unformatted =~ s/^\s*From:.+?Reply-to:[^\n]+//s;
+  $unformatted = trim($unformatted);
+  return [] if !$unformatted;
+  $self->debug('Reading attachments...', 2);
+  my $boundary = generate_random_password(48);
+  $unformatted =~ s/\Q$gnats_boundary\E/--$boundary/g;
+
+  # Sometimes the whole Unformatted section is indented by exactly
+  # one space, and needs to be fixed.
+  if ($unformatted =~ /--\Q$boundary\E\n /) {
+    $unformatted =~ s/^ //mg;
+  }
+  $unformatted = <<END;
 From: nobody
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="$boundary"
@@ -607,96 +626,103 @@ Content-Transfer-Encoding: 7bit
 $unformatted
 --$boundary--
 END
-    my $email = new Email::MIME(\$unformatted);
-    my @parts = $email->parts;
-    # Remove the fake body.
-    my $part1 = shift @parts;
-    if ($part1->body) {
-        $self->debug(" Additional Unformatted data found on "
-                     . $fields->{Category} . " bug " . $fields->{Number});
-        $self->debug($part1->body, 3);
-        $fields->{_add_comment} .= "\n\nUnformatted:\n" . $part1->body;
-    }
+  my $email = new Email::MIME(\$unformatted);
+  my @parts = $email->parts;
+
+  # Remove the fake body.
+  my $part1 = shift @parts;
+  if ($part1->body) {
+    $self->debug(" Additional Unformatted data found on "
+        . $fields->{Category} . " bug "
+        . $fields->{Number});
+    $self->debug($part1->body, 3);
+    $fields->{_add_comment} .= "\n\nUnformatted:\n" . $part1->body;
+  }
+
+  my @attachments;
+  foreach my $part (@parts) {
+    $self->debug('  Parsing attachment: ' . $part->filename);
+    my $temp_fh = IO::File->new_tmpfile or die("Can't create tempfile: $!");
+    $temp_fh->binmode;
+    print $temp_fh $part->body;
+    my $content_type = $part->content_type;
+    $content_type =~ s/; name=.+$//;
+    my $attachment = {
+      filename    => $part->filename,
+      description => $part->filename,
+      mimetype    => $content_type,
+      data        => $temp_fh
+    };
+    $self->debug($attachment, 3);
+    push(@attachments, $attachment);
+  }
+
+  if (scalar(@attachments) ne $num_attachments) {
+    warn "WARNING: Expected $num_attachments attachments but got "
+      . scalar(@attachments) . "\n";
+    $self->debug($unformatted, 3);
+  }
+  return \@attachments;
+}
 
-    my @attachments;
-    foreach my $part (@parts) {
-        $self->debug('  Parsing attachment: ' . $part->filename);
-        my $temp_fh = IO::File->new_tmpfile or die ("Can't create tempfile: $!");
-        $temp_fh->binmode;
-        print $temp_fh $part->body;
-        my $content_type = $part->content_type;
-        $content_type =~ s/; name=.+$//;
-        my $attachment = { filename    => $part->filename,
-                           description => $part->filename,
-                           mimetype    => $content_type,
-                           data        => $temp_fh };
-        $self->debug($attachment, 3);
-        push(@attachments, $attachment);
+sub translate_value {
+  my $self = shift;
+  my ($field, $value, $options) = @_;
+  my $original_value = $value;
+  $options ||= {};
+
+  if (!ref($value) and grep($_ eq $field, $self->USER_FIELDS)) {
+    if ($value =~ /(\S+\@\S+)/) {
+      $value = $1;
+      $value =~ s/^<//;
+      $value =~ s/>$//;
     }
-    
-    if (scalar(@attachments) ne $num_attachments) {
-        warn "WARNING: Expected $num_attachments attachments but got "
-             . scalar(@attachments) . "\n" ;
-        $self->debug($unformatted, 3);
+    else {
+      # Sometimes names have extra stuff on the end like "(Somebody's Name)"
+      $value =~ s/\s+\(.+\)$//;
+
+      # Sometimes user fields look like "(user)" instead of just "user".
+      $value =~ s/^\((.+)\)$/$1/;
+      $value = trim($value);
     }
-    return \@attachments;
-}
+  }
 
-sub translate_value {
-    my $self = shift;
-    my ($field, $value, $options) = @_;
-    my $original_value = $value;
-    $options ||= {};
-
-    if (!ref($value) and grep($_ eq $field, $self->USER_FIELDS)) {
-        if ($value =~ /(\S+\@\S+)/) {
-            $value = $1;
-            $value =~ s/^<//;
-            $value =~ s/>$//;
-        }
-        else {
-            # Sometimes names have extra stuff on the end like "(Somebody's Name)"
-            $value =~ s/\s+\(.+\)$//;
-            # Sometimes user fields look like "(user)" instead of just "user".
-            $value =~ s/^\((.+)\)$/$1/;
-            $value = trim($value);
-        }
+  if ($field eq 'version' and $value ne '') {
+    my $version_re = $self->config('version_regex');
+    if ($version_re and $value =~ $version_re) {
+      $value = $1;
     }
 
-    if ($field eq 'version' and $value ne '') {
-        my $version_re = $self->config('version_regex');
-        if ($version_re and $value =~ $version_re) {
-            $value = $1;
-        }
-        # In the GNATS that I tested this with, there were many extremely long
-        # values for "version" that caused some import problems (they were
-        # longer than the max allowed version value). So if the version value
-        # is longer than 32 characters, pull out the first thing that looks
-        # like a version number.
-        elsif (length($value) > LONG_VERSION_LENGTH) {
-            $value =~ s/^.+?\b(\d[\w\.]+)\b.+$/$1/;
-        }
+    # In the GNATS that I tested this with, there were many extremely long
+    # values for "version" that caused some import problems (they were
+    # longer than the max allowed version value). So if the version value
+    # is longer than 32 characters, pull out the first thing that looks
+    # like a version number.
+    elsif (length($value) > LONG_VERSION_LENGTH) {
+      $value =~ s/^.+?\b(\d[\w\.]+)\b.+$/$1/;
     }
-    
-    my @args = @_;
+  }
+
+  my @args = @_;
+  $args[1] = $value;
+
+  $value = $self->SUPER::translate_value(@args);
+  return $value if ref $value;
+
+  if (grep($_ eq $field, $self->USER_FIELDS)) {
+    my $from_value = $value;
+    $value = $self->user_to_email($value);
     $args[1] = $value;
-    
+
+    # If we got something new from user_to_email, do any necessary
+    # translation of it.
     $value = $self->SUPER::translate_value(@args);
-    return $value if ref $value;
-    
-    if (grep($_ eq $field, $self->USER_FIELDS)) {
-        my $from_value = $value;
-        $value = $self->user_to_email($value);
-        $args[1] = $value;
-        # If we got something new from user_to_email, do any necessary
-        # translation of it.
-        $value = $self->SUPER::translate_value(@args);
-        if (!$options->{check_only}) {
-            $self->add_user($from_value, $value);
-        }
+    if (!$options->{check_only}) {
+      $self->add_user($from_value, $value);
     }
-    
-    return $value;
+  }
+
+  return $value;
 }
 
 1;
diff --git a/Bugzilla/Milestone.pm b/Bugzilla/Milestone.pm
index cf7e3e35f1..37b6dab36e 100644
--- a/Bugzilla/Milestone.pm
+++ b/Bugzilla/Milestone.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Milestone;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,140 +25,140 @@ use Scalar::Util qw(blessed);
 
 use constant DEFAULT_SORTKEY => 0;
 
-use constant DB_TABLE => 'milestones';
+use constant DB_TABLE   => 'milestones';
 use constant NAME_FIELD => 'value';
 use constant LIST_ORDER => 'sortkey, value';
 
 use constant DB_COLUMNS => qw(
-    id
-    value
-    product_id
-    sortkey
-    isactive
+  id
+  value
+  product_id
+  sortkey
+  isactive
 );
 
-use constant REQUIRED_FIELD_MAP => {
-    product_id => 'product',
-};
+use constant REQUIRED_FIELD_MAP => {product_id => 'product',};
 
 use constant UPDATE_COLUMNS => qw(
-    value
-    sortkey
-    isactive
+  value
+  sortkey
+  isactive
 );
 
 use constant VALIDATORS => {
-    product  => \&_check_product,
-    sortkey  => \&_check_sortkey,
-    value    => \&_check_value,
-    isactive => \&Bugzilla::Object::check_boolean,
+  product  => \&_check_product,
+  sortkey  => \&_check_sortkey,
+  value    => \&_check_value,
+  isactive => \&Bugzilla::Object::check_boolean,
 };
 
-use constant VALIDATOR_DEPENDENCIES => {
-    value => ['product'],
-};
+use constant VALIDATOR_DEPENDENCIES => {value => ['product'],};
 
 ################################
 
 sub new {
-    my $class = shift;
-    my $param = shift;
-    my $dbh = Bugzilla->dbh;
-
-    my $product;
-    if (ref $param and !defined $param->{id}) {
-        $product = $param->{product};
-        my $name = $param->{name};
-        if (!defined $product) {
-            ThrowCodeError('bad_arg',
-                {argument => 'product',
-                 function => "${class}::new"});
-        }
-        if (!defined $name) {
-            ThrowCodeError('bad_arg',
-                {argument => 'name',
-                 function => "${class}::new"});
-        }
-
-        my $condition = 'product_id = ? AND value = ?';
-        my @values = ($product->id, $name);
-        $param = { condition => $condition, values => \@values };
+  my $class = shift;
+  my $param = shift;
+  my $dbh   = Bugzilla->dbh;
+
+  my $product;
+  if (ref $param and !defined $param->{id}) {
+    $product = $param->{product};
+    my $name = $param->{name};
+    if (!defined $product) {
+      ThrowCodeError('bad_arg', {argument => 'product', function => "${class}::new"});
     }
+    if (!defined $name) {
+      ThrowCodeError('bad_arg', {argument => 'name', function => "${class}::new"});
+    }
+
+    my $condition = 'product_id = ? AND value = ?';
+    my @values = ($product->id, $name);
+    $param = {condition => $condition, values => \@values};
+  }
 
-    unshift @_, $param;
-    return $class->SUPER::new(@_);
+  unshift @_, $param;
+  return $class->SUPER::new(@_);
 }
 
 sub run_create_validators {
-    my $class = shift;
-    my $params = $class->SUPER::run_create_validators(@_);
-    my $product = delete $params->{product};
-    $params->{product_id} = $product->id;
-    return $params;
+  my $class   = shift;
+  my $params  = $class->SUPER::run_create_validators(@_);
+  my $product = delete $params->{product};
+  $params->{product_id} = $product->id;
+  return $params;
 }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-    my $changes = $self->SUPER::update(@_);
-
-    if (exists $changes->{value}) {
-        # The milestone value is stored in the bugs table instead of its ID.
-        $dbh->do('UPDATE bugs SET target_milestone = ?
-                  WHERE target_milestone = ? AND product_id = ?',
-                 undef, ($self->name, $changes->{value}->[0], $self->product_id));
-
-        # The default milestone also stores the value instead of the ID.
-        $dbh->do('UPDATE products SET defaultmilestone = ?
-                  WHERE id = ? AND defaultmilestone = ?',
-                 undef, ($self->name, $self->product_id, $changes->{value}->[0]));
-        Bugzilla->memcached->clear({ table => 'products', id => $self->product_id });
-    }
-    $dbh->bz_commit_transaction();
-    Bugzilla->memcached->clear_config();
-
-    return $changes;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+  my $changes = $self->SUPER::update(@_);
+
+  if (exists $changes->{value}) {
+
+    # The milestone value is stored in the bugs table instead of its ID.
+    $dbh->do(
+      'UPDATE bugs SET target_milestone = ?
+                  WHERE target_milestone = ? AND product_id = ?', undef,
+      ($self->name, $changes->{value}->[0], $self->product_id)
+    );
+
+    # The default milestone also stores the value instead of the ID.
+    $dbh->do(
+      'UPDATE products SET defaultmilestone = ?
+                  WHERE id = ? AND defaultmilestone = ?', undef,
+      ($self->name, $self->product_id, $changes->{value}->[0])
+    );
+    Bugzilla->memcached->clear({table => 'products', id => $self->product_id});
+  }
+  $dbh->bz_commit_transaction();
+  Bugzilla->memcached->clear_config();
+
+  return $changes;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    # The default milestone cannot be deleted.
-    if ($self->name eq $self->product->default_milestone) {
-        ThrowUserError('milestone_is_default', { milestone => $self });
-    }
+  # The default milestone cannot be deleted.
+  if ($self->name eq $self->product->default_milestone) {
+    ThrowUserError('milestone_is_default', {milestone => $self});
+  }
+
+  if ($self->bug_count) {
 
-    if ($self->bug_count) {
-        # We don't want to delete bugs when deleting a milestone.
-        # Bugs concerned are reassigned to the default milestone.
-        my $bug_ids =
-          $dbh->selectcol_arrayref('SELECT bug_id FROM bugs
+    # We don't want to delete bugs when deleting a milestone.
+    # Bugs concerned are reassigned to the default milestone.
+    my $bug_ids = $dbh->selectcol_arrayref(
+      'SELECT bug_id FROM bugs
                                     WHERE product_id = ? AND target_milestone = ?',
-                                    undef, ($self->product->id, $self->name));
-
-        my $timestamp = $dbh->selectrow_array('SELECT NOW()');
-
-        $dbh->do('UPDATE bugs SET target_milestone = ?, delta_ts = ?
-                   WHERE ' . $dbh->sql_in('bug_id', $bug_ids),
-                 undef, ($self->product->default_milestone, $timestamp));
-
-        require Bugzilla::Bug;
-        import Bugzilla::Bug qw(LogActivityEntry);
-        foreach my $bug_id (@$bug_ids) {
-            LogActivityEntry($bug_id, 'target_milestone',
-                             $self->name,
-                             $self->product->default_milestone,
-                             Bugzilla->user->id, $timestamp);
-        }
+      undef, ($self->product->id, $self->name)
+    );
+
+    my $timestamp = $dbh->selectrow_array('SELECT NOW()');
+
+    $dbh->do(
+      'UPDATE bugs SET target_milestone = ?, delta_ts = ?
+                   WHERE ' . $dbh->sql_in('bug_id', $bug_ids), undef,
+      ($self->product->default_milestone, $timestamp)
+    );
+
+    require Bugzilla::Bug;
+    import Bugzilla::Bug qw(LogActivityEntry);
+    foreach my $bug_id (@$bug_ids) {
+      LogActivityEntry($bug_id, 'target_milestone', $self->name,
+        $self->product->default_milestone,
+        Bugzilla->user->id, $timestamp);
     }
-    $self->SUPER::remove_from_db();
+  }
+  $self->SUPER::remove_from_db();
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 }
 
 ################################
@@ -166,78 +166,85 @@ sub remove_from_db {
 ################################
 
 sub _check_value {
-    my ($invocant, $name, undef, $params) = @_;
-    my $product = blessed($invocant) ? $invocant->product : $params->{product};
-
-    $name = trim($name);
-    $name || ThrowUserError('milestone_blank_name');
-    if (length($name) > MAX_MILESTONE_SIZE) {
-        ThrowUserError('milestone_name_too_long', {name => $name});
-    }
-
-    my $milestone = new Bugzilla::Milestone({product => $product, name => $name});
-    if ($milestone && (!ref $invocant || $milestone->id != $invocant->id)) {
-        ThrowUserError('milestone_already_exists', { name    => $milestone->name,
-                                                     product => $product->name });
-    }
-    return $name;
+  my ($invocant, $name, undef, $params) = @_;
+  my $product = blessed($invocant) ? $invocant->product : $params->{product};
+
+  $name = trim($name);
+  $name || ThrowUserError('milestone_blank_name');
+  if (length($name) > MAX_MILESTONE_SIZE) {
+    ThrowUserError('milestone_name_too_long', {name => $name});
+  }
+
+  my $milestone = new Bugzilla::Milestone({product => $product, name => $name});
+  if ($milestone && (!ref $invocant || $milestone->id != $invocant->id)) {
+    ThrowUserError('milestone_already_exists',
+      {name => $milestone->name, product => $product->name});
+  }
+  return $name;
 }
 
 sub _check_sortkey {
-    my ($invocant, $sortkey) = @_;
-
-    # Keep a copy in case detaint_signed() clears the sortkey
-    my $stored_sortkey = $sortkey;
-
-    if (!detaint_signed($sortkey) || $sortkey < MIN_SMALLINT || $sortkey > MAX_SMALLINT) {
-        ThrowUserError('milestone_sortkey_invalid', {sortkey => $stored_sortkey});
-    }
-    return $sortkey;
+  my ($invocant, $sortkey) = @_;
+
+  # Keep a copy in case detaint_signed() clears the sortkey
+  my $stored_sortkey = $sortkey;
+
+  if ( !detaint_signed($sortkey)
+    || $sortkey < MIN_SMALLINT
+    || $sortkey > MAX_SMALLINT)
+  {
+    ThrowUserError('milestone_sortkey_invalid', {sortkey => $stored_sortkey});
+  }
+  return $sortkey;
 }
 
 sub _check_product {
-    my ($invocant, $product) = @_;
-    $product || ThrowCodeError('param_required',
-                    { function => "$invocant->create", param => "product" });
-    return Bugzilla->user->check_can_admin_product($product->name);
+  my ($invocant, $product) = @_;
+  $product
+    || ThrowCodeError('param_required',
+    {function => "$invocant->create", param => "product"});
+  return Bugzilla->user->check_can_admin_product($product->name);
 }
 
 ################################
 # Methods
 ################################
 
-sub set_name      { $_[0]->set('value', $_[1]);    }
-sub set_sortkey   { $_[0]->set('sortkey', $_[1]);  }
+sub set_name      { $_[0]->set('value',    $_[1]); }
+sub set_sortkey   { $_[0]->set('sortkey',  $_[1]); }
 sub set_is_active { $_[0]->set('isactive', $_[1]); }
 
 sub bug_count {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{'bug_count'}) {
-        $self->{'bug_count'} = $dbh->selectrow_array(q{
+  if (!defined $self->{'bug_count'}) {
+    $self->{'bug_count'} = $dbh->selectrow_array(
+      q{
             SELECT COUNT(*) FROM bugs
-            WHERE product_id = ? AND target_milestone = ?},
-            undef, $self->product_id, $self->name) || 0;
-    }
-    return $self->{'bug_count'};
+            WHERE product_id = ? AND target_milestone = ?}, undef, $self->product_id,
+      $self->name
+    ) || 0;
+  }
+  return $self->{'bug_count'};
 }
 
 ################################
 #####      Accessors      ######
 ################################
 
-sub name       { return $_[0]->{'value'};      }
+sub name       { return $_[0]->{'value'}; }
 sub product_id { return $_[0]->{'product_id'}; }
-sub sortkey    { return $_[0]->{'sortkey'};    }
-sub is_active  { return $_[0]->{'isactive'};   }
+sub sortkey    { return $_[0]->{'sortkey'}; }
+sub is_active  { return $_[0]->{'isactive'}; }
 
 sub product {
-    my $self = shift;
+  my $self = shift;
 
-    require Bugzilla::Product;
-    $self->{'product'} ||= new Bugzilla::Product($self->product_id);
-    return $self->{'product'};
+  require Bugzilla::Product;
+  $self->{'product'}
+    ||= Bugzilla::Product->new({id => $self->product_id, cache => 1});
+  return $self->{'product'};
 }
 
 1;
diff --git a/Bugzilla/Object.pm b/Bugzilla/Object.pm
index 8f25e2b20c..3f4b90eb82 100644
--- a/Bugzilla/Object.pm
+++ b/Bugzilla/Object.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Object;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -24,16 +24,17 @@ use constant NAME_FIELD => 'name';
 use constant ID_FIELD   => 'id';
 use constant LIST_ORDER => NAME_FIELD;
 
-use constant UPDATE_VALIDATORS => {};
-use constant NUMERIC_COLUMNS   => ();
-use constant DATE_COLUMNS      => ();
+use constant UPDATE_VALIDATORS      => {};
+use constant NUMERIC_COLUMNS        => ();
+use constant DATE_COLUMNS           => ();
 use constant VALIDATOR_DEPENDENCIES => {};
+
 # XXX At some point, this will be joined with FIELD_MAP.
-use constant REQUIRED_FIELD_MAP  => {};
+use constant REQUIRED_FIELD_MAP    => {};
 use constant EXTRA_REQUIRED_FIELDS => ();
-use constant AUDIT_CREATES => 1;
-use constant AUDIT_UPDATES => 1;
-use constant AUDIT_REMOVES => 1;
+use constant AUDIT_CREATES         => 1;
+use constant AUDIT_UPDATES         => 1;
+use constant AUDIT_REMOVES         => 1;
 
 # When USE_MEMCACHED is true, the class is suitable for serialisation to
 # Memcached.  See documentation in Bugzilla::Memcached for more information.
@@ -47,54 +48,52 @@ use constant IS_CONFIG => 0;
 # This allows the JSON-RPC interface to return Bugzilla::Object instances
 # as though they were hashes. In the future, this may be modified to return
 # less information.
-sub TO_JSON { return { %{ $_[0] } }; }
+sub TO_JSON { return {%{$_[0]}}; }
 
 ###############################
 ####    Initialization     ####
 ###############################
 
 sub new {
-    my $invocant = shift;
-    my $class    = ref($invocant) || $invocant;
-    my $param    = shift;
-
-    my $object = $class->_object_cache_get($param);
-    return $object if $object;
-
-    my ($data, $set_memcached);
-    if (Bugzilla->memcached->enabled
-        && $class->USE_MEMCACHED
-        && ref($param) eq 'HASH' && $param->{cache})
-    {
-        if (defined $param->{id}) {
-            $data = Bugzilla->memcached->get({
-                table => $class->DB_TABLE,
-                id    => $param->{id},
-            });
-        }
-        elsif (defined $param->{name}) {
-            $data = Bugzilla->memcached->get({
-                table => $class->DB_TABLE,
-                name  => $param->{name},
-            });
-        }
-        $set_memcached = $data ? 0 : 1;
+  my $invocant = shift;
+  my $class    = ref($invocant) || $invocant;
+  my $param    = shift;
+
+  my $object = $class->_object_cache_get($param);
+  return $object if $object;
+
+  my ($data, $set_memcached);
+  if ( Bugzilla->memcached->enabled
+    && $class->USE_MEMCACHED
+    && ref($param) eq 'HASH'
+    && $param->{cache})
+  {
+    if (defined $param->{id}) {
+      $data
+        = Bugzilla->memcached->get({table => $class->DB_TABLE, id => $param->{id},});
     }
-    $data ||= $class->_load_from_db($param);
-
-    if ($data && $set_memcached) {
-        Bugzilla->memcached->set({
-            table => $class->DB_TABLE,
-            id    => $data->{$class->ID_FIELD},
-            name  => $data->{$class->NAME_FIELD},
-            data  => $data,
+    elsif (defined $param->{name}) {
+      $data
+        = Bugzilla->memcached->get({table => $class->DB_TABLE, name => $param->{name},
         });
     }
-
-    $object = $class->new_from_hash($data);
-    $class->_object_cache_set($param, $object);
-
-    return $object;
+    $set_memcached = $data ? 0 : 1;
+  }
+  $data ||= $class->_load_from_db($param);
+
+  if ($data && $set_memcached) {
+    Bugzilla->memcached->set({
+      table => $class->DB_TABLE,
+      id    => $data->{$class->ID_FIELD},
+      name  => $data->{$class->NAME_FIELD},
+      data  => $data,
+    });
+  }
+
+  $object = $class->new_from_hash($data);
+  $class->_object_cache_set($param, $object);
+
+  return $object;
 }
 
 # Note: Because this uses sql_istrcmp, if you make a new object use
@@ -102,326 +101,324 @@ sub new {
 # in Bugzilla::DB::Pg appropriately, to add the right LOWER
 # index. You can see examples already there.
 sub _load_from_db {
-    my $class = shift;
-    my ($param) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $columns = join(',', $class->_get_db_columns);
-    my $table   = $class->DB_TABLE;
-    my $name_field = $class->NAME_FIELD;
-    my $id_field   = $class->ID_FIELD;
-
-    my $id = $param;
-    if (ref $param eq 'HASH') {
-        $id = $param->{id};
+  my $class      = shift;
+  my ($param)    = @_;
+  my $dbh        = Bugzilla->dbh;
+  my $columns    = join(',', $class->_get_db_columns);
+  my $table      = $class->DB_TABLE;
+  my $name_field = $class->NAME_FIELD;
+  my $id_field   = $class->ID_FIELD;
+
+  my $id = $param;
+  if (ref $param eq 'HASH') {
+    $id = $param->{id};
+  }
+
+  my $object_data;
+  if (defined $id) {
+
+    # We special-case if somebody specifies an ID, so that we can
+    # validate it as numeric.
+    detaint_natural($id)
+      || ThrowCodeError('param_must_be_numeric',
+      {function => $class . '::_load_from_db'});
+
+    # Too large integers make PostgreSQL crash.
+    return if $id > MAX_INT_32;
+
+    $object_data = $dbh->selectrow_hashref(
+      qq{
+            SELECT $columns FROM $table
+             WHERE $id_field = ?}, undef, $id
+    );
+  }
+  else {
+    unless (defined $param->{name}
+      || (defined $param->{'condition'} && defined $param->{'values'}))
+    {
+      ThrowCodeError('bad_arg', {argument => 'param', function => $class . '::new'});
     }
 
-    my $object_data;
-    if (defined $id) {
-        # We special-case if somebody specifies an ID, so that we can
-        # validate it as numeric.
-        detaint_natural($id)
-          || ThrowCodeError('param_must_be_numeric',
-                            {function => $class . '::_load_from_db'});
-
-        # Too large integers make PostgreSQL crash.
-        return if $id > MAX_INT_32;
-
-        $object_data = $dbh->selectrow_hashref(qq{
-            SELECT $columns FROM $table
-             WHERE $id_field = ?}, undef, $id);
-    } else {
-        unless (defined $param->{name} || (defined $param->{'condition'} 
-                                           && defined $param->{'values'}))
+    my ($condition, @values);
+    if (defined $param->{name}) {
+      $condition = $dbh->sql_istrcmp($name_field, '?');
+      push(@values, $param->{name});
+    }
+    elsif (defined $param->{'condition'} && defined $param->{'values'}) {
+      caller->isa('Bugzilla::Object') || ThrowCodeError(
+        'protection_violation',
         {
-            ThrowCodeError('bad_arg', { argument => 'param',
-                                        function => $class . '::new' });
-        }
-
-        my ($condition, @values);
-        if (defined $param->{name}) {
-            $condition = $dbh->sql_istrcmp($name_field, '?');
-            push(@values, $param->{name});
-        }
-        elsif (defined $param->{'condition'} && defined $param->{'values'}) {
-            caller->isa('Bugzilla::Object')
-                || ThrowCodeError('protection_violation',
-                       { caller    => caller, 
-                         function  => $class . '::new',
-                         argument  => 'condition/values' });
-            $condition = $param->{'condition'};
-            push(@values, @{$param->{'values'}});
+          caller   => caller,
+          function => $class . '::new',
+          argument => 'condition/values'
         }
-
-        map { trick_taint($_) } @values;
-        $object_data = $dbh->selectrow_hashref(
-            "SELECT $columns FROM $table WHERE $condition", undef, @values);
+      );
+      $condition = $param->{'condition'};
+      push(@values, @{$param->{'values'}});
     }
-    return $object_data;
+
+    map { trick_taint($_) } @values;
+    $object_data
+      = $dbh->selectrow_hashref("SELECT $columns FROM $table WHERE $condition",
+      undef, @values);
+  }
+  return $object_data;
 }
 
 sub new_from_list {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my ($id_list) = @_;
-    my $id_field = $class->ID_FIELD;
-
-    my @detainted_ids;
-    foreach my $id (@$id_list) {
-        detaint_natural($id) ||
-            ThrowCodeError('param_must_be_numeric',
-                          {function => $class . '::new_from_list'});
-        # Too large integers make PostgreSQL crash.
-        next if $id > MAX_INT_32;
-        push(@detainted_ids, $id);
-    }
-
-    # We don't do $invocant->match because some classes have
-    # their own implementation of match which is not compatible
-    # with this one. However, match() still needs to have the right $invocant
-    # in order to do $class->DB_TABLE and so on.
-    return match($invocant, { $id_field => \@detainted_ids });
+  my $invocant  = shift;
+  my $class     = ref($invocant) || $invocant;
+  my ($id_list) = @_;
+  my $id_field  = $class->ID_FIELD;
+
+  my @detainted_ids;
+  foreach my $id (@$id_list) {
+    detaint_natural($id)
+      || ThrowCodeError('param_must_be_numeric',
+      {function => $class . '::new_from_list'});
+
+    # Too large integers make PostgreSQL crash.
+    next if $id > MAX_INT_32;
+    push(@detainted_ids, $id);
+  }
+
+  # We don't do $invocant->match because some classes have
+  # their own implementation of match which is not compatible
+  # with this one. However, match() still needs to have the right $invocant
+  # in order to do $class->DB_TABLE and so on.
+  return match($invocant, {$id_field => \@detainted_ids});
 }
 
 sub new_from_hash {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $object_data = shift || return;
-    $class->_serialisation_keys($object_data);
-    bless($object_data, $class);
-    $object_data->initialize();
-    return $object_data;
+  my $invocant    = shift;
+  my $class       = ref($invocant) || $invocant;
+  my $object_data = shift || return;
+  $class->_serialisation_keys($object_data);
+  bless($object_data, $class);
+  $object_data->initialize();
+  return $object_data;
 }
 
 sub initialize {
-    # abstract
+
+  # abstract
 }
 
 # Provides a mechanism for objects to be cached in the request_cache
 
 sub object_cache_get {
-    my ($class, $id) = @_;
-    return $class->_object_cache_get(
-        { id => $id, cache => 1},
-        $class
-    );
+  my ($class, $id) = @_;
+  return $class->_object_cache_get({id => $id, cache => 1}, $class);
 }
 
 sub object_cache_set {
-    my $self = shift;
-    return $self->_object_cache_set(
-        { id => $self->id, cache => 1 },
-        $self
-    );
+  my $self = shift;
+  return $self->_object_cache_set({id => $self->id, cache => 1}, $self);
 }
 
 sub _object_cache_get {
-    my $class = shift;
-    my ($param) = @_;
-    my $cache_key = $class->object_cache_key($param)
-      || return;
-    return Bugzilla->request_cache->{$cache_key};
+  my $class     = shift;
+  my ($param)   = @_;
+  my $cache_key = $class->object_cache_key($param) || return;
+  return Bugzilla->request_cache->{$cache_key};
 }
 
 sub _object_cache_set {
-    my $class = shift;
-    my ($param, $object) = @_;
-    my $cache_key = $class->object_cache_key($param)
-      || return;
-    Bugzilla->request_cache->{$cache_key} = $object;
+  my $class = shift;
+  my ($param, $object) = @_;
+  my $cache_key = $class->object_cache_key($param) || return;
+  Bugzilla->request_cache->{$cache_key} = $object;
 }
 
 sub _object_cache_remove {
-    my $class = shift;
-    my ($param) = @_;
-    $param->{cache} = 1;
-    my $cache_key = $class->object_cache_key($param)
-      || return;
-    delete Bugzilla->request_cache->{$cache_key};
+  my $class = shift;
+  my ($param) = @_;
+  $param->{cache} = 1;
+  my $cache_key = $class->object_cache_key($param) || return;
+  delete Bugzilla->request_cache->{$cache_key};
 }
 
 sub object_cache_key {
-    my $class = shift;
-    my ($param) = @_;
-    if (ref($param) && $param->{cache} && ($param->{id} || $param->{name})) {
-        $class = blessed($class) if blessed($class);
-        return $class  . ',' . ($param->{id} || $param->{name});
-    } else {
-        return;
-    }
+  my $class = shift;
+  my ($param) = @_;
+  if (ref($param) && $param->{cache} && ($param->{id} || $param->{name})) {
+    $class = blessed($class) if blessed($class);
+    return $class . ',' . ($param->{id} || $param->{name});
+  }
+  else {
+    return;
+  }
 }
 
 # To support serialisation, we need to capture the keys in an object's default
 # hashref.
 sub _serialisation_keys {
-    my ($class, $object) = @_;
-    my $cache = Bugzilla->request_cache->{serialisation_keys} ||= {};
-    $cache->{$class} = [ keys %$object ] if $object && !exists $cache->{$class};
-    return @{ $cache->{$class} };
+  my ($class, $object) = @_;
+  my $cache = Bugzilla->request_cache->{serialisation_keys} ||= {};
+  $cache->{$class} = [keys %$object] if $object && !exists $cache->{$class};
+  return @{$cache->{$class}};
 }
 
 sub check {
-    my ($invocant, $param) = @_;
-    my $class = ref($invocant) || $invocant;
-    # If we were just passed a name, then just use the name.
-    if (!ref $param) {
-        $param = { name => $param };
+  my ($invocant, $param) = @_;
+  my $class = ref($invocant) || $invocant;
+
+  # If we were just passed a name, then just use the name.
+  if (!ref $param) {
+    $param = {name => $param};
+  }
+
+  # Don't allow empty names or ids.
+  my $check_param = exists $param->{id} ? 'id' : 'name';
+  $param->{$check_param} = trim($param->{$check_param});
+
+  # If somebody passes us "0", we want to throw an error like
+  # "there is no X with the name 0". This is true even for ids. So here,
+  # we only check if the parameter is undefined or empty.
+  if (!defined $param->{$check_param} or $param->{$check_param} eq '') {
+    ThrowUserError('object_not_specified', {class => $class});
+  }
+
+  my $obj = $class->new($param);
+  if (!$obj) {
+
+    # We don't want to override the normal template "user" object if
+    # "user" is one of the params.
+    delete $param->{user};
+    if (my $error = delete $param->{_error}) {
+      ThrowUserError($error, {%$param, class => $class});
     }
-
-    # Don't allow empty names or ids.
-    my $check_param = exists $param->{id} ? 'id' : 'name';
-    $param->{$check_param} = trim($param->{$check_param});
-    # If somebody passes us "0", we want to throw an error like
-    # "there is no X with the name 0". This is true even for ids. So here,
-    # we only check if the parameter is undefined or empty.
-    if (!defined $param->{$check_param} or $param->{$check_param} eq '') {
-        ThrowUserError('object_not_specified', { class => $class });
+    else {
+      ThrowUserError('object_does_not_exist', {%$param, class => $class});
     }
-
-    my $obj = $class->new($param);
-    if (!$obj) {
-        # We don't want to override the normal template "user" object if
-        # "user" is one of the params.
-        delete $param->{user};
-        if (my $error = delete $param->{_error}) {
-            ThrowUserError($error, { %$param, class => $class });
-        }
-        else {
-            ThrowUserError('object_does_not_exist', { %$param, class => $class });
-        }
-    }
-    return $obj;
+  }
+  return $obj;
 }
 
 # Note: Future extensions to this could be:
 #  * Add a MATCH_JOIN constant so that we can join against
 #    certain other tables for the WHERE criteria.
 sub match {
-    my ($invocant, $criteria) = @_;
-    my $class = ref($invocant) || $invocant;
-    my $dbh   = Bugzilla->dbh;
-
-    return [$class->get_all] if !$criteria;
-
-    my (@terms, @values, $postamble);
-    foreach my $field (keys %$criteria) {
-        my $value = $criteria->{$field};
-        
-        # allow for LIMIT and OFFSET expressions via the criteria.
-        next if $field eq 'OFFSET';
-        if ( $field eq 'LIMIT' ) {
-            next unless defined $value;
-            detaint_natural($value)
-              or ThrowCodeError('param_must_be_numeric', 
-                                { param    => 'LIMIT', 
-                                  function => "${class}::match" });
-            my $offset;
-            if (defined $criteria->{OFFSET}) {
-                $offset = $criteria->{OFFSET};
-                detaint_signed($offset)
-                  or ThrowCodeError('param_must_be_numeric', 
-                                    { param    => 'OFFSET',
-                                      function => "${class}::match" });
-            }
-            $postamble = $dbh->sql_limit($value, $offset);
-            next;
-        }
-        elsif ( $field eq 'WHERE' ) {
-            # the WHERE value is a hashref where the keys are
-            # "column_name operator ?" and values are the placeholder's
-            # value (either a scalar or an array of values).
-            foreach my $k (keys %$value) {
-                push(@terms, $k);
-                my @this_value = ref($value->{$k}) ? @{ $value->{$k} } 
-                                                   : ($value->{$k});
-                push(@values, @this_value);
-            }            
-            next;
-        }
+  my ($invocant, $criteria) = @_;
+  my $class = ref($invocant) || $invocant;
+  my $dbh = Bugzilla->dbh;
+
+  return [$class->get_all] if !$criteria;
+
+  my (@terms, @values, $postamble);
+  foreach my $field (keys %$criteria) {
+    my $value = $criteria->{$field};
+
+    # allow for LIMIT and OFFSET expressions via the criteria.
+    next if $field eq 'OFFSET';
+    if ($field eq 'LIMIT') {
+      next unless defined $value;
+      detaint_natural($value)
+        or ThrowCodeError('param_must_be_numeric',
+        {param => 'LIMIT', function => "${class}::match"});
+      my $offset;
+      if (defined $criteria->{OFFSET}) {
+        $offset = $criteria->{OFFSET};
+        detaint_signed($offset)
+          or ThrowCodeError('param_must_be_numeric',
+          {param => 'OFFSET', function => "${class}::match"});
+      }
+      $postamble = $dbh->sql_limit($value, $offset);
+      next;
+    }
+    elsif ($field eq 'WHERE') {
+
+      # the WHERE value is a hashref where the keys are
+      # "column_name operator ?" and values are the placeholder's
+      # value (either a scalar or an array of values).
+      foreach my $k (keys %$value) {
+        push(@terms, $k);
+        my @this_value = ref($value->{$k}) ? @{$value->{$k}} : ($value->{$k});
+        push(@values, @this_value);
+      }
+      next;
+    }
 
-        # It's always safe to use the field defined by classes as being
-        # their ID field. In particular, this means that new_from_list()
-        # is exempted from this check.
-        $class->_check_field($field, 'match') unless $field eq $class->ID_FIELD;
+    # It's always safe to use the field defined by classes as being
+    # their ID field. In particular, this means that new_from_list()
+    # is exempted from this check.
+    $class->_check_field($field, 'match') unless $field eq $class->ID_FIELD;
 
-        if (ref $value eq 'ARRAY') {
-            # IN () is invalid SQL, and if we have an empty list
-            # to match against, we're just returning an empty
-            # array anyhow.
-            return [] if !scalar @$value;
+    if (ref $value eq 'ARRAY') {
 
-            my @qmarks = ("?") x @$value;
-            push(@terms, $dbh->sql_in($field, \@qmarks));
-            push(@values, @$value);
-        }
-        elsif ($value eq NOT_NULL) {
-            push(@terms, "$field IS NOT NULL");
-        }
-        elsif ($value eq IS_NULL) {
-            push(@terms, "$field IS NULL");
-        }
-        else {
-            push(@terms, "$field = ?");
-            push(@values, $value);
-        }
+      # IN () is invalid SQL, and if we have an empty list
+      # to match against, we're just returning an empty
+      # array anyhow.
+      return [] if !scalar @$value;
+
+      my @qmarks = ("?") x @$value;
+      push(@terms, $dbh->sql_in($field, \@qmarks));
+      push(@values, @$value);
+    }
+    elsif ($value eq NOT_NULL) {
+      push(@terms, "$field IS NOT NULL");
     }
+    elsif ($value eq IS_NULL) {
+      push(@terms, "$field IS NULL");
+    }
+    else {
+      push(@terms,  "$field = ?");
+      push(@values, $value);
+    }
+  }
 
-    my $where = join(' AND ', @terms) if scalar @terms;
-    return $class->_do_list_select($where, \@values, $postamble);
+  my $where = join(' AND ', @terms) if scalar @terms;
+  return $class->_do_list_select($where, \@values, $postamble);
 }
 
 sub _do_list_select {
-    my ($class, $where, $values, $postamble) = @_;
-    my $table = $class->DB_TABLE;
-    my $cols  = join(',', $class->_get_db_columns);
-    my $order = $class->LIST_ORDER;
-
-    # Unconditional requests for configuration data are cacheable.
-    my ($objects, $set_memcached, $memcached_key);
-    if (!defined $where
-        && Bugzilla->memcached->enabled
-        && $class->IS_CONFIG)
-    {
-        $memcached_key = "$class:get_all";
-        $objects = Bugzilla->memcached->get_config({ key => $memcached_key });
-        $set_memcached = $objects ? 0 : 1;
+  my ($class, $where, $values, $postamble) = @_;
+  my $table = $class->DB_TABLE;
+  my $cols  = join(',', $class->_get_db_columns);
+  my $order = $class->LIST_ORDER;
+
+  # Unconditional requests for configuration data are cacheable.
+  my ($objects, $set_memcached, $memcached_key);
+  if (!defined $where && Bugzilla->memcached->enabled && $class->IS_CONFIG) {
+    $memcached_key = "$class:get_all";
+    $objects       = Bugzilla->memcached->get_config({key => $memcached_key});
+    $set_memcached = $objects ? 0 : 1;
+  }
+
+  if (!$objects) {
+    my $sql = "SELECT $cols FROM $table";
+    if (defined $where) {
+      $sql .= " WHERE $where ";
     }
+    $sql .= " ORDER BY $order";
+    $sql .= " $postamble" if $postamble;
 
-    if (!$objects) {
-        my $sql = "SELECT $cols FROM $table";
-        if (defined $where) {
-            $sql .= " WHERE $where ";
-        }
-        $sql .= " ORDER BY $order";
-        $sql .= " $postamble" if $postamble;
-
-        my $dbh = Bugzilla->dbh;
-        # Sometimes the values are tainted, but we don't want to untaint them
-        # for the caller. So we copy the array. It's safe to untaint because
-        # they're only used in placeholders here.
-        my @untainted = @{ $values || [] };
-        trick_taint($_) foreach @untainted;
-        $objects = $dbh->selectall_arrayref($sql, {Slice=>{}}, @untainted);
-        $class->_serialisation_keys($objects->[0]) if @$objects;
-    }
-
-    if ($objects && $set_memcached) {
-        Bugzilla->memcached->set_config({
-            key  => $memcached_key,
-            data => $objects
-        });
-    }
+    my $dbh = Bugzilla->dbh;
 
-    foreach my $object (@$objects) {
-        $object = $class->new_from_hash($object);
-    }
-    return $objects;
+    # Sometimes the values are tainted, but we don't want to untaint them
+    # for the caller. So we copy the array. It's safe to untaint because
+    # they're only used in placeholders here.
+    my @untainted = @{$values || []};
+    trick_taint($_) foreach @untainted;
+    $objects = $dbh->selectall_arrayref($sql, {Slice => {}}, @untainted);
+    $class->_serialisation_keys($objects->[0]) if @$objects;
+  }
+
+  if ($objects && $set_memcached) {
+    Bugzilla->memcached->set_config({key => $memcached_key, data => $objects});
+  }
+
+  foreach my $object (@$objects) {
+    $object = $class->new_from_hash($object);
+  }
+  return $objects;
 }
 
 ###############################
 ####      Accessors      ######
 ###############################
 
-sub id   { return $_[0]->{$_[0]->ID_FIELD};   }
+sub id   { return $_[0]->{$_[0]->ID_FIELD}; }
 sub name { return $_[0]->{$_[0]->NAME_FIELD}; }
 
 ###############################
@@ -429,186 +426,214 @@ sub name { return $_[0]->{$_[0]->NAME_FIELD}; }
 ###############################
 
 sub set {
-    my ($self, $field, $value) = @_;
-
-    # This method is protected. It's used to help implement set_ functions.
-    my $caller = caller;
-    $caller->isa('Bugzilla::Object') || $caller->isa('Bugzilla::Extension')
-        || ThrowCodeError('protection_violation', 
-                          { caller     => caller,
-                            superclass => __PACKAGE__,
-                            function   => 'Bugzilla::Object->set' });
-
-    Bugzilla::Hook::process('object_before_set',
-                            { object => $self, field => $field,
-                              value => $value });
-
-    my %validators = (%{$self->_get_validators}, %{$self->UPDATE_VALIDATORS});
-    if (exists $validators{$field}) {
-        my $validator = $validators{$field};
-        $value = $self->$validator($value, $field);
-        trick_taint($value) if (defined $value && !ref($value));
-
-        if ($self->can('_set_global_validator')) {
-            $self->_set_global_validator($value, $field);
-        }
+  my ($self, $field, $value) = @_;
+
+  # This method is protected. It's used to help implement set_ functions.
+  my $caller = caller;
+  $caller->isa('Bugzilla::Object')
+    || $caller->isa('Bugzilla::Extension')
+    || ThrowCodeError(
+    'protection_violation',
+    {
+      caller     => caller,
+      superclass => __PACKAGE__,
+      function   => 'Bugzilla::Object->set'
+    }
+    );
+
+  Bugzilla::Hook::process('object_before_set',
+    {object => $self, field => $field, value => $value});
+
+  my %validators = (%{$self->_get_validators}, %{$self->UPDATE_VALIDATORS});
+  if (exists $validators{$field}) {
+    my $validator = $validators{$field};
+    $value = $self->$validator($value, $field);
+    trick_taint($value) if (defined $value && !ref($value));
+
+    if ($self->can('_set_global_validator')) {
+      $self->_set_global_validator($value, $field);
     }
+  }
 
-    $self->{$field} = $value;
+  $self->{$field} = $value;
 
-    Bugzilla::Hook::process('object_end_of_set',
-                            { object => $self, field => $field });
+  Bugzilla::Hook::process('object_end_of_set',
+    {object => $self, field => $field});
 }
 
 sub set_all {
-    my ($self, $params) = @_;
-
-    # Don't let setters modify the values in $params for the caller.
-    my %field_values = %$params;
-
-    my @sorted_names = $self->_sort_by_dep(keys %field_values);
-
-    foreach my $key (@sorted_names) {
-        # It's possible for one set_ method to delete a key from $params
-        # for another set method, so if that's happened, we don't call the
-        # other set method.
-        next if !exists $field_values{$key};
-        my $method = "set_$key";
-        if (!$self->can($method)) {
-            my $class = ref($self) || $self;
-            ThrowCodeError("unknown_method", { method => "${class}::${method}" });
-        }
-        $self->$method($field_values{$key}, \%field_values);
+  my ($self, $params) = @_;
+
+  # Don't let setters modify the values in $params for the caller.
+  my %field_values = %$params;
+
+  my @sorted_names = $self->_sort_by_dep(keys %field_values);
+
+  foreach my $key (@sorted_names) {
+
+    # It's possible for one set_ method to delete a key from $params
+    # for another set method, so if that's happened, we don't call the
+    # other set method.
+    next if !exists $field_values{$key};
+    my $method = "set_$key";
+    if (!$self->can($method)) {
+      my $class = ref($self) || $self;
+      ThrowCodeError("unknown_method", {method => "${class}::${method}"});
     }
-    Bugzilla::Hook::process('object_end_of_set_all', 
-                            { object => $self, params => \%field_values });
+    $self->$method($field_values{$key}, \%field_values);
+  }
+  Bugzilla::Hook::process('object_end_of_set_all',
+    {object => $self, params => \%field_values});
 }
 
 sub update {
-    my $self = shift;
-
-    my $dbh      = Bugzilla->dbh;
-    my $table    = $self->DB_TABLE;
-    my $id_field = $self->ID_FIELD;
-
-    $dbh->bz_start_transaction();
-
-    my $old_self = $self->new($self->id);
-   
-    my @all_columns = $self->UPDATE_COLUMNS;
-    my @hook_columns;
-    Bugzilla::Hook::process('object_update_columns',
-                            { object => $self, columns => \@hook_columns });
-    push(@all_columns, @hook_columns);
-
-    my %numeric = map { $_ => 1 } $self->NUMERIC_COLUMNS;
-    my %date    = map { $_ => 1 } $self->DATE_COLUMNS;
-    my (@update_columns, @values, %changes);
-    foreach my $column (@all_columns) {
-        my ($old, $new) = ($old_self->{$column}, $self->{$column});
-        # This has to be written this way in order to allow us to set a field
-        # from undef or to undef, and avoid warnings about comparing an undef
-        # with the "eq" operator.
-        if (!defined $new || !defined $old) {
-            next if !defined $new && !defined $old;
-        }
-        elsif ( ($numeric{$column} && $old == $new) 
-                || ($date{$column} && str2time($old) == str2time($new))
-                || $old eq $new ) {
-            next;
-        }
+  my $self = shift;
 
-        trick_taint($new) if defined $new;
-        push(@values, $new);
-        push(@update_columns, $column);
-        # We don't use $new because we don't want to detaint this for
-        # the caller.
-        $changes{$column} = [$old, $self->{$column}];
-    }
+  my $dbh      = Bugzilla->dbh;
+  my $table    = $self->DB_TABLE;
+  my $id_field = $self->ID_FIELD;
 
-    my $columns = join(', ', map {"$_ = ?"} @update_columns);
+  $dbh->bz_start_transaction();
 
-    $dbh->do("UPDATE $table SET $columns WHERE $id_field = ?", undef, 
-             @values, $self->id) if @values;
+  my $old_self = $self->new($self->id);
 
-    Bugzilla::Hook::process('object_end_of_update',
-                            { object => $self, old_object => $old_self,
-                              changes => \%changes });
+  my @all_columns = $self->UPDATE_COLUMNS;
+  my @hook_columns;
+  Bugzilla::Hook::process('object_update_columns',
+    {object => $self, columns => \@hook_columns});
+  push(@all_columns, @hook_columns);
 
-    $self->audit_log(\%changes) if $self->AUDIT_UPDATES;
+  my %numeric = map { $_ => 1 } $self->NUMERIC_COLUMNS;
+  my %date    = map { $_ => 1 } $self->DATE_COLUMNS;
+  my (@update_columns, @values, %changes);
+  foreach my $column (@all_columns) {
+    my ($old, $new) = ($old_self->{$column}, $self->{$column});
 
-    $dbh->bz_commit_transaction();
-    if ($self->USE_MEMCACHED && @values) {
-        Bugzilla->memcached->clear({ table => $table, id => $self->id });
-        Bugzilla->memcached->clear_config()
-            if $self->IS_CONFIG;
+    # This has to be written this way in order to allow us to set a field
+    # from undef or to undef, and avoid warnings about comparing an undef
+    # with the "eq" operator.
+    if (!defined $new || !defined $old) {
+      next if !defined $new && !defined $old;
     }
-    $self->_object_cache_remove({ id => $self->id });
-    $self->_object_cache_remove({ name => $self->name }) if $self->name;
-
-    if (wantarray) {
-        return (\%changes, $old_self);
+    elsif (($numeric{$column} && $old == $new)
+      || ($date{$column} && str2time($old) == str2time($new))
+      || $old eq $new)
+    {
+      next;
     }
 
-    return \%changes;
+    trick_taint($new) if defined $new;
+    push(@values,         $new);
+    push(@update_columns, $column);
+
+    # We don't use $new because we don't want to detaint this for
+    # the caller.
+    $changes{$column} = [$old, $self->{$column}];
+  }
+
+  my $columns = join(', ', map {"$_ = ?"} @update_columns);
+
+  $dbh->do("UPDATE $table SET $columns WHERE $id_field = ?",
+    undef, @values, $self->id)
+    if @values;
+
+  Bugzilla::Hook::process('object_end_of_update',
+    {object => $self, old_object => $old_self, changes => \%changes});
+
+  $self->audit_log(\%changes) if $self->AUDIT_UPDATES;
+
+  $dbh->bz_commit_transaction();
+  if ($self->USE_MEMCACHED && @values) {
+    Bugzilla->memcached->clear({table => $table, id => $self->id});
+    Bugzilla->memcached->clear_config() if $self->IS_CONFIG;
+  }
+  $self->_object_cache_remove({id => $self->id});
+  $self->_object_cache_remove({name => $self->name}) if $self->name;
+
+  if (wantarray) {
+    return (\%changes, $old_self);
+  }
+
+  return \%changes;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    Bugzilla::Hook::process('object_before_delete', { object => $self });
-    my $table = $self->DB_TABLE;
-    my $id_field = $self->ID_FIELD;
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    $self->audit_log(AUDIT_REMOVE) if $self->AUDIT_REMOVES;
-    $dbh->do("DELETE FROM $table WHERE $id_field = ?", undef, $self->id);
-    $dbh->bz_commit_transaction();
-    if ($self->USE_MEMCACHED) {
-        Bugzilla->memcached->clear({ table => $table, id => $self->id });
-        Bugzilla->memcached->clear_config()
-            if $self->IS_CONFIG;
-    }
-    $self->_object_cache_remove({ id => $self->id });
-    $self->_object_cache_remove({ name => $self->name }) if $self->name;
-    undef $self;
+  my $self = shift;
+  Bugzilla::Hook::process('object_before_delete', {object => $self});
+  my $table    = $self->DB_TABLE;
+  my $id_field = $self->ID_FIELD;
+  my $dbh      = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  $self->audit_log(AUDIT_REMOVE) if $self->AUDIT_REMOVES;
+  $dbh->do("DELETE FROM $table WHERE $id_field = ?", undef, $self->id);
+  $dbh->bz_commit_transaction();
+
+  if ($self->USE_MEMCACHED) {
+    Bugzilla->memcached->clear({table => $table, id => $self->id});
+    Bugzilla->memcached->clear_config() if $self->IS_CONFIG;
+  }
+  $self->_object_cache_remove({id => $self->id});
+  $self->_object_cache_remove({name => $self->name}) if $self->name;
+  undef $self;
 }
 
 sub audit_log {
-    my ($self, $changes) = @_;
-    my $class = ref $self;
-    my $dbh = Bugzilla->dbh;
-    my $user_id = Bugzilla->user->id || undef;
-    my $sth = $dbh->prepare(
-        'INSERT INTO audit_log (user_id, class, object_id, field,
+  my ($self, $changes) = @_;
+  my $class   = ref $self;
+  my $dbh     = Bugzilla->dbh;
+  my $user_id = Bugzilla->user->id || undef;
+  my $sth     = $dbh->prepare(
+    'INSERT INTO audit_log (user_id, class, object_id, field,
                                 removed, added, at_time) 
-              VALUES (?,?,?,?,?,?,LOCALTIMESTAMP(0))');
-    # During creation or removal, $changes is actually just a string
-    # indicating whether we're creating or removing the object.
-    if ($changes eq AUDIT_CREATE or $changes eq AUDIT_REMOVE) {
-        # We put the object's name in the "added" or "removed" field.
-        # We do this thing with NAME_FIELD because $self->name returns
-        # the wrong thing for Bugzilla::User.
-        my $name = $self->{$self->NAME_FIELD};
-        my @added_removed = $changes eq AUDIT_CREATE ? (undef, $name) 
-                                                     : ($name, undef);
-        $sth->execute($user_id, $class, $self->id, $changes, @added_removed);
-        return;
-    }
+              VALUES (?,?,?,?,?,?,LOCALTIMESTAMP(0))'
+  );
+
+  # During creation or removal, $changes is actually just a string
+  # indicating whether we're creating or removing the object.
+  if ($changes eq AUDIT_CREATE or $changes eq AUDIT_REMOVE) {
+
+    # We put the object's name in the "added" or "removed" field.
+    # We do this thing with NAME_FIELD because $self->name returns
+    # the wrong thing for Bugzilla::User.
+    my $name = $self->{$self->NAME_FIELD};
+    my @added_removed = $changes eq AUDIT_CREATE ? (undef, $name) : ($name, undef);
+    $sth->execute($user_id, $class, $self->id, $changes, @added_removed);
+    return;
+  }
+
+  # During update, it's the actual %changes hash produced by update().
+  foreach my $field (keys %$changes) {
+
+    # Skip private changes.
+    next if $field =~ /^_/;
+    my ($from, $to) = $self->_sanitize_audit_log($field, $changes->{$field});
+    $sth->execute($user_id, $class, $self->id, $field, $from, $to);
+  }
+}
 
-    # During update, it's the actual %changes hash produced by update().
-    foreach my $field (keys %$changes) {
-        # Skip private changes.
-        next if $field =~ /^_/;
-        my ($from, $to) = @{ $changes->{$field} };
-        $sth->execute($user_id, $class, $self->id, $field, $from, $to);
+sub _sanitize_audit_log {
+  my ($self, $field, $changes) = @_;
+  my $class = ref($self) || $self;
+
+  # Do not store hashed passwords. Only record the algorithm used to encode them.
+  if ($class eq 'Bugzilla::User' && $field eq 'cryptpassword') {
+    foreach my $passwd (@$changes) {
+      next unless $passwd;
+      my $algorithm = 'unknown_algorithm';
+      if ($passwd =~ /{([^}]+)}$/) {
+        $algorithm = $1;
+      }
+      $passwd = "hashed_with_$algorithm";
     }
+  }
+  return @$changes;
 }
 
 sub flatten_to_hash {
-    my $self = shift;
-    my $class = blessed($self);
-    my %hash = map { $_ => $self->{$_} } $class->_serialisation_keys;
-    return \%hash;
+  my $self  = shift;
+  my $class = blessed($self);
+  my %hash  = map { $_ => $self->{$_} } $class->_serialisation_keys;
+  return \%hash;
 }
 
 ###############################
@@ -616,127 +641,125 @@ sub flatten_to_hash {
 ###############################
 
 sub any_exist {
-    my $class = shift;
-    my $table = $class->DB_TABLE;
-    my $dbh = Bugzilla->dbh;
-    my $any_exist = $dbh->selectrow_array(
-        "SELECT 1 FROM $table " . $dbh->sql_limit(1));
-    return $any_exist ? 1 : 0;
+  my $class = shift;
+  my $table = $class->DB_TABLE;
+  my $dbh   = Bugzilla->dbh;
+  my $any_exist
+    = $dbh->selectrow_array("SELECT 1 FROM $table " . $dbh->sql_limit(1));
+  return $any_exist ? 1 : 0;
 }
 
 sub create {
-    my ($class, $params) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($class, $params) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
-    $class->check_required_create_fields($params);
-    my $field_values = $class->run_create_validators($params);
-    my $object = $class->insert_create_data($field_values);
-    $dbh->bz_commit_transaction();
+  $dbh->bz_start_transaction();
+  $class->check_required_create_fields($params);
+  my $field_values = $class->run_create_validators($params);
+  my $object       = $class->insert_create_data($field_values);
+  $dbh->bz_commit_transaction();
 
-    if (Bugzilla->memcached->enabled
-        && $class->USE_MEMCACHED
-        && $class->IS_CONFIG)
-    {
-        Bugzilla->memcached->clear_config();
-    }
+  if (Bugzilla->memcached->enabled && $class->USE_MEMCACHED && $class->IS_CONFIG)
+  {
+    Bugzilla->memcached->clear_config();
+  }
 
-    return $object;
+  return $object;
 }
 
 # Used to validate that a field name is in fact a valid column in the
 # current table before inserting it into SQL.
 sub _check_field {
-    my ($invocant, $field, $function) = @_;
-    my $class = ref($invocant) || $invocant;
-    if (!Bugzilla->dbh->bz_column_info($class->DB_TABLE, $field)) {
-        ThrowCodeError('param_invalid', { param    => $field,
-                                          function => "${class}::$function" });
-    }
+  my ($invocant, $field, $function) = @_;
+  my $class = ref($invocant) || $invocant;
+  if (!Bugzilla->dbh->bz_column_info($class->DB_TABLE, $field)) {
+    ThrowCodeError('param_invalid',
+      {param => $field, function => "${class}::$function"});
+  }
 }
 
 sub check_required_create_fields {
-    my ($class, $params) = @_;
+  my ($class, $params) = @_;
 
-    # This hook happens here so that even subclasses that don't call
-    # SUPER::create are still affected by the hook.
-    Bugzilla::Hook::process('object_before_create', { class => $class,
-                                                      params => $params });
+  # This hook happens here so that even subclasses that don't call
+  # SUPER::create are still affected by the hook.
+  Bugzilla::Hook::process('object_before_create',
+    {class => $class, params => $params});
 
-    my @check_fields = $class->_required_create_fields();
-    foreach my $field (@check_fields) {
-        $params->{$field} = undef if !exists $params->{$field};
-    }
+  my @check_fields = $class->_required_create_fields();
+  foreach my $field (@check_fields) {
+    $params->{$field} = undef if !exists $params->{$field};
+  }
 }
 
 sub run_create_validators {
-    my ($class, $params, $options) = @_;
+  my ($class, $params, $options) = @_;
 
-    my $validators = $class->_get_validators;
-    my %field_values = %$params;
+  my $validators   = $class->_get_validators;
+  my %field_values = %$params;
 
-    # Make a hash skiplist for easier searching later
-    my %skip_list = map { $_ => 1 } @{ $options->{skip} || [] };
+  # Make a hash skiplist for easier searching later
+  my %skip_list = map { $_ => 1 } @{$options->{skip} || []};
 
-    # Get the sorted field names
-    my @sorted_names = $class->_sort_by_dep(keys %field_values);
+  # Get the sorted field names
+  my @sorted_names = $class->_sort_by_dep(keys %field_values);
 
-    # Remove the skipped names
-    my @unskipped = grep { !$skip_list{$_} } @sorted_names;
+  # Remove the skipped names
+  my @unskipped = grep { !$skip_list{$_} } @sorted_names;
 
-    foreach my $field (@unskipped) {
-        my $value;
-        if (exists $validators->{$field}) {
-            my $validator = $validators->{$field};
-            $value = $class->$validator($field_values{$field}, $field,
-                                        \%field_values);
-        }
-        else {
-            $value = $field_values{$field};
-        }
-
-        # We want people to be able to explicitly set fields to NULL,
-        # and that means they can be set to undef.
-        trick_taint($value) if defined $value && !ref($value);
-        $field_values{$field} = $value;
+  foreach my $field (@unskipped) {
+    my $value;
+    if (exists $validators->{$field}) {
+      my $validator = $validators->{$field};
+      $value = $class->$validator($field_values{$field}, $field, \%field_values);
     }
-
-    Bugzilla::Hook::process('object_end_of_create_validators',
-                            { class => $class, params => \%field_values });
-
-    return \%field_values;
-}
-
-sub insert_create_data {
-    my ($class, $field_values) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my (@field_names, @values);
-    while (my ($field, $value) = each %$field_values) {
-        $class->_check_field($field, 'create');
-        push(@field_names, $field);
-        push(@values, $value);
+    else {
+      $value = $field_values{$field};
     }
 
-    my $qmarks = '?,' x @field_names;
-    chop($qmarks);
-    my $table = $class->DB_TABLE;
-    $dbh->do("INSERT INTO $table (" . join(', ', @field_names)
-             . ") VALUES ($qmarks)", undef, @values);
-    my $id = $dbh->bz_last_key($table, $class->ID_FIELD);
+    # We want people to be able to explicitly set fields to NULL,
+    # and that means they can be set to undef.
+    trick_taint($value) if defined $value && !ref($value);
+    $field_values{$field} = $value;
+  }
 
-    my $object = $class->new($id);
+  Bugzilla::Hook::process('object_end_of_create_validators',
+    {class => $class, params => \%field_values});
 
-    Bugzilla::Hook::process('object_end_of_create', { class => $class,
-                                                      object => $object });
-    $object->audit_log(AUDIT_CREATE) if $object->AUDIT_CREATES;
+  return \%field_values;
+}
 
-    return $object;
+sub insert_create_data {
+  my ($class, $field_values) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my (@field_names, @values);
+  while (my ($field, $value) = each %$field_values) {
+    $class->_check_field($field, 'create');
+    push(@field_names, $field);
+    push(@values,      $value);
+  }
+
+  my $qmarks = '?,' x @field_names;
+  chop($qmarks);
+  my $table = $class->DB_TABLE;
+  $dbh->do(
+    "INSERT INTO $table (" . join(', ', @field_names) . ") VALUES ($qmarks)",
+    undef, @values);
+  my $id = $dbh->bz_last_key($table, $class->ID_FIELD);
+
+  my $object = $class->new($id);
+
+  Bugzilla::Hook::process('object_end_of_create',
+    {class => $class, object => $object});
+  $object->audit_log(AUDIT_CREATE) if $object->AUDIT_CREATES;
+
+  return $object;
 }
 
 sub get_all {
-    my $class = shift;
-    return @{ $class->_do_list_select() };
+  my $class = shift;
+  return @{$class->_do_list_select()};
 }
 
 ###############################
@@ -746,20 +769,19 @@ sub get_all {
 sub check_boolean { return $_[1] ? 1 : 0 }
 
 sub check_time {
-    my ($invocant, $value, $field, $params, $allow_negative) = @_;
+  my ($invocant, $value, $field, $params, $allow_negative) = @_;
 
-    # If we don't have a current value default to zero
-    my $current = blessed($invocant) ? $invocant->{$field}
-                                     : 0;
-    $current ||= 0;
+  # If we don't have a current value default to zero
+  my $current = blessed($invocant) ? $invocant->{$field} : 0;
+  $current ||= 0;
 
-    # Get the new value or zero if it isn't defined
-    $value = trim($value) || 0;
+  # Get the new value or zero if it isn't defined
+  $value = trim($value) || 0;
 
-    # Make sure the new value is well formed
-    _validate_time($value, $field, $allow_negative);
+  # Make sure the new value is well formed
+  _validate_time($value, $field, $allow_negative);
 
-    return $value;
+  return $value;
 }
 
 
@@ -768,26 +790,25 @@ sub check_time {
 ###################
 
 sub _validate_time {
-    my ($time, $field, $allow_negative) = @_;
-
-    # regexp verifies one or more digits, optionally followed by a period and
-    # zero or more digits, OR we have a period followed by one or more digits
-    # (allow negatives, though, so people can back out errors in time reporting)
-    if ($time !~ /^-?(?:\d+(?:\.\d*)?|\.\d+)$/) {
-        ThrowUserError("number_not_numeric",
-                       {field => $field, num => "$time"});
-    }
-
-    # Callers can optionally allow negative times
-    if ( ($time < 0) && !$allow_negative ) {
-        ThrowUserError("number_too_small",
-                       {field => $field, num => "$time", min_num => "0"});
-    }
-
-    if ($time > 99999.99) {
-        ThrowUserError("number_too_large",
-                       {field => $field, num => "$time", max_num => "99999.99"});
-    }
+  my ($time, $field, $allow_negative) = @_;
+
+  # regexp verifies one or more digits, optionally followed by a period and
+  # zero or more digits, OR we have a period followed by one or more digits
+  # (allow negatives, though, so people can back out errors in time reporting)
+  if ($time !~ /^-?(?:\d+(?:\.\d*)?|\.\d+)$/) {
+    ThrowUserError("number_not_numeric", {field => $field, num => "$time"});
+  }
+
+  # Callers can optionally allow negative times
+  if (($time < 0) && !$allow_negative) {
+    ThrowUserError("number_too_small",
+      {field => $field, num => "$time", min_num => "0"});
+  }
+
+  if ($time > 99999.99) {
+    ThrowUserError("number_too_large",
+      {field => $field, num => "$time", max_num => "99999.99"});
+  }
 }
 
 # Sorts fields according to VALIDATOR_DEPENDENCIES. This is not a
@@ -795,54 +816,55 @@ sub _validate_time {
 # *have* to be in the list--it just has to be earlier than its dependent
 # if it *is* in the list.
 sub _sort_by_dep {
-    my ($invocant, @fields) = @_;
-
-    my $dependencies = $invocant->VALIDATOR_DEPENDENCIES;
-    my ($has_deps, $no_deps) = part { $dependencies->{$_} ? 0 : 1 } @fields;
-
-    # For fields with no dependencies, we sort them alphabetically,
-    # so that validation always happens in a consistent order.
-    # Fields with no dependencies come at the start of the list.
-    my @result = sort @{ $no_deps || [] };
-
-    # Fields with dependencies all go at the end of the list, and if
-    # they have dependencies on *each other*, then they have to be
-    # sorted properly. We go through $has_deps in sorted order to be
-    # sure that fields always validate in a consistent order.
-    foreach my $field (sort @{ $has_deps || [] }) {
-        if (!grep { $_ eq $field } @result) {
-            _insert_dep_field($field, $has_deps, $dependencies, \@result);
-        }
+  my ($invocant, @fields) = @_;
+
+  my $dependencies = $invocant->VALIDATOR_DEPENDENCIES;
+  my ($has_deps, $no_deps) = part { $dependencies->{$_} ? 0 : 1 } @fields;
+
+  # For fields with no dependencies, we sort them alphabetically,
+  # so that validation always happens in a consistent order.
+  # Fields with no dependencies come at the start of the list.
+  my @result = sort @{$no_deps || []};
+
+  # Fields with dependencies all go at the end of the list, and if
+  # they have dependencies on *each other*, then they have to be
+  # sorted properly. We go through $has_deps in sorted order to be
+  # sure that fields always validate in a consistent order.
+  foreach my $field (sort @{$has_deps || []}) {
+    if (!grep { $_ eq $field } @result) {
+      _insert_dep_field($field, $has_deps, $dependencies, \@result);
     }
-    return @result;
+  }
+  return @result;
 }
 
 sub _insert_dep_field {
-    my ($field, $insert_me, $dependencies, $result, $loop_tracking) = @_;
+  my ($field, $insert_me, $dependencies, $result, $loop_tracking) = @_;
 
-    if ($loop_tracking->{$field}) {
-        ThrowCodeError('object_dep_sort_loop', 
-                       { field => $field, 
-                         considered => [keys %$loop_tracking] });
-    }
-    $loop_tracking->{$field} = 1;
-
-    my $required_fields = $dependencies->{$field};
-    # Imagine Field A requires field B...
-    foreach my $required_field (@$required_fields) {
-        # If our dependency is already satisfied, we're good.
-        next if grep { $_ eq $required_field } @$result;
-
-        # If our dependency is not in the remaining fields to insert,
-        # then we're also OK.
-        next if !grep { $_ eq $required_field } @$insert_me;
-
-        # So, at this point, we know that Field B is in $insert_me.
-        # So let's put the required field into the result.
-        _insert_dep_field($required_field, $insert_me, $dependencies,
-                          $result, $loop_tracking);
-    }
-    push(@$result, $field);
+  if ($loop_tracking->{$field}) {
+    ThrowCodeError('object_dep_sort_loop',
+      {field => $field, considered => [keys %$loop_tracking]});
+  }
+  $loop_tracking->{$field} = 1;
+
+  my $required_fields = $dependencies->{$field};
+
+  # Imagine Field A requires field B...
+  foreach my $required_field (@$required_fields) {
+
+    # If our dependency is already satisfied, we're good.
+    next if grep { $_ eq $required_field } @$result;
+
+    # If our dependency is not in the remaining fields to insert,
+    # then we're also OK.
+    next if !grep { $_ eq $required_field } @$insert_me;
+
+    # So, at this point, we know that Field B is in $insert_me.
+    # So let's put the required field into the result.
+    _insert_dep_field($required_field, $insert_me, $dependencies, $result,
+      $loop_tracking);
+  }
+  push(@$result, $field);
 }
 
 ####################
@@ -855,61 +877,67 @@ sub _insert_dep_field {
 # page.
 
 sub _get_db_columns {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $cache = Bugzilla->request_cache;
-    my $cache_key = "object_${class}_db_columns";
-    return @{ $cache->{$cache_key} } if $cache->{$cache_key};
-    # Currently you can only add new columns using object_columns, not
-    # remove or modify existing columns, because removing columns would
-    # almost certainly cause Bugzilla to function improperly.
-    my @add_columns;
-    Bugzilla::Hook::process('object_columns',
-                            { class => $class, columns => \@add_columns });
-    my @columns = ($invocant->DB_COLUMNS, @add_columns);
-    $cache->{$cache_key} = \@columns;
-    return @{ $cache->{$cache_key} };
+  my $invocant  = shift;
+  my $class     = ref($invocant) || $invocant;
+  my $cache     = Bugzilla->request_cache;
+  my $cache_key = "object_${class}_db_columns";
+  return @{$cache->{$cache_key}} if $cache->{$cache_key};
+
+  # Currently you can only add new columns using object_columns, not
+  # remove or modify existing columns, because removing columns would
+  # almost certainly cause Bugzilla to function improperly.
+  my @add_columns;
+  Bugzilla::Hook::process('object_columns',
+    {class => $class, columns => \@add_columns});
+  my @columns = ($invocant->DB_COLUMNS, @add_columns);
+  $cache->{$cache_key} = \@columns;
+  return @{$cache->{$cache_key}};
 }
 
 # This method is private and should only be called by Bugzilla::Object.
 sub _get_validators {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $cache = Bugzilla->request_cache;
-    my $cache_key = "object_${class}_validators";
-    return $cache->{$cache_key} if $cache->{$cache_key};
-    # We copy this into a hash so that the hook doesn't modify the constant.
-    # (That could be bad in mod_perl.)
-    my %validators = %{ $invocant->VALIDATORS };
-    Bugzilla::Hook::process('object_validators', 
-                            { class => $class, validators => \%validators });
-    $cache->{$cache_key} = \%validators;
-    return $cache->{$cache_key};
+  my $invocant  = shift;
+  my $class     = ref($invocant) || $invocant;
+  my $cache     = Bugzilla->request_cache;
+  my $cache_key = "object_${class}_validators";
+  return $cache->{$cache_key} if $cache->{$cache_key};
+
+  # We copy this into a hash so that the hook doesn't modify the constant.
+  # (That could be bad in mod_perl.)
+  my %validators = %{$invocant->VALIDATORS};
+  Bugzilla::Hook::process('object_validators',
+    {class => $class, validators => \%validators});
+  $cache->{$cache_key} = \%validators;
+  return $cache->{$cache_key};
 }
 
 # These are all the fields that need to be checked, always, when
 # calling create(), because they have no DEFAULT and they are marked
 # NOT NULL.
 sub _required_create_fields {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
-    my $table = $class->DB_TABLE;
-
-    my @columns = $dbh->bz_table_columns($table);
-    my @required;
-    foreach my $column (@columns) {
-        my $def = $dbh->bz_column_info($table, $column);
-        if ($def->{NOTNULL} and !defined $def->{DEFAULT}
-            # SERIAL fields effectively have a DEFAULT, but they're not
-            # listed as having a DEFAULT in DB::Schema.
-            and $def->{TYPE} !~ /serial/i) 
-        {
-            my $field = $class->REQUIRED_FIELD_MAP->{$column} || $column;
-            push(@required, $field);
-        }
+  my $class = shift;
+  my $dbh   = Bugzilla->dbh;
+  my $table = $class->DB_TABLE;
+
+  my @columns = $dbh->bz_table_columns($table);
+  my @required;
+  foreach my $column (@columns) {
+    my $def = $dbh->bz_column_info($table, $column);
+    if (
+      $def->{NOTNULL}
+      and !defined $def->{DEFAULT}
+
+      # SERIAL fields effectively have a DEFAULT, but they're not
+      # listed as having a DEFAULT in DB::Schema.
+      and $def->{TYPE} !~ /serial/i
+      )
+    {
+      my $field = $class->REQUIRED_FIELD_MAP->{$column} || $column;
+      push(@required, $field);
     }
-    push(@required, $class->EXTRA_REQUIRED_FIELDS);
-    return @required;
+  }
+  push(@required, $class->EXTRA_REQUIRED_FIELDS);
+  return @required;
 }
 
 1;
diff --git a/Bugzilla/Product.pm b/Bugzilla/Product.pm
index 30ebc7c6cd..6b5a78c3a2 100644
--- a/Bugzilla/Product.pm
+++ b/Bugzilla/Product.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Product;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -22,7 +22,6 @@ use Bugzilla::Milestone;
 use Bugzilla::Field;
 use Bugzilla::Status;
 use Bugzilla::Install::Requirements;
-use Bugzilla::Mailer;
 use Bugzilla::Series;
 use Bugzilla::Hook;
 use Bugzilla::FlagType;
@@ -40,32 +39,32 @@ use constant IS_CONFIG => 1;
 use constant DB_TABLE => 'products';
 
 use constant DB_COLUMNS => qw(
-   id
-   name
-   classification_id
-   description
-   isactive
-   defaultmilestone
-   allows_unconfirmed
+  id
+  name
+  classification_id
+  description
+  isactive
+  defaultmilestone
+  allows_unconfirmed
 );
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    description
-    defaultmilestone
-    isactive
-    allows_unconfirmed
+  name
+  description
+  defaultmilestone
+  isactive
+  allows_unconfirmed
 );
 
 use constant VALIDATORS => {
-    allows_unconfirmed => \&Bugzilla::Object::check_boolean,
-    classification   => \&_check_classification,
-    name             => \&_check_name,
-    description      => \&_check_description,
-    version          => \&_check_version,
-    defaultmilestone => \&_check_default_milestone,
-    isactive         => \&Bugzilla::Object::check_boolean,
-    create_series    => \&Bugzilla::Object::check_boolean
+  allows_unconfirmed => \&Bugzilla::Object::check_boolean,
+  classification     => \&_check_classification,
+  name               => \&_check_name,
+  description        => \&_check_description,
+  version            => \&_check_version,
+  defaultmilestone   => \&_check_default_milestone,
+  isactive           => \&Bugzilla::Object::check_boolean,
+  create_series      => \&Bugzilla::Object::check_boolean
 };
 
 ###############################
@@ -73,258 +72,282 @@ use constant VALIDATORS => {
 ###############################
 
 sub create {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
+  my $class = shift;
+  my $dbh   = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    $class->check_required_create_fields(@_);
+  $class->check_required_create_fields(@_);
 
-    my $params = $class->run_create_validators(@_);
-    # Some fields do not exist in the DB as is.
-    if (defined $params->{classification}) {
-        $params->{classification_id} = delete $params->{classification}; 
-    }
-    my $version = delete $params->{version};
-    my $create_series = delete $params->{create_series};
+  my $params = $class->run_create_validators(@_);
+
+  # Some fields do not exist in the DB as is.
+  if (defined $params->{classification}) {
+    $params->{classification_id} = delete $params->{classification};
+  }
+  my $version       = delete $params->{version};
+  my $create_series = delete $params->{create_series};
 
-    my $product = $class->insert_create_data($params);
-    Bugzilla->user->clear_product_cache();
+  my $product = $class->insert_create_data($params);
+  Bugzilla->user->clear_product_cache();
 
-    # Add the new version and milestone into the DB as valid values.
-    Bugzilla::Version->create({ value => $version, product => $product });
-    Bugzilla::Milestone->create({ value => $product->default_milestone, 
-                                  product => $product });
+  # Add the new version and milestone into the DB as valid values.
+  Bugzilla::Version->create({value => $version, product => $product});
+  Bugzilla::Milestone->create(
+    {value => $product->default_milestone, product => $product});
 
-    # Create groups and series for the new product, if requested.
-    $product->_create_bug_group() if Bugzilla->params->{'makeproductgroups'};
-    $product->_create_series() if $create_series;
+  # Create groups and series for the new product, if requested.
+  $product->_create_series() if $create_series;
 
-    Bugzilla::Hook::process('product_end_of_create', { product => $product });
+  Bugzilla::Hook::process('product_end_of_create', {product => $product});
 
-    $dbh->bz_commit_transaction();
-    Bugzilla->memcached->clear_config();
-    return $product;
+  $dbh->bz_commit_transaction();
+  Bugzilla->memcached->clear_config();
+  return $product;
 }
 
 # This is considerably faster than calling new_from_list three times
 # for each product in the list, particularly with hundreds or thousands
 # of products.
 sub preload {
-    my ($products, $preload_flagtypes) = @_;
-    my %prods = map { $_->id => $_ } @$products;
-    my @prod_ids = keys %prods;
-    return unless @prod_ids;
-
-    # We cannot |use| it due to a dependency loop with Bugzilla::User.
-    require Bugzilla::Component;
-    foreach my $field (qw(component version milestone)) {
-        my $classname = "Bugzilla::" . ucfirst($field);
-        my $objects = $classname->match({ product_id => \@prod_ids });
-
-        # Now populate the products with this set of objects.
-        foreach my $obj (@$objects) {
-            my $product_id = $obj->product_id;
-            $prods{$product_id}->{"${field}s"} ||= [];
-            push(@{$prods{$product_id}->{"${field}s"}}, $obj);
-        }
-    }
-    if ($preload_flagtypes) {
-        $_->flag_types foreach @$products;
+  my ($products, $preload_flagtypes) = @_;
+  my %prods = map { $_->id => $_ } @$products;
+  my @prod_ids = keys %prods;
+  return unless @prod_ids;
+
+  # We cannot |use| it due to a dependency loop with Bugzilla::User.
+  require Bugzilla::Component;
+  foreach my $field (qw(component version milestone)) {
+    my $classname = "Bugzilla::" . ucfirst($field);
+    my $objects = $classname->match({product_id => \@prod_ids});
+
+    # Now populate the products with this set of objects.
+    foreach my $obj (@$objects) {
+      my $product_id = $obj->product_id;
+      $prods{$product_id}->{"${field}s"} ||= [];
+      push(@{$prods{$product_id}->{"${field}s"}}, $obj);
     }
+  }
+  if ($preload_flagtypes) {
+    $_->flag_types foreach @$products;
+  }
 }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    # Don't update the DB if something goes wrong below -> transaction.
-    $dbh->bz_start_transaction();
-    my ($changes, $old_self) = $self->SUPER::update(@_);
-
-    # Also update group settings.
-    if ($self->{check_group_controls}) {
-        require Bugzilla::Bug;
-        import Bugzilla::Bug qw(LogActivityEntry);
-
-        my $old_settings = $old_self->group_controls;
-        my $new_settings = $self->group_controls;
-        my $timestamp = $dbh->selectrow_array('SELECT NOW()');
-
-        foreach my $gid (keys %$new_settings) {
-            my $old_setting = $old_settings->{$gid} || {};
-            my $new_setting = $new_settings->{$gid};
-            # If all new settings are 0 for a given group, we delete the entry
-            # from group_control_map, so we have to track it here.
-            my $all_zero = 1;
-            my @fields;
-            my @values;
-
-            foreach my $field ('entry', 'membercontrol', 'othercontrol', 'canedit',
-                               'editcomponents', 'editbugs', 'canconfirm')
-            {
-                my $old_value = $old_setting->{$field};
-                my $new_value = $new_setting->{$field};
-                $all_zero = 0 if $new_value;
-                next if (defined $old_value && $old_value == $new_value);
-                push(@fields, $field);
-                # The value has already been validated.
-                detaint_natural($new_value);
-                push(@values, $new_value);
-            }
-            # Is there anything to update?
-            next unless scalar @fields;
-
-            if ($all_zero) {
-                $dbh->do('DELETE FROM group_control_map
-                          WHERE product_id = ? AND group_id = ?',
-                          undef, $self->id, $gid);
-            }
-            else {
-                if (exists $old_setting->{group}) {
-                    # There is already an entry in the DB.
-                    my $set_fields = join(', ', map {"$_ = ?"} @fields);
-                    $dbh->do("UPDATE group_control_map SET $set_fields
-                              WHERE product_id = ? AND group_id = ?",
-                              undef, (@values, $self->id, $gid));
-                }
-                else {
-                    # No entry yet.
-                    my $fields = join(', ', @fields);
-                    # +2 because of the product and group IDs.
-                    my $qmarks = join(',', ('?') x (scalar @fields + 2));
-                    $dbh->do("INSERT INTO group_control_map (product_id, group_id, $fields)
-                              VALUES ($qmarks)", undef, ($self->id, $gid, @values));
-                }
-            }
-
-            # If the group is mandatory, restrict all bugs to it.
-            if ($new_setting->{membercontrol} == CONTROLMAPMANDATORY) {
-                my $bug_ids =
-                  $dbh->selectcol_arrayref('SELECT bugs.bug_id
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  # Don't update the DB if something goes wrong below -> transaction.
+  $dbh->bz_start_transaction();
+  my ($changes, $old_self) = $self->SUPER::update(@_);
+
+  # Also update group settings.
+  if ($self->{check_group_controls}) {
+    require Bugzilla::Bug;
+    import Bugzilla::Bug qw(LogActivityEntry);
+
+    my $old_settings = $old_self->group_controls;
+    my $new_settings = $self->group_controls;
+    my $timestamp    = $dbh->selectrow_array('SELECT NOW()');
+
+    foreach my $gid (keys %$new_settings) {
+      my $old_setting = $old_settings->{$gid} || {};
+      my $new_setting = $new_settings->{$gid};
+
+      # If all new settings are 0 for a given group, we delete the entry
+      # from group_control_map, so we have to track it here.
+      my $all_zero = 1;
+      my @fields;
+      my @values;
+
+      foreach my $field (
+        'entry',          'membercontrol', 'othercontrol', 'canedit',
+        'editcomponents', 'editbugs',      'canconfirm'
+        )
+      {
+        my $old_value = $old_setting->{$field};
+        my $new_value = $new_setting->{$field};
+        $all_zero = 0 if $new_value;
+        next if (defined $old_value && $old_value == $new_value);
+        push(@fields, $field);
+
+        # The value has already been validated.
+        detaint_natural($new_value);
+        push(@values, $new_value);
+      }
+
+      # Is there anything to update?
+      next unless scalar @fields;
+
+      if ($all_zero) {
+        $dbh->do(
+          'DELETE FROM group_control_map
+                          WHERE product_id = ? AND group_id = ?', undef, $self->id, $gid
+        );
+      }
+      else {
+        if (exists $old_setting->{group}) {
+
+          # There is already an entry in the DB.
+          my $set_fields = join(', ', map {"$_ = ?"} @fields);
+          $dbh->do(
+            "UPDATE group_control_map SET $set_fields
+                              WHERE product_id = ? AND group_id = ?", undef,
+            (@values, $self->id, $gid)
+          );
+        }
+        else {
+          # No entry yet.
+          my $fields = join(', ', @fields);
+
+          # +2 because of the product and group IDs.
+          my $qmarks = join(',', ('?') x (scalar @fields + 2));
+          $dbh->do(
+            "INSERT INTO group_control_map (product_id, group_id, $fields)
+                              VALUES ($qmarks)", undef, ($self->id, $gid, @values)
+          );
+        }
+      }
+
+      # If the group is mandatory, restrict all bugs to it.
+      if ($new_setting->{membercontrol} == CONTROLMAPMANDATORY) {
+        my $bug_ids = $dbh->selectcol_arrayref(
+          'SELECT bugs.bug_id
                                               FROM bugs
                                                    LEFT JOIN bug_group_map
                                                    ON bug_group_map.bug_id = bugs.bug_id
                                                    AND group_id = ?
                                              WHERE product_id = ?
                                                    AND bug_group_map.bug_id IS NULL',
-                                             undef, $gid, $self->id);
-
-                if (scalar @$bug_ids) {
-                    my $sth = $dbh->prepare('INSERT INTO bug_group_map (bug_id, group_id)
-                                             VALUES (?, ?)');
-
-                    foreach my $bug_id (@$bug_ids) {
-                        $sth->execute($bug_id, $gid);
-                        # Add this change to the bug history.
-                        LogActivityEntry($bug_id, 'bug_group', '',
-                                         $new_setting->{group}->name,
-                                         Bugzilla->user->id, $timestamp);
-                    }
-                    push(@{$changes->{'_group_controls'}->{'now_mandatory'}},
-                         {name      => $new_setting->{group}->name,
-                          bug_count => scalar @$bug_ids});
-                }
-            }
-            # If the group can no longer be used to restrict bugs, remove them.
-            elsif ($new_setting->{membercontrol} == CONTROLMAPNA) {
-                my $bug_ids =
-                  $dbh->selectcol_arrayref('SELECT bugs.bug_id
+          undef, $gid, $self->id
+        );
+
+        if (scalar @$bug_ids) {
+          my $sth = $dbh->prepare(
+            'INSERT INTO bug_group_map (bug_id, group_id)
+                                             VALUES (?, ?)'
+          );
+
+          foreach my $bug_id (@$bug_ids) {
+            $sth->execute($bug_id, $gid);
+
+            # Add this change to the bug history.
+            LogActivityEntry($bug_id, 'bug_group', '', $new_setting->{group}->name,
+              Bugzilla->user->id, $timestamp);
+          }
+          push(
+            @{$changes->{'_group_controls'}->{'now_mandatory'}},
+            {name => $new_setting->{group}->name, bug_count => scalar @$bug_ids}
+          );
+        }
+      }
+
+      # If the group can no longer be used to restrict bugs, remove them.
+      elsif ($new_setting->{membercontrol} == CONTROLMAPNA) {
+        my $bug_ids = $dbh->selectcol_arrayref(
+          'SELECT bugs.bug_id
                                               FROM bugs
                                                    INNER JOIN bug_group_map
                                                    ON bug_group_map.bug_id = bugs.bug_id
                                              WHERE product_id = ? AND group_id = ?',
-                                             undef, $self->id, $gid);
-
-                if (scalar @$bug_ids) {
-                    $dbh->do('DELETE FROM bug_group_map WHERE group_id = ? AND ' .
-                              $dbh->sql_in('bug_id', $bug_ids), undef, $gid);
-
-                    # Add this change to the bug history.
-                    foreach my $bug_id (@$bug_ids) {
-                        LogActivityEntry($bug_id, 'bug_group',
-                                         $old_setting->{group}->name, '',
-                                         Bugzilla->user->id, $timestamp);
-                    }
-                    push(@{$changes->{'_group_controls'}->{'now_na'}},
-                         {name => $old_setting->{group}->name,
-                          bug_count => scalar @$bug_ids});
-                }
-            }
+          undef, $self->id, $gid
+        );
+
+        if (scalar @$bug_ids) {
+          $dbh->do(
+            'DELETE FROM bug_group_map WHERE group_id = ? AND '
+              . $dbh->sql_in('bug_id', $bug_ids),
+            undef, $gid
+          );
+
+          # Add this change to the bug history.
+          foreach my $bug_id (@$bug_ids) {
+            LogActivityEntry($bug_id, 'bug_group', $old_setting->{group}->name,
+              '', Bugzilla->user->id, $timestamp);
+          }
+          push(
+            @{$changes->{'_group_controls'}->{'now_na'}},
+            {name => $old_setting->{group}->name, bug_count => scalar @$bug_ids}
+          );
         }
-
-        delete $self->{groups_available};
-        delete $self->{groups_mandatory};
+      }
     }
-    $dbh->bz_commit_transaction();
-    # Changes have been committed.
-    delete $self->{check_group_controls};
-    Bugzilla->user->clear_product_cache();
-    Bugzilla->memcached->clear_config();
 
-    return $changes;
+    delete $self->{groups_available};
+    delete $self->{groups_mandatory};
+  }
+  $dbh->bz_commit_transaction();
+
+  # Changes have been committed.
+  delete $self->{check_group_controls};
+  Bugzilla->user->clear_product_cache();
+  Bugzilla->memcached->clear_config();
+
+  return $changes;
 }
 
 sub remove_from_db {
-    my ($self, $params) = @_;
-    my $user = Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-
-    $self->_check_if_controller();
-
-    if ($self->bug_count) {
-        if (Bugzilla->params->{'allowbugdeletion'}) {
-            require Bugzilla::Bug;
-            foreach my $bug_id (@{$self->bug_ids}) {
-                # Note that we allow the user to delete bugs they can't see,
-                # which is okay, because they're deleting the whole Product.
-                my $bug = new Bugzilla::Bug($bug_id);
-                $bug->remove_from_db();
-            }
-        }
-        else {
-            ThrowUserError('product_has_bugs', { nb => $self->bug_count });
-        }
+  my ($self, $params) = @_;
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+
+  $self->_check_if_controller();
+
+  if ($self->bug_count) {
+    if (Bugzilla->params->{'allowbugdeletion'}) {
+      require Bugzilla::Bug;
+      foreach my $bug_id (@{$self->bug_ids}) {
+
+        # Note that we allow the user to delete bugs they can't see,
+        # which is okay, because they're deleting the whole Product.
+        my $bug = new Bugzilla::Bug($bug_id);
+        $bug->remove_from_db();
+      }
+    }
+    else {
+      ThrowUserError('product_has_bugs', {nb => $self->bug_count});
     }
+  }
 
-    if ($params->{delete_series}) {
-        my $series_ids =
-          $dbh->selectcol_arrayref('SELECT series_id
+  if ($params->{delete_series}) {
+    my $series_ids = $dbh->selectcol_arrayref(
+      'SELECT series_id
                                       FROM series
                                 INNER JOIN series_categories
                                         ON series_categories.id = series.category
-                                     WHERE series_categories.name = ?',
-                                    undef, $self->name);
+                                     WHERE series_categories.name = ?', undef,
+      $self->name
+    );
 
-        if (scalar @$series_ids) {
-            $dbh->do('DELETE FROM series WHERE ' . $dbh->sql_in('series_id', $series_ids));
-        }
+    if (scalar @$series_ids) {
+      $dbh->do('DELETE FROM series WHERE ' . $dbh->sql_in('series_id', $series_ids));
+    }
 
-        # If no subcategory uses this product name, completely purge it.
-        my $in_use =
-          $dbh->selectrow_array('SELECT 1
+    # If no subcategory uses this product name, completely purge it.
+    my $in_use = $dbh->selectrow_array(
+      'SELECT 1
                                    FROM series
                              INNER JOIN series_categories
                                      ON series_categories.id = series.subcategory
-                                  WHERE series_categories.name = ? ' .
-                                   $dbh->sql_limit(1),
-                                  undef, $self->name);
-        if (!$in_use) {
-            $dbh->do('DELETE FROM series_categories WHERE name = ?', undef, $self->name);
-        }
+                                  WHERE series_categories.name = ? '
+        . $dbh->sql_limit(1), undef, $self->name
+    );
+    if (!$in_use) {
+      $dbh->do('DELETE FROM series_categories WHERE name = ?', undef, $self->name);
     }
+  }
 
-    $self->SUPER::remove_from_db();
+  $self->SUPER::remove_from_db();
 
-    $dbh->bz_commit_transaction();
-    Bugzilla->memcached->clear_config();
+  $dbh->bz_commit_transaction();
+  Bugzilla->memcached->clear_config();
 
-    # We have to delete these internal variables, else we get
-    # the old lists of products and classifications again.
-    delete $user->{selectable_products};
-    delete $user->{selectable_classifications};
+  # We have to delete these internal variables, else we get
+  # the old lists of products and classifications again.
+  delete $user->{selectable_products};
+  delete $user->{selectable_classifications};
 
 }
 
@@ -333,91 +356,94 @@ sub remove_from_db {
 ###############################
 
 sub _check_classification {
-    my ($invocant, $classification_name) = @_;
-
-    my $classification_id = 1;
-    if (Bugzilla->params->{'useclassification'}) {
-        my $classification = Bugzilla::Classification->check($classification_name);
-        $classification_id = $classification->id;
-    }
-    return $classification_id;
+  my ($invocant, $classification_name) = @_;
+
+  my $classification_id = 1;
+  if (Bugzilla->params->{'useclassification'}) {
+    my $classification = Bugzilla::Classification->check($classification_name);
+    $classification_id = $classification->id;
+  }
+  return $classification_id;
 }
 
 sub _check_name {
-    my ($invocant, $name) = @_;
+  my ($invocant, $name) = @_;
 
-    $name = trim($name);
-    $name || ThrowUserError('product_blank_name');
+  $name = trim($name);
+  $name || ThrowUserError('product_blank_name');
 
-    if (length($name) > MAX_PRODUCT_SIZE) {
-        ThrowUserError('product_name_too_long', {'name' => $name});
-    }
+  if (length($name) > MAX_PRODUCT_SIZE) {
+    ThrowUserError('product_name_too_long', {'name' => $name});
+  }
 
-    my $product = new Bugzilla::Product({name => $name});
-    if ($product && (!ref $invocant || $product->id != $invocant->id)) {
-        # Check for exact case sensitive match:
-        if ($product->name eq $name) {
-            ThrowUserError('product_name_already_in_use', {'product' => $product->name});
-        }
-        else {
-            ThrowUserError('product_name_diff_in_case', {'product'          => $name,
-                                                         'existing_product' => $product->name});
-        }
+  my $product = new Bugzilla::Product({name => $name});
+  if ($product && (!ref $invocant || $product->id != $invocant->id)) {
+
+    # Check for exact case sensitive match:
+    if ($product->name eq $name) {
+      ThrowUserError('product_name_already_in_use', {'product' => $product->name});
     }
-    return $name;
+    else {
+      ThrowUserError('product_name_diff_in_case',
+        {'product' => $name, 'existing_product' => $product->name});
+    }
+  }
+  return $name;
 }
 
 sub _check_description {
-    my ($invocant, $description) = @_;
+  my ($invocant, $description) = @_;
 
-    $description  = trim($description);
-    $description || ThrowUserError('product_must_have_description');
-    return $description;
+  $description = trim($description);
+  $description || ThrowUserError('product_must_have_description');
+  return $description;
 }
 
 sub _check_version {
-    my ($invocant, $version) = @_;
+  my ($invocant, $version) = @_;
+
+  $version = trim($version);
+  $version || ThrowUserError('product_must_have_version');
 
-    $version = trim($version);
-    $version || ThrowUserError('product_must_have_version');
-    # We will check the version length when Bugzilla::Version->create will do it.
-    return $version;
+  # We will check the version length when Bugzilla::Version->create will do it.
+  return $version;
 }
 
 sub _check_default_milestone {
-    my ($invocant, $milestone) = @_;
+  my ($invocant, $milestone) = @_;
 
-    # Do nothing if target milestones are not in use.
-    unless (Bugzilla->params->{'usetargetmilestone'}) {
-        return (ref $invocant) ? $invocant->default_milestone : '---';
-    }
+  # Do nothing if target milestones are not in use.
+  unless (Bugzilla->params->{'usetargetmilestone'}) {
+    return (ref $invocant) ? $invocant->default_milestone : '---';
+  }
 
-    $milestone = trim($milestone);
+  $milestone = trim($milestone);
 
-    if (ref $invocant) {
-        # The default milestone must be one of the existing milestones.
-        my $mil_obj = new Bugzilla::Milestone({name => $milestone, product => $invocant});
+  if (ref $invocant) {
 
-        $mil_obj || ThrowUserError('product_must_define_defaultmilestone',
-                                   {product   => $invocant->name,
-                                    milestone => $milestone});
-    }
-    else {
-        $milestone ||= '---';
-    }
-    return $milestone;
+    # The default milestone must be one of the existing milestones.
+    my $mil_obj
+      = new Bugzilla::Milestone({name => $milestone, product => $invocant});
+
+    $mil_obj || ThrowUserError('product_must_define_defaultmilestone',
+      {product => $invocant->name, milestone => $milestone});
+  }
+  else {
+    $milestone ||= '---';
+  }
+  return $milestone;
 }
 
 sub _check_milestone_url {
-    my ($invocant, $url) = @_;
+  my ($invocant, $url) = @_;
 
-    # Do nothing if target milestones are not in use.
-    unless (Bugzilla->params->{'usetargetmilestone'}) {
-        return (ref $invocant) ? $invocant->milestone_url : '';
-    }
+  # Do nothing if target milestones are not in use.
+  unless (Bugzilla->params->{'usetargetmilestone'}) {
+    return (ref $invocant) ? $invocant->milestone_url : '';
+  }
 
-    $url = trim($url || '');
-    return $url;
+  $url = trim($url || '');
+  return $url;
 }
 
 #####################################
@@ -431,394 +457,406 @@ use constant is_default => 0;
 ####       Methods         ####
 ###############################
 
-sub _create_bug_group {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    my $group_name = $self->name;
-    while (new Bugzilla::Group({name => $group_name})) {
-        $group_name .= '_';
-    }
-    my $group_description = get_text('bug_group_description', {product => $self});
-
-    my $group = Bugzilla::Group->create({name        => $group_name,
-                                         description => $group_description,
-                                         isbuggroup  => 1});
-
-    # Associate the new group and new product.
-    $dbh->do('INSERT INTO group_control_map
-              (group_id, product_id, membercontrol, othercontrol)
-              VALUES (?, ?, ?, ?)',
-              undef, ($group->id, $self->id, CONTROLMAPDEFAULT, CONTROLMAPNA));
-}
-
 sub _create_series {
-    my $self = shift;
-
-    my @series;
-    # We do every status, every resolution, and an "opened" one as well.
-    foreach my $bug_status (@{get_legal_field_values('bug_status')}) {
-        push(@series, [$bug_status, "bug_status=" . url_quote($bug_status)]);
-    }
-
-    foreach my $resolution (@{get_legal_field_values('resolution')}) {
-        next if !$resolution;
-        push(@series, [$resolution, "resolution=" . url_quote($resolution)]);
-    }
-
-    my @openedstatuses = BUG_STATE_OPEN;
-    my $query = join("&", map { "bug_status=" . url_quote($_) } @openedstatuses);
-    push(@series, [get_text('series_all_open'), $query]);
-
-    foreach my $sdata (@series) {
-        my $series = new Bugzilla::Series(undef, $self->name,
-                        get_text('series_subcategory'),
-                        $sdata->[0], Bugzilla->user->id, 1,
-                        $sdata->[1] . "&product=" . url_quote($self->name), 1);
-        $series->writeToDatabase();
-    }
+  my $self = shift;
+
+  my @series;
+
+  # We do every status, every resolution, and an "opened" one as well.
+  foreach my $bug_status (@{get_legal_field_values('bug_status')}) {
+    push(@series, [$bug_status, "bug_status=" . url_quote($bug_status)]);
+  }
+
+  foreach my $resolution (@{get_legal_field_values('resolution')}) {
+    next if !$resolution;
+    push(@series, [$resolution, "resolution=" . url_quote($resolution)]);
+  }
+
+  my @openedstatuses = BUG_STATE_OPEN;
+  my $query = join("&", map { "bug_status=" . url_quote($_) } @openedstatuses);
+  push(@series, [get_text('series_all_open'), $query]);
+
+  foreach my $sdata (@series) {
+    my $series
+      = new Bugzilla::Series(undef, $self->name, get_text('series_subcategory'),
+      $sdata->[0], Bugzilla->user->id, 1,
+      $sdata->[1] . "&product=" . url_quote($self->name), 1);
+    $series->writeToDatabase();
+  }
 }
 
-sub set_name { $_[0]->set('name', $_[1]); }
-sub set_description { $_[0]->set('description', $_[1]); }
-sub set_default_milestone { $_[0]->set('defaultmilestone', $_[1]); }
-sub set_is_active { $_[0]->set('isactive', $_[1]); }
+sub set_name               { $_[0]->set('name',               $_[1]); }
+sub set_description        { $_[0]->set('description',        $_[1]); }
+sub set_default_milestone  { $_[0]->set('defaultmilestone',   $_[1]); }
+sub set_is_active          { $_[0]->set('isactive',           $_[1]); }
 sub set_allows_unconfirmed { $_[0]->set('allows_unconfirmed', $_[1]); }
 
 sub set_group_controls {
-    my ($self, $group, $settings) = @_;
-
-    $group->is_active_bug_group
-      || ThrowUserError('product_illegal_group', {group => $group});
-
-    scalar(keys %$settings)
-      || ThrowCodeError('product_empty_group_controls', {group => $group});
-
-    # We store current settings for this group.
-    my $gs = $self->group_controls->{$group->id};
-    # If there is no entry for this group yet, create a default hash.
-    unless (defined $gs) {
-        $gs = { entry          => 0,
-                membercontrol  => CONTROLMAPNA,
-                othercontrol   => CONTROLMAPNA,
-                canedit        => 0,
-                editcomponents => 0,
-                editbugs       => 0,
-                canconfirm     => 0,
-                group          => $group };
-    }
-
-    # Both settings must be defined, or none of them can be updated.
-    if (defined $settings->{membercontrol} && defined $settings->{othercontrol}) {
-        #  Legality of control combination is a function of
-        #  membercontrol\othercontrol
-        #                 NA SH DE MA
-        #              NA  +  -  -  -
-        #              SH  +  +  +  +
-        #              DE  +  -  +  +
-        #              MA  -  -  -  +
-        foreach my $field ('membercontrol', 'othercontrol') {
-            my ($is_legal) = grep { $settings->{$field} == $_ }
-              (CONTROLMAPNA, CONTROLMAPSHOWN, CONTROLMAPDEFAULT, CONTROLMAPMANDATORY);
-            defined $is_legal || ThrowCodeError('product_illegal_group_control',
-                                   { field => $field, value => $settings->{$field} });
-        }
-        unless ($settings->{membercontrol} == $settings->{othercontrol}
-                || $settings->{membercontrol} == CONTROLMAPSHOWN
-                || ($settings->{membercontrol} == CONTROLMAPDEFAULT
-                    && $settings->{othercontrol} != CONTROLMAPSHOWN))
-        {
-            ThrowUserError('illegal_group_control_combination', {groupname => $group->name});
-        }
-        $gs->{membercontrol} = $settings->{membercontrol};
-        $gs->{othercontrol} = $settings->{othercontrol};
+  my ($self, $group, $settings) = @_;
+
+  $group->is_active_bug_group
+    || ThrowUserError('product_illegal_group', {group => $group});
+
+  scalar(keys %$settings)
+    || ThrowCodeError('product_empty_group_controls', {group => $group});
+
+  # We store current settings for this group.
+  my $gs = $self->group_controls->{$group->id};
+
+  # If there is no entry for this group yet, create a default hash.
+  unless (defined $gs) {
+    $gs = {
+      entry          => 0,
+      membercontrol  => CONTROLMAPNA,
+      othercontrol   => CONTROLMAPNA,
+      canedit        => 0,
+      editcomponents => 0,
+      editbugs       => 0,
+      canconfirm     => 0,
+      group          => $group
+    };
+  }
+
+  # Both settings must be defined, or none of them can be updated.
+  if (defined $settings->{membercontrol} && defined $settings->{othercontrol}) {
+
+    #  Legality of control combination is a function of
+    #  membercontrol\othercontrol
+    #                 NA SH DE MA
+    #              NA  +  -  -  -
+    #              SH  +  +  +  +
+    #              DE  +  -  +  +
+    #              MA  -  -  -  +
+    foreach my $field ('membercontrol', 'othercontrol') {
+      my ($is_legal)
+        = grep { $settings->{$field} == $_ }
+        (CONTROLMAPNA, CONTROLMAPSHOWN, CONTROLMAPDEFAULT, CONTROLMAPMANDATORY);
+      defined $is_legal || ThrowCodeError('product_illegal_group_control',
+        {field => $field, value => $settings->{$field}});
     }
-
-    foreach my $field ('entry', 'canedit', 'editcomponents', 'editbugs', 'canconfirm') {
-        next unless defined $settings->{$field};
-        $gs->{$field} = $settings->{$field} ? 1 : 0;
+    unless (
+         $settings->{membercontrol} == $settings->{othercontrol}
+      || $settings->{membercontrol} == CONTROLMAPSHOWN
+      || ( $settings->{membercontrol} == CONTROLMAPDEFAULT
+        && $settings->{othercontrol} != CONTROLMAPSHOWN)
+      )
+    {
+      ThrowUserError('illegal_group_control_combination',
+        {groupname => $group->name});
     }
-    $self->{group_controls}->{$group->id} = $gs;
-    $self->{check_group_controls} = 1;
+    $gs->{membercontrol} = $settings->{membercontrol};
+    $gs->{othercontrol}  = $settings->{othercontrol};
+  }
+
+  foreach
+    my $field ('entry', 'canedit', 'editcomponents', 'editbugs', 'canconfirm')
+  {
+    next unless defined $settings->{$field};
+    $gs->{$field} = $settings->{$field} ? 1 : 0;
+  }
+  $self->{group_controls}->{$group->id} = $gs;
+  $self->{check_group_controls} = 1;
 }
 
 sub components {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{components}) {
-        my $ids = $dbh->selectcol_arrayref(q{
+  if (!defined $self->{components}) {
+    my $ids = $dbh->selectcol_arrayref(
+      q{
             SELECT id FROM components
             WHERE product_id = ?
-            ORDER BY name}, undef, $self->id);
+            ORDER BY name}, undef, $self->id
+    );
 
-        require Bugzilla::Component;
-        $self->{components} = Bugzilla::Component->new_from_list($ids);
-    }
-    return $self->{components};
+    require Bugzilla::Component;
+    $self->{components} = Bugzilla::Component->new_from_list($ids);
+  }
+  return $self->{components};
 }
 
 sub group_controls {
-    my ($self, $full_data) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # By default, we don't return groups which are not listed in
-    # group_control_map. If $full_data is true, then we also
-    # return groups whose settings could be set for the product.
-    my $where_or_and = 'WHERE';
-    my $and_or_where = 'AND';
-    if ($full_data) {
-        $where_or_and = 'AND';
-        $and_or_where = 'WHERE';
-    }
-
-    # If $full_data is true, we collect all the data in all cases,
-    # even if the cache is already populated.
-    # $full_data is never used except in the very special case where
-    # all configurable bug groups are displayed to administrators,
-    # so we don't care about collecting all the data again in this case.
-    if (!defined $self->{group_controls} || $full_data) {
-        # Include name to the list, to allow us sorting data more easily.
-        my $query = qq{SELECT id, name, entry, membercontrol, othercontrol,
+  my ($self, $full_data) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  # By default, we don't return groups which are not listed in
+  # group_control_map. If $full_data is true, then we also
+  # return groups whose settings could be set for the product.
+  my $where_or_and = 'WHERE';
+  my $and_or_where = 'AND';
+  if ($full_data) {
+    $where_or_and = 'AND';
+    $and_or_where = 'WHERE';
+  }
+
+  # If $full_data is true, we collect all the data in all cases,
+  # even if the cache is already populated.
+  # $full_data is never used except in the very special case where
+  # all configurable bug groups are displayed to administrators,
+  # so we don't care about collecting all the data again in this case.
+  if (!defined $self->{group_controls} || $full_data) {
+
+    # Include name to the list, to allow us sorting data more easily.
+    my $query = qq{SELECT id, name, entry, membercontrol, othercontrol,
                               canedit, editcomponents, editbugs, canconfirm
                          FROM groups
                               LEFT JOIN group_control_map
                               ON id = group_id 
                 $where_or_and product_id = ?
                 $and_or_where isbuggroup = 1};
-        $self->{group_controls} = 
-            $dbh->selectall_hashref($query, 'id', undef, $self->id);
-
-        # For each group ID listed above, create and store its group object.
-        my @gids = keys %{$self->{group_controls}};
-        my $groups = Bugzilla::Group->new_from_list(\@gids);
-        $self->{group_controls}->{$_->id}->{group} = $_ foreach @$groups;
-    }
-
-    # We never cache bug counts, for the same reason as above.
-    if ($full_data) {
-        my $counts =
-          $dbh->selectall_arrayref('SELECT group_id, COUNT(bugs.bug_id) AS bug_count
+    $self->{group_controls}
+      = $dbh->selectall_hashref($query, 'id', undef, $self->id);
+
+    # For each group ID listed above, create and store its group object.
+    my @gids   = keys %{$self->{group_controls}};
+    my $groups = Bugzilla::Group->new_from_list(\@gids);
+    $self->{group_controls}->{$_->id}->{group} = $_ foreach @$groups;
+  }
+
+  # We never cache bug counts, for the same reason as above.
+  if ($full_data) {
+    my $counts = $dbh->selectall_arrayref(
+      'SELECT group_id, COUNT(bugs.bug_id) AS bug_count
                                       FROM bug_group_map
                                 INNER JOIN bugs
                                         ON bugs.bug_id = bug_group_map.bug_id
-                                     WHERE bugs.product_id = ? ' .
-                                     $dbh->sql_group_by('group_id'),
-                          {'Slice' => {}}, $self->id);
-        foreach my $data (@$counts) {
-            $self->{group_controls}->{$data->{group_id}}->{bug_count} = $data->{bug_count};
-        }
+                                     WHERE bugs.product_id = ? '
+        . $dbh->sql_group_by('group_id'), {'Slice' => {}}, $self->id
+    );
+    foreach my $data (@$counts) {
+      $self->{group_controls}->{$data->{group_id}}->{bug_count} = $data->{bug_count};
     }
-    return $self->{group_controls};
+  }
+  return $self->{group_controls};
 }
 
 sub groups_available {
-    my ($self) = @_;
-    return $self->{groups_available} if defined $self->{groups_available};
-    my $dbh = Bugzilla->dbh;
-    my $shown = CONTROLMAPSHOWN;
-    my $default = CONTROLMAPDEFAULT;
-    my %member_groups = @{ $dbh->selectcol_arrayref(
-        "SELECT group_id, membercontrol
+  my ($self) = @_;
+  return $self->{groups_available} if defined $self->{groups_available};
+  my $dbh           = Bugzilla->dbh;
+  my $shown         = CONTROLMAPSHOWN;
+  my $default       = CONTROLMAPDEFAULT;
+  my %member_groups = @{
+    $dbh->selectcol_arrayref(
+      "SELECT group_id, membercontrol
            FROM group_control_map
                 INNER JOIN groups ON group_control_map.group_id = groups.id
           WHERE isbuggroup = 1 AND isactive = 1 AND product_id = ?
                 AND (membercontrol = $shown OR membercontrol = $default)
-                AND " . Bugzilla->user->groups_in_sql(),
-        {Columns=>[1,2]}, $self->id) };
-    # We don't need to check the group membership here, because we only
-    # add these groups to the list below if the group isn't already listed
-    # for membercontrol.
-    my %other_groups = @{ $dbh->selectcol_arrayref(
-        "SELECT group_id, othercontrol
+                AND " . Bugzilla->user->groups_in_sql(), {Columns => [1, 2]},
+      $self->id
+    )
+  };
+
+  # We don't need to check the group membership here, because we only
+  # add these groups to the list below if the group isn't already listed
+  # for membercontrol.
+  my %other_groups = @{
+    $dbh->selectcol_arrayref(
+      "SELECT group_id, othercontrol
            FROM group_control_map
                 INNER JOIN groups ON group_control_map.group_id = groups.id
           WHERE isbuggroup = 1 AND isactive = 1 AND product_id = ?
-                AND (othercontrol = $shown OR othercontrol = $default)", 
-        {Columns=>[1,2]}, $self->id) };
-
-    # If the user is a member, then we use the membercontrol value.
-    # Otherwise, we use the othercontrol value.
-    my %all_groups = %member_groups;
-    foreach my $id (keys %other_groups) {
-        if (!defined $all_groups{$id}) {
-            $all_groups{$id} = $other_groups{$id};
-        }
+                AND (othercontrol = $shown OR othercontrol = $default)",
+      {Columns => [1, 2]}, $self->id
+    )
+  };
+
+  # If the user is a member, then we use the membercontrol value.
+  # Otherwise, we use the othercontrol value.
+  my %all_groups = %member_groups;
+  foreach my $id (keys %other_groups) {
+    if (!defined $all_groups{$id}) {
+      $all_groups{$id} = $other_groups{$id};
     }
+  }
 
-    my $available = Bugzilla::Group->new_from_list([keys %all_groups]);
-    foreach my $group (@$available) {
-        $group->{is_default} = 1 if $all_groups{$group->id} == $default;
-    }
+  my $available = Bugzilla::Group->new_from_list([keys %all_groups]);
+  foreach my $group (@$available) {
+    $group->{is_default} = 1 if $all_groups{$group->id} == $default;
+  }
 
-    $self->{groups_available} = $available;
-    return $self->{groups_available};
+  $self->{groups_available} = $available;
+  return $self->{groups_available};
 }
 
 sub groups_mandatory {
-    my ($self) = @_;
-    return $self->{groups_mandatory} if $self->{groups_mandatory};
-    my $groups = Bugzilla->user->groups_as_string;
-    my $mandatory = CONTROLMAPMANDATORY;
-    # For membercontrol we don't check group_id IN, because if membercontrol
-    # is Mandatory, the group is Mandatory for everybody, regardless of their
-    # group membership.
-    my $ids = Bugzilla->dbh->selectcol_arrayref(
-        "SELECT group_id 
+  my ($self) = @_;
+  return $self->{groups_mandatory} if $self->{groups_mandatory};
+  my $groups    = Bugzilla->user->groups_as_string;
+  my $mandatory = CONTROLMAPMANDATORY;
+
+  # For membercontrol we don't check group_id IN, because if membercontrol
+  # is Mandatory, the group is Mandatory for everybody, regardless of their
+  # group membership.
+  my $ids = Bugzilla->dbh->selectcol_arrayref(
+    "SELECT group_id 
            FROM group_control_map
                 INNER JOIN groups ON group_control_map.group_id = groups.id
           WHERE product_id = ? AND isactive = 1
                 AND (membercontrol = $mandatory
                      OR (othercontrol = $mandatory
-                         AND group_id NOT IN ($groups)))",
-        undef, $self->id);
-    $self->{groups_mandatory} = Bugzilla::Group->new_from_list($ids);
-    return $self->{groups_mandatory};
+                         AND group_id NOT IN ($groups)))", undef, $self->id
+  );
+  $self->{groups_mandatory} = Bugzilla::Group->new_from_list($ids);
+  return $self->{groups_mandatory};
 }
 
 # We don't just check groups_valid, because we want to know specifically
 # if this group can be validly set by the currently-logged-in user.
 sub group_is_settable {
-    my ($self, $group) = @_;
+  my ($self, $group) = @_;
 
-    return 0 unless ($group->is_active && $group->is_bug_group);
+  return 0 unless ($group->is_active && $group->is_bug_group);
 
-    my $is_mandatory = grep { $group->id == $_->id }
-                            @{ $self->groups_mandatory };
-    my $is_available = grep { $group->id == $_->id }
-                            @{ $self->groups_available };
-    return ($is_mandatory or $is_available) ? 1 : 0;
+  my $is_mandatory = grep { $group->id == $_->id } @{$self->groups_mandatory};
+  my $is_available = grep { $group->id == $_->id } @{$self->groups_available};
+  return ($is_mandatory or $is_available) ? 1 : 0;
 }
 
 sub group_is_valid {
-    my ($self, $group) = @_;
-    return grep($_->id == $group->id, @{ $self->groups_valid }) ? 1 : 0;
+  my ($self, $group) = @_;
+  return grep($_->id == $group->id, @{$self->groups_valid}) ? 1 : 0;
 }
 
 sub groups_valid {
-    my ($self) = @_;
-    return $self->{groups_valid} if defined $self->{groups_valid};
-    
-    # Note that we don't check OtherControl below, because there is no
-    # valid NA/* combination.
-    my $ids = Bugzilla->dbh->selectcol_arrayref(
-        "SELECT DISTINCT group_id
+  my ($self) = @_;
+  return $self->{groups_valid} if defined $self->{groups_valid};
+
+  # Note that we don't check OtherControl below, because there is no
+  # valid NA/* combination.
+  my $ids = Bugzilla->dbh->selectcol_arrayref(
+    "SELECT DISTINCT group_id
           FROM group_control_map AS gcm
                INNER JOIN groups ON gcm.group_id = groups.id
          WHERE product_id = ? AND isbuggroup = 1
-               AND membercontrol != " . CONTROLMAPNA,  undef, $self->id);
-    $self->{groups_valid} = Bugzilla::Group->new_from_list($ids);
-    return $self->{groups_valid};
+               AND membercontrol != " . CONTROLMAPNA, undef, $self->id
+  );
+  $self->{groups_valid} = Bugzilla::Group->new_from_list($ids);
+  return $self->{groups_valid};
 }
 
 sub versions {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{versions}) {
-        my $ids = $dbh->selectcol_arrayref(q{
+  if (!defined $self->{versions}) {
+    my $ids = $dbh->selectcol_arrayref(
+      q{
             SELECT id FROM versions
-            WHERE product_id = ?}, undef, $self->id);
+            WHERE product_id = ?}, undef, $self->id
+    );
 
-        $self->{versions} = Bugzilla::Version->new_from_list($ids);
-    }
-    return $self->{versions};
+    $self->{versions} = Bugzilla::Version->new_from_list($ids);
+  }
+  return $self->{versions};
 }
 
 sub milestones {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{milestones}) {
-        my $ids = $dbh->selectcol_arrayref(q{
+  if (!defined $self->{milestones}) {
+    my $ids = $dbh->selectcol_arrayref(
+      q{
             SELECT id FROM milestones
-             WHERE product_id = ?}, undef, $self->id);
- 
-        $self->{milestones} = Bugzilla::Milestone->new_from_list($ids);
-    }
-    return $self->{milestones};
+             WHERE product_id = ?}, undef, $self->id
+    );
+
+    $self->{milestones} = Bugzilla::Milestone->new_from_list($ids);
+  }
+  return $self->{milestones};
 }
 
 sub bug_count {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{'bug_count'}) {
-        $self->{'bug_count'} = $dbh->selectrow_array(qq{
+  if (!defined $self->{'bug_count'}) {
+    $self->{'bug_count'} = $dbh->selectrow_array(
+      qq{
             SELECT COUNT(bug_id) FROM bugs
-            WHERE product_id = ?}, undef, $self->id);
+            WHERE product_id = ?}, undef, $self->id
+    );
 
-    }
-    return $self->{'bug_count'};
+  }
+  return $self->{'bug_count'};
 }
 
 sub bug_ids {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    if (!defined $self->{'bug_ids'}) {
-        $self->{'bug_ids'} = 
-            $dbh->selectcol_arrayref(q{SELECT bug_id FROM bugs
-                                       WHERE product_id = ?},
-                                     undef, $self->id);
-    }
-    return $self->{'bug_ids'};
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  if (!defined $self->{'bug_ids'}) {
+    $self->{'bug_ids'} = $dbh->selectcol_arrayref(
+      q{SELECT bug_id FROM bugs
+                                       WHERE product_id = ?}, undef, $self->id
+    );
+  }
+  return $self->{'bug_ids'};
 }
 
 sub user_has_access {
-    my ($self, $user) = @_;
+  my ($self, $user) = @_;
 
-    return Bugzilla->dbh->selectrow_array(
-        'SELECT CASE WHEN group_id IS NULL THEN 1 ELSE 0 END
+  return Bugzilla->dbh->selectrow_array(
+    'SELECT CASE WHEN group_id IS NULL THEN 1 ELSE 0 END
            FROM products LEFT JOIN group_control_map
                 ON group_control_map.product_id = products.id
                    AND group_control_map.entry != 0
                    AND group_id NOT IN (' . $user->groups_as_string . ')
-          WHERE products.id = ? ' . Bugzilla->dbh->sql_limit(1),
-          undef, $self->id);
+          WHERE products.id = ? ' . Bugzilla->dbh->sql_limit(1), undef, $self->id
+  );
 }
 
 sub flag_types {
-    my $self = shift;
-
-    return $self->{'flag_types'} if defined $self->{'flag_types'};
-
-    # We cache flag types to avoid useless calls to get_clusions().
-    my $cache = Bugzilla->request_cache->{flag_types_per_product} ||= {};
-    $self->{flag_types} = {};
-    my $prod_id = $self->id;
-    my $flagtypes = Bugzilla::FlagType::match({ product_id => $prod_id });
-
-    foreach my $type ('bug', 'attachment') {
-        my @flags = grep { $_->target_type eq $type } @$flagtypes;
-        $self->{flag_types}->{$type} = \@flags;
-
-        # Also populate component flag types, while we are here.
-        foreach my $comp (@{$self->components}) {
-            $comp->{flag_types} ||= {};
-            my $comp_id = $comp->id;
-
-            foreach my $flag (@flags) {
-                my $flag_id = $flag->id;
-                $cache->{$flag_id} ||= $flag;
-                my $i = $cache->{$flag_id}->inclusions_as_hash;
-                my $e = $cache->{$flag_id}->exclusions_as_hash;
-                my $included = $i->{0}->{0} || $i->{0}->{$comp_id}
-                               || $i->{$prod_id}->{0} || $i->{$prod_id}->{$comp_id};
-                my $excluded = $e->{0}->{0} || $e->{0}->{$comp_id}
-                               || $e->{$prod_id}->{0} || $e->{$prod_id}->{$comp_id};
-                push(@{$comp->{flag_types}->{$type}}, $flag) if ($included && !$excluded);
-            }
-        }
+  my $self = shift;
+
+  return $self->{'flag_types'} if defined $self->{'flag_types'};
+
+  # We cache flag types to avoid useless calls to get_clusions().
+  my $cache = Bugzilla->request_cache->{flag_types_per_product} ||= {};
+  $self->{flag_types} = {};
+  my $prod_id = $self->id;
+  my $flagtypes = Bugzilla::FlagType::match({product_id => $prod_id});
+
+  foreach my $type ('bug', 'attachment') {
+    my @flags = grep { $_->target_type eq $type } @$flagtypes;
+    $self->{flag_types}->{$type} = \@flags;
+
+    # Also populate component flag types, while we are here.
+    foreach my $comp (@{$self->components}) {
+      $comp->{flag_types} ||= {};
+      my $comp_id = $comp->id;
+
+      foreach my $flag (@flags) {
+        my $flag_id = $flag->id;
+        $cache->{$flag_id} ||= $flag;
+        my $i = $cache->{$flag_id}->inclusions_as_hash;
+        my $e = $cache->{$flag_id}->exclusions_as_hash;
+        my $included
+          = $i->{0}->{0}
+          || $i->{0}->{$comp_id}
+          || $i->{$prod_id}->{0}
+          || $i->{$prod_id}->{$comp_id};
+        my $excluded
+          = $e->{0}->{0}
+          || $e->{0}->{$comp_id}
+          || $e->{$prod_id}->{0}
+          || $e->{$prod_id}->{$comp_id};
+        push(@{$comp->{flag_types}->{$type}}, $flag) if ($included && !$excluded);
+      }
     }
-    return $self->{'flag_types'};
+  }
+  return $self->{'flag_types'};
 }
 
 sub classification {
-    my $self = shift;
-    $self->{'classification'} ||=
-        new Bugzilla::Classification({ id => $self->classification_id, cache => 1 });
-    return $self->{'classification'};
+  my $self = shift;
+  $self->{'classification'} ||= new Bugzilla::Classification(
+    {id => $self->classification_id, cache => 1});
+  return $self->{'classification'};
 }
 
 ###############################
@@ -826,29 +864,29 @@ sub classification {
 ###############################
 
 sub allows_unconfirmed { return $_[0]->{'allows_unconfirmed'}; }
-sub description       { return $_[0]->{'description'};       }
-sub is_active         { return $_[0]->{'isactive'};       }
-sub default_milestone { return $_[0]->{'defaultmilestone'};  }
-sub classification_id { return $_[0]->{'classification_id'}; }
+sub description        { return $_[0]->{'description'}; }
+sub is_active          { return $_[0]->{'isactive'}; }
+sub default_milestone  { return $_[0]->{'defaultmilestone'}; }
+sub classification_id  { return $_[0]->{'classification_id'}; }
 
 ###############################
 ####      Subroutines    ######
 ###############################
 
 sub check {
-    my ($class, $params) = @_;
-    $params = { name => $params } if !ref $params;
-    if (!$params->{allow_inaccessible}) {
-        $params->{_error} = 'product_access_denied';
-    }
-    my $product = $class->SUPER::check($params);
-
-    if (!$params->{allow_inaccessible}
-        && !Bugzilla->user->can_access_product($product))
-    {
-        ThrowUserError('product_access_denied', $params);
-    }
-    return $product;
+  my ($class, $params) = @_;
+  $params = {name => $params} if !ref $params;
+  if (!$params->{allow_inaccessible}) {
+    $params->{_error} = 'product_access_denied';
+  }
+  my $product = $class->SUPER::check($params);
+
+  if ( !$params->{allow_inaccessible}
+    && !Bugzilla->user->can_access_product($product))
+  {
+    ThrowUserError('product_access_denied', $params);
+  }
+  return $product;
 }
 
 1;
diff --git a/Bugzilla/RNG.pm b/Bugzilla/RNG.pm
index 96e442fa03..63cb770c23 100644
--- a/Bugzilla/RNG.pm
+++ b/Bugzilla/RNG.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::RNG;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -27,25 +27,13 @@ our @EXPORT_OK = qw(rand srand irand);
 use constant DIVIDE_BY => 2**32;
 
 # How many bytes of seed to read.
-use constant SEED_SIZE => 16; # 128 bits.
+use constant SEED_SIZE => 16;    # 128 bits.
 
 #################
 # Windows Stuff #
 #################
 
-# The type of cryptographic service provider we want to use.
-# This doesn't really matter for our purposes, so we just pick
-# PROV_RSA_FULL, which seems reasonable. For more info, see
-# http://msdn.microsoft.com/en-us/library/aa380244(v=VS.85).aspx
-use constant PROV_RSA_FULL => 1;
-
-# Flags for CryptGenRandom:
-# Don't ever display a UI to the user, just fail if one would be needed.
-use constant CRYPT_SILENT => 64;
-# Don't require existing public/private keypairs.
-use constant CRYPT_VERIFYCONTEXT => 0xF0000000;
-
-# For some reason, BOOLEAN doesn't work properly as a return type with 
+# For some reason, BOOLEAN doesn't work properly as a return type with
 # Win32::API.
 use constant RTLGENRANDOM_PROTO => <<END;
 INT SystemFunction036(
@@ -59,40 +47,42 @@ END
 #################
 
 sub rand (;$) {
-    my ($limit) = @_;
-    my $int = irand();
-    return _to_float($int, $limit);
+  my ($limit) = @_;
+  my $int = irand();
+  return _to_float($int, $limit);
 }
 
 sub irand (;$) {
-    my ($limit) = @_;
-    Bugzilla::RNG::srand() if !defined $RNG;
-    my $int = $RNG->irand();
-    if (defined $limit) {
-        # We can't just use the mod operator because it will bias
-        # our output. Search for "modulo bias" on the Internet for
-        # details. This is slower than mod(), but does not have a bias,
-        # as demonstrated by Math::Random::Secure's uniform.t test.
-        return int(_to_float($int, $limit));
-    }
-    return $int;
+  my ($limit) = @_;
+  Bugzilla::RNG::srand() if !defined $RNG;
+  my $int = $RNG->irand();
+  if (defined $limit) {
+
+    # We can't just use the mod operator because it will bias
+    # our output. Search for "modulo bias" on the Internet for
+    # details. This is slower than mod(), but does not have a bias,
+    # as demonstrated by Math::Random::Secure's uniform.t test.
+    return int(_to_float($int, $limit));
+  }
+  return $int;
 }
 
 sub srand (;$) {
-    my ($value) = @_;
-    # Remove any RNG that might already have been made.
-    $RNG = undef;
-    my %args;
-    if (defined $value) {
-        $args{seed} = $value;
-    }
-    $RNG = _create_rng(\%args);
+  my ($value) = @_;
+
+  # Remove any RNG that might already have been made.
+  $RNG = undef;
+  my %args;
+  if (defined $value) {
+    $args{seed} = $value;
+  }
+  $RNG = _create_rng(\%args);
 }
 
 sub _to_float {
-    my ($integer, $limit) = @_;
-    $limit ||= 1;
-    return ($integer / DIVIDE_BY) * $limit;
+  my ($integer, $limit) = @_;
+  $limit ||= 1;
+  return ($integer / DIVIDE_BY) * $limit;
 }
 
 ##########################
@@ -100,123 +90,77 @@ sub _to_float {
 ##########################
 
 sub _create_rng {
-    my ($params) = @_;
+  my ($params) = @_;
 
-    if (!defined $params->{seed}) {
-        $params->{seed} = _get_seed();
-    }
+  if (!defined $params->{seed}) {
+    $params->{seed} = _get_seed();
+  }
 
-    _check_seed($params->{seed});
+  _check_seed($params->{seed});
 
-    my @seed_ints = unpack('L*', $params->{seed});
+  my @seed_ints = unpack('L*', $params->{seed});
 
-    my $rng = Math::Random::ISAAC->new(@seed_ints);
+  my $rng = Math::Random::ISAAC->new(@seed_ints);
 
-    # It's faster to skip the frontend interface of Math::Random::ISAAC
-    # and just use the backend directly. However, in case the internal
-    # code of Math::Random::ISAAC changes at some point, we do make sure
-    # that the {backend} element actually exists first.
-    return $rng->{backend} ? $rng->{backend} : $rng;
+  # It's faster to skip the frontend interface of Math::Random::ISAAC
+  # and just use the backend directly. However, in case the internal
+  # code of Math::Random::ISAAC changes at some point, we do make sure
+  # that the {backend} element actually exists first.
+  return $rng->{backend} ? $rng->{backend} : $rng;
 }
 
 sub _check_seed {
-    my ($seed) = @_;
-    if (length($seed) < 8) {
-        warn "Your seed is less than 8 bytes (64 bits). It could be"
-             . " easy to crack";
-    }
-    # If it looks like we were seeded with a 32-bit integer, warn the
-    # user that they are making a dangerous, easily-crackable mistake.
-    elsif (length($seed) <= 10 and $seed =~ /^\d+$/) {
-        warn "RNG seeded with a 32-bit integer, this is easy to crack";
-    }
+  my ($seed) = @_;
+  if (length($seed) < 8) {
+    warn "Your seed is less than 8 bytes (64 bits). It could be" . " easy to crack";
+  }
+
+  # If it looks like we were seeded with a 32-bit integer, warn the
+  # user that they are making a dangerous, easily-crackable mistake.
+  elsif (length($seed) <= 10 and $seed =~ /^\d+$/) {
+    warn "RNG seeded with a 32-bit integer, this is easy to crack";
+  }
 }
 
 sub _get_seed {
-    return _windows_seed() if ON_WINDOWS;
+  return _windows_seed() if ON_WINDOWS;
 
-    if (-r '/dev/urandom') {
-        return _read_seed_from('/dev/urandom');
-    }
+  if (-r '/dev/urandom') {
+    return _read_seed_from('/dev/urandom');
+  }
 
-    return _read_seed_from('/dev/random');
+  return _read_seed_from('/dev/random');
 }
 
 sub _read_seed_from {
-    my ($from) = @_;
-
-    open(my $fh, '<', $from) or die "$from: $!";
-    my $buffer;
-    read($fh, $buffer, SEED_SIZE);
-    if (length($buffer) < SEED_SIZE) {
-        die "Could not read enough seed bytes from $from, got only " 
-            . length($buffer);
-    }
-    close $fh;
-    return $buffer;
+  my ($from) = @_;
+
+  open(my $fh, '<', $from) or die "$from: $!";
+  my $buffer;
+  read($fh, $buffer, SEED_SIZE);
+  if (length($buffer) < SEED_SIZE) {
+    die "Could not read enough seed bytes from $from, got only " . length($buffer);
+  }
+  close $fh;
+  return $buffer;
 }
 
 sub _windows_seed {
-    my ($major, $minor) = (Win32::GetOSVersion())[1,2];
-    if ($major < 5) {
-        die "Bugzilla does not support versions of Windows before"
-            . " Windows 2000";
-    }
-    # This means Windows 2000.
-    if ($major == 5 and $minor == 0) {
-        return _win2k_seed();
-    }
-
-    my $rtlgenrand = Win32::API->new('advapi32', RTLGENRANDOM_PROTO);
-    if (!defined $rtlgenrand) {
-        die "Could not import RtlGenRand: $^E";
-    }
-    my $buffer = chr(0) x SEED_SIZE;
-    my $result = $rtlgenrand->Call($buffer, SEED_SIZE);
-    if (!$result) {
-        die "RtlGenRand failed: $^E";
-    }
-    return $buffer;
-}
-
-sub _win2k_seed {
-    my $crypt_acquire = Win32::API->new(
-        "advapi32", 'CryptAcquireContext', 'PPPNN', 'I');
-    if (!defined $crypt_acquire) {
-        die "Could not import CryptAcquireContext: $^E";
-    }
-
-    my $crypt_release = Win32::API->new(
-        "advapi32", 'CryptReleaseContext', 'NN', 'I');
-    if (!defined $crypt_release) {
-        die "Could not import CryptReleaseContext: $^E";
-    }
-
-    my $crypt_gen_random = Win32::API->new(
-        "advapi32", 'CryptGenRandom', 'NNP', 'I');
-    if (!defined $crypt_gen_random) {
-        die "Could not import CryptGenRandom: $^E";
-    }
-
-    my $context = chr(0) x Win32::API::Type->sizeof('PULONG');
-    my $acquire_result = $crypt_acquire->Call(
-        $context, 0, 0, PROV_RSA_FULL, CRYPT_SILENT | CRYPT_VERIFYCONTEXT);
-    if (!defined $acquire_result) {
-        die "CryptAcquireContext failed: $^E";
-    }
-
-    my $pack_type = Win32::API::Type::packing('PULONG');
-    $context = unpack($pack_type, $context);
-
-    my $buffer = chr(0) x SEED_SIZE;
-    my $rand_result = $crypt_gen_random->Call($context, SEED_SIZE, $buffer);
-    my $rand_error = $^E;
-    # We don't check this if it fails, we don't care.
-    $crypt_release->Call($context, 0);
-    if (!defined $rand_result) {
-        die "CryptGenRandom failed: $rand_error";
-    }
-    return $buffer;
+  my ($major, $minor) = (Win32::GetOSVersion())[1, 2];
+  if ($major < 5 || ($major == 5 and $minor == 0)) {
+    die 'Bugzilla does not support versions of Windows before Windows XP';
+  }
+
+  my $rtlgenrand = Win32::API->new('advapi32', RTLGENRANDOM_PROTO);
+  if (!defined $rtlgenrand) {
+    die "Could not import RtlGenRand: $^E";
+  }
+  my $buffer = chr(0) x SEED_SIZE;
+  my $result = $rtlgenrand->Call($buffer, SEED_SIZE);
+  if (!$result) {
+    die "RtlGenRand failed: $^E";
+  }
+  return $buffer;
 }
 
 1;
diff --git a/Bugzilla/Report.pm b/Bugzilla/Report.pm
index 10af2ea9ef..0f22e48c7e 100644
--- a/Bugzilla/Report.pm
+++ b/Bugzilla/Report.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Report;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,43 +26,40 @@ use constant AUDIT_UPDATES => 0;
 use constant AUDIT_REMOVES => 0;
 
 use constant DB_COLUMNS => qw(
-    id
-    user_id
-    name
-    query
+  id
+  user_id
+  name
+  query
 );
 
 use constant UPDATE_COLUMNS => qw(
-    name
-    query
+  name
+  query
 );
 
-use constant VALIDATORS => {
-    name    => \&_check_name,
-    query   => \&_check_query,
-};
+use constant VALIDATORS => {name => \&_check_name, query => \&_check_query,};
 
 ##############
 # Validators #
 ##############
 
 sub _check_name {
-    my ($invocant, $name) = @_;
-    $name = clean_text($name);
-    $name || ThrowUserError("report_name_missing");
-    $name !~ /[<>&]/ || ThrowUserError("illegal_query_name");
-    if (length($name) > MAX_LEN_QUERY_NAME) {
-        ThrowUserError("query_name_too_long");
-    }
-    return $name;
+  my ($invocant, $name) = @_;
+  $name = clean_text($name);
+  $name || ThrowUserError("report_name_missing");
+  $name !~ /[<>&]/ || ThrowUserError("illegal_query_name");
+  if (length($name) > MAX_LEN_QUERY_NAME) {
+    ThrowUserError("query_name_too_long");
+  }
+  return $name;
 }
 
 sub _check_query {
-    my ($invocant, $query) = @_;
-    $query || ThrowUserError("buglist_parameters_required");
-    my $cgi = new Bugzilla::CGI($query);
-    $cgi->clean_search_url;
-    return $cgi->query_string;
+  my ($invocant, $query) = @_;
+  $query || ThrowUserError("buglist_parameters_required");
+  my $cgi = new Bugzilla::CGI($query);
+  $cgi->clean_search_url;
+  return $cgi->query_string;
 }
 
 #############
@@ -71,7 +68,7 @@ sub _check_query {
 
 sub query { return $_[0]->{'query'}; }
 
-sub set_name { $_[0]->set('name', $_[1]); }
+sub set_name  { $_[0]->set('name',  $_[1]); }
 sub set_query { $_[0]->set('query', $_[1]); }
 
 ###########
@@ -79,25 +76,26 @@ sub set_query { $_[0]->set('query', $_[1]); }
 ###########
 
 sub create {
-    my $class = shift;
-    my $param = shift;
+  my $class = shift;
+  my $param = shift;
 
-    Bugzilla->login(LOGIN_REQUIRED);
-    $param->{'user_id'} = Bugzilla->user->id;
+  Bugzilla->login(LOGIN_REQUIRED);
+  $param->{'user_id'} = Bugzilla->user->id;
 
-    unshift @_, $param;
-    my $self = $class->SUPER::create(@_);
+  unshift @_, $param;
+  my $self = $class->SUPER::create(@_);
 }
 
 sub check {
-    my $class = shift;
-    my $report = $class->SUPER::check(@_);
-    my $user = Bugzilla->user;
-    if ( grep($_->id eq $report->id, @{$user->reports})) {
-        return $report;
-    } else {
-        ThrowUserError('report_access_denied');
-    }
+  my $class  = shift;
+  my $report = $class->SUPER::check(@_);
+  my $user   = Bugzilla->user;
+  if (grep($_->id eq $report->id, @{$user->reports})) {
+    return $report;
+  }
+  else {
+    ThrowUserError('report_access_denied');
+  }
 }
 
 1;
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 0395d08eef..59a6fb195d 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -7,14 +7,14 @@
 
 package Bugzilla::Search;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Exporter);
 @Bugzilla::Search::EXPORT = qw(
-    IsValidQueryType
-    split_order_term
+  IsValidQueryType
+  split_order_term
 );
 
 use Bugzilla::Error;
@@ -34,7 +34,7 @@ use Date::Format;
 use Date::Parse;
 use Scalar::Util qw(blessed);
 use List::MoreUtils qw(all firstidx part uniq);
-use POSIX qw(INT_MAX);
+use POSIX qw(INT_MAX floor);
 use Storable qw(dclone);
 use Time::HiRes qw(gettimeofday tv_interval);
 
@@ -135,311 +135,290 @@ use constant NUMBER_REGEX => qr/
 # If you specify a search type in the boolean charts, this describes
 # which operator maps to which internal function here.
 use constant OPERATORS => {
-    equals         => \&_simple_operator,
-    notequals      => \&_simple_operator,
-    casesubstring  => \&_casesubstring,
-    substring      => \&_substring,
-    substr         => \&_substring,
-    notsubstring   => \&_notsubstring,
-    regexp         => \&_regexp,
-    notregexp      => \&_notregexp,
-    lessthan       => \&_simple_operator,
-    lessthaneq     => \&_simple_operator,
-    matches        => sub { ThrowUserError("search_content_without_matches"); },
-    notmatches     => sub { ThrowUserError("search_content_without_matches"); },
-    greaterthan    => \&_simple_operator,
-    greaterthaneq  => \&_simple_operator,
-    anyexact       => \&_anyexact,
-    anywordssubstr => \&_anywordsubstr,
-    allwordssubstr => \&_allwordssubstr,
-    nowordssubstr  => \&_nowordssubstr,
-    anywords       => \&_anywords,
-    allwords       => \&_allwords,
-    nowords        => \&_nowords,
-    changedbefore  => \&_changedbefore_changedafter,
-    changedafter   => \&_changedbefore_changedafter,
-    changedfrom    => \&_changedfrom_changedto,
-    changedto      => \&_changedfrom_changedto,
-    changedby      => \&_changedby,
-    isempty        => \&_isempty,
-    isnotempty     => \&_isnotempty,
+  equals         => \&_simple_operator,
+  notequals      => \&_simple_operator,
+  casesubstring  => \&_casesubstring,
+  substring      => \&_substring,
+  substr         => \&_substring,
+  notsubstring   => \&_notsubstring,
+  regexp         => \&_regexp,
+  notregexp      => \&_notregexp,
+  lessthan       => \&_simple_operator,
+  lessthaneq     => \&_simple_operator,
+  matches        => sub { ThrowUserError("search_content_without_matches"); },
+  notmatches     => sub { ThrowUserError("search_content_without_matches"); },
+  greaterthan    => \&_simple_operator,
+  greaterthaneq  => \&_simple_operator,
+  anyexact       => \&_anyexact,
+  anywordssubstr => \&_anywordsubstr,
+  allwordssubstr => \&_allwordssubstr,
+  nowordssubstr  => \&_nowordssubstr,
+  anywords       => \&_anywords,
+  allwords       => \&_allwords,
+  nowords        => \&_nowords,
+  changedbefore  => \&_changedbefore_changedafter,
+  changedafter   => \&_changedbefore_changedafter,
+  changedfrom    => \&_changedfrom_changedto,
+  changedto      => \&_changedfrom_changedto,
+  changedby      => \&_changedby,
+  isempty        => \&_isempty,
+  isnotempty     => \&_isnotempty,
+  isactive       => \&_isactive,
+  isnotactive    => \&_isactive,
 };
 
 # Some operators are really just standard SQL operators, and are
 # all implemented by the _simple_operator function, which uses this
 # constant.
 use constant SIMPLE_OPERATORS => {
-    equals        => '=',
-    notequals     => '!=',
-    greaterthan   => '>',
-    greaterthaneq => '>=',
-    lessthan      => '<',
-    lessthaneq    => "<=",
+  equals        => '=',
+  notequals     => '!=',
+  greaterthan   => '>',
+  greaterthaneq => '>=',
+  lessthan      => '<',
+  lessthaneq    => "<=",
 };
 
 # Most operators just reverse by removing or adding "not" from/to them.
 # However, some operators reverse in a different way, so those are listed
 # here.
 use constant OPERATOR_REVERSE => {
-    nowords        => 'anywords',
-    nowordssubstr  => 'anywordssubstr',
-    anywords       => 'nowords',
-    anywordssubstr => 'nowordssubstr',
-    lessthan       => 'greaterthaneq',
-    lessthaneq     => 'greaterthan',
-    greaterthan    => 'lessthaneq',
-    greaterthaneq  => 'lessthan',
-    isempty        => 'isnotempty',
-    isnotempty     => 'isempty',
-    # The following don't currently have reversals:
-    # casesubstring, anyexact, allwords, allwordssubstr
+  nowords        => 'anywords',
+  nowordssubstr  => 'anywordssubstr',
+  anywords       => 'nowords',
+  anywordssubstr => 'nowordssubstr',
+  lessthan       => 'greaterthaneq',
+  lessthaneq     => 'greaterthan',
+  greaterthan    => 'lessthaneq',
+  greaterthaneq  => 'lessthan',
+  isempty        => 'isnotempty',
+  isnotempty     => 'isempty',
+  isactive       => 'isnotactive',
+  isnotactive    => 'isactive',
+
+  # The following don't currently have reversals:
+  # casesubstring, anyexact, allwords, allwordssubstr
 };
 
 # For these operators, even if a field is numeric (is_numeric returns true),
 # we won't treat the input like a number.
 use constant NON_NUMERIC_OPERATORS => qw(
-    changedafter
-    changedbefore
-    changedfrom
-    changedto
-    regexp
-    notregexp
+  changedafter
+  changedbefore
+  changedfrom
+  changedto
+  regexp
+  notregexp
 );
 
 # These operators ignore the entered value
 use constant NO_VALUE_OPERATORS => qw(
-    isempty
-    isnotempty
+  isempty
+  isnotempty
+  isactive
+  isnotactive
 );
 
 use constant MULTI_SELECT_OVERRIDE => {
-    notequals      => \&_multiselect_negative,
-    notregexp      => \&_multiselect_negative,
-    notsubstring   => \&_multiselect_negative,
-    nowords        => \&_multiselect_negative,
-    nowordssubstr  => \&_multiselect_negative,
-    
-    allwords       => \&_multiselect_multiple,
-    allwordssubstr => \&_multiselect_multiple,
-    anyexact       => \&_multiselect_multiple,
-    anywords       => \&_multiselect_multiple,
-    anywordssubstr => \&_multiselect_multiple,
-    
-    _non_changed    => \&_multiselect_nonchanged,
+  notequals     => \&_multiselect_negative,
+  notregexp     => \&_multiselect_negative,
+  notsubstring  => \&_multiselect_negative,
+  nowords       => \&_multiselect_negative,
+  nowordssubstr => \&_multiselect_negative,
+
+  allwords       => \&_multiselect_multiple,
+  allwordssubstr => \&_multiselect_multiple,
+  anyexact       => \&_multiselect_multiple,
+  anywords       => \&_multiselect_multiple,
+  anywordssubstr => \&_multiselect_multiple,
+
+  _non_changed => \&_multiselect_nonchanged,
 };
 
 use constant OPERATOR_FIELD_OVERRIDE => {
-    # User fields
-    'attachments.submitter' => {
-        _non_changed => \&_user_nonchanged,
-    },
-    assigned_to => {
-        _non_changed => \&_user_nonchanged,
-    },
-    assigned_to_realname => {
-        _non_changed => \&_user_nonchanged,
-    },
-    cc => {
-        _non_changed => \&_user_nonchanged,
-    },
-    commenter => {
-        _non_changed => \&_user_nonchanged,
-    },
-    reporter => {
-        _non_changed => \&_user_nonchanged,
-    },
-    reporter_realname => {
-        _non_changed => \&_user_nonchanged,
-    },
-    'requestees.login_name' => {
-        _non_changed => \&_user_nonchanged,
-    },
-    'setters.login_name' => {
-        _non_changed => \&_user_nonchanged,    
-    },
-    qa_contact => {
-        _non_changed => \&_user_nonchanged,
-    },
-    qa_contact_realname => {
-        _non_changed => \&_user_nonchanged,
-    },
 
-    # General Bug Fields
-    alias        => { _non_changed => \&_alias_nonchanged },
-    'attach_data.thedata' => MULTI_SELECT_OVERRIDE,
-    # We check all attachment fields against this.
-    attachments  => MULTI_SELECT_OVERRIDE,
-    blocked      => MULTI_SELECT_OVERRIDE,
-    bug_file_loc => { _non_changed => \&_nullable },
-    bug_group    => MULTI_SELECT_OVERRIDE,
-    classification => {
-        _non_changed => \&_classification_nonchanged,
-    },
-    component => {
-        _non_changed => \&_component_nonchanged,
-    },
-    content => {
-        matches    => \&_content_matches,
-        notmatches => \&_content_matches,
-        _default   => sub { ThrowUserError("search_content_without_matches"); },
-    },
-    days_elapsed => {
-        _default => \&_days_elapsed,
-    },
-    dependson        => MULTI_SELECT_OVERRIDE,
-    keywords         => MULTI_SELECT_OVERRIDE,
-    'flagtypes.name' => {
-        _non_changed => \&_flagtypes_nonchanged,
-    },
-    longdesc => {
-        changedby     => \&_long_desc_changedby,
-        changedbefore => \&_long_desc_changedbefore_after,
-        changedafter  => \&_long_desc_changedbefore_after,
-        _non_changed  => \&_long_desc_nonchanged,
-    },
-    'longdescs.count' => {
-        changedby     => \&_long_desc_changedby,
-        changedbefore => \&_long_desc_changedbefore_after,
-        changedafter  => \&_long_desc_changedbefore_after,
-        changedfrom   => \&_invalid_combination,
-        changedto     => \&_invalid_combination,
-        _default      => \&_long_descs_count,
-    },
-    'longdescs.isprivate' => MULTI_SELECT_OVERRIDE,
-    owner_idle_time => {
-        greaterthan   => \&_owner_idle_time_greater_less,
-        greaterthaneq => \&_owner_idle_time_greater_less,
-        lessthan      => \&_owner_idle_time_greater_less,
-        lessthaneq    => \&_owner_idle_time_greater_less,
-        _default      => \&_invalid_combination,
-    },
-    product => {
-        _non_changed => \&_product_nonchanged,
-    },
-    tag => MULTI_SELECT_OVERRIDE,
-    comment_tag => MULTI_SELECT_OVERRIDE,
-
-    # Timetracking Fields
-    deadline => { _non_changed => \&_deadline },
-    percentage_complete => {
-        _non_changed => \&_percentage_complete,
-    },
-    work_time => {
-        changedby     => \&_work_time_changedby,
-        changedbefore => \&_work_time_changedbefore_after,
-        changedafter  => \&_work_time_changedbefore_after,
-        _default      => \&_work_time,
-    },
-    last_visit_ts => {
-        _non_changed => \&_last_visit_ts,
-        _default     => \&_last_visit_ts_invalid_operator,
-    },
-    
-    # Custom Fields
-    FIELD_TYPE_FREETEXT, { _non_changed => \&_nullable },
-    FIELD_TYPE_BUG_ID,   { _non_changed => \&_nullable_int },
-    FIELD_TYPE_DATETIME, { _non_changed => \&_nullable_datetime },
-    FIELD_TYPE_DATE,     { _non_changed => \&_nullable_date },
-    FIELD_TYPE_TEXTAREA, { _non_changed => \&_nullable },
-    FIELD_TYPE_MULTI_SELECT, MULTI_SELECT_OVERRIDE,
-    FIELD_TYPE_BUG_URLS,     MULTI_SELECT_OVERRIDE,    
+  # User fields
+  'attachments.submitter' => {_non_changed => \&_user_nonchanged,},
+  assigned_to             => {_non_changed => \&_user_nonchanged,},
+  assigned_to_realname    => {_non_changed => \&_user_nonchanged,},
+  cc                      => {_non_changed => \&_user_nonchanged,},
+  commenter               => {_non_changed => \&_user_nonchanged,},
+  reporter                => {_non_changed => \&_user_nonchanged,},
+  reporter_realname       => {_non_changed => \&_user_nonchanged,},
+  'requestees.login_name' => {_non_changed => \&_user_nonchanged,},
+  'setters.login_name'    => {_non_changed => \&_user_nonchanged,},
+  qa_contact              => {_non_changed => \&_user_nonchanged,},
+  qa_contact_realname     => {_non_changed => \&_user_nonchanged,},
+
+  # General Bug Fields
+  alias                 => {_non_changed => \&_alias_nonchanged},
+  'attach_data.thedata' => MULTI_SELECT_OVERRIDE,
+
+  # We check all attachment fields against this.
+  attachments    => MULTI_SELECT_OVERRIDE,
+  blocked        => MULTI_SELECT_OVERRIDE,
+  bug_file_loc   => {_non_changed => \&_nullable},
+  bug_group      => MULTI_SELECT_OVERRIDE,
+  classification => {_non_changed => \&_classification_nonchanged,},
+  component      => {_non_changed => \&_component_nonchanged,},
+  content        => {
+    matches    => \&_content_matches,
+    notmatches => \&_content_matches,
+    _default   => sub { ThrowUserError("search_content_without_matches"); },
+  },
+  days_elapsed => {_default => \&_days_elapsed,},
+  dependson    => MULTI_SELECT_OVERRIDE,
+  dupe_of      => {
+    %{&MULTI_SELECT_OVERRIDE},
+    changedby     => \&_dupe_of_changedby,
+    changedbefore => \&_dupe_of_changedbefore_after,
+    changedafter  => \&_dupe_of_changedbefore_after,
+    changedfrom   => \&_invalid_combination,
+    changedto     => \&_invalid_combination,
+  },
+  keywords         => MULTI_SELECT_OVERRIDE,
+  'flagtypes.name' => {_non_changed => \&_flagtypes_nonchanged,},
+  longdesc         => {
+    changedby     => \&_long_desc_changedby,
+    changedbefore => \&_long_desc_changedbefore_after,
+    changedafter  => \&_long_desc_changedbefore_after,
+    _non_changed  => \&_long_desc_nonchanged,
+  },
+  'longdescs.count' => {
+    changedby     => \&_long_desc_changedby,
+    changedbefore => \&_long_desc_changedbefore_after,
+    changedafter  => \&_long_desc_changedbefore_after,
+    changedfrom   => \&_invalid_combination,
+    changedto     => \&_invalid_combination,
+    _default      => \&_long_descs_count,
+  },
+  'longdescs.isprivate' => MULTI_SELECT_OVERRIDE,
+  owner_idle_time       => {
+    greaterthan   => \&_owner_idle_time_greater_less,
+    greaterthaneq => \&_owner_idle_time_greater_less,
+    lessthan      => \&_owner_idle_time_greater_less,
+    lessthaneq    => \&_owner_idle_time_greater_less,
+    _default      => \&_invalid_combination,
+  },
+  product     => {_non_changed => \&_product_nonchanged,},
+  tag         => MULTI_SELECT_OVERRIDE,
+  comment_tag => MULTI_SELECT_OVERRIDE,
+
+  # Timetracking Fields
+  deadline            => {_non_changed => \&_deadline},
+  percentage_complete => {_non_changed => \&_percentage_complete,},
+  work_time           => {
+    changedby     => \&_work_time_changedby,
+    changedbefore => \&_work_time_changedbefore_after,
+    changedafter  => \&_work_time_changedbefore_after,
+    _default      => \&_work_time,
+  },
+  last_visit_ts => {
+    _non_changed => \&_last_visit_ts,
+    _default     => \&_last_visit_ts_invalid_operator,
+  },
+
+  # Custom Fields
+  FIELD_TYPE_FREETEXT,
+  {_non_changed => \&_nullable},
+  FIELD_TYPE_BUG_ID,
+  {_non_changed => \&_nullable_int},
+  FIELD_TYPE_DATETIME,
+  {_non_changed => \&_nullable_datetime},
+  FIELD_TYPE_DATE,
+  {_non_changed => \&_nullable_date},
+  FIELD_TYPE_TEXTAREA,
+  {_non_changed => \&_nullable},
+  FIELD_TYPE_MULTI_SELECT,
+  MULTI_SELECT_OVERRIDE,
+  FIELD_TYPE_BUG_URLS,
+  MULTI_SELECT_OVERRIDE,
 };
 
 # These are fields where special action is taken depending on the
 # *value* passed in to the chart, sometimes.
 # This is a sub because custom fields are dynamic
 sub SPECIAL_PARSING {
-    my $map = {
-        # Pronoun Fields (Ones that can accept %user%, etc.)
-        assigned_to => \&_contact_pronoun,
-        cc          => \&_contact_pronoun,
-        commenter   => \&_contact_pronoun,
-        qa_contact  => \&_contact_pronoun,
-        reporter    => \&_contact_pronoun,
-        'setters.login_name' => \&_contact_pronoun,
-        'requestees.login_name' => \&_contact_pronoun,
-
-        # Date Fields that accept the 1d, 1w, 1m, 1y, etc. format.
-        creation_ts => \&_datetime_translate,
-        deadline    => \&_date_translate,
-        delta_ts    => \&_datetime_translate,
-
-        # last_visit field that accept both a 1d, 1w, 1m, 1y format and the
-        # %last_changed% pronoun.
-        last_visit_ts => \&_last_visit_datetime,
-    };
-    foreach my $field (Bugzilla->active_custom_fields) {
-        if ($field->type == FIELD_TYPE_DATETIME) {
-            $map->{$field->name} = \&_datetime_translate;
-        } elsif ($field->type == FIELD_TYPE_DATE) {
-            $map->{$field->name} = \&_date_translate;
-        }
-    }
-    return $map;
-};
+  my $map = {
+
+    # Pronoun Fields (Ones that can accept %user%, etc.)
+    assigned_to             => \&_contact_pronoun,
+    'attachments.submitter' => \&_contact_pronoun,
+    cc                      => \&_contact_pronoun,
+    commenter               => \&_contact_pronoun,
+    qa_contact              => \&_contact_pronoun,
+    reporter                => \&_contact_pronoun,
+    'setters.login_name'    => \&_contact_pronoun,
+    'requestees.login_name' => \&_contact_pronoun,
+
+    # Date Fields that accept the 1d, 1w, 1m, 1y, etc. format.
+    creation_ts => \&_datetime_translate,
+    deadline    => \&_date_translate,
+    delta_ts    => \&_datetime_translate,
+
+    # last_visit field that accept both a 1d, 1w, 1m, 1y format and the
+    # %last_changed% pronoun.
+    last_visit_ts => \&_last_visit_datetime,
+  };
+  foreach my $field (Bugzilla->active_custom_fields) {
+    if ($field->type == FIELD_TYPE_DATETIME) {
+      $map->{$field->name} = \&_datetime_translate;
+    }
+    elsif ($field->type == FIELD_TYPE_DATE) {
+      $map->{$field->name} = \&_date_translate;
+    }
+  }
+  return $map;
+}
 
 # Information about fields that represent "users", used by _user_nonchanged.
 # There are other user fields than the ones listed here, but those use
 # defaults in _user_nonchanged.
 use constant USER_FIELDS => {
-    'attachments.submitter' => {
-        field    => 'submitter_id',
-        join     => { table => 'attachments' },
-        isprivate => 1,
-    },
-    cc => {
-        field => 'who',
-        join  => { table => 'cc' },
-    },
-    commenter => {
-        field => 'who',
-        join  => { table => 'longdescs', join => 'INNER' },
-        isprivate => 1,
-    },
-    qa_contact => {
-        nullable => 1,
-    },
-    'requestees.login_name' => {
-        nullable => 1,
-        field    => 'requestee_id',
-        join     => { table => 'flags' },
-    },
-    'setters.login_name' => {
-        field    => 'setter_id',
-        join     => { table => 'flags' },
-    },
+  'attachments.submitter' =>
+    {field => 'submitter_id', join => {table => 'attachments'}, isprivate => 1,},
+  cc        => {field => 'who', join => {table => 'cc'},},
+  commenter => {
+    field     => 'who',
+    join      => {table => 'longdescs', join => 'INNER'},
+    isprivate => 1,
+  },
+  qa_contact => {nullable => 1,},
+  'requestees.login_name' =>
+    {nullable => 1, field => 'requestee_id', join => {table => 'flags'},},
+  'setters.login_name' => {field => 'setter_id', join => {table => 'flags'},},
 };
 
 # Backwards compatibility for times that we changed the names of fields
 # or URL parameters.
 use constant FIELD_MAP => {
-    'attachments.thedata' => 'attach_data.thedata',
-    bugidtype => 'bug_id_type',
-    changedin => 'days_elapsed',
-    long_desc => 'longdesc',
-    tags      => 'tag',
+  'attachments.thedata' => 'attach_data.thedata',
+  bugidtype             => 'bug_id_type',
+  changedin             => 'days_elapsed',
+  long_desc             => 'longdesc',
+  tags                  => 'tag',
 };
 
 # Some fields are not sorted on themselves, but on other fields.
 # We need to have a list of these fields and what they map to.
 use constant SPECIAL_ORDER => {
-    'target_milestone' => {
-        order => ['map_target_milestone.sortkey','map_target_milestone.value'],
-        join  => {
-            table => 'milestones',
-            from  => 'target_milestone',
-            to    => 'value',
-            extra => ['bugs.product_id = map_target_milestone.product_id'],
-            join  => 'INNER',
-        }
-    },
+  'target_milestone' => {
+    order => ['map_target_milestone.sortkey', 'map_target_milestone.value'],
+    join  => {
+      table => 'milestones',
+      from  => 'target_milestone',
+      to    => 'value',
+      extra => ['bugs.product_id = map_target_milestone.product_id'],
+      join  => 'INNER',
+    }
+  },
 };
 
 # Certain columns require other columns to come before them
 # in _select_columns, and should be put there if they're not there.
 use constant COLUMN_DEPENDS => {
-    classification      => ['product'],
-    percentage_complete => ['actual_time', 'remaining_time'],
+  classification      => ['product'],
+  percentage_complete => ['actual_time', 'remaining_time'],
 };
 
 # This describes tables that must be joined when you want to display
@@ -447,109 +426,81 @@ use constant COLUMN_DEPENDS => {
 # DB::Schema to figure out what needs to be joined, but for some
 # fields it needs a little help.
 sub COLUMN_JOINS {
-    my $invocant = shift;
-    my $user = blessed($invocant) ? $invocant->_user : Bugzilla->user;
-
-    my $joins = {
-        actual_time => {
-            table => '(SELECT bug_id, SUM(work_time) AS total'
-                     . ' FROM longdescs GROUP BY bug_id)',
-            join  => 'INNER',
-        },
-        alias => {
-            table => 'bugs_aliases',
-            as => 'map_alias',
-        },
-        assigned_to => {
-            from  => 'assigned_to',
-            to    => 'userid',
-            table => 'profiles',
-            join  => 'INNER',
-        },
-        reporter => {
-            from  => 'reporter',
-            to    => 'userid',
-            table => 'profiles',
-            join  => 'INNER',
-        },
-        qa_contact => {
-            from  => 'qa_contact',
-            to    => 'userid',
-            table => 'profiles',
-        },
-        component => {
-            from  => 'component_id',
-            to    => 'id',
-            table => 'components',
-            join  => 'INNER',
-        },
-        product => {
-            from  => 'product_id',
-            to    => 'id',
-            table => 'products',
-            join  => 'INNER',
-        },
-        classification => {
-            table => 'classifications',
-            from  => 'map_product.classification_id',
-            to    => 'id',
-            join  => 'INNER',
-        },
-        'flagtypes.name' => {
-            as    => 'map_flags',
-            table => 'flags',
-            extra => ['map_flags.attach_id IS NULL'],
-            then_to => {
-                as    => 'map_flagtypes',
-                table => 'flagtypes',
-                from  => 'map_flags.type_id',
-                to    => 'id',
-            },
-        },
-        keywords => {
-            table => 'keywords',
-            then_to => {
-                as    => 'map_keyworddefs',
-                table => 'keyworddefs',
-                from  => 'map_keywords.keywordid',
-                to    => 'id',
-            },
-        },
-        blocked => {
-            table => 'dependencies',
-            to => 'dependson',
-        },
-        dependson => {
-            table => 'dependencies',
-            to => 'blocked',
-        },
-        'longdescs.count' => {
-            table => 'longdescs',
-            join  => 'INNER',
-        },
-        tag => {
-            as => 'map_bug_tag',
-            table => 'bug_tag',
-            then_to => {
-                as => 'map_tag',
-                table => 'tag',
-                extra => ['map_tag.user_id = ' . $user->id],
-                from => 'map_bug_tag.tag_id',
-                to => 'id',
-            },
-        },
-        last_visit_ts => {
-            as    => 'bug_user_last_visit',
-            table => 'bug_user_last_visit',
-            extra => ['bug_user_last_visit.user_id = ' . $user->id],
-            from  => 'bug_id',
-            to    => 'bug_id',
-        },
-    };
-    return $joins;
-};
+  my $invocant = shift;
+  my $user = blessed($invocant) ? $invocant->_user : Bugzilla->user;
+
+  my $joins = {
+    actual_time => {
+      table => '(SELECT bug_id, SUM(work_time) AS total'
+        . ' FROM longdescs GROUP BY bug_id)',
+      join => 'INNER',
+    },
+    alias       => {table => 'bugs_aliases', as => 'map_alias',},
+    assigned_to => {
+      from  => 'assigned_to',
+      to    => 'userid',
+      table => 'profiles',
+      join  => 'INNER',
+    },
+    reporter =>
+      {from => 'reporter', to => 'userid', table => 'profiles', join => 'INNER',},
+    qa_contact => {from => 'qa_contact', to => 'userid', table => 'profiles',},
+    component =>
+      {from => 'component_id', to => 'id', table => 'components', join => 'INNER',},
+    product =>
+      {from => 'product_id', to => 'id', table => 'products', join => 'INNER',},
+    classification => {
+      table => 'classifications',
+      from  => 'map_product.classification_id',
+      to    => 'id',
+      join  => 'INNER',
+    },
+    'flagtypes.name' => {
+      as      => 'map_flags',
+      table   => 'flags',
+      extra   => ['map_flags.attach_id IS NULL'],
+      then_to => {
+        as    => 'map_flagtypes',
+        table => 'flagtypes',
+        from  => 'map_flags.type_id',
+        to    => 'id',
+      },
+    },
+    keywords => {
+      table   => 'keywords',
+      then_to => {
+        as    => 'map_keyworddefs',
+        table => 'keyworddefs',
+        from  => 'map_keywords.keywordid',
+        to    => 'id',
+      },
+    },
+    blocked           => {table => 'dependencies', to   => 'dependson',},
+    dependson         => {table => 'dependencies', to   => 'blocked',},
+    'longdescs.count' => {table => 'longdescs',    join => 'INNER',},
+    tag               => {
+      as      => 'map_bug_tag',
+      table   => 'bug_tag',
+      then_to => {
+        as    => 'map_tag',
+        table => 'tag',
+        extra => ['map_tag.user_id = ' . $user->id],
+        from  => 'map_bug_tag.tag_id',
+        to    => 'id',
+      },
+    },
+    last_visit_ts => {
+      as    => 'bug_user_last_visit',
+      table => 'bug_user_last_visit',
+      extra => ['bug_user_last_visit.user_id = ' . $user->id],
+      from  => 'bug_id',
+      to    => 'bug_id',
+    },
+  };
+  return $joins;
+}
 
-# This constant defines the columns that can be selected in a query 
+# This constant defines the columns that can be selected in a query
 # and/or displayed in a bug list.  Column records include the following
 # fields:
 #
@@ -559,7 +510,7 @@ sub COLUMN_JOINS {
 #          that returns the value of the column);
 #
 # 3. title: The title of the column as displayed to users.
-# 
+#
 # Note: There are a few hacks in the code that deviate from these definitions.
 #       In particular, the redundant short_desc column is removed when the
 #       client requests "all" columns.
@@ -570,149 +521,149 @@ sub COLUMN_JOINS {
 # and we don't want it to happen at compile time, so we have it as a
 # subroutine.
 sub COLUMNS {
-    my $invocant = shift;
-    my $user = blessed($invocant) ? $invocant->_user : Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
-    my $cache = Bugzilla->request_cache;
+  my $invocant = shift;
+  my $user     = blessed($invocant) ? $invocant->_user : Bugzilla->user;
+  my $dbh      = Bugzilla->dbh;
+  my $cache    = Bugzilla->request_cache;
 
-    if (defined $cache->{search_columns}->{$user->id}) {
-        return $cache->{search_columns}->{$user->id};
-    }
-
-    # These are columns that don't exist in fielddefs, but are valid buglist
-    # columns. (Also see near the bottom of this function for the definition
-    # of short_short_desc.)
-    my %columns = (
-        relevance            => { title => 'Relevance'  },
-    );
-
-    # Next we define columns that have special SQL instead of just something
-    # like "bugs.bug_id".
-    my $total_time = "(map_actual_time.total + bugs.remaining_time)";
-    my %special_sql = (
-        alias       => $dbh->sql_group_concat('DISTINCT map_alias.alias'),
-        deadline    => $dbh->sql_date_format('bugs.deadline', '%Y-%m-%d'),
-        actual_time => 'map_actual_time.total',
-
-        # "FLOOR" is in there to turn this into an integer, making searches
-        # totally predictable. Otherwise you get floating-point numbers that
-        # are rather hard to search reliably if you're asking for exact
-        # numbers.
-        percentage_complete =>
-            "(CASE WHEN $total_time = 0"
-               . " THEN 0"
-               . " ELSE FLOOR(100 * (map_actual_time.total / $total_time))"
-                . " END)",
-
-        'flagtypes.name' => $dbh->sql_group_concat('DISTINCT ' 
-            . $dbh->sql_string_concat('map_flagtypes.name', 'map_flags.status'),
-            undef, undef, 'map_flagtypes.sortkey, map_flagtypes.name'),
-
-        'keywords' => $dbh->sql_group_concat('DISTINCT map_keyworddefs.name'),
-
-        blocked => $dbh->sql_group_concat('DISTINCT map_blocked.blocked'),
-        dependson => $dbh->sql_group_concat('DISTINCT map_dependson.dependson'),
-        
-        'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)',
-
-        tag => $dbh->sql_group_concat('DISTINCT map_tag.name'),
-        last_visit_ts => 'bug_user_last_visit.last_visit_ts',
-    );
-
-    # Backward-compatibility for old field names. Goes new_name => old_name.
-    # These are here and not in _translate_old_column because the rest of the
-    # code actually still uses the old names, while the fielddefs table uses
-    # the new names (which is not the case for the fields handled by
-    # _translate_old_column).
-    my %old_names = (
-        creation_ts => 'opendate',
-        delta_ts    => 'changeddate',
-        work_time   => 'actual_time',
-    );
-
-    # Fields that are email addresses
-    my @email_fields = qw(assigned_to reporter qa_contact);
-    # Other fields that are stored in the bugs table as an id, but
-    # should be displayed using their name.
-    my @id_fields = qw(product component classification);
-
-    foreach my $col (@email_fields) {
-        my $sql = "map_${col}.login_name";
-        if (!$user->id) {
-             $sql = $dbh->sql_string_until($sql, $dbh->quote('@'));
-        }
-        $special_sql{$col} = $sql;
-        $special_sql{"${col}_realname"} = "map_${col}.realname";
-    }
-
-    foreach my $col (@id_fields) {
-        $special_sql{$col} = "map_${col}.name";
+  if (defined $cache->{search_columns}->{$user->id}) {
+    return $cache->{search_columns}->{$user->id};
+  }
+
+  # These are columns that don't exist in fielddefs, but are valid buglist
+  # columns. (Also see near the bottom of this function for the definition
+  # of short_short_desc.)
+  my %columns = (relevance => {title => 'Relevance'},);
+
+  # Next we define columns that have special SQL instead of just something
+  # like "bugs.bug_id".
+  my $total_time  = "(map_actual_time.total + bugs.remaining_time)";
+  my %special_sql = (
+    alias       => $dbh->sql_group_concat('DISTINCT map_alias.alias'),
+    deadline    => $dbh->sql_date_format('bugs.deadline', '%Y-%m-%d'),
+    actual_time => 'map_actual_time.total',
+
+    # "FLOOR" is in there to turn this into an integer, making searches
+    # totally predictable. Otherwise you get floating-point numbers that
+    # are rather hard to search reliably if you're asking for exact
+    # numbers.
+    percentage_complete => "(CASE WHEN $total_time = 0"
+      . " THEN 0"
+      . " ELSE FLOOR(100 * (map_actual_time.total / $total_time))" . " END)",
+
+    'flagtypes.name' => $dbh->sql_group_concat(
+      'DISTINCT ' . $dbh->sql_string_concat('map_flagtypes.name', 'map_flags.status'),
+      undef,
+      undef,
+      'map_flagtypes.sortkey, map_flagtypes.name'
+    ),
+
+    'keywords' => $dbh->sql_group_concat('DISTINCT map_keyworddefs.name'),
+
+    blocked   => $dbh->sql_group_concat('DISTINCT map_blocked.blocked'),
+    dependson => $dbh->sql_group_concat('DISTINCT map_dependson.dependson'),
+
+    'longdescs.count' => 'COUNT(DISTINCT map_longdescs_count.comment_id)',
+
+    tag           => $dbh->sql_group_concat('DISTINCT map_tag.name'),
+    last_visit_ts => 'bug_user_last_visit.last_visit_ts',
+  );
+
+  # Backward-compatibility for old field names. Goes new_name => old_name.
+  # These are here and not in _translate_old_column because the rest of the
+  # code actually still uses the old names, while the fielddefs table uses
+  # the new names (which is not the case for the fields handled by
+  # _translate_old_column).
+  my %old_names = (
+    creation_ts => 'opendate',
+    delta_ts    => 'changeddate',
+    work_time   => 'actual_time',
+  );
+
+  # Fields that are email addresses
+  my @email_fields = qw(assigned_to reporter qa_contact);
+
+  # Other fields that are stored in the bugs table as an id, but
+  # should be displayed using their name.
+  my @id_fields = qw(product component classification);
+
+  foreach my $col (@email_fields) {
+    my $sql = "map_${col}.login_name";
+    if (!$user->id) {
+      $sql = $dbh->sql_string_until($sql, $dbh->quote('@'));
+    }
+    $special_sql{$col} = $sql;
+    $special_sql{"${col}_realname"} = "map_${col}.realname";
+  }
+
+  foreach my $col (@id_fields) {
+    $special_sql{$col} = "map_${col}.name";
+  }
+
+  # Do the actual column-getting from fielddefs, now.
+  my @fields = @{Bugzilla->fields({obsolete => 0, buglist => 1})};
+  foreach my $field (@fields) {
+    my $id = $field->name;
+    $id = $old_names{$id} if exists $old_names{$id};
+    my $sql;
+    if (exists $special_sql{$id}) {
+      $sql = $special_sql{$id};
+    }
+    elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
+      $sql = $dbh->sql_group_concat('DISTINCT map_' . $field->name . '.value');
     }
-
-    # Do the actual column-getting from fielddefs, now.
-    my @fields = @{ Bugzilla->fields({ obsolete => 0, buglist => 1 }) };
-    foreach my $field (@fields) {
-        my $id = $field->name;
-        $id = $old_names{$id} if exists $old_names{$id};
-        my $sql;
-        if (exists $special_sql{$id}) {
-            $sql = $special_sql{$id};
-        }
-        elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
-            $sql = $dbh->sql_group_concat(
-                'DISTINCT map_' . $field->name . '.value');
-        }
-        else {
-            $sql = 'bugs.' . $field->name;
-        }
-        $columns{$id} = { name => $sql, title => $field->description };
+    else {
+      $sql = 'bugs.' . $field->name;
     }
+    $columns{$id} = {name => $sql, title => $field->description};
+  }
 
-    # The short_short_desc column is identical to short_desc
-    $columns{'short_short_desc'} = $columns{'short_desc'};
+  # The short_short_desc column is identical to short_desc
+  $columns{'short_short_desc'} = $columns{'short_desc'};
 
-    Bugzilla::Hook::process('buglist_columns', { columns => \%columns });
+  Bugzilla::Hook::process('buglist_columns', {columns => \%columns});
 
-    $cache->{search_columns}->{$user->id} = \%columns;
-    return $cache->{search_columns}->{$user->id};
+  $cache->{search_columns}->{$user->id} = \%columns;
+  return $cache->{search_columns}->{$user->id};
 }
 
 sub REPORT_COLUMNS {
-    my $invocant = shift;
-    my $user = blessed($invocant) ? $invocant->_user : Bugzilla->user;
-
-    my $columns = dclone(blessed($invocant) ? $invocant->COLUMNS : COLUMNS);
-    # There's no reason to support reporting on unique fields.
-    # Also, some other fields don't make very good reporting axises,
-    # or simply don't work with the current reporting system.
-    my @no_report_columns = 
-        qw(bug_id alias short_short_desc opendate changeddate
-           flagtypes.name relevance);
-
-    # If you're not a time-tracker, you can't use time-tracking
-    # columns.
-    if (!$user->is_timetracker) {
-        push(@no_report_columns, TIMETRACKING_FIELDS);
-    }
+  my $invocant = shift;
+  my $user = blessed($invocant) ? $invocant->_user : Bugzilla->user;
 
-    foreach my $name (@no_report_columns) {
-        delete $columns->{$name};
-    }
-    return $columns;
+  my $columns = dclone(blessed($invocant) ? $invocant->COLUMNS : COLUMNS);
+
+  # There's no reason to support reporting on unique fields.
+  # Also, some other fields don't make very good reporting axises,
+  # or simply don't work with the current reporting system.
+  my @no_report_columns = qw(bug_id alias short_short_desc opendate changeddate
+    flagtypes.name relevance);
+
+  # If you're not a time-tracker, you can't use time-tracking
+  # columns.
+  if (!$user->is_timetracker) {
+    push(@no_report_columns, TIMETRACKING_FIELDS);
+  }
+
+  foreach my $name (@no_report_columns) {
+    delete $columns->{$name};
+  }
+  return $columns;
 }
 
 # These are fields that never go into the GROUP BY on any DB. bug_id
 # is here because it *always* goes into the GROUP BY as the first item,
 # so it should be skipped when determining extra GROUP BY columns.
 use constant GROUP_BY_SKIP => qw(
-    blocked
-    bug_id
-    dependson
-    flagtypes.name
-    keywords
-    longdescs.count
-    percentage_complete
-    tag
+  alias
+  blocked
+  bug_id
+  dependson
+  flagtypes.name
+  keywords
+  longdescs.count
+  percentage_complete
+  tag
 );
 
 ###############
@@ -721,27 +672,27 @@ use constant GROUP_BY_SKIP => qw(
 
 # Note that the params argument may be modified by Bugzilla::Search
 sub new {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-  
-    my $self = { @_ };
-    bless($self, $class);
-    $self->{'user'} ||= Bugzilla->user;
-    
-    # There are certain behaviors of the CGI "Vars" hash that we don't want.
-    # In particular, if you put a single-value arrayref into it, later you
-    # get back out a string, which breaks anyexact charts (because they
-    # need arrays even for individual items, or we will re-trigger bug 67036).
-    #
-    # We can't just untie the hash--that would give us a hash with no values.
-    # We have to manually copy the hash into a new one, and we have to always
-    # do it, because there's no way to know if we were passed a tied hash
-    # or not.
-    my $params_in = $self->_params;
-    my %params = map { $_ => $params_in->{$_} } keys %$params_in;
-    $self->{params} = \%params;
-
-    return $self;
+  my $invocant = shift;
+  my $class = ref($invocant) || $invocant;
+
+  my $self = {@_};
+  bless($self, $class);
+  $self->{'user'} ||= Bugzilla->user;
+
+  # There are certain behaviors of the CGI "Vars" hash that we don't want.
+  # In particular, if you put a single-value arrayref into it, later you
+  # get back out a string, which breaks anyexact charts (because they
+  # need arrays even for individual items, or we will re-trigger bug 67036).
+  #
+  # We can't just untie the hash--that would give us a hash with no values.
+  # We have to manually copy the hash into a new one, and we have to always
+  # do it, because there's no way to know if we were passed a tied hash
+  # or not.
+  my $params_in = $self->_params;
+  my %params = map { $_ => $params_in->{$_} } keys %$params_in;
+  $self->{params} = \%params;
+
+  return $self;
 }
 
 
@@ -750,148 +701,156 @@ sub new {
 ####################
 
 sub data {
-    my $self = shift;
-    return $self->{data} if $self->{data};
-    my $dbh = Bugzilla->dbh;
-
-    # If all fields belong to the 'bugs' table, there is no need to split
-    # the original query into two pieces. Else we override the 'fields'
-    # argument to first get bug IDs based on the search criteria defined
-    # by the caller, and the desired fields are collected in the 2nd query.
-    my @orig_fields = $self->_input_columns;
-    my $all_in_bugs_table = 1;
-    foreach my $field (@orig_fields) {
-        next if ($self->COLUMNS->{$field}->{name} // $field) =~ /^bugs\.\w+$/;
-        $self->{fields} = ['bug_id'];
-        $all_in_bugs_table = 0;
-        last;
-    }
-
-    my $start_time = [gettimeofday()];
-    my $sql = $self->_sql;
-    # Do we just want bug IDs to pass to the 2nd query or all the data immediately?
-    my $func = $all_in_bugs_table ? 'selectall_arrayref' : 'selectcol_arrayref';
-    my $bug_ids = $dbh->$func($sql);
-    my @extra_data = ({sql => $sql, time => tv_interval($start_time)});
-    # Restore the original 'fields' argument, just in case.
-    $self->{fields} = \@orig_fields unless $all_in_bugs_table;
-
-    # If there are no bugs found, or all fields are in the 'bugs' table,
-    # there is no need for another query.
-    if (!scalar @$bug_ids || $all_in_bugs_table) {
-        $self->{data} = $bug_ids;
-        return wantarray ? ($self->{data}, \@extra_data) : $self->{data};
-    }
-
-    # Make sure the bug_id will be returned. If not, append it to the list.
-    my $pos = firstidx { $_ eq 'bug_id' } @orig_fields;
-    if ($pos < 0) {
-        push(@orig_fields, 'bug_id');
-        $pos = $#orig_fields;
-    }
-
-    # Now create a query with the buglist above as the single criteria
-    # and the fields that the caller wants. No need to redo security checks;
-    # the list has already been validated above.
-    my $search = $self->new('fields' => \@orig_fields,
-                            'params' => {bug_id => $bug_ids, bug_id_type => 'anyexact'},
-                            'sharer' => $self->_sharer_id,
-                            'user'   => $self->_user,
-                            'allow_unlimited'    => 1,
-                            '_no_security_check' => 1);
-
-    $start_time = [gettimeofday()];
-    $sql = $search->_sql;
-    my $unsorted_data = $dbh->selectall_arrayref($sql);
-    push(@extra_data, {sql => $sql, time => tv_interval($start_time)});
-    # Let's sort the data. We didn't do it in the query itself because
-    # we already know in which order to sort bugs thanks to the first query,
-    # and this avoids additional table joins in the SQL query.
-    my %data = map { $_->[$pos] => $_ } @$unsorted_data;
-    $self->{data} = [map { $data{$_} } @$bug_ids];
+  my $self = shift;
+  return $self->{data} if $self->{data};
+  my $dbh = Bugzilla->dbh;
+
+  # If all fields belong to the 'bugs' table, there is no need to split
+  # the original query into two pieces. Else we override the 'fields'
+  # argument to first get bug IDs based on the search criteria defined
+  # by the caller, and the desired fields are collected in the 2nd query.
+  my @orig_fields       = $self->_input_columns;
+  my $all_in_bugs_table = 1;
+  foreach my $field (@orig_fields) {
+    next if ($self->COLUMNS->{$field}->{name} // $field) =~ /^bugs\.\w+$/;
+    $self->{fields} = ['bug_id'];
+    $all_in_bugs_table = 0;
+    last;
+  }
+
+  my $start_time = [gettimeofday()];
+  my $sql        = $self->_sql;
+
+  # Do we just want bug IDs to pass to the 2nd query or all the data immediately?
+  my $func = $all_in_bugs_table ? 'selectall_arrayref' : 'selectcol_arrayref';
+  my $bug_ids = $dbh->$func($sql);
+  my @extra_data = ({sql => $sql, time => tv_interval($start_time)});
+
+  # Restore the original 'fields' argument, just in case.
+  $self->{fields} = \@orig_fields unless $all_in_bugs_table;
+
+  # If there are no bugs found, or all fields are in the 'bugs' table,
+  # there is no need for another query.
+  if (!scalar @$bug_ids || $all_in_bugs_table) {
+    $self->{data} = $bug_ids;
     return wantarray ? ($self->{data}, \@extra_data) : $self->{data};
+  }
+
+  # Make sure the bug_id will be returned. If not, append it to the list.
+  my $pos = firstidx { $_ eq 'bug_id' } @orig_fields;
+  if ($pos < 0) {
+    push(@orig_fields, 'bug_id');
+    $pos = $#orig_fields;
+  }
+
+  # Now create a query with the buglist above as the single criteria
+  # and the fields that the caller wants. No need to redo security checks;
+  # the list has already been validated above.
+  my $search = $self->new(
+    'fields'             => \@orig_fields,
+    'params'             => {bug_id => $bug_ids, bug_id_type => 'anyexact'},
+    'sharer'             => $self->_sharer_id,
+    'user'               => $self->_user,
+    'allow_unlimited'    => 1,
+    '_no_security_check' => 1
+  );
+
+  $start_time = [gettimeofday()];
+  $sql        = $search->_sql;
+  my $unsorted_data = $dbh->selectall_arrayref($sql);
+  push(@extra_data, {sql => $sql, time => tv_interval($start_time)});
+
+  # Let's sort the data. We didn't do it in the query itself because
+  # we already know in which order to sort bugs thanks to the first query,
+  # and this avoids additional table joins in the SQL query.
+  my %data = map { $_->[$pos] => $_ } @$unsorted_data;
+  $self->{data} = [map { $data{$_} } @$bug_ids];
+  return wantarray ? ($self->{data}, \@extra_data) : $self->{data};
 }
 
 sub _sql {
-    my ($self) = @_;
-    return $self->{sql} if $self->{sql};
-    my $dbh = Bugzilla->dbh;
-
-    my ($joins, $clause) = $self->_charts_to_conditions();
-
-    if (!$clause->as_string
-        && !Bugzilla->params->{'search_allow_no_criteria'}
-        && !$self->{allow_unlimited})
-    {
-        ThrowUserError('buglist_parameters_required');
-    }
-
-    my $select = join(', ', $self->_sql_select);
-    my $from = $self->_sql_from($joins);
-    my $where = $self->_sql_where($clause);
-    my $group_by = $dbh->sql_group_by($self->_sql_group_by);
-    my $order_by = $self->_sql_order_by
-                   ? "\nORDER BY " . join(', ', $self->_sql_order_by) : '';
-    my $limit = $self->_sql_limit;
-    $limit = "\n$limit" if $limit;
-    
-    my $query = <<END;
+  my ($self) = @_;
+  return $self->{sql} if $self->{sql};
+  my $dbh = Bugzilla->dbh;
+
+  my ($joins, $clause) = $self->_charts_to_conditions();
+
+  if ( !$clause->as_string
+    && !Bugzilla->params->{'search_allow_no_criteria'}
+    && !$self->{allow_unlimited})
+  {
+    ThrowUserError('buglist_parameters_required');
+  }
+
+  my $select   = join(', ', $self->_sql_select);
+  my $from     = $self->_sql_from($joins);
+  my $where    = $self->_sql_where($clause);
+  my $group_by = $dbh->sql_group_by($self->_sql_group_by);
+  my $order_by
+    = $self->_sql_order_by
+    ? "\nORDER BY " . join(', ', $self->_sql_order_by)
+    : '';
+  my $limit = $self->_sql_limit;
+  $limit = "\n$limit" if $limit;
+
+  my $query = <<END;
 SELECT $select
   FROM $from
  WHERE $where
 $group_by$order_by$limit
 END
-    $self->{sql} = $query;
-    return $self->{sql};
+  $self->{sql} = $query;
+  return $self->{sql};
 }
 
 sub search_description {
-    my ($self, $params) = @_;
-    my $desc = $self->{'search_description'} ||= [];
-    if ($params) {
-        push(@$desc, $params);
-    }
-    # Make sure that the description has actually been generated if
-    # people are asking for the whole thing.
-    else {
-        $self->_sql;
-    }
-    return $self->{'search_description'};
+  my ($self, $params) = @_;
+  my $desc = $self->{'search_description'} ||= [];
+  if ($params) {
+    push(@$desc, $params);
+  }
+
+  # Make sure that the description has actually been generated if
+  # people are asking for the whole thing.
+  else {
+    $self->_sql;
+  }
+  return $self->{'search_description'};
 }
 
 sub boolean_charts_to_custom_search {
-    my ($self, $cgi_buffer) = @_;
-    my $boolean_charts = $self->_boolean_charts;
-    my @as_params = $boolean_charts ? $boolean_charts->as_params : ();
-
-    # We need to start our new ids after the last custom search "f" id.
-    # We can just pick the last id in the array because they are sorted
-    # numerically.
-    my $last_id = ($self->_field_ids)[-1];
-    my $count = defined($last_id) ? $last_id + 1 : 0;
-    foreach my $param_set (@as_params) {
-        foreach my $name (keys %$param_set) {
-            my $value = $param_set->{$name};
-            next if !defined $value;
-            $cgi_buffer->param($name . $count, $value);
-        }
-        $count++;
+  my ($self, $cgi_buffer) = @_;
+  my $boolean_charts = $self->_boolean_charts;
+  my @as_params = $boolean_charts ? $boolean_charts->as_params : ();
+
+  # We need to start our new ids after the last custom search "f" id.
+  # We can just pick the last id in the array because they are sorted
+  # numerically.
+  my $last_id = ($self->_field_ids)[-1];
+  my $count = defined($last_id) ? $last_id + 1 : 0;
+  foreach my $param_set (@as_params) {
+    foreach my $name (keys %$param_set) {
+      my $value = $param_set->{$name};
+      next if !defined $value;
+      $cgi_buffer->param($name . $count, $value);
     }
+    $count++;
+  }
 }
 
 sub invalid_order_columns {
-   my ($self) = @_;
-   my @invalid_columns;
-   foreach my $order ($self->_input_order) {
-       next if defined $self->_validate_order_column($order);
-       push(@invalid_columns, $order);
-   }
-   return \@invalid_columns;
+  my ($self) = @_;
+  my @invalid_columns;
+  foreach my $order ($self->_input_order) {
+    next if defined $self->_validate_order_column($order);
+    push(@invalid_columns, $order);
+  }
+  return \@invalid_columns;
 }
 
 sub order {
-   my ($self) = @_;
-   return $self->_valid_order;
+  my ($self) = @_;
+  return $self->_valid_order;
 }
 
 ######################
@@ -900,49 +859,61 @@ sub order {
 
 # Fields that are legal for boolean charts of any kind.
 sub _chart_fields {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    if (!$self->{chart_fields}) {
-        my $chart_fields = Bugzilla->fields({ by_name => 1 });
+  if (!$self->{chart_fields}) {
+    my $chart_fields = Bugzilla->fields({by_name => 1});
 
-        if (!$self->_user->is_timetracker) {
-            foreach my $tt_field (TIMETRACKING_FIELDS) {
-                delete $chart_fields->{$tt_field};
-            }
-        }
-        $self->{chart_fields} = $chart_fields;
+    if (!$self->_user->is_timetracker) {
+      foreach my $tt_field (TIMETRACKING_FIELDS) {
+        delete $chart_fields->{$tt_field};
+      }
     }
-    return $self->{chart_fields};
+    $self->{chart_fields} = $chart_fields;
+  }
+  return $self->{chart_fields};
 }
 
 # There are various places in Search.pm that we need to know the list of
 # valid multi-select fields--or really, fields that are stored like
 # multi-selects, which includes BUG_URLS fields.
 sub _multi_select_fields {
-    my ($self) = @_;
-    $self->{multi_select_fields} ||= Bugzilla->fields({
-        by_name => 1,
-        type    => [FIELD_TYPE_MULTI_SELECT, FIELD_TYPE_BUG_URLS]});
-    return $self->{multi_select_fields};
+  my ($self) = @_;
+  $self->{multi_select_fields}
+    ||= Bugzilla->fields({
+    by_name => 1, type => [FIELD_TYPE_MULTI_SELECT, FIELD_TYPE_BUG_URLS]
+    });
+  return $self->{multi_select_fields};
+}
+
+# Select custom fields have an active field, so we need to know these fields
+# too. The type is important as we handle them differently.
+sub _select_fields {
+  my ($self) = @_;
+  $self->{select_fields}
+    ||= Bugzilla->fields({
+    by_name => 1, type => [FIELD_TYPE_MULTI_SELECT, FIELD_TYPE_SINGLE_SELECT]
+    });
+  return $self->{select_fields};
 }
 
 # $self->{params} contains values that could be undef, could be a string,
 # or could be an arrayref. Sometimes we want that value as an array,
 # always.
 sub _param_array {
-    my ($self, $name) = @_;
-    my $value = $self->_params->{$name};
-    if (!defined $value) {
-        return ();
-    }
-    if (ref($value) eq 'ARRAY') {
-        return @$value;
-    }
-    return ($value);
-}
-
-sub _params { $_[0]->{params} }
-sub _user { return $_[0]->{user} }
+  my ($self, $name) = @_;
+  my $value = $self->_params->{$name};
+  if (!defined $value) {
+    return ();
+  }
+  if (ref($value) eq 'ARRAY') {
+    return @$value;
+  }
+  return ($value);
+}
+
+sub _params    { $_[0]->{params} }
+sub _user      { return $_[0]->{user} }
 sub _sharer_id { $_[0]->{sharer} }
 
 ##############################
@@ -951,81 +922,84 @@ sub _sharer_id { $_[0]->{sharer} }
 
 # These are the fields the user has chosen to display on the buglist,
 # exactly as they were passed to new().
-sub _input_columns { @{ $_[0]->{'fields'} || [] } }
+sub _input_columns { @{$_[0]->{'fields'} || []} }
 
 # These are columns that are also going to be in the SELECT for one reason
 # or another, but weren't actually requested by the caller.
 sub _extra_columns {
-    my ($self) = @_;
-    # Everything that's going to be in the ORDER BY must also be
-    # in the SELECT.
-    push(@{ $self->{extra_columns} }, $self->_valid_order_columns);
-    return @{ $self->{extra_columns} };
+  my ($self) = @_;
+
+  # Everything that's going to be in the ORDER BY must also be
+  # in the SELECT.
+  push(@{$self->{extra_columns}}, $self->_valid_order_columns);
+  return @{$self->{extra_columns}};
 }
 
 # For search functions to modify extra_columns. It doesn't matter if
 # people push the same column onto this array multiple times, because
 # _select_columns will call "uniq" on its final result.
 sub _add_extra_column {
-    my ($self, $column) = @_;
-    push(@{ $self->{extra_columns} }, $column);
+  my ($self, $column) = @_;
+  push(@{$self->{extra_columns}}, $column);
 }
 
 # These are the columns that we're going to be actually SELECTing.
 sub _display_columns {
-    my ($self) = @_;
-    return @{ $self->{display_columns} } if $self->{display_columns};
-
-    # Do not alter the list from _input_columns at all, even if there are
-    # duplicated columns. Those are passed by the caller, and the caller
-    # expects to get them back in the exact same order.
-    my @columns = $self->_input_columns;
-
-    # Only add columns which are not already listed.
-    my %list = map { $_ => 1 } @columns;
-    foreach my $column ($self->_extra_columns) {
-        push(@columns, $column) unless $list{$column}++;
-    }
-    $self->{display_columns} = \@columns;
-    return @{ $self->{display_columns} };
+  my ($self) = @_;
+  return @{$self->{display_columns}} if $self->{display_columns};
+
+  # Do not alter the list from _input_columns at all, even if there are
+  # duplicated columns. Those are passed by the caller, and the caller
+  # expects to get them back in the exact same order.
+  my @columns = $self->_input_columns;
+
+  # Only add columns which are not already listed.
+  my %list = map { $_ => 1 } @columns;
+  foreach my $column ($self->_extra_columns) {
+    push(@columns, $column) unless $list{$column}++;
+  }
+  $self->{display_columns} = \@columns;
+  return @{$self->{display_columns}};
 }
 
 # These are the columns that are involved in the query.
 sub _select_columns {
-    my ($self) = @_;
-    return @{ $self->{select_columns} } if $self->{select_columns};
-
-    my @select_columns;
-    foreach my $column ($self->_display_columns) {
-        if (my $add_first = COLUMN_DEPENDS->{$column}) {
-            push(@select_columns, @$add_first);
-        }
-        push(@select_columns, $column);
+  my ($self) = @_;
+  return @{$self->{select_columns}} if $self->{select_columns};
+
+  my @select_columns;
+  foreach my $column ($self->_display_columns) {
+    if (my $add_first = COLUMN_DEPENDS->{$column}) {
+      push(@select_columns, @$add_first);
     }
-    # Remove duplicated columns.
-    $self->{select_columns} = [uniq @select_columns];
-    return @{ $self->{select_columns} };
+    push(@select_columns, $column);
+  }
+
+  # Remove duplicated columns.
+  $self->{select_columns} = [uniq @select_columns];
+  return @{$self->{select_columns}};
 }
 
 # This takes _display_columns and translates it into the actual SQL that
 # will go into the SELECT clause.
 sub _sql_select {
-    my ($self) = @_;
-    my @sql_fields;
-    foreach my $column ($self->_display_columns) {
-        my $sql = $self->COLUMNS->{$column}->{name} // '';
-        if ($sql) {
-            my $alias = $column;
-            # Aliases cannot contain dots in them. We convert them to underscores.
-            $alias =~ tr/./_/;
-            $sql .= " AS $alias";
-        }
-        else {
-            $sql = $column;
-        }
-        push(@sql_fields, $sql);
+  my ($self) = @_;
+  my @sql_fields;
+  foreach my $column ($self->_display_columns) {
+    my $sql = $self->COLUMNS->{$column}->{name} // '';
+    if ($sql) {
+      my $alias = $column;
+
+      # Aliases cannot contain dots in them. We convert them to underscores.
+      $alias =~ tr/./_/;
+      $sql .= " AS $alias";
     }
-    return @sql_fields;
+    else {
+      $sql = $column;
+    }
+    push(@sql_fields, $sql);
+  }
+  return @sql_fields;
 }
 
 ################################
@@ -1034,85 +1008,83 @@ sub _sql_select {
 
 # The "order" that was requested by the consumer, exactly as it was
 # requested.
-sub _input_order { @{ $_[0]->{'order'} || [] } }
+sub _input_order { @{$_[0]->{'order'} || []} }
+
 # Requested order with invalid values removed and old names translated
 sub _valid_order {
-    my ($self) = @_;
-    return map { ($self->_validate_order_column($_)) } $self->_input_order;
+  my ($self) = @_;
+  return map { ($self->_validate_order_column($_)) } $self->_input_order;
 }
+
 # The valid order with just the column names, and no ASC or DESC.
 sub _valid_order_columns {
-    my ($self) = @_;
-    return map { (split_order_term($_))[0] } $self->_valid_order;
+  my ($self) = @_;
+  return map { (split_order_term($_))[0] } $self->_valid_order;
 }
 
 sub _validate_order_column {
-    my ($self, $order_item) = @_;
+  my ($self, $order_item) = @_;
 
-    # Translate old column names
-    my ($field, $direction) = split_order_term($order_item);
-    $field = $self->_translate_old_column($field);
+  # Translate old column names
+  my ($field, $direction) = split_order_term($order_item);
+  $field = $self->_translate_old_column($field);
 
-    # Only accept valid columns
-    return if (!exists $self->COLUMNS->{$field});
+  # Only accept valid columns
+  return if (!exists $self->COLUMNS->{$field});
 
-    # Relevance column can be used only with one or more fulltext searches
-    return if ($field eq 'relevance' && !$self->COLUMNS->{$field}->{name});
+  # Relevance column can be used only with one or more fulltext searches
+  return if ($field eq 'relevance' && !$self->COLUMNS->{$field}->{name});
 
-    $direction = " $direction" if $direction;
-    return "$field$direction";
+  $direction = " $direction" if $direction;
+  return "$field$direction";
 }
 
 # A hashref that describes all the special stuff that has to be done
 # for various fields if they go into the ORDER BY clause.
 sub _special_order {
-    my ($self) = @_;
-    return $self->{special_order} if $self->{special_order};
-    
-    my %special_order = %{ SPECIAL_ORDER() };
-    my $select_fields = Bugzilla->fields({ type => FIELD_TYPE_SINGLE_SELECT });
-    foreach my $field (@$select_fields) {
-        next if $field->is_abnormal;
-        my $name = $field->name;
-        $special_order{$name} = {
-            order => ["map_$name.sortkey", "map_$name.value"],
-            join  => {
-                table => $name,
-                from  => "bugs.$name",
-                to    => "value",
-                join  => 'INNER',
-            }
-        };
-    }
-    $self->{special_order} = \%special_order;
-    return $self->{special_order};
+  my ($self) = @_;
+  return $self->{special_order} if $self->{special_order};
+
+  my %special_order = %{SPECIAL_ORDER()};
+  my $select_fields = Bugzilla->fields({type => FIELD_TYPE_SINGLE_SELECT});
+  foreach my $field (@$select_fields) {
+    next if $field->is_abnormal;
+    my $name = $field->name;
+    $special_order{$name} = {
+      order => ["map_$name.sortkey", "map_$name.value"],
+      join => {table => $name, from => "bugs.$name", to => "value", join => 'INNER',}
+    };
+  }
+  $self->{special_order} = \%special_order;
+  return $self->{special_order};
 }
 
 sub _sql_order_by {
-    my ($self) = @_;
-    if (!$self->{sql_order_by}) {
-        my @order_by = map { $self->_translate_order_by_column($_) }
-                           $self->_valid_order;
-        $self->{sql_order_by} = \@order_by;
-    }
-    return @{ $self->{sql_order_by} };
+  my ($self) = @_;
+  if (!$self->{sql_order_by}) {
+    my @order_by
+      = map { $self->_translate_order_by_column($_) } $self->_valid_order;
+    $self->{sql_order_by} = \@order_by;
+  }
+  return @{$self->{sql_order_by}};
 }
 
 sub _translate_order_by_column {
-    my ($self, $order_by_item) = @_;
-
-    my ($field, $direction) = split_order_term($order_by_item);
-    
-    $direction = '' if lc($direction) eq 'asc';
-    my $special_order = $self->_special_order->{$field}->{order};
-    # Standard fields have underscores in their SELECT alias instead
-    # of a period (because aliases can't have periods).
-    $field =~ s/\./_/g;
-    my @items = $special_order ? @$special_order : $field;
-    if (lc($direction) eq 'desc') {
-        @items = map { "$_ DESC" } @items;
-    }
-    return @items;
+  my ($self, $order_by_item) = @_;
+
+  my ($field, $direction) = split_order_term($order_by_item);
+
+  $direction = '' if lc($direction) eq 'asc';
+  my $special_order = $self->_special_order->{$field}->{order};
+
+  # Standard fields have underscores in their SELECT alias instead
+  # of a period (because aliases can't have periods).
+  $field =~ s/\./_/g;
+  my @items = $special_order ? @$special_order : $field;
+  if (lc($direction) eq 'desc') {
+    @items = map {"$_ DESC"} @items;
+  }
+  return @items;
 }
 
 #############################
@@ -1120,32 +1092,30 @@ sub _translate_order_by_column {
 #############################
 
 sub _sql_limit {
-    my ($self) = @_;
-    my $limit = $self->_params->{limit};
-    my $offset = $self->_params->{offset};
-    
-    my $max_results = Bugzilla->params->{'max_search_results'};
-    if (!$self->{allow_unlimited} && (!$limit || $limit > $max_results)) {
-        $limit = $max_results;
-    }
-    
-    if (defined($offset) && !$limit) {
-        $limit = INT_MAX;
-    }
-    if (defined $limit) {
-        detaint_natural($limit) 
-            || ThrowCodeError('param_must_be_numeric', 
-                              { function => 'Bugzilla::Search::new',
-                                param    => 'limit' });
-        if (defined $offset) {
-            detaint_natural($offset)
-                || ThrowCodeError('param_must_be_numeric',
-                                  { function => 'Bugzilla::Search::new',
-                                    param    => 'offset' });
-        }
-        return Bugzilla->dbh->sql_limit($limit, $offset);
-    }
-    return '';
+  my ($self) = @_;
+  my $limit  = $self->_params->{limit};
+  my $offset = $self->_params->{offset};
+
+  my $max_results = Bugzilla->params->{'max_search_results'};
+  if (!$self->{allow_unlimited} && (!$limit || $limit > $max_results)) {
+    $limit = $max_results;
+  }
+
+  if (defined($offset) && !$limit) {
+    $limit = INT_MAX;
+  }
+  if (defined $limit) {
+    detaint_natural($limit)
+      || ThrowCodeError('param_must_be_numeric',
+      {function => 'Bugzilla::Search::new', param => 'limit'});
+    if (defined $offset) {
+      detaint_natural($offset)
+        || ThrowCodeError('param_must_be_numeric',
+        {function => 'Bugzilla::Search::new', param => 'offset'});
+    }
+    return Bugzilla->dbh->sql_limit($limit, $offset);
+  }
+  return '';
 }
 
 ############################
@@ -1153,176 +1123,176 @@ sub _sql_limit {
 ############################
 
 sub _column_join {
-    my ($self, $field) = @_;
-    # The _realname fields require the same join as the username fields.
-    $field =~ s/_realname$//;
-    my $column_joins = $self->_get_column_joins();
-    my $join_info = $column_joins->{$field};
-    if ($join_info) {
-        # Don't allow callers to modify the constant.
-        $join_info = dclone($join_info);
-    }
-    else {
-        if ($self->_multi_select_fields->{$field}) {
-            $join_info = { table => "bug_$field" };
-        }
-    }
-    if ($join_info and !$join_info->{as}) {
-        $join_info = dclone($join_info);
-        $join_info->{as} = "map_$field";
+  my ($self, $field) = @_;
+
+  # The _realname fields require the same join as the username fields.
+  $field =~ s/_realname$//;
+  my $column_joins = $self->_get_column_joins();
+  my $join_info    = $column_joins->{$field};
+  if ($join_info) {
+
+    # Don't allow callers to modify the constant.
+    $join_info = dclone($join_info);
+  }
+  else {
+    if ($self->_multi_select_fields->{$field}) {
+      $join_info = {table => "bug_$field"};
     }
-    return $join_info ? $join_info : ();
+  }
+  if ($join_info and !$join_info->{as}) {
+    $join_info = dclone($join_info);
+    $join_info->{as} = "map_$field";
+  }
+  return $join_info ? $join_info : ();
 }
 
 # Sometimes we join the same table more than once. In this case, we
 # want to AND all the various critiera that were used in both joins.
 sub _combine_joins {
-    my ($self, $joins) = @_;
-    my @result;
-    while(my $join = shift @$joins) {
-        my $name = $join->{as};
-        my ($others_like_me, $the_rest) = part { $_->{as} eq $name ? 0 : 1 }
-                                               @$joins;
-        if ($others_like_me) {
-            my $from = $join->{from};
-            my $to   = $join->{to};
-            # Sanity check to make sure that we have the same from and to
-            # for all the same-named joins.
-            if ($from) {
-                all { $_->{from} eq $from } @$others_like_me
-                  or die "Not all same-named joins have identical 'from': "
-                         . Dumper($join, $others_like_me);
-            }
-            if ($to) {
-                all { $_->{to} eq $to } @$others_like_me
-                  or die "Not all same-named joins have identical 'to': "
-                         . Dumper($join, $others_like_me);
-            }
-            
-            # We don't need to call uniq here--translate_join will do that
-            # for us.
-            my @conditions = map { @{ $_->{extra} || [] } }
-                                 ($join, @$others_like_me);
-            $join->{extra} = \@conditions;
-            $joins = $the_rest;
-        }
-        push(@result, $join);
-    }
-    
-    return @result;
+  my ($self, $joins) = @_;
+  my @result;
+  while (my $join = shift @$joins) {
+    my $name = $join->{as};
+    my ($others_like_me, $the_rest) = part { $_->{as} eq $name ? 0 : 1 }
+    @$joins;
+    if ($others_like_me) {
+      my $from = $join->{from};
+      my $to   = $join->{to};
+
+      # Sanity check to make sure that we have the same from and to
+      # for all the same-named joins.
+      if ($from) {
+        all { $_->{from} eq $from } @$others_like_me
+          or die "Not all same-named joins have identical 'from': "
+          . Dumper($join, $others_like_me);
+      }
+      if ($to) {
+        all { $_->{to} eq $to } @$others_like_me
+          or die "Not all same-named joins have identical 'to': "
+          . Dumper($join, $others_like_me);
+      }
+
+      # We don't need to call uniq here--translate_join will do that
+      # for us.
+      my @conditions = map { @{$_->{extra} || []} } ($join, @$others_like_me);
+      $join->{extra} = \@conditions;
+      $joins = $the_rest;
+    }
+    push(@result, $join);
+  }
+
+  return @result;
 }
 
 # Takes all the "then_to" items and just puts them as the next item in
 # the array. Right now this only does one level of "then_to", but we
 # could re-write this to handle then_to recursively if we need more levels.
 sub _extract_then_to {
-    my ($self, $joins) = @_;
-    my @result;
-    foreach my $join (@$joins) {
-        push(@result, $join);
-        if (my $then_to = $join->{then_to}) {
-            push(@result, $then_to);
-        }
+  my ($self, $joins) = @_;
+  my @result;
+  foreach my $join (@$joins) {
+    push(@result, $join);
+    if (my $then_to = $join->{then_to}) {
+      push(@result, $then_to);
     }
-    return @result;
+  }
+  return @result;
 }
 
 # JOIN statements for the SELECT and ORDER BY columns. This should not be
 # called until the moment it is needed, because _select_columns might be
 # modified by the charts.
 sub _select_order_joins {
-    my ($self) = @_;
-    my @joins;
-    foreach my $field ($self->_select_columns) {
-        my @column_join = $self->_column_join($field);
-        push(@joins, @column_join);
-    }
-    foreach my $field ($self->_valid_order_columns) {
-        my $join_info = $self->_special_order->{$field}->{join};
-        if ($join_info) {
-            # Don't let callers modify SPECIAL_ORDER.
-            $join_info = dclone($join_info);
-            if (!$join_info->{as}) {
-                $join_info->{as} = "map_$field";
-            }
-            push(@joins, $join_info);
-        }
+  my ($self) = @_;
+  my @joins;
+  foreach my $field ($self->_select_columns) {
+    my @column_join = $self->_column_join($field);
+    push(@joins, @column_join);
+  }
+  foreach my $field ($self->_valid_order_columns) {
+    my $join_info = $self->_special_order->{$field}->{join};
+    if ($join_info) {
+
+      # Don't let callers modify SPECIAL_ORDER.
+      $join_info = dclone($join_info);
+      if (!$join_info->{as}) {
+        $join_info->{as} = "map_$field";
+      }
+      push(@joins, $join_info);
     }
-    return @joins;
+  }
+  return @joins;
 }
 
 # These are the joins that are *always* in the FROM clause.
 sub _standard_joins {
-    my ($self) = @_;
-    my $user = $self->_user;
-    my @joins;
-    return () if $self->{_no_security_check};
-
-    my $security_join = {
-        table => 'bug_group_map',
-        as    => 'security_map',
-    };
-    push(@joins, $security_join);
+  my ($self) = @_;
+  my $user = $self->_user;
+  my @joins;
+  return () if $self->{_no_security_check};
 
-    if ($user->id) {
-        # See also _standard_joins for the other half of the below statement
-        if (!Bugzilla->params->{'or_groups'}) {
-            $security_join->{extra} =
-                ["NOT (" . $user->groups_in_sql('security_map.group_id') . ")"];
-        }
-
-        my $security_cc_join = {
-            table => 'cc',
-            as    => 'security_cc',
-            extra => ['security_cc.who = ' . $user->id],
-        };
-        push(@joins, $security_cc_join);
+  my $security_join = {table => 'bug_group_map', as => 'security_map',};
+  push(@joins, $security_join);
+
+  if ($user->id) {
+
+    # See also _standard_joins for the other half of the below statement
+    if (!Bugzilla->params->{'or_groups'}) {
+      $security_join->{extra}
+        = ["NOT (" . $user->groups_in_sql('security_map.group_id') . ")"];
     }
-    
-    return @joins;
+
+    my $security_cc_join = {
+      table => 'cc',
+      as    => 'security_cc',
+      extra => ['security_cc.who = ' . $user->id],
+    };
+    push(@joins, $security_cc_join);
+  }
+
+  return @joins;
 }
 
 sub _sql_from {
-    my ($self, $joins_input) = @_;
-    my @joins = ($self->_standard_joins, $self->_select_order_joins,
-                 @$joins_input);
-    @joins = $self->_extract_then_to(\@joins);
-    @joins = $self->_combine_joins(\@joins);
-    my @join_sql = map { $self->_translate_join($_) } @joins;
-    return "bugs\n" . join("\n", @join_sql);
+  my ($self, $joins_input) = @_;
+  my @joins = ($self->_standard_joins, $self->_select_order_joins, @$joins_input);
+  @joins = $self->_extract_then_to(\@joins);
+  @joins = $self->_combine_joins(\@joins);
+  my @join_sql = map { $self->_translate_join($_) } @joins;
+  return "bugs\n" . join("\n", @join_sql);
 }
 
 # This takes a join data structure and turns it into actual JOIN SQL.
 sub _translate_join {
-    my ($self, $join_info) = @_;
-    
-    die "join with no table: " . Dumper($join_info) if !$join_info->{table};
-    die "join with no 'as': " . Dumper($join_info) if !$join_info->{as};
-
-    my $from_table = $join_info->{bugs_table} || "bugs";
-    my $from  = $join_info->{from} || "bug_id";
-    if ($from =~ /^(\w+)\.(\w+)$/) {
-        ($from_table, $from) = ($1, $2);
-    }
-    my $table = $join_info->{table};
-    my $name  = $join_info->{as};
-    my $to    = $join_info->{to}    || "bug_id";
-    my $join  = $join_info->{join}  || 'LEFT';
-    my @extra = @{ $join_info->{extra} || [] };
-    $name =~ s/\./_/g;
-    
-    # If a term contains ORs, we need to put parens around the condition.
-    # This is a pretty weak test, but it's actually OK to put parens
-    # around too many things.
-    @extra = map { $_ =~ /\bOR\b/i ? "($_)" : $_ } @extra;
-    my $extra_condition = join(' AND ', uniq @extra);
-    if ($extra_condition) {
-        $extra_condition = " AND $extra_condition";
-    }
-
-    my @join_sql = "$join JOIN $table AS $name"
-                        . " ON $from_table.$from = $name.$to$extra_condition";
-    return @join_sql;
+  my ($self, $join_info) = @_;
+
+  die "join with no table: " . Dumper($join_info) if !$join_info->{table};
+  die "join with no 'as': " . Dumper($join_info)  if !$join_info->{as};
+
+  my $from_table = $join_info->{bugs_table} || "bugs";
+  my $from       = $join_info->{from}       || "bug_id";
+  if ($from =~ /^(\w+)\.(\w+)$/) {
+    ($from_table, $from) = ($1, $2);
+  }
+  my $table = $join_info->{table};
+  my $name  = $join_info->{as};
+  my $to    = $join_info->{to} || "bug_id";
+  my $join  = $join_info->{join} || 'LEFT';
+  my @extra = @{$join_info->{extra} || []};
+  $name =~ s/\./_/g;
+
+  # If a term contains ORs, we need to put parens around the condition.
+  # This is a pretty weak test, but it's actually OK to put parens
+  # around too many things.
+  @extra = map { $_ =~ /\bOR\b/i ? "($_)" : $_ } @extra;
+  my $extra_condition = join(' AND ', uniq @extra);
+  if ($extra_condition) {
+    $extra_condition = " AND $extra_condition";
+  }
+
+  my @join_sql = "$join JOIN $table AS $name"
+    . " ON $from_table.$from = $name.$to$extra_condition";
+  return @join_sql;
 }
 
 #############################
@@ -1335,54 +1305,60 @@ sub _translate_join {
 # The terms that are always in the WHERE clause. These implement bug
 # group security.
 sub _standard_where {
-    my ($self) = @_;
-    return ('1=1') if $self->{_no_security_check};
-    # If replication lags badly between the shadow db and the main DB,
-    # it's possible for bugs to show up in searches before their group
-    # controls are properly set. To prevent this, when initially creating
-    # bugs we set their creation_ts to NULL, and don't give them a creation_ts
-    # until their group controls are set. So if a bug has a NULL creation_ts,
-    # it shouldn't show up in searches at all.
-    my @where = ('bugs.creation_ts IS NOT NULL');
-
-    my $user = $self->_user;
-    my $security_term = '';
-    # See also _standard_joins for the other half of the below statement
-    if (Bugzilla->params->{'or_groups'}) {
-        $security_term .= " (security_map.group_id IS NULL OR security_map.group_id IN (" . $user->groups_as_string . "))";
-    }
-    else {
-        $security_term = 'security_map.group_id IS NULL';
-    }
-
-    if ($user->id) {
-        my $userid = $user->id;
-        # This indentation makes the resulting SQL more readable.
-        $security_term .= <<END;
+  my ($self) = @_;
+  return ('1=1') if $self->{_no_security_check};
+
+  # If replication lags badly between the shadow db and the main DB,
+  # it's possible for bugs to show up in searches before their group
+  # controls are properly set. To prevent this, when initially creating
+  # bugs we set their creation_ts to NULL, and don't give them a creation_ts
+  # until their group controls are set. So if a bug has a NULL creation_ts,
+  # it shouldn't show up in searches at all.
+  my @where = ('bugs.creation_ts IS NOT NULL');
+
+  my $user          = $self->_user;
+  my $security_term = '';
+
+  # See also _standard_joins for the other half of the below statement
+  if (Bugzilla->params->{'or_groups'}) {
+    $security_term
+      .= " (security_map.group_id IS NULL OR security_map.group_id IN ("
+      . $user->groups_as_string . "))";
+  }
+  else {
+    $security_term = 'security_map.group_id IS NULL';
+  }
+
+  if ($user->id) {
+    my $userid = $user->id;
+
+    # This indentation makes the resulting SQL more readable.
+    $security_term .= <<END;
 
         OR (bugs.reporter_accessible = 1 AND bugs.reporter = $userid)
         OR (bugs.cclist_accessible = 1 AND security_cc.who IS NOT NULL)
         OR bugs.assigned_to = $userid
 END
-        if (Bugzilla->params->{'useqacontact'}) {
-            $security_term.= "        OR bugs.qa_contact = $userid";
-        }
-        $security_term = "($security_term)";
+    if (Bugzilla->params->{'useqacontact'}) {
+      $security_term .= "        OR bugs.qa_contact = $userid";
     }
+    $security_term = "($security_term)";
+  }
 
-    push(@where, $security_term);
+  push(@where, $security_term);
 
-    return @where;
+  return @where;
 }
 
 sub _sql_where {
-    my ($self, $main_clause) = @_;
-    # The newline and this particular spacing makes the resulting
-    # SQL a bit more readable for debugging.
-    my $where = join("\n   AND ", $self->_standard_where);
-    my $clause_sql = $main_clause->as_string;
-    $where .= "\n   AND " . $clause_sql if $clause_sql;
-    return $where;
+  my ($self, $main_clause) = @_;
+
+  # The newline and this particular spacing makes the resulting
+  # SQL a bit more readable for debugging.
+  my $where = join("\n   AND ", $self->_standard_where);
+  my $clause_sql = $main_clause->as_string;
+  $where .= "\n   AND " . $clause_sql if $clause_sql;
+  return $where;
 }
 
 ################################
@@ -1392,40 +1368,40 @@ sub _sql_where {
 # And these are the fields that we have to do GROUP BY for in DBs
 # that are more strict about putting everything into GROUP BY.
 sub _sql_group_by {
-    my ($self) = @_;
-
-    # Strict DBs require every element from the SELECT to be in the GROUP BY,
-    # unless that element is being used in an aggregate function.
-    my @extra_group_by;
-    foreach my $column ($self->_select_columns) {
-        next if $self->_skip_group_by->{$column};
-        my $sql = $self->COLUMNS->{$column}->{name} // $column;
-        push(@extra_group_by, $sql);
-    }
+  my ($self) = @_;
 
-    # And all items from ORDER BY must be in the GROUP BY. The above loop 
-    # doesn't catch items that were put into the ORDER BY from SPECIAL_ORDER.
-    foreach my $column ($self->_valid_order_columns) {
-        my $special_order = $self->_special_order->{$column}->{order};
-        next if !$special_order;
-        push(@extra_group_by, @$special_order);
-    }
-    
-    @extra_group_by = uniq @extra_group_by;
-    
-    # bug_id is the only field we actually group by.
-    return ('bugs.bug_id', join(',', @extra_group_by));
+  # Strict DBs require every element from the SELECT to be in the GROUP BY,
+  # unless that element is being used in an aggregate function.
+  my @extra_group_by;
+  foreach my $column ($self->_select_columns) {
+    next if $self->_skip_group_by->{$column};
+    my $sql = $self->COLUMNS->{$column}->{name} // $column;
+    push(@extra_group_by, $sql);
+  }
+
+  # And all items from ORDER BY must be in the GROUP BY. The above loop
+  # doesn't catch items that were put into the ORDER BY from SPECIAL_ORDER.
+  foreach my $column ($self->_valid_order_columns) {
+    my $special_order = $self->_special_order->{$column}->{order};
+    next if !$special_order;
+    push(@extra_group_by, @$special_order);
+  }
+
+  @extra_group_by = uniq @extra_group_by;
+
+  # bug_id is the only field we actually group by.
+  return ('bugs.bug_id', join(',', @extra_group_by));
 }
 
 # A helper for _sql_group_by.
 sub _skip_group_by {
-    my ($self) = @_;
-    return $self->{skip_group_by} if $self->{skip_group_by};
-    my @skip_list = GROUP_BY_SKIP;
-    push(@skip_list, keys %{ $self->_multi_select_fields });
-    my %skip_hash = map { $_ => 1 } @skip_list;
-    $self->{skip_group_by} = \%skip_hash;
-    return $self->{skip_group_by};
+  my ($self) = @_;
+  return $self->{skip_group_by} if $self->{skip_group_by};
+  my @skip_list = GROUP_BY_SKIP;
+  push(@skip_list, keys %{$self->_multi_select_fields});
+  my %skip_hash = map { $_ => 1 } @skip_list;
+  $self->{skip_group_by} = \%skip_hash;
+  return $self->{skip_group_by};
 }
 
 ##############################################
@@ -1434,243 +1410,253 @@ sub _skip_group_by {
 
 # Backwards compatibility for old field names.
 sub _convert_old_params {
-    my ($self) = @_;
-    my $params = $self->_params;
-    
-    # bugidtype has different values in modern Search.pm.
-    if (defined $params->{'bugidtype'}) {
-        my $value = $params->{'bugidtype'};
-        $params->{'bugidtype'} = $value eq 'exclude' ? 'nowords' : 'anyexact';
-    }
-    
-    foreach my $old_name (keys %{ FIELD_MAP() }) {
-        if (defined $params->{$old_name}) {
-            my $new_name = FIELD_MAP->{$old_name};
-            $params->{$new_name} = delete $params->{$old_name};
-        }
+  my ($self) = @_;
+  my $params = $self->_params;
+
+  # bugidtype has different values in modern Search.pm.
+  if (defined $params->{'bugidtype'}) {
+    my $value = $params->{'bugidtype'};
+    $params->{'bugidtype'} = $value eq 'exclude' ? 'nowords' : 'anyexact';
+  }
+
+  foreach my $old_name (keys %{FIELD_MAP()}) {
+    if (defined $params->{$old_name}) {
+      my $new_name = FIELD_MAP->{$old_name};
+      $params->{$new_name} = delete $params->{$old_name};
     }
+  }
 }
 
 # This parses all the standard search parameters except for the boolean
 # charts.
 sub _special_charts {
-    my ($self) = @_;
-    $self->_convert_old_params();
-    $self->_special_parse_bug_status();
-    $self->_special_parse_resolution();
-    my $clause = new Bugzilla::Search::Clause();
-    $clause->add( $self->_parse_basic_fields()     );
-    $clause->add( $self->_special_parse_email()    );
-    $clause->add( $self->_special_parse_chfield()  );
-    $clause->add( $self->_special_parse_deadline() );
-    return $clause;
+  my ($self) = @_;
+  $self->_convert_old_params();
+  $self->_special_parse_bug_status();
+  $self->_special_parse_resolution();
+  my $clause = new Bugzilla::Search::Clause();
+  $clause->add($self->_parse_basic_fields());
+  $clause->add($self->_special_parse_email());
+  $clause->add($self->_special_parse_chfield());
+  $clause->add($self->_special_parse_deadline());
+  return $clause;
 }
 
 sub _parse_basic_fields {
-    my ($self) = @_;
-    my $params = $self->_params;
-    my $chart_fields = $self->_chart_fields;
-    
-    my $clause = new Bugzilla::Search::Clause();
-    foreach my $field_name (keys %$chart_fields) {
-        # CGI params shouldn't have periods in them, so we only accept
-        # period-separated fields with underscores where the periods go.
-        my $param_name = $field_name;
-        $param_name =~ s/\./_/g;
-        my @values = $self->_param_array($param_name);
-        next if !@values;
-        my $default_op = $param_name eq 'content' ? 'matches' : 'anyexact';
-        my $operator = $params->{"${param_name}_type"} || $default_op;
-        # Fields that are displayed as multi-selects are passed as arrays,
-        # so that they can properly search values that contain commas.
-        # However, other fields are sent as strings, so that they are properly
-        # split on commas if required.
-        my $field = $chart_fields->{$field_name};
-        my $pass_value;
-        if ($field->is_select or $field->name eq 'version'
-            or $field->name eq 'target_milestone')
-        {
-            $pass_value = \@values;
-        }
-        else {
-            $pass_value = join(',', @values);
-        }
-        $clause->add($field_name, $operator, $pass_value);
+  my ($self)       = @_;
+  my $params       = $self->_params;
+  my $chart_fields = $self->_chart_fields;
+
+  my $clause = new Bugzilla::Search::Clause();
+  foreach my $field_name (keys %$chart_fields) {
+
+    # CGI params shouldn't have periods in them, so we only accept
+    # period-separated fields with underscores where the periods go.
+    my $param_name = $field_name;
+    $param_name =~ s/\./_/g;
+    my @values = $self->_param_array($param_name);
+    next if !@values;
+    my $default_op = $param_name eq 'content' ? 'matches' : 'anyexact';
+    my $operator = $params->{"${param_name}_type"} || $default_op;
+
+    # Fields that are displayed as multi-selects are passed as arrays,
+    # so that they can properly search values that contain commas.
+    # However, other fields are sent as strings, so that they are properly
+    # split on commas if required.
+    my $field = $chart_fields->{$field_name};
+    my $pass_value;
+    if ( $field->is_select
+      or $field->name eq 'version'
+      or $field->name eq 'target_milestone')
+    {
+      $pass_value = \@values;
     }
-    return @{$clause->children} ? $clause : undef;
+    else {
+      $pass_value = join(',', @values);
+    }
+    $clause->add($field_name, $operator, $pass_value);
+  }
+  return @{$clause->children} ? $clause : undef;
 }
 
 sub _special_parse_bug_status {
-    my ($self) = @_;
-    my $params = $self->_params;
-    return if !defined $params->{'bug_status'};
-    # We want to allow the bug_status_type parameter to work normally,
-    # meaning that this special code should only be activated if we are
-    # doing the normal "anyexact" search on bug_status.
-    return if (defined $params->{'bug_status_type'}
-               and $params->{'bug_status_type'} ne 'anyexact');
-
-    my @bug_status = $self->_param_array('bug_status');
-    # Also include inactive bug statuses, as you can query them.
-    my $legal_statuses = $self->_chart_fields->{'bug_status'}->legal_values;
-
-    # If the status contains __open__ or __closed__, translate those
-    # into their equivalent lists of open and closed statuses.
-    if (grep { $_ eq '__open__' } @bug_status) {
-        my @open = grep { $_->is_open } @$legal_statuses;
-        @open = map { $_->name } @open;
-        push(@bug_status, @open);
-    }
-    if (grep { $_ eq '__closed__' } @bug_status) {
-        my @closed = grep { not $_->is_open } @$legal_statuses;
-        @closed = map { $_->name } @closed;
-        push(@bug_status, @closed);
-    }
-
-    @bug_status = uniq @bug_status;
-    my $all = grep { $_ eq "__all__" } @bug_status;
-    # This will also handle removing __open__ and __closed__ for us
-    # (__all__ too, which is why we check for it above, first).
-    @bug_status = _valid_values(\@bug_status, $legal_statuses);
-
-    # If the user has selected every status, change to selecting none.
-    # This is functionally equivalent, but quite a lot faster.
-    if ($all or scalar(@bug_status) == scalar(@$legal_statuses)) {
-        delete $params->{'bug_status'};
-    }
-    else {
-        $params->{'bug_status'} = \@bug_status;
-    }
+  my ($self) = @_;
+  my $params = $self->_params;
+  return if !defined $params->{'bug_status'};
+
+  # We want to allow the bug_status_type parameter to work normally,
+  # meaning that this special code should only be activated if we are
+  # doing the normal "anyexact" search on bug_status.
+  return
+    if (defined $params->{'bug_status_type'}
+    and $params->{'bug_status_type'} ne 'anyexact');
+
+  my @bug_status = $self->_param_array('bug_status');
+
+  # Also include inactive bug statuses, as you can query them.
+  my $legal_statuses = $self->_chart_fields->{'bug_status'}->legal_values;
+
+  # If the status contains __open__ or __closed__, translate those
+  # into their equivalent lists of open and closed statuses.
+  if (grep { $_ eq '__open__' } @bug_status) {
+    my @open = grep { $_->is_open } @$legal_statuses;
+    @open = map { $_->name } @open;
+    push(@bug_status, @open);
+  }
+  if (grep { $_ eq '__closed__' } @bug_status) {
+    my @closed = grep { not $_->is_open } @$legal_statuses;
+    @closed = map { $_->name } @closed;
+    push(@bug_status, @closed);
+  }
+
+  @bug_status = uniq @bug_status;
+  my $all = grep { $_ eq "__all__" } @bug_status;
+
+  # This will also handle removing __open__ and __closed__ for us
+  # (__all__ too, which is why we check for it above, first).
+  @bug_status = _valid_values(\@bug_status, $legal_statuses);
+
+  # If the user has selected every status, change to selecting none.
+  # This is functionally equivalent, but quite a lot faster.
+  if ($all or scalar(@bug_status) == scalar(@$legal_statuses)) {
+    delete $params->{'bug_status'};
+  }
+  else {
+    $params->{'bug_status'} = \@bug_status;
+  }
 }
 
 sub _special_parse_chfield {
-    my ($self) = @_;
-    my $params = $self->_params;
-    
-    my $date_from = trim(lc($params->{'chfieldfrom'} || ''));
-    my $date_to = trim(lc($params->{'chfieldto'} || ''));
-    $date_from = '' if $date_from eq 'now';
-    $date_to = '' if $date_to eq 'now';
-    my @fields = $self->_param_array('chfield');
-    my $value_to = $params->{'chfieldvalue'};
-    $value_to = '' if !defined $value_to;
-
-    @fields = map { $_ eq '[Bug creation]' ? 'creation_ts' : $_ } @fields;
-
-    return undef unless ($date_from ne '' || $date_to ne '' || $value_to ne '');
-
-    my $clause = new Bugzilla::Search::Clause();
-
-    # It is always safe and useful to push delta_ts into the charts
-    # if there is a "from" date specified. It doesn't conflict with
-    # searching [Bug creation], because a bug's delta_ts is set to
-    # its creation_ts when it is created. So this just gives the
-    # database an additional index to possibly choose, on a table that
-    # is smaller than bugs_activity.
-    if ($date_from ne '') {
-        $clause->add('delta_ts', 'greaterthaneq', $date_from);
-    }
-    # It's not normally safe to do it for "to" dates, though--"chfieldto" means
-    # "a field that changed before this date", and delta_ts could be either
-    # later or earlier than that, if we're searching for the time that a field
-    # changed. However, chfieldto all by itself, without any chfieldvalue or
-    # chfield, means "just search delta_ts", and so we still want that to
-    # work.
-    if ($date_to ne '' and !@fields and $value_to eq '') {
-        $clause->add('delta_ts', 'lessthaneq', $date_to);
-    }
-
-    # chfieldto is supposed to be a relative date or a date of the form
-    # YYYY-MM-DD, i.e. without the time appended to it. We append the
-    # time ourselves so that the end date is correctly taken into account.
-    $date_to .= ' 23:59:59' if $date_to =~ /^\d{4}-\d{1,2}-\d{1,2}$/;
-
-    my $join_clause = new Bugzilla::Search::Clause('OR');
-
-    foreach my $field (@fields) {
-        my $sub_clause = new Bugzilla::Search::ClauseGroup();
-        $sub_clause->add(condition($field, 'changedto', $value_to)) if $value_to ne '';
-        $sub_clause->add(condition($field, 'changedafter', $date_from)) if $date_from ne '';
-        $sub_clause->add(condition($field, 'changedbefore', $date_to)) if $date_to ne '';
-        $join_clause->add($sub_clause);
-    }
-    $clause->add($join_clause);
-
-    return @{$clause->children} ? $clause : undef;
+  my ($self) = @_;
+  my $params = $self->_params;
+
+  my $date_from = trim(lc($params->{'chfieldfrom'} || ''));
+  my $date_to   = trim(lc($params->{'chfieldto'}   || ''));
+  $date_from = '' if $date_from eq 'now';
+  $date_to   = '' if $date_to eq 'now';
+  my @fields   = $self->_param_array('chfield');
+  my $value_to = $params->{'chfieldvalue'};
+  $value_to = '' if !defined $value_to;
+
+  @fields = map { $_ eq '[Bug creation]' ? 'creation_ts' : $_ } @fields;
+
+  return undef unless ($date_from ne '' || $date_to ne '' || $value_to ne '');
+
+  my $clause = new Bugzilla::Search::Clause();
+
+  # It is always safe and useful to push delta_ts into the charts
+  # if there is a "from" date specified. It doesn't conflict with
+  # searching [Bug creation], because a bug's delta_ts is set to
+  # its creation_ts when it is created. So this just gives the
+  # database an additional index to possibly choose, on a table that
+  # is smaller than bugs_activity.
+  if ($date_from ne '') {
+    $clause->add('delta_ts', 'greaterthaneq', $date_from);
+  }
+
+  # It's not normally safe to do it for "to" dates, though--"chfieldto" means
+  # "a field that changed before this date", and delta_ts could be either
+  # later or earlier than that, if we're searching for the time that a field
+  # changed. However, chfieldto all by itself, without any chfieldvalue or
+  # chfield, means "just search delta_ts", and so we still want that to
+  # work.
+  if ($date_to ne '' and !@fields and $value_to eq '') {
+    $clause->add('delta_ts', 'lessthaneq', $date_to);
+  }
+
+  # chfieldto is supposed to be a relative date or a date of the form
+  # YYYY-MM-DD, i.e. without the time appended to it. We append the
+  # time ourselves so that the end date is correctly taken into account.
+  $date_to .= ' 23:59:59' if $date_to =~ /^\d{4}-\d{1,2}-\d{1,2}$/;
+
+  my $join_clause = new Bugzilla::Search::Clause('OR');
+
+  foreach my $field (@fields) {
+    my $sub_clause = new Bugzilla::Search::ClauseGroup();
+    $sub_clause->add(condition($field, 'changedto', $value_to)) if $value_to ne '';
+    $sub_clause->add(condition($field, 'changedafter', $date_from))
+      if $date_from ne '';
+    $sub_clause->add(condition($field, 'changedbefore', $date_to))
+      if $date_to ne '';
+    $join_clause->add($sub_clause);
+  }
+  $clause->add($join_clause);
+
+  return @{$clause->children} ? $clause : undef;
 }
 
 sub _special_parse_deadline {
-    my ($self) = @_;
-    my $params = $self->_params;
+  my ($self) = @_;
+  my $params = $self->_params;
 
-    my $clause = new Bugzilla::Search::Clause();
-    if (my $from = $params->{'deadlinefrom'}) {
-        $clause->add('deadline', 'greaterthaneq', $from);
-    }
-    if (my $to = $params->{'deadlineto'}) {
-        $clause->add('deadline', 'lessthaneq', $to);
-    }
+  my $clause = new Bugzilla::Search::Clause();
+  if (my $from = $params->{'deadlinefrom'}) {
+    $clause->add('deadline', 'greaterthaneq', $from);
+  }
+  if (my $to = $params->{'deadlineto'}) {
+    $clause->add('deadline', 'lessthaneq', $to);
+  }
 
-    return @{$clause->children} ? $clause : undef;
+  return @{$clause->children} ? $clause : undef;
 }
 
 sub _special_parse_email {
-    my ($self) = @_;
-    my $params = $self->_params;
-    
-    my @email_params = grep { $_ =~ /^email\d+$/ } keys %$params;
-    
-    my $clause = new Bugzilla::Search::Clause();
-    foreach my $param (@email_params) {
-        $param =~ /(\d+)$/;
-        my $id = $1;
-        my $email = trim($params->{"email$id"});
-        next if !$email;
-        my $type = $params->{"emailtype$id"} || 'anyexact';
-        $type = "anyexact" if $type eq "exact";
-
-        my $or_clause = new Bugzilla::Search::Clause('OR');
-        foreach my $field (qw(assigned_to reporter cc qa_contact)) {
-            if ($params->{"email$field$id"}) {
-                $or_clause->add($field, $type, $email);
-            }
-        }
-        if ($params->{"emaillongdesc$id"}) {
-            $or_clause->add("commenter", $type, $email);
-        }
-        
-        $clause->add($or_clause);
+  my ($self) = @_;
+  my $params = $self->_params;
+
+  my @email_params = grep { $_ =~ /^email\d+$/a } keys %$params;
+
+  my $clause = new Bugzilla::Search::Clause();
+  foreach my $param (@email_params) {
+    $param =~ /(\d+)$/a;
+    my $id    = $1;
+    my $email = trim($params->{"email$id"});
+    next if !$email;
+    my $type = $params->{"emailtype$id"} || 'equals';
+    $type = "equals" if $type eq "exact";
+
+    my $or_clause = new Bugzilla::Search::Clause('OR');
+    foreach my $field (qw(assigned_to reporter cc qa_contact)) {
+      if ($params->{"email$field$id"}) {
+        $or_clause->add($field, $type, $email);
+      }
     }
+    if ($params->{"emaillongdesc$id"}) {
+      $or_clause->add("commenter", $type, $email);
+    }
+
+    $clause->add($or_clause);
+  }
 
-    return @{$clause->children} ? $clause : undef;
+  return @{$clause->children} ? $clause : undef;
 }
 
 sub _special_parse_resolution {
-    my ($self) = @_;
-    my $params = $self->_params;
-    return if !defined $params->{'resolution'};
-
-    my @resolution = $self->_param_array('resolution');
-    my $legal_resolutions = $self->_chart_fields->{resolution}->legal_values;
-    @resolution = _valid_values(\@resolution, $legal_resolutions, '---');
-    if (scalar(@resolution) == scalar(@$legal_resolutions)) {
-        delete $params->{'resolution'};
-    }
+  my ($self) = @_;
+  my $params = $self->_params;
+  return if !defined $params->{'resolution'};
+
+  my @resolution        = $self->_param_array('resolution');
+  my $legal_resolutions = $self->_chart_fields->{resolution}->legal_values;
+  @resolution = _valid_values(\@resolution, $legal_resolutions, '---');
+  if (scalar(@resolution) == scalar(@$legal_resolutions)) {
+    delete $params->{'resolution'};
+  }
 }
 
 sub _valid_values {
-    my ($input, $valid, $extra_value) = @_;
-    my @result;
-    foreach my $item (@$input) {
-        $item = trim($item);
-        if (defined $extra_value and $item eq $extra_value) {
-            push(@result, $item);
-        }
-        elsif (grep { $_->name eq $item } @$valid) {
-            push(@result, $item);
-        }
+  my ($input, $valid, $extra_value) = @_;
+  my @result;
+  foreach my $item (@$input) {
+    $item = trim($item);
+    if (defined $extra_value and $item eq $extra_value) {
+      push(@result, $item);
+    }
+    elsif (grep { $_->name eq $item } @$valid) {
+      push(@result, $item);
     }
-    return @result;
+  }
+  return @result;
 }
 
 ######################################
@@ -1678,239 +1664,246 @@ sub _valid_values {
 ######################################
 
 sub _charts_to_conditions {
-    my ($self) = @_;
-    
-    my $clause = $self->_charts;
-    my @joins;
-    $clause->walk_conditions(sub {
-        my ($clause, $condition) = @_;
-        return if !$condition->translated;
-        push(@joins, @{ $condition->translated->{joins} });
-    });
-    return (\@joins, $clause);
+  my ($self) = @_;
+
+  my $clause = $self->_charts;
+  my @joins;
+  $clause->walk_conditions(sub {
+    my ($clause, $condition) = @_;
+    return if !$condition->translated;
+    push(@joins, @{$condition->translated->{joins}});
+  });
+  return (\@joins, $clause);
 }
 
 sub _charts {
-    my ($self) = @_;
-    
-    my $clause = $self->_params_to_data_structure();
-    my $chart_id = 0;
-    $clause->walk_conditions(sub { $self->_handle_chart($chart_id++, @_) });
-    return $clause;
+  my ($self) = @_;
+
+  my $clause   = $self->_params_to_data_structure();
+  my $chart_id = 0;
+  $clause->walk_conditions(sub { $self->_handle_chart($chart_id++, @_) });
+  return $clause;
 }
 
 sub _params_to_data_structure {
-    my ($self) = @_;
-    
-    # First we get the "special" charts, representing all the normal
-    # fields on the search page. This may modify _params, so it needs to
-    # happen first.
-    my $clause = $self->_special_charts;
-
-    # Then we process the old Boolean Charts input format.
-    $clause->add( $self->_boolean_charts );
-    
-    # And then process the modern "custom search" format.
-    $clause->add( $self->_custom_search );
-    
-    return $clause;
+  my ($self) = @_;
+
+  # First we get the "special" charts, representing all the normal
+  # fields on the search page. This may modify _params, so it needs to
+  # happen first.
+  my $clause = $self->_special_charts;
+
+  # Then we process the old Boolean Charts input format.
+  $clause->add($self->_boolean_charts);
+
+  # And then process the modern "custom search" format.
+  $clause->add($self->_custom_search);
+
+  return $clause;
 }
 
 sub _boolean_charts {
-    my ($self) = @_;
-    
-    my $params = $self->_params;
-    my @param_list = keys %$params;
-    
-    my @all_field_params = grep { /^field-?\d+/ } @param_list;
-    my @chart_ids = map { /^field(-?\d+)/; $1 } @all_field_params;
-    @chart_ids = sort { $a <=> $b } uniq @chart_ids;
-    
-    my $clause = new Bugzilla::Search::Clause();
-    foreach my $chart_id (@chart_ids) {
-        my @all_and = grep { /^field$chart_id-\d+/ } @param_list;
-        my @and_ids = map { /^field$chart_id-(\d+)/; $1 } @all_and;
-        @and_ids = sort { $a <=> $b } uniq @and_ids;
-        
-        my $and_clause = new Bugzilla::Search::Clause();
-        foreach my $and_id (@and_ids) {
-            my @all_or = grep { /^field$chart_id-$and_id-\d+/ } @param_list;
-            my @or_ids = map { /^field$chart_id-$and_id-(\d+)/; $1 } @all_or;
-            @or_ids = sort { $a <=> $b } uniq @or_ids;
-            
-            my $or_clause = new Bugzilla::Search::Clause('OR');
-            foreach my $or_id (@or_ids) {
-                my $identifier = "$chart_id-$and_id-$or_id";
-                my $field = $params->{"field$identifier"};
-                my $operator = $params->{"type$identifier"};
-                my $value = $params->{"value$identifier"};
-                # no-value operators ignore the value, however a value needs to be set
-                $value = ' ' if $operator && grep { $_ eq $operator } NO_VALUE_OPERATORS;
-                $or_clause->add($field, $operator, $value);
-            }
-            $and_clause->add($or_clause);
-            $and_clause->negate(1) if $params->{"negate$chart_id"};
-        }
-        $clause->add($and_clause);
-    }
+  my ($self) = @_;
 
-    return @{$clause->children} ? $clause : undef;
-}
+  use re '/a';
 
-sub _custom_search {
-    my ($self) = @_;
-    my $params = $self->_params;
+  my $params     = $self->_params;
+  my @param_list = keys %$params;
 
-    my @field_ids = $self->_field_ids;
-    return unless scalar @field_ids;
+  my @all_field_params = grep {/^field-?\d+/} @param_list;
+  my @chart_ids = map { /^field(-?\d+)/; $1 } @all_field_params;
+  @chart_ids = sort { $a <=> $b } uniq @chart_ids;
 
-    my $joiner = $params->{j_top} || '';
-    my $current_clause = $joiner eq 'AND_G'
-        ? new Bugzilla::Search::ClauseGroup()
-        : new Bugzilla::Search::Clause($joiner);
+  my $clause = new Bugzilla::Search::Clause();
+  foreach my $chart_id (@chart_ids) {
+    my @all_and = grep {/^field$chart_id-\d+/} @param_list;
+    my @and_ids = map { /^field$chart_id-(\d+)/; $1 } @all_and;
+    @and_ids = sort { $a <=> $b } uniq @and_ids;
+
+    my $and_clause = new Bugzilla::Search::Clause();
+    foreach my $and_id (@and_ids) {
+      my @all_or = grep {/^field$chart_id-$and_id-\d+/} @param_list;
+      my @or_ids = map { /^field$chart_id-$and_id-(\d+)/; $1 } @all_or;
+      @or_ids = sort { $a <=> $b } uniq @or_ids;
+
+      my $or_clause = new Bugzilla::Search::Clause('OR');
+      foreach my $or_id (@or_ids) {
+        my $identifier = "$chart_id-$and_id-$or_id";
+        my $field      = $params->{"field$identifier"};
+        my $operator   = $params->{"type$identifier"};
+        my $value      = $params->{"value$identifier"};
 
-    my @clause_stack;
-    foreach my $id (@field_ids) {
-        my $field = $params->{"f$id"};
-        if ($field eq 'OP') {
-            my $joiner = $params->{"j$id"} || '';
-            my $new_clause = $joiner eq 'AND_G'
-                ? new Bugzilla::Search::ClauseGroup()
-                : new Bugzilla::Search::Clause($joiner);
-            $new_clause->negate($params->{"n$id"});
-            $current_clause->add($new_clause);
-            push(@clause_stack, $current_clause);
-            $current_clause = $new_clause;
-            next;
-        }
-        if ($field eq 'CP') {
-            $current_clause = pop @clause_stack;
-            ThrowCodeError('search_cp_without_op', { id => $id })
-                if !$current_clause;
-            next;
-        }
-        
-        my $operator = $params->{"o$id"};
-        my $value = $params->{"v$id"};
         # no-value operators ignore the value, however a value needs to be set
         $value = ' ' if $operator && grep { $_ eq $operator } NO_VALUE_OPERATORS;
-        my $condition = condition($field, $operator, $value);
-        $condition->negate($params->{"n$id"});
-        $current_clause->add($condition);
+        $or_clause->add($field, $operator, $value);
+      }
+      $and_clause->add($or_clause);
+      $and_clause->negate(1) if $params->{"negate$chart_id"};
     }
-    
-    # We allow people to specify more OPs than CPs, so at the end of the
-    # loop our top clause may be still in the stack instead of being
-    # $current_clause.
-    return $clause_stack[0] || $current_clause;
-}
+    $clause->add($and_clause);
+  }
 
-sub _field_ids {
-    my ($self) = @_;
-    my $params = $self->_params;
-    my @param_list = keys %$params;
-    
-    my @field_params = grep { /^f\d+$/ } @param_list;
-    my @field_ids = map { /(\d+)/; $1 } @field_params;
-    @field_ids = sort { $a <=> $b } @field_ids;
-    return @field_ids;
+  return @{$clause->children} ? $clause : undef;
 }
 
-sub _handle_chart {
-    my ($self, $chart_id, $clause, $condition) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $params = $self->_params;
-    my ($field, $operator, $value) = $condition->fov;
-    return if (!defined $field or !defined $operator or !defined $value);
-    $field = FIELD_MAP->{$field} || $field;
-
-    my ($string_value, $orig_value);
-    state $is_mysql = $dbh->isa('Bugzilla::DB::Mysql') ? 1 : 0;
-
-    if (ref $value eq 'ARRAY') {
-        # Trim input and ignore blank values.
-        @$value = map { trim($_) } @$value;
-        @$value = grep { defined $_ and $_ ne '' } @$value;
-        return if !@$value;
-        $orig_value = join(',', @$value);
-        if ($field eq 'longdesc' && $is_mysql) {
-            @$value = map { _convert_unicode_characters($_) } @$value;
-        }
-        $string_value = join(',', @$value);
+sub _custom_search {
+  my ($self) = @_;
+  my $params = $self->_params;
+
+  my @field_ids = $self->_field_ids;
+  return unless scalar @field_ids;
+
+  my $joiner = $params->{j_top} || '';
+  my $current_clause
+    = $joiner eq 'AND_G'
+    ? new Bugzilla::Search::ClauseGroup()
+    : new Bugzilla::Search::Clause($joiner);
+
+  my @clause_stack;
+  foreach my $id (@field_ids) {
+    my $field = $params->{"f$id"};
+    if ($field eq 'OP') {
+      my $joiner = $params->{"j$id"} || '';
+      my $new_clause
+        = $joiner eq 'AND_G'
+        ? new Bugzilla::Search::ClauseGroup()
+        : new Bugzilla::Search::Clause($joiner);
+      $new_clause->negate($params->{"n$id"});
+      $current_clause->add($new_clause);
+      push(@clause_stack, $current_clause);
+      $current_clause = $new_clause;
+      next;
     }
-    else {
-        return if $value eq '';
-        $orig_value = $value;
-        if ($field eq 'longdesc' && $is_mysql) {
-            $value = _convert_unicode_characters($value);
-        }
-        $string_value = $value;
+    if ($field eq 'CP') {
+      $current_clause = pop @clause_stack;
+      ThrowCodeError('search_cp_without_op', {id => $id}) if !$current_clause;
+      next;
     }
 
-    $self->_chart_fields->{$field}
-        or ThrowCodeError("invalid_field_name", { field => $field });
-    trick_taint($field);
-    
-    # This is the field as you'd reference it in a SQL statement.
-    my $full_field = $field =~ /\./ ? $field : "bugs.$field";
-
-    # "value" and "quoted" are for search functions that always operate
-    # on a scalar string and never care if they were passed multiple
-    # parameters. If the user does pass multiple parameters, they will
-    # become a space-separated string for those search functions.
-    #
-    # all_values is for search functions that do operate
-    # on multiple values, like anyexact.
-    
-    my %search_args = (
-        chart_id     => $chart_id,
-        sequence     => $chart_id,
-        field        => $field,
-        full_field   => $full_field,
-        operator     => $operator,
-        value        => $string_value,
-        all_values   => $value,
-        joins        => [],
-        bugs_table   => 'bugs',
-        table_suffix => '',
-        condition    => $condition,
-    );
-    $clause->update_search_args(\%search_args);
-
-    $search_args{quoted} = $self->_quote_unless_numeric(\%search_args);
-    # This should add a "term" selement to %search_args.
-    $self->do_search_function(\%search_args);
-
-    # If term is left empty, then this means the criteria
-    # has no effect and can be ignored.
-    return unless $search_args{term};
-
-    # All the things here that don't get pulled out of
-    # %search_args are their original values before
-    # do_search_function modified them.   
-    $self->search_description({
-        field => $field, type => $operator,
-        value => $orig_value, term => $search_args{term},
-    });
+    my $operator = $params->{"o$id"};
+    my $value    = $params->{"v$id"};
 
-    foreach my $join (@{ $search_args{joins} }) {
-        $join->{bugs_table}   = $search_args{bugs_table};
-        $join->{table_suffix} = $search_args{table_suffix};
-    }
+    # no-value operators ignore the value, however a value needs to be set
+    $value = ' ' if $operator && grep { $_ eq $operator } NO_VALUE_OPERATORS;
+    my $condition = condition($field, $operator, $value);
+    $condition->negate($params->{"n$id"});
+    $current_clause->add($condition);
+  }
+
+  # We allow people to specify more OPs than CPs, so at the end of the
+  # loop our top clause may be still in the stack instead of being
+  # $current_clause.
+  return $clause_stack[0] || $current_clause;
+}
+
+sub _field_ids {
+  my ($self)     = @_;
+  my $params     = $self->_params;
+  my @param_list = keys %$params;
+
+  my @field_params = grep {/^f\d+$/a} @param_list;
+  my @field_ids = map { /(\d+)/a; $1 } @field_params;
+  @field_ids = sort { $a <=> $b } @field_ids;
+  return @field_ids;
+}
 
-    $condition->translated(\%search_args);
+sub _handle_chart {
+  my ($self, $chart_id, $clause, $condition) = @_;
+  my $dbh    = Bugzilla->dbh;
+  my $params = $self->_params;
+  my ($field, $operator, $value) = $condition->fov;
+  return if (!defined $field or !defined $operator or !defined $value);
+  $field = FIELD_MAP->{$field} || $field;
+
+  my ($string_value, $orig_value);
+  state $is_mysql = $dbh->isa('Bugzilla::DB::Mysql') ? 1 : 0;
+
+  if (ref $value eq 'ARRAY') {
+
+    # Trim input and ignore blank values.
+    @$value = map { trim($_) } @$value;
+    @$value = grep { defined $_ and $_ ne '' } @$value;
+    return if !@$value;
+    $orig_value = join(',', @$value);
+    if ($field eq 'longdesc' && $is_mysql) {
+      @$value = map { _convert_unicode_characters($_) } @$value;
+    }
+    $string_value = join(',', @$value);
+  }
+  else {
+    return if $value eq '';
+    $orig_value = $value;
+    if ($field eq 'longdesc' && $is_mysql) {
+      $value = _convert_unicode_characters($value);
+    }
+    $string_value = $value;
+  }
+
+  $self->_chart_fields->{$field}
+    or ThrowCodeError("invalid_field_name", {field => $field});
+  trick_taint($field);
+
+  # This is the field as you'd reference it in a SQL statement.
+  my $full_field = $field =~ /\./ ? $field : "bugs.$field";
+
+  # "value" and "quoted" are for search functions that always operate
+  # on a scalar string and never care if they were passed multiple
+  # parameters. If the user does pass multiple parameters, they will
+  # become a space-separated string for those search functions.
+  #
+  # all_values is for search functions that do operate
+  # on multiple values, like anyexact.
+
+  my %search_args = (
+    chart_id     => $chart_id,
+    sequence     => $chart_id,
+    field        => $field,
+    full_field   => $full_field,
+    operator     => $operator,
+    value        => $string_value,
+    all_values   => $value,
+    joins        => [],
+    bugs_table   => 'bugs',
+    table_suffix => '',
+    condition    => $condition,
+  );
+  $clause->update_search_args(\%search_args);
+
+  $search_args{quoted} = $self->_quote_unless_numeric(\%search_args);
+
+  # This should add a "term" selement to %search_args.
+  $self->do_search_function(\%search_args);
+
+  # If term is left empty, then this means the criteria
+  # has no effect and can be ignored.
+  return unless $search_args{term};
+
+  # All the things here that don't get pulled out of
+  # %search_args are their original values before
+  # do_search_function modified them.
+  $self->search_description({
+    field => $field,
+    type  => $operator,
+    value => $orig_value,
+    term  => $search_args{term},
+  });
+
+  foreach my $join (@{$search_args{joins}}) {
+    $join->{bugs_table}   = $search_args{bugs_table};
+    $join->{table_suffix} = $search_args{table_suffix};
+  }
+
+  $condition->translated(\%search_args);
 }
 
 # XXX - This is a hack for MySQL which doesn't understand Unicode characters
 # above U+FFFF, see Bugzilla::Comment::_check_thetext(). This hack can go away
 # once we require MySQL 5.5.3 and use utf8mb4.
 sub _convert_unicode_characters {
-    my $string = shift;
-
-    # Perl 5.13.8 and older complain about non-characters.
-    no warnings 'utf8';
-    $string =~ s/([\x{10000}-\x{10FFFF}])/"\x{FDD0}[" . uc(sprintf('U+%04x', ord($1))) . "]\x{FDD1}"/eg;
-    return $string;
+  my $string = shift;
+  $string
+    =~ s/([\x{10000}-\x{10FFFF}])/"\x{FDD0}[" . uc(sprintf('U+%04x', ord($1))) . "]\x{FDD1}"/eg;
+  return $string;
 }
 
 ##################################
@@ -1920,121 +1913,126 @@ sub _convert_unicode_characters {
 # This takes information about the current boolean chart and translates
 # it into SQL, using the constants at the top of this file.
 sub do_search_function {
-    my ($self, $args) = @_;
-    my ($field, $operator) = @$args{qw(field operator)};
-    
-    if (my $parse_func = SPECIAL_PARSING->{$field}) {
-        $self->$parse_func($args);
-        # Some parsing functions set $term, though most do not.
-        # For the ones that set $term, we don't need to do any further
-        # parsing.
-        return if $args->{term};
-    }
-    
-    my $operator_field_override = $self->_get_operator_field_override();
-    my $override = $operator_field_override->{$field};
-    # Attachment fields get special handling, if they don't have a specific
-    # individual override.
-    if (!$override and $field =~ /^attachments\./) {
-        $override = $operator_field_override->{attachments};
-    }
-    # If there's still no override, check for an override on the field's type.
-    if (!$override) {
-        my $field_obj = $self->_chart_fields->{$field};
-        $override = $operator_field_override->{$field_obj->type};
-    }
-    
-    if ($override) {
-        my $search_func = $self->_pick_override_function($override, $operator);
-        $self->$search_func($args) if $search_func;
-    }
+  my ($self,  $args)     = @_;
+  my ($field, $operator) = @$args{qw(field operator)};
 
-    # Some search functions set $term, and some don't. For the ones that
-    # don't (or for fields that don't have overrides) we now call the
-    # direct operator function from OPERATORS.
-    if (!defined $args->{term}) {
-        $self->_do_operator_function($args);
-    }
-    
-    if (!defined $args->{term}) {
-        # This field and this type don't work together. Generally,
-        # this should never be reached, because it should be handled
-        # explicitly by OPERATOR_FIELD_OVERRIDE.
-        ThrowUserError("search_field_operator_invalid",
-                       { field => $field, operator => $operator });
-    }
+  if (my $parse_func = SPECIAL_PARSING->{$field}) {
+    $self->$parse_func($args);
+
+    # Some parsing functions set $term, though most do not.
+    # For the ones that set $term, we don't need to do any further
+    # parsing.
+    return if $args->{term};
+  }
+
+  my $operator_field_override = $self->_get_operator_field_override();
+  my $override                = $operator_field_override->{$field};
+
+  # Attachment fields get special handling, if they don't have a specific
+  # individual override.
+  if (!$override and $field =~ /^attachments\./) {
+    $override = $operator_field_override->{attachments};
+  }
+
+  # If there's still no override, check for an override on the field's type.
+  if (!$override) {
+    my $field_obj = $self->_chart_fields->{$field};
+    $override = $operator_field_override->{$field_obj->type};
+  }
+
+  if ($override) {
+    my $search_func = $self->_pick_override_function($override, $operator);
+    $self->$search_func($args) if $search_func;
+  }
+
+  # Some search functions set $term, and some don't. For the ones that
+  # don't (or for fields that don't have overrides) we now call the
+  # direct operator function from OPERATORS.
+  if (!defined $args->{term}) {
+    $self->_do_operator_function($args);
+  }
+
+  if (!defined $args->{term}) {
+
+    # This field and this type don't work together. Generally,
+    # this should never be reached, because it should be handled
+    # explicitly by OPERATOR_FIELD_OVERRIDE.
+    ThrowUserError("search_field_operator_invalid",
+      {field => $field, operator => $operator});
+  }
 }
 
 # A helper for various search functions that need to run operator
 # functions directly.
 sub _do_operator_function {
-    my ($self, $func_args) = @_;
-    my $operator = $func_args->{operator};
-    my $operator_func = OPERATORS->{$operator}
-      || ThrowCodeError("search_field_operator_unsupported",
-                        { operator => $operator });
-    $self->$operator_func($func_args);
+  my ($self, $func_args) = @_;
+  my $operator = $func_args->{operator};
+  my $operator_func
+    = OPERATORS->{$operator}
+    || ThrowCodeError("search_field_operator_unsupported",
+    {operator => $operator});
+  $self->$operator_func($func_args);
 }
 
 sub _reverse_operator {
-    my ($self, $operator) = @_;
-    my $reverse = OPERATOR_REVERSE->{$operator};
-    return $reverse if $reverse;
-    if ($operator =~ s/^not//) {
-        return $operator;
-    }
-    return "not$operator";
+  my ($self, $operator) = @_;
+  my $reverse = OPERATOR_REVERSE->{$operator};
+  return $reverse if $reverse;
+  if ($operator =~ s/^not//) {
+    return $operator;
+  }
+  return "not$operator";
 }
 
 sub _pick_override_function {
-    my ($self, $override, $operator) = @_;
-    my $search_func = $override->{$operator};
-
-    if (!$search_func) {
-        # If we don't find an override for one specific operator,
-        # then there are some special override types:
-        # _non_changed: For any operator that doesn't have the word
-        #               "changed" in it
-        # _default: Overrides all operators that aren't explicitly specified.
-        if ($override->{_non_changed} and $operator !~ /changed/) {
-            $search_func = $override->{_non_changed};
-        }
-        elsif ($override->{_default}) {
-            $search_func = $override->{_default};
-        }
+  my ($self, $override, $operator) = @_;
+  my $search_func = $override->{$operator};
+
+  if (!$search_func) {
+
+    # If we don't find an override for one specific operator,
+    # then there are some special override types:
+    # _non_changed: For any operator that doesn't have the word
+    #               "changed" in it
+    # _default: Overrides all operators that aren't explicitly specified.
+    if ($override->{_non_changed} and $operator !~ /changed/) {
+      $search_func = $override->{_non_changed};
+    }
+    elsif ($override->{_default}) {
+      $search_func = $override->{_default};
     }
+  }
 
-    return $search_func;
+  return $search_func;
 }
 
 sub _get_operator_field_override {
-    my $self = shift;
-    my $cache = Bugzilla->request_cache;
+  my $self  = shift;
+  my $cache = Bugzilla->request_cache;
 
-    return $cache->{operator_field_override} 
-        if defined $cache->{operator_field_override};
+  return $cache->{operator_field_override}
+    if defined $cache->{operator_field_override};
 
-    my %operator_field_override = %{ OPERATOR_FIELD_OVERRIDE() };
-    Bugzilla::Hook::process('search_operator_field_override',
-                            { search => $self, 
-                              operators => \%operator_field_override });
+  my %operator_field_override = %{OPERATOR_FIELD_OVERRIDE()};
+  Bugzilla::Hook::process('search_operator_field_override',
+    {search => $self, operators => \%operator_field_override});
 
-    $cache->{operator_field_override} = \%operator_field_override;
-    return $cache->{operator_field_override};
+  $cache->{operator_field_override} = \%operator_field_override;
+  return $cache->{operator_field_override};
 }
 
 sub _get_column_joins {
-    my $self = shift;
-    my $cache = Bugzilla->request_cache;
+  my $self  = shift;
+  my $cache = Bugzilla->request_cache;
 
-    return $cache->{column_joins} if defined $cache->{column_joins};
+  return $cache->{column_joins} if defined $cache->{column_joins};
 
-    my %column_joins = %{ $self->COLUMN_JOINS() };
-    Bugzilla::Hook::process('buglist_column_joins',
-                            { column_joins => \%column_joins });
+  my %column_joins = %{$self->COLUMN_JOINS()};
+  Bugzilla::Hook::process('buglist_column_joins',
+    {column_joins => \%column_joins});
 
-    $cache->{column_joins} = \%column_joins;
-    return $cache->{column_joins};
+  $cache->{column_joins} = \%column_joins;
+  return $cache->{column_joins};
 }
 
 ###########################
@@ -2046,47 +2044,49 @@ sub _get_column_joins {
 # is just a performance optimization, but on SQLite it actually changes
 # the behavior of some searches.
 sub _quote_unless_numeric {
-    my ($self, $args, $value) = @_;
-    if (!defined $value) {
-        $value = $args->{value};
-    }
-    my ($field, $operator) = @$args{qw(field operator)};
-    
-    my $numeric_operator = !grep { $_ eq $operator } NON_NUMERIC_OPERATORS;
-    my $numeric_field = $self->_chart_fields->{$field}->is_numeric;
-    my $numeric_value = ($value =~ NUMBER_REGEX) ? 1 : 0;
-    my $is_numeric = $numeric_operator && $numeric_field && $numeric_value;
-
-    # These operators are really numeric operators with numeric fields.
-    $numeric_operator = grep { $_ eq $operator } keys %{ SIMPLE_OPERATORS() };
-
-    if ($is_numeric) {
-        my $quoted = $value;
-        trick_taint($quoted);
-        return $quoted;
-    }
-    elsif ($numeric_field && !$numeric_value && $numeric_operator) {
-        ThrowUserError('number_not_numeric', { field => $field, num => $value });
-    }
-    return Bugzilla->dbh->quote($value);
+  my ($self, $args, $value) = @_;
+  if (!defined $value) {
+    $value = $args->{value};
+  }
+  my ($field, $operator) = @$args{qw(field operator)};
+
+  my $numeric_operator = !grep { $_ eq $operator } NON_NUMERIC_OPERATORS;
+  my $numeric_field    = $self->_chart_fields->{$field}->is_numeric;
+  my $numeric_value    = ($value =~ NUMBER_REGEX) ? 1 : 0;
+  my $is_numeric       = $numeric_operator && $numeric_field && $numeric_value;
+
+  # These operators are really numeric operators with numeric fields.
+  $numeric_operator = grep { $_ eq $operator } keys %{SIMPLE_OPERATORS()};
+
+  if ($is_numeric) {
+    my $quoted = $value;
+    trick_taint($quoted);
+    return $quoted;
+  }
+  elsif ($numeric_field && !$numeric_value && $numeric_operator) {
+    ThrowUserError('number_not_numeric', {field => $field, num => $value});
+  }
+  return Bugzilla->dbh->quote($value);
 }
 
 sub build_subselect {
-    my ($outer, $inner, $table, $cond, $negate) = @_;
-    if ($table =~ /\battach_data\b/) {
-        # It takes a long time to scan the whole attach_data table
-        # unconditionally, so we return the subselect and let the DB optimizer
-        # restrict the search based on other search criteria.
-        my $not = $negate ? "NOT" : "";
-        return "$outer $not IN (SELECT DISTINCT $inner FROM $table WHERE $cond)";
-    }
-    # Execute subselects immediately to avoid dependent subqueries, which are
-    # large performance hits on MySql
-    my $q = "SELECT DISTINCT $inner FROM $table WHERE $cond";
-    my $dbh = Bugzilla->dbh;
-    my $list = $dbh->selectcol_arrayref($q);
-    return $negate ? "1=1" : "1=2" unless @$list;
-    return $dbh->sql_in($outer, $list, $negate);
+  my ($outer, $inner, $table, $cond, $negate) = @_;
+  if ($table =~ /\battach_data\b/) {
+
+    # It takes a long time to scan the whole attach_data table
+    # unconditionally, so we return the subselect and let the DB optimizer
+    # restrict the search based on other search criteria.
+    my $not = $negate ? "NOT" : "";
+    return "$outer $not IN (SELECT DISTINCT $inner FROM $table WHERE $cond)";
+  }
+
+  # Execute subselects immediately to avoid dependent subqueries, which are
+  # large performance hits on MySql
+  my $q    = "SELECT DISTINCT $inner FROM $table WHERE $cond";
+  my $dbh  = Bugzilla->dbh;
+  my $list = $dbh->selectcol_arrayref($q);
+  return $negate ? "1=1" : "1=2" unless @$list;
+  return $dbh->sql_in($outer, $list, $negate);
 }
 
 # Used by anyexact to get the list of input values. This allows us to
@@ -2094,70 +2094,69 @@ sub build_subselect {
 # still accept string values for the boolean charts (and split them on
 # commas).
 sub _all_values {
-    my ($self, $args, $split_on) = @_;
-    $split_on ||= qr/[\s,]+/;
-    my $dbh = Bugzilla->dbh;
-    my $all_values = $args->{all_values};
-    
-    my @array;
-    if (ref $all_values eq 'ARRAY') {
-        @array = @$all_values;
-    }
-    else {
-        @array = split($split_on, $all_values);
-        @array = map { trim($_) } @array;
-        @array = grep { defined $_ and $_ ne '' } @array;
-    }
-    
-    if ($args->{field} eq 'resolution') {
-        @array = map { $_ eq '---' ? '' : $_ } @array;
-    }
-    
-    return @array;
+  my ($self, $args, $split_on) = @_;
+  $split_on ||= qr/[\s,]+/;
+  my $dbh        = Bugzilla->dbh;
+  my $all_values = $args->{all_values};
+
+  my @array;
+  if (ref $all_values eq 'ARRAY') {
+    @array = @$all_values;
+  }
+  else {
+    @array = split($split_on, $all_values);
+    @array = map { trim($_) } @array;
+    @array = grep { defined $_ and $_ ne '' } @array;
+  }
+
+  if ($args->{field} eq 'resolution') {
+    @array = map { $_ eq '---' ? '' : $_ } @array;
+  }
+
+  return @array;
 }
 
 # Support for "any/all/nowordssubstr" comparison type ("words as substrings")
 sub _substring_terms {
-    my ($self, $args) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self, $args) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    # We don't have to (or want to) use _all_values, because we'd just
-    # split each term on spaces and commas anyway.
-    my @words = split(/[\s,]+/, $args->{value});
-    @words = grep { defined $_ and $_ ne '' } @words;
-    @words = map { $dbh->quote($_) } @words;
-    my @terms = map { $dbh->sql_iposition($_, $args->{full_field}) . " > 0" }
-                    @words;
-    return @terms;
+  # We don't have to (or want to) use _all_values, because we'd just
+  # split each term on spaces and commas anyway.
+  my @words = split(/[\s,]+/, $args->{value});
+  @words = grep { defined $_ and $_ ne '' } @words;
+  my @terms = map { $dbh->sql_ilike($_, $args->{full_field}) } @words;
+  return @terms;
 }
 
 sub _word_terms {
-    my ($self, $args) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    my @values = split(/[\s,]+/, $args->{value});
-    @values = grep { defined $_ and $_ ne '' } @values;
-    my @substring_terms = $self->_substring_terms($args);
-    
-    my @terms;
-    my $start = $dbh->WORD_START;
-    my $end   = $dbh->WORD_END;
-    foreach my $word (@values) {
-        my $regex  = $start . quotemeta($word) . $end;
-        my $quoted = $dbh->quote($regex);
-        # We don't have to check the regexp, because we escaped it, so we're
-        # sure it's valid.
-        my $regex_term = $dbh->sql_regexp($args->{full_field}, $quoted,
-                                          'no check');
-        # Regular expressions are slow--substring searches are faster.
-        # If we're searching for a word, we're also certain that the
-        # substring will appear in the value. So we limit first by
-        # substring and then by a regex that will match just words.
-        my $substring_term = shift @substring_terms;
-        push(@terms, "$substring_term AND $regex_term");
-    }
-    
-    return @terms;
+  my ($self, $args) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my @values = split(/[\s,]+/, $args->{value});
+  @values = grep { defined $_ and $_ ne '' } @values;
+  my @substring_terms = $self->_substring_terms($args);
+
+  my @terms;
+  my $start = $dbh->WORD_START;
+  my $end   = $dbh->WORD_END;
+  foreach my $word (@values) {
+    my $regex  = $start . quotemeta($word) . $end;
+    my $quoted = $dbh->quote($regex);
+
+    # We don't have to check the regexp, because we escaped it, so we're
+    # sure it's valid.
+    my $regex_term = $dbh->sql_regexp($args->{full_field}, $quoted, 'no check');
+
+    # Regular expressions are slow--substring searches are faster.
+    # If we're searching for a word, we're also certain that the
+    # substring will appear in the value. So we limit first by
+    # substring and then by a regex that will match just words.
+    my $substring_term = shift @substring_terms;
+    push(@terms, "$substring_term AND $regex_term");
+  }
+
+  return @terms;
 }
 
 #####################################
@@ -2165,106 +2164,124 @@ sub _word_terms {
 #####################################
 
 sub _timestamp_translate {
-    my ($self, $ignore_time, $args) = @_;
-    my $value = $args->{value};
-    my $dbh = Bugzilla->dbh;
+  my ($self, $ignore_time, $args) = @_;
+  my $value = $args->{value};
+  my $dbh   = Bugzilla->dbh;
 
-    return if $value !~ /^(?:[\+\-]?\d+[hdwmy]s?|now)$/i;
+  return if $value !~ /^(?:[\+\-]?\d+[hdwmy]s?|now)$/i;
 
-    $value = SqlifyDate($value);
-    # By default, the time is appended to the date, which we don't always want.
-    if ($ignore_time) {
-        ($value) = split(/\s/, $value);
-    }
-    $args->{value} = $value;
-    $args->{quoted} = $dbh->quote($value);
+  $value = SqlifyDate($value);
+
+  # By default, the time is appended to the date, which we don't always want.
+  if ($ignore_time) {
+    ($value) = split(/\s/, $value);
+  }
+  $args->{value}  = $value;
+  $args->{quoted} = $dbh->quote($value);
 }
 
 sub _datetime_translate {
-    return shift->_timestamp_translate(0, @_);
+  return shift->_timestamp_translate(0, @_);
 }
 
 sub _last_visit_datetime {
-    my ($self, $args) = @_;
-    my $value = $args->{value};
-
-    $self->_datetime_translate($args);
-    if ($value eq $args->{value}) {
-        # Failed to translate a datetime. let's try the pronoun expando.
-        if ($value eq '%last_changed%') {
-            $self->_add_extra_column('changeddate');
-            $args->{value} = $args->{quoted} = 'bugs.delta_ts';
-        }
+  my ($self, $args) = @_;
+  my $value = $args->{value};
+
+  $self->_datetime_translate($args);
+  if ($value eq $args->{value}) {
+
+    # Failed to translate a datetime. let's try the pronoun expando.
+    if ($value eq '%last_changed%') {
+      $self->_add_extra_column('changeddate');
+      $args->{value} = $args->{quoted} = 'bugs.delta_ts';
     }
+  }
 }
 
 
 sub _date_translate {
-    return shift->_timestamp_translate(1, @_);
+  return shift->_timestamp_translate(1, @_);
 }
 
 sub SqlifyDate {
-    my ($str) = @_;
-    my $fmt = "%Y-%m-%d %H:%M:%S";
-    $str = "" if (!defined $str || lc($str) eq 'now');
-    if ($str eq "") {
-        my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime(time());
-        return sprintf("%4d-%02d-%02d 00:00:00", $year+1900, $month+1, $mday);
-    }
-
-    if ($str =~ /^(-|\+)?(\d+)([hdwmy])(s?)$/i) {   # relative date
-        my ($sign, $amount, $unit, $startof, $date) = ($1, $2, lc $3, lc $4, time);
-        my ($sec, $min, $hour, $mday, $month, $year, $wday)  = localtime($date);
-        if ($sign && $sign eq '+') { $amount = -$amount; }
-        $startof = 1 if $amount == 0;
-        if ($unit eq 'w') {                  # convert weeks to days
-            $amount = 7*$amount;
-            $amount += $wday if $startof;
-            $unit = 'd';
-        }
-        if ($unit eq 'd') {
-            if ($startof) {
-              $fmt = "%Y-%m-%d 00:00:00";
-              $date -= $sec + 60*$min + 3600*$hour;
-            }
-            $date -= 24*3600*$amount;
-            return time2str($fmt, $date);
-        }
-        elsif ($unit eq 'y') {
-            if ($startof) {
-                return sprintf("%4d-01-01 00:00:00", $year+1900-$amount);
-            } 
-            else {
-                return sprintf("%4d-%02d-%02d %02d:%02d:%02d", 
-                               $year+1900-$amount, $month+1, $mday, $hour, $min, $sec);
-            }
-        }
-        elsif ($unit eq 'm') {
-            $month -= $amount;
-            while ($month<0) { $year--; $month += 12; }
-            if ($startof) {
-                return sprintf("%4d-%02d-01 00:00:00", $year+1900, $month+1);
-            }
-            else {
-                return sprintf("%4d-%02d-%02d %02d:%02d:%02d", 
-                               $year+1900, $month+1, $mday, $hour, $min, $sec);
-            }
-        }
-        elsif ($unit eq 'h') {
-            # Special case for 'beginning of an hour'
-            if ($startof) {
-                $fmt = "%Y-%m-%d %H:00:00";
-            } 
-            $date -= 3600*$amount;
-            return time2str($fmt, $date);
-        }
-        return undef;                      # should not happen due to regexp at top
-    }
-    my $date = str2time($str);
-    if (!defined($date)) {
-        ThrowUserError("illegal_date", { date => $str });
-    }
-    return time2str($fmt, $date);
+  my ($str) = @_;
+  my $fmt = "%Y-%m-%d %H:%M:%S";
+  $str = "" if (!defined $str);
+  if ($str eq "") {
+    my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime(time());
+    return sprintf("%4d-%02d-%02d 00:00:00", $year + 1900, $month + 1, $mday);
+  }
+  if (lc($str) eq 'now') {
+    my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime(time());
+    return sprintf(
+      "%4d-%02d-%02d %02d:%02d:%02d",
+      $year + 1900,
+      $month + 1, $mday, $hour, $min, $sec
+    );
+  }
+
+  if ($str =~ /^(-|\+)?(\d+)([hdwmy])(s?)$/ai) {    # relative date
+    my ($sign, $amount, $unit, $startof, $date) = ($1, $2, lc $3, lc $4, time);
+    my ($sec, $min, $hour, $mday, $month, $year, $wday) = localtime($date);
+    if ($sign && $sign eq '+') { $amount = -$amount; }
+    $startof = 1 if $amount == 0;
+    if ($unit eq 'w') {                             # convert weeks to days
+      $amount = 7 * $amount;
+      $amount += $wday if $startof;
+      $unit = 'd';
+    }
+    if ($unit eq 'd') {
+      if ($startof) {
+        $fmt = "%Y-%m-%d 00:00:00";
+        $date -= $sec + 60 * $min + 3600 * $hour;
+      }
+      $date -= 24 * 3600 * $amount;
+      return time2str($fmt, $date);
+    }
+    elsif ($unit eq 'y') {
+      if ($startof) {
+        return sprintf("%4d-01-01 00:00:00", $year + 1900 - $amount);
+      }
+      else {
+        return sprintf(
+          "%4d-%02d-%02d %02d:%02d:%02d",
+          $year + 1900 - $amount,
+          $month + 1, $mday, $hour, $min, $sec
+        );
+      }
+    }
+    elsif ($unit eq 'm') {
+      $month -= $amount;
+      $year += floor($month / 12);
+      $month %= 12;
+      if ($startof) {
+        return sprintf("%4d-%02d-01 00:00:00", $year + 1900, $month + 1);
+      }
+      else {
+        return sprintf(
+          "%4d-%02d-%02d %02d:%02d:%02d",
+          $year + 1900,
+          $month + 1, $mday, $hour, $min, $sec
+        );
+      }
+    }
+    elsif ($unit eq 'h') {
+
+      # Special case for 'beginning of an hour'
+      if ($startof) {
+        $fmt = "%Y-%m-%d %H:00:00";
+      }
+      $date -= 3600 * $amount;
+      return time2str($fmt, $date);
+    }
+    return undef;    # should not happen due to regexp at top
+  }
+  my $date = str2time($str);
+  if (!defined($date)) {
+    ThrowUserError("illegal_date", {date => $str});
+  }
+  return time2str($fmt, $date);
 }
 
 ######################################
@@ -2272,104 +2289,109 @@ sub SqlifyDate {
 ######################################
 
 sub pronoun {
-    my ($noun, $user) = (@_);
-    if ($noun eq "%user%") {
-        if ($user->id) {
-            return $user->id;
-        } else {
-            ThrowUserError('login_required_for_pronoun');
-        }
-    }
-    if ($noun eq "%reporter%") {
-        return "bugs.reporter";
-    }
-    if ($noun eq "%assignee%") {
-        return "bugs.assigned_to";
+  my ($noun, $user) = (@_);
+  if ($noun eq "%user%") {
+    if ($user->id) {
+      return $user->id;
     }
-    if ($noun eq "%qacontact%") {
-        return "COALESCE(bugs.qa_contact,0)";
+    else {
+      ThrowUserError('login_required_for_pronoun');
     }
+  }
+  if ($noun eq "%reporter%") {
+    return "bugs.reporter";
+  }
+  if ($noun eq "%assignee%") {
+    return "bugs.assigned_to";
+  }
+  if ($noun eq "%qacontact%") {
+    return "COALESCE(bugs.qa_contact,0)";
+  }
 
-    ThrowUserError('illegal_pronoun', { pronoun => $noun });
+  ThrowUserError('illegal_pronoun', {pronoun => $noun});
 }
 
 sub _contact_pronoun {
-    my ($self, $args) = @_;
-    my $value = $args->{value};
-    my $user = $self->_user;
+  my ($self, $args) = @_;
+  my $value = $args->{value};
+  my $user  = $self->_user;
 
-    if ($value =~ /^\%group\.[^%]+%$/) {
-        $self->_contact_exact_group($args);
-    }
-    elsif ($value =~ /^(%\w+%)$/) {
-        $args->{value} = pronoun($1, $user);
-        $args->{quoted} = $args->{value};
-        $args->{value_is_id} = 1;
-    }
+  if ($value =~ /^\%group\.[^%]+%$/) {
+    $self->_contact_exact_group($args);
+  }
+  elsif ($value =~ /^(%\w+%)$/) {
+    $args->{value}       = pronoun($1, $user);
+    $args->{quoted}      = $args->{value};
+    $args->{value_is_id} = 1;
+  }
 }
 
 sub _contact_exact_group {
-    my ($self, $args) = @_;
-    my ($value, $operator, $field, $chart_id, $joins, $sequence) =
-        @$args{qw(value operator field chart_id joins sequence)};
-    my $dbh = Bugzilla->dbh;
-    my $user = $self->_user;
-
-    # We already know $value will match this regexp, else we wouldn't be here.
-    $value =~ /\%group\.([^%]+)%/;
-    my $group_name = $1;
-    my $group = Bugzilla::Group->check({ name => $group_name, _error => 'invalid_group_name' });
-    # Pass $group_name instead of $group->name to the error message
-    # to not leak the existence of the group.
-    $user->in_group($group)
-      || ThrowUserError('invalid_group_name', { name => $group_name });
-    # Now that we know the user belongs to this group, it's safe
-    # to disclose more information.
-    $group->check_members_are_visible();
-
-    my $group_ids = Bugzilla::Group->flatten_group_membership($group->id);
-
-    if ($field eq 'cc' && $chart_id eq '') {
-        # This is for the email1, email2, email3 fields from query.cgi.
-        $chart_id = "CC$$sequence";
-        $args->{sequence}++;
-    }
-
-    my $from = $field;
-    # These fields need an additional table.
-    if ($field =~ /^(commenter|cc)$/) {
-        my $join_table = $field;
-        $join_table = 'longdescs' if $field eq 'commenter';
-        my $join_table_alias = "${field}_$chart_id";
-        push(@$joins, { table => $join_table, as => $join_table_alias });
-        $from = "$join_table_alias.who";
-    }
-
-    my $table = "user_group_map_$chart_id";
-    my $join = {
-        table => 'user_group_map',
-        as    => $table,
-        from  => $from,
-        to    => 'user_id',
-        extra => [$dbh->sql_in("$table.group_id", $group_ids),
-                  "$table.isbless = 0"],
-    };
-    push(@$joins, $join);
-    if ($operator =~ /^not/) {
-        $args->{term} = "$table.group_id IS NULL";
-    }
-    else {
-        $args->{term} = "$table.group_id IS NOT NULL";
-    }
+  my ($self, $args) = @_;
+  my ($value, $operator, $field, $chart_id, $joins, $sequence)
+    = @$args{qw(value operator field chart_id joins sequence)};
+  my $dbh  = Bugzilla->dbh;
+  my $user = $self->_user;
+
+  # We already know $value will match this regexp, else we wouldn't be here.
+  $value =~ /\%group\.([^%]+)%/;
+  my $group_name = $1;
+  my $group      = Bugzilla::Group->check(
+    {name => $group_name, _error => 'invalid_group_name'});
+
+  # Pass $group_name instead of $group->name to the error message
+  # to not leak the existence of the group.
+  $user->in_group($group)
+    || ThrowUserError('invalid_group_name', {name => $group_name});
+
+  # Now that we know the user belongs to this group, it's safe
+  # to disclose more information.
+  $group->check_members_are_visible();
+
+  my $group_ids = Bugzilla::Group->flatten_group_membership($group->id);
+
+  if ($field eq 'cc' && $chart_id eq '') {
+
+    # This is for the email1, email2, email3 fields from query.cgi.
+    $chart_id = "CC$$sequence";
+    $args->{sequence}++;
+  }
+
+  my $from = $field;
+
+  # These fields need an additional table.
+  if ($field =~ /^(commenter|cc)$/) {
+    my $join_table = $field;
+    $join_table = 'longdescs' if $field eq 'commenter';
+    my $join_table_alias = "${field}_$chart_id";
+    push(@$joins, {table => $join_table, as => $join_table_alias});
+    $from = "$join_table_alias.who";
+  }
+
+  my $table = "user_group_map_$chart_id";
+  my $join  = {
+    table => 'user_group_map',
+    as    => $table,
+    from  => $from,
+    to    => 'user_id',
+    extra => [$dbh->sql_in("$table.group_id", $group_ids), "$table.isbless = 0"],
+  };
+  push(@$joins, $join);
+  if ($operator =~ /^not/) {
+    $args->{term} = "$table.group_id IS NULL";
+  }
+  else {
+    $args->{term} = "$table.group_id IS NOT NULL";
+  }
 }
 
 sub _get_user_id {
-    my ($self, $value) = @_;
+  my ($self, $value) = @_;
 
-    if ($value =~ /^%\w+%$/) {
-        return pronoun($value, $self->_user);
-    }
-    return login_to_id($value, THROW_ERROR);
+  if ($value =~ /^%\w+%$/) {
+    return pronoun($value, $self->_user);
+  }
+  return login_to_id($value, THROW_ERROR);
 }
 
 #####################################################################
@@ -2377,540 +2399,605 @@ sub _get_user_id {
 #####################################################################
 
 sub _invalid_combination {
-    my ($self, $args) = @_;
-    my ($field, $operator) = @$args{qw(field operator)};
-    ThrowUserError('search_field_operator_invalid',
-                   { field => $field, operator => $operator });
+  my ($self,  $args)     = @_;
+  my ($field, $operator) = @$args{qw(field operator)};
+  ThrowUserError('search_field_operator_invalid',
+    {field => $field, operator => $operator});
 }
 
 # For all the "user" fields--assigned_to, reporter, qa_contact,
 # cc, commenter, requestee, etc.
 sub _user_nonchanged {
-    my ($self, $args) = @_;
-    my ($field, $operator, $chart_id, $sequence, $joins) =
-        @$args{qw(field operator chart_id sequence joins)};
-
-    my $is_in_other_table;
-    if (my $join = USER_FIELDS->{$field}->{join}) {
-        $is_in_other_table = 1;
-        my $as = "${field}_$chart_id";
-        # Needed for setters.login_name and requestees.login_name.
-        # Otherwise when we try to join "profiles" below, we'd get
-        # something like "setters.login_name.login_name" in the "from".
-        $as =~ s/\./_/g;        
-        # This helps implement the email1, email2, etc. parameters.
-        if ($chart_id =~ /default/) {
-            $as .= "_$sequence";
-        }
-        my $isprivate = USER_FIELDS->{$field}->{isprivate};
-        my $extra = ($isprivate and !$self->_user->is_insider)
-                    ? ["$as.isprivate = 0"] : [];
-        # We want to copy $join so as not to modify USER_FIELDS.
-        push(@$joins, { %$join, as => $as, extra => $extra });
-        my $search_field = USER_FIELDS->{$field}->{field};
-        $args->{full_field} = "$as.$search_field";
-    }
+  my ($self, $args) = @_;
+  my ($field, $operator, $chart_id, $sequence, $joins)
+    = @$args{qw(field operator chart_id sequence joins)};
+
+  my $is_in_other_table;
+  if (my $join = USER_FIELDS->{$field}->{join}) {
+    $is_in_other_table = 1;
+    my $as = "${field}_$chart_id";
+
+    # Needed for setters.login_name and requestees.login_name.
+    # Otherwise when we try to join "profiles" below, we'd get
+    # something like "setters.login_name.login_name" in the "from".
+    $as =~ s/\./_/g;
+
+    # This helps implement the email1, email2, etc. parameters.
+    if ($chart_id =~ /default/) {
+      $as .= "_$sequence";
+    }
+    my $isprivate = USER_FIELDS->{$field}->{isprivate};
+    my $extra
+      = ($isprivate and !$self->_user->is_insider) ? ["$as.isprivate = 0"] : [];
+
+    # We want to copy $join so as not to modify USER_FIELDS.
+    push(@$joins, {%$join, as => $as, extra => $extra});
+    my $search_field = USER_FIELDS->{$field}->{field};
+    $args->{full_field} = "$as.$search_field";
+  }
+
+  my $is_nullable    = USER_FIELDS->{$field}->{nullable};
+  my $null_alternate = "''";
+
+  # When using a pronoun, we use the userid, and we don't have to
+  # join the profiles table.
+  if ($args->{value_is_id}) {
+    $null_alternate = 0;
+  }
+  elsif (substr($field, -9) eq '_realname') {
+    my $as = "name_${field}_$chart_id";
+
+    # For fields with periods in their name.
+    $as =~ s/\./_/;
+    my $join = {
+      table => 'profiles',
+      as    => $as,
+      from  => substr($args->{full_field}, 0, -9),
+      to    => 'userid',
+      join  => (!$is_in_other_table and !$is_nullable) ? 'INNER' : undef,
+    };
+    push(@$joins, $join);
+    $args->{full_field} = "$as.realname";
+  }
+  else {
+    my $as = "name_${field}_$chart_id";
 
-    my $is_nullable = USER_FIELDS->{$field}->{nullable};
-    my $null_alternate = "''";
-    # When using a pronoun, we use the userid, and we don't have to
-    # join the profiles table.
-    if ($args->{value_is_id}) {
-        $null_alternate = 0;
+    # For fields with periods in their name.
+    $as =~ s/\./_/;
+    my $join = {
+      table => 'profiles',
+      as    => $as,
+      from  => $args->{full_field},
+      to    => 'userid',
+      join  => (!$is_in_other_table and !$is_nullable) ? 'INNER' : undef,
+    };
+    push(@$joins, $join);
+    $args->{full_field} = "$as.login_name";
+  }
+
+  # We COALESCE fields that can be NULL, to make "not"-style operators
+  # continue to work properly. For example, "qa_contact is not equal to bob"
+  # should also show bugs where the qa_contact is NULL. With COALESCE,
+  # it does.
+  if ($is_nullable) {
+    $args->{full_field} = "COALESCE($args->{full_field}, $null_alternate)";
+  }
+
+  # For fields whose values are stored in other tables, negation (NOT)
+  # only works properly if we put the condition into the JOIN instead
+  # of the WHERE.
+  if ($is_in_other_table) {
+
+    # Using the last join works properly whether we're searching based
+    # on userid or login_name.
+    my $last_join = $joins->[-1];
+
+    # For negative operators, the system we're using here
+    # only works properly if we reverse the operator and check IS NULL
+    # in the WHERE.
+    my $is_negative
+      = $operator ne 'notactive' && $operator =~ /^(?:no|isempty)/ ? 1 : 0;
+    if ($is_negative) {
+      $args->{operator} = $self->_reverse_operator($operator);
     }
-    elsif (substr($field, -9) eq '_realname') {
-        my $as = "name_${field}_$chart_id";
-        # For fields with periods in their name.
-        $as =~ s/\./_/;
-        my $join = {
-            table => 'profiles',
-            as    => $as,
-            from  => substr($args->{full_field}, 0, -9),
-            to    => 'userid',
-            join  => (!$is_in_other_table and !$is_nullable) ? 'INNER' : undef,
-        };
-        push(@$joins, $join);
-        $args->{full_field} = "$as.realname";
+    $self->_do_operator_function($args);
+    push(@{$last_join->{extra}}, $args->{term});
+
+    # For login_name searches, we only want a single join.
+    # So we create a subselect table out of our two joins. This makes
+    # negation (NOT) work properly for values that are in other
+    # tables.
+    if ($last_join->{table} eq 'profiles') {
+      pop @$joins;
+      $last_join->{join} = 'INNER';
+      my ($join_sql) = $self->_translate_join($last_join);
+      my $first_join = $joins->[-1];
+      my $as         = $first_join->{as};
+      my $table      = $first_join->{table};
+      my $columns    = "bug_id";
+      $columns .= ",isprivate" if @{$first_join->{extra}};
+      my $new_table = "SELECT DISTINCT $columns FROM $table AS $as $join_sql";
+      $first_join->{table} = "($new_table)";
+
+      # We always want to LEFT JOIN the generated table.
+      delete $first_join->{join};
+
+      # To support OR charts, we need multiple tables.
+      my $new_as = $first_join->{as} . "_$sequence";
+      $_ =~ s/\Q$as\E/$new_as/ foreach @{$first_join->{extra}};
+      $first_join->{as} = $new_as;
+      $last_join = $first_join;
+    }
+
+    # If we're joining the first table (we're using a pronoun and
+    # searching by user id) then we need to check $other_table->{field}.
+    my $check_field = $last_join->{as} . '.bug_id';
+    if ($is_negative) {
+      $args->{term} = "$check_field IS NULL";
     }
     else {
-        my $as = "name_${field}_$chart_id";
-        # For fields with periods in their name.
-        $as =~ s/\./_/;
-        my $join = {
-            table => 'profiles',
-            as    => $as,
-            from  => $args->{full_field},
-            to    => 'userid',
-            join  => (!$is_in_other_table and !$is_nullable) ? 'INNER' : undef,
-        };
-        push(@$joins, $join);
-        $args->{full_field} = "$as.login_name";
-    }
-
-    # We COALESCE fields that can be NULL, to make "not"-style operators
-    # continue to work properly. For example, "qa_contact is not equal to bob"
-    # should also show bugs where the qa_contact is NULL. With COALESCE,
-    # it does.
-    if ($is_nullable) {
-        $args->{full_field} = "COALESCE($args->{full_field}, $null_alternate)";
-    }
-    
-    # For fields whose values are stored in other tables, negation (NOT)
-    # only works properly if we put the condition into the JOIN instead
-    # of the WHERE.
-    if ($is_in_other_table) {
-        # Using the last join works properly whether we're searching based
-        # on userid or login_name.
-        my $last_join = $joins->[-1];
-        
-        # For negative operators, the system we're using here
-        # only works properly if we reverse the operator and check IS NULL
-        # in the WHERE.
-        my $is_negative = $operator =~ /^(?:no|isempty)/ ? 1 : 0;
-        if ($is_negative) {
-            $args->{operator} = $self->_reverse_operator($operator);
-        }
-        $self->_do_operator_function($args);
-        push(@{ $last_join->{extra} }, $args->{term});
-        
-        # For login_name searches, we only want a single join.
-        # So we create a subselect table out of our two joins. This makes
-        # negation (NOT) work properly for values that are in other
-        # tables.
-        if ($last_join->{table} eq 'profiles') {
-            pop @$joins;
-            $last_join->{join} = 'INNER';
-            my ($join_sql) = $self->_translate_join($last_join);
-            my $first_join = $joins->[-1];
-            my $as = $first_join->{as};            
-            my $table = $first_join->{table};
-            my $columns = "bug_id";
-            $columns .= ",isprivate" if @{ $first_join->{extra} };
-            my $new_table = "SELECT DISTINCT $columns FROM $table AS $as $join_sql";
-            $first_join->{table} = "($new_table)";
-            # We always want to LEFT JOIN the generated table.
-            delete $first_join->{join};
-            # To support OR charts, we need multiple tables.
-            my $new_as = $first_join->{as} . "_$sequence";
-            $_ =~ s/\Q$as\E/$new_as/ foreach @{ $first_join->{extra} };
-            $first_join->{as} = $new_as;
-            $last_join = $first_join;
-        }
-        
-        # If we're joining the first table (we're using a pronoun and
-        # searching by user id) then we need to check $other_table->{field}.
-        my $check_field = $last_join->{as} . '.bug_id';
-        if ($is_negative) {
-            $args->{term} = "$check_field IS NULL";
-        }
-        else {
-            $args->{term} = "$check_field IS NOT NULL";
-        }
+      $args->{term} = "$check_field IS NOT NULL";
     }
+  }
 }
 
-# XXX This duplicates having Commenter as a search field.
-sub _long_desc_changedby {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $value) = @$args{qw(chart_id joins value)};
-    
-    my $table = "longdescs_$chart_id";
-    push(@$joins, { table => 'longdescs', as => $table });
-    my $user_id = $self->_get_user_id($value);
-    $args->{term} = "$table.who = $user_id";
+# Changes to duplicates are stored in the longdesc table
+sub _dupe_of_changedby {
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $value) = @$args{qw(chart_id joins value)};
+
+  my $table = "longdescs_$chart_id";
+  push(@$joins, {table => 'longdescs', as => $table});
+  my $user_id = $self->_get_user_id($value);
+  $args->{term} = "$table.who = $user_id AND $table.type = " . CMT_DUPE_OF;
+
+  # If the user is not part of the insiders group, they cannot see
+  # private comments
+  if (!$self->_user->is_insider) {
+    $args->{term} .= " AND $table.isprivate = 0";
+  }
 }
 
-sub _long_desc_changedbefore_after {
-    my ($self, $args) = @_;
-    my ($chart_id, $operator, $value, $joins) =
-        @$args{qw(chart_id operator value joins)};
-    my $dbh = Bugzilla->dbh;
-    
-    my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
-    my $table = "longdescs_$chart_id";
-    my $sql_date = $dbh->quote(SqlifyDate($value));
-    my $join = {
-        table => 'longdescs',
-        as    => $table,
-        extra => ["$table.bug_when $sql_operator $sql_date"],
-    };
-    push(@$joins, $join);
-    $args->{term} = "$table.bug_when IS NOT NULL";
+sub _dupe_of_changedbefore_after {
+  my ($self, $args) = @_;
+  my ($chart_id, $operator, $value, $joins)
+    = @$args{qw(chart_id operator value joins)};
+  my $dbh = Bugzilla->dbh;
 
-    # If the user is not part of the insiders group, they cannot see
-    # private comments
-    if (!$self->_user->is_insider) {
-        $args->{term} .= " AND $table.isprivate = 0";
-    }
+  my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
+  my $table        = "longdescs_$chart_id";
+  my $sql_date     = $dbh->quote(SqlifyDate($value));
+  my $join         = {
+    table => 'longdescs',
+    as    => $table,
+    extra =>
+      ["$table.bug_when $sql_operator $sql_date AND $table.type = " . CMT_DUPE_OF],
+  };
+  push(@$joins, $join);
+  $args->{term} = "$table.bug_when IS NOT NULL";
+
+  # If the user is not part of the insiders group, they cannot see
+  # private comments
+  if (!$self->_user->is_insider) {
+    $args->{term} .= " AND $table.isprivate = 0";
+  }
 }
 
-sub _long_desc_nonchanged {
-    my ($self, $args) = @_;
-    my ($chart_id, $operator, $value, $joins, $bugs_table) =
-        @$args{qw(chart_id operator value joins bugs_table)};
 
-    if ($operator =~ /^is(not)?empty$/) {
-        $args->{term} = $self->_multiselect_isempty($args, $operator eq 'isnotempty');
-        return;
-    }
-    my $dbh = Bugzilla->dbh;
-
-    my $table = "longdescs_$chart_id";
-    my $join_args = {
-        chart_id   => $chart_id,
-        sequence   => $chart_id,
-        field      => 'longdesc',
-        full_field => "$table.thetext",
-        operator   => $operator,
-        value      => $value,
-        all_values => $value,
-        quoted     => $dbh->quote($value),
-        joins      => [],
-        bugs_table => $bugs_table,
-    };
-    $self->_do_operator_function($join_args);
+# XXX This duplicates having Commenter as a search field.
+sub _long_desc_changedby {
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $value) = @$args{qw(chart_id joins value)};
 
-    # If the user is not part of the insiders group, they cannot see
-    # private comments
-    if (!$self->_user->is_insider) {
-        $join_args->{term} .= " AND $table.isprivate = 0";
-    }
+  my $table = "longdescs_$chart_id";
+  push(@$joins, {table => 'longdescs', as => $table});
+  my $user_id = $self->_get_user_id($value);
+  $args->{term} = "$table.who = $user_id";
 
-    my $join = {
-        table => 'longdescs',
-        as    => $table,
-        extra => [ $join_args->{term} ],
-    };
-    push(@$joins, $join);
+  # If the user is not part of the insiders group, they cannot see
+  # private comments
+  if (!$self->_user->is_insider) {
+    $args->{term} .= " AND $table.isprivate = 0";
+  }
+}
 
-    $args->{term} =  "$table.comment_id IS NOT NULL";
+sub _long_desc_changedbefore_after {
+  my ($self, $args) = @_;
+  my ($chart_id, $operator, $value, $joins)
+    = @$args{qw(chart_id operator value joins)};
+  my $dbh = Bugzilla->dbh;
+
+  my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
+  my $table        = "longdescs_$chart_id";
+  my $sql_date     = $dbh->quote(SqlifyDate($value));
+  my $join         = {
+    table => 'longdescs',
+    as    => $table,
+    extra => ["$table.bug_when $sql_operator $sql_date"],
+  };
+  push(@$joins, $join);
+  $args->{term} = "$table.bug_when IS NOT NULL";
+
+  # If the user is not part of the insiders group, they cannot see
+  # private comments
+  if (!$self->_user->is_insider) {
+    $args->{term} .= " AND $table.isprivate = 0";
+  }
+}
+
+sub _long_desc_nonchanged {
+  my ($self, $args) = @_;
+  my ($chart_id, $operator, $value, $joins, $bugs_table)
+    = @$args{qw(chart_id operator value joins bugs_table)};
+
+  if ($operator =~ /^is(not)?empty$/) {
+    $args->{term} = $self->_multiselect_isempty($args, $operator eq 'isnotempty');
+    return;
+  }
+  if ($operator =~ /^is(not)?active$/) {
+
+    # Comments can't be (in)active
+    $self->_invalid_combination($args);
+  }
+  my $dbh = Bugzilla->dbh;
+
+  my $table     = "longdescs_$chart_id";
+  my $join_args = {
+    chart_id   => $chart_id,
+    sequence   => $chart_id,
+    field      => 'longdesc',
+    full_field => "$table.thetext",
+    operator   => $operator,
+    value      => $value,
+    all_values => $value,
+    quoted     => $dbh->quote($value),
+    joins      => [],
+    bugs_table => $bugs_table,
+  };
+  $self->_do_operator_function($join_args);
+
+  # If the user is not part of the insiders group, they cannot see
+  # private comments
+  if (!$self->_user->is_insider) {
+    $join_args->{term} .= " AND $table.isprivate = 0";
+  }
+
+  my $join = {table => 'longdescs', as => $table, extra => [$join_args->{term}],};
+  push(@$joins, $join);
+
+  $args->{term} = "$table.comment_id IS NOT NULL";
 }
 
 sub _content_matches {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $fields, $operator, $value) =
-        @$args{qw(chart_id joins fields operator value)};
-    my $dbh = Bugzilla->dbh;
-
-    # "content" is an alias for columns containing text for which we
-    # can search a full-text index and retrieve results by relevance,
-    # currently just bug comments (and summaries to some degree).
-    # There's only one way to search a full-text index, so we only
-    # accept the "matches" operator, which is specific to full-text
-    # index searches.
-
-    # Add the fulltext table to the query so we can search on it.
-    my $table = "bugs_fulltext_$chart_id";
-    my $comments_col = "comments";
-    $comments_col = "comments_noprivate" unless $self->_user->is_insider;
-    push(@$joins, { table => 'bugs_fulltext', as => $table });
-    
-    # Create search terms to add to the SELECT and WHERE clauses.
-    my ($term1, $rterm1) =
-        $dbh->sql_fulltext_search("$table.$comments_col", $value);
-    my ($term2, $rterm2) =
-        $dbh->sql_fulltext_search("$table.short_desc", $value);
-    $rterm1 = $term1 if !$rterm1;
-    $rterm2 = $term2 if !$rterm2;
-
-    # The term to use in the WHERE clause.
-    my $term = "$term1 OR $term2";
-    if ($operator =~ /not/i) {
-        $term = "NOT($term)";
-    }
-    $args->{term} = $term;
-    
-    # In order to sort by relevance (in case the user requests it),
-    # we SELECT the relevance value so we can add it to the ORDER BY
-    # clause. Every time a new fulltext chart isadded, this adds more 
-    # terms to the relevance sql.
-    #
-    # We build the relevance SQL by modifying the COLUMNS list directly,
-    # which is kind of a hack but works.
-    my $current = $self->COLUMNS->{'relevance'}->{name};
-    $current = $current ? "$current + " : '';
-    # For NOT searches, we just add 0 to the relevance.
-    my $select_term = $operator =~ /not/ ? 0 : "($current$rterm1 + $rterm2)";
-    $self->COLUMNS->{'relevance'}->{name} = $select_term;
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $fields, $operator, $value)
+    = @$args{qw(chart_id joins fields operator value)};
+  my $dbh = Bugzilla->dbh;
+
+  # "content" is an alias for columns containing text for which we
+  # can search a full-text index and retrieve results by relevance,
+  # currently just bug comments (and summaries to some degree).
+  # There's only one way to search a full-text index, so we only
+  # accept the "matches" operator, which is specific to full-text
+  # index searches.
+
+  # Add the fulltext table to the query so we can search on it.
+  my $table        = "bugs_fulltext_$chart_id";
+  my $comments_col = "comments";
+  $comments_col = "comments_noprivate" unless $self->_user->is_insider;
+  push(@$joins, {table => 'bugs_fulltext', as => $table});
+
+  # Create search terms to add to the SELECT and WHERE clauses.
+  my ($term1, $rterm1)
+    = $dbh->sql_fulltext_search("$table.$comments_col", $value);
+  my ($term2, $rterm2) = $dbh->sql_fulltext_search("$table.short_desc", $value);
+  $rterm1 = $term1 if !$rterm1;
+  $rterm2 = $term2 if !$rterm2;
+
+  # The term to use in the WHERE clause.
+  my $term = "$term1 OR $term2";
+  if ($operator =~ /not/i) {
+    $term = "NOT($term)";
+  }
+  $args->{term} = $term;
+
+  # In order to sort by relevance (in case the user requests it),
+  # we SELECT the relevance value so we can add it to the ORDER BY
+  # clause. Every time a new fulltext chart isadded, this adds more
+  # terms to the relevance sql.
+  #
+  # We build the relevance SQL by modifying the COLUMNS list directly,
+  # which is kind of a hack but works.
+  my $current = $self->COLUMNS->{'relevance'}->{name};
+  $current = $current ? "$current + " : '';
+
+  # For NOT searches, we just add 0 to the relevance.
+  my $select_term = $operator =~ /not/ ? 0 : "($current$rterm1 + $rterm2)";
+  $self->COLUMNS->{'relevance'}->{name} = $select_term;
 }
 
 sub _long_descs_count {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins) = @$args{qw(chart_id joins)};
-    my $table = "longdescs_count_$chart_id";
-    my $extra =  $self->_user->is_insider ? "" : "WHERE isprivate = 0";
-    my $join = {
-        table => "(SELECT bug_id, COUNT(*) AS num"
-                 . " FROM longdescs $extra GROUP BY bug_id)",
-        as    => $table,
-    };
-    push(@$joins, $join);
-    $args->{full_field} = "${table}.num";
+  my ($self,     $args)  = @_;
+  my ($chart_id, $joins) = @$args{qw(chart_id joins)};
+  my $table = "longdescs_count_$chart_id";
+  my $extra = $self->_user->is_insider ? "" : "WHERE isprivate = 0";
+  my $join  = {
+    table => "(SELECT bug_id, COUNT(*) AS num"
+      . " FROM longdescs $extra GROUP BY bug_id)",
+    as => $table,
+  };
+  push(@$joins, $join);
+  $args->{full_field} = "${table}.num";
 }
 
 sub _work_time_changedby {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $value) = @$args{qw(chart_id joins value)};
-    
-    my $table = "longdescs_$chart_id";
-    push(@$joins, { table => 'longdescs', as => $table });
-    my $user_id = $self->_get_user_id($value);
-    $args->{term} = "$table.who = $user_id AND $table.work_time != 0";
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $value) = @$args{qw(chart_id joins value)};
+
+  my $table = "longdescs_$chart_id";
+  push(@$joins, {table => 'longdescs', as => $table});
+  my $user_id = $self->_get_user_id($value);
+  $args->{term} = "$table.who = $user_id AND $table.work_time != 0";
 }
 
 sub _work_time_changedbefore_after {
-    my ($self, $args) = @_;
-    my ($chart_id, $operator, $value, $joins) =
-        @$args{qw(chart_id operator value joins)};
-    my $dbh = Bugzilla->dbh;
-    
-    my $table = "longdescs_$chart_id";
-    my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
-    my $sql_date = $dbh->quote(SqlifyDate($value));
-    my $join = {
-        table => 'longdescs',
-        as    => $table,
-        extra => ["$table.work_time != 0",
-                  "$table.bug_when $sql_operator $sql_date"],
-    };
-    push(@$joins, $join);
-    
-    $args->{term} = "$table.bug_when IS NOT NULL";
+  my ($self, $args) = @_;
+  my ($chart_id, $operator, $value, $joins)
+    = @$args{qw(chart_id operator value joins)};
+  my $dbh = Bugzilla->dbh;
+
+  my $table        = "longdescs_$chart_id";
+  my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
+  my $sql_date     = $dbh->quote(SqlifyDate($value));
+  my $join         = {
+    table => 'longdescs',
+    as    => $table,
+    extra => ["$table.work_time != 0", "$table.bug_when $sql_operator $sql_date"],
+  };
+  push(@$joins, $join);
+
+  $args->{term} = "$table.bug_when IS NOT NULL";
 }
 
 sub _work_time {
-    my ($self, $args) = @_;
-    $self->_add_extra_column('actual_time');
-    $args->{full_field} = $self->COLUMNS->{actual_time}->{name};
+  my ($self, $args) = @_;
+  $self->_add_extra_column('actual_time');
+  $args->{full_field} = $self->COLUMNS->{actual_time}->{name};
 }
 
 sub _percentage_complete {
-    my ($self, $args) = @_;
-    
-    $args->{full_field} = $self->COLUMNS->{percentage_complete}->{name};
+  my ($self, $args) = @_;
+
+  $args->{full_field} = $self->COLUMNS->{percentage_complete}->{name};
 
-    # We need actual_time in _select_columns, otherwise we can't use
-    # it in the expression for searching percentage_complete.
-    $self->_add_extra_column('actual_time');
+  # We need actual_time in _select_columns, otherwise we can't use
+  # it in the expression for searching percentage_complete.
+  $self->_add_extra_column('actual_time');
 }
 
 sub _last_visit_ts {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    $args->{full_field} = $self->COLUMNS->{last_visit_ts}->{name};
-    $self->_add_extra_column('last_visit_ts');
+  $args->{full_field} = $self->COLUMNS->{last_visit_ts}->{name};
+  $self->_add_extra_column('last_visit_ts');
 }
 
 sub _last_visit_ts_invalid_operator {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    ThrowUserError('search_field_operator_invalid',
-        { field    => $args->{field},
-          operator => $args->{operator} });
+  ThrowUserError('search_field_operator_invalid',
+    {field => $args->{field}, operator => $args->{operator}});
 }
 
 sub _days_elapsed {
-    my ($self, $args) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    $args->{full_field} = "(" . $dbh->sql_to_days('NOW()') . " - " .
-                                $dbh->sql_to_days('bugs.delta_ts') . ")";
+  my ($self, $args) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  $args->{full_field}
+    = "("
+    . $dbh->sql_to_days('NOW()') . " - "
+    . $dbh->sql_to_days('bugs.delta_ts') . ")";
 }
 
 sub _component_nonchanged {
-    my ($self, $args) = @_;
-    
-    $args->{full_field} = "components.name";
-    $self->_do_operator_function($args);
-    my $term = $args->{term};
-    $args->{term} = build_subselect("bugs.component_id",
-        "components.id", "components", $args->{term});
+  my ($self, $args) = @_;
+
+  $args->{full_field} = "components.name";
+  $self->_do_operator_function($args);
+  my $term = $args->{term};
+  $args->{term}
+    = build_subselect("bugs.component_id", "components.id", "components",
+    $args->{term});
 }
 
 sub _product_nonchanged {
-    my ($self, $args) = @_;
-    
-    # Generate the restriction condition
-    $args->{full_field} = "products.name";
-    $self->_do_operator_function($args);
-    my $term = $args->{term};
-    $args->{term} = build_subselect("bugs.product_id",
-        "products.id", "products", $term);
+  my ($self, $args) = @_;
+
+  # Generate the restriction condition
+  $args->{full_field} = "products.name";
+  $self->_do_operator_function($args);
+  my $term = $args->{term};
+  $args->{term}
+    = build_subselect("bugs.product_id", "products.id", "products", $term);
 }
 
 sub _alias_nonchanged {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    $args->{full_field} = "bugs_aliases.alias";
-    $self->_do_operator_function($args);
-    $args->{term} = build_subselect("bugs.bug_id",
-        "bugs_aliases.bug_id", "bugs_aliases", $args->{term});
+  $args->{full_field} = "bugs_aliases.alias";
+  $self->_do_operator_function($args);
+  $args->{term}
+    = build_subselect("bugs.bug_id", "bugs_aliases.bug_id", "bugs_aliases",
+    $args->{term});
 }
 
 sub _classification_nonchanged {
-    my ($self, $args) = @_;
-    my $joins = $args->{joins};
-    
-    # This joins the right tables for us.
-    $self->_add_extra_column('product');
-    
-    # Generate the restriction condition    
-    $args->{full_field} = "classifications.name";
-    $self->_do_operator_function($args);
-    my $term = $args->{term};
-    $args->{term} = build_subselect("map_product.classification_id",
-        "classifications.id", "classifications", $term);
+  my ($self, $args) = @_;
+  my $joins = $args->{joins};
+
+  # This joins the right tables for us.
+  $self->_add_extra_column('product');
+
+  # Generate the restriction condition
+  $args->{full_field} = "classifications.name";
+  $self->_do_operator_function($args);
+  my $term = $args->{term};
+  $args->{term} = build_subselect("map_product.classification_id",
+    "classifications.id", "classifications", $term);
 }
 
 sub _nullable {
-    my ($self, $args) = @_;
-    my $field = $args->{full_field};
-    $args->{full_field} = "COALESCE($field, '')";
+  my ($self, $args) = @_;
+  my $field = $args->{full_field};
+  $args->{full_field} = "COALESCE($field, '')";
 }
 
 sub _nullable_int {
-    my ($self, $args) = @_;
-    my $field = $args->{full_field};
-    $args->{full_field} = "COALESCE($field, 0)";
+  my ($self, $args) = @_;
+  my $field = $args->{full_field};
+  $args->{full_field} = "COALESCE($field, 0)";
 }
 
 sub _nullable_datetime {
-    my ($self, $args) = @_;
-    my $field = $args->{full_field};
-    my $empty = Bugzilla->dbh->quote(EMPTY_DATETIME);
-    $args->{full_field} = "COALESCE($field, $empty)";
+  my ($self, $args) = @_;
+  my $field = $args->{full_field};
+  my $empty = Bugzilla->dbh->quote(EMPTY_DATETIME);
+  $args->{full_field} = "COALESCE($field, $empty)";
 }
 
 sub _nullable_date {
-    my ($self, $args) = @_;
-    my $field = $args->{full_field};
-    my $empty = Bugzilla->dbh->quote(EMPTY_DATE);
-    $args->{full_field} = "COALESCE($field, $empty)";
+  my ($self, $args) = @_;
+  my $field = $args->{full_field};
+  my $empty = Bugzilla->dbh->quote(EMPTY_DATE);
+  $args->{full_field} = "COALESCE($field, $empty)";
 }
 
 sub _deadline {
-    my ($self, $args) = @_;
-    my $field = $args->{full_field};
-    # This makes "equals" searches work on all DBs (even on MySQL, which
-    # has a bug: http://bugs.mysql.com/bug.php?id=60324).
-    $args->{full_field} = Bugzilla->dbh->sql_date_format($field, '%Y-%m-%d');
-    $self->_nullable_datetime($args);
+  my ($self, $args) = @_;
+  my $field = $args->{full_field};
+
+  # This makes "equals" searches work on all DBs (even on MySQL, which
+  # has a bug: http://bugs.mysql.com/bug.php?id=60324).
+  $args->{full_field} = Bugzilla->dbh->sql_date_format($field, '%Y-%m-%d');
+  $self->_nullable_datetime($args);
 }
 
 sub _owner_idle_time_greater_less {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $value, $operator) =
-        @$args{qw(chart_id joins value operator)};
-    my $dbh = Bugzilla->dbh;
-    
-    my $table = "idle_$chart_id";
-    my $quoted = $dbh->quote(SqlifyDate($value));
-    
-    my $ld_table = "comment_$table";
-    my $act_table = "activity_$table";    
-    my $comments_join = {
-        table => 'longdescs',
-        as    => $ld_table,
-        from  => 'assigned_to',
-        to    => 'who',
-        extra => ["$ld_table.bug_when > $quoted"],
-    };
-    my $activity_join = {
-        table => 'bugs_activity',
-        as    => $act_table,
-        from  => 'assigned_to',
-        to    => 'who',
-        extra => ["$act_table.bug_when > $quoted"]
-    };
-    
-    push(@$joins, $comments_join, $activity_join);
-    
-    if ($operator =~ /greater/) {
-        $args->{term} =
-            "$ld_table.who IS NULL AND $act_table.who IS NULL";
-    } else {
-         $args->{term} =
-            "($ld_table.who IS NOT NULL OR $act_table.who IS NOT NULL)";
-    }
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $value, $operator)
+    = @$args{qw(chart_id joins value operator)};
+  my $dbh = Bugzilla->dbh;
+
+  my $table  = "idle_$chart_id";
+  my $quoted = $dbh->quote(SqlifyDate($value));
+
+  my $ld_table      = "comment_$table";
+  my $act_table     = "activity_$table";
+  my $comments_join = {
+    table => 'longdescs',
+    as    => $ld_table,
+    from  => 'assigned_to',
+    to    => 'who',
+    extra => ["$ld_table.bug_when > $quoted"],
+  };
+  my $activity_join = {
+    table => 'bugs_activity',
+    as    => $act_table,
+    from  => 'assigned_to',
+    to    => 'who',
+    extra => ["$act_table.bug_when > $quoted"]
+  };
+
+  push(@$joins, $comments_join, $activity_join);
+
+  if ($operator =~ /greater/) {
+    $args->{term} = "$ld_table.who IS NULL AND $act_table.who IS NULL";
+  }
+  else {
+    $args->{term} = "($ld_table.who IS NOT NULL OR $act_table.who IS NOT NULL)";
+  }
 }
 
 sub _multiselect_negative {
-    my ($self, $args) = @_;
-    my ($field, $operator) = @$args{qw(field operator)};
+  my ($self,  $args)     = @_;
+  my ($field, $operator) = @$args{qw(field operator)};
 
-    $args->{operator} = $self->_reverse_operator($operator);
-    $args->{term} = $self->_multiselect_term($args, 1);
+  $args->{operator} = $self->_reverse_operator($operator);
+  $args->{term} = $self->_multiselect_term($args, 1);
 }
 
 sub _multiselect_multiple {
-    my ($self, $args) = @_;
-    my ($chart_id, $field, $operator, $value)
-        = @$args{qw(chart_id field operator value)};
-    my $dbh = Bugzilla->dbh;
-    
-    # We want things like "cf_multi_select=two+words" to still be
-    # considered a search for two separate words, unless we're using
-    # anyexact. (_all_values would consider that to be one "word" with a
-    # space in it, because it's not in the Boolean Charts).
-    my @words = $operator eq 'anyexact' ? $self->_all_values($args)
-                                        : split(/[\s,]+/, $value);
-    
-    my @terms;
-    foreach my $word (@words) {
-        next if $word eq '';
-        $args->{value} = $word;
-        $args->{quoted} = $dbh->quote($word);
-        push(@terms, $self->_multiselect_term($args));
-    }
-    
-    # The spacing in the joins helps make the resulting SQL more readable.
-    if ($operator =~ /^any/) {
-        $args->{term} = join("\n        OR ", @terms);
-    }
-    else {
-        $args->{term} = join("\n        AND ", @terms);
-    }
+  my ($self, $args) = @_;
+  my ($chart_id, $field, $operator, $value)
+    = @$args{qw(chart_id field operator value)};
+  my $dbh = Bugzilla->dbh;
+
+  # We want things like "cf_multi_select=two+words" to still be
+  # considered a search for two separate words, unless we're using
+  # anyexact. (_all_values would consider that to be one "word" with a
+  # space in it, because it's not in the Boolean Charts).
+  my @words
+    = $operator eq 'anyexact'
+    ? $self->_all_values($args)
+    : split(/[\s,]+/, $value);
+
+  my @terms;
+  foreach my $word (@words) {
+    next if $word eq '';
+    $args->{value}  = $word;
+    $args->{quoted} = $dbh->quote($word);
+    push(@terms, $self->_multiselect_term($args));
+  }
+
+  # The spacing in the joins helps make the resulting SQL more readable.
+  if ($operator =~ /^any/) {
+    $args->{term} = join("\n        OR ", @terms);
+  }
+  else {
+    $args->{term} = join("\n        AND ", @terms);
+  }
 }
 
 sub _flagtypes_nonchanged {
-    my ($self, $args) = @_;
-    my ($chart_id, $operator, $value, $joins, $bugs_table, $condition) =
-        @$args{qw(chart_id operator value joins bugs_table condition)};
-
-    if ($operator =~ /^is(not)?empty$/) {
-        $args->{term} = $self->_multiselect_isempty($args, $operator eq 'isnotempty');
-        return;
-    }
-
-    my $dbh = Bugzilla->dbh;
-
-    # For 'not' operators, we need to negate the whole term.
-    # If you search for "Flags" (does not contain) "approval+" we actually want
-    # to return *bugs* that don't contain an approval+ flag.  Without rewriting
-    # the negation we'll search for *flags* which don't contain approval+.
-    if ($operator =~ s/^not//) {
-        $args->{operator} = $operator;
-        $condition->operator($operator);
-        $condition->negate(1);
-    }
-
-    my $subselect_args = {
-        chart_id   => $chart_id,
-        sequence   => $chart_id,
-        field      => 'flagtypes.name',
-        full_field =>  $dbh->sql_string_concat("flagtypes_$chart_id.name", "flags_$chart_id.status"),
-        operator   => $operator,
-        value      => $value,
-        all_values => $value,
-        quoted     => $dbh->quote($value),
-        joins      => [],
-        bugs_table => "bugs_$chart_id",
-    };
-    $self->_do_operator_function($subselect_args);
-    my $subselect_term = $subselect_args->{term};
-
-    # don't call build_subselect as this must run as a true sub-select
-    $args->{term} = "EXISTS (
+  my ($self, $args) = @_;
+  my ($chart_id, $operator, $value, $joins, $bugs_table, $condition)
+    = @$args{qw(chart_id operator value joins bugs_table condition)};
+
+  if ($operator =~ /^is(not)?empty$/) {
+    $args->{term} = $self->_multiselect_isempty($args, $operator eq 'isnotempty');
+    return;
+  }
+
+  my $dbh = Bugzilla->dbh;
+
+  # For 'not' operators, we need to negate the whole term.
+  # If you search for "Flags" (does not contain) "approval+" we actually want
+  # to return *bugs* that don't contain an approval+ flag.  Without rewriting
+  # the negation we'll search for *flags* which don't contain approval+.
+  if ($operator ne 'notactive' && $operator =~ s/^not//) {
+    $args->{operator} = $operator;
+    $condition->operator($operator);
+    $condition->negate(1);
+  }
+
+  my $subselect_args = {
+    chart_id => $chart_id,
+    sequence => $chart_id,
+    field    => 'flagtypes.name',
+    full_field =>
+      $dbh->sql_string_concat("flagtypes_$chart_id.name", "flags_$chart_id.status"),
+    operator   => $operator,
+    value      => $value,
+    all_values => $value,
+    quoted     => $dbh->quote($value),
+    joins      => [],
+    bugs_table => "bugs_$chart_id",
+  };
+  $self->_do_operator_function($subselect_args);
+  my $subselect_term = $subselect_args->{term};
+
+  # don't call build_subselect as this must run as a true sub-select
+  $args->{term} = "EXISTS (
         SELECT 1
           FROM $bugs_table bugs_$chart_id
           LEFT JOIN attachments AS attachments_$chart_id
@@ -2927,209 +3014,239 @@ sub _flagtypes_nonchanged {
 }
 
 sub _multiselect_nonchanged {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $field, $operator) =
-        @$args{qw(chart_id joins field operator)};
-    $args->{term} = $self->_multiselect_term($args)
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $field, $operator)
+    = @$args{qw(chart_id joins field operator)};
+  $args->{term} = $self->_multiselect_term($args);
 }
 
 sub _multiselect_table {
-    my ($self, $args) = @_;
-    my ($field, $chart_id) = @$args{qw(field chart_id)};
-    my $dbh = Bugzilla->dbh;
-    
-    if ($field eq 'keywords') {
-        $args->{full_field} = 'keyworddefs.name';
-        return "keywords INNER JOIN keyworddefs".
-                               " ON keywords.keywordid = keyworddefs.id";
-    }
-    elsif ($field eq 'tag') {
-        $args->{full_field} = 'tag.name';
-        return "bug_tag INNER JOIN tag ON bug_tag.tag_id = tag.id AND user_id = "
-               . ($self->_sharer_id || $self->_user->id);
-    }
-    elsif ($field eq 'bug_group') {
-        $args->{full_field} = 'groups.name';
-        return "bug_group_map INNER JOIN groups
+  my ($self,  $args)     = @_;
+  my ($field, $chart_id) = @$args{qw(field chart_id)};
+  my $dbh = Bugzilla->dbh;
+
+  if ($field eq 'keywords') {
+    $args->{full_field} = 'keyworddefs.name';
+    return "keywords INNER JOIN keyworddefs"
+      . " ON keywords.keywordid = keyworddefs.id";
+  }
+  elsif ($field eq 'tag') {
+    $args->{full_field} = 'tag.name';
+    return "bug_tag INNER JOIN tag ON bug_tag.tag_id = tag.id AND user_id = "
+      . ($self->_sharer_id || $self->_user->id);
+  }
+  elsif ($field eq 'bug_group') {
+    $args->{full_field} = 'groups.name';
+    return "bug_group_map INNER JOIN groups
                                       ON bug_group_map.group_id = groups.id";
-    }
-    elsif ($field eq 'blocked' or $field eq 'dependson') {
-        my $select = $field eq 'blocked' ? 'dependson' : 'blocked';
-        $args->{_select_field} = $select;
-        $args->{full_field} = $field;
-        return "dependencies";
-    }
-    elsif ($field eq 'longdesc') {
-        $args->{_extra_where} = " AND isprivate = 0"
-            if !$self->_user->is_insider;
-        $args->{full_field} = 'thetext';
-        return "longdescs";
-    }
-    elsif ($field eq 'longdescs.isprivate') {
-        ThrowUserError('auth_failure', { action => 'search',
-                                         object => 'bug_fields',
-                                         field => 'longdescs.isprivate' })
-            if !$self->_user->is_insider;
-        $args->{full_field} = 'isprivate';
-        return "longdescs";
-    }
-    elsif ($field =~ /^attachments/) {
-        $args->{_extra_where} = " AND isprivate = 0"
-            if !$self->_user->is_insider;
-        $field =~ /^attachments\.(.+)$/;
-        $args->{full_field} = $1;
-        return "attachments";
-    }
-    elsif ($field eq 'attach_data.thedata') {
-        $args->{_extra_where} = " AND attachments.isprivate = 0"
-            if !$self->_user->is_insider;
-        return "attachments INNER JOIN attach_data "
-               . " ON attachments.attach_id = attach_data.id"
-    }
-    elsif ($field eq 'comment_tag') {
-        $args->{_extra_where} = " AND longdescs.isprivate = 0"
-            if !$self->_user->is_insider;
-        $args->{full_field} = 'longdescs_tags.tag';
-        return "longdescs INNER JOIN longdescs_tags".
-               " ON longdescs.comment_id = longdescs_tags.comment_id";
-    }
-    my $table = "bug_$field";
-    $args->{full_field} = "bug_$field.value";
-    return $table;
+  }
+  elsif ($field eq 'blocked' or $field eq 'dependson') {
+    my $select = $field eq 'blocked' ? 'dependson' : 'blocked';
+    $args->{_select_field} = $select;
+    $args->{full_field}    = $field;
+    return "dependencies";
+  }
+  elsif ($field eq 'dupe_of') {
+    $args->{_select_field} = 'dupe';
+    $args->{full_field}    = 'dupe_of';
+    return "duplicates";
+  }
+  elsif ($field eq 'longdesc') {
+    $args->{_extra_where} = " AND isprivate = 0" if !$self->_user->is_insider;
+    $args->{full_field} = 'thetext';
+    return "longdescs";
+  }
+  elsif ($field eq 'longdescs.isprivate') {
+    ThrowUserError('auth_failure',
+      {action => 'search', object => 'bug_fields', field => 'longdescs.isprivate'})
+      if !$self->_user->is_insider;
+    $args->{full_field} = 'isprivate';
+    return "longdescs";
+  }
+  elsif ($field =~ /^attachments/) {
+    $args->{_extra_where} = " AND isprivate = 0" if !$self->_user->is_insider;
+    $field =~ /^attachments\.(.+)$/;
+    $args->{full_field} = $1;
+    return "attachments";
+  }
+  elsif ($field eq 'attach_data.thedata') {
+    $args->{_extra_where} = " AND attachments.isprivate = 0"
+      if !$self->_user->is_insider;
+    return "attachments INNER JOIN attach_data "
+      . " ON attachments.attach_id = attach_data.id";
+  }
+  elsif ($field eq 'comment_tag') {
+    $args->{_extra_where} = " AND longdescs.isprivate = 0"
+      if !$self->_user->is_insider;
+    $args->{full_field} = 'longdescs_tags.tag';
+    return "longdescs INNER JOIN longdescs_tags"
+      . " ON longdescs.comment_id = longdescs_tags.comment_id";
+  }
+  my $table = "bug_$field";
+  $args->{full_field} = "bug_$field.value";
+  return $table;
 }
 
 sub _multiselect_term {
-    my ($self, $args, $not) = @_;
-    my ($operator) = $args->{operator};
-    my $value = $args->{value} || '';
-    # 'empty' operators require special handling
-    return $self->_multiselect_isempty($args, $not)
-        if ($operator =~ /^is(not)?empty$/ || $value eq '---');
-    my $table = $self->_multiselect_table($args);
-    $self->_do_operator_function($args);
-    my $term = $args->{term};
-    $term .= $args->{_extra_where} || '';
-    my $select = $args->{_select_field} || 'bug_id';
-    return build_subselect("$args->{bugs_table}.bug_id", $select, $table, $term, $not);
+  my ($self, $args, $not) = @_;
+  my ($operator) = $args->{operator};
+  my $value = $args->{value} || '';
+
+  # 'empty' operators require special handling
+  return $self->_multiselect_isempty($args, $not)
+    if ($operator =~ /^is(not)?empty$/ || $value eq '---');
+  my $table = $self->_multiselect_table($args);
+  $self->_do_operator_function($args);
+  my $term = $args->{term};
+  $term .= $args->{_extra_where} || '';
+  my $select = $args->{_select_field} || 'bug_id';
+  return build_subselect("$args->{bugs_table}.bug_id", $select, $table, $term,
+    $not);
 }
 
 # We can't use the normal operator_functions to build isempty queries which
 # join to different tables.
 sub _multiselect_isempty {
-    my ($self, $args, $not) = @_;
-    my ($field, $operator, $joins, $chart_id) = @$args{qw(field operator joins chart_id)};
-    my $dbh = Bugzilla->dbh;
-    $operator = $self->_reverse_operator($operator) if $not;
-    $not = $operator eq 'isnotempty' ? 'NOT' : '';
-
-    if ($field eq 'keywords') {
-        push @$joins, {
-            table => 'keywords',
-            as    => "keywords_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-        };
-        return "keywords_$chart_id.bug_id IS $not NULL";
-    }
-    elsif ($field eq 'bug_group') {
-        push @$joins, {
-            table => 'bug_group_map',
-            as    => "bug_group_map_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-        };
-        return "bug_group_map_$chart_id.bug_id IS $not NULL";
-    }
-    elsif ($field eq 'flagtypes.name') {
-        push @$joins, {
-            table => 'flags',
-            as    => "flags_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-        };
-        return "flags_$chart_id.bug_id IS $not NULL";
-    }
-    elsif ($field eq 'blocked' or $field eq 'dependson') {
-        my $to = $field eq 'blocked' ? 'dependson' : 'blocked';
-        push @$joins, {
-            table => 'dependencies',
-            as    => "dependencies_$chart_id",
-            from  => 'bug_id',
-            to    => $to,
-        };
-        return "dependencies_$chart_id.$to IS $not NULL";
-    }
-    elsif ($field eq 'longdesc') {
-        my @extra = ( "longdescs_$chart_id.type != " . CMT_HAS_DUPE );
-        push @extra, "longdescs_$chart_id.isprivate = 0"
-            unless $self->_user->is_insider;
-        push @$joins, {
-            table => 'longdescs',
-            as    => "longdescs_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-            extra => \@extra,
-        };
-        return $not
-            ? "longdescs_$chart_id.thetext != ''"
-            : "longdescs_$chart_id.thetext = ''";
-    }
-    elsif ($field eq 'longdescs.isprivate') {
-        ThrowUserError('search_field_operator_invalid', { field  => $field,
-                                                          operator => $operator });
-    }
-    elsif ($field =~ /^attachments\.(.+)/) {
-        my $sub_field = $1;
-        if ($sub_field eq 'description' || $sub_field eq 'filename' || $sub_field eq 'mimetype') {
-            # can't be null/empty
-            return $not ? '1=1' : '1=2';
-        } else {
-            # all other fields which get here are boolean
-            ThrowUserError('search_field_operator_invalid', { field => $field,
-                                                              operator => $operator });
-        }
-    }
-    elsif ($field eq 'attach_data.thedata') {
-        push @$joins, {
-            table => 'attachments',
-            as    => "attachments_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-            extra => [ $self->_user->is_insider ? '' : "attachments_$chart_id.isprivate = 0" ],
-        };
-        push @$joins, {
-            table => 'attach_data',
-            as    => "attach_data_$chart_id",
-            from  => "attachments_$chart_id.attach_id",
-            to    => 'id',
-        };
-        return "attach_data_$chart_id.thedata IS $not NULL";
-    }
-    elsif ($field eq 'tag') {
-        push @$joins, {
-            table => 'bug_tag',
-            as    => "bug_tag_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-        };
-        push @$joins, {
-            table => 'tag',
-            as    => "tag_$chart_id",
-            from  => "bug_tag_$chart_id.tag_id",
-            to    => 'id',
-            extra => [ "tag_$chart_id.user_id = " . ($self->_sharer_id || $self->_user->id) ],
-        };
-        return "tag_$chart_id.id IS $not NULL";
-    }
-    elsif ($self->_multi_select_fields->{$field}) {
-        push @$joins, {
-            table => "bug_$field",
-            as => "bug_${field}_$chart_id",
-            from  => 'bug_id',
-            to    => 'bug_id',
-        };
-        return "bug_${field}_$chart_id.bug_id IS $not NULL";
+  my ($self, $args, $not) = @_;
+  my ($field, $operator, $joins, $chart_id)
+    = @$args{qw(field operator joins chart_id)};
+  my $dbh = Bugzilla->dbh;
+  $operator = $self->_reverse_operator($operator) if $not;
+  $not = $operator eq 'isnotempty' ? 'NOT' : '';
+
+  if ($field eq 'keywords') {
+    push @$joins,
+      {
+      table => 'keywords',
+      as    => "keywords_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      };
+    return "keywords_$chart_id.bug_id IS $not NULL";
+  }
+  elsif ($field eq 'bug_group') {
+    push @$joins,
+      {
+      table => 'bug_group_map',
+      as    => "bug_group_map_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      };
+    return "bug_group_map_$chart_id.bug_id IS $not NULL";
+  }
+  elsif ($field eq 'flagtypes.name') {
+    push @$joins,
+      {
+      table => 'flags',
+      as    => "flags_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      };
+    return "flags_$chart_id.bug_id IS $not NULL";
+  }
+  elsif ($field eq 'blocked' or $field eq 'dependson') {
+    my $to = $field eq 'blocked' ? 'dependson' : 'blocked';
+    push @$joins,
+      {
+      table => 'dependencies',
+      as    => "dependencies_$chart_id",
+      from  => 'bug_id',
+      to    => $to,
+      };
+    return "dependencies_$chart_id.$to IS $not NULL";
+  }
+  elsif ($field eq 'dupe_of') {
+    push @$joins,
+      {
+      table => 'duplicates',
+      as    => "duplicates_$chart_id",
+      from  => 'bug_id',
+      to    => 'dupe',
+      };
+    return "duplicates_$chart_id.dupe IS $not NULL";
+  }
+  elsif ($field eq 'longdesc') {
+    my @extra = ("longdescs_$chart_id.type != " . CMT_HAS_DUPE);
+    push @extra, "longdescs_$chart_id.isprivate = 0"
+      unless $self->_user->is_insider;
+    push @$joins,
+      {
+      table => 'longdescs',
+      as    => "longdescs_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      extra => \@extra,
+      };
+    return $not
+      ? "longdescs_$chart_id.thetext != ''"
+      : "longdescs_$chart_id.thetext = ''";
+  }
+  elsif ($field eq 'longdescs.isprivate') {
+    ThrowUserError('search_field_operator_invalid',
+      {field => $field, operator => $operator});
+  }
+  elsif ($field =~ /^attachments\.(.+)/) {
+    my $sub_field = $1;
+    if ( $sub_field eq 'description'
+      || $sub_field eq 'filename'
+      || $sub_field eq 'mimetype')
+    {
+      # can't be null/empty
+      return $not ? '1=1' : '1=2';
     }
+    else {
+      # all other fields which get here are boolean
+      ThrowUserError('search_field_operator_invalid',
+        {field => $field, operator => $operator});
+    }
+  }
+  elsif ($field eq 'attach_data.thedata') {
+    push @$joins,
+      {
+      table => 'attachments',
+      as    => "attachments_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      extra =>
+        [$self->_user->is_insider ? '' : "attachments_$chart_id.isprivate = 0"],
+      };
+    push @$joins,
+      {
+      table => 'attach_data',
+      as    => "attach_data_$chart_id",
+      from  => "attachments_$chart_id.attach_id",
+      to    => 'id',
+      };
+    return "attach_data_$chart_id.thedata IS $not NULL";
+  }
+  elsif ($field eq 'tag') {
+    push @$joins,
+      {
+      table => 'bug_tag',
+      as    => "bug_tag_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      };
+    push @$joins,
+      {
+      table => 'tag',
+      as    => "tag_$chart_id",
+      from  => "bug_tag_$chart_id.tag_id",
+      to    => 'id',
+      extra => ["tag_$chart_id.user_id = " . ($self->_sharer_id || $self->_user->id)],
+      };
+    return "tag_$chart_id.id IS $not NULL";
+  }
+  elsif ($self->_multi_select_fields->{$field}) {
+    push @$joins,
+      {
+      table => "bug_$field",
+      as    => "bug_${field}_$chart_id",
+      from  => 'bug_id',
+      to    => 'bug_id',
+      };
+    return "bug_${field}_$chart_id.bug_id IS $not NULL";
+  }
 }
 
 ###############################
@@ -3137,236 +3254,309 @@ sub _multiselect_isempty {
 ###############################
 
 sub _simple_operator {
-    my ($self, $args) = @_;
-    my ($full_field, $quoted, $operator) =
-        @$args{qw(full_field quoted operator)};
-    my $sql_operator = SIMPLE_OPERATORS->{$operator};
-    $args->{term} = "$full_field $sql_operator $quoted";
+  my ($self, $args) = @_;
+  my ($full_field, $quoted, $operator) = @$args{qw(full_field quoted operator)};
+  my $sql_operator = SIMPLE_OPERATORS->{$operator};
+  $args->{term} = "$full_field $sql_operator $quoted";
 }
 
 sub _casesubstring {
-    my ($self, $args) = @_;
-    my ($full_field, $quoted) = @$args{qw(full_field quoted)};
-    my $dbh = Bugzilla->dbh;
-    
-    $args->{term} = $dbh->sql_position($quoted, $full_field) . " > 0";
+  my ($self,       $args)  = @_;
+  my ($full_field, $value) = @$args{qw(full_field value)};
+  my $dbh = Bugzilla->dbh;
+
+  $args->{term} = $dbh->sql_like($value, $full_field);
 }
 
 sub _substring {
-    my ($self, $args) = @_;
-    my ($full_field, $quoted) = @$args{qw(full_field quoted)};
-    my $dbh = Bugzilla->dbh;
-    
-    # XXX This should probably be changed to just use LIKE
-    $args->{term} = $dbh->sql_iposition($quoted, $full_field) . " > 0";
+  my ($self,       $args)  = @_;
+  my ($full_field, $value) = @$args{qw(full_field value)};
+  my $dbh = Bugzilla->dbh;
+
+  $args->{term} = $dbh->sql_ilike($value, $full_field);
 }
 
 sub _notsubstring {
-    my ($self, $args) = @_;
-    my ($full_field, $quoted) = @$args{qw(full_field quoted)};
-    my $dbh = Bugzilla->dbh;
-    
-    # XXX This should probably be changed to just use NOT LIKE
-    $args->{term} = $dbh->sql_iposition($quoted, $full_field) . " = 0";
+  my ($self,       $args)  = @_;
+  my ($full_field, $value) = @$args{qw(full_field value)};
+  my $dbh = Bugzilla->dbh;
+
+  $args->{term} = $dbh->sql_not_ilike($value, $full_field);
 }
 
 sub _regexp {
-    my ($self, $args) = @_;
-    my ($full_field, $quoted) = @$args{qw(full_field quoted)};
-    my $dbh = Bugzilla->dbh;
-    
-    $args->{term} = $dbh->sql_regexp($full_field, $quoted);
+  my ($self,       $args)   = @_;
+  my ($full_field, $quoted) = @$args{qw(full_field quoted)};
+  my $dbh = Bugzilla->dbh;
+
+  $args->{term} = $dbh->sql_regexp($full_field, $quoted);
 }
 
 sub _notregexp {
-    my ($self, $args) = @_;
-    my ($full_field, $quoted) = @$args{qw(full_field quoted)};
-    my $dbh = Bugzilla->dbh;
-    
-    $args->{term} = $dbh->sql_not_regexp($full_field, $quoted);
+  my ($self,       $args)   = @_;
+  my ($full_field, $quoted) = @$args{qw(full_field quoted)};
+  my $dbh = Bugzilla->dbh;
+
+  $args->{term} = $dbh->sql_not_regexp($full_field, $quoted);
 }
 
 sub _anyexact {
-    my ($self, $args) = @_;
-    my ($field, $full_field) = @$args{qw(field full_field)};
-    my $dbh = Bugzilla->dbh;
-    
-    my @list = $self->_all_values($args, ',');
-    @list = map { $self->_quote_unless_numeric($args, $_) } @list;
-    
-    if (@list) {
-        $args->{term} = $dbh->sql_in($full_field, \@list);
-    }
-    else {
-        $args->{term} = '';
-    }
+  my ($self,  $args)       = @_;
+  my ($field, $full_field) = @$args{qw(field full_field)};
+  my $dbh = Bugzilla->dbh;
+
+  my @list = $self->_all_values($args, ',');
+  @list = map { $self->_quote_unless_numeric($args, $_) } @list;
+
+  if (@list) {
+    $args->{term} = $dbh->sql_in($full_field, \@list);
+  }
+  else {
+    $args->{term} = '';
+  }
 }
 
 sub _anywordsubstr {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my @terms = $self->_substring_terms($args);
-    $args->{term} = @terms ? '(' . join("\n\tOR ", @terms) . ')' : '';
+  my @terms = $self->_substring_terms($args);
+  $args->{term} = @terms ? '(' . join("\n\tOR ", @terms) . ')' : '';
 }
 
 sub _allwordssubstr {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my @terms = $self->_substring_terms($args);
-    $args->{term} = @terms ? '(' . join("\n\tAND ", @terms) . ')' : '';
+  my @terms = $self->_substring_terms($args);
+  $args->{term} = @terms ? '(' . join("\n\tAND ", @terms) . ')' : '';
 }
 
 sub _nowordssubstr {
-    my ($self, $args) = @_;
-    $self->_anywordsubstr($args);
-    my $term = $args->{term};
-    $args->{term} = "NOT($term)";
+  my ($self, $args) = @_;
+  $self->_anywordsubstr($args);
+  my $term = $args->{term};
+  $args->{term} = "NOT($term)";
 }
 
 sub _anywords {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
+
+  my @terms = $self->_word_terms($args);
 
-    my @terms = $self->_word_terms($args);
-    # Because _word_terms uses AND, we need to parenthesize its terms
-    # if there are more than one.
-    @terms = map("($_)", @terms) if scalar(@terms) > 1;
-    $args->{term} = @terms ? '(' . join("\n\tOR ", @terms) . ')' : '';
+  # Because _word_terms uses AND, we need to parenthesize its terms
+  # if there are more than one.
+  @terms = map("($_)", @terms) if scalar(@terms) > 1;
+  $args->{term} = @terms ? '(' . join("\n\tOR ", @terms) . ')' : '';
 }
 
 sub _allwords {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my @terms = $self->_word_terms($args);
-    $args->{term} = @terms ? '(' . join("\n\tAND ", @terms) . ')' : '';
+  my @terms = $self->_word_terms($args);
+  $args->{term} = @terms ? '(' . join("\n\tAND ", @terms) . ')' : '';
 }
 
 sub _nowords {
-    my ($self, $args) = @_;
-    $self->_anywords($args);
-    my $term = $args->{term};
-    $args->{term} = "NOT($term)";
+  my ($self, $args) = @_;
+  $self->_anywords($args);
+  my $term = $args->{term};
+  $args->{term} = "NOT($term)";
 }
 
 sub _changedbefore_changedafter {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $field, $operator, $value) =
-        @$args{qw(chart_id joins field operator value)};
-    my $dbh = Bugzilla->dbh;
-
-    my $field_object = $self->_chart_fields->{$field}
-        || ThrowCodeError("invalid_field_name", { field => $field });
-    
-    # Asking when creation_ts changed is just asking when the bug was created.
-    if ($field_object->name eq 'creation_ts') {
-        $args->{operator} =
-            $operator eq 'changedbefore' ? 'lessthaneq' : 'greaterthaneq';
-        return $self->_do_operator_function($args);
-    }
-    
-    my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
-    my $field_id = $field_object->id;
-    # Charts on changed* fields need to be field-specific. Otherwise,
-    # OR chart rows make no sense if they contain multiple fields.
-    my $table = "act_${field_id}_$chart_id";
-
-    my $sql_date = $dbh->quote(SqlifyDate($value));
-    my $join = {
-        table => 'bugs_activity',
-        as    => $table,
-        extra => ["$table.fieldid = $field_id",
-                  "$table.bug_when $sql_operator $sql_date"],
-    };
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $field, $operator, $value)
+    = @$args{qw(chart_id joins field operator value)};
+  my $dbh = Bugzilla->dbh;
 
-    $args->{term} = "$table.bug_when IS NOT NULL";
-    $self->_changed_security_check($args, $join);
-    push(@$joins, $join);
+  my $field_object = $self->_chart_fields->{$field}
+    || ThrowCodeError("invalid_field_name", {field => $field});
+
+  # Asking when creation_ts changed is just asking when the bug was created.
+  if ($field_object->name eq 'creation_ts') {
+    $args->{operator}
+      = $operator eq 'changedbefore' ? 'lessthaneq' : 'greaterthaneq';
+    return $self->_do_operator_function($args);
+  }
+
+  my $sql_operator = ($operator =~ /before/) ? '<=' : '>=';
+  my $field_id = $field_object->id;
+
+  # Charts on changed* fields need to be field-specific. Otherwise,
+  # OR chart rows make no sense if they contain multiple fields.
+  my $table = "act_${field_id}_$chart_id";
+
+  my $sql_date = $dbh->quote(SqlifyDate($value));
+  my $join     = {
+    table => 'bugs_activity',
+    as    => $table,
+    extra =>
+      ["$table.fieldid = $field_id", "$table.bug_when $sql_operator $sql_date"],
+  };
+
+  $args->{term} = "$table.bug_when IS NOT NULL";
+  $self->_changed_security_check($args, $join);
+  push(@$joins, $join);
 }
 
 sub _changedfrom_changedto {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $field, $operator, $quoted) =
-        @$args{qw(chart_id joins field operator quoted)};
-    
-    my $column = ($operator =~ /from/) ? 'removed' : 'added';
-    my $field_object = $self->_chart_fields->{$field}
-        || ThrowCodeError("invalid_field_name", { field => $field });
-    my $field_id = $field_object->id;
-    my $table = "act_${field_id}_$chart_id";
-    my $join = {
-        table => 'bugs_activity',
-        as    => $table,
-        extra => ["$table.fieldid = $field_id",
-                  "$table.$column = $quoted"],
-    };
-
-    $args->{term} = "$table.bug_when IS NOT NULL";
-    $self->_changed_security_check($args, $join);
-    push(@$joins, $join);
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $field, $operator, $quoted)
+    = @$args{qw(chart_id joins field operator quoted)};
+
+  my $column = ($operator =~ /from/) ? 'removed' : 'added';
+  my $field_object = $self->_chart_fields->{$field}
+    || ThrowCodeError("invalid_field_name", {field => $field});
+  my $field_id = $field_object->id;
+  my $table    = "act_${field_id}_$chart_id";
+  my $join     = {
+    table => 'bugs_activity',
+    as    => $table,
+    extra => ["$table.fieldid = $field_id", "$table.$column = $quoted"],
+  };
+
+  $args->{term} = "$table.bug_when IS NOT NULL";
+  $self->_changed_security_check($args, $join);
+  push(@$joins, $join);
 }
 
 sub _changedby {
-    my ($self, $args) = @_;
-    my ($chart_id, $joins, $field, $operator, $value) =
-        @$args{qw(chart_id joins field operator value)};
-    
-    my $field_object = $self->_chart_fields->{$field}
-        || ThrowCodeError("invalid_field_name", { field => $field });
-    my $field_id = $field_object->id;
-    my $table = "act_${field_id}_$chart_id";
-    my $user_id  = $self->_get_user_id($value);
-    my $join = {
-        table => 'bugs_activity',
-        as    => $table,
-        extra => ["$table.fieldid = $field_id",
-                  "$table.who = $user_id"],
-    };
-
-    $args->{term} = "$table.bug_when IS NOT NULL";
-    $self->_changed_security_check($args, $join);
-    push(@$joins, $join);
+  my ($self, $args) = @_;
+  my ($chart_id, $joins, $field, $operator, $value)
+    = @$args{qw(chart_id joins field operator value)};
+
+  my $field_object = $self->_chart_fields->{$field}
+    || ThrowCodeError("invalid_field_name", {field => $field});
+  my $field_id = $field_object->id;
+  my $table    = "act_${field_id}_$chart_id";
+  my $user_id  = $self->_get_user_id($value);
+  my $join     = {
+    table => 'bugs_activity',
+    as    => $table,
+    extra => ["$table.fieldid = $field_id", "$table.who = $user_id"],
+  };
+
+  $args->{term} = "$table.bug_when IS NOT NULL";
+  $self->_changed_security_check($args, $join);
+  push(@$joins, $join);
 }
 
 sub _changed_security_check {
-    my ($self, $args, $join) = @_;
-    my ($chart_id, $field) = @$args{qw(chart_id field)};
-
-    my $field_object = $self->_chart_fields->{$field}
-        || ThrowCodeError("invalid_field_name", { field => $field });
-    my $field_id = $field_object->id;
-
-    # If the user is not part of the insiders group, they cannot see
-    # changes to attachments (including attachment flags) that are private
-    if ($field =~ /^(?:flagtypes\.name$|attach)/ and !$self->_user->is_insider) {
-        $join->{then_to} = {
-            as    => "attach_${field_id}_$chart_id",
-            table => 'attachments',
-            from  => "act_${field_id}_$chart_id.attach_id",
-            to    => 'attach_id',
-        };
+  my ($self, $args, $join) = @_;
+  my ($chart_id, $field) = @$args{qw(chart_id field)};
+
+  my $field_object = $self->_chart_fields->{$field}
+    || ThrowCodeError("invalid_field_name", {field => $field});
+  my $field_id = $field_object->id;
+
+  # If the user is not part of the insiders group, they cannot see
+  # changes to attachments (including attachment flags) that are private
+  if ($field =~ /^(?:flagtypes\.name$|attach)/ and !$self->_user->is_insider) {
+    $join->{then_to} = {
+      as    => "attach_${field_id}_$chart_id",
+      table => 'attachments',
+      from  => "act_${field_id}_$chart_id.attach_id",
+      to    => 'attach_id',
+    };
 
-        $args->{term} .= " AND COALESCE(attach_${field_id}_$chart_id.isprivate, 0) = 0";
-    }
+    $args->{term} .= " AND COALESCE(attach_${field_id}_$chart_id.isprivate, 0) = 0";
+  }
 }
 
 sub _isempty {
-    my ($self, $args) = @_;
-    my $full_field = $args->{full_field};
-    $args->{term} = "$full_field IS NULL OR $full_field = " . $self->_empty_value($args->{field});
+  my ($self, $args) = @_;
+  my $full_field = $args->{full_field};
+  $args->{term} = "$full_field IS NULL OR $full_field = "
+    . $self->_empty_value($args->{field});
 }
 
 sub _isnotempty {
-    my ($self, $args) = @_;
-    my $full_field = $args->{full_field};
-    $args->{term} = "$full_field IS NOT NULL AND $full_field != " . $self->_empty_value($args->{field});
+  my ($self, $args) = @_;
+  my $full_field = $args->{full_field};
+  $args->{term} = "$full_field IS NOT NULL AND $full_field != "
+    . $self->_empty_value($args->{field});
 }
 
 sub _empty_value {
-    my ($self, $field) = @_;
-    my $field_obj = $self->_chart_fields->{$field};
-    return "0" if $field_obj->type == FIELD_TYPE_BUG_ID;
-    return Bugzilla->dbh->quote(EMPTY_DATETIME) if $field_obj->type == FIELD_TYPE_DATETIME;
-    return Bugzilla->dbh->quote(EMPTY_DATE) if $field_obj->type == FIELD_TYPE_DATE;
-    return "''";
+  my ($self, $field) = @_;
+  my $field_obj = $self->_chart_fields->{$field};
+  return "0" if $field_obj->type == FIELD_TYPE_BUG_ID;
+  return Bugzilla->dbh->quote(EMPTY_DATETIME)
+    if $field_obj->type == FIELD_TYPE_DATETIME;
+  return Bugzilla->dbh->quote(EMPTY_DATE) if $field_obj->type == FIELD_TYPE_DATE;
+  return "''";
+}
+
+sub _isactive {
+  my ($self, $args) = @_;
+  my ($field, $chart_id, $operator, $joins, $bugs_table)
+    = @$args{qw(field chart_id operator joins bugs_table)};
+
+  my $value = $operator eq 'isnotactive' ? 0 : 1;
+
+  my @simple_fields = qw(bug_severity bug_status op_sys priority rep_platform
+    resolution version
+  );
+  my @user_fields = qw(attachments.submitter assigned_to assigned_to_realname
+    cc commenter reporter reporter_realname requestees.login_name
+    setters.login_name qa_contact qa_contact_realname
+  );
+
+  if ($field eq 'product' or $field eq 'component') {
+    $args->{term} = "${field}s.isactive = $value";
+  }
+  elsif (grep { $_ eq $field } @simple_fields) {
+    push @$joins,
+      {
+      table => ($field eq 'version' ? 'versions' : $field),
+      as    => "${field}_$chart_id",
+      from  => $field,
+      to    => 'value',
+      };
+    $args->{term} = "${field}_$chart_id.isactive = $value";
+  }
+  elsif ($field eq 'flagtypes.name') {
+    $args->{term} = "flagtypes_$chart_id.is_active = $value";
+  }
+  elsif ($field eq 'bug_group') {
+    $args->{term} = "groups.isactive = $value";
+  }
+  elsif ($field eq 'keywords') {
+    $args->{term} = "keyworddefs.is_active = $value";
+  }
+  elsif ($field eq 'target_milestone') {
+    push @$joins,
+      {
+      table => 'milestones',
+      as    => "milestones_$chart_id",
+      from  => 'target_milestone',
+      to    => 'value',
+      };
+    $args->{term} = qq{
+            (milestones_$chart_id.product_id = bugs.product_id AND
+             milestones_$chart_id.isactive = $value)
+        };
+  }
+  elsif (grep { $_ eq $field } @user_fields) {
+    my $as = "name_${field}_$chart_id";
+
+    # For fields with periods in their name.
+    $as =~ s/\./_/;
+    $args->{full_field} = "$as.disabled_text";
+    my $op = $value ? '=' : '!=';
+    $args->{term} = "$as.disabledtext $op ''";
+  }
+
+  elsif (my $field_obj = $self->_select_fields->{$field}) {
+    my $field_type = $field_obj->type;
+    $args->{term}
+      = $field_type == FIELD_TYPE_MULTI_SELECT ? 'value' : "bugs.$field";
+    $args->{term}
+      .= " IN (SELECT value FROM $field WHERE $field.isactive = $value)";
+  }
+  else {
+    # This field does not have an active value
+    $self->_invalid_combination($args);
+  }
 }
 
 ######################
@@ -3374,46 +3564,47 @@ sub _empty_value {
 ######################
 
 # Validate that the query type is one we can deal with
-sub IsValidQueryType
-{
-    my ($queryType) = @_;
-    if (grep { $_ eq $queryType } qw(specific advanced)) {
-        return 1;
-    }
-    return 0;
+sub IsValidQueryType {
+  my ($queryType) = @_;
+  if (grep { $_ eq $queryType } qw(specific advanced)) {
+    return 1;
+  }
+  return 0;
 }
 
 # Splits out "asc|desc" from a sort order item.
 sub split_order_term {
-    my $fragment = shift;
-    $fragment =~ /^(.+?)(?:\s+(ASC|DESC))?$/i;
-    my ($column_name, $direction) = (lc($1), uc($2 || ''));
-    return wantarray ? ($column_name, $direction) : $column_name;
+  my $fragment = shift;
+  $fragment =~ /^(.+?)(?:\s+(ASC|DESC))?$/i;
+  my ($column_name, $direction) = (lc($1), uc($2 || ''));
+  return wantarray ? ($column_name, $direction) : $column_name;
 }
 
 # Used to translate old SQL fragments from buglist.cgi's "order" argument
 # into our modern field IDs.
 sub _translate_old_column {
-    my ($self, $column) = @_;
-    # All old SQL fragments have a period in them somewhere.
-    return $column if $column !~ /\./;
+  my ($self, $column) = @_;
 
-    if ($column =~ /\bAS\s+(\w+)$/i) {
-        return $1;
-    }
-    # product, component, classification, assigned_to, qa_contact, reporter
-    elsif ($column =~ /map_(\w+?)s?\.(login_)?name/i) {
-        return $1;
-    }
-    
-    # If it doesn't match the regexps above, check to see if the old 
-    # SQL fragment matches the SQL of an existing column
-    foreach my $key (%{ $self->COLUMNS }) {
-        next unless exists $self->COLUMNS->{$key}->{name};
-        return $key if $self->COLUMNS->{$key}->{name} eq $column;
-    }
+  # All old SQL fragments have a period in them somewhere.
+  return $column if $column !~ /\./;
+
+  if ($column =~ /\bAS\s+(\w+)$/i) {
+    return $1;
+  }
+
+  # product, component, classification, assigned_to, qa_contact, reporter
+  elsif ($column =~ /map_(\w+?)s?\.(login_)?name/i) {
+    return $1;
+  }
+
+  # If it doesn't match the regexps above, check to see if the old
+  # SQL fragment matches the SQL of an existing column
+  foreach my $key (%{$self->COLUMNS}) {
+    next unless exists $self->COLUMNS->{$key}->{name};
+    return $key if $self->COLUMNS->{$key}->{name} eq $column;
+  }
 
-    return $column;
+  return $column;
 }
 
 1;
diff --git a/Bugzilla/Search/Clause.pm b/Bugzilla/Search/Clause.pm
index 1d7872c785..1f61cd6800 100644
--- a/Bugzilla/Search/Clause.pm
+++ b/Bugzilla/Search/Clause.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Search::Clause;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,121 +16,123 @@ use Bugzilla::Search::Condition qw(condition);
 use Bugzilla::Util qw(trick_taint);
 
 sub new {
-    my ($class, $joiner) = @_;
-    if ($joiner and $joiner ne 'OR' and $joiner ne 'AND') {
-        ThrowCodeError('search_invalid_joiner', { joiner => $joiner });
-    }
-    # This will go into SQL directly so needs to be untainted.
-    trick_taint($joiner) if $joiner;
-    bless { joiner => $joiner || 'AND' }, $class;
+  my ($class, $joiner) = @_;
+  if ($joiner and $joiner ne 'OR' and $joiner ne 'AND') {
+    ThrowCodeError('search_invalid_joiner', {joiner => $joiner});
+  }
+
+  # This will go into SQL directly so needs to be untainted.
+  trick_taint($joiner) if $joiner;
+  bless {joiner => $joiner || 'AND'}, $class;
 }
 
 sub children {
-    my ($self) = @_;
-    $self->{children} ||= [];
-    return $self->{children};
+  my ($self) = @_;
+  $self->{children} ||= [];
+  return $self->{children};
 }
 
 sub update_search_args {
-    my ($self, $search_args) = @_;
-    # abstract
+  my ($self, $search_args) = @_;
+
+  # abstract
 }
 
 sub joiner { return $_[0]->{joiner} }
 
 sub has_translated_conditions {
-    my ($self) = @_;
-    my $children = $self->children;
-    return 1 if grep { $_->isa('Bugzilla::Search::Condition')
-                       && $_->translated } @$children;
-    foreach my $child (@$children) {
-        next if $child->isa('Bugzilla::Search::Condition');
-        return 1 if $child->has_translated_conditions;
-    }
-    return 0;
+  my ($self) = @_;
+  my $children = $self->children;
+  return 1
+    if grep { $_->isa('Bugzilla::Search::Condition') && $_->translated }
+    @$children;
+  foreach my $child (@$children) {
+    next if $child->isa('Bugzilla::Search::Condition');
+    return 1 if $child->has_translated_conditions;
+  }
+  return 0;
 }
 
 sub add {
-    my $self = shift;
-    my $children = $self->children;
-    if (@_ == 3) {
-        push(@$children, condition(@_));
-        return;
-    }
-    
-    my ($child) = @_;
-    return if !defined $child;
-    $child->isa(__PACKAGE__) || $child->isa('Bugzilla::Search::Condition')
-        || die 'child not the right type: ' . $child;
-    push(@{ $self->children }, $child);
+  my $self     = shift;
+  my $children = $self->children;
+  if (@_ == 3) {
+    push(@$children, condition(@_));
+    return;
+  }
+
+  my ($child) = @_;
+  return if !defined $child;
+  $child->isa(__PACKAGE__)
+    || $child->isa('Bugzilla::Search::Condition')
+    || die 'child not the right type: ' . $child;
+  push(@{$self->children}, $child);
 }
 
 sub negate {
-    my ($self, $value) = @_;
-    if (@_ == 2) {
-        $self->{negate} = $value ? 1 : 0;
-    }
-    return $self->{negate};
+  my ($self, $value) = @_;
+  if (@_ == 2) {
+    $self->{negate} = $value ? 1 : 0;
+  }
+  return $self->{negate};
 }
 
 sub walk_conditions {
-    my ($self, $callback) = @_;
-    foreach my $child (@{ $self->children }) {
-        if ($child->isa('Bugzilla::Search::Condition')) {
-            $callback->($self, $child);
-        }
-        else {
-            $child->walk_conditions($callback);
-        }
+  my ($self, $callback) = @_;
+  foreach my $child (@{$self->children}) {
+    if ($child->isa('Bugzilla::Search::Condition')) {
+      $callback->($self, $child);
+    }
+    else {
+      $child->walk_conditions($callback);
     }
+  }
 }
 
 sub as_string {
-    my ($self) = @_;
-    if (!$self->{sql}) {
-        my @strings;
-        foreach my $child (@{ $self->children }) {
-            next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
-            next if $child->isa('Bugzilla::Search::Condition')
-                    && !$child->translated;
-
-            my $string = $child->as_string;
-            next unless $string;
-            if ($self->joiner eq 'AND') {
-                $string = "( $string )" if $string =~ /OR/;
-            }
-            else {
-                $string = "( $string )" if $string =~ /AND/;
-            }
-            push(@strings, $string);
-        }
-
-        my $sql = join(' ' . $self->joiner . ' ', @strings);
-        $sql = "NOT( $sql )" if $sql && $self->negate;
-        $self->{sql} = $sql;
+  my ($self) = @_;
+  if (!$self->{sql}) {
+    my @strings;
+    foreach my $child (@{$self->children}) {
+      next if $child->isa(__PACKAGE__) && !$child->has_translated_conditions;
+      next if $child->isa('Bugzilla::Search::Condition') && !$child->translated;
+
+      my $string = $child->as_string;
+      next unless $string;
+      if ($self->joiner eq 'AND') {
+        $string = "( $string )" if $string =~ /OR/;
+      }
+      else {
+        $string = "( $string )" if $string =~ /AND/;
+      }
+      push(@strings, $string);
     }
-    return $self->{sql};
+
+    my $sql = join(' ' . $self->joiner . ' ', @strings);
+    $sql = "NOT( $sql )" if $sql && $self->negate;
+    $self->{sql} = $sql;
+  }
+  return $self->{sql};
 }
 
 # Search.pm converts URL parameters to Clause objects. This helps do the
 # reverse.
 sub as_params {
-    my ($self) = @_;
-    my @params;
-    foreach my $child (@{ $self->children }) {
-        if ($child->isa(__PACKAGE__)) {
-            my %open_paren = (f => 'OP', n => scalar $child->negate,
-                              j => $child->joiner);
-            push(@params, \%open_paren);
-            push(@params, $child->as_params);
-            my %close_paren =  (f => 'CP');
-            push(@params, \%close_paren);
-        }
-        else {
-            push(@params, $child->as_params);
-        }
+  my ($self) = @_;
+  my @params;
+  foreach my $child (@{$self->children}) {
+    if ($child->isa(__PACKAGE__)) {
+      my %open_paren = (f => 'OP', n => scalar $child->negate, j => $child->joiner);
+      push(@params, \%open_paren);
+      push(@params, $child->as_params);
+      my %close_paren = (f => 'CP');
+      push(@params, \%close_paren);
+    }
+    else {
+      push(@params, $child->as_params);
     }
-    return @params;
+  }
+  return @params;
 }
 
 1;
diff --git a/Bugzilla/Search/ClauseGroup.pm b/Bugzilla/Search/ClauseGroup.pm
index 590c737fad..83d6381da9 100644
--- a/Bugzilla/Search/ClauseGroup.pm
+++ b/Bugzilla/Search/ClauseGroup.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Search::ClauseGroup;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -19,83 +19,88 @@ use Bugzilla::Util qw(trick_taint);
 use List::MoreUtils qw(uniq);
 
 use constant UNSUPPORTED_FIELDS => qw(
-    attach_data.thedata
-    classification
-    commenter
-    component
-    longdescs.count
-    product
-    owner_idle_time
+  attach_data.thedata
+  classification
+  commenter
+  component
+  longdescs.count
+  product
+  owner_idle_time
 );
 
 sub new {
-    my ($class) = @_;
-    my $self = bless({ joiner => 'AND' }, $class);
-    # Add a join back to the bugs table which will be used to group conditions
-    # for this clause
-    my $condition = Bugzilla::Search::Condition->new({});
-    $condition->translated({
-        joins => [{
-            table => 'bugs',
-            as    => 'bugs_g0',
-            from  => 'bug_id',
-            to    => 'bug_id',
-            extra => [],
-        }],
-        term => '1 = 1',
-    });
-    $self->SUPER::add($condition);
-    $self->{group_condition} = $condition;
-    return $self;
+  my ($class) = @_;
+  my $self = bless({joiner => 'AND'}, $class);
+
+  # Add a join back to the bugs table which will be used to group conditions
+  # for this clause
+  my $condition = Bugzilla::Search::Condition->new({});
+  $condition->translated({
+    joins => [{
+      table => 'bugs',
+      as    => 'bugs_g0',
+      from  => 'bug_id',
+      to    => 'bug_id',
+      extra => [],
+    }],
+    term => '1 = 1',
+  });
+  $self->SUPER::add($condition);
+  $self->{group_condition} = $condition;
+  return $self;
 }
 
 sub add {
-    my ($self, @args) = @_;
-    my $field = scalar(@args) == 3 ? $args[0] : $args[0]->{field};
-
-    # We don't support nesting of conditions under this clause
-    if (scalar(@args) == 1 && !$args[0]->isa('Bugzilla::Search::Condition')) {
-        ThrowUserError('search_grouped_invalid_nesting');
-    }
-
-    # Ensure all conditions use the same field
-    if (!$self->{_field}) {
-        $self->{_field} = $field;
-    } elsif ($field ne $self->{_field}) {
-        ThrowUserError('search_grouped_field_mismatch');
-    }
-
-    # Unsupported fields
-    if (grep { $_ eq $field } UNSUPPORTED_FIELDS ) {
-        # XXX - Hack till bug 916882 is fixed.
-        my $operator = scalar(@args) == 3 ? $args[1] : $args[0]->{operator};
-        ThrowUserError('search_grouped_field_invalid', { field => $field })
-          unless (($field eq 'product' || $field eq 'component') && $operator =~ /^changed/);
-    }
-
-    $self->SUPER::add(@args);
+  my ($self, @args) = @_;
+  my $field = scalar(@args) == 3 ? $args[0] : $args[0]->{field};
+
+  # We don't support nesting of conditions under this clause
+  if (scalar(@args) == 1 && !$args[0]->isa('Bugzilla::Search::Condition')) {
+    ThrowUserError('search_grouped_invalid_nesting');
+  }
+
+  # Ensure all conditions use the same field
+  if (!$self->{_field}) {
+    $self->{_field} = $field;
+  }
+  elsif ($field ne $self->{_field}) {
+    ThrowUserError('search_grouped_field_mismatch');
+  }
+
+  # Unsupported fields
+  if (grep { $_ eq $field } UNSUPPORTED_FIELDS) {
+
+    # XXX - Hack till bug 916882 is fixed.
+    my $operator = scalar(@args) == 3 ? $args[1] : $args[0]->{operator};
+    ThrowUserError('search_grouped_field_invalid', {field => $field})
+      unless (($field eq 'product' || $field eq 'component')
+      && $operator =~ /^changed/);
+  }
+
+  $self->SUPER::add(@args);
 }
 
 sub update_search_args {
-    my ($self, $search_args) = @_;
+  my ($self, $search_args) = @_;
 
-    # No need to change things if there's only one child condition
-    return unless scalar(@{ $self->children }) > 1;
+  # No need to change things if there's only one child condition
+  return unless scalar(@{$self->children}) > 1;
 
-    # we want all the terms to use the same join table
-    if (!exists $self->{_first_chart_id}) {
-        $self->{_first_chart_id} = $search_args->{chart_id};
-    } else {
-        $search_args->{chart_id} = $self->{_first_chart_id};
-    }
+  # we want all the terms to use the same join table
+  if (!exists $self->{_first_chart_id}) {
+    $self->{_first_chart_id} = $search_args->{chart_id};
+  }
+  else {
+    $search_args->{chart_id} = $self->{_first_chart_id};
+  }
 
-    my $suffix = '_g' . $self->{_first_chart_id};
-    $self->{group_condition}->{translated}->{joins}->[0]->{as} = "bugs$suffix";
+  my $suffix = '_g' . $self->{_first_chart_id};
+  $self->{group_condition}->{translated}->{joins}->[0]->{as} = "bugs$suffix";
 
-    $search_args->{full_field} =~ s/^bugs\./bugs$suffix\./;
+  $search_args->{full_field} =~ s/^bugs\./bugs$suffix\./;
 
-    $search_args->{table_suffix} = $suffix;
-    $search_args->{bugs_table} = "bugs$suffix";
+  $search_args->{table_suffix} = $suffix;
+  $search_args->{bugs_table}   = "bugs$suffix";
 }
 
 1;
diff --git a/Bugzilla/Search/Condition.pm b/Bugzilla/Search/Condition.pm
index 306a63eed3..d91191c54a 100644
--- a/Bugzilla/Search/Condition.pm
+++ b/Bugzilla/Search/Condition.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Search::Condition;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -15,55 +15,59 @@ use parent qw(Exporter);
 our @EXPORT_OK = qw(condition);
 
 sub new {
-    my ($class, $params) = @_;
-    my %self = %$params;
-    bless \%self, $class;
-    return \%self;
+  my ($class, $params) = @_;
+  my %self = %$params;
+  bless \%self, $class;
+  return \%self;
 }
 
-sub field    { return $_[0]->{field}    }
-sub value    { return $_[0]->{value}    }
+sub field { return $_[0]->{field} }
+sub value { return $_[0]->{value} }
 
 sub operator {
-    my ($self, $value) = @_;
-    if (@_ == 2) {
-        $self->{operator} = $value;
-    }
-    return $self->{operator};
+  my ($self, $value) = @_;
+  if (@_ == 2) {
+    $self->{operator} = $value;
+  }
+  return $self->{operator};
 }
 
 sub fov {
-    my ($self) = @_;
-    return ($self->field, $self->operator, $self->value);
+  my ($self) = @_;
+  return ($self->field, $self->operator, $self->value);
 }
 
 sub translated {
-    my ($self, $params) = @_;
-    if (@_ == 2) {
-        $self->{translated} = $params;
-    }
-    return $self->{translated};
+  my ($self, $params) = @_;
+  if (@_ == 2) {
+    $self->{translated} = $params;
+  }
+  return $self->{translated};
 }
 
 sub as_string {
-    my ($self) = @_;
-    my $term = $self->translated->{term};
-    $term = "NOT( $term )" if $term && $self->negate;
-    return $term;
+  my ($self) = @_;
+  my $term = $self->translated->{term};
+  $term = "NOT( $term )" if $term && $self->negate;
+  return $term;
 }
 
 sub as_params {
-    my ($self) = @_;
-    return { f => $self->field, o => $self->operator, v => $self->value,
-             n => scalar $self->negate };
+  my ($self) = @_;
+  return {
+    f => $self->field,
+    o => $self->operator,
+    v => $self->value,
+    n => scalar $self->negate
+  };
 }
 
 sub negate {
-    my ($self, $value) = @_;
-    if (@_ == 2) {
-        $self->{negate} = $value ? 1 : 0;
-    }
-    return $self->{negate};
+  my ($self, $value) = @_;
+  if (@_ == 2) {
+    $self->{negate} = $value ? 1 : 0;
+  }
+  return $self->{negate};
 }
 
 ###########################
@@ -71,9 +75,9 @@ sub negate {
 ###########################
 
 sub condition {
-    my ($field, $operator, $value) = @_;
-    return __PACKAGE__->new({ field => $field, operator => $operator,
-                              value => $value });
+  my ($field, $operator, $value) = @_;
+  return __PACKAGE__->new(
+    {field => $field, operator => $operator, value => $value});
 }
 
 1;
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 830177f8b5..a69139d138 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Search::Quicksearch;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -27,246 +27,251 @@ use parent qw(Exporter);
 
 # Custom mappings for some fields.
 use constant MAPPINGS => {
-    # Status, Resolution, Platform, OS, Priority, Severity
-    "status"   => "bug_status",
-    "platform" => "rep_platform",
-    "os"       => "op_sys",
-    "severity" => "bug_severity",
-
-    # People: AssignedTo, Reporter, QA Contact, CC, etc.
-    "assignee" => "assigned_to",
-    "owner"    => "assigned_to",
-
-    # Product, Version, Component, Target Milestone
-    "milestone" => "target_milestone",
-
-    # Summary, Description, URL, Status whiteboard, Keywords
-    "summary"     => "short_desc",
-    "description" => "longdesc",
-    "comment"     => "longdesc",
-    "url"         => "bug_file_loc",
-    "whiteboard"  => "status_whiteboard",
-    "sw"          => "status_whiteboard",
-    "kw"          => "keywords",
-    "group"       => "bug_group",
-
-    # Flags
-    "flag"        => "flagtypes.name",
-    "requestee"   => "requestees.login_name",
-    "setter"      => "setters.login_name",
-
-    # Attachments
-    "attachment"     => "attachments.description",
-    "attachmentdesc" => "attachments.description",
-    "attachdesc"     => "attachments.description",
-    "attachmentdata" => "attach_data.thedata",
-    "attachdata"     => "attach_data.thedata",
-    "attachmentmimetype" => "attachments.mimetype",
-    "attachmimetype" => "attachments.mimetype"
+
+  # Status, Resolution, Platform, OS, Priority, Severity
+  "status"   => "bug_status",
+  "platform" => "rep_platform",
+  "os"       => "op_sys",
+  "severity" => "bug_severity",
+
+  # People: AssignedTo, Reporter, QA Contact, CC, etc.
+  "assignee" => "assigned_to",
+  "owner"    => "assigned_to",
+
+  # Product, Version, Component, Target Milestone
+  "milestone" => "target_milestone",
+
+  # Summary, Description, URL, Status whiteboard, Keywords
+  "summary"     => "short_desc",
+  "description" => "longdesc",
+  "comment"     => "longdesc",
+  "url"         => "bug_file_loc",
+  "whiteboard"  => "status_whiteboard",
+  "sw"          => "status_whiteboard",
+  "kw"          => "keywords",
+  "group"       => "bug_group",
+
+  # Flags
+  "flag"      => "flagtypes.name",
+  "requestee" => "requestees.login_name",
+  "setter"    => "setters.login_name",
+
+  # Attachments
+  "attachment"         => "attachments.description",
+  "attachmentdesc"     => "attachments.description",
+  "attachdesc"         => "attachments.description",
+  "attachmentdata"     => "attach_data.thedata",
+  "attachdata"         => "attach_data.thedata",
+  "attachmentmimetype" => "attachments.mimetype",
+  "attachmimetype"     => "attachments.mimetype"
 };
 
 sub FIELD_MAP {
-    my $cache = Bugzilla->request_cache;
-    return $cache->{quicksearch_fields} if $cache->{quicksearch_fields};
-
-    # Get all the fields whose names don't contain periods. (Fields that
-    # contain periods are always handled in MAPPINGS.) 
-    my @db_fields = grep { $_->name !~ /\./ } 
-                         @{ Bugzilla->fields({ obsolete => 0 }) };
-    my %full_map = (%{ MAPPINGS() }, map { $_->name => $_->name } @db_fields);
-
-    # Eliminate the fields that start with bug_ or rep_, because those are
-    # handled by the MAPPINGS instead, and we don't want too many names
-    # for them. (Also, otherwise "rep" doesn't match "reporter".)
-    #
-    # Remove "status_whiteboard" because we have "whiteboard" for it in
-    # the mappings, and otherwise "stat" can't match "status".
-    #
-    # Also, don't allow searching the _accessible stuff via quicksearch
-    # (both because it's unnecessary and because otherwise 
-    # "reporter_accessible" and "reporter" both match "rep".
-    delete @full_map{qw(rep_platform bug_status bug_file_loc bug_group
-                        bug_severity bug_status
-                        status_whiteboard
-                        cclist_accessible reporter_accessible)};
-
-    Bugzilla::Hook::process('quicksearch_map', {'map' => \%full_map} );
-
-    $cache->{quicksearch_fields} = \%full_map;
-
-    return $cache->{quicksearch_fields};
+  my $cache = Bugzilla->request_cache;
+  return $cache->{quicksearch_fields} if $cache->{quicksearch_fields};
+
+  # Get all the fields whose names don't contain periods. (Fields that
+  # contain periods are always handled in MAPPINGS.)
+  my @db_fields = grep { $_->name !~ /\./ } @{Bugzilla->fields({obsolete => 0})};
+  my %full_map = (%{MAPPINGS()}, map { $_->name => $_->name } @db_fields);
+
+  # Eliminate the fields that start with bug_ or rep_, because those are
+  # handled by the MAPPINGS instead, and we don't want too many names
+  # for them. (Also, otherwise "rep" doesn't match "reporter".)
+  #
+  # Remove "status_whiteboard" because we have "whiteboard" for it in
+  # the mappings, and otherwise "stat" can't match "status".
+  #
+  # Also, don't allow searching the _accessible stuff via quicksearch
+  # (both because it's unnecessary and because otherwise
+  # "reporter_accessible" and "reporter" both match "rep".
+  delete @full_map{
+    qw(rep_platform bug_status bug_file_loc bug_group
+      bug_severity bug_status
+      status_whiteboard
+      cclist_accessible reporter_accessible)
+  };
+
+  Bugzilla::Hook::process('quicksearch_map', {'map' => \%full_map});
+
+  $cache->{quicksearch_fields} = \%full_map;
+
+  return $cache->{quicksearch_fields};
 }
 
 # Certain fields, when specified like "field:value" get an operator other
 # than "substring"
-use constant FIELD_OPERATOR => {
-    content         => 'matches',
-    owner_idle_time => 'greaterthan',
-};
+use constant FIELD_OPERATOR =>
+  {content => 'matches', owner_idle_time => 'greaterthan',};
 
 # Mappings for operators symbols to support operators other than "substring"
 use constant OPERATOR_SYMBOLS => {
-    ':'  => 'substring',
-    '='  => 'equals',
-    '!=' => 'notequals',
-    '>=' => 'greaterthaneq',
-    '<=' => 'lessthaneq',
-    '>'  => 'greaterthan',
-    '<'  => 'lessthan',
+  ':'  => 'substring',
+  '='  => 'equals',
+  '!=' => 'notequals',
+  '>=' => 'greaterthaneq',
+  '<=' => 'lessthaneq',
+  '>'  => 'greaterthan',
+  '<'  => 'lessthan',
 };
 
 # We might want to put this into localconfig or somewhere
 use constant PRODUCT_EXCEPTIONS => (
-    'row',   # [Browser]
-             #   ^^^
-    'new',   # [MailNews]
-             #      ^^^
+  'row',    # [Browser]
+            #   ^^^
+  'new',    # [MailNews]
+            #      ^^^
 );
 use constant COMPONENT_EXCEPTIONS => (
-    'hang'   # [Bugzilla: Component/Keyword Changes]
-             #                               ^^^^
+  'hang'    # [Bugzilla: Component/Keyword Changes]
+            #                               ^^^^
 );
 
 # Quicksearch-wide globals for boolean charts.
 our ($chart, $and, $or, $fulltext, $bug_status_set);
 
 sub quicksearch {
-    my ($searchstring) = (@_);
-    my $cgi = Bugzilla->cgi;
-
-    $chart = 0;
-    $and   = 0;
-    $or    = 0;
+  my ($searchstring) = (@_);
+  my $cgi = Bugzilla->cgi;
+
+  $chart = 0;
+  $and   = 0;
+  $or    = 0;
+
+  # Remove leading and trailing commas and whitespace.
+  $searchstring =~ s/(^[\s,]+|[\s,]+$)//g;
+  ThrowUserError('buglist_parameters_required') unless ($searchstring);
+
+  if ($searchstring =~ m/^[0-9,\s]*$/) {
+    _bug_numbers_only($searchstring);
+  }
+  else {
+    _handle_alias($searchstring);
+
+    # Retain backslashes and quotes, to know which strings are quoted,
+    # and which ones are not.
+    my @words = _parse_line('\s+', 1, $searchstring);
+
+    # If parse_line() returns no data, this means strings are badly quoted.
+    # Rather than trying to guess what the user wanted to do, we throw an error.
+    scalar(@words)
+      || ThrowUserError('quicksearch_unbalanced_quotes', {string => $searchstring});
+
+    # A query cannot start with AND or OR, nor can it end with AND, OR or NOT.
+    ThrowUserError('quicksearch_invalid_query')
+      if ($words[0] =~ /^(?:AND|OR)$/ || $words[$#words] =~ /^(?:AND|OR|NOT)$/);
+
+    my (@qswords, @or_group);
+    while (scalar @words) {
+      my $word = shift @words;
+
+      # AND is the default word separator, similar to a whitespace,
+      # but |a AND OR b| is not a valid combination.
+      if ($word eq 'AND') {
+        ThrowUserError('quicksearch_invalid_query', {operators => ['AND', 'OR']})
+          if $words[0] eq 'OR';
+      }
+
+      # |a OR AND b| is not a valid combination.
+      # |a OR OR b| is equivalent to |a OR b| and so is harmless.
+      elsif ($word eq 'OR') {
+        ThrowUserError('quicksearch_invalid_query', {operators => ['OR', 'AND']})
+          if $words[0] eq 'AND';
+      }
+
+      # NOT negates the following word.
+      # |NOT AND| and |NOT OR| are not valid combinations.
+      # |NOT NOT| is fine but has no effect as they cancel themselves.
+      elsif ($word eq 'NOT') {
+        $word = shift @words;
+        next if $word eq 'NOT';
+        if ($word eq 'AND' || $word eq 'OR') {
+          ThrowUserError('quicksearch_invalid_query', {operators => ['NOT', $word]});
+        }
+        unshift(@words, "-$word");
+      }
+      else {
+        # OR groups words together, as OR has higher precedence than AND.
+        push(@or_group, $word);
+
+        # If the next word is not OR, then we are not in a OR group,
+        # or we are leaving it.
+        if (!defined $words[0] || $words[0] ne 'OR') {
+          push(@qswords, join('|', @or_group));
+          @or_group = ();
+        }
+      }
+    }
 
-    # Remove leading and trailing commas and whitespace.
-    $searchstring =~ s/(^[\s,]+|[\s,]+$)//g;
-    ThrowUserError('buglist_parameters_required') unless ($searchstring);
+    _handle_status_and_resolution($qswords[0]);
+    shift(@qswords) if $bug_status_set;
 
-    if ($searchstring =~ m/^[0-9,\s]*$/) {
-        _bug_numbers_only($searchstring);
-    }
-    else {
-        _handle_alias($searchstring);
-
-        # Retain backslashes and quotes, to know which strings are quoted,
-        # and which ones are not.
-        my @words = _parse_line('\s+', 1, $searchstring);
-        # If parse_line() returns no data, this means strings are badly quoted.
-        # Rather than trying to guess what the user wanted to do, we throw an error.
-        scalar(@words)
-          || ThrowUserError('quicksearch_unbalanced_quotes', {string => $searchstring});
-
-        # A query cannot start with AND or OR, nor can it end with AND, OR or NOT.
-        ThrowUserError('quicksearch_invalid_query')
-          if ($words[0] =~ /^(?:AND|OR)$/ || $words[$#words] =~ /^(?:AND|OR|NOT)$/);
-
-        my (@qswords, @or_group);
-        while (scalar @words) {
-            my $word = shift @words;
-            # AND is the default word separator, similar to a whitespace,
-            # but |a AND OR b| is not a valid combination.
-            if ($word eq 'AND') {
-                ThrowUserError('quicksearch_invalid_query', {operators => ['AND', 'OR']})
-                  if $words[0] eq 'OR';
-            }
-            # |a OR AND b| is not a valid combination.
-            # |a OR OR b| is equivalent to |a OR b| and so is harmless.
-            elsif ($word eq 'OR') {
-                ThrowUserError('quicksearch_invalid_query', {operators => ['OR', 'AND']})
-                  if $words[0] eq 'AND';
-            }
-            # NOT negates the following word.
-            # |NOT AND| and |NOT OR| are not valid combinations.
-            # |NOT NOT| is fine but has no effect as they cancel themselves.
-            elsif ($word eq 'NOT') {
-                $word = shift @words;
-                next if $word eq 'NOT';
-                if ($word eq 'AND' || $word eq 'OR') {
-                    ThrowUserError('quicksearch_invalid_query', {operators => ['NOT', $word]});
-                }
-                unshift(@words, "-$word");
-            }
-            else {
-                # OR groups words together, as OR has higher precedence than AND.
-                push(@or_group, $word);
-                # If the next word is not OR, then we are not in a OR group,
-                # or we are leaving it.
-                if (!defined $words[0] || $words[0] ne 'OR') {
-                    push(@qswords, join('|', @or_group));
-                    @or_group = ();
-                }
-            }
-        }
+    my (@unknownFields, %ambiguous_fields);
+    $fulltext = Bugzilla->user->setting('quicksearch_fulltext') eq 'on' ? 1 : 0;
 
-        _handle_status_and_resolution($qswords[0]);
-        shift(@qswords) if $bug_status_set;
-
-        my (@unknownFields, %ambiguous_fields);
-        $fulltext = Bugzilla->user->setting('quicksearch_fulltext') eq 'on' ? 1 : 0;
-
-        # Loop over all main-level QuickSearch words.
-        foreach my $qsword (@qswords) {
-            my @or_operand = _parse_line('\|', 1, $qsword);
-            foreach my $term (@or_operand) {
-                next unless defined $term;
-                my $negate = substr($term, 0, 1) eq '-';
-                if ($negate) {
-                    $term = substr($term, 1);
-                }
-
-                next if _handle_special_first_chars($term, $negate);
-                next if _handle_field_names($term, $negate, \@unknownFields,
-                                            \%ambiguous_fields);
-
-                # Having ruled out the special cases, we may now split
-                # by comma, which is another legal boolean OR indicator.
-                # Remove quotes from quoted words, if any.
-                @words = _parse_line(',', 0, $term);
-                foreach my $word (@words) {
-                    if (!_special_field_syntax($word, $negate)) {
-                        _default_quicksearch_word($word, $negate);
-                    }
-                    _handle_urls($word, $negate);
-                }
-            }
-            $chart++;
-            $and = 0;
-            $or = 0;
+    # Loop over all main-level QuickSearch words.
+    foreach my $qsword (@qswords) {
+      my @or_operand = _parse_line('\|', 1, $qsword);
+      foreach my $term (@or_operand) {
+        next unless defined $term;
+        my $negate = substr($term, 0, 1) eq '-';
+        if ($negate) {
+          $term = substr($term, 1);
         }
 
-        # If there is no mention of a bug status, we restrict the query
-        # to open bugs by default.
-        unless ($bug_status_set) {
-            $cgi->param('bug_status', BUG_STATE_OPEN);
+        next if _handle_special_first_chars($term, $negate);
+        next
+          if _handle_field_names($term, $negate, \@unknownFields, \%ambiguous_fields);
+
+        # Having ruled out the special cases, we may now split
+        # by comma, which is another legal boolean OR indicator.
+        # Remove quotes from quoted words, if any.
+        @words = _parse_line(',', 0, $term);
+        foreach my $word (@words) {
+          if (!_special_field_syntax($word, $negate)) {
+            _default_quicksearch_word($word, $negate);
+          }
+          _handle_urls($word, $negate);
         }
+      }
+      $chart++;
+      $and = 0;
+      $or  = 0;
+    }
 
-        # Inform user about any unknown fields
-        if (scalar(@unknownFields) || scalar(keys %ambiguous_fields)) {
-            ThrowUserError("quicksearch_unknown_field",
-                           { unknown   => \@unknownFields,
-                             ambiguous => \%ambiguous_fields });
-        }
+    # If there is no mention of a bug status, we restrict the query
+    # to open bugs by default.
+    unless ($bug_status_set) {
+      $cgi->param('bug_status', BUG_STATE_OPEN);
+    }
 
-        # Make sure we have some query terms left
-        scalar($cgi->param())>0 || ThrowUserError("buglist_parameters_required");
+    # Inform user about any unknown fields
+    if (scalar(@unknownFields) || scalar(keys %ambiguous_fields)) {
+      ThrowUserError("quicksearch_unknown_field",
+        {unknown => \@unknownFields, ambiguous => \%ambiguous_fields});
     }
 
-    # List of quicksearch-specific CGI parameters to get rid of.
-    my @params_to_strip = ('quicksearch', 'load', 'run');
-    my $modified_query_string = $cgi->canonicalise_query(@params_to_strip);
+    # Make sure we have some query terms left
+    scalar $cgi->multi_param() or ThrowUserError("buglist_parameters_required");
+  }
 
-    if ($cgi->param('load')) {
-        my $urlbase = correct_urlbase();
-        # Param 'load' asks us to display the query in the advanced search form.
-        print $cgi->redirect(-uri => "${urlbase}query.cgi?format=advanced&amp;"
-                             . $modified_query_string);
-    }
+  # List of quicksearch-specific CGI parameters to get rid of.
+  my @params_to_strip = ('quicksearch', 'load', 'run');
+  my $modified_query_string = $cgi->canonicalise_query(@params_to_strip);
+
+  if ($cgi->param('load')) {
+    my $urlbase = correct_urlbase();
 
-    # Otherwise, pass the modified query string to the caller.
-    # We modified $cgi->params, so the caller can choose to look at that, too,
-    # and disregard the return value.
-    $cgi->delete(@params_to_strip);
-    return $modified_query_string;
+    # Param 'load' asks us to display the query in the advanced search form.
+    print $cgi->redirect(
+      -uri => "${urlbase}query.cgi?format=advanced&amp;" . $modified_query_string);
+  }
+
+  # Otherwise, pass the modified query string to the caller.
+  # We modified $cgi->params, so the caller can choose to look at that, too,
+  # and disregard the return value.
+  $cgi->delete(@params_to_strip);
+  return $modified_query_string;
 }
 
 ##########################
@@ -274,335 +279,351 @@ sub quicksearch {
 ##########################
 
 sub _parse_line {
-    my ($delim, $keep, $line) = @_;
-    return () unless defined $line;
-
-    # parse_line always treats ' as a quote character, making it impossible
-    # to sanely search for contractions. As this behavour isn't
-    # configurable, we replace ' with a placeholder to hide it from the
-    # parser.
-
-    # only treat ' at the start or end of words as quotes
-    # it's easier to do this in reverse with regexes
-    $line =~ s/(^|\s|:)'/$1\001/g;
-    $line =~ s/'($|\s)/\001$1/g;
-    $line =~ s/\\?'/\000/g;
-    $line =~ tr/\001/'/;
-
-    my @words = parse_line($delim, $keep, $line);
-    foreach my $word (@words) {
-        $word =~ tr/\000/'/ if defined $word;
-    }
-    return @words;
+  my ($delim, $keep, $line) = @_;
+  return () unless defined $line;
+
+  # parse_line always treats ' as a quote character, making it impossible
+  # to sanely search for contractions. As this behavour isn't
+  # configurable, we replace ' with a placeholder to hide it from the
+  # parser.
+
+  # only treat ' at the start or end of words as quotes
+  # it's easier to do this in reverse with regexes
+  $line =~ s/(^|\s|:)'/$1\001/g;
+  $line =~ s/'($|\s)/\001$1/g;
+  $line =~ s/\\?'/\000/g;
+  $line =~ tr/\001/'/;
+
+  my @words = parse_line($delim, $keep, $line);
+  foreach my $word (@words) {
+    $word =~ tr/\000/'/ if defined $word;
+  }
+  return @words;
 }
 
 sub _bug_numbers_only {
-    my $searchstring = shift;
-    my $cgi = Bugzilla->cgi;
-    # Allow separation by comma or whitespace.
-    $searchstring =~ s/[,\s]+/,/g;
-
-    if ($searchstring !~ /,/ && !i_am_webservice()) {
-        # Single bug number; shortcut to show_bug.cgi.
-        print $cgi->redirect(
-            -uri => correct_urlbase() . "show_bug.cgi?id=$searchstring");
-        exit;
-    }
-    else {
-        # List of bug numbers.
-        $cgi->param('bug_id', $searchstring);
-        $cgi->param('order', 'bugs.bug_id');
-        $cgi->param('bug_id_type', 'anyexact');
-    }
+  my $searchstring = shift;
+  my $cgi          = Bugzilla->cgi;
+
+  # Allow separation by comma or whitespace.
+  $searchstring =~ s/[,\s]+/,/g;
+
+  if ($searchstring !~ /,/ && !i_am_webservice()) {
+
+    # Single bug number; shortcut to show_bug.cgi.
+    print $cgi->redirect(
+      -uri => correct_urlbase() . "show_bug.cgi?id=$searchstring");
+    exit;
+  }
+  else {
+    # List of bug numbers.
+    $cgi->param('bug_id',      $searchstring);
+    $cgi->param('order',       'bugs.bug_id');
+    $cgi->param('bug_id_type', 'anyexact');
+  }
 }
 
 sub _handle_alias {
-    my $searchstring = shift;
-    if ($searchstring =~ /^([^,\s]+)$/) {
-        my $alias = $1;
-        # We use this direct SQL because we want quicksearch to be VERY fast.
-        my $bug_id = Bugzilla->dbh->selectrow_array(
-            q{SELECT bug_id FROM bugs_aliases WHERE alias = ?}, undef, $alias);
-        # If the user cannot see the bug or if we are using a webservice,
-        # do not resolve its alias.
-        if ($bug_id && Bugzilla->user->can_see_bug($bug_id) && !i_am_webservice()) {
-            $alias = url_quote($alias);
-            print Bugzilla->cgi->redirect(
-                -uri => correct_urlbase() . "show_bug.cgi?id=$alias");
-            exit;
-        }
-    }
+  my $searchstring = shift;
+  if ($searchstring =~ /^([^,\s]+)$/) {
+    my $alias = $1;
+
+    # We use this direct SQL because we want quicksearch to be VERY fast.
+    my $bug_id
+      = Bugzilla->dbh->selectrow_array(
+      q{SELECT bug_id FROM bugs_aliases WHERE alias = ?},
+      undef, $alias);
+
+    # If the user cannot see the bug or if we are using a webservice,
+    # do not resolve its alias.
+    if ($bug_id && Bugzilla->user->can_see_bug($bug_id) && !i_am_webservice()) {
+      $alias = url_quote($alias);
+      print Bugzilla->cgi->redirect(
+        -uri => correct_urlbase() . "show_bug.cgi?id=$alias");
+      exit;
+    }
+  }
 }
 
 sub _handle_status_and_resolution {
-    my $word = shift;
-    my $legal_statuses = get_legal_field_values('bug_status');
-    my (%states, %resolutions);
-    $bug_status_set = 1;
-
-    if ($word eq 'OPEN') {
-        $states{$_} = 1 foreach BUG_STATE_OPEN;
-    }
-    # If we want all bugs, then there is nothing to do.
-    elsif ($word ne 'ALL'
-           && !matchPrefixes(\%states, \%resolutions, $word, $legal_statuses))
-    {
-        $bug_status_set = 0;
-    }
-
-    # If we have wanted resolutions, allow closed states
-    if (keys(%resolutions)) {
-        foreach my $status (@$legal_statuses) {
-            $states{$status} = 1 unless is_open_state($status);
-        }
-    }
-
-    Bugzilla->cgi->param('bug_status', keys(%states));
-    Bugzilla->cgi->param('resolution', keys(%resolutions));
+  my $word           = shift;
+  my $legal_statuses = get_legal_field_values('bug_status');
+  my (%states, %resolutions);
+  $bug_status_set = 1;
+
+  if ($word eq 'OPEN') {
+    $states{$_} = 1 foreach BUG_STATE_OPEN;
+  }
+
+  # If we want all bugs, then there is nothing to do.
+  elsif ($word ne 'ALL'
+    && !matchPrefixes(\%states, \%resolutions, $word, $legal_statuses))
+  {
+    $bug_status_set = 0;
+  }
+
+  # If we have wanted resolutions, allow closed states
+  if (keys(%resolutions)) {
+    foreach my $status (@$legal_statuses) {
+      $states{$status} = 1 unless is_open_state($status);
+    }
+  }
+
+  Bugzilla->cgi->param('bug_status', keys(%states));
+  Bugzilla->cgi->param('resolution', keys(%resolutions));
 }
 
 
 sub _handle_special_first_chars {
-    my ($qsword, $negate) = @_;
-    return 0 if !defined $qsword || length($qsword) <= 1;
-
-    my $firstChar = substr($qsword, 0, 1);
-    my $baseWord = substr($qsword, 1);
-    my @subWords = split(/,/, $baseWord);
-
-    if ($firstChar eq '#') {
-        addChart('short_desc', 'substring', $baseWord, $negate);
-        addChart('content', 'matches', _matches_phrase($baseWord), $negate) if $fulltext;
-        return 1;
-    }
-    if ($firstChar eq ':') {
-        foreach (@subWords) {
-            addChart('product', 'substring', $_, $negate);
-            addChart('component', 'substring', $_, $negate);
-        }
-        return 1;
-    }
-    if ($firstChar eq '@') {
-        addChart('assigned_to', 'substring', $_, $negate) foreach (@subWords);
-        return 1;
-    }
-    if ($firstChar eq '[') {
-        addChart('short_desc', 'substring', $baseWord, $negate);
-        addChart('status_whiteboard', 'substring', $baseWord, $negate);
-        return 1;
-    }
-    if ($firstChar eq '!') {
-        addChart('keywords', 'anywords', $baseWord, $negate);
-        return 1;
-    }
-    return 0;
+  my ($qsword, $negate) = @_;
+  return 0 if !defined $qsword || length($qsword) <= 1;
+
+  my $firstChar = substr($qsword, 0, 1);
+  my $baseWord = substr($qsword, 1);
+  my @subWords = split(/,/, $baseWord);
+
+  if ($firstChar eq '#') {
+    addChart('short_desc', 'substring', $baseWord, $negate);
+    addChart('content', 'matches', _matches_phrase($baseWord), $negate)
+      if $fulltext;
+    return 1;
+  }
+  if ($firstChar eq ':') {
+    foreach (@subWords) {
+      addChart('product',   'substring', $_, $negate);
+      addChart('component', 'substring', $_, $negate);
+    }
+    return 1;
+  }
+  if ($firstChar eq '@') {
+    addChart('assigned_to', 'substring', $_, $negate) foreach (@subWords);
+    return 1;
+  }
+  if ($firstChar eq '[') {
+    addChart('short_desc',        'substring', $baseWord, $negate);
+    addChart('status_whiteboard', 'substring', $baseWord, $negate);
+    return 1;
+  }
+  if ($firstChar eq '!') {
+    addChart('keywords', 'anywords', $baseWord, $negate);
+    return 1;
+  }
+  return 0;
 }
 
 sub _handle_field_names {
-    my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
-
-    # Generic field1,field2,field3:value1,value2 notation.
-    # We have to correctly ignore commas and colons in quotes.
-    # Longer operators must be tested first as we don't want single character
-    # operators such as <, > and = to be tested before <=, >= and !=.
-    my @operators = sort { length($b) <=> length($a) } keys %{ OPERATOR_SYMBOLS() };
-
-    foreach my $symbol (@operators) {
-        my @field_values = _parse_line($symbol, 1, $or_operand);
-        next unless scalar @field_values == 2;
-        my @fields = _parse_line(',', 1, $field_values[0]);
-        my @values = _parse_line(',', 1, $field_values[1]);
-        foreach my $field (@fields) {
-            my $translated = _translate_field_name($field);
-            # Skip and record any unknown fields
-            if (!defined $translated) {
-                push(@$unknownFields, $field);
-            }
-            # If we got back an array, that means the substring is
-            # ambiguous and could match more than field name
-            elsif (ref $translated) {
-                $ambiguous_fields->{$field} = $translated;
-            }
-            else {
-                if ($translated eq 'bug_status' || $translated eq 'resolution') {
-                    $bug_status_set = 1;
-                }
-                foreach my $value (@values) {
-                    my $operator = FIELD_OPERATOR->{$translated}
-                        || OPERATOR_SYMBOLS->{$symbol}
-                        || 'substring';
-                    # If the string was quoted to protect some special
-                    # characters such as commas and colons, we need
-                    # to remove quotes.
-                    if ($value =~ /^(["'])(.+)\1$/) {
-                        $value = $2;
-                        $value =~ s/\\(["'])/$1/g;
-                    }
-                    # If a requestee is set, we need to handle it separately.
-                    if ($translated eq 'flagtypes.name' && $value =~ /^([^\?]+\?)([^\?]+)$/) {
-                        _handle_flags($1, $2, $negate);
-                        next;
-                    }
-                    addChart($translated, $operator, $value, $negate);
-                }
-            }
+  my ($or_operand, $negate, $unknownFields, $ambiguous_fields) = @_;
+
+  # Generic field1,field2,field3:value1,value2 notation.
+  # We have to correctly ignore commas and colons in quotes.
+  # Longer operators must be tested first as we don't want single character
+  # operators such as <, > and = to be tested before <=, >= and !=.
+  my @operators = sort { length($b) <=> length($a) } keys %{OPERATOR_SYMBOLS()};
+
+  foreach my $symbol (@operators) {
+    my @field_values = _parse_line($symbol, 1, $or_operand);
+    next unless scalar @field_values == 2;
+    my @fields = _parse_line(',', 1, $field_values[0]);
+    my @values = _parse_line(',', 1, $field_values[1]);
+    foreach my $field (@fields) {
+      my $translated = _translate_field_name($field);
+
+      # Skip and record any unknown fields
+      if (!defined $translated) {
+        push(@$unknownFields, $field);
+      }
+
+      # If we got back an array, that means the substring is
+      # ambiguous and could match more than field name
+      elsif (ref $translated) {
+        $ambiguous_fields->{$field} = $translated;
+      }
+      else {
+        if ($translated eq 'bug_status' || $translated eq 'resolution') {
+          $bug_status_set = 1;
+        }
+        foreach my $value (@values) {
+          my $operator
+            = FIELD_OPERATOR->{$translated} || OPERATOR_SYMBOLS->{$symbol} || 'substring';
+
+          # If the string was quoted to protect some special
+          # characters such as commas and colons, we need
+          # to remove quotes.
+          if ($value =~ /^(["'])(.+)\1$/) {
+            $value = $2;
+            $value =~ s/\\(["'])/$1/g;
+          }
+
+          # If a requestee is set, we need to handle it separately.
+          if ($translated eq 'flagtypes.name' && $value =~ /^([^\?]+\?)([^\?]+)$/) {
+            _handle_flags($1, $2, $negate);
+            next;
+          }
+          addChart($translated, $operator, $value, $negate);
         }
-        return 1;
+      }
     }
+    return 1;
+  }
 
-    # Do not look inside quoted strings.
-    return 0 if ($or_operand =~ /^(["']).*\1$/);
+  # Do not look inside quoted strings.
+  return 0 if ($or_operand =~ /^(["']).*\1$/);
 
-    # Flag and requestee shortcut.
-    if ($or_operand =~ /^([^\?]+\?)([^\?]*)$/) {
-        _handle_flags($1, $2, $negate);
-        return 1;
-    }
+  # Flag and requestee shortcut.
+  if ($or_operand =~ /^([^\?]+\?)([^\?]*)$/) {
+    _handle_flags($1, $2, $negate);
+    return 1;
+  }
 
-    return 0;
+  return 0;
 }
 
 sub _handle_flags {
-    my ($flag, $requestee, $negate) = @_;
-
-    addChart('flagtypes.name', 'substring', $flag, $negate);
-    if ($requestee) {
-        # FIXME - Every time a requestee is involved and you use OR somewhere
-        # in your quick search, the logic will be wrong because boolean charts
-        # are unable to run queries of the form (a AND b) OR c. In our case:
-        # (flag name is foo AND requestee is bar) OR (any other criteria).
-        # But this has never been possible, so this is not a regression. If one
-        # needs to run such queries, they must use the Custom Search section of
-        # the Advanced Search page.
-        $chart++;
-        $and = $or = 0;
-        addChart('requestees.login_name', 'substring', $requestee, $negate);
-    }
+  my ($flag, $requestee, $negate) = @_;
+
+  addChart('flagtypes.name', 'substring', $flag, $negate);
+  if ($requestee) {
+
+    # FIXME - Every time a requestee is involved and you use OR somewhere
+    # in your quick search, the logic will be wrong because boolean charts
+    # are unable to run queries of the form (a AND b) OR c. In our case:
+    # (flag name is foo AND requestee is bar) OR (any other criteria).
+    # But this has never been possible, so this is not a regression. If one
+    # needs to run such queries, they must use the Custom Search section of
+    # the Advanced Search page.
+    $chart++;
+    $and = $or = 0;
+    addChart('requestees.login_name', 'substring', $requestee, $negate);
+  }
 }
 
 sub _translate_field_name {
-    my $field = shift;
-    $field = lc($field);
-    my $field_map = FIELD_MAP;
-
-    # If the field exactly matches a mapping, just return right now.
-    return $field_map->{$field} if exists $field_map->{$field};
-
-    # Check if we match, as a starting substring, exactly one field.
-    my @field_names = keys %$field_map;
-    my @matches = grep { $_ =~ /^\Q$field\E/ } @field_names;
-    # Eliminate duplicates that are actually the same field
-    # (otherwise "assi" matches both "assignee" and "assigned_to", and
-    # the lines below fail when they shouldn't.)
-    my %match_unique = map { $field_map->{$_} => $_ } @matches;
-    @matches = values %match_unique;
-
-    if (scalar(@matches) == 1) {
-        return $field_map->{$matches[0]};
-    }
-    elsif (scalar(@matches) > 1) {
-        return \@matches;
-    }
+  my $field = shift;
+  $field = lc($field);
+  my $field_map = FIELD_MAP;
+
+  # If the field exactly matches a mapping, just return right now.
+  return $field_map->{$field} if exists $field_map->{$field};
+
+  # Check if we match, as a starting substring, exactly one field.
+  my @field_names = keys %$field_map;
+  my @matches = grep { $_ =~ /^\Q$field\E/ } @field_names;
+
+  # Eliminate duplicates that are actually the same field
+  # (otherwise "assi" matches both "assignee" and "assigned_to", and
+  # the lines below fail when they shouldn't.)
+  my %match_unique = map { $field_map->{$_} => $_ } @matches;
+  @matches = values %match_unique;
+
+  if (scalar(@matches) == 1) {
+    return $field_map->{$matches[0]};
+  }
+  elsif (scalar(@matches) > 1) {
+    return \@matches;
+  }
+
+  # Check if we match exactly one custom field, ignoring the cf_ on the
+  # custom fields (to allow people to type things like "build" for
+  # "cf_build").
+  my %cfless;
+  foreach my $name (@field_names) {
+    my $no_cf = $name;
+    if ($no_cf =~ s/^cf_//) {
+      if ($field eq $no_cf) {
+        return $field_map->{$name};
+      }
+      $cfless{$no_cf} = $name;
+    }
+  }
+
+  # See if we match exactly one substring of any of the cf_-less fields.
+  my @cfless_matches = grep { $_ =~ /^\Q$field\E/ } (keys %cfless);
+
+  if (scalar(@cfless_matches) == 1) {
+    my $match        = $cfless_matches[0];
+    my $actual_field = $cfless{$match};
+    return $field_map->{$actual_field};
+  }
+  elsif (scalar(@matches) > 1) {
+    return \@matches;
+  }
+
+  return undef;
+}
 
-    # Check if we match exactly one custom field, ignoring the cf_ on the
-    # custom fields (to allow people to type things like "build" for 
-    # "cf_build").
-    my %cfless;
-    foreach my $name (@field_names) {
-        my $no_cf = $name;
-        if ($no_cf =~ s/^cf_//) {
-            if ($field eq $no_cf) {
-                return $field_map->{$name};
-            }
-            $cfless{$no_cf} = $name;
-        }
-    }
+sub _special_field_syntax {
+  my ($word, $negate) = @_;
 
-    # See if we match exactly one substring of any of the cf_-less fields.
-    my @cfless_matches = grep { $_ =~ /^\Q$field\E/ } (keys %cfless);
+  # P1-5 Syntax
+  if ($word =~ m/^P(\d+)(?:-(\d+))?$/ai) {
+    my ($p_start, $p_end) = ($1, $2);
+    my $legal_priorities = get_legal_field_values('priority');
 
-    if (scalar(@cfless_matches) == 1) {
-        my $match = $cfless_matches[0];
-        my $actual_field = $cfless{$match};
-        return $field_map->{$actual_field};
-    }
-    elsif (scalar(@matches) > 1) {
-        return \@matches;
-    }
+    # If Pn exists explicitly, use it.
+    my $start = firstidx { $_ eq "P$p_start" } @$legal_priorities;
+    my $end;
+    $end = firstidx { $_ eq "P$p_end" } @$legal_priorities if defined $p_end;
 
-    return undef;
-}
+    # If Pn doesn't exist explicitly, then we mean the nth priority.
+    if ($start == -1) {
+      $start = max(0, $p_start - 1);
+    }
+    my $prios = $legal_priorities->[$start];
 
-sub _special_field_syntax {
-    my ($word, $negate) = @_;
-    
-    # P1-5 Syntax
-    if ($word =~ m/^P(\d+)(?:-(\d+))?$/i) {
-        my ($p_start, $p_end) = ($1, $2);
-        my $legal_priorities = get_legal_field_values('priority');
-
-        # If Pn exists explicitly, use it.
-        my $start = firstidx { $_ eq "P$p_start" } @$legal_priorities;
-        my $end;
-        $end = firstidx { $_ eq "P$p_end" } @$legal_priorities if defined $p_end;
-
-        # If Pn doesn't exist explicitly, then we mean the nth priority.
-        if ($start == -1) {
-            $start = max(0, $p_start - 1);
-        }
-        my $prios = $legal_priorities->[$start];
-
-        if (defined $end) {
-            # If Pn doesn't exist explicitly, then we mean the nth priority.
-            if ($end == -1) {
-                $end = min(scalar(@$legal_priorities), $p_end) - 1;
-                $end = max(0, $end); # Just in case the user typed P0.
-            }
-            ($start, $end) = ($end, $start) if $end < $start;
-            $prios = join(',', @$legal_priorities[$start..$end])
-        }
+    if (defined $end) {
 
-        addChart('priority', 'anyexact', $prios, $negate);
-        return 1;
+      # If Pn doesn't exist explicitly, then we mean the nth priority.
+      if ($end == -1) {
+        $end = min(scalar(@$legal_priorities), $p_end) - 1;
+        $end = max(0, $end);    # Just in case the user typed P0.
+      }
+      ($start, $end) = ($end, $start) if $end < $start;
+      $prios = join(',', @$legal_priorities[$start .. $end]);
     }
-    return 0;    
+
+    addChart('priority', 'anyexact', $prios, $negate);
+    return 1;
+  }
+  return 0;
 }
 
 sub _default_quicksearch_word {
-    my ($word, $negate) = @_;
-    
-    if (!grep { lc($word) eq $_ } PRODUCT_EXCEPTIONS and length($word) > 2) {
-        addChart('product', 'substring', $word, $negate);
-    }
-    
-    if (!grep { lc($word) eq $_ } COMPONENT_EXCEPTIONS and length($word) > 2) {
-        addChart('component', 'substring', $word, $negate);
-    }
-    
-    my @legal_keywords = map($_->name, Bugzilla::Keyword->get_all);
-    if (grep { lc($word) eq lc($_) } @legal_keywords) {
-        addChart('keywords', 'substring', $word, $negate);
-    }
-    
-    addChart('alias', 'substring', $word, $negate);
-    addChart('short_desc', 'substring', $word, $negate);
-    addChart('status_whiteboard', 'substring', $word, $negate);
-    addChart('content', 'matches', _matches_phrase($word), $negate) if $fulltext;
+  my ($word, $negate) = @_;
+
+  if (!grep { lc($word) eq $_ } PRODUCT_EXCEPTIONS and length($word) > 2) {
+    addChart('product', 'substring', $word, $negate);
+  }
+
+  if (!grep { lc($word) eq $_ } COMPONENT_EXCEPTIONS and length($word) > 2) {
+    addChart('component', 'substring', $word, $negate);
+  }
+
+  my @legal_keywords = map($_->name, Bugzilla::Keyword->get_all);
+  if (grep { lc($word) eq lc($_) } @legal_keywords) {
+    addChart('keywords', 'substring', $word, $negate);
+  }
+
+  addChart('alias',             'substring', $word, $negate);
+  addChart('short_desc',        'substring', $word, $negate);
+  addChart('status_whiteboard', 'substring', $word, $negate);
+  addChart('content', 'matches', _matches_phrase($word), $negate) if $fulltext;
 }
 
 sub _handle_urls {
-    my ($word, $negate) = @_;
-    # URL field (for IP addrs, host.names,
-    # scheme://urls)
-    if ($word =~ m/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
-        || $word =~ /^[A-Za-z]+(\.[A-Za-z]+)+/
-        || $word =~ /:[\\\/][\\\/]/
-        || $word =~ /localhost/
-        || $word =~ /mailto[:]?/)
-        # || $word =~ /[A-Za-z]+[:][0-9]+/ #host:port
-    {
-        addChart('bug_file_loc', 'substring', $word, $negate);
-    }
+  my ($word, $negate) = @_;
+
+  # URL field (for IP addrs, host.names,
+  # scheme://urls)
+  if ( $word =~ m/[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/
+    || $word =~ /^[A-Za-z]+(\.[A-Za-z]+)+/
+    || $word =~ /:[\\\/][\\\/]/
+    || $word =~ /localhost/
+    || $word =~ /mailto[:]?/)
+
+    # || $word =~ /[A-Za-z]+[:][0-9]+/ #host:port
+  {
+    addChart('bug_file_loc', 'substring', $word, $negate);
+  }
 }
 
 ###########################################################################
@@ -611,70 +632,70 @@ sub _handle_urls {
 
 # Quote and escape a phrase appropriately for a "content matches" search.
 sub _matches_phrase {
-    my ($phrase) = @_;
-    $phrase =~ s/"/\\"/g;
-    return "\"$phrase\"";
+  my ($phrase) = @_;
+  $phrase =~ s/"/\\"/g;
+  return "\"$phrase\"";
 }
 
 # Expand found prefixes to states or resolutions
 sub matchPrefixes {
-    my ($hr_states, $hr_resolutions, $word, $ar_check_states) = @_;
-    return unless $word =~ /^[A-Z_]+(,[A-Z_]+)*$/;
-
-    my @ar_prefixes = split(/,/, $word);
-    my $ar_check_resolutions = get_legal_field_values('resolution');
-    my $foundMatch = 0;
-
-    foreach my $prefix (@ar_prefixes) {
-        foreach (@$ar_check_states) {
-            if (/^$prefix/) {
-                $$hr_states{$_} = 1;
-                $foundMatch = 1;
-            }
-        }
-        foreach (@$ar_check_resolutions) {
-            if (/^$prefix/) {
-                $$hr_resolutions{$_} = 1;
-                $foundMatch = 1;
-            }
-        }
-    }
-    return $foundMatch;
+  my ($hr_states, $hr_resolutions, $word, $ar_check_states) = @_;
+  return unless $word =~ /^[A-Z_]+(,[A-Z_]+)*$/;
+
+  my @ar_prefixes          = split(/,/, $word);
+  my $ar_check_resolutions = get_legal_field_values('resolution');
+  my $foundMatch           = 0;
+
+  foreach my $prefix (@ar_prefixes) {
+    foreach (@$ar_check_states) {
+      if (/^$prefix/) {
+        $$hr_states{$_} = 1;
+        $foundMatch = 1;
+      }
+    }
+    foreach (@$ar_check_resolutions) {
+      if (/^$prefix/) {
+        $$hr_resolutions{$_} = 1;
+        $foundMatch = 1;
+      }
+    }
+  }
+  return $foundMatch;
 }
 
 # Negate comparison type
 sub negateComparisonType {
-    my $comparisonType = shift;
+  my $comparisonType = shift;
 
-    if ($comparisonType eq 'anywords') {
-        return 'nowords';
-    }
-    return "not$comparisonType";
+  if ($comparisonType eq 'anywords') {
+    return 'nowords';
+  }
+  return "not$comparisonType";
 }
 
 # Add a boolean chart
 sub addChart {
-    my ($field, $comparisonType, $value, $negate) = @_;
-
-    $negate && ($comparisonType = negateComparisonType($comparisonType));
-    makeChart("$chart-$and-$or", $field, $comparisonType, $value);
-    if ($negate) {
-        $and++;
-        $or = 0;
-    }
-    else {
-        $or++;
-    }
+  my ($field, $comparisonType, $value, $negate) = @_;
+
+  $negate && ($comparisonType = negateComparisonType($comparisonType));
+  makeChart("$chart-$and-$or", $field, $comparisonType, $value);
+  if ($negate) {
+    $and++;
+    $or = 0;
+  }
+  else {
+    $or++;
+  }
 }
 
 # Create the CGI parameters for a boolean chart
 sub makeChart {
-    my ($expr, $field, $type, $value) = @_;
+  my ($expr, $field, $type, $value) = @_;
 
-    my $cgi = Bugzilla->cgi;
-    $cgi->param("field$expr", $field);
-    $cgi->param("type$expr",  $type);
-    $cgi->param("value$expr", $value);
+  my $cgi = Bugzilla->cgi;
+  $cgi->param("field$expr", $field);
+  $cgi->param("type$expr",  $type);
+  $cgi->param("value$expr", $value);
 }
 
 1;
diff --git a/Bugzilla/Search/Recent.pm b/Bugzilla/Search/Recent.pm
index e774c7fe05..67859f5638 100644
--- a/Bugzilla/Search/Recent.pm
+++ b/Bugzilla/Search/Recent.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Search::Recent;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,24 +21,25 @@ use Bugzilla::Util;
 # Constants #
 #############
 
-use constant DB_TABLE => 'profile_search';
+use constant DB_TABLE   => 'profile_search';
 use constant LIST_ORDER => 'id DESC';
+
 # Do not track buglists viewed by users.
 use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
 use constant AUDIT_REMOVES => 0;
 
 use constant DB_COLUMNS => qw(
-    id
-    user_id
-    bug_list
-    list_order
+  id
+  user_id
+  bug_list
+  list_order
 );
 
 use constant VALIDATORS => {
-    user_id    => \&_check_user_id,
-    bug_list   => \&_check_bug_list,
-    list_order => \&_check_list_order,
+  user_id    => \&_check_user_id,
+  bug_list   => \&_check_bug_list,
+  list_order => \&_check_list_order,
 };
 
 use constant UPDATE_COLUMNS => qw(bug_list list_order);
@@ -51,29 +52,30 @@ use constant USE_MEMCACHED => 0;
 ###################
 
 sub create {
-    my $class = shift;
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    my $search = $class->SUPER::create(@_);
-    my $user_id = $search->user_id;
-
-    # Enforce there only being SAVE_NUM_SEARCHES per user.
-    my @ids = @{ $dbh->selectcol_arrayref(
-        "SELECT id FROM profile_search WHERE user_id = ? ORDER BY id",
-        undef, $user_id) };
-    if (scalar(@ids) > SAVE_NUM_SEARCHES) {
-        splice(@ids, - SAVE_NUM_SEARCHES);
-        $dbh->do(
-            "DELETE FROM profile_search WHERE id IN (" . join(',', @ids) . ")");
-    }
-    $dbh->bz_commit_transaction();
-    return $search;
+  my $class = shift;
+  my $dbh   = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  my $search  = $class->SUPER::create(@_);
+  my $user_id = $search->user_id;
+
+  # Enforce there only being SAVE_NUM_SEARCHES per user.
+  my @ids = @{
+    $dbh->selectcol_arrayref(
+      "SELECT id FROM profile_search WHERE user_id = ? ORDER BY id", undef,
+      $user_id
+    )
+  };
+  if (scalar(@ids) > SAVE_NUM_SEARCHES) {
+    splice(@ids, - SAVE_NUM_SEARCHES);
+    $dbh->do("DELETE FROM profile_search WHERE id IN (" . join(',', @ids) . ")");
+  }
+  $dbh->bz_commit_transaction();
+  return $search;
 }
 
 sub create_placeholder {
-    my $class = shift;
-    return $class->create({ user_id  => Bugzilla->user->id,
-                            bug_list => '' });
+  my $class = shift;
+  return $class->create({user_id => Bugzilla->user->id, bug_list => ''});
 }
 
 ###############
@@ -81,41 +83,43 @@ sub create_placeholder {
 ###############
 
 sub check {
-    my $class = shift;
-    my $search = $class->SUPER::check(@_);
-    my $user = Bugzilla->user;
-    if ($search->user_id != $user->id) {
-        ThrowUserError('object_does_not_exist', { id => $search->id });
-    }
-    return $search;
+  my $class  = shift;
+  my $search = $class->SUPER::check(@_);
+  my $user   = Bugzilla->user;
+  if ($search->user_id != $user->id) {
+    ThrowUserError('object_does_not_exist', {id => $search->id});
+  }
+  return $search;
 }
 
 sub check_quietly {
-    my $class = shift;
-    my $error_mode = Bugzilla->error_mode;
-    Bugzilla->error_mode(ERROR_MODE_DIE);
-    my $search = eval { $class->check(@_) };
-    Bugzilla->error_mode($error_mode);
-    return $search;
+  my $class      = shift;
+  my $error_mode = Bugzilla->error_mode;
+  Bugzilla->error_mode(ERROR_MODE_DIE);
+  my $search = eval { $class->check(@_) };
+  Bugzilla->error_mode($error_mode);
+  return $search;
 }
 
 sub new_from_cookie {
-    my ($invocant, $bug_ids) = @_;
-    my $class = ref($invocant) || $invocant;
+  my ($invocant, $bug_ids) = @_;
+  my $class = ref($invocant) || $invocant;
 
-    my $search = { id       => 'cookie',
-                   user_id  => Bugzilla->user->id,
-                   bug_list => join(',', @$bug_ids) };
+  my $search = {
+    id       => 'cookie',
+    user_id  => Bugzilla->user->id,
+    bug_list => join(',', @$bug_ids)
+  };
 
-    bless $search, $class;
-    return $search;
+  bless $search, $class;
+  return $search;
 }
 
 ####################
 # Simple Accessors #
 ####################
 
-sub bug_list   { return [split(',', $_[0]->{'bug_list'})]; }
+sub bug_list { return [split(',', $_[0]->{'bug_list'})]; }
 sub list_order { return $_[0]->{'list_order'}; }
 sub user_id    { return $_[0]->{'user_id'}; }
 
@@ -131,17 +135,17 @@ sub set_list_order { $_[0]->set('list_order', $_[1]); }
 ##############
 
 sub _check_user_id {
-    my ($invocant, $id) = @_;
-    require Bugzilla::User;
-    return Bugzilla::User->check({ id => $id })->id;
+  my ($invocant, $id) = @_;
+  require Bugzilla::User;
+  return Bugzilla::User->check({id => $id})->id;
 }
 
 sub _check_bug_list {
-    my ($invocant, $list) = @_;
+  my ($invocant, $list) = @_;
 
-    my @bug_ids = ref($list) ? @$list : split(',', $list || '');
-    detaint_natural($_) foreach @bug_ids;
-    return join(',', @bug_ids);
+  my @bug_ids = ref($list) ? @$list : split(',', $list || '');
+  detaint_natural($_) foreach @bug_ids;
+  return join(',', @bug_ids);
 }
 
 sub _check_list_order { defined $_[1] ? trim($_[1]) : '' }
diff --git a/Bugzilla/Search/Saved.pm b/Bugzilla/Search/Saved.pm
index 50a9cdd672..4dc0ca873c 100644
--- a/Bugzilla/Search/Saved.pm
+++ b/Bugzilla/Search/Saved.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Search::Saved;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -28,22 +28,23 @@ use Scalar::Util qw(blessed);
 #############
 
 use constant DB_TABLE => 'namedqueries';
+
 # Do not track buglists saved by users.
 use constant AUDIT_CREATES => 0;
 use constant AUDIT_UPDATES => 0;
 use constant AUDIT_REMOVES => 0;
 
 use constant DB_COLUMNS => qw(
-    id
-    userid
-    name
-    query
+  id
+  userid
+  name
+  query
 );
 
 use constant VALIDATORS => {
-    name       => \&_check_name,
-    query      => \&_check_query,
-    link_in_footer => \&_check_link_in_footer,
+  name           => \&_check_name,
+  query          => \&_check_query,
+  link_in_footer => \&_check_link_in_footer,
 };
 
 use constant UPDATE_COLUMNS => qw(name query);
@@ -53,56 +54,53 @@ use constant UPDATE_COLUMNS => qw(name query);
 ###############
 
 sub new {
-    my $class = shift;
-    my $param = shift;
-    my $dbh = Bugzilla->dbh;
-
-    my $user;
-    if (ref $param) {
-        $user = $param->{user} || Bugzilla->user;
-        my $name = $param->{name};
-        if (!defined $name) {
-            ThrowCodeError('bad_arg',
-                {argument => 'name',
-                 function => "${class}::new"});
-        }
-        my $condition = 'userid = ? AND name = ?';
-        my $user_id = blessed $user ? $user->id : $user;
-        detaint_natural($user_id)
-          || ThrowCodeError('param_must_be_numeric',
-                            {function => $class . '::_init', param => 'user'});
-        my @values = ($user_id, $name);
-        $param = { condition => $condition, values => \@values };
-    }
-
-    unshift @_, $param;
-    my $self = $class->SUPER::new(@_);
-    if ($self) {
-        $self->{user} = $user if blessed $user;
-
-        # Some DBs (read: Oracle) incorrectly mark the query string as UTF-8
-        # when it's coming out of the database, even though it has no UTF-8
-        # characters in it, which prevents Bugzilla::CGI from later reading
-        # it correctly.
-        utf8::downgrade($self->{query}) if utf8::is_utf8($self->{query});
+  my $class = shift;
+  my $param = shift;
+  my $dbh   = Bugzilla->dbh;
+
+  my $user;
+  if (ref $param) {
+    $user = $param->{user} || Bugzilla->user;
+    my $name = $param->{name};
+    if (!defined $name) {
+      ThrowCodeError('bad_arg', {argument => 'name', function => "${class}::new"});
     }
-    return $self;
+    my $condition = 'userid = ? AND name = ?';
+    my $user_id = blessed $user ? $user->id : $user;
+    detaint_natural($user_id)
+      || ThrowCodeError('param_must_be_numeric',
+      {function => $class . '::_init', param => 'user'});
+    my @values = ($user_id, $name);
+    $param = {condition => $condition, values => \@values};
+  }
+
+  unshift @_, $param;
+  my $self = $class->SUPER::new(@_);
+  if ($self) {
+    $self->{user} = $user if blessed $user;
+
+    # Some DBs (read: Oracle) incorrectly mark the query string as UTF-8
+    # when it's coming out of the database, even though it has no UTF-8
+    # characters in it, which prevents Bugzilla::CGI from later reading
+    # it correctly.
+    utf8::downgrade($self->{query}) if utf8::is_utf8($self->{query});
+  }
+  return $self;
 }
 
 sub check {
-    my $class = shift;
-    my $search = $class->SUPER::check(@_);
-    my $user = Bugzilla->user;
-    return $search if $search->user->id == $user->id;
-
-    if (!$search->shared_with_group
-        or !$user->in_group($search->shared_with_group)) 
-    {
-        ThrowUserError('missing_query', { name => $search->name,
-                                          sharer_id => $search->user->id });
-    }
-
-    return $search;
+  my $class  = shift;
+  my $search = $class->SUPER::check(@_);
+  my $user   = Bugzilla->user;
+  return $search if $search->user->id == $user->id;
+
+  if (!$search->shared_with_group or !$user->in_group($search->shared_with_group))
+  {
+    ThrowUserError('missing_query',
+      {name => $search->name, sharer_id => $search->user->id});
+  }
+
+  return $search;
 }
 
 ##############
@@ -112,24 +110,25 @@ sub check {
 sub _check_link_in_footer { return $_[1] ? 1 : 0; }
 
 sub _check_name {
-    my ($invocant, $name) = @_;
-    $name = trim($name);
-    $name || ThrowUserError("query_name_missing");
-    $name !~ /[<>&]/ || ThrowUserError("illegal_query_name");
-    if (length($name) > MAX_LEN_QUERY_NAME) {
-        ThrowUserError("query_name_too_long");
-    }
-    return $name;
+  my ($invocant, $name) = @_;
+  $name = trim($name);
+  $name || ThrowUserError("query_name_missing");
+  $name !~ /[<>&]/ || ThrowUserError("illegal_query_name");
+  if (length($name) > MAX_LEN_QUERY_NAME) {
+    ThrowUserError("query_name_too_long");
+  }
+  return $name;
 }
 
 sub _check_query {
-    my ($invocant, $query) = @_;
-    $query || ThrowUserError("buglist_parameters_required");
-    my $cgi = new Bugzilla::CGI($query);
-    $cgi->clean_search_url;
-    # Don't store the query name as a parameter.
-    $cgi->delete('known_name');
-    return $cgi->query_string;
+  my ($invocant, $query) = @_;
+  $query || ThrowUserError("buglist_parameters_required");
+  my $cgi = new Bugzilla::CGI($query);
+  $cgi->clean_search_url;
+
+  # Don't store the query name as a parameter.
+  $cgi->delete('known_name');
+  return $cgi->query_string;
 }
 
 #########################
@@ -137,170 +136,181 @@ sub _check_query {
 #########################
 
 sub create {
-    my $class = shift;
-    Bugzilla->login(LOGIN_REQUIRED);
-    my $dbh = Bugzilla->dbh;
-    $class->check_required_create_fields(@_);
-    $dbh->bz_start_transaction();
-    my $params = $class->run_create_validators(@_);
-
-    # Right now you can only create a Saved Search for the current user.
-    $params->{userid} = Bugzilla->user->id;
-
-    my $lif = delete $params->{link_in_footer};
-    my $obj = $class->insert_create_data($params);
-    if ($lif) {
-        $dbh->do('INSERT INTO namedqueries_link_in_footer 
-                  (user_id, namedquery_id) VALUES (?,?)',
-                 undef, $params->{userid}, $obj->id);
-    }
-    $dbh->bz_commit_transaction();
-
-    return $obj;
+  my $class = shift;
+  Bugzilla->login(LOGIN_REQUIRED);
+  my $dbh = Bugzilla->dbh;
+  $class->check_required_create_fields(@_);
+  $dbh->bz_start_transaction();
+  my $params = $class->run_create_validators(@_);
+
+  # Right now you can only create a Saved Search for the current user.
+  $params->{userid} = Bugzilla->user->id;
+
+  my $lif = delete $params->{link_in_footer};
+  my $obj = $class->insert_create_data($params);
+  if ($lif) {
+    $dbh->do(
+      'INSERT INTO namedqueries_link_in_footer 
+                  (user_id, namedquery_id) VALUES (?,?)', undef, $params->{userid},
+      $obj->id
+    );
+  }
+  $dbh->bz_commit_transaction();
+
+  return $obj;
 }
 
 sub rename_field_value {
-    my ($class, $field, $old_value, $new_value) = @_;
-
-    my $old = url_quote($old_value);
-    my $new = url_quote($new_value);
-    my $old_sql = $old;
-    $old_sql =~ s/([_\%])/\\$1/g;
-
-    my $table = $class->DB_TABLE;
-    my $id_field = $class->ID_FIELD;
-
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-
-    my %queries = @{ $dbh->selectcol_arrayref(
-        "SELECT $id_field, query FROM $table WHERE query LIKE ?",
-        {Columns=>[1,2]}, "\%$old_sql\%") };
-    foreach my $id (keys %queries) {
-        my $query = $queries{$id};
-        $query =~ s/\b$field=\Q$old\E\b/$field=$new/gi;
-        # Fix boolean charts.
-        while ($query =~ /\bfield(\d+-\d+-\d+)=\Q$field\E\b/gi) {
-            my $chart_id = $1;
-            # Note that this won't handle lists or substrings inside of
-            # boolean charts. Users will have to fix those themselves.
-            $query =~ s/\bvalue\Q$chart_id\E=\Q$old\E\b/value$chart_id=$new/i;
-        }
-        $dbh->do("UPDATE $table SET query = ? WHERE $id_field = ?",
-                 undef, $query, $id);
-        Bugzilla->memcached->clear({ table => $table, id => $id });
+  my ($class, $field, $old_value, $new_value) = @_;
+
+  my $old     = url_quote($old_value);
+  my $new     = url_quote($new_value);
+  my $old_sql = $old;
+  $old_sql =~ s/([_\%])/\\$1/g;
+
+  my $table    = $class->DB_TABLE;
+  my $id_field = $class->ID_FIELD;
+
+  my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+
+  my %queries = @{
+    $dbh->selectcol_arrayref(
+      "SELECT $id_field, query FROM $table WHERE query LIKE ?",
+      {Columns => [1, 2]},
+      "\%$old_sql\%"
+    )
+  };
+  foreach my $id (keys %queries) {
+    my $query = $queries{$id};
+    $query =~ s/\b$field=\Q$old\E\b/$field=$new/gi;
+
+    # Fix boolean charts.
+    while ($query =~ /\bfield(\d+-\d+-\d+)=\Q$field\E\b/gi) {
+      my $chart_id = $1;
+
+      # Note that this won't handle lists or substrings inside of
+      # boolean charts. Users will have to fix those themselves.
+      $query =~ s/\bvalue\Q$chart_id\E=\Q$old\E\b/value$chart_id=$new/i;
     }
+    $dbh->do("UPDATE $table SET query = ? WHERE $id_field = ?", undef, $query, $id);
+    Bugzilla->memcached->clear({table => $table, id => $id});
+  }
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 }
 
 sub preload {
-    my ($searches) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($searches) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    return unless scalar @$searches;
+  return unless scalar @$searches;
 
-    my @query_ids = map { $_->id } @$searches;
-    my $queries_in_footer = $dbh->selectcol_arrayref(
-        'SELECT namedquery_id
+  my @query_ids = map { $_->id } @$searches;
+  my $queries_in_footer = $dbh->selectcol_arrayref(
+    'SELECT namedquery_id
            FROM namedqueries_link_in_footer
           WHERE ' . $dbh->sql_in('namedquery_id', \@query_ids) . ' AND user_id = ?',
-          undef, Bugzilla->user->id);
+    undef, Bugzilla->user->id
+  );
 
-    my %links_in_footer = map { $_ => 1 } @$queries_in_footer;
-    foreach my $query (@$searches) {
-        $query->{link_in_footer} = ($links_in_footer{$query->id}) ? 1 : 0;
-    }
+  my %links_in_footer = map { $_ => 1 } @$queries_in_footer;
+  foreach my $query (@$searches) {
+    $query->{link_in_footer} = ($links_in_footer{$query->id}) ? 1 : 0;
+  }
 }
 #####################
 # Complex Accessors #
 #####################
 
 sub edit_link {
-    my ($self) = @_;
-    return $self->{edit_link} if defined $self->{edit_link};
-    my $cgi = new Bugzilla::CGI($self->url);
-    if (!$cgi->param('query_type') 
-        || !IsValidQueryType($cgi->param('query_type')))
-    {
-        $cgi->param('query_type', 'advanced');
-    }
-    $self->{edit_link} = $cgi->canonicalise_query;
-    return $self->{edit_link};
+  my ($self) = @_;
+  return $self->{edit_link} if defined $self->{edit_link};
+  my $cgi = new Bugzilla::CGI($self->url);
+  if ( !$cgi->param('query_format')
+    || !IsValidQueryType(scalar $cgi->param('query_format')))
+  {
+    $cgi->param('query_format', 'advanced');
+  }
+  $self->{edit_link} = $cgi->canonicalise_query;
+  return $self->{edit_link};
 }
 
 sub used_in_whine {
-    my ($self) = @_;
-    return $self->{used_in_whine} if exists $self->{used_in_whine};
-    ($self->{used_in_whine}) = Bugzilla->dbh->selectrow_array(
-        'SELECT 1 FROM whine_events INNER JOIN whine_queries
+  my ($self) = @_;
+  return $self->{used_in_whine} if exists $self->{used_in_whine};
+  ($self->{used_in_whine}) = Bugzilla->dbh->selectrow_array(
+    'SELECT 1 FROM whine_events INNER JOIN whine_queries
                        ON whine_events.id = whine_queries.eventid
-          WHERE whine_events.owner_userid = ? AND query_name = ?', undef, 
-          $self->{userid}, $self->name) || 0;
-    return $self->{used_in_whine};
+          WHERE whine_events.owner_userid = ? AND query_name = ?', undef,
+    $self->{userid}, $self->name
+  ) || 0;
+  return $self->{used_in_whine};
 }
 
 sub link_in_footer {
-    my ($self, $user) = @_;
-    # We only cache link_in_footer for the current Bugzilla->user.
-    return $self->{link_in_footer} if exists $self->{link_in_footer} && !$user;
-    my $user_id = $user ? $user->id : Bugzilla->user->id;
-    my $link_in_footer = Bugzilla->dbh->selectrow_array(
-        'SELECT 1 FROM namedqueries_link_in_footer
-          WHERE namedquery_id = ? AND user_id = ?', 
-        undef, $self->id, $user_id) || 0;
-    $self->{link_in_footer} = $link_in_footer if !$user;
-    return $link_in_footer;
+  my ($self, $user) = @_;
+
+  # We only cache link_in_footer for the current Bugzilla->user.
+  return $self->{link_in_footer} if exists $self->{link_in_footer} && !$user;
+  my $user_id = $user ? $user->id : Bugzilla->user->id;
+  my $link_in_footer = Bugzilla->dbh->selectrow_array(
+    'SELECT 1 FROM namedqueries_link_in_footer
+          WHERE namedquery_id = ? AND user_id = ?', undef, $self->id, $user_id
+  ) || 0;
+  $self->{link_in_footer} = $link_in_footer if !$user;
+  return $link_in_footer;
 }
 
 sub shared_with_group {
-    my ($self) = @_;
-    return $self->{shared_with_group} if exists $self->{shared_with_group};
-    # Bugzilla only currently supports sharing with one group, even
-    # though the database backend allows for an infinite number.
-    my ($group_id) = Bugzilla->dbh->selectrow_array(
-        'SELECT group_id FROM namedquery_group_map WHERE namedquery_id = ?',
-        undef, $self->id);
-    $self->{shared_with_group} = $group_id ? new Bugzilla::Group($group_id) 
-                                 : undef;
-    return $self->{shared_with_group};
+  my ($self) = @_;
+  return $self->{shared_with_group} if exists $self->{shared_with_group};
+
+  # Bugzilla only currently supports sharing with one group, even
+  # though the database backend allows for an infinite number.
+  my ($group_id)
+    = Bugzilla->dbh->selectrow_array(
+    'SELECT group_id FROM namedquery_group_map WHERE namedquery_id = ?',
+    undef, $self->id);
+  $self->{shared_with_group} = $group_id ? new Bugzilla::Group($group_id) : undef;
+  return $self->{shared_with_group};
 }
 
 sub shared_with_users {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!exists $self->{shared_with_users}) {
-        $self->{shared_with_users} =
-          $dbh->selectrow_array('SELECT COUNT(*)
+  if (!exists $self->{shared_with_users}) {
+    $self->{shared_with_users} = $dbh->selectrow_array(
+      'SELECT COUNT(*)
                                    FROM namedqueries_link_in_footer
                              INNER JOIN namedqueries
                                      ON namedquery_id = id
                                   WHERE namedquery_id = ?
-                                    AND user_id != userid',
-                                  undef, $self->id);
-    }
-    return $self->{shared_with_users};
+                                    AND user_id != userid', undef, $self->id
+    );
+  }
+  return $self->{shared_with_users};
 }
 
 ####################
 # Simple Accessors #
 ####################
 
-sub url  { return $_[0]->{'query'}; }
+sub url { return $_[0]->{'query'}; }
 
 sub user {
-    my ($self) = @_;
-    return $self->{user} ||=
-        Bugzilla::User->new({ id => $self->{userid}, cache => 1 });
+  my ($self) = @_;
+  return $self->{user}
+    ||= Bugzilla::User->new({id => $self->{userid}, cache => 1});
 }
 
 ############
 # Mutators #
 ############
 
-sub set_name       { $_[0]->set('name',       $_[1]); }
-sub set_url        { $_[0]->set('query',      $_[1]); }
+sub set_name { $_[0]->set('name',  $_[1]); }
+sub set_url  { $_[0]->set('query', $_[1]); }
 
 1;
 
diff --git a/Bugzilla/Sender/Transport/Sendmail.pm b/Bugzilla/Sender/Transport/Sendmail.pm
index 49f00777fc..cdab336b7c 100644
--- a/Bugzilla/Sender/Transport/Sendmail.pm
+++ b/Bugzilla/Sender/Transport/Sendmail.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Sender::Transport::Sendmail;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,72 +16,93 @@ use parent qw(Email::Sender::Transport::Sendmail);
 use Email::Sender::Failure;
 
 sub send_email {
-    my ($self, $email, $envelope) = @_;
-
-    my $pipe = $self->_sendmail_pipe($envelope);
-
-    my $string = $email->as_string;
-    $string =~ s/\x0D\x0A/\x0A/g unless $^O eq 'MSWin32';
-
-    print $pipe $string
-      or Email::Sender::Failure->throw("couldn't send message to sendmail: $!");
-
-    unless (close $pipe) {
-        Email::Sender::Failure->throw("error when closing pipe to sendmail: $!") if $!;
-        my ($error_message, $is_transient) = _map_exitcode($? >> 8);
-        if (Bugzilla->params->{'use_mailer_queue'}) {
-            # Return success for errors which are fatal so Bugzilla knows to
-            # remove them from the queue.
-            if ($is_transient) {
-                Email::Sender::Failure->throw("error when closing pipe to sendmail: $error_message");
-            } else {
-                warn "error when closing pipe to sendmail: $error_message\n";
-                return $self->success;
-            }
-        } else {
-            Email::Sender::Failure->throw("error when closing pipe to sendmail: $error_message");
-        }
+  my ($self, $email, $envelope) = @_;
+
+  my $pipe = $self->_sendmail_pipe($envelope);
+
+  my $string = $email->as_string;
+  $string =~ s/\x0D\x0A/\x0A/g unless $^O eq 'MSWin32';
+
+  print $pipe $string
+    or Email::Sender::Failure->throw("couldn't send message to sendmail: $!");
+
+  unless (close $pipe) {
+    Email::Sender::Failure->throw("error when closing pipe to sendmail: $!") if $!;
+    my ($error_message, $is_transient) = _map_exitcode($? >> 8);
+    if (Bugzilla->params->{'use_mailer_queue'}) {
+
+      # Return success for errors which are fatal so Bugzilla knows to
+      # remove them from the queue.
+      if ($is_transient) {
+        Email::Sender::Failure->throw(
+          "error when closing pipe to sendmail: $error_message");
+      }
+      else {
+        warn "error when closing pipe to sendmail: $error_message\n";
+        return $self->success;
+      }
+    }
+    else {
+      Email::Sender::Failure->throw(
+        "error when closing pipe to sendmail: $error_message");
     }
-    return $self->success;
+  }
+  return $self->success;
 }
 
 sub _map_exitcode {
-    # Returns (error message, is_transient)
-    # from the sendmail source (sendmail/sysexits.h)
-    my $code = shift;
-    if ($code == 64) {
-        return ("Command line usage error (EX_USAGE)", 1);
-    } elsif ($code == 65) {
-        return ("Data format error (EX_DATAERR)", 1);
-    } elsif ($code == 66) {
-        return ("Cannot open input (EX_NOINPUT)", 1);
-    } elsif ($code == 67) {
-        return ("Addressee unknown (EX_NOUSER)", 0);
-    } elsif ($code == 68) {
-        return ("Host name unknown (EX_NOHOST)", 0);
-    } elsif ($code == 69) {
-        return ("Service unavailable (EX_UNAVAILABLE)", 1);
-    } elsif ($code == 70) {
-        return ("Internal software error (EX_SOFTWARE)", 1);
-    } elsif ($code == 71) {
-        return ("System error (EX_OSERR)", 1);
-    } elsif ($code == 72) {
-        return ("Critical OS file missing (EX_OSFILE)", 1);
-    } elsif ($code == 73) {
-        return ("Can't create output file (EX_CANTCREAT)", 1);
-    } elsif ($code == 74) {
-        return ("Input/output error (EX_IOERR)", 1);
-    } elsif ($code == 75) {
-        return ("Temp failure (EX_TEMPFAIL)", 1);
-    } elsif ($code == 76) {
-        return ("Remote error in protocol (EX_PROTOCOL)", 1);
-    } elsif ($code == 77) {
-        return ("Permission denied (EX_NOPERM)", 1);
-    } elsif ($code == 78) {
-        return ("Configuration error (EX_CONFIG)", 1);
-    } else {
-        return ("Unknown Error ($code)", 1);
-    }
+
+  # Returns (error message, is_transient)
+  # from the sendmail source (sendmail/sysexits.h)
+  my $code = shift;
+  if ($code == 64) {
+    return ("Command line usage error (EX_USAGE)", 1);
+  }
+  elsif ($code == 65) {
+    return ("Data format error (EX_DATAERR)", 1);
+  }
+  elsif ($code == 66) {
+    return ("Cannot open input (EX_NOINPUT)", 1);
+  }
+  elsif ($code == 67) {
+    return ("Addressee unknown (EX_NOUSER)", 0);
+  }
+  elsif ($code == 68) {
+    return ("Host name unknown (EX_NOHOST)", 0);
+  }
+  elsif ($code == 69) {
+    return ("Service unavailable (EX_UNAVAILABLE)", 1);
+  }
+  elsif ($code == 70) {
+    return ("Internal software error (EX_SOFTWARE)", 1);
+  }
+  elsif ($code == 71) {
+    return ("System error (EX_OSERR)", 1);
+  }
+  elsif ($code == 72) {
+    return ("Critical OS file missing (EX_OSFILE)", 1);
+  }
+  elsif ($code == 73) {
+    return ("Can't create output file (EX_CANTCREAT)", 1);
+  }
+  elsif ($code == 74) {
+    return ("Input/output error (EX_IOERR)", 1);
+  }
+  elsif ($code == 75) {
+    return ("Temp failure (EX_TEMPFAIL)", 1);
+  }
+  elsif ($code == 76) {
+    return ("Remote error in protocol (EX_PROTOCOL)", 1);
+  }
+  elsif ($code == 77) {
+    return ("Permission denied (EX_NOPERM)", 1);
+  }
+  elsif ($code == 78) {
+    return ("Configuration error (EX_CONFIG)", 1);
+  }
+  else {
+    return ("Unknown Error ($code)", 1);
+  }
 }
 
 1;
diff --git a/Bugzilla/Series.pm b/Bugzilla/Series.pm
index 22202c6f18..6ca2aa59eb 100644
--- a/Bugzilla/Series.pm
+++ b/Bugzilla/Series.pm
@@ -7,14 +7,14 @@
 
 # This module implements a series - a set of data to be plotted on a chart.
 #
-# This Series is in the database if and only if self->{'series_id'} is defined. 
-# Note that the series being in the database does not mean that the fields of 
-# this object are the same as the DB entries, as the object may have been 
+# This Series is in the database if and only if self->{'series_id'} is defined.
+# Note that the series being in the database does not mean that the fields of
+# this object are the same as the DB entries, as the object may have been
 # altered.
 
 package Bugzilla::Series;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -27,224 +27,255 @@ use constant DB_TABLE => 'series';
 use constant ID_FIELD => 'series_id';
 
 sub new {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-  
-    # Create a ref to an empty hash and bless it
-    my $self = {};
-    bless($self, $class);
-
-    my $arg_count = scalar(@_);
-    
-    # new() can return undef if you pass in a series_id and the user doesn't 
-    # have sufficient permissions. If you create a new series in this way,
-    # you need to check for an undef return, and act appropriately.
-    my $retval = $self;
-
-    # There are three ways of creating Series objects. Two (CGI and Parameters)
-    # are for use when creating a new series. One (Database) is for retrieving
-    # information on existing series.
-    if ($arg_count == 1) {
-        if (ref($_[0])) {
-            # We've been given a CGI object to create a new Series from.
-            # This series may already exist - external code needs to check
-            # before it calls writeToDatabase().
-            $self->initFromCGI($_[0]);
-        }
-        else {
-            # We've been given a series_id, which should represent an existing
-            # Series.
-            $retval = $self->initFromDatabase($_[0]);
-        }
-    }
-    elsif ($arg_count >= 6 && $arg_count <= 8) {
-        # We've been given a load of parameters to create a new Series from.
-        # Currently, undef is always passed as the first parameter; this allows
-        # you to call writeToDatabase() unconditionally.
-        # XXX - You cannot set category_id and subcategory_id from here.
-        $self->initFromParameters(@_);
+  my $invocant = shift;
+  my $class = ref($invocant) || $invocant;
+
+  # Create a ref to an empty hash and bless it
+  my $self = {};
+  bless($self, $class);
+
+  my $arg_count = scalar(@_);
+
+  # new() can return undef if you pass in a series_id and the user doesn't
+  # have sufficient permissions. If you create a new series in this way,
+  # you need to check for an undef return, and act appropriately.
+  my $retval = $self;
+
+  # There are three ways of creating Series objects. Two (CGI and Parameters)
+  # are for use when creating a new series. One (Database) is for retrieving
+  # information on existing series.
+  if ($arg_count == 1) {
+    if (ref($_[0])) {
+
+      # We've been given a CGI object to create a new Series from.
+      # This series may already exist - external code needs to check
+      # before it calls writeToDatabase().
+      $self->initFromCGI($_[0]);
     }
     else {
-        die("Bad parameters passed in - invalid number of args: $arg_count");
+      # We've been given a series_id, which should represent an existing
+      # Series.
+      $retval = $self->initFromDatabase($_[0]);
     }
-
-    return $retval;
+  }
+  elsif ($arg_count >= 6 && $arg_count <= 8) {
+
+    # We've been given a load of parameters to create a new Series from.
+    # Currently, undef is always passed as the first parameter; this allows
+    # you to call writeToDatabase() unconditionally.
+    # XXX - You cannot set category_id and subcategory_id from here.
+    $self->initFromParameters(@_);
+  }
+  else {
+    die("Bad parameters passed in - invalid number of args: $arg_count");
+  }
+
+  return $retval;
 }
 
 sub initFromDatabase {
-    my ($self, $series_id) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    detaint_natural($series_id) 
-      || ThrowCodeError("invalid_series_id", { 'series_id' => $series_id });
-
-    my $grouplist = $user->groups_as_string;
-
-    my @series = $dbh->selectrow_array("SELECT series.series_id, cc1.name, " .
-        "cc2.name, series.name, series.creator, series.frequency, " .
-        "series.query, series.is_public, series.category, series.subcategory " .
-        "FROM series " .
-        "INNER JOIN series_categories AS cc1 " .
-        "    ON series.category = cc1.id " .
-        "INNER JOIN series_categories AS cc2 " .
-        "    ON series.subcategory = cc2.id " .
-        "LEFT JOIN category_group_map AS cgm " .
-        "    ON series.category = cgm.category_id " .
-        "    AND cgm.group_id NOT IN($grouplist) " .
-        "WHERE series.series_id = ? " .
-        "    AND (creator = ? OR (is_public = 1 AND cgm.category_id IS NULL))",
-        undef, ($series_id, $user->id));
-
-    if (@series) {
-        $self->initFromParameters(@series);
-        return $self;
-    }
-    else {
-        return undef;
-    }
+  my ($self, $series_id) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  detaint_natural($series_id)
+    || ThrowCodeError("invalid_series_id", {'series_id' => $series_id});
+
+  my $grouplist = $user->groups_as_string;
+
+  my @series = $dbh->selectrow_array(
+    "SELECT series.series_id, cc1.name, "
+      . "cc2.name, series.name, series.creator, series.frequency, "
+      . "series.query, series.is_public, series.category, series.subcategory "
+      . "FROM series "
+      . "INNER JOIN series_categories AS cc1 "
+      . "    ON series.category = cc1.id "
+      . "INNER JOIN series_categories AS cc2 "
+      . "    ON series.subcategory = cc2.id "
+      . "LEFT JOIN category_group_map AS cgm "
+      . "    ON series.category = cgm.category_id "
+      . "    AND cgm.group_id NOT IN($grouplist) "
+      . "WHERE series.series_id = ? "
+      . "    AND (creator = ? OR (is_public = 1 AND cgm.category_id IS NULL))",
+    undef,
+    ($series_id, $user->id)
+  );
+
+  if (@series) {
+    $self->initFromParameters(@series);
+    return $self;
+  }
+  else {
+    return undef;
+  }
 }
 
 sub initFromParameters {
-    # Pass undef as the first parameter if you are creating a new series.
-    my $self = shift;
 
-    ($self->{'series_id'}, $self->{'category'},  $self->{'subcategory'},
-     $self->{'name'}, $self->{'creator_id'}, $self->{'frequency'},
-     $self->{'query'}, $self->{'public'}, $self->{'category_id'},
-     $self->{'subcategory_id'}) = @_;
+  # Pass undef as the first parameter if you are creating a new series.
+  my $self = shift;
+
+  (
+    $self->{'series_id'}, $self->{'category'},   $self->{'subcategory'},
+    $self->{'name'},      $self->{'creator_id'}, $self->{'frequency'},
+    $self->{'query'},     $self->{'public'},     $self->{'category_id'},
+    $self->{'subcategory_id'}
+  ) = @_;
 
-    # If the first parameter is undefined, check if this series already
-    # exists and update it series_id accordingly
-    $self->{'series_id'} ||= $self->existsInDatabase();
+  # If the first parameter is undefined, check if this series already
+  # exists and update it series_id accordingly
+  $self->{'series_id'} ||= $self->existsInDatabase();
 }
 
 sub initFromCGI {
-    my $self = shift;
-    my $cgi = shift;
-
-    $self->{'series_id'} = $cgi->param('series_id') || undef;
-    if (defined($self->{'series_id'})) {
-        detaint_natural($self->{'series_id'})
-          || ThrowCodeError("invalid_series_id", 
-                               { 'series_id' => $self->{'series_id'} });
-    }
-    
-    $self->{'category'} = $cgi->param('category')
-      || $cgi->param('newcategory')
-      || ThrowUserError("missing_category");
-
-    $self->{'subcategory'} = $cgi->param('subcategory')
-      || $cgi->param('newsubcategory')
-      || ThrowUserError("missing_subcategory");
-
-    $self->{'name'} = $cgi->param('name')
-      || ThrowUserError("missing_name");
-
-    $self->{'creator_id'} = Bugzilla->user->id;
-
-    $self->{'frequency'} = $cgi->param('frequency');
-    detaint_natural($self->{'frequency'})
-      || ThrowUserError("missing_frequency");
-
-    $self->{'query'} = $cgi->canonicalise_query("format", "ctype", "action",
-                                        "category", "subcategory", "name",
-                                        "frequency", "public", "query_format");
-    trick_taint($self->{'query'});
-                                        
-    $self->{'public'} = $cgi->param('public') ? 1 : 0;
-    
-    # Change 'admin' here and in series.html.tmpl, or remove the check
-    # completely, if you want to change who can make series public.
-    $self->{'public'} = 0 unless Bugzilla->user->in_group('admin');
+  my $self = shift;
+  my $cgi  = shift;
+
+  $self->{'series_id'} = $cgi->param('series_id') || undef;
+  if (defined($self->{'series_id'})) {
+    detaint_natural($self->{'series_id'})
+      || ThrowCodeError("invalid_series_id", {'series_id' => $self->{'series_id'}});
+  }
+
+  $self->{'category'}
+    = $cgi->param('category')
+    || $cgi->param('newcategory')
+    || ThrowUserError("missing_category");
+
+  $self->{'subcategory'}
+    = $cgi->param('subcategory')
+    || $cgi->param('newsubcategory')
+    || ThrowUserError("missing_subcategory");
+
+  $self->{'name'} = $cgi->param('name') || ThrowUserError("missing_name");
+
+  $self->{'creator_id'} = Bugzilla->user->id;
+
+  $self->{'frequency'} = $cgi->param('frequency');
+  detaint_natural($self->{'frequency'}) || ThrowUserError("missing_frequency");
+
+  $self->{'query'} = $cgi->canonicalise_query(
+    "format",      "ctype", "action",    "category",
+    "subcategory", "name",  "frequency", "public",
+    "query_format"
+  );
+  trick_taint($self->{'query'});
+
+  $self->{'public'} = $cgi->param('public') ? 1 : 0;
+
+  # Change 'admin' here and in series.html.tmpl, or remove the check
+  # completely, if you want to change who can make series public.
+  $self->{'public'} = 0 unless Bugzilla->user->in_group('admin');
 }
 
 sub writeToDatabase {
-    my $self = shift;
+  my $self = shift;
 
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
+  my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
 
-    my $category_id = getCategoryID($self->{'category'});
-    my $subcategory_id = getCategoryID($self->{'subcategory'});
+  my $category_id    = getCategoryID($self->{'category'});
+  my $subcategory_id = getCategoryID($self->{'subcategory'});
 
-    my $exists;
-    if ($self->{'series_id'}) { 
-        $exists = 
-            $dbh->selectrow_array("SELECT series_id FROM series
-                                   WHERE series_id = $self->{'series_id'}");
-    }
-    
-    # Is this already in the database?                              
-    if ($exists) {
-        # Update existing series
-        my $dbh = Bugzilla->dbh;
-        $dbh->do("UPDATE series SET " .
-                 "category = ?, subcategory = ?," .
-                 "name = ?, frequency = ?, is_public = ?  " .
-                 "WHERE series_id = ?", undef,
-                 $category_id, $subcategory_id, $self->{'name'},
-                 $self->{'frequency'}, $self->{'public'}, 
-                 $self->{'series_id'});
-    }
-    else {
-        # Insert the new series into the series table
-        $dbh->do("INSERT INTO series (creator, category, subcategory, " .
-                 "name, frequency, query, is_public) VALUES " . 
-                 "(?, ?, ?, ?, ?, ?, ?)", undef,
-                 $self->{'creator_id'}, $category_id, $subcategory_id, $self->{'name'},
-                 $self->{'frequency'}, $self->{'query'}, $self->{'public'});
-
-        # Retrieve series_id
-        $self->{'series_id'} = $dbh->selectrow_array("SELECT MAX(series_id) " .
-                                                     "FROM series");
-        $self->{'series_id'}
-          || ThrowCodeError("missing_series_id", { 'series' => $self });
-    }
-    
-    $dbh->bz_commit_transaction();
+  my $exists;
+  if ($self->{'series_id'}) {
+    $exists = $dbh->selectrow_array(
+      "SELECT series_id FROM series
+                                   WHERE series_id = $self->{'series_id'}"
+    );
+  }
+
+  # Is this already in the database?
+  if ($exists) {
+
+    # Update existing series
+    my $dbh = Bugzilla->dbh;
+    $dbh->do(
+      "UPDATE series SET "
+        . "category = ?, subcategory = ?,"
+        . "name = ?, frequency = ?, is_public = ?  "
+        . "WHERE series_id = ?",
+      undef,
+      $category_id,
+      $subcategory_id,
+      $self->{'name'},
+      $self->{'frequency'},
+      $self->{'public'},
+      $self->{'series_id'}
+    );
+  }
+  else {
+    # Insert the new series into the series table
+    $dbh->do(
+      "INSERT INTO series (creator, category, subcategory, "
+        . "name, frequency, query, is_public) VALUES "
+        . "(?, ?, ?, ?, ?, ?, ?)",
+      undef,
+      $self->{'creator_id'},
+      $category_id,
+      $subcategory_id,
+      $self->{'name'},
+      $self->{'frequency'},
+      $self->{'query'},
+      $self->{'public'}
+    );
+
+    # Retrieve series_id
+    $self->{'series_id'}
+      = $dbh->selectrow_array("SELECT MAX(series_id) " . "FROM series");
+    $self->{'series_id'}
+      || ThrowCodeError("missing_series_id", {'series' => $self});
+  }
+
+  $dbh->bz_commit_transaction();
 }
 
 # Check whether a series with this name, category and subcategory exists in
 # the DB and, if so, returns its series_id.
 sub existsInDatabase {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  my $category_id    = getCategoryID($self->{'category'});
+  my $subcategory_id = getCategoryID($self->{'subcategory'});
 
-    my $category_id = getCategoryID($self->{'category'});
-    my $subcategory_id = getCategoryID($self->{'subcategory'});
-    
-    trick_taint($self->{'name'});
-    my $series_id = $dbh->selectrow_array("SELECT series_id " .
-                              "FROM series WHERE category = $category_id " .
-                              "AND subcategory = $subcategory_id AND name = " .
-                              $dbh->quote($self->{'name'}));
-                              
-    return($series_id);
+  trick_taint($self->{'name'});
+  my $series_id
+    = $dbh->selectrow_array("SELECT series_id "
+      . "FROM series WHERE category = $category_id "
+      . "AND subcategory = $subcategory_id AND name = "
+      . $dbh->quote($self->{'name'}));
+
+  return ($series_id);
 }
 
 # Get a category or subcategory IDs, creating the category if it doesn't exist.
 sub getCategoryID {
-    my ($category) = @_;
-    my $category_id;
-    my $dbh = Bugzilla->dbh;
+  my ($category) = @_;
+  my $category_id;
+  my $dbh = Bugzilla->dbh;
 
-    # This seems for the best idiom for "Do A. Then maybe do B and A again."
-    while (1) {
-        # We are quoting this to put it in the DB, so we can remove taint
-        trick_taint($category);
+  # This seems for the best idiom for "Do A. Then maybe do B and A again."
+  while (1) {
 
-        $category_id = $dbh->selectrow_array("SELECT id " .
-                                      "from series_categories " .
-                                      "WHERE name =" . $dbh->quote($category));
+    # We are quoting this to put it in the DB, so we can remove taint
+    trick_taint($category);
 
-        last if defined($category_id);
+    $category_id
+      = $dbh->selectrow_array("SELECT id "
+        . "from series_categories "
+        . "WHERE name ="
+        . $dbh->quote($category));
 
-        $dbh->do("INSERT INTO series_categories (name) " .
-                 "VALUES (" . $dbh->quote($category) . ")");
-    }
+    last if defined($category_id);
+
+    $dbh->do("INSERT INTO series_categories (name) "
+        . "VALUES ("
+        . $dbh->quote($category)
+        . ")");
+  }
 
-    return $category_id;
+  return $category_id;
 }
 
 ##########
@@ -254,20 +285,20 @@ sub id   { return $_[0]->{'series_id'}; }
 sub name { return $_[0]->{'name'}; }
 
 sub creator {
-    my $self = shift;
+  my $self = shift;
 
-    if (!$self->{creator} && $self->{creator_id}) {
-        require Bugzilla::User;
-        $self->{creator} = new Bugzilla::User($self->{creator_id});
-    }
-    return $self->{creator};
+  if (!$self->{creator} && $self->{creator_id}) {
+    require Bugzilla::User;
+    $self->{creator} = new Bugzilla::User($self->{creator_id});
+  }
+  return $self->{creator};
 }
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    $dbh->do('DELETE FROM series WHERE series_id = ?', undef, $self->id);
+  $dbh->do('DELETE FROM series WHERE series_id = ?', undef, $self->id);
 }
 
 1;
diff --git a/Bugzilla/Status.pm b/Bugzilla/Status.pm
index 2755102160..8b7e61c9f5 100644
--- a/Bugzilla/Status.pm
+++ b/Bugzilla/Status.pm
@@ -7,21 +7,21 @@
 
 package Bugzilla::Status;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-# This subclasses Bugzilla::Field::Choice instead of implementing 
+# This subclasses Bugzilla::Field::Choice instead of implementing
 # ChoiceInterface, because a bug status literally is a special type
 # of Field::Choice, not just an object that happens to have the same
 # methods.
 use parent qw(Bugzilla::Field::Choice Exporter);
 @Bugzilla::Status::EXPORT = qw(
-    BUG_STATE_OPEN
-    SPECIAL_STATUS_WORKFLOW_ACTIONS
+  BUG_STATE_OPEN
+  SPECIAL_STATUS_WORKFLOW_ACTIONS
 
-    is_open_state 
-    closed_bug_statuses
+  is_open_state
+  closed_bug_statuses
 );
 
 use Bugzilla::Error;
@@ -31,25 +31,25 @@ use Bugzilla::Error;
 ################################
 
 use constant SPECIAL_STATUS_WORKFLOW_ACTIONS => qw(
-    none
-    duplicate
-    change_resolution
-    clearresolution
+  none
+  duplicate
+  change_resolution
+  clearresolution
 );
 
 use constant DB_TABLE => 'bug_status';
 
 # This has all the standard Bugzilla::Field::Choice columns plus "is_open"
 sub DB_COLUMNS {
-    return ($_[0]->SUPER::DB_COLUMNS, 'is_open');
+  return ($_[0]->SUPER::DB_COLUMNS, 'is_open');
 }
 
 sub VALIDATORS {
-    my $invocant = shift;
-    my $validators = $invocant->SUPER::VALIDATORS;
-    $validators->{is_open} = \&Bugzilla::Object::check_boolean;
-    $validators->{value} = \&_check_value;
-    return $validators;
+  my $invocant   = shift;
+  my $validators = $invocant->SUPER::VALIDATORS;
+  $validators->{is_open} = \&Bugzilla::Object::check_boolean;
+  $validators->{value}   = \&_check_value;
+  return $validators;
 }
 
 #########################
@@ -57,17 +57,17 @@ sub VALIDATORS {
 #########################
 
 sub create {
-    my $class = shift;
-    my $self = $class->SUPER::create(@_);
-    delete Bugzilla->request_cache->{status_bug_state_open};
-    add_missing_bug_status_transitions();
-    return $self;
+  my $class = shift;
+  my $self  = $class->SUPER::create(@_);
+  delete Bugzilla->request_cache->{status_bug_state_open};
+  add_missing_bug_status_transitions();
+  return $self;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    $self->SUPER::remove_from_db();
-    delete Bugzilla->request_cache->{status_bug_state_open};
+  my $self = shift;
+  $self->SUPER::remove_from_db();
+  delete Bugzilla->request_cache->{status_bug_state_open};
 }
 
 ###############################
@@ -75,16 +75,16 @@ sub remove_from_db {
 ###############################
 
 sub is_active { return $_[0]->{'isactive'}; }
-sub is_open   { return $_[0]->{'is_open'};  }
+sub is_open   { return $_[0]->{'is_open'}; }
 
 sub is_static {
-    my $self = shift;
-    if ($self->name eq 'UNCONFIRMED'
-        || $self->name eq Bugzilla->params->{'duplicate_or_move_bug_status'}) 
-    {
-        return 1;
-    }
-    return 0;
+  my $self = shift;
+  if ( $self->name eq 'UNCONFIRMED'
+    || $self->name eq Bugzilla->params->{'duplicate_or_move_bug_status'})
+  {
+    return 1;
+  }
+  return 0;
 }
 
 ##############
@@ -92,14 +92,14 @@ sub is_static {
 ##############
 
 sub _check_value {
-    my $invocant = shift;
-    my $value = $invocant->SUPER::_check_value(@_);
-
-    if (grep { lc($value) eq lc($_) } SPECIAL_STATUS_WORKFLOW_ACTIONS) {
-        ThrowUserError('fieldvalue_reserved_word',
-                       { field => $invocant->field, value => $value });
-    }
-    return $value;
+  my $invocant = shift;
+  my $value    = $invocant->SUPER::_check_value(@_);
+
+  if (grep { lc($value) eq lc($_) } SPECIAL_STATUS_WORKFLOW_ACTIONS) {
+    ThrowUserError('fieldvalue_reserved_word',
+      {field => $invocant->field, value => $value});
+  }
+  return $value;
 }
 
 
@@ -108,118 +108,125 @@ sub _check_value {
 ###############################
 
 sub BUG_STATE_OPEN {
-    my $dbh = Bugzilla->dbh;
-    my $request_cache = Bugzilla->request_cache;
-    my $cache_key = 'status_bug_state_open';
-    return @{ $request_cache->{$cache_key} }
-        if exists $request_cache->{$cache_key};
-
-    my $rows = Bugzilla->memcached->get_config({ key => $cache_key });
-    if (!$rows) {
-        $rows = $dbh->selectcol_arrayref(
-            'SELECT value FROM bug_status WHERE is_open = 1'
-        );
-        Bugzilla->memcached->set_config({ key => $cache_key, data => $rows });
-    }
-
-    $request_cache->{$cache_key} = $rows;
-    return @$rows;
+  my $dbh           = Bugzilla->dbh;
+  my $request_cache = Bugzilla->request_cache;
+  my $cache_key     = 'status_bug_state_open';
+  return @{$request_cache->{$cache_key}} if exists $request_cache->{$cache_key};
+
+  my $rows = Bugzilla->memcached->get_config({key => $cache_key});
+  if (!$rows) {
+    $rows
+      = $dbh->selectcol_arrayref('SELECT value FROM bug_status WHERE is_open = 1');
+    Bugzilla->memcached->set_config({key => $cache_key, data => $rows});
+  }
+
+  $request_cache->{$cache_key} = $rows;
+  return @$rows;
 }
 
 # Tells you whether or not the argument is a valid "open" state.
 sub is_open_state {
-    my ($state) = @_;
-    return (grep($_ eq $state, BUG_STATE_OPEN) ? 1 : 0);
+  my ($state) = @_;
+  return (grep($_ eq $state, BUG_STATE_OPEN) ? 1 : 0);
 }
 
 sub closed_bug_statuses {
-    my @bug_statuses = Bugzilla::Status->get_all;
-    @bug_statuses = grep { !$_->is_open } @bug_statuses;
-    return @bug_statuses;
+  my @bug_statuses = Bugzilla::Status->get_all;
+  @bug_statuses = grep { !$_->is_open } @bug_statuses;
+  return @bug_statuses;
 }
 
 sub can_change_to {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    if (!ref($self) || !defined $self->{'can_change_to'}) {
-        my ($cond, @args, $self_exists);
-        if (ref($self)) {
-            $cond = '= ?';
-            push(@args, $self->id);
-            $self_exists = 1;
-        }
-        else {
-            $cond = 'IS NULL';
-            # Let's do it so that the code below works in all cases.
-            $self = {};
-        }
-
-        my $new_status_ids = $dbh->selectcol_arrayref("SELECT new_status
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  if (!ref($self) || !defined $self->{'can_change_to'}) {
+    my ($cond, @args, $self_exists);
+    if (ref($self)) {
+      $cond = '= ?';
+      push(@args, $self->id);
+      $self_exists = 1;
+    }
+    else {
+      $cond = 'IS NULL';
+
+      # Let's do it so that the code below works in all cases.
+      $self = {};
+    }
+
+    my $new_status_ids = $dbh->selectcol_arrayref(
+      "SELECT new_status
                                                          FROM status_workflow
                                                    INNER JOIN bug_status
                                                            ON id = new_status
                                                         WHERE isactive = 1
                                                           AND old_status $cond
-                                                     ORDER BY sortkey",
-                                                        undef, @args);
+                                                     ORDER BY sortkey", undef, @args
+    );
 
-        # Allow the bug status to remain unchanged.
-        push(@$new_status_ids, $self->id) if $self_exists;
-        $self->{'can_change_to'} = Bugzilla::Status->new_from_list($new_status_ids);
-    }
+    # Allow the bug status to remain unchanged.
+    push(@$new_status_ids, $self->id) if $self_exists;
+    $self->{'can_change_to'} = Bugzilla::Status->new_from_list($new_status_ids);
+  }
 
-    return $self->{'can_change_to'};
+  return $self->{'can_change_to'};
 }
 
 sub comment_required_on_change_from {
-    my ($self, $old_status) = @_;
-    my ($cond, $values) = $self->_status_condition($old_status);
-    
-    my ($require_comment) = Bugzilla->dbh->selectrow_array(
-        "SELECT require_comment FROM status_workflow
-          WHERE $cond", undef, @$values);
-    return $require_comment;
+  my ($self, $old_status) = @_;
+  my ($cond, $values)     = $self->_status_condition($old_status);
+
+  my ($require_comment) = Bugzilla->dbh->selectrow_array(
+    "SELECT require_comment FROM status_workflow
+          WHERE $cond", undef, @$values
+  );
+  return $require_comment;
 }
 
 # Used as a helper for various functions that have to deal with old_status
 # sometimes being NULL and sometimes having a value.
 sub _status_condition {
-    my ($self, $old_status) = @_;
-    my @values;
-    my $cond = 'old_status IS NULL';
-    # We may pass a fake status object to represent the initial unset state.
-    if ($old_status && $old_status->id)  {
-        $cond = 'old_status = ?';
-        push(@values, $old_status->id);
-    }
-    $cond .= " AND new_status = ?";
-    push(@values, $self->id);
-    return ($cond, \@values);
+  my ($self, $old_status) = @_;
+  my @values;
+  my $cond = 'old_status IS NULL';
+
+  # We may pass a fake status object to represent the initial unset state.
+  if ($old_status && $old_status->id) {
+    $cond = 'old_status = ?';
+    push(@values, $old_status->id);
+  }
+  $cond .= " AND new_status = ?";
+  push(@values, $self->id);
+  return ($cond, \@values);
 }
 
 sub add_missing_bug_status_transitions {
-    my $bug_status = shift || Bugzilla->params->{'duplicate_or_move_bug_status'};
-    my $dbh = Bugzilla->dbh;
-    my $new_status = new Bugzilla::Status({name => $bug_status});
-    # Silently discard invalid bug statuses.
-    $new_status || return;
+  my $bug_status = shift || Bugzilla->params->{'duplicate_or_move_bug_status'};
+  my $dbh        = Bugzilla->dbh;
+  my $new_status = new Bugzilla::Status({name => $bug_status});
+
+  # Silently discard invalid bug statuses.
+  $new_status || return;
 
-    my $missing_statuses = $dbh->selectcol_arrayref('SELECT id
+  my $missing_statuses = $dbh->selectcol_arrayref(
+    'SELECT id
                                                        FROM bug_status
                                                   LEFT JOIN status_workflow
                                                          ON old_status = id
                                                         AND new_status = ?
                                                       WHERE old_status IS NULL',
-                                                      undef, $new_status->id);
-
-    my $sth = $dbh->prepare('INSERT INTO status_workflow
-                             (old_status, new_status) VALUES (?, ?)');
-
-    foreach my $old_status_id (@$missing_statuses) {
-        next if ($old_status_id == $new_status->id);
-        $sth->execute($old_status_id, $new_status->id);
-    }
+    undef, $new_status->id
+  );
+
+  my $sth = $dbh->prepare(
+    'INSERT INTO status_workflow
+                             (old_status, new_status) VALUES (?, ?)'
+  );
+
+  foreach my $old_status_id (@$missing_statuses) {
+    next if ($old_status_id == $new_status->id);
+    $sth->execute($old_status_id, $new_status->id);
+  }
 }
 
 1;
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 660767afdb..28d4ad5272 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -8,7 +8,7 @@
 
 package Bugzilla::Template;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,8 +16,8 @@ use Bugzilla::Constants;
 use Bugzilla::WebService::Constants;
 use Bugzilla::Hook;
 use Bugzilla::Install::Requirements;
-use Bugzilla::Install::Util qw(install_string template_include_path 
-                               include_languages);
+use Bugzilla::Install::Util qw(install_string template_include_path
+  include_languages i_am_persistent);
 use Bugzilla::Classification;
 use Bugzilla::Keyword;
 use Bugzilla::Util;
@@ -32,7 +32,6 @@ use Digest::MD5 qw(md5_hex);
 use File::Basename qw(basename dirname);
 use File::Find;
 use File::Path qw(rmtree mkpath);
-use File::Slurp;
 use File::Spec;
 use IO::Dir;
 use List::MoreUtils qw(firstidx);
@@ -41,47 +40,49 @@ use Scalar::Util qw(blessed);
 use parent qw(Template);
 
 use constant FORMAT_TRIPLE => '%19s|%-28s|%-28s';
-use constant FORMAT_3_SIZE => [19,28,28];
+use constant FORMAT_3_SIZE => [19, 28, 28];
 use constant FORMAT_DOUBLE => '%19s %-55s';
-use constant FORMAT_2_SIZE => [19,55];
+use constant FORMAT_2_SIZE => [19, 55];
 
 # Pseudo-constant.
 sub SAFE_URL_REGEXP {
-    my $safe_protocols = join('|', SAFE_PROTOCOLS);
-    return qr/($safe_protocols):[^:\s<>\"][^\s<>\"]+[\w\/]/i;
+  my $safe_protocols = join('|', SAFE_PROTOCOLS);
+  return qr/($safe_protocols):[^:\s<>\"][^\s<>\"]+[\w\/]/i;
 }
 
 # Convert the constants in the Bugzilla::Constants and Bugzilla::WebService::Constants
-# modules into a hash we can pass to the template object for reflection into its "constants" 
+# modules into a hash we can pass to the template object for reflection into its "constants"
 # namespace (which is like its "variables" namespace, but for constants). To do so, we
 # traverse the arrays of exported and exportable symbols and ignoring the rest
 # (which, if Constants.pm exports only constants, as it should, will be nothing else).
 sub _load_constants {
-    my %constants;
-    foreach my $constant (@Bugzilla::Constants::EXPORT,
-                          @Bugzilla::Constants::EXPORT_OK)
-    {
-        if (ref Bugzilla::Constants->$constant) {
-            $constants{$constant} = Bugzilla::Constants->$constant;
-        }
-        else {
-            my @list = (Bugzilla::Constants->$constant);
-            $constants{$constant} = (scalar(@list) == 1) ? $list[0] : \@list;
-        }
+  my %constants;
+  foreach
+    my $constant (@Bugzilla::Constants::EXPORT, @Bugzilla::Constants::EXPORT_OK)
+  {
+    if (ref Bugzilla::Constants->$constant) {
+      $constants{$constant} = Bugzilla::Constants->$constant;
     }
-
-    foreach my $constant (@Bugzilla::WebService::Constants::EXPORT, 
-                          @Bugzilla::WebService::Constants::EXPORT_OK)
-    {
-        if (ref Bugzilla::WebService::Constants->$constant) {
-            $constants{$constant} = Bugzilla::WebService::Constants->$constant;
-        }
-        else {
-            my @list = (Bugzilla::WebService::Constants->$constant);
-            $constants{$constant} = (scalar(@list) == 1) ? $list[0] : \@list;
-        }
+    else {
+      my @list = (Bugzilla::Constants->$constant);
+      $constants{$constant} = (scalar(@list) == 1) ? $list[0] : \@list;
+    }
+  }
+
+  foreach my $constant (
+    @Bugzilla::WebService::Constants::EXPORT,
+    @Bugzilla::WebService::Constants::EXPORT_OK
+    )
+  {
+    if (ref Bugzilla::WebService::Constants->$constant) {
+      $constants{$constant} = Bugzilla::WebService::Constants->$constant;
     }
-    return \%constants;
+    else {
+      my @list = (Bugzilla::WebService::Constants->$constant);
+      $constants{$constant} = (scalar(@list) == 1) ? $list[0] : \@list;
+    }
+  }
+  return \%constants;
 }
 
 # Returns the path to the templates based on the Accept-Language
@@ -89,55 +90,51 @@ sub _load_constants {
 # If no Accept-Language is present it uses the defined default
 # Templates may also be found in the extensions/ tree
 sub _include_path {
-    my $lang = shift || '';
-    my $cache = Bugzilla->request_cache;
-    $cache->{"template_include_path_$lang"} ||= 
-        template_include_path({ language => $lang });
-    return $cache->{"template_include_path_$lang"};
+  my $lang = shift || '';
+  my $cache = Bugzilla->request_cache;
+  $cache->{"template_include_path_$lang"}
+    ||= template_include_path({language => $lang});
+  return $cache->{"template_include_path_$lang"};
 }
 
 sub get_format {
-    my $self = shift;
-    my ($template, $format, $ctype) = @_;
-
-    $ctype //= 'html';
-    $format //= '';
-
-    # ctype and format can have letters and a hyphen only.
-    if ($ctype =~ /[^a-zA-Z\-]/ || $format =~ /[^a-zA-Z\-]/) {
-        ThrowUserError('format_not_found', {'format' => $format,
-                                            'ctype'  => $ctype,
-                                            'invalid' => 1});
-    }
-    trick_taint($ctype);
-    trick_taint($format);
-
-    $template .= ($format ? "-$format" : "");
-    $template .= ".$ctype.tmpl";
-
-    # Now check that the template actually exists. We only want to check
-    # if the template exists; any other errors (eg parse errors) will
-    # end up being detected later.
-    eval {
-        $self->context->template($template);
-    };
-    # This parsing may seem fragile, but it's OK:
-    # http://lists.template-toolkit.org/pipermail/templates/2003-March/004370.html
-    # Even if it is wrong, any sort of error is going to cause a failure
-    # eventually, so the only issue would be an incorrect error message
-    if ($@ && $@->info =~ /: not found$/) {
-        ThrowUserError('format_not_found', {'format' => $format,
-                                            'ctype'  => $ctype});
-    }
-
-    # Else, just return the info
-    return
-    {
-        'template'    => $template,
-        'format'      => $format,
-        'extension'   => $ctype,
-        'ctype'       => Bugzilla::Constants::contenttypes->{$ctype}
-    };
+  my $self = shift;
+  my ($template, $format, $ctype) = @_;
+
+  $ctype  //= 'html';
+  $format //= '';
+
+  # ctype and format can have letters and a hyphen only.
+  if ($ctype =~ /[^a-zA-Z\-]/ || $format =~ /[^a-zA-Z\-]/) {
+    ThrowUserError('format_not_found',
+      {'format' => $format, 'ctype' => $ctype, 'invalid' => 1});
+  }
+  trick_taint($ctype);
+  trick_taint($format);
+
+  $template .= ($format ? "-$format" : "");
+  $template .= ".$ctype.tmpl";
+
+  # Now check that the template actually exists. We only want to check
+  # if the template exists; any other errors (eg parse errors) will
+  # end up being detected later.
+  eval { $self->context->template($template); };
+
+  # This parsing may seem fragile, but it's OK:
+  # http://lists.template-toolkit.org/pipermail/templates/2003-March/004370.html
+  # Even if it is wrong, any sort of error is going to cause a failure
+  # eventually, so the only issue would be an incorrect error message
+  if ($@ && $@->info =~ /: not found$/) {
+    ThrowUserError('format_not_found', {'format' => $format, 'ctype' => $ctype});
+  }
+
+  # Else, just return the info
+  return {
+    'template'  => $template,
+    'format'    => $format,
+    'extension' => $ctype,
+    'ctype'     => Bugzilla::Constants::contenttypes->{$ctype}
+  };
 }
 
 # This routine quoteUrls contains inspirations from the HTML::FromText CPAN
@@ -148,198 +145,211 @@ sub get_format {
 # If you want to modify this routine, read the comments carefully
 
 sub quoteUrls {
-    my ($text, $bug, $comment, $user, $bug_link_func, $for_markdown) = @_;
-    return $text unless $text;
-    $user ||= Bugzilla->user;
-    $bug_link_func ||= \&get_bug_link;
-    $for_markdown ||= 0;
-
-    # We use /g for speed, but uris can have other things inside them
-    # (http://foo/bug#3 for example). Filtering that out filters valid
-    # bug refs out, so we have to do replacements.
-    # mailto can't contain space or #, so we don't have to bother for that
-    # Do this by replacing matches with \x{FDD2}$count\x{FDD3}
-    # \x{FDDx} is used because it's unlikely to occur in the text
-    # and are reserved unicode characters. We disable warnings for now
-    # until we require Perl 5.13.9 or newer.
-    no warnings 'utf8';
-
-    # If the comment is already wrapped, we should ignore newlines when
-    # looking for matching regexps. Else we should take them into account.
-    my $s = ($comment && $comment->already_wrapped) ? qr/\s/ : qr/\h/;
-
-    # However, note that adding the title (for buglinks) can affect things
-    # In particular, attachment matches go before bug titles, so that titles
-    # with 'attachment 1' don't double match.
-    # Dupe checks go afterwards, because that uses ^ and \Z, which won't occur
-    # if it was substituted as a bug title (since that always involve leading
-    # and trailing text)
-
-    # Because of entities, it's easier (and quicker) to do this before escaping
-
-    my @things;
-    my $count = 0;
-    my $tmp;
-
-    my @hook_regexes;
-    Bugzilla::Hook::process('bug_format_comment',
-        { text => \$text, bug => $bug, regexes => \@hook_regexes,
-          comment => $comment, user => $user });
-
-    foreach my $re (@hook_regexes) {
-        my ($match, $replace) = @$re{qw(match replace)};
-        if (ref($replace) eq 'CODE') {
-            $text =~ s/$match/($things[$count++] = $replace->({matches => [
+  my ($text, $bug, $comment, $user, $for_markdown) = @_;
+  return $text unless $text;
+  $user ||= Bugzilla->user;
+  $for_markdown ||= 0;
+
+  # We use /g for speed, but uris can have other things inside them
+  # (http://foo/bug#3 for example). Filtering that out filters valid
+  # bug refs out, so we have to do replacements.
+  # mailto can't contain space or #, so we don't have to bother for that
+  # Do this by replacing matches with \x{FDD2}$count\x{FDD3}
+  # \x{FDDx} is used because it's unlikely to occur in the text
+  # and are reserved unicode characters.
+
+# If the comment is already wrapped, we should ignore newlines when
+# looking for matching regexps. Else we should take them into account.
+# And confirm comment is an object, it could be a hash from WebService::Bug::render_comment
+  my $s
+    = (  $comment
+      && ref($comment) eq 'Bugzilla::Comment'
+      && $comment->already_wrapped) ? qr/\s/ : qr/\h/;
+
+  # However, note that adding the title (for buglinks) can affect things
+  # In particular, attachment matches go before bug titles, so that titles
+  # with 'attachment 1' don't double match.
+  # Dupe checks go afterwards, because that uses ^ and \Z, which won't occur
+  # if it was substituted as a bug title (since that always involve leading
+  # and trailing text)
+
+  # Because of entities, it's easier (and quicker) to do this before escaping
+
+  my @things;
+  my $count = 0;
+  my $tmp;
+
+  my @hook_regexes;
+  Bugzilla::Hook::process(
+    'bug_format_comment',
+    {
+      text    => \$text,
+      bug     => $bug,
+      regexes => \@hook_regexes,
+      comment => $comment,
+      user    => $user
+    }
+  );
+
+  foreach my $re (@hook_regexes) {
+    my ($match, $replace) = @$re{qw(match replace)};
+    if (ref($replace) eq 'CODE') {
+      $text =~ s/$match/($things[$count++] = $replace->({matches => [
                                                                $1, $2, $3, $4,
                                                                $5, $6, $7, $8, 
                                                                $9, $10]}))
                                && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx;
-        }
-        else {
-            $text =~ s/$match/($things[$count++] = $replace) 
+    }
+    else {
+      $text =~ s/$match/($things[$count++] = $replace) 
                               && ("\x{FDD2}" . ($count-1) . "\x{FDD3}")/egx;
-        }
     }
-
-    # Provide tooltips for full bug links (Bug 74355)
-    my $urlbase_re = '(' . join('|',
-        map { qr/$_/ } grep($_, Bugzilla->params->{'urlbase'}, 
-                            Bugzilla->params->{'sslbase'})) . ')';
-    $text =~ s~\b(${urlbase_re}\Qshow_bug.cgi?id=\E([0-9]+)(\#c([0-9]+))?)\b
-              ~($things[$count++] = $bug_link_func->($3, $1, { comment_num => $5, user => $user })) &&
+  }
+
+  # Provide tooltips for full bug links (Bug 74355)
+  my $urlbase_re = '('
+    . join('|',
+    map {qr/$_/}
+    grep($_, Bugzilla->params->{'urlbase'}, Bugzilla->params->{'sslbase'}))
+    . ')';
+  $text =~ s~\b(${urlbase_re}\Qshow_bug.cgi?id=\E([0-9]+)(\#c([0-9]+))?)\b
+              ~($things[$count++] = get_bug_link($3, $1, { comment_num => $5, user => $user })) &&
                ("\x{FDD2}" . ($count-1) . "\x{FDD3}")
               ~egox;
 
-    # non-mailto protocols
-    my $safe_protocols = SAFE_URL_REGEXP();
-    $text =~ s~\b($safe_protocols)
+  # non-mailto protocols
+  my $safe_protocols = SAFE_URL_REGEXP();
+  $text =~ s~\b($safe_protocols)
               ~($tmp = html_quote($1)) &&
                ($things[$count++] = "<a href=\"$tmp\">$tmp</a>") &&
                ("\x{FDD2}" . ($count-1) . "\x{FDD3}")
               ~egox;
 
-    # We have to quote now, otherwise the html itself is escaped
-    # THIS MEANS THAT A LITERAL ", <, >, ' MUST BE ESCAPED FOR A MATCH
+  # We have to quote now, otherwise the html itself is escaped
+  # THIS MEANS THAT A LITERAL ", <, >, ' MUST BE ESCAPED FOR A MATCH
 
-    $text = html_quote($text);
+  $text = html_quote($text);
 
-    unless ($for_markdown) {
-        # Color quoted text
-        $text =~ s~^(&gt;.+)$~<span class="quote">$1</span >~mg;
-        $text =~ s~</span >\n<span class="quote">~\n~g;
-    }
-    # mailto:
-    # Use |<nothing> so that $1 is defined regardless
-    # &#64; is the encoded '@' character.
-    $text =~ s~\b(mailto:|)?([\w\.\-\+\=]+&\#64;[\w\-]+(?:\.[\w\-]+)+)\b
+  unless ($for_markdown) {
+
+    # Color quoted text
+    $text =~ s~^(&gt;.+)$~<span class="quote">$1</span >~mg;
+    $text =~ s~</span >\n<span class="quote">~\n~g;
+  }
+
+  # mailto:
+  # Use |<nothing> so that $1 is defined regardless
+  # &#64; is the encoded '@' character.
+  $text =~ s~\b(mailto:|)?([\w\.\-\+\=]+&\#64;[\w\-]+(?:\.[\w\-]+)+)\b
               ~<a href=\"mailto:$2\">$1$2</a>~igx;
 
-    # attachment links
-    $text =~ s~\b(attachment$s*\#?$s*(\d+)(?:$s+\[details\])?)
+  # attachment links
+  $text =~ s~\b(attachment$s*\#?$s*(\d+)(?:$s+\[details\])?)
               ~($things[$count++] = get_attachment_link($2, $1, $user)) &&
                ("\x{FDD2}" . ($count-1) . "\x{FDD3}")
               ~egmxi;
 
-    # Current bug ID this comment belongs to
-    my $current_bugurl = $bug ? ("show_bug.cgi?id=" . $bug->id) : "";
-
-    # This handles bug a, comment b type stuff. Because we're using /g
-    # we have to do this in one pattern, and so this is semi-messy.
-    # Also, we can't use $bug_re?$comment_re? because that will match the
-    # empty string
-    my $bug_word = template_var('terms')->{bug};
-    my $bug_re = qr/\Q$bug_word\E$s*\#?$s*(\d+)/i;
-    my $comment_word = template_var('terms')->{comment};
-    my $comment_re = qr/(?:\Q$comment_word\E|comment)$s*\#?$s*(\d+)/i;
-    $text =~ s~\b($bug_re(?:$s*,?$s*$comment_re)?|$comment_re)
+  # Current bug ID this comment belongs to
+  my $current_bugurl = $bug ? ("show_bug.cgi?id=" . $bug->id) : "";
+
+  # This handles bug a, comment b type stuff. Because we're using /g
+  # we have to do this in one pattern, and so this is semi-messy.
+  # Also, we can't use $bug_re?$comment_re? because that will match the
+  # empty string
+  my $bug_word     = template_var('terms')->{bug};
+  my $bug_re       = qr/\Q$bug_word\E$s*\#?$s*(\d+)/ai;
+  my $comment_word = template_var('terms')->{comment};
+  my $comment_re   = qr/(?:\Q$comment_word\E|comment)$s*\#?$s*(\d+)/ai;
+  $text =~ s~\b($bug_re(?:$s*,?$s*$comment_re)?|$comment_re)
               ~ # We have several choices. $1 here is the link, and $2-4 are set
                 # depending on which part matched
-               (defined($2) ? $bug_link_func->($2, $1, { comment_num => $3, user => $user }) :
+               (defined($2) ? get_bug_link($2, $1, { comment_num => $3, user => $user }) :
                               "<a href=\"$current_bugurl#c$4\">$1</a>")
               ~egx;
 
-    # Handle a list of bug ids: bugs 1, #2, 3, 4
-    # Currently, the only delimiter supported is comma.
-    # Concluding "and" and "or" are not supported.
-    my $bugs_word = template_var('terms')->{bugs};
+  # Handle a list of bug ids: bugs 1, #2, 3, 4
+  # Currently, the only delimiter supported is comma.
+  # Concluding "and" and "or" are not supported.
+  my $bugs_word = template_var('terms')->{bugs};
 
-    my $bugs_re = qr/\Q$bugs_word\E$s*\#?$s*
+  my $bugs_re = qr/\Q$bugs_word\E$s*\#?$s*
                      \d+(?:$s*,$s*\#?$s*\d+)+/ix;
 
-    $text =~ s{($bugs_re)}{
+  $text =~ s{($bugs_re)}{
         my $match = $1;
-        $match =~ s/((?:#$s*)?(\d+))/$bug_link_func->($2, $1);/eg;
+        $match =~ s/((?:#$s*)?(\d+))/get_bug_link($2, $1);/eg;
         $match;
     }eg;
 
-    my $comments_word = template_var('terms')->{comments};
+  my $comments_word = template_var('terms')->{comments};
 
-    my $comments_re = qr/(?:comments|\Q$comments_word\E)$s*\#?$s*
+  my $comments_re = qr/(?:comments|\Q$comments_word\E)$s*\#?$s*
                          \d+(?:$s*,$s*\#?$s*\d+)+/ix;
 
-    $text =~ s{($comments_re)}{
+  $text =~ s{($comments_re)}{
         my $match = $1;
         $match =~ s|((?:#$s*)?(\d+))|<a href="$current_bugurl#c$2">$1</a>|g;
         $match;
     }eg;
 
-    # Old duplicate markers. These don't use $bug_word because they are old
-    # and were never customizable.
-    $text =~ s~(?<=^\*\*\*\ This\ bug\ has\ been\ marked\ as\ a\ duplicate\ of\ )
+  # Old duplicate markers. These don't use $bug_word because they are old
+  # and were never customizable.
+  $text =~ s~(?<=^\*\*\*\ This\ bug\ has\ been\ marked\ as\ a\ duplicate\ of\ )
                (\d+)
                (?=\ \*\*\*\Z)
-              ~$bug_link_func->($1, $1, { user => $user })
+              ~get_bug_link($1, $1, { user => $user })
               ~egmx;
 
-    # Now remove the encoding hacks in reverse order
-    for (my $i = $#things; $i >= 0; $i--) {
-        $text =~ s/\x{FDD2}($i)\x{FDD3}/$things[$i]/eg;
-    }
+  # Now remove the encoding hacks in reverse order
+  for (my $i = $#things; $i >= 0; $i--) {
+    $text =~ s/\x{FDD2}($i)\x{FDD3}/$things[$i]/eg;
+  }
 
-    return $text;
+  return $text;
 }
 
 # Creates a link to an attachment, including its title.
 sub get_attachment_link {
-    my ($attachid, $link_text, $user) = @_;
-    my $dbh = Bugzilla->dbh;
-    $user ||= Bugzilla->user;
-
-    my $attachment = new Bugzilla::Attachment({ id => $attachid, cache => 1 });
-
-    if ($attachment) {
-        my $title = "";
-        my $className = "";
-        if ($user->can_see_bug($attachment->bug_id)
-            && (!$attachment->isprivate || $user->is_insider))
-        {
-            $title = $attachment->description;
-        }
-        if ($attachment->isobsolete) {
-            $className = "bz_obsolete";
-        }
-        # Prevent code injection in the title.
-        $title = html_quote(clean_text($title));
-
-        $link_text =~ s/ \[details\]$//;
-        my $linkval = "attachment.cgi?id=$attachid";
+  my ($attachid, $link_text, $user) = @_;
+  $user ||= Bugzilla->user;
 
-        # If the attachment is a patch, try to link to the diff rather
-        # than the text, by default.
-        my $patchlink = "";
-        if ($attachment->ispatch and Bugzilla->feature('patch_viewer')) {
-            $patchlink = '&amp;action=diff';
-        }
+  my $attachment = new Bugzilla::Attachment({id => $attachid, cache => 1});
 
-        # Whitespace matters here because these links are in <pre> tags.
-        return qq|<span class="$className">|
-               . qq|<a href="${linkval}${patchlink}" name="attach_${attachid}" title="$title">$link_text</a>|
-               . qq| <a href="${linkval}&amp;action=edit" title="$title">[details]</a>|
-               . qq|</span>|;
+  if ($attachment) {
+    my $title     = "";
+    my $className = "";
+    if ($user->can_see_bug($attachment->bug_id)
+      && (!$attachment->isprivate || $user->is_insider))
+    {
+      $title = $attachment->description;
     }
-    else {
-        return qq{$link_text};
+    if ($attachment->isobsolete) {
+      $className = "bz_obsolete";
+    }
+
+    # Prevent code injection in the title.
+    $title = html_quote(clean_text($title));
+
+    $link_text =~ s/ \[details\]$//;
+    my $linkval = "attachment.cgi?id=$attachid";
+
+    # If the attachment is a patch, try to link to the diff rather
+    # than the text, by default.
+    my $patchlink = "";
+    if ($attachment->ispatch and Bugzilla->feature('patch_viewer')) {
+      $patchlink = '&amp;action=diff';
     }
+
+    # Whitespace matters here because these links are in <pre> tags.
+    return
+        qq|<span class="$className">|
+      . qq|<a href="${linkval}${patchlink}" name="attach_${attachid}" title="$title">$link_text</a>|
+      . qq| <a href="${linkval}&amp;action=edit" title="$title">[details]</a>|
+      . qq|</span>|;
+  }
+  else {
+    return qq{$link_text};
+  }
 }
 
 # Creates a link to a bug, including its title.
@@ -350,54 +360,61 @@ sub get_attachment_link {
 #    comment in the bug
 
 sub get_bug_link {
-    my ($bug, $link_text, $options) = @_;
-    $options ||= {};
-    $options->{user} ||= Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
-
-    if (defined $bug && $bug ne '') {
-        if (!blessed($bug)) {
-            require Bugzilla::Bug;
-            $bug = new Bugzilla::Bug({ id => $bug, cache => 1 });
-        }
-        return $link_text if $bug->{error};
+  my ($bug, $link_text, $options) = @_;
+  $options ||= {};
+  $options->{user} ||= Bugzilla->user;
+
+  if (defined $bug && $bug ne '') {
+    if (!blessed($bug)) {
+      require Bugzilla::Bug;
+      $bug = new Bugzilla::Bug({id => $bug, cache => 1});
     }
-
-    my $template = Bugzilla->template_inner;
-    my $linkified;
-    $template->process('bug/link.html.tmpl', 
-        { bug => $bug, link_text => $link_text, %$options }, \$linkified);
-    return $linkified;
+    return $link_text if $bug->{error};
+  }
+
+  my $template = Bugzilla->template_inner;
+  my $linkified;
+  $template->process('bug/link.html.tmpl',
+    {bug => $bug, link_text => $link_text, %$options},
+    \$linkified);
+  $linkified =~ s/\n//g;          # strip newlines to prevent markdown conflicts
+  $linkified =~ s/\|/&#124;/g;    # escape '|', it confuses markdown tables
+  return $linkified;
 }
 
 # We use this instead of format because format doesn't deal well with
 # multi-byte languages.
 sub multiline_sprintf {
-    my ($format, $args, $sizes) = @_;
-    my @parts;
-    my @my_sizes = @$sizes; # Copy this so we don't modify the input array.
-    foreach my $string (@$args) {
-        my $size = shift @my_sizes;
-        my @pieces = split("\n", wrap_hard($string, $size));
-        push(@parts, \@pieces);
-    }
-
-    my $formatted;
-    while (1) {
-        # Get the first item of each part.
-        my @line = map { shift @$_ } @parts;
-        # If they're all undef, we're done.
-        last if !grep { defined $_ } @line;
-        # Make any single undef item into ''
-        @line = map { defined $_ ? $_ : '' } @line;
-        # And append a formatted line
-        $formatted .= sprintf($format, @line);
-        # Remove trailing spaces, or they become lots of =20's in
-        # quoted-printable emails.
-        $formatted =~ s/\s+$//;
-        $formatted .= "\n";
-    }
-    return $formatted;
+  my ($format, $args, $sizes) = @_;
+  my @parts;
+  my @my_sizes = @$sizes;         # Copy this so we don't modify the input array.
+  foreach my $string (@$args) {
+    my $size = shift @my_sizes;
+    my @pieces = split("\n", wrap_hard($string, $size));
+    push(@parts, \@pieces);
+  }
+
+  my $formatted;
+  while (1) {
+
+    # Get the first item of each part.
+    my @line = map { shift @$_ } @parts;
+
+    # If they're all undef, we're done.
+    last if !grep { defined $_ } @line;
+
+    # Make any single undef item into ''
+    @line = map { defined $_ ? $_ : '' } @line;
+
+    # And append a formatted line
+    $formatted .= sprintf($format, @line);
+
+    # Remove trailing spaces, or they become lots of =20's in
+    # quoted-printable emails.
+    $formatted =~ s/\s+$//;
+    $formatted .= "\n";
+  }
+  return $formatted;
 }
 
 #####################
@@ -409,17 +426,18 @@ sub multiline_sprintf {
 sub _mtime { return (stat($_[0]))[9] }
 
 sub mtime_filter {
-    my ($file_url, $mtime) = @_;
-    # This environment var is set in the .htaccess if we have mod_headers
-    # and mod_expires installed, to make sure that JS and CSS with "?"
-    # after them will still be cached by clients.
-    return $file_url if !$ENV{BZ_CACHE_CONTROL};
-    if (!$mtime) {
-        my $cgi_path = bz_locations()->{'cgi_path'};
-        my $file_path = "$cgi_path/$file_url";
-        $mtime = _mtime($file_path);
-    }
-    return "$file_url?$mtime";
+  my ($file_url, $mtime) = @_;
+
+  # This environment var is set in the .htaccess if we have mod_headers
+  # and mod_expires installed, to make sure that JS and CSS with "?"
+  # after them will still be cached by clients.
+  return $file_url if !$ENV{BZ_CACHE_CONTROL};
+  if (!$mtime) {
+    my $cgi_path  = bz_locations()->{'cgi_path'};
+    my $file_path = "$cgi_path/$file_url";
+    $mtime = _mtime($file_path);
+  }
+  return "$file_url?$mtime";
 }
 
 # Set up the skin CSS cascade:
@@ -432,181 +450,188 @@ sub mtime_filter {
 #  6. Custom Bugzilla stylesheet set
 
 sub css_files {
-    my ($style_urls, $yui, $yui_css) = @_;
+  my ($style_urls, $yui, $yui_css) = @_;
 
-    # global.css goes on every page.
-    my @requested_css = ('skins/standard/global.css', @$style_urls);
+  # global.css goes on every page.
+  my @requested_css = ('skins/standard/global.css', @$style_urls);
 
-    my @yui_required_css;
-    foreach my $yui_name (@$yui) {
-        next if !$yui_css->{$yui_name};
-        push(@yui_required_css, "js/yui/assets/skins/sam/$yui_name.css");
-    }
-    unshift(@requested_css, @yui_required_css);
-    
-    my @css_sets = map { _css_link_set($_) } @requested_css;
-    
-    my %by_type = (standard => [], skin => [], custom => []);
-    foreach my $set (@css_sets) {
-        foreach my $key (keys %$set) {
-            push(@{ $by_type{$key} }, $set->{$key});
-        }
+  my @yui_required_css;
+  foreach my $yui_name (@$yui) {
+    next if !$yui_css->{$yui_name};
+    push(@yui_required_css, "js/yui/assets/skins/sam/$yui_name.css");
+  }
+  unshift(@requested_css, @yui_required_css);
+
+  my @css_sets = map { _css_link_set($_) } @requested_css;
+
+  my %by_type = (standard => [], skin => [], custom => []);
+  foreach my $set (@css_sets) {
+    foreach my $key (keys %$set) {
+      push(@{$by_type{$key}}, $set->{$key});
     }
+  }
 
-    # build unified
-    $by_type{unified_standard_skin} = _concatenate_css($by_type{standard},
-                                                       $by_type{skin});
-    $by_type{unified_custom} = _concatenate_css($by_type{custom});
+  # build concatenated
+  if (CONCATENATE_ASSETS) {
+    $by_type{concatenated_standard_skin}
+      = _concatenate_css($by_type{standard}, $by_type{skin});
+    $by_type{concatenated_custom} = _concatenate_css($by_type{custom});
+  }
 
-    return \%by_type;
+  return \%by_type;
 }
 
 sub _css_link_set {
-    my ($file_name) = @_;
-
-    my %set = (standard => mtime_filter($file_name));
-
-    # We use (?:^|/) to allow Extensions to use the skins system if they want.
-    if ($file_name !~ m{(?:^|/)skins/standard/}) {
-        return \%set;
-    }
+  my ($file_name) = @_;
 
-    my $skin = Bugzilla->user->settings->{skin}->{value};
-    my $cgi_path = bz_locations()->{'cgi_path'};
-    my $skin_file_name = $file_name;
-    $skin_file_name =~ s{(?:^|/)skins/standard/}{skins/contrib/$skin/};
-    if (my $mtime = _mtime("$cgi_path/$skin_file_name")) {
-        $set{skin} = mtime_filter($skin_file_name, $mtime);
-    }
-
-    my $custom_file_name = $file_name;
-    $custom_file_name =~ s{(?:^|/)skins/standard/}{skins/custom/};
-    if (my $custom_mtime = _mtime("$cgi_path/$custom_file_name")) {
-        $set{custom} = mtime_filter($custom_file_name, $custom_mtime);
-    }
+  my %set = (standard => mtime_filter($file_name));
 
+  # We use (?:^|/) to allow Extensions to use the skins system if they want.
+  if ($file_name !~ m{(?:^|/)skins/standard/}) {
     return \%set;
+  }
+
+  my $skin           = Bugzilla->user->settings->{skin}->{value};
+  my $cgi_path       = bz_locations()->{'cgi_path'};
+  my $skin_file_name = $file_name;
+  $skin_file_name =~ s{(?:^|/)skins/standard/}{skins/contrib/$skin/};
+  if (my $mtime = _mtime("$cgi_path/$skin_file_name")) {
+    $set{skin} = mtime_filter($skin_file_name, $mtime);
+  }
+
+  my $custom_file_name = $file_name;
+  $custom_file_name =~ s{(?:^|/)skins/standard/}{skins/custom/};
+  if (my $custom_mtime = _mtime("$cgi_path/$custom_file_name")) {
+    $set{custom} = mtime_filter($custom_file_name, $custom_mtime);
+  }
+
+  return \%set;
 }
 
 sub _concatenate_css {
-    my @sources = map { @$_ } @_;
-    return unless @sources;
-
-    my %files =
-        map {
-            (my $file = $_) =~ s/(^[^\?]+)\?.+/$1/;
-            $_ => $file;
-        } @sources;
-
-    my $cgi_path   = bz_locations()->{cgi_path};
-    my $skins_path = bz_locations()->{assetsdir};
-
-    # build minified files
-    my @minified;
-    foreach my $source (@sources) {
-        next unless -e "$cgi_path/$files{$source}";
-        my $file = $skins_path . '/' . md5_hex($source) . '.css';
-        if (!-e $file) {
-            my $content = read_file("$cgi_path/$files{$source}");
-
-            # minify
-            $content =~ s{/\*.*?\*/}{}sg;   # comments
-            $content =~ s{(^\s+|\s+$)}{}mg; # leading/trailing whitespace
-            $content =~ s{\n}{}g;           # single line
-
-            # rewrite urls
-            $content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig;
-
-            write_file($file, "/* $files{$source} */\n" . $content . "\n");
-        }
-        push @minified, $file;
-    }
-
-    # concat files
-    my $file = $skins_path . '/' . md5_hex(join(' ', @sources)) . '.css';
+  my @sources = map {@$_} @_;
+  return unless @sources;
+
+  my %files = map {
+    (my $file = $_) =~ s/(^[^\?]+)\?.+/$1/;
+    $_ => $file;
+  } @sources;
+
+  my $cgi_path   = bz_locations()->{cgi_path};
+  my $skins_path = bz_locations()->{assetsdir};
+
+  # build minified files
+  my @minified;
+  foreach my $source (@sources) {
+    next unless -e "$cgi_path/$files{$source}";
+    my $file = $skins_path . '/' . md5_hex($source) . '.css';
     if (!-e $file) {
-        my $content = '';
-        foreach my $source (@minified) {
-            $content .= read_file($source);
-        }
-        write_file($file, $content);
+      my $content = read_text("$cgi_path/$files{$source}");
+
+      # minify
+      $content =~ s{/\*.*?\*/}{}sg;      # comments
+      $content =~ s{(^\s+|\s+$)}{}mg;    # leading/trailing whitespace
+      $content =~ s{\n}{}g;              # single line
+
+      # rewrite urls
+      $content =~ s{url\(([^\)]+)\)}{_css_url_rewrite($source, $1)}eig;
+
+      write_text($file, "/* $files{$source} */\n" . $content . "\n");
     }
+    push @minified, $file;
+  }
+
+  # concat files
+  my $file = $skins_path . '/' . md5_hex(join(' ', @sources)) . '.css';
+  if (!-e $file) {
+    my $content = '';
+    foreach my $source (@minified) {
+      $content .= read_text($source);
+    }
+    write_text($file, $content);
+  }
 
-    $file =~ s/^\Q$cgi_path\E\///o;
-    return mtime_filter($file);
+  $file =~ s/^\Q$cgi_path\E\///o;
+  return mtime_filter($file);
 }
 
 sub _css_url_rewrite {
-    my ($source, $url) = @_;
-    # rewrite relative urls as the unified stylesheet lives in a different
-    # directory from the source
-    $url =~ s/(^['"]|['"]$)//g;
-    return $url if substr($url, 0, 1) eq '/';
-    return 'url(../../' . dirname($source) . '/' . $url . ')';
+  my ($source, $url) = @_;
+
+  # rewrite relative urls as the concatenated stylesheet lives in a different
+  # directory from the source
+  $url =~ s/(^['"]|['"]$)//g;
+  if (substr($url, 0, 1) eq '/' || substr($url, 0, 5) eq 'data:') {
+    return 'url(' . $url . ')';
+  }
+  return
+      'url(../../'
+    . ($ENV{'PROJECT'} ? '../' : '')
+    . dirname($source) . '/'
+    . $url . ')';
 }
 
 sub _concatenate_js {
-    return @_ unless CONCATENATE_ASSETS;
-    my ($sources) = @_;
-    return [] unless $sources;
-    $sources = ref($sources) ? $sources : [ $sources ];
-
-    my %files =
-        map {
-            (my $file = $_) =~ s/(^[^\?]+)\?.+/$1/;
-            $_ => $file;
-        } @$sources;
-
-    my $cgi_path   = bz_locations()->{cgi_path};
-    my $skins_path = bz_locations()->{assetsdir};
-
-    # build minified files
-    my @minified;
-    foreach my $source (@$sources) {
-        next unless -e "$cgi_path/$files{$source}";
-        my $file = $skins_path . '/' . md5_hex($source) . '.js';
-        if (!-e $file) {
-            my $content = read_file("$cgi_path/$files{$source}");
-
-            # minimal minification
-            $content =~ s#/\*.*?\*/##sg;    # block comments
-            $content =~ s#(^ +| +$)##gm;    # leading/trailing spaces
-            $content =~ s#^//.+$##gm;       # single line comments
-            $content =~ s#\n{2,}#\n#g;      # blank lines
-            $content =~ s#(^\s+|\s+$)##g;   # whitespace at the start/end of file
-
-            write_file($file, "/* $files{$source} */\n" . $content . "\n");
-        }
-        push @minified, $file;
-    }
-
-    # concat files
-    my $file = $skins_path . '/' . md5_hex(join(' ', @$sources)) . '.js';
+  return @_ unless CONCATENATE_ASSETS;
+  my ($sources) = @_;
+  return [] unless $sources;
+  $sources = ref($sources) ? $sources : [$sources];
+
+  my %files = map {
+    (my $file = $_) =~ s/(^[^\?]+)\?.+/$1/;
+    $_ => $file;
+  } @$sources;
+
+  my $cgi_path   = bz_locations()->{cgi_path};
+  my $skins_path = bz_locations()->{assetsdir};
+
+  # build minified files
+  my @minified;
+  foreach my $source (@$sources) {
+    next unless -e "$cgi_path/$files{$source}";
+    my $file = $skins_path . '/' . md5_hex($source) . '.js';
     if (!-e $file) {
-        my $content = '';
-        foreach my $source (@minified) {
-            $content .= read_file($source);
-        }
-        write_file($file, $content);
+      my $content = read_text("$cgi_path/$files{$source}");
+
+      # minimal minification
+      $content =~ s#/\*.*?\*/##sg;     # block comments
+      $content =~ s#(^ +| +$)##gm;     # leading/trailing spaces
+      $content =~ s#^//.+$##gm;        # single line comments
+      $content =~ s#\n{2,}#\n#g;       # blank lines
+      $content =~ s#(^\s+|\s+$)##g;    # whitespace at the start/end of file
+
+      write_text($file, ";/* $files{$source} */\n" . $content . "\n");
+    }
+    push @minified, $file;
+  }
+
+  # concat files
+  my $file = $skins_path . '/' . md5_hex(join(' ', @$sources)) . '.js';
+  if (!-e $file) {
+    my $content = '';
+    foreach my $source (@minified) {
+      $content .= read_text($source);
     }
+    write_text($file, $content);
+  }
 
-    $file =~ s/^\Q$cgi_path\E\///o;
-    return [ $file ];
+  $file =~ s/^\Q$cgi_path\E\///o;
+  return [$file];
 }
 
 # YUI dependency resolution
 sub yui_resolve_deps {
-    my ($yui, $yui_deps) = @_;
-    
-    my @yui_resolved;
-    foreach my $yui_name (@$yui) {
-        my $deps = $yui_deps->{$yui_name} || [];
-        foreach my $dep (reverse @$deps) {
-            push(@yui_resolved, $dep) if !grep { $_ eq $dep } @yui_resolved;
-        }
-        push(@yui_resolved, $yui_name) if !grep { $_ eq $yui_name } @yui_resolved;
+  my ($yui, $yui_deps) = @_;
+
+  my @yui_resolved;
+  foreach my $yui_name (@$yui) {
+    my $deps = $yui_deps->{$yui_name} || [];
+    foreach my $dep (reverse @$deps) {
+      push(@yui_resolved, $dep) if !grep { $_ eq $dep } @yui_resolved;
     }
-    return \@yui_resolved;
+    push(@yui_resolved, $yui_name) if !grep { $_ eq $yui_name } @yui_resolved;
+  }
+  return \@yui_resolved;
 }
 
 ###############################################################################
@@ -625,88 +650,94 @@ use Template::Stash;
 # Allow keys to start with an underscore or a dot.
 $Template::Stash::PRIVATE = undef;
 
-# Add "contains***" methods to list variables that search for one or more 
-# items in a list and return boolean values representing whether or not 
+# Add "contains***" methods to list variables that search for one or more
+# items in a list and return boolean values representing whether or not
 # one/all/any item(s) were found.
-$Template::Stash::LIST_OPS->{ contains } =
-  sub {
-      my ($list, $item) = @_;
-      if (ref $item && $item->isa('Bugzilla::Object')) {
-          return grep($_->id == $item->id, @$list);
-      } else {
-          return grep($_ eq $item, @$list);
-      }
-  };
-
-$Template::Stash::LIST_OPS->{ containsany } =
-  sub {
-      my ($list, $items) = @_;
-      foreach my $item (@$items) { 
-          if (ref $item && $item->isa('Bugzilla::Object')) {
-              return 1 if grep($_->id == $item->id, @$list);
-          } else {
-              return 1 if grep($_ eq $item, @$list);
-          }
-      }
-      return 0;
-  };
+$Template::Stash::LIST_OPS->{contains} = sub {
+  my ($list, $item) = @_;
+  if (ref $item && $item->isa('Bugzilla::Object')) {
+    return grep($_->id == $item->id, @$list);
+  }
+  else {
+    return grep($_ eq $item, @$list);
+  }
+};
+
+$Template::Stash::LIST_OPS->{containsany} = sub {
+  my ($list, $items) = @_;
+  foreach my $item (@$items) {
+    if (ref $item && $item->isa('Bugzilla::Object')) {
+      return 1 if grep($_->id == $item->id, @$list);
+    }
+    else {
+      return 1 if grep($_ eq $item, @$list);
+    }
+  }
+  return 0;
+};
 
 # Clone the array reference to leave the original one unaltered.
-$Template::Stash::LIST_OPS->{ clone } =
-  sub {
-      my $list = shift;
-      return [@$list];
-  };
+$Template::Stash::LIST_OPS->{clone} = sub {
+  my $list = shift;
+  return [@$list];
+};
 
 # Allow us to sort the list of fields correctly
-$Template::Stash::LIST_OPS->{ sort_by_field_name } =
-    sub {
-        sub field_name {
-            if ($_[0] eq 'noop') {
-                # Sort --- first
-                return '';
-            }
-            # Otherwise sort by field_desc or description
-            return $_[1]{$_[0]} || $_[0];
-        }
-        my ($list, $field_desc) = @_;
-        return [ sort { lc field_name($a, $field_desc) cmp lc field_name($b, $field_desc) } @$list ];
-    };
+$Template::Stash::LIST_OPS->{sort_by_field_name} = sub {
+
+  sub field_name {
+    if ($_[0] eq 'noop') {
+
+      # Sort --- first
+      return '';
+    }
+
+    # Otherwise sort by field_desc or description
+    return $_[1]{$_[0]} || $_[0];
+  }
+  my ($list, $field_desc) = @_;
+  return [
+    sort { lc field_name($a, $field_desc) cmp lc field_name($b, $field_desc) }
+      @$list
+  ];
+};
 
 # Allow us to still get the scalar if we use the list operation ".0" on it,
 # as we often do for defaults in query.cgi and other places.
-$Template::Stash::SCALAR_OPS->{ 0 } = 
-  sub {
-      return $_[0];
-  };
+$Template::Stash::SCALAR_OPS->{0} = sub {
+  return $_[0];
+};
 
 # Add a "truncate" method to the Template Toolkit's "scalar" object
 # that truncates a string to a certain length.
-$Template::Stash::SCALAR_OPS->{ truncate } = 
-  sub {
-      my ($string, $length, $ellipsis) = @_;
-      return $string if !$length || length($string) <= $length;
-
-      $ellipsis ||= '';
-      my $strlen = $length - length($ellipsis);
-      my $newstr = substr($string, 0, $strlen) . $ellipsis;
-      return $newstr;
-  };
+$Template::Stash::SCALAR_OPS->{truncate} = sub {
+  my ($string, $length, $ellipsis) = @_;
+  return $string if !$length || length($string) <= $length;
+
+  $ellipsis ||= '';
+  my $strlen = $length - length($ellipsis);
+  my $newstr = substr($string, 0, $strlen) . $ellipsis;
+  return $newstr;
+};
 
 # Create the template object that processes templates and specify
 # configuration parameters that apply to all templates.
 
 ###############################################################################
 
+our $is_processing = 0;
+
 sub process {
-    my $self = shift;
-    # All of this current_langs stuff allows template_inner to correctly
-    # determine what-language Template object it should instantiate.
-    my $current_langs = Bugzilla->request_cache->{template_current_lang} ||= [];
-    unshift(@$current_langs, $self->context->{bz_language});
-    my $retval = $self->SUPER::process(@_);
-    shift @$current_langs;
-    return $retval;
+  my $self = shift;
+
+  # All of this current_langs stuff allows template_inner to correctly
+  # determine what-language Template object it should instantiate.
+  my $current_langs = Bugzilla->request_cache->{template_current_lang} ||= [];
+  unshift(@$current_langs, $self->context->{bz_language});
+  local $is_processing = 1;
+  my $retval = $self->SUPER::process(@_);
+  shift @$current_langs;
+  return $retval;
 }
 
 # Construct the Template object
@@ -715,581 +746,645 @@ sub process {
 # since we won't have a template to use...
 
 sub create {
-    my $class = shift;
-    my %opts = @_;
-
-    # IMPORTANT - If you make any FILTER changes here, make sure to
-    # make them in t/004.template.t also, if required.
-
-    my $config = {
-        # Colon-separated list of directories containing templates.
-        INCLUDE_PATH => $opts{'include_path'} 
-                        || _include_path($opts{'language'}),
-
-        # Remove white-space before template directives (PRE_CHOMP) and at the
-        # beginning and end of templates and template blocks (TRIM) for better
-        # looking, more compact content.  Use the plus sign at the beginning
-        # of directives to maintain white space (i.e. [%+ DIRECTIVE %]).
-        PRE_CHOMP => 1,
-        TRIM => 1,
-
-        # Bugzilla::Template::Plugin::Hook uses the absolute (in mod_perl)
-        # or relative (in mod_cgi) paths of hook files to explicitly compile
-        # a specific file. Also, these paths may be absolute at any time
-        # if a packager has modified bz_locations() to contain absolute
-        # paths.
-        ABSOLUTE => 1,
-        RELATIVE => $ENV{MOD_PERL} ? 0 : 1,
-
-        COMPILE_DIR => bz_locations()->{'template_cache'},
-
-        # Don't check for a template update until 1 hour has passed since the
-        # last check.
-        STAT_TTL    => 60 * 60,
-
-        # Initialize templates (f.e. by loading plugins like Hook).
-        PRE_PROCESS => ["global/variables.none.tmpl"],
-
-        ENCODING => Bugzilla->params->{'utf8'} ? 'UTF-8' : undef,
-
-        # Functions for processing text within templates in various ways.
-        # IMPORTANT!  When adding a filter here that does not override a
-        # built-in filter, please also add a stub filter to t/004template.t.
-        FILTERS => {
-
-            # Render text in required style.
-
-            inactive => [
-                sub {
-                    my($context, $isinactive) = @_;
-                    return sub {
-                        return $isinactive ? '<span class="bz_inactive">'.$_[0].'</span>' : $_[0];
-                    }
-                }, 1
-            ],
-
-            closed => [
-                sub {
-                    my($context, $isclosed) = @_;
-                    return sub {
-                        return $isclosed ? '<span class="bz_closed">'.$_[0].'</span>' : $_[0];
-                    }
-                }, 1
-            ],
-
-            obsolete => [
-                sub {
-                    my($context, $isobsolete) = @_;
-                    return sub {
-                        return $isobsolete ? '<span class="bz_obsolete">'.$_[0].'</span>' : $_[0];
-                    }
-                }, 1
-            ],
-
-            # Returns the text with backslashes, single/double quotes,
-            # and newlines/carriage returns escaped for use in JS strings.
-            js => sub {
-                my ($var) = @_;
-                $var =~ s/([\\\'\"\/])/\\$1/g;
-                $var =~ s/\n/\\n/g;
-                $var =~ s/\r/\\r/g;
-                $var =~ s/\@/\\x40/g; # anti-spam for email addresses
-                $var =~ s/</\\x3c/g;
-                $var =~ s/>/\\x3e/g;
-                return $var;
-            },
-            
-            # Converts data to base64
-            base64 => sub {
-                my ($data) = @_;
-                return encode_base64($data);
-            },
-
-            # Strips out control characters excepting whitespace
-            strip_control_chars => sub {
-                my ($data) = @_;
-                state $use_utf8 = Bugzilla->params->{'utf8'};
-                # Only run for utf8 to avoid issues with other multibyte encodings 
-                # that may be reassigning meaning to ascii characters.
-                if ($use_utf8) {
-                    $data =~ s/(?![\t\r\n])[[:cntrl:]]//g;
-                }
-                return $data;
-            },
-            
-            # HTML collapses newlines in element attributes to a single space,
-            # so form elements which may have whitespace (ie comments) need
-            # to be encoded using &#013;
-            # See bugs 4928, 22983 and 32000 for more details
-            html_linebreak => sub {
-                my ($var) = @_;
-                $var = html_quote($var);
-                $var =~ s/\r\n/\&#013;/g;
-                $var =~ s/\n\r/\&#013;/g;
-                $var =~ s/\r/\&#013;/g;
-                $var =~ s/\n/\&#013;/g;
-                return $var;
-            },
-
-            # Prevents line break on hyphens and whitespaces.
-            no_break => sub {
-                my ($var) = @_;
-                $var =~ s/ /\&nbsp;/g;
-                $var =~ s/-/\&#8209;/g;
-                return $var;
-            },
-
-            xml => \&Bugzilla::Util::xml_quote ,
-
-            # This filter is similar to url_quote but used a \ instead of a %
-            # as prefix. In addition it replaces a ' ' by a '_'.
-            css_class_quote => \&Bugzilla::Util::css_class_quote ,
-
-            # Removes control characters and trims extra whitespace.
-            clean_text => \&Bugzilla::Util::clean_text ,
-
-            quoteUrls => [ sub {
-                               my ($context, $bug, $comment, $user) = @_;
-                               return sub {
-                                   my $text = shift;
-                                   return quoteUrls($text, $bug, $comment, $user);
-                               };
-                           },
-                           1
-                         ],
-
-            markdown => [ sub {
-                              my ($context, $bug, $comment, $user) = @_;
-                              return sub {
-                                  my $text = shift;
-                                  return unless $text;
-
-                                  if (Bugzilla->feature('markdown')
-                                      && ((ref($comment) eq 'HASH' && $comment->{is_markdown})
-                                         || (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown)))
-                                  {
-                                      return Bugzilla->markdown->markdown($text);
-                                  }
-                                  return quoteUrls($text, $bug, $comment, $user);
-                              };
-                          },
-                          1
-                        ],
-
-            bug_link => [ sub {
-                              my ($context, $bug, $options) = @_;
-                              return sub {
-                                  my $text = shift;
-                                  return get_bug_link($bug, $text, $options);
-                              };
-                          },
-                          1
-                        ],
-
-            bug_list_link => sub {
-                my ($buglist, $options) = @_;
-                return join(", ", map(get_bug_link($_, $_, $options), split(/ *, */, $buglist)));
-            },
-
-            # In CSV, quotes are doubled, and any value containing a quote or a
-            # comma is enclosed in quotes. If a field starts with an equals
-            # sign, it is proceed by a space.
-            csv => sub
-            {
-                my ($var) = @_;
-                $var = ' ' . $var if substr($var, 0, 1) eq '=';
-                $var =~ s/\"/\"\"/g;
-                if ($var !~ /^-?(\d+\.)?\d*$/) {
-                    $var = "\"$var\"";
-                }
-                return $var;
-            } ,
-
-            # Format a filesize in bytes to a human readable value
-            unitconvert => sub
+  my $class = shift;
+  my %opts  = @_;
+
+  # IMPORTANT - If you make any FILTER changes here, make sure to
+  # make them in t/004.template.t also, if required.
+
+  my $config = {
+
+    # Colon-separated list of directories containing templates.
+    INCLUDE_PATH => $opts{'include_path'} || _include_path($opts{'language'}),
+
+    # Remove white-space before template directives (PRE_CHOMP) and at the
+    # beginning and end of templates and template blocks (TRIM) for better
+    # looking, more compact content.  Use the plus sign at the beginning
+    # of directives to maintain white space (i.e. [%+ DIRECTIVE %]).
+    PRE_CHOMP => 1,
+    TRIM      => 1,
+
+    # Bugzilla::Template::Plugin::Hook uses the absolute (in mod_perl)
+    # or relative (in mod_cgi) paths of hook files to explicitly compile
+    # a specific file. Also, these paths may be absolute at any time
+    # if a packager has modified bz_locations() to contain absolute
+    # paths.
+    ABSOLUTE => 1,
+    RELATIVE => i_am_persistent() ? 0 : 1,
+
+    COMPILE_DIR => bz_locations()->{'template_cache'},
+
+    # Don't check for a template update until 1 hour has passed since the
+    # last check.
+    STAT_TTL => 60 * 60,
+
+    # Initialize templates (f.e. by loading plugins like Hook).
+    PRE_PROCESS => ["global/variables.none.tmpl"],
+
+    ENCODING => 'UTF-8',
+
+    # Functions for processing text within templates in various ways.
+    # IMPORTANT!  When adding a filter here that does not override a
+    # built-in filter, please also add a stub filter to t/004template.t.
+    FILTERS => {
+
+      # Returns the text with backslashes, single/double quotes,
+      # and newlines/carriage returns escaped for use in JS strings.
+      js => sub {
+        my ($var) = @_;
+        $var =~ s/([\\\'\"\/])/\\$1/g;
+        $var =~ s/\n/\\n/g;
+        $var =~ s/\r/\\r/g;
+        $var =~ s/\x{2028}/\\u2028/g;    # unicode line separator
+        $var =~ s/\x{2029}/\\u2029/g;    # unicode paragraph separator
+        $var =~ s/\@/\\x40/g;            # anti-spam for email addresses
+        $var =~ s/</\\x3c/g;
+        $var =~ s/>/\\x3e/g;
+        return $var;
+      },
+
+      # Converts data to base64
+      base64 => sub {
+        my ($data) = @_;
+        return encode_base64($data);
+      },
+
+      # Strips out control characters excepting whitespace
+      strip_control_chars => sub {
+        my ($data) = @_;
+        $data =~ s/(?![\t\r\n])[[:cntrl:]]//g;
+        return $data;
+      },
+
+      # HTML collapses newlines in element attributes to a single space,
+      # so form elements which may have whitespace (ie comments) need
+      # to be encoded using &#013;
+      # See bugs 4928, 22983 and 32000 for more details
+      html_linebreak => sub {
+        my ($var) = @_;
+        $var = html_quote($var);
+        $var =~ s/\r\n/\&#013;/g;
+        $var =~ s/\n\r/\&#013;/g;
+        $var =~ s/\r/\&#013;/g;
+        $var =~ s/\n/\&#013;/g;
+        return $var;
+      },
+
+      xml => \&Bugzilla::Util::xml_quote,
+
+      # This filter is similar to url_quote but used a \ instead of a %
+      # as prefix. In addition it replaces a ' ' by a '_'.
+      css_class_quote => \&Bugzilla::Util::css_class_quote,
+
+      # Removes control characters and trims extra whitespace.
+      clean_text => \&Bugzilla::Util::clean_text,
+
+      quoteUrls => [
+        sub {
+          my ($context, $bug, $comment, $user) = @_;
+          return sub {
+            my $text = shift;
+            return quoteUrls($text, $bug, $comment, $user);
+          };
+        },
+        1
+      ],
+
+      markdown => [
+        sub {
+          my ($context, $bug, $comment, $user) = @_;
+          return sub {
+            my $text = shift;
+            return unless $text;
+
+            if (
+              Bugzilla->feature('markdown')
+              && ( (ref($comment) eq 'HASH' && $comment->{is_markdown})
+                || (ref($comment) eq 'Bugzilla::Comment' && $comment->is_markdown))
+              )
             {
-                my ($data) = @_;
-                my $retval = "";
-                my %units = (
-                    'KB' => 1024,
-                    'MB' => 1024 * 1024,
-                    'GB' => 1024 * 1024 * 1024,
-                );
-
-                if ($data < 1024) {
-                    return "$data bytes";
-                } 
-                else {
-                    my $u;
-                    foreach $u ('GB', 'MB', 'KB') {
-                        if ($data >= $units{$u}) {
-                            return sprintf("%.2f %s", $data/$units{$u}, $u);
-                        }
-                    }
-                }
-            },
-
-            # Format a time for display (more info in Bugzilla::Util)
-            time => [ sub {
-                          my ($context, $format, $timezone) = @_;
-                          return sub {
-                              my $time = shift;
-                              return format_time($time, $format, $timezone);
-                          };
-                      },
-                      1
-                    ],
-
-            html => \&Bugzilla::Util::html_quote,
-
-            html_light => \&Bugzilla::Util::html_light_quote,
-
-            email => \&Bugzilla::Util::email_filter,
-            
-            mtime => \&mtime_filter,
-
-            # iCalendar contentline filter
-            ics => [ sub {
-                         my ($context, @args) = @_;
-                         return sub {
-                             my ($var) = shift;
-                             my ($par) = shift @args;
-                             my ($output) = "";
-
-                             $var =~ s/[\r\n]/ /g;
-                             $var =~ s/([;\\\",])/\\$1/g;
-
-                             if ($par) {
-                                 $output = sprintf("%s:%s", $par, $var);
-                             } else {
-                                 $output = $var;
-                             }
-                             
-                             $output =~ s/(.{75,75})/$1\n /g;
-
-                             return $output;
-                         };
-                     },
-                     1
-                     ],
-
-            # Note that using this filter is even more dangerous than
-            # using "none," and you should only use it when you're SURE
-            # the output won't be displayed directly to a web browser.
-            txt => sub {
-                my ($var) = @_;
-                # Trivial HTML tag remover
-                $var =~ s/<[^>]*>//g;
-                # And this basically reverses the html filter.
-                $var =~ s/\&#64;/@/g;
-                $var =~ s/\&lt;/</g;
-                $var =~ s/\&gt;/>/g;
-                $var =~ s/\&quot;/\"/g;
-                $var =~ s/\&amp;/\&/g;
-                # Now remove extra whitespace...
-                my $collapse_filter = $Template::Filters::FILTERS->{collapse};
-                $var = $collapse_filter->($var);
-                # And if we're not in the WebService, wrap the message.
-                # (Wrapping the message in the WebService is unnecessary
-                # and causes awkward things like \n's appearing in error
-                # messages in JSON-RPC.)
-                unless (i_am_webservice()) {
-                    $var = wrap_comment($var, 72);
-                }
-                $var =~ s/\&nbsp;/ /g;
-
-                return $var;
-            },
-
-            # Wrap a displayed comment to the appropriate length
-            wrap_comment => [
-                sub {
-                    my ($context, $cols) = @_;
-                    return sub { wrap_comment($_[0], $cols) }
-                }, 1],
-
-            # We force filtering of every variable in key security-critical
-            # places; we have a none filter for people to use when they 
-            # really, really don't want a variable to be changed.
-            none => sub { return $_[0]; } ,
+              return Bugzilla->markdown->markdown($text, $bug, $comment);
+            }
+            return quoteUrls($text, $bug, $comment, $user);
+          };
+        },
+        1
+      ],
+
+      bug_link => [
+        sub {
+          my ($context, $bug, $options) = @_;
+          return sub {
+            my $text = shift;
+            return get_bug_link($bug, $text, $options);
+          };
+        },
+        1
+      ],
+
+      bug_list_link => sub {
+        my ($buglist, $options) = @_;
+        return
+          join(", ", map(get_bug_link($_, $_, $options), split(/ *, */, $buglist)));
+      },
+
+      # In CSV, quotes are doubled, and any value containing a quote or a
+      # comma is enclosed in quotes.
+      # If a field starts with either "=", "+", "-" or "@", it is preceded
+      # by a space to prevent stupid formula execution from Excel & co.
+      csv => sub {
+        my ($var) = @_;
+        $var = ' ' . $var if $var =~ /^[+=@-]/;
+
+       # backslash is not special to CSV, but it can be used to confuse some browsers...
+       # so we do not allow it to happen. We only do this for logged-in users.
+        $var =~ s/\\/\x{FF3C}/g if Bugzilla->user->id;
+        $var =~ s/\"/\"\"/g;
+        if ($var !~ /^-?(\d+\.)?\d*$/) {
+          $var = "\"$var\"";
+        }
+        return $var;
+      },
+
+      # Format a filesize in bytes to a human readable value
+      unitconvert => sub {
+        my ($data) = @_;
+        my $retval = "";
+        my %units = ('KB' => 1024, 'MB' => 1024 * 1024, 'GB' => 1024 * 1024 * 1024,);
+
+        if ($data < 1024) {
+          return "$data bytes";
+        }
+        else {
+          my $u;
+          foreach $u ('GB', 'MB', 'KB') {
+            if ($data >= $units{$u}) {
+              return sprintf("%.2f %s", $data / $units{$u}, $u);
+            }
+          }
+        }
+      },
+
+      # Format a time for display (more info in Bugzilla::Util)
+      time => [
+        sub {
+          my ($context, $format, $timezone) = @_;
+          return sub {
+            my $time = shift;
+            return format_time($time, $format, $timezone);
+          };
         },
+        1
+      ],
+
+      html => \&Bugzilla::Util::html_quote,
+
+      html_light => \&Bugzilla::Util::html_light_quote,
+
+      email => \&Bugzilla::Util::email_filter,
+
+      mtime => \&mtime_filter,
+
+      # iCalendar contentline filter
+      ics => [
+        sub {
+          my ($context, @args) = @_;
+          return sub {
+            my ($var)    = shift;
+            my ($par)    = shift @args;
+            my ($output) = "";
+
+            $var =~ s/[\r\n]/ /g;
+            $var =~ s/([;\\\",])/\\$1/g;
 
-        PLUGIN_BASE => 'Bugzilla::Template::Plugin',
-
-        CONSTANTS => _load_constants(),
-
-        # Default variables for all templates
-        VARIABLES => {
-            # Function for retrieving global parameters.
-            'Param' => sub { return Bugzilla->params->{$_[0]}; },
-
-            # Function to create date strings
-            'time2str' => \&Date::Format::time2str,
-
-            # Fixed size column formatting for bugmail.
-            'format_columns' => sub {
-                my $cols = shift;
-                my $format = ($cols == 3) ? FORMAT_TRIPLE : FORMAT_DOUBLE;
-                my $col_size = ($cols == 3) ? FORMAT_3_SIZE : FORMAT_2_SIZE;
-                return multiline_sprintf($format, \@_, $col_size);
-            },
-
-            # Generic linear search function
-            'lsearch' => sub {
-                my ($array, $item) = @_;
-                return firstidx { $_ eq $item } @$array;
-            },
-
-            # Currently logged in user, if any
-            # If an sudo session is in progress, this is the user we're faking
-            'user' => sub { return Bugzilla->user; },
-
-            # Currenly active language
-            'current_language' => sub { return Bugzilla->current_language; },
-
-            # If an sudo session is in progress, this is the user who
-            # started the session.
-            'sudoer' => sub { return Bugzilla->sudoer; },
-
-            # Allow templates to access the "correct" URLBase value
-            'urlbase' => sub { return Bugzilla::Util::correct_urlbase(); },
-
-            # Allow templates to access docs url with users' preferred language
-            'docs_urlbase' => sub { 
-                my $language = Bugzilla->current_language;
-                my $docs_urlbase = Bugzilla->params->{'docs_urlbase'};
-                $docs_urlbase =~ s/\%lang\%/$language/;
-                return $docs_urlbase;
-            },
-
-            # Check whether the URL is safe.
-            'is_safe_url' => sub {
-                my $url = shift;
-                return 0 unless $url;
-
-                my $safe_url_regexp = SAFE_URL_REGEXP();
-                return 1 if $url =~ /^$safe_url_regexp$/;
-                # Pointing to a local file with no colon in its name is fine.
-                return 1 if $url =~ /^[^\s<>\":]+[\w\/]$/i;
-                # If we come here, then we cannot guarantee it's safe.
-                return 0;
-            },
-
-            # Allow templates to generate a token themselves.
-            'issue_hash_token' => \&Bugzilla::Token::issue_hash_token,
-
-            'get_login_request_token' => sub {
-                my $cookie = Bugzilla->cgi->cookie('Bugzilla_login_request_cookie');
-                return $cookie ? issue_hash_token(['login_request', $cookie]) : '';
-            },
-
-            'get_api_token' => sub {
-                return '' unless Bugzilla->user->id;
-                my $cache = Bugzilla->request_cache;
-                return $cache->{api_token} //= issue_api_token();
-            },
-
-            # A way for all templates to get at Field data, cached.
-            'bug_fields' => sub {
-                my $cache = Bugzilla->request_cache;
-                $cache->{template_bug_fields} ||=
-                    Bugzilla->fields({ by_name => 1 });
-                return $cache->{template_bug_fields};
-            },
-
-            # A general purpose cache to store rendered templates for reuse.
-            # Make sure to not mix language-specific data.
-            'template_cache' => sub {
-                my $cache = Bugzilla->request_cache->{template_cache} ||= {};
-                $cache->{users} ||= {};
-                return $cache;
-            },
-
-            'css_files' => \&css_files,
-            yui_resolve_deps => \&yui_resolve_deps,
-            concatenate_js => \&_concatenate_js,
-
-            # All classifications (sorted by sortkey, name)
-            'all_classifications' => sub {
-                return [map { $_->name } Bugzilla::Classification->get_all()];
-            },
-
-            # Whether or not keywords are enabled, in this Bugzilla.
-            'use_keywords' => sub { return Bugzilla::Keyword->any_exist; },
-
-            # All the keywords.
-            'all_keywords' => sub {
-                return [map { $_->name } Bugzilla::Keyword->get_all()];
-            },
-
-            'feature_enabled' => sub { return Bugzilla->feature(@_); },
-
-            # field_descs can be somewhat slow to generate, so we generate
-            # it only once per-language no matter how many times
-            # $template->process() is called.
-            'field_descs' => sub { return template_var('field_descs') },
-
-            # Calling bug/field-help.none.tmpl once per label is very
-            # expensive, so we generate it once per-language.
-            'help_html' => sub { return template_var('help_html') },
-
-            # This way we don't have to load field-descs.none.tmpl in
-            # many templates.
-            'display_value' => \&Bugzilla::Util::display_value,
-
-            'install_string' => \&Bugzilla::Install::Util::install_string,
-
-            'report_columns' => \&Bugzilla::Search::REPORT_COLUMNS,
-
-            # These don't work as normal constants.
-            DB_MODULE        => \&Bugzilla::Constants::DB_MODULE,
-            REQUIRED_MODULES => 
-                \&Bugzilla::Install::Requirements::REQUIRED_MODULES,
-            OPTIONAL_MODULES => sub {
-                my @optional = @{OPTIONAL_MODULES()};
-                foreach my $item (@optional) {
-                    my @features;
-                    foreach my $feat_id (@{ $item->{feature} }) {
-                        push(@features, install_string("feature_$feat_id"));
-                    }
-                    $item->{feature} = \@features;
-                }
-                return \@optional;
-            },
-            'default_authorizer' => sub { return Bugzilla::Auth->new() },
+            if ($par) {
+              $output = sprintf("%s:%s", $par, $var);
+            }
+            else {
+              $output = $var;
+            }
+
+            $output =~ s/(.{75,75})/$1\n /g;
+
+            return $output;
+          };
+        },
+        1
+      ],
+
+      # Note that using this filter is even more dangerous than
+      # using "none," and you should only use it when you're SURE
+      # the output won't be displayed directly to a web browser.
+      txt => sub {
+        my ($var) = @_;
+
+        # Trivial HTML tag remover
+        $var =~ s/<[^>]*>//g;
+
+        # And this basically reverses the html filter.
+        $var =~ s/\&#64;/@/g;
+        $var =~ s/\&lt;/</g;
+        $var =~ s/\&gt;/>/g;
+        $var =~ s/\&quot;/\"/g;
+        $var =~ s/\&amp;/\&/g;
+
+        # Now remove extra whitespace...
+        my $collapse_filter = $Template::Filters::FILTERS->{collapse};
+        $var = $collapse_filter->($var);
+
+        # And if we're not in the WebService, wrap the message.
+        # (Wrapping the message in the WebService is unnecessary
+        # and causes awkward things like \n's appearing in error
+        # messages in JSON-RPC.)
+        unless (i_am_webservice()) {
+          $var = wrap_comment($var, 72);
+        }
+        $var =~ s/\&nbsp;/ /g;
+
+        return $var;
+      },
+
+      # Wrap a displayed comment to the appropriate length
+      wrap_comment => [
+        sub {
+          my ($context, $cols) = @_;
+          return sub { wrap_comment($_[0], $cols) }
         },
-    };
-    # Use a per-process provider to cache compiled templates in memory across
-    # requests.
-    my $provider_key = join(':', @{ $config->{INCLUDE_PATH} });
-    my $shared_providers = Bugzilla->process_cache->{shared_providers} ||= {};
-    $shared_providers->{$provider_key} ||= Template::Provider->new($config);
-    $config->{LOAD_TEMPLATES} = [ $shared_providers->{$provider_key} ];
+        1
+      ],
+
+      # Wrap cited text
+      wrap_cite => [
+        sub {
+          my ($context, $cols) = @_;
+          return sub { wrap_cite($_[0], $cols) }
+        },
+        1
+      ],
+
+      # We force filtering of every variable in key security-critical
+      # places; we have a none filter for people to use when they
+      # really, really don't want a variable to be changed.
+      none => sub { return $_[0]; },
+    },
 
-    local $Template::Config::CONTEXT = 'Bugzilla::Template::Context';
+    PLUGIN_BASE => 'Bugzilla::Template::Plugin',
 
-    Bugzilla::Hook::process('template_before_create', { config => $config });
-    my $template = $class->new($config) 
-        || die("Template creation failed: " . $class->error());
+    CONSTANTS => _load_constants(),
 
-    # Pass on our current language to any template hooks or inner templates
-    # called by this Template object.
-    $template->context->{bz_language} = $opts{language} || '';
+    # Default variables for all templates
+    VARIABLES => {
 
-    return $template;
+      # Function for retrieving global parameters.
+      'Param' => sub { return Bugzilla->params->{$_[0]}; },
+
+      # Function to create date strings
+      'time2str' => \&Date::Format::time2str,
+
+      # Fixed size column formatting for bugmail.
+      'format_columns' => sub {
+        my $cols     = shift;
+        my $format   = ($cols == 3) ? FORMAT_TRIPLE : FORMAT_DOUBLE;
+        my $col_size = ($cols == 3) ? FORMAT_3_SIZE : FORMAT_2_SIZE;
+        return multiline_sprintf($format, \@_, $col_size);
+      },
+
+      # Generic linear search function
+      'lsearch' => sub {
+        my ($array, $item) = @_;
+        return firstidx { $_ eq $item } @$array;
+      },
+
+      # Currently logged in user, if any
+      # If an sudo session is in progress, this is the user we're faking
+      'user' => sub { return Bugzilla->user; },
+
+      # TT directives are evaluated in list context, conflicting
+      # with CGI checks about using $cgi->param() in list context.
+      'cgi_param' => sub { return scalar Bugzilla->cgi->param($_[0]) },
+
+      # Currenly active language
+      'current_language' => sub { return Bugzilla->current_language; },
+
+      # If an sudo session is in progress, this is the user who
+      # started the session.
+      'sudoer' => sub { return Bugzilla->sudoer; },
+
+      # Allow templates to access the "correct" URLBase value
+      'urlbase' => sub { return Bugzilla::Util::correct_urlbase(); },
+
+      # Allow templates to access docs url with users' preferred language
+      # We fall back to English if documentation in the preferred
+      # language is not available
+      'docs_urlbase' => sub {
+        my $docs_urlbase;
+        my $lang = Bugzilla->current_language;
+
+        # Translations currently available on readthedocs.org
+        my @rtd_translations = ('en', 'fr');
+
+        if ($lang ne 'en' && -f "docs/$lang/html/index.html") {
+          $docs_urlbase = "docs/$lang/html/";
+        }
+        elsif (-f "docs/en/html/index.html") {
+          $docs_urlbase = "docs/en/html/";
+        }
+        else {
+          if (!grep { $_ eq $lang } @rtd_translations) {
+            $lang = "en";
+          }
+
+          my $version = BUGZILLA_VERSION;
+          $version =~ /^(\d+)\.(\d+)/;
+          if ($2 % 2 == 1) {
+
+            # second number is odd; development version
+            $version = 'latest';
+          }
+          else {
+            $version = "$1.$2";
+          }
+
+          $docs_urlbase = "https://bugzilla.readthedocs.org/$lang/$version/";
+        }
+
+        return $docs_urlbase;
+      },
+
+      # Check whether the URL is safe.
+      'is_safe_url' => sub {
+        my $url = shift;
+        return 0 unless $url;
+
+        my $safe_url_regexp = SAFE_URL_REGEXP();
+        return 1 if $url =~ /^$safe_url_regexp$/;
+
+        # Pointing to a local file with no colon in its name is fine.
+        return 1 if $url =~ /^[^\s<>\":]+[\w\/]$/i;
+
+        # If we come here, then we cannot guarantee it's safe.
+        return 0;
+      },
+
+      # Allow templates to generate a token themselves.
+      'issue_hash_token' => \&Bugzilla::Token::issue_hash_token,
+
+      'get_login_request_token' => sub {
+        my $cookie = Bugzilla->cgi->cookie('Bugzilla_login_request_cookie');
+        return $cookie ? issue_hash_token(['login_request', $cookie]) : '';
+      },
+
+      'get_api_token' => sub {
+        return '' unless Bugzilla->user->id;
+        my $cache = Bugzilla->request_cache;
+        return $cache->{api_token} //= issue_api_token();
+      },
+
+      # A way for all templates to get at Field data, cached.
+      'bug_fields' => sub {
+        my $cache = Bugzilla->request_cache;
+        $cache->{template_bug_fields} ||= Bugzilla->fields({by_name => 1});
+        return $cache->{template_bug_fields};
+      },
+
+      # A general purpose cache to store rendered templates for reuse.
+      # Make sure to not mix language-specific data.
+      'template_cache' => sub {
+        my $cache = Bugzilla->request_cache->{template_cache} ||= {};
+        $cache->{users} ||= {};
+        return $cache;
+      },
+
+      'css_files'      => \&css_files,
+      yui_resolve_deps => \&yui_resolve_deps,
+      concatenate_js   => \&_concatenate_js,
+
+      # All classifications (sorted by sortkey, name)
+      'all_classifications' => sub {
+        return [map { $_->name } Bugzilla::Classification->get_all()];
+      },
+
+      # Whether or not keywords are enabled, in this Bugzilla.
+      'use_keywords' => sub { return Bugzilla::Keyword->any_exist; },
+
+      # All the keywords
+      'all_keywords' => sub {
+        return [map { $_->name } Bugzilla::Keyword->get_all()];
+      },
+
+      # All the active keywords
+      'active_keywords' => sub {
+        return [map { $_->name } grep { $_->is_active } Bugzilla::Keyword->get_all()];
+      },
+
+      'feature_enabled' => sub { return Bugzilla->feature(@_); },
+
+      # field_descs can be somewhat slow to generate, so we generate
+      # it only once per-language no matter how many times
+      # $template->process() is called.
+      'field_descs' => sub { return template_var('field_descs') },
+
+      # Calling bug/field-help.none.tmpl once per label is very
+      # expensive, so we generate it once per-language.
+      'help_html' => sub { return template_var('help_html') },
+
+      # This way we don't have to load field-descs.none.tmpl in
+      # many templates.
+      'display_value' => \&Bugzilla::Util::display_value,
+
+      'install_string' => \&Bugzilla::Install::Util::install_string,
+
+      'feature_description' => \&Bugzilla::Install::Util::feature_description,
+
+      'report_columns' => \&Bugzilla::Search::REPORT_COLUMNS,
+
+      # These don't work as normal constants.
+      DB_MODULE        => \&Bugzilla::Constants::DB_MODULE,
+      REQUIRED_MODULES => sub {
+        my %required_modules;
+        my $cache = Bugzilla->request_cache;
+        my $meta  = $cache->{cpan_meta}
+          ||= Bugzilla::Install::Requirements::load_cpan_meta();
+        my $reqs
+          = $meta->effective_prereqs->merged_requirements(['configure', 'runtime'],
+          ['requires']);
+        foreach my $module (sort $reqs->required_modules) {
+          next if $module eq 'perl';
+          $required_modules{$module}
+            = {version => $reqs->requirements_for_module($module)};
+        }
+        return \%required_modules;
+      },
+      OPTIONAL_MODULES => sub {
+        my %optional_modules;
+        my $cache = Bugzilla->request_cache;
+        my $meta  = $cache->{cpan_meta}
+          ||= Bugzilla::Install::Requirements::load_cpan_meta();
+        foreach my $feature ($meta->features) {
+          my $reqs = $feature->prereqs->merged_requirements(['configure', 'runtime'],
+            ['requires']);
+          foreach my $module ($reqs->required_modules) {
+            my $version = $reqs->requirements_for_module($module);
+            $optional_modules{$module} ||= {};
+            $optional_modules{$module}{version} = $version;
+            $optional_modules{$module}{features} ||= [];
+            push(@{$optional_modules{$module}{features}}, $feature->description);
+          }
+        }
+        return \%optional_modules;
+      },
+      'default_authorizer' => sub { return Bugzilla::Auth->new() },
+
+      'login_not_email' => sub {
+        my $params = Bugzilla->params;
+        my $cache  = Bugzilla->request_cache;
+
+        return $cache->{login_not_email}
+          //= (!$params->{use_email_as_login}
+            || ($params->{user_verify_class} =~ /LDAP/ && $params->{LDAPmailattribute})
+            || ($params->{user_verify_class} =~ /RADIUS/
+            && $params->{RADIUS_email_suffix})) ? 1 : 0;
+      },
+    },
+  };
+
+  # Use a per-process provider to cache compiled templates in memory across
+  # requests.
+  my $provider_key = join(':', @{$config->{INCLUDE_PATH}});
+  my $shared_providers = Bugzilla->process_cache->{shared_providers} ||= {};
+  $shared_providers->{$provider_key} ||= Template::Provider->new($config);
+  $config->{LOAD_TEMPLATES} = [$shared_providers->{$provider_key}];
+
+  local $Template::Config::CONTEXT = 'Bugzilla::Template::Context';
+
+  Bugzilla::Hook::process('template_before_create', {config => $config});
+  my $template = $class->new($config)
+    || die("Template creation failed: " . $class->error());
+
+  # Pass on our current language to any template hooks or inner templates
+  # called by this Template object.
+  $template->context->{bz_language} = $opts{language} || '';
+
+  return $template;
 }
 
 # Used as part of the two subroutines below.
 our %_templates_to_precompile;
+
 sub precompile_templates {
-    my ($output) = @_;
+  my ($output) = @_;
 
-    # Remove the compiled templates.
-    my $cache_dir = bz_locations()->{'template_cache'};
-    my $datadir = bz_locations()->{'datadir'};
+  # Remove the compiled templates.
+  my $cache_dir = bz_locations()->{'template_cache'};
+  my $datadir   = bz_locations()->{'datadir'};
+  if (-e $cache_dir) {
+    print install_string('template_removing_dir') . "\n" if $output;
+
+    # This frequently fails if the webserver made the files, because
+    # then the webserver owns the directories.
+    rmtree($cache_dir);
+
+    # Check that the directory was really removed, and if not, move it
+    # into data/deleteme/.
     if (-e $cache_dir) {
-        print install_string('template_removing_dir') . "\n" if $output;
-
-        # This frequently fails if the webserver made the files, because
-        # then the webserver owns the directories.
-        rmtree($cache_dir);
-
-        # Check that the directory was really removed, and if not, move it
-        # into data/deleteme/.
-        if (-e $cache_dir) {
-            my $deleteme = "$datadir/deleteme";
-            
-            print STDERR "\n\n",
-                install_string('template_removal_failed', 
-                               { deleteme => $deleteme, 
-                                 template_cache => $cache_dir }), "\n\n";
-            mkpath($deleteme);
-            my $random = generate_random_password();
-            rename($cache_dir, "$deleteme/$random")
-              or die "move failed: $!";
-        }
+      my $deleteme = "$datadir/deleteme";
+
+      print STDERR "\n\n",
+        install_string('template_removal_failed',
+        {deleteme => $deleteme, template_cache => $cache_dir}),
+        "\n\n";
+      mkpath($deleteme);
+      my $random = generate_random_password();
+      rename($cache_dir, "$deleteme/$random") or die "move failed: $!";
     }
+  }
 
-    print install_string('template_precompile') if $output;
+  print install_string('template_precompile') if $output;
 
-    # Pre-compile all available languages.
-    my $paths = template_include_path({ language => Bugzilla->languages });
+  # Pre-compile all available languages.
+  my $paths = template_include_path({language => Bugzilla->languages});
 
-    foreach my $dir (@$paths) {
-        my $template = Bugzilla::Template->create(include_path => [$dir]);
+  foreach my $dir (@$paths) {
+    my $template = Bugzilla::Template->create(include_path => [$dir]);
 
-        %_templates_to_precompile = ();
-        # Traverse the template hierarchy.
-        find({ wanted => \&_precompile_push, no_chdir => 1 }, $dir);
-        # The sort isn't totally necessary, but it makes debugging easier
-        # by making the templates always be compiled in the same order.
-        foreach my $file (sort keys %_templates_to_precompile) {
-            $file =~ s{^\Q$dir\E/}{};
-            # Compile the template but throw away the result. This has the side-
-            # effect of writing the compiled version to disk.
-            $template->context->template($file);
-        }
+    %_templates_to_precompile = ();
 
-        # Clear out the cached Provider object
-        Bugzilla->process_cache->{shared_providers} = undef;
-    }
+    # Traverse the template hierarchy.
+    find({wanted => \&_precompile_push, no_chdir => 1}, $dir);
 
-    # Under mod_perl, we look for templates using the absolute path of the
-    # template directory, which causes Template Toolkit to look for their 
-    # *compiled* versions using the full absolute path under the data/template
-    # directory. (Like data/template/var/www/html/bugzilla/.) To avoid
-    # re-compiling templates under mod_perl, we symlink to the
-    # already-compiled templates. This doesn't work on Windows.
-    if (!ON_WINDOWS) {
-        # We do these separately in case they're in different locations.
-        _do_template_symlink(bz_locations()->{'templatedir'});
-        _do_template_symlink(bz_locations()->{'extensionsdir'});
+    # The sort isn't totally necessary, but it makes debugging easier
+    # by making the templates always be compiled in the same order.
+    foreach my $file (sort keys %_templates_to_precompile) {
+      $file =~ s{^\Q$dir\E/}{};
+
+      # Compile the template but throw away the result. This has the side-
+      # effect of writing the compiled version to disk.
+      $template->context->template($file);
     }
 
-    # If anything created a Template object before now, clear it out.
-    delete Bugzilla->request_cache->{template};
+    # Clear out the cached Provider object
+    Bugzilla->process_cache->{shared_providers} = undef;
+  }
+
+  # Under mod_perl, we look for templates using the absolute path of the
+  # template directory, which causes Template Toolkit to look for their
+  # *compiled* versions using the full absolute path under the data/template
+  # directory. (Like data/template/var/www/html/bugzilla/.) To avoid
+  # re-compiling templates under mod_perl, we symlink to the
+  # already-compiled templates. This doesn't work on Windows.
+  if (!ON_WINDOWS) {
+
+    # We do these separately in case they're in different locations.
+    _do_template_symlink(bz_locations()->{'templatedir'});
+    _do_template_symlink(bz_locations()->{'extensionsdir'});
+  }
 
-    print install_string('done') . "\n" if $output;
+  # If anything created a Template object before now, clear it out.
+  delete Bugzilla->request_cache->{template};
+
+  print install_string('done') . "\n" if $output;
 }
 
 # Helper for precompile_templates
 sub _precompile_push {
-    my $name = $File::Find::name;
-    return if (-d $name);
-    return if ($name =~ /\/CVS\//);
-    return if ($name !~ /\.tmpl$/);
-    $_templates_to_precompile{$name} = 1;
+  my $name = $File::Find::name;
+  return if (-d $name);
+  return if ($name =~ /\/CVS\//);
+  return if ($name !~ /\.tmpl$/);
+  $_templates_to_precompile{$name} = 1;
 }
 
 # Helper for precompile_templates
 sub _do_template_symlink {
-    my $dir_to_symlink = shift;
-
-    my $abs_path = abs_path($dir_to_symlink);
-
-    # If $dir_to_symlink is already an absolute path (as might happen
-    # with packagers who set $libpath to an absolute path), then we don't
-    # need to do this symlink.
-    return if ($abs_path eq $dir_to_symlink);
-
-    my $abs_root  = dirname($abs_path);
-    my $dir_name  = basename($abs_path);
-    my $cache_dir   = bz_locations()->{'template_cache'};
-    my $container = "$cache_dir$abs_root";
-    mkpath($container);
-    my $target = "$cache_dir/$dir_name";
-    # Check if the directory exists, because if there are no extensions,
-    # there won't be an "data/template/extensions" directory to link to.
-    if (-d $target) {
-        # We use abs2rel so that the symlink will look like 
-        # "../../../../template" which works, while just 
-        # "data/template/template/" doesn't work.
-        my $relative_target = File::Spec->abs2rel($target, $container);
-
-        my $link_name = "$container/$dir_name";
-        symlink($relative_target, $link_name)
-          or warn "Could not make $link_name a symlink to $relative_target: $!";
-    }
+  my $dir_to_symlink = shift;
+
+  my $abs_path = abs_path($dir_to_symlink);
+
+  # If $dir_to_symlink is already an absolute path (as might happen
+  # with packagers who set $libpath to an absolute path), then we don't
+  # need to do this symlink.
+  return if ($abs_path eq $dir_to_symlink);
+
+  my $abs_root  = dirname($abs_path);
+  my $dir_name  = basename($abs_path);
+  my $cache_dir = bz_locations()->{'template_cache'};
+  my $container = "$cache_dir$abs_root";
+  mkpath($container);
+  my $target = "$cache_dir/$dir_name";
+
+  # Check if the directory exists, because if there are no extensions,
+  # there won't be an "data/template/extensions" directory to link to.
+  if (-d $target) {
+
+    # We use abs2rel so that the symlink will look like
+    # "../../../../template" which works, while just
+    # "data/template/template/" doesn't work.
+    my $relative_target = File::Spec->abs2rel($target, $container);
+
+    my $link_name = "$container/$dir_name";
+    symlink($relative_target, $link_name)
+      or warn "Could not make $link_name a symlink to $relative_target: $!";
+  }
 }
 
 1;
diff --git a/Bugzilla/Template/Context.pm b/Bugzilla/Template/Context.pm
index 470e6a9ee1..b9d84ab859 100644
--- a/Bugzilla/Template/Context.pm
+++ b/Bugzilla/Template/Context.pm
@@ -8,7 +8,7 @@
 # This exists to implement the template-before_process hook.
 package Bugzilla::Template::Context;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,23 +18,24 @@ use Bugzilla::Hook;
 use Scalar::Util qw(blessed);
 
 sub process {
-    my $self = shift;
-    # We don't want to run the template_before_process hook for
-    # template hooks (but we do want it to run if a hook calls
-    # PROCESS inside itself). The problem is that the {component}->{name} of
-    # hooks is unreliable--sometimes it starts with ./ and it's the
-    # full path to the hook template, and sometimes it's just the relative
-    # name (like hook/global/field-descs-end.none.tmpl). Also, calling
-    # template_before_process for hook templates doesn't seem too useful,
-    # because that's already part of the extension and they should be able
-    # to modify their hook if they want (or just modify the variables in the
-    # calling template).
-    if (not delete $self->{bz_in_hook}) {
-        $self->{bz_in_process} = 1;
-    }
-    my $result = $self->SUPER::process(@_);
-    delete $self->{bz_in_process};
-    return $result;
+  my $self = shift;
+
+  # We don't want to run the template_before_process hook for
+  # template hooks (but we do want it to run if a hook calls
+  # PROCESS inside itself). The problem is that the {component}->{name} of
+  # hooks is unreliable--sometimes it starts with ./ and it's the
+  # full path to the hook template, and sometimes it's just the relative
+  # name (like hook/global/field-descs-end.none.tmpl). Also, calling
+  # template_before_process for hook templates doesn't seem too useful,
+  # because that's already part of the extension and they should be able
+  # to modify their hook if they want (or just modify the variables in the
+  # calling template).
+  if (not delete $self->{bz_in_hook}) {
+    $self->{bz_in_process} = 1;
+  }
+  my $result = $self->SUPER::process(@_);
+  delete $self->{bz_in_process};
+  return $result;
 }
 
 # This method is called by Template-Toolkit exactly once per template or
@@ -46,58 +47,59 @@ sub process {
 # in the PROCESS or INCLUDE directive haven't been set, and if we're
 # in an INCLUDE, the stash is not yet localized during process().
 sub stash {
-    my $self = shift;
-    my $stash = $self->SUPER::stash(@_);
-
-    my $name = $stash->{component}->{name};
-    my $pre_process = $self->config->{PRE_PROCESS};
-
-    # Checking bz_in_process tells us that we were indeed called as part of a
-    # Context::process, and not at some other point. 
-    #
-    # Checking $name makes sure that we're processing a file, and not just a
-    # block, by checking that the name has a period in it. We don't allow
-    # blocks because their names are too unreliable--an extension could have
-    # a block with the same name, or multiple files could have a same-named
-    # block, and then your extension would malfunction.
-    #
-    # We also make sure that we don't run, ever, during the PRE_PROCESS
-    # templates, because if somebody calls Throw*Error globally inside of
-    # template_before_process, that causes an infinite recursion into
-    # the PRE_PROCESS templates (because Bugzilla, while inside 
-    # global/intialize.none.tmpl, loads the template again to create the
-    # template object for Throw*Error).
-    #
-    # Checking Bugzilla::Hook::in prevents infinite recursion on this hook.
-    if ($self->{bz_in_process} and $name =~ /\./
-        and !grep($_ eq $name, @$pre_process)
-        and !Bugzilla::Hook::in('template_before_process'))
-    {
-        Bugzilla::Hook::process("template_before_process",
-                                { vars => $stash, context => $self,
-                                  file => $name });
-    }
-
-    # This prevents other calls to stash() that might somehow happen
-    # later in the file from also triggering the hook.
-    delete $self->{bz_in_process};
-
-    return $stash;
+  my $self  = shift;
+  my $stash = $self->SUPER::stash(@_);
+
+  my $name        = $stash->{component}->{name};
+  my $pre_process = $self->config->{PRE_PROCESS};
+
+  # Checking bz_in_process tells us that we were indeed called as part of a
+  # Context::process, and not at some other point.
+  #
+  # Checking $name makes sure that we're processing a file, and not just a
+  # block, by checking that the name has a period in it. We don't allow
+  # blocks because their names are too unreliable--an extension could have
+  # a block with the same name, or multiple files could have a same-named
+  # block, and then your extension would malfunction.
+  #
+  # We also make sure that we don't run, ever, during the PRE_PROCESS
+  # templates, because if somebody calls Throw*Error globally inside of
+  # template_before_process, that causes an infinite recursion into
+  # the PRE_PROCESS templates (because Bugzilla, while inside
+  # global/intialize.none.tmpl, loads the template again to create the
+  # template object for Throw*Error).
+  #
+  # Checking Bugzilla::Hook::in prevents infinite recursion on this hook.
+  if (  $self->{bz_in_process}
+    and $name =~ /\./
+    and !grep($_ eq $name, @$pre_process)
+    and !Bugzilla::Hook::in('template_before_process'))
+  {
+    Bugzilla::Hook::process("template_before_process",
+      {vars => $stash, context => $self, file => $name});
+  }
+
+  # This prevents other calls to stash() that might somehow happen
+  # later in the file from also triggering the hook.
+  delete $self->{bz_in_process};
+
+  return $stash;
 }
 
 sub filter {
-    my ($self, $name, $args) = @_;
-    # If we pass an alias for the filter name, the filter code is cached
-    # instead of looking for it at each call.
-    # If the filter has arguments, then we can't cache it.
-    $self->SUPER::filter($name, $args, $args ? undef : $name);
+  my ($self, $name, $args) = @_;
+
+  # If we pass an alias for the filter name, the filter code is cached
+  # instead of looking for it at each call.
+  # If the filter has arguments, then we can't cache it.
+  $self->SUPER::filter($name, $args, $args ? undef : $name);
 }
 
 # We need a DESTROY sub for the same reason that Bugzilla::CGI does.
 sub DESTROY {
-    my $self = shift;
-    $self->SUPER::DESTROY(@_);
-};
+  my $self = shift;
+  $self->SUPER::DESTROY(@_);
+}
 
 1;
 
diff --git a/Bugzilla/Template/Plugin/Bugzilla.pm b/Bugzilla/Template/Plugin/Bugzilla.pm
index 806dd903b6..6e6100f6a6 100644
--- a/Bugzilla/Template/Plugin/Bugzilla.pm
+++ b/Bugzilla/Template/Plugin/Bugzilla.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Template::Plugin::Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,20 +16,20 @@ use parent qw(Template::Plugin);
 use Bugzilla;
 
 sub new {
-    my ($class, $context) = @_;
+  my ($class, $context) = @_;
 
-    return bless {}, $class;
+  return bless {}, $class;
 }
 
 sub AUTOLOAD {
-    my $class = shift;
-    our $AUTOLOAD;
+  my $class = shift;
+  our $AUTOLOAD;
 
-    $AUTOLOAD =~ s/^.*:://;
+  $AUTOLOAD =~ s/^.*:://;
 
-    return if $AUTOLOAD eq 'DESTROY';
+  return if $AUTOLOAD eq 'DESTROY';
 
-    return Bugzilla->$AUTOLOAD(@_);
+  return Bugzilla->$AUTOLOAD(@_);
 }
 
 1;
diff --git a/Bugzilla/Template/Plugin/Hook.pm b/Bugzilla/Template/Plugin/Hook.pm
index 669c77614c..18da2983fb 100644
--- a/Bugzilla/Template/Plugin/Hook.pm
+++ b/Bugzilla/Template/Plugin/Hook.pm
@@ -7,88 +7,87 @@
 
 package Bugzilla::Template::Plugin::Hook;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Template::Plugin);
 
 use Bugzilla::Constants;
-use Bugzilla::Install::Util qw(template_include_path); 
+use Bugzilla::Install::Util qw(template_include_path);
 use Bugzilla::Util;
 use Bugzilla::Error;
 
 use File::Spec;
 
 sub new {
-    my ($class, $context) = @_;
-    return bless { _CONTEXT => $context }, $class;
+  my ($class, $context) = @_;
+  return bless {_CONTEXT => $context}, $class;
 }
 
 sub _context { return $_[0]->{_CONTEXT} }
 
 sub process {
-    my ($self, $hook_name, $template) = @_;
-    my $context = $self->_context();
-    $template ||= $context->stash->{component}->{name};
-
-    # sanity check:
-    if (!$template =~ /[\w\.\/\-_\\]+/) {
-        ThrowCodeError('template_invalid', { name => $template });
-    }
-
-    my (undef, $path, $filename) = File::Spec->splitpath($template);
-    $path ||= '';
-    $filename =~ m/(.+)\.(.+)\.tmpl$/;
-    my $template_name = $1;
-    my $type = $2;
-
-    # Hooks are named like this:
-    my $extension_template = "$path$template_name-$hook_name.$type.tmpl";
-
-    # Get the hooks out of the cache if they exist. Otherwise, read them
-    # from the disk.
-    my $cache = Bugzilla->request_cache->{template_plugin_hook_cache} ||= {};
-    my $lang = $context->{bz_language} || '';
-    $cache->{"${lang}__$extension_template"} 
-        ||= $self->_get_hooks($extension_template);
-
-    # process() accepts an arrayref of templates, so we just pass the whole
-    # arrayref.
-    $context->{bz_in_hook} = 1; # See Bugzilla::Template::Context
-    return $context->process($cache->{"${lang}__$extension_template"});
+  my ($self, $hook_name, $template) = @_;
+  my $context = $self->_context();
+  $template ||= $context->stash->{component}->{name};
+
+  # sanity check:
+  if (!$template =~ /[\w\.\/\-_\\]+/) {
+    ThrowCodeError('template_invalid', {name => $template});
+  }
+
+  my (undef, $path, $filename) = File::Spec->splitpath($template);
+  $path ||= '';
+  $filename =~ m/(.+)\.(.+)\.tmpl$/;
+  my $template_name = $1;
+  my $type          = $2;
+
+  # Hooks are named like this:
+  my $extension_template = "$path$template_name-$hook_name.$type.tmpl";
+
+  # Get the hooks out of the cache if they exist. Otherwise, read them
+  # from the disk.
+  my $cache = Bugzilla->request_cache->{template_plugin_hook_cache} ||= {};
+  my $lang = $context->{bz_language} || '';
+  $cache->{"${lang}__$extension_template"}
+    ||= $self->_get_hooks($extension_template);
+
+  # process() accepts an arrayref of templates, so we just pass the whole
+  # arrayref.
+  $context->{bz_in_hook} = 1;    # See Bugzilla::Template::Context
+  return $context->process($cache->{"${lang}__$extension_template"});
 }
 
 sub _get_hooks {
-    my ($self, $extension_template) = @_;
-
-    my $template_sets = $self->_template_hook_include_path();
-    my @hooks;
-    foreach my $dir_set (@$template_sets) {
-        foreach my $template_dir (@$dir_set) {
-            my $file = "$template_dir/hook/$extension_template";
-            if (-e $file) {
-                my $template = $self->_context->template($file);
-                push(@hooks, $template);
-                # Don't run the hook for more than one language.
-                last;
-            }
-        }
+  my ($self, $extension_template) = @_;
+
+  my $template_sets = $self->_template_hook_include_path();
+  my @hooks;
+  foreach my $dir_set (@$template_sets) {
+    foreach my $template_dir (@$dir_set) {
+      my $file = "$template_dir/hook/$extension_template";
+      if (-e $file) {
+        my $template = $self->_context->template($file);
+        push(@hooks, $template);
+
+        # Don't run the hook for more than one language.
+        last;
+      }
     }
+  }
 
-    return \@hooks;
+  return \@hooks;
 }
 
 sub _template_hook_include_path {
-    my $self = shift;
-    my $cache = Bugzilla->request_cache;
-    my $language = $self->_context->{bz_language} || '';
-    my $cache_key = "template_plugin_hook_include_path_$language";
-    $cache->{$cache_key} ||= template_include_path({
-        language => $language,
-        hook     => 1,
-    });
-    return $cache->{$cache_key};
+  my $self      = shift;
+  my $cache     = Bugzilla->request_cache;
+  my $language  = $self->_context->{bz_language} || '';
+  my $cache_key = "template_plugin_hook_include_path_$language";
+  $cache->{$cache_key}
+    ||= template_include_path({language => $language, hook => 1,});
+  return $cache->{$cache_key};
 }
 
 1;
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 24ffad3c34..2d69cea4fb 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Token;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,8 +25,16 @@ use Digest::SHA qw(hmac_sha256_base64);
 use parent qw(Exporter);
 
 @Bugzilla::Token::EXPORT = qw(issue_api_token issue_session_token
-                              check_token_data delete_token
-                              issue_hash_token check_hash_token);
+  issue_auth_delegation_token check_auth_delegation_token
+  check_token_data delete_token
+  issue_hash_token check_hash_token);
+
+# 128 bits password:
+# 128 * log10(2) / log10(62) = 21.49, round up to 22.
+# 62 = 0-9, a-z, A-Z.
+use constant TOKEN_LENGTH => 22;
+
+use constant SEND_NOW => 1;
 
 ################################################################################
 # Public Functions
@@ -34,388 +42,466 @@ use parent qw(Exporter);
 
 # Create a token used for internal API authentication
 sub issue_api_token {
-    # Generates a random token, adds it to the tokens table if one does not
-    # already exist, and returns the token to the caller.
-    my $dbh  = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    my ($token) = $dbh->selectrow_array("
+
+  # Generates a random token, adds it to the tokens table if one does not
+  # already exist, and returns the token to the caller.
+  my $dbh = Bugzilla->dbh;
+
+  # Allow certain UI components to work if impersonating another user.
+  my $user = Bugzilla->sudoer || Bugzilla->user;
+  my ($token) = $dbh->selectrow_array("
         SELECT token FROM tokens
          WHERE userid = ? AND tokentype = 'api_token'
-               AND (" . $dbh->sql_date_math('issuedate', '+', (MAX_TOKEN_AGE * 24 - 12), 'HOUR') . ") > NOW()",
-        undef, $user->id);
-    return $token // _create_token($user->id, 'api_token', '');
+               AND ("
+      . $dbh->sql_date_math('issuedate', '+', (MAX_TOKEN_AGE * 24 - 12), 'HOUR')
+      . ") > NOW()", undef, $user->id);
+  return $token // _create_token($user->id, 'api_token', '');
+}
+
+sub issue_auth_delegation_token {
+  my ($uri)    = @_;
+  my $dbh      = Bugzilla->dbh;
+  my $user     = Bugzilla->user;
+  my $checksum = hmac_sha256_base64($user->id, $uri,
+    Bugzilla->localconfig->{'site_wide_secret'});
+
+  return _create_token($user->id, 'auth_delegation', $checksum);
+}
+
+sub check_auth_delegation_token {
+  my ($token, $uri) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  my ($eventdata) = $dbh->selectrow_array("
+        SELECT eventdata FROM tokens
+         WHERE token = ? AND tokentype = 'auth_delegation'
+               AND ("
+      . $dbh->sql_date_math('issuedate', '+', (MAX_TOKEN_AGE * 24 - 12), 'HOUR')
+      . ") > NOW()", undef, $token);
+
+  if ($eventdata) {
+    my $checksum = hmac_sha256_base64($user->id, $uri,
+      Bugzilla->localconfig->{'site_wide_secret'});
+    if ($eventdata eq $checksum) {
+      delete_token($token);
+      return 1;
+    }
+  }
+
+  return 0;
 }
 
 # Creates and sends a token to create a new user account.
 # It assumes that the login has the correct format and is not already in use.
 sub issue_new_user_account_token {
-    my $login_name = shift;
-    my $dbh = Bugzilla->dbh;
-    my $template = Bugzilla->template;
-    my $vars = {};
-
-    # Is there already a pending request for this login name? If yes, do not throw
-    # an error because the user may have lost their email with the token inside.
-    # But to prevent using this way to mailbomb an email address, make sure
-    # the last request is old enough before sending a new email (default: 10 minutes).
-
-    my $pending_requests = $dbh->selectrow_array(
-        'SELECT COUNT(*)
+  my ($login, $email) = @_;
+  my $dbh      = Bugzilla->dbh;
+  my $template = Bugzilla->template;
+  my $vars     = {};
+
+# Is there already a pending request for this email? If yes, do not throw
+# an error because the user may have lost their email with the token inside.
+# But to prevent using this way to mailbomb an email address, make sure
+# the last request is old enough before sending a new email (default: 10 minutes).
+
+  my $regexp           = "^$email:";
+  my $pending_requests = $dbh->selectrow_array(
+    'SELECT COUNT(*)
            FROM tokens
           WHERE tokentype = ?
-                AND ' . $dbh->sql_istrcmp('eventdata', '?') . '
+                AND ' . $dbh->sql_regexp('eventdata', $dbh->quote($regexp)) . '
                 AND issuedate > '
-                    . $dbh->sql_date_math('NOW()', '-', ACCOUNT_CHANGE_INTERVAL, 'MINUTE'),
-        undef, ('account', $login_name));
+      . $dbh->sql_date_math('NOW()', '-', ACCOUNT_CHANGE_INTERVAL, 'MINUTE'),
+    undef, 'account'
+  );
 
-    ThrowUserError('too_soon_for_new_token', {'type' => 'account'}) if $pending_requests;
+  ThrowUserError('too_soon_for_new_token', {'type' => 'account'})
+    if $pending_requests;
 
-    my ($token, $token_ts) = _create_token(undef, 'account', $login_name);
+  my ($token, $token_ts) = _create_token(undef, 'account', "$email:$login");
 
-    $vars->{'email'} = $login_name . Bugzilla->params->{'emailsuffix'};
-    $vars->{'expiration_ts'} = ctime($token_ts + MAX_TOKEN_AGE * 86400);
-    $vars->{'token'} = $token;
+  $vars->{'login'}         = $login;
+  $vars->{'email'}         = $email;
+  $vars->{'expiration_ts'} = ctime($token_ts + MAX_TOKEN_AGE * 86400);
+  $vars->{'token'}         = $token;
 
-    my $message;
-    $template->process('account/email/request-new.txt.tmpl', $vars, \$message)
-      || ThrowTemplateError($template->error());
+  my $message;
+  $template->process('account/email/request-new.txt.tmpl', $vars, \$message)
+    || ThrowTemplateError($template->error());
 
-    # In 99% of cases, the user getting the confirmation email is the same one
-    # who made the request, and so it is reasonable to send the email in the same
-    # language used to view the "Create a New Account" page (we cannot use their
-    # user prefs as the user has no account yet!).
-    MessageToMTA($message);
+  # In 99% of cases, the user getting the confirmation email is the same one
+  # who made the request, and so it is reasonable to send the email in the same
+  # language used to view the "Create a New Account" page (we cannot use their
+  # user prefs as the user has no account yet!).
+  MessageToMTA($message, SEND_NOW);
 }
 
 sub IssueEmailChangeToken {
-    my ($user, $new_email) = @_;
-    my $email_suffix = Bugzilla->params->{'emailsuffix'};
-    my $old_email = $user->login;
+  my $new_email = shift;
+  my $user      = Bugzilla->user;
 
-    my ($token, $token_ts) = _create_token($user->id, 'emailold', $old_email . ":" . $new_email);
+  my ($token, $token_ts)
+    = _create_token($user->id, 'emailold', $user->email . ":$new_email");
+  my $newtoken
+    = _create_token($user->id, 'emailnew', $user->email . ":$new_email");
 
-    my $newtoken = _create_token($user->id, 'emailnew', $old_email . ":" . $new_email);
+  # Mail the user the token along with instructions for using it.
 
-    # Mail the user the token along with instructions for using it.
+  my $template = Bugzilla->template_inner($user->setting('lang'));
+  my $vars     = {};
 
-    my $template = Bugzilla->template_inner($user->setting('lang'));
-    my $vars = {};
+  $vars->{'newemailaddress'} = $new_email;
+  $vars->{'expiration_ts'}   = ctime($token_ts + MAX_TOKEN_AGE * 86400);
 
-    $vars->{'oldemailaddress'} = $old_email . $email_suffix;
-    $vars->{'newemailaddress'} = $new_email . $email_suffix;
-    $vars->{'expiration_ts'} = ctime($token_ts + MAX_TOKEN_AGE * 86400);
-    $vars->{'token'} = $token;
-    $vars->{'emailaddress'} = $old_email . $email_suffix;
+  # First send an email to the new address. If this one doesn't exist,
+  # then the whole process must stop immediately. This means the email must
+  # be sent immediately and must not be stored in the queue.
+  $vars->{'token'} = $newtoken;
 
-    my $message;
-    $template->process("account/email/change-old.txt.tmpl", $vars, \$message)
-      || ThrowTemplateError($template->error());
+  my $message;
+  $template->process('account/email/change-new.txt.tmpl', $vars, \$message)
+    || ThrowTemplateError($template->error());
 
-    MessageToMTA($message);
+  MessageToMTA($message, SEND_NOW);
 
-    $vars->{'token'} = $newtoken;
-    $vars->{'emailaddress'} = $new_email . $email_suffix;
+  # If we come here, then the new address exists. We now email the current
+  # address, but we don't want to stop the process if it no longer exists,
+  # to give a chance to the user to confirm the email address change.
+  $vars->{'token'} = $token;
 
-    $message = "";
-    $template->process("account/email/change-new.txt.tmpl", $vars, \$message)
-      || ThrowTemplateError($template->error());
+  $message = '';
+  $template->process('account/email/change-old.txt.tmpl', $vars, \$message)
+    || ThrowTemplateError($template->error());
+
+  eval { MessageToMTA($message, SEND_NOW); };
 
-    MessageToMTA($message);
+  # Give the user a chance to cancel the process even if he never got
+  # the email above. The token is required.
+  return $token;
 }
 
 # Generates a random token, adds it to the tokens table, and sends it
 # to the user with instructions for using it to change their password.
 sub IssuePasswordToken {
-    my $user = shift;
-    my $dbh = Bugzilla->dbh;
+  my $user = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    my $too_soon = $dbh->selectrow_array(
-        'SELECT 1 FROM tokens
+  my $too_soon = $dbh->selectrow_array(
+    'SELECT 1 FROM tokens
           WHERE userid = ? AND tokentype = ?
-                AND issuedate > ' 
-                    . $dbh->sql_date_math('NOW()', '-', ACCOUNT_CHANGE_INTERVAL, 'MINUTE'),
-        undef, ($user->id, 'password'));
+                AND issuedate > '
+      . $dbh->sql_date_math('NOW()', '-', ACCOUNT_CHANGE_INTERVAL, 'MINUTE'),
+    undef, ($user->id, 'password')
+  );
 
-    ThrowUserError('too_soon_for_new_token', {'type' => 'password'}) if $too_soon;
+  ThrowUserError('too_soon_for_new_token', {'type' => 'password'}) if $too_soon;
 
-    my $ip_addr = remote_ip();
-    my ($token, $token_ts) = _create_token($user->id, 'password', $ip_addr);
+  my $ip_addr = remote_ip();
+  my ($token, $token_ts) = _create_token($user->id, 'password', $ip_addr);
 
-    # Mail the user the token along with instructions for using it.
-    my $template = Bugzilla->template_inner($user->setting('lang'));
-    my $vars = {};
+  # Mail the user the token along with instructions for using it.
+  my $template = Bugzilla->template_inner($user->setting('lang'));
+  my $vars     = {};
 
-    $vars->{'token'} = $token;
-    $vars->{'ip_addr'} = $ip_addr;
-    $vars->{'emailaddress'} = $user->email;
-    $vars->{'expiration_ts'} = ctime($token_ts + MAX_TOKEN_AGE * 86400);
-    # The user is not logged in (else they wouldn't request a new password).
-    # So we have to pass this information to the template.
-    $vars->{'timezone'} = $user->timezone;
-
-    my $message = "";
-    $template->process("account/password/forgotten-password.txt.tmpl", 
-                                                               $vars, \$message)
-      || ThrowTemplateError($template->error());
+  $vars->{'token'}         = $token;
+  $vars->{'ip_addr'}       = $ip_addr;
+  $vars->{'emailaddress'}  = $user->email;
+  $vars->{'expiration_ts'} = ctime($token_ts + MAX_TOKEN_AGE * 86400);
 
-    MessageToMTA($message);
+  # The user is not logged in (else they wouldn't request a new password).
+  # So we have to pass this information to the template.
+  $vars->{'timezone'} = $user->timezone;
+
+  my $message = "";
+  $template->process("account/password/forgotten-password.txt.tmpl",
+    $vars, \$message)
+    || ThrowTemplateError($template->error());
+
+  MessageToMTA($message);
 }
 
 sub issue_session_token {
-    # Generates a random token, adds it to the tokens table, and returns
-    # the token to the caller.
 
-    my $data = shift;
-    return _create_token(Bugzilla->user->id, 'session', $data);
+  # Generates a random token, adds it to the tokens table, and returns
+  # the token to the caller.
+
+  my $data = shift;
+  return _create_token(Bugzilla->user->id, 'session', $data);
 }
 
 sub issue_hash_token {
-    my ($data, $time) = @_;
-    $data ||= [];
-    $time ||= time();
-
-    # For the user ID, use the actual ID if the user is logged in.
-    # Otherwise, use the remote IP, in case this is for something
-    # such as creating an account or logging in.
-    my $user_id = Bugzilla->user->id || remote_ip();
-
-    # The concatenated string is of the form
-    # token creation time + user ID (either ID or remote IP) + data
-    my @args = ($time, $user_id, @$data);
-
-    my $token = join('*', @args);
-    # Wide characters cause Digest::SHA to die.
-    if (Bugzilla->params->{'utf8'}) {
-        utf8::encode($token) if utf8::is_utf8($token);
-    }
-    $token = hmac_sha256_base64($token, Bugzilla->localconfig->{'site_wide_secret'});
-    $token =~ s/\+/-/g;
-    $token =~ s/\//_/g;
-
-    # Prepend the token creation time, unencrypted, so that the token
-    # lifetime can be validated.
-    return $time . '-' . $token;
+  my ($data, $time) = @_;
+  $data ||= [];
+  $time ||= time();
+
+  # For the user ID, use the actual ID if the user is logged in.
+  # Otherwise, use the remote IP, in case this is for something
+  # such as creating an account or logging in.
+  my $user_id = Bugzilla->user->id || remote_ip();
+
+  # The concatenated string is of the form
+  # token creation time + user ID (either ID or remote IP) + data
+  my @args = ($time, $user_id, @$data);
+
+  my $token = join('*', @args);
+
+  # Wide characters cause Digest::SHA to die.
+  utf8::encode($token) if utf8::is_utf8($token);
+  $token
+    = hmac_sha256_base64($token, Bugzilla->localconfig->{'site_wide_secret'});
+  $token =~ s/\+/-/g;
+  $token =~ s/\//_/g;
+
+  # Prepend the token creation time, unencrypted, so that the token
+  # lifetime can be validated.
+  return $time . '-' . $token;
 }
 
 sub check_hash_token {
-    my ($token, $data) = @_;
-    $data ||= [];
-    my ($time, $expected_token);
-
-    if ($token) {
-        ($time, undef) = split(/-/, $token);
-        # Regenerate the token based on the information we have.
-        $expected_token = issue_hash_token($data, $time);
-    }
+  my ($token, $data) = @_;
+  $data ||= [];
+  my ($time, $expected_token);
 
-    if (!$token
-        || $expected_token ne $token
-        || time() - $time > MAX_TOKEN_AGE * 86400)
-    {
-        my $template = Bugzilla->template;
-        my $vars = {};
-        $vars->{'script_name'} = basename($0);
-        $vars->{'token'} = issue_hash_token($data);
-        $vars->{'reason'} = (!$token) ?                   'missing_token' :
-                            ($expected_token ne $token) ? 'invalid_token' :
-                                                          'expired_token';
-        print Bugzilla->cgi->header();
-        $template->process('global/confirm-action.html.tmpl', $vars)
-          || ThrowTemplateError($template->error());
-        exit;
-    }
+  if ($token) {
+    ($time, undef) = split(/-/, $token);
 
-    # If we come here, then the token is valid and not too old.
-    return 1;
+    # Regenerate the token based on the information we have.
+    $expected_token = issue_hash_token($data, $time);
+  }
+
+  if (!$token
+    || $expected_token ne $token
+    || time() - $time > MAX_TOKEN_AGE * 86400)
+  {
+    my $template = Bugzilla->template;
+    my $vars     = {};
+    $vars->{'script_name'} = basename($0);
+    $vars->{'token'}       = issue_hash_token($data);
+    $vars->{'reason'}
+      = (!$token) ? 'missing_token'
+      : ($expected_token ne $token) ? 'invalid_token'
+      :                               'expired_token';
+    print Bugzilla->cgi->header();
+    $template->process('global/confirm-action.html.tmpl', $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+
+  # If we come here, then the token is valid and not too old.
+  return 1;
 }
 
 sub CleanTokenTable {
-    my $dbh = Bugzilla->dbh;
-    $dbh->do('DELETE FROM tokens
-              WHERE ' . $dbh->sql_to_days('NOW()') . ' - ' .
-                        $dbh->sql_to_days('issuedate') . ' >= ?',
-              undef, MAX_TOKEN_AGE);
+  my $dbh = Bugzilla->dbh;
+  $dbh->do(
+    'DELETE FROM tokens
+              WHERE '
+      . $dbh->sql_to_days('NOW()') . ' - '
+      . $dbh->sql_to_days('issuedate')
+      . ' >= ?', undef, MAX_TOKEN_AGE
+  );
 }
 
 sub GenerateUniqueToken {
-    # Generates a unique random token.  Uses generate_random_password 
-    # for the tokens themselves and checks uniqueness by searching for
-    # the token in the "tokens" table.  Gives up if it can't come up
-    # with a token after about one hundred tries.
-    my ($table, $column) = @_;
-
-    my $token;
-    my $duplicate = 1;
-    my $tries = 0;
-    $table ||= "tokens";
-    $column ||= "token";
-
-    my $dbh = Bugzilla->dbh;
-    my $sth = $dbh->prepare("SELECT 1 FROM $table WHERE $column = ?");
-
-    while ($duplicate) {
-        ++$tries;
-        if ($tries > 100) {
-            ThrowCodeError("token_generation_error");
-        }
-        $token = generate_random_password();
-        $sth->execute($token);
-        $duplicate = $sth->fetchrow_array;
+
+  # Generates a unique random token.  Uses generate_random_password
+  # for the tokens themselves and checks uniqueness by searching for
+  # the token in the "tokens" table.  Gives up if it can't come up
+  # with a token after about one hundred tries.
+  my ($table, $column) = @_;
+
+  my $token;
+  my $duplicate = 1;
+  my $tries     = 0;
+  $table  ||= "tokens";
+  $column ||= "token";
+
+  my $dbh = Bugzilla->dbh;
+  my $sth = $dbh->prepare("SELECT 1 FROM $table WHERE $column = ?");
+
+  while ($duplicate) {
+    ++$tries;
+    if ($tries > 100) {
+      ThrowCodeError("token_generation_error");
     }
-    return $token;
+    $token = generate_random_password(TOKEN_LENGTH);
+    $sth->execute($token);
+    $duplicate = $sth->fetchrow_array;
+  }
+  return $token;
 }
 
 # Cancels a previously issued token and notifies the user.
 # This should only happen when the user accidentally makes a token request
 # or when a malicious hacker makes a token request on behalf of a user.
 sub Cancel {
-    my ($token, $cancelaction, $vars) = @_;
-    my $dbh = Bugzilla->dbh;
-    $vars ||= {};
-
-    # Get information about the token being canceled.
-    trick_taint($token);
-    my ($db_token, $issuedate, $tokentype, $eventdata, $userid) =
-        $dbh->selectrow_array('SELECT token, ' . $dbh->sql_date_format('issuedate') . ',
+  my ($token, $cancelaction, $vars) = @_;
+  my $dbh = Bugzilla->dbh;
+  $vars ||= {};
+
+  # Get information about the token being canceled.
+  trick_taint($token);
+  my ($db_token, $issuedate, $tokentype, $eventdata, $userid)
+    = $dbh->selectrow_array(
+    'SELECT token, '
+      . $dbh->sql_date_format('issuedate') . ',
                                       tokentype, eventdata, userid
                                  FROM tokens
-                                WHERE token = ?',
-                                undef, $token);
-
-    # Some DBs such as MySQL are case-insensitive by default so we do
-    # a quick comparison to make sure the tokens are indeed the same.
-    (defined $db_token && $db_token eq $token)
-        || ThrowCodeError("cancel_token_does_not_exist");
-
-    # If we are canceling the creation of a new user account, then there
-    # is no entry in the 'profiles' table.
-    my $user = new Bugzilla::User($userid);
-
-    $vars->{'emailaddress'} = $userid ? $user->email : $eventdata;
-    $vars->{'remoteaddress'} = remote_ip();
-    $vars->{'token'} = $token;
-    $vars->{'tokentype'} = $tokentype;
-    $vars->{'issuedate'} = $issuedate;
-    # The user is probably not logged in.
-    # So we have to pass this information to the template.
-    $vars->{'timezone'} = $user->timezone;
-    $vars->{'eventdata'} = $eventdata;
-    $vars->{'cancelaction'} = $cancelaction;
-
-    # Notify the user via email about the cancellation.
-    my $template = Bugzilla->template_inner($user->setting('lang'));
-
-    my $message;
-    $template->process("account/cancel-token.txt.tmpl", $vars, \$message)
-      || ThrowTemplateError($template->error());
+                                WHERE token = ?', undef, $token
+    );
 
-    MessageToMTA($message);
+  # Some DBs such as MySQL are case-insensitive by default so we do
+  # a quick comparison to make sure the tokens are indeed the same.
+  (defined $db_token && $db_token eq $token)
+    || ThrowCodeError("cancel_token_does_not_exist");
 
-    # Delete the token from the database.
-    delete_token($token);
+  # If we are canceling the creation of a new user account, then there
+  # is no entry in the 'profiles' table.
+  my $user = new Bugzilla::User($userid);
+
+  if ($userid) {
+    $vars->{'emailaddress'} = $user->email;
+    $vars->{'login'}        = $user->login;
+  }
+  else {
+    # Be careful! Some logins may contain ":" in them.
+    my ($email, $login) = split(':', $eventdata, 2);
+    $vars->{'emailaddress'} = $email;
+    $vars->{'login'}        = $login;
+  }
+
+  $vars->{'remoteaddress'} = remote_ip();
+  $vars->{'token'}         = $token;
+  $vars->{'tokentype'}     = $tokentype;
+  $vars->{'issuedate'}     = $issuedate;
+
+  # The user is probably not logged in.
+  # So we have to pass this information to the template.
+  $vars->{'timezone'}     = $user->timezone;
+  $vars->{'eventdata'}    = $eventdata;
+  $vars->{'cancelaction'} = $cancelaction;
+
+  # Notify the user via email about the cancellation.
+  my $template = Bugzilla->template_inner($user->setting('lang'));
+
+  my $message;
+  $template->process("account/cancel-token.txt.tmpl", $vars, \$message)
+    || ThrowTemplateError($template->error());
+
+  MessageToMTA($message);
+
+  # Delete the token from the database.
+  delete_token($token);
 }
 
 sub DeletePasswordTokens {
-    my ($userid, $reason) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($userid, $reason) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    detaint_natural($userid);
-    my $tokens = $dbh->selectcol_arrayref('SELECT token FROM tokens
+  detaint_natural($userid);
+  my $tokens = $dbh->selectcol_arrayref(
+    'SELECT token FROM tokens
                                            WHERE userid = ? AND tokentype = ?',
-                                           undef, ($userid, 'password'));
+    undef, ($userid, 'password')
+  );
 
-    foreach my $token (@$tokens) {
-        Bugzilla::Token::Cancel($token, $reason);
-    }
+  foreach my $token (@$tokens) {
+    Bugzilla::Token::Cancel($token, $reason);
+  }
 }
 
-# Returns an email change token if the user has one. 
+# Returns an email change token if the user has one.
 sub HasEmailChangeToken {
-    my $userid = shift;
-    my $dbh = Bugzilla->dbh;
+  my $userid = shift;
+  my $dbh    = Bugzilla->dbh;
 
-    my $token = $dbh->selectrow_array('SELECT token FROM tokens
+  my $token = $dbh->selectrow_array(
+    'SELECT token FROM tokens
                                        WHERE userid = ?
-                                       AND (tokentype = ? OR tokentype = ?) ' .
-                                       $dbh->sql_limit(1),
-                                       undef, ($userid, 'emailnew', 'emailold'));
-    return $token;
+                                       AND (tokentype = ? OR tokentype = ?) '
+      . $dbh->sql_limit(1), undef, ($userid, 'emailnew', 'emailold')
+  );
+  return $token;
 }
 
 # Returns the userid, issuedate and eventdata for the specified token
 sub GetTokenData {
-    my ($token) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($token) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    return unless defined $token;
-    $token = clean_text($token);
-    trick_taint($token);
+  return unless defined $token;
+  $token = clean_text($token);
+  trick_taint($token);
 
-    my @token_data = $dbh->selectrow_array(
-        "SELECT token, userid, " . $dbh->sql_date_format('issuedate') . ", eventdata, tokentype
+  my @token_data = $dbh->selectrow_array(
+        "SELECT token, userid, "
+      . $dbh->sql_date_format('issuedate')
+      . ", eventdata, tokentype
          FROM   tokens
-         WHERE  token = ?", undef, $token);
+         WHERE  token = ?", undef, $token
+  );
 
-    # Some DBs such as MySQL are case-insensitive by default so we do
-    # a quick comparison to make sure the tokens are indeed the same.
-    my $db_token = shift @token_data;
-    return undef if (!defined $db_token || $db_token ne $token);
+  # Some DBs such as MySQL are case-insensitive by default so we do
+  # a quick comparison to make sure the tokens are indeed the same.
+  my $db_token = shift @token_data;
+  return undef if (!defined $db_token || $db_token ne $token);
 
-    return @token_data;
+  return @token_data;
 }
 
 # Deletes specified token
 sub delete_token {
-    my ($token) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($token) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    return unless defined $token;
-    trick_taint($token);
+  return unless defined $token;
+  trick_taint($token);
 
-    $dbh->do("DELETE FROM tokens WHERE token = ?", undef, $token);
+  $dbh->do("DELETE FROM tokens WHERE token = ?", undef, $token);
 }
 
 # Given a token, makes sure it comes from the currently logged in user
 # and match the expected event. Returns 1 on success, else displays a warning.
 sub check_token_data {
-    my ($token, $expected_action, $alternate_script) = @_;
-    my $user = Bugzilla->user;
-    my $template = Bugzilla->template;
-    my $cgi = Bugzilla->cgi;
-
-    my ($creator_id, $date, $token_action) = GetTokenData($token);
-    unless ($creator_id
-            && $creator_id == $user->id
-            && $token_action eq $expected_action)
-    {
-        # Something is going wrong. Ask confirmation before processing.
-        # It is possible that someone tried to trick an administrator.
-        # In this case, we want to know their name!
-        require Bugzilla::User;
-
-        my $vars = {};
-        $vars->{'abuser'} = Bugzilla::User->new($creator_id)->identity;
-        $vars->{'token_action'} = $token_action;
-        $vars->{'expected_action'} = $expected_action;
-        $vars->{'script_name'} = basename($0);
-        $vars->{'alternate_script'} = $alternate_script || basename($0);
-
-        # Now is a good time to remove old tokens from the DB.
-        CleanTokenTable();
-
-        # If no token was found, create a valid token for the given action.
-        unless ($creator_id) {
-            $token = issue_session_token($expected_action);
-            $cgi->param('token', $token);
-        }
-
-        print $cgi->header();
-
-        $template->process('admin/confirm-action.html.tmpl', $vars)
-          || ThrowTemplateError($template->error());
-        exit;
+  my ($token, $expected_action, $alternate_script) = @_;
+  my $user     = Bugzilla->user;
+  my $template = Bugzilla->template;
+  my $cgi      = Bugzilla->cgi;
+
+  my ($creator_id, $date, $token_action) = GetTokenData($token);
+  unless ($creator_id
+    && $creator_id == $user->id
+    && $token_action eq $expected_action)
+  {
+    # Something is going wrong. Ask confirmation before processing.
+    # It is possible that someone tried to trick an administrator.
+    # In this case, we want to know their name!
+    require Bugzilla::User;
+
+    my $vars = {};
+    $vars->{'abuser'}           = Bugzilla::User->new($creator_id)->identity;
+    $vars->{'token_action'}     = $token_action;
+    $vars->{'expected_action'}  = $expected_action;
+    $vars->{'script_name'}      = basename($0);
+    $vars->{'alternate_script'} = $alternate_script || basename($0);
+
+    # Now is a good time to remove old tokens from the DB.
+    CleanTokenTable();
+
+    # If no token was found, create a valid token for the given action.
+    unless ($creator_id) {
+      $token = issue_session_token($expected_action);
+      $cgi->param('token', $token);
     }
-    return 1;
+
+    print $cgi->header();
+
+    $template->process('admin/confirm-action.html.tmpl', $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+  return 1;
 }
 
 ################################################################################
@@ -425,29 +511,38 @@ sub check_token_data {
 # Generates a unique token and inserts it into the database
 # Returns the token and the token timestamp
 sub _create_token {
-    my ($userid, $tokentype, $eventdata) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($userid, $tokentype, $eventdata) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    detaint_natural($userid) if defined $userid;
-    trick_taint($tokentype);
-    trick_taint($eventdata);
+  detaint_natural($userid) if defined $userid;
+  trick_taint($tokentype);
+  trick_taint($eventdata);
 
-    $dbh->bz_start_transaction();
+  my $is_shadow = Bugzilla->is_shadow_db;
+  $dbh = Bugzilla->switch_to_main_db() if $is_shadow;
 
-    my $token = GenerateUniqueToken();
+  $dbh->bz_start_transaction();
 
-    $dbh->do("INSERT INTO tokens (userid, issuedate, token, tokentype, eventdata)
-        VALUES (?, NOW(), ?, ?, ?)", undef, ($userid, $token, $tokentype, $eventdata));
+  my $token = GenerateUniqueToken();
 
-    $dbh->bz_commit_transaction();
+  $dbh->do(
+    "INSERT INTO tokens (userid, issuedate, token, tokentype, eventdata)
+        VALUES (?, NOW(), ?, ?, ?)", undef,
+    ($userid, $token, $tokentype, $eventdata)
+  );
 
-    if (wantarray) {
-        my (undef, $token_ts, undef) = GetTokenData($token);
-        $token_ts = str2time($token_ts);
-        return ($token, $token_ts);
-    } else {
-        return $token;
-    }
+  $dbh->bz_commit_transaction();
+
+  if (wantarray) {
+    my (undef, $token_ts, undef) = GetTokenData($token);
+    $token_ts = str2time($token_ts);
+    Bugzilla->switch_to_shadow_db() if $is_shadow;
+    return ($token, $token_ts);
+  }
+  else {
+    Bugzilla->switch_to_shadow_db() if $is_shadow;
+    return $token;
+  }
 }
 
 1;
@@ -462,7 +557,7 @@ Bugzilla::Token - Provides different routines to manage tokens.
 
     use Bugzilla::Token;
 
-    Bugzilla::Token::issue_new_user_account_token($login_name);
+    Bugzilla::Token::issue_new_user_account_token($login, $email);
     Bugzilla::Token::IssueEmailChangeToken($user, $new_email);
     Bugzilla::Token::IssuePasswordToken($user);
     Bugzilla::Token::DeletePasswordTokens($user_id, $reason);
@@ -490,29 +585,28 @@ Bugzilla::Token - Provides different routines to manage tokens.
 
  Returns:     The token.
 
-=item C<issue_new_user_account_token($login_name)>
+=item C<issue_new_user_account_token($login, $email)>
 
  Description: Creates and sends a token per email to the email address
               requesting a new user account. It doesn't check whether
               the user account already exists. The user will have to
               use this token to confirm the creation of their user account.
 
- Params:      $login_name - The new login name requested by the user.
+ Params:      $login - The new login name requested by the user.
+              $email - The email address to be associated with the account.
 
  Returns:     Nothing. It throws an error if the same user made the same
               request in the last few minutes.
 
-=item C<sub IssueEmailChangeToken($user, $new_email)>
+=item C<sub IssueEmailChangeToken($new_email)>
 
  Description: Sends two distinct tokens per email to the old and new email
               addresses to confirm the email address change for the given
               user. These tokens remain valid for the next MAX_TOKEN_AGE days.
 
- Params:      $user      - User object of the user requesting a new
-                           email address.
-              $new_email - The new email address of the user.
+ Params:      $new_email - The new email address of the user.
 
- Returns:     Nothing.
+ Returns:     The token to cancel the request.
 
 =item C<IssuePasswordToken($user)>
 
@@ -605,6 +699,23 @@ although they can be used separately.
 
  Returns:     A unique token.
 
+=item C<issue_auth_delegation_token($uri)>
+
+ Description: Creates and returns a token used to validate auth delegation confirmations.
+
+ Params:      $uri - The uri that auth will be delegated to.
+
+ Returns:     A unique token.
+
+=item C<check_auth_delegation_token($token, $uri)>
+
+ Description: Checks if a token $token is a confirmation token for $uri.
+
+ Params:      $token - The token returned by issue_auth_delegation_token()
+              $uri - The uri that auth will be delegated to.
+
+ Returns:     a boolean value
+
 =item C<check_token_data($token, $event)>
 
  Description: Makes sure the $token has been created by the currently logged in
diff --git a/Bugzilla/Update.pm b/Bugzilla/Update.pm
index 72a7108a8e..516de43e8b 100644
--- a/Bugzilla/Update.pm
+++ b/Bugzilla/Update.pm
@@ -7,155 +7,165 @@
 
 package Bugzilla::Update;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Constants;
 
-use constant TIME_INTERVAL => 86400; # Default is one day, in seconds.
-use constant TIMEOUT       => 5; # Number of seconds before timeout.
+use constant TIME_INTERVAL => 86400;    # Default is one day, in seconds.
+use constant TIMEOUT       => 5;        # Number of seconds before timeout.
 
 # Look for new releases and notify logged in administrators about them.
 sub get_notifications {
-    return if !Bugzilla->feature('updates');
-    return if (Bugzilla->params->{'upgrade_notification'} eq 'disabled');
-
-    my $local_file = bz_locations()->{'datadir'} . '/' . LOCAL_FILE;
-    # Update the local XML file if this one doesn't exist or if
-    # the last modification time (stat[9]) is older than TIME_INTERVAL.
-    if (!-e $local_file || (time() - (stat($local_file))[9] > TIME_INTERVAL)) {
-        unlink $local_file; # Make sure the old copy is away.
-        return { 'error' => 'no_update' } if (-e $local_file);
-
-        my $error = _synchronize_data();
-        # If an error is returned, leave now.
-        return $error if $error;
+  return if !Bugzilla->feature('updates');
+  return if (Bugzilla->params->{'upgrade_notification'} eq 'disabled');
+
+  my $local_file = bz_locations()->{'datadir'} . '/' . LOCAL_FILE;
+
+  # Update the local XML file if this one doesn't exist or if
+  # the last modification time (stat[9]) is older than TIME_INTERVAL.
+  if (!-e $local_file || (time() - (stat($local_file))[9] > TIME_INTERVAL)) {
+    unlink $local_file;    # Make sure the old copy is away.
+    return {'error' => 'no_update'} if (-e $local_file);
+
+    my $error = _synchronize_data();
+
+    # If an error is returned, leave now.
+    return $error if $error;
+  }
+
+  # If we cannot access the local XML file, ignore it.
+  return {'error' => 'no_access'} unless (-r $local_file);
+
+  my $twig = XML::Twig->new();
+  $twig->safe_parsefile($local_file);
+
+  # If the XML file is invalid, return.
+  return {'error' => 'corrupted'} if $@;
+  my $root = $twig->root;
+
+  my @releases;
+  foreach my $branch ($root->children('branch')) {
+    my $release = {
+      'branch_ver' => $branch->{'att'}->{'id'},
+      'latest_ver' => $branch->{'att'}->{'vid'},
+      'status'     => $branch->{'att'}->{'status'},
+      'url'        => $branch->{'att'}->{'url'},
+      'date'       => $branch->{'att'}->{'date'}
+    };
+    push(@releases, $release);
+  }
+
+  # On which branch is the current installation running?
+  my @current_version
+    = (BUGZILLA_VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
+
+  my @release;
+  if (Bugzilla->params->{'upgrade_notification'} eq 'development_snapshot') {
+    @release = grep { $_->{'status'} eq 'development' } @releases;
+
+    # If there is no development snapshot available, then we are in the
+    # process of releasing a release candidate. That's the release we want.
+    unless (scalar(@release)) {
+      @release = grep { $_->{'status'} eq 'release-candidate' } @releases;
     }
-
-    # If we cannot access the local XML file, ignore it.
-    return { 'error' => 'no_access' } unless (-r $local_file);
-
-    my $twig = XML::Twig->new();
-    $twig->safe_parsefile($local_file);
-    # If the XML file is invalid, return.
-    return { 'error' => 'corrupted' } if $@;
-    my $root = $twig->root;
-
-    my @releases;
-    foreach my $branch ($root->children('branch')) {
-        my $release = {
-            'branch_ver' => $branch->{'att'}->{'id'},
-            'latest_ver' => $branch->{'att'}->{'vid'},
-            'status'     => $branch->{'att'}->{'status'},
-            'url'        => $branch->{'att'}->{'url'},
-            'date'       => $branch->{'att'}->{'date'}
-        };
-        push(@releases, $release);
-    }
-
-    # On which branch is the current installation running?
-    my @current_version =
-        (BUGZILLA_VERSION =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
-
-    my @release;
-    if (Bugzilla->params->{'upgrade_notification'} eq 'development_snapshot') {
-        @release = grep {$_->{'status'} eq 'development'} @releases;
-        # If there is no development snapshot available, then we are in the
-        # process of releasing a release candidate. That's the release we want.
-        unless (scalar(@release)) {
-            @release = grep {$_->{'status'} eq 'release-candidate'} @releases;
-        }
-    }
-    elsif (Bugzilla->params->{'upgrade_notification'} eq 'latest_stable_release') {
-        @release = grep {$_->{'status'} eq 'stable'} @releases;
-    }
-    elsif (Bugzilla->params->{'upgrade_notification'} eq 'stable_branch_release') {
-        # We want the latest stable version for the current branch.
-        # If we are running a development snapshot, we won't match anything.
-        my $branch_version = $current_version[0] . '.' . $current_version[1];
-
-        # We do a string comparison instead of a numerical one, because
-        # e.g. 2.2 == 2.20, but 2.2 ne 2.20 (and 2.2 is indeed much older).
-        @release = grep {$_->{'branch_ver'} eq $branch_version} @releases;
-
-        # If the branch is now closed, we should strongly suggest
-        # to upgrade to the latest stable release available.
-        if (scalar(@release) && $release[0]->{'status'} eq 'closed') {
-            @release = grep {$_->{'status'} eq 'stable'} @releases;
-            return {'data' => $release[0], 'deprecated' => $branch_version};
-        }
+  }
+  elsif (Bugzilla->params->{'upgrade_notification'} eq 'latest_stable_release') {
+    @release = grep { $_->{'status'} eq 'stable' } @releases;
+  }
+  elsif (Bugzilla->params->{'upgrade_notification'} eq 'stable_branch_release') {
+
+    # We want the latest stable version for the current branch.
+    # If we are running a development snapshot, we won't match anything.
+    my $branch_version = $current_version[0] . '.' . $current_version[1];
+
+    # We do a string comparison instead of a numerical one, because
+    # e.g. 2.2 == 2.20, but 2.2 ne 2.20 (and 2.2 is indeed much older).
+    @release = grep { $_->{'branch_ver'} eq $branch_version } @releases;
+
+    # If the branch is now closed, we should strongly suggest
+    # to upgrade to the latest stable release available.
+    if (scalar(@release) && $release[0]->{'status'} eq 'closed') {
+      @release = grep { $_->{'status'} eq 'stable' } @releases;
+      return {'data' => $release[0], 'deprecated' => $branch_version};
     }
-    else {
-      # Unknown parameter.
-      return {'error' => 'unknown_parameter'};
-    }
-
-    # Return if no new release is available.
-    return unless scalar(@release);
-
-    # Only notify the administrator if the latest version available
-    # is newer than the current one.
-    my @new_version =
-        ($release[0]->{'latest_ver'} =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
-
-    # We convert release candidates 'rc' to integers (rc ? 0 : 1) in order
-    # to compare versions easily.
-    $current_version[2] = ($current_version[2] && $current_version[2] eq 'rc') ? 0 : 1;
-    $new_version[2] = ($new_version[2] && $new_version[2] eq 'rc') ? 0 : 1;
-
-    my $is_newer = _compare_versions(\@current_version, \@new_version);
-    return ($is_newer == 1) ? {'data' => $release[0]} : undef;
+  }
+  else {
+    # Unknown parameter.
+    return {'error' => 'unknown_parameter'};
+  }
+
+  # Return if no new release is available.
+  return unless scalar(@release);
+
+  # Only notify the administrator if the latest version available
+  # is newer than the current one.
+  my @new_version
+    = ($release[0]->{'latest_ver'} =~ m/^(\d+)\.(\d+)(?:(rc|\.)(\d+))?\+?$/);
+
+  # We convert release candidates 'rc' to integers (rc ? 0 : 1) in order
+  # to compare versions easily.
+  $current_version[2]
+    = ($current_version[2] && $current_version[2] eq 'rc') ? 0 : 1;
+  $new_version[2] = ($new_version[2] && $new_version[2] eq 'rc') ? 0 : 1;
+
+  my $is_newer = _compare_versions(\@current_version, \@new_version);
+  return ($is_newer == 1) ? {'data' => $release[0]} : undef;
 }
 
 sub _synchronize_data {
-    my $local_file = bz_locations()->{'datadir'} . '/' . LOCAL_FILE;
-
-    my $ua = LWP::UserAgent->new();
-    $ua->timeout(TIMEOUT);
-    $ua->protocols_allowed(['http', 'https']);
-    # If the URL of the proxy is given, use it, else get this information
-    # from the environment variable.
-    my $proxy_url = Bugzilla->params->{'proxy_url'};
-    if ($proxy_url) {
-        $ua->proxy(['http', 'https'], $proxy_url);
-    }
-    else {
-        $ua->env_proxy;
-    }
-    my $response = eval { $ua->mirror(REMOTE_FILE, $local_file) };
-
-    # $ua->mirror() forces the modification time of the local XML file
-    # to match the modification time of the remote one.
-    # So we have to update it manually to reflect that a newer version
-    # of the file has effectively been requested. This will avoid
-    # any new download for the next TIME_INTERVAL.
-    if (-e $local_file) {
-        # Try to alter its last modification time.
-        my $can_alter = utime(undef, undef, $local_file);
-        # This error should never happen.
-        $can_alter || return { 'error' => 'no_update' };
-    }
-    elsif ($response && $response->is_error) {
-        # We have been unable to download the file.
-        return { 'error' => 'cannot_download', 'reason' => $response->status_line };
-    }
-    else {
-        return { 'error' => 'no_write', 'reason' => $@ };
-    }
-
-    # Everything went well.
-    return 0;
+  my $local_file = bz_locations()->{'datadir'} . '/' . LOCAL_FILE;
+
+  my $ua = LWP::UserAgent->new();
+  $ua->timeout(TIMEOUT);
+  $ua->protocols_allowed(['http', 'https']);
+
+  # If the URL of the proxy is given, use it, else get this information
+  # from the environment variable.
+  my $proxy_url = Bugzilla->params->{'proxy_url'};
+  if ($proxy_url) {
+    $ua->proxy(['http', 'https'], $proxy_url);
+  }
+  else {
+    $ua->env_proxy;
+  }
+  my $response = eval { $ua->mirror(REMOTE_FILE, $local_file) };
+
+  # $ua->mirror() forces the modification time of the local XML file
+  # to match the modification time of the remote one.
+  # So we have to update it manually to reflect that a newer version
+  # of the file has effectively been requested. This will avoid
+  # any new download for the next TIME_INTERVAL.
+  if (-e $local_file) {
+
+    # Try to alter its last modification time.
+    my $can_alter = utime(undef, undef, $local_file);
+
+    # This error should never happen.
+    $can_alter || return {'error' => 'no_update'};
+  }
+  elsif ($response && $response->is_error) {
+
+    # We have been unable to download the file.
+    return {'error' => 'cannot_download', 'reason' => $response->status_line};
+  }
+  else {
+    return {'error' => 'no_write', 'reason' => $@};
+  }
+
+  # Everything went well.
+  return 0;
 }
 
 sub _compare_versions {
-    my ($old_ver, $new_ver) = @_;
-    while (scalar(@$old_ver) && scalar(@$new_ver)) {
-        my $old = shift(@$old_ver) || 0;
-        my $new = shift(@$new_ver) || 0;
-        return $new <=> $old if ($new <=> $old);
-    }
-    return scalar(@$new_ver) <=> scalar(@$old_ver);
+  my ($old_ver, $new_ver) = @_;
+  while (scalar(@$old_ver) && scalar(@$new_ver)) {
+    my $old = shift(@$old_ver) || 0;
+    my $new = shift(@$new_ver) || 0;
+    return $new <=> $old if ($new <=> $old);
+  }
+  return scalar(@$new_ver) <=> scalar(@$old_ver);
 
 }
 
diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index acedc65f2a..ddde183871 100644
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::User;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,6 +21,7 @@ use Bugzilla::Classification;
 use Bugzilla::Field;
 use Bugzilla::Group;
 use Bugzilla::BugUserLastVisit;
+use Bugzilla::Hook;
 
 use DateTime::TimeZone;
 use List::Util qw(max);
@@ -31,10 +32,10 @@ use URI;
 use URI::QueryParam;
 
 use parent qw(Bugzilla::Object Exporter);
-@Bugzilla::User::EXPORT = qw(is_available_username
-    login_to_id validate_password validate_password_check
-    USER_MATCH_MULTIPLE USER_MATCH_FAILED USER_MATCH_SUCCESS
-    MATCH_SKIP_CONFIRM
+@Bugzilla::User::EXPORT = qw(is_available_email email_to_id
+  login_to_id validate_password validate_password_check
+  USER_MATCH_MULTIPLE USER_MATCH_FAILED USER_MATCH_SUCCESS
+  MATCH_SKIP_CONFIRM
 );
 
 #####################################################################
@@ -45,16 +46,17 @@ use constant USER_MATCH_MULTIPLE => -1;
 use constant USER_MATCH_FAILED   => 0;
 use constant USER_MATCH_SUCCESS  => 1;
 
-use constant MATCH_SKIP_CONFIRM  => 1;
+use constant MATCH_SKIP_CONFIRM => 1;
 
 use constant DEFAULT_USER => {
-    'userid'         => 0,
-    'realname'       => '',
-    'login_name'     => '',
-    'showmybugslink' => 0,
-    'disabledtext'   => '',
-    'disable_mail'   => 0,
-    'is_enabled'     => 1, 
+  'userid'         => 0,
+  'login_name'     => '',
+  'email'          => '',
+  'realname'       => '',
+  'showmybugslink' => 0,
+  'disabledtext'   => '',
+  'disable_mail'   => 0,
+  'is_enabled'     => 1,
 };
 
 use constant DB_TABLE => 'profiles';
@@ -64,18 +66,20 @@ use constant DB_TABLE => 'profiles';
 # Bugzilla::User used "name" for the realname field. This should be
 # fixed one day.
 sub DB_COLUMNS {
-    my $dbh = Bugzilla->dbh;
-    return (
-        'profiles.userid',
-        'profiles.login_name',
-        'profiles.realname',
-        'profiles.mybugslink AS showmybugslink',
-        'profiles.disabledtext',
-        'profiles.disable_mail',
-        'profiles.extern_id',
-        'profiles.is_enabled',
-        $dbh->sql_date_format('last_seen_date', '%Y-%m-%d') . ' AS last_seen_date',
+  my $dbh = Bugzilla->dbh;
+  return (
+    'profiles.userid',
+    'profiles.login_name',
+    'profiles.email',
+    'profiles.realname',
+    'profiles.mybugslink AS showmybugslink',
+    'profiles.disabledtext',
+    'profiles.disable_mail',
+    'profiles.extern_id',
+    'profiles.is_enabled',
+    $dbh->sql_date_format('last_seen_date', '%Y-%m-%d') . ' AS last_seen_date',
     ),
+    ;
 }
 
 use constant NAME_FIELD => 'login_name';
@@ -83,32 +87,33 @@ use constant ID_FIELD   => 'userid';
 use constant LIST_ORDER => NAME_FIELD;
 
 use constant VALIDATORS => {
-    cryptpassword => \&_check_password,
-    disable_mail  => \&_check_disable_mail,
-    disabledtext  => \&_check_disabledtext,
-    login_name    => \&check_login_name,
-    realname      => \&_check_realname,
-    extern_id     => \&_check_extern_id,
-    is_enabled    => \&_check_is_enabled, 
+  cryptpassword => \&_check_password,
+  disable_mail  => \&_check_disable_mail,
+  disabledtext  => \&_check_disabledtext,
+  login_name    => \&check_login_name,
+  email         => \&check_email,
+  realname      => \&_check_realname,
+  extern_id     => \&_check_extern_id,
+  is_enabled    => \&_check_is_enabled,
 };
 
 sub UPDATE_COLUMNS {
-    my $self = shift;
-    my @cols = qw(
-        disable_mail
-        disabledtext
-        login_name
-        realname
-        extern_id
-        is_enabled
-    );
-    push(@cols, 'cryptpassword') if exists $self->{cryptpassword};
-    return @cols;
-};
-
-use constant VALIDATOR_DEPENDENCIES => {
-    is_enabled => ['disabledtext'], 
-};
+  my $self = shift;
+  my @cols = qw(
+    disable_mail
+    disabledtext
+    login_name
+    email
+    realname
+    extern_id
+    is_enabled
+  );
+  push(@cols, 'cryptpassword') if exists $self->{cryptpassword};
+  return @cols;
+}
+
+use constant VALIDATOR_DEPENDENCIES =>
+  {is_enabled => ['disabledtext'], login_name => ['email'],};
 
 use constant EXTRA_REQUIRED_FIELDS => qw(is_enabled);
 
@@ -117,129 +122,140 @@ use constant EXTRA_REQUIRED_FIELDS => qw(is_enabled);
 ################################################################################
 
 sub new {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my ($param) = @_;
-
-    my $user = { %{ DEFAULT_USER() } };
-    bless ($user, $class);
-    return $user unless $param;
-
-    if (ref($param) eq 'HASH') {
-        if (defined $param->{extern_id}) {
-            $param = { condition => 'extern_id = ?' , values => [$param->{extern_id}] };
-            $_[0] = $param;
-        }
+  my $invocant = shift;
+  my $class    = ref($invocant) || $invocant;
+  my ($param)  = @_;
+
+  my $user = {%{DEFAULT_USER()}};
+  bless($user, $class);
+  return $user unless $param;
+
+  if (ref($param) eq 'HASH') {
+    if (defined $param->{extern_id}) {
+      $param = {condition => 'extern_id = ?', values => [$param->{extern_id}]};
+      $_[0] = $param;
     }
-    return $class->SUPER::new(@_);
+  }
+
+  $user = $class->SUPER::new(@_);
+
+  # MySQL considers some non-ascii characters such as umlauts to equal
+  # ascii characters returning a user when it should not.
+  if ($user && ref $param eq 'HASH' && exists $param->{name}) {
+    my $login = $param->{name};
+    if (lc $login ne lc $user->login) {
+      $user = undef;
+    }
+  }
+
+  return $user;
 }
 
 sub super_user {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my ($param) = @_;
+  my $invocant = shift;
+  my $class    = ref($invocant) || $invocant;
+  my ($param)  = @_;
 
-    my $user = { %{ DEFAULT_USER() } };
-    $user->{groups} = [Bugzilla::Group->get_all];
-    $user->{bless_groups} = [Bugzilla::Group->get_all];
-    bless $user, $class;
-    return $user;
+  my $user = {%{DEFAULT_USER()}};
+  $user->{groups}       = [Bugzilla::Group->get_all];
+  $user->{bless_groups} = [Bugzilla::Group->get_all];
+  bless $user, $class;
+  return $user;
 }
 
 sub _update_groups {
-    my $self = shift;
-    my $group_changes = shift;
-    my $changes = shift;
-    my $dbh = Bugzilla->dbh;
-
-    # Update group settings.
-    my $sth_add_mapping = $dbh->prepare(
-        qq{INSERT INTO user_group_map (
+  my $self          = shift;
+  my $group_changes = shift;
+  my $changes       = shift;
+  my $dbh           = Bugzilla->dbh;
+
+  # Update group settings.
+  my $sth_add_mapping = $dbh->prepare(
+    qq{INSERT INTO user_group_map (
                   user_id, group_id, isbless, grant_type
                  ) VALUES (
                   ?, ?, ?, ?
                  )
-          });
-    my $sth_remove_mapping = $dbh->prepare(
-        qq{DELETE FROM user_group_map
+          }
+  );
+  my $sth_remove_mapping = $dbh->prepare(
+    qq{DELETE FROM user_group_map
             WHERE user_id = ?
               AND group_id = ?
               AND isbless = ?
               AND grant_type = ?
-          });
+          }
+  );
 
-    foreach my $is_bless (keys %$group_changes) {
-        my ($removed, $added) = @{$group_changes->{$is_bless}};
+  foreach my $is_bless (keys %$group_changes) {
+    my ($removed, $added) = @{$group_changes->{$is_bless}};
 
-        foreach my $group (@$removed) {
-            $sth_remove_mapping->execute(
-                $self->id, $group->id, $is_bless, GRANT_DIRECT
-             );
-        }
-        foreach my $group (@$added) {
-            $sth_add_mapping->execute(
-                $self->id, $group->id, $is_bless, GRANT_DIRECT
-             );
-        }
+    foreach my $group (@$removed) {
+      $sth_remove_mapping->execute($self->id, $group->id, $is_bless, GRANT_DIRECT);
+    }
+    foreach my $group (@$added) {
+      $sth_add_mapping->execute($self->id, $group->id, $is_bless, GRANT_DIRECT);
+    }
 
-        if (! $is_bless) {
-            my $query = qq{
+    if (!$is_bless) {
+      my $query = qq{
                 INSERT INTO profiles_activity
                     (userid, who, profiles_when, fieldid, oldvalue, newvalue)
                 VALUES ( ?, ?, now(), ?, ?, ?)
             };
 
-            $dbh->do(
-                $query, undef,
-                $self->id, Bugzilla->user->id,
-                get_field_id('bug_group'),
-                join(', ', map { $_->name } @$removed),
-                join(', ', map { $_->name } @$added)
-            );
-        }
-        else {
-            # XXX: should create profiles_activity entries for blesser changes.
-        }
+      $dbh->do(
+        $query, undef, $self->id, Bugzilla->user->id,
+        get_field_id('bug_group'),
+        join(', ', map { $_->name } @$removed),
+        join(', ', map { $_->name } @$added)
+      );
+    }
+    else {
+      # XXX: should create profiles_activity entries for blesser changes.
+    }
 
-        Bugzilla->memcached->clear_config({ key => 'user_groups.' . $self->id });
+    Bugzilla->memcached->clear_config({key => 'user_groups.' . $self->id});
 
-        my $type = $is_bless ? 'bless_groups' : 'groups';
-        $changes->{$type} = [
-            [ map { $_->name } @$removed ],
-            [ map { $_->name } @$added ],
-        ];
-    }
+    my $type = $is_bless ? 'bless_groups' : 'groups';
+    $changes->{$type} = [[map { $_->name } @$removed], [map { $_->name } @$added],];
+  }
 }
 
 sub update {
-    my $self = shift;
-    my $options = shift;
+  my $self    = shift;
+  my $options = shift;
 
-    my $group_changes = delete $self->{_group_changes};
+  my $group_changes = delete $self->{_group_changes};
 
-    my $changes = $self->SUPER::update(@_);
-    my $dbh = Bugzilla->dbh;
-    $self->_update_groups($group_changes, $changes);
+  my $changes = $self->SUPER::update(@_);
+  my $dbh     = Bugzilla->dbh;
+  $self->_update_groups($group_changes, $changes);
 
-    if (exists $changes->{login_name}) {
-        # Delete all the tokens related to the userid
-        $dbh->do('DELETE FROM tokens WHERE userid = ?', undef, $self->id)
-          unless $options->{keep_tokens};
-        # And rederive regex groups
-        $self->derive_regexp_groups();
-    }
+  if (exists $changes->{email}) {
+
+    # Delete all the tokens related to the userid
+    $dbh->do('DELETE FROM tokens WHERE userid = ?', undef, $self->id)
+      unless $options->{keep_tokens};
+
+    # And rederive regex groups
+    $self->derive_regexp_groups();
+  }
 
-    # Logout the user if necessary.
-    Bugzilla->logout_user($self) 
-        if (!$options->{keep_session}
-            && (exists $changes->{login_name}
-                || exists $changes->{disabledtext}
-                || exists $changes->{cryptpassword}));
+  # Logout the user if necessary.
+  Bugzilla->logout_user($self)
+    if (
+    !$options->{keep_session}
+    && ( exists $changes->{login_name}
+      || exists $changes->{email}
+      || exists $changes->{disabledtext}
+      || exists $changes->{cryptpassword})
+    );
+
+  # XXX Can update profiles_activity here as soon as it understands
+  #     field names like login_name.
 
-    # XXX Can update profiles_activity here as soon as it understands
-    #     field names like login_name.
-    
-    return $changes;
+  return $changes;
 }
 
 ################################################################################
@@ -251,213 +267,255 @@ sub _check_disabledtext { return trim($_[1]) || ''; }
 
 # Check whether the extern_id is unique.
 sub _check_extern_id {
-    my ($invocant, $extern_id) = @_;
-    $extern_id = trim($extern_id);
-    return undef unless defined($extern_id) && $extern_id ne "";
-    if (!ref($invocant) || $invocant->extern_id ne $extern_id) {
-        my $existing_login = $invocant->new({ extern_id => $extern_id });
-        if ($existing_login) {
-            ThrowUserError( 'extern_id_exists',
-                            { extern_id => $extern_id,
-                              existing_login_name => $existing_login->login });
-        }
+  my ($invocant, $extern_id) = @_;
+  $extern_id = trim($extern_id);
+  return undef unless defined($extern_id) && $extern_id ne "";
+  if (!ref($invocant) || $invocant->extern_id ne $extern_id) {
+    my $existing_login = $invocant->new({extern_id => $extern_id});
+    if ($existing_login) {
+      ThrowUserError('extern_id_exists',
+        {extern_id => $extern_id, existing_login_name => $existing_login->login});
     }
-    return $extern_id;
+  }
+  return $extern_id;
 }
 
-# This is public since createaccount.cgi needs to use it before issuing
-# a token for account creation.
 sub check_login_name {
-    my ($invocant, $name) = @_;
-    $name = trim($name);
-    $name || ThrowUserError('user_login_required');
-    check_email_syntax($name);
-
-    # Check the name if it's a new user, or if we're changing the name.
-    if (!ref($invocant) || lc($invocant->login) ne lc($name)) {
-        my @params = ($name);
-        push(@params, $invocant->login) if ref($invocant);
-        is_available_username(@params)
-            || ThrowUserError('account_exists', { email => $name });
+  my ($invocant, $login, undef, $data) = @_;
+
+  # No control characters
+  $login = clean_text($login);
+  $login || ThrowUserError('user_login_required');
+
+  # No whitespace
+  $login !~ /\s/ || ThrowUserError('login_illegal_character');
+
+  # No @ sign unless login is email (VALIDATOR_DEPENDENCIES means
+  # this will be set already)
+  if ($login =~ /@/) {
+    my $email = ref($invocant) ? $invocant->email : $data->{email};
+
+    # We should really use fc() instead of lc(), but this requires Perl 5.16.
+    ThrowUserError('login_at_sign_disallowed') unless lc($login) eq lc($email);
+  }
+
+  # We set the max length to 127 to ensure logins aren't truncated when
+  # inserted into the tokens.eventdata field.
+  length($login) <= 127 or ThrowUserError('login_too_long');
+
+  trick_taint($login);
+
+  # Check the login name if it's a new user, or if we're changing the login name.
+  if (!ref($invocant) || lc($invocant->login) ne lc($login)) {
+    if (login_to_id($login)) {
+      ThrowUserError('account_exists', {login => $login});
     }
+  }
 
-    return $name;
+  return $login;
+}
+
+sub check_email {
+  my ($invocant, $email) = @_;
+  $email = clean_text($email);
+  $email || ThrowUserError('email_required');
+
+  check_email_syntax($email);
+
+  # Check the email if it's a new user, or if we're changing the email.
+  my $old_email = ref($invocant) ? $invocant->email : undef;
+  if (!defined($old_email) || lc($old_email) ne lc($email)) {
+    is_available_email($email, $old_email)
+      || ThrowUserError('account_exists', {email => $email});
+  }
+
+  return $email;
 }
 
 sub _check_password {
-    my ($self, $pass) = @_;
+  my ($self, $pass) = @_;
 
-    # If the password is '*', do not encrypt it or validate it further--we 
-    # are creating a user who should not be able to log in using DB 
-    # authentication.
-    return $pass if $pass eq '*';
+  # If the password is '*', do not encrypt it or validate it further--we
+  # are creating a user who should not be able to log in using DB
+  # authentication.
+  return $pass if $pass eq '*';
 
-    validate_password($pass);
-    my $cryptpassword = bz_crypt($pass);
-    return $cryptpassword;
+  validate_password($pass);
+  my $cryptpassword = bz_crypt($pass);
+  return $cryptpassword;
 }
 
 sub _check_realname { return trim($_[1]) || ''; }
 
 sub _check_is_enabled {
-    my ($invocant, $is_enabled, undef, $params) = @_;
-    # is_enabled is set automatically on creation depending on whether 
-    # disabledtext is empty (enabled) or not empty (disabled).
-    # When updating the user, is_enabled is set by calling set_disabledtext().
-    # Any value passed into this validator is ignored.
-    my $disabledtext = ref($invocant) ? $invocant->disabledtext : $params->{disabledtext};
-    return $disabledtext ? 0 : 1;
+  my ($invocant, $is_enabled, undef, $params) = @_;
+
+  # is_enabled is set automatically on creation depending on whether
+  # disabledtext is empty (enabled) or not empty (disabled).
+  # When updating the user, is_enabled is set by calling set_disabledtext().
+  # Any value passed into this validator is ignored.
+  my $disabledtext
+    = ref($invocant) ? $invocant->disabledtext : $params->{disabledtext};
+  return $disabledtext ? 0 : 1;
 }
 
 ################################################################################
 # Mutators
 ################################################################################
 
-sub set_disable_mail { $_[0]->set('disable_mail', $_[1]); }
-sub set_extern_id    { $_[0]->set('extern_id', $_[1]); }
+sub set_disable_mail  { $_[0]->set('disable_mail', $_[1]); }
+sub set_email_enabled { $_[0]->set('disable_mail', !$_[1]); }
+sub set_extern_id     { $_[0]->set('extern_id',    $_[1]); }
 
 sub set_login {
-    my ($self, $login) = @_;
-    $self->set('login_name', $login);
-    delete $self->{identity};
-    delete $self->{nick};
+  my ($self, $login) = @_;
+  $self->set('login_name', $login);
+  delete $self->{identity};
+  delete $self->{nick};
+}
+
+sub set_email {
+  my ($self, $email) = @_;
+  $self->set('email', $email);
+  $self->set_login($email) if Bugzilla->params->{'use_email_as_login'};
 }
 
 sub set_name {
-    my ($self, $name) = @_;
-    $self->set('realname', $name);
-    delete $self->{identity};
+  my ($self, $name) = @_;
+  $self->set('realname', $name);
+  delete $self->{identity};
 }
 
 sub set_password { $_[0]->set('cryptpassword', $_[1]); }
 
 sub set_disabledtext {
-    $_[0]->set('disabledtext', $_[1]);
-    $_[0]->set('is_enabled', $_[1] ? 0 : 1);
+  $_[0]->set('disabledtext', $_[1]);
+  $_[0]->set('is_enabled', $_[1] ? 0 : 1);
 }
 
 sub set_groups {
-    my $self = shift;
-    $self->_set_groups(GROUP_MEMBERSHIP, @_);
+  my $self = shift;
+  $self->_set_groups(GROUP_MEMBERSHIP, @_);
 }
 
 sub set_bless_groups {
-    my $self = shift;
+  my $self = shift;
 
-    # The person making the change needs to be in the editusers group
-    Bugzilla->user->in_group('editusers')
-        || ThrowUserError("auth_failure", {group  => "editusers",
-                                           reason => "cant_bless",
-                                           action => "edit",
-                                           object => "users"});
+  # The person making the change needs to be in the editusers group
+  Bugzilla->user->in_group('editusers') || ThrowUserError(
+    "auth_failure",
+    {
+      group  => "editusers",
+      reason => "cant_bless",
+      action => "edit",
+      object => "users"
+    }
+  );
 
-    $self->_set_groups(GROUP_BLESS, @_);
+  $self->_set_groups(GROUP_BLESS, @_);
 }
 
 sub _set_groups {
-    my $self     = shift;
-    my $is_bless = shift;
-    my $changes  = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self     = shift;
+  my $is_bless = shift;
+  my $changes  = shift;
+  my $dbh      = Bugzilla->dbh;
 
-    # The person making the change is $user, $self is the person being changed
-    my $user = Bugzilla->user;
+  # The person making the change is $user, $self is the person being changed
+  my $user = Bugzilla->user;
 
-    # Input is a hash of arrays. Key is 'set', 'add' or 'remove'. The array
-    # is a list of group ids and/or names.
+  # Input is a hash of arrays. Key is 'set', 'add' or 'remove'. The array
+  # is a list of group ids and/or names.
 
-    # First turn the arrays into group objects.
-    $changes = $self->_set_groups_to_object($changes);
+  # First turn the arrays into group objects.
+  $changes = $self->_set_groups_to_object($changes);
 
-    # Get a list of the groups the user currently is a member of
-    my $ids = $dbh->selectcol_arrayref(
-        q{SELECT DISTINCT group_id
+  # Get a list of the groups the user currently is a member of
+  my $ids = $dbh->selectcol_arrayref(
+    q{SELECT DISTINCT group_id
             FROM user_group_map
-           WHERE user_id = ? AND isbless = ? AND grant_type = ?},
-        undef, $self->id, $is_bless, GRANT_DIRECT);
-
-    my $current_groups = Bugzilla::Group->new_from_list($ids);
-    my $new_groups = dclone($current_groups);
-
-    # Record the changes
-    if (exists $changes->{set}) {
-        $new_groups = $changes->{set};
-
-        # We need to check the user has bless rights on the existing groups
-        # If they don't, then we need to add them back to new_groups
-        foreach my $group (@$current_groups) {
-            if (! $user->can_bless($group->id)) {
-                push @$new_groups, $group
-                    unless grep { $_->id eq $group->id } @$new_groups;
-            }
-        }
+           WHERE user_id = ? AND isbless = ? AND grant_type = ?}, undef, $self->id,
+    $is_bless, GRANT_DIRECT
+  );
+
+  my $current_groups = Bugzilla::Group->new_from_list($ids);
+  my $new_groups     = dclone($current_groups);
+
+  # Record the changes
+  if (exists $changes->{set}) {
+    $new_groups = $changes->{set};
+
+    # We need to check the user has bless rights on the existing groups
+    # If they don't, then we need to add them back to new_groups
+    foreach my $group (@$current_groups) {
+      if (!$user->can_bless($group->id)) {
+        push @$new_groups, $group unless grep { $_->id eq $group->id } @$new_groups;
+      }
     }
-    else {
-        foreach my $group (@{$changes->{remove} // []}) {
-            @$new_groups = grep { $_->id ne $group->id } @$new_groups;
-        }
-        foreach my $group (@{$changes->{add} // []}) {
-            push @$new_groups, $group
-                unless grep { $_->id eq $group->id } @$new_groups;
-        }
+  }
+  else {
+    foreach my $group (@{$changes->{remove} // []}) {
+      @$new_groups = grep { $_->id ne $group->id } @$new_groups;
     }
-
-    # Stash the changes, so self->update can actually make them
-    my @diffs = diff_arrays($current_groups, $new_groups, 'id');
-    if (scalar(@{$diffs[0]}) || scalar(@{$diffs[1]})) {
-        $self->{_group_changes}{$is_bless} = \@diffs;
+    foreach my $group (@{$changes->{add} // []}) {
+      push @$new_groups, $group unless grep { $_->id eq $group->id } @$new_groups;
     }
+  }
+
+  # Stash the changes, so self->update can actually make them
+  my @diffs = diff_arrays($current_groups, $new_groups, 'id');
+  if (scalar(@{$diffs[0]}) || scalar(@{$diffs[1]})) {
+    $self->{_group_changes}{$is_bless} = \@diffs;
+  }
 }
 
 sub _set_groups_to_object {
-    my $self = shift;
-    my $changes = shift;
-    my $user = Bugzilla->user;
-
-    foreach my $key (keys %$changes) {
-        # Check we were given an array
-        unless (ref($changes->{$key}) eq 'ARRAY') {
-            ThrowCodeError(
-                'param_invalid',
-                { param => $changes->{$key}, function => $key }
-            );
-        }
+  my $self    = shift;
+  my $changes = shift;
+  my $user    = Bugzilla->user;
 
-        # Go through the array, and turn items into group objects
-        my @groups = ();
-        foreach my $value (@{$changes->{$key}}) {
-            my $type = $value =~ /^\d+$/ ? 'id' : 'name';
-            my $group = Bugzilla::Group->new({$type => $value});
-
-            if (! $group || ! $user->can_bless($group->id)) {
-                ThrowUserError('auth_failure',
-                    { group  => $value, reason => 'cant_bless',
-                      action => 'edit', object => 'users' });
-            }
-            push @groups, $group;
-        }
-        $changes->{$key} = \@groups;
+  foreach my $key (keys %$changes) {
+
+    # Check we were given an array
+    unless (ref($changes->{$key}) eq 'ARRAY') {
+      ThrowCodeError('param_invalid', {param => $changes->{$key}, function => $key});
     }
 
-    return $changes;
+    # Go through the array, and turn items into group objects
+    my @groups = ();
+    foreach my $value (@{$changes->{$key}}) {
+      my $type = $value =~ /^\d+$/ ? 'id' : 'name';
+      my $group = Bugzilla::Group->new({$type => $value});
+
+      if (!$group || !$user->can_bless($group->id)) {
+        ThrowUserError('auth_failure',
+          {group => $value, reason => 'cant_bless', action => 'edit', object => 'users'});
+      }
+      push @groups, $group;
+    }
+    $changes->{$key} = \@groups;
+  }
+
+  return $changes;
 }
 
 sub update_last_seen_date {
-    my $self = shift;
-    return unless $self->id;
-    my $dbh = Bugzilla->dbh;
-    my $date = $dbh->selectrow_array(
-        'SELECT ' . $dbh->sql_date_format('NOW()', '%Y-%m-%d'));
-
-    if (!$self->last_seen_date or $date ne $self->last_seen_date) {
-        $self->{last_seen_date} = $date;
-        # We don't use the normal update() routine here as we only
-        # want to update the last_seen_date column, not any other
-        # pending changes
-        $dbh->do("UPDATE profiles SET last_seen_date = ? WHERE userid = ?",
-                 undef, $date, $self->id);
-        Bugzilla->memcached->clear({ table => 'profiles', id => $self->id });
-    }
+  my $self = shift;
+  return unless $self->id;
+  my $dbh  = Bugzilla->dbh;
+  my $date = $dbh->selectrow_array(
+    'SELECT ' . $dbh->sql_date_format('NOW()', '%Y-%m-%d'));
+
+  if (!$self->last_seen_date or $date ne $self->last_seen_date) {
+    $self->{last_seen_date} = $date;
+
+    # We don't use the normal update() routine here as we only
+    # want to update the last_seen_date column, not any other
+    # pending changes
+    $dbh->do("UPDATE profiles SET last_seen_date = ? WHERE userid = ?",
+      undef, $date, $self->id);
+    Bugzilla->memcached->clear({table => 'profiles', id => $self->id});
+  }
 }
 
 ################################################################################
@@ -465,171 +523,195 @@ sub update_last_seen_date {
 ################################################################################
 
 # Accessors for user attributes
-sub name  { $_[0]->{realname};   }
-sub login { $_[0]->{login_name}; }
-sub extern_id { $_[0]->{extern_id}; }
-sub email { $_[0]->login . Bugzilla->params->{'emailsuffix'}; }
-sub disabledtext { $_[0]->{'disabledtext'}; }
-sub is_enabled { $_[0]->{'is_enabled'} ? 1 : 0; }
+sub name           { $_[0]->{realname}; }
+sub login          { $_[0]->{login_name}; }
+sub extern_id      { $_[0]->{extern_id}; }
+sub email          { $_[0]->{email}; }
+sub disabledtext   { $_[0]->{'disabledtext'}; }
+sub is_enabled     { $_[0]->{'is_enabled'} ? 1 : 0; }
 sub showmybugslink { $_[0]->{showmybugslink}; }
 sub email_disabled { $_[0]->{disable_mail}; }
-sub email_enabled { !($_[0]->{disable_mail}); }
+sub email_enabled  { !($_[0]->{disable_mail}); }
 sub last_seen_date { $_[0]->{last_seen_date}; }
+
 sub cryptpassword {
-    my $self = shift;
-    # We don't store it because we never want it in the object (we
-    # don't want to accidentally dump even the hash somewhere).
-    my ($pw) = Bugzilla->dbh->selectrow_array(
-        'SELECT cryptpassword FROM profiles WHERE userid = ?',
-        undef, $self->id);
-    return $pw;
+  my $self = shift;
+
+  # We don't store it because we never want it in the object (we
+  # don't want to accidentally dump even the hash somewhere).
+  my ($pw)
+    = Bugzilla->dbh->selectrow_array(
+    'SELECT cryptpassword FROM profiles WHERE userid = ?',
+    undef, $self->id);
+  return $pw;
 }
 
 sub set_authorizer {
-    my ($self, $authorizer) = @_;
-    $self->{authorizer} = $authorizer;
+  my ($self, $authorizer) = @_;
+  $self->{authorizer} = $authorizer;
 }
+
 sub authorizer {
-    my ($self) = @_;
-    if (!$self->{authorizer}) {
-        require Bugzilla::Auth;
-        $self->{authorizer} = new Bugzilla::Auth();
-    }
-    return $self->{authorizer};
+  my ($self) = @_;
+  if (!$self->{authorizer}) {
+    require Bugzilla::Auth;
+    $self->{authorizer} = new Bugzilla::Auth();
+  }
+  return $self->{authorizer};
 }
 
 # Generate a string to identify the user by name + login if the user
 # has a name or by login only if they don't.
+#
+# See also get_userlist(), which constructs pseudo-Bugzilla::Users, including
+# the 'identity' value.
 sub identity {
-    my $self = shift;
+  my $self = shift;
 
-    return "" unless $self->id;
+  return "" unless $self->id;
 
-    if (!defined $self->{identity}) {
-        $self->{identity} = 
-          $self->name ? $self->name . " <" . $self->login. ">" : $self->login;
-    }
+  if (!defined $self->{identity}) {
+    $self->{identity}
+      = $self->name ? $self->name . " (" . $self->login . ")" : $self->login;
+  }
 
-    return $self->{identity};
+  return $self->{identity};
 }
 
 sub nick {
-    my $self = shift;
+  my $self = shift;
 
-    return "" unless $self->id;
+  return "" unless $self->id;
 
-    if (!defined $self->{nick}) {
-        $self->{nick} = (split(/@/, $self->login, 2))[0];
-    }
+  if (!defined $self->{nick}) {
+
+    # This has the correct result even if the login does not contain an @.
+    $self->{nick} = (split(/@/, $self->login, 2))[0];
+  }
 
-    return $self->{nick};
+  return $self->{nick};
 }
 
 sub queries {
-    my $self = shift;
-    return $self->{queries} if defined $self->{queries};
-    return [] unless $self->id;
+  my $self = shift;
+  return $self->{queries} if defined $self->{queries};
+  return [] unless $self->id;
 
-    my $dbh = Bugzilla->dbh;
-    my $query_ids = $dbh->selectcol_arrayref(
-        'SELECT id FROM namedqueries WHERE userid = ?', undef, $self->id);
-    require Bugzilla::Search::Saved;
-    $self->{queries} = Bugzilla::Search::Saved->new_from_list($query_ids);
+  my $dbh = Bugzilla->dbh;
+  my $query_ids
+    = $dbh->selectcol_arrayref('SELECT id FROM namedqueries WHERE userid = ?',
+    undef, $self->id);
+  require Bugzilla::Search::Saved;
+  $self->{queries} = Bugzilla::Search::Saved->new_from_list($query_ids);
 
-    # We preload link_in_footer from here as this information is always requested.
-    # This only works if the user object represents the current logged in user.
-    Bugzilla::Search::Saved::preload($self->{queries}) if $self->id == Bugzilla->user->id;
+  # We preload link_in_footer from here as this information is always requested.
+  # This only works if the user object represents the current logged in user.
+  Bugzilla::Search::Saved::preload($self->{queries})
+    if $self->id == Bugzilla->user->id;
 
-    return $self->{queries};
+  return $self->{queries};
 }
 
 sub queries_subscribed {
-    my $self = shift;
-    return $self->{queries_subscribed} if defined $self->{queries_subscribed};
-    return [] unless $self->id;
-
-    # Exclude the user's own queries.
-    my @my_query_ids = map($_->id, @{$self->queries});
-    my $query_id_string = join(',', @my_query_ids) || '-1';
-
-    # Only show subscriptions that we can still actually see. If a
-    # user changes the shared group of a query, our subscription
-    # will remain but we won't have access to the query anymore.
-    my $subscribed_query_ids = Bugzilla->dbh->selectcol_arrayref(
-        "SELECT lif.namedquery_id
+  my $self = shift;
+  return $self->{queries_subscribed} if defined $self->{queries_subscribed};
+  return [] unless $self->id;
+
+  # Exclude the user's own queries.
+  my @my_query_ids = map($_->id, @{$self->queries});
+  my $query_id_string = join(',', @my_query_ids) || '-1';
+
+  # Only show subscriptions that we can still actually see. If a
+  # user changes the shared group of a query, our subscription
+  # will remain but we won't have access to the query anymore.
+  my $subscribed_query_ids = Bugzilla->dbh->selectcol_arrayref(
+    "SELECT lif.namedquery_id
            FROM namedqueries_link_in_footer lif
                 INNER JOIN namedquery_group_map ngm
                 ON ngm.namedquery_id = lif.namedquery_id
           WHERE lif.user_id = ? 
                 AND lif.namedquery_id NOT IN ($query_id_string)
-                AND " . $self->groups_in_sql,
-          undef, $self->id);
-    require Bugzilla::Search::Saved;
-    $self->{queries_subscribed} =
-        Bugzilla::Search::Saved->new_from_list($subscribed_query_ids);
-    return $self->{queries_subscribed};
+                AND " . $self->groups_in_sql, undef, $self->id
+  );
+  require Bugzilla::Search::Saved;
+  $self->{queries_subscribed}
+    = Bugzilla::Search::Saved->new_from_list($subscribed_query_ids);
+  return $self->{queries_subscribed};
 }
 
 sub queries_available {
-    my $self = shift;
-    return $self->{queries_available} if defined $self->{queries_available};
-    return [] unless $self->id;
+  my $self = shift;
+  return $self->{queries_available} if defined $self->{queries_available};
+  return [] unless $self->id;
 
-    # Exclude the user's own queries.
-    my @my_query_ids = map($_->id, @{$self->queries});
-    my $query_id_string = join(',', @my_query_ids) || '-1';
+  # Exclude the user's own queries.
+  my @my_query_ids = map($_->id, @{$self->queries});
+  my $query_id_string = join(',', @my_query_ids) || '-1';
 
-    my $avail_query_ids = Bugzilla->dbh->selectcol_arrayref(
-        'SELECT namedquery_id FROM namedquery_group_map
-          WHERE '  . $self->groups_in_sql . "
-                AND namedquery_id NOT IN ($query_id_string)");
-    require Bugzilla::Search::Saved;
-    $self->{queries_available} =
-        Bugzilla::Search::Saved->new_from_list($avail_query_ids);
-    return $self->{queries_available};
+  my $avail_query_ids = Bugzilla->dbh->selectcol_arrayref(
+    'SELECT namedquery_id FROM namedquery_group_map
+          WHERE ' . $self->groups_in_sql . "
+                AND namedquery_id NOT IN ($query_id_string)"
+  );
+  require Bugzilla::Search::Saved;
+  $self->{queries_available}
+    = Bugzilla::Search::Saved->new_from_list($avail_query_ids);
+  return $self->{queries_available};
 }
 
 sub tags {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    if (!defined $self->{tags}) {
-        # We must use LEFT JOIN instead of INNER JOIN as we may be
-        # in the process of inserting a new tag to some bugs,
-        # in which case there are no bugs with this tag yet.
-        $self->{tags} = $dbh->selectall_hashref(
-            'SELECT name, id, COUNT(bug_id) AS bug_count
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  if (!defined $self->{tags}) {
+
+    # We must use LEFT JOIN instead of INNER JOIN as we may be
+    # in the process of inserting a new tag to some bugs,
+    # in which case there are no bugs with this tag yet.
+    $self->{tags} = $dbh->selectall_hashref(
+      'SELECT name, id, COUNT(bug_id) AS bug_count
                FROM tag
           LEFT JOIN bug_tag ON bug_tag.tag_id = tag.id
-              WHERE user_id = ? ' . $dbh->sql_group_by('id', 'name'),
-            'name', undef, $self->id);
-    }
-    return $self->{tags};
+              WHERE user_id = ? ' . $dbh->sql_group_by('id', 'name'), 'name', undef,
+      $self->id
+    );
+  }
+  return $self->{tags};
 }
 
 sub bugs_ignored {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
-    if (!defined $self->{'bugs_ignored'}) {
-        $self->{'bugs_ignored'} = $dbh->selectall_arrayref(
-            'SELECT bugs.bug_id AS id,
+  my ($self) = @_;
+  my $dbh = Bugzilla->dbh;
+  if (!defined $self->{'bugs_ignored'}) {
+    $self->{'bugs_ignored'} = $dbh->selectall_arrayref(
+      'SELECT bugs.bug_id AS id,
                     bugs.bug_status AS status,
                     bugs.short_desc AS summary
                FROM bugs
                     INNER JOIN email_bug_ignore
                     ON bugs.bug_id = email_bug_ignore.bug_id
-              WHERE user_id = ?',
-            { Slice => {} }, $self->id);
-        # Go ahead and load these into the visible bugs cache
-        # to speed up can_see_bug checks later
-        $self->visible_bugs([ map { $_->{'id'} } @{ $self->{'bugs_ignored'} } ]);
-    }
-    return $self->{'bugs_ignored'};
+              WHERE user_id = ?', {Slice => {}}, $self->id
+    );
+
+    # Go ahead and load these into the visible bugs cache
+    # to speed up can_see_bug checks later
+    $self->visible_bugs([map { $_->{'id'} } @{$self->{'bugs_ignored'}}]);
+  }
+  return $self->{'bugs_ignored'};
 }
 
 sub is_bug_ignored {
-    my ($self, $bug_id) = @_;
-    return (grep {$_->{'id'} == $bug_id} @{$self->bugs_ignored}) ? 1 : 0;
+  my ($self, $bug_id) = @_;
+  return (grep { $_->{'id'} == $bug_id } @{$self->bugs_ignored}) ? 1 : 0;
+}
+
+sub use_markdown {
+  my ($self, $comment) = @_;
+  return
+       Bugzilla->feature('markdown')
+    && $self->settings->{use_markdown}->{is_enabled}
+    && $self->settings->{use_markdown}->{value} eq 'on'
+    && (!defined $comment || $comment->is_markdown);
 }
 
 ##########################
@@ -637,308 +719,316 @@ sub is_bug_ignored {
 ##########################
 
 sub recent_searches {
-    my $self = shift;
-    $self->{recent_searches} ||= 
-        Bugzilla::Search::Recent->match({ user_id => $self->id });
-    return $self->{recent_searches};
+  my $self = shift;
+  $self->{recent_searches}
+    ||= Bugzilla::Search::Recent->match({user_id => $self->id});
+  return $self->{recent_searches};
 }
 
 sub recent_search_containing {
-    my ($self, $bug_id) = @_;
-    my $searches = $self->recent_searches;
+  my ($self, $bug_id) = @_;
+  my $searches = $self->recent_searches;
 
-    foreach my $search (@$searches) {
-        return $search if grep($_ == $bug_id, @{ $search->bug_list });
-    }
+  foreach my $search (@$searches) {
+    return $search if grep($_ == $bug_id, @{$search->bug_list});
+  }
 
-    return undef;
+  return undef;
 }
 
 sub recent_search_for {
-    my ($self, $bug) = @_;
-    my $params = Bugzilla->input_params;
-    my $cgi = Bugzilla->cgi;
-
-    if ($self->id) {
-        # First see if there's a list_id parameter in the query string.
-        my $list_id = $params->{list_id};
-        if (!$list_id) {
-            # If not, check for "list_id" in the query string of the referer.
-            my $referer = $cgi->referer;
-            if ($referer) {
-                my $uri = URI->new($referer);
-                if ($uri->path =~ /buglist\.cgi$/) {
-                    $list_id = $uri->query_param('list_id')
-                               || $uri->query_param('regetlastlist');
-                }
-            }
+  my ($self, $bug) = @_;
+  my $params = Bugzilla->input_params;
+  my $cgi    = Bugzilla->cgi;
+
+  if ($self->id) {
+
+    # First see if there's a list_id parameter in the query string.
+    my $list_id = $params->{list_id};
+    if (!$list_id) {
+
+      # If not, check for "list_id" in the query string of the referer.
+      my $referer = $cgi->referer;
+      if ($referer) {
+        my $uri = URI->new($referer);
+        if ($uri->path =~ /buglist\.cgi$/) {
+          $list_id = $uri->query_param('list_id') || $uri->query_param('regetlastlist');
         }
+      }
+    }
 
-        if ($list_id && $list_id ne 'cookie') {
-            # If we got a bad list_id (either some other user's or an expired
-            # one) don't crash, just don't return that list.
-            my $search = Bugzilla::Search::Recent->check_quietly(
-                { id => $list_id });
-            return $search if $search;
-        }
+    if ($list_id && $list_id ne 'cookie') {
 
-        # If there's no list_id, see if the current bug's id is contained
-        # in any of the user's saved lists.
-        my $search = $self->recent_search_containing($bug->id);
-        return $search if $search;
+      # If we got a bad list_id (either some other user's or an expired
+      # one) don't crash, just don't return that list.
+      my $search = Bugzilla::Search::Recent->check_quietly({id => $list_id});
+      return $search if $search;
     }
 
-    # Finally (or always, if we're logged out), if there's a BUGLIST cookie
-    # and the selected bug is in the list, then return the cookie as a fake
-    # Search::Recent object.
-    if (my $list = $cgi->cookie('BUGLIST')) {
-        # Also split on colons, which was used as a separator in old cookies.
-        my @bug_ids = split(/[:-]/, $list);
-        if (grep { $_ == $bug->id } @bug_ids) {
-            my $search = Bugzilla::Search::Recent->new_from_cookie(\@bug_ids);
-            return $search;
-        }
+    # If there's no list_id, see if the current bug's id is contained
+    # in any of the user's saved lists.
+    my $search = $self->recent_search_containing($bug->id);
+    return $search if $search;
+  }
+
+  # Finally (or always, if we're logged out), if there's a BUGLIST cookie
+  # and the selected bug is in the list, then return the cookie as a fake
+  # Search::Recent object.
+  if (my $list = $cgi->cookie('BUGLIST')) {
+
+    # Also split on colons, which was used as a separator in old cookies.
+    my @bug_ids = split(/[:-]/, $list);
+    if (grep { $_ == $bug->id } @bug_ids) {
+      my $search = Bugzilla::Search::Recent->new_from_cookie(\@bug_ids);
+      return $search;
     }
+  }
 
-    return undef;
+  return undef;
 }
 
 sub save_last_search {
-    my ($self, $params) = @_;
-    my ($bug_ids, $order, $vars, $list_id) = 
-        @$params{qw(bugs order vars list_id)};
-
-    my $cgi = Bugzilla->cgi;
-    if ($order) {
-        $cgi->send_cookie(-name => 'LASTORDER',
-                          -value => $order,
-                          -expires => 'Fri, 01-Jan-2038 00:00:00 GMT');
-    }
+  my ($self, $params) = @_;
+  my ($bug_ids, $order, $vars, $list_id) = @$params{qw(bugs order vars list_id)};
+
+  my $cgi = Bugzilla->cgi;
+  if ($order) {
+    $cgi->send_cookie(
+      -name    => 'LASTORDER',
+      -value   => $order,
+      -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'
+    );
+  }
 
-    return if !@$bug_ids;
-
-    my $search;
-    if ($self->id) {
-        on_main_db {
-            if ($list_id) {
-                $search = Bugzilla::Search::Recent->check_quietly({ id => $list_id });
-            }
-
-            if ($search) {
-                if (join(',', @{$search->bug_list}) ne join(',', @$bug_ids)) {
-                    $search->set_bug_list($bug_ids);
-                }
-                if (!$search->list_order || $order ne $search->list_order) {
-                    $search->set_list_order($order);
-                }
-                $search->update();
-            }
-            else {
-                # If we already have an existing search with a totally
-                # identical bug list, then don't create a new one. This
-                # prevents people from writing over their whole 
-                # recent-search list by just refreshing a saved search
-                # (which doesn't have list_id in the header) over and over.
-                my $list_string = join(',', @$bug_ids);
-                my $existing_search = Bugzilla::Search::Recent->match({
-                    user_id => $self->id, bug_list => $list_string });
-           
-                if (!scalar(@$existing_search)) {
-                    $search = Bugzilla::Search::Recent->create({
-                        user_id    => $self->id,
-                        bug_list   => $bug_ids,
-                        list_order => $order });
-                }
-                else {
-                    $search = $existing_search->[0];
-                }
-            }
-        };
-        delete $self->{recent_searches};
-    }
-    # Logged-out users use a cookie to store a single last search. We don't
-    # override that cookie with the logged-in user's latest search, because
-    # if they did one search while logged out and another while logged in,
-    # they may still want to navigate through the search they made while
-    # logged out.
-    else {
-        my $bug_list = join('-', @$bug_ids);
-        if (length($bug_list) < 4000) {
-            $cgi->send_cookie(-name => 'BUGLIST',
-                              -value => $bug_list,
-                              -expires => 'Fri, 01-Jan-2038 00:00:00 GMT');
+  return if !@$bug_ids;
+
+  my $search;
+  if ($self->id) {
+    on_main_db {
+      if ($list_id) {
+        $search = Bugzilla::Search::Recent->check_quietly({id => $list_id});
+      }
+
+      if ($search) {
+        if (join(',', @{$search->bug_list}) ne join(',', @$bug_ids)) {
+          $search->set_bug_list($bug_ids);
+        }
+        if (!$search->list_order || $order ne $search->list_order) {
+          $search->set_list_order($order);
+        }
+        $search->update();
+      }
+      else {
+        # If we already have an existing search with a totally
+        # identical bug list, then don't create a new one. This
+        # prevents people from writing over their whole
+        # recent-search list by just refreshing a saved search
+        # (which doesn't have list_id in the header) over and over.
+        my $list_string = join(',', @$bug_ids);
+        my $existing_search = Bugzilla::Search::Recent->match(
+          {user_id => $self->id, bug_list => $list_string});
+
+        if (!scalar(@$existing_search)) {
+          $search
+            = Bugzilla::Search::Recent->create({
+            user_id => $self->id, bug_list => $bug_ids, list_order => $order
+            });
         }
         else {
-            $cgi->remove_cookie('BUGLIST');
-            $vars->{'toolong'} = 1;
+          $search = $existing_search->[0];
         }
+      }
+    };
+    delete $self->{recent_searches};
+  }
+
+  # Logged-out users use a cookie to store a single last search. We don't
+  # override that cookie with the logged-in user's latest search, because
+  # if they did one search while logged out and another while logged in,
+  # they may still want to navigate through the search they made while
+  # logged out.
+  else {
+    my $bug_list = join('-', @$bug_ids);
+    if (length($bug_list) < 4000) {
+      $cgi->send_cookie(
+        -name    => 'BUGLIST',
+        -value   => $bug_list,
+        -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'
+      );
     }
-    return $search;
+    else {
+      $cgi->remove_cookie('BUGLIST');
+      $vars->{'toolong'} = 1;
+    }
+  }
+  return $search;
 }
 
 sub reports {
-    my $self = shift;
-    return $self->{reports} if defined $self->{reports};
-    return [] unless $self->id;
+  my $self = shift;
+  return $self->{reports} if defined $self->{reports};
+  return [] unless $self->id;
 
-    my $dbh = Bugzilla->dbh;
-    my $report_ids = $dbh->selectcol_arrayref(
-        'SELECT id FROM reports WHERE user_id = ?', undef, $self->id);
-    require Bugzilla::Report;
-    $self->{reports} = Bugzilla::Report->new_from_list($report_ids);
-    return $self->{reports};
+  my $dbh = Bugzilla->dbh;
+  my $report_ids
+    = $dbh->selectcol_arrayref('SELECT id FROM reports WHERE user_id = ?',
+    undef, $self->id);
+  require Bugzilla::Report;
+  $self->{reports} = Bugzilla::Report->new_from_list($report_ids);
+  return $self->{reports};
 }
 
 sub flush_reports_cache {
-    my $self = shift;
+  my $self = shift;
 
-    delete $self->{reports};
+  delete $self->{reports};
 }
 
 sub settings {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    return $self->{'settings'} if (defined $self->{'settings'});
+  return $self->{'settings'} if (defined $self->{'settings'});
 
-    # IF the user is logged in
-    # THEN get the user's settings
-    # ELSE get default settings
-    if ($self->id) {
-        $self->{'settings'} = get_all_settings($self->id);
-    } else {
-        $self->{'settings'} = get_defaults();
-    }
+  # IF the user is logged in
+  # THEN get the user's settings
+  # ELSE get default settings
+  if ($self->id) {
+    $self->{'settings'} = get_all_settings($self->id);
+  }
+  else {
+    $self->{'settings'} = get_defaults();
+  }
 
-    return $self->{'settings'};
+  return $self->{'settings'};
 }
 
 sub setting {
-    my ($self, $name) = @_;
-    return $self->settings->{$name}->{'value'};
+  my ($self, $name) = @_;
+  return $self->settings->{$name}->{'value'};
 }
 
 sub timezone {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{timezone}) {
-        my $tz = $self->setting('timezone');
-        if ($tz eq 'local') {
-            # The user wants the local timezone of the server.
-            $self->{timezone} = Bugzilla->local_timezone;
-        }
-        else {
-            $self->{timezone} = DateTime::TimeZone->new(name => $tz);
-        }
+  if (!defined $self->{timezone}) {
+    my $tz = $self->setting('timezone');
+    if ($tz eq 'local') {
+
+      # The user wants the local timezone of the server.
+      $self->{timezone} = Bugzilla->local_timezone;
     }
-    return $self->{timezone};
+    else {
+      $self->{timezone} = DateTime::TimeZone->new(name => $tz);
+    }
+  }
+  return $self->{timezone};
 }
 
 sub flush_queries_cache {
-    my $self = shift;
+  my $self = shift;
 
-    delete $self->{queries};
-    delete $self->{queries_subscribed};
-    delete $self->{queries_available};
+  delete $self->{queries};
+  delete $self->{queries_subscribed};
+  delete $self->{queries_available};
 }
 
 sub groups {
-    my $self = shift;
+  my $self = shift;
 
-    return $self->{groups} if defined $self->{groups};
-    return [] unless $self->id;
+  return $self->{groups} if defined $self->{groups};
+  return [] unless $self->id;
 
-    my $user_groups_key = "user_groups." . $self->id;
-    my $groups = Bugzilla->memcached->get_config({
-        key => $user_groups_key
-    });
+  my $user_groups_key = "user_groups." . $self->id;
+  my $groups = Bugzilla->memcached->get_config({key => $user_groups_key});
 
-    if (!$groups) {
-        my $dbh = Bugzilla->dbh;
-        my $groups_to_check = $dbh->selectcol_arrayref(
-            "SELECT DISTINCT group_id
+  if (!$groups) {
+    my $dbh             = Bugzilla->dbh;
+    my $groups_to_check = $dbh->selectcol_arrayref(
+      "SELECT DISTINCT group_id
                FROM user_group_map
-              WHERE user_id = ? AND isbless = 0", undef, $self->id);
-
-        my $grant_type_key = 'group_grant_type_' . GROUP_MEMBERSHIP;
-        my $membership_rows = Bugzilla->memcached->get_config({
-            key => $grant_type_key,
-        });
-        if (!$membership_rows) {
-            $membership_rows = $dbh->selectall_arrayref(
-                "SELECT DISTINCT grantor_id, member_id
+              WHERE user_id = ? AND isbless = 0", undef, $self->id
+    );
+
+    my $grant_type_key = 'group_grant_type_' . GROUP_MEMBERSHIP;
+    my $membership_rows
+      = Bugzilla->memcached->get_config({key => $grant_type_key,});
+    if (!$membership_rows) {
+      $membership_rows = $dbh->selectall_arrayref(
+        "SELECT DISTINCT grantor_id, member_id
                 FROM group_group_map
-                WHERE grant_type = " . GROUP_MEMBERSHIP);
-            Bugzilla->memcached->set_config({
-                key  => $grant_type_key,
-                data => $membership_rows,
-            });
-        }
+                WHERE grant_type = " . GROUP_MEMBERSHIP
+      );
+      Bugzilla->memcached->set_config({
+        key => $grant_type_key, data => $membership_rows,
+      });
+    }
 
-        my %group_membership;
-        foreach my $row (@$membership_rows) {
-            my ($grantor_id, $member_id) = @$row;
-            push (@{ $group_membership{$member_id} }, $grantor_id);
-        }
+    my %group_membership;
+    foreach my $row (@$membership_rows) {
+      my ($grantor_id, $member_id) = @$row;
+      push(@{$group_membership{$member_id}}, $grantor_id);
+    }
 
-        # Let's walk the groups hierarchy tree (using FIFO)
-        # On the first iteration it's pre-filled with direct groups
-        # membership. Later on, each group can add its own members into the
-        # FIFO. Circular dependencies are eliminated by checking
-        # $checked_groups{$member_id} hash values.
-        # As a result, %groups will have all the groups we are the member of.
-        my %checked_groups;
-        my %groups;
-        while (scalar(@$groups_to_check) > 0) {
-            # Pop the head group from FIFO
-            my $member_id = shift @$groups_to_check;
-
-            # Skip the group if we have already checked it
-            if (!$checked_groups{$member_id}) {
-                # Mark group as checked
-                $checked_groups{$member_id} = 1;
-
-                # Add all its members to the FIFO check list
-                # %group_membership contains arrays of group members
-                # for all groups. Accessible by group number.
-                my $members = $group_membership{$member_id};
-                my @new_to_check = grep(!$checked_groups{$_}, @$members);
-                push(@$groups_to_check, @new_to_check);
-
-                $groups{$member_id} = 1;
-            }
-        }
-        $groups = [ keys %groups ];
+    # Let's walk the groups hierarchy tree (using FIFO)
+    # On the first iteration it's pre-filled with direct groups
+    # membership. Later on, each group can add its own members into the
+    # FIFO. Circular dependencies are eliminated by checking
+    # $checked_groups{$member_id} hash values.
+    # As a result, %groups will have all the groups we are the member of.
+    my %checked_groups;
+    my %groups;
+    while (scalar(@$groups_to_check) > 0) {
+
+      # Pop the head group from FIFO
+      my $member_id = shift @$groups_to_check;
+
+      # Skip the group if we have already checked it
+      if (!$checked_groups{$member_id}) {
 
-        Bugzilla->memcached->set_config({
-            key  => $user_groups_key,
-            data => $groups,
-        });
+        # Mark group as checked
+        $checked_groups{$member_id} = 1;
+
+        # Add all its members to the FIFO check list
+        # %group_membership contains arrays of group members
+        # for all groups. Accessible by group number.
+        my $members = $group_membership{$member_id};
+        my @new_to_check = grep(!$checked_groups{$_}, @$members);
+        push(@$groups_to_check, @new_to_check);
+
+        $groups{$member_id} = 1;
+      }
     }
+    $groups = [keys %groups];
+
+    Bugzilla->memcached->set_config({key => $user_groups_key, data => $groups,});
+  }
 
-    $self->{groups} = Bugzilla::Group->new_from_list($groups);
-    return $self->{groups};
+  $self->{groups} = Bugzilla::Group->new_from_list($groups);
+  return $self->{groups};
 }
 
 sub last_visited {
-    my ($self) = @_;
+  my ($self, $ids) = @_;
 
-    return Bugzilla::BugUserLastVisit->match({ user_id => $self->id });
+  return Bugzilla::BugUserLastVisit->match({
+    user_id => $self->id, $ids ? (bug_id => $ids) : ()
+  });
 }
 
 sub is_involved_in_bug {
-    my ($self, $bug) = @_;
-    my $user_id    = $self->id;
-    my $user_login = $self->login;
+  my ($self, $bug) = @_;
+  my $user_id    = $self->id;
+  my $user_login = $self->login;
 
-    return unless $user_id;
-    return 1 if $user_id == $bug->assigned_to->id;
-    return 1 if $user_id == $bug->reporter->id;
+  return unless $user_id;
+  return 1 if $user_id == $bug->assigned_to->id;
+  return 1 if $user_id == $bug->reporter->id;
 
-    if (Bugzilla->params->{'useqacontact'} and $bug->qa_contact) {
-        return 1 if $user_id == $bug->qa_contact->id;
-    }
+  if (Bugzilla->params->{'useqacontact'} and $bug->qa_contact) {
+    return 1 if $user_id == $bug->qa_contact->id;
+  }
 
-    return any { $user_login eq $_ } @{ $bug->cc };
+  return any { $user_login eq $_ } @{$bug->cc};
 }
 
 # It turns out that calling ->id on objects a few hundred thousand
@@ -946,296 +1036,311 @@ sub is_involved_in_bug {
 # when profiling xt/search.t.) So we cache the group ids separately from
 # groups for functions that need the group ids.
 sub _group_ids {
-    my ($self) = @_;
-    $self->{group_ids} ||= [map { $_->id } @{ $self->groups }];
-    return $self->{group_ids};
+  my ($self) = @_;
+  $self->{group_ids} ||= [map { $_->id } @{$self->groups}];
+  return $self->{group_ids};
 }
 
 sub groups_as_string {
-    my $self = shift;
-    my $ids = $self->_group_ids;
-    return scalar(@$ids) ? join(',', @$ids) : '-1';
+  my $self = shift;
+  my $ids  = $self->_group_ids;
+  return scalar(@$ids) ? join(',', @$ids) : '-1';
 }
 
 sub groups_in_sql {
-    my ($self, $field) = @_;
-    $field ||= 'group_id';
-    my $ids = $self->_group_ids;
-    $ids = [-1] if !scalar @$ids;
-    return Bugzilla->dbh->sql_in($field, $ids);
+  my ($self, $field) = @_;
+  $field ||= 'group_id';
+  my $ids = $self->_group_ids;
+  $ids = [-1] if !scalar @$ids;
+  return Bugzilla->dbh->sql_in($field, $ids);
 }
 
 sub bless_groups {
-    my $self = shift;
+  my $self = shift;
 
-    return $self->{'bless_groups'} if defined $self->{'bless_groups'};
-    return [] unless $self->id;
+  return $self->{'bless_groups'} if defined $self->{'bless_groups'};
+  return [] unless $self->id;
 
-    if ($self->in_group('editusers')) {
-        # Users having editusers permissions may bless all groups.
-        $self->{'bless_groups'} = [Bugzilla::Group->get_all];
-        return $self->{'bless_groups'};
-    }
+  if ($self->in_group('editusers')) {
 
-    if (Bugzilla->params->{usevisibilitygroups}
-        && !@{ $self->visible_groups_inherited }) {
-        return [];
-    }
+    # Users having editusers permissions may bless all groups.
+    $self->{'bless_groups'} = [Bugzilla::Group->get_all];
+    return $self->{'bless_groups'};
+  }
 
-    my $dbh = Bugzilla->dbh;
+  if (Bugzilla->params->{usevisibilitygroups}
+    && !@{$self->visible_groups_inherited})
+  {
+    return [];
+  }
 
-    # Get all groups for the user where they have direct bless privileges.
-    my $query = "
+  my $dbh = Bugzilla->dbh;
+
+  # Get all groups for the user where they have direct bless privileges.
+  my $query = "
         SELECT DISTINCT group_id
           FROM user_group_map
          WHERE user_id = ?
                AND isbless = 1";
-    if (Bugzilla->params->{usevisibilitygroups}) {
-        $query .= " AND "
-            . $dbh->sql_in('group_id', $self->visible_groups_inherited);
-    }
-
-    # Get all groups for the user where they are a member of a group that
-    # inherits bless privs.
-    my @group_ids = map { $_->id } @{ $self->groups };
-    if (@group_ids) {
-        $query .= "
+  if (Bugzilla->params->{usevisibilitygroups}) {
+    $query .= " AND " . $dbh->sql_in('group_id', $self->visible_groups_inherited);
+  }
+
+  # Get all groups for the user where they are a member of a group that
+  # inherits bless privs.
+  my @group_ids = map { $_->id } @{$self->groups};
+  if (@group_ids) {
+    $query .= "
             UNION
             SELECT DISTINCT grantor_id
             FROM group_group_map
             WHERE grant_type = " . GROUP_BLESS . "
                 AND " . $dbh->sql_in('member_id', \@group_ids);
-        if (Bugzilla->params->{usevisibilitygroups}) {
-            $query .= " AND "
-                . $dbh->sql_in('grantor_id', $self->visible_groups_inherited);
-        }
+    if (Bugzilla->params->{usevisibilitygroups}) {
+      $query .= " AND " . $dbh->sql_in('grantor_id', $self->visible_groups_inherited);
     }
+  }
 
-    my $ids = $dbh->selectcol_arrayref($query, undef, $self->id);
-    return $self->{bless_groups} = Bugzilla::Group->new_from_list($ids);
+  my $ids = $dbh->selectcol_arrayref($query, undef, $self->id);
+  return $self->{bless_groups} = Bugzilla::Group->new_from_list($ids);
 }
 
 sub in_group {
-    my ($self, $group, $product_id) = @_;
-    $group = $group->name if blessed $group;
-    if (scalar grep($_->name eq $group, @{ $self->groups })) {
-        return 1;
-    }
-    elsif ($product_id && detaint_natural($product_id)) {
-        # Make sure $group exists on a per-product basis.
-        return 0 unless (grep {$_ eq $group} PER_PRODUCT_PRIVILEGES);
-
-        $self->{"product_$product_id"} = {} unless exists $self->{"product_$product_id"};
-        if (!defined $self->{"product_$product_id"}->{$group}) {
-            my $dbh = Bugzilla->dbh;
-            my $in_group = $dbh->selectrow_array(
-                           "SELECT 1
+  my ($self, $group, $product_id) = @_;
+  $group = $group->name if blessed $group;
+  if (scalar grep($_->name eq $group, @{$self->groups})) {
+    return 1;
+  }
+  elsif ($product_id && detaint_natural($product_id)) {
+
+    # Make sure $group exists on a per-product basis.
+    return 0 unless (grep { $_ eq $group } PER_PRODUCT_PRIVILEGES);
+
+    $self->{"product_$product_id"} = {}
+      unless exists $self->{"product_$product_id"};
+    if (!defined $self->{"product_$product_id"}->{$group}) {
+      my $dbh      = Bugzilla->dbh;
+      my $in_group = $dbh->selectrow_array(
+        "SELECT 1
                               FROM group_control_map
                              WHERE product_id = ?
                                    AND $group != 0
-                                   AND " . $self->groups_in_sql . ' ' .
-                              $dbh->sql_limit(1),
-                             undef, $product_id);
+                                   AND "
+          . $self->groups_in_sql . ' ' . $dbh->sql_limit(1), undef, $product_id
+      );
 
-            $self->{"product_$product_id"}->{$group} = $in_group ? 1 : 0;
-        }
-        return $self->{"product_$product_id"}->{$group};
+      $self->{"product_$product_id"}->{$group} = $in_group ? 1 : 0;
     }
-    # If we come here, then the user is not in the requested group.
-    return 0;
+    return $self->{"product_$product_id"}->{$group};
+  }
+
+  # If we come here, then the user is not in the requested group.
+  return 0;
 }
 
 sub in_group_id {
-    my ($self, $id) = @_;
-    return grep($_->id == $id, @{ $self->groups }) ? 1 : 0;
+  my ($self, $id) = @_;
+  return grep($_->id == $id, @{$self->groups}) ? 1 : 0;
 }
 
 # This is a helper to get all groups which have an icon to be displayed
 # besides the name of the commenter.
 sub groups_with_icon {
-    my $self = shift;
+  my $self = shift;
 
-    return $self->{groups_with_icon} //= [grep { $_->icon_url } @{ $self->groups }];
+  return $self->{groups_with_icon} //= [grep { $_->icon_url } @{$self->groups}];
 }
 
 sub get_products_by_permission {
-    my ($self, $group) = @_;
-    # Make sure $group exists on a per-product basis.
-    return [] unless (grep {$_ eq $group} PER_PRODUCT_PRIVILEGES);
+  my ($self, $group) = @_;
+
+  # Make sure $group exists on a per-product basis.
+  return [] unless (grep { $_ eq $group } PER_PRODUCT_PRIVILEGES);
 
-    my $product_ids = Bugzilla->dbh->selectcol_arrayref(
-                          "SELECT DISTINCT product_id
+  my $product_ids = Bugzilla->dbh->selectcol_arrayref(
+    "SELECT DISTINCT product_id
                              FROM group_control_map
                             WHERE $group != 0
-                              AND " . $self->groups_in_sql);
+                              AND " . $self->groups_in_sql
+  );
 
-    # No need to go further if the user has no "special" privs.
-    return [] unless scalar(@$product_ids);
-    my %product_map = map { $_ => 1 } @$product_ids;
+  # No need to go further if the user has no "special" privs.
+  return [] unless scalar(@$product_ids);
+  my %product_map = map { $_ => 1 } @$product_ids;
 
-    # We will restrict the list to products the user can see.
-    my $selectable_products = $self->get_selectable_products;
-    my @products = grep { $product_map{$_->id} } @$selectable_products;
-    return \@products;
+  # We will restrict the list to products the user can see.
+  my $selectable_products = $self->get_selectable_products;
+  my @products = grep { $product_map{$_->id} } @$selectable_products;
+  return \@products;
 }
 
 sub can_see_user {
-    my ($self, $otherUser) = @_;
-    my $query;
+  my ($self, $otherUser) = @_;
+  my $query;
 
-    if (Bugzilla->params->{'usevisibilitygroups'}) {
-        # If the user can see no groups, then no users are visible either.
-        my $visibleGroups = $self->visible_groups_as_string() || return 0;
-        $query = qq{SELECT COUNT(DISTINCT userid)
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+
+    # If the user can see no groups, then no users are visible either.
+    my $visibleGroups = $self->visible_groups_as_string() || return 0;
+    $query = qq{SELECT COUNT(DISTINCT userid)
                     FROM profiles, user_group_map
                     WHERE userid = ?
                     AND user_id = userid
                     AND isbless = 0
                     AND group_id IN ($visibleGroups)
                    };
-    } else {
-        $query = qq{SELECT COUNT(userid)
+  }
+  else {
+    $query = qq{SELECT COUNT(userid)
                     FROM profiles
                     WHERE userid = ?
                    };
-    }
-    return Bugzilla->dbh->selectrow_array($query, undef, $otherUser->id);
+  }
+  return Bugzilla->dbh->selectrow_array($query, undef, $otherUser->id);
 }
 
 sub can_edit_product {
-    my ($self, $prod_id) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self, $prod_id) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    if (Bugzilla->params->{'or_groups'}) {
-        my $groups = $self->groups_as_string;
-        # For or-groups, we check if there are any can_edit groups for the
-        # product, and if the user is in any of them. If there are none or
-        # the user is in at least one of them, they can edit the product
-        my ($cnt_can_edit, $cnt_group_member) = $dbh->selectrow_array(
-           "SELECT SUM(p.cnt_can_edit),
+  if (Bugzilla->params->{'or_groups'}) {
+    my $groups = $self->groups_as_string;
+
+    # For or-groups, we check if there are any can_edit groups for the
+    # product, and if the user is in any of them. If there are none or
+    # the user is in at least one of them, they can edit the product
+    my ($cnt_can_edit, $cnt_group_member) = $dbh->selectrow_array(
+      "SELECT SUM(p.cnt_can_edit),
                    SUM(p.cnt_group_member)
               FROM (SELECT CASE WHEN canedit = 1 THEN 1 ELSE 0 END AS cnt_can_edit,
                            CASE WHEN canedit = 1 AND group_id IN ($groups) THEN 1 ELSE 0 END AS cnt_group_member
                     FROM group_control_map
-                    WHERE product_id = $prod_id) AS p");
-        return (!$cnt_can_edit or $cnt_group_member);
-    }
-    else {
-        # For and-groups, a user needs to be in all canedit groups. Therefore
-        # if the user is not in a can_edit group for the product, they cannot
-        # edit the product.
-        my $has_external_groups =
-          $dbh->selectrow_array('SELECT 1
+                    WHERE product_id = $prod_id) AS p"
+    );
+    return (!$cnt_can_edit or $cnt_group_member);
+  }
+  else {
+    # For and-groups, a user needs to be in all canedit groups. Therefore
+    # if the user is not in a can_edit group for the product, they cannot
+    # edit the product.
+    my $has_external_groups = $dbh->selectrow_array(
+      'SELECT 1
                                    FROM group_control_map
                                   WHERE product_id = ?
                                     AND canedit != 0
-                                    AND group_id NOT IN(' . $self->groups_as_string . ')',
-                                 undef, $prod_id);
+                                    AND group_id NOT IN('
+        . $self->groups_as_string . ')', undef, $prod_id
+    );
 
-        return !$has_external_groups;
-    }
+    return !$has_external_groups;
+  }
 }
 
 sub can_see_bug {
-    my ($self, $bug_id) = @_;
-    return @{ $self->visible_bugs([$bug_id]) } ? 1 : 0;
+  my ($self, $bug_id) = @_;
+  return @{$self->visible_bugs([$bug_id])} ? 1 : 0;
 }
 
 sub visible_bugs {
-    my ($self, $bugs) = @_;
-    # Allow users to pass in Bug objects and bug ids both.
-    my @bug_ids = map { blessed $_ ? $_->id : $_ } @$bugs;
-
-    # We only check the visibility of bugs that we haven't
-    # checked yet.
-    # Bugzilla::Bug->update automatically removes updated bugs
-    # from the cache to force them to be checked again.
-    my $visible_cache = $self->{_visible_bugs_cache} ||= {};
-    my @check_ids = grep(!exists $visible_cache->{$_}, @bug_ids);
-
-    if (@check_ids) {
-        foreach my $id (@check_ids) {
-            my $orig_id = $id;
-            detaint_natural($id)
-              || ThrowCodeError('param_must_be_numeric', { param    => $orig_id,
-                                                           function => 'Bugzilla::User->visible_bugs'});
-        }
+  my ($self, $bugs) = @_;
+
+  # Allow users to pass in Bug objects and bug ids both.
+  my @bug_ids = map { blessed $_ ? $_->id : $_ } @$bugs;
+
+  # We only check the visibility of bugs that we haven't
+  # checked yet.
+  # Bugzilla::Bug->update automatically removes updated bugs
+  # from the cache to force them to be checked again.
+  my $visible_cache = $self->{_visible_bugs_cache} ||= {};
+  my @check_ids = grep(!exists $visible_cache->{$_}, @bug_ids);
 
-        Bugzilla->params->{'or_groups'}
-            ? $self->_visible_bugs_check_or(\@check_ids)
-            : $self->_visible_bugs_check_and(\@check_ids);
+  if (@check_ids) {
+    foreach my $id (@check_ids) {
+      my $orig_id = $id;
+      detaint_natural($id)
+        || ThrowCodeError('param_must_be_numeric',
+        {param => $orig_id, function => 'Bugzilla::User->visible_bugs'});
     }
 
-    return [grep { $visible_cache->{blessed $_ ? $_->id : $_} } @$bugs];
+    Bugzilla->params->{'or_groups'}
+      ? $self->_visible_bugs_check_or(\@check_ids)
+      : $self->_visible_bugs_check_and(\@check_ids);
+  }
+
+  return [grep { $visible_cache->{blessed $_ ? $_->id : $_} } @$bugs];
 }
 
 sub _visible_bugs_check_or {
-    my ($self, $check_ids) = @_;
-    my $visible_cache = $self->{_visible_bugs_cache};
-    my $dbh = Bugzilla->dbh;
-    my $user_id = $self->id;
-
-    my $sth;
-    # Speed up the can_see_bug case.
-    if (scalar(@$check_ids) == 1) {
-        $sth = $self->{_sth_one_visible_bug};
-    }
-    my $query = qq{
+  my ($self, $check_ids) = @_;
+  my $visible_cache = $self->{_visible_bugs_cache};
+  my $dbh           = Bugzilla->dbh;
+  my $user_id       = $self->id;
+
+  my $sth;
+
+  # Speed up the can_see_bug case.
+  if (scalar(@$check_ids) == 1) {
+    $sth = $self->{_sth_one_visible_bug};
+  }
+  my $query = qq{
         SELECT DISTINCT bugs.bug_id
         FROM bugs
             LEFT JOIN bug_group_map AS security_map ON bugs.bug_id = security_map.bug_id
             LEFT JOIN cc AS security_cc ON bugs.bug_id = security_cc.bug_id AND security_cc.who = $user_id
         WHERE bugs.bug_id IN (} . join(',', ('?') x @$check_ids) . qq{)
-          AND ((security_map.group_id IS NULL OR security_map.group_id IN (} . $self->groups_as_string . qq{))
+          AND ((security_map.group_id IS NULL OR security_map.group_id IN (}
+    . $self->groups_as_string . qq{))
             OR (bugs.reporter_accessible = 1 AND bugs.reporter = $user_id)
             OR (bugs.cclist_accessible = 1 AND security_cc.who IS NOT NULL)
             OR bugs.assigned_to = $user_id
     };
 
-    if (Bugzilla->params->{'useqacontact'}) {
-        $query .= " OR bugs.qa_contact = $user_id";
-    }
-    $query .= ')';
+  if (Bugzilla->params->{'useqacontact'}) {
+    $query .= " OR bugs.qa_contact = $user_id";
+  }
+  $query .= ')';
 
-    $sth ||= $dbh->prepare($query);
-    if (scalar(@$check_ids) == 1) {
-        $self->{_sth_one_visible_bug} = $sth;
-    }
+  $sth ||= $dbh->prepare($query);
+  if (scalar(@$check_ids) == 1) {
+    $self->{_sth_one_visible_bug} = $sth;
+  }
 
-    # Set all bugs as non visible
-    foreach my $bug_id (@$check_ids) {
-        $visible_cache->{$bug_id} = 0;
-    }
+  # Set all bugs as non visible
+  foreach my $bug_id (@$check_ids) {
+    $visible_cache->{$bug_id} = 0;
+  }
 
-    # Now get the bugs the user can see
-    my $visible_bug_ids = $dbh->selectcol_arrayref($sth, undef, @$check_ids);
-    foreach my $bug_id (@$visible_bug_ids) {
-        $visible_cache->{$bug_id} = 1;
-    }
+  # Now get the bugs the user can see
+  my $visible_bug_ids = $dbh->selectcol_arrayref($sth, undef, @$check_ids);
+  foreach my $bug_id (@$visible_bug_ids) {
+    $visible_cache->{$bug_id} = 1;
+  }
 }
 
 sub _visible_bugs_check_and {
-    my ($self, $check_ids) = @_;
-    my $visible_cache = $self->{_visible_bugs_cache};
-    my $dbh = Bugzilla->dbh;
-    my $user_id = $self->id;
-
-    my $sth;
-    # Speed up the can_see_bug case.
-    if (scalar(@$check_ids) == 1) {
-        $sth = $self->{_sth_one_visible_bug};
-    }
-    $sth ||= $dbh->prepare(
-        # This checks for groups that the bug is in that the user
-        # *isn't* in. Then, in the Perl code below, we check if
-        # the user can otherwise access the bug (for example, by being
-        # the assignee or QA Contact).
-        #
-        # The DISTINCT exists because the bug could be in *several*
-        # groups that the user isn't in, but they will all return the
-        # same result for bug_group_map.bug_id (so DISTINCT filters
-        # out duplicate rows).
-        "SELECT DISTINCT bugs.bug_id, reporter, assigned_to, qa_contact,
+  my ($self, $check_ids) = @_;
+  my $visible_cache = $self->{_visible_bugs_cache};
+  my $dbh           = Bugzilla->dbh;
+  my $user_id       = $self->id;
+
+  my $sth;
+
+  # Speed up the can_see_bug case.
+  if (scalar(@$check_ids) == 1) {
+    $sth = $self->{_sth_one_visible_bug};
+  }
+  $sth ||= $dbh->prepare(
+
+    # This checks for groups that the bug is in that the user
+    # *isn't* in. Then, in the Perl code below, we check if
+    # the user can otherwise access the bug (for example, by being
+    # the assignee or QA Contact).
+    #
+    # The DISTINCT exists because the bug could be in *several*
+    # groups that the user isn't in, but they will all return the
+    # same result for bug_group_map.bug_id (so DISTINCT filters
+    # out duplicate rows).
+    "SELECT DISTINCT bugs.bug_id, reporter, assigned_to, qa_contact,
                 reporter_accessible, cclist_accessible, cc.who,
                 bug_group_map.bug_id
            FROM bugs
@@ -1245,1056 +1350,1132 @@ sub _visible_bugs_check_and {
                 LEFT JOIN bug_group_map 
                           ON bugs.bug_id = bug_group_map.bug_id
                              AND bug_group_map.group_id NOT IN ("
-                                 . $self->groups_as_string . ')
+      . $self->groups_as_string . ')
           WHERE bugs.bug_id IN (' . join(',', ('?') x @$check_ids) . ')
-                AND creation_ts IS NOT NULL ');
-    if (scalar(@$check_ids) == 1) {
-        $self->{_sth_one_visible_bug} = $sth;
-    }
-
-    $sth->execute(@$check_ids);
-    my $use_qa_contact = Bugzilla->params->{'useqacontact'};
-    while (my $row = $sth->fetchrow_arrayref) {
-        my ($bug_id, $reporter, $owner, $qacontact, $reporter_access, 
-            $cclist_access, $isoncclist, $missinggroup) = @$row;
-        $visible_cache->{$bug_id} ||= 
-            ((($reporter == $user_id) && $reporter_access)
-             || ($use_qa_contact
-                 && $qacontact && ($qacontact == $user_id))
-             || ($owner == $user_id)
-             || ($isoncclist && $cclist_access)
-             || !$missinggroup) ? 1 : 0;
-    }
+                AND creation_ts IS NOT NULL '
+  );
+  if (scalar(@$check_ids) == 1) {
+    $self->{_sth_one_visible_bug} = $sth;
+  }
+
+  $sth->execute(@$check_ids);
+  my $use_qa_contact = Bugzilla->params->{'useqacontact'};
+  while (my $row = $sth->fetchrow_arrayref) {
+    my ($bug_id, $reporter, $owner, $qacontact, $reporter_access, $cclist_access,
+      $isoncclist, $missinggroup)
+      = @$row;
+    $visible_cache->{$bug_id}
+      ||= ((($reporter == $user_id) && $reporter_access)
+        || ($use_qa_contact && $qacontact && ($qacontact == $user_id))
+        || ($owner == $user_id)
+        || ($isoncclist && $cclist_access)
+        || !$missinggroup) ? 1 : 0;
+  }
 
 }
 
 sub clear_product_cache {
-    my $self = shift;
-    delete $self->{enterable_products};
-    delete $self->{selectable_products};
-    delete $self->{selectable_classifications};
+  my $self = shift;
+  delete $self->{enterable_products};
+  delete $self->{selectable_products};
+  delete $self->{selectable_classifications};
 }
 
 sub can_see_product {
-    my ($self, $product_name) = @_;
+  my ($self, $product_name) = @_;
 
-    return scalar(grep {$_->name eq $product_name} @{$self->get_selectable_products});
+  return
+    scalar(grep { $_->name eq $product_name } @{$self->get_selectable_products});
 }
 
 sub get_selectable_products {
-    my $self = shift;
-    my $class_id = shift;
-    my $class_restricted = Bugzilla->params->{'useclassification'} && $class_id;
+  my $self             = shift;
+  my $class_id         = shift;
+  my $class_restricted = Bugzilla->params->{'useclassification'} && $class_id;
 
-    if (!defined $self->{selectable_products}) {
-        my $query = "SELECT id
+  if (!defined $self->{selectable_products}) {
+    my $query = "SELECT id
                      FROM products
                          LEFT JOIN group_control_map
                              ON group_control_map.product_id = products.id
-                             AND group_control_map.membercontrol = " . CONTROLMAPMANDATORY;
-                             
-        if (Bugzilla->params->{'or_groups'}) {
-            # Either the user is in at least one of the MANDATORY groups, or
-            # there are no such groups for the product.
-            $query .= " WHERE group_id IN (" . $self->groups_as_string . ")
+                             AND group_control_map.membercontrol = "
+      . CONTROLMAPMANDATORY;
+
+    if (Bugzilla->params->{'or_groups'}) {
+
+      # Either the user is in at least one of the MANDATORY groups, or
+      # there are no such groups for the product.
+      $query .= " WHERE group_id IN (" . $self->groups_as_string . ")
                         OR group_id IS NULL";
-        }
-        else {
-            # There must be no MANDATORY groups that the user is not in.
-            $query .= " AND group_id NOT IN (" . $self->groups_as_string . ")
+    }
+    else {
+      # There must be no MANDATORY groups that the user is not in.
+      $query .= " AND group_id NOT IN (" . $self->groups_as_string . ")
                         WHERE group_id IS NULL";
-        }
-        
-        my $prod_ids = Bugzilla->dbh->selectcol_arrayref($query);
-        $self->{selectable_products} = Bugzilla::Product->new_from_list($prod_ids);
     }
 
-    # Restrict the list of products to those being in the classification, if any.
-    if ($class_restricted) {
-        return [grep {$_->classification_id == $class_id} @{$self->{selectable_products}}];
-    }
-    # If we come here, then we want all selectable products.
-    return $self->{selectable_products};
+    my $prod_ids = Bugzilla->dbh->selectcol_arrayref($query);
+    $self->{selectable_products} = Bugzilla::Product->new_from_list($prod_ids);
+  }
+
+  # Restrict the list of products to those being in the classification, if any.
+  if ($class_restricted) {
+    return [grep { $_->classification_id == $class_id }
+        @{$self->{selectable_products}}];
+  }
+
+  # If we come here, then we want all selectable products.
+  return $self->{selectable_products};
 }
 
 sub get_selectable_classifications {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    if (!defined $self->{selectable_classifications}) {
-        my $products = $self->get_selectable_products;
-        my %class_ids = map { $_->classification_id => 1 } @$products;
+  if (!defined $self->{selectable_classifications}) {
+    my $products = $self->get_selectable_products;
+    my %class_ids = map { $_->classification_id => 1 } @$products;
 
-        $self->{selectable_classifications} = Bugzilla::Classification->new_from_list([keys %class_ids]);
-    }
-    return $self->{selectable_classifications};
+    $self->{selectable_classifications}
+      = Bugzilla::Classification->new_from_list([keys %class_ids]);
+  }
+  return $self->{selectable_classifications};
 }
 
 sub can_enter_product {
-    my ($self, $input, $warn) = @_;
-    my $dbh = Bugzilla->dbh;
-    $warn ||= 0;
-
-    $input = trim($input) if !ref $input;
-    if (!defined $input or $input eq '') {
-        return unless $warn == THROW_ERROR;
-        ThrowUserError('object_not_specified',
-                       { class => 'Bugzilla::Product' });
-    }
+  my ($self, $input, $warn) = @_;
+  my $dbh = Bugzilla->dbh;
+  $warn ||= 0;
 
-    if (!scalar @{ $self->get_enterable_products }) {
-        return unless $warn == THROW_ERROR;
-        ThrowUserError('no_products');
-    }
+  $input = trim($input) if !ref $input;
+  if (!defined $input or $input eq '') {
+    return unless $warn == THROW_ERROR;
+    ThrowUserError('object_not_specified', {class => 'Bugzilla::Product'});
+  }
 
-    my $product = blessed($input) ? $input 
-                                  : new Bugzilla::Product({ name => $input });
-    my $can_enter =
-      $product && grep($_->name eq $product->name,
-                       @{ $self->get_enterable_products });
+  if (!scalar @{$self->get_enterable_products}) {
+    return unless $warn == THROW_ERROR;
+    ThrowUserError('no_products');
+  }
 
-    return $product if $can_enter;
+  my $product
+    = blessed($input) ? $input : new Bugzilla::Product({name => $input});
+  my $can_enter = $product
+    && grep($_->name eq $product->name, @{$self->get_enterable_products});
 
-    return 0 unless $warn == THROW_ERROR;
+  return $product if $can_enter;
 
-    # Check why access was denied. These checks are slow,
-    # but that's fine, because they only happen if we fail.
+  return 0 unless $warn == THROW_ERROR;
 
-    # We don't just use $product->name for error messages, because if it
-    # changes case from $input, then that's a clue that the product does
-    # exist but is hidden.
-    my $name = blessed($input) ? $input->name : $input;
+  # Check why access was denied. These checks are slow,
+  # but that's fine, because they only happen if we fail.
 
-    # The product could not exist or you could be denied...
-    if (!$product || !$product->user_has_access($self)) {
-        ThrowUserError('entry_access_denied', { product => $name });
-    }
-    # It could be closed for bug entry...
-    elsif (!$product->is_active) {
-        ThrowUserError('product_disabled', { product => $product });
-    }
-    # It could have no components...
-    elsif (!@{$product->components}
-           || !grep { $_->is_active } @{$product->components})
-    {
-        ThrowUserError('missing_component', { product => $product });
-    }
-    # It could have no versions...
-    elsif (!@{$product->versions}
-           || !grep { $_->is_active } @{$product->versions})
-    {
-        ThrowUserError ('missing_version', { product => $product });
-    }
+  # We don't just use $product->name for error messages, because if it
+  # changes case from $input, then that's a clue that the product does
+  # exist but is hidden.
+  my $name = blessed($input) ? $input->name : $input;
 
-    die "can_enter_product reached an unreachable location.";
+  # The product could not exist or you could be denied...
+  if (!$product || !$product->user_has_access($self)) {
+    ThrowUserError('entry_access_denied', {product => $name});
+  }
+
+  # It could be closed for bug entry...
+  elsif (!$product->is_active) {
+    ThrowUserError('product_disabled', {product => $product});
+  }
+
+  # It could have no components...
+  elsif (!@{$product->components}
+    || !grep { $_->is_active } @{$product->components})
+  {
+    ThrowUserError('missing_component', {product => $product});
+  }
+
+  # It could have no versions...
+  elsif (!@{$product->versions} || !grep { $_->is_active } @{$product->versions})
+  {
+    ThrowUserError('missing_version', {product => $product});
+  }
+
+  die "can_enter_product reached an unreachable location.";
 }
 
 sub get_enterable_products {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (defined $self->{enterable_products}) {
-        return $self->{enterable_products};
-    }
+  if (defined $self->{enterable_products}) {
+    return $self->{enterable_products};
+  }
 
-     # All products which the user has "Entry" access to.
-     my $query =
-           'SELECT products.id FROM products
+  # All products which the user has "Entry" access to.
+  my $query = 'SELECT products.id FROM products
             LEFT JOIN group_control_map
                 ON group_control_map.product_id = products.id
                     AND group_control_map.entry != 0';
 
-    if (Bugzilla->params->{'or_groups'}) {
-        $query .= " WHERE (group_id IN (" . $self->groups_as_string . ")" .
-                  "    OR group_id IS NULL)";
-    } else {
-        $query .= " AND group_id NOT IN (" . $self->groups_as_string . ")" .
-                  " WHERE group_id IS NULL"
-    }
-    $query .= " AND products.isactive = 1";
-    my $enterable_ids = $dbh->selectcol_arrayref($query);
-
-    if (scalar @$enterable_ids) {
-        # And all of these products must have at least one component
-        # and one version.
-        $enterable_ids = $dbh->selectcol_arrayref(
-            'SELECT DISTINCT products.id FROM products
-              WHERE ' . $dbh->sql_in('products.id', $enterable_ids) .
-              ' AND products.id IN (SELECT DISTINCT components.product_id
+  if (Bugzilla->params->{'or_groups'}) {
+    $query
+      .= " WHERE (group_id IN ("
+      . $self->groups_as_string . ")"
+      . "    OR group_id IS NULL)";
+  }
+  else {
+    $query
+      .= " AND group_id NOT IN ("
+      . $self->groups_as_string . ")"
+      . " WHERE group_id IS NULL";
+  }
+  $query .= " AND products.isactive = 1";
+  my $enterable_ids = $dbh->selectcol_arrayref($query);
+
+  if (scalar @$enterable_ids) {
+
+    # And all of these products must have at least one component
+    # and one version.
+    $enterable_ids = $dbh->selectcol_arrayref(
+      'SELECT DISTINCT products.id FROM products
+              WHERE '
+        . $dbh->sql_in('products.id', $enterable_ids)
+        . ' AND products.id IN (SELECT DISTINCT components.product_id
                                       FROM components
-                                     WHERE components.isactive = 1)
+                                     WHERE components.isactive = 1 AND products.id = components.product_id)
                 AND products.id IN (SELECT DISTINCT versions.product_id
                                       FROM versions
-                                     WHERE versions.isactive = 1)');
-    }
+                                     WHERE versions.isactive = 1 AND products.id = versions.product_id)'
+    );
+  }
 
-    $self->{enterable_products} =
-         Bugzilla::Product->new_from_list($enterable_ids);
-    return $self->{enterable_products};
+  $self->{enterable_products} = Bugzilla::Product->new_from_list($enterable_ids);
+  return $self->{enterable_products};
 }
 
 sub can_access_product {
-    my ($self, $product) = @_;
-    my $product_name = blessed($product) ? $product->name : $product;
-    return scalar(grep {$_->name eq $product_name} @{$self->get_accessible_products});
+  my ($self, $product) = @_;
+  my $product_name = blessed($product) ? $product->name : $product;
+  return
+    scalar(grep { $_->name eq $product_name } @{$self->get_accessible_products});
 }
 
 sub get_accessible_products {
-    my $self = shift;
-    
-    # Map the objects into a hash using the ids as keys
-    my %products = map { $_->id => $_ }
-                       @{$self->get_selectable_products},
-                       @{$self->get_enterable_products};
-    
-    return [ sort { $a->name cmp $b->name } values %products ];
+  my $self = shift;
+
+  # Map the objects into a hash using the ids as keys
+  my %products = map { $_->id => $_ } @{$self->get_selectable_products},
+    @{$self->get_enterable_products};
+
+  return [sort { $a->name cmp $b->name } values %products];
 }
 
 sub can_administer {
-    my $self = shift;
-
-    if (not defined $self->{can_administer}) {
-        my $can_administer = 0;
-
-        $can_administer = 1 if $self->in_group('admin')
-            || $self->in_group('tweakparams')
-            || $self->in_group('editusers')
-            || $self->can_bless
-            || (Bugzilla->params->{'useclassification'} && $self->in_group('editclassifications'))
-            || $self->in_group('editcomponents')
-            || scalar(@{$self->get_products_by_permission('editcomponents')})
-            || $self->in_group('creategroups')
-            || $self->in_group('editkeywords')
-            || $self->in_group('bz_canusewhines');
-
-        Bugzilla::Hook::process('user_can_administer', { can_administer => \$can_administer });
-        $self->{can_administer} = $can_administer;
-    }
+  my $self = shift;
+
+  if (not defined $self->{can_administer}) {
+    my $can_administer = 0;
 
-    return $self->{can_administer};
+    $can_administer = 1
+      if $self->in_group('admin')
+      || $self->in_group('tweakparams')
+      || $self->in_group('editusers')
+      || $self->can_bless
+      || (Bugzilla->params->{'useclassification'}
+      && $self->in_group('editclassifications'))
+      || $self->in_group('editcomponents')
+      || scalar(@{$self->get_products_by_permission('editcomponents')})
+      || $self->in_group('creategroups')
+      || $self->in_group('editkeywords')
+      || $self->in_group('bz_canusewhines');
+
+    Bugzilla::Hook::process('user_can_administer',
+      {can_administer => \$can_administer});
+    $self->{can_administer} = $can_administer;
+  }
+
+  return $self->{can_administer};
 }
 
 sub check_can_admin_product {
-    my ($self, $product_name) = @_;
+  my ($self, $product_name) = @_;
 
-    # First make sure the product name is valid.
-    my $product = Bugzilla::Product->check($product_name);
+  # First make sure the product name is valid.
+  my $product = Bugzilla::Product->check($product_name);
 
-    ($self->in_group('editcomponents', $product->id)
-       && $self->can_see_product($product->name))
-         || ThrowUserError('product_admin_denied', {product => $product->name});
+  (      $self->in_group('editcomponents', $product->id)
+      && $self->can_see_product($product->name))
+    || ThrowUserError('product_admin_denied', {product => $product->name});
 
-    # Return the validated product object.
-    return $product;
+  # Return the validated product object.
+  return $product;
 }
 
 sub check_can_admin_flagtype {
-    my ($self, $flagtype_id) = @_;
-
-    my $flagtype = Bugzilla::FlagType->check({ id => $flagtype_id });
-    my $can_fully_edit = 1;
-
-    if (!$self->in_group('editcomponents')) {
-        my $products = $self->get_products_by_permission('editcomponents');
-        # You need editcomponents privs for at least one product to have
-        # a chance to edit the flagtype.
-        scalar(@$products)
-          || ThrowUserError('auth_failure', {group  => 'editcomponents',
-                                             action => 'edit',
-                                             object => 'flagtypes'});
-        my $can_admin = 0;
-        my $i = $flagtype->inclusions_as_hash;
-        my $e = $flagtype->exclusions_as_hash;
-
-        # If there is at least one product for which the user doesn't have
-        # editcomponents privs, then don't allow them to do everything with
-        # this flagtype, independently of whether this product is in the
-        # exclusion list or not.
-        my %product_ids;
-        map { $product_ids{$_->id} = 1 } @$products;
-        $can_fully_edit = 0 if grep { !$product_ids{$_} } keys %$i;
-
-        unless ($e->{0}->{0}) {
-            foreach my $product (@$products) {
-                my $id = $product->id;
-                next if $e->{$id}->{0};
-                # If we are here, the product has not been explicitly excluded.
-                # Check whether it's explicitly included, or at least one of
-                # its components.
-                $can_admin = ($i->{0}->{0} || $i->{$id}->{0}
-                              || scalar(grep { !$e->{$id}->{$_} } keys %{$i->{$id}}));
-                last if $can_admin;
-            }
-        }
-        $can_admin || ThrowUserError('flag_type_not_editable', { flagtype => $flagtype });
-    }
-    return wantarray ? ($flagtype, $can_fully_edit) : $flagtype;
+  my ($self, $flagtype_id) = @_;
+
+  my $flagtype = Bugzilla::FlagType->check({id => $flagtype_id});
+  my $can_fully_edit = 1;
+
+  if (!$self->in_group('editcomponents')) {
+    my $products = $self->get_products_by_permission('editcomponents');
+
+    # You need editcomponents privs for at least one product to have
+    # a chance to edit the flagtype.
+    scalar(@$products)
+      || ThrowUserError('auth_failure',
+      {group => 'editcomponents', action => 'edit', object => 'flagtypes'});
+    my $can_admin = 0;
+    my $i         = $flagtype->inclusions_as_hash;
+    my $e         = $flagtype->exclusions_as_hash;
+
+    # If there is at least one product for which the user doesn't have
+    # editcomponents privs, then don't allow them to do everything with
+    # this flagtype, independently of whether this product is in the
+    # exclusion list or not.
+    my %product_ids;
+    map { $product_ids{$_->id} = 1 } @$products;
+    $can_fully_edit = 0 if grep { !$product_ids{$_} } keys %$i;
+
+    unless ($e->{0}->{0}) {
+      foreach my $product (@$products) {
+        my $id = $product->id;
+        next if $e->{$id}->{0};
+
+        # If we are here, the product has not been explicitly excluded.
+        # Check whether it's explicitly included, or at least one of
+        # its components.
+        $can_admin
+          = (  $i->{0}->{0}
+            || $i->{$id}->{0}
+            || scalar(grep { !$e->{$id}->{$_} } keys %{$i->{$id}}));
+        last if $can_admin;
+      }
+    }
+    $can_admin || ThrowUserError('flag_type_not_editable', {flagtype => $flagtype});
+  }
+  return wantarray ? ($flagtype, $can_fully_edit) : $flagtype;
 }
 
 sub can_request_flag {
-    my ($self, $flag_type) = @_;
+  my ($self, $flag_type) = @_;
 
-    return ($self->can_set_flag($flag_type)
-            || !$flag_type->request_group_id
-            || $self->in_group_id($flag_type->request_group_id)) ? 1 : 0;
+  return ($self->can_set_flag($flag_type)
+      || !$flag_type->request_group_id
+      || $self->in_group_id($flag_type->request_group_id)) ? 1 : 0;
 }
 
 sub can_set_flag {
-    my ($self, $flag_type) = @_;
+  my ($self, $flag_type) = @_;
 
-    return (!$flag_type->grant_group_id
-            || $self->in_group_id($flag_type->grant_group_id)) ? 1 : 0;
+  return (!$flag_type->grant_group_id
+      || $self->in_group_id($flag_type->grant_group_id)) ? 1 : 0;
 }
 
 # visible_groups_inherited returns a reference to a list of all the groups
 # whose members are visible to this user.
 sub visible_groups_inherited {
-    my $self = shift;
-    return $self->{visible_groups_inherited} if defined $self->{visible_groups_inherited};
-    return [] unless $self->id;
-    my @visgroups = @{$self->visible_groups_direct};
-    @visgroups = @{Bugzilla::Group->flatten_group_membership(@visgroups)};
-    $self->{visible_groups_inherited} = \@visgroups;
-    return $self->{visible_groups_inherited};
+  my $self = shift;
+  return $self->{visible_groups_inherited}
+    if defined $self->{visible_groups_inherited};
+  return [] unless $self->id;
+  my @visgroups = @{$self->visible_groups_direct};
+  @visgroups = @{Bugzilla::Group->flatten_group_membership(@visgroups)};
+  $self->{visible_groups_inherited} = \@visgroups;
+  return $self->{visible_groups_inherited};
 }
 
 # visible_groups_direct returns a reference to a list of all the groups that
 # are visible to this user.
 sub visible_groups_direct {
-    my $self = shift;
-    my @visgroups = ();
-    return $self->{visible_groups_direct} if defined $self->{visible_groups_direct};
-    return [] unless $self->id;
-
-    my $dbh = Bugzilla->dbh;
-    my $sth;
-   
-    if (Bugzilla->params->{'usevisibilitygroups'}) {
-        $sth = $dbh->prepare("SELECT DISTINCT grantor_id
+  my $self      = shift;
+  my @visgroups = ();
+  return $self->{visible_groups_direct} if defined $self->{visible_groups_direct};
+  return [] unless $self->id;
+
+  my $dbh = Bugzilla->dbh;
+  my $sth;
+
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+    $sth = $dbh->prepare(
+      "SELECT DISTINCT grantor_id
                                  FROM group_group_map
                                 WHERE " . $self->groups_in_sql('member_id') . "
-                                  AND grant_type=" . GROUP_VISIBLE);
-    }
-    else {
-        # All groups are visible if usevisibilitygroups is off.
-        $sth = $dbh->prepare('SELECT id FROM groups');
-    }
-    $sth->execute();
+                                  AND grant_type=" . GROUP_VISIBLE
+    );
+  }
+  else {
+    # All groups are visible if usevisibilitygroups is off.
+    $sth = $dbh->prepare('SELECT id FROM groups');
+  }
+  $sth->execute();
 
-    while (my ($row) = $sth->fetchrow_array) {
-        push @visgroups,$row;
-    }
-    $self->{visible_groups_direct} = \@visgroups;
+  while (my ($row) = $sth->fetchrow_array) {
+    push @visgroups, $row;
+  }
+  $self->{visible_groups_direct} = \@visgroups;
 
-    return $self->{visible_groups_direct};
+  return $self->{visible_groups_direct};
 }
 
 sub visible_groups_as_string {
-    my $self = shift;
-    return join(', ', @{$self->visible_groups_inherited()});
+  my $self = shift;
+  return join(', ', @{$self->visible_groups_inherited()});
 }
 
 # This function defines the groups a user may share a query with.
 # More restrictive sites may want to build this reference to a list of group IDs
 # from bless_groups instead of mirroring visible_groups_inherited, perhaps.
 sub queryshare_groups {
-    my $self = shift;
-    my @queryshare_groups;
-
-    return $self->{queryshare_groups} if defined $self->{queryshare_groups};
-
-    if ($self->in_group(Bugzilla->params->{'querysharegroup'})) {
-        # We want to be allowed to share with groups we're in only.
-        # If usevisibilitygroups is on, then we need to restrict this to groups
-        # we may see.
-        if (Bugzilla->params->{'usevisibilitygroups'}) {
-            foreach(@{$self->visible_groups_inherited()}) {
-                next unless $self->in_group_id($_);
-                push(@queryshare_groups, $_);
-            }
-        }
-        else {
-            @queryshare_groups = @{ $self->_group_ids };
-        }
+  my $self = shift;
+  my @queryshare_groups;
+
+  return $self->{queryshare_groups} if defined $self->{queryshare_groups};
+
+  if ($self->in_group(Bugzilla->params->{'querysharegroup'})) {
+
+    # We want to be allowed to share with groups we're in only.
+    # If usevisibilitygroups is on, then we need to restrict this to groups
+    # we may see.
+    if (Bugzilla->params->{'usevisibilitygroups'}) {
+      foreach (@{$self->visible_groups_inherited()}) {
+        next unless $self->in_group_id($_);
+        push(@queryshare_groups, $_);
+      }
     }
+    else {
+      @queryshare_groups = @{$self->_group_ids};
+    }
+  }
 
-    return $self->{queryshare_groups} = \@queryshare_groups;
+  return $self->{queryshare_groups} = \@queryshare_groups;
 }
 
 sub queryshare_groups_as_string {
-    my $self = shift;
-    return join(', ', @{$self->queryshare_groups()});
+  my $self = shift;
+  return join(', ', @{$self->queryshare_groups()});
 }
 
 sub derive_regexp_groups {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    my $id = $self->id;
-    return unless $id;
+  my $id = $self->id;
+  return unless $id;
 
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    my $sth;
+  my $sth;
 
-    # add derived records for any matching regexps
+  # add derived records for any matching regexps
 
-    $sth = $dbh->prepare("SELECT id, userregexp, user_group_map.group_id
+  $sth = $dbh->prepare(
+    "SELECT id, userregexp, user_group_map.group_id
                             FROM groups
                        LEFT JOIN user_group_map
                               ON groups.id = user_group_map.group_id
                              AND user_group_map.user_id = ?
-                             AND user_group_map.grant_type = ?");
-    $sth->execute($id, GRANT_REGEXP);
+                             AND user_group_map.grant_type = ?"
+  );
+  $sth->execute($id, GRANT_REGEXP);
 
-    my $group_insert = $dbh->prepare(q{INSERT INTO user_group_map
+  my $group_insert = $dbh->prepare(
+    q{INSERT INTO user_group_map
                                        (user_id, group_id, isbless, grant_type)
-                                       VALUES (?, ?, 0, ?)});
-    my $group_delete = $dbh->prepare(q{DELETE FROM user_group_map
+                                       VALUES (?, ?, 0, ?)}
+  );
+  my $group_delete = $dbh->prepare(
+    q{DELETE FROM user_group_map
                                        WHERE user_id = ?
                                          AND group_id = ?
                                          AND isbless = 0
-                                         AND grant_type = ?});
-    while (my ($group, $regexp, $present) = $sth->fetchrow_array()) {
-        if (($regexp ne '') && ($self->login =~ m/$regexp/i)) {
-            $group_insert->execute($id, $group, GRANT_REGEXP) unless $present;
-        } else {
-            $group_delete->execute($id, $group, GRANT_REGEXP) if $present;
-        }
+                                         AND grant_type = ?}
+  );
+  while (my ($group, $regexp, $present) = $sth->fetchrow_array()) {
+    if (($regexp ne '') && ($self->login =~ m/$regexp/i)) {
+      $group_insert->execute($id, $group, GRANT_REGEXP) unless $present;
     }
+    else {
+      $group_delete->execute($id, $group, GRANT_REGEXP) if $present;
+    }
+  }
 
-    Bugzilla->memcached->clear_config({ key => "user_groups.$id" });
+  Bugzilla->memcached->clear_config({key => "user_groups.$id"});
 }
 
 sub product_responsibilities {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    return $self->{'product_resp'} if defined $self->{'product_resp'};
-    return [] unless $self->id;
+  return $self->{'product_resp'} if defined $self->{'product_resp'};
+  return [] unless $self->id;
 
-    my $list = $dbh->selectall_arrayref('SELECT components.product_id, components.id
+  my $list = $dbh->selectall_arrayref(
+    'SELECT components.product_id, components.id
                                            FROM components
                                            LEFT JOIN component_cc
                                            ON components.id = component_cc.component_id
                                           WHERE components.initialowner = ?
                                              OR components.initialqacontact = ?
                                              OR component_cc.user_id = ?',
-                                  {Slice => {}}, ($self->id, $self->id, $self->id));
-
-    unless ($list) {
-        $self->{'product_resp'} = [];
-        return $self->{'product_resp'};
-    }
+    {Slice => {}}, ($self->id, $self->id, $self->id)
+  );
 
-    my @prod_ids = map {$_->{'product_id'}} @$list;
-    my $products = Bugzilla::Product->new_from_list(\@prod_ids);
-    # We cannot |use| it, because Component.pm already |use|s User.pm.
-    require Bugzilla::Component;
-    my @comp_ids = map {$_->{'id'}} @$list;
-    my $components = Bugzilla::Component->new_from_list(\@comp_ids);
-
-    my @prod_list;
-    # @$products is already sorted alphabetically.
-    foreach my $prod (@$products) {
-        # We use @components instead of $prod->components because we only want
-        # components where the user is either the default assignee or QA contact.
-        push(@prod_list, {product    => $prod,
-                          components => [grep {$_->product_id == $prod->id} @$components]});
-    }
-    $self->{'product_resp'} = \@prod_list;
+  unless ($list) {
+    $self->{'product_resp'} = [];
     return $self->{'product_resp'};
+  }
+
+  my @prod_ids = map { $_->{'product_id'} } @$list;
+  my $products = Bugzilla::Product->new_from_list(\@prod_ids);
+
+  # We cannot |use| it, because Component.pm already |use|s User.pm.
+  require Bugzilla::Component;
+  my @comp_ids = map { $_->{'id'} } @$list;
+  my $components = Bugzilla::Component->new_from_list(\@comp_ids);
+
+  my @prod_list;
+
+  # @$products is already sorted alphabetically.
+  foreach my $prod (@$products) {
+
+    # We use @components instead of $prod->components because we only want
+    # components where the user is either the default assignee or QA contact.
+    push(
+      @prod_list,
+      {
+        product    => $prod,
+        components => [grep { $_->product_id == $prod->id } @$components]
+      }
+    );
+  }
+  $self->{'product_resp'} = \@prod_list;
+  return $self->{'product_resp'};
 }
 
 sub can_bless {
-    my $self = shift;
+  my $self = shift;
 
-    if (!scalar(@_)) {
-        # If we're called without an argument, just return 
-        # whether or not we can bless at all.
-        return scalar(@{ $self->bless_groups }) ? 1 : 0;
-    }
+  if (!scalar(@_)) {
+
+    # If we're called without an argument, just return
+    # whether or not we can bless at all.
+    return scalar(@{$self->bless_groups}) ? 1 : 0;
+  }
 
-    # Otherwise, we're checking a specific group
-    my $group_id = shift;
-    return grep($_->id == $group_id, @{ $self->bless_groups }) ? 1 : 0;
+  # Otherwise, we're checking a specific group
+  my $group_id = shift;
+  return grep($_->id == $group_id, @{$self->bless_groups}) ? 1 : 0;
 }
 
 sub match {
-    # Generates a list of users whose login name (email address) or real name
-    # matches a substring or wildcard.
-    # This is also called if matches are disabled (for error checking), but
-    # in this case only the exact match code will end up running.
-
-    # $str contains the string to match, while $limit contains the
-    # maximum number of records to retrieve.
-    my ($str, $limit, $exclude_disabled) = @_;
-    my $user = Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
-
-    $str = trim($str);
-
-    my @users = ();
-    return \@users if $str =~ /^\s*$/;
-
-    # The search order is wildcards, then exact match, then substring search.
-    # Wildcard matching is skipped if there is no '*', and exact matches will
-    # not (?) have a '*' in them.  If any search comes up with something, the
-    # ones following it will not execute.
-
-    # first try wildcards
-    my $wildstr = $str;
-
-    # Do not do wildcards if there is no '*' in the string.
-    if ($wildstr =~ s/\*/\%/g && $user->id) {
-        # Build the query.
-        trick_taint($wildstr);
-        my $query  = "SELECT DISTINCT userid FROM profiles ";
-        if (Bugzilla->params->{'usevisibilitygroups'}) {
-            $query .= "INNER JOIN user_group_map
-                               ON user_group_map.user_id = profiles.userid ";
-        }
-        $query .= "WHERE ("
-            . $dbh->sql_istrcmp('login_name', '?', "LIKE") . " OR " .
-              $dbh->sql_istrcmp('realname', '?', "LIKE") . ") ";
-        if (Bugzilla->params->{'usevisibilitygroups'}) {
-            $query .= "AND isbless = 0 " .
-                      "AND group_id IN(" .
-                      join(', ', (-1, @{$user->visible_groups_inherited})) . ") ";
-        }
-        $query    .= " AND is_enabled = 1 " if $exclude_disabled;
-        $query    .= $dbh->sql_limit($limit) if $limit;
 
-        # Execute the query, retrieve the results, and make them into
-        # User objects.
-        my $user_ids = $dbh->selectcol_arrayref($query, undef, ($wildstr, $wildstr));
-        @users = @{Bugzilla::User->new_from_list($user_ids)};
-    }
-    else {    # try an exact match
-        # Exact matches don't care if a user is disabled.
-        trick_taint($str);
-        my $user_id = $dbh->selectrow_array('SELECT userid FROM profiles
-                                             WHERE ' . $dbh->sql_istrcmp('login_name', '?'),
-                                             undef, $str);
-
-        push(@users, new Bugzilla::User($user_id)) if $user_id;
+  # Generates a list of users whose login name or real name matches a
+  # substring or wildcard.
+  # This is also called if matches are disabled (for error checking), but
+  # in this case only the exact match code will end up running.
+
+  # $str contains the string to match, while $limit contains the
+  # maximum number of records to retrieve.
+  my ($str, $limit, $exclude_disabled) = @_;
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
+
+  $str = trim($str);
+
+  my @users = ();
+  return \@users if $str =~ /^\s*$/;
+
+  # The search order is wildcards, then exact match, then substring search.
+  # Wildcard matching is skipped if there is no '*', and exact matches will
+  # not (?) have a '*' in them.  If any search comes up with something, the
+  # ones following it will not execute.
+
+  # first try wildcards
+  my $wildstr = $str;
+
+  # Do not do wildcards if there is no '*' in the string.
+  if ($wildstr =~ s/\*/\%/g && $user->id) {
+
+    # Build the query.
+    trick_taint($wildstr);
+    my $query = "SELECT DISTINCT userid FROM profiles ";
+    if (Bugzilla->params->{'usevisibilitygroups'}) {
+      $query .= "INNER JOIN user_group_map
+                               ON user_group_map.user_id = profiles.userid ";
     }
+    $query
+      .= "WHERE ("
+      . $dbh->sql_istrcmp('login_name', '?', "LIKE") . " OR "
+      . $dbh->sql_istrcmp('realname',   '?', "LIKE") . ") ";
+    if (Bugzilla->params->{'usevisibilitygroups'}) {
+      $query
+        .= "AND isbless = 0 "
+        . "AND group_id IN("
+        . join(', ', (-1, @{$user->visible_groups_inherited})) . ") ";
+    }
+    $query .= " AND is_enabled = 1 "  if $exclude_disabled;
+    $query .= $dbh->sql_limit($limit) if $limit;
+
+    # Execute the query, retrieve the results, and make them into
+    # User objects.
+    my $user_ids = $dbh->selectcol_arrayref($query, undef, ($wildstr, $wildstr));
+    @users = @{Bugzilla::User->new_from_list($user_ids)};
+  }
+  else {    # try an exact match
+            # Exact matches don't care if a user is disabled, and match
+            # login names only.
+    trick_taint($str);
+
+    my $user_id = $dbh->selectrow_array(
+      'SELECT userid FROM profiles
+                                             WHERE '
+        . $dbh->sql_istrcmp('login_name', '?'), undef, $str
+    );
 
-    # then try substring search
-    if (!scalar(@users) && length($str) >= 3 && $user->id) {
-        trick_taint($str);
+    push(@users, new Bugzilla::User($user_id)) if $user_id;
+  }
 
-        my $query   = "SELECT DISTINCT userid FROM profiles ";
-        if (Bugzilla->params->{'usevisibilitygroups'}) {
-            $query .= "INNER JOIN user_group_map
+  # then try substring search
+  if (!scalar(@users) && length($str) >= 3 && $user->id) {
+    trick_taint($str);
+
+    my $query = "SELECT DISTINCT userid FROM profiles ";
+    if (Bugzilla->params->{'usevisibilitygroups'}) {
+      $query .= "INNER JOIN user_group_map
                                ON user_group_map.user_id = profiles.userid ";
-        }
-        $query     .= " WHERE (" .
-                $dbh->sql_iposition('?', 'login_name') . " > 0" . " OR " .
-                $dbh->sql_iposition('?', 'realname') . " > 0) ";
-        if (Bugzilla->params->{'usevisibilitygroups'}) {
-            $query .= " AND isbless = 0" .
-                      " AND group_id IN(" .
-                join(', ', (-1, @{$user->visible_groups_inherited})) . ") ";
-        }
-        $query     .= " AND is_enabled = 1 " if $exclude_disabled;
-        $query     .= $dbh->sql_limit($limit) if $limit;
-        my $user_ids = $dbh->selectcol_arrayref($query, undef, ($str, $str));
-        @users = @{Bugzilla::User->new_from_list($user_ids)};
     }
-    return \@users;
+    $query
+      .= " WHERE ("
+      . $dbh->sql_iposition('?', 'login_name') . " > 0" . " OR "
+      . $dbh->sql_iposition('?', 'realname')
+      . " > 0) ";
+    if (Bugzilla->params->{'usevisibilitygroups'}) {
+      $query
+        .= " AND isbless = 0"
+        . " AND group_id IN("
+        . join(', ', (-1, @{$user->visible_groups_inherited})) . ") ";
+    }
+    $query .= " AND is_enabled = 1 "  if $exclude_disabled;
+    $query .= $dbh->sql_limit($limit) if $limit;
+    my $user_ids = $dbh->selectcol_arrayref($query, undef, ($str, $str));
+    @users = @{Bugzilla::User->new_from_list($user_ids)};
+  }
+  return \@users;
 }
 
 sub match_field {
-    my $fields       = shift;   # arguments as a hash
-    my $data         = shift || Bugzilla->input_params; # hash to look up fields in
-    my $behavior     = shift || 0; # A constant that tells us how to act
-    my $matches      = {};      # the values sent to the template
-    my $matchsuccess = 1;       # did the match fail?
-    my $need_confirm = 0;       # whether to display confirmation screen
-    my $match_multiple = 0;     # whether we ever matched more than one user
-    my @non_conclusive_fields;  # fields which don't have a unique user.
-
-    my $params = Bugzilla->params;
-
-    # prepare default form values
-
-    # Fields can be regular expressions matching multiple form fields
-    # (f.e. "requestee-(\d+)"), so expand each non-literal field
-    # into the list of form fields it matches.
-    my $expanded_fields = {};
-    foreach my $field_pattern (keys %{$fields}) {
-        # Check if the field has any non-word characters.  Only those fields
-        # can be regular expressions, so don't expand the field if it doesn't
-        # have any of those characters.
-        if ($field_pattern =~ /^\w+$/) {
-            $expanded_fields->{$field_pattern} = $fields->{$field_pattern};
-        }
-        else {
-            my @field_names = grep(/$field_pattern/, keys %$data);
-
-            foreach my $field_name (@field_names) {
-                $expanded_fields->{$field_name} = 
-                  { type => $fields->{$field_pattern}->{'type'} };
-                
-                # The field is a requestee field; in order for its name 
-                # to show up correctly on the confirmation page, we need 
-                # to find out the name of its flag type.
-                if ($field_name =~ /^requestee(_type)?-(\d+)$/) {
-                    my $flag_type;
-                    if ($1) {
-                        require Bugzilla::FlagType;
-                        $flag_type = new Bugzilla::FlagType($2);
-                    }
-                    else {
-                        require Bugzilla::Flag;
-                        my $flag = new Bugzilla::Flag($2);
-                        $flag_type = $flag->type if $flag;
-                    }
-                    if ($flag_type) {
-                        $expanded_fields->{$field_name}->{'flag_type'} = $flag_type;
-                    }
-                    else {
-                        # No need to look for a valid requestee if the flag(type)
-                        # has been deleted (may occur in race conditions).
-                        delete $expanded_fields->{$field_name};
-                        delete $data->{$field_name};
-                    }
-                }
-            }
+  my $fields = shift;                            # arguments as a hash
+  my $data = shift || Bugzilla->input_params;    # hash to look up fields in
+  my $behavior       = shift || 0;    # A constant that tells us how to act
+  my $matches        = {};            # the values sent to the template
+  my $matchsuccess   = 1;             # did the match fail?
+  my $need_confirm   = 0;             # whether to display confirmation screen
+  my $match_multiple = 0;             # whether we ever matched more than one user
+  my @non_conclusive_fields;          # fields which don't have a unique user.
+
+  my $params = Bugzilla->params;
+
+  # prepare default form values
+
+  # Fields can be regular expressions matching multiple form fields
+  # (f.e. "requestee-(\d+)"), so expand each non-literal field
+  # into the list of form fields it matches.
+  my $expanded_fields = {};
+  foreach my $field_pattern (keys %{$fields}) {
+
+    # Check if the field has any non-word characters.  Only those fields
+    # can be regular expressions, so don't expand the field if it doesn't
+    # have any of those characters.
+    if ($field_pattern =~ /^\w+$/) {
+      $expanded_fields->{$field_pattern} = $fields->{$field_pattern};
+    }
+    else {
+      my @field_names = grep(/$field_pattern/, keys %$data);
+
+      foreach my $field_name (@field_names) {
+        $expanded_fields->{$field_name} = {type => $fields->{$field_pattern}->{'type'}};
+
+        # The field is a requestee field; in order for its name
+        # to show up correctly on the confirmation page, we need
+        # to find out the name of its flag type.
+        if ($field_name =~ /^requestee(_type)?-(\d+)$/a) {
+          my $flag_type;
+          if ($1) {
+            require Bugzilla::FlagType;
+            $flag_type = new Bugzilla::FlagType($2);
+          }
+          else {
+            require Bugzilla::Flag;
+            my $flag = new Bugzilla::Flag($2);
+            $flag_type = $flag->type if $flag;
+          }
+          if ($flag_type) {
+            $expanded_fields->{$field_name}->{'flag_type'} = $flag_type;
+          }
+          else {
+            # No need to look for a valid requestee if the flag(type)
+            # has been deleted (may occur in race conditions).
+            delete $expanded_fields->{$field_name};
+            delete $data->{$field_name};
+          }
         }
+      }
     }
-    $fields = $expanded_fields;
+  }
+  $fields = $expanded_fields;
 
-    foreach my $field (keys %{$fields}) {
-        next unless defined $data->{$field};
+  foreach my $field (keys %{$fields}) {
+    next unless defined $data->{$field};
 
-        #Concatenate login names, so that we have a common way to handle them.
-        my $raw_field;
-        if (ref $data->{$field}) {
-            $raw_field = join(",", @{$data->{$field}});
-        }
-        else {
-            $raw_field = $data->{$field};
-        }
-        $raw_field = clean_text($raw_field || '');
-
-        # Now we either split $raw_field by spaces/commas and put the list
-        # into @queries, or in the case of fields which only accept single
-        # entries, we simply use the verbatim text.
-        my @queries;
-        if ($fields->{$field}->{'type'} eq 'single') {
-            @queries = ($raw_field);
-            # We will repopulate it later if a match is found, else it must
-            # be set to an empty string so that the field remains defined.
-            $data->{$field} = '';
-        }
-        elsif ($fields->{$field}->{'type'} eq 'multi') {
-            @queries =  split(/[,;]+/, $raw_field);
-            # We will repopulate it later if a match is found, else it must
-            # be undefined.
-            delete $data->{$field};
-        }
-        else {
-            # bad argument
-            ThrowCodeError('bad_arg',
-                           { argument => $fields->{$field}->{'type'},
-                             function =>  'Bugzilla::User::match_field',
-                           });
-        }
+    #Concatenate login names, so that we have a common way to handle them.
+    my $raw_field;
+    if (ref $data->{$field}) {
+      $raw_field = join(",", @{$data->{$field}});
+    }
+    else {
+      $raw_field = $data->{$field};
+    }
+    $raw_field = clean_text($raw_field || '');
 
-        # Tolerate fields that do not exist (in case you specify
-        # e.g. the QA contact, and it's currently not in use).
-        next unless (defined $raw_field && $raw_field ne '');
+    # Now we either split $raw_field by spaces/commas and put the list
+    # into @queries, or in the case of fields which only accept single
+    # entries, we simply use the verbatim text.
+    my @queries;
+    if ($fields->{$field}->{'type'} eq 'single') {
+      @queries = ($raw_field);
 
-        my $limit = 0;
-        if ($params->{'maxusermatches'}) {
-            $limit = $params->{'maxusermatches'} + 1;
-        }
+      # We will repopulate it later if a match is found, else it must
+      # be set to an empty string so that the field remains defined.
+      $data->{$field} = '';
+    }
+    elsif ($fields->{$field}->{'type'} eq 'multi') {
+      @queries = split(/[,;]+/, $raw_field);
 
-        my @logins;
-        for my $query (@queries) {
-            $query = trim($query);
-            next if $query eq '';
-
-            my $users = match(
-                $query,   # match string
-                $limit,   # match limit
-                1         # exclude_disabled
-            );
-
-            # here is where it checks for multiple matches
-            if (scalar(@{$users}) == 1) { # exactly one match
-                push(@logins, @{$users}[0]->login);
-
-                # skip confirmation for exact matches
-                next if (lc(@{$users}[0]->login) eq lc($query));
-
-                $matches->{$field}->{$query}->{'status'} = 'success';
-                $need_confirm = 1 if $params->{'confirmuniqueusermatch'};
-
-            }
-            elsif ((scalar(@{$users}) > 1)
-                    && ($params->{'maxusermatches'} != 1)) {
-                $need_confirm = 1;
-                $match_multiple = 1;
-                push(@non_conclusive_fields, $field);
-
-                if (($params->{'maxusermatches'})
-                   && (scalar(@{$users}) > $params->{'maxusermatches'}))
-                {
-                    $matches->{$field}->{$query}->{'status'} = 'trunc';
-                    pop @{$users};  # take the last one out
-                }
-                else {
-                    $matches->{$field}->{$query}->{'status'} = 'success';
-                }
-
-            }
-            else {
-                # everything else fails
-                $matchsuccess = 0; # fail
-                push(@non_conclusive_fields, $field);
-                $matches->{$field}->{$query}->{'status'} = 'fail';
-                $need_confirm = 1;  # confirmation screen shows failures
-            }
-
-            $matches->{$field}->{$query}->{'users'}  = $users;
+      # We will repopulate it later if a match is found, else it must
+      # be undefined.
+      delete $data->{$field};
+    }
+    else {
+      # bad argument
+      ThrowCodeError(
+        'bad_arg',
+        {
+          argument => $fields->{$field}->{'type'},
+          function => 'Bugzilla::User::match_field',
         }
+      );
+    }
+
+    # Tolerate fields that do not exist (in case you specify
+    # e.g. the QA contact, and it's currently not in use).
+    next unless (defined $raw_field && $raw_field ne '');
 
-        # If no match or more than one match has been found for a field
-        # expecting only one match (type eq "single"), we set it back to ''
-        # so that the caller of this function can still check whether this
-        # field was defined or not (and it was if we came here).
-        if ($fields->{$field}->{'type'} eq 'single') {
-            $data->{$field} = $logins[0] || '';
+    my $limit = 0;
+    if ($params->{'maxusermatches'}) {
+      $limit = $params->{'maxusermatches'} + 1;
+    }
+
+    my @logins;
+    for my $query (@queries) {
+      $query = trim($query);
+      next if $query eq '';
+
+      my $users = match(
+        $query,    # match string
+        $limit,    # match limit
+        1          # exclude_disabled
+      );
+
+      # here is where it checks for multiple matches
+      if (scalar(@{$users}) == 1) {    # exactly one match
+        push(@logins, @{$users}[0]->login);
+
+        # skip confirmation for exact matches
+        next if (lc(@{$users}[0]->login) eq lc($query));
+
+        $matches->{$field}->{$query}->{'status'} = 'success';
+        $need_confirm = 1 if $params->{'confirmuniqueusermatch'};
+
+      }
+      elsif ((scalar(@{$users}) > 1) && ($params->{'maxusermatches'} != 1)) {
+        $need_confirm   = 1;
+        $match_multiple = 1;
+        push(@non_conclusive_fields, $field);
+
+        if ( ($params->{'maxusermatches'})
+          && (scalar(@{$users}) > $params->{'maxusermatches'}))
+        {
+          $matches->{$field}->{$query}->{'status'} = 'trunc';
+          pop @{$users};    # take the last one out
         }
-        elsif (scalar @logins) {
-            $data->{$field} = \@logins;
+        else {
+          $matches->{$field}->{$query}->{'status'} = 'success';
         }
-    }
 
-    my $retval;
-    if (!$matchsuccess) {
-        $retval = USER_MATCH_FAILED;
+      }
+      else {
+        # everything else fails
+        $matchsuccess = 0;    # fail
+        push(@non_conclusive_fields, $field);
+        $matches->{$field}->{$query}->{'status'} = 'fail';
+        $need_confirm = 1;    # confirmation screen shows failures
+      }
+
+      $matches->{$field}->{$query}->{'users'} = $users;
     }
-    elsif ($match_multiple) {
-        $retval = USER_MATCH_MULTIPLE;
+
+    # If no match or more than one match has been found for a field
+    # expecting only one match (type eq "single"), we set it back to ''
+    # so that the caller of this function can still check whether this
+    # field was defined or not (and it was if we came here).
+    if ($fields->{$field}->{'type'} eq 'single') {
+      $data->{$field} = $logins[0] || '';
     }
-    else {
-        $retval = USER_MATCH_SUCCESS;
+    elsif (scalar @logins) {
+      $data->{$field} = \@logins;
     }
+  }
 
-    # Skip confirmation if we were told to, or if we don't need to confirm.
-    if ($behavior == MATCH_SKIP_CONFIRM || !$need_confirm) {
-        return wantarray ? ($retval, \@non_conclusive_fields) : $retval;
-    }
+  my $retval;
+  if (!$matchsuccess) {
+    $retval = USER_MATCH_FAILED;
+  }
+  elsif ($match_multiple) {
+    $retval = USER_MATCH_MULTIPLE;
+  }
+  else {
+    $retval = USER_MATCH_SUCCESS;
+  }
+
+  # Skip confirmation if we were told to, or if we don't need to confirm.
+  if ($behavior == MATCH_SKIP_CONFIRM || !$need_confirm) {
+    return wantarray ? ($retval, \@non_conclusive_fields) : $retval;
+  }
 
-    my $template = Bugzilla->template;
-    my $cgi = Bugzilla->cgi;
-    my $vars = {};
+  my $template = Bugzilla->template;
+  my $cgi      = Bugzilla->cgi;
+  my $vars     = {};
 
-    $vars->{'script'}        = $cgi->url(-relative => 1); # for self-referencing URLs
-    $vars->{'fields'}        = $fields; # fields being matched
-    $vars->{'matches'}       = $matches; # matches that were made
-    $vars->{'matchsuccess'}  = $matchsuccess; # continue or fail
-    $vars->{'matchmultiple'} = $match_multiple;
+  $vars->{'script'}       = $cgi->url(-relative => 1); # for self-referencing URLs
+  $vars->{'fields'}       = $fields;                   # fields being matched
+  $vars->{'matches'}      = $matches;                  # matches that were made
+  $vars->{'matchsuccess'} = $matchsuccess;             # continue or fail
+  $vars->{'matchmultiple'} = $match_multiple;
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $template->process("global/confirm-user-match.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("global/confirm-user-match.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 
 }
 
 # Changes in some fields automatically trigger events. The field names are
 # from the fielddefs table.
 our %names_to_events = (
-    'resolution'              => EVT_OPENED_CLOSED,
-    'keywords'                => EVT_KEYWORD,
-    'cc'                      => EVT_CC,
-    'bug_severity'            => EVT_PROJ_MANAGEMENT,
-    'priority'                => EVT_PROJ_MANAGEMENT,
-    'bug_status'              => EVT_PROJ_MANAGEMENT,
-    'target_milestone'        => EVT_PROJ_MANAGEMENT,
-    'attachments.description' => EVT_ATTACHMENT_DATA,
-    'attachments.mimetype'    => EVT_ATTACHMENT_DATA,
-    'attachments.ispatch'     => EVT_ATTACHMENT_DATA,
-    'dependson'               => EVT_DEPEND_BLOCK,
-    'blocked'                 => EVT_DEPEND_BLOCK,
-    'product'                 => EVT_COMPONENT,
-    'component'               => EVT_COMPONENT);
+  'resolution'              => EVT_OPENED_CLOSED,
+  'keywords'                => EVT_KEYWORD,
+  'cc'                      => EVT_CC,
+  'bug_severity'            => EVT_PROJ_MANAGEMENT,
+  'priority'                => EVT_PROJ_MANAGEMENT,
+  'bug_status'              => EVT_PROJ_MANAGEMENT,
+  'target_milestone'        => EVT_PROJ_MANAGEMENT,
+  'attachments.description' => EVT_ATTACHMENT_DATA,
+  'attachments.mimetype'    => EVT_ATTACHMENT_DATA,
+  'attachments.ispatch'     => EVT_ATTACHMENT_DATA,
+  'dependson'               => EVT_DEPEND_BLOCK,
+  'blocked'                 => EVT_DEPEND_BLOCK,
+  'product'                 => EVT_COMPONENT,
+  'component'               => EVT_COMPONENT
+);
 
 # Returns true if the user wants mail for a given bug change.
 # Note: the "+" signs before the constants suppress bareword quoting.
 sub wants_bug_mail {
-    my $self = shift;
-    my ($bug, $relationship, $fieldDiffs, $comments, $dep_mail, $changer) = @_;
-
-    # Make a list of the events which have happened during this bug change,
-    # from the point of view of this user.    
-    my %events;    
-    foreach my $change (@$fieldDiffs) {
-        my $fieldName = $change->{field_name};
-        # A change to any of the above fields sets the corresponding event
-        if (defined($names_to_events{$fieldName})) {
-            $events{$names_to_events{$fieldName}} = 1;
-        }
-        else {
-            # Catch-all for any change not caught by a more specific event
-            $events{+EVT_OTHER} = 1;
-        }
-
-        # If the user is in a particular role and the value of that role
-        # changed, we need the ADDED_REMOVED event.
-        if (($fieldName eq "assigned_to" && $relationship == REL_ASSIGNEE) ||
-            ($fieldName eq "qa_contact" && $relationship == REL_QA))
-        {
-            $events{+EVT_ADDED_REMOVED} = 1;
-        }
-        
-        if ($fieldName eq "cc") {
-            my $login = $self->login;
-            my $inold = ($change->{old} =~ /^(.*,\s*)?\Q$login\E(,.*)?$/);
-            my $innew = ($change->{new} =~ /^(.*,\s*)?\Q$login\E(,.*)?$/);
-            if ($inold != $innew)
-            {
-                $events{+EVT_ADDED_REMOVED} = 1;
-            }
-        }
-    }
+  my $self = shift;
+  my ($bug, $relationship, $fieldDiffs, $comments, $dep_mail, $changer,
+    $minor_update)
+    = @_;
 
-    if (!$bug->lastdiffed) {
-        # Notify about new bugs.
-        $events{+EVT_BUG_CREATED} = 1;
+  # Make a list of the events which have happened during this bug change,
+  # from the point of view of this user.
+  my %events;
+  foreach my $change (@$fieldDiffs) {
+    my $fieldName = $change->{field_name};
 
-        # You role is new if the bug itself is.
-        # Only makes sense for the assignee, QA contact and the CC list.
-        if ($relationship == REL_ASSIGNEE
-            || $relationship == REL_QA
-            || $relationship == REL_CC)
-        {
-            $events{+EVT_ADDED_REMOVED} = 1;
-        }
+    # A change to any of the above fields sets the corresponding event
+    if (defined($names_to_events{$fieldName})) {
+      $events{$names_to_events{$fieldName}} = 1;
     }
-
-    if (grep { $_->type == CMT_ATTACHMENT_CREATED } @$comments) {
-        $events{+EVT_ATTACHMENT} = 1;
+    else {
+      # Catch-all for any change not caught by a more specific event
+      $events{+EVT_OTHER} = 1;
     }
-    elsif (defined($$comments[0])) {
-        $events{+EVT_COMMENT} = 1;
+
+    # If the user is in a particular role and the value of that role
+    # changed, we need the ADDED_REMOVED event.
+    if ( ($fieldName eq "assigned_to" && $relationship == REL_ASSIGNEE)
+      || ($fieldName eq "qa_contact" && $relationship == REL_QA))
+    {
+      $events{+EVT_ADDED_REMOVED} = 1;
     }
-    
-    # Dependent changed bugmails must have an event to ensure the bugmail is
-    # emailed.
-    if ($dep_mail) {
-        $events{+EVT_DEPEND_BLOCK} = 1;
+
+    if ($fieldName eq "cc") {
+      my $login = $self->login;
+      my $inold = ($change->{old} =~ /^(.*,\s*)?\Q$login\E(,.*)?$/);
+      my $innew = ($change->{new} =~ /^(.*,\s*)?\Q$login\E(,.*)?$/);
+      if ($inold != $innew) {
+        $events{+EVT_ADDED_REMOVED} = 1;
+      }
     }
+  }
 
-    my @event_list = keys %events;
-    
-    my $wants_mail = $self->wants_mail(\@event_list, $relationship);
-
-    # The negative events are handled separately - they can't be incorporated
-    # into the first wants_mail call, because they are of the opposite sense.
-    # 
-    # We do them separately because if _any_ of them are set, we don't want
-    # the mail.
-    if ($wants_mail && $changer && ($self->id == $changer->id)) {
-        $wants_mail &= $self->wants_mail([EVT_CHANGED_BY_ME], $relationship);
-    }    
-    
-    if ($wants_mail && $bug->bug_status eq 'UNCONFIRMED') {
-        $wants_mail &= $self->wants_mail([EVT_UNCONFIRMED], $relationship);
+  if (!$bug->lastdiffed) {
+
+    # Notify about new bugs.
+    $events{+EVT_BUG_CREATED} = 1;
+
+    # You role is new if the bug itself is.
+    # Only makes sense for the assignee, QA contact and the CC list.
+    if ( $relationship == REL_ASSIGNEE
+      || $relationship == REL_QA
+      || $relationship == REL_CC)
+    {
+      $events{+EVT_ADDED_REMOVED} = 1;
     }
-    
-    return $wants_mail;
+  }
+
+  if (grep { $_->type == CMT_ATTACHMENT_CREATED } @$comments) {
+    $events{+EVT_ATTACHMENT} = 1;
+  }
+  elsif (defined($$comments[0])) {
+    $events{+EVT_COMMENT} = 1;
+  }
+
+  # Dependent changed bugmails must have an event to ensure the bugmail is
+  # emailed.
+  if ($dep_mail) {
+    $events{+EVT_DEPEND_BLOCK} = 1;
+  }
+
+  my @event_list = keys %events;
+
+  my $wants_mail = $self->wants_mail(\@event_list, $relationship);
+
+  # The negative events are handled separately - they can't be incorporated
+  # into the first wants_mail call, because they are of the opposite sense.
+  #
+  # We do them separately because if _any_ of them are set, we don't want
+  # the mail.
+  if ($wants_mail && $changer && ($self->id == $changer->id)) {
+    $wants_mail &= $self->wants_mail([EVT_CHANGED_BY_ME], $relationship);
+  }
+
+  if ($wants_mail && $bug->bug_status eq 'UNCONFIRMED') {
+    $wants_mail &= $self->wants_mail([EVT_UNCONFIRMED], $relationship);
+  }
+
+  if ($wants_mail && $minor_update) {
+    $wants_mail &= $self->wants_mail([EVT_MINOR_UPDATE], $relationship);
+  }
+
+  return $wants_mail;
 }
 
 # Returns true if the user wants mail for a given set of events.
 sub wants_mail {
-    my $self = shift;
-    my ($events, $relationship) = @_;
-    
-    # Don't send any mail, ever, if account is disabled 
-    # XXX Temporary Compatibility Change 1 of 2:
-    # This code is disabled for the moment to make the behaviour like the old
-    # system, which sent bugmail to disabled accounts.
-    # return 0 if $self->{'disabledtext'};
-    
-    # No mail if there are no events
-    return 0 if !scalar(@$events);
-
-    # If a relationship isn't given, default to REL_ANY.
-    if (!defined($relationship)) {
-        $relationship = REL_ANY;
-    }
+  my $self = shift;
+  my ($events, $relationship) = @_;
 
-    # Skip DB query if relationship is explicit
-    return 1 if $relationship == REL_GLOBAL_WATCHER;
+  # Don't send any mail, ever, if account is disabled
+  # XXX Temporary Compatibility Change 1 of 2:
+  # This code is disabled for the moment to make the behaviour like the old
+  # system, which sent bugmail to disabled accounts.
+  # return 0 if $self->{'disabledtext'};
 
-    my $wants_mail = grep { $self->mail_settings->{$relationship}{$_} } @$events;
-    return $wants_mail ? 1 : 0;
+  # No mail if there are no events
+  return 0 if !scalar(@$events);
+
+  # If a relationship isn't given, default to REL_ANY.
+  if (!defined($relationship)) {
+    $relationship = REL_ANY;
+  }
+
+  # Skip DB query if relationship is explicit
+  return 1 if $relationship == REL_GLOBAL_WATCHER;
+
+  my $wants_mail = grep { $self->mail_settings->{$relationship}{$_} } @$events;
+  return $wants_mail ? 1 : 0;
 }
 
 sub mail_settings {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    if (!defined $self->{'mail_settings'}) {
-        my $data =
-          $dbh->selectall_arrayref('SELECT relationship, event FROM email_setting
-                                    WHERE user_id = ?', undef, $self->id);
-        my %mail;
-        # The hash is of the form $mail{$relationship}{$event} = 1.
-        $mail{$_->[0]}{$_->[1]} = 1 foreach @$data;
-
-        $self->{'mail_settings'} = \%mail;
-    }
-    return $self->{'mail_settings'};
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  if (!defined $self->{'mail_settings'}) {
+    my $data = $dbh->selectall_arrayref(
+      'SELECT relationship, event FROM email_setting
+                                    WHERE user_id = ?', undef, $self->id
+    );
+    my %mail;
+
+    # The hash is of the form $mail{$relationship}{$event} = 1.
+    $mail{$_->[0]}{$_->[1]} = 1 foreach @$data;
+
+    $self->{'mail_settings'} = \%mail;
+  }
+  return $self->{'mail_settings'};
 }
 
 sub has_audit_entries {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!exists $self->{'has_audit_entries'}) {
-        $self->{'has_audit_entries'} =
-            $dbh->selectrow_array('SELECT 1 FROM audit_log WHERE user_id = ? ' .
-                                   $dbh->sql_limit(1), undef, $self->id);
-    }
-    return $self->{'has_audit_entries'};
+  if (!exists $self->{'has_audit_entries'}) {
+    $self->{'has_audit_entries'}
+      = $dbh->selectrow_array(
+      'SELECT 1 FROM audit_log WHERE user_id = ? ' . $dbh->sql_limit(1),
+      undef, $self->id);
+  }
+  return $self->{'has_audit_entries'};
 }
 
 sub is_insider {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'is_insider'}) {
-        my $insider_group = Bugzilla->params->{'insidergroup'};
-        $self->{'is_insider'} =
-            ($insider_group && $self->in_group($insider_group)) ? 1 : 0;
-    }
-    return $self->{'is_insider'};
+  if (!defined $self->{'is_insider'}) {
+    my $insider_group = Bugzilla->params->{'insidergroup'};
+    $self->{'is_insider'}
+      = ($insider_group && $self->in_group($insider_group)) ? 1 : 0;
+  }
+  return $self->{'is_insider'};
 }
 
 sub is_global_watcher {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'is_global_watcher'}) {
-        my @watchers = split(/[,;]+/, Bugzilla->params->{'globalwatchers'});
-        $self->{'is_global_watcher'} = scalar(grep { $_ eq $self->login } @watchers) ? 1 : 0;
-    }
-    return  $self->{'is_global_watcher'};
+  if (!defined $self->{'is_global_watcher'}) {
+    my @watchers = split(/[,;]+/, Bugzilla->params->{'globalwatchers'});
+    $self->{'is_global_watcher'}
+      = scalar(grep { $_ eq $self->login } @watchers) ? 1 : 0;
+  }
+  return $self->{'is_global_watcher'};
 }
 
 sub is_timetracker {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'is_timetracker'}) {
-        my $tt_group = Bugzilla->params->{'timetrackinggroup'};
-        $self->{'is_timetracker'} =
-            ($tt_group && $self->in_group($tt_group)) ? 1 : 0;
-    }
-    return $self->{'is_timetracker'};
+  if (!defined $self->{'is_timetracker'}) {
+    my $tt_group = Bugzilla->params->{'timetrackinggroup'};
+    $self->{'is_timetracker'} = ($tt_group && $self->in_group($tt_group)) ? 1 : 0;
+  }
+  return $self->{'is_timetracker'};
 }
 
 sub can_tag_comments {
-    my $self = shift;
+  my $self = shift;
 
-    if (!defined $self->{'can_tag_comments'}) {
-        my $group = Bugzilla->params->{'comment_taggers_group'};
-        $self->{'can_tag_comments'} =
-            ($group && $self->in_group($group)) ? 1 : 0;
-    }
-    return $self->{'can_tag_comments'};
+  if (!defined $self->{'can_tag_comments'}) {
+    my $group = Bugzilla->params->{'comment_taggers_group'};
+    $self->{'can_tag_comments'} = ($group && $self->in_group($group)) ? 1 : 0;
+  }
+  return $self->{'can_tag_comments'};
 }
 
 sub get_userlist {
-    my $self = shift;
-
-    return $self->{'userlist'} if defined $self->{'userlist'};
-
-    my $dbh = Bugzilla->dbh;
-    my $query  = "SELECT DISTINCT login_name, realname,";
-    if (Bugzilla->params->{'usevisibilitygroups'}) {
-        $query .= " COUNT(group_id) ";
-    } else {
-        $query .= " 1 ";
-    }
-    $query     .= "FROM profiles ";
-    if (Bugzilla->params->{'usevisibilitygroups'}) {
-        $query .= "LEFT JOIN user_group_map " .
-                  "ON user_group_map.user_id = userid AND isbless = 0 " .
-                  "AND group_id IN(" .
-                  join(', ', (-1, @{$self->visible_groups_inherited})) . ")";
-    }
-    $query    .= " WHERE is_enabled = 1 ";
-    $query    .= $dbh->sql_group_by('userid', 'login_name, realname');
-
-    my $sth = $dbh->prepare($query);
-    $sth->execute;
-
-    my @userlist;
-    while (my($login, $name, $visible) = $sth->fetchrow_array) {
-        push @userlist, {
-            login => $login,
-            identity => $name ? "$name <$login>" : $login,
-            visible => $visible,
-        };
-    }
-    @userlist = sort { lc $$a{'identity'} cmp lc $$b{'identity'} } @userlist;
-
-    $self->{'userlist'} = \@userlist;
-    return $self->{'userlist'};
+  my $self = shift;
+
+  return $self->{'userlist'} if defined $self->{'userlist'};
+
+  my $dbh   = Bugzilla->dbh;
+  my $query = "SELECT DISTINCT login_name, realname,";
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+    $query .= " COUNT(group_id) ";
+  }
+  else {
+    $query .= " 1 ";
+  }
+  $query .= "FROM profiles ";
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+    $query
+      .= "LEFT JOIN user_group_map "
+      . "ON user_group_map.user_id = userid AND isbless = 0 "
+      . "AND group_id IN("
+      . join(', ', (-1, @{$self->visible_groups_inherited})) . ")";
+  }
+  $query .= " WHERE is_enabled = 1 ";
+  $query .= $dbh->sql_group_by('userid', 'login_name, realname');
+
+  my $sth = $dbh->prepare($query);
+  $sth->execute;
+
+  my @userlist;
+  while (my ($login, $name, $visible) = $sth->fetchrow_array) {
+    push @userlist,
+      {
+      login    => $login,
+      identity => $name ? "$name ($login)" : $login,
+      visible  => $visible,
+      };
+  }
+  @userlist = sort { lc $$a{'identity'} cmp lc $$b{'identity'} } @userlist;
+
+  $self->{'userlist'} = \@userlist;
+  return $self->{'userlist'};
 }
 
 sub create {
-    my $invocant = shift;
-    my $class = ref($invocant) || $invocant;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-
-    my $user = $class->SUPER::create(@_);
-
-    # Turn on all email for the new user
-    require Bugzilla::BugMail;
-    my %relationships = Bugzilla::BugMail::relationships();
-    foreach my $rel (keys %relationships) {
-        foreach my $event (POS_EVENTS, NEG_EVENTS) {
-            # These "exceptions" define the default email preferences.
-            # 
-            # We enable mail unless the change was made by the user, or it's
-            # just a CC list addition and the user is not the reporter.
-            next if ($event == EVT_CHANGED_BY_ME);
-            next if (($event == EVT_CC) && ($rel != REL_REPORTER));
-
-            $dbh->do('INSERT INTO email_setting (user_id, relationship, event)
-                      VALUES (?, ?, ?)', undef, ($user->id, $rel, $event));
-        }
-    }
-
-    foreach my $event (GLOBAL_EVENTS) {
-        $dbh->do('INSERT INTO email_setting (user_id, relationship, event)
-                  VALUES (?, ?, ?)', undef, ($user->id, REL_ANY, $event));
-    }
+  my $invocant = shift;
+  my $class    = ref($invocant) || $invocant;
+  my $dbh      = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+
+  my $user = $class->SUPER::create(@_);
+
+  # Turn on all email for the new user
+  require Bugzilla::BugMail;
+  my %relationships = Bugzilla::BugMail::relationships();
+  foreach my $rel (keys %relationships) {
+    foreach my $event (POS_EVENTS, NEG_EVENTS) {
+
+      # These "exceptions" define the default email preferences.
+      #
+      # We enable mail unless the change was made by the user, or it's
+      # just a CC list addition and the user is not the reporter.
+      next if ($event == EVT_CHANGED_BY_ME);
+      next if (($event == EVT_CC) && ($rel != REL_REPORTER));
+
+      $dbh->do(
+        'INSERT INTO email_setting (user_id, relationship, event)
+                      VALUES (?, ?, ?)', undef, ($user->id, $rel, $event)
+      );
+    }
+  }
+
+  foreach my $event (GLOBAL_EVENTS) {
+    $dbh->do(
+      'INSERT INTO email_setting (user_id, relationship, event)
+                  VALUES (?, ?, ?)', undef, ($user->id, REL_ANY, $event)
+    );
+  }
 
-    $user->derive_regexp_groups();
+  $user->derive_regexp_groups();
 
-    # Add the creation date to the profiles_activity table.
-    # $who is the user who created the new user account, i.e. either an
-    # admin or the new user himself.
-    my $who = Bugzilla->user->id || $user->id;
-    my $creation_date_fieldid = get_field_id('creation_ts');
+  # Add the creation date to the profiles_activity table.
+  # $who is the user who created the new user account, i.e. either an
+  # admin or the new user himself.
+  my $who = Bugzilla->user->id || $user->id;
+  my $creation_date_fieldid = get_field_id('creation_ts');
 
-    $dbh->do('INSERT INTO profiles_activity
+  $dbh->do(
+    'INSERT INTO profiles_activity
                           (userid, who, profiles_when, fieldid, newvalue)
-                   VALUES (?, ?, NOW(), ?, NOW())',
-                   undef, ($user->id, $who, $creation_date_fieldid));
+                   VALUES (?, ?, NOW(), ?, NOW())', undef,
+    ($user->id, $who, $creation_date_fieldid)
+  );
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 
-    # Return the newly created user account.
-    return $user;
+  # Return the newly created user account.
+  return $user;
 }
 
 ###########################
@@ -2302,182 +2483,238 @@ sub create {
 ###########################
 
 sub account_is_locked_out {
-    my $self = shift;
-    my $login_failures = scalar @{ $self->account_ip_login_failures };
-    return $login_failures >= MAX_LOGIN_ATTEMPTS ? 1 : 0;
+  my $self           = shift;
+  my $login_failures = scalar @{$self->account_ip_login_failures};
+  return $login_failures >= MAX_LOGIN_ATTEMPTS ? 1 : 0;
 }
 
 sub note_login_failure {
-    my $self = shift;
-    my $ip_addr = remote_ip();
-    trick_taint($ip_addr);
-    Bugzilla->dbh->do("INSERT INTO login_failure (user_id, ip_addr, login_time)
-                       VALUES (?, ?, LOCALTIMESTAMP(0))",
-                      undef, $self->id, $ip_addr);
-    delete $self->{account_ip_login_failures};
+  my $self    = shift;
+  my $ip_addr = remote_ip();
+  trick_taint($ip_addr);
+  Bugzilla->dbh->do(
+    "INSERT INTO login_failure (user_id, ip_addr, login_time)
+                       VALUES (?, ?, LOCALTIMESTAMP(0))", undef, $self->id, $ip_addr
+  );
+  delete $self->{account_ip_login_failures};
 }
 
 sub clear_login_failures {
-    my $self = shift;
-    my $ip_addr = remote_ip();
-    trick_taint($ip_addr);
-    Bugzilla->dbh->do(
-        'DELETE FROM login_failure WHERE user_id = ? AND ip_addr = ?',
-        undef, $self->id, $ip_addr);
-    delete $self->{account_ip_login_failures};
+  my $self    = shift;
+  my $ip_addr = remote_ip();
+  trick_taint($ip_addr);
+  Bugzilla->dbh->do('DELETE FROM login_failure WHERE user_id = ? AND ip_addr = ?',
+    undef, $self->id, $ip_addr);
+  delete $self->{account_ip_login_failures};
 }
 
 sub account_ip_login_failures {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-    my $time = $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', 
-                                   LOGIN_LOCKOUT_INTERVAL, 'MINUTE');
-    my $ip_addr = remote_ip();
-    trick_taint($ip_addr);
-    $self->{account_ip_login_failures} ||= Bugzilla->dbh->selectall_arrayref(
-        "SELECT login_time, ip_addr, user_id FROM login_failure
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+  my $time = $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', LOGIN_LOCKOUT_INTERVAL,
+    'MINUTE');
+  my $ip_addr = remote_ip();
+  trick_taint($ip_addr);
+  $self->{account_ip_login_failures} ||= Bugzilla->dbh->selectall_arrayref(
+    "SELECT login_time, ip_addr, user_id FROM login_failure
           WHERE user_id = ? AND login_time > $time
                 AND ip_addr = ?
-       ORDER BY login_time", {Slice => {}}, $self->id, $ip_addr);
-    return $self->{account_ip_login_failures};
+       ORDER BY login_time", {Slice => {}}, $self->id, $ip_addr
+  );
+  return $self->{account_ip_login_failures};
+}
+
+sub check_current_password {
+  my $self = shift;
+  my $password = shift || ThrowUserError("current_password_required");
+
+  my $cryptpwd
+    = $self->cryptpassword || ThrowCodeError("unable_to_retrieve_password");
+
+  if (bz_crypt($password, $cryptpwd) ne $cryptpwd) {
+    ThrowUserError("current_password_incorrect");
+  }
+
 }
 
 ###############
 # Subroutines #
 ###############
 
-sub is_available_username {
-    my ($username, $old_username) = @_;
+sub is_available_email {
+  my ($email, $old_email) = @_;
 
-    if(login_to_id($username) != 0) {
-        return 0;
-    }
+  return 0 if email_to_id($email);
 
-    my $dbh = Bugzilla->dbh;
-    # $username is safe because it is only used in SELECT placeholders.
-    trick_taint($username);
-    # Reject if the new login is part of an email change which is
-    # still in progress
-    #
-    # substring/locate stuff: bug 165221; this used to use regexes, but that
-    # was unsafe and required weird escaping; using substring to pull out
-    # the new/old email addresses and sql_position() to find the delimiter (':')
-    # is cleaner/safer
-    my ($tokentype, $eventdata) = $dbh->selectrow_array(
-        "SELECT tokentype, eventdata
+  my $dbh = Bugzilla->dbh;
+
+  # $email is safe because it is only used in SELECT placeholders.
+  trick_taint($email);
+
+  # Reject if the new email is part of an email change which is
+  # still in progress
+  #
+  # substring/locate stuff: bug 165221; this used to use regexes, but that
+  # was unsafe and required weird escaping; using substring to pull out
+  # the new/old email addresses and sql_position() to find the delimiter (':')
+  # is cleaner/safer
+  my ($tokentype, $eventdata) = $dbh->selectrow_array(
+    "SELECT tokentype, eventdata
            FROM tokens
           WHERE (tokentype = 'emailold'
-                AND SUBSTRING(eventdata, 1, (" .
-                    $dbh->sql_position(q{':'}, 'eventdata') . "-  1)) = ?)
+                AND SUBSTRING(eventdata, 1, ("
+      . $dbh->sql_position(q{':'}, 'eventdata') . "-  1)) = ?)
              OR (tokentype = 'emailnew'
-                AND SUBSTRING(eventdata, (" .
-                    $dbh->sql_position(q{':'}, 'eventdata') . "+ 1), LENGTH(eventdata)) = ?)",
-         undef, ($username, $username));
-
-    if ($eventdata) {
-        # Allow thru owner of token
-        if ($old_username
-            && (($tokentype eq 'emailnew' && $eventdata eq "$old_username:$username")
-                || ($tokentype eq 'emailold' && $eventdata eq "$username:$old_username")))
-        {
-            return 1;
-        }
-        return 0;
+                AND SUBSTRING(eventdata, ("
+      . $dbh->sql_position(q{':'}, 'eventdata')
+      . "+ 1), LENGTH(eventdata)) = ?)",
+    undef, ($email, $email)
+  );
+
+  if ($eventdata) {
+
+    # Allow thru owner of token
+    if (
+      $old_email
+      && ( ($tokentype eq 'emailnew' && $eventdata eq "$old_email:$email")
+        || ($tokentype eq 'emailold' && $eventdata eq "$email:$old_email"))
+      )
+    {
+      return 1;
     }
+    return 0;
+  }
 
-    return 1;
+  return 1;
 }
 
 sub check_account_creation_enabled {
-    my $self = shift;
+  my $self = shift;
 
-    # If we're using e.g. LDAP for login, then we can't create a new account.
-    $self->authorizer->user_can_create_account
-      || ThrowUserError('auth_cant_create_account');
+  # If we're using e.g. LDAP for login, then we can't create a new account.
+  $self->authorizer->user_can_create_account
+    || ThrowUserError('auth_cant_create_account');
 
-    Bugzilla->params->{'createemailregexp'}
-      || ThrowUserError('account_creation_disabled');
+  Bugzilla->params->{'createemailregexp'}
+    || ThrowUserError('account_creation_disabled');
 }
 
 sub check_and_send_account_creation_confirmation {
-    my ($self, $login) = @_;
+  my ($self, $login, $email) = @_;
+  my $class = ref($self) || $self;
+  my $dbh = Bugzilla->dbh;
 
-    $login = $self->check_login_name($login);
-    my $creation_regexp = Bugzilla->params->{'createemailregexp'};
+  $dbh->bz_start_transaction;
 
-    if ($login !~ /$creation_regexp/i) {
-        ThrowUserError('account_creation_restricted');
-    }
+  $email = $class->check_email($email);
+  $login = $class->check_login_name($login, undef, {email => $email});
+  my $creation_regexp = Bugzilla->params->{'createemailregexp'};
+
+  if ($email !~ /$creation_regexp/i) {
+    ThrowUserError('account_creation_restricted');
+  }
+
+  # Allow extensions to do extra checks.
+  Bugzilla::Hook::process('user_check_account_creation',
+    {login => $login, email => $email});
 
-    # Create and send a token for this new account.
-    require Bugzilla::Token;
-    Bugzilla::Token::issue_new_user_account_token($login);
+  # Create and send a token for this new account.
+  require Bugzilla::Token;
+  Bugzilla::Token::issue_new_user_account_token($login, $email);
+
+  $dbh->bz_commit_transaction;
 }
 
 # This is used in a few performance-critical areas where we don't want to
 # do check() and pull all the user data from the database.
 sub login_to_id {
-    my ($login, $throw_error) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $cache = Bugzilla->request_cache->{user_login_to_id} ||= {};
-
-    # We cache lookups because this function showed up as taking up a 
-    # significant amount of time in profiles of xt/search.t. However,
-    # for users that don't exist, we re-do the check every time, because
-    # otherwise we break is_available_username.
-    my $user_id;
-    if (defined $cache->{$login}) {
-        $user_id = $cache->{$login};
-    }
-    else {
-        # No need to validate $login -- it will be used by the following SELECT
-        # statement only, so it's safe to simply trick_taint.
-        trick_taint($login);
-        $user_id = $dbh->selectrow_array(
-            "SELECT userid FROM profiles 
-              WHERE " . $dbh->sql_istrcmp('login_name', '?'), undef, $login);
-        $cache->{$login} = $user_id;
-    }
-
-    if ($user_id) {
-        return $user_id;
-    } elsif ($throw_error) {
-        ThrowUserError('invalid_username', { name => $login });
-    } else {
-        return 0;
-    }
+  my ($login, $throw_error) = @_;
+  my $dbh = Bugzilla->dbh;
+  my $cache = Bugzilla->request_cache->{user_login_to_id} ||= {};
+
+  # We cache lookups because this function showed up as taking up a
+  # significant amount of time in profiles of xt/search.t. However,
+  # for users that don't exist, we re-do the check every time.
+  my $user_id;
+  if (defined $cache->{$login}) {
+    $user_id = $cache->{$login};
+  }
+  else {
+    trick_taint($login);
+    $user_id = $dbh->selectrow_array(
+      "SELECT userid FROM profiles
+              WHERE " . $dbh->sql_istrcmp('login_name', '?'), undef, $login
+    );
+    $cache->{$login} = $user_id;
+  }
+
+  if ($user_id) {
+    return $user_id;
+  }
+  elsif ($throw_error) {
+    ThrowUserError('invalid_username', {name => $login});
+  }
+  else {
+    return 0;
+  }
+}
+
+sub email_to_id {
+  my ($email, $throw_error) = @_;
+  my $dbh = Bugzilla->dbh;
+  trick_taint($email);
+  my $user_id
+    = $dbh->selectrow_array(
+    "SELECT userid FROM profiles WHERE " . $dbh->sql_istrcmp('email', '?'),
+    undef, $email);
+  if ($user_id) {
+    return $user_id;
+  }
+  elsif ($throw_error) {
+    ThrowUserError('invalid_email', {email => $email});
+  }
+  else {
+    return 0;
+  }
 }
 
 sub validate_password {
-    my $check = validate_password_check(@_);
-    ThrowUserError($check) if $check;
-    return 1;
+  my $check = validate_password_check(@_);
+  ThrowUserError($check) if $check;
+  return 1;
 }
 
 sub validate_password_check {
-    my ($password, $matchpassword) = @_;
-
-    if (length($password) < USER_PASSWORD_MIN_LENGTH) {
-        return 'password_too_short';
-    } elsif ((defined $matchpassword) && ($password ne $matchpassword)) {
-        return 'passwords_dont_match';
-    }
-
-    my $complexity_level = Bugzilla->params->{password_complexity};
-    if ($complexity_level eq 'letters_numbers_specialchars') {
-        return 'password_not_complex'
-          if ($password !~ /[[:alpha:]]/ || $password !~ /\d/ || $password !~ /[[:punct:]]/);
-    } elsif ($complexity_level eq 'letters_numbers') {
-        return 'password_not_complex'
-          if ($password !~ /[[:lower:]]/ || $password !~ /[[:upper:]]/ || $password !~ /\d/);
-    } elsif ($complexity_level eq 'mixed_letters') {
-        return 'password_not_complex'
-          if ($password !~ /[[:lower:]]/ || $password !~ /[[:upper:]]/);
-    }
-
-    # Having done these checks makes us consider the password untainted.
-    trick_taint($_[0]);
-    return;
+  my ($password, $matchpassword) = @_;
+
+  if (length($password) < USER_PASSWORD_MIN_LENGTH) {
+    return 'password_too_short';
+  }
+  elsif ((defined $matchpassword) && ($password ne $matchpassword)) {
+    return 'passwords_dont_match';
+  }
+
+  my $complexity_level = Bugzilla->params->{password_complexity};
+  if ($complexity_level eq 'letters_numbers_specialchars') {
+    return 'password_not_complex'
+      if ($password !~ /[[:alpha:]]/
+      || $password !~ /\d/
+      || $password !~ /[[:punct:]]/);
+  }
+  elsif ($complexity_level eq 'letters_numbers') {
+    return 'password_not_complex'
+      if ($password !~ /[[:lower:]]/
+      || $password !~ /[[:upper:]]/
+      || $password !~ /\d/);
+  }
+  elsif ($complexity_level eq 'mixed_letters') {
+    return 'password_not_complex'
+      if ($password !~ /[[:lower:]]/ || $password !~ /[[:upper:]]/);
+  }
+
+  # Having done these checks makes us consider the password untainted.
+  trick_taint($_[0]);
+  return;
 }
 
 
@@ -2495,14 +2732,15 @@ Bugzilla::User - Object for a Bugzilla user
 
   my $user = new Bugzilla::User($id);
 
-  my @get_selectable_classifications = 
+  my @get_selectable_classifications =
       $user->get_selectable_classifications;
 
   # Class Functions
-  $user = Bugzilla::User->create({ 
-      login_name    => $username, 
-      realname      => $realname, 
-      cryptpassword => $plaintext_password, 
+  $user = Bugzilla::User->create({
+      login_name    => $username,
+      email         => $email,
+      realname      => $realname,
+      cryptpassword => $plaintext_password,
       disabledtext  => $disabledtext,
       disable_mail  => 0});
 
@@ -2558,6 +2796,27 @@ database changes and so on.
 
 =back
 
+=head2 Validators
+
+=over
+
+=item C<check_email>
+
+Returns the sanitized email address if that email address is well formatted
+and not already used by another user account. Else an error is thrown.
+
+=item C<check_login_name>
+
+Returns the sanitized login name if:
+
+1) it is not already used by another user account; and
+2) it contains no forbidden characters, which means no whitespace characters; and
+3) it contains no @ character (unless it exactly matches the email address of the account).
+
+Else an error is thrown.
+
+=back
+
 =head2 Saved and Shared Queries
 
 =over
@@ -2623,6 +2882,12 @@ C<string> The current summary of the bug.
 Returns true if the user does not want email notifications for the
 specified bug ID, else returns false.
 
+=item C<use_markdown>
+
+Returns true if the user has set their preferences to use Markdown
+for rendering comments. If an optional C<comment> object is passed
+then it returns true if the comment has markdown enabled.
+
 =back
 
 =head2 Saved Recent Bug Lists
@@ -2637,7 +2902,7 @@ containing the user's recent searches.
 =item C<recent_search_containing(bug_id)>
 
 Returns a L<Bugzilla::Search::Recent> object that contains the most recent
-search by the user for the specified bug id. Retuns undef if no match is found.
+search by the user for the specified bug id. Returns undef if no match is found.
 
 =item C<recent_search_for(bug)>
 
@@ -2691,8 +2956,7 @@ Returns the login name for this user.
 
 =item C<email>
 
-Returns the user's email address. Currently this is the same value as the
-login.
+Returns the user's email address.
 
 =item C<name>
 
@@ -2711,10 +2975,10 @@ otherwise.
 
 =item C<nick>
 
-Returns a user "nickname" -- i.e. a shorter, not-necessarily-unique name by
-which to identify the user. Currently the part of the user's email address
-before the at sign (@), but that could change, especially if we implement
-usernames not dependent on email address.
+Usually, this is an alias for C<login>.
+If email addresses are used as logins, though, then this is the part of the
+user's email address before the at sign (@). In this case, nicks are not
+unique.
 
 =item C<authorizer>
 
@@ -3075,6 +3339,15 @@ C<hash> - This is the same as set_groups, but affects what groups a user
 has direct membership to bless that group. It takes the same inputs as
 set_groups.
 
+=item C<set_email_enabled>
+
+C<bool> - Sets C<disable_mail> to the inverse of the boolean provided.
+
+=item C<check_current_password>
+
+C<string> - Throws an error if the supplied password does not match the
+user's current password.
+
 =back
 
 =head1 CLASS FUNCTIONS
@@ -3089,7 +3362,8 @@ called "statically," just like a normal procedural function.
 The same as L<Bugzilla::Object/create>.
 
 Params: login_name - B<Required> The login name for the new user.
-        realname - The full name for the new user.
+        email - B<Required> The email address of the new user.
+        realname - The full name of the new user.
         cryptpassword  - B<Required> The password for the new user.
             Even though the name says "crypt", you should just specify
             a plain-text password. If you specify '*', the user will not
@@ -3110,30 +3384,29 @@ user with that username. Returns a C<Bugzilla::User> object.
 Checks that users can create new user accounts, and throws an error
 if user creation is disabled.
 
-=item C<check_and_send_account_creation_confirmation($login)>
+=item C<check_and_send_account_creation_confirmation($login, $email)>
 
 If the user request for a new account passes validation checks, an email
 is sent to this user for confirmation. Otherwise an error is thrown
 indicating why the request has been rejected.
 
-=item C<is_available_username>
+=item C<is_available_email>
 
-Returns a boolean indicating whether or not the supplied username is
+Returns a boolean indicating whether or not the supplied email address is
 already taken in Bugzilla.
 
-Params: $username (scalar, string) - The full login name of the username 
-            that you are checking.
-        $old_username (scalar, string) - If you are checking an email-change
-            token, insert the "old" username that the user is changing from,
-            here. Then, as long as it's the right user for that token, they
-            can change their username to $username. (That is, this function
+Params: $email (scalar, string) - The email address that you are checking.
+        $old_email (scalar, string) - If you are checking an email-change
+            token, insert the "old" address that the user is changing from,
+            here. Then, as long as it's the right user for that token, he
+            can change his email to $email. (That is, this function
             will return a boolean true value).
 
 =item C<login_to_id($login, $throw_error)>
 
 Takes a login name of a Bugzilla user and changes that into a numeric
 ID for that user. This ID can then be passed to Bugzilla::User::new to
-create a new user.
+create a new user object.
 
 If no valid user exists with that login name, then the function returns 0.
 However, if $throw_error is set, the function will throw a user error
@@ -3145,6 +3418,11 @@ of a user, but you don't want the full weight of Bugzilla::User.
 However, consider using a Bugzilla::User object instead of this function
 if you need more information about the user than just their ID.
 
+=item C<email_to_id($email, $throw_error)>
+
+Same as C<login_to_id>, but operates on an email address instead of a login
+name.
+
 =item C<validate_password($passwd1, $passwd2)>
 
 Returns true if a password is valid (i.e. meets Bugzilla's
@@ -3230,8 +3508,6 @@ L<Bugzilla|Bugzilla>
 
 =item groups_with_icon
 
-=item check_login_name
-
 =item set_extern_id
 
 =item mail_settings
@@ -3248,6 +3524,8 @@ L<Bugzilla|Bugzilla>
 
 =item set_login
 
+=item set_email
+
 =item set_password
 
 =item last_seen_date
diff --git a/Bugzilla/User/APIKey.pm b/Bugzilla/User/APIKey.pm
index d268a0a93c..2ce8a256de 100644
--- a/Bugzilla/User/APIKey.pm
+++ b/Bugzilla/User/APIKey.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::User::APIKey;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,55 +17,57 @@ use Bugzilla::User;
 use Bugzilla::Util qw(generate_random_password trim);
 
 #####################################################################
-# Overriden Constants that are used as methods
+# Overridden Constants that are used as methods
 #####################################################################
 
-use constant DB_TABLE       => 'user_api_keys';
-use constant DB_COLUMNS     => qw(
-    id
-    user_id
-    api_key
-    description
-    revoked
-    last_used
+use constant DB_TABLE   => 'user_api_keys';
+use constant DB_COLUMNS => qw(
+  id
+  user_id
+  api_key
+  description
+  revoked
+  last_used
 );
 
 use constant UPDATE_COLUMNS => qw(description revoked last_used);
 use constant VALIDATORS     => {
-    api_key     => \&_check_api_key,
-    description => \&_check_description,
-    revoked     => \&Bugzilla::Object::check_boolean,
+  api_key     => \&_check_api_key,
+  description => \&_check_description,
+  revoked     => \&Bugzilla::Object::check_boolean,
 };
-use constant LIST_ORDER     => 'id';
-use constant NAME_FIELD     => 'api_key';
+use constant LIST_ORDER => 'id';
+use constant NAME_FIELD => 'api_key';
 
 # turn off auditing and exclude these objects from memcached
-use constant { AUDIT_CREATES => 0,
-               AUDIT_UPDATES => 0,
-               AUDIT_REMOVES => 0,
-               USE_MEMCACHED => 0 };
+use constant {
+  AUDIT_CREATES => 0,
+  AUDIT_UPDATES => 0,
+  AUDIT_REMOVES => 0,
+  USE_MEMCACHED => 0
+};
 
 # Accessors
-sub id            { return $_[0]->{id}          }
-sub user_id       { return $_[0]->{user_id}     }
-sub api_key       { return $_[0]->{api_key}     }
-sub description   { return $_[0]->{description} }
-sub revoked       { return $_[0]->{revoked}     }
-sub last_used     { return $_[0]->{last_used}   }
+sub id          { return $_[0]->{id} }
+sub user_id     { return $_[0]->{user_id} }
+sub api_key     { return $_[0]->{api_key} }
+sub description { return $_[0]->{description} }
+sub revoked     { return $_[0]->{revoked} }
+sub last_used   { return $_[0]->{last_used} }
 
 # Helpers
 sub user {
-    my $self = shift;
-    $self->{user} //= Bugzilla::User->new({name => $self->user_id, cache => 1});
-    return $self->{user};
+  my $self = shift;
+  $self->{user} //= Bugzilla::User->new({name => $self->user_id, cache => 1});
+  return $self->{user};
 }
 
 sub update_last_used {
-    my $self = shift;
-    my $timestamp = shift
-        || Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-    $self->set('last_used', $timestamp);
-    $self->update;
+  my $self = shift;
+  my $timestamp
+    = shift || Bugzilla->dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  $self->set('last_used', $timestamp);
+  $self->update;
 }
 
 # Setters
@@ -73,8 +75,8 @@ sub set_description { $_[0]->set('description', $_[1]); }
 sub set_revoked     { $_[0]->set('revoked',     $_[1]); }
 
 # Validators
-sub _check_api_key     { return generate_random_password(40); }
-sub _check_description { return trim($_[1]) || '';   }
+sub _check_api_key { return generate_random_password(40); }
+sub _check_description { return trim($_[1]) || ''; }
 1;
 
 __END__
diff --git a/Bugzilla/User/Setting.pm b/Bugzilla/User/Setting.pm
index ea3bbfb542..f55515bae6 100644
--- a/Bugzilla/User/Setting.pm
+++ b/Bugzilla/User/Setting.pm
@@ -8,7 +8,7 @@
 
 package Bugzilla::User::Setting;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,10 +17,10 @@ use parent qw(Exporter);
 
 # Module stuff
 @Bugzilla::User::Setting::EXPORT = qw(
-    get_all_settings
-    get_defaults
-    add_setting
-    clear_settings_cache
+  get_all_settings
+  get_defaults
+  add_setting
+  clear_settings_cache
 );
 
 use Bugzilla::Error;
@@ -31,88 +31,84 @@ use Bugzilla::Util qw(trick_taint get_text);
 ###############################
 
 sub new {
-    my $invocant = shift;
-    my $setting_name = shift;
-    my $user_id = shift;
-
-    my $class = ref($invocant) || $invocant;
-    my $subclass = '';
-
-    # Create a ref to an empty hash and bless it
-    my $self = {};
-
-    my $dbh = Bugzilla->dbh;
-
-    # Confirm that the $setting_name is properly formed;
-    # if not, throw a code error. 
-    # 
-    # NOTE: due to the way that setting names are used in templates,
-    # they must conform to to the limitations set for HTML NAMEs and IDs.
-    #
-    if ( !($setting_name =~ /^[a-zA-Z][-.:\w]*$/) ) {
-      ThrowCodeError("setting_name_invalid", { name => $setting_name });
-    }
-
-    # If there were only two parameters passed in, then we need
-    # to retrieve the information for this setting ourselves.
-    if (scalar @_ == 0) {
-
-        my ($default, $is_enabled, $value);
-        ($default, $is_enabled, $value, $subclass) = 
-          $dbh->selectrow_array(
-             q{SELECT default_value, is_enabled, setting_value, subclass
+  my $invocant     = shift;
+  my $setting_name = shift;
+  my $user_id      = shift;
+
+  my $class = ref($invocant) || $invocant;
+  my $subclass = '';
+
+  # Create a ref to an empty hash and bless it
+  my $self = {};
+
+  my $dbh = Bugzilla->dbh;
+
+  # Confirm that the $setting_name is properly formed;
+  # if not, throw a code error.
+  #
+  # NOTE: due to the way that setting names are used in templates,
+  # they must conform to to the limitations set for HTML NAMEs and IDs.
+  #
+  if (!($setting_name =~ /^[a-zA-Z][-.:\w]*$/)) {
+    ThrowCodeError("setting_name_invalid", {name => $setting_name});
+  }
+
+  # If there were only two parameters passed in, then we need
+  # to retrieve the information for this setting ourselves.
+  if (scalar @_ == 0) {
+
+    my ($default, $is_enabled, $value);
+    ($default, $is_enabled, $value, $subclass) = $dbh->selectrow_array(
+      q{SELECT default_value, is_enabled, setting_value, subclass
                  FROM setting
             LEFT JOIN profile_setting
                    ON setting.name = profile_setting.setting_name
                 WHERE name = ?
-                  AND profile_setting.user_id = ?},
-             undef, 
-             $setting_name, $user_id);
-
-        # if not defined, then grab the default value
-        if (! defined $value) {
-            ($default, $is_enabled, $subclass) =
-              $dbh->selectrow_array(
-                 q{SELECT default_value, is_enabled, subclass
+                  AND profile_setting.user_id = ?}, undef, $setting_name, $user_id
+    );
+
+    # if not defined, then grab the default value
+    if (!defined $value) {
+      ($default, $is_enabled, $subclass) = $dbh->selectrow_array(
+        q{SELECT default_value, is_enabled, subclass
                    FROM setting
-                   WHERE name = ?},
-              undef,
-              $setting_name);
-        }
-
-        $self->{'is_enabled'} = $is_enabled;
-        $self->{'default_value'} = $default;
-
-        # IF the setting is enabled, AND the user has chosen a setting
-        # THEN return that value
-        # ELSE return the site default, and note that it is the default.
-        if ( ($is_enabled) && (defined $value) ) {
-            $self->{'value'} = $value;
-        } else {
-            $self->{'value'} = $default;
-            $self->{'isdefault'} = 1;
-        }
-    }
-    else {
-        # If the values were passed in, simply assign them and return.
-        $self->{'is_enabled'}    = shift;
-        $self->{'default_value'} = shift;
-        $self->{'value'}         = shift;
-        $self->{'is_default'}    = shift;
-        $subclass                = shift;
-    }
-    if ($subclass) {
-        eval('require ' . $class . '::' . $subclass);
-        $@ && ThrowCodeError('setting_subclass_invalid',
-                             {'subclass' => $subclass});
-        $class = $class . '::' . $subclass;
+                   WHERE name = ?}, undef, $setting_name
+      );
     }
-    bless($self, $class);
 
-    $self->{'_setting_name'} = $setting_name;
-    $self->{'_user_id'}      = $user_id;
+    $self->{'is_enabled'}    = $is_enabled;
+    $self->{'default_value'} = $default;
 
-    return $self;
+    # IF the setting is enabled, AND the user has chosen a setting
+    # THEN return that value
+    # ELSE return the site default, and note that it is the default.
+    if (($is_enabled) && (defined $value)) {
+      $self->{'value'} = $value;
+    }
+    else {
+      $self->{'value'}     = $default;
+      $self->{'isdefault'} = 1;
+    }
+  }
+  else {
+    # If the values were passed in, simply assign them and return.
+    $self->{'is_enabled'}    = shift;
+    $self->{'default_value'} = shift;
+    $self->{'value'}         = shift;
+    $self->{'is_default'}    = shift;
+    $subclass                = shift;
+  }
+  if ($subclass) {
+    eval('require ' . $class . '::' . $subclass);
+    $@ && ThrowCodeError('setting_subclass_invalid', {'subclass' => $subclass});
+    $class = $class . '::' . $subclass;
+  }
+  bless($self, $class);
+
+  $self->{'_setting_name'} = $setting_name;
+  $self->{'_user_id'}      = $user_id;
+
+  return $self;
 }
 
 ###############################
@@ -120,191 +116,205 @@ sub new {
 ###############################
 
 sub add_setting {
-    my ($name, $values, $default_value, $subclass, $force_check,
-        $silently) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    my $exists = _setting_exists($name);
-    return if ($exists && !$force_check);
-
-    ($name && $default_value)
-      ||  ThrowCodeError("setting_info_invalid");
-
-    if ($exists) {
-        # If this setting exists, we delete it and regenerate it.
-        $dbh->do('DELETE FROM setting_value WHERE name = ?', undef, $name);
-        $dbh->do('DELETE FROM setting WHERE name = ?', undef, $name);
-        # Remove obsolete user preferences for this setting.
-        if (defined $values && scalar(@$values)) {
-            my $list = join(', ', map {$dbh->quote($_)} @$values);
-            $dbh->do("DELETE FROM profile_setting
-                      WHERE setting_name = ? AND setting_value NOT IN ($list)",
-                      undef, $name);
-        }
-    }
-    elsif (!$silently) {
-        print get_text('install_setting_new', { name => $name }) . "\n";
-    }
-    $dbh->do(q{INSERT INTO setting (name, default_value, is_enabled, subclass)
-                    VALUES (?, ?, 1, ?)},
-             undef, ($name, $default_value, $subclass));
+  my ($name, $values, $default_value, $subclass, $force_check, $silently) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $exists = _setting_exists($name);
+  return if ($exists && !$force_check);
+
+  ($name && length($default_value // ''))
+    || ThrowCodeError("setting_info_invalid");
 
-    my $sth = $dbh->prepare(q{INSERT INTO setting_value (name, value, sortindex)
-                                    VALUES (?, ?, ?)});
+  if ($exists) {
 
-    my $sortindex = 5;
-    foreach my $key (@$values){
-        $sth->execute($name, $key, $sortindex);
-        $sortindex += 5;
+    # If this setting exists, we delete it and regenerate it.
+    $dbh->do('DELETE FROM setting_value WHERE name = ?', undef, $name);
+    $dbh->do('DELETE FROM setting WHERE name = ?',       undef, $name);
+
+    # Remove obsolete user preferences for this setting.
+    if (defined $values && scalar(@$values)) {
+      my $list = join(', ', map { $dbh->quote($_) } @$values);
+      $dbh->do(
+        "DELETE FROM profile_setting
+                      WHERE setting_name = ? AND setting_value NOT IN ($list)", undef,
+        $name
+      );
     }
+  }
+  elsif (!$silently) {
+    print get_text('install_setting_new', {name => $name}) . "\n";
+  }
+  $dbh->do(
+    q{INSERT INTO setting (name, default_value, is_enabled, subclass)
+                    VALUES (?, ?, 1, ?)}, undef, ($name, $default_value, $subclass)
+  );
+
+  my $sth = $dbh->prepare(
+    q{INSERT INTO setting_value (name, value, sortindex)
+                                    VALUES (?, ?, ?)}
+  );
+
+  my $sortindex = 5;
+  foreach my $key (@$values) {
+    $sth->execute($name, $key, $sortindex);
+    $sortindex += 5;
+  }
 }
 
 sub get_all_settings {
-    my ($user_id) = @_;
-    my $settings = {};
-    my $dbh = Bugzilla->dbh;
-
-    my $cache_key = "user_settings.$user_id";
-    my $rows = Bugzilla->memcached->get_config({ key => $cache_key });
-    if (!$rows) {
-        $rows = $dbh->selectall_arrayref(
-            q{SELECT name, default_value, is_enabled, setting_value, subclass
+  my ($user_id) = @_;
+  my $settings  = {};
+  my $dbh       = Bugzilla->dbh;
+
+  my $cache_key = "user_settings.$user_id";
+  my $rows = Bugzilla->memcached->get_config({key => $cache_key});
+  if (!$rows) {
+    $rows = $dbh->selectall_arrayref(
+      q{SELECT name, default_value, is_enabled, setting_value, subclass
                 FROM setting
            LEFT JOIN profile_setting
                      ON setting.name = profile_setting.setting_name
-                     AND profile_setting.user_id = ?}, undef, ($user_id));
-        Bugzilla->memcached->set_config({ key => $cache_key, data => $rows });
-    }
+                     AND profile_setting.user_id = ?}, undef, ($user_id)
+    );
+    Bugzilla->memcached->set_config({key => $cache_key, data => $rows});
+  }
 
-    foreach my $row (@$rows) {
-        my ($name, $default_value, $is_enabled, $value, $subclass) = @$row;
+  foreach my $row (@$rows) {
+    my ($name, $default_value, $is_enabled, $value, $subclass) = @$row;
 
-        my $is_default;
+    my $is_default;
 
-        if ( ($is_enabled) && (defined $value) ) {
-            $is_default = 0;
-        } else {
-            $value = $default_value;
-            $is_default = 1;
-        }
-
-        $settings->{$name} = new Bugzilla::User::Setting(
-           $name, $user_id, $is_enabled,
-           $default_value, $value, $is_default, $subclass);
+    if (($is_enabled) && (defined $value)) {
+      $is_default = 0;
     }
+    else {
+      $value      = $default_value;
+      $is_default = 1;
+    }
+
+    $settings->{$name}
+      = new Bugzilla::User::Setting($name, $user_id, $is_enabled, $default_value,
+      $value, $is_default, $subclass);
+  }
 
-    return $settings;
+  return $settings;
 }
 
 sub clear_settings_cache {
-    my ($user_id) = @_;
-    Bugzilla->memcached->clear_config({ key => "user_settings.$user_id" });
+  my ($user_id) = @_;
+  Bugzilla->memcached->clear_config({key => "user_settings.$user_id"});
 }
 
 sub get_defaults {
-    my ($user_id) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $default_settings = {};
+  my ($user_id)        = @_;
+  my $dbh              = Bugzilla->dbh;
+  my $default_settings = {};
 
-    $user_id ||= 0;
+  $user_id ||= 0;
 
-    my $rows = $dbh->selectall_arrayref(q{SELECT name, default_value, is_enabled, subclass
-                                            FROM setting});
+  my $rows = $dbh->selectall_arrayref(
+    q{SELECT name, default_value, is_enabled, subclass
+                                            FROM setting}
+  );
 
-    foreach my $row (@$rows) {
-        my ($name, $default_value, $is_enabled, $subclass) = @$row;
+  foreach my $row (@$rows) {
+    my ($name, $default_value, $is_enabled, $subclass) = @$row;
 
-        $default_settings->{$name} = new Bugzilla::User::Setting(
-            $name, $user_id, $is_enabled, $default_value, $default_value, 1,
-            $subclass);
-    }
+    $default_settings->{$name}
+      = new Bugzilla::User::Setting($name, $user_id, $is_enabled, $default_value,
+      $default_value, 1, $subclass);
+  }
 
-    return $default_settings;
+  return $default_settings;
 }
 
 sub set_default {
-    my ($setting_name, $default_value, $is_enabled) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($setting_name, $default_value, $is_enabled) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my $sth = $dbh->prepare(q{UPDATE setting
+  my $sth = $dbh->prepare(
+    q{UPDATE setting
                                  SET default_value = ?, is_enabled = ?
-                               WHERE name = ?});
-    $sth->execute($default_value, $is_enabled, $setting_name);
+                               WHERE name = ?}
+  );
+  $sth->execute($default_value, $is_enabled, $setting_name);
 }
 
 sub _setting_exists {
-    my ($setting_name) = @_;
-    my $dbh = Bugzilla->dbh;
-    return $dbh->selectrow_arrayref(
-        "SELECT 1 FROM setting WHERE name = ?", undef, $setting_name) || 0;
+  my ($setting_name) = @_;
+  my $dbh = Bugzilla->dbh;
+  return $dbh->selectrow_arrayref("SELECT 1 FROM setting WHERE name = ?",
+    undef, $setting_name)
+    || 0;
 }
 
 
 sub legal_values {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    return $self->{'legal_values'} if defined $self->{'legal_values'};
+  return $self->{'legal_values'} if defined $self->{'legal_values'};
 
-    my $dbh = Bugzilla->dbh;
-    $self->{'legal_values'} = $dbh->selectcol_arrayref(
-              q{SELECT value
+  my $dbh = Bugzilla->dbh;
+  $self->{'legal_values'} = $dbh->selectcol_arrayref(
+    q{SELECT value
                   FROM setting_value
                  WHERE name = ?
-              ORDER BY sortindex},
-        undef, $self->{'_setting_name'});
+              ORDER BY sortindex}, undef, $self->{'_setting_name'}
+  );
 
-    return $self->{'legal_values'};
+  return $self->{'legal_values'};
 }
 
 sub validate_value {
-    my $self = shift;
-
-    if (grep(/^$_[0]$/, @{$self->legal_values()})) {
-        trick_taint($_[0]);
-    }
-    else {
-        ThrowCodeError('setting_value_invalid',
-                       {'name'  => $self->{'_setting_name'},
-                        'value' => $_[0]});
-    }
+  my $self = shift;
+
+  if (grep(/^$_[0]$/, @{$self->legal_values()})) {
+    trick_taint($_[0]);
+  }
+  else {
+    ThrowCodeError('setting_value_invalid',
+      {'name' => $self->{'_setting_name'}, 'value' => $_[0]});
+  }
 }
 
 sub reset_to_default {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    my $dbh = Bugzilla->dbh;
-    my $sth = $dbh->do(q{ DELETE
+  my $dbh = Bugzilla->dbh;
+  my $sth = $dbh->do(
+    q{ DELETE
                             FROM profile_setting
                            WHERE setting_name = ?
-                             AND user_id = ?},
-                       undef, $self->{'_setting_name'}, $self->{'_user_id'});
-      $self->{'value'}       = $self->{'default_value'};
-      $self->{'is_default'}  = 1;
+                             AND user_id = ?}, undef, $self->{'_setting_name'},
+    $self->{'_user_id'}
+  );
+  $self->{'value'}      = $self->{'default_value'};
+  $self->{'is_default'} = 1;
 }
 
 sub set {
-    my ($self, $value) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $query;
+  my ($self, $value) = @_;
+  my $dbh = Bugzilla->dbh;
+  my $query;
 
-    if ($self->{'is_default'}) {
-        $query = q{INSERT INTO profile_setting
+  if ($self->{'is_default'}) {
+    $query = q{INSERT INTO profile_setting
                    (setting_value, setting_name, user_id)
                    VALUES (?,?,?)};
-    } else {
-        $query = q{UPDATE profile_setting
+  }
+  else {
+    $query = q{UPDATE profile_setting
                       SET setting_value = ?
                     WHERE setting_name = ?
                       AND user_id = ?};
-    }
-    $dbh->do($query, undef, $value, $self->{'_setting_name'}, $self->{'_user_id'});
+  }
+  $dbh->do($query, undef, $value, $self->{'_setting_name'}, $self->{'_user_id'});
 
-    $self->{'value'}       = $value;
-    $self->{'is_default'}  = 0;
+  $self->{'value'}      = $value;
+  $self->{'is_default'} = 0;
 }
 
 
-
 1;
 
 __END__
diff --git a/Bugzilla/User/Setting/Lang.pm b/Bugzilla/User/Setting/Lang.pm
index d980b7a92e..d413910c29 100644
--- a/Bugzilla/User/Setting/Lang.pm
+++ b/Bugzilla/User/Setting/Lang.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::User::Setting::Lang;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,11 +16,11 @@ use parent qw(Bugzilla::User::Setting);
 use Bugzilla::Constants;
 
 sub legal_values {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    return $self->{'legal_values'} if defined $self->{'legal_values'};
+  return $self->{'legal_values'} if defined $self->{'legal_values'};
 
-    return $self->{'legal_values'} = Bugzilla->languages;
+  return $self->{'legal_values'} = Bugzilla->languages;
 }
 
 1;
diff --git a/Bugzilla/User/Setting/Skin.pm b/Bugzilla/User/Setting/Skin.pm
index 7b0688c0c8..0eb97d389a 100644
--- a/Bugzilla/User/Setting/Skin.pm
+++ b/Bugzilla/User/Setting/Skin.pm
@@ -8,7 +8,7 @@
 
 package Bugzilla::User::Setting::Skin;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,24 +21,26 @@ use File::Basename;
 use constant BUILTIN_SKIN_NAMES => ['standard'];
 
 sub legal_values {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    return $self->{'legal_values'} if defined $self->{'legal_values'};
+  return $self->{'legal_values'} if defined $self->{'legal_values'};
 
-    my $dirbase = bz_locations()->{'skinsdir'} . '/contrib';
-    # Avoid modification of the list BUILTIN_SKIN_NAMES points to by copying the
-    # list over instead of simply writing $legal_values = BUILTIN_SKIN_NAMES.
-    my @legal_values = @{(BUILTIN_SKIN_NAMES)};
+  my $dirbase = bz_locations()->{'skinsdir'} . '/contrib';
 
-    foreach my $direntry (glob(catdir($dirbase, '*'))) {
-        if (-d $direntry) {
-            next if basename($direntry) =~ /^cvs$/i;
-            # Stylesheet set found
-            push(@legal_values, basename($direntry));
-        }
+  # Avoid modification of the list BUILTIN_SKIN_NAMES points to by copying the
+  # list over instead of simply writing $legal_values = BUILTIN_SKIN_NAMES.
+  my @legal_values = @{(BUILTIN_SKIN_NAMES)};
+
+  foreach my $direntry (glob(catdir($dirbase, '*'))) {
+    if (-d $direntry) {
+      next if basename($direntry) =~ /^cvs$/i;
+
+      # Stylesheet set found
+      push(@legal_values, basename($direntry));
     }
+  }
 
-    return $self->{'legal_values'} = \@legal_values;
+  return $self->{'legal_values'} = \@legal_values;
 }
 
 1;
diff --git a/Bugzilla/User/Setting/Timezone.pm b/Bugzilla/User/Setting/Timezone.pm
index 8959d1ddac..508f448ed1 100644
--- a/Bugzilla/User/Setting/Timezone.pm
+++ b/Bugzilla/User/Setting/Timezone.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::User::Setting::Timezone;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,19 +18,21 @@ use parent qw(Bugzilla::User::Setting);
 use Bugzilla::Constants;
 
 sub legal_values {
-    my ($self) = @_;
+  my ($self) = @_;
 
-    return $self->{'legal_values'} if defined $self->{'legal_values'};
+  return $self->{'legal_values'} if defined $self->{'legal_values'};
 
-    my @timezones = DateTime::TimeZone->all_names;
-    # Remove old formats, such as CST6CDT, EST, EST5EDT.
-    @timezones = grep { $_ =~ m#.+/.+#} @timezones;
-    # Append 'local' to the list, which will use the timezone
-    # given by the server.
-    push(@timezones, 'local');
-    push(@timezones, 'UTC');
+  my @timezones = DateTime::TimeZone->all_names;
 
-    return $self->{'legal_values'} = \@timezones;
+  # Remove old formats, such as CST6CDT, EST, EST5EDT.
+  @timezones = grep { $_ =~ m#.+/.+# } @timezones;
+
+  # Append 'local' to the list, which will use the timezone
+  # given by the server.
+  push(@timezones, 'local');
+  push(@timezones, 'UTC');
+
+  return $self->{'legal_values'} = \@timezones;
 }
 
 1;
diff --git a/Bugzilla/UserAgent.pm b/Bugzilla/UserAgent.pm
index 963e305113..c677003dee 100644
--- a/Bugzilla/UserAgent.pm
+++ b/Bugzilla/UserAgent.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::UserAgent;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,174 +20,200 @@ use List::MoreUtils qw(natatime);
 use constant DEFAULT_VALUE => 'Other';
 
 use constant PLATFORMS_MAP => (
-    # PowerPC
-    qr/\(.*PowerPC.*\)/i => ["PowerPC", "Macintosh"],
-    # AMD64, Intel x86_64
-    qr/\(.*[ix0-9]86 (?:on |\()x86_64.*\)/ => ["IA32", "x86", "PC"],
-    qr/\(.*amd64.*\)/ => ["AMD64", "x86_64", "PC"],
-    qr/\(.*x86_64.*\)/ => ["AMD64", "x86_64", "PC"],
-    # Intel IA64
-    qr/\(.*IA64.*\)/ => ["IA64", "PC"],
-    # Intel x86
-    qr/\(.*Intel.*\)/ => ["IA32", "x86", "PC"],
-    qr/\(.*[ix0-9]86.*\)/ => ["IA32", "x86", "PC"],
-    # Versions of Windows that only run on Intel x86
-    qr/\(.*Win(?:dows |)[39M].*\)/ => ["IA32", "x86", "PC"],
-    qr/\(.*Win(?:dows |)16.*\)/ => ["IA32", "x86", "PC"],
-    # Sparc
-    qr/\(.*sparc.*\)/ => ["Sparc", "Sun"],
-    qr/\(.*sun4.*\)/ => ["Sparc", "Sun"],
-    # Alpha
-    qr/\(.*AXP.*\)/i => ["Alpha", "DEC"],
-    qr/\(.*[ _]Alpha.\D/i => ["Alpha", "DEC"],
-    qr/\(.*[ _]Alpha\)/i => ["Alpha", "DEC"],
-    # MIPS
-    qr/\(.*IRIX.*\)/i => ["MIPS", "SGI"],
-    qr/\(.*MIPS.*\)/i => ["MIPS", "SGI"],
-    # 68k
-    qr/\(.*68K.*\)/ => ["68k", "Macintosh"],
-    qr/\(.*680[x0]0.*\)/ => ["68k", "Macintosh"],
-    # HP
-    qr/\(.*9000.*\)/ => ["PA-RISC", "HP"],
-    # ARM
-    qr/\(.*(?:iPod|iPad|iPhone).*\)/ => ["ARM"],
-    qr/\(.*ARM.*\)/ => ["ARM", "PocketPC"],
-    # PocketPC intentionally before PowerPC
-    qr/\(.*Windows CE.*PPC.*\)/ => ["ARM", "PocketPC"],
-    # PowerPC
-    qr/\(.*PPC.*\)/ => ["PowerPC", "Macintosh"],
-    qr/\(.*AIX.*\)/ => ["PowerPC", "Macintosh"],
-    # Stereotypical and broken
-    qr/\(.*Windows CE.*\)/ => ["ARM", "PocketPC"],
-    qr/\(.*Macintosh.*\)/ => ["68k", "Macintosh"],
-    qr/\(.*Mac OS [89].*\)/ => ["68k", "Macintosh"],
-    qr/\(.*WOW64.*\)/ => ["x86_64"],
-    qr/\(.*Win64.*\)/ => ["IA64"],
-    qr/\(Win.*\)/ => ["IA32", "x86", "PC"],
-    qr/\(.*Win(?:dows[ -])NT.*\)/ => ["IA32", "x86", "PC"],
-    qr/\(.*OSF.*\)/ => ["Alpha", "DEC"],
-    qr/\(.*HP-?UX.*\)/i => ["PA-RISC", "HP"],
-    qr/\(.*IRIX.*\)/i => ["MIPS", "SGI"],
-    qr/\(.*(SunOS|Solaris).*\)/ => ["Sparc", "Sun"],
-    # Braindead old browsers who didn't follow convention:
-    qr/Amiga/ => ["68k", "Macintosh"],
-    qr/WinMosaic/ => ["IA32", "x86", "PC"],
+
+  # PowerPC
+  qr/\(.*PowerPC.*\)/i => ["PowerPC", "Macintosh"],
+
+  # AMD64, Intel x86_64
+  qr/\(.*[ix0-9]86 (?:on |\()x86_64.*\)/ => ["IA32",  "x86",    "PC"],
+  qr/\(.*amd64.*\)/                      => ["AMD64", "x86_64", "PC"],
+  qr/\(.*x86_64.*\)/                     => ["AMD64", "x86_64", "PC"],
+
+  # Intel IA64
+  qr/\(.*IA64.*\)/ => ["IA64", "PC"],
+
+  # Intel x86
+  qr/\(.*Intel.*\)/     => ["IA32", "x86", "PC"],
+  qr/\(.*[ix0-9]86.*\)/ => ["IA32", "x86", "PC"],
+
+  # Versions of Windows that only run on Intel x86
+  qr/\(.*Win(?:dows |)[39M].*\)/ => ["IA32", "x86", "PC"],
+  qr/\(.*Win(?:dows |)16.*\)/    => ["IA32", "x86", "PC"],
+
+  # Sparc
+  qr/\(.*sparc.*\)/ => ["Sparc", "Sun"],
+  qr/\(.*sun4.*\)/  => ["Sparc", "Sun"],
+
+  # Alpha
+  qr/\(.*AXP.*\)/i      => ["Alpha", "DEC"],
+  qr/\(.*[ _]Alpha.\D/i => ["Alpha", "DEC"],
+  qr/\(.*[ _]Alpha\)/i  => ["Alpha", "DEC"],
+
+  # MIPS
+  qr/\(.*IRIX.*\)/i => ["MIPS", "SGI"],
+  qr/\(.*MIPS.*\)/i => ["MIPS", "SGI"],
+
+  # 68k
+  qr/\(.*68K.*\)/      => ["68k", "Macintosh"],
+  qr/\(.*680[x0]0.*\)/ => ["68k", "Macintosh"],
+
+  # HP
+  qr/\(.*9000.*\)/ => ["PA-RISC", "HP"],
+
+  # ARM
+  qr/\(.*(?:iPod|iPad|iPhone).*\)/ => ["ARM"],
+  qr/\(.*ARM.*\)/                  => ["ARM", "PocketPC"],
+
+  # PocketPC intentionally before PowerPC
+  qr/\(.*Windows CE.*PPC.*\)/ => ["ARM", "PocketPC"],
+
+  # PowerPC
+  qr/\(.*PPC.*\)/ => ["PowerPC", "Macintosh"],
+  qr/\(.*AIX.*\)/ => ["PowerPC", "Macintosh"],
+
+  # Stereotypical and broken
+  qr/\(.*Windows CE.*\)/        => ["ARM",     "PocketPC"],
+  qr/\(.*Macintosh.*\)/         => ["68k",     "Macintosh"],
+  qr/\(.*Mac OS [89].*\)/       => ["68k",     "Macintosh"],
+  qr/\(.*WOW64.*\)/             => ["x86_64"],
+  qr/\(.*Win64.*\)/             => ["IA64"],
+  qr/\(Win.*\)/                 => ["IA32",    "x86", "PC"],
+  qr/\(.*Win(?:dows[ -])NT.*\)/ => ["IA32",    "x86", "PC"],
+  qr/\(.*OSF.*\)/               => ["Alpha",   "DEC"],
+  qr/\(.*HP-?UX.*\)/i           => ["PA-RISC", "HP"],
+  qr/\(.*IRIX.*\)/i             => ["MIPS",    "SGI"],
+  qr/\(.*(SunOS|Solaris).*\)/   => ["Sparc",   "Sun"],
+
+  # Braindead old browsers who didn't follow convention:
+  qr/Amiga/     => ["68k",  "Macintosh"],
+  qr/WinMosaic/ => ["IA32", "x86", "PC"],
 );
 
 use constant OS_MAP => (
-    # Sun
-    qr/\(.*Solaris.*\)/ => ["Solaris"],
-    qr/\(.*SunOS 5.11.*\)/ => [("OpenSolaris", "Opensolaris", "Solaris 11")],
-    qr/\(.*SunOS 5.10.*\)/ => ["Solaris 10"],
-    qr/\(.*SunOS 5.9.*\)/ => ["Solaris 9"],
-    qr/\(.*SunOS 5.8.*\)/ => ["Solaris 8"],
-    qr/\(.*SunOS 5.7.*\)/ => ["Solaris 7"],
-    qr/\(.*SunOS 5.6.*\)/ => ["Solaris 6"],
-    qr/\(.*SunOS 5.5.*\)/ => ["Solaris 5"],
-    qr/\(.*SunOS 5.*\)/ => ["Solaris"],
-    qr/\(.*SunOS.*sun4u.*\)/ => ["Solaris"],
-    qr/\(.*SunOS.*i86pc.*\)/ => ["Solaris"],
-    qr/\(.*SunOS.*\)/ => ["SunOS"],
-    # BSD
-    qr/\(.*BSD\/(?:OS|386).*\)/ => ["BSDI"],
-    qr/\(.*FreeBSD.*\)/ => ["FreeBSD"],
-    qr/\(.*OpenBSD.*\)/ => ["OpenBSD"],
-    qr/\(.*NetBSD.*\)/ => ["NetBSD"],
-    # Misc POSIX
-    qr/\(.*IRIX.*\)/ => ["IRIX"],
-    qr/\(.*OSF.*\)/ => ["OSF/1"],
-    qr/\(.*Linux.*\)/ => ["Linux"],
-    qr/\(.*BeOS.*\)/ => ["BeOS"],
-    qr/\(.*AIX.*\)/ => ["AIX"],
-    qr/\(.*OS\/2.*\)/ => ["OS/2"],
-    qr/\(.*QNX.*\)/ => ["Neutrino"],
-    qr/\(.*VMS.*\)/ => ["OpenVMS"],
-    qr/\(.*HP-?UX.*\)/ => ["HP-UX"],
-    qr/\(.*Android.*\)/ => ["Android"],
-    # Windows
-    qr/\(.*Windows XP.*\)/ => ["Windows XP"],
-    qr/\(.*Windows NT 6\.3.*\)/ => ["Windows 8.1"],
-    qr/\(.*Windows NT 6\.2.*\)/ => ["Windows 8"],
-    qr/\(.*Windows NT 6\.1.*\)/ => ["Windows 7"],
-    qr/\(.*Windows NT 6\.0.*\)/ => ["Windows Vista"],
-    qr/\(.*Windows NT 5\.2.*\)/ => ["Windows Server 2003"],
-    qr/\(.*Windows NT 5\.1.*\)/ => ["Windows XP"],
-    qr/\(.*Windows 2000.*\)/ => ["Windows 2000"],
-    qr/\(.*Windows NT 5.*\)/ => ["Windows 2000"],
-    qr/\(.*Win.*9[8x].*4\.9.*\)/ => ["Windows ME"],
-    qr/\(.*Win(?:dows |)M[Ee].*\)/ => ["Windows ME"],
-    qr/\(.*Win(?:dows |)98.*\)/ => ["Windows 98"],
-    qr/\(.*Win(?:dows |)95.*\)/ => ["Windows 95"],
-    qr/\(.*Win(?:dows |)16.*\)/ => ["Windows 3.1"],
-    qr/\(.*Win(?:dows[ -]|)NT.*\)/ => ["Windows NT"],
-    qr/\(.*Windows.*NT.*\)/ => ["Windows NT"],
-    # OS X
-    qr/\(.*(?:iPad|iPhone).*OS 7.*\)/ => ["iOS 7"],
-    qr/\(.*(?:iPad|iPhone).*OS 6.*\)/ => ["iOS 6"],
-    qr/\(.*(?:iPad|iPhone).*OS 5.*\)/ => ["iOS 5"],
-    qr/\(.*(?:iPad|iPhone).*OS 4.*\)/ => ["iOS 4"],
-    qr/\(.*(?:iPad|iPhone).*OS 3.*\)/ => ["iOS 3"],
-    qr/\(.*(?:iPod|iPad|iPhone).*\)/ => ["iOS"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.8.*\)/ => ["Mac OS X 10.8"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.7.*\)/ => ["Mac OS X 10.7"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.6.*\)/ => ["Mac OS X 10.6"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.5.*\)/ => ["Mac OS X 10.5"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.4.*\)/ => ["Mac OS X 10.4"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.3.*\)/ => ["Mac OS X 10.3"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.2.*\)/ => ["Mac OS X 10.2"],
-    qr/\(.*Mac OS X (?:|Mach-O |\()10.1.*\)/ => ["Mac OS X 10.1"],
-    # Unfortunately, OS X 10.4 was the first to support Intel. This is fallback
-    # support because some browsers refused to include the OS Version.
-    qr/\(.*Intel.*Mac OS X.*\)/ => ["Mac OS X 10.4"],
-    # OS X 10.3 is the most likely default version of PowerPC Macs
-    # OS X 10.0 is more for configurations which didn't setup 10.x versions
-    qr/\(.*Mac OS X.*\)/ => [("Mac OS X 10.3", "Mac OS X 10.0", "Mac OS X")],
-    qr/\(.*Mac OS 9.*\)/ => [("Mac System 9.x", "Mac System 9.0")],
-    qr/\(.*Mac OS 8\.6.*\)/ => [("Mac System 8.6", "Mac System 8.5")],
-    qr/\(.*Mac OS 8\.5.*\)/ => ["Mac System 8.5"],
-    qr/\(.*Mac OS 8\.1.*\)/ => [("Mac System 8.1", "Mac System 8.0")],
-    qr/\(.*Mac OS 8\.0.*\)/ => ["Mac System 8.0"],
-    qr/\(.*Mac OS 8[^.].*\)/ => ["Mac System 8.0"],
-    qr/\(.*Mac OS 8.*\)/ => ["Mac System 8.6"],
-    qr/\(.*Darwin.*\)/ => [("Mac OS X 10.0", "Mac OS X")],
-    # Silly
-    qr/\(.*Mac.*PowerPC.*\)/ => ["Mac System 9.x"],
-    qr/\(.*Mac.*PPC.*\)/ => ["Mac System 9.x"],
-    qr/\(.*Mac.*68k.*\)/ => ["Mac System 8.0"],
-    # Evil
-    qr/Amiga/i => ["Other"],
-    qr/WinMosaic/ => ["Windows 95"],
-    qr/\(.*32bit.*\)/ => ["Windows 95"],
-    qr/\(.*16bit.*\)/ => ["Windows 3.1"],
-    qr/\(.*PowerPC.*\)/ => ["Mac System 9.x"],
-    qr/\(.*PPC.*\)/ => ["Mac System 9.x"],
-    qr/\(.*68K.*\)/ => ["Mac System 8.0"],
+
+  # Sun
+  qr/\(.*Solaris.*\)/      => ["Solaris"],
+  qr/\(.*SunOS 5.11.*\)/   => [("OpenSolaris", "Opensolaris", "Solaris 11")],
+  qr/\(.*SunOS 5.10.*\)/   => ["Solaris 10"],
+  qr/\(.*SunOS 5.9.*\)/    => ["Solaris 9"],
+  qr/\(.*SunOS 5.8.*\)/    => ["Solaris 8"],
+  qr/\(.*SunOS 5.7.*\)/    => ["Solaris 7"],
+  qr/\(.*SunOS 5.6.*\)/    => ["Solaris 6"],
+  qr/\(.*SunOS 5.5.*\)/    => ["Solaris 5"],
+  qr/\(.*SunOS 5.*\)/      => ["Solaris"],
+  qr/\(.*SunOS.*sun4u.*\)/ => ["Solaris"],
+  qr/\(.*SunOS.*i86pc.*\)/ => ["Solaris"],
+  qr/\(.*SunOS.*\)/        => ["SunOS"],
+
+  # BSD
+  qr/\(.*BSD\/(?:OS|386).*\)/ => ["BSDI"],
+  qr/\(.*FreeBSD.*\)/         => ["FreeBSD"],
+  qr/\(.*OpenBSD.*\)/         => ["OpenBSD"],
+  qr/\(.*NetBSD.*\)/          => ["NetBSD"],
+
+  # Misc POSIX
+  qr/\(.*IRIX.*\)/    => ["IRIX"],
+  qr/\(.*OSF.*\)/     => ["OSF/1"],
+  qr/\(.*Linux.*\)/   => ["Linux"],
+  qr/\(.*BeOS.*\)/    => ["BeOS"],
+  qr/\(.*AIX.*\)/     => ["AIX"],
+  qr/\(.*OS\/2.*\)/   => ["OS/2"],
+  qr/\(.*QNX.*\)/     => ["Neutrino"],
+  qr/\(.*VMS.*\)/     => ["OpenVMS"],
+  qr/\(.*HP-?UX.*\)/  => ["HP-UX"],
+  qr/\(.*Android.*\)/ => ["Android"],
+
+  # Windows
+  qr/\(.*Windows XP.*\)/         => ["Windows XP"],
+  qr/\(.*Windows NT 10\.0.*\)/   => ["Windows 10"],
+  qr/\(.*Windows NT 6\.4.*\)/    => ["Windows 10"],
+  qr/\(.*Windows NT 6\.3.*\)/    => ["Windows 8.1"],
+  qr/\(.*Windows NT 6\.2.*\)/    => ["Windows 8"],
+  qr/\(.*Windows NT 6\.1.*\)/    => ["Windows 7"],
+  qr/\(.*Windows NT 6\.0.*\)/    => ["Windows Vista"],
+  qr/\(.*Windows NT 5\.2.*\)/    => ["Windows Server 2003"],
+  qr/\(.*Windows NT 5\.1.*\)/    => ["Windows XP"],
+  qr/\(.*Windows 2000.*\)/       => ["Windows 2000"],
+  qr/\(.*Windows NT 5.*\)/       => ["Windows 2000"],
+  qr/\(.*Win.*9[8x].*4\.9.*\)/   => ["Windows ME"],
+  qr/\(.*Win(?:dows |)M[Ee].*\)/ => ["Windows ME"],
+  qr/\(.*Win(?:dows |)98.*\)/    => ["Windows 98"],
+  qr/\(.*Win(?:dows |)95.*\)/    => ["Windows 95"],
+  qr/\(.*Win(?:dows |)16.*\)/    => ["Windows 3.1"],
+  qr/\(.*Win(?:dows[ -]|)NT.*\)/ => ["Windows NT"],
+  qr/\(.*Windows.*NT.*\)/        => ["Windows NT"],
+
+  # OS X
+  qr/\(.*(?:iPad|iPhone).*OS 7.*\)/        => ["iOS 7"],
+  qr/\(.*(?:iPad|iPhone).*OS 6.*\)/        => ["iOS 6"],
+  qr/\(.*(?:iPad|iPhone).*OS 5.*\)/        => ["iOS 5"],
+  qr/\(.*(?:iPad|iPhone).*OS 4.*\)/        => ["iOS 4"],
+  qr/\(.*(?:iPad|iPhone).*OS 3.*\)/        => ["iOS 3"],
+  qr/\(.*(?:iPod|iPad|iPhone).*\)/         => ["iOS"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.8.*\)/ => ["Mac OS X 10.8"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.7.*\)/ => ["Mac OS X 10.7"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.6.*\)/ => ["Mac OS X 10.6"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.5.*\)/ => ["Mac OS X 10.5"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.4.*\)/ => ["Mac OS X 10.4"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.3.*\)/ => ["Mac OS X 10.3"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.2.*\)/ => ["Mac OS X 10.2"],
+  qr/\(.*Mac OS X (?:|Mach-O |\()10.1.*\)/ => ["Mac OS X 10.1"],
+
+  # Unfortunately, OS X 10.4 was the first to support Intel. This is fallback
+  # support because some browsers refused to include the OS Version.
+  qr/\(.*Intel.*Mac OS X.*\)/ => ["Mac OS X 10.4"],
+
+  # OS X 10.3 is the most likely default version of PowerPC Macs
+  # OS X 10.0 is more for configurations which didn't setup 10.x versions
+  qr/\(.*Mac OS X.*\)/     => [("Mac OS X 10.3",  "Mac OS X 10.0", "Mac OS X")],
+  qr/\(.*Mac OS 9.*\)/     => [("Mac System 9.x", "Mac System 9.0")],
+  qr/\(.*Mac OS 8\.6.*\)/  => [("Mac System 8.6", "Mac System 8.5")],
+  qr/\(.*Mac OS 8\.5.*\)/  => ["Mac System 8.5"],
+  qr/\(.*Mac OS 8\.1.*\)/  => [("Mac System 8.1", "Mac System 8.0")],
+  qr/\(.*Mac OS 8\.0.*\)/  => ["Mac System 8.0"],
+  qr/\(.*Mac OS 8[^.].*\)/ => ["Mac System 8.0"],
+  qr/\(.*Mac OS 8.*\)/     => ["Mac System 8.6"],
+  qr/\(.*Darwin.*\)/       => [("Mac OS X 10.0",  "Mac OS X")],
+
+  # Silly
+  qr/\(.*Mac.*PowerPC.*\)/ => ["Mac System 9.x"],
+  qr/\(.*Mac.*PPC.*\)/     => ["Mac System 9.x"],
+  qr/\(.*Mac.*68k.*\)/     => ["Mac System 8.0"],
+
+  # Evil
+  qr/Amiga/i          => ["Other"],
+  qr/WinMosaic/       => ["Windows 95"],
+  qr/\(.*32bit.*\)/   => ["Windows 95"],
+  qr/\(.*16bit.*\)/   => ["Windows 3.1"],
+  qr/\(.*PowerPC.*\)/ => ["Mac System 9.x"],
+  qr/\(.*PPC.*\)/     => ["Mac System 9.x"],
+  qr/\(.*68K.*\)/     => ["Mac System 8.0"],
 );
 
 sub detect_platform {
-    my $userAgent = $ENV{'HTTP_USER_AGENT'};
-    my @detected;
-    my $iterator = natatime(2, PLATFORMS_MAP);
-    while (my($re, $ra) = $iterator->()) {
-        if ($userAgent =~ $re) {
-            push @detected, @$ra;
-        }
+  my $userAgent = $ENV{'HTTP_USER_AGENT'};
+  my @detected;
+  my $iterator = natatime(2, PLATFORMS_MAP);
+  while (my ($re, $ra) = $iterator->()) {
+    if ($userAgent =~ $re) {
+      push @detected, @$ra;
     }
-    return _pick_valid_field_value('rep_platform', @detected);
+  }
+  return _pick_valid_field_value('rep_platform', @detected);
 }
 
 sub detect_op_sys {
-    my $userAgent = $ENV{'HTTP_USER_AGENT'} || '';
-    my @detected;
-    my $iterator = natatime(2, OS_MAP);
-    while (my($re, $ra) = $iterator->()) {
-        if ($userAgent =~ $re) {
-            push @detected, @$ra;
-        }
+  my $userAgent = $ENV{'HTTP_USER_AGENT'} || '';
+  my @detected;
+  my $iterator = natatime(2, OS_MAP);
+  while (my ($re, $ra) = $iterator->()) {
+    if ($userAgent =~ $re) {
+      push @detected, @$ra;
     }
-    push(@detected, "Windows") if grep(/^Windows /, @detected);
-    push(@detected, "Mac OS") if grep(/^Mac /, @detected);
-    return _pick_valid_field_value('op_sys', @detected);
+  }
+  push(@detected, "Windows") if grep(/^Windows /, @detected);
+  push(@detected, "Mac OS")  if grep(/^Mac /,     @detected);
+  return _pick_valid_field_value('op_sys', @detected);
 }
 
 # Takes the name of a field and a list of possible values for that field.
@@ -195,11 +221,11 @@ sub detect_op_sys {
 # field.
 # Returns 'Other' if none of the values match.
 sub _pick_valid_field_value {
-    my ($field, @values) = @_;
-    foreach my $value (@values) {
-        return $value if check_field($field, $value, undef, 1);
-    }
-    return DEFAULT_VALUE;
+  my ($field, @values) = @_;
+  foreach my $value (@values) {
+    return $value if check_field($field, $value, undef, 1);
+  }
+  return DEFAULT_VALUE;
 }
 
 1;
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 670f5f8f28..0e33ede4e5 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -7,24 +7,24 @@
 
 package Bugzilla::Util;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Exporter);
 @Bugzilla::Util::EXPORT = qw(trick_taint detaint_natural detaint_signed
-                             html_quote url_quote xml_quote
-                             css_class_quote html_light_quote
-                             i_am_cgi i_am_webservice correct_urlbase remote_ip
-                             validate_ip do_ssl_redirect_if_required use_attachbase
-                             diff_arrays on_main_db
-                             trim wrap_hard wrap_comment find_wrap_point
-                             format_time validate_date validate_time datetime_from
-                             is_7bit_clean bz_crypt generate_random_password
-                             validate_email_syntax check_email_syntax clean_text
-                             get_text template_var display_value disable_utf8
-                             detect_encoding email_filter
-                             join_activity_entries);
+  html_quote url_quote xml_quote
+  css_class_quote html_light_quote
+  i_am_cgi i_am_webservice correct_urlbase remote_ip
+  validate_ip do_ssl_redirect_if_required use_attachbase
+  diff_arrays on_main_db
+  trim wrap_hard wrap_comment find_wrap_point wrap_cite
+  format_time validate_date validate_time datetime_from
+  is_7bit_clean bz_crypt generate_random_password
+  validate_email_syntax check_email_syntax clean_text
+  get_text template_var display_value disable_utf8
+  detect_encoding email_filter
+  join_activity_entries read_text write_text);
 
 use Bugzilla::Constants;
 use Bugzilla::RNG qw(irand);
@@ -34,626 +34,713 @@ use Date::Parse;
 use Date::Format;
 use Digest;
 use Email::Address;
-use List::Util qw(first);
+use List::MoreUtils qw(none);
 use Scalar::Util qw(tainted blessed);
 use Text::Wrap;
 use Encode qw(encode decode resolve_alias);
 use Encode::Guess;
+use File::Basename qw(dirname);
+use File::Temp qw(tempfile);
 
 sub trick_taint {
-    require Carp;
-    Carp::confess("Undef to trick_taint") unless defined $_[0];
-    my $match = $_[0] =~ /^(.*)$/s;
-    $_[0] = $match ? $1 : undef;
-    return (defined($_[0]));
+  require Carp;
+  Carp::confess("Undef to trick_taint") unless defined $_[0];
+  my $match = $_[0] =~ /^(.*)$/s;
+  $_[0] = $match ? $1 : undef;
+  return (defined($_[0]));
 }
 
 sub detaint_natural {
-    my $match = $_[0] =~ /^(\d+)$/;
-    $_[0] = $match ? int($1) : undef;
-    return (defined($_[0]));
+  my $match = $_[0] =~ /^(\d+)$/a;
+  $_[0] = $match ? int($1) : undef;
+  return (defined($_[0]));
 }
 
 sub detaint_signed {
-    my $match = $_[0] =~ /^([-+]?\d+)$/;
-    # The "int()" call removes any leading plus sign.
-    $_[0] = $match ? int($1) : undef;
-    return (defined($_[0]));
+  my $match = $_[0] =~ /^([-+]?\d+)$/a;
+
+  # The "int()" call removes any leading plus sign.
+  $_[0] = $match ? int($1) : undef;
+  return (defined($_[0]));
 }
 
 # Bug 120030: Override html filter to obscure the '@' in user
 #             visible strings.
 # Bug 319331: Handle BiDi disruptions.
 sub html_quote {
-    my $var = shift;
-    $var =~ s/&/&amp;/g;
-    $var =~ s/</&lt;/g;
-    $var =~ s/>/&gt;/g;
-    $var =~ s/"/&quot;/g;
-    # Obscure '@'.
-    $var =~ s/\@/\&#64;/g;
-
-    state $use_utf8 = Bugzilla->params->{'utf8'};
-
-    if ($use_utf8) {
-        # Remove control characters if the encoding is utf8.
-        # Other multibyte encodings may be using this range; so ignore if not utf8.
-        $var =~ s/(?![\t\r\n])[[:cntrl:]]//g;
-
-        # Remove the following characters because they're
-        # influencing BiDi:
-        # --------------------------------------------------------
-        # |Code  |Name                      |UTF-8 representation|
-        # |------|--------------------------|--------------------|
-        # |U+202a|Left-To-Right Embedding   |0xe2 0x80 0xaa      |
-        # |U+202b|Right-To-Left Embedding   |0xe2 0x80 0xab      |
-        # |U+202c|Pop Directional Formatting|0xe2 0x80 0xac      |
-        # |U+202d|Left-To-Right Override    |0xe2 0x80 0xad      |
-        # |U+202e|Right-To-Left Override    |0xe2 0x80 0xae      |
-        # --------------------------------------------------------
-        #
-        # The following are characters influencing BiDi, too, but
-        # they can be spared from filtering because they don't
-        # influence more than one character right or left:
-        # --------------------------------------------------------
-        # |Code  |Name                      |UTF-8 representation|
-        # |------|--------------------------|--------------------|
-        # |U+200e|Left-To-Right Mark        |0xe2 0x80 0x8e      |
-        # |U+200f|Right-To-Left Mark        |0xe2 0x80 0x8f      |
-        # --------------------------------------------------------
-        $var =~ tr/\x{202a}-\x{202e}//d;
-    }
-    return $var;
+  my $var = shift;
+  $var =~ s/&/&amp;/g;
+  $var =~ s/</&lt;/g;
+  $var =~ s/>/&gt;/g;
+  $var =~ s/"/&quot;/g;
+
+  # Obscure '@'.
+  $var =~ s/\@/\&#64;/g;
+
+  # Remove control characters.
+  $var =~ s/(?![\t\r\n])[[:cntrl:]]//g;
+
+  # Remove the following characters because they're
+  # influencing BiDi:
+  # --------------------------------------------------------
+  # |Code  |Name                      |UTF-8 representation|
+  # |------|--------------------------|--------------------|
+  # |U+202a|Left-To-Right Embedding   |0xe2 0x80 0xaa      |
+  # |U+202b|Right-To-Left Embedding   |0xe2 0x80 0xab      |
+  # |U+202c|Pop Directional Formatting|0xe2 0x80 0xac      |
+  # |U+202d|Left-To-Right Override    |0xe2 0x80 0xad      |
+  # |U+202e|Right-To-Left Override    |0xe2 0x80 0xae      |
+  # --------------------------------------------------------
+  #
+  # The following are characters influencing BiDi, too, but
+  # they can be spared from filtering because they don't
+  # influence more than one character right or left:
+  # --------------------------------------------------------
+  # |Code  |Name                      |UTF-8 representation|
+  # |------|--------------------------|--------------------|
+  # |U+200e|Left-To-Right Mark        |0xe2 0x80 0x8e      |
+  # |U+200f|Right-To-Left Mark        |0xe2 0x80 0x8f      |
+  # --------------------------------------------------------
+  $var =~ tr/\x{202a}-\x{202e}//d;
+  return $var;
+}
+
+sub read_text {
+  my ($filename) = @_;
+  open my $fh, '<:encoding(utf-8)', $filename;
+  local $/ = undef;
+  my $content = <$fh>;
+  close $fh;
+  return $content;
+}
+
+sub write_text {
+  my ($filename, $content) = @_;
+  my ($tmp_fh, $tmp_filename)
+    = tempfile('.tmp.XXXXXXXXXX', DIR => dirname($filename), UNLINK => 0,);
+  binmode $tmp_fh, ':encoding(utf-8)';
+  print $tmp_fh $content;
+  close $tmp_fh;
+  rename $tmp_filename, $filename;
 }
 
 sub html_light_quote {
-    my ($text) = @_;
-    # admin/table.html.tmpl calls |FILTER html_light| many times.
-    # There is no need to recreate the HTML::Scrubber object again and again.
-    my $scrubber = Bugzilla->process_cache->{html_scrubber};
-
-    # List of allowed HTML elements having no attributes.
-    my @allow = qw(b strong em i u p br abbr acronym ins del cite code var
-                   dfn samp kbd big small sub sup tt dd dt dl ul li ol
-                   fieldset legend);
-
-    if (!Bugzilla->feature('html_desc')) {
-        my $safe = join('|', @allow);
-        my $chr = chr(1);
-
-        # First, escape safe elements.
-        $text =~ s#<($safe)>#$chr$1$chr#go;
-        $text =~ s#</($safe)>#$chr/$1$chr#go;
-        # Now filter < and >.
-        $text =~ s#<#&lt;#g;
-        $text =~ s#>#&gt;#g;
-        # Restore safe elements.
-        $text =~ s#$chr/($safe)$chr#</$1>#go;
-        $text =~ s#$chr($safe)$chr#<$1>#go;
-        return $text;
-    }
-    elsif (!$scrubber) {
-        # We can be less restrictive. We can accept elements with attributes.
-        push(@allow, qw(a blockquote q span));
-
-        # Allowed protocols.
-        my $safe_protocols = join('|', SAFE_PROTOCOLS);
-        my $protocol_regexp = qr{(^(?:$safe_protocols):|^[^:]+$)}i;
-
-        # Deny all elements and attributes unless explicitly authorized.
-        my @default = (0 => {
-                             id    => 1,
-                             name  => 1,
-                             class => 1,
-                             '*'   => 0, # Reject all other attributes.
-                            }
-                       );
-
-        # Specific rules for allowed elements. If no specific rule is set
-        # for a given element, then the default is used.
-        my @rules = (a => {
-                           href   => $protocol_regexp,
-                           target => qr{^(?:_blank|_parent|_self|_top)$}i,
-                           title  => 1,
-                           id     => 1,
-                           name   => 1,
-                           class  => 1,
-                           '*'    => 0, # Reject all other attributes.
-                          },
-                     blockquote => {
-                                    cite => $protocol_regexp,
-                                    id    => 1,
-                                    name  => 1,
-                                    class => 1,
-                                    '*'  => 0, # Reject all other attributes.
-                                   },
-                     'q' => {
-                             cite => $protocol_regexp,
-                             id    => 1,
-                             name  => 1,
-                             class => 1,
-                             '*'  => 0, # Reject all other attributes.
-                          },
-                    );
-
-        Bugzilla->process_cache->{html_scrubber} = $scrubber =
-          HTML::Scrubber->new(default => \@default,
-                              allow   => \@allow,
-                              rules   => \@rules,
-                              comment => 0,
-                              process => 0);
-    }
-    return $scrubber->scrub($text);
+  my ($text) = @_;
+
+  # admin/table.html.tmpl calls |FILTER html_light| many times.
+  # There is no need to recreate the HTML::Scrubber object again and again.
+  my $scrubber = Bugzilla->process_cache->{html_scrubber};
+
+  # List of allowed HTML elements having no attributes.
+  my @allow = qw(b strong em i u p br abbr acronym ins del cite code var
+    dfn samp kbd big small sub sup tt dd dt dl ul li ol
+    fieldset legend);
+
+  if (!Bugzilla->feature('html_desc')) {
+    my $safe = join('|', @allow);
+    my $chr = chr(1);
+
+    # First, escape safe elements.
+    $text =~ s#<($safe)>#$chr$1$chr#go;
+    $text =~ s#</($safe)>#$chr/$1$chr#go;
+
+    # Now filter < and >.
+    $text =~ s#<#&lt;#g;
+    $text =~ s#>#&gt;#g;
+
+    # Restore safe elements.
+    $text =~ s#$chr/($safe)$chr#</$1>#go;
+    $text =~ s#$chr($safe)$chr#<$1>#go;
+    return $text;
+  }
+  elsif (!$scrubber) {
+
+    # We can be less restrictive. We can accept elements with attributes.
+    push(@allow, qw(a blockquote q span));
+
+    # Allowed protocols.
+    my $safe_protocols = join('|', SAFE_PROTOCOLS);
+    my $protocol_regexp = qr{(^(?:$safe_protocols):|^[^:]+$)}i;
+
+    # Deny all elements and attributes unless explicitly authorized.
+    my @default = (
+      0 => {
+        id    => 1,
+        name  => 1,
+        class => 1,
+        '*'   => 0,    # Reject all other attributes.
+      }
+    );
+
+    # Specific rules for allowed elements. If no specific rule is set
+    # for a given element, then the default is used.
+    my @rules = (
+      a => {
+        href   => $protocol_regexp,
+        target => qr{^(?:_blank|_parent|_self|_top)$}i,
+        title  => 1,
+        id     => 1,
+        name   => 1,
+        class  => 1,
+        '*'    => 0,                                      # Reject all other attributes.
+      },
+      blockquote => {
+        cite  => $protocol_regexp,
+        id    => 1,
+        name  => 1,
+        class => 1,
+        '*'   => 0,                                       # Reject all other attributes.
+      },
+      'q' => {
+        cite  => $protocol_regexp,
+        id    => 1,
+        name  => 1,
+        class => 1,
+        '*'   => 0,                                       # Reject all other attributes.
+      },
+    );
+
+    Bugzilla->process_cache->{html_scrubber} = $scrubber = HTML::Scrubber->new(
+      default => \@default,
+      allow   => \@allow,
+      rules   => \@rules,
+      comment => 0,
+      process => 0
+    );
+  }
+  return $scrubber->scrub($text);
 }
 
 sub email_filter {
-    my ($toencode) = @_;
-    if (!Bugzilla->user->id) {
-        my @emails = Email::Address->parse($toencode);
-        if (scalar @emails) {
-            my @hosts = map { quotemeta($_->host) } @emails;
-            my $hosts_re = join('|', @hosts);
-            $toencode =~ s/\@(?:$hosts_re)//g;
-            return $toencode;
-        }
+  my ($toencode) = @_;
+  if (!Bugzilla->user->id) {
+    my @emails = Email::Address->parse($toencode);
+    if (scalar @emails) {
+      my @hosts = map { quotemeta($_->host) } @emails;
+      my $hosts_re = join('|', @hosts);
+      $toencode =~ s/\@(?:$hosts_re)//g;
+      return $toencode;
     }
-    return $toencode;
+  }
+  return $toencode;
 }
 
 # This originally came from CGI.pm, by Lincoln D. Stein
 sub url_quote {
-    my ($toencode) = (@_);
-    utf8::encode($toencode) # The below regex works only on bytes
-        if Bugzilla->params->{'utf8'} && utf8::is_utf8($toencode);
-    $toencode =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("%%%02x",ord($1))/eg;
-    return $toencode;
+  my ($toencode) = (@_);
+
+  # The below regex works only on bytes
+  utf8::encode($toencode) if utf8::is_utf8($toencode);
+  $toencode =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("%%%02x",ord($1))/eg;
+  return $toencode;
 }
 
 sub css_class_quote {
-    my ($toencode) = (@_);
-    $toencode =~ s#[ /]#_#g;
-    $toencode =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("&#x%x;",ord($1))/eg;
-    return $toencode;
+  my ($toencode) = (@_);
+  $toencode =~ s#[ /]#_#g;
+  $toencode =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("&#x%x;",ord($1))/eg;
+  return $toencode;
 }
 
 sub xml_quote {
-    my ($var) = (@_);
-    $var =~ s/\&/\&amp;/g;
-    $var =~ s/</\&lt;/g;
-    $var =~ s/>/\&gt;/g;
-    $var =~ s/\"/\&quot;/g;
-    $var =~ s/\'/\&apos;/g;
-    
-    # the following nukes characters disallowed by the XML 1.0
-    # spec, Production 2.2. 1.0 declares that only the following 
-    # are valid:
-    # (#x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF])
-    $var =~ s/([\x{0001}-\x{0008}]|
+  my ($var) = (@_);
+  $var =~ s/\&/\&amp;/g;
+  $var =~ s/</\&lt;/g;
+  $var =~ s/>/\&gt;/g;
+  $var =~ s/\"/\&quot;/g;
+  $var =~ s/\'/\&apos;/g;
+
+  # the following nukes characters disallowed by the XML 1.0
+  # spec, Production 2.2. 1.0 declares that only the following
+  # are valid:
+  # (#x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF])
+  $var =~ s/([\x{0001}-\x{0008}]|
                [\x{000B}-\x{000C}]|
                [\x{000E}-\x{001F}]|
                [\x{D800}-\x{DFFF}]|
                [\x{FFFE}-\x{FFFF}])//gx;
-    return $var;
+  return $var;
 }
 
 sub i_am_cgi {
-    # I use SERVER_SOFTWARE because it's required to be
-    # defined for all requests in the CGI spec.
-    return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0;
+
+  # I use SERVER_SOFTWARE because it's required to be
+  # defined for all requests in the CGI spec.
+  return exists $ENV{'SERVER_SOFTWARE'} ? 1 : 0;
 }
 
 sub i_am_webservice {
-    my $usage_mode = Bugzilla->usage_mode;
-    return $usage_mode == USAGE_MODE_XMLRPC
-           || $usage_mode == USAGE_MODE_JSON
-           || $usage_mode == USAGE_MODE_REST;
+  my $usage_mode = Bugzilla->usage_mode;
+  return
+       $usage_mode == USAGE_MODE_XMLRPC
+    || $usage_mode == USAGE_MODE_JSON
+    || $usage_mode == USAGE_MODE_REST;
 }
 
 # This exists as a separate function from Bugzilla::CGI::redirect_to_https
 # because we don't want to create a CGI object during XML-RPC calls
 # (doing so can mess up XML-RPC).
 sub do_ssl_redirect_if_required {
-    return if !i_am_cgi();
-    return if !Bugzilla->params->{'ssl_redirect'};
-
-    my $sslbase = Bugzilla->params->{'sslbase'};
-    
-    # If we're already running under SSL, never redirect.
-    return if uc($ENV{HTTPS} || '') eq 'ON';
-    # Never redirect if there isn't an sslbase.
-    return if !$sslbase;
-    Bugzilla->cgi->redirect_to_https();
+  return if !i_am_cgi();
+  return if Bugzilla->params->{urlbase} =~ /^https/i;
+  return if !Bugzilla->params->{'ssl_redirect'};
+  return if !Bugzilla->params->{'sslbase'};
+
+  # If we're already running under SSL, never redirect.
+  if (Bugzilla->params->{'inbound_proxies'}
+    && uc($ENV{HTTP_X_FORWARDED_PROTO} || '') eq 'HTTPS')
+  {
+    return;
+  }
+  return if uc($ENV{HTTPS} || '') eq 'ON';
+
+  # If called from Bugzilla::CGI->new itself, use the newly created
+  # CGI object, to avoid deep recursions.
+  my $cgi = shift || Bugzilla->cgi;
+  $cgi->redirect_to_https();
 }
 
 sub correct_urlbase {
-    my $ssl = Bugzilla->params->{'ssl_redirect'};
-    my $urlbase = Bugzilla->params->{'urlbase'};
-    my $sslbase = Bugzilla->params->{'sslbase'};
-
-    if (!$sslbase) {
-        return $urlbase;
-    }
-    elsif ($ssl) {
-        return $sslbase;
-    }
-    else {
-        # Return what the user currently uses.
-        return (uc($ENV{HTTPS} || '') eq 'ON') ? $sslbase : $urlbase;
-    }
+  my $urlbase = Bugzilla->params->{'urlbase'};
+  my $sslbase = Bugzilla->params->{'sslbase'};
+
+  if (!$sslbase) {
+    return $urlbase;
+  }
+  elsif (Bugzilla->params->{'ssl_redirect'}) {
+    return $sslbase;
+  }
+
+  # Return what the user currently uses.
+  elsif (Bugzilla->params->{'inbound_proxies'}) {
+    return (uc($ENV{HTTP_X_FORWARDED_PROTO} || '') eq 'HTTPS')
+      ? $sslbase
+      : $urlbase;
+  }
+  else {
+    return (uc($ENV{HTTPS} || '') eq 'ON') ? $sslbase : $urlbase;
+  }
 }
 
+# Returns the real remote address of the client,
 sub remote_ip {
-    my $ip = $ENV{'REMOTE_ADDR'} || '127.0.0.1';
-    my @proxies = split(/[\s,]+/, Bugzilla->params->{'inbound_proxies'});
-
-    # If the IP address is one of our trusted proxies, then we look at
-    # the X-Forwarded-For header to determine the real remote IP address.
-    if ($ENV{'HTTP_X_FORWARDED_FOR'} && first { $_ eq $ip } @proxies) {
-        my @ips = split(/[\s,]+/, $ENV{'HTTP_X_FORWARDED_FOR'});
-        # This header can contain several IP addresses. We want the
-        # IP address of the machine which connected to our proxies as
-        # all other IP addresses may be fake or internal ones.
-        # Note that this may block a whole external proxy, but we have
-        # no way to determine if this proxy is malicious or trustable.
-        foreach my $remote_ip (reverse @ips) {
-            if (!first { $_ eq $remote_ip } @proxies) {
-                # Keep the original IP address if the remote IP is invalid.
-                $ip = validate_ip($remote_ip) || $ip;
-                last;
-            }
-        }
+  my $remote_ip = $ENV{'REMOTE_ADDR'} || '127.0.0.1';
+  my @proxies         = split(/[\s,]+/, Bugzilla->params->{inbound_proxies});
+  my @x_forwarded_for = split(/[\s,]+/, $ENV{HTTP_X_FORWARDED_FOR} // '');
+
+  return $remote_ip unless @x_forwarded_for;
+  return $x_forwarded_for[0] if (@proxies && $proxies[0] eq '*');
+  return $remote_ip if none { $_ eq $remote_ip } @proxies;
+
+  foreach my $ip (reverse @x_forwarded_for) {
+    if (none { $_ eq $ip } @proxies) {
+
+      # Keep the original IP address if the remote IP is invalid.
+      return validate_ip($ip) || $remote_ip;
     }
-    return $ip;
+  }
+  return $remote_ip;
 }
 
 sub validate_ip {
-    my $ip = shift;
-    return is_ipv4($ip) || is_ipv6($ip);
+  my $ip = shift;
+  return is_ipv4($ip) || is_ipv6($ip);
 }
 
 # Copied from Data::Validate::IP::is_ipv4().
 sub is_ipv4 {
-    my $ip = shift;
-    return unless defined $ip;
+  my $ip = shift;
+  return unless defined $ip;
 
-    my @octets = $ip =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;
-    return unless scalar(@octets) == 4;
+  my @octets = $ip =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;
+  return unless scalar(@octets) == 4;
 
-    foreach my $octet (@octets) {
-        return unless ($octet >= 0 && $octet <= 255 && $octet !~ /^0\d{1,2}$/);
-    }
+  foreach my $octet (@octets) {
+    return unless ($octet >= 0 && $octet <= 255 && $octet !~ /^0\d{1,2}$/);
+  }
 
-    # The IP address is valid and can now be detainted.
-    return join('.', @octets);
+  # The IP address is valid and can now be detainted.
+  return join('.', @octets);
 }
 
 # Copied from Data::Validate::IP::is_ipv6().
 sub is_ipv6 {
-    my $ip = shift;
-    return unless defined $ip;
-
-    # If there is a :: then there must be only one :: and the length
-    # can be variable. Without it, the length must be 8 groups.
-    my @chunks = split(':', $ip);
-
-    # Need to check if the last chunk is an IPv4 address, if it is we
-    # pop it off and exempt it from the normal IPv6 checking and stick
-    # it back on at the end. If there is only one chunk and it's an IPv4
-    # address, then it isn't an IPv6 address.
-    my $ipv4;
-    my $expected_chunks = 8;
-    if (@chunks > 1 && is_ipv4($chunks[$#chunks])) {
-        $ipv4 = pop(@chunks);
-        $expected_chunks--;
-    }
+  my $ip = shift;
+  return unless defined $ip;
+
+  # If there is a :: then there must be only one :: and the length
+  # can be variable. Without it, the length must be 8 groups.
+  my @chunks = split(':', $ip);
+
+  # Need to check if the last chunk is an IPv4 address, if it is we
+  # pop it off and exempt it from the normal IPv6 checking and stick
+  # it back on at the end. If there is only one chunk and it's an IPv4
+  # address, then it isn't an IPv6 address.
+  my $ipv4;
+  my $expected_chunks = 8;
+  if (@chunks > 1 && is_ipv4($chunks[$#chunks])) {
+    $ipv4 = pop(@chunks);
+    $expected_chunks--;
+  }
+
+  my $empty = 0;
+
+  # Workaround to handle trailing :: being valid.
+  if ($ip =~ /[0-9a-f]{1,4}::$/) {
+    $empty++;
 
-    my $empty = 0;
-    # Workaround to handle trailing :: being valid.
-    if ($ip =~ /[0-9a-f]{1,4}::$/) {
-        $empty++;
     # Single trailing ':' is invalid.
-    } elsif ($ip =~ /:$/) {
-        return;
-    }
+  }
+  elsif ($ip =~ /:$/) {
+    return;
+  }
 
-    foreach my $chunk (@chunks) {
-        return unless $chunk =~ /^[0-9a-f]{0,4}$/i;
-        $empty++ if $chunk eq '';
-    }
-    # More than one :: block is bad, but if it starts with :: it will
-    # look like two, so we need an exception.
-    if ($empty == 2 && $ip =~ /^::/) {
-        # This is ok
-    } elsif ($empty > 1) {
-        return;
-    }
+  foreach my $chunk (@chunks) {
+    return unless $chunk =~ /^[0-9a-f]{0,4}$/i;
+    $empty++ if $chunk eq '';
+  }
+
+  # More than one :: block is bad, but if it starts with :: it will
+  # look like two, so we need an exception.
+  if ($empty == 2 && $ip =~ /^::/) {
+
+    # This is ok
+  }
+  elsif ($empty > 1) {
+    return;
+  }
 
-    push(@chunks, $ipv4) if $ipv4;
-    # Need 8 chunks, or we need an empty section that could be filled
-    # to represent the missing '0' sections.
-    return unless (@chunks == $expected_chunks || @chunks < $expected_chunks && $empty);
+  push(@chunks, $ipv4) if $ipv4;
 
-    my $ipv6 = join(':', @chunks);
-    # The IP address is valid and can now be detainted.
-    trick_taint($ipv6);
+  # Need 8 chunks, or we need an empty section that could be filled
+  # to represent the missing '0' sections.
+  return
+    unless (@chunks == $expected_chunks || @chunks < $expected_chunks && $empty);
 
-    # Need to handle the exception of trailing :: being valid.
-    return "${ipv6}::" if $ip =~ /::$/;
-    return $ipv6;
+  my $ipv6 = join(':', @chunks);
+
+  # The IP address is valid and can now be detainted.
+  trick_taint($ipv6);
+
+  # Need to handle the exception of trailing :: being valid.
+  return "${ipv6}::" if $ip =~ /::$/;
+  return $ipv6;
 }
 
 sub use_attachbase {
-    my $attachbase = Bugzilla->params->{'attachment_base'};
-    return ($attachbase ne ''
-            && $attachbase ne Bugzilla->params->{'urlbase'}
-            && $attachbase ne Bugzilla->params->{'sslbase'}) ? 1 : 0;
+  my $attachbase = Bugzilla->params->{'attachment_base'};
+  return ($attachbase ne ''
+      && $attachbase ne Bugzilla->params->{'urlbase'}
+      && $attachbase ne Bugzilla->params->{'sslbase'}) ? 1 : 0;
 }
 
 sub diff_arrays {
-    my ($old_ref, $new_ref, $attrib) = @_;
-    $attrib ||= 'name';
-
-    my (%counts, %pos);
-    # We are going to alter the old array.
-    my @old = @$old_ref;
-    my $i = 0;
-
-    # $counts{foo}-- means old, $counts{foo}++ means new.
-    # If $counts{foo} becomes positive, then we are adding new items,
-    # else we simply cancel one old existing item. Remaining items
-    # in the old list have been removed.
-    foreach (@old) {
-        next unless defined $_;
-        my $value = blessed($_) ? $_->$attrib : $_;
-        $counts{$value}--;
-        push @{$pos{$value}}, $i++;
+  my ($old_ref, $new_ref, $attrib) = @_;
+  $attrib ||= 'name';
+
+  my (%counts, %pos);
+
+  # We are going to alter the old array.
+  my @old = @$old_ref;
+  my $i   = 0;
+
+  # $counts{foo}-- means old, $counts{foo}++ means new.
+  # If $counts{foo} becomes positive, then we are adding new items,
+  # else we simply cancel one old existing item. Remaining items
+  # in the old list have been removed.
+  foreach (@old) {
+    next unless defined $_;
+    my $value = blessed($_) ? $_->$attrib : $_;
+    $counts{$value}--;
+    push @{$pos{$value}}, $i++;
+  }
+  my @added;
+  foreach (@$new_ref) {
+    next unless defined $_;
+    my $value = blessed($_) ? $_->$attrib : $_;
+    if (++$counts{$value} > 0) {
+
+      # Ignore empty strings, but objects having an empty string
+      # as attribute are fine.
+      push(@added, $_) unless ($value eq '' && !blessed($_));
     }
-    my @added;
-    foreach (@$new_ref) {
-        next unless defined $_;
-        my $value = blessed($_) ? $_->$attrib : $_;
-        if (++$counts{$value} > 0) {
-            # Ignore empty strings, but objects having an empty string
-            # as attribute are fine.
-            push(@added, $_) unless ($value eq '' && !blessed($_));
-        }
-        else {
-            my $old_pos = shift @{$pos{$value}};
-            $old[$old_pos] = undef;
-        }
+    else {
+      my $old_pos = shift @{$pos{$value}};
+      $old[$old_pos] = undef;
     }
-    # Ignore canceled items as well as empty strings.
-    my @removed = grep { defined $_ && $_ ne '' } @old;
-    return (\@removed, \@added);
+  }
+
+  # Ignore canceled items as well as empty strings.
+  my @removed = grep { defined $_ && $_ ne '' } @old;
+  return (\@removed, \@added);
 }
 
 sub trim {
-    my ($str) = @_;
-    if ($str) {
-      $str =~ s/^\s+//g;
-      $str =~ s/\s+$//g;
-    }
-    return $str;
+  my ($str) = @_;
+  if ($str) {
+    $str =~ s/^\s+//g;
+    $str =~ s/\s+$//g;
+  }
+  return $str;
 }
 
 sub wrap_comment {
-    my ($comment, $cols) = @_;
-    my $wrappedcomment = "";
-
-    # Use 'local', as recommended by Text::Wrap's perldoc.
-    local $Text::Wrap::columns = $cols || COMMENT_COLS;
-    # Make words that are longer than COMMENT_COLS not wrap.
-    local $Text::Wrap::huge    = 'overflow';
-    # Don't mess with tabs.
-    local $Text::Wrap::unexpand = 0;
-
-    # If the line starts with ">", don't wrap it. Otherwise, wrap.
-    foreach my $line (split(/\r\n|\r|\n/, $comment)) {
-      if ($line =~ qr/^>/) {
-        $wrappedcomment .= ($line . "\n");
-      }
-      else {
-        $wrappedcomment .= (wrap('', '', $line) . "\n");
-      }
-    }
+  my ($comment, $cols) = @_;
+  my $wrappedcomment = "";
 
-    chomp($wrappedcomment); # Text::Wrap adds an extra newline at the end.
-    return $wrappedcomment;
-}
+  # Use 'local', as recommended by Text::Wrap's perldoc.
+  local $Text::Wrap::columns = $cols || COMMENT_COLS;
 
-sub find_wrap_point {
-    my ($string, $maxpos) = @_;
-    if (!$string) { return 0 }
-    if (length($string) < $maxpos) { return length($string) }
-    my $wrappoint = rindex($string, ",", $maxpos); # look for comma
-    if ($wrappoint <= 0) {  # can't find comma
-        $wrappoint = rindex($string, " ", $maxpos); # look for space
-        if ($wrappoint <= 0) {  # can't find space
-            $wrappoint = rindex($string, "-", $maxpos); # look for hyphen
-            if ($wrappoint <= 0) {  # can't find hyphen
-                $wrappoint = $maxpos;  # just truncate it
-            } else {
-                $wrappoint++; # leave hyphen on the left side
-            }
-        }
-    }
-    return $wrappoint;
-}
+  # Make words that are longer than COMMENT_COLS not wrap.
+  local $Text::Wrap::huge = 'overflow';
 
-sub join_activity_entries {
-    my ($field, $current_change, $new_change) = @_;
-    # We need to insert characters as these were removed by old
-    # LogActivityEntry code.
-
-    return $new_change if $current_change eq '';
-
-    # Buglists and see_also need the comma restored
-    if ($field eq 'dependson' || $field eq 'blocked' || $field eq 'see_also') {
-        if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
-            return $current_change . $new_change;
-        } else {
-            return $current_change . ', ' . $new_change;
-        }
-    }
+  # Don't mess with tabs.
+  local $Text::Wrap::unexpand = 0;
 
-    # Assume bug_file_loc contain a single url, don't insert a delimiter
-    if ($field eq 'bug_file_loc') {
-        return $current_change . $new_change;
+  # If the line starts with ">", don't wrap it. Otherwise, wrap.
+  foreach my $line (split(/\r\n|\r|\n/, $comment)) {
+    if ($line =~ qr/^>/) {
+      $wrappedcomment .= ($line . "\n");
     }
-
-    # All other fields get a space unless the first character of the second
-    # string is a comma or space
-    if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
-        return $current_change . $new_change;
-    } else {
-        return $current_change . ' ' . $new_change;
+    else {
+      $wrappedcomment .= (wrap('', '', $line) . "\n");
     }
-}
+  }
 
-sub wrap_hard {
-    my ($string, $columns) = @_;
-    local $Text::Wrap::columns = $columns;
-    local $Text::Wrap::unexpand = 0;
-    local $Text::Wrap::huge = 'wrap';
-    
-    my $wrapped = wrap('', '', $string);
-    chomp($wrapped);
-    return $wrapped;
+  chomp($wrappedcomment);    # Text::Wrap adds an extra newline at the end.
+  return $wrappedcomment;
 }
 
-sub format_time {
-    my ($date, $format, $timezone) = @_;
-
-    # If $format is not set, try to guess the correct date format.
-    if (!$format) {
-        if (!ref $date
-            && $date =~ /^(\d{4})[-\.](\d{2})[-\.](\d{2}) (\d{2}):(\d{2})(:(\d{2}))?$/) 
-        {
-            my $sec = $7;
-            if (defined $sec) {
-                $format = "%Y-%m-%d %T %Z";
-            } else {
-                $format = "%Y-%m-%d %R %Z";
-            }
-        } else {
-            # Default date format. See DateTime for other formats available.
-            $format = "%Y-%m-%d %R %Z";
-        }
-    }
+sub wrap_cite {
+  my ($comment, $cols) = @_;
+  my $wrappedcomment = "";
 
-    my $dt = ref $date ? $date : datetime_from($date, $timezone);
-    $date = defined $dt ? $dt->strftime($format) : '';
-    return trim($date);
-}
+  # Use 'local', as recommended by Text::Wrap's perldoc.
+  local $Text::Wrap::columns = $cols || COMMENT_COLS;
 
-sub datetime_from {
-    my ($date, $timezone) = @_;
+  # Make words that are longer than COMMENT_COLS not wrap.
+  local $Text::Wrap::huge = 'overflow';
 
-    # In the database, this is the "0" date.
-    return undef if $date =~ /^0000/;
+  # Don't mess with tabs.
+  local $Text::Wrap::unexpand = 0;
 
-    my @time;
-    # Most dates will be in this format, avoid strptime's generic parser
-    if ($date =~ /^(\d{4})[\.-](\d{2})[\.-](\d{2})(?: (\d{2}):(\d{2}):(\d{2}))?$/) {
-        @time = ($6, $5, $4, $3, $2 - 1, $1 - 1900, undef);
+  foreach my $line (split(/\r\n|\r|\n/, $comment)) {
+    if ($line =~ /^(>+ *)/) {
+      $wrappedcomment .= wrap('', $1, $line) . "\n";
     }
     else {
-        @time = strptime($date);
+      $wrappedcomment .= $line . "\n";
     }
+  }
+  chomp($wrappedcomment);    # remove extra newline at the end
+  return $wrappedcomment;
+}
 
-    unless (scalar @time) {
-        # If an unknown timezone is passed (such as MSK, for Moskow),
-        # strptime() is unable to parse the date. We try again, but we first
-        # remove the timezone.
-        $date =~ s/\s+\S+$//;
-        @time = strptime($date);
+sub find_wrap_point {
+  my ($string, $maxpos) = @_;
+  if (!$string) { return 0 }
+  if (length($string) < $maxpos) { return length($string) }
+  my $wrappoint = rindex($string, ",", $maxpos);    # look for comma
+  if ($wrappoint <= 0) {                            # can't find comma
+    $wrappoint = rindex($string, " ", $maxpos);     # look for space
+    if ($wrappoint <= 0) {                          # can't find space
+      $wrappoint = rindex($string, "-", $maxpos);    # look for hyphen
+      if ($wrappoint <= 0) {                         # can't find hyphen
+        $wrappoint = $maxpos;                        # just truncate it
+      }
+      else {
+        $wrappoint++;                                # leave hyphen on the left side
+      }
     }
+  }
+  return $wrappoint;
+}
 
-    return undef if !@time;
-
-    # strptime() counts years from 1900, except if they are older than 1901
-    # in which case it returns the full year (so 1890 -> 1890, but 1984 -> 84,
-    # and 3790 -> 1890). We make a guess and assume that 1100 <= year < 3000.
-    $time[5] += 1900 if $time[5] < 1100;
-
-    my %args = (
-        year   => $time[5],
-        # Months start from 0 (January).
-        month  => $time[4] + 1,
-        day    => $time[3],
-        hour   => $time[2],
-        minute => $time[1],
-        # DateTime doesn't like fractional seconds.
-        # Also, sometimes seconds are undef.
-        second => defined($time[0]) ? int($time[0]) : undef,
-        # If a timezone was specified, use it. Otherwise, use the
-        # local timezone.
-        time_zone => Bugzilla->local_timezone->offset_as_string($time[6]) 
-                     || Bugzilla->local_timezone,
-    );
-
-    # If something wasn't specified in the date, it's best to just not
-    # pass it to DateTime at all. (This is important for doing datetime_from
-    # on the deadline field, which is usually just a date with no time.)
-    foreach my $arg (keys %args) {
-        delete $args{$arg} if !defined $args{$arg};
-    }
+sub join_activity_entries {
+  my ($field, $current_change, $new_change) = @_;
 
-    # This module takes time to load and is only used here, so we
-    # |require| it here rather than |use| it.
-    require DateTime;
-    my $dt = new DateTime(\%args);
+  # We need to insert characters as these were removed by old
+  # LogActivityEntry code.
 
-    # Now display the date using the given timezone,
-    # or the user's timezone if none is given.
-    $dt->set_time_zone($timezone || Bugzilla->user->timezone);
-    return $dt;
-}
+  return $new_change if $current_change eq '';
 
-sub bz_crypt {
-    my ($password, $salt) = @_;
-
-    my $algorithm;
-    if (!defined $salt) {
-        # If you don't use a salt, then people can create tables of
-        # hashes that map to particular passwords, and then break your
-        # hashing very easily if they have a large-enough table of common
-        # (or even uncommon) passwords. So we generate a unique salt for
-        # each password in the database, and then just prepend it to
-        # the hash.
-        $salt = generate_random_password(PASSWORD_SALT_LENGTH);
-        $algorithm = PASSWORD_DIGEST_ALGORITHM;
+  # Buglists and see_also need the comma restored
+  if ($field eq 'dependson' || $field eq 'blocked' || $field eq 'see_also') {
+    if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
+      return $current_change . $new_change;
     }
-
-    # We append the algorithm used to the string. This is good because then
-    # we can change the algorithm being used, in the future, without 
-    # disrupting the validation of existing passwords. Also, this tells
-    # us if a password is using the old "crypt" method of hashing passwords,
-    # because the algorithm will be missing from the string.
-    if ($salt =~ /{([^}]+)}$/) {
-        $algorithm = $1;
+    else {
+      return $current_change . ', ' . $new_change;
     }
+  }
+
+  # Assume bug_file_loc contain a single url, don't insert a delimiter
+  if ($field eq 'bug_file_loc') {
+    return $current_change . $new_change;
+  }
+
+  # All other fields get a space unless the first character of the second
+  # string is a comma or space
+  if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
+    return $current_change . $new_change;
+  }
+  else {
+    return $current_change . ' ' . $new_change;
+  }
+}
 
-    # Wide characters cause crypt and Digest to die.
-    if (Bugzilla->params->{'utf8'}) {
-        utf8::encode($password) if utf8::is_utf8($password);
-    }
+sub wrap_hard {
+  my ($string, $columns) = @_;
+  local $Text::Wrap::columns  = $columns;
+  local $Text::Wrap::unexpand = 0;
+  local $Text::Wrap::huge     = 'wrap';
+
+  my $wrapped = wrap('', '', $string);
+  chomp($wrapped);
+  return $wrapped;
+}
 
-    my $crypted_password;
-    if (!$algorithm) {
-        # Crypt the password.
-        $crypted_password = crypt($password, $salt);
+sub format_time {
+  my ($date, $format, $timezone) = @_;
+
+  # If $format is not set, try to guess the correct date format.
+  if (!$format) {
+    if (!ref $date
+      && $date =~ /^(\d{4})[-\.](\d{2})[-\.](\d{2}) (\d{2}):(\d{2})(:(\d{2}))?$/)
+    {
+      my $sec = $7;
+      if (defined $sec) {
+        $format = "%Y-%m-%d %T %Z";
+      }
+      else {
+        $format = "%Y-%m-%d %R %Z";
+      }
     }
     else {
-        my $hasher = Digest->new($algorithm);
-        # Newly created salts won't yet have a comma.
-        ($salt) = $salt =~ /^([^,]+),?/;
-        $hasher->add($password, $salt);
-        $crypted_password = $salt . ',' . $hasher->b64digest . "{$algorithm}";
+      # Default date format. See DateTime for other formats available.
+      $format = "%Y-%m-%d %R %Z";
     }
+  }
+
+  my $dt = ref $date ? $date : datetime_from($date, $timezone);
+  $date = defined $dt ? $dt->strftime($format) : '';
+  return trim($date);
+}
 
-    # Return the crypted password.
-    return $crypted_password;
+sub datetime_from {
+  my ($date, $timezone) = @_;
+
+  # In the database, this is the "0" date.
+  return undef if $date =~ /^0000/;
+
+  my @time;
+
+  # Most dates will be in this format, avoid strptime's generic parser
+  if ($date =~ /^(\d{4})[\.-](\d{2})[\.-](\d{2})(?: (\d{2}):(\d{2}):(\d{2}))?$/) {
+    @time = ($6, $5, $4, $3, $2 - 1, $1 - 1900, undef);
+  }
+  else {
+    @time = strptime($date);
+  }
+
+  unless (scalar @time) {
+
+    # If an unknown timezone is passed (such as MSK, for Moskow),
+    # strptime() is unable to parse the date. We try again, but we first
+    # remove the timezone.
+    $date =~ s/\s+\S+$//;
+    @time = strptime($date);
+  }
+
+  return undef if !@time;
+
+  # strptime() counts years from 1900, except if they are older than 1901
+  # in which case it returns the full year (so 1890 -> 1890, but 1984 -> 84,
+  # and 3790 -> 1890). We make a guess and assume that 1100 <= year < 3000.
+  $time[5] += 1900 if $time[5] < 1100;
+
+  my %args = (
+    year => $time[5],
+
+    # Months start from 0 (January).
+    month  => $time[4] + 1,
+    day    => $time[3],
+    hour   => $time[2],
+    minute => $time[1],
+
+    # DateTime doesn't like fractional seconds.
+    # Also, sometimes seconds are undef.
+    second => defined($time[0]) ? int($time[0]) : undef,
+
+    # If a timezone was specified, use it. Otherwise, use the
+    # local timezone.
+    time_zone => DateTime::TimeZone->offset_as_string($time[6])
+      || Bugzilla->local_timezone,
+  );
+
+  # If something wasn't specified in the date, it's best to just not
+  # pass it to DateTime at all. (This is important for doing datetime_from
+  # on the deadline field, which is usually just a date with no time.)
+  foreach my $arg (keys %args) {
+    delete $args{$arg} if !defined $args{$arg};
+  }
+
+  # This module takes time to load and is only used here, so we
+  # |require| it here rather than |use| it.
+  require DateTime;
+  my $dt = new DateTime(\%args);
+
+  # Now display the date using the given timezone,
+  # or the user's timezone if none is given.
+  $dt->set_time_zone($timezone || Bugzilla->user->timezone);
+  return $dt;
+}
+
+sub bz_crypt {
+  my ($password, $salt) = @_;
+
+  my $algorithm;
+  if (!defined $salt) {
+
+    # If you don't use a salt, then people can create tables of
+    # hashes that map to particular passwords, and then break your
+    # hashing very easily if they have a large-enough table of common
+    # (or even uncommon) passwords. So we generate a unique salt for
+    # each password in the database, and then just prepend it to
+    # the hash.
+    $salt      = generate_random_password(PASSWORD_SALT_LENGTH);
+    $algorithm = PASSWORD_DIGEST_ALGORITHM;
+  }
+
+  # We append the algorithm used to the string. This is good because then
+  # we can change the algorithm being used, in the future, without
+  # disrupting the validation of existing passwords. Also, this tells
+  # us if a password is using the old "crypt" method of hashing passwords,
+  # because the algorithm will be missing from the string.
+  if ($salt =~ /{([^}]+)}$/) {
+    $algorithm = $1;
+  }
+
+  # Wide characters cause crypt and Digest to die.
+  utf8::encode($password) if utf8::is_utf8($password);
+
+  my $crypted_password;
+  if (!$algorithm) {
+
+    # Crypt the password.
+    $crypted_password = crypt($password, $salt);
+  }
+  else {
+    my $hasher = Digest->new($algorithm);
+
+    # Newly created salts won't yet have a comma.
+    ($salt) = $salt =~ /^([^,]+),?/;
+    $hasher->add($password, $salt);
+    $crypted_password = $salt . ',' . $hasher->b64digest . "{$algorithm}";
+  }
+
+  # Return the crypted password.
+  return $crypted_password;
 }
 
 # If you want to understand the security of strings generated by this
@@ -663,185 +750,197 @@ sub bz_crypt {
 # by the number of characters you generate, and that gets you the equivalent
 # strength of the string in bits.
 sub generate_random_password {
-    my $size = shift || 10; # default to 10 chars if nothing specified
-    return join("", map{ ('0'..'9','a'..'z','A'..'Z')[irand 62] } (1..$size));
+  my $size = shift || 10;    # default to 10 chars if nothing specified
+  return
+    join("", map { ('0' .. '9', 'a' .. 'z', 'A' .. 'Z')[irand 62] } (1 .. $size));
 }
 
 sub validate_email_syntax {
-    my ($addr) = @_;
-    my $match = Bugzilla->params->{'emailregexp'};
-    my $email = $addr . Bugzilla->params->{'emailsuffix'};
-    # This regexp follows RFC 2822 section 3.4.1.
-    my $addr_spec = $Email::Address::addr_spec;
-    # RFC 2822 section 2.1 specifies that email addresses must
-    # be made of US-ASCII characters only.
-    # Email::Address::addr_spec doesn't enforce this.
-    my $ret = ($addr =~ /$match/ && $email !~ /\P{ASCII}/ && $email =~ /^$addr_spec$/);
-    if ($ret) {
-        # We assume these checks to suffice to consider the address untainted.
-        trick_taint($_[0]);
-    }
-    return $ret ? 1 : 0;
+  my ($email) = @_;
+  my $match = Bugzilla->params->{'emailregexp'};
+
+  # This regexp follows RFC 2822 section 3.4.1.
+  my $addr_spec = $Email::Address::addr_spec;
+
+  # RFC 2822 section 2.1 specifies that email addresses must
+  # be made of US-ASCII characters only.
+  # Email::Address::addr_spec doesn't enforce this.
+  # We set the max length to 127 to ensure addresses aren't truncated when
+  # inserted into the tokens.eventdata field.
+  if ( $email =~ /$match/
+    && $email !~ /\P{ASCII}/
+    && $email =~ /^$addr_spec$/
+    && length($email) <= 127)
+  {
+    # We assume these checks to suffice to consider the address untainted.
+    trick_taint($_[0]);
+    return 1;
+  }
+  return 0;
 }
 
 sub check_email_syntax {
-    my ($addr) = @_;
+  my ($email) = @_;
 
-    unless (validate_email_syntax(@_)) {
-        my $email = $addr . Bugzilla->params->{'emailsuffix'};
-        ThrowUserError('illegal_email_address', { addr => $email });
-    }
+  unless (validate_email_syntax(@_)) {
+    ThrowUserError('illegal_email_address', {email => $email});
+  }
 }
 
 sub validate_date {
-    my ($date) = @_;
-    my $date2;
-
-    # $ts is undefined if the parser fails.
-    my $ts = str2time($date);
-    if ($ts) {
-        $date2 = time2str("%Y-%m-%d", $ts);
-
-        $date =~ s/(\d+)-0*(\d+?)-0*(\d+?)/$1-$2-$3/; 
-        $date2 =~ s/(\d+)-0*(\d+?)-0*(\d+?)/$1-$2-$3/;
-    }
-    my $ret = ($ts && $date eq $date2);
-    return $ret ? 1 : 0;
+  my ($date) = @_;
+  my $date2;
+
+  # $ts is undefined if the parser fails.
+  my $ts = str2time($date);
+  if ($ts) {
+    $date2 = time2str("%Y-%m-%d", $ts);
+
+    $date =~ s/(\d+)-0*(\d+?)-0*(\d+?)/$1-$2-$3/a;
+    $date2 =~ s/(\d+)-0*(\d+?)-0*(\d+?)/$1-$2-$3/a;
+  }
+  my $ret = ($ts && $date eq $date2);
+  return $ret ? 1 : 0;
 }
 
 sub validate_time {
-    my ($time) = @_;
-    my $time2;
-
-    # $ts is undefined if the parser fails.
-    my $ts = str2time($time);
-    if ($ts) {
-        $time2 = time2str("%H:%M:%S", $ts);
-        if ($time =~ /^(\d{1,2}):(\d\d)(?::(\d\d))?$/) {
-            $time = sprintf("%02d:%02d:%02d", $1, $2, $3 || 0);
-        }
+  my ($time) = @_;
+  my $time2;
+
+  # $ts is undefined if the parser fails.
+  my $ts = str2time($time);
+  if ($ts) {
+    $time2 = time2str("%H:%M:%S", $ts);
+    if ($time =~ /^(\d{1,2}):(\d\d)(?::(\d\d))?$/) {
+      $time = sprintf("%02d:%02d:%02d", $1, $2, $3 || 0);
     }
-    my $ret = ($ts && $time eq $time2);
-    return $ret ? 1 : 0;
+  }
+  my $ret = ($ts && $time eq $time2);
+  return $ret ? 1 : 0;
 }
 
 sub is_7bit_clean {
-    return $_[0] !~ /[^\x20-\x7E\x0A\x0D]/;
+  return $_[0] !~ /[^\x20-\x7E\x0A\x0D]/;
 }
 
 sub clean_text {
-    my $dtext = shift;
-    if ($dtext) {
-        # change control characters into a space
-        $dtext =~ s/[\x00-\x1F\x7F]+/ /g;
-    }
-    return trim($dtext);
+  my $dtext = shift;
+  if ($dtext) {
+
+    # change control characters into a space
+    $dtext =~ s/[\x00-\x1F\x7F]+/ /g;
+  }
+  return trim($dtext);
 }
 
 sub on_main_db (&) {
-    my $code = shift;
-    my $original_dbh = Bugzilla->dbh;
-    Bugzilla->request_cache->{dbh} = Bugzilla->dbh_main;
-    $code->();
-    Bugzilla->request_cache->{dbh} = $original_dbh;
+  my $code         = shift;
+  my $original_dbh = Bugzilla->dbh;
+  Bugzilla->request_cache->{dbh} = Bugzilla->dbh_main;
+  $code->();
+  Bugzilla->request_cache->{dbh} = $original_dbh;
 }
 
 sub get_text {
-    my ($name, $vars) = @_;
-    my $template = Bugzilla->template_inner;
-    $vars ||= {};
-    $vars->{'message'} = $name;
-    my $message;
-    $template->process('global/message.txt.tmpl', $vars, \$message)
-      || ThrowTemplateError($template->error());
-
-    # Remove the indenting that exists in messages.html.tmpl.
-    $message =~ s/^    //gm;
-    return $message;
+  my ($name, $vars) = @_;
+  my $template = Bugzilla->template_inner;
+  $vars ||= {};
+  $vars->{'message'} = $name;
+  my $message;
+  $template->process('global/message.txt.tmpl', $vars, \$message)
+    || ThrowTemplateError($template->error());
+
+  # Remove the indenting that exists in messages.html.tmpl.
+  $message =~ s/^    //gm;
+  return $message;
 }
 
 sub template_var {
-    my $name = shift;
-    my $request_cache = Bugzilla->request_cache;
-    my $cache = $request_cache->{util_template_var} ||= {};
-    my $lang = $request_cache->{template_current_lang}->[0] || '';
-    return $cache->{$lang}->{$name} if defined $cache->{$lang};
-
-    my $template = Bugzilla->template_inner($lang);
-    my %vars;
-    # Note: If we suddenly start needing a lot of template_var variables,
-    # they should move into their own template, not field-descs.
-    $template->process('global/field-descs.none.tmpl',
-                       { vars => \%vars, in_template_var => 1 })
-      || ThrowTemplateError($template->error());
-
-    $cache->{$lang} = \%vars;
-    return $vars{$name};
+  my $name          = shift;
+  my $request_cache = Bugzilla->request_cache;
+  my $cache         = $request_cache->{util_template_var} ||= {};
+  my $lang          = $request_cache->{template_current_lang}->[0] || '';
+  return $cache->{$lang}->{$name} if defined $cache->{$lang};
+
+  my $template = Bugzilla->template_inner($lang);
+  my %vars;
+
+  # Note: If we suddenly start needing a lot of template_var variables,
+  # they should move into their own template, not field-descs.
+  $template->process('global/field-descs.none.tmpl',
+    {vars => \%vars, in_template_var => 1})
+    || ThrowTemplateError($template->error());
+
+  $cache->{$lang} = \%vars;
+  return $vars{$name};
 }
 
 sub display_value {
-    my ($field, $value) = @_;
-    return template_var('value_descs')->{$field}->{$value} // $value;
+  my ($field, $value) = @_;
+  return template_var('value_descs')->{$field}->{$value} // $value;
 }
 
 sub disable_utf8 {
-    if (Bugzilla->params->{'utf8'}) {
-        binmode STDOUT, ':bytes'; # Turn off UTF8 encoding.
-    }
+
+  # Turn off UTF8 encoding.
+  binmode STDOUT, ':bytes';
 }
 
 use constant UTF8_ACCIDENTAL => qw(shiftjis big5-eten euc-kr euc-jp);
 
 sub detect_encoding {
-    my $data = shift;
-
-    Bugzilla->feature('detect_charset')
-      || ThrowUserError('feature_disabled', { feature => 'detect_charset' });
-
-    require Encode::Detect::Detector;
-    import Encode::Detect::Detector 'detect';
-
-    my $encoding = detect($data);
-    $encoding = resolve_alias($encoding) if $encoding;
-
-    # Encode::Detect is bad at detecting certain charsets, but Encode::Guess
-    # is better at them. Here's the details:
-
-    # shiftjis, big5-eten, euc-kr, and euc-jp: (Encode::Detect
-    # tends to accidentally mis-detect UTF-8 strings as being
-    # these encodings.)
-    if ($encoding && grep($_ eq $encoding, UTF8_ACCIDENTAL)) {
-        $encoding = undef;
-        my $decoder = guess_encoding($data, UTF8_ACCIDENTAL);
-        $encoding = $decoder->name if ref $decoder;
-    }
-
-    # Encode::Detect sometimes mis-detects various ISO encodings as iso-8859-8,
-    # or cp1255, but Encode::Guess can usually tell which one it is.
-    if ($encoding && ($encoding eq 'iso-8859-8' || $encoding eq 'cp1255')) {
-        my $decoded_as = _guess_iso($data, 'iso-8859-8', 
-            # These are ordered this way because it gives the most 
-            # accurate results.
-            qw(cp1252 iso-8859-7 iso-8859-2));
-        $encoding = $decoded_as if $decoded_as;
-    }
+  my $data = shift;
+
+  Bugzilla->feature('detect_charset')
+    || ThrowUserError('feature_disabled', {feature => 'detect_charset'});
+
+  require Encode::Detect::Detector;
+  import Encode::Detect::Detector 'detect';
+
+  my $encoding = detect($data);
+  $encoding = resolve_alias($encoding) if $encoding;
+
+  # Encode::Detect is bad at detecting certain charsets, but Encode::Guess
+  # is better at them. Here's the details:
+
+  # shiftjis, big5-eten, euc-kr, and euc-jp: (Encode::Detect
+  # tends to accidentally mis-detect UTF-8 strings as being
+  # these encodings.)
+  if ($encoding && grep($_ eq $encoding, UTF8_ACCIDENTAL)) {
+    $encoding = undef;
+    my $decoder = guess_encoding($data, UTF8_ACCIDENTAL);
+    $encoding = $decoder->name if ref $decoder;
+  }
+
+  # Encode::Detect sometimes mis-detects various ISO encodings as iso-8859-8,
+  # or cp1255, but Encode::Guess can usually tell which one it is.
+  if ($encoding && ($encoding eq 'iso-8859-8' || $encoding eq 'cp1255')) {
+    my $decoded_as = _guess_iso(
+      $data, 'iso-8859-8',
+
+      # These are ordered this way because it gives the most
+      # accurate results.
+      qw(cp1252 iso-8859-7 iso-8859-2)
+    );
+    $encoding = $decoded_as if $decoded_as;
+  }
 
-    return $encoding;
+  return $encoding;
 }
 
 # A helper for detect_encoding.
 sub _guess_iso {
-    my ($data, $versus, @isos) = (shift, shift, shift);
-
-    my $encoding;
-    foreach my $iso (@isos) {
-        my $decoder = guess_encoding($data, ($iso, $versus));
-        if (ref $decoder) {
-            $encoding = $decoder->name if ref $decoder;
-            last;
-        }
+  my ($data, $versus, @isos) = (shift, shift, shift);
+
+  my $encoding;
+  foreach my $iso (@isos) {
+    my $decoder = guess_encoding($data, ($iso, $versus));
+    if (ref $decoder) {
+      $encoding = $decoder->name if ref $decoder;
+      last;
     }
-    return $encoding;
+  }
+  return $encoding;
 }
 
 1;
@@ -1246,4 +1345,10 @@ if Bugzilla is currently using the shadowdb or not. Used like:
 
 =item display_value
 
+=item wrap_cite
+
+=item read_text
+
+=item write_text
+
 =back
diff --git a/Bugzilla/Version.pm b/Bugzilla/Version.pm
index 4b332ff2bc..143475c494 100644
--- a/Bugzilla/Version.pm
+++ b/Bugzilla/Version.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Version;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -26,134 +26,131 @@ use Scalar::Util qw(blessed);
 
 use constant DEFAULT_VERSION => 'unspecified';
 
-use constant DB_TABLE => 'versions';
+use constant DB_TABLE   => 'versions';
 use constant NAME_FIELD => 'value';
+
 # This is "id" because it has to be filled in and id is probably the fastest.
 # We do a custom sort in new_from_list below.
 use constant LIST_ORDER => 'id';
 
 use constant DB_COLUMNS => qw(
-    id
-    value
-    product_id
-    isactive
+  id
+  value
+  product_id
+  isactive
 );
 
-use constant REQUIRED_FIELD_MAP => {
-    product_id => 'product',
-};
+use constant REQUIRED_FIELD_MAP => {product_id => 'product',};
 
 use constant UPDATE_COLUMNS => qw(
-    value
-    isactive
+  value
+  isactive
 );
 
 use constant VALIDATORS => {
-    product  => \&_check_product,
-    value    => \&_check_value,
-    isactive => \&Bugzilla::Object::check_boolean,
+  product  => \&_check_product,
+  value    => \&_check_value,
+  isactive => \&Bugzilla::Object::check_boolean,
 };
 
-use constant VALIDATOR_DEPENDENCIES => {
-    value => ['product'],
-};
+use constant VALIDATOR_DEPENDENCIES => {value => ['product'],};
 
 ################################
 # Methods
 ################################
 
 sub new {
-    my $class = shift;
-    my $param = shift;
-    my $dbh = Bugzilla->dbh;
-
-    my $product;
-    if (ref $param and !defined $param->{id}) {
-        $product = $param->{product};
-        my $name = $param->{name};
-        if (!defined $product) {
-            ThrowCodeError('bad_arg',
-                {argument => 'product',
-                 function => "${class}::new"});
-        }
-        if (!defined $name) {
-            ThrowCodeError('bad_arg',
-                {argument => 'name',
-                 function => "${class}::new"});
-        }
-
-        my $condition = 'product_id = ? AND value = ?';
-        my @values = ($product->id, $name);
-        $param = { condition => $condition, values => \@values };
+  my $class = shift;
+  my $param = shift;
+  my $dbh   = Bugzilla->dbh;
+
+  my $product;
+  if (ref $param and !defined $param->{id}) {
+    $product = $param->{product};
+    my $name = $param->{name};
+    if (!defined $product) {
+      ThrowCodeError('bad_arg', {argument => 'product', function => "${class}::new"});
+    }
+    if (!defined $name) {
+      ThrowCodeError('bad_arg', {argument => 'name', function => "${class}::new"});
     }
 
-    unshift @_, $param;
-    return $class->SUPER::new(@_);
+    my $condition = 'product_id = ? AND value = ?';
+    my @values = ($product->id, $name);
+    $param = {condition => $condition, values => \@values};
+  }
+
+  unshift @_, $param;
+  return $class->SUPER::new(@_);
 }
 
 sub new_from_list {
-    my $self = shift;
-    my $list = $self->SUPER::new_from_list(@_);
-    return [sort { vers_cmp(lc($a->name), lc($b->name)) } @$list];
+  my $self = shift;
+  my $list = $self->SUPER::new_from_list(@_);
+  return [sort { vers_cmp(lc($a->name), lc($b->name)) } @$list];
 }
 
 sub run_create_validators {
-    my $class  = shift;
-    my $params = $class->SUPER::run_create_validators(@_);
-    my $product = delete $params->{product};
-    $params->{product_id} = $product->id;
-    return $params;
+  my $class   = shift;
+  my $params  = $class->SUPER::run_create_validators(@_);
+  my $product = delete $params->{product};
+  $params->{product_id} = $product->id;
+  return $params;
 }
 
 sub bug_count {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    if (!defined $self->{'bug_count'}) {
-        $self->{'bug_count'} = $dbh->selectrow_array(qq{
+  if (!defined $self->{'bug_count'}) {
+    $self->{'bug_count'} = $dbh->selectrow_array(
+      qq{
             SELECT COUNT(*) FROM bugs
             WHERE product_id = ? AND version = ?}, undef,
-            ($self->product_id, $self->name)) || 0;
-    }
-    return $self->{'bug_count'};
+      ($self->product_id, $self->name)
+    ) || 0;
+  }
+  return $self->{'bug_count'};
 }
 
 sub update {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
-
-    $dbh->bz_start_transaction();
-    my ($changes, $old_self) = $self->SUPER::update(@_);
-
-    if (exists $changes->{value}) {
-        $dbh->do('UPDATE bugs SET version = ?
-                  WHERE version = ? AND product_id = ?',
-                  undef, ($self->name, $old_self->name, $self->product_id));
-    }
-    $dbh->bz_commit_transaction();
-
-    return $changes;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
+
+  $dbh->bz_start_transaction();
+  my ($changes, $old_self) = $self->SUPER::update(@_);
+
+  if (exists $changes->{value}) {
+    $dbh->do(
+      'UPDATE bugs SET version = ?
+                  WHERE version = ? AND product_id = ?', undef,
+      ($self->name, $old_self->name, $self->product_id)
+    );
+  }
+  $dbh->bz_commit_transaction();
+
+  return $changes;
 }
 
 sub remove_from_db {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    # Products must have at least one version.
-    if (scalar(@{$self->product->versions}) == 1) {
-        ThrowUserError('version_is_last', { version => $self });
-    }
+  # Products must have at least one version.
+  if (scalar(@{$self->product->versions}) == 1) {
+    ThrowUserError('version_is_last', {version => $self});
+  }
 
-    # The version cannot be removed if there are bugs
-    # associated with it.
-    if ($self->bug_count) {
-        ThrowUserError("version_has_bugs", { nb => $self->bug_count });
-    }
-    $self->SUPER::remove_from_db();
+  # The version cannot be removed if there are bugs
+  # associated with it.
+  if ($self->bug_count) {
+    ThrowUserError("version_has_bugs", {nb => $self->bug_count});
+  }
+  $self->SUPER::remove_from_db();
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 }
 
 ###############################
@@ -161,45 +158,48 @@ sub remove_from_db {
 ###############################
 
 sub product_id { return $_[0]->{'product_id'}; }
-sub is_active  { return $_[0]->{'isactive'};   }
+sub is_active  { return $_[0]->{'isactive'}; }
 
 sub product {
-    my $self = shift;
+  my $self = shift;
 
-    require Bugzilla::Product;
-    $self->{'product'} ||= new Bugzilla::Product($self->product_id);
-    return $self->{'product'};
+  require Bugzilla::Product;
+  $self->{'product'}
+    ||= Bugzilla::Product->new({id => $self->product_id, cache => 1});
+  return $self->{'product'};
 }
 
 ################################
 # Validators
 ################################
 
-sub set_value    { $_[0]->set('value', $_[1]);    }
+sub set_value    { $_[0]->set('value',    $_[1]); }
 sub set_isactive { $_[0]->set('isactive', $_[1]); }
 
 sub _check_value {
-    my ($invocant, $name, undef, $params) = @_;
-    my $product = blessed($invocant) ? $invocant->product : $params->{product};
-
-    $name = trim($name);
-    $name || ThrowUserError('version_blank_name');
-    # Remove unprintable characters
-    $name = clean_text($name);
-
-    my $version = new Bugzilla::Version({ product => $product, name => $name });
-    if ($version && (!ref $invocant || $version->id != $invocant->id)) {
-        ThrowUserError('version_already_exists', { name    => $version->name,
-                                                   product => $product->name });
-    }
-    return $name;
+  my ($invocant, $name, undef, $params) = @_;
+  my $product = blessed($invocant) ? $invocant->product : $params->{product};
+
+  $name = trim($name);
+  $name || ThrowUserError('version_blank_name');
+
+  # Remove unprintable characters
+  $name = clean_text($name);
+
+  my $version = new Bugzilla::Version({product => $product, name => $name});
+  if ($version && (!ref $invocant || $version->id != $invocant->id)) {
+    ThrowUserError('version_already_exists',
+      {name => $version->name, product => $product->name});
+  }
+  return $name;
 }
 
 sub _check_product {
-    my ($invocant, $product) = @_;
-    $product || ThrowCodeError('param_required',
-                    { function => "$invocant->create", param => 'product' });
-    return Bugzilla->user->check_can_admin_product($product->name);
+  my ($invocant, $product) = @_;
+  $product
+    || ThrowCodeError('param_required',
+    {function => "$invocant->create", param => 'product'});
+  return Bugzilla->user->check_can_admin_product($product->name);
 }
 
 ###############################
@@ -209,44 +209,52 @@ sub _check_product {
 # This is taken straight from Sort::Versions 1.5, which is not included
 # with perl by default.
 sub vers_cmp {
-    my ($a, $b) = @_;
-
-    # Remove leading zeroes - Bug 344661
-    $a =~ s/^0*(\d.+)/$1/;
-    $b =~ s/^0*(\d.+)/$1/;
-
-    my @A = ($a =~ /([-.]|\d+|[^-.\d]+)/g);
-    my @B = ($b =~ /([-.]|\d+|[^-.\d]+)/g);
-
-    my ($A, $B);
-    while (@A and @B) {
-        $A = shift @A;
-        $B = shift @B;
-        if ($A eq '-' and $B eq '-') {
-            next;
-        } elsif ( $A eq '-' ) {
-            return -1;
-        } elsif ( $B eq '-') {
-            return 1;
-        } elsif ($A eq '.' and $B eq '.') {
-            next;
-        } elsif ( $A eq '.' ) {
-            return -1;
-        } elsif ( $B eq '.' ) {
-            return 1;
-        } elsif ($A =~ /^\d+$/ and $B =~ /^\d+$/) {
-            if ($A =~ /^0/ || $B =~ /^0/) {
-                return $A cmp $B if $A cmp $B;
-            } else {
-                return $A <=> $B if $A <=> $B;
-            }
-        } else {
-            $A = uc $A;
-            $B = uc $B;
-            return $A cmp $B if $A cmp $B;
-        }
+  my ($a, $b) = @_;
+
+  # Remove leading zeroes - Bug 344661
+  $a =~ s/^0*(\d.+)/$1/;
+  $b =~ s/^0*(\d.+)/$1/;
+
+  my @A = ($a =~ /([-.]|\d+|[^-.\d]+)/g);
+  my @B = ($b =~ /([-.]|\d+|[^-.\d]+)/g);
+
+  my ($A, $B);
+  while (@A and @B) {
+    $A = shift @A;
+    $B = shift @B;
+    if ($A eq '-' and $B eq '-') {
+      next;
+    }
+    elsif ($A eq '-') {
+      return -1;
+    }
+    elsif ($B eq '-') {
+      return 1;
+    }
+    elsif ($A eq '.' and $B eq '.') {
+      next;
+    }
+    elsif ($A eq '.') {
+      return -1;
+    }
+    elsif ($B eq '.') {
+      return 1;
+    }
+    elsif ($A =~ /^\d+$/ and $B =~ /^\d+$/) {
+      if ($A =~ /^0/ || $B =~ /^0/) {
+        return $A cmp $B if $A cmp $B;
+      }
+      else {
+        return $A <=> $B if $A <=> $B;
+      }
+    }
+    else {
+      $A = uc $A;
+      $B = uc $B;
+      return $A cmp $B if $A cmp $B;
     }
-    return @A <=> @B;
+  }
+  return @A <=> @B;
 }
 
 1;
diff --git a/Bugzilla/WebService.pm b/Bugzilla/WebService.pm
index 1bdeb49d1f..16bc86e615 100644
--- a/Bugzilla/WebService.pm
+++ b/Bugzilla/WebService.pm
@@ -5,11 +5,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-# This is the base class for $self in WebService method calls. For the 
+# This is the base class for $self in WebService method calls. For the
 # actual RPC server, see Bugzilla::WebService::Server and its subclasses.
 package Bugzilla::WebService;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,19 +17,24 @@ use Bugzilla::WebService::Server;
 
 # Used by the JSON-RPC server to convert incoming date fields apprpriately.
 use constant DATE_FIELDS => {};
+
 # Used by the JSON-RPC server to convert incoming base64 fields appropriately.
 use constant BASE64_FIELDS => {};
 
 # For some methods, we shouldn't call Bugzilla->login before we call them
-use constant LOGIN_EXEMPT => { };
+use constant LOGIN_EXEMPT => {};
 
 # Used to allow methods to be called in the JSON-RPC WebService via GET.
 # Methods that can modify data MUST not be listed here.
 use constant READ_ONLY => ();
 
+# Whitelist of methods that a client is allowed to access when making
+# an API call.
+use constant PUBLIC_METHODS => ();
+
 sub login_exempt {
-    my ($class, $method) = @_;
-    return $class->LOGIN_EXEMPT->{$method};
+  my ($class, $method) = @_;
+  return $class->LOGIN_EXEMPT->{$method};
 }
 
 1;
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index f50bb6aee3..f128d3949b 100644
--- a/Bugzilla/WebService/Bug.pm
+++ b/Bugzilla/WebService/Bug.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Bug;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -19,7 +19,8 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Field;
 use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(extract_flags filter filter_wants validate translate);
+use Bugzilla::WebService::Util
+  qw(extract_flags filter filter_wants validate translate);
 use Bugzilla::Bug;
 use Bugzilla::BugMail;
 use Bugzilla::Util qw(trick_taint trim diff_arrays detaint_natural);
@@ -43,1148 +44,1252 @@ use Storable qw(dclone);
 use constant PRODUCT_SPECIFIC_FIELDS => qw(version target_milestone component);
 
 use constant DATE_FIELDS => {
-    comments => ['new_since'],
-    history  => ['new_since'],
-    search   => ['last_change_time', 'creation_time'],
+  comments => ['new_since'],
+  history  => ['new_since'],
+  search   => ['last_change_time', 'creation_time'],
 };
 
-use constant BASE64_FIELDS => {
-    add_attachment => ['data'],
-};
+use constant BASE64_FIELDS => {add_attachment => ['data'],};
 
 use constant READ_ONLY => qw(
-    attachments
-    comments
-    fields
-    get
-    history
-    legal_values
-    search
+  attachments
+  comments
+  fields
+  get
+  history
+  legal_values
+  search
 );
 
-use constant ATTACHMENT_MAPPED_SETTERS => {
-    file_name => 'filename',
-    summary   => 'description',
-};
+use constant PUBLIC_METHODS => qw(
+  add_attachment
+  add_comment
+  attachments
+  comments
+  create
+  fields
+  get
+  history
+  legal_values
+  possible_duplicates
+  render_comment
+  search
+  search_comment_tags
+  update
+  update_attachment
+  update_comment_tags
+  update_see_also
+  update_tags
+);
+
+use constant ATTACHMENT_MAPPED_SETTERS =>
+  {file_name => 'filename', summary => 'description',};
 
 use constant ATTACHMENT_MAPPED_RETURNS => {
-    description => 'summary',
-    ispatch     => 'is_patch',
-    isprivate   => 'is_private',
-    isobsolete  => 'is_obsolete',
-    filename    => 'file_name',
-    mimetype    => 'content_type',
+  description => 'summary',
+  ispatch     => 'is_patch',
+  isprivate   => 'is_private',
+  isobsolete  => 'is_obsolete',
+  filename    => 'file_name',
+  mimetype    => 'content_type',
 };
 
-######################################################
-# Add aliases here for old method name compatibility #
-######################################################
-
-BEGIN { 
-  # In 3.0, get was called get_bugs
-  *get_bugs = \&get;
-  # Before 3.4rc1, "history" was get_history.
-  *get_history = \&history;
-}
-
 ###########
 # Methods #
 ###########
 
 sub fields {
-    my ($self, $params) = validate(@_, 'ids', 'names');
+  my ($self, $params) = validate(@_, 'ids', 'names');
 
-    Bugzilla->switch_to_shadow_db();
+  Bugzilla->switch_to_shadow_db();
 
-    my @fields;
-    if (defined $params->{ids}) {
-        my $ids = $params->{ids};
-        foreach my $id (@$ids) {
-            my $loop_field = Bugzilla::Field->check({ id => $id });
-            push(@fields, $loop_field);
-        }
+  my @fields;
+  if (defined $params->{ids}) {
+    my $ids = $params->{ids};
+    foreach my $id (@$ids) {
+      my $loop_field = Bugzilla::Field->check({id => $id});
+      push(@fields, $loop_field);
     }
-
-    if (defined $params->{names}) {
-        my $names = $params->{names};
-        foreach my $field_name (@$names) {
-            my $loop_field = Bugzilla::Field->check($field_name);
-            # Don't push in duplicate fields if we also asked for this field
-            # in "ids".
-            if (!grep($_->id == $loop_field->id, @fields)) {
-                push(@fields, $loop_field);
-            }
-        }
+  }
+
+  if (defined $params->{names}) {
+    my $names = $params->{names};
+    foreach my $field_name (@$names) {
+      my $loop_field = Bugzilla::Field->check($field_name);
+
+      # Don't push in duplicate fields if we also asked for this field
+      # in "ids".
+      if (!grep($_->id == $loop_field->id, @fields)) {
+        push(@fields, $loop_field);
+      }
     }
-
-    if (!defined $params->{ids} and !defined $params->{names}) {
-        @fields = @{ Bugzilla->fields({ obsolete => 0 }) };
+  }
+
+  if (!defined $params->{ids} and !defined $params->{names}) {
+    @fields = @{Bugzilla->fields({obsolete => 0})};
+  }
+
+  my @fields_out;
+  foreach my $field (@fields) {
+    my $visibility_field
+      = $field->visibility_field ? $field->visibility_field->name : undef;
+    my $vis_values = $field->visibility_values;
+    my $value_field = $field->value_field ? $field->value_field->name : undef;
+
+    my (@values, $has_values);
+    if ( ($field->is_select and $field->name ne 'product')
+      or grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)
+      or $field->name eq 'keywords')
+    {
+      $has_values = 1;
+      @values = @{$self->_legal_field_values({field => $field})};
     }
 
-    my @fields_out;
-    foreach my $field (@fields) {
-        my $visibility_field = $field->visibility_field
-                               ? $field->visibility_field->name : undef;
-        my $vis_values = $field->visibility_values;
-        my $value_field = $field->value_field
-                          ? $field->value_field->name : undef;
-
-        my (@values, $has_values);
-        if ( ($field->is_select and $field->name ne 'product')
-             or grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)
-             or $field->name eq 'keywords')
-        {
-             $has_values = 1;
-             @values = @{ $self->_legal_field_values({ field => $field }) };
-        } 
-
-        if (grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)) {
-             $value_field = 'product';
-        }
+    if (grep($_ eq $field->name, PRODUCT_SPECIFIC_FIELDS)) {
+      $value_field = 'product';
+    }
 
-        my %field_data = (
-           id                => $self->type('int', $field->id),
-           type              => $self->type('int', $field->type),
-           is_custom         => $self->type('boolean', $field->custom),
-           name              => $self->type('string', $field->name),
-           display_name      => $self->type('string', $field->description),
-           is_mandatory      => $self->type('boolean', $field->is_mandatory),
-           is_on_bug_entry   => $self->type('boolean', $field->enter_bug),
-           visibility_field  => $self->type('string', $visibility_field),
-           visibility_values =>
-              [ map { $self->type('string', $_->name) } @$vis_values ],
-        );
-        if ($has_values) {
-           $field_data{value_field} = $self->type('string', $value_field);
-           $field_data{values}      = \@values;
-        };
-        push(@fields_out, filter $params, \%field_data);
+    my %field_data = (
+      id               => $self->type('int',     $field->id),
+      type             => $self->type('int',     $field->type),
+      is_custom        => $self->type('boolean', $field->custom),
+      name             => $self->type('string',  $field->name),
+      display_name     => $self->type('string',  $field->description),
+      is_mandatory     => $self->type('boolean', $field->is_mandatory),
+      is_on_bug_entry  => $self->type('boolean', $field->enter_bug),
+      visibility_field => $self->type('string',  $visibility_field),
+      visibility_values => [map { $self->type('string', $_->name) } @$vis_values],
+    );
+    if ($has_values) {
+      $field_data{value_field} = $self->type('string', $value_field);
+      $field_data{values} = \@values;
     }
+    push(@fields_out, filter $params, \%field_data);
+  }
 
-    return { fields => \@fields_out };
+  return {fields => \@fields_out};
 }
 
 sub _legal_field_values {
-    my ($self, $params) = @_;
-    my $field = $params->{field};
-    my $field_name = $field->name;
-    my $user = Bugzilla->user;
-
-    my @result;
-    if (grep($_ eq $field_name, PRODUCT_SPECIFIC_FIELDS)) {
-        my @list;
-        if ($field_name eq 'version') {
-            @list = Bugzilla::Version->get_all;
-        }
-        elsif ($field_name eq 'component') {
-            @list = Bugzilla::Component->get_all;
-        }
-        else {
-            @list = Bugzilla::Milestone->get_all;
-        }
+  my ($self, $params) = @_;
+  my $field      = $params->{field};
+  my $field_name = $field->name;
+  my $user       = Bugzilla->user;
+
+  my @result;
+  if (grep($_ eq $field_name, PRODUCT_SPECIFIC_FIELDS)) {
+    my @list;
+    if ($field_name eq 'version') {
+      @list = Bugzilla::Version->get_all;
+    }
+    elsif ($field_name eq 'component') {
+      @list = Bugzilla::Component->get_all;
+    }
+    else {
+      @list = Bugzilla::Milestone->get_all;
+    }
 
-        foreach my $value (@list) {
-            my $sortkey = $field_name eq 'target_milestone'
-                          ? $value->sortkey : 0;
-            # XXX This is very slow for large numbers of values.
-            my $product_name = $value->product->name;
-            if ($user->can_see_product($product_name)) {
-                push(@result, {
-                    name     => $self->type('string', $value->name),
-                    sort_key => $self->type('int', $sortkey),
-                    sortkey  => $self->type('int', $sortkey), # deprecated
-                    visibility_values => [$self->type('string', $product_name)],
-                    is_active         => $self->type('boolean', $value->is_active),
-                });
-            }
-        }
+    foreach my $value (@list) {
+      my $sortkey = $field_name eq 'target_milestone' ? $value->sortkey : 0;
+
+      # XXX This is very slow for large numbers of values.
+      my $product_name = $value->product->name;
+      if ($user->can_see_product($product_name)) {
+        push(
+          @result,
+          {
+            name              => $self->type('string',  $value->name),
+            sort_key          => $self->type('int',     $sortkey),
+            sortkey           => $self->type('int',     $sortkey),            # deprecated
+            visibility_values => [$self->type('string', $product_name)],
+            is_active         => $self->type('boolean', $value->is_active),
+          }
+        );
+      }
     }
+  }
+
+  elsif ($field_name eq 'bug_status') {
+    my @status_all     = Bugzilla::Status->get_all;
+    my $initial_status = bless(
+      {
+        id            => 0,
+        name          => '',
+        is_open       => 1,
+        sortkey       => 0,
+        can_change_to => Bugzilla::Status->can_change_to
+      },
+      'Bugzilla::Status'
+    );
+    unshift(@status_all, $initial_status);
+
+    foreach my $status (@status_all) {
+      my @can_change_to;
+      foreach my $change_to (@{$status->can_change_to}) {
+
+        # There's no need to note that a status can transition
+        # to itself.
+        next if $change_to->id == $status->id;
+        my %change_to_hash = (
+          name => $self->type('string', $change_to->name),
+          comment_required =>
+            $self->type('boolean', $change_to->comment_required_on_change_from($status)),
+        );
+        push(@can_change_to, \%change_to_hash);
+      }
 
-    elsif ($field_name eq 'bug_status') {
-        my @status_all = Bugzilla::Status->get_all;
-        my $initial_status = bless({ id => 0, name => '', is_open => 1, sortkey => 0,
-                                     can_change_to => Bugzilla::Status->can_change_to },
-                                   'Bugzilla::Status');
-        unshift(@status_all, $initial_status);
-
-        foreach my $status (@status_all) {
-            my @can_change_to;
-            foreach my $change_to (@{ $status->can_change_to }) {
-                # There's no need to note that a status can transition
-                # to itself.
-                next if $change_to->id == $status->id;
-                my %change_to_hash = (
-                    name => $self->type('string', $change_to->name),
-                    comment_required => $self->type('boolean', 
-                        $change_to->comment_required_on_change_from($status)),
-                );
-                push(@can_change_to, \%change_to_hash);
-            }
-
-            push (@result, {
-               name     => $self->type('string', $status->name),
-               is_open  => $self->type('boolean', $status->is_open),
-               sort_key => $self->type('int', $status->sortkey),
-               sortkey  => $self->type('int', $status->sortkey), # deprecated
-               can_change_to => \@can_change_to,
-               visibility_values => [],
-            });
+      push(
+        @result,
+        {
+          name              => $self->type('string',  $status->name),
+          is_open           => $self->type('boolean', $status->is_open),
+          sort_key          => $self->type('int',     $status->sortkey),
+          sortkey           => $self->type('int',     $status->sortkey),    # deprecated
+          can_change_to     => \@can_change_to,
+          visibility_values => [],
         }
+      );
     }
-
-    elsif ($field_name eq 'keywords') {
-        my @legal_keywords = Bugzilla::Keyword->get_all;
-        foreach my $value (@legal_keywords) {
-            push (@result, {
-               name     => $self->type('string', $value->name),
-               description => $self->type('string', $value->description),
-            });
+  }
+
+  elsif ($field_name eq 'keywords') {
+    my @legal_keywords = Bugzilla::Keyword->get_all;
+    foreach my $value (@legal_keywords) {
+      next unless $value->is_active;
+      push(
+        @result,
+        {
+          name        => $self->type('string', $value->name),
+          description => $self->type('string', $value->description),
         }
+      );
     }
-    else {
-        my @values = Bugzilla::Field::Choice->type($field)->get_all();
-        foreach my $value (@values) {
-            my $vis_val = $value->visibility_value;
-            push(@result, {
-                name     => $self->type('string', $value->name),
-                sort_key => $self->type('int'   , $value->sortkey),
-                sortkey  => $self->type('int'   , $value->sortkey), # deprecated
-                visibility_values => [
-                    defined $vis_val ? $self->type('string', $vis_val->name) 
-                                     : ()
-                ],
-            });
+  }
+  else {
+    my @values = Bugzilla::Field::Choice->type($field)->get_all();
+    foreach my $value (@values) {
+      my $vis_val = $value->visibility_value;
+      push(
+        @result,
+        {
+          name     => $self->type('string', $value->name),
+          sort_key => $self->type('int',    $value->sortkey),
+          sortkey  => $self->type('int',    $value->sortkey),    # deprecated
+          visibility_values =>
+            [defined $vis_val ? $self->type('string', $vis_val->name) : ()],
         }
+      );
     }
+  }
 
-    return \@result;
+  return \@result;
 }
 
 sub comments {
-    my ($self, $params) = validate(@_, 'ids', 'comment_ids');
+  my ($self, $params) = validate(@_, 'ids', 'comment_ids');
 
-    if (!(defined $params->{ids} || defined $params->{comment_ids})) {
-        ThrowCodeError('params_required',
-                       { function => 'Bug.comments',
-                         params   => ['ids', 'comment_ids'] });
-    }
+  if (!(defined $params->{ids} || defined $params->{comment_ids})) {
+    ThrowCodeError('params_required',
+      {function => 'Bug.comments', params => ['ids', 'comment_ids']});
+  }
 
-    my $bug_ids = $params->{ids} || [];
-    my $comment_ids = $params->{comment_ids} || [];
-
-    my $dbh  = Bugzilla->switch_to_shadow_db();
-    my $user = Bugzilla->user;
-
-    my %bugs;
-    foreach my $bug_id (@$bug_ids) {
-        my $bug = Bugzilla::Bug->check($bug_id);
-        # We want the API to always return comments in the same order.
-   
-        my $comments = $bug->comments({ order => 'oldest_to_newest',
-                                        after => $params->{new_since} });
-        my @result;
-        foreach my $comment (@$comments) {
-            next if $comment->is_private && !$user->is_insider;
-            push(@result, $self->_translate_comment($comment, $params));
-        }
-        $bugs{$bug->id}{'comments'} = \@result;
+  my $bug_ids     = $params->{ids}         || [];
+  my $comment_ids = $params->{comment_ids} || [];
+
+  my $dbh  = Bugzilla->switch_to_shadow_db();
+  my $user = Bugzilla->user;
+
+  my %bugs;
+  foreach my $bug_id (@$bug_ids) {
+    my $bug = Bugzilla::Bug->check($bug_id);
+
+    # We want the API to always return comments in the same order.
+
+    my $comments
+      = $bug->comments({order => 'oldest_to_newest', after => $params->{new_since}
+      });
+    my @result;
+    foreach my $comment (@$comments) {
+      next if $comment->is_private && !$user->is_insider;
+      push(@result, $self->_translate_comment($comment, $params));
+    }
+    $bugs{$bug->id}{'comments'} = \@result;
+  }
+
+  my %comments;
+  if (scalar @$comment_ids) {
+    my @ids = map { trim($_) } @$comment_ids;
+    my $comment_data = Bugzilla::Comment->new_from_list(\@ids);
+
+    # See if we were passed any invalid comment ids.
+    my %got_ids = map { $_->id => 1 } @$comment_data;
+    foreach my $comment_id (@ids) {
+      if (!$got_ids{$comment_id}) {
+        ThrowUserError('comment_id_invalid', {id => $comment_id});
+      }
     }
 
-    my %comments;
-    if (scalar @$comment_ids) {
-        my @ids = map { trim($_) } @$comment_ids;
-        my $comment_data = Bugzilla::Comment->new_from_list(\@ids);
-
-        # See if we were passed any invalid comment ids.
-        my %got_ids = map { $_->id => 1 } @$comment_data;
-        foreach my $comment_id (@ids) {
-            if (!$got_ids{$comment_id}) {
-                ThrowUserError('comment_id_invalid', { id => $comment_id });
-            }
-        }
- 
-        # Now make sure that we can see all the associated bugs.
-        my %got_bug_ids = map { $_->bug_id => 1 } @$comment_data;
-        Bugzilla::Bug->check($_) foreach (keys %got_bug_ids);
-
-        foreach my $comment (@$comment_data) {
-            if ($comment->is_private && !$user->is_insider) {
-                ThrowUserError('comment_is_private', { id => $comment->id });
-            }
-            $comments{$comment->id} =
-                $self->_translate_comment($comment, $params);
-        }
+    # Now make sure that we can see all the associated bugs.
+    my %got_bug_ids = map { $_->bug_id => 1 } @$comment_data;
+    Bugzilla::Bug->check($_) foreach (keys %got_bug_ids);
+
+    foreach my $comment (@$comment_data) {
+      if ($comment->is_private && !$user->is_insider) {
+        ThrowUserError('comment_is_private', {id => $comment->id});
+      }
+      $comments{$comment->id} = $self->_translate_comment($comment, $params);
     }
+  }
 
-    return { bugs => \%bugs, comments => \%comments };
+  return {bugs => \%bugs, comments => \%comments};
 }
 
 sub render_comment {
-    my ($self, $params) = @_;
+  my ($self, $params) = @_;
 
-    unless (defined $params->{text}) {
-        ThrowCodeError('params_required',
-                       { function => 'Bug.render_comment',
-                         params   => ['text'] });
-    }
-
-    Bugzilla->switch_to_shadow_db();
-    my $bug = $params->{id} ? Bugzilla::Bug->check($params->{id}) : undef;
+  unless (defined $params->{text}) {
+    ThrowCodeError('params_required',
+      {function => 'Bug.render_comment', params => ['text']});
+  }
 
-    my $markdown = $params->{markdown} ? 1 : 0;
-    my $tmpl = $markdown ? '[% text FILTER markdown(bug, { is_markdown => 1 }) %]' : '[% text FILTER markdown(bug) %]';
+  Bugzilla->switch_to_shadow_db();
+  my $bug = $params->{id} ? Bugzilla::Bug->check($params->{id}) : undef;
 
-    my $html;
-    my $template = Bugzilla->template;
-    $template->process(
-        \$tmpl,
-        { bug => $bug, text => $params->{text}},
-        \$html
-    );
+  my $tmpl
+    = $params->{markdown}
+    ? '[% text FILTER markdown(bug, { is_markdown => 1 }) %]'
+    : '[% text FILTER wrap_cite FILTER markdown(bug) %]';
+  my $html;
+  my $template = Bugzilla->template;
+  $template->process(\$tmpl, {bug => $bug, text => $params->{text}}, \$html);
 
-    return { html => $html };
+  return {html => $html};
 }
 
 # Helper for Bug.comments
 sub _translate_comment {
-    my ($self, $comment, $filters, $types, $prefix) = @_;
-    my $attach_id = $comment->is_about_attachment ? $comment->extra_data
-                                                  : undef;
-
-    my $comment_hash = {
-        id            => $self->type('int', $comment->id),
-        bug_id        => $self->type('int', $comment->bug_id),
-        creator       => $self->type('email', $comment->author->login),
-        time          => $self->type('dateTime', $comment->creation_ts),
-        creation_time => $self->type('dateTime', $comment->creation_ts),
-        is_private    => $self->type('boolean', $comment->is_private),
-        is_markdown   => $self->type('boolean', $comment->is_markdown),
-        text          => $self->type('string', $comment->body_full),
-        attachment_id => $self->type('int', $attach_id),
-        count         => $self->type('int', $comment->count),
-    };
-
-    # Don't load comment tags unless enabled
-    if (Bugzilla->params->{'comment_taggers_group'}) {
-        $comment_hash->{tags} = [
-            map { $self->type('string', $_) }
-            @{ $comment->tags }
-        ];
-    }
-
-    return filter($filters, $comment_hash, $types, $prefix);
+  my ($self, $comment, $filters, $types, $prefix) = @_;
+  my $attach_id = $comment->is_about_attachment ? $comment->extra_data : undef;
+
+  my $comment_hash = {
+    id            => $self->type('int',      $comment->id),
+    bug_id        => $self->type('int',      $comment->bug_id),
+    creator       => $self->type('login',    $comment->author->login),
+    time          => $self->type('dateTime', $comment->creation_ts),
+    creation_time => $self->type('dateTime', $comment->creation_ts),
+    is_private    => $self->type('boolean',  $comment->is_private),
+    is_markdown   => $self->type('boolean',  $comment->is_markdown),
+    text          => $self->type('string',   $comment->body_full),
+    attachment_id => $self->type('int',      $attach_id),
+    count         => $self->type('int',      $comment->count),
+  };
+
+  # Don't load comment tags unless enabled
+  if (Bugzilla->params->{'comment_taggers_group'}) {
+    $comment_hash->{tags} = [map { $self->type('string', $_) } @{$comment->tags}];
+  }
+
+  return filter($filters, $comment_hash, $types, $prefix);
 }
 
 sub get {
-    my ($self, $params) = validate(@_, 'ids');
-
-    Bugzilla->switch_to_shadow_db() unless Bugzilla->user->id;
-
-    my $ids = $params->{ids};
-    defined $ids || ThrowCodeError('param_required', { param => 'ids' });
-
-    my (@bugs, @faults, @hashes);
-
-    # Cache permissions for bugs. This highly reduces the number of calls to the DB.
-    # visible_bugs() is only able to handle bug IDs, so we have to skip aliases.
-    my @int = grep { $_ =~ /^\d+$/ } @$ids;
-    Bugzilla->user->visible_bugs(\@int);
-
-    foreach my $bug_id (@$ids) {
-        my $bug;
-        if ($params->{permissive}) {
-            eval { $bug = Bugzilla::Bug->check($bug_id); };
-            if ($@) {
-                push(@faults, {id => $bug_id,
-                               faultString => $@->faultstring,
-                               faultCode => $@->faultcode,
-                              }
-                    );
-                undef $@;
-                next;
-            }
-        }
-        else {
-            $bug = Bugzilla::Bug->check($bug_id);
-        }
-        push(@bugs, $bug);
-        push(@hashes, $self->_bug_to_hash($bug, $params));
+  my ($self, $params) = validate(@_, 'ids');
+
+  Bugzilla->switch_to_shadow_db() unless Bugzilla->user->id;
+
+  my $ids = $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  my (@bugs, @faults, @hashes);
+
+  # Cache permissions for bugs. This highly reduces the number of calls to the DB.
+  # visible_bugs() is only able to handle bug IDs, so we have to skip aliases.
+  my @int = grep { $_ =~ /^\d+$/ } @$ids;
+  Bugzilla->user->visible_bugs(\@int);
+
+  foreach my $bug_id (@$ids) {
+    my $bug;
+    if ($params->{permissive}) {
+      eval { $bug = Bugzilla::Bug->check($bug_id); };
+      if ($@) {
+        push(@faults,
+          {id => $bug_id, faultString => $@->faultstring, faultCode => $@->faultcode,});
+        undef $@;
+        next;
+      }
+    }
+    else {
+      $bug = Bugzilla::Bug->check($bug_id);
     }
+    push(@bugs, $bug);
+    push(@hashes, $self->_bug_to_hash($bug, $params));
+  }
 
-    # Set the ETag before inserting the update tokens
-    # since the tokens will always be unique even if
-    # the data has not changed.
-    $self->bz_etag(\@hashes);
+  # Set the ETag before inserting the update tokens
+  # since the tokens will always be unique even if
+  # the data has not changed.
+  $self->bz_etag(\@hashes);
 
-    $self->_add_update_tokens($params, \@bugs, \@hashes);
+  $self->_add_update_tokens($params, \@bugs, \@hashes);
 
-    return { bugs => \@hashes, faults => \@faults };
+  return {bugs => \@hashes, faults => \@faults};
 }
 
-# this is a function that gets bug activity for list of bug ids 
+# this is a function that gets bug activity for list of bug ids
 # it can be called as the following:
 # $call = $rpc->call( 'Bug.history', { ids => [1,2] });
 sub history {
-    my ($self, $params) = validate(@_, 'ids');
-
-    Bugzilla->switch_to_shadow_db();
-
-    my $ids = $params->{ids};
-    defined $ids || ThrowCodeError('param_required', { param => 'ids' });
-
-    my %api_name = reverse %{ Bugzilla::Bug::FIELD_MAP() };
-    $api_name{'bug_group'} = 'groups';
-
-    my @return;
-    foreach my $bug_id (@$ids) {
-        my %item;
-        my $bug = Bugzilla::Bug->check($bug_id);
-        $bug_id = $bug->id;
-        $item{id} = $self->type('int', $bug_id);
-
-        my ($activity) = $bug->get_activity(undef, $params->{new_since});
-
-        my @history;
-        foreach my $changeset (@$activity) {
-            my %bug_history;
-            $bug_history{when} = $self->type('dateTime', $changeset->{when});
-            $bug_history{who}  = $self->type('string', $changeset->{who});
-            $bug_history{changes} = [];
-            foreach my $change (@{ $changeset->{changes} }) {
-                my $api_field = $api_name{$change->{fieldname}} || $change->{fieldname};
-                my $attach_id = delete $change->{attachid};
-                if ($attach_id) {
-                    $change->{attachment_id} = $self->type('int', $attach_id);
-                }
-                $change->{removed} = $self->type('string', $change->{removed});
-                $change->{added}   = $self->type('string', $change->{added});
-                $change->{field_name} = $self->type('string', $api_field);
-                delete $change->{fieldname};
-                push (@{$bug_history{changes}}, $change);
-            }
-            
-            push (@history, \%bug_history);
+  my ($self, $params) = validate(@_, 'ids');
+
+  Bugzilla->switch_to_shadow_db();
+
+  my $ids = $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  my %api_name = reverse %{Bugzilla::Bug::FIELD_MAP()};
+  $api_name{'bug_group'} = 'groups';
+
+  my @return;
+  foreach my $bug_id (@$ids) {
+    my %item;
+    my $bug = Bugzilla::Bug->check($bug_id);
+    $bug_id = $bug->id;
+    $item{id} = $self->type('int', $bug_id);
+
+    my ($activity) = $bug->get_activity(undef, $params->{new_since});
+
+    my @history;
+    foreach my $changeset (@$activity) {
+      my %bug_history;
+      $bug_history{when} = $self->type('dateTime', $changeset->{when});
+      $bug_history{who}  = $self->type('string',   $changeset->{who});
+      $bug_history{changes} = [];
+      foreach my $change (@{$changeset->{changes}}) {
+        my $api_field = $api_name{$change->{fieldname}} || $change->{fieldname};
+        my $attach_id = delete $change->{attachid};
+        if ($attach_id) {
+          $change->{attachment_id} = $self->type('int', $attach_id);
         }
+        $change->{removed}    = $self->type('string', $change->{removed});
+        $change->{added}      = $self->type('string', $change->{added});
+        $change->{field_name} = $self->type('string', $api_field);
+        delete $change->{fieldname};
+        push(@{$bug_history{changes}}, $change);
+      }
+
+      push(@history, \%bug_history);
+    }
 
-        $item{history} = \@history;
+    $item{history} = \@history;
 
-        # alias is returned in case users passes a mixture of ids and aliases
-        # then they get to know which bug activity relates to which value  
-        # they passed
-        $item{alias} = [ map { $self->type('string', $_) } @{ $bug->alias } ];
+    # alias is returned in case users passes a mixture of ids and aliases
+    # then they get to know which bug activity relates to which value
+    # they passed
+    $item{alias} = [map { $self->type('string', $_) } @{$bug->alias}];
 
-        push(@return, \%item);
-    }
+    push(@return, \%item);
+  }
 
-    return { bugs => \@return };
+  return {bugs => \@return};
 }
 
 sub search {
-    my ($self, $params) = @_;
-    my $user = Bugzilla->user;
-    my $dbh  = Bugzilla->dbh;
-
-    Bugzilla->switch_to_shadow_db();
+  my ($self, $params) = @_;
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
 
-    my $match_params = dclone($params);
-    delete $match_params->{include_fields};
-    delete $match_params->{exclude_fields};
+  Bugzilla->switch_to_shadow_db();
 
-    # Determine whether this is a quicksearch query
-    if (exists $match_params->{quicksearch}) {
-        my $quicksearch = quicksearch($match_params->{'quicksearch'});
-        my $cgi = Bugzilla::CGI->new($quicksearch);
-        $match_params = $cgi->Vars;
-    }
-
-    if ( defined($match_params->{offset}) and !defined($match_params->{limit}) ) {
-        ThrowCodeError('param_required',
-                       { param => 'limit', function => 'Bug.search()' });
-    }
+  my $match_params = dclone($params);
+  delete $match_params->{include_fields};
+  delete $match_params->{exclude_fields};
 
-    my $max_results = Bugzilla->params->{max_search_results};
-    unless (defined $match_params->{limit} && $match_params->{limit} == 0) {
-        if (!defined $match_params->{limit} || $match_params->{limit} > $max_results) {
-            $match_params->{limit} = $max_results;
-        }
-    }
-    else {
-        delete $match_params->{limit};
-        delete $match_params->{offset};
-    }
+  # Determine whether this is a quicksearch query
+  if (exists $match_params->{quicksearch}) {
+    my $quicksearch = quicksearch($match_params->{'quicksearch'});
+    my $cgi         = Bugzilla::CGI->new($quicksearch);
+    $match_params = $cgi->Vars;
+  }
 
-    $match_params = Bugzilla::Bug::map_fields($match_params);
-
-    my %options = ( fields => ['bug_id'] );
-
-    # Find the highest custom field id
-    my @field_ids = grep(/^f(\d+)$/, keys %$match_params);
-    my $last_field_id = @field_ids ? max @field_ids + 1 : 1;
-
-    # Do special search types for certain fields.
-    if (my $change_when = delete $match_params->{'delta_ts'}) {
-        $match_params->{"f${last_field_id}"} = 'delta_ts';
-        $match_params->{"o${last_field_id}"} = 'greaterthaneq';
-        $match_params->{"v${last_field_id}"} = $change_when;
-        $last_field_id++;
-    }
-    if (my $creation_when = delete $match_params->{'creation_ts'}) {
-        $match_params->{"f${last_field_id}"} = 'creation_ts';
-        $match_params->{"o${last_field_id}"} = 'greaterthaneq';
-        $match_params->{"v${last_field_id}"} = $creation_when;
-        $last_field_id++;
-    }
+  if (defined($match_params->{offset}) and !defined($match_params->{limit})) {
+    ThrowCodeError('param_required',
+      {param => 'limit', function => 'Bug.search()'});
+  }
 
-    # Some fields require a search type such as short desc, keywords, etc.
-    foreach my $param (qw(short_desc longdesc status_whiteboard bug_file_loc)) {
-        if (defined $match_params->{$param} && !defined $match_params->{$param . '_type'}) {
-            $match_params->{$param . '_type'} = 'allwordssubstr';
-        }
+  my $max_results = Bugzilla->params->{max_search_results};
+  unless (defined $match_params->{limit} && $match_params->{limit} == 0) {
+    if (!defined $match_params->{limit} || $match_params->{limit} > $max_results) {
+      $match_params->{limit} = $max_results;
     }
-    if (defined $match_params->{'keywords'} && !defined $match_params->{'keywords_type'}) {
-        $match_params->{'keywords_type'} = 'allwords';
+  }
+  else {
+    delete $match_params->{limit};
+    delete $match_params->{offset};
+  }
+
+  $match_params = Bugzilla::Bug::map_fields($match_params);
+
+  my %options = (fields => ['bug_id']);
+
+  # Find the highest custom field id
+  my @field_ids = grep(/^f(\d+)$/a, keys %$match_params);
+  my $last_field_id = @field_ids ? max @field_ids + 1 : 1;
+
+  # Do special search types for certain fields.
+  if (my $change_when = delete $match_params->{'delta_ts'}) {
+    $match_params->{"f${last_field_id}"} = 'delta_ts';
+    $match_params->{"o${last_field_id}"} = 'greaterthaneq';
+    $match_params->{"v${last_field_id}"} = $change_when;
+    $last_field_id++;
+  }
+  if (my $creation_when = delete $match_params->{'creation_ts'}) {
+    $match_params->{"f${last_field_id}"} = 'creation_ts';
+    $match_params->{"o${last_field_id}"} = 'greaterthaneq';
+    $match_params->{"v${last_field_id}"} = $creation_when;
+    $last_field_id++;
+  }
+
+  # Some fields require a search type such as short desc, keywords, etc.
+  foreach my $param (qw(short_desc longdesc status_whiteboard bug_file_loc)) {
+    if (defined $match_params->{$param}
+      && !defined $match_params->{$param . '_type'})
+    {
+      $match_params->{$param . '_type'} = 'allwordssubstr';
     }
-
-    # Backwards compatibility with old method regarding role search
-    $match_params->{'reporter'} = delete $match_params->{'creator'} if $match_params->{'creator'};
-    foreach my $role (qw(assigned_to reporter qa_contact longdesc cc)) {
-        next if !exists $match_params->{$role};
-        my $value = delete $match_params->{$role};
-        $match_params->{"f${last_field_id}"} = $role;
-        $match_params->{"o${last_field_id}"} = "anywordssubstr";
-        $match_params->{"v${last_field_id}"} = ref $value ? join(" ", @{$value}) : $value;
-        $last_field_id++;
+  }
+  if (defined $match_params->{'keywords'}
+    && !defined $match_params->{'keywords_type'})
+  {
+    $match_params->{'keywords_type'} = 'allwords';
+  }
+
+  # Backwards compatibility with old method regarding role search
+  $match_params->{'reporter'} = delete $match_params->{'creator'}
+    if $match_params->{'creator'};
+  foreach my $role (qw(assigned_to reporter qa_contact longdesc cc)) {
+    next if !exists $match_params->{$role};
+    my $value = delete $match_params->{$role};
+    $match_params->{"f${last_field_id}"} = $role;
+    $match_params->{"o${last_field_id}"} = "anywordssubstr";
+    $match_params->{"v${last_field_id}"}
+      = ref $value ? join(" ", @{$value}) : $value;
+    $last_field_id++;
+  }
+
+  # If no other parameters have been passed other than limit and offset
+  # then we throw error if system is configured to do so.
+  if ( !grep(!/^(limit|offset)$/, keys %$match_params)
+    && !Bugzilla->params->{search_allow_no_criteria})
+  {
+    ThrowUserError('buglist_parameters_required');
+  }
+
+  # Allow the use of order shortcuts similar to web UI
+  if ($match_params->{order}) {
+
+    # Convert the value of the "order" form field into a list of columns
+    # by which to sort the results.
+    my %order_types = (
+      "Bug Number" => ["bug_id"],
+      "Importance" => ["priority", "bug_severity"],
+      "Assignee"   => ["assigned_to", "bug_status", "priority", "bug_id"],
+      "Last Changed" =>
+        ["changeddate", "bug_status", "priority", "assigned_to", "bug_id"],
+    );
+    if ($order_types{$match_params->{order}}) {
+      $options{order} = $order_types{$match_params->{order}};
     }
-
-    # If no other parameters have been passed other than limit and offset
-    # then we throw error if system is configured to do so.
-    if (!grep(!/^(limit|offset)$/, keys %$match_params)
-        && !Bugzilla->params->{search_allow_no_criteria})
-    {
-        ThrowUserError('buglist_parameters_required');
+    else {
+      $options{order} = [split(/\s*,\s*/, $match_params->{order})];
     }
+  }
 
-    $options{order}  = [ split(/\s*,\s*/, delete $match_params->{order}) ] if $match_params->{order};
-    $options{params} = $match_params;
+  $options{params} = $match_params;
 
-    my $search = new Bugzilla::Search(%options);
-    my ($data) = $search->data;
+  my $search = new Bugzilla::Search(%options);
+  my ($data) = $search->data;
 
-    if (!scalar @$data) {
-        return { bugs => [] };
-    }
+  if (!scalar @$data) {
+    return {bugs => []};
+  }
 
-    # Search.pm won't return bugs that the user shouldn't see so no filtering is needed.
-    my @bug_ids = map { $_->[0] } @$data;
-    my %bug_objects = map { $_->id => $_ } @{ Bugzilla::Bug->new_from_list(\@bug_ids) };
-    my @bugs = map { $bug_objects{$_} } @bug_ids;
-    @bugs = map { $self->_bug_to_hash($_, $params) } @bugs;
+# Search.pm won't return bugs that the user shouldn't see so no filtering is needed.
+  my @bug_ids = map { $_->[0] } @$data;
+  my %bug_objects
+    = map { $_->id => $_ } @{Bugzilla::Bug->new_from_list(\@bug_ids)};
+  my @bugs = map { $bug_objects{$_} } @bug_ids;
+  @bugs = map { $self->_bug_to_hash($_, $params) } @bugs;
 
-    return { bugs => \@bugs };
+  return {bugs => \@bugs};
 }
 
 sub possible_duplicates {
-    my ($self, $params) = validate(@_, 'products');
-    my $user = Bugzilla->user;
-
-    Bugzilla->switch_to_shadow_db();
-
-    # Undo the array-ification that validate() does, for "summary".
-    $params->{summary} || ThrowCodeError('param_required',
-        { function => 'Bug.possible_duplicates', param => 'summary' });
-
-    my @products;
-    foreach my $name (@{ $params->{'products'} || [] }) {
-        my $object = $user->can_enter_product($name, THROW_ERROR);
-        push(@products, $object);
-    }
-
-    my $possible_dupes = Bugzilla::Bug->possible_duplicates(
-        { summary => $params->{summary}, products => \@products,
-          limit   => $params->{limit} });
-    my @hashes = map { $self->_bug_to_hash($_, $params) } @$possible_dupes;
-    $self->_add_update_tokens($params, $possible_dupes, \@hashes);
-    return { bugs => \@hashes };
+  my ($self, $params) = validate(@_, 'products');
+  my $user = Bugzilla->user;
+
+  Bugzilla->switch_to_shadow_db();
+
+  # Undo the array-ification that validate() does, for "summary".
+  $params->{summary}
+    || ThrowCodeError('param_required',
+    {function => 'Bug.possible_duplicates', param => 'summary'});
+
+  my @products;
+  foreach my $name (@{$params->{'products'} || []}) {
+    my $object = $user->can_enter_product($name, THROW_ERROR);
+    push(@products, $object);
+  }
+
+  my $possible_dupes = Bugzilla::Bug->possible_duplicates({
+    summary  => $params->{summary},
+    products => \@products,
+    limit    => $params->{limit}
+  });
+  my @hashes = map { $self->_bug_to_hash($_, $params) } @$possible_dupes;
+  $self->_add_update_tokens($params, $possible_dupes, \@hashes);
+  return {bugs => \@hashes};
 }
 
 sub update {
-    my ($self, $params) = validate(@_, 'ids');
+  my ($self, $params) = validate(@_, 'ids');
 
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    my $dbh = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  my $dbh  = Bugzilla->dbh;
 
-    # We skip certain fields because their set_ methods actually use
-    # the external names instead of the internal names.
-    $params = Bugzilla::Bug::map_fields($params, 
-        { summary => 1, platform => 1, severity => 1, url => 1 });
+  # We skip certain fields because their set_ methods actually use
+  # the external names instead of the internal names.
+  $params = Bugzilla::Bug::map_fields($params,
+    {summary => 1, platform => 1, severity => 1, url => 1});
 
-    my $ids = delete $params->{ids};
-    defined $ids || ThrowCodeError('param_required', { param => 'ids' });
+  my $ids = delete $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
 
-    my @bugs = map { Bugzilla::Bug->check_for_edit($_) } @$ids;
+  my @bugs = map { Bugzilla::Bug->check_for_edit($_) } @$ids;
 
-    my %values = %$params;
-    $values{other_bugs} = \@bugs;
+  my $minor_update = delete $params->{minor_update} ? 1 : 0;
+  my %values = %$params;
+  $values{other_bugs} = \@bugs;
 
-    if (exists $values{comment} and exists $values{comment}{comment}) {
-        $values{comment}{body} = delete $values{comment}{comment};
-    }
+  if (exists $values{comment} and exists $values{comment}{comment}) {
+    $values{comment}{body} = delete $values{comment}{comment};
+  }
 
-    # Prevent bugs that could be triggered by specifying fields that
-    # have valid "set_" functions in Bugzilla::Bug, but shouldn't be
-    # called using those field names.
-    delete $values{dependencies};
+  # Prevent bugs that could be triggered by specifying fields that
+  # have valid "set_" functions in Bugzilla::Bug, but shouldn't be
+  # called using those field names.
+  delete $values{dependencies};
 
-    # For backwards compatibility, treat alias string or array as a set action
-    if (exists $values{alias}) {
-        if (not ref $values{alias}) {
-            $values{alias} = { set => [ $values{alias} ] };
-        }
-        elsif (ref $values{alias} eq 'ARRAY') {
-            $values{alias} = { set => $values{alias} };
-        }
+  # For backwards compatibility, treat alias string or array as a set action
+  if (exists $values{alias}) {
+    if (not ref $values{alias}) {
+      $values{alias} = {set => [$values{alias}]};
     }
-
-    my $flags = delete $values{flags};
-
-    foreach my $bug (@bugs) {
-        $bug->set_all(\%values);
-        if ($flags) {
-            my ($old_flags, $new_flags) = extract_flags($flags, $bug);
-            $bug->set_flags($old_flags, $new_flags);
-        }
+    elsif (ref $values{alias} eq 'ARRAY') {
+      $values{alias} = {set => $values{alias}};
     }
+  }
 
-    my %all_changes;
-    $dbh->bz_start_transaction();
-    foreach my $bug (@bugs) {
-        $all_changes{$bug->id} = $bug->update();
-    }
-    $dbh->bz_commit_transaction();
+  my $flags = delete $values{flags};
 
-    foreach my $bug (@bugs) {
-        $bug->send_changes($all_changes{$bug->id});
+  foreach my $bug (@bugs) {
+    $bug->set_all(\%values);
+    if ($flags) {
+      my ($old_flags, $new_flags)
+        = extract_flags($flags, $bug->flag_types, $bug->flags);
+      $bug->set_flags($old_flags, $new_flags);
     }
+  }
+
+  my %all_changes;
+  my %minor_updates;
+  $dbh->bz_start_transaction();
+  foreach my $bug (@bugs) {
+    $minor_updates{$bug->id} = $bug->has_unsent_changes ? 0 : $minor_update;
+    $all_changes{$bug->id} = $bug->update();
+  }
+  $dbh->bz_commit_transaction();
+
+  foreach my $bug (@bugs) {
+    $bug->send_changes($all_changes{$bug->id}, undef, $minor_updates{$bug->id});
+  }
+
+  my %api_name = reverse %{Bugzilla::Bug::FIELD_MAP()};
+
+  # This doesn't normally belong in FIELD_MAP, but we do want to translate
+  # "bug_group" back into "groups".
+  $api_name{'bug_group'} = 'groups';
+
+  my @result;
+  foreach my $bug (@bugs) {
+    my %hash = (
+      id               => $self->type('int',      $bug->id),
+      last_change_time => $self->type('dateTime', $bug->delta_ts),
+      changes          => {},
+    );
 
-    my %api_name = reverse %{ Bugzilla::Bug::FIELD_MAP() };
-    # This doesn't normally belong in FIELD_MAP, but we do want to translate
-    # "bug_group" back into "groups".
-    $api_name{'bug_group'} = 'groups';
-
-    my @result;
-    foreach my $bug (@bugs) {
-        my %hash = (
-            id               => $self->type('int', $bug->id),
-            last_change_time => $self->type('dateTime', $bug->delta_ts),
-            changes          => {},
-        );
-
-        # alias is returned in case users pass a mixture of ids and aliases,
-        # so that they can know which set of changes relates to which value
-        # they passed.
-        $hash{alias} = [ map { $self->type('string', $_) } @{ $bug->alias } ];
-
-        my %changes = %{ $all_changes{$bug->id} };
-        foreach my $field (keys %changes) {
-            my $change = $changes{$field};
-            my $api_field = $api_name{$field} || $field;
-            # We normalize undef to an empty string, so that the API
-            # stays consistent for things like Deadline that can become
-            # empty.
-            $change->[0] = '' if !defined $change->[0];
-            $change->[1] = '' if !defined $change->[1];
-            $hash{changes}->{$api_field} = {
-                removed => $self->type('string', $change->[0]),
-                added   => $self->type('string', $change->[1]) 
-            };
-        }
-
-        push(@result, \%hash);
+    # alias is returned in case users pass a mixture of ids and aliases,
+    # so that they can know which set of changes relates to which value
+    # they passed.
+    $hash{alias} = [map { $self->type('string', $_) } @{$bug->alias}];
+
+    my %changes = %{$all_changes{$bug->id}};
+    foreach my $field (keys %changes) {
+      my $change = $changes{$field};
+      my $api_field = $api_name{$field} || $field;
+
+      # We normalize undef to an empty string, so that the API
+      # stays consistent for things like Deadline that can become
+      # empty.
+      $change->[0] = '' if !defined $change->[0];
+      $change->[1] = '' if !defined $change->[1];
+      $hash{changes}->{$api_field} = {
+        removed => $self->type('string', $change->[0]),
+        added   => $self->type('string', $change->[1])
+      };
     }
 
-    return { bugs => \@result };
+    push(@result, \%hash);
+  }
+
+  return {bugs => \@result};
 }
 
 sub create {
-    my ($self, $params) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($self, $params) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->login(LOGIN_REQUIRED);
 
-    $params = Bugzilla::Bug::map_fields($params);
+  $params = Bugzilla::Bug::map_fields($params);
 
-    my $flags = delete $params->{flags};
+  my $flags = delete $params->{flags};
 
-    # We start a nested transaction in case flag setting fails
-    # we want the bug creation to roll back as well.
-    $dbh->bz_start_transaction();
+  # Set bug flags
+  if ($flags) {
+    my $product = Bugzilla::Product->check($params->{product});
+    my $component
+      = Bugzilla::Component->check({
+      product => $product, name => $params->{component}
+      });
+    my $flag_types
+      = Bugzilla::FlagType::match({
+      product_id => $product->id, component_id => $component->id, is_active => 1,
+      });
 
-    my $bug = Bugzilla::Bug->create($params);
+    my (undef, $new_flags) = extract_flags($flags, $flag_types);
 
-    # Set bug flags
-    if ($flags) {
-        my ($flags, $new_flags) = extract_flags($flags, $bug);
-        $bug->set_flags($flags, $new_flags);
-        $bug->update($bug->creation_ts);
-    }
+    $params->{flags} = $new_flags;
+  }
+
+  # We start a nested transaction in case flag setting fails
+  # we want the bug creation to roll back as well.
+  $dbh->bz_start_transaction();
 
-    $dbh->bz_commit_transaction();
+  my $bug = Bugzilla::Bug->create($params);
 
-    $bug->send_changes();
+  $dbh->bz_commit_transaction();
 
-    return { id => $self->type('int', $bug->bug_id) };
+  $bug->send_changes();
+
+  return {id => $self->type('int', $bug->bug_id)};
 }
 
 sub legal_values {
-    my ($self, $params) = @_;
+  my ($self, $params) = @_;
 
-    Bugzilla->switch_to_shadow_db();
+  Bugzilla->switch_to_shadow_db();
 
-    defined $params->{field} 
-        or ThrowCodeError('param_required', { param => 'field' });
+  defined $params->{field}
+    or ThrowCodeError('param_required', {param => 'field'});
 
-    my $field = Bugzilla::Bug::FIELD_MAP->{$params->{field}} 
-                || $params->{field};
+  my $field = Bugzilla::Bug::FIELD_MAP->{$params->{field}} || $params->{field};
 
-    my @global_selects =
-        @{ Bugzilla->fields({ is_select => 1, is_abnormal => 0 }) };
+  my @global_selects = @{Bugzilla->fields({is_select => 1, is_abnormal => 0})};
 
-    my $values;
-    if (grep($_->name eq $field, @global_selects)) {
-        # The field is a valid one.
-        trick_taint($field);
-        $values = get_legal_field_values($field);
-    }
-    elsif (grep($_ eq $field, PRODUCT_SPECIFIC_FIELDS)) {
-        my $id = $params->{product_id};
-        defined $id || ThrowCodeError('param_required',
-            { function => 'Bug.legal_values', param => 'product_id' });
-        grep($_->id eq $id, @{Bugzilla->user->get_accessible_products})
-            || ThrowUserError('product_access_denied', { id => $id });
-
-        my $product = new Bugzilla::Product($id);
-        my @objects;
-        if ($field eq 'version') {
-            @objects = @{$product->versions};
-        }
-        elsif ($field eq 'target_milestone') {
-            @objects = @{$product->milestones};
-        }
-        elsif ($field eq 'component') {
-            @objects = @{$product->components};
-        }
+  my $values;
+  if (grep($_->name eq $field, @global_selects)) {
+
+    # The field is a valid one.
+    trick_taint($field);
+    $values = get_legal_field_values($field);
+  }
+  elsif (grep($_ eq $field, PRODUCT_SPECIFIC_FIELDS)) {
+    my $id = $params->{product_id};
+    defined $id
+      || ThrowCodeError('param_required',
+      {function => 'Bug.legal_values', param => 'product_id'});
+    grep($_->id eq $id, @{Bugzilla->user->get_accessible_products})
+      || ThrowUserError('product_access_denied', {id => $id});
 
-        $values = [map { $_->name } @objects];
+    my $product = new Bugzilla::Product($id);
+    my @objects;
+    if ($field eq 'version') {
+      @objects = @{$product->versions};
     }
-    else {
-        ThrowCodeError('invalid_field_name', { field => $params->{field} });
+    elsif ($field eq 'target_milestone') {
+      @objects = @{$product->milestones};
     }
-
-    my @result;
-    foreach my $val (@$values) {
-        push(@result, $self->type('string', $val));
+    elsif ($field eq 'component') {
+      @objects = @{$product->components};
     }
 
-    return { values => \@result };
-}
+    $values = [map { $_->name } @objects];
+  }
+  else {
+    ThrowCodeError('invalid_field_name', {field => $params->{field}});
+  }
 
-sub add_attachment {
-    my ($self, $params) = validate(@_, 'ids');
-    my $dbh = Bugzilla->dbh;
-
-    Bugzilla->login(LOGIN_REQUIRED);
-    defined $params->{ids}
-        || ThrowCodeError('param_required', { param => 'ids' });
-    defined $params->{data}
-        || ThrowCodeError('param_required', { param => 'data' });
-
-    my @bugs = map { Bugzilla::Bug->check_for_edit($_) } @{ $params->{ids} };
-
-    my @created;
-    $dbh->bz_start_transaction();
-    my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-
-    my $flags = delete $params->{flags};
-
-    foreach my $bug (@bugs) {
-        my $attachment = Bugzilla::Attachment->create({
-            bug         => $bug,
-            creation_ts => $timestamp,
-            data        => $params->{data},
-            description => $params->{summary},
-            filename    => $params->{file_name},
-            mimetype    => $params->{content_type},
-            ispatch     => $params->{is_patch},
-            isprivate   => $params->{is_private},
-        });
-
-        if ($flags) {
-            my ($old_flags, $new_flags) = extract_flags($flags, $bug, $attachment);
-            $attachment->set_flags($old_flags, $new_flags);
-        }
+  my @result;
+  foreach my $val (@$values) {
+    push(@result, $self->type('string', $val));
+  }
 
-        $attachment->update($timestamp);
-        my $comment = $params->{comment} || '';
+  return {values => \@result};
+}
 
-        my $is_markdown = 0;
-        if (ref $params->{comment} eq 'HASH') {
-            $is_markdown = $params->{comment}->{is_markdown};
-            $comment     = $params->{comment}->{body};
-        }
+sub add_attachment {
+  my ($self, $params) = validate(@_, 'ids');
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  defined $params->{ids}  || ThrowCodeError('param_required', {param => 'ids'});
+  defined $params->{data} || ThrowCodeError('param_required', {param => 'data'});
+
+  my @bugs = map { Bugzilla::Bug->check_for_edit($_) } @{$params->{ids}};
+  my $minor_update = delete $params->{minor_update} ? 1 : 0;
+
+  my @created;
+  $dbh->bz_start_transaction();
+  my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+
+  my $flags = delete $params->{flags};
+
+  foreach my $bug (@bugs) {
+    my $attachment = Bugzilla::Attachment->create({
+      bug         => $bug,
+      creation_ts => $timestamp,
+      data        => $params->{data},
+      description => $params->{summary},
+      filename    => $params->{file_name},
+      mimetype    => $params->{content_type},
+      ispatch     => $params->{is_patch},
+      isprivate   => $params->{is_private},
+    });
 
-        ThrowUserError('markdown_disabled') if $is_markdown && !_is_markdown_enabled();
+    if ($flags) {
+      my ($old_flags, $new_flags)
+        = extract_flags($flags, $attachment->flag_types, $attachment->flags);
 
-        $attachment->bug->add_comment($comment,
-            { is_markdown => $is_markdown,
-              isprivate   => $attachment->isprivate,
-              type        => CMT_ATTACHMENT_CREATED,
-              extra_data  => $attachment->id });
-        push(@created, $attachment);
+      $attachment->set_flags($old_flags, $new_flags);
     }
-    $_->bug->update($timestamp) foreach @created;
-    $dbh->bz_commit_transaction();
 
-    $_->send_changes() foreach @bugs;
+    $attachment->update($timestamp);
+    my $comment = $params->{comment} || '';
 
-    my @created_ids = map { $_->id } @created;
+    my $is_markdown = 0;
+    if (ref $params->{comment} eq 'HASH') {
+      $is_markdown = $params->{comment}->{is_markdown};
+      $comment     = $params->{comment}->{body};
+    }
 
-    return { ids => \@created_ids };
+    ThrowUserError('markdown_disabled')
+      if $is_markdown && !Bugzilla->user->use_markdown();
+
+    $attachment->bug->add_comment(
+      $comment,
+      {
+        is_markdown => $is_markdown,
+        isprivate   => $attachment->isprivate,
+        type        => CMT_ATTACHMENT_CREATED,
+        extra_data  => $attachment->id
+      }
+    );
+    push(@created, $attachment);
+  }
+  my %minor_updates;
+  foreach my $attachment (@created) {
+    my $bug = $attachment->bug;
+    $minor_updates{$bug->id} = $bug->has_unsent_changes ? 0 : $minor_update;
+    $bug->update($timestamp);
+  }
+  $dbh->bz_commit_transaction();
+
+  foreach my $bug (@bugs) {
+    $bug->send_changes(undef, undef, $minor_updates{$bug->id});
+  }
+
+  my @created_ids = map { $_->id } @created;
+
+  return {ids => \@created_ids};
 }
 
 sub update_attachment {
-    my ($self, $params) = validate(@_, 'ids');
+  my ($self, $params) = validate(@_, 'ids');
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  my $dbh  = Bugzilla->dbh;
+
+  my $ids = delete $params->{ids};
+  defined $ids || ThrowCodeError('param_required', {param => 'ids'});
+
+  my $req_minor_update = delete $params->{minor_update} ? 1 : 0;
+
+  # Some fields cannot be sent to set_all
+  foreach my $key (qw(login password token)) {
+    delete $params->{$key};
+  }
+
+  $params = translate($params, ATTACHMENT_MAPPED_SETTERS);
+
+  # Get all the attachments, after verifying that they exist and are editable
+  my @attachments = ();
+  my %bugs        = ();
+  foreach my $id (@$ids) {
+    my $attachment = Bugzilla::Attachment->new($id)
+      || ThrowUserError("invalid_attach_id", {attach_id => $id});
+    my $bug = $attachment->bug;
+    $attachment->_check_bug;
+
+    push @attachments, $attachment;
+    $bugs{$bug->id} = $bug;
+  }
+
+  my $flags       = delete $params->{flags};
+  my $comment     = delete $params->{comment};
+  my $is_markdown = 0;
+
+  if (ref $comment eq 'HASH') {
+    $is_markdown = $comment->{is_markdown};
+    $comment     = $comment->{body};
+  }
+
+  ThrowUserError('markdown_disabled') if $is_markdown && !$user->use_markdown();
+
+  # Update the values
+  foreach my $attachment (@attachments) {
+    my ($update_flags, $new_flags)
+      = $flags
+      ? extract_flags($flags, $attachment->flag_types, $attachment->flags)
+      : ([], []);
+    if ($attachment->validate_can_edit) {
+      $attachment->set_all($params);
+      $attachment->set_flags($update_flags, $new_flags) if $flags;
+    }
+    elsif (scalar @$update_flags && !scalar(@$new_flags) && !scalar keys %$params) {
+
+      # Requestees can set flags targeted to them, even if they cannot
+      # edit the attachment. Flag setters can edit their own flags too.
+      my %flag_list = map { $_->{id} => $_ } @$update_flags;
+      my $flag_objs = Bugzilla::Flag->new_from_list([keys %flag_list]);
+      my @editable_flags;
+      foreach my $flag_obj (@$flag_objs) {
+        if ($flag_obj->setter_id == $user->id
+          || ($flag_obj->requestee_id && $flag_obj->requestee_id == $user->id))
+        {
+          push(@editable_flags, $flag_list{$flag_obj->id});
+        }
+      }
+      if (!scalar @editable_flags) {
+        ThrowUserError("illegal_attachment_edit", {attach_id => $attachment->id});
+      }
+      $attachment->set_flags(\@editable_flags, []);
+    }
+    else {
+      ThrowUserError("illegal_attachment_edit", {attach_id => $attachment->id});
+    }
+  }
 
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
 
-    my $ids = delete $params->{ids};
-    defined $ids || ThrowCodeError('param_required', { param => 'ids' });
+  # Do the actual update and get information to return to user
+  my @result;
+  foreach my $attachment (@attachments) {
+    my $changes = $attachment->update();
 
-    # Some fields cannot be sent to set_all
-    foreach my $key (qw(login password token)) {
-        delete $params->{$key};
+    if ($comment = trim($comment)) {
+      $attachment->bug->add_comment(
+        $comment,
+        {
+          is_markdown => $is_markdown,
+          isprivate   => $attachment->isprivate,
+          type        => CMT_ATTACHMENT_UPDATED,
+          extra_data  => $attachment->id
+        }
+      );
     }
 
-    $params = translate($params, ATTACHMENT_MAPPED_SETTERS);
+    $changes = translate($changes, ATTACHMENT_MAPPED_RETURNS);
 
-    # Get all the attachments, after verifying that they exist and are editable
-    my @attachments = ();
-    my %bugs = ();
-    foreach my $id (@$ids) {
-        my $attachment = Bugzilla::Attachment->new($id)
-          || ThrowUserError("invalid_attach_id", { attach_id => $id });
-        my $bug = $attachment->bug;
-        $attachment->_check_bug;
-        $attachment->validate_can_edit
-          || ThrowUserError("illegal_attachment_edit", { attach_id => $id });
-
-        push @attachments, $attachment;
-        $bugs{$bug->id} = $bug;
-    }
+    my %hash = (
+      id               => $self->type('int',      $attachment->id),
+      last_change_time => $self->type('dateTime', $attachment->modification_time),
+      changes          => {},
+    );
 
-    my $flags = delete $params->{flags};
-    my $comment = delete $params->{comment};
-    my $is_markdown = 0;
+    foreach my $field (keys %$changes) {
+      my $change = $changes->{$field};
 
-    if (ref $comment eq 'HASH') {
-        $is_markdown = $comment->{is_markdown};
-        $comment     = $comment->{body};
+      # We normalize undef to an empty string, so that the API
+      # stays consistent for things like Deadline that can become
+      # empty.
+      $hash{changes}->{$field} = {
+        removed => $self->type('string', $change->[0] // ''),
+        added   => $self->type('string', $change->[1] // '')
+      };
     }
 
-    ThrowUserError('markdown_disabled') if $is_markdown && !_is_markdown_enabled();
+    push(@result, \%hash);
+  }
 
-    # Update the values
-    foreach my $attachment (@attachments) {
-        $attachment->set_all($params);
-        if ($flags) {
-            my ($old_flags, $new_flags) = extract_flags($flags, $attachment->bug, $attachment);
-            $attachment->set_flags($old_flags, $new_flags);
-        }
-    }
+  $dbh->bz_commit_transaction();
 
-    $dbh->bz_start_transaction();
+  # Email users about the change
+  foreach my $bug (values %bugs) {
+    my $minor_update = $bug->has_unsent_changes ? 0 : $req_minor_update;
+    $bug->update();
+    $bug->send_changes(undef, undef, $minor_update);
+  }
 
-    # Do the actual update and get information to return to user
-    my @result;
-    foreach my $attachment (@attachments) {
-        my $changes = $attachment->update();
-
-        if ($comment = trim($comment)) {
-            $attachment->bug->add_comment($comment,
-                { is_markdown => $is_markdown,
-                  isprivate   => $attachment->isprivate,
-                  type        => CMT_ATTACHMENT_UPDATED,
-                  extra_data  => $attachment->id });
-        }
+  # Return the information to the user
+  return {attachments => \@result};
+}
 
-        $changes = translate($changes, ATTACHMENT_MAPPED_RETURNS);
+sub add_comment {
+  my ($self, $params) = @_;
 
-        my %hash = (
-            id               => $self->type('int', $attachment->id),
-            last_change_time => $self->type('dateTime', $attachment->modification_time),
-            changes          => {},
-        );
+  # The user must login in order add a comment
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
 
-        foreach my $field (keys %$changes) {
-            my $change = $changes->{$field};
+  # Check parameters
+  defined $params->{id} || ThrowCodeError('param_required', {param => 'id'});
+  my $comment = $params->{comment};
+  (defined $comment && trim($comment) ne '')
+    || ThrowCodeError('param_required', {param => 'comment'});
 
-            # We normalize undef to an empty string, so that the API
-            # stays consistent for things like Deadline that can become
-            # empty.
-            $hash{changes}->{$field} = {
-                removed => $self->type('string', $change->[0] // ''),
-                added   => $self->type('string', $change->[1] // '')
-            };
-        }
+  my $bug = Bugzilla::Bug->check_for_edit($params->{id});
+  my $minor_update = delete $params->{minor_update} ? 1 : 0;
+  $minor_update = $bug->has_unsent_changes ? 0 : $minor_update;
 
-        push(@result, \%hash);
-    }
+  # Backwards-compatibility for versions before 3.6
+  if (defined $params->{private}) {
+    $params->{is_private} = delete $params->{private};
+  }
 
-    $dbh->bz_commit_transaction();
+  ThrowUserError('markdown_disabled')
+    if $params->{is_markdown} && !$user->use_markdown();
 
-    # Email users about the change
-    foreach my $bug (values %bugs) {
-        $bug->update();
-        $bug->send_changes();
+  # Append comment
+  $bug->add_comment(
+    $comment,
+    {
+      isprivate   => $params->{is_private},
+      is_markdown => $params->{is_markdown},
+      work_time   => $params->{work_time}
     }
+  );
+  $bug->update();
 
-    # Return the information to the user
-    return { attachments => \@result };
-}
+  my $new_comment_id = $bug->{added_comments}[0]->id;
 
-sub add_comment {
-    my ($self, $params) = @_;
-
-    # The user must login in order add a comment
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-
-    # Check parameters
-    defined $params->{id} 
-        || ThrowCodeError('param_required', { param => 'id' }); 
-    my $comment = $params->{comment}; 
-    (defined $comment && trim($comment) ne '')
-        || ThrowCodeError('param_required', { param => 'comment' });
-    
-    my $bug = Bugzilla::Bug->check_for_edit($params->{id});
-
-    # Backwards-compatibility for versions before 3.6    
-    if (defined $params->{private}) {
-        $params->{is_private} = delete $params->{private};
-    }
+  # Send mail.
+  Bugzilla::BugMail::Send(
+    $bug->bug_id,
+    {changer      => $user},
+    {minor_update => $minor_update}
+  );
 
-    ThrowUserError('markdown_disabled') if $params->{is_markdown} && !_is_markdown_enabled();
-
-    # Append comment
-    $bug->add_comment($comment, { isprivate   => $params->{is_private},
-                                  is_markdown => $params->{is_markdown},
-                                  work_time   => $params->{work_time} });
-    
-    # Capture the call to bug->update (which creates the new comment) in 
-    # a transaction so we're sure to get the correct comment_id.
-    
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    
-    $bug->update();
-    
-    my $new_comment_id = $dbh->bz_last_key('longdescs', 'comment_id');
-    
-    $dbh->bz_commit_transaction();
-    
-    # Send mail.
-    Bugzilla::BugMail::Send($bug->bug_id, { changer => $user });
-
-    return { id => $self->type('int', $new_comment_id) };
+  return {id => $self->type('int', $new_comment_id)};
 }
 
 sub update_see_also {
-    my ($self, $params) = @_;
-
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-
-    # Check parameters
-    $params->{ids}
-        || ThrowCodeError('param_required', { param => 'id' });
-    my ($add, $remove) = @$params{qw(add remove)};
-    ($add || $remove)
-        or ThrowCodeError('params_required', { params => ['add', 'remove'] });
-
-    my @bugs;
-    foreach my $id (@{ $params->{ids} }) {
-        my $bug = Bugzilla::Bug->check_for_edit($id);
-        push(@bugs, $bug);
-        if ($remove) {
-            $bug->remove_see_also($_) foreach @$remove;
-        }
-        if ($add) {
-            $bug->add_see_also($_) foreach @$add;
-        }
+  my ($self, $params) = @_;
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  # Check parameters
+  $params->{ids} || ThrowCodeError('param_required', {param => 'id'});
+  my ($add, $remove) = @$params{qw(add remove)};
+  ($add || $remove)
+    or ThrowCodeError('params_required', {params => ['add', 'remove']});
+  my $req_minor_update = delete $params->{minor_update} ? 1 : 0;
+
+  my @bugs;
+  foreach my $id (@{$params->{ids}}) {
+    my $bug = Bugzilla::Bug->check_for_edit($id);
+    push(@bugs, $bug);
+    if ($remove) {
+      $bug->remove_see_also($_) foreach @$remove;
     }
-    
-    my %changes;
-    foreach my $bug (@bugs) {
-        my $change = $bug->update();
-        if (my $see_also = $change->{see_also}) {
-            $changes{$bug->id}->{see_also} = {
-                removed => [split(', ', $see_also->[0])],
-                added   => [split(', ', $see_also->[1])],
-            };
-        }
-        else {
-            # We still want a changes entry, for API consistency.
-            $changes{$bug->id}->{see_also} = { added => [], removed => [] };
-        }
-
-        Bugzilla::BugMail::Send($bug->id, { changer => $user });
+    if ($add) {
+      $bug->add_see_also($_) foreach @$add;
+    }
+  }
+
+  my %changes;
+  foreach my $bug (@bugs) {
+    my $minor_update = $bug->has_unsent_changes ? 0 : $req_minor_update;
+    my $change = $bug->update();
+    if (my $see_also = $change->{see_also}) {
+      $changes{$bug->id}->{see_also} = {
+        removed => [split(', ', $see_also->[0])],
+        added   => [split(', ', $see_also->[1])],
+      };
+    }
+    else {
+      # We still want a changes entry, for API consistency.
+      $changes{$bug->id}->{see_also} = {added => [], removed => []};
     }
 
-    return { changes => \%changes };
+    Bugzilla::BugMail::Send(
+      $bug->id,
+      {changer      => $user},
+      {minor_update => $minor_update}
+    );
+  }
+
+  return {changes => \%changes};
 }
 
 sub attachments {
-    my ($self, $params) = validate(@_, 'ids', 'attachment_ids');
-
-    Bugzilla->switch_to_shadow_db() unless Bugzilla->user->id;
-
-    if (!(defined $params->{ids}
-          or defined $params->{attachment_ids}))
-    {
-        ThrowCodeError('param_required',
-                       { function => 'Bug.attachments', 
-                         params   => ['ids', 'attachment_ids'] });
-    }
+  my ($self, $params) = validate(@_, 'ids', 'attachment_ids');
 
-    my $ids = $params->{ids} || [];
-    my $attach_ids = $params->{attachment_ids} || [];
+  Bugzilla->switch_to_shadow_db() unless Bugzilla->user->id;
 
-    my %bugs;
-    foreach my $bug_id (@$ids) {
-        my $bug = Bugzilla::Bug->check($bug_id);
-        $bugs{$bug->id} = [];
-        foreach my $attach (@{$bug->attachments}) {
-            push @{$bugs{$bug->id}},
-                $self->_attachment_to_hash($attach, $params);
-        }
+  if (!(defined $params->{ids} or defined $params->{attachment_ids})) {
+    ThrowCodeError('param_required',
+      {function => 'Bug.attachments', params => ['ids', 'attachment_ids']});
+  }
+
+  my $ids        = $params->{ids}            || [];
+  my $attach_ids = $params->{attachment_ids} || [];
+
+  my %bugs;
+  foreach my $bug_id (@$ids) {
+    my $bug = Bugzilla::Bug->check($bug_id);
+    $bugs{$bug->id} = [];
+    foreach my $attach (@{$bug->attachments}) {
+      push @{$bugs{$bug->id}}, $self->_attachment_to_hash($attach, $params);
     }
-
-    my %attachments;
-    foreach my $attach (@{Bugzilla::Attachment->new_from_list($attach_ids)}) {
-        Bugzilla::Bug->check($attach->bug_id);
-        if ($attach->isprivate && !Bugzilla->user->is_insider) {
-            ThrowUserError('auth_failure', {action    => 'access',
-                                            object    => 'attachment',
-                                            attach_id => $attach->id});
-        }
-        $attachments{$attach->id} =
-            $self->_attachment_to_hash($attach, $params);
+  }
+
+  my %attachments;
+  foreach my $attach (@{Bugzilla::Attachment->new_from_list($attach_ids)}) {
+    Bugzilla::Bug->check($attach->bug_id);
+    if ($attach->isprivate && !Bugzilla->user->is_insider) {
+      ThrowUserError('auth_failure',
+        {action => 'access', object => 'attachment', attach_id => $attach->id});
     }
+    $attachments{$attach->id} = $self->_attachment_to_hash($attach, $params);
+  }
 
-    return { bugs => \%bugs, attachments => \%attachments };
+  return {bugs => \%bugs, attachments => \%attachments};
 }
 
 sub update_tags {
-    my ($self, $params) = @_;
+  my ($self, $params) = @_;
 
-    Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->login(LOGIN_REQUIRED);
 
-    my $ids  = $params->{ids};
-    my $tags = $params->{tags};
+  my $ids  = $params->{ids};
+  my $tags = $params->{tags};
 
-    ThrowCodeError('param_required',
-                   { function => 'Bug.update_tags', 
-                     param    => 'ids' }) if !defined $ids;
+  ThrowCodeError('param_required',
+    {function => 'Bug.update_tags', param => 'ids'})
+    if !defined $ids;
 
-    ThrowCodeError('param_required',
-                   { function => 'Bug.update_tags', 
-                     param    => 'tags' }) if !defined $tags;
+  ThrowCodeError('param_required',
+    {function => 'Bug.update_tags', param => 'tags'})
+    if !defined $tags;
 
-    my %changes;
-    foreach my $bug_id (@$ids) {
-        my $bug = Bugzilla::Bug->check($bug_id);
-        my @old_tags = @{ $bug->tags };
+  my %changes;
+  foreach my $bug_id (@$ids) {
+    my $bug      = Bugzilla::Bug->check($bug_id);
+    my @old_tags = @{$bug->tags};
 
-        $bug->remove_tag($_) foreach @{ $tags->{remove} || [] };
-        $bug->add_tag($_) foreach @{ $tags->{add} || [] };
+    $bug->remove_tag($_) foreach @{$tags->{remove} || []};
+    $bug->add_tag($_)    foreach @{$tags->{add}    || []};
 
-        my ($removed, $added) = diff_arrays(\@old_tags, $bug->tags);
+    my ($removed, $added) = diff_arrays(\@old_tags, $bug->tags);
 
-        my @removed = map { $self->type('string', $_) } @$removed;
-        my @added   = map { $self->type('string', $_) } @$added;
+    my @removed = map { $self->type('string', $_) } @$removed;
+    my @added   = map { $self->type('string', $_) } @$added;
 
-        $changes{$bug->id}->{tags} = {
-            removed => \@removed,
-            added   => \@added
-        };
-    }
+    $changes{$bug->id}->{tags} = {removed => \@removed, added => \@added};
+  }
 
-    return { changes => \%changes };
+  return {changes => \%changes};
 }
 
 sub update_comment_tags {
-    my ($self, $params) = @_;
-
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->params->{'comment_taggers_group'}
-        || ThrowUserError("comment_tag_disabled");
-    $user->can_tag_comments
-        || ThrowUserError("auth_failure",
-                          { group  => Bugzilla->params->{'comment_taggers_group'},
-                            action => "update",
-                            object => "comment_tags" });
-
-    my $comment_id  = $params->{comment_id}
-        // ThrowCodeError('param_required',
-                          { function => 'Bug.update_comment_tags',
-                            param    => 'comment_id' });
-
-    my $comment = Bugzilla::Comment->new($comment_id)
-        || return [];
-    $comment->bug->check_is_visible();
-    if ($comment->is_private && !$user->is_insider) {
-        ThrowUserError('comment_is_private', { id => $comment_id });
-    }
+  my ($self, $params) = @_;
 
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    foreach my $tag (@{ $params->{add} || [] }) {
-        $comment->add_tag($tag) if defined $tag;
-    }
-    foreach my $tag (@{ $params->{remove} || [] }) {
-        $comment->remove_tag($tag) if defined $tag;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->params->{'comment_taggers_group'}
+    || ThrowUserError("comment_tag_disabled");
+  $user->can_tag_comments || ThrowUserError(
+    "auth_failure",
+    {
+      group  => Bugzilla->params->{'comment_taggers_group'},
+      action => "update",
+      object => "comment_tags"
     }
-    $comment->update();
-    $dbh->bz_commit_transaction();
-
-    return $comment->tags;
+  );
+
+  my $comment_id = $params->{comment_id} // ThrowCodeError('param_required',
+    {function => 'Bug.update_comment_tags', param => 'comment_id'});
+
+  ThrowCodeError('param_integer_required',
+    {function => 'Bug.update_comment_tags', param => 'comment_id'})
+    unless $comment_id =~ /^\d+$/a;
+
+  my $comment = Bugzilla::Comment->new($comment_id) || return [];
+  $comment->bug->check_is_visible();
+  if ($comment->is_private && !$user->is_insider) {
+    ThrowUserError('comment_is_private', {id => $comment_id});
+  }
+
+  my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  foreach my $tag (@{$params->{add} || []}) {
+    $comment->add_tag($tag) if defined $tag;
+  }
+  foreach my $tag (@{$params->{remove} || []}) {
+    $comment->remove_tag($tag) if defined $tag;
+  }
+  $comment->update();
+  $dbh->bz_commit_transaction();
+
+  return $comment->tags;
 }
 
 sub search_comment_tags {
-    my ($self, $params) = @_;
-
-    Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->params->{'comment_taggers_group'}
-        || ThrowUserError("comment_tag_disabled");
-    Bugzilla->user->can_tag_comments
-        || ThrowUserError("auth_failure", { group  => Bugzilla->params->{'comment_taggers_group'},
-                                            action => "search",
-                                            object => "comment_tags"});
-
-    my $query = $params->{query};
-    $query
-        // ThrowCodeError('param_required', { param => 'query' });
-    my $limit = $params->{limit} || 7;
-    detaint_natural($limit)
-        || ThrowCodeError('param_must_be_numeric', { param    => 'limit',
-                                                     function => 'Bug.search_comment_tags' });
-
-
-    my $tags = Bugzilla::Comment::TagWeights->match({
-        WHERE => {
-            'tag LIKE ?' => "\%$query\%",
-        },
-        LIMIT => $limit,
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->params->{'comment_taggers_group'}
+    || ThrowUserError("comment_tag_disabled");
+  Bugzilla->user->can_tag_comments || ThrowUserError(
+    "auth_failure",
+    {
+      group  => Bugzilla->params->{'comment_taggers_group'},
+      action => "search",
+      object => "comment_tags"
+    }
+  );
+
+  my $query = $params->{query};
+  $query // ThrowCodeError('param_required', {param => 'query'});
+  my $limit = $params->{limit} || 7;
+  detaint_natural($limit)
+    || ThrowCodeError('param_must_be_numeric',
+    {param => 'limit', function => 'Bug.search_comment_tags'});
+
+
+  my $tags
+    = Bugzilla::Comment::TagWeights->match({
+    WHERE => {'tag LIKE ?' => "\%$query\%",}, LIMIT => $limit,
     });
-    return [ map { $_->tag } @$tags ];
+  return [map { $_->tag } @$tags];
 }
 
 ##############################
@@ -1197,240 +1302,240 @@ sub search_comment_tags {
 # return them directly.
 
 sub _bug_to_hash {
-    my ($self, $bug, $params) = @_;
-
-    # All the basic bug attributes are here, in alphabetical order.
-    # A bug attribute is "basic" if it doesn't require an additional
-    # database call to get the info.
-    my %item = %{ filter $params, {
-        # No need to format $bug->deadline specially, because Bugzilla::Bug
-        # already does it for us.
-        deadline         => $self->type('string', $bug->deadline),
-        id               => $self->type('int', $bug->bug_id),
-        is_confirmed     => $self->type('boolean', $bug->everconfirmed),
-        op_sys           => $self->type('string', $bug->op_sys),
-        platform         => $self->type('string', $bug->rep_platform),
-        priority         => $self->type('string', $bug->priority),
-        resolution       => $self->type('string', $bug->resolution),
-        severity         => $self->type('string', $bug->bug_severity),
-        status           => $self->type('string', $bug->bug_status),
-        summary          => $self->type('string', $bug->short_desc),
-        target_milestone => $self->type('string', $bug->target_milestone),
-        url              => $self->type('string', $bug->bug_file_loc),
-        version          => $self->type('string', $bug->version),
-        whiteboard       => $self->type('string', $bug->status_whiteboard),
-    } };
-
-    # First we handle any fields that require extra work (such as date parsing
-    # or SQL calls).
-    if (filter_wants $params, 'alias') {
-        $item{alias} = [ map { $self->type('string', $_) } @{ $bug->alias } ];
-    }
-    if (filter_wants $params, 'assigned_to') {
-        $item{'assigned_to'} = $self->type('email', $bug->assigned_to->login);
-        $item{'assigned_to_detail'} = $self->_user_to_hash($bug->assigned_to, $params, undef, 'assigned_to');
-    }
-    if (filter_wants $params, 'blocks') {
-        my @blocks = map { $self->type('int', $_) } @{ $bug->blocked };
-        $item{'blocks'} = \@blocks;
-    }
-    if (filter_wants $params, 'classification') {
-        $item{classification} = $self->type('string', $bug->classification);
-    }
-    if (filter_wants $params, 'component') {
-        $item{component} = $self->type('string', $bug->component);
-    }
-    if (filter_wants $params, 'cc') {
-        my @cc = map { $self->type('email', $_) } @{ $bug->cc };
-        $item{'cc'} = \@cc;
-        $item{'cc_detail'} = [ map { $self->_user_to_hash($_, $params, undef, 'cc') } @{ $bug->cc_users } ];
-    }
-    if (filter_wants $params, 'creation_time') {
-        $item{'creation_time'} = $self->type('dateTime', $bug->creation_ts);
-    }
-    if (filter_wants $params, 'creator') {
-        $item{'creator'} = $self->type('email', $bug->reporter->login);
-        $item{'creator_detail'} = $self->_user_to_hash($bug->reporter, $params, undef, 'creator');
-    }
-    if (filter_wants $params, 'depends_on') {
-        my @depends_on = map { $self->type('int', $_) } @{ $bug->dependson };
-        $item{'depends_on'} = \@depends_on;
-    }
-    if (filter_wants $params, 'dupe_of') {
-        $item{'dupe_of'} = $self->type('int', $bug->dup_id);
-    }
-    if (filter_wants $params, 'groups') {
-        my @groups = map { $self->type('string', $_->name) }
-                     @{ $bug->groups_in };
-        $item{'groups'} = \@groups;
-    }
-    if (filter_wants $params, 'is_open') {
-        $item{'is_open'} = $self->type('boolean', $bug->status->is_open);
-    }
-    if (filter_wants $params, 'keywords') {
-        my @keywords = map { $self->type('string', $_->name) }
-                       @{ $bug->keyword_objects };
-        $item{'keywords'} = \@keywords;
-    }
-    if (filter_wants $params, 'last_change_time') {
-        $item{'last_change_time'} = $self->type('dateTime', $bug->delta_ts);
-    }
-    if (filter_wants $params, 'product') {
-        $item{product} = $self->type('string', $bug->product);
+  my ($self, $bug, $params) = @_;
+
+  # All the basic bug attributes are here, in alphabetical order.
+  # A bug attribute is "basic" if it doesn't require an additional
+  # database call to get the info.
+  my %item = %{filter $params,
+    {
+      # No need to format $bug->deadline specially, because Bugzilla::Bug
+      # already does it for us.
+      deadline         => $self->type('string',  $bug->deadline),
+      id               => $self->type('int',     $bug->bug_id),
+      is_confirmed     => $self->type('boolean', $bug->everconfirmed),
+      op_sys           => $self->type('string',  $bug->op_sys),
+      platform         => $self->type('string',  $bug->rep_platform),
+      priority         => $self->type('string',  $bug->priority),
+      resolution       => $self->type('string',  $bug->resolution),
+      severity         => $self->type('string',  $bug->bug_severity),
+      status           => $self->type('string',  $bug->bug_status),
+      summary          => $self->type('string',  $bug->short_desc),
+      target_milestone => $self->type('string',  $bug->target_milestone),
+      url              => $self->type('string',  $bug->bug_file_loc),
+      version          => $self->type('string',  $bug->version),
+      whiteboard       => $self->type('string',  $bug->status_whiteboard),
     }
-    if (filter_wants $params, 'qa_contact') {
-        my $qa_login = $bug->qa_contact ? $bug->qa_contact->login : '';
-        $item{'qa_contact'} = $self->type('email', $qa_login);
-        if ($bug->qa_contact) {
-            $item{'qa_contact_detail'} = $self->_user_to_hash($bug->qa_contact, $params, undef, 'qa_contact');
-        }
+  };
+
+  # First we handle any fields that require extra work (such as date parsing
+  # or SQL calls).
+  if (filter_wants $params, 'alias') {
+    $item{alias} = [map { $self->type('string', $_) } @{$bug->alias}];
+  }
+  if (filter_wants $params, 'assigned_to') {
+    $item{'assigned_to'} = $self->type('login', $bug->assigned_to->login);
+    $item{'assigned_to_detail'}
+      = $self->_user_to_hash($bug->assigned_to, $params, undef, 'assigned_to');
+  }
+  if (filter_wants $params, 'blocks') {
+    my @blocks = map { $self->type('int', $_) } @{$bug->blocked};
+    $item{'blocks'} = \@blocks;
+  }
+  if (filter_wants $params, 'classification') {
+    $item{classification} = $self->type('string', $bug->classification);
+  }
+  if (filter_wants $params, 'component') {
+    $item{component} = $self->type('string', $bug->component);
+  }
+  if (filter_wants $params, 'cc') {
+    my @cc = map { $self->type('login', $_) } @{$bug->cc};
+    $item{'cc'} = \@cc;
+    $item{'cc_detail'}
+      = [map { $self->_user_to_hash($_, $params, undef, 'cc') } @{$bug->cc_users}];
+  }
+  if (filter_wants $params, 'creation_time') {
+    $item{'creation_time'} = $self->type('dateTime', $bug->creation_ts);
+  }
+  if (filter_wants $params, 'creator') {
+    $item{'creator'} = $self->type('login', $bug->reporter->login);
+    $item{'creator_detail'}
+      = $self->_user_to_hash($bug->reporter, $params, undef, 'creator');
+  }
+  if (filter_wants $params, 'depends_on') {
+    my @depends_on = map { $self->type('int', $_) } @{$bug->dependson};
+    $item{'depends_on'} = \@depends_on;
+  }
+  if (filter_wants $params, 'dupe_of') {
+    $item{'dupe_of'} = $self->type('int', $bug->dup_id);
+  }
+  if (filter_wants $params, 'groups') {
+    my @groups = map { $self->type('string', $_->name) } @{$bug->groups_in};
+    $item{'groups'} = \@groups;
+  }
+  if (filter_wants $params, 'is_open') {
+    $item{'is_open'} = $self->type('boolean', $bug->status->is_open);
+  }
+  if (filter_wants $params, 'keywords') {
+    my @keywords = map { $self->type('string', $_->name) } @{$bug->keyword_objects};
+    $item{'keywords'} = \@keywords;
+  }
+  if (filter_wants $params, 'last_change_time') {
+    $item{'last_change_time'} = $self->type('dateTime', $bug->delta_ts);
+  }
+  if (filter_wants $params, 'product') {
+    $item{product} = $self->type('string', $bug->product);
+  }
+  if (filter_wants $params, 'qa_contact') {
+    my $qa_login = $bug->qa_contact ? $bug->qa_contact->login : '';
+    $item{'qa_contact'} = $self->type('login', $qa_login);
+    if ($bug->qa_contact) {
+      $item{'qa_contact_detail'}
+        = $self->_user_to_hash($bug->qa_contact, $params, undef, 'qa_contact');
     }
-    if (filter_wants $params, 'see_also') {
-        my @see_also = map { $self->type('string', $_->name) }
-                       @{ $bug->see_also };
-        $item{'see_also'} = \@see_also;
+  }
+  if (filter_wants $params, 'see_also') {
+    my @see_also = map { $self->type('string', $_->name) } @{$bug->see_also};
+    $item{'see_also'} = \@see_also;
+  }
+  if (filter_wants $params, 'flags') {
+    $item{'flags'} = [map { $self->_flag_to_hash($_) } @{$bug->flags}];
+  }
+  if (filter_wants $params, 'tags', 'extra') {
+    $item{'tags'} = $bug->tags;
+  }
+  if (filter_wants $params, 'duplicates', 'extra') {
+    $item{'duplicates'} = [map { $self->type('int', $_->id) } @{$bug->duplicates}];
+  }
+
+  # And now custom fields
+  my @custom_fields = Bugzilla->active_custom_fields;
+  foreach my $field (@custom_fields) {
+    my $name = $field->name;
+    next if !filter_wants($params, $name, ['default', 'custom']);
+    if ($field->type == FIELD_TYPE_BUG_ID) {
+      $item{$name} = $self->type('int', $bug->$name);
     }
-    if (filter_wants $params, 'flags') {
-        $item{'flags'} = [ map { $self->_flag_to_hash($_) } @{$bug->flags} ];
+    elsif ($field->type == FIELD_TYPE_DATETIME || $field->type == FIELD_TYPE_DATE) {
+      $item{$name} = $self->type('dateTime', $bug->$name);
     }
-    if (filter_wants $params, 'tags', 'extra') {
-        $item{'tags'} = $bug->tags;
+    elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
+      my @values = map { $self->type('string', $_) } @{$bug->$name};
+      $item{$name} = \@values;
     }
-
-    # And now custom fields
-    my @custom_fields = Bugzilla->active_custom_fields;
-    foreach my $field (@custom_fields) {
-        my $name = $field->name;
-        next if !filter_wants($params, $name, ['default', 'custom']);
-        if ($field->type == FIELD_TYPE_BUG_ID) {
-            $item{$name} = $self->type('int', $bug->$name);
-        }
-        elsif ($field->type == FIELD_TYPE_DATETIME
-               || $field->type == FIELD_TYPE_DATE)
-        {
-            $item{$name} = $self->type('dateTime', $bug->$name);
-        }
-        elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
-            my @values = map { $self->type('string', $_) } @{ $bug->$name };
-            $item{$name} = \@values;
-        }
-        else {
-            $item{$name} = $self->type('string', $bug->$name);
-        }
+    else {
+      $item{$name} = $self->type('string', $bug->$name);
     }
+  }
 
-    # Timetracking fields are only sent if the user can see them.
-    if (Bugzilla->user->is_timetracker) {
-        if (filter_wants $params, 'estimated_time') {
-            $item{'estimated_time'} = $self->type('double', $bug->estimated_time);
-        }
-        if (filter_wants $params, 'remaining_time') {
-            $item{'remaining_time'} = $self->type('double', $bug->remaining_time);
-        }
-        if (filter_wants $params, 'actual_time') {
-            $item{'actual_time'} = $self->type('double', $bug->actual_time);
-        }
+  # Timetracking fields are only sent if the user can see them.
+  if (Bugzilla->user->is_timetracker) {
+    if (filter_wants $params, 'estimated_time') {
+      $item{'estimated_time'} = $self->type('double', $bug->estimated_time);
     }
-
-    # The "accessible" bits go here because they have long names and it
-    # makes the code look nicer to separate them out.
-    if (filter_wants $params, 'is_cc_accessible') {
-        $item{'is_cc_accessible'} = $self->type('boolean', $bug->cclist_accessible);
+    if (filter_wants $params, 'remaining_time') {
+      $item{'remaining_time'} = $self->type('double', $bug->remaining_time);
     }
-    if (filter_wants $params, 'is_creator_accessible') {
-        $item{'is_creator_accessible'} = $self->type('boolean', $bug->reporter_accessible);
+    if (filter_wants $params, 'actual_time') {
+      $item{'actual_time'} = $self->type('double', $bug->actual_time);
     }
-
-    return \%item;
+  }
+
+  # The "accessible" bits go here because they have long names and it
+  # makes the code look nicer to separate them out.
+  if (filter_wants $params, 'is_cc_accessible') {
+    $item{'is_cc_accessible'} = $self->type('boolean', $bug->cclist_accessible);
+  }
+  if (filter_wants $params, 'is_creator_accessible') {
+    $item{'is_creator_accessible'}
+      = $self->type('boolean', $bug->reporter_accessible);
+  }
+
+  return \%item;
 }
 
 sub _user_to_hash {
-    my ($self, $user, $filters, $types, $prefix) = @_;
-    my $item = filter $filters, {
-        id        => $self->type('int', $user->id),
-        real_name => $self->type('string', $user->name),
-        name      => $self->type('email', $user->login),
-        email     => $self->type('email', $user->email),
-    }, $types, $prefix;
-    return $item;
+  my ($self, $user, $filters, $types, $prefix) = @_;
+  my $item = filter $filters,
+    {
+    id        => $self->type('int',    $user->id),
+    real_name => $self->type('string', $user->name),
+    name      => $self->type('login',  $user->login),
+    },
+    $types, $prefix;
+  return $item;
 }
 
 sub _attachment_to_hash {
-    my ($self, $attach, $filters, $types, $prefix) = @_;
-
-    my $item = filter $filters, {
-        creation_time    => $self->type('dateTime', $attach->attached),
-        last_change_time => $self->type('dateTime', $attach->modification_time),
-        id               => $self->type('int', $attach->id),
-        bug_id           => $self->type('int', $attach->bug_id),
-        file_name        => $self->type('string', $attach->filename),
-        summary          => $self->type('string', $attach->description),
-        content_type     => $self->type('string', $attach->contenttype),
-        is_private       => $self->type('int', $attach->isprivate),
-        is_obsolete      => $self->type('int', $attach->isobsolete),
-        is_patch         => $self->type('int', $attach->ispatch),
-    }, $types, $prefix;
-
-    # creator requires an extra lookup, so we only send them if
-    # the filter wants them.
-    if (filter_wants $filters, 'creator', $types, $prefix) {
-        $item->{'creator'} = $self->type('email', $attach->attacher->login);
-    }
-
-    if (filter_wants $filters, 'data', $types, $prefix) {
-        $item->{'data'} = $self->type('base64', $attach->data);
-    }
-
-    if (filter_wants $filters, 'size', $types, $prefix) {
-        $item->{'size'} = $self->type('int', $attach->datasize);
-    }
-
-    if (filter_wants $filters, 'flags', $types, $prefix) {
-        $item->{'flags'} = [ map { $self->_flag_to_hash($_) } @{$attach->flags} ];
-    }
+  my ($self, $attach, $filters, $types, $prefix) = @_;
 
-    return $item;
+  my $item = filter $filters,
+    {
+    creation_time    => $self->type('dateTime', $attach->attached),
+    last_change_time => $self->type('dateTime', $attach->modification_time),
+    id               => $self->type('int',      $attach->id),
+    bug_id           => $self->type('int',      $attach->bug_id),
+    file_name        => $self->type('string',   $attach->filename),
+    summary          => $self->type('string',   $attach->description),
+    content_type     => $self->type('string',   $attach->contenttype),
+    is_private       => $self->type('int',      $attach->isprivate),
+    is_obsolete      => $self->type('int',      $attach->isobsolete),
+    is_patch         => $self->type('int',      $attach->ispatch),
+    },
+    $types, $prefix;
+
+  # creator requires an extra lookup, so we only send it if
+  # the filter wants it.
+  if (filter_wants $filters, 'creator', $types, $prefix) {
+    $item->{'creator'} = $self->type('login', $attach->attacher->login);
+  }
+
+  if (filter_wants $filters, 'data', $types, $prefix) {
+    $item->{'data'} = $self->type('base64', $attach->data);
+  }
+
+  if (filter_wants $filters, 'size', $types, $prefix) {
+    $item->{'size'} = $self->type('int', $attach->datasize);
+  }
+
+  if (filter_wants $filters, 'flags', $types, $prefix) {
+    $item->{'flags'} = [map { $self->_flag_to_hash($_) } @{$attach->flags}];
+  }
+
+  return $item;
 }
 
 sub _flag_to_hash {
-    my ($self, $flag) = @_;
-
-    my $item = {
-        id                => $self->type('int', $flag->id),
-        name              => $self->type('string', $flag->name),
-        type_id           => $self->type('int', $flag->type_id),
-        creation_date     => $self->type('dateTime', $flag->creation_date), 
-        modification_date => $self->type('dateTime', $flag->modification_date), 
-        status            => $self->type('string', $flag->status)
-    };
-
-    foreach my $field (qw(setter requestee)) {
-        my $field_id = $field . "_id";
-        $item->{$field} = $self->type('email', $flag->$field->login)
-            if $flag->$field_id;
-    }
-
-    return $item;
+  my ($self, $flag) = @_;
+
+  my $item = {
+    id                => $self->type('int',      $flag->id),
+    name              => $self->type('string',   $flag->name),
+    type_id           => $self->type('int',      $flag->type_id),
+    creation_date     => $self->type('dateTime', $flag->creation_date),
+    modification_date => $self->type('dateTime', $flag->modification_date),
+    status            => $self->type('string',   $flag->status)
+  };
+
+  foreach my $field (qw(setter requestee)) {
+    my $field_id = $field . "_id";
+    $item->{$field} = $self->type('login', $flag->$field->login)
+      if $flag->$field_id;
+  }
+
+  return $item;
 }
 
 sub _add_update_tokens {
-    my ($self, $params, $bugs, $hashes) = @_;
-
-    return if !Bugzilla->user->id;
-    return if !filter_wants($params, 'update_token');
-
-    for(my $i = 0; $i < @$bugs; $i++) {
-        my $token = issue_hash_token([$bugs->[$i]->id, $bugs->[$i]->delta_ts]);
-        $hashes->[$i]->{'update_token'} = $self->type('string', $token);
-    }
-}
+  my ($self, $params, $bugs, $hashes) = @_;
 
-sub _is_markdown_enabled {
-    my $user = Bugzilla->user;
+  return if !Bugzilla->user->id;
+  return if !filter_wants($params, 'update_token');
 
-    return Bugzilla->feature('markdown')
-            && $user->settings->{use_markdown}->{is_enabled}
-            && $user->setting('use_markdown') eq 'on';
+  for (my $i = 0; $i < @$bugs; $i++) {
+    my $token = issue_hash_token([$bugs->[$i]->id, $bugs->[$i]->delta_ts]);
+    $hashes->[$i]->{'update_token'} = $self->type('string', $token);
+  }
 }
 
 1;
@@ -1471,7 +1576,7 @@ for each field.
 
 =item B<REST>
 
-You have several options for retreiving information about fields. The first
+You have several options for retrieving information about fields. The first
 part is the request method and the rest is the related path needed.
 
 To get information about all fields:
@@ -2169,8 +2274,6 @@ B<STABLE>
 
 Gets information about particular bugs in the database.
 
-Note: Can also be called as "get_bugs" for compatibilty with Bugzilla 3.0 API.
-
 =item B<REST>
 
 To get information about a particular bug using its ID or alias:
@@ -2501,10 +2604,6 @@ C<string> The 'real' name for this user, if any.
 
 C<string> The user's Bugzilla login.
 
-=item C<email>
-
-C<string> The user's email address. Currently this is the same value as the name.
-
 =back
 
 =back
@@ -2519,6 +2618,10 @@ C<array> of C<string>s.  Each array item is a tag name.
 
 Note that tags are personal to the currently logged in user.
 
+=item C<duplicates>
+
+C<array> of C<integers>. Each array item is a bug ID that is a duplicate of this bug.
+
 =back
 
 =item C<faults> B<EXPERIMENTAL>
@@ -2620,7 +2723,11 @@ in Bugzilla B<4.4>.
 
 =item REST API call added in Bugzilla B<5.0>.
 
-=item In Bugzilla B<5.0>, the following items were added to the bugs return value: C<assigned_to_detail>, C<creator_detail>, C<qa_contact_detail>. 
+=item In Bugzilla B<5.0>, the following items were added to the bugs return
+value: C<assigned_to_detail>, C<creator_detail>, C<qa_contact_detail>.
+
+=item Since Bugzilla B<6.0>, the email address of users is private and is no
+longer returned as part of the user detail hash.
 
 =back
 
@@ -2657,7 +2764,7 @@ from the Bugzilla database to fetch. If it contains any non-numeric
 characters, it is considered to be a bug alias instead, and the data bug 
 with that alias will be loaded.
 
-item C<new_since>
+=item C<new_since>
 
 C<dateTime> If specified, the method will only return changes I<newer>
 than this time.
@@ -3289,7 +3396,7 @@ Bugzilla B<4.4>.
 
 =item REST API call added in Bugzilla B<5.0>.
 
-=item C<is_markdown> option added in Bugzilla B<5.0>.
+=item C<is_markdown> option added in Bugzilla B<6.0>.
 
 =back
 
@@ -3407,6 +3514,12 @@ C<string> The login of the requestee if the flag type is requestable to a specif
 
 =back
 
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
 =back
 
 =item B<Returns>
@@ -3481,7 +3594,7 @@ You set the "data" field to an empty string.
 
 =item REST API call added in Bugzilla B<5.0>.
 
-=item C<is_markdown> added in Bugzilla B<5.0>.
+=item C<is_markdown> added in Bugzilla B<6.0>.
 
 =back
 
@@ -3602,9 +3715,17 @@ C<boolean> Set to true if you specifically want a new flag to be created.
 
 =back
 
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
+=back
+
 =item B<Returns>
 
-A C<hash> with a single field, "attachment". This points to an array of hashes
+A C<hash> with a single field, "attachments". This points to an array of hashes
 with the following fields:
 
 =over
@@ -3722,8 +3843,6 @@ You did not specify a value for the C<summary> argument.
 
 =back
 
-=back
-
 =head2 add_comment
 
 B<STABLE>
@@ -3764,6 +3883,9 @@ structures, otherwise it is a normal text.
 on the bug. If you are not in the time tracking group, this value will
 be ignored.
 
+=item C<minor_update> (boolean) - If set to true, this is considered a minor update
+and no mail is sent to users who do not want minor update emails. If current user
+is not in the minor_update_group, this parameter is simply ignored.
 
 =back
 
@@ -3828,7 +3950,7 @@ code of 32000.
 
 =item REST API call added in Bugzilla B<5.0>.
 
-=item C<is_markdown> option added in Bugzilla B<5.0>.
+=item C<is_markdown> option added in Bugzilla B<6.0>.
 
 =back
 
@@ -3865,6 +3987,12 @@ pulled from the URL path.
 Array of C<int>s or C<string>s. The ids or aliases of the bugs that
 you want to modify.
 
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
 =back
 
 B<Note>: All following fields specify the values you want to set on the
@@ -4096,7 +4224,7 @@ the default for the product, when you move a bug to a new product.
 You may also wish to add or remove groups, as which groups are
 valid on a bug depends on the product. Groups that are not valid
 in the new product will be automatically removed, and groups which
-are mandatory in the new product will be automaticaly added, but no
+are mandatory in the new product will be automatically added, but no
 other automatic group changes will be done.
 
 Note that users can only move a bug into a product if they would
@@ -4435,6 +4563,12 @@ If you specify a URL that is not in the See Also field of a particular bug,
 it will just be silently ignored. Invaild URLs are currently silently ignored,
 though this may change in some future version of Bugzilla.
 
+=item C<minor_update>
+
+C<boolean> If set to true, this is considered a minor update and no mail is sent
+to users who do not want minor update emails. If current user is not in the
+minor_update_group, this parameter is simply ignored.
+
 =back
 
 NOTE: If you specify the same URL in both C<add> and C<remove>, it will
@@ -4590,7 +4724,7 @@ GET /rest/bug/comment/tags/<query>
 
 =item C<query>
 
-B<Required> C<string> Only tags containg this substring will be returned.
+B<Required> C<string> Only tags containing this substring will be returned.
 
 =item C<limit>
 
@@ -4740,13 +4874,3 @@ This method can throw all of the errors that L</get> throws.
 =back
 
 =back
-
-=head1 B<Methods in need of POD>
-
-=over
-
-=item get_bugs
-
-=item get_history
-
-=back
diff --git a/Bugzilla/WebService/BugUserLastVisit.pm b/Bugzilla/WebService/BugUserLastVisit.pm
index a29d2633b8..8e0042a84d 100644
--- a/Bugzilla/WebService/BugUserLastVisit.pm
+++ b/Bugzilla/WebService/BugUserLastVisit.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::BugUserLastVisit;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,80 +18,84 @@ use Bugzilla::Error;
 use Bugzilla::WebService::Util qw( validate filter );
 use Bugzilla::Constants;
 
+use constant PUBLIC_METHODS => qw(
+  get
+  update
+);
+
 sub update {
-    my ($self, $params) = validate(@_, 'ids');
-    my $user = Bugzilla->user;
-    my $dbh  = Bugzilla->dbh;
+  my ($self, $params) = validate(@_, 'ids');
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
 
-    $user->login(LOGIN_REQUIRED);
+  $user->login(LOGIN_REQUIRED);
 
-    my $ids = $params->{ids} // [];
-    ThrowCodeError('param_required', { param => 'ids' }) unless @$ids;
+  my $ids = $params->{ids} // [];
+  ThrowCodeError('param_required', {param => 'ids'}) unless @$ids;
 
-    # Cache permissions for bugs. This highly reduces the number of calls to the
-    # DB.  visible_bugs() is only able to handle bug IDs, so we have to skip
-    # aliases.
-    $user->visible_bugs([grep /^[0-9]$/, @$ids]);
+  # Cache permissions for bugs. This highly reduces the number of calls to the
+  # DB.  visible_bugs() is only able to handle bug IDs, so we have to skip
+  # aliases.
+  $user->visible_bugs([grep /^[0-9]+$/, @$ids]);
 
-    $dbh->bz_start_transaction();
-    my @results;
-    my $last_visit_ts = $dbh->selectrow_array('SELECT NOW()');
-    foreach my $bug_id (@$ids) {
-        my $bug = Bugzilla::Bug->check({ id => $bug_id, cache => 1 });
+  $dbh->bz_start_transaction();
+  my @results;
+  my $last_visit_ts = $dbh->selectrow_array('SELECT NOW()');
+  foreach my $bug_id (@$ids) {
+    my $bug = Bugzilla::Bug->check({id => $bug_id, cache => 1});
 
-        ThrowUserError('user_not_involved', { bug_id => $bug->id })
-            unless $user->is_involved_in_bug($bug);
+    ThrowUserError('user_not_involved', {bug_id => $bug->id})
+      unless $user->is_involved_in_bug($bug);
 
-        $bug->update_user_last_visit($user, $last_visit_ts);
+    $bug->update_user_last_visit($user, $last_visit_ts);
 
-        push(
-            @results,
-            $self->_bug_user_last_visit_to_hash(
-                $bug, $last_visit_ts, $params
-            ));
-    }
-    $dbh->bz_commit_transaction();
+    push(@results,
+      $self->_bug_user_last_visit_to_hash($bug->bug_id, $last_visit_ts, $params));
+  }
+  $dbh->bz_commit_transaction();
 
-    return \@results;
+  return \@results;
 }
 
 sub get {
-    my ($self, $params) = validate(@_, 'ids');
-    my $user = Bugzilla->user;
-    my $ids  = $params->{ids};
-
-    $user->login(LOGIN_REQUIRED);
-
-    if ($ids) {
-        # Cache permissions for bugs. This highly reduces the number of calls to
-        # the DB.  visible_bugs() is only able to handle bug IDs, so we have to
-        # skip aliases.
-        $user->visible_bugs([grep /^[0-9]$/, @$ids]);
-    }
-
-    my @last_visits = @{ $user->last_visited };
-
-    if ($ids) {
-        # remove bugs that we are not interested in if ids is passed in.
-        my %id_set = map { ($_ => 1) } @$ids;
-        @last_visits = grep { $id_set{ $_->bug_id } } @last_visits;
-    }
-
-    return [
-        map {
-            $self->_bug_user_last_visit_to_hash($_->bug_id, $_->last_visit_ts,
-                $params)
-        } @last_visits
-    ];
+  my ($self, $params) = validate(@_, 'ids');
+  my $user = Bugzilla->user;
+  my $ids  = $params->{ids};
+
+  $user->login(LOGIN_REQUIRED);
+
+  my @last_visits;
+  if ($ids) {
+
+    # Cache permissions for bugs. This highly reduces the number of calls to
+    # the DB.  visible_bugs() is only able to handle bug IDs, so we have to
+    # skip aliases.
+    $user->visible_bugs([grep /^[0-9]+$/, @$ids]);
+
+    my %last_visit
+      = map { $_->bug_id => $_->last_visit_ts } @{$user->last_visited($ids)};
+    @last_visits
+      = map { $self->_bug_user_last_visit_to_hash($_, $last_visit{$_}, $params) }
+      @$ids;
+  }
+  else {
+    @last_visits = map {
+      $self->_bug_user_last_visit_to_hash($_->bug_id, $_->last_visit_ts, $params)
+    } @{$user->last_visited};
+  }
+
+  return \@last_visits;
 }
 
 sub _bug_user_last_visit_to_hash {
-    my ($self, $bug_id, $last_visit_ts, $params) = @_;
+  my ($self, $bug_id, $last_visit_ts, $params) = @_;
 
-    my %result = (id            => $self->type('int',      $bug_id),
-                  last_visit_ts => $self->type('dateTime', $last_visit_ts));
+  my %result = (
+    id            => $self->type('int',      $bug_id),
+    last_visit_ts => $self->type('dateTime', $last_visit_ts)
+  );
 
-    return filter($params, \%result);
+  return filter($params, \%result);
 }
 
 1;
diff --git a/Bugzilla/WebService/Bugzilla.pm b/Bugzilla/WebService/Bugzilla.pm
index 8333f99c48..a9595d867c 100644
--- a/Bugzilla/WebService/Bugzilla.pm
+++ b/Bugzilla/WebService/Bugzilla.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,149 +20,149 @@ use Bugzilla::Util qw(trick_taint);
 use DateTime;
 
 # Basic info that is needed before logins
-use constant LOGIN_EXEMPT => {
-    parameters => 1,
-    timezone => 1,
-    version => 1,
-};
+use constant LOGIN_EXEMPT => {parameters => 1, timezone => 1, version => 1,};
 
 use constant READ_ONLY => qw(
-    extensions
-    parameters
-    timezone
-    time
-    version
+  extensions
+  parameters
+  timezone
+  time
+  version
+);
+
+use constant PUBLIC_METHODS => qw(
+  extensions
+  last_audit_time
+  parameters
+  time
+  timezone
+  version
 );
 
 # Logged-out users do not need to know more than that.
 use constant PARAMETERS_LOGGED_OUT => qw(
-    maintainer
-    requirelogin
+  maintainer
+  requirelogin
 );
 
 # These parameters are guessable from the web UI when the user
 # is logged in. So it's safe to access them.
 use constant PARAMETERS_LOGGED_IN => qw(
-    allowemailchange
-    attachment_base
-    commentonchange_resolution
-    commentonduplicate
-    cookiepath
-    defaultopsys
-    defaultplatform
-    defaultpriority
-    defaultseverity
-    duplicate_or_move_bug_status
-    emailregexpdesc
-    emailsuffix
-    letsubmitterchoosemilestone
-    letsubmitterchoosepriority
-    mailfrom
-    maintainer
-    maxattachmentsize
-    maxlocalattachment
-    musthavemilestoneonaccept
-    noresolveonopenblockers
-    password_complexity
-    rememberlogin
-    requirelogin
-    search_allow_no_criteria
-    urlbase
-    use_see_also
-    useclassification
-    usemenuforusers
-    useqacontact
-    usestatuswhiteboard
-    usetargetmilestone
+  allowemailchange
+  attachment_base
+  commentonchange_resolution
+  commentonduplicate
+  defaultopsys
+  defaultplatform
+  defaultpriority
+  defaultseverity
+  duplicate_or_move_bug_status
+  emailregexpdesc
+  letsubmitterchoosemilestone
+  letsubmitterchoosepriority
+  mailfrom
+  maintainer
+  maxattachmentsize
+  maxlocalattachment
+  password_complexity
+  rememberlogin
+  requirelogin
+  resolution_forbidden_with_open_blockers
+  search_allow_no_criteria
+  urlbase
+  use_email_as_login
+  use_see_also
+  useclassification
+  usemenuforusers
+  useqacontact
+  usestatuswhiteboard
+  usetargetmilestone
 );
 
 sub version {
-    my $self = shift;
-    return { version => $self->type('string', BUGZILLA_VERSION) };
+  my $self = shift;
+  return {version => $self->type('string', BUGZILLA_VERSION)};
 }
 
 sub extensions {
-    my $self = shift;
-
-    my %retval;
-    foreach my $extension (@{ Bugzilla->extensions }) {
-        my $version = $extension->VERSION || 0;
-        my $name    = $extension->NAME;
-        $retval{$name}->{version} = $self->type('string', $version);
-    }
-    return { extensions => \%retval };
+  my $self = shift;
+
+  my %retval;
+  foreach my $extension (@{Bugzilla->extensions}) {
+    my $version = $extension->VERSION || 0;
+    my $name = $extension->NAME;
+    $retval{$name}->{version} = $self->type('string', $version);
+  }
+  return {extensions => \%retval};
 }
 
 sub timezone {
-    my $self = shift;
-    # All Webservices return times in UTC; Use UTC here for backwards compat.
-    return { timezone => $self->type('string', "+0000") };
+  my $self = shift;
+
+  # All Webservices return times in UTC; Use UTC here for backwards compat.
+  return {timezone => $self->type('string', "+0000")};
 }
 
 sub time {
-    my ($self) = @_;
-    # All Webservices return times in UTC; Use UTC here for backwards compat.
-    # Hardcode values where appropriate
-    my $dbh = Bugzilla->dbh;
-
-    my $db_time = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
-    $db_time = datetime_from($db_time, 'UTC');
-    my $now_utc = DateTime->now();
-
-    return {
-        db_time       => $self->type('dateTime', $db_time),
-        web_time      => $self->type('dateTime', $now_utc),
-        web_time_utc  => $self->type('dateTime', $now_utc),
-        tz_name       => $self->type('string', 'UTC'),
-        tz_offset     => $self->type('string', '+0000'),
-        tz_short_name => $self->type('string', 'UTC'),
-    };
+  my ($self) = @_;
+
+  # All Webservices return times in UTC; Use UTC here for backwards compat.
+  # Hardcode values where appropriate
+  my $dbh = Bugzilla->dbh;
+
+  my $db_time = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  $db_time = datetime_from($db_time, 'UTC');
+  my $now_utc = DateTime->now();
+
+  return {
+    db_time  => $self->type('dateTime', $db_time),
+    web_time => $self->type('dateTime', $now_utc),
+  };
 }
 
 sub last_audit_time {
-    my ($self, $params) = validate(@_, 'class');
-    my $dbh = Bugzilla->dbh;
-
-    my $sql_statement = "SELECT MAX(at_time) FROM audit_log";
-    my $class_values =  $params->{class};
-    my @class_values_quoted;
-    foreach my $class_value (@$class_values) {
-        push (@class_values_quoted, $dbh->quote($class_value))
-            if $class_value =~ /^Bugzilla(::[a-zA-Z0-9_]+)*$/;
-    }
-
-    if (@class_values_quoted) {
-        $sql_statement .= " WHERE " . $dbh->sql_in('class', \@class_values_quoted);
-    }
-
-    my $last_audit_time = $dbh->selectrow_array("$sql_statement");
-
-    # All Webservices return times in UTC; Use UTC here for backwards compat.
-    # Hardcode values where appropriate
-    $last_audit_time = datetime_from($last_audit_time, 'UTC');
-
-    return {
-        last_audit_time => $self->type('dateTime', $last_audit_time)
-    };
+  my ($self, $params) = validate(@_, 'class');
+  my $dbh = Bugzilla->dbh;
+
+  my $sql_statement = "SELECT MAX(at_time) FROM audit_log";
+  my $class_values  = $params->{class};
+  my @class_values_quoted;
+  foreach my $class_value (@$class_values) {
+    push(@class_values_quoted, $dbh->quote($class_value))
+      if $class_value =~ /^Bugzilla(::[a-zA-Z0-9_]+)*$/;
+  }
+
+  if (@class_values_quoted) {
+    $sql_statement .= " WHERE " . $dbh->sql_in('class', \@class_values_quoted);
+  }
+
+  my $last_audit_time = $dbh->selectrow_array("$sql_statement");
+
+  # All Webservices return times in UTC; Use UTC here for backwards compat.
+  # Hardcode values where appropriate
+  $last_audit_time = datetime_from($last_audit_time, 'UTC');
+
+  return {last_audit_time => $self->type('dateTime', $last_audit_time)};
 }
 
 sub parameters {
-    my ($self, $args) = @_;
-    my $user = Bugzilla->login();
-    my $params = Bugzilla->params;
-    $args ||= {};
-
-    my @params_list = $user->in_group('tweakparams')
-                      ? keys(%$params)
-                      : $user->id ? PARAMETERS_LOGGED_IN : PARAMETERS_LOGGED_OUT;
-
-    my %parameters;
-    foreach my $param (@params_list) {
-        next unless filter_wants($args, $param);
-        $parameters{$param} = $self->type('string', $params->{$param});
-    }
-
-    return { parameters => \%parameters };
+  my ($self, $args) = @_;
+  my $user   = Bugzilla->login(LOGIN_OPTIONAL);
+  my $params = Bugzilla->params;
+  $args ||= {};
+
+  my @params_list
+    = $user->in_group('tweakparams') ? keys(%$params)
+    : $user->id                      ? PARAMETERS_LOGGED_IN
+    :                                  PARAMETERS_LOGGED_OUT;
+
+  my %parameters;
+  foreach my $param (@params_list) {
+    next unless filter_wants($args, $param);
+    $parameters{$param} = $self->type('string', $params->{$param});
+  }
+
+  return {parameters => \%parameters};
 }
 
 1;
@@ -357,26 +357,6 @@ a different source. If it's any more different than a second, then there is
 likely some problem with this Bugzilla instance. In this case you should
 rely on the C<db_time>, not the C<web_time>.
 
-=item C<web_time_utc>
-
-Identical to C<web_time>. (Exists only for backwards-compatibility with
-versions of Bugzilla before 3.6.)
-
-=item C<tz_name>
-
-C<string> The literal string C<UTC>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.)
-
-=item C<tz_short_name>
-
-C<string> The literal string C<UTC>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.)
-
-=item C<tz_offset>
-
-C<string> The literal string C<+0000>. (Exists only for backwards-compatibility
-with versions of Bugzilla before 3.6.)
-
 =back
 
 =item B<History>
@@ -428,27 +408,25 @@ A logged-in user can access the following parameters (listed alphabetically):
     C<attachment_base>,
     C<commentonchange_resolution>,
     C<commentonduplicate>,
-    C<cookiepath>,
     C<defaultopsys>,
     C<defaultplatform>,
     C<defaultpriority>,
     C<defaultseverity>,
     C<duplicate_or_move_bug_status>,
     C<emailregexpdesc>,
-    C<emailsuffix>,
     C<letsubmitterchoosemilestone>,
     C<letsubmitterchoosepriority>,
     C<mailfrom>,
     C<maintainer>,
     C<maxattachmentsize>,
     C<maxlocalattachment>,
-    C<musthavemilestoneonaccept>,
-    C<noresolveonopenblockers>,
     C<password_complexity>,
     C<rememberlogin>,
     C<requirelogin>,
+    C<resolution_forbidden_with_open_blockers>,
     C<search_allow_no_criteria>,
     C<urlbase>,
+    C<use_email_as_login>,
     C<use_see_also>,
     C<useclassification>,
     C<usemenuforusers>,
diff --git a/Bugzilla/WebService/Classification.pm b/Bugzilla/WebService/Classification.pm
index 8e1b3ae8a6..008b4974e2 100644
--- a/Bugzilla/WebService/Classification.pm
+++ b/Bugzilla/WebService/Classification.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Classification;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,61 +18,76 @@ use Bugzilla::Error;
 use Bugzilla::WebService::Util qw(filter validate params_to_objects);
 
 use constant READ_ONLY => qw(
-    get
+  get
+);
+
+use constant PUBLIC_METHODS => qw(
+  get
 );
 
 sub get {
-    my ($self, $params) = validate(@_, 'names', 'ids');
+  my ($self, $params) = validate(@_, 'names', 'ids');
 
-    defined $params->{names} || defined $params->{ids}
-        || ThrowCodeError('params_required', { function => 'Classification.get',
-                                               params => ['names', 'ids'] });
+  defined $params->{names}
+    || defined $params->{ids}
+    || ThrowCodeError('params_required',
+    {function => 'Classification.get', params => ['names', 'ids']});
 
-    my $user = Bugzilla->user;
+  my $user = Bugzilla->user;
 
-    Bugzilla->params->{'useclassification'}
-      || $user->in_group('editclassifications')
-      || ThrowUserError('auth_classification_not_enabled');
+  Bugzilla->params->{'useclassification'}
+    || $user->in_group('editclassifications')
+    || ThrowUserError('auth_classification_not_enabled');
 
-    Bugzilla->switch_to_shadow_db;
+  Bugzilla->switch_to_shadow_db;
 
-    my @classification_objs = @{ params_to_objects($params, 'Bugzilla::Classification') };
-    unless ($user->in_group('editclassifications')) {
-        my %selectable_class = map { $_->id => 1 } @{$user->get_selectable_classifications};
-        @classification_objs = grep { $selectable_class{$_->id} } @classification_objs;
-    }
+  my @classification_objs
+    = @{params_to_objects($params, 'Bugzilla::Classification')};
+  unless ($user->in_group('editclassifications')) {
+    my %selectable_class
+      = map { $_->id => 1 } @{$user->get_selectable_classifications};
+    @classification_objs = grep { $selectable_class{$_->id} } @classification_objs;
+  }
 
-    my @classifications = map { $self->_classification_to_hash($_, $params) } @classification_objs;
+  my @classifications
+    = map { $self->_classification_to_hash($_, $params) } @classification_objs;
 
-    return { classifications => \@classifications };
+  return {classifications => \@classifications};
 }
 
 sub _classification_to_hash {
-    my ($self, $classification, $params) = @_;
-
-    my $user = Bugzilla->user;
-    return unless (Bugzilla->params->{'useclassification'} || $user->in_group('editclassifications'));
-
-    my $products = $user->in_group('editclassifications') ?
-                     $classification->products : $user->get_selectable_products($classification->id);
-
-    return filter $params, {
-        id          => $self->type('int',    $classification->id),
-        name        => $self->type('string', $classification->name),
-        description => $self->type('string', $classification->description),
-        sort_key    => $self->type('int',    $classification->sortkey),
-        products    => [ map { $self->_product_to_hash($_, $params) } @$products ],
+  my ($self, $classification, $params) = @_;
+
+  my $user = Bugzilla->user;
+  return
+    unless (Bugzilla->params->{'useclassification'}
+    || $user->in_group('editclassifications'));
+
+  my $products
+    = $user->in_group('editclassifications')
+    ? $classification->products
+    : $user->get_selectable_products($classification->id);
+
+  return filter $params,
+    {
+    id          => $self->type('int',    $classification->id),
+    name        => $self->type('string', $classification->name),
+    description => $self->type('string', $classification->description),
+    sort_key    => $self->type('int',    $classification->sortkey),
+    products => [map { $self->_product_to_hash($_, $params) } @$products],
     };
 }
 
 sub _product_to_hash {
-    my ($self, $product, $params) = @_;
-
-    return filter $params, {
-       id          => $self->type('int', $product->id),
-       name        => $self->type('string', $product->name),
-       description => $self->type('string', $product->description),
-   }, undef, 'products';
+  my ($self, $product, $params) = @_;
+
+  return filter $params,
+    {
+    id          => $self->type('int',    $product->id),
+    name        => $self->type('string', $product->name),
+    description => $self->type('string', $product->description),
+    },
+    undef, 'products';
 }
 
 1;
diff --git a/Bugzilla/WebService/Component.pm b/Bugzilla/WebService/Component.pm
index 893e244b89..92def92063 100644
--- a/Bugzilla/WebService/Component.pm
+++ b/Bugzilla/WebService/Component.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Component;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -19,33 +19,210 @@ use Bugzilla::Error;
 use Bugzilla::WebService::Constants;
 use Bugzilla::WebService::Util qw(translate params_to_objects validate);
 
-use constant MAPPED_FIELDS => {
-    default_assignee   => 'initialowner',
-    default_qa_contact => 'initialqacontact',
-    default_cc         => 'initial_cc',
-    is_open            => 'isactive',
+use constant PUBLIC_METHODS => qw(
+  create
+  delete
+  update
+);
+
+use constant CREATE_MAPPED_FIELDS => {
+  default_assignee   => 'initialowner',
+  default_qa_contact => 'initialqacontact',
+  default_cc         => 'initial_cc',
+  is_open            => 'isactive',
+};
+
+use constant MAPPED_FIELDS => {is_open => 'is_active',};
+
+use constant MAPPED_RETURNS => {
+  initialowner     => 'default_assignee',
+  initialqacontact => 'default_qa_contact',
+  cc_list          => 'default_cc',
+  isactive         => 'isopen',
 };
 
 sub create {
-    my ($self, $params) = @_;
+  my ($self, $params) = @_;
+
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar @{$user->get_products_by_permission('editcomponents')}
+    || ThrowUserError('auth_failure',
+    {group => 'editcomponents', action => 'edit', object => 'components'});
+
+  my $product = $user->check_can_admin_product($params->{product});
+
+  # Translate the fields
+  my $values = translate($params, CREATE_MAPPED_FIELDS);
+  $values->{product} = $product;
+
+  # Create the component and return the newly created id.
+  my $component = Bugzilla::Component->create($values);
+  return {id => $self->type('int', $component->id)};
+}
+
+sub _component_params_to_objects {
+
+  # We can't use Util's _param_to_objects since name is a hash
+  my $params = shift;
+  my $user   = Bugzilla->user;
+
+  my @components = ();
+
+  if (defined $params->{ids}) {
+    push @components, @{Bugzilla::Component->new_from_list($params->{ids})};
+  }
+
+  if (defined $params->{names}) {
+
+    # To get the component objects for product/component combination
+    # first obtain the product object from the passed product name
+    foreach my $name_hash (@{$params->{names}}) {
+      my $product = $user->check_can_admin_product($name_hash->{product});
+      push @components,
+        @{Bugzilla::Component->match({
+          product_id => $product->id, name => $name_hash->{component}
+        })};
+    }
+  }
+
+  my %seen_component_ids = ();
+
+  my @accessible_components;
+  foreach my $component (@components) {
+
+    # Skip if we already included this component
+    next if $seen_component_ids{$component->id}++;
+
+    # Can the user see and admin this product?
+    my $product = $component->product;
+    $user->check_can_admin_product($product->name);
+
+    push @accessible_components, $component;
+  }
+
+  return \@accessible_components;
+}
 
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
+sub update {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar @{$user->get_products_by_permission('editcomponents')}
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "components"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Component.update', params => ['ids', 'names']});
+
+  my $component_objects = _component_params_to_objects($params);
+
+  # If the user tries to change component name for several
+  # components of the same product then throw an error
+  if ($params->{name}) {
+    my %unique_product_comps;
+    foreach my $comp (@$component_objects) {
+      if ($unique_product_comps{$comp->product_id}) {
+        ThrowUserError("multiple_components_update_not_allowed");
+      }
+      else {
+        $unique_product_comps{$comp->product_id} = 1;
+      }
+    }
+  }
+
+  my $values = translate($params, MAPPED_FIELDS);
+
+  # We delete names and ids to keep only new values to set.
+  delete $values->{names};
+  delete $values->{ids};
+
+  $dbh->bz_start_transaction();
+  foreach my $component (@$component_objects) {
+    $component->set_all($values);
+  }
+
+  my %changes;
+  foreach my $component (@$component_objects) {
+    my $returned_changes = $component->update();
+    $changes{$component->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $component (@$component_objects) {
+    my %hash = (id => $component->id, changes => {},);
+
+    foreach my $field (keys %{$changes{$component->id}}) {
+      my $change = $changes{$component->id}->{$field};
+
+      if ( $field eq 'default_assignee'
+        || $field eq 'default_qa_contact'
+        || $field eq 'default_cc')
+      {
+        # We need to convert user ids to login names
+        my @old_user_ids = split(/[,\s]+/, $change->[0]);
+        my @new_user_ids = split(/[,\s]+/, $change->[1]);
+
+        my @old_users
+          = map { $_->login } @{Bugzilla::User->new_from_list(\@old_user_ids)};
+        my @new_users
+          = map { $_->login } @{Bugzilla::User->new_from_list(\@new_user_ids)};
+
+        $hash{changes}{$field} = {
+          removed => $self->type('string', join(', ', @old_users)),
+          added   => $self->type('string', join(', ', @new_users)),
+        };
+      }
+      else {
+        $hash{changes}{$field} = {
+          removed => $self->type('string', $change->[0]),
+          added   => $self->type('string', $change->[1])
+        };
+      }
+    }
+
+    push(@result, \%hash);
+  }
+
+  return {components => \@result};
+}
+
+sub delete {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar @{$user->get_products_by_permission('editcomponents')}
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "components"});
 
-    $user->in_group('editcomponents')
-        || scalar @{ $user->get_products_by_permission('editcomponents') }
-        || ThrowUserError('auth_failure', { group  => 'editcomponents',
-                                            action => 'edit',
-                                            object => 'components' });
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Component.delete', params => ['ids', 'names']});
 
-    my $product = $user->check_can_admin_product($params->{product});
+  my $component_objects = _component_params_to_objects($params);
 
-    # Translate the fields
-    my $values = translate($params, MAPPED_FIELDS);
-    $values->{product} = $product;
+  $dbh->bz_start_transaction();
+  my %changes;
+  foreach my $component (@$component_objects) {
+    my $returned_changes = $component->remove_from_db();
+  }
+  $dbh->bz_commit_transaction();
 
-    # Create the component and return the newly created id.
-    my $component = Bugzilla::Component->create($values);
-    return { id => $self->type('int', $component->id) };
+  my @result;
+  foreach my $component (@$component_objects) {
+    push @result, {id => $component->id};
+  }
+
+  return {components => \@result};
 }
 
 1;
@@ -147,3 +324,260 @@ specified product.
 
 =back
 
+=head2 update
+
+=over
+
+=item B<Description>
+
+This allows you to update one or more components in Bugzilla.
+
+=item B<REST>
+
+PUT /rest/component/<component_id>
+
+PUT /rest/component/<product_name>/<component_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
+=item B<Params>
+
+B<Note:> The following parameters specify which components you are updating.
+You must set one or both of these parameters.
+
+=over
+
+=item C<ids>
+
+C<array> of C<int>s. Numeric ids of the components that you wish to update.
+
+=item C<names>
+
+C<array> of C<hash>es. Names of the components that you wish to update. The
+hash keys are C<product> and C<component>, representing the name of the product
+and the component you wish to change.
+
+=back
+
+B<Note:> The following parameters specify the new values you want to set for
+the components you are updating.
+
+=over
+
+=item C<name>
+
+C<string> A new name for this component. If you try to set this while updating
+more than one component for a product, an error will occur, as component names
+must be unique per product.
+
+=item C<description>
+
+C<string> Update the long description for these components to this value.
+
+=item C<default_assignee>
+
+C<string> The login name of the default assignee of the component.
+
+=item C<default_cc>
+
+C<array> An array of strings with each element representing one login name of the default CC list.
+
+=item C<default_qa_contact>
+
+C<string> The login name of the default QA contact for the component.
+
+=item C<is_open>
+
+C<boolean> True if the component is currently allowing bugs to be entered
+into it, False otherwise.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "components". This points to an array of hashes
+with the following fields:
+
+=over
+
+=item C<id>
+
+C<int> The id of the component that was updated.
+
+=item C<changes>
+
+C<hash> The changes that were actually done on this component. The keys are
+the names of the fields that were changed, and the values are a hash
+with two keys:
+
+=over
+
+=item C<added>
+
+C<string> The value that this field was changed to.
+
+=item C<removed>
+
+C<string> The value that was previously set in this field.
+
+=back
+
+Note that booleans will be represented with the strings '1' and '0'.
+
+Here's an example of what a return value might look like:
+
+ {
+   components => [
+     {
+       id => 123,
+       changes => {
+         name => {
+           removed => 'FooName',
+           added   => 'BarName'
+         },
+         default_assignee => {
+           removed => 'foo@company.com',
+           added   => 'bar@company.com',
+         }
+       }
+     }
+   ]
+ }
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 51 (User does not exist)
+
+One of the contact e-mail addresses is not a valid Bugzilla user.
+
+=item 106 (Product access denied)
+
+The product you are trying to modify does not exist or you don't have access to it.
+
+=item 706 (Product admin denied)
+
+You do not have the permission to change components for this product.
+
+=item 105 (Component name too long)
+
+The name specified for this component was longer than the maximum
+allowed length.
+
+=item 1200 (Component name already exists)
+
+You specified the name of a component that already exists.
+(Component names must be unique per product in Bugzilla.)
+
+=item 1210 (Component blank name)
+
+You must specify a non-blank name for this component.
+
+=item 1211 (Component must have description)
+
+You must specify a description for this component.
+
+=item 1212 (Component name is not unique)
+
+You have attempted to set more than one component in the same product with the
+same name. Component names must be unique in each product.
+
+=item 1213 (Component needs a default assignee)
+
+A default assignee is required for this component.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>.
+
+=back
+
+=back
+
+=head2 delete
+
+=over
+
+=item B<Description>
+
+This allows you to delete one or more components in Bugzilla.
+
+=item B<REST>
+
+DELETE /rest/component/<component_id>
+
+DELETE /rest/component/<product_name>/<component_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The C<ids> and C<names> params will be overridden as
+it is pulled from the URL path.
+
+=item B<Params>
+
+B<Note:> The following parameters specify which components you are deleting.
+You must set one or both of these parameters.
+
+=over
+
+=item C<ids>
+
+C<array> of C<int>s. Numeric ids of the components that you wish to delete.
+
+=item C<names>
+
+C<array> of C<hash>es. Names of the components that you wish to delete. The
+hash keys are C<product> and C<component>, representing the name of the product
+and the component you wish to delete.
+
+=back
+
+=item B<Returns>
+
+A C<hash> with a single field "components". This points to an array of hashes
+with the following field:
+
+=over
+
+=item C<id>
+
+C<int> The id of the component that was deleted.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 106 (Product access denied)
+
+The product you are trying to modify does not exist or you don't have access to it.
+
+=item 706 (Product admin denied)
+
+You do not have the permission to delete components for this product.
+
+=item 1202 (Component has bugs)
+
+The component you are trying to delete currently has bugs assigned to it.
+You must move these bugs before trying to delete the component.
+
+=back
+
+=item B<History>
+
+=over
+
+=item Added in Bugzilla B<5.0>
+
+=back
+
+=back
diff --git a/Bugzilla/WebService/Constants.pm b/Bugzilla/WebService/Constants.pm
index db50611cbf..f18f9f0ecb 100644
--- a/Bugzilla/WebService/Constants.pm
+++ b/Bugzilla/WebService/Constants.pm
@@ -7,32 +7,34 @@
 
 package Bugzilla::WebService::Constants;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Exporter);
 
 our @EXPORT = qw(
-    WS_ERROR_CODE
+  WS_ERROR_CODE
 
-    STATUS_OK
-    STATUS_CREATED
-    STATUS_ACCEPTED
-    STATUS_NO_CONTENT
-    STATUS_MULTIPLE_CHOICES
-    STATUS_BAD_REQUEST
-    STATUS_NOT_FOUND
-    STATUS_GONE
-    REST_STATUS_CODE_MAP
+  STATUS_OK
+  STATUS_CREATED
+  STATUS_ACCEPTED
+  STATUS_NO_CONTENT
+  STATUS_MULTIPLE_CHOICES
+  STATUS_BAD_REQUEST
+  STATUS_NOT_FOUND
+  STATUS_GONE
+  REST_STATUS_CODE_MAP
 
-    ERROR_UNKNOWN_FATAL
-    ERROR_UNKNOWN_TRANSIENT
+  ERROR_UNKNOWN_FATAL
+  ERROR_UNKNOWN_TRANSIENT
 
-    XMLRPC_CONTENT_TYPE_WHITELIST
-    REST_CONTENT_TYPE_WHITELIST
+  XMLRPC_CONTENT_TYPE_WHITELIST
+  REST_CONTENT_TYPE_WHITELIST
 
-    WS_DISPATCH
+  WS_DISPATCH
+
+  API_AUTH_HEADERS
 );
 
 # This maps the error names in global/*-error.html.tmpl to numbers.
@@ -54,172 +56,205 @@ our @EXPORT = qw(
 # comment that it was retired. Also, if an error changes its name, you'll
 # have to fix it here.
 use constant WS_ERROR_CODE => {
-    # Generic errors (Bugzilla::Object and others) are 50-99.    
-    object_not_specified        => 50,
-    reassign_to_empty           => 50,
-    param_required              => 50,
-    params_required             => 50,
-    undefined_field             => 50,
-    object_does_not_exist       => 51,
-    param_must_be_numeric       => 52,
-    number_not_numeric          => 52,
-    param_invalid               => 53,
-    number_too_large            => 54,
-    number_too_small            => 55,
-    illegal_date                => 56,
-    # Bug errors usually occupy the 100-200 range.
-    improper_bug_id_field_value => 100,
-    bug_id_does_not_exist       => 101,
-    bug_access_denied           => 102,
-    bug_access_query            => 102,
-    # These all mean "invalid alias"
-    alias_too_long           => 103,
-    alias_in_use             => 103,
-    alias_is_numeric         => 103,
-    alias_has_comma_or_space => 103,
-    multiple_alias_not_allowed => 103,
-    # Misc. bug field errors
-    illegal_field => 104,
-    freetext_too_long => 104,
-    # Component errors
-    require_component         => 105,
-    component_name_too_long   => 105,
-    product_unknown_component => 105,
-    # Invalid Product
-    no_products         => 106,
-    entry_access_denied => 106,
-    product_access_denied => 106,
-    product_disabled    => 106,
-    # Invalid Summary
-    require_summary => 107,
-    # Invalid field name
-    invalid_field_name => 108,
-    # Not authorized to edit the bug
-    product_edit_denied => 109,
-    # Comment-related errors
-    comment_is_private => 110,
-    comment_id_invalid => 111,
-    comment_too_long => 114,
-    comment_invalid_isprivate => 117,
-    markdown_disabled => 140,
-    # Comment tagging
-    comment_tag_disabled => 125,
-    comment_tag_invalid => 126,
-    comment_tag_too_long => 127,
-    comment_tag_too_short => 128,
-    # See Also errors
-    bug_url_invalid => 112,
-    bug_url_too_long => 112,
-    # Insidergroup Errors
-    user_not_insider => 113,
-    # Note: 114 is above in the Comment-related section.
-    # Bug update errors
-    illegal_change => 115,
-    # Dependency errors
-    dependency_loop_single => 116,
-    dependency_loop_multi  => 116,
-    # Note: 117 is above in the Comment-related section.
-    # Dup errors
-    dupe_loop_detected => 118,
-    dupe_id_required => 119,
-    # Bug-related group errors
-    group_invalid_removal => 120,
-    group_restriction_not_allowed => 120,
-    # Status/Resolution errors
-    missing_resolution => 121,
-    resolution_not_allowed => 122,
-    illegal_bug_status_transition => 123,
-    # Flag errors
-    flag_status_invalid => 129,
-    flag_update_denied => 130,
-    flag_type_requestee_disabled => 131,
-    flag_not_unique => 132,
-    flag_type_not_unique => 133,
-    flag_type_inactive => 134,
-
-    # Authentication errors are usually 300-400.
-    invalid_login_or_password => 300,
-    account_disabled             => 301,
-    auth_invalid_email           => 302,
-    extern_id_conflict           => -303,
-    auth_failure                 => 304,
-    password_too_short           => 305,
-    password_not_complex         => 305,
-    api_key_not_valid            => 306,
-    api_key_revoked              => 306,
-    auth_invalid_token           => 307,
-
-    # Except, historically, AUTH_NODATA, which is 410.
-    login_required               => 410,
-
-    # User errors are 500-600.
-    account_exists        => 500,
-    illegal_email_address => 501,
-    auth_cant_create_account    => 501,
-    account_creation_disabled   => 501,
-    account_creation_restricted => 501,
-    password_too_short    => 502,
-    # Error 503 password_too_long no longer exists.
-    invalid_username      => 504,
-    # This is from strict_isolation, but it also basically means 
-    # "invalid user."
-    invalid_user_group    => 504,
-    user_access_by_id_denied    => 505,
-    user_access_by_match_denied => 505,
-
-    # Attachment errors are 600-700.
-    file_too_large         => 600,
-    invalid_content_type   => 601,
-    # Error 602 attachment_illegal_url no longer exists.
-    file_not_specified     => 603,
-    missing_attachment_description => 604,
-    # Error 605 attachment_url_disabled no longer exists.
-    zero_length_file       => 606,
-
-    # Product erros are 700-800
-    product_blank_name => 700,
-    product_name_too_long => 701,
-    product_name_already_in_use => 702,
-    product_name_diff_in_case => 702,
-    product_must_have_description => 703,
-    product_must_have_version => 704,
-    product_must_define_defaultmilestone => 705,
-
-    # Group errors are 800-900
-    empty_group_name => 800,
-    group_exists => 801,
-    empty_group_description => 802,
-    invalid_regexp => 803,
-    invalid_group_name => 804,
-    group_cannot_view => 805,
-
-    # Classification errors are 900-1000
-    auth_classification_not_enabled => 900,
-
-    # Search errors are 1000-1100
-    buglist_parameters_required => 1000,
-
-    # Flag type errors are 1100-1200
-    flag_type_name_invalid        => 1101,
-    flag_type_description_invalid => 1102,
-    flag_type_cc_list_invalid     => 1103,
-    flag_type_sortkey_invalid     => 1104,
-    flag_type_not_editable        => 1105,
-
-    # Component errors are 1200-1300
-    component_already_exists => 1200,
-    component_is_last        => 1201,
-    component_has_bugs       => 1202,
-
-    # Errors thrown by the WebService itself. The ones that are negative 
-    # conform to http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
-    xmlrpc_invalid_value => -32600,
-    unknown_method       => -32601,
-    json_rpc_post_only   => 32610,
-    json_rpc_invalid_callback => 32611,
-    xmlrpc_illegal_content_type   => 32612,
-    json_rpc_illegal_content_type => 32613,
-    rest_invalid_resource         => 32614,
+
+  # Generic errors (Bugzilla::Object and others) are 50-99.
+  object_not_specified        => 50,
+  reassign_to_empty           => 50,
+  param_required              => 50,
+  params_required             => 50,
+  undefined_field             => 50,
+  object_does_not_exist       => 51,
+  param_must_be_numeric       => 52,
+  number_not_numeric          => 52,
+  param_invalid               => 53,
+  number_too_large            => 54,
+  number_too_small            => 55,
+  illegal_date                => 56,
+  param_integer_required      => 57,
+  param_scalar_array_required => 58,
+
+  # Bug errors usually occupy the 100-200 range.
+  improper_bug_id_field_value => 100,
+  bug_id_does_not_exist       => 101,
+  bug_access_denied           => 102,
+  bug_access_query            => 102,
+
+  # These all mean "invalid alias"
+  alias_too_long             => 103,
+  alias_in_use               => 103,
+  alias_is_numeric           => 103,
+  alias_has_comma_or_space   => 103,
+  multiple_alias_not_allowed => 103,
+
+  # Misc. bug field errors
+  illegal_field     => 104,
+  freetext_too_long => 104,
+
+  # Component errors
+  require_component         => 105,
+  component_name_too_long   => 105,
+  product_unknown_component => 105,
+
+  # Invalid Product
+  no_products           => 106,
+  entry_access_denied   => 106,
+  product_access_denied => 106,
+  product_disabled      => 106,
+
+  # Invalid Summary
+  require_summary => 107,
+
+  # Invalid field name
+  invalid_field_name => 108,
+
+  # Not authorized to edit the bug
+  product_edit_denied => 109,
+
+  # Comment-related errors
+  comment_is_private        => 110,
+  comment_id_invalid        => 111,
+  comment_too_long          => 114,
+  comment_invalid_isprivate => 117,
+  markdown_disabled         => 140,
+
+  # Comment tagging
+  comment_tag_disabled  => 125,
+  comment_tag_invalid   => 126,
+  comment_tag_too_long  => 127,
+  comment_tag_too_short => 128,
+
+  # See Also errors
+  bug_url_invalid  => 112,
+  bug_url_too_long => 112,
+
+  # Insidergroup Errors
+  user_not_insider => 113,
+
+  # Note: 114 is above in the Comment-related section.
+  # Bug update errors
+  illegal_change => 115,
+
+  # Dependency errors
+  dependency_loop_single => 116,
+  dependency_loop_multi  => 116,
+
+  # Note: 117 is above in the Comment-related section.
+  # Dup errors
+  dupe_loop_detected => 118,
+  dupe_id_required   => 119,
+
+  # Bug-related group errors
+  group_invalid_removal         => 120,
+  group_restriction_not_allowed => 120,
+
+  # Status/Resolution errors
+  missing_resolution            => 121,
+  resolution_not_allowed        => 122,
+  illegal_bug_status_transition => 123,
+
+  # Flag errors
+  flag_status_invalid          => 129,
+  flag_update_denied           => 130,
+  flag_type_requestee_disabled => 131,
+  flag_not_unique              => 132,
+  flag_type_not_unique         => 133,
+  flag_type_inactive           => 134,
+
+  # Authentication errors are usually 300-400.
+  invalid_login_or_password => 300,
+  account_disabled          => 301,
+  auth_invalid_email        => 302,
+  extern_id_conflict        => -303,
+  auth_failure              => 304,
+  password_too_short        => 305,
+  password_not_complex      => 305,
+  api_key_not_valid         => 306,
+  api_key_revoked           => 306,
+  auth_invalid_token        => 307,
+
+  # Except, historically, AUTH_NODATA, which is 410.
+  login_required => 410,
+
+  # User errors are 500-600.
+  account_exists              => 500,
+  illegal_email_address       => 501,
+  auth_cant_create_account    => 501,
+  account_creation_disabled   => 501,
+  account_creation_restricted => 501,
+  password_too_short          => 502,
+
+  # Error 503 password_too_long no longer exists.
+  invalid_username => 504,
+
+  # This is from strict_isolation, but it also basically means
+  # "invalid user."
+  invalid_user_group          => 504,
+  user_access_by_id_denied    => 505,
+  user_access_by_match_denied => 505,
+
+  # Attachment errors are 600-700.
+  file_too_large       => 600,
+  invalid_content_type => 601,
+
+  # Error 602 attachment_illegal_url no longer exists.
+  file_not_specified             => 603,
+  missing_attachment_description => 604,
+
+  # Error 605 attachment_url_disabled no longer exists.
+  zero_length_file => 606,
+
+  # Product erros are 700-800
+  product_blank_name                   => 700,
+  product_name_too_long                => 701,
+  product_name_already_in_use          => 702,
+  product_name_diff_in_case            => 702,
+  product_must_have_description        => 703,
+  product_must_have_version            => 704,
+  product_must_define_defaultmilestone => 705,
+  product_admin_denied                 => 706,
+
+  # Group errors are 800-900
+  empty_group_name        => 800,
+  group_exists            => 801,
+  empty_group_description => 802,
+  invalid_regexp          => 803,
+  invalid_group_name      => 804,
+  group_cannot_view       => 805,
+
+  # Classification errors are 900-1000
+  auth_classification_not_enabled => 900,
+
+  # Search errors are 1000-1100
+  buglist_parameters_required => 1000,
+
+  # Flag type errors are 1100-1200
+  flag_type_name_invalid        => 1101,
+  flag_type_description_invalid => 1102,
+  flag_type_cc_list_invalid     => 1103,
+  flag_type_sortkey_invalid     => 1104,
+  flag_type_not_editable        => 1105,
+
+  # Component errors are 1200-1300
+  component_already_exists               => 1200,
+  component_is_last                      => 1201,
+  component_has_bugs                     => 1202,
+  component_blank_name                   => 1210,
+  component_blank_description            => 1211,
+  multiple_components_update_not_allowed => 1212,
+  component_need_initialowner            => 1213,
+
+  # BugUserLastVisited errors
+  user_not_involved => 1300,
+
+  # Errors thrown by the WebService itself. The ones that are negative
+  # conform to http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php
+  xmlrpc_invalid_value          => -32600,
+  unknown_method                => -32601,
+  json_rpc_post_only            => 32610,
+  json_rpc_invalid_callback     => 32611,
+  xmlrpc_illegal_content_type   => 32612,
+  json_rpc_illegal_content_type => 32613,
+  rest_invalid_resource         => 32614,
 };
 
 # RESTful webservices use the http status code
@@ -239,7 +274,8 @@ use constant STATUS_GONE             => 410;
 # the related webvservice call. We choose the appropriate
 # http status code based on the error code or use the
 # default STATUS_BAD_REQUEST.
-use constant REST_STATUS_CODE_MAP => {
+sub REST_STATUS_CODE_MAP {
+  my $status_code_map = {
     51       => STATUS_NOT_FOUND,
     101      => STATUS_NOT_FOUND,
     102      => STATUS_NOT_AUTHORIZED,
@@ -259,46 +295,63 @@ use constant REST_STATUS_CODE_MAP => {
     505      => STATUS_NOT_AUTHORIZED,
     32614    => STATUS_NOT_FOUND,
     _default => STATUS_BAD_REQUEST
-};
+  };
+
+  Bugzilla::Hook::process('webservice_status_code_map',
+    {status_code_map => $status_code_map});
+
+  return $status_code_map;
+}
 
 # These are the fallback defaults for errors not in ERROR_CODE.
 use constant ERROR_UNKNOWN_FATAL     => -32000;
 use constant ERROR_UNKNOWN_TRANSIENT => 32000;
 
-use constant ERROR_GENERAL       => 999;
+use constant ERROR_GENERAL => 999;
 
 use constant XMLRPC_CONTENT_TYPE_WHITELIST => qw(
-    text/xml
-    application/xml
+  text/xml
+  application/xml
 );
 
 # The first content type specified is used as the default.
 use constant REST_CONTENT_TYPE_WHITELIST => qw(
-    application/json
-    application/javascript
-    text/javascript
-    text/html
+  application/json
+  application/javascript
+  text/javascript
+  text/html
 );
 
 sub WS_DISPATCH {
-    # We "require" here instead of "use" above to avoid a dependency loop.
-    require Bugzilla::Hook;
-    my %hook_dispatch;
-    Bugzilla::Hook::process('webservice', { dispatch => \%hook_dispatch });
-
-    my $dispatch = {
-        'Bugzilla'         => 'Bugzilla::WebService::Bugzilla',
-        'Bug'              => 'Bugzilla::WebService::Bug',
-        'Classification'   => 'Bugzilla::WebService::Classification',
-        'Component'        => 'Bugzilla::WebService::Component',
-        'FlagType'         => 'Bugzilla::WebService::FlagType',
-        'Group'            => 'Bugzilla::WebService::Group',
-        'Product'          => 'Bugzilla::WebService::Product',
-        'User'             => 'Bugzilla::WebService::User',
-        'BugUserLastVisit' => 'Bugzilla::WebService::BugUserLastVisit',
-        %hook_dispatch
-    };
-    return $dispatch;
+
+  # We "require" here instead of "use" above to avoid a dependency loop.
+  require Bugzilla::Hook;
+  my %hook_dispatch;
+  Bugzilla::Hook::process('webservice', {dispatch => \%hook_dispatch});
+
+  my $dispatch = {
+    'Bugzilla'         => 'Bugzilla::WebService::Bugzilla',
+    'Bug'              => 'Bugzilla::WebService::Bug',
+    'Classification'   => 'Bugzilla::WebService::Classification',
+    'Component'        => 'Bugzilla::WebService::Component',
+    'FlagType'         => 'Bugzilla::WebService::FlagType',
+    'Group'            => 'Bugzilla::WebService::Group',
+    'Product'          => 'Bugzilla::WebService::Product',
+    'User'             => 'Bugzilla::WebService::User',
+    'BugUserLastVisit' => 'Bugzilla::WebService::BugUserLastVisit',
+    %hook_dispatch
+  };
+  return $dispatch;
+}
+
+# Custom HTTP headers that can be used for API authentication rather than
+# passing as URL parameters. This is useful if you do not want sensitive
+# information to show up in webserver log files.
+use constant API_AUTH_HEADERS => {
+  X_BUGZILLA_LOGIN    => 'Bugzilla_login',
+  X_BUGZILLA_PASSWORD => 'Bugzilla_password',
+  X_BUGZILLA_API_KEY  => 'Bugzilla_api_key',
+  X_BUGZILLA_TOKEN    => 'Bugzilla_token',
 };
 
 1;
@@ -307,6 +360,8 @@ sub WS_DISPATCH {
 
 =over
 
+=item REST_STATUS_CODE_MAP
+
 =item WS_DISPATCH
 
 =back
diff --git a/Bugzilla/WebService/FlagType.pm b/Bugzilla/WebService/FlagType.pm
index cf654e6592..0b0aff4393 100644
--- a/Bugzilla/WebService/FlagType.pm
+++ b/Bugzilla/WebService/FlagType.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::FlagType;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -21,291 +21,309 @@ use Bugzilla::Util qw(trim);
 
 use List::MoreUtils qw(uniq);
 
-sub get {
-    my ($self, $params) = @_;
-    my $dbh  = Bugzilla->switch_to_shadow_db();
-    my $user = Bugzilla->user;
-
-    defined $params->{product}
-        || ThrowCodeError('param_required',
-                          { function => 'Bug.flag_types',
-                            param   => 'product' });
-
-    my $product   = delete $params->{product};
-    my $component = delete $params->{component};
-
-    $product = Bugzilla::Product->check({ name => $product, cache => 1 });
-    $component = Bugzilla::Component->check(
-        { name => $component, product => $product, cache => 1 }) if $component;
-
-    my $flag_params = { product_id => $product->id };
-    $flag_params->{component_id} = $component->id if $component;
-    my $matched_flag_types = Bugzilla::FlagType::match($flag_params);
-
-    my $flag_types = { bug => [], attachment => [] };
-    foreach my $flag_type (@$matched_flag_types) {
-        push(@{ $flag_types->{bug} }, $self->_flagtype_to_hash($flag_type, $product))
-            if $flag_type->target_type eq 'bug';
-        push(@{ $flag_types->{attachment} }, $self->_flagtype_to_hash($flag_type, $product))
-            if $flag_type->target_type eq 'attachment';
-    }
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  update
+);
 
-    return $flag_types;
+sub get {
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->switch_to_shadow_db();
+  my $user = Bugzilla->user;
+
+  defined $params->{product}
+    || ThrowCodeError('param_required',
+    {function => 'Bug.flag_types', param => 'product'});
+
+  my $product   = delete $params->{product};
+  my $component = delete $params->{component};
+
+  $product = Bugzilla::Product->check({name => $product, cache => 1});
+  $component
+    = Bugzilla::Component->check(
+    {name => $component, product => $product, cache => 1})
+    if $component;
+
+  my $flag_params = {product_id => $product->id};
+  $flag_params->{component_id} = $component->id if $component;
+  my $matched_flag_types = Bugzilla::FlagType::match($flag_params);
+
+  my $flag_types = {bug => [], attachment => []};
+  foreach my $flag_type (@$matched_flag_types) {
+    push(@{$flag_types->{bug}}, $self->_flagtype_to_hash($flag_type, $product))
+      if $flag_type->target_type eq 'bug';
+    push(
+      @{$flag_types->{attachment}},
+      $self->_flagtype_to_hash($flag_type, $product)
+    ) if $flag_type->target_type eq 'attachment';
+  }
+
+  return $flag_types;
 }
 
 sub create {
-    my ($self, $params) = @_;
-
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    Bugzilla->user->in_group('editcomponents')
-        || scalar(@{$user->get_products_by_permission('editcomponents')})
-        || ThrowUserError("auth_failure", { group => "editcomponents",
-                                         action => "add",
-                                         object => "flagtypes" });
-
-    $params->{name} || ThrowCodeError('param_required', { param => 'name' });
-    $params->{description} || ThrowCodeError('param_required', { param => 'description' });
-
-    my %args = (
-        sortkey => 1,
-        name => undef,
-        inclusions => ['0:0'],  # Default to __ALL__:__ALL__
-        cc_list => '',
-        description => undef,
-        is_requestable => 'on',
-        exclusions => [],
-        is_multiplicable => 'on',
-        request_group => '',
-        is_active => 'on',
-        is_specifically_requestable => 'on',
-        target_type => 'bug',
-        grant_group => '',
-    );
-
-    foreach my $key (keys %args) {
-        $args{$key} = $params->{$key} if defined($params->{$key});
+  my ($self, $params) = @_;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar(@{$user->get_products_by_permission('editcomponents')})
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "add", object => "flagtypes"});
+
+  $params->{name} || ThrowCodeError('param_required', {param => 'name'});
+  $params->{description}
+    || ThrowCodeError('param_required', {param => 'description'});
+
+  my %args = (
+    sortkey                     => 1,
+    name                        => undef,
+    inclusions                  => ['0:0'],    # Default to __ALL__:__ALL__
+    cc_list                     => '',
+    description                 => undef,
+    is_requestable              => 'on',
+    exclusions                  => [],
+    is_multiplicable            => 'on',
+    request_group               => '',
+    is_active                   => 'on',
+    is_specifically_requestable => 'on',
+    target_type                 => 'bug',
+    grant_group                 => '',
+  );
+
+  foreach my $key (keys %args) {
+    $args{$key} = $params->{$key} if defined($params->{$key});
+  }
+
+  $args{name}        = trim($params->{name});
+  $args{description} = trim($params->{description});
+
+  # Is specifically requestable is actually is_requesteeable
+  if (exists $args{is_specifically_requestable}) {
+    $args{is_requesteeble} = delete $args{is_specifically_requestable};
+  }
+
+# Default is on for the tickbox flags.
+# If the user has set them to 'off' then undefine them so the flags are not ticked
+  foreach
+    my $arg_name (qw(is_requestable is_multiplicable is_active is_requesteeble))
+  {
+    if (defined($args{$arg_name}) && ($args{$arg_name} eq '0')) {
+      $args{$arg_name} = undef;
     }
+  }
 
-    $args{name} = trim($params->{name});
-    $args{description} = trim($params->{description});
+  # Process group inclusions and exclusions
+  $args{inclusions} = _process_lists($params->{inclusions})
+    if defined $params->{inclusions};
+  $args{exclusions} = _process_lists($params->{exclusions})
+    if defined $params->{exclusions};
 
-    # Is specifically requestable is actually is_requesteeable
-    if (exists $args{is_specifically_requestable}) {
-        $args{is_requesteeble} = delete $args{is_specifically_requestable};
-    }
-
-    # Default is on for the tickbox flags.
-    # If the user has set them to 'off' then undefine them so the flags are not ticked
-    foreach my $arg_name (qw(is_requestable is_multiplicable is_active is_requesteeble)) {
-        if (defined($args{$arg_name}) && ($args{$arg_name} eq '0')) {
-            $args{$arg_name} = undef;
-        }
-    }
+  my $flagtype = Bugzilla::FlagType->create(\%args);
 
-    # Process group inclusions and exclusions
-    $args{inclusions} = _process_lists($params->{inclusions}) if defined $params->{inclusions};
-    $args{exclusions} = _process_lists($params->{exclusions}) if defined $params->{exclusions};
-
-    my $flagtype = Bugzilla::FlagType->create(\%args);
-
-    return { id => $self->type('int', $flagtype->id)  };
+  return {id => $self->type('int', $flagtype->id)};
 }
 
 sub update {
-    my ($self, $params) = @_;
-
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    Bugzilla->login(LOGIN_REQUIRED);
-    $user->in_group('editcomponents')
-        || scalar(@{$user->get_products_by_permission('editcomponents')})
-        || ThrowUserError("auth_failure", { group  => "editcomponents",
-                                            action => "edit",
-                                            object => "flagtypes" });
-
-    defined($params->{names}) || defined($params->{ids})
-        || ThrowCodeError('params_required',
-               { function => 'FlagType.update', params => ['ids', 'names'] });
-
-    # Get the list of unique flag type ids we are updating
-    my @flag_type_ids = defined($params->{ids}) ? @{$params->{ids}} : ();
-    if (defined $params->{names}) {
-        push @flag_type_ids, map { $_->id }
-            @{ Bugzilla::FlagType::match({ name => $params->{names} }) };
+  my ($self, $params) = @_;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  $user->in_group('editcomponents')
+    || scalar(@{$user->get_products_by_permission('editcomponents')})
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "flagtypes"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'FlagType.update', params => ['ids', 'names']});
+
+  # Get the list of unique flag type ids we are updating
+  my @flag_type_ids = defined($params->{ids}) ? @{$params->{ids}} : ();
+  if (defined $params->{names}) {
+    push @flag_type_ids,
+      map { $_->id } @{Bugzilla::FlagType::match({name => $params->{names}})};
+  }
+  @flag_type_ids = uniq @flag_type_ids;
+
+  # We delete names and ids to keep only new values to set.
+  delete $params->{names};
+  delete $params->{ids};
+
+  # Process group inclusions and exclusions
+  # We removed them from $params because these are handled differently
+  my $inclusions = _process_lists(delete $params->{inclusions})
+    if defined $params->{inclusions};
+  my $exclusions = _process_lists(delete $params->{exclusions})
+    if defined $params->{exclusions};
+
+  $dbh->bz_start_transaction();
+  my %changes = ();
+
+  foreach my $flag_type_id (@flag_type_ids) {
+    my ($flagtype, $can_fully_edit)
+      = $user->check_can_admin_flagtype($flag_type_id);
+
+    if ($can_fully_edit) {
+      $flagtype->set_all($params);
+    }
+    elsif (scalar keys %$params) {
+      ThrowUserError('flag_type_not_editable', {flagtype => $flagtype});
     }
-    @flag_type_ids = uniq @flag_type_ids;
-
-    # We delete names and ids to keep only new values to set.
-    delete $params->{names};
-    delete $params->{ids};
-
-    # Process group inclusions and exclusions
-    # We removed them from $params because these are handled differently
-    my $inclusions = _process_lists(delete $params->{inclusions}) if defined $params->{inclusions};
-    my $exclusions = _process_lists(delete $params->{exclusions}) if defined $params->{exclusions};
-
-    $dbh->bz_start_transaction();
-    my %changes = ();
 
-    foreach my $flag_type_id (@flag_type_ids) {
-        my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_type_id);
+    # Process the clusions
+    foreach my $type ('inclusions', 'exclusions') {
+      my $clusions = $type eq 'inclusions' ? $inclusions : $exclusions;
+      next if not defined $clusions;
 
-        if ($can_fully_edit) {
-            $flagtype->set_all($params);
-        }
-        elsif (scalar keys %$params) {
-            ThrowUserError('flag_type_not_editable', { flagtype => $flagtype });
-        }
+      my @extra_clusions = ();
+      if (!$user->in_group('editcomponents')) {
+        my $products = $user->get_products_by_permission('editcomponents');
 
-        # Process the clusions
-        foreach my $type ('inclusions', 'exclusions') {
-            my $clusions = $type eq 'inclusions' ? $inclusions : $exclusions;
-            next if not defined $clusions;
-
-            my @extra_clusions = ();
-            if (!$user->in_group('editcomponents')) {
-                my $products = $user->get_products_by_permission('editcomponents');
-                # Bring back the products the user cannot edit.
-                foreach my $item (values %{$flagtype->$type}) {
-                    my ($prod_id, $comp_id) = split(':', $item);
-                    push(@extra_clusions, $item) unless grep { $_->id == $prod_id } @$products;
-                }
-            }
-
-            $flagtype->set_clusions({
-                $type => [@$clusions, @extra_clusions],
-            });
+        # Bring back the products the user cannot edit.
+        foreach my $item (values %{$flagtype->$type}) {
+          my ($prod_id, $comp_id) = split(':', $item);
+          push(@extra_clusions, $item) unless grep { $_->id == $prod_id } @$products;
         }
+      }
 
-        my $returned_changes = $flagtype->update();
-        $changes{$flagtype->id} = {
-            name    => $flagtype->name,
-            changes => $returned_changes,
-        };
+      $flagtype->set_clusions({$type => [@$clusions, @extra_clusions],});
     }
-    $dbh->bz_commit_transaction();
-
-    my @result;
-    foreach my $flag_type_id (keys %changes) {
-        my %hash = (
-            id      => $self->type('int',    $flag_type_id),
-            name    => $self->type('string', $changes{$flag_type_id}{name}),
-            changes => {},
-        );
-
-        foreach my $field (keys %{ $changes{$flag_type_id}{changes} }) {
-            my $change = $changes{$flag_type_id}{changes}{$field};
-            $hash{changes}{$field} = {
-                removed => $self->type('string', $change->[0]),
-                added   => $self->type('string', $change->[1])
-            };
-        }
 
-        push(@result, \%hash);
+    my $returned_changes = $flagtype->update();
+    $changes{$flagtype->id}
+      = {name => $flagtype->name, changes => $returned_changes,};
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $flag_type_id (keys %changes) {
+    my %hash = (
+      id      => $self->type('int',    $flag_type_id),
+      name    => $self->type('string', $changes{$flag_type_id}{name}),
+      changes => {},
+    );
+
+    foreach my $field (keys %{$changes{$flag_type_id}{changes}}) {
+      my $change = $changes{$flag_type_id}{changes}{$field};
+      $hash{changes}{$field} = {
+        removed => $self->type('string', $change->[0]),
+        added   => $self->type('string', $change->[1])
+      };
     }
 
-    return { flagtypes => \@result };
+    push(@result, \%hash);
+  }
+
+  return {flagtypes => \@result};
 }
 
 sub _flagtype_to_hash {
-    my ($self, $flagtype, $product) = @_;
-    my $user = Bugzilla->user;
-
-    my @values = ('X');
-    push(@values, '?') if ($flagtype->is_requestable && $user->can_request_flag($flagtype));
-    push(@values, '+', '-') if $user->can_set_flag($flagtype);
-
-    my $item = {
-        id          => $self->type('int'    , $flagtype->id),
-        name        => $self->type('string' , $flagtype->name),
-        description => $self->type('string' , $flagtype->description),
-        type        => $self->type('string' , $flagtype->target_type),
-        values      => \@values,
-        is_active   => $self->type('boolean', $flagtype->is_active),
-        is_requesteeble  => $self->type('boolean', $flagtype->is_requesteeble),
-        is_multiplicable => $self->type('boolean', $flagtype->is_multiplicable)
-    };
-
-    if ($product) {
-        my $inclusions = $self->_flagtype_clusions_to_hash($flagtype->inclusions, $product->id);
-        my $exclusions = $self->_flagtype_clusions_to_hash($flagtype->exclusions, $product->id);
-        # if we have both inclusions and exclusions, the exclusions are redundant
-        $exclusions = [] if @$inclusions && @$exclusions;
-        # no need to return anything if there's just "any component"
-        $item->{inclusions} = $inclusions if @$inclusions && $inclusions->[0] ne '';
-        $item->{exclusions} = $exclusions if @$exclusions && $exclusions->[0] ne '';
-    }
-
-    return $item;
+  my ($self, $flagtype, $product) = @_;
+  my $user = Bugzilla->user;
+
+  my @values = ('X');
+  push(@values, '?')
+    if ($flagtype->is_requestable && $user->can_request_flag($flagtype));
+  push(@values, '+', '-') if $user->can_set_flag($flagtype);
+
+  my $item = {
+    id               => $self->type('int',     $flagtype->id),
+    name             => $self->type('string',  $flagtype->name),
+    description      => $self->type('string',  $flagtype->description),
+    type             => $self->type('string',  $flagtype->target_type),
+    values           => \@values,
+    is_active        => $self->type('boolean', $flagtype->is_active),
+    is_requesteeble  => $self->type('boolean', $flagtype->is_requesteeble),
+    is_multiplicable => $self->type('boolean', $flagtype->is_multiplicable)
+  };
+
+  if ($product) {
+    my $inclusions
+      = $self->_flagtype_clusions_to_hash($flagtype->inclusions, $product->id);
+    my $exclusions
+      = $self->_flagtype_clusions_to_hash($flagtype->exclusions, $product->id);
+
+    # if we have both inclusions and exclusions, the exclusions are redundant
+    $exclusions = [] if @$inclusions && @$exclusions;
+
+    # no need to return anything if there's just "any component"
+    $item->{inclusions} = $inclusions if @$inclusions && $inclusions->[0] ne '';
+    $item->{exclusions} = $exclusions if @$exclusions && $exclusions->[0] ne '';
+  }
+
+  return $item;
 }
 
 sub _flagtype_clusions_to_hash {
-    my ($self, $clusions, $product_id) = @_;
-    my $result = [];
-    foreach my $key (keys %$clusions) {
-        my ($prod_id, $comp_id) = split(/:/, $clusions->{$key}, 2);
-        if ($prod_id == 0 || $prod_id == $product_id) {
-            if ($comp_id) {
-                my $component = Bugzilla::Component->new({ id => $comp_id, cache => 1 });
-                push @$result, $component->name;
-            }
-            else {
-                return [ '' ];
-            }
-        }
+  my ($self, $clusions, $product_id) = @_;
+  my $result = [];
+  foreach my $key (keys %$clusions) {
+    my ($prod_id, $comp_id) = split(/:/, $clusions->{$key}, 2);
+    if ($prod_id == 0 || $prod_id == $product_id) {
+      if ($comp_id) {
+        my $component = Bugzilla::Component->new({id => $comp_id, cache => 1});
+        push @$result, $component->name;
+      }
+      else {
+        return [''];
+      }
     }
-    return $result;
+  }
+  return $result;
 }
 
 sub _process_lists {
-    my $list = shift;
-    my $user = Bugzilla->user;
-
-    my @products;
-    if ($user->in_group('editcomponents')) {
-        @products = Bugzilla::Product->get_all;
-    }
-    else {
-        @products = @{$user->get_products_by_permission('editcomponents')};
-    }
-
-    my @component_list;
-
-    foreach my $item (@$list) {
-        # A hash with products as the key and component names as the values
-        if(ref($item) eq 'HASH') {
-            while (my ($product_name, $component_names) = each %$item) {
-                my $product = Bugzilla::Product->check({name => $product_name});
-                unless (grep { $product->name eq $_->name } @products) {
-                    ThrowUserError('product_access_denied', { name => $product_name });
-                }
-                my @component_ids;
-
-                foreach my $comp_name (@$component_names) {
-                    my $component = Bugzilla::Component->check({product => $product, name => $comp_name});
-                    ThrowCodeError('param_invalid', { param => $comp_name}) unless defined $component;
-                    push @component_list, $product->id . ':' . $component->id;
-                }
-            }
+  my $list = shift;
+  my $user = Bugzilla->user;
+
+  my @products;
+  if ($user->in_group('editcomponents')) {
+    @products = Bugzilla::Product->get_all;
+  }
+  else {
+    @products = @{$user->get_products_by_permission('editcomponents')};
+  }
+
+  my @component_list;
+
+  foreach my $item (@$list) {
+
+    # A hash with products as the key and component names as the values
+    if (ref($item) eq 'HASH') {
+      while (my ($product_name, $component_names) = each %$item) {
+        my $product = Bugzilla::Product->check({name => $product_name});
+        unless (grep { $product->name eq $_->name } @products) {
+          ThrowUserError('product_access_denied', {name => $product_name});
         }
-        elsif(!ref($item)) {
-            # These are whole products
-            my $product = Bugzilla::Product->check({name => $item});
-            unless (grep { $product->name eq $_->name } @products) {
-                ThrowUserError('product_access_denied', { name => $item });
-            }
-            push @component_list, $product->id . ':0';
-        }
-        else {
-            # The user has passed something invalid
-            ThrowCodeError('param_invalid', { param => $item });
+        my @component_ids;
+
+        foreach my $comp_name (@$component_names) {
+          my $component
+            = Bugzilla::Component->check({product => $product, name => $comp_name});
+          ThrowCodeError('param_invalid', {param => $comp_name})
+            unless defined $component;
+          push @component_list, $product->id . ':' . $component->id;
         }
+      }
+    }
+    elsif (!ref($item)) {
+
+      # These are whole products
+      my $product = Bugzilla::Product->check({name => $item});
+      unless (grep { $product->name eq $_->name } @products) {
+        ThrowUserError('product_access_denied', {name => $item});
+      }
+      push @component_list, $product->id . ':0';
+    }
+    else {
+      # The user has passed something invalid
+      ThrowCodeError('param_invalid', {param => $item});
     }
+  }
 
-    return \@component_list;
+  return \@component_list;
 }
 
 1;
@@ -337,7 +355,7 @@ Get information about valid flag types that can be set for bugs and attachments.
 
 =item B<REST>
 
-You have several options for retreiving information about flag types. The first
+You have several options for retrieving information about flag types. The first
 part is the request method and the rest is the related path needed.
 
 To get information about all flag types for a product:
diff --git a/Bugzilla/WebService/Group.pm b/Bugzilla/WebService/Group.pm
index d0ee6fdbad..04aa6e9a01 100644
--- a/Bugzilla/WebService/Group.pm
+++ b/Bugzilla/WebService/Group.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Group;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,202 +16,211 @@ use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::WebService::Util qw(validate translate params_to_objects);
 
-use constant MAPPED_RETURNS => {
-    userregexp => 'user_regexp',
-    isactive => 'is_active'
-};
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  update
+);
+
+use constant MAPPED_RETURNS =>
+  {userregexp => 'user_regexp', isactive => 'is_active'};
 
 sub create {
-    my ($self, $params) = @_;
-
-    Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->user->in_group('creategroups') 
-        || ThrowUserError("auth_failure", { group  => "creategroups",
-                                            action => "add",
-                                            object => "group"});
-    # Create group
-    my $group = Bugzilla::Group->create({
-        name               => $params->{name},
-        description        => $params->{description},
-        userregexp         => $params->{user_regexp},
-        isactive           => $params->{is_active},
-        isbuggroup         => 1,
-        icon_url           => $params->{icon_url}
-    });
-    return { id => $self->type('int', $group->id) };
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('creategroups')
+    || ThrowUserError("auth_failure",
+    {group => "creategroups", action => "add", object => "group"});
+
+  # Create group
+  my $group = Bugzilla::Group->create({
+    name        => $params->{name},
+    description => $params->{description},
+    userregexp  => $params->{user_regexp},
+    isactive    => $params->{is_active},
+    isbuggroup  => 1,
+    icon_url    => $params->{icon_url}
+  });
+  return {id => $self->type('int', $group->id)};
 }
 
 sub update {
-    my ($self, $params) = @_;
+  my ($self, $params) = @_;
+
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('creategroups')
+    || ThrowUserError("auth_failure",
+    {group => "creategroups", action => "edit", object => "group"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Group.update', params => ['ids', 'names']});
+
+  my $group_objects = params_to_objects($params, 'Bugzilla::Group');
+
+  my %values = %$params;
+
+  # We delete names and ids to keep only new values to set.
+  delete $values{names};
+  delete $values{ids};
+
+  $dbh->bz_start_transaction();
+  foreach my $group (@$group_objects) {
+    $group->set_all(\%values);
+  }
+
+  my %changes;
+  foreach my $group (@$group_objects) {
+    my $returned_changes = $group->update();
+    $changes{$group->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $group (@$group_objects) {
+    my %hash = (id => $group->id, changes => {},);
+    foreach my $field (keys %{$changes{$group->id}}) {
+      my $change = $changes{$group->id}->{$field};
+      $hash{changes}{$field} = {
+        removed => $self->type('string', $change->[0]),
+        added   => $self->type('string', $change->[1])
+      };
+    }
+    push(@result, \%hash);
+  }
 
-    my $dbh = Bugzilla->dbh;
+  return {groups => \@result};
+}
 
-    Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->user->in_group('creategroups')
-        || ThrowUserError("auth_failure", { group  => "creategroups",
-                                            action => "edit",
-                                            object => "group" });
+sub get {
+  my ($self, $params) = validate(@_, 'ids', 'names', 'type');
 
-    defined($params->{names}) || defined($params->{ids})
-        || ThrowCodeError('params_required',
-               { function => 'Group.update', params => ['ids', 'names'] });
+  Bugzilla->login(LOGIN_REQUIRED);
 
-    my $group_objects = params_to_objects($params, 'Bugzilla::Group');
+  # Reject access if there is no sense in continuing.
+  my $user = Bugzilla->user;
+  my $all_groups
+    = $user->in_group('editusers') || $user->in_group('creategroups');
+  if (!$all_groups && !$user->can_bless) {
+    ThrowUserError('group_cannot_view');
+  }
 
-    my %values = %$params;
-    
-    # We delete names and ids to keep only new values to set.
-    delete $values{names};
-    delete $values{ids};
+  Bugzilla->switch_to_shadow_db();
 
-    $dbh->bz_start_transaction();
-    foreach my $group (@$group_objects) {
-        $group->set_all(\%values);
-    }
+  my $groups = [];
 
-    my %changes;
-    foreach my $group (@$group_objects) {
-        my $returned_changes = $group->update();
-        $changes{$group->id} = translate($returned_changes, MAPPED_RETURNS);
-    }
-    $dbh->bz_commit_transaction();
-
-    my @result;
-    foreach my $group (@$group_objects) {
-        my %hash = (
-            id      => $group->id,
-            changes => {},
-        );
-        foreach my $field (keys %{ $changes{$group->id} }) {
-            my $change = $changes{$group->id}->{$field};
-            $hash{changes}{$field} = {
-                removed => $self->type('string', $change->[0]),
-                added   => $self->type('string', $change->[1]) 
-            };
-        }
-       push(@result, \%hash);
-    }
-
-    return { groups => \@result };
-}
-
-sub get {
-    my ($self, $params) = validate(@_, 'ids', 'names', 'type');
+  if (defined $params->{ids}) {
 
-    Bugzilla->login(LOGIN_REQUIRED);
+    # Get the groups by id
+    $groups = Bugzilla::Group->new_from_list($params->{ids});
+  }
 
-    # Reject access if there is no sense in continuing.
-    my $user = Bugzilla->user;
-    my $all_groups = $user->in_group('editusers') || $user->in_group('creategroups');
-    if (!$all_groups && !$user->can_bless) {
-        ThrowUserError('group_cannot_view');
-    }
+  if (defined $params->{names}) {
 
-    Bugzilla->switch_to_shadow_db();
+    # Get the groups by name. Check will throw an error if a bad name is given
+    foreach my $name (@{$params->{names}}) {
 
-    my $groups = [];
+      # Skip if we got this from params->{id}
+      next if grep { $_->name eq $name } @$groups;
 
-    if (defined $params->{ids}) {
-        # Get the groups by id
-        $groups = Bugzilla::Group->new_from_list($params->{ids});
+      push @$groups, Bugzilla::Group->check({name => $name});
     }
+  }
 
-    if (defined $params->{names}) {
-        # Get the groups by name. Check will throw an error if a bad name is given
-        foreach my $name (@{$params->{names}}) {
-            # Skip if we got this from params->{id}
-            next if grep { $_->name eq $name } @$groups;
-
-            push @$groups, Bugzilla::Group->check({ name => $name });
-        }
+  if (!defined $params->{ids} && !defined $params->{names}) {
+    if ($all_groups) {
+      @$groups = Bugzilla::Group->get_all;
     }
-
-    if (!defined $params->{ids} && !defined $params->{names}) {
-        if ($all_groups) {
-            @$groups = Bugzilla::Group->get_all;
-        }
-        else {
-            # Get only groups the user has bless groups too
-            $groups = $user->bless_groups;
-        }
+    else {
+      # Get only groups the user has bless groups too
+      $groups = $user->bless_groups;
     }
+  }
 
-    # Now create a result entry for each.
-    my @groups = map { $self->_group_to_hash($params, $_) } @$groups;
-    return { groups => \@groups };
+  # Now create a result entry for each.
+  my @groups = map { $self->_group_to_hash($params, $_) } @$groups;
+  return {groups => \@groups};
 }
 
 sub _group_to_hash {
-    my ($self, $params, $group) = @_;
-    my $user = Bugzilla->user;
-
-    my $field_data = {
-        id          => $self->type('int', $group->id),
-        name        => $self->type('string', $group->name),
-        description => $self->type('string', $group->description),
-    };
-
-    if ($user->in_group('creategroups')) {
-        $field_data->{is_active}    = $self->type('boolean', $group->is_active);
-        $field_data->{is_bug_group} = $self->type('boolean', $group->is_bug_group);
-        $field_data->{user_regexp}  = $self->type('string', $group->user_regexp);
-    }
-
-    if ($params->{membership}) {
-        $field_data->{membership} = $self->_get_group_membership($group, $params);
-    }
-    return $field_data;
+  my ($self, $params, $group) = @_;
+  my $user = Bugzilla->user;
+
+  my $field_data = {
+    id          => $self->type('int',    $group->id),
+    name        => $self->type('string', $group->name),
+    description => $self->type('string', $group->description),
+  };
+
+  if ($user->in_group('creategroups')) {
+    $field_data->{is_active}    = $self->type('boolean', $group->is_active);
+    $field_data->{is_bug_group} = $self->type('boolean', $group->is_bug_group);
+    $field_data->{user_regexp}  = $self->type('string',  $group->user_regexp);
+  }
+
+  if ($params->{membership}) {
+    $field_data->{membership} = $self->_get_group_membership($group, $params);
+  }
+  return $field_data;
 }
 
 sub _get_group_membership {
-    my ($self, $group, $params) = @_;
-    my $user = Bugzilla->user;
+  my ($self, $group, $params) = @_;
+  my $user = Bugzilla->user;
 
-    my %users_only;
-    my $dbh = Bugzilla->dbh;
-    my $editusers = $user->in_group('editusers');
+  my %users_only;
+  my $dbh       = Bugzilla->dbh;
+  my $editusers = $user->in_group('editusers');
 
-    my $query = 'SELECT userid FROM profiles';
-    my $visibleGroups;
+  my $query = 'SELECT userid FROM profiles';
+  my $visibleGroups;
 
-    if (!$editusers && Bugzilla->params->{'usevisibilitygroups'}) {
-        # Show only users in visible groups.
-        $visibleGroups = $user->visible_groups_inherited;
+  if (!$editusers && Bugzilla->params->{'usevisibilitygroups'}) {
 
-        if (scalar @$visibleGroups) {
-            $query .= qq{, user_group_map AS ugm
+    # Show only users in visible groups.
+    $visibleGroups = $user->visible_groups_inherited;
+
+    if (scalar @$visibleGroups) {
+      $query .= qq{, user_group_map AS ugm
                          WHERE ugm.user_id = profiles.userid
                            AND ugm.isbless = 0
                            AND } . $dbh->sql_in('ugm.group_id', $visibleGroups);
-        }
-    } elsif ($editusers || $user->can_bless($group->id) || $user->in_group('creategroups')) {
-        $visibleGroups = 1;
-        $query .= qq{, user_group_map AS ugm
+    }
+  }
+  elsif ($editusers
+    || $user->can_bless($group->id)
+    || $user->in_group('creategroups'))
+  {
+    $visibleGroups = 1;
+    $query .= qq{, user_group_map AS ugm
                      WHERE ugm.user_id = profiles.userid
                        AND ugm.isbless = 0
                     };
-    }
-    if (!$visibleGroups) {
-        ThrowUserError('group_not_visible', { group => $group });
-    }
-
-    my $grouplist = Bugzilla::Group->flatten_group_membership($group->id);
-    $query .= ' AND ' . $dbh->sql_in('ugm.group_id', $grouplist);
-
-    my $userids = $dbh->selectcol_arrayref($query);
-    my $user_objects = Bugzilla::User->new_from_list($userids);
-    my @users =
-        map {{
-            id                => $self->type('int', $_->id),
-            real_name         => $self->type('string', $_->name),
-            name              => $self->type('string', $_->login),
-            email             => $self->type('string', $_->email),
-            can_login         => $self->type('boolean', $_->is_enabled),
-            email_enabled     => $self->type('boolean', $_->email_enabled),
-            login_denied_text => $self->type('string', $_->disabledtext),
-        }} @$user_objects;
-
-    return \@users;
+  }
+  if (!$visibleGroups) {
+    ThrowUserError('group_not_visible', {group => $group});
+  }
+
+  my $grouplist = Bugzilla::Group->flatten_group_membership($group->id);
+  $query .= ' AND ' . $dbh->sql_in('ugm.group_id', $grouplist);
+
+  my $userids      = $dbh->selectcol_arrayref($query);
+  my $user_objects = Bugzilla::User->new_from_list($userids);
+  my @users        = map { {
+    id                => $self->type('int',     $_->id),
+    real_name         => $self->type('string',  $_->name),
+    name              => $self->type('login',   $_->login),
+    email             => $self->type('email',   $_->email),
+    can_login         => $self->type('boolean', $_->is_enabled),
+    email_enabled     => $self->type('boolean', $_->email_enabled),
+    login_denied_text => $self->type('string',  $_->disabledtext),
+  } } @$user_objects;
+
+  return \@users;
 }
 
 1;
@@ -276,7 +285,7 @@ name of the group.
 
 =item C<user_regexp>
 
-C<string> A regular expression. Any user whose Bugzilla username matches
+C<string> A regular expression. Any user whose Bugzilla email address matches
 this regular expression will automatically be granted membership in this group.
 
 =item C<is_active>
@@ -547,8 +556,7 @@ C<string> The email address of the user.
 
 =item name
 
-C<string> The login name of the user. Note that in some situations this is
-different than their email.
+C<string> The login name of the user.
 
 =item can_login
 
diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm
index 0e78836bf1..e7eb0bf8f5 100644
--- a/Bugzilla/WebService/Product.pm
+++ b/Bugzilla/WebService/Product.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Product;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,333 +17,314 @@ use Bugzilla::User;
 use Bugzilla::Error;
 use Bugzilla::Constants;
 use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(validate filter filter_wants translate params_to_objects);
+use Bugzilla::WebService::Util
+  qw(validate filter filter_wants translate params_to_objects);
 
 use constant READ_ONLY => qw(
-    get
-    get_accessible_products
-    get_enterable_products
-    get_selectable_products
+  get
+  get_accessible_products
+  get_enterable_products
+  get_selectable_products
 );
 
-use constant MAPPED_FIELDS => {
-    has_unconfirmed => 'allows_unconfirmed',
-    is_open => 'is_active',
-};
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  get_accessible_products
+  get_enterable_products
+  get_selectable_products
+  update
+);
+
+use constant MAPPED_FIELDS =>
+  {has_unconfirmed => 'allows_unconfirmed', is_open => 'is_active',};
 
 use constant MAPPED_RETURNS => {
-    allows_unconfirmed => 'has_unconfirmed',
-    defaultmilestone => 'default_milestone',
-    isactive => 'is_open',
+  allows_unconfirmed => 'has_unconfirmed',
+  defaultmilestone   => 'default_milestone',
+  isactive           => 'is_open',
 };
 
-use constant FIELD_MAP => {
-    has_unconfirmed => 'allows_unconfirmed',
-    is_open         => 'isactive',
-};
+use constant FIELD_MAP =>
+  {has_unconfirmed => 'allows_unconfirmed', is_open => 'isactive',};
 
 ##################################################
 # Add aliases here for method name compatibility #
 ##################################################
 
-BEGIN { *get_products = \&get }
-
 # Get the ids of the products the user can search
 sub get_selectable_products {
-    Bugzilla->switch_to_shadow_db();
-    return {ids => [map {$_->id} @{Bugzilla->user->get_selectable_products}]};
+  Bugzilla->switch_to_shadow_db();
+  return {ids => [map { $_->id } @{Bugzilla->user->get_selectable_products}]};
 }
 
 # Get the ids of the products the user can enter bugs against
 sub get_enterable_products {
-    Bugzilla->switch_to_shadow_db();
-    return {ids => [map {$_->id} @{Bugzilla->user->get_enterable_products}]};
+  Bugzilla->switch_to_shadow_db();
+  return {ids => [map { $_->id } @{Bugzilla->user->get_enterable_products}]};
 }
 
 # Get the union of the products the user can search and enter bugs against.
 sub get_accessible_products {
-    Bugzilla->switch_to_shadow_db();
-    return {ids => [map {$_->id} @{Bugzilla->user->get_accessible_products}]};
+  Bugzilla->switch_to_shadow_db();
+  return {ids => [map { $_->id } @{Bugzilla->user->get_accessible_products}]};
 }
 
 # Get a list of actual products, based on list of ids or names
 sub get {
-    my ($self, $params) = validate(@_, 'ids', 'names', 'type');
-    my $user = Bugzilla->user;
-
-    defined $params->{ids} || defined $params->{names} || defined $params->{type}
-        || ThrowCodeError("params_required", { function => "Product.get",
-                                               params => ['ids', 'names', 'type'] });
-    Bugzilla->switch_to_shadow_db();
-
-    my $products = [];
-    if (defined $params->{type}) {
-        my %product_hash;
-        foreach my $type (@{ $params->{type} }) {
-            my $result = [];
-            if ($type eq 'accessible') {
-                $result = $user->get_accessible_products();
-            }
-            elsif ($type eq 'enterable') {
-                $result = $user->get_enterable_products();
-            }
-            elsif ($type eq 'selectable') {
-                $result = $user->get_selectable_products();
-            }
-            else {
-                ThrowUserError('get_products_invalid_type',
-                               { type => $type });
-            }
-            map { $product_hash{$_->id} = $_ } @$result;
-        }
-        $products = [ values %product_hash ];
-    }
-    else {
-        $products = $user->get_accessible_products;
+  my ($self, $params) = validate(@_, 'ids', 'names', 'type');
+  my $user = Bugzilla->user;
+
+       defined $params->{ids}
+    || defined $params->{names}
+    || defined $params->{type}
+    || ThrowCodeError("params_required",
+    {function => "Product.get", params => ['ids', 'names', 'type']});
+  Bugzilla->switch_to_shadow_db();
+
+  my $products = [];
+  if (defined $params->{type}) {
+    my %product_hash;
+    foreach my $type (@{$params->{type}}) {
+      my $result = [];
+      if ($type eq 'accessible') {
+        $result = $user->get_accessible_products();
+      }
+      elsif ($type eq 'enterable') {
+        $result = $user->get_enterable_products();
+      }
+      elsif ($type eq 'selectable') {
+        $result = $user->get_selectable_products();
+      }
+      else {
+        ThrowUserError('get_products_invalid_type', {type => $type});
+      }
+      map { $product_hash{$_->id} = $_ } @$result;
     }
+    $products = [values %product_hash];
+  }
+  else {
+    $products = $user->get_accessible_products;
+  }
 
-    my @requested_products;
+  my @requested_products;
 
-    if (defined $params->{ids}) {
-        # Create a hash with the ids the user wants
-        my %ids = map { $_ => 1 } @{$params->{ids}};
+  if (defined $params->{ids}) {
 
-        # Return the intersection of this, by grepping the ids from $products.
-        push(@requested_products,
-            grep { $ids{$_->id} } @$products);
-    }
+    # Create a hash with the ids the user wants
+    my %ids = map { $_ => 1 } @{$params->{ids}};
 
-    if (defined $params->{names}) {
-        # Create a hash with the names the user wants
-        my %names = map { lc($_) => 1 } @{$params->{names}};
-
-        # Return the intersection of this, by grepping the names
-        # from $products, union'ed with products found by ID to
-        # avoid duplicates
-        foreach my $product (grep { $names{lc $_->name} }
-                                  @$products) {
-            next if grep { $_->id == $product->id }
-                         @requested_products;
-            push @requested_products, $product;
-        }
-    }
+    # Return the intersection of this, by grepping the ids from $products.
+    push(@requested_products, grep { $ids{$_->id} } @$products);
+  }
+
+  if (defined $params->{names}) {
 
-    # If we just requested a specific type of products without
-    # specifying ids or names, then return the entire list.
-    if (!defined $params->{ids} && !defined $params->{names}) {
-        @requested_products = @$products;
+    # Create a hash with the names the user wants
+    my %names = map { lc($_) => 1 } @{$params->{names}};
+
+    # Return the intersection of this, by grepping the names
+    # from $products, union'ed with products found by ID to
+    # avoid duplicates
+    foreach my $product (grep { $names{lc $_->name} } @$products) {
+      next if grep { $_->id == $product->id } @requested_products;
+      push @requested_products, $product;
     }
+  }
+
+  # If we just requested a specific type of products without
+  # specifying ids or names, then return the entire list.
+  if (!defined $params->{ids} && !defined $params->{names}) {
+    @requested_products = @$products;
+  }
 
-    # Now create a result entry for each.
-    my @products = map { $self->_product_to_hash($params, $_) }
-                       @requested_products;
-    return { products => \@products };
+  # Now create a result entry for each.
+  my @products = map { $self->_product_to_hash($params, $_) } @requested_products;
+  return {products => \@products};
 }
 
 sub create {
-    my ($self, $params) = @_;
-
-    Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->user->in_group('editcomponents')
-        || ThrowUserError("auth_failure", { group  => "editcomponents",
-                                            action => "add",
-                                            object => "products"});
-    # Create product
-    my $args = {
-        name             => $params->{name},
-        description      => $params->{description},
-        version          => $params->{version},
-        defaultmilestone => $params->{default_milestone},
-        # create_series has no default value.
-        create_series    => defined $params->{create_series} ?
-                              $params->{create_series} : 1
-    };
-    foreach my $field (qw(has_unconfirmed is_open classification)) {
-        if (defined $params->{$field}) {
-            my $name = FIELD_MAP->{$field} || $field;
-            $args->{$name} = $params->{$field};
-        }
+  my ($self, $params) = @_;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('editcomponents')
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "add", object => "products"});
+
+  # Create product
+  my $args = {
+    name             => $params->{name},
+    description      => $params->{description},
+    version          => $params->{version},
+    defaultmilestone => $params->{default_milestone},
+
+    # create_series has no default value.
+    create_series => defined $params->{create_series}
+    ? $params->{create_series}
+    : 1
+  };
+  foreach my $field (qw(has_unconfirmed is_open classification)) {
+    if (defined $params->{$field}) {
+      my $name = FIELD_MAP->{$field} || $field;
+      $args->{$name} = $params->{$field};
     }
-    my $product = Bugzilla::Product->create($args);
-    return { id => $self->type('int', $product->id) };
+  }
+  my $product = Bugzilla::Product->create($args);
+  return {id => $self->type('int', $product->id)};
 }
 
 sub update {
-    my ($self, $params) = @_;
-
-    my $dbh = Bugzilla->dbh;
-
-    Bugzilla->login(LOGIN_REQUIRED);
-    Bugzilla->user->in_group('editcomponents')
-        || ThrowUserError("auth_failure", { group  => "editcomponents",
-                                            action => "edit",
-                                            object => "products" });
-
-    defined($params->{names}) || defined($params->{ids})
-        || ThrowCodeError('params_required',
-               { function => 'Product.update', params => ['ids', 'names'] });
-
-    my $product_objects = params_to_objects($params, 'Bugzilla::Product');
-
-    my $values = translate($params, MAPPED_FIELDS);
-
-    # We delete names and ids to keep only new values to set.
-    delete $values->{names};
-    delete $values->{ids};
-
-    $dbh->bz_start_transaction();
-    foreach my $product (@$product_objects) {
-        $product->set_all($values);
+  my ($self, $params) = @_;
+
+  my $dbh = Bugzilla->dbh;
+
+  Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->user->in_group('editcomponents')
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "edit", object => "products"});
+
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'Product.update', params => ['ids', 'names']});
+
+  my $product_objects = params_to_objects($params, 'Bugzilla::Product');
+
+  my $values = translate($params, MAPPED_FIELDS);
+
+  # We delete names and ids to keep only new values to set.
+  delete $values->{names};
+  delete $values->{ids};
+
+  $dbh->bz_start_transaction();
+  foreach my $product (@$product_objects) {
+    $product->set_all($values);
+  }
+
+  my %changes;
+  foreach my $product (@$product_objects) {
+    my $returned_changes = $product->update();
+    $changes{$product->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
+
+  my @result;
+  foreach my $product (@$product_objects) {
+    my %hash = (id => $product->id, changes => {},);
+
+    foreach my $field (keys %{$changes{$product->id}}) {
+      my $change = $changes{$product->id}->{$field};
+      $hash{changes}{$field} = {
+        removed => $self->type('string', $change->[0]),
+        added   => $self->type('string', $change->[1])
+      };
     }
 
-    my %changes;
-    foreach my $product (@$product_objects) {
-        my $returned_changes = $product->update();
-        $changes{$product->id} = translate($returned_changes, MAPPED_RETURNS);
-    }
-    $dbh->bz_commit_transaction();
-
-    my @result;
-    foreach my $product (@$product_objects) {
-        my %hash = (
-            id      => $product->id,
-            changes => {},
-        );
-
-        foreach my $field (keys %{ $changes{$product->id} }) {
-            my $change = $changes{$product->id}->{$field};
-            $hash{changes}{$field} = {
-                removed => $self->type('string', $change->[0]),
-                added   => $self->type('string', $change->[1])
-            };
-        }
-
-        push(@result, \%hash);
-    }
+    push(@result, \%hash);
+  }
 
-    return { products => \@result };
+  return {products => \@result};
 }
 
 sub _product_to_hash {
-    my ($self, $params, $product) = @_;
-
-    my $field_data = {
-        id          => $self->type('int', $product->id),
-        name        => $self->type('string', $product->name),
-        description => $self->type('string', $product->description),
-        is_active   => $self->type('boolean', $product->is_active),
-        default_milestone => $self->type('string', $product->default_milestone),
-        has_unconfirmed   => $self->type('boolean', $product->allows_unconfirmed),
-        classification => $self->type('string', $product->classification->name),
-    };
-    if (filter_wants($params, 'components')) {
-        $field_data->{components} = [map {
-            $self->_component_to_hash($_, $params)
-        } @{$product->components}];
-    }
-    if (filter_wants($params, 'versions')) {
-        $field_data->{versions} = [map {
-            $self->_version_to_hash($_, $params)
-        } @{$product->versions}];
-    }
-    if (filter_wants($params, 'milestones')) {
-        $field_data->{milestones} = [map {
-            $self->_milestone_to_hash($_, $params)
-        } @{$product->milestones}];
-    }
-    return filter($params, $field_data);
+  my ($self, $params, $product) = @_;
+
+  my $field_data = {
+    id                => $self->type('int',     $product->id),
+    name              => $self->type('string',  $product->name),
+    description       => $self->type('string',  $product->description),
+    is_active         => $self->type('boolean', $product->is_active),
+    default_milestone => $self->type('string',  $product->default_milestone),
+    has_unconfirmed   => $self->type('boolean', $product->allows_unconfirmed),
+    classification    => $self->type('string',  $product->classification->name),
+  };
+  if (filter_wants($params, 'components')) {
+    $field_data->{components}
+      = [map { $self->_component_to_hash($_, $params) } @{$product->components}];
+  }
+  if (filter_wants($params, 'versions')) {
+    $field_data->{versions}
+      = [map { $self->_version_to_hash($_, $params) } @{$product->versions}];
+  }
+  if (filter_wants($params, 'milestones')) {
+    $field_data->{milestones}
+      = [map { $self->_milestone_to_hash($_, $params) } @{$product->milestones}];
+  }
+  return filter($params, $field_data);
 }
 
 sub _component_to_hash {
-    my ($self, $component, $params) = @_;
-    my $field_data = filter $params, {
-        id =>
-            $self->type('int', $component->id),
-        name =>
-            $self->type('string', $component->name),
-        description =>
-            $self->type('string' , $component->description),
-        default_assigned_to =>
-            $self->type('email', $component->default_assignee->login),
-        default_qa_contact =>
-            $self->type('email', $component->default_qa_contact ?
-                                 $component->default_qa_contact->login : ""),
-        sort_key =>  # sort_key is returned to match Bug.fields
-            0,
-        is_active =>
-            $self->type('boolean', $component->is_active),
-    }, undef, 'components';
-
-    if (filter_wants($params, 'flag_types', undef, 'components')) {
-        $field_data->{flag_types} = {
-            bug =>
-                [map {
-                    $self->_flag_type_to_hash($_)
-                } @{$component->flag_types->{'bug'}}],
-            attachment =>
-                [map {
-                    $self->_flag_type_to_hash($_)
-                } @{$component->flag_types->{'attachment'}}],
-        };
-    }
+  my ($self, $component, $params) = @_;
+  my $field_data = filter $params, {
+    id          => $self->type('int',    $component->id),
+    name        => $self->type('string', $component->name),
+    description => $self->type('string', $component->description),
+    default_assigned_to =>
+      $self->type('login', $component->default_assignee->login),
+    default_qa_contact => $self->type(
+      'login',
+      $component->default_qa_contact ? $component->default_qa_contact->login : ""
+    ),
+    sort_key =>    # sort_key is returned to match Bug.fields
+      0,
+    is_active => $self->type('boolean', $component->is_active),
+    },
+    undef, 'components';
+
+  if (filter_wants($params, 'flag_types', undef, 'components')) {
+    $field_data->{flag_types} = {
+      bug =>
+        [map { $self->_flag_type_to_hash($_) } @{$component->flag_types->{'bug'}}],
+      attachment => [
+        map { $self->_flag_type_to_hash($_) } @{$component->flag_types->{'attachment'}}
+      ],
+    };
+  }
 
-    return $field_data;
+  return $field_data;
 }
 
 sub _flag_type_to_hash {
-    my ($self, $flag_type, $params) = @_;
-    return filter $params, {
-        id =>
-            $self->type('int', $flag_type->id),
-        name =>
-            $self->type('string', $flag_type->name),
-        description =>
-            $self->type('string', $flag_type->description),
-        cc_list =>
-            $self->type('string', $flag_type->cc_list),
-        sort_key =>
-            $self->type('int', $flag_type->sortkey),
-        is_active =>
-            $self->type('boolean', $flag_type->is_active),
-        is_requestable =>
-            $self->type('boolean', $flag_type->is_requestable),
-        is_requesteeble =>
-            $self->type('boolean', $flag_type->is_requesteeble),
-        is_multiplicable =>
-            $self->type('boolean', $flag_type->is_multiplicable),
-        grant_group =>
-            $self->type('int', $flag_type->grant_group_id),
-        request_group =>
-            $self->type('int', $flag_type->request_group_id),
-    }, undef, 'flag_types';
+  my ($self, $flag_type, $params) = @_;
+  return filter $params,
+    {
+    id               => $self->type('int',     $flag_type->id),
+    name             => $self->type('string',  $flag_type->name),
+    description      => $self->type('string',  $flag_type->description),
+    cc_list          => $self->type('string',  $flag_type->cc_list),
+    sort_key         => $self->type('int',     $flag_type->sortkey),
+    is_active        => $self->type('boolean', $flag_type->is_active),
+    is_requestable   => $self->type('boolean', $flag_type->is_requestable),
+    is_requesteeble  => $self->type('boolean', $flag_type->is_requesteeble),
+    is_multiplicable => $self->type('boolean', $flag_type->is_multiplicable),
+    grant_group      => $self->type('int',     $flag_type->grant_group_id),
+    request_group    => $self->type('int',     $flag_type->request_group_id),
+    },
+    undef, 'flag_types';
 }
 
 sub _version_to_hash {
-    my ($self, $version, $params) = @_;
-    return filter $params, {
-        id =>
-            $self->type('int', $version->id),
-        name =>
-            $self->type('string', $version->name),
-        sort_key =>  # sort_key is returened to match Bug.fields
-            0,
-        is_active =>
-            $self->type('boolean', $version->is_active),
-    }, undef, 'versions';
+  my ($self, $version, $params) = @_;
+  return filter $params, {
+    id   => $self->type('int',    $version->id),
+    name => $self->type('string', $version->name),
+    sort_key =>    # sort_key is returened to match Bug.fields
+      0,
+    is_active => $self->type('boolean', $version->is_active),
+    },
+    undef, 'versions';
 }
 
 sub _milestone_to_hash {
-    my ($self, $milestone, $params) = @_;
-    return filter $params, {
-        id =>
-            $self->type('int', $milestone->id),
-        name =>
-            $self->type('string', $milestone->name),
-        sort_key =>
-            $self->type('int', $milestone->sortkey),
-        is_active =>
-            $self->type('boolean', $milestone->is_active),
-    }, undef, 'milestones';
+  my ($self, $milestone, $params) = @_;
+  return filter $params,
+    {
+    id        => $self->type('int',     $milestone->id),
+    name      => $self->type('string',  $milestone->name),
+    sort_key  => $self->type('int',     $milestone->sortkey),
+    is_active => $self->type('boolean', $milestone->is_active),
+    },
+    undef, 'milestones';
 }
 
 1;
@@ -489,8 +470,6 @@ Returns a list of information about the products passed to it.
 
 B<Note>: You must at least specify one of C<ids> or C<names>.
 
-B<Note>: Can also be called as "get_products" for compatibilty with Bugzilla 3.0 API.
-
 =item B<REST>
 
 To return information about a specific groups of products such as
@@ -857,7 +836,7 @@ C<array> of C<int>s. Numeric ids of the products that you wish to update.
 
 =item C<names>
 
-C<array> or C<string>s. Names of the products that you wish to update.
+C<array> of C<string>s. Names of the products that you wish to update.
 
 =back
 
@@ -983,11 +962,3 @@ You must define a default milestone.
 =back
 
 =back
-
-=head1 B<Methods in need of POD>
-
-=over
-
-=item get_products
-
-=back
diff --git a/Bugzilla/WebService/Server.pm b/Bugzilla/WebService/Server.pm
index 7950c7a3b9..190c3d5695 100644
--- a/Bugzilla/WebService/Server.pm
+++ b/Bugzilla/WebService/Server.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::Server;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -20,72 +20,77 @@ use Digest::MD5 qw(md5_base64);
 use Storable qw(freeze);
 
 sub handle_login {
-    my ($self, $class, $method, $full_method) = @_;
-    # Throw error if the supplied class does not exist or the method is private
-    ThrowCodeError('unknown_method', {method => $full_method}) if (!$class or $method =~ /^_/);
-
-    eval "require $class";
-    ThrowCodeError('unknown_method', {method => $full_method}) if $@;
-    return if ($class->login_exempt($method) 
-               and !defined Bugzilla->input_params->{Bugzilla_login});
-    Bugzilla->login();
-
-    Bugzilla::Hook::process(
-        'webservice_before_call',
-        { 'method'  => $method, full_method => $full_method });
+  my ($self, $class, $method, $full_method) = @_;
+
+  # Throw error if the supplied class does not exist or the method is private
+  ThrowCodeError('unknown_method', {method => $full_method})
+    if (!$class or $method =~ /^_/);
+
+  eval "require $class";
+  ThrowCodeError('unknown_method', {method => $full_method}) if $@;
+  return
+    if ($class->login_exempt($method)
+    and !defined Bugzilla->input_params->{Bugzilla_login});
+  Bugzilla->login();
+
+  Bugzilla::Hook::process('webservice_before_call',
+    {'method' => $method, full_method => $full_method});
 }
 
 sub datetime_format_inbound {
-    my ($self, $time) = @_;
-
-    my $converted = datetime_from($time, Bugzilla->local_timezone);
-    if (!defined $converted) {
-        ThrowUserError('illegal_date', { date => $time });
-    }
-    $time = $converted->ymd() . ' ' . $converted->hms();
-    return $time
+  my ($self, $time) = @_;
+
+  my $converted = datetime_from($time, Bugzilla->local_timezone);
+  if (!defined $converted) {
+    ThrowUserError('illegal_date', {date => $time});
+  }
+  $time = $converted->ymd() . ' ' . $converted->hms();
+  return $time;
 }
 
 sub datetime_format_outbound {
-    my ($self, $date) = @_;
-
-    return undef if (!defined $date or $date eq '');
-
-    my $time = $date;
-    if (blessed($date)) {
-        # We expect this to mean we were sent a datetime object
-        $time->set_time_zone('UTC');
-    } else {
-        # We always send our time in UTC, for consistency.
-        # passed in value is likely a string, create a datetime object
-        $time = datetime_from($date, 'UTC');
-    }
-    return $time->iso8601();
+  my ($self, $date) = @_;
+
+  return undef if (!defined $date or $date eq '');
+
+  my $time = $date;
+  if (blessed($date)) {
+
+    # We expect this to mean we were sent a datetime object
+    $time->set_time_zone('UTC');
+  }
+  else {
+    # We always send our time in UTC, for consistency.
+    # passed in value is likely a string, create a datetime object
+    $time = datetime_from($date, 'UTC');
+  }
+  return $time->iso8601();
 }
 
 # ETag support
 sub bz_etag {
-    my ($self, $data) = @_;
-    my $cache = Bugzilla->request_cache;
-    if (defined $data) {
-        # Serialize the data if passed a reference
-        local $Storable::canonical = 1;
-        $data = freeze($data) if ref $data;
-
-        # Wide characters cause md5_base64() to die.
-        utf8::encode($data) if utf8::is_utf8($data);
-
-        # Append content_type to the end of the data
-        # string as we want the etag to be unique to
-        # the content_type. We do not need this for
-        # XMLRPC as text/xml is always returned.
-        if (blessed($self) && $self->can('content_type')) {
-            $data .= $self->content_type if $self->content_type;
-        }
-
-        $cache->{'bz_etag'} = md5_base64($data);
+  my ($self, $data) = @_;
+  my $cache = Bugzilla->request_cache;
+  if (defined $data) {
+
+    # Serialize the data if passed a reference
+    local $Storable::canonical = 1;
+    $data = freeze($data) if ref $data;
+
+    # Wide characters cause md5_base64() to die.
+    utf8::encode($data) if utf8::is_utf8($data);
+
+    # Append content_type to the end of the data
+    # string as we want the etag to be unique to
+    # the content_type. We do not need this for
+    # XMLRPC as text/xml is always returned.
+    if (blessed($self) && $self->can('content_type')) {
+      $data .= $self->content_type if $self->content_type;
     }
-    return $cache->{'bz_etag'};
+
+    $cache->{'bz_etag'} = md5_base64($data);
+  }
+  return $cache->{'bz_etag'};
 }
 
 1;
diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index 6cda474805..2aebc4cea3 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -7,21 +7,22 @@
 
 package Bugzilla::WebService::Server::JSONRPC;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::WebService::Server;
-BEGIN {
-    our @ISA = qw(Bugzilla::WebService::Server);
 
-    if (eval { require JSON::RPC::Server::CGI }) {
-        unshift(@ISA, 'JSON::RPC::Server::CGI');
-    }
-    else {
-        require JSON::RPC::Legacy::Server::CGI;
-        unshift(@ISA, 'JSON::RPC::Legacy::Server::CGI');
-    }
+BEGIN {
+  our @ISA = qw(Bugzilla::WebService::Server);
+
+  if (eval { require JSON::RPC::Server::CGI }) {
+    unshift(@ISA, 'JSON::RPC::Server::CGI');
+  }
+  else {
+    require JSON::RPC::Legacy::Server::CGI;
+    unshift(@ISA, 'JSON::RPC::Legacy::Server::CGI');
+  }
 }
 
 use Bugzilla::Error;
@@ -31,85 +32,90 @@ use Bugzilla::Util;
 
 use HTTP::Message;
 use MIME::Base64 qw(decode_base64 encode_base64);
+use List::MoreUtils qw(none);
 
 #####################################
 # Public JSON::RPC Method Overrides #
 #####################################
 
 sub new {
-    my $class = shift;
-    my $self = $class->SUPER::new(@_);
-    Bugzilla->_json_server($self);
-    $self->dispatch(WS_DISPATCH);
-    $self->return_die_message(1);
-    return $self;
+  my $class = shift;
+  my $self  = $class->SUPER::new(@_);
+  Bugzilla->_json_server($self);
+  $self->dispatch(WS_DISPATCH);
+  $self->return_die_message(1);
+  return $self;
 }
 
 sub create_json_coder {
-    my $self = shift;
-    my $json = $self->SUPER::create_json_coder(@_);
-    $json->allow_blessed(1);
-    $json->convert_blessed(1);
-    # This may seem a little backwards, but what this really means is
-    # "don't convert our utf8 into byte strings, just leave it as a
-    # utf8 string."
-    $json->utf8(0) if Bugzilla->params->{'utf8'};
-    return $json;
+  my $self = shift;
+  my $json = $self->SUPER::create_json_coder(@_);
+  $json->allow_blessed(1);
+  $json->convert_blessed(1);
+
+  # This may seem a little backwards, but what this really means is
+  # "don't convert our utf8 into byte strings, just leave it as a
+  # utf8 string."
+  $json->utf8(0);
+  return $json;
 }
 
 # Override the JSON::RPC method to return our CGI object instead of theirs.
 sub cgi { return Bugzilla->cgi; }
 
 sub response_header {
-    my $self = shift;
-    # The HTTP body needs to be bytes (not a utf8 string) for recent
-    # versions of HTTP::Message, but JSON::RPC::Server doesn't handle this
-    # properly. $_[1] is the HTTP body content we're going to be sending.
-    if (utf8::is_utf8($_[1])) {
-        utf8::encode($_[1]);
-        # Since we're going to just be sending raw bytes, we need to
-        # set STDOUT to not expect utf8.
-        disable_utf8();
-    }
-    return $self->SUPER::response_header(@_);
+  my $self = shift;
+
+  # The HTTP body needs to be bytes (not a utf8 string) for recent
+  # versions of HTTP::Message, but JSON::RPC::Server doesn't handle this
+  # properly. $_[1] is the HTTP body content we're going to be sending.
+  if (utf8::is_utf8($_[1])) {
+    utf8::encode($_[1]);
+
+    # Since we're going to just be sending raw bytes, we need to
+    # set STDOUT to not expect utf8.
+    disable_utf8();
+  }
+  return $self->SUPER::response_header(@_);
 }
 
 sub response {
-    my ($self, $response) = @_;
-    my $cgi = $self->cgi;
-
-    # Implement JSONP.
-    if (my $callback = $self->_bz_callback) {
-        my $content = $response->content;
-        # Prepend the JSONP response with /**/ in order to protect
-        # against possible encoding attacks (e.g., affecting Flash).
-        $response->content("/**/$callback($content)");
-    }
-
-    # Use $cgi->header properly instead of just printing text directly.
-    # This fixes various problems, including sending Bugzilla's cookies
-    # properly.
-    my $headers = $response->headers;
-    my @header_args;
-    foreach my $name ($headers->header_field_names) {
-        my @values = $headers->header($name);
-        $name =~ s/-/_/g;
-        foreach my $value (@values) {
-            push(@header_args, "-$name", $value);
-        }
-    }
-
-    # ETag support
-    my $etag = $self->bz_etag;
-    if ($etag && $cgi->check_etag($etag)) {
-        push(@header_args, "-ETag", $etag);
-        print $cgi->header(-status => '304 Not Modified', @header_args);
-    }
-    else {
-        push(@header_args, "-ETag", $etag) if $etag;
-        print $cgi->header(-status => $response->code, @header_args);
-        print $response->content;
-    }
+  my ($self, $response) = @_;
+  my $cgi = $self->cgi;
+
+  # Implement JSONP.
+  if (my $callback = $self->_bz_callback) {
+    my $content = $response->content;
+
+    # Prepend the JSONP response with /**/ in order to protect
+    # against possible encoding attacks (e.g., affecting Flash).
+    $response->content("/**/$callback($content)");
+  }
+
+  # Use $cgi->header properly instead of just printing text directly.
+  # This fixes various problems, including sending Bugzilla's cookies
+  # properly.
+  my $headers = $response->headers;
+  my @header_args;
+  foreach my $name ($headers->header_field_names) {
+    my @values = $headers->header($name);
+    $name =~ s/-/_/g;
+    foreach my $value (@values) {
+      push(@header_args, "-$name", $value);
+    }
+  }
+
+  # ETag support
+  my $etag = $self->bz_etag;
+  if ($etag && $cgi->check_etag($etag)) {
+    push(@header_args, "-ETag", $etag);
+    print $cgi->header(-status => '304 Not Modified', @header_args);
+  }
+  else {
+    push(@header_args, "-ETag", $etag) if $etag;
+    print $cgi->header(-status => $response->code, @header_args);
+    print $response->content;
+  }
 }
 
 # The JSON-RPC 1.1 GET specification is not so great--you can't specify
@@ -121,70 +127,69 @@ sub response {
 # Base64 encoded, because that is ridiculous and obnoxious for JavaScript
 # clients.
 sub retrieve_json_from_get {
-    my $self = shift;
-    my $cgi = $self->cgi;
-
-    my %input;
-
-    # Both version and id must be set before any errors are thrown.
-    if ($cgi->param('version')) {
-        $self->version(scalar $cgi->param('version'));
-        $input{version} = $cgi->param('version');
-    }
-    else {
-        $self->version('1.0');
-    }
-
-    # The JSON-RPC 2.0 spec says that any request that omits an id doesn't
-    # want a response. However, in an HTTP GET situation, it's stupid to
-    # expect all clients to specify some id parameter just to get a response,
-    # so we don't require it.
-    my $id;
-    if (defined $cgi->param('id')) {
-        $id = $cgi->param('id');
-    }
-    # However, JSON::RPC does require that an id exist in most cases, in
-    # order to throw proper errors. We use the installation's urlbase as
-    # the id, in this case.
-    else {
-        $id = correct_urlbase();
-    }
-    # Setting _bz_request_id here is required in case we throw errors early,
-    # before _handle.
-    $self->{_bz_request_id} = $input{id} = $id;
-
-    # _bz_callback can throw an error, so we have to set it here, after we're
-    # ready to throw errors.
-    $self->_bz_callback(scalar $cgi->param('callback'));
-
-    if (!$cgi->param('method')) {
-        ThrowUserError('json_rpc_get_method_required');
-    }
-    $input{method} = $cgi->param('method');
-
-    my $params;
-    if (defined $cgi->param('params')) {
-        local $@;
-        $params = eval { 
-            $self->json->decode(scalar $cgi->param('params')) 
-        };
-        if ($@) {
-            ThrowUserError('json_rpc_invalid_params',
-                           { params => scalar $cgi->param('params'),
-                             err_msg  => $@ });
-        }
-    }
-    elsif (!$self->version or $self->version ne '1.1') {
-        $params = [];
-    }
-    else {
-        $params = {};
-    }
-
-    $input{params} = $params;
-
-    my $json = $self->json->encode(\%input);
-    return $json;
+  my $self = shift;
+  my $cgi  = $self->cgi;
+
+  my %input;
+
+  # Both version and id must be set before any errors are thrown.
+  if ($cgi->param('version')) {
+    $self->version(scalar $cgi->param('version'));
+    $input{version} = $cgi->param('version');
+  }
+  else {
+    $self->version('1.0');
+  }
+
+  # The JSON-RPC 2.0 spec says that any request that omits an id doesn't
+  # want a response. However, in an HTTP GET situation, it's stupid to
+  # expect all clients to specify some id parameter just to get a response,
+  # so we don't require it.
+  my $id;
+  if (defined $cgi->param('id')) {
+    $id = $cgi->param('id');
+  }
+
+  # However, JSON::RPC does require that an id exist in most cases, in
+  # order to throw proper errors. We use the installation's urlbase as
+  # the id, in this case.
+  else {
+    $id = correct_urlbase();
+  }
+
+  # Setting _bz_request_id here is required in case we throw errors early,
+  # before _handle.
+  $self->{_bz_request_id} = $input{id} = $id;
+
+  # _bz_callback can throw an error, so we have to set it here, after we're
+  # ready to throw errors.
+  $self->_bz_callback(scalar $cgi->param('callback'));
+
+  if (!$cgi->param('method')) {
+    ThrowUserError('json_rpc_get_method_required');
+  }
+  $input{method} = $cgi->param('method');
+
+  my $params;
+  if (defined $cgi->param('params')) {
+    local $@;
+    $params = eval { $self->json->decode(scalar $cgi->param('params')) };
+    if ($@) {
+      ThrowUserError('json_rpc_invalid_params',
+        {params => scalar $cgi->param('params'), err_msg => $@});
+    }
+  }
+  elsif (!$self->version or $self->version ne '1.1') {
+    $params = [];
+  }
+  else {
+    $params = {};
+  }
+
+  $input{params} = $params;
+
+  my $json = $self->json->encode(\%input);
+  return $json;
 }
 
 #######################################
@@ -192,72 +197,82 @@ sub retrieve_json_from_get {
 #######################################
 
 sub type {
-    my ($self, $type, $value) = @_;
-    
-    # This is the only type that does something special with undef.
-    if ($type eq 'boolean') {
-        return $value ? JSON::true : JSON::false;
-    }
-    
-    return JSON::null if !defined $value;
-
-    my $retval = $value;
-
-    if ($type eq 'int') {
-        $retval = int($value);
-    }
-    if ($type eq 'double') {
-        $retval = 0.0 + $value;
-    }
-    elsif ($type eq 'string') {
-        # Forces string context, so that JSON will make it a string.
-        $retval = "$value";
-    }
-    elsif ($type eq 'dateTime') {
-        # ISO-8601 "YYYYMMDDTHH:MM:SS" with a literal T
-        $retval = $self->datetime_format_outbound($value);
-    }
-    elsif ($type eq 'base64') {
-        utf8::encode($value) if utf8::is_utf8($value);
-        $retval = encode_base64($value, '');
-    }
-    elsif ($type eq 'email' && Bugzilla->params->{'webservice_email_filter'}) {
-        $retval = email_filter($value);
-    }
-
-    return $retval;
+  my ($self, $type, $value) = @_;
+
+  # This is the only type that does something special with undef.
+  if ($type eq 'boolean') {
+    return $value ? JSON::true : JSON::false;
+  }
+
+  return JSON::null if !defined $value;
+
+  my $retval = $value;
+
+  if ($type eq 'int') {
+    $retval = int($value);
+  }
+  if ($type eq 'double') {
+    $retval = 0.0 + $value;
+  }
+  elsif ($type eq 'string') {
+
+    # Forces string context, so that JSON will make it a string.
+    $retval = "$value";
+  }
+  elsif ($type eq 'dateTime') {
+
+    # ISO-8601 "YYYYMMDDTHH:MM:SS" with a literal T
+    $retval = $self->datetime_format_outbound($value);
+  }
+  elsif ($type eq 'base64') {
+    utf8::encode($value) if utf8::is_utf8($value);
+    $retval = encode_base64($value, '');
+  }
+  elsif ($type eq 'login') {
+    $retval
+      = Bugzilla->params->{'use_email_as_login'}
+      ? email_filter($retval)
+      : "$retval";
+  }
+  elsif ($type eq 'email') {
+    $retval = Bugzilla->user->in_group('editusers') ? "$retval" : '';
+  }
+
+  return $retval;
 }
 
 sub datetime_format_outbound {
-    my $self = shift;
-    # YUI expects ISO8601 in UTC time; including TZ specifier
-    return $self->SUPER::datetime_format_outbound(@_) . 'Z';
+  my $self = shift;
+
+  # YUI expects ISO8601 in UTC time; including TZ specifier
+  return $self->SUPER::datetime_format_outbound(@_) . 'Z';
 }
 
 sub handle_login {
-    my $self = shift;
-
-    # If we're being called using GET, we don't allow cookie-based or Env
-    # login, because GET requests can be done cross-domain, and we don't
-    # want private data showing up on another site unless the user
-    # explicitly gives that site their username and password. (This is
-    # particularly important for JSONP, which would allow a remote site
-    # to use private data without the user's knowledge, unless we had this
-    # protection in place.)
-    if ($self->request->method ne 'POST') {
-        # XXX There's no particularly good way for us to get a parameter
-        # to Bugzilla->login at this point, so we pass this information
-        # around using request_cache, which is a bit of a hack. The
-        # implementation of it is in Bugzilla::Auth::Login::Stack.
-        Bugzilla->request_cache->{auth_no_automatic_login} = 1;
-    }
-
-    my $path = $self->path_info;
-    my $class = $self->{dispatch_path}->{$path};
-    my $full_method = $self->_bz_method_name;
-    $full_method =~ /^\S+\.(\S+)/;
-    my $method = $1;
-    $self->SUPER::handle_login($class, $method, $full_method);
+  my $self = shift;
+
+  # If we're being called using GET, we don't allow cookie-based or Env
+  # login, because GET requests can be done cross-domain, and we don't
+  # want private data showing up on another site unless the user
+  # explicitly gives that site their username and password. (This is
+  # particularly important for JSONP, which would allow a remote site
+  # to use private data without the user's knowledge, unless we had this
+  # protection in place.)
+  if ($self->request->method ne 'POST') {
+
+    # XXX There's no particularly good way for us to get a parameter
+    # to Bugzilla->login at this point, so we pass this information
+    # around using request_cache, which is a bit of a hack. The
+    # implementation of it is in Bugzilla::Auth::Login::Stack.
+    Bugzilla->request_cache->{auth_no_automatic_login} = 1;
+  }
+
+  my $path        = $self->path_info;
+  my $class       = $self->{dispatch_path}->{$path};
+  my $full_method = $self->_bz_method_name;
+  $full_method =~ /^\S+\.(\S+)/;
+  my $method = $1;
+  $self->SUPER::handle_login($class, $method, $full_method);
 }
 
 ######################################
@@ -266,160 +281,171 @@ sub handle_login {
 
 # Store the ID of the current call, because Bugzilla::Error will need it.
 sub _handle {
-    my $self = shift;
-    my ($obj) = @_;
-    $self->{_bz_request_id} = $obj->{id};
+  my $self = shift;
+  my ($obj) = @_;
+  $self->{_bz_request_id} = $obj->{id};
 
-    my $result = $self->SUPER::_handle(@_);
+  my $result = $self->SUPER::_handle(@_);
 
-    # Set the ETag if not already set in the webservice methods.
-    my $etag = $self->bz_etag;
-    if (!$etag && ref $result) {
-        my $data = $self->json->decode($result)->{'result'};
-        $self->bz_etag($data);
-    }
+  # Reset in_eval to so we get normal exceptions from here
+  Bugzilla->request_cache->{in_eval} = 0;
 
-    return $result;
+  # Set the ETag if not already set in the webservice methods.
+  my $etag = $self->bz_etag;
+  if (!$etag && ref $result) {
+    my $data = $self->json->decode($result)->{'result'};
+    $self->bz_etag($data);
+  }
+
+  return $result;
 }
 
 # Make all error messages returned by JSON::RPC go into the 100000
 # range, and bring down all our errors into the normal range.
 sub _error {
-    my ($self, $id, $code) = (shift, shift, shift);
-    # All JSON::RPC errors are less than 1000.
-    if ($code < 1000) {
-        $code += 100000;
-    }
-    # Bugzilla::Error adds 100,000 to all *our* errors, so
-    # we know they came from us.
-    elsif ($code > 100000) {
-        $code -= 100000;
-    }
-
-    # We can't just set $_[1] because it's not always settable,
-    # in JSON::RPC::Server.
-    unshift(@_, $id, $code);
-    my $json = $self->SUPER::_error(@_);
-
-    # We want to always send the JSON-RPC 1.1 error format, although
-    # If we're not in JSON-RPC 1.1, we don't need the silly "name" parameter.
-    if (!$self->version or $self->version ne '1.1') {
-        my $object = $self->json->decode($json);
-        my $message = $object->{error};
-        # Just assure that future versions of JSON::RPC don't change the
-        # JSON-RPC 1.0 error format.
-        if (!ref $message) {
-            $object->{error} = {
-                code    => $code,
-                message => $message,
-            };
-            $json = $self->json->encode($object);
-        }
-    }
-    return $json;
+  my ($self, $id, $code) = (shift, shift, shift);
+
+  # All JSON::RPC errors are less than 1000.
+  if ($code < 1000) {
+    $code += 100000;
+  }
+
+  # Bugzilla::Error adds 100,000 to all *our* errors, so
+  # we know they came from us.
+  elsif ($code > 100000) {
+    $code -= 100000;
+  }
+
+  # We can't just set $_[1] because it's not always settable,
+  # in JSON::RPC::Server.
+  unshift(@_, $id, $code);
+  my $json = $self->SUPER::_error(@_);
+
+  # We want to always send the JSON-RPC 1.1 error format, although
+  # If we're not in JSON-RPC 1.1, we don't need the silly "name" parameter.
+  if (!$self->version or $self->version ne '1.1') {
+    my $object  = $self->json->decode($json);
+    my $message = $object->{error};
+
+    # Just assure that future versions of JSON::RPC don't change the
+    # JSON-RPC 1.0 error format.
+    if (!ref $message) {
+      $object->{error} = {code => $code, message => $message,};
+      $json = $self->json->encode($object);
+    }
+  }
+  return $json;
 }
 
 # This handles dispatching our calls to the appropriate class based on
 # the name of the method.
 sub _find_procedure {
-    my $self = shift;
+  my $self = shift;
 
-    my $method = shift;
-    $self->{_bz_method_name} = $method;
+  my $method = shift;
+  $self->{_bz_method_name} = $method;
 
-    # This tricks SUPER::_find_procedure into finding the right class.
-    $method =~ /^(\S+)\.(\S+)$/;
-    $self->path_info($1);
-    unshift(@_, $2);
+  # This tricks SUPER::_find_procedure into finding the right class.
+  $method =~ /^(\S+)\.(\S+)$/;
+  $self->path_info($1);
+  unshift(@_, $2);
 
-    return $self->SUPER::_find_procedure(@_);
+  return $self->SUPER::_find_procedure(@_);
 }
 
 # This is a hacky way to do something right before methods are called.
 # This is the last thing that JSON::RPC::Server::_handle calls right before
 # the method is actually called.
 sub _argument_type_check {
-    my $self = shift;
-    my $params = $self->SUPER::_argument_type_check(@_);
-
-    # JSON-RPC 1.0 requires all parameters to be passed as an array, so
-    # we just pull out the first item and assume it's an object.
-    my $params_is_array;
-    if (ref $params eq 'ARRAY') {
-        $params = $params->[0];
-        $params_is_array = 1;
-    }
-
-    taint_data($params);
-
-    # Now, convert dateTime fields on input.
-    $self->_bz_method_name =~ /^(\S+)\.(\S+)$/;
-    my ($class, $method) = ($1, $2);
-    my $pkg = $self->{dispatch_path}->{$class};
-    my @date_fields = @{ $pkg->DATE_FIELDS->{$method} || [] };
-    foreach my $field (@date_fields) {
-        if (defined $params->{$field}) {
-            my $value = $params->{$field};
-            if (ref $value eq 'ARRAY') {
-                $params->{$field} = 
-                    [ map { $self->datetime_format_inbound($_) } @$value ];
-            }
-            else {
-                $params->{$field} = $self->datetime_format_inbound($value);
-            }
-        }
-    }
-    my @base64_fields = @{ $pkg->BASE64_FIELDS->{$method} || [] };
-    foreach my $field (@base64_fields) {
-        if (defined $params->{$field}) {
-            $params->{$field} = decode_base64($params->{$field});
-        }
-    }
-
-    # Update the params to allow for several convenience key/values
-    # use for authentication
-    fix_credentials($params);
-
-    Bugzilla->input_params($params);
-
-    if ($self->request->method eq 'POST') {
-        # CSRF is possible via XMLHttpRequest when the Content-Type header
-        # is not application/json (for example: text/plain or
-        # application/x-www-form-urlencoded).
-        # application/json is the single official MIME type, per RFC 4627.
-        my $content_type = $self->cgi->content_type;
-        # The charset can be appended to the content type, so we use a regexp.
-        if ($content_type !~ m{^application/json(-rpc)?(;.*)?$}i) {
-            ThrowUserError('json_rpc_illegal_content_type',
-                            { content_type => $content_type });
-        }
-    }
-    else {
-        # When being called using GET, we don't allow calling
-        # methods that can change data. This protects us against cross-site
-        # request forgeries.
-        if (!grep($_ eq $method, $pkg->READ_ONLY)) {
-            ThrowUserError('json_rpc_post_only', 
-                           { method => $self->_bz_method_name });
-        }
-    }
-
-    # This is the best time to do login checks.
-    $self->handle_login();
-
-    # Bugzilla::WebService packages call internal methods like
-    # $self->_some_private_method. So we have to inherit from 
-    # that class as well as this Server class.
-    my $new_class = ref($self) . '::' . $pkg;
-    my $isa_string = 'our @ISA = qw(' . ref($self) . " $pkg)";
-    eval "package $new_class;$isa_string;";
-    bless $self, $new_class;
-
-    if ($params_is_array) {
-        $params = [$params];
-    }
-
-    return $params;
+  my $self   = shift;
+  my $params = $self->SUPER::_argument_type_check(@_);
+
+  # JSON-RPC 1.0 requires all parameters to be passed as an array, so
+  # we just pull out the first item and assume it's an object.
+  my $params_is_array;
+  if (ref $params eq 'ARRAY') {
+    $params          = $params->[0];
+    $params_is_array = 1;
+  }
+
+  taint_data($params);
+
+  # Now, convert dateTime fields on input.
+  $self->_bz_method_name =~ /^(\S+)\.(\S+)$/;
+  my ($class, $method) = ($1, $2);
+  my $pkg = $self->{dispatch_path}->{$class};
+  my @date_fields = @{$pkg->DATE_FIELDS->{$method} || []};
+  foreach my $field (@date_fields) {
+    if (defined $params->{$field}) {
+      my $value = $params->{$field};
+      if (ref $value eq 'ARRAY') {
+        $params->{$field} = [map { $self->datetime_format_inbound($_) } @$value];
+      }
+      else {
+        $params->{$field} = $self->datetime_format_inbound($value);
+      }
+    }
+  }
+  my @base64_fields = @{$pkg->BASE64_FIELDS->{$method} || []};
+  foreach my $field (@base64_fields) {
+    if (defined $params->{$field}) {
+      $params->{$field} = decode_base64($params->{$field});
+    }
+  }
+
+  # Update the params to allow for several convenience key/values
+  # use for authentication
+  fix_credentials($params, $self->cgi);
+
+  Bugzilla->input_params($params);
+
+  if ($self->request->method eq 'POST') {
+
+    # CSRF is possible via XMLHttpRequest when the Content-Type header
+    # is not application/json (for example: text/plain or
+    # application/x-www-form-urlencoded).
+    # application/json is the single official MIME type, per RFC 4627.
+    my $content_type = $self->cgi->content_type;
+
+    # The charset can be appended to the content type, so we use a regexp.
+    if ($content_type !~ m{^application/json(-rpc)?(;.*)?$}i) {
+      ThrowUserError('json_rpc_illegal_content_type',
+        {content_type => $content_type});
+    }
+  }
+  else {
+    # When being called using GET, we don't allow calling
+    # methods that can change data. This protects us against cross-site
+    # request forgeries.
+    if (!grep($_ eq $method, $pkg->READ_ONLY)) {
+      ThrowUserError('json_rpc_post_only', {method => $self->_bz_method_name});
+    }
+  }
+
+  # Only allowed methods to be used from our whitelist
+  if (none { $_ eq $method } $pkg->PUBLIC_METHODS) {
+    ThrowCodeError('unknown_method', {method => $self->_bz_method_name});
+  }
+
+  # This is the best time to do login checks.
+  $self->handle_login();
+
+  # Bugzilla::WebService packages call internal methods like
+  # $self->_some_private_method. So we have to inherit from
+  # that class as well as this Server class.
+  my $new_class  = ref($self) . '::' . $pkg;
+  my $isa_string = 'our @ISA = qw(' . ref($self) . " $pkg)";
+  eval "package $new_class;$isa_string;";
+  bless $self, $new_class;
+
+  if ($params_is_array) {
+    $params = [$params];
+  }
+
+  # Let Bugzilla::Error know we are inside an eval() after this point
+  Bugzilla->request_cache->{in_eval} = 1;
+
+  return $params;
 }
 
 ##########################
@@ -428,22 +454,24 @@ sub _argument_type_check {
 
 # _bz_method_name is stored by _find_procedure for later use.
 sub _bz_method_name {
-    return $_[0]->{_bz_method_name}; 
+  return $_[0]->{_bz_method_name};
 }
 
 sub _bz_callback {
-    my ($self, $value) = @_;
-    if (defined $value) {
-        $value = trim($value);
-        # We don't use \w because we don't want to allow Unicode here.
-        if ($value !~ /^[A-Za-z0-9_\.\[\]]+$/) {
-            ThrowUserError('json_rpc_invalid_callback', { callback => $value });
-        }
-        $self->{_bz_callback} = $value;
-        # JSONP needs to be parsed by a JS parser, not by a JSON parser.
-        $self->content_type('text/javascript');
+  my ($self, $value) = @_;
+  if (defined $value) {
+    $value = trim($value);
+
+    # We don't use \w because we don't want to allow Unicode here.
+    if ($value !~ /^[A-Za-z0-9_\.\[\]]+$/) {
+      ThrowUserError('json_rpc_invalid_callback', {callback => $value});
     }
-    return $self->{_bz_callback};
+    $self->{_bz_callback} = $value;
+
+    # JSONP needs to be parsed by a JS parser, not by a JSON parser.
+    $self->content_type('text/javascript');
+  }
+  return $self->{_bz_callback};
 }
 
 1;
diff --git a/Bugzilla/WebService/Server/REST.pm b/Bugzilla/WebService/Server/REST.pm
deleted file mode 100644
index 5ab973f1a9..0000000000
--- a/Bugzilla/WebService/Server/REST.pm
+++ /dev/null
@@ -1,659 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use parent qw(Bugzilla::WebService::Server::JSONRPC);
-
-use Bugzilla::Constants;
-use Bugzilla::Error;
-use Bugzilla::Hook;
-use Bugzilla::Util qw(correct_urlbase html_quote);
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Util qw(taint_data fix_credentials);
-
-# Load resource modules
-use Bugzilla::WebService::Server::REST::Resources::Bug;
-use Bugzilla::WebService::Server::REST::Resources::Bugzilla;
-use Bugzilla::WebService::Server::REST::Resources::Classification;
-use Bugzilla::WebService::Server::REST::Resources::Component;
-use Bugzilla::WebService::Server::REST::Resources::FlagType;
-use Bugzilla::WebService::Server::REST::Resources::Group;
-use Bugzilla::WebService::Server::REST::Resources::Product;
-use Bugzilla::WebService::Server::REST::Resources::User;
-use Bugzilla::WebService::Server::REST::Resources::BugUserLastVisit;
-
-use Scalar::Util qw(blessed reftype);
-use MIME::Base64 qw(decode_base64);
-
-###########################
-# Public Method Overrides #
-###########################
-
-sub handle {
-    my ($self)  = @_;
-
-    # Determine how the data should be represented. We do this early so
-    # errors will also be returned with the proper content type.
-    # If no accept header was sent or the content types specified were not
-    # matched, we default to the first type in the whitelist.
-    $self->content_type($self->_best_content_type(REST_CONTENT_TYPE_WHITELIST()));
-
-    # Using current path information, decide which class/method to
-    # use to serve the request. Throw error if no resource was found
-    # unless we were looking for OPTIONS
-    if (!$self->_find_resource($self->cgi->path_info)) {
-        if ($self->request->method eq 'OPTIONS'
-            && $self->bz_rest_options)
-        {
-            my $response = $self->response_header(STATUS_OK, "");
-            my $options_string = join(', ', @{ $self->bz_rest_options });
-            $response->header('Allow' => $options_string,
-                              'Access-Control-Allow-Methods' => $options_string);
-            return $self->response($response);
-        }
-
-        ThrowUserError("rest_invalid_resource",
-                       { path   => $self->cgi->path_info,
-                         method => $self->request->method });
-    }
-
-    # Dispatch to the proper module
-    my $class  = $self->bz_class_name;
-    my ($path) = $class =~ /::([^:]+)$/;
-    $self->path_info($path);
-    delete $self->{dispatch_path};
-    $self->dispatch({ $path => $class });
-
-    my $params = $self->_retrieve_json_params;
-
-    fix_credentials($params);
-
-    # Fix includes/excludes for each call
-    rest_include_exclude($params);
-
-    # Set callback name if exists
-    $self->_bz_callback($params->{'callback'}) if $params->{'callback'};
-
-    Bugzilla->input_params($params);
-
-    # Set the JSON version to 1.1 and the id to the current urlbase
-    # also set up the correct handler method
-    my $obj = {
-        version => '1.1',
-        id      => correct_urlbase(),
-        method  => $self->bz_method_name,
-        params  => $params
-    };
-
-    # Execute the handler
-    my $result = $self->_handle($obj);
-
-    if (!$self->error_response_header) {
-        return $self->response(
-            $self->response_header($self->bz_success_code || STATUS_OK, $result));
-    }
-
-    $self->response($self->error_response_header);
-}
-
-sub response {
-    my ($self, $response) = @_;
-
-    # If we have thrown an error, the 'error' key will exist
-    # otherwise we use 'result'. JSONRPC returns other data
-    # along with the result/error such as version and id which
-    # we will strip off for REST calls.
-    my $content = $response->content;
-    my $json_data = {};
-    if ($content) {
-        $json_data = $self->json->decode($content);
-    }
-
-    my $result = {};
-    if (exists $json_data->{error}) {
-        $result = $json_data->{error};
-        $result->{error} = $self->type('boolean', 1);
-        $result->{documentation} = REST_DOC;
-        delete $result->{'name'}; # Remove JSONRPCError
-    }
-    elsif (exists $json_data->{result}) {
-        $result = $json_data->{result};
-    }
-
-    Bugzilla::Hook::process('webservice_rest_response',
-        { rpc => $self, result => \$result, response => $response });
-
-    # Access Control
-    $response->header("Access-Control-Allow-Origin", "*");
-    $response->header("Access-Control-Allow-Headers", "origin, content-type, accept");
-
-    # ETag support
-    my $etag = $self->bz_etag;
-    $self->bz_etag($result) if !$etag;
-
-    # If accessing through web browser, then display in readable format
-    if ($self->content_type eq 'text/html') {
-        $result = $self->json->pretty->canonical->allow_nonref->encode($result);
-
-        my $template = Bugzilla->template;
-        $content = "";
-        $template->process("rest.html.tmpl", { result => $result }, \$content)
-            || ThrowTemplateError($template->error());
-
-        $response->content_type('text/html');
-    }
-    else {
-        $content = $self->json->encode($result);
-    }
-
-    $response->content($content);
-
-    $self->SUPER::response($response);
-}
-
-#######################################
-# Bugzilla::WebService Implementation #
-#######################################
-
-sub handle_login {
-    my $self = shift;
-
-    # If we're being called using GET, we don't allow cookie-based or Env
-    # login, because GET requests can be done cross-domain, and we don't
-    # want private data showing up on another site unless the user
-    # explicitly gives that site their username and password. (This is
-    # particularly important for JSONP, which would allow a remote site
-    # to use private data without the user's knowledge, unless we had this
-    # protection in place.) We do allow this for GET /login as we need to
-    # for Bugzilla::Auth::Persist::Cookie to create a login cookie that we
-    # can also use for Bugzilla_token support. This is OK as it requires
-    # a login and password to be supplied and will fail if they are not
-    # valid for the user.
-    if (!grep($_ eq $self->request->method, ('POST', 'PUT'))
-        && !($self->bz_class_name eq 'Bugzilla::WebService::User'
-            && $self->bz_method_name eq 'login'))
-    {
-        # XXX There's no particularly good way for us to get a parameter
-        # to Bugzilla->login at this point, so we pass this information
-        # around using request_cache, which is a bit of a hack. The
-        # implementation of it is in Bugzilla::Auth::Login::Stack.
-        Bugzilla->request_cache->{'auth_no_automatic_login'} = 1;
-    }
-
-    my $class = $self->bz_class_name;
-    my $method = $self->bz_method_name;
-    my $full_method = $class . "." . $method;
-
-    # Bypass JSONRPC::handle_login
-    Bugzilla::WebService::Server->handle_login($class, $method, $full_method);
-}
-
-############################
-# Private Method Overrides #
-############################
-
-# We do not want to run Bugzilla::WebService::Server::JSONRPC->_find_prodedure
-# as it determines the method name differently.
-sub _find_procedure {
-    my $self = shift;
-    if ($self->isa('JSON::RPC::Server::CGI')) {
-        return JSON::RPC::Server::_find_procedure($self, @_);
-    }
-    else {
-        return JSON::RPC::Legacy::Server::_find_procedure($self, @_);
-    }
-}
-
-sub _argument_type_check {
-    my $self = shift;
-    my $params;
-
-    if ($self->isa('JSON::RPC::Server::CGI')) {
-        $params = JSON::RPC::Server::_argument_type_check($self, @_);
-    }
-    else {
-        $params = JSON::RPC::Legacy::Server::_argument_type_check($self, @_);
-    }
-
-    # JSON-RPC 1.0 requires all parameters to be passed as an array, so
-    # we just pull out the first item and assume it's an object.
-    my $params_is_array;
-    if (ref $params eq 'ARRAY') {
-        $params = $params->[0];
-        $params_is_array = 1;
-    }
-
-    taint_data($params);
-
-    # Now, convert dateTime fields on input.
-    my $method = $self->bz_method_name;
-    my $pkg = $self->{dispatch_path}->{$self->path_info};
-    my @date_fields = @{ $pkg->DATE_FIELDS->{$method} || [] };
-    foreach my $field (@date_fields) {
-        if (defined $params->{$field}) {
-            my $value = $params->{$field};
-            if (ref $value eq 'ARRAY') {
-                $params->{$field} =
-                    [ map { $self->datetime_format_inbound($_) } @$value ];
-            }
-            else {
-                $params->{$field} = $self->datetime_format_inbound($value);
-            }
-        }
-    }
-    my @base64_fields = @{ $pkg->BASE64_FIELDS->{$method} || [] };
-    foreach my $field (@base64_fields) {
-        if (defined $params->{$field}) {
-            $params->{$field} = decode_base64($params->{$field});
-        }
-    }
-
-    # This is the best time to do login checks.
-    $self->handle_login();
-
-    # Bugzilla::WebService packages call internal methods like
-    # $self->_some_private_method. So we have to inherit from
-    # that class as well as this Server class.
-    my $new_class = ref($self) . '::' . $pkg;
-    my $isa_string = 'our @ISA = qw(' . ref($self) . " $pkg)";
-    eval "package $new_class;$isa_string;";
-    bless $self, $new_class;
-
-    # Allow extensions to modify the params post login
-    Bugzilla::Hook::process('webservice_rest_request',
-                            { rpc => $self, params => $params });
-
-    if ($params_is_array) {
-        $params = [$params];
-    }
-
-    return $params;
-}
-
-###################
-# Utility Methods #
-###################
-
-sub bz_method_name {
-    my ($self, $method) = @_;
-    $self->{_bz_method_name} = $method if $method;
-    return $self->{_bz_method_name};
-}
-
-sub bz_class_name {
-    my ($self, $class) = @_;
-    $self->{_bz_class_name} = $class if $class;
-    return $self->{_bz_class_name};
-}
-
-sub bz_success_code {
-    my ($self, $value) = @_;
-    $self->{_bz_success_code} = $value if $value;
-    return $self->{_bz_success_code};
-}
-
-sub bz_rest_params {
-    my ($self, $params) = @_;
-    $self->{_bz_rest_params} = $params if $params;
-    return $self->{_bz_rest_params};
-}
-
-sub bz_rest_options {
-    my ($self, $options) = @_;
-    $self->{_bz_rest_options} = $options if $options;
-    return $self->{_bz_rest_options};
-}
-
-sub rest_include_exclude {
-    my ($params) = @_;
-
-    if ($params->{'include_fields'} && !ref $params->{'include_fields'}) {
-        $params->{'include_fields'} = [ split(/[\s+,]/, $params->{'include_fields'}) ];
-    }
-    if ($params->{'exclude_fields'} && !ref $params->{'exclude_fields'}) {
-        $params->{'exclude_fields'} = [ split(/[\s+,]/, $params->{'exclude_fields'}) ];
-    }
-
-    return $params;
-}
-
-##########################
-# Private Custom Methods #
-##########################
-
-sub _retrieve_json_params {
-    my $self = shift;
-
-    # Make a copy of the current input_params rather than edit directly
-    my $params = {};
-    %{$params} = %{ Bugzilla->input_params };
-
-    # First add any params we were able to pull out of the path
-    # based on the resource regexp
-    %{$params} = (%{$params}, %{$self->bz_rest_params}) if $self->bz_rest_params;
-
-    # Merge any additional query key/values with $obj->{params} if not a GET request
-    # We do this manually cause CGI.pm doesn't understand JSON strings.
-    if ($self->request->method ne 'GET') {
-        my $extra_params = {};
-        my $json = delete $params->{'POSTDATA'} || delete $params->{'PUTDATA'};
-        if ($json) {
-            eval { $extra_params = $self->json->decode($json); };
-            if ($@) {
-                ThrowUserError('json_rpc_invalid_params', { err_msg  => $@ });
-            }
-        }
-
-        # Allow parameters in the query string if request was not GET.
-        # Note: query string parameters will override any matching params
-        # also specified in the request body.
-        foreach my $param ($self->cgi->url_param()) {
-            $extra_params->{$param} = $self->cgi->url_param($param);
-        }
-
-        %{$params} = (%{$params}, %{$extra_params}) if %{$extra_params};
-    }
-
-    return $params;
-}
-
-sub _find_resource {
-    my ($self, $path) = @_;
-
-    # Load in the WebService module from the dispatch map and then call
-    # $module->rest_resources to get the resources array ref.
-    my $resources = {};
-    foreach my $module (values %{ $self->{dispatch_path} }) {
-        eval("require $module") || die $@;
-        next if !$module->can('rest_resources');
-        $resources->{$module} = $module->rest_resources;
-    }
-
-    Bugzilla::Hook::process('webservice_rest_resources',
-                            { rpc => $self, resources => $resources });
-
-    # Use the resources hash from each module loaded earlier to determine
-    # which handler to use based on a regex match of the CGI path.
-    # Also any matches found in the regex will be passed in later to the
-    # handler for possible use.
-    my $request_method = $self->request->method;
-
-    my (@matches, $handler_found, $handler_method, $handler_class);
-    foreach my $class (keys %{ $resources }) {
-        # The resource data for each module needs to be
-        # an array ref with an even number of elements
-        # to work correctly.
-        next if (ref $resources->{$class} ne 'ARRAY'
-                 || scalar @{ $resources->{$class} } % 2 != 0);
-
-        while (my $regex = shift @{ $resources->{$class} }) {
-            my $options_data = shift @{ $resources->{$class} };
-            next if ref $options_data ne 'HASH';
-
-            if (@matches = ($path =~ $regex)) {
-                # If a specific path is accompanied by a OPTIONS request
-                # method, the user is asking for a list of possible request
-                # methods for a specific path.
-                $self->bz_rest_options([ keys %{ $options_data } ]);
-
-                if ($options_data->{$request_method}) {
-                    my $resource_data = $options_data->{$request_method};
-                    $self->bz_class_name($class);
-
-                    # The method key/value can be a simple scalar method name
-                    # or a anonymous subroutine so we execute it here.
-                    my $method = ref $resource_data->{method} eq 'CODE'
-                                 ? $resource_data->{method}->($self)
-                                 : $resource_data->{method};
-                    $self->bz_method_name($method);
-
-                    # Pull out any parameters parsed from the URL path
-                    # and store them for use by the method.
-                    if ($resource_data->{params}) {
-                        $self->bz_rest_params($resource_data->{params}->(@matches));
-                    }
-
-                    # If a special success code is needed for this particular
-                    # method, then store it for later when generating response.
-                    if ($resource_data->{success_code}) {
-                        $self->bz_success_code($resource_data->{success_code});
-                    }
-                    $handler_found = 1;
-                }
-            }
-            last if $handler_found;
-        }
-        last if $handler_found;
-    }
-
-    return $handler_found;
-}
-
-sub _best_content_type {
-    my ($self, @types) = @_;
-    return ($self->_simple_content_negotiation(@types))[0] || '*/*';
-}
-
-sub _simple_content_negotiation {
-    my ($self, @types) = @_;
-    my @accept_types = $self->_get_content_prefs();
-    # Return the types as-is if no accept header sent, since sorting will be a no-op.
-    if (!@accept_types) {
-        return @types;
-    }
-    my $score = sub { $self->_score_type(shift, @accept_types) };
-    return sort {$score->($b) <=> $score->($a)} @types;
-}
-
-sub _score_type {
-    my ($self, $type, @accept_types) = @_;
-    my $score = scalar(@accept_types);
-    for my $accept_type (@accept_types) {
-        return $score if $type eq $accept_type;
-        $score--;
-    }
-    return 0;
-}
-
-sub _get_content_prefs {
-    my $self = shift;
-    my $default_weight = 1;
-    my @prefs;
-
-    # Parse the Accept header, and save type name, score, and position.
-    my @accept_types = split /,/, $self->cgi->http('accept') || '';
-    my $order = 0;
-    for my $accept_type (@accept_types) {
-        my ($weight) = ($accept_type =~ /q=(\d\.\d+|\d+)/);
-        my ($name) = ($accept_type =~ m#(\S+/[^;]+)#);
-        next unless $name;
-        push @prefs, { name => $name, order => $order++};
-        if (defined $weight) {
-            $prefs[-1]->{score} = $weight;
-        } else {
-            $prefs[-1]->{score} = $default_weight;
-            $default_weight -= 0.001;
-        }
-    }
-
-    # Sort the types by score, subscore by order, and pull out just the name
-    @prefs = map {$_->{name}} sort {$b->{score} <=> $a->{score} ||
-                                    $a->{order} <=> $b->{order}} @prefs;
-    return @prefs;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::WebService::Server::REST - The REST Interface to Bugzilla
-
-=head1 DESCRIPTION
-
-This documentation describes things about the Bugzilla WebService that
-are specific to REST. For a general overview of the Bugzilla WebServices,
-see L<Bugzilla::WebService>. The L<Bugzilla::WebService::Server::REST>
-module is a sub-class of L<Bugzilla::WebService::Server::JSONRPC> so any
-method documentation not found here can be viewed in it's POD.
-
-Please note that I<everything> about this REST interface is
-B<EXPERIMENTAL>. If you want a fully stable API, please use the
-C<Bugzilla::WebService::Server::XMLRPC|XML-RPC> interface.
-
-=head1 CONNECTING
-
-The endpoint for the REST interface is the C<rest.cgi> script in
-your Bugzilla installation. For example, if your Bugzilla is at
-C<bugzilla.yourdomain.com>, to access the API and load a bug,
-you would use C<http://bugzilla.yourdomain.com/rest.cgi/bug/35>.
-
-If using Apache and mod_rewrite is installed and enabled, you can
-simplify the endpoint by changing /rest.cgi/ to something like /rest/
-or something similar. So the same example from above would be:
-C<http://bugzilla.yourdomain.com/rest/bug/35> which is simpler to remember.
-
-Add this to your .htaccess file:
-
-  <IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteRule ^rest/(.*)$ rest.cgi/$1 [NE]
-  </IfModule>
-
-=head1 BROWSING
-
-If the Accept: header of a request is set to text/html (as it is by an
-ordinary web browser) then the API will return the JSON data as a HTML
-page which the browser can display. In other words, you can play with the
-API using just your browser and see results in a human-readable form.
-This is a good way to try out the various GET calls, even if you can't use
-it for POST or PUT.
-
-=head1 DATA FORMAT
-
-The REST API only supports JSON input, and either JSON and JSONP output.
-So objects sent and received must be in JSON format. Basically since
-the REST API is a sub class of the JSONRPC API, you can refer to
-L<JSONRPC|Bugzilla::WebService::Server::JSONRPC> for more information
-on data types that are valid for REST.
-
-On every request, you must set both the "Accept" and "Content-Type" HTTP
-headers to the MIME type of the data format you are using to communicate with
-the API. Content-Type tells the API how to interpret your request, and Accept
-tells it how you want your data back. "Content-Type" must be "application/json".
-"Accept" can be either that, or "application/javascript" for JSONP - add a "callback"
-parameter to name your callback.
-
-Parameters may also be passed in as part of the query string  for non-GET requests
-and will override any matching parameters in the request body.
-
-=head1 AUTHENTICATION
-
-Along with viewing data as an anonymous user, you may also see private information
-if you have a Bugzilla account by providing your login credentials.
-
-=over
-
-=item Login name and password
-
-Pass in as query parameters of any request:
-
-login=fred@example.com&password=ilovecheese
-
-Remember to URL encode any special characters, which are often seen in passwords and to
-also enable SSL support.
-
-=item Login token
-
-By calling GET /login?login=fred@example.com&password=ilovecheese, you get back
-a C<token> value which can then be passed to each subsequent call as
-authentication. This is useful for third party clients that cannot use cookies
-and do not want to store a user's login and password in the client. You can also
-pass in "token" as a convenience.
-
-=back
-
-=head1 ERRORS
-
-When an error occurs over REST, a hash structure is returned with the key C<error>
-set to C<true>.
-
-The error contents look similar to:
-
- { "error": true, "message": "Some message here", "code": 123 }
-
-Every error has a "code", as described in L<Bugzilla::WebService/ERRORS>.
-Errors with a numeric C<code> higher than 100000 are errors thrown by
-the JSON-RPC library that Bugzilla uses, not by Bugzilla.
-
-=head1 UTILITY FUNCTIONS
-
-=over
-
-=item B<handle>
-
-This method overrides the handle method provided by JSONRPC so that certain
-actions related to REST such as determining the proper resource to use,
-loading query parameters, etc. can be done before the proper WebService
-method is executed.
-
-=item B<response>
-
-This method overrides the response method provided by JSONRPC so that
-the response content can be altered for REST before being returned to
-the client.
-
-=item B<handle_login>
-
-This method determines the proper WebService all to make based on class
-and method name determined earlier. Then calls L<Bugzilla::WebService::Server::handle_login>
-which will attempt to authenticate the client.
-
-=item B<bz_method_name>
-
-The WebService method name that matches the path used by the client.
-
-=item B<bz_class_name>
-
-The WebService class containing the method that matches the path used by the client.
-
-=item B<bz_rest_params>
-
-Each REST resource contains a hash key called C<params> that is a subroutine reference.
-This subroutine will return a hash structure based on matched values from the path
-information that is formatted properly for the WebService method that will be called.
-
-=item B<bz_rest_options>
-
-When a client uses the OPTIONS request method along with a specific path, they are
-requesting the list of request methods that are valid for the path. Such as for the
-path /bug, the valid request methods are GET (search) and POST (create). So the
-client would receive in the response header, C<Access-Control-Allow-Methods: GET, POST>.
-
-=item B<bz_success_code>
-
-Each resource can specify a specific SUCCESS CODE if the operation completes successfully.
-OTherwise STATUS OK (200) is the default returned.
-
-=item B<rest_include_exclude>
-
-Normally the WebService methods required C<include_fields> and C<exclude_fields> to be an
-array of field names. REST allows for the values for these to be instead comma delimited
-string of field names. This method converts the latter into the former so the WebService
-methods will not complain.
-
-=back
-
-=head1 SEE ALSO
-
-L<Bugzilla::WebService>
diff --git a/Bugzilla/WebService/Server/REST/Resources/Bug.pm b/Bugzilla/WebService/Server/REST/Resources/Bug.pm
deleted file mode 100644
index cf9f054c7b..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/Bug.pm
+++ /dev/null
@@ -1,174 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::Bug;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Bug;
-
-BEGIN {
-    *Bugzilla::WebService::Bug::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/bug$}, {
-            GET  => {
-                method => 'search',
-            },
-            POST => {
-                method => 'create',
-                status_code => STATUS_CREATED
-            }
-        },
-        qr{^/bug/([^/]+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                }
-            },
-            PUT => {
-                method => 'update',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                }
-            }
-        },
-        qr{^/bug/([^/]+)/comment$}, {
-            GET  => {
-                method => 'comments',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                }
-            },
-            POST => {
-                method => 'add_comment',
-                params => sub {
-                    return { id => $_[0] };
-                },
-                success_code => STATUS_CREATED
-            }
-        },
-        qr{^/bug/comment/([^/]+)$}, {
-            GET => {
-                method => 'comments',
-                params => sub {
-                    return { comment_ids => [ $_[0] ] };
-                }
-            }
-        },
-        qr{^/bug/comment/tags/([^/]+)$}, {
-            GET => {
-                method => 'search_comment_tags',
-                params => sub {
-                    return { query => $_[0] };
-                },
-            },
-        },
-        qr{^/bug/comment/([^/]+)/tags$}, {
-            PUT => {
-                method => 'update_comment_tags',
-                params => sub {
-                    return { comment_id => $_[0] };
-                },
-            },
-        },
-        qr{^/bug/([^/]+)/history$}, {
-            GET => {
-                method => 'history',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                },
-            }
-        },
-        qr{^/bug/([^/]+)/attachment$}, {
-            GET  => {
-                method => 'attachments',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                }
-            },
-            POST => {
-                method => 'add_attachment',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                },
-                success_code => STATUS_CREATED
-            }
-        },
-        qr{^/bug/attachment/([^/]+)$}, {
-            GET => {
-                method => 'attachments',
-                params => sub {
-                    return { attachment_ids => [ $_[0] ] };
-                }
-            },
-            PUT => {
-                method => 'update_attachment',
-                params => sub {
-                    return { ids => [ $_[0] ] };
-                }
-            }
-        },
-        qr{^/field/bug$}, {
-            GET => {
-                method => 'fields',
-            }
-        },
-        qr{^/field/bug/([^/]+)$}, {
-            GET => {
-                method => 'fields',
-                params => sub {
-                    my $value = $_[0];
-                    my $param = 'names';
-                    $param = 'ids' if $value =~ /^\d+$/;
-                    return { $param => [ $_[0] ] };
-                }
-            }
-        },
-        qr{^/field/bug/([^/]+)/values$}, {
-            GET => {
-                method => 'legal_values',
-                params => sub {
-                    return { field => $_[0] };
-                }
-            }
-        },
-        qr{^/field/bug/([^/]+)/([^/]+)/values$}, {
-            GET => {
-                method => 'legal_values',
-                params => sub {
-                    return { field      => $_[0],
-                             product_id => $_[1] };
-                }
-            }
-        },
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::Bug - The REST API for creating,
-changing, and getting the details of bugs.
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to file a new bug in Bugzilla,
-or get information about bugs that have already been filed.
-
-See L<Bugzilla::WebService::Bug> for more details on how to use this part of
-the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/BugUserLastVisit.pm b/Bugzilla/WebService/Server/REST/Resources/BugUserLastVisit.pm
deleted file mode 100644
index a434d4befa..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/BugUserLastVisit.pm
+++ /dev/null
@@ -1,52 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::BugUserLastVisit;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-BEGIN {
-    *Bugzilla::WebService::BugUserLastVisit::rest_resources = \&_rest_resources;
-}
-
-sub _rest_resources {
-    return [
-        # bug-id
-        qr{^/bug_user_last_visit/(\d+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    return { ids => $_[0] };
-                },
-            },
-            POST => {
-                method => 'update',
-                params => sub {
-                    return { ids => $_[0] };
-                },
-            },
-        },
-    ];
-}
-
-1;
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::BugUserLastVisit - The
-BugUserLastVisit REST API
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to lookup and update the last time
-a user visited a bug.
-
-See L<Bugzilla::WebService::BugUserLastVisit> for more details on how to use
-this part of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm b/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm
deleted file mode 100644
index a8f3f9330e..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/Bugzilla.pm
+++ /dev/null
@@ -1,70 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::Bugzilla;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Bugzilla;
-
-BEGIN {
-    *Bugzilla::WebService::Bugzilla::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/version$}, {
-            GET  => {
-                method => 'version'
-            }
-        },
-        qr{^/extensions$}, {
-            GET => {
-                method => 'extensions'
-            }
-        },
-        qr{^/timezone$}, {
-            GET => {
-                method => 'timezone'
-            }
-        },
-        qr{^/time$}, {
-            GET => {
-                method => 'time'
-            }
-        },
-        qr{^/last_audit_time$}, {
-            GET => {
-                method => 'last_audit_time'
-            }
-        },
-        qr{^/parameters$}, {
-            GET => {
-                method => 'parameters'
-            }
-        }
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::WebService::Bugzilla - Global functions for the webservice interface.
-
-=head1 DESCRIPTION
-
-This provides functions that tell you about Bugzilla in general.
-
-See L<Bugzilla::WebService::Bugzilla> for more details on how to use this part
-of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Classification.pm b/Bugzilla/WebService/Server/REST/Resources/Classification.pm
deleted file mode 100644
index 3f8d32a036..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/Classification.pm
+++ /dev/null
@@ -1,50 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::Classification;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Classification;
-
-BEGIN {
-    *Bugzilla::WebService::Classification::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/classification/([^/]+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            }
-        }
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::Classification - The Classification REST API
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to deal with the available Classifications.
-You will be able to get information about them as well as manipulate them.
-
-See L<Bugzilla::WebService::Classification> for more details on how to use this part
-of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Component.pm b/Bugzilla/WebService/Server/REST/Resources/Component.pm
deleted file mode 100644
index 198c093329..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/Component.pm
+++ /dev/null
@@ -1,48 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::Component;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Component;
-
-use Bugzilla::Error;
-
-BEGIN {
-    *Bugzilla::WebService::Component::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/component$}, {
-            POST => {
-                method => 'create',
-                success_code => STATUS_CREATED
-            }
-        },
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::Component - The Component REST API
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you create Components.
-
-See L<Bugzilla::WebService::Component> for more details on how to use this
-part of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/FlagType.pm b/Bugzilla/WebService/Server/REST/Resources/FlagType.pm
deleted file mode 100644
index 21dad0f73a..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/FlagType.pm
+++ /dev/null
@@ -1,72 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::FlagType;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::FlagType;
-
-use Bugzilla::Error;
-
-BEGIN {
-    *Bugzilla::WebService::FlagType::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/flag_type$}, {
-            POST => {
-                method => 'create',
-                success_code => STATUS_CREATED
-            }
-        },
-        qr{^/flag_type/([^/]+)/([^/]+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    return { product   => $_[0],
-                             component => $_[1] };
-                }
-            }
-        },
-        qr{^/flag_type/([^/]+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    return { product => $_[0] };
-                }
-            },
-            PUT => {
-                method => 'update',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            }
-        },
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::FlagType - The Flag Type REST API
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to create and update Flag types.
-
-See L<Bugzilla::WebService::FlagType> for more details on how to use this
-part of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Group.pm b/Bugzilla/WebService/Server/REST/Resources/Group.pm
deleted file mode 100644
index b052e384b4..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/Group.pm
+++ /dev/null
@@ -1,60 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::Group;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Group;
-
-BEGIN {
-    *Bugzilla::WebService::Group::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/group$}, {
-            GET  => {
-                method => 'get'
-            },
-            POST => {
-                method => 'create',
-                success_code => STATUS_CREATED
-            }
-        },
-        qr{^/group/([^/]+)$}, {
-            PUT => {
-                method => 'update',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            }
-        }
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::Group - The REST API for 
-creating, changing, and getting information about Groups.
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to create Groups and
-get information about them.
-
-See L<Bugzilla::WebService::Group> for more details on how to use this part
-of the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/Product.pm b/Bugzilla/WebService/Server/REST/Resources/Product.pm
deleted file mode 100644
index 607b94b538..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/Product.pm
+++ /dev/null
@@ -1,83 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::Product;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::Product;
-
-use Bugzilla::Error;
-
-BEGIN {
-    *Bugzilla::WebService::Product::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/product_accessible$}, {
-            GET => {
-                method => 'get_accessible_products'
-            }
-        },
-        qr{^/product_enterable$}, {
-            GET => {
-                method => 'get_enterable_products'
-            }
-        },
-        qr{^/product_selectable$}, {
-            GET => {
-                method => 'get_selectable_products'
-            }
-        },
-        qr{^/product$}, {
-            GET  => {
-                method => 'get'
-            },
-            POST => {
-                method => 'create',
-                success_code => STATUS_CREATED
-            }
-        },
-        qr{^/product/([^/]+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            },
-            PUT => {
-                method => 'update',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            }
-        },
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::Product - The Product REST API
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to list the available Products and
-get information about them.
-
-See L<Bugzilla::WebService::Product> for more details on how to use this part of
-the REST API.
diff --git a/Bugzilla/WebService/Server/REST/Resources/User.pm b/Bugzilla/WebService/Server/REST/Resources/User.pm
deleted file mode 100644
index a83109e737..0000000000
--- a/Bugzilla/WebService/Server/REST/Resources/User.pm
+++ /dev/null
@@ -1,81 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::WebService::Server::REST::Resources::User;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::WebService::Constants;
-use Bugzilla::WebService::User;
-
-BEGIN {
-    *Bugzilla::WebService::User::rest_resources = \&_rest_resources;
-};
-
-sub _rest_resources {
-    my $rest_resources = [
-        qr{^/login$}, {
-            GET => {
-                method => 'login'
-            }
-        },
-        qr{^/logout$}, {
-            GET => {
-                method => 'logout'
-            }
-        },
-        qr{^/valid_login$}, {
-            GET => {
-                method => 'valid_login'
-            }
-        },
-        qr{^/user$}, {
-            GET  => {
-                method => 'get'
-            },
-            POST => {
-                method => 'create',
-                success_code => STATUS_CREATED
-            }
-        },
-        qr{^/user/([^/]+)$}, {
-            GET => {
-                method => 'get',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            },
-            PUT => {
-                method => 'update',
-                params => sub {
-                    my $param = $_[0] =~ /^\d+$/ ? 'ids' : 'names';
-                    return { $param => [ $_[0] ] };
-                }
-            }
-        }
-    ];
-    return $rest_resources;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-Bugzilla::Webservice::Server::REST::Resources::User - The User Account REST API
-
-=head1 DESCRIPTION
-
-This part of the Bugzilla REST API allows you to get User information as well
-as create User Accounts.
-
-See L<Bugzilla::WebService::User> for more details on how to use this part of
-the REST API.
diff --git a/Bugzilla/WebService/Server/XMLRPC.pm b/Bugzilla/WebService/Server/XMLRPC.pm
index 8f9070ae76..00dadbadf0 100644
--- a/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/Bugzilla/WebService/Server/XMLRPC.pm
@@ -7,97 +7,125 @@
 
 package Bugzilla::WebService::Server::XMLRPC;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use XMLRPC::Transport::HTTP;
 use Bugzilla::WebService::Server;
 if ($ENV{MOD_PERL}) {
-    our @ISA = qw(XMLRPC::Transport::HTTP::Apache Bugzilla::WebService::Server);
-} else {
-    our @ISA = qw(XMLRPC::Transport::HTTP::CGI Bugzilla::WebService::Server);
+  our @ISA = qw(XMLRPC::Transport::HTTP::Apache Bugzilla::WebService::Server);
+}
+else {
+  our @ISA = qw(XMLRPC::Transport::HTTP::CGI Bugzilla::WebService::Server);
 }
 
 use Bugzilla::WebService::Constants;
+use Bugzilla::Error;
 use Bugzilla::Util;
 
+use List::MoreUtils qw(none);
+
 BEGIN {
-    # Allow WebService methods to call XMLRPC::Lite's type method directly
-    *Bugzilla::WebService::type = sub {
-        my ($self, $type, $value) = @_;
-        if ($type eq 'dateTime') {
-            # This is the XML-RPC implementation,  see the README in Bugzilla/WebService/.
-            # Our "base" implementation is in Bugzilla::WebService::Server.
-            $value = Bugzilla::WebService::Server->datetime_format_outbound($value);
-            $value =~ s/-//g;
-        }
-        elsif ($type eq 'email') {
-            $type = 'string';
-            if (Bugzilla->params->{'webservice_email_filter'}) {
-                $value = email_filter($value);
-            }
-        }
-        return XMLRPC::Data->type($type)->value($value);
-    };
-
-    # Add support for ETags into XMLRPC WebServices
-    *Bugzilla::WebService::bz_etag = sub {
-        return Bugzilla::WebService::Server->bz_etag($_[1]);
-    };
+  # Allow WebService methods to call XMLRPC::Lite's type method directly
+  *Bugzilla::WebService::type = sub {
+    my ($self, $type, $value) = @_;
+    if ($type eq 'dateTime') {
+
+      # This is the XML-RPC implementation,  see the README in Bugzilla/WebService/.
+      # Our "base" implementation is in Bugzilla::WebService::Server.
+      $value = Bugzilla::WebService::Server->datetime_format_outbound($value);
+      $value =~ s/-//g;
+    }
+    elsif ($type eq 'login') {
+      $type = 'string';
+      $value = email_filter($value) if Bugzilla->params->{'use_email_as_login'};
+    }
+    elsif ($type eq 'email') {
+      $type = 'string';
+      $value = '' unless Bugzilla->user->in_group('editusers');
+    }
+    return XMLRPC::Data->type($type)->value($value);
+  };
+
+  # Add support for ETags into XMLRPC WebServices
+  *Bugzilla::WebService::bz_etag = sub {
+    return Bugzilla::WebService::Server->bz_etag($_[1]);
+  };
 }
 
 sub initialize {
-    my $self = shift;
-    my %retval = $self->SUPER::initialize(@_);
-    $retval{'serializer'}   = Bugzilla::XMLRPC::Serializer->new;
-    $retval{'deserializer'} = Bugzilla::XMLRPC::Deserializer->new;
-    $retval{'dispatch_with'} = WS_DISPATCH;
-    return %retval;
+  my $self   = shift;
+  my %retval = $self->SUPER::initialize(@_);
+  $retval{'serializer'}    = Bugzilla::XMLRPC::Serializer->new;
+  $retval{'deserializer'}  = Bugzilla::XMLRPC::Deserializer->new;
+  $retval{'dispatch_with'} = WS_DISPATCH;
+  return %retval;
 }
 
 sub make_response {
-    my $self = shift;
-    my $cgi = Bugzilla->cgi;
-
-    $self->SUPER::make_response(@_);
-
-    # XMLRPC::Transport::HTTP::CGI doesn't know about Bugzilla carrying around
-    # its cookies in Bugzilla::CGI, so we need to copy them over.
-    foreach my $cookie (@{$cgi->{'Bugzilla_cookie_list'}}) {
-        $self->response->headers->push_header('Set-Cookie', $cookie);
-    }
-
-    # Copy across security related headers from Bugzilla::CGI
-    foreach my $header (split(/[\r\n]+/, $cgi->header)) {
-        my ($name, $value) = $header =~ /^([^:]+): (.*)/;
-        if (!$self->response->headers->header($name)) {
-           $self->response->headers->header($name => $value);
-        }
-    }
-
-    # ETag support
-    my $etag = $self->bz_etag;
-    if (!$etag) {
-        my $data = $self->response->as_string;
-        $etag = $self->bz_etag($data);
-    }
-
-    if ($etag && $cgi->check_etag($etag)) {
-        $self->response->headers->push_header('ETag', $etag);
-        $self->response->headers->push_header('status', '304 Not Modified');
-    }
-    elsif ($etag) {
-        $self->response->headers->push_header('ETag', $etag);
+  my $self = shift;
+  my $cgi  = Bugzilla->cgi;
+
+  # Fix various problems with IIS.
+  if ($ENV{'SERVER_SOFTWARE'} =~ /IIS/) {
+    $ENV{CONTENT_LENGTH} = 0;
+    binmode(STDOUT, ':bytes');
+  }
+
+  $self->SUPER::make_response(@_);
+
+  # XMLRPC::Transport::HTTP::CGI doesn't know about Bugzilla carrying around
+  # its cookies in Bugzilla::CGI, so we need to copy them over.
+  foreach my $cookie (@{$cgi->{'Bugzilla_cookie_list'}}) {
+    $self->response->headers->push_header('Set-Cookie', $cookie);
+  }
+
+  # Copy across security related headers from Bugzilla::CGI
+  foreach my $header (split(/[\r\n]+/, $cgi->header)) {
+    my ($name, $value) = $header =~ /^([^:]+): (.*)/;
+    if (!$self->response->headers->header($name)) {
+      $self->response->headers->header($name => $value);
     }
+  }
+
+  # ETag support
+  my $etag = $self->bz_etag;
+  if (!$etag) {
+    my $data = $self->response->as_string;
+    $etag = $self->bz_etag($data);
+  }
+
+  if ($etag && $cgi->check_etag($etag)) {
+    $self->response->headers->push_header('ETag',   $etag);
+    $self->response->headers->push_header('status', '304 Not Modified');
+  }
+  elsif ($etag) {
+    $self->response->headers->push_header('ETag', $etag);
+  }
 }
 
 sub handle_login {
-    my ($self, $classes, $action, $uri, $method) = @_;
-    my $class = $classes->{$uri};
-    my $full_method = $uri . "." . $method;
-    $self->SUPER::handle_login($class, $method, $full_method);
-    return;
+  my ($self, $classes, $action, $uri, $method) = @_;
+  my $class = $classes->{$uri};
+  if (!$class) {
+    ThrowCodeError('unknown_method',
+      {method => $method eq 'methodName' ? '' : '.' . $method});
+  }
+  my $full_method = $uri . "." . $method;
+
+  # Only allowed methods to be used from the module's whitelist
+  my $file = $class;
+  $file =~ s{::}{/}g;
+  $file .= ".pm";
+  require $file;
+  if (none { $_ eq $method } $class->PUBLIC_METHODS) {
+    ThrowCodeError('unknown_method', {method => $full_method});
+  }
+
+  $ENV{CONTENT_LENGTH} = 0 if $ENV{'SERVER_SOFTWARE'} =~ /IIS/;
+  $self->SUPER::handle_login($class, $method, $full_method);
+  return;
 }
 
 1;
@@ -106,7 +134,7 @@ sub handle_login {
 # and also, in some cases, to more-usefully decode them.
 package Bugzilla::XMLRPC::Deserializer;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -117,95 +145,122 @@ our @ISA = qw(XMLRPC::Deserializer);
 
 use Bugzilla::Error;
 use Bugzilla::WebService::Constants qw(XMLRPC_CONTENT_TYPE_WHITELIST);
+use Bugzilla::WebService::Util qw(fix_credentials);
 use Scalar::Util qw(tainted);
 
-sub deserialize {
-    my $self = shift;
-
-    # Only allow certain content types to protect against CSRF attacks
-    my $content_type = lc($ENV{'CONTENT_TYPE'});
-    # Remove charset, etc, if provided
-    $content_type =~ s/^([^;]+);.*/$1/;
-    if (!grep($_ eq $content_type, XMLRPC_CONTENT_TYPE_WHITELIST)) {
-        ThrowUserError('xmlrpc_illegal_content_type',
-                       { content_type => $ENV{'CONTENT_TYPE'} });
+sub new {
+  my $self = shift->SUPER::new(@_);
+
+  # Initialise XML::Parser to not expand references to entities, to prevent DoS
+  require XML::Parser;
+  my $parser = XML::Parser->new(
+    NoExpand => 1,
+    Handlers => {
+      Default => sub { }
     }
+  );
+  $self->{_parser}->parser($parser, $parser);
+  return $self;
+}
 
-    my ($xml) = @_;
-    my $som = $self->SUPER::deserialize(@_);
-    if (tainted($xml)) {
-        $som->{_bz_do_taint} = 1;
-    }
-    bless $som, 'Bugzilla::XMLRPC::SOM';
-    my $params = $som->paramsin;
-    # This allows positional parameters for Testopia.
-    $params = {} if ref $params ne 'HASH';
-    Bugzilla->input_params($params);
-    return $som;
+sub deserialize {
+  my $self = shift;
+
+  # Only allow certain content types to protect against CSRF attacks
+  my $content_type = lc($ENV{'CONTENT_TYPE'});
+
+  # Remove charset, etc, if provided
+  $content_type =~ s/^([^;]+);.*/$1/;
+  if (!grep($_ eq $content_type, XMLRPC_CONTENT_TYPE_WHITELIST)) {
+    ThrowUserError('xmlrpc_illegal_content_type',
+      {content_type => $ENV{'CONTENT_TYPE'}});
+  }
+
+  my ($xml) = @_;
+  my $som = $self->SUPER::deserialize(@_);
+  if (tainted($xml)) {
+    $som->{_bz_do_taint} = 1;
+  }
+  bless $som, 'Bugzilla::XMLRPC::SOM';
+  my $params = $som->paramsin;
+
+  # This allows positional parameters for Testopia.
+  $params = {} if ref $params ne 'HASH';
+
+  # Update the params to allow for several convenience key/values
+  # use for authentication
+  fix_credentials($params);
+
+  Bugzilla->input_params($params);
+
+  return $som;
 }
 
 # Some method arguments need to be converted in some way, when they are input.
 sub decode_value {
-    my $self = shift;
-    my ($type) = @{ $_[0] };
-    my $value = $self->SUPER::decode_value(@_);
-    
-    # We only validate/convert certain types here.
-    return $value if $type !~ /^(?:int|i4|boolean|double|dateTime\.iso8601)$/;
-    
-    # Though the XML-RPC standard doesn't allow an empty <int>,
-    # <double>,or <dateTime.iso8601>,  we do, and we just say
-    # "that's undef".
-    if (grep($type eq $_, qw(int double dateTime))) {
-        return undef if $value eq '';
-    }
-    
-    my $validator = $self->_validation_subs->{$type};
-    if (!$validator->($value)) {
-        ThrowUserError('xmlrpc_invalid_value',
-                       { type => $type, value => $value });
-    }
-    
-    # We convert dateTimes to a DB-friendly date format.
-    if ($type eq 'dateTime.iso8601') {
-        if ($value !~ /T.*[\-+Z]/i) {
-           # The caller did not specify a timezone, so we assume UTC.
-           # pass 'Z' specifier to datetime_from to force it
-           $value = $value . 'Z';
-        }
-        $value = Bugzilla::WebService::Server::XMLRPC->datetime_format_inbound($value);
+  my $self   = shift;
+  my ($type) = @{$_[0]};
+  my $value  = $self->SUPER::decode_value(@_);
+
+  # We only validate/convert certain types here.
+  return $value if $type !~ /^(?:int|i4|boolean|double|dateTime\.iso8601)$/;
+
+  # Though the XML-RPC standard doesn't allow an empty <int>,
+  # <double>,or <dateTime.iso8601>,  we do, and we just say
+  # "that's undef".
+  if (grep($type eq $_, qw(int double dateTime))) {
+    return undef if $value eq '';
+  }
+
+  my $validator = $self->_validation_subs->{$type};
+  if (!$validator->($value)) {
+    ThrowUserError('xmlrpc_invalid_value', {type => $type, value => $value});
+  }
+
+  # We convert dateTimes to a DB-friendly date format.
+  if ($type eq 'dateTime.iso8601') {
+    if ($value !~ /T.*[\-+Z]/i) {
+
+      # The caller did not specify a timezone, so we assume UTC.
+      # pass 'Z' specifier to datetime_from to force it
+      $value = $value . 'Z';
     }
+    $value = Bugzilla::WebService::Server::XMLRPC->datetime_format_inbound($value);
+  }
 
-    return $value;
+  return $value;
 }
 
 sub _validation_subs {
-    my $self = shift;
-    return $self->{_validation_subs} if $self->{_validation_subs};
-    # The only place that XMLRPC::Lite stores any sort of validation
-    # regex is in XMLRPC::Serializer. We want to re-use those regexes here.
-    my $lookup = Bugzilla::XMLRPC::Serializer->new->typelookup;
-    
-    # $lookup is a hash whose values are arrayrefs, and whose keys are the
-    # names of types. The second item of each arrayref is a subroutine
-    # that will do our validation for us.
-    my %validators = map { $_ => $lookup->{$_}->[1] } (keys %$lookup);
-    # Add a boolean validator
-    $validators{'boolean'} = sub {$_[0] =~ /^[01]$/};
-    # Some types have multiple names, or have a different name in
-    # XMLRPC::Serializer than their standard XML-RPC name.
-    $validators{'dateTime.iso8601'} = $validators{'dateTime'};
-    $validators{'i4'} = $validators{'int'};
-    
-    $self->{_validation_subs} = \%validators;
-    return \%validators;
+  my $self = shift;
+  return $self->{_validation_subs} if $self->{_validation_subs};
+
+  # The only place that XMLRPC::Lite stores any sort of validation
+  # regex is in XMLRPC::Serializer. We want to re-use those regexes here.
+  my $lookup = Bugzilla::XMLRPC::Serializer->new->typelookup;
+
+  # $lookup is a hash whose values are arrayrefs, and whose keys are the
+  # names of types. The second item of each arrayref is a subroutine
+  # that will do our validation for us.
+  my %validators = map { $_ => $lookup->{$_}->[1] } (keys %$lookup);
+
+  # Add a boolean validator
+  $validators{'boolean'} = sub { $_[0] =~ /^[01]$/ };
+
+  # Some types have multiple names, or have a different name in
+  # XMLRPC::Serializer than their standard XML-RPC name.
+  $validators{'dateTime.iso8601'} = $validators{'dateTime'};
+  $validators{'i4'}               = $validators{'int'};
+
+  $self->{_validation_subs} = \%validators;
+  return \%validators;
 }
 
 1;
 
 package Bugzilla::XMLRPC::SOM;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -214,16 +269,16 @@ our @ISA = qw(XMLRPC::SOM);
 use Bugzilla::WebService::Util qw(taint_data);
 
 sub paramsin {
-    my $self = shift;
-    if (!$self->{bz_params_in}) {
-        my @params = $self->SUPER::paramsin(@_); 
-        if ($self->{_bz_do_taint}) {
-            taint_data(@params);
-        }
-        $self->{bz_params_in} = \@params;
+  my $self = shift;
+  if (!$self->{bz_params_in}) {
+    my @params = $self->SUPER::paramsin(@_);
+    if ($self->{_bz_do_taint}) {
+      taint_data(@params);
     }
-    my $params = $self->{bz_params_in};
-    return wantarray ? @$params : $params->[0];
+    $self->{bz_params_in} = \@params;
+  }
+  my $params = $self->{bz_params_in};
+  return wantarray ? @$params : $params->[0];
 }
 
 1;
@@ -232,48 +287,51 @@ sub paramsin {
 # See http://rt.cpan.org/Public/Bug/Display.html?id=32952.
 package Bugzilla::XMLRPC::Serializer;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Scalar::Util qw(blessed reftype);
+
 # We can't use "use parent" because XMLRPC::Serializer doesn't return
 # a true value.
 use XMLRPC::Lite;
 our @ISA = qw(XMLRPC::Serializer);
 
 sub new {
-    my $class = shift;
-    my $self = $class->SUPER::new(@_);
-    # This fixes UTF-8.
-    $self->{'_typelookup'}->{'base64'} =
-        [10, sub { !utf8::is_utf8($_[0]) && $_[0] =~ /[^\x09\x0a\x0d\x20-\x7f]/},
-        'as_base64'];
-    # This makes arrays work right even though we're a subclass.
-    # (See http://rt.cpan.org//Ticket/Display.html?id=34514)
-    $self->{'_encodingStyle'} = '';
-    return $self;
+  my $class = shift;
+  my $self  = $class->SUPER::new(@_);
+
+  # This fixes UTF-8.
+  $self->{'_typelookup'}->{'base64'} = [
+    10, sub { !utf8::is_utf8($_[0]) && $_[0] =~ /[^\x09\x0a\x0d\x20-\x7f]/ },
+    'as_base64'
+  ];
+
+  # This makes arrays work right even though we're a subclass.
+  # (See http://rt.cpan.org//Ticket/Display.html?id=34514)
+  $self->{'_encodingStyle'} = '';
+  return $self;
 }
 
 # Here the XMLRPC::Serializer is extended to use the XMLRPC nil extension.
 sub encode_object {
-    my $self = shift;
-    my @encoded = $self->SUPER::encode_object(@_);
+  my $self    = shift;
+  my @encoded = $self->SUPER::encode_object(@_);
 
-    return $encoded[0]->[0] eq 'nil'
-        ? ['value', {}, [@encoded]]
-        : @encoded;
+  return $encoded[0]->[0] eq 'nil' ? ['value', {}, [@encoded]] : @encoded;
 }
 
 # Removes undefined values so they do not produce invalid XMLRPC.
 sub envelope {
-    my $self = shift;
-    my ($type, $method, $data) = @_;
-    # If the type isn't a successful response we don't want to change the values.
-    if ($type eq 'response') {
-        _strip_undefs($data);
-    }
-    return $self->SUPER::envelope($type, $method, $data);
+  my $self = shift;
+  my ($type, $method, $data) = @_;
+
+  # If the type isn't a successful response we don't want to change the values.
+  if ($type eq 'response') {
+    _strip_undefs($data);
+  }
+  return $self->SUPER::envelope($type, $method, $data);
 }
 
 # In an XMLRPC response we have to handle hashes of arrays, hashes, scalars,
@@ -281,58 +339,58 @@ sub envelope {
 # The whole XMLRPC::Data object must be removed if its value key is undefined
 # so it cannot be recursed like the other hash type objects.
 sub _strip_undefs {
-    my ($initial) = @_;
-    my $type = reftype($initial) or return;
-
-    if ($type eq "HASH") {
-        while (my ($key, $value) = each(%$initial)) {
-            if ( !defined $value
-                 || (blessed $value && $value->isa('XMLRPC::Data') && !defined $value->value) )
-            {
-                # If the value is undefined remove it from the hash.
-                delete $initial->{$key};
-            }
-            else {
-                _strip_undefs($value);
-            }
-        }
+  my ($initial) = @_;
+  my $type = reftype($initial) or return;
+
+  if ($type eq "HASH") {
+    while (my ($key, $value) = each(%$initial)) {
+      if (!defined $value
+        || (blessed $value && $value->isa('XMLRPC::Data') && !defined $value->value))
+      {
+        # If the value is undefined remove it from the hash.
+        delete $initial->{$key};
+      }
+      else {
+        _strip_undefs($value);
+      }
     }
-    elsif ($type eq "ARRAY") {
-        for (my $count = 0; $count < scalar @{$initial}; $count++) {
-            my $value = $initial->[$count];
-            if ( !defined $value
-                 || (blessed $value && $value->isa('XMLRPC::Data') && !defined $value->value) )
-            {
-                # If the value is undefined remove it from the array.
-                splice(@$initial, $count, 1);
-                $count--;
-            }
-            else {
-                _strip_undefs($value);
-            }
-        }
+  }
+  elsif ($type eq "ARRAY") {
+    for (my $count = 0; $count < scalar @{$initial}; $count++) {
+      my $value = $initial->[$count];
+      if (!defined $value
+        || (blessed $value && $value->isa('XMLRPC::Data') && !defined $value->value))
+      {
+        # If the value is undefined remove it from the array.
+        splice(@$initial, $count, 1);
+        $count--;
+      }
+      else {
+        _strip_undefs($value);
+      }
     }
+  }
 }
 
 sub BEGIN {
-    no strict 'refs';
-    for my $type (qw(double i4 int dateTime)) {
-        my $method = 'as_' . $type;
-        *$method = sub {
-            my ($self, $value) = @_;
-            if (!defined($value)) {
-                return as_nil();
-            }
-            else {
-                my $super_method = "SUPER::$method"; 
-                return $self->$super_method($value);
-            }
-        }
-    }
+  no strict 'refs';
+  for my $type (qw(double i4 int dateTime)) {
+    my $method = 'as_' . $type;
+    *$method = sub {
+      my ($self, $value) = @_;
+      if (!defined($value)) {
+        return as_nil();
+      }
+      else {
+        my $super_method = "SUPER::$method";
+        return $self->$super_method($value);
+      }
+      }
+  }
 }
 
 sub as_nil {
-    return ['nil', {}];
+  return ['nil', {}];
 }
 
 1;
diff --git a/Bugzilla/WebService/User.pm b/Bugzilla/WebService/User.pm
index 4c8af7f6c2..1175767b0b 100644
--- a/Bugzilla/WebService/User.pm
+++ b/Bugzilla/WebService/User.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::WebService::User;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,78 +18,72 @@ use Bugzilla::Error;
 use Bugzilla::Group;
 use Bugzilla::User;
 use Bugzilla::Util qw(trim detaint_natural);
-use Bugzilla::WebService::Util qw(filter filter_wants validate translate params_to_objects);
+use Bugzilla::WebService::Util
+  qw(filter filter_wants validate translate params_to_objects);
 
 use List::Util qw(first min);
 
 # Don't need auth to login
-use constant LOGIN_EXEMPT => {
-    login => 1,
-    offer_account_by_email => 1,
-};
+use constant LOGIN_EXEMPT => {login => 1, offer_account_by_email => 1,};
 
 use constant READ_ONLY => qw(
-    get
+  get
 );
 
-use constant MAPPED_FIELDS => {
-    email => 'login',
-    full_name => 'name',
-    login_denied_text => 'disabledtext',
-    email_enabled => 'disable_mail'
-};
+use constant PUBLIC_METHODS => qw(
+  create
+  get
+  login
+  logout
+  offer_account_by_email
+  update
+  valid_login
+  whoami
+);
+
+use constant MAPPED_FIELDS =>
+  {full_name => 'name', login_denied_text => 'disabledtext',};
 
-use constant MAPPED_RETURNS => {
-    login_name => 'email',
-    realname => 'full_name',
-    disabledtext => 'login_denied_text',
-    disable_mail => 'email_enabled'
-};
+use constant MAPPED_RETURNS =>
+  {realname => 'full_name', disabledtext => 'login_denied_text',};
 
 ##############
 # User Login #
 ##############
 
 sub login {
-    my ($self, $params) = @_;
-
-    # Username and password params are required 
-    foreach my $param ("login", "password") {
-        defined $params->{$param} 
-            || ThrowCodeError('param_required', { param => $param });
-    }
-
-    # Make sure the CGI user info class works if necessary.
-    my $input_params = Bugzilla->input_params;
-    $input_params->{'Bugzilla_login'} =  $params->{login};
-    $input_params->{'Bugzilla_password'} = $params->{password};
-    $input_params->{'Bugzilla_restrictlogin'} = $params->{restrict_login};
-
-    my $user = Bugzilla->login();
-
-    my $result = { id => $self->type('int', $user->id) };
-
-    if ($user->{_login_token}) {
-        $result->{'token'} = $user->id . "-" . $user->{_login_token};
-    }
-
-    return $result;
+  my ($self, $params) = @_;
+
+  # Check to see if we are already logged in
+  my $user = Bugzilla->user;
+  if ($user->id) {
+    return $self->_login_to_hash($user);
+  }
+
+  # Login name and password params are required
+  foreach my $param ("login", "password") {
+    (defined $params->{$param} || defined $params->{'Bugzilla_' . $param})
+      || ThrowCodeError('param_required', {param => $param});
+  }
+
+  $user = Bugzilla->login();
+  return $self->_login_to_hash($user);
 }
 
 sub logout {
-    my $self = shift;
-    Bugzilla->logout;
+  my $self = shift;
+  Bugzilla->logout;
 }
 
 sub valid_login {
-    my ($self, $params) = @_;
-    defined $params->{login}
-        || ThrowCodeError('param_required', { param => 'login' });
-    Bugzilla->login();
-    if (Bugzilla->user->id && Bugzilla->user->login eq $params->{login}) {
-        return $self->type('boolean', 1);
-    }
-    return $self->type('boolean', 0);
+  my ($self, $params) = @_;
+  defined $params->{login}
+    || ThrowCodeError('param_required', {param => 'login'});
+  Bugzilla->login();
+  if (Bugzilla->user->id && Bugzilla->user->login eq $params->{login}) {
+    return $self->type('boolean', 1);
+  }
+  return $self->type('boolean', 0);
 }
 
 #################
@@ -97,168 +91,182 @@ sub valid_login {
 #################
 
 sub offer_account_by_email {
-    my $self = shift;
-    my ($params) = @_;
-    my $email = trim($params->{email})
-        || ThrowCodeError('param_required', { param => 'email' });
-
-    Bugzilla->user->check_account_creation_enabled;
-    Bugzilla->user->check_and_send_account_creation_confirmation($email);
-    return undef;
+  my $self     = shift;
+  my ($params) = @_;
+  my $email    = trim($params->{email})
+    || ThrowCodeError('param_required', {param => 'email'});
+
+  my $login
+    = Bugzilla->params->{use_email_as_login} ? $email : trim($params->{login});
+  $login or ThrowCodeError('param_required', {param => 'login'});
+
+  Bugzilla->user->check_account_creation_enabled;
+  Bugzilla->user->check_and_send_account_creation_confirmation($login, $email);
+  return undef;
 }
 
 sub create {
-    my $self = shift;
-    my ($params) = @_;
-
-    Bugzilla->user->in_group('editusers') 
-        || ThrowUserError("auth_failure", { group  => "editusers",
-                                            action => "add",
-                                            object => "users"});
-
-    my $email = trim($params->{email})
-        || ThrowCodeError('param_required', { param => 'email' });
-    my $realname = trim($params->{full_name});
-    my $password = trim($params->{password}) || '*';
-
-    my $user = Bugzilla::User->create({
-        login_name    => $email,
-        realname      => $realname,
-        cryptpassword => $password
-    });
-
-    return { id => $self->type('int', $user->id) };
+  my $self = shift;
+  my ($params) = @_;
+
+  Bugzilla->user->in_group('editusers')
+    || ThrowUserError("auth_failure",
+    {group => "editusers", action => "add", object => "users"});
+
+  my $email = trim($params->{email})
+    || ThrowCodeError('param_required', {param => 'email'});
+
+  my $login
+    = Bugzilla->params->{use_email_as_login} ? $email : trim($params->{login});
+  $login or ThrowCodeError('param_required', {param => 'login'});
+
+  my $realname = trim($params->{full_name});
+  my $password = trim($params->{password}) || '*';
+
+  my $user = Bugzilla::User->create({
+    login_name    => $login,
+    email         => $email,
+    realname      => $realname,
+    cryptpassword => $password
+  });
+
+  return {id => $self->type('int', $user->id)};
 }
 
 
-# function to return user information by passing either user ids or 
+# function to return user information by passing either user ids or
 # login names or both together:
-# $call = $rpc->call( 'User.get', { ids => [1,2,3], 
+# $call = $rpc->call( 'User.get', { ids => [1,2,3],
 #         names => ['testusera@redhat.com', 'testuserb@redhat.com'] });
 sub get {
-    my ($self, $params) = validate(@_, 'names', 'ids', 'match', 'group_ids', 'groups');
-
-    Bugzilla->switch_to_shadow_db();
-
-    defined($params->{names}) || defined($params->{ids})
-        || defined($params->{match})
-        || ThrowCodeError('params_required', 
-               { function => 'User.get', params => ['ids', 'names', 'match'] });
-
-    my @user_objects;
-    @user_objects = map { Bugzilla::User->check($_) } @{ $params->{names} }
-                    if $params->{names};
-
-    # start filtering to remove duplicate user ids
-    my %unique_users = map { $_->id => $_ } @user_objects;
-    @user_objects = values %unique_users;
-      
-    my @users;
-
-    # If the user is not logged in: Return an error if they passed any user ids.
-    # Otherwise, return a limited amount of information based on login names.
-    if (!Bugzilla->user->id){
-        if ($params->{ids}){
-            ThrowUserError("user_access_by_id_denied");
-        }
-        if ($params->{match}) {
-            ThrowUserError('user_access_by_match_denied');
-        }
-        my $in_group = $self->_filter_users_by_group(
-            \@user_objects, $params);
-        @users = map { filter $params, {
-                     id        => $self->type('int', $_->id),
-                     real_name => $self->type('string', $_->name),
-                     name      => $self->type('email', $_->login),
-                 } } @$in_group;
-
-        return { users => \@users };
-    }
+  my ($self, $params)
+    = validate(@_, 'names', 'ids', 'match', 'group_ids', 'groups');
 
-    my $obj_by_ids;
-    $obj_by_ids = Bugzilla::User->new_from_list($params->{ids}) if $params->{ids};
-
-    # obj_by_ids are only visible to the user if they can see
-    # the otheruser, for non visible otheruser throw an error
-    foreach my $obj (@$obj_by_ids) {
-        if (Bugzilla->user->can_see_user($obj)){
-            if (!$unique_users{$obj->id}) {
-                push (@user_objects, $obj);
-                $unique_users{$obj->id} = $obj;
-            }
-        }
-        else {
-            ThrowUserError('auth_failure', {reason => "not_visible",
-                                            action => "access",
-                                            object => "user",
-                                            userid => $obj->id});
-        }
-    }
+  Bugzilla->switch_to_shadow_db();
 
-    # User Matching
-    my $limit = Bugzilla->params->{maxusermatches};
-    if ($params->{limit}) {
-        detaint_natural($params->{limit})
-            || ThrowCodeError('param_must_be_numeric',
-                              { function => 'Bugzilla::WebService::User::match',
-                                param    => 'limit' });
-        $limit = $limit ? min($params->{limit}, $limit) : $params->{limit};
-    }
+       defined($params->{names})
+    || defined($params->{ids})
+    || defined($params->{match})
+    || ThrowCodeError('params_required',
+    {function => 'User.get', params => ['ids', 'names', 'match']});
 
-    my $exclude_disabled = $params->{'include_disabled'} ? 0 : 1;
-    foreach my $match_string (@{ $params->{'match'} || [] }) {
-        my $matched = Bugzilla::User::match($match_string, $limit, $exclude_disabled);
-        foreach my $user (@$matched) {
-            if (!$unique_users{$user->id}) {
-                push(@user_objects, $user);
-                $unique_users{$user->id} = $user;
-            }
-        }
-    }
+  my @user_objects;
+  @user_objects = map { Bugzilla::User->check($_) } @{$params->{names}}
+    if $params->{names};
+
+  # start filtering to remove duplicate user ids
+  my %unique_users = map { $_->id => $_ } @user_objects;
+  @user_objects = values %unique_users;
 
+  my @users;
+
+  # If the user is not logged in: Return an error if they passed any user ids.
+  # Otherwise, return a limited amount of information based on login names.
+  if (!Bugzilla->user->id) {
+    if ($params->{ids}) {
+      ThrowUserError("user_access_by_id_denied");
+    }
+    if ($params->{match}) {
+      ThrowUserError('user_access_by_match_denied');
+    }
     my $in_group = $self->_filter_users_by_group(\@user_objects, $params);
-    foreach my $user (@$in_group) {
-        my $user_info = filter $params, {
-            id        => $self->type('int', $user->id),
-            real_name => $self->type('string', $user->name),
-            name      => $self->type('email', $user->login),
-            email     => $self->type('email', $user->email),
-            can_login => $self->type('boolean', $user->is_enabled ? 1 : 0),
-        };
-
-        if (Bugzilla->user->in_group('editusers')) {
-            $user_info->{email_enabled}     = $self->type('boolean', $user->email_enabled);
-            $user_info->{login_denied_text} = $self->type('string', $user->disabledtext);
+    @users = map {
+      filter $params,
+        {
+        id        => $self->type('int',    $_->id),
+        real_name => $self->type('string', $_->name),
+        name      => $self->type('login',  $_->login),
         }
-
-        if (Bugzilla->user->id == $user->id) {
-            if (filter_wants($params, 'saved_searches')) {
-                $user_info->{saved_searches} = [
-                    map { $self->_query_to_hash($_) } @{ $user->queries }
-                ];
-            }
-            if (filter_wants($params, 'saved_reports')) {
-                $user_info->{saved_reports}  = [
-                    map { $self->_report_to_hash($_) } @{ $user->reports }
-                ];
-            }
+    } @$in_group;
+
+    return {users => \@users};
+  }
+
+  my $obj_by_ids;
+  $obj_by_ids = Bugzilla::User->new_from_list($params->{ids}) if $params->{ids};
+
+  # obj_by_ids are only visible to the user if they can see
+  # the otheruser, for non visible otheruser throw an error
+  foreach my $obj (@$obj_by_ids) {
+    if (Bugzilla->user->can_see_user($obj)) {
+      if (!$unique_users{$obj->id}) {
+        push(@user_objects, $obj);
+        $unique_users{$obj->id} = $obj;
+      }
+    }
+    else {
+      ThrowUserError(
+        'auth_failure',
+        {
+          reason => "not_visible",
+          action => "access",
+          object => "user",
+          userid => $obj->id
         }
+      );
+    }
+  }
+
+  # User Matching
+  my $limit = Bugzilla->params->{maxusermatches};
+  if ($params->{limit}) {
+    detaint_natural($params->{limit})
+      || ThrowCodeError('param_must_be_numeric',
+      {function => 'Bugzilla::WebService::User::match', param => 'limit'});
+    $limit = $limit ? min($params->{limit}, $limit) : $params->{limit};
+  }
+
+  my $exclude_disabled = $params->{'include_disabled'} ? 0 : 1;
+  foreach my $match_string (@{$params->{'match'} || []}) {
+    my $matched = Bugzilla::User::match($match_string, $limit, $exclude_disabled);
+    foreach my $user (@$matched) {
+      if (!$unique_users{$user->id}) {
+        push(@user_objects, $user);
+        $unique_users{$user->id} = $user;
+      }
+    }
+  }
+
+  my $in_group = $self->_filter_users_by_group(\@user_objects, $params);
+  foreach my $user (@$in_group) {
+    my $user_info = filter $params,
+      {
+      id        => $self->type('int',     $user->id),
+      real_name => $self->type('string',  $user->name),
+      name      => $self->type('login',   $user->login),
+      can_login => $self->type('boolean', $user->is_enabled ? 1 : 0),
+      };
+
+    if (Bugzilla->user->in_group('editusers')) {
+      $user_info->{email}           = $self->type('email',   $user->email),
+        $user_info->{email_enabled} = $self->type('boolean', $user->email_enabled);
+      $user_info->{login_denied_text} = $self->type('string', $user->disabledtext);
+    }
 
-        if (filter_wants($params, 'groups')) {
-            if (Bugzilla->user->id == $user->id || Bugzilla->user->in_group('editusers')) {
-                $user_info->{groups} = [
-                    map { $self->_group_to_hash($_) } @{ $user->groups }
-                ];
-            }
-            else {
-                $user_info->{groups} = $self->_filter_bless_groups($user->groups);
-            }
-        }
+    if (Bugzilla->user->id == $user->id) {
+      if (filter_wants($params, 'saved_searches')) {
+        $user_info->{saved_searches}
+          = [map { $self->_query_to_hash($_) } @{$user->queries}];
+      }
+      if (filter_wants($params, 'saved_reports')) {
+        $user_info->{saved_reports}
+          = [map { $self->_report_to_hash($_) } @{$user->reports}];
+      }
+    }
 
-        push(@users, $user_info);
+    if (filter_wants($params, 'groups')) {
+      if (Bugzilla->user->id == $user->id || Bugzilla->user->in_group('editusers')) {
+        $user_info->{groups} = [map { $self->_group_to_hash($_) } @{$user->groups}];
+      }
+      else {
+        $user_info->{groups} = $self->_filter_bless_groups($user->groups);
+      }
     }
 
-    return { users => \@users };
+    push(@users, $user_info);
+  }
+
+  return {users => \@users};
 }
 
 ###############
@@ -266,147 +274,171 @@ sub get {
 ###############
 
 sub update {
-    my ($self, $params) = @_;
+  my ($self, $params) = @_;
 
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
 
-    # Reject access if there is no sense in continuing.
-    $user->in_group('editusers')
-        || ThrowUserError("auth_failure", {group  => "editusers",
-                                           action => "edit",
-                                           object => "users"});
+  # Reject access if there is no sense in continuing.
+  $user->in_group('editusers')
+    || $user->can_bless()
+    || ThrowUserError("auth_failure",
+    {group => "editusers", action => "edit", object => "users"});
 
-    defined($params->{names}) || defined($params->{ids})
-        || ThrowCodeError('params_required', 
-               { function => 'User.update', params => ['ids', 'names'] });
+  defined($params->{names})
+    || defined($params->{ids})
+    || ThrowCodeError('params_required',
+    {function => 'User.update', params => ['ids', 'names']});
 
-    my $user_objects = params_to_objects($params, 'Bugzilla::User');
+  my $user_objects = params_to_objects($params, 'Bugzilla::User');
 
-    my $values = translate($params, MAPPED_FIELDS);
+  my $values = translate($params, MAPPED_FIELDS);
 
-    # We delete names and ids to keep only new values to set.
-    delete $values->{names};
-    delete $values->{ids};
+  # We delete names and ids to keep only new values to set.
+  delete $values->{names};
+  delete $values->{ids};
 
-    $dbh->bz_start_transaction();
-    foreach my $user (@$user_objects){
-        $user->set_all($values);
-    }
+  $dbh->bz_start_transaction();
 
-    my %changes;
-    foreach my $user (@$user_objects){
-        my $returned_changes = $user->update();
-        $changes{$user->id} = translate($returned_changes, MAPPED_RETURNS);    
-    }
-    $dbh->bz_commit_transaction();
-
-    my @result;
-    foreach my $user (@$user_objects) {
-        my %hash = (
-            id      => $user->id,
-            changes => {},
-        );
-
-        foreach my $field (keys %{ $changes{$user->id} }) {
-            my $change = $changes{$user->id}->{$field};
-            # We normalize undef to an empty string, so that the API
-            # stays consistent for things that can become empty.
-            $change->[0] = '' if !defined $change->[0];
-            $change->[1] = '' if !defined $change->[1];
-            # We also flatten arrays (used by groups and blessed_groups)
-            $change->[0] = join(',', @{$change->[0]}) if ref $change->[0];
-            $change->[1] = join(',', @{$change->[1]}) if ref $change->[1];
-
-            $hash{changes}{$field} = {
-                removed => $self->type('string', $change->[0]),
-                added   => $self->type('string', $change->[1]) 
-            };
-        }
+  $values = {groups => $values->{groups}} unless $user->in_group('editusers');
+  foreach my $user (@$user_objects) {
+    $user->set_all($values);
+  }
 
-        push(@result, \%hash);
-    }
+  my %changes;
+  foreach my $user (@$user_objects) {
+    my $returned_changes = $user->update();
+    $changes{$user->id} = translate($returned_changes, MAPPED_RETURNS);
+  }
+  $dbh->bz_commit_transaction();
 
-    return { users => \@result };
-}
+  my @result;
+  foreach my $user (@$user_objects) {
+    my %hash = (id => $user->id, changes => {},);
 
-sub _filter_users_by_group {
-    my ($self, $users, $params) = @_;
-    my ($group_ids, $group_names) = @$params{qw(group_ids groups)};
+    foreach my $field (keys %{$changes{$user->id}}) {
+      my $change = $changes{$user->id}->{$field};
 
-    # If no groups are specified, we return all users.
-    return $users if (!$group_ids and !$group_names);
+      # We normalize undef to an empty string, so that the API
+      # stays consistent for things that can become empty.
+      $change->[0] = '' if !defined $change->[0];
+      $change->[1] = '' if !defined $change->[1];
 
-    my $user = Bugzilla->user;
-    my (@groups, %groups);
+      # We also flatten arrays (used by groups and blessed_groups)
+      $change->[0] = join(',', @{$change->[0]}) if ref $change->[0];
+      $change->[1] = join(',', @{$change->[1]}) if ref $change->[1];
 
-    if ($group_ids) {
-        @groups = map { Bugzilla::Group->check({ id => $_ }) } @$group_ids;
-        $groups{$_->id} = $_ foreach @groups;
+      $hash{changes}{$field} = {
+        removed => $self->type('string', $change->[0]),
+        added   => $self->type('string', $change->[1])
+      };
     }
-    if ($group_names) {
-        foreach my $name (@$group_names) {
-            my $group = Bugzilla::Group->check({ name => $name, _error => 'invalid_group_name' });
-            $user->in_group($group) || ThrowUserError('invalid_group_name', { name => $name });
-            $groups{$group->id} = $group;
-        }
+
+    push(@result, \%hash);
+  }
+
+  return {users => \@result};
+}
+
+sub _filter_users_by_group {
+  my ($self, $users, $params) = @_;
+  my ($group_ids, $group_names) = @$params{qw(group_ids groups)};
+
+  # If no groups are specified, we return all users.
+  return $users if (!$group_ids and !$group_names);
+
+  my $user = Bugzilla->user;
+  my (@groups, %groups);
+
+  if ($group_ids) {
+    @groups = map { Bugzilla::Group->check({id => $_}) } @$group_ids;
+    $groups{$_->id} = $_ foreach @groups;
+  }
+  if ($group_names) {
+    foreach my $name (@$group_names) {
+      my $group
+        = Bugzilla::Group->check({name => $name, _error => 'invalid_group_name'});
+      $user->in_group($group)
+        || ThrowUserError('invalid_group_name', {name => $name});
+      $groups{$group->id} = $group;
     }
-    @groups = values %groups;
+  }
+  @groups = values %groups;
 
-    my @in_group = grep { $self->_user_in_any_group($_, \@groups) } @$users;
-    return \@in_group;
+  my @in_group = grep { $self->_user_in_any_group($_, \@groups) } @$users;
+  return \@in_group;
 }
 
 sub _user_in_any_group {
-    my ($self, $user, $groups) = @_;
-    foreach my $group (@$groups) {
-        return 1 if $user->in_group($group);
-    }
-    return 0;
+  my ($self, $user, $groups) = @_;
+  foreach my $group (@$groups) {
+    return 1 if $user->in_group($group);
+  }
+  return 0;
 }
 
 sub _filter_bless_groups {
-    my ($self, $groups) = @_;
-    my $user = Bugzilla->user;
+  my ($self, $groups) = @_;
+  my $user = Bugzilla->user;
 
-    my @filtered_groups;
-    foreach my $group (@$groups) {
-        next unless $user->can_bless($group->id);
-        push(@filtered_groups, $self->_group_to_hash($group));
-    }
+  my @filtered_groups;
+  foreach my $group (@$groups) {
+    next unless $user->can_bless($group->id);
+    push(@filtered_groups, $self->_group_to_hash($group));
+  }
 
-    return \@filtered_groups;
+  return \@filtered_groups;
 }
 
 sub _group_to_hash {
-    my ($self, $group) = @_;
-    my $item = {
-        id          => $self->type('int', $group->id), 
-        name        => $self->type('string', $group->name), 
-        description => $self->type('string', $group->description), 
-    };
-    return $item;
+  my ($self, $group) = @_;
+  my $item = {
+    id          => $self->type('int',    $group->id),
+    name        => $self->type('string', $group->name),
+    description => $self->type('string', $group->description),
+  };
+  return $item;
 }
 
 sub _query_to_hash {
-    my ($self, $query) = @_;
-    my $item = {
-        id    => $self->type('int', $query->id),
-        name  => $self->type('string', $query->name),
-        query => $self->type('string', $query->url),
-    };
-    return $item;
+  my ($self, $query) = @_;
+  my $item = {
+    id    => $self->type('int',    $query->id),
+    name  => $self->type('string', $query->name),
+    query => $self->type('string', $query->url),
+  };
+  return $item;
 }
 
 sub _report_to_hash {
-    my ($self, $report) = @_;
-    my $item = {
-        id    => $self->type('int', $report->id),
-        name  => $self->type('string', $report->name),
-        query => $self->type('string', $report->query),
+  my ($self, $report) = @_;
+  my $item = {
+    id    => $self->type('int',    $report->id),
+    name  => $self->type('string', $report->name),
+    query => $self->type('string', $report->query),
+  };
+  return $item;
+}
+
+sub _login_to_hash {
+  my ($self, $user) = @_;
+  my $item = {id => $self->type('int', $user->id)};
+  if ($user->{_login_token}) {
+    $item->{'token'} = $user->id . "-" . $user->{_login_token};
+  }
+  return $item;
+}
+
+sub whoami {
+  my ($self, $params) = @_;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  return filter $params,
+    {
+    id        => $self->type('int',    $user->id),
+    real_name => $self->type('string', $user->name),
+    name      => $self->type('email',  $user->login),
     };
-    return $item;
 }
 
 1;
@@ -592,10 +624,15 @@ and real name.
 
 This is the recommended way to create a Bugzilla account.
 
-=item B<Param>
+=item B<Params>
 
 =over
 
+=item C<login> (string) - the login name for the new account.
+If the installation has the C<use_email_as_login> parameter switched on, then
+this parameter is ignored, and the value of the C<email> parameter will
+be used as the login name for the new account.
+
 =item C<email> (string) - the email to send the offer to.
 
 =back
@@ -646,7 +683,12 @@ are the same as below.
 
 =over
 
-=item C<email> (string) - The email address for the new user.
+=item C<login> (string) - the login name for the new account.
+If the installation has the C<use_email_as_login> parameter switched on, then
+this parameter is ignored, and the value of the C<email> parameter will
+be used as the login name for the new account.
+
+=item C<email> (string) - The email address for the new account's user.
 
 =item C<full_name> (string) B<Optional> - The user's full name. Will
 be set to empty if not specified.
@@ -662,7 +704,7 @@ resetting their password) or by the administrator.
 
 =item B<Returns>
 
-A hash containing one item, C<id>, the numeric id of the user that was
+A hash containing one item, C<id>, the numeric id of the user account that was
 created.
 
 =item B<Errors>
@@ -699,7 +741,12 @@ B<EXPERIMENTAL>
 
 =item B<Description>
 
-Updates user accounts in Bugzilla.
+Updates user accounts in Bugzilla. To use this method, you must be a member
+of the C<editusers> group.
+
+If you are not in the C<editusers> group, you may
+add or remove users from groups if you have bless permissions for the groups
+you wish to modify. All other changes will be ignored.
 
 =item B<REST>
 
@@ -719,7 +766,7 @@ C<array> Contains ids of user to update.
 
 =item C<names>
 
-C<array> Contains email/login of user to update.
+C<array> Contains login name of user to update.
 
 =item C<full_name>
 
@@ -727,8 +774,10 @@ C<string> The new name of the user.
 
 =item C<email>
 
-C<string> The email of the user. Note that email used to login to bugzilla.
-Also note that you can only update one user at a time when changing the 
+C<string> The email address of the user. It may be required that this is the
+same as the login name. If you send different values in that case, the results
+are undefined.
+Note that you can only update one user at a time when changing the
 login name / email. (An error will be thrown if you try to update this field 
 for multiple users at once.)
 
@@ -949,8 +998,7 @@ C<string> The email address of the user.
 
 =item name
 
-C<string> The login name of the user. Note that in some situations this is 
-different than their email.
+C<string> The login name of the user.
 
 =item can_login
 
@@ -1036,7 +1084,7 @@ C<string> The CGI parameters for the saved report.
 B<Note>: If you are not logged in to Bugzilla when you call this function, you
 will only be returned the C<id>, C<name>, and C<real_name> items. If you are
 logged in and not in editusers group, you will only be returned the C<id>, C<name>, 
-C<real_name>, C<email>, C<can_login>, and C<groups> items. The groups returned are
+C<real_name>, C<can_login>, and C<groups> items. The groups returned are
 filtered based on your permission to bless each group.
 The C<saved_searches> and C<saved_reports> items are only returned if you are
 querying your own account, even if you are in the editusers group.
@@ -1095,3 +1143,58 @@ in Bugzilla B<4.4>.
 =back
 
 =back
+
+=head2 whoami
+
+=over
+
+=item B<Description>
+
+Allows for validating a user's API key, token, or username and password.
+If successfully authenticated, it returns simple information about the
+logged in user.
+
+=item B<Params> (none)
+
+=item B<Returns>
+
+On success, a hash containing information about the logged in user.
+
+=over
+
+=item id
+
+C<int> The unique integer ID that Bugzilla uses to represent this user.
+Even if the user's login name changes, this will not change.
+
+=item real_name
+
+C<string> The actual name of the user. May be blank.
+
+=item name
+
+C<string> The login name of the user.
+
+=back
+
+=item B<Errors>
+
+=over
+
+=item 300 (Invalid Username or Password)
+
+The username does not exist, or the password is wrong.
+
+=item 301 (Account Disabled)
+
+The account has been disabled.  A reason may be specified with the
+error.
+
+=item 305 (New Password Required)
+
+The current password is correct, but the user is asked to change
+his password.
+
+=back
+
+=back
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index e2bc780026..dacf2b1254 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -7,15 +7,18 @@
 
 package Bugzilla::WebService::Util;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Bugzilla::Flag;
 use Bugzilla::FlagType;
 use Bugzilla::Error;
+use Bugzilla::WebService::Constants;
 
 use Storable qw(dclone);
+use URI::Escape qw(uri_unescape);
+use List::MoreUtils qw(any none);
 
 use parent qw(Exporter);
 
@@ -24,264 +27,287 @@ use parent qw(Exporter);
 require Test::Taint;
 
 our @EXPORT_OK = qw(
-    extract_flags
-    filter
-    filter_wants
-    taint_data
-    validate
-    translate
-    params_to_objects
-    fix_credentials
+  extract_flags
+  filter
+  filter_wants
+  taint_data
+  validate
+  translate
+  params_to_objects
+  fix_credentials
 );
 
 sub extract_flags {
-    my ($flags, $bug, $attachment) = @_;
-    my (@new_flags, @old_flags);
+  my ($flags, $flag_types, $current_flags) = @_;
+  my (@new_flags, @old_flags);
 
-    my $flag_types    = $attachment ? $attachment->flag_types : $bug->flag_types;
-    my $current_flags = $attachment ? $attachment->flags : $bug->flags;
+  $current_flags //= [];
 
-    # Copy the user provided $flags as we may call extract_flags more than
-    # once when editing multiple bugs or attachments.
-    my $flags_copy = dclone($flags);
+  # Copy the user provided $flags as we may call extract_flags more than
+  # once when editing multiple bugs or attachments.
+  my $flags_copy = dclone($flags);
 
-    foreach my $flag (@$flags_copy) {
-        my $id      = $flag->{id};
-        my $type_id = $flag->{type_id};
+  foreach my $flag (@$flags_copy) {
+    my $id      = $flag->{id};
+    my $type_id = $flag->{type_id};
 
-        my $new  = delete $flag->{new};
-        my $name = delete $flag->{name};
+    my $new  = delete $flag->{new};
+    my $name = delete $flag->{name};
 
-        if ($id) {
-            my $flag_obj = grep($id == $_->id, @$current_flags);
-            $flag_obj || ThrowUserError('object_does_not_exist',
-                                        { class => 'Bugzilla::Flag', id => $id });
-        }
-        elsif ($type_id) {
-            my $type_obj = grep($type_id == $_->id, @$flag_types);
-            $type_obj || ThrowUserError('object_does_not_exist',
-                                        { class => 'Bugzilla::FlagType', id => $type_id });
-            if (!$new) {
-                my @flag_matches = grep($type_id == $_->type->id, @$current_flags);
-                @flag_matches > 1 && ThrowUserError('flag_not_unique',
-                                                     { value => $type_id });
-                if (!@flag_matches) {
-                    delete $flag->{id};
-                }
-                else {
-                    delete $flag->{type_id};
-                    $flag->{id} = $flag_matches[0]->id;
-                }
-            }
+    if ($id) {
+      my $flag_obj = grep($id == $_->id, @$current_flags);
+      $flag_obj
+        || ThrowUserError('object_does_not_exist',
+        {class => 'Bugzilla::Flag', id => $id});
+    }
+    elsif ($type_id) {
+      my $type_obj = grep($type_id == $_->id, @$flag_types);
+      $type_obj
+        || ThrowUserError('object_does_not_exist',
+        {class => 'Bugzilla::FlagType', id => $type_id});
+      if (!$new) {
+        my @flag_matches = grep($type_id == $_->type->id, @$current_flags);
+        @flag_matches > 1 && ThrowUserError('flag_not_unique', {value => $type_id});
+        if (!@flag_matches) {
+          delete $flag->{id};
         }
-        elsif ($name) {
-            my @type_matches = grep($name eq $_->name, @$flag_types);
-            @type_matches > 1 && ThrowUserError('flag_type_not_unique',
-                                                { value => $name });
-            @type_matches || ThrowUserError('object_does_not_exist',
-                                            { class => 'Bugzilla::FlagType', name => $name });
-            if ($new) {
-                delete $flag->{id};
-                $flag->{type_id} = $type_matches[0]->id;
-            }
-            else {
-                my @flag_matches = grep($name eq $_->type->name, @$current_flags);
-                @flag_matches > 1 && ThrowUserError('flag_not_unique', { value => $name });
-                if (@flag_matches) {
-                    $flag->{id} = $flag_matches[0]->id;
-                }
-                else {
-                    delete $flag->{id};
-                    $flag->{type_id} = $type_matches[0]->id;
-                }
-            }
+        else {
+          delete $flag->{type_id};
+          $flag->{id} = $flag_matches[0]->id;
         }
-
-        if ($flag->{id}) {
-            push(@old_flags, $flag);
+      }
+    }
+    elsif ($name) {
+      my @type_matches = grep($name eq $_->name, @$flag_types);
+      @type_matches > 1 && ThrowUserError('flag_type_not_unique', {value => $name});
+      @type_matches
+        || ThrowUserError('object_does_not_exist',
+        {class => 'Bugzilla::FlagType', name => $name});
+      if ($new) {
+        delete $flag->{id};
+        $flag->{type_id} = $type_matches[0]->id;
+      }
+      else {
+        my @flag_matches = grep($name eq $_->type->name, @$current_flags);
+        @flag_matches > 1 && ThrowUserError('flag_not_unique', {value => $name});
+        if (@flag_matches) {
+          $flag->{id} = $flag_matches[0]->id;
         }
         else {
-            push(@new_flags, $flag);
+          delete $flag->{id};
+          $flag->{type_id} = $type_matches[0]->id;
         }
+      }
     }
 
-    return (\@old_flags, \@new_flags);
+    if ($flag->{id}) {
+      push(@old_flags, $flag);
+    }
+    else {
+      push(@new_flags, $flag);
+    }
+  }
+
+  return (\@old_flags, \@new_flags);
 }
 
 sub filter($$;$$) {
-    my ($params, $hash, $types, $prefix) = @_;
-    my %newhash = %$hash;
+  my ($params, $hash, $types, $prefix) = @_;
+  my %newhash = %$hash;
 
-    foreach my $key (keys %$hash) {
-        delete $newhash{$key} if !filter_wants($params, $key, $types, $prefix);
-    }
+  foreach my $key (keys %$hash) {
+    delete $newhash{$key} if !filter_wants($params, $key, $types, $prefix);
+  }
 
-    return \%newhash;
+  return \%newhash;
 }
 
 sub filter_wants($$;$$) {
-    my ($params, $field, $types, $prefix) = @_;
-
-    # Since this is operation is resource intensive, we will cache the results
-    # This assumes that $params->{*_fields} doesn't change between calls
-    my $cache = Bugzilla->request_cache->{filter_wants} ||= {};
-    $field = "${prefix}.${field}" if $prefix;
-
-    if (exists $cache->{$field}) {
-        return $cache->{$field};
-    }
-
-    # Mimic old behavior if no types provided
-    my %field_types = map { $_ => 1 } (ref $types ? @$types : ($types || 'default'));
-
-    my %include = map { $_ => 1 } @{ $params->{'include_fields'} || [] };
-    my %exclude = map { $_ => 1 } @{ $params->{'exclude_fields'} || [] };
-
-    my %include_types;
-    my %exclude_types;
-
-    # Only return default fields if nothing is specified
-    $include_types{default} = 1 if !%include;
-
-    # Look for any field types requested
-    foreach my $key (keys %include) {
-        next if $key !~ /^_(.*)$/;
-        $include_types{$1} = 1;
-        delete $include{$key};
-    }
-    foreach my $key (keys %exclude) {
-        next if $key !~ /^_(.*)$/;
-        $exclude_types{$1} = 1;
-        delete $exclude{$key};
-    }
-
-    # Explicit inclusion/exclusion
-    return $cache->{$field} = 0 if $exclude{$field};
-    return $cache->{$field} = 1 if $include{$field};
-
-    # If the user has asked to include all or exclude all
-    return $cache->{$field} = 0 if $exclude_types{'all'};
-    return $cache->{$field} = 1 if $include_types{'all'};
-
-    # If the user has not asked for any fields specifically or if the user has asked
-    # for one or more of the field's types (and not excluded them)
-    foreach my $type (keys %field_types) {
-        return $cache->{$field} = 0 if $exclude_types{$type};
-        return $cache->{$field} = 1 if $include_types{$type};
-    }
-
-    my $wants = 0;
-    if ($prefix) {
-        # Include the field if the parent is include (and this one is not excluded)
-        $wants = 1 if $include{$prefix};
-    }
-    else {
-        # We want to include this if one of the sub keys is included
-        my $key = $field . '.';
-        my $len = length($key);
-        $wants = 1 if grep { substr($_, 0, $len) eq $key  } keys %include;
-    }
-
-    return $cache->{$field} = $wants;
+  my ($params, $field, $types, $prefix) = @_;
+
+  # Since this is operation is resource intensive, we will cache the results
+  # This assumes that $params->{*_fields} doesn't change between calls
+  my $cache = Bugzilla->request_cache->{filter_wants} ||= {};
+  $field = "${prefix}.${field}" if $prefix;
+
+  if (exists $cache->{$field}) {
+    return $cache->{$field};
+  }
+
+  # Mimic old behavior if no types provided
+  my %field_types
+    = map { $_ => 1 } (ref $types ? @$types : ($types || 'default'));
+
+  my %include = map { $_ => 1 } @{$params->{'include_fields'} || []};
+  my %exclude = map { $_ => 1 } @{$params->{'exclude_fields'} || []};
+
+  my %include_types;
+  my %exclude_types;
+
+  # Only return default fields if nothing is specified
+  $include_types{default} = 1 if !%include;
+
+  # Look for any field types requested
+  foreach my $key (keys %include) {
+    next if $key !~ /^_(.*)$/;
+    $include_types{$1} = 1;
+    delete $include{$key};
+  }
+  foreach my $key (keys %exclude) {
+    next if $key !~ /^_(.*)$/;
+    $exclude_types{$1} = 1;
+    delete $exclude{$key};
+  }
+
+  # Explicit inclusion/exclusion
+  return $cache->{$field} = 0 if $exclude{$field};
+  return $cache->{$field} = 1 if $include{$field};
+
+  # If the user has asked to include all or exclude all
+  return $cache->{$field} = 0 if $exclude_types{'all'};
+  return $cache->{$field} = 1 if $include_types{'all'};
+
+  # If the user has not asked for any fields specifically or if the user has asked
+  # for one or more of the field's types (and not excluded them)
+  foreach my $type (keys %field_types) {
+    return $cache->{$field} = 0 if $exclude_types{$type};
+    return $cache->{$field} = 1 if $include_types{$type};
+  }
+
+  my $wants = 0;
+  if ($prefix) {
+
+    # Include the field if the parent is include (and this one is not excluded)
+    $wants = 1 if $include{$prefix};
+  }
+  else {
+    # We want to include this if one of the sub keys is included
+    my $key = $field . '.';
+    my $len = length($key);
+    $wants = 1 if grep { substr($_, 0, $len) eq $key } keys %include;
+  }
+
+  return $cache->{$field} = $wants;
 }
 
 sub taint_data {
-    my @params = @_;
-    return if !@params;
-    # Though this is a private function, it hasn't changed since 2004 and
-    # should be safe to use, and prevents us from having to write it ourselves
-    # or require another module to do it.
-    Test::Taint::_deeply_traverse(\&_delete_bad_keys, \@params);
-    Test::Taint::taint_deeply(\@params);
+  my @params = @_;
+  return if !@params;
+
+  # Though this is a private function, it hasn't changed since 2004 and
+  # should be safe to use, and prevents us from having to write it ourselves
+  # or require another module to do it.
+  Test::Taint::_deeply_traverse(\&_delete_bad_keys, \@params);
+  Test::Taint::taint_deeply(\@params);
 }
 
 sub _delete_bad_keys {
-    foreach my $item (@_) {
-        next if ref $item ne 'HASH';
-        foreach my $key (keys %$item) {
-            # Making something a hash key always untaints it, in Perl.
-            # However, we need to validate our argument names in some way.
-            # We know that all hash keys passed in to the WebService will 
-            # match \w+, contain '.' or '-', so we delete any key that
-            # doesn't match that.
-            if ($key !~ /^[\w\.\-]+$/) {
-                delete $item->{$key};
-            }
-        }
+  foreach my $item (@_) {
+    next if ref $item ne 'HASH';
+    foreach my $key (keys %$item) {
+
+      # Making something a hash key always untaints it, in Perl.
+      # However, we need to validate our argument names in some way.
+      # We know that all hash keys passed in to the WebService will
+      # match \w+, contain '.' or '-', so we delete any key that
+      # doesn't match that.
+      if ($key !~ /^[\w\.\-]+$/) {
+        delete $item->{$key};
+      }
     }
-    return @_;
+  }
+  return @_;
 }
 
-sub validate  {
-    my ($self, $params, @keys) = @_;
-
-    # If $params is defined but not a reference, then we weren't
-    # sent any parameters at all, and we're getting @keys where
-    # $params should be.
-    return ($self, undef) if (defined $params and !ref $params);
-    
-    # If @keys is not empty then we convert any named 
-    # parameters that have scalar values to arrayrefs
-    # that match.
-    foreach my $key (@keys) {
-        if (exists $params->{$key}) {
-            $params->{$key} = ref $params->{$key} 
-                              ? $params->{$key} 
-                              : [ $params->{$key} ];
-        }
+sub validate {
+  my ($self, $params, @keys) = @_;
+
+  # If $params is defined but not a reference, then we weren't
+  # sent any parameters at all, and we're getting @keys where
+  # $params should be.
+  return ($self, undef) if (defined $params and !ref $params);
+
+  my @id_params = qw(ids comment_ids);
+
+  # If @keys is not empty then we convert any named
+  # parameters that have scalar values to arrayrefs
+  # that match.
+  foreach my $key (@keys) {
+    if (exists $params->{$key}) {
+      $params->{$key} = [$params->{$key}] unless ref $params->{$key};
+
+      if (any { $key eq $_ } @id_params) {
+        my $ids = $params->{$key};
+        ThrowCodeError('param_scalar_array_required', {param => $key})
+          unless ref($ids) eq 'ARRAY' && none { ref $_ } @$ids;
+      }
     }
+  }
 
-    return ($self, $params);
+  return ($self, $params);
 }
 
 sub translate {
-    my ($params, $mapped) = @_;
-    my %changes;
-    while (my ($key,$value) = each (%$params)) {
-        my $new_field = $mapped->{$key} || $key;
-        $changes{$new_field} = $value;
-    }
-    return \%changes;
+  my ($params, $mapped) = @_;
+  my %changes;
+  while (my ($key, $value) = each(%$params)) {
+    my $new_field = $mapped->{$key} || $key;
+    $changes{$new_field} = $value;
+  }
+  return \%changes;
 }
 
 sub params_to_objects {
-    my ($params, $class) = @_;
-    my (@objects, @objects_by_ids);
+  my ($params, $class) = @_;
+  my (@objects, @objects_by_ids);
 
-    @objects = map { $class->check($_) } 
-        @{ $params->{names} } if $params->{names};
+  @objects = map { $class->check($_) } @{$params->{names}} if $params->{names};
 
-    @objects_by_ids = map { $class->check({ id => $_ }) } 
-        @{ $params->{ids} } if $params->{ids};
+  @objects_by_ids = map { $class->check({id => $_}) } @{$params->{ids}}
+    if $params->{ids};
 
-    push(@objects, @objects_by_ids);
-    my %seen;
-    @objects = grep { !$seen{$_->id}++ } @objects;
-    return \@objects;
+  push(@objects, @objects_by_ids);
+  my %seen;
+  @objects = grep { !$seen{$_->id}++ } @objects;
+  return \@objects;
 }
 
 sub fix_credentials {
-    my ($params) = @_;
-    # Allow user to pass in login=foo&password=bar as a convenience
-    # even if not calling GET /login. We also do not delete them as
-    # GET /login requires "login" and "password".
-    if (exists $params->{'login'} && exists $params->{'password'}) {
-        $params->{'Bugzilla_login'}    = $params->{'login'};
-        $params->{'Bugzilla_password'} = $params->{'password'};
-    }
-    # Allow user to pass api_key=12345678 as a convenience which becomes
-    # "Bugzilla_api_key" which is what the auth code looks for.
-    if (exists $params->{api_key}) {
-        $params->{Bugzilla_api_key} = delete $params->{api_key};
+  my ($params, $cgi) = @_;
+
+  # Allow user to pass in authentication details in X-Headers
+  # This allows callers to keep credentials out of GET request query-strings
+  if ($cgi) {
+    foreach my $field (keys %{API_AUTH_HEADERS()}) {
+      next
+        if exists $params->{API_AUTH_HEADERS->{$field}}
+        || ($cgi->http($field) // '') eq '';
+      $params->{API_AUTH_HEADERS->{$field}} = uri_unescape($cgi->http($field));
     }
-    # Allow user to pass token=12345678 as a convenience which becomes
-    # "Bugzilla_token" which is what the auth code looks for.
-    if (exists $params->{'token'}) {
-        $params->{'Bugzilla_token'} = $params->{'token'};
-    }
-
-    # Allow extensions to modify the credential data before login
-    Bugzilla::Hook::process('webservice_fix_credentials', { params => $params });
+  }
+
+  # Allow user to pass in login=foo&password=bar as a convenience
+  # even if not calling GET /login. We also do not delete them as
+  # GET /login requires "login" and "password".
+  if (exists $params->{'login'} && exists $params->{'password'}) {
+    $params->{'Bugzilla_login'}    = delete $params->{'login'};
+    $params->{'Bugzilla_password'} = delete $params->{'password'};
+  }
+
+  # Allow user to pass api_key=12345678 as a convenience which becomes
+  # "Bugzilla_api_key" which is what the auth code looks for.
+  if (exists $params->{api_key}) {
+    $params->{Bugzilla_api_key} = delete $params->{api_key};
+  }
+
+  # Allow user to pass token=12345678 as a convenience which becomes
+  # "Bugzilla_token" which is what the auth code looks for.
+  if (exists $params->{'token'}) {
+    $params->{'Bugzilla_token'} = delete $params->{'token'};
+  }
+
+  # Allow extensions to modify the credential data before login
+  Bugzilla::Hook::process('webservice_fix_credentials', {params => $params});
 }
 
 __END__
diff --git a/Bugzilla/Whine.pm b/Bugzilla/Whine.pm
index eeaea6da4e..6170df7514 100644
--- a/Bugzilla/Whine.pm
+++ b/Bugzilla/Whine.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Whine;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -27,11 +27,11 @@ use Bugzilla::Whine::Query;
 use constant DB_TABLE => 'whine_events';
 
 use constant DB_COLUMNS => qw(
-    id
-    owner_userid
-    subject
-    body
-    mailifnobugs
+  id
+  owner_userid
+  subject
+  body
+  mailifnobugs
 );
 
 use constant LIST_ORDER => 'id';
@@ -39,15 +39,15 @@ use constant LIST_ORDER => 'id';
 ####################
 # Simple Accessors #
 ####################
-sub subject         { return $_[0]->{'subject'};      }
-sub body            { return $_[0]->{'body'};         }
+sub subject         { return $_[0]->{'subject'}; }
+sub body            { return $_[0]->{'body'}; }
 sub mail_if_no_bugs { return $_[0]->{'mailifnobugs'}; }
 
 sub user {
-    my ($self) = @_;
-    return $self->{user} if defined $self->{user};
-    $self->{user} = new Bugzilla::User($self->{'owner_userid'});
-    return $self->{user};
+  my ($self) = @_;
+  return $self->{user} if defined $self->{user};
+  $self->{user} = new Bugzilla::User($self->{'owner_userid'});
+  return $self->{user};
 }
 
 1;
diff --git a/Bugzilla/Whine/Query.pm b/Bugzilla/Whine/Query.pm
index b2a2c9e073..a4c2f36e8f 100644
--- a/Bugzilla/Whine/Query.pm
+++ b/Bugzilla/Whine/Query.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Whine::Query;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -23,12 +23,12 @@ use Bugzilla::Search::Saved;
 use constant DB_TABLE => 'whine_queries';
 
 use constant DB_COLUMNS => qw(
-    id
-    eventid
-    query_name
-    sortkey
-    onemailperbug
-    title
+  id
+  eventid
+  query_name
+  sortkey
+  onemailperbug
+  title
 );
 
 use constant NAME_FIELD => 'id';
@@ -37,11 +37,11 @@ use constant LIST_ORDER => 'sortkey';
 ####################
 # Simple Accessors #
 ####################
-sub eventid           { return $_[0]->{'eventid'};       }
-sub sortkey           { return $_[0]->{'sortkey'};       }
+sub eventid           { return $_[0]->{'eventid'}; }
+sub sortkey           { return $_[0]->{'sortkey'}; }
 sub one_email_per_bug { return $_[0]->{'onemailperbug'}; }
-sub title             { return $_[0]->{'title'};         }
-sub name              { return $_[0]->{'query_name'};    }
+sub title             { return $_[0]->{'title'}; }
+sub name              { return $_[0]->{'query_name'}; }
 
 
 1;
diff --git a/Bugzilla/Whine/Schedule.pm b/Bugzilla/Whine/Schedule.pm
index 11f0bf16f1..b55fd8b10a 100644
--- a/Bugzilla/Whine/Schedule.pm
+++ b/Bugzilla/Whine/Schedule.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Whine::Schedule;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -22,22 +22,22 @@ use Bugzilla::Constants;
 use constant DB_TABLE => 'whine_schedules';
 
 use constant DB_COLUMNS => qw(
-    id
-    eventid
-    run_day
-    run_time
-    run_next
-    mailto
-    mailto_type
+  id
+  eventid
+  run_day
+  run_time
+  run_next
+  mailto
+  mailto_type
 );
 
 use constant UPDATE_COLUMNS => qw(
-    eventid 
-    run_day 
-    run_time 
-    run_next 
-    mailto 
-    mailto_type
+  eventid
+  run_day
+  run_time
+  run_next
+  mailto
+  mailto_type
 );
 use constant NAME_FIELD => 'id';
 use constant LIST_ORDER => 'id';
@@ -45,36 +45,38 @@ use constant LIST_ORDER => 'id';
 ####################
 # Simple Accessors #
 ####################
-sub eventid         { return $_[0]->{'eventid'};     }
-sub run_day         { return $_[0]->{'run_day'};     }
-sub run_time        { return $_[0]->{'run_time'};    }
+sub eventid         { return $_[0]->{'eventid'}; }
+sub run_day         { return $_[0]->{'run_day'}; }
+sub run_time        { return $_[0]->{'run_time'}; }
 sub mailto_is_group { return $_[0]->{'mailto_type'}; }
 
 sub mailto {
-    my $self = shift;
-
-    return $self->{mailto_object} if exists $self->{mailto_object};
-    my $id = $self->{'mailto'};
-
-    if ($self->mailto_is_group) {
-        $self->{mailto_object} = Bugzilla::Group->new($id);
-    } else {
-        $self->{mailto_object} = Bugzilla::User->new($id);
-    }
-    return $self->{mailto_object};
+  my $self = shift;
+
+  return $self->{mailto_object} if exists $self->{mailto_object};
+  my $id = $self->{'mailto'};
+
+  if ($self->mailto_is_group) {
+    $self->{mailto_object} = Bugzilla::Group->new($id);
+  }
+  else {
+    $self->{mailto_object} = Bugzilla::User->new($id);
+  }
+  return $self->{mailto_object};
 }
 
-sub mailto_users { 
-    my $self = shift;
-    return $self->{mailto_users} if exists $self->{mailto_users};
-    my $object = $self->mailto;
-
-    if ($self->mailto_is_group) {
-        $self->{mailto_users} = $object->members_non_inherited if $object->is_active;
-    } else {
-        $self->{mailto_users} = $object;
-    }
-    return $self->{mailto_users};
+sub mailto_users {
+  my $self = shift;
+  return $self->{mailto_users} if exists $self->{mailto_users};
+  my $object = $self->mailto;
+
+  if ($self->mailto_is_group) {
+    $self->{mailto_users} = $object->members_non_inherited if $object->is_active;
+  }
+  else {
+    $self->{mailto_users} = $object;
+  }
+  return $self->{mailto_users};
 }
 
 1;
diff --git a/Build.PL b/Build.PL
deleted file mode 100644
index 024a560248..0000000000
--- a/Build.PL
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use FindBin qw($RealBin);
-use lib ($RealBin, "$RealBin/lib");
-
-use Module::Build 0.36_14;
-
-use Bugzilla::Install::Requirements qw(REQUIRED_MODULES OPTIONAL_MODULES);
-use Bugzilla::Constants qw(BUGZILLA_VERSION);
-
-sub requires {
-    my $requirements = REQUIRED_MODULES();
-    my $hrequires = {};
-    foreach my $module (@$requirements) {
-        $hrequires->{$module->{module}} = $module->{version};
-    }
-    return $hrequires;
-};
-
-sub build_requires {
-    return requires();
-}
-
-sub recommends {
-    my $recommends = OPTIONAL_MODULES();
-    my @blacklist = ('Apache-SizeLimit', 'mod_perl'); # Does not compile properly on Travis
-    my $hrecommends = {};
-    foreach my $module (@$recommends) {
-        next if grep($_ eq $module->{package}, @blacklist);
-        $hrecommends->{$module->{module}} = $module->{version};
-    }
-    return $hrecommends;
-}
-
-my $build = Module::Build->new(
-    module_name        => 'Bugzilla',
-    dist_abstract      => <<END,
-Bugzilla is a free bug-tracking system that is developed by an active
-community of volunteers. You can install and use it without having to
-pay any license fee.
-END
-    dist_version_from  => 'Bugzilla/Constants.pm',
-    dist_version       => BUGZILLA_VERSION,
-    requires           => requires(),
-    recommends         => recommends(),
-    license            => 'Mozilla_2_0',
-    create_readme      => 0,
-    create_makefile_pl => 0
-);
-
-$build->create_build_script;
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..463669e899
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,35 @@
+# Contributing to Bugzilla
+
+Bugzilla is an open source project.
+
+Over the years, hundreds of people have contributed code. We appreciate your help!
+
+
+## Filing issues
+
+When filing an issue, make sure to answer these four questions:
+
+1. What version of Bugzilla are you using (`the version is on the top right-hand corner of the front page`)?
+2. What did you do?
+3. What did you expect to see?
+4. What did you see instead?
+
+General questions should go to the [support-bugzilla mailing list](https://lists.mozilla.org/listinfo/support-bugzilla) instead of our bug tracker.
+The people there will answer or ask you to file an issue if you've tripped over a bug.
+
+
+## Contributing code
+
+Please read the [tips for Developers](https://wiki.mozilla.org/Bugzilla:Developers)
+before sending patches.
+
+The gist of it is:
+
+1. Introduce yourself and don't hesitate to ask for help
+2. Download the code, make the changes you want and test them
+3. Ask a reviewer to work with you through the [review process](https://wiki.mozilla.org/Bugzilla:Review)
+
+**We gladly accept GitHub pull requests**
+
+Unless otherwise noted, the Bugzilla source files are distributed under
+the Mozilla Public License, v2.0 found in the LICENSE file.
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..0c1aac13b5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,75 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+FROM centos:7
+MAINTAINER David Lawrence <dkl@mozilla.com>
+
+# Environment configuration
+ENV USER bugzilla
+ENV HOME /home/$USER
+ENV BUGS_DB_DRIVER mysql
+ENV BUGZILLA_ROOT $HOME/devel/htdocs/bugzilla
+ENV GITHUB_BASE_GIT https://github.com/bugzilla/bugzilla
+ENV GITHUB_BASE_BRANCH master
+ENV GITHUB_QA_GIT https://github.com/bugzilla/qa
+
+# Distribution package installation
+COPY docker_files /docker_files
+RUN yum -y -q update \
+    && yum -y -q install https://dev.mysql.com/get/mysql-community-release-el7-5.noarch.rpm epel-release \
+    && yum -y -q groupinstall "Development Tools" \
+    && yum -y -q install `cat /docker_files/rpm_list` \
+    && yum clean all
+
+# User configuration
+RUN useradd -m -G wheel -u 1000 -s /bin/bash $USER \
+    && passwd -u -f $USER \
+    && echo "bugzilla:bugzilla" | chpasswd
+
+# Apache configuration
+RUN cp /docker_files/bugzilla.conf /etc/httpd/conf.d/bugzilla.conf \
+    && chown root.root /etc/httpd/conf.d/bugzilla.conf \
+    && chmod 440 /etc/httpd/conf.d/bugzilla.conf
+
+# MySQL configuration
+RUN cp /docker_files/my.cnf /etc/my.cnf \
+    && chmod 644 /etc/my.cnf \
+    && chown root.root /etc/my.cnf \
+    && rm -rf /etc/mysql \
+    && rm -rf /var/lib/mysql/* \
+    && /usr/bin/mysql_install_db --user=$USER --basedir=/usr --datadir=/var/lib/mysql
+
+# Sudoer configuration
+RUN cp /docker_files/sudoers /etc/sudoers \
+    && chown root.root /etc/sudoers \
+    && chmod 440 /etc/sudoers
+
+# Clone the code repo initially
+RUN su $USER -c "git clone $GITHUB_BASE_GIT -b $GITHUB_BASE_BRANCH $BUGZILLA_ROOT"
+
+# Bugzilla dependencies and setup
+ADD https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm /usr/local/bin/cpanm
+RUN chmod 755 /usr/local/bin/cpanm
+RUN /bin/bash /docker_files/install_deps.sh
+RUN /bin/bash /docker_files/bugzilla_config.sh
+RUN /bin/bash /docker_files/my_config.sh
+
+# Final permissions fix
+RUN chown -R $USER.$USER $HOME
+
+# Networking
+RUN echo "NETWORKING=yes" > /etc/sysconfig/network
+EXPOSE 80
+EXPOSE 5900
+
+# Testing scripts for CI
+ADD https://selenium-release.storage.googleapis.com/2.45/selenium-server-standalone-2.45.0.jar /selenium-server.jar
+
+# Supervisor
+RUN cp /docker_files/supervisord.conf /etc/supervisord.conf \
+    && chmod 700 /etc/supervisord.conf
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000000..14e2f777f6
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
deleted file mode 100644
index 69204e63f0..0000000000
--- a/MANIFEST.SKIP
+++ /dev/null
@@ -1,53 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-#!start included /usr/share/perl5/ExtUtils/MANIFEST.SKIP
-# Avoid version control files.
-\B\.git\b
-\B\.bzr\b
-\B\.bzrignore\b
-\B\.gitignore\b
-\B\.gitrev\b
-\B\.patch\b
-
-# Avoid Makemaker generated and utility files.
-\bMANIFEST\.bak
-\bMakefile$
-\bblib/
-\bMakeMaker-\d
-\bpm_to_blib\.ts$
-\bpm_to_blib$
-\bblibdirs\.ts$         # 6.18 through 6.25 generated this
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\b_build/
-
-# Avoid temp and backup files.
-~$
-\.old$
-\#$
-\b\.#
-\.bak$
-\.swp$
-
-#!end included /usr/share/perl5/ExtUtils/MANIFEST.SKIP
-
-# Avoid Module::Build generated and utility files.
-\bBuild$
-\bBuild.bat$
-\b_build
-\bBuild.COM$
-\bBUILD.COM$
-\bbuild.com$
-
-# Avoid archives of this distribution
-\bBugzilla-[\d\.\_]+
-
-# Bugzilla specific avoids
-\bdata\/\b
-\blocalconfig$
diff --git a/META.json b/META.json
new file mode 100644
index 0000000000..88b131c985
--- /dev/null
+++ b/META.json
@@ -0,0 +1,399 @@
+{
+   "abstract" : "Bugzilla Bug Tracking System",
+   "author" : [
+      "Bugzilla Developers <developers@bugzilla.org>"
+   ],
+   "dynamic_config" : 1,
+   "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150005",
+   "license" : [
+      "unknown"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "Bugzilla",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "optional_features" : {
+      "auth_delegation" : {
+         "description" : "Auth Delegation",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "LWP::UserAgent" : "0"
+               }
+            }
+         }
+      },
+      "auth_ldap" : {
+         "description" : "LDAP Authentication",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Net::LDAP" : "0"
+               }
+            }
+         }
+      },
+      "auth_radius" : {
+         "description" : "RADIUS Authentication",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Authen::Radius" : "0"
+               }
+            }
+         }
+      },
+      "csp" : {
+         "description" : "Content-Security-Policy support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "MooX::StrictConstructor" : "0.008",
+                  "Type::Tiny" : "1"
+               }
+            }
+         }
+      },
+      "db_from_env" : {
+         "description" : "Support for using $ENV{DATABASE_URL}",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "URI::db" : "0.17"
+               }
+            }
+         }
+      },
+      "detect_charset" : {
+         "description" : "Automatic charset detection for text attachments",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Encode" : "2.21",
+                  "Encode::Detect" : "0"
+               }
+            }
+         }
+      },
+      "documentation" : {
+         "description" : "Documentation",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "File::Copy::Recursive" : "0",
+                  "File::Which" : "0"
+               }
+            }
+         }
+      },
+      "features" : {
+         "description" : "Modules required to enable any feature",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "CPAN::Meta::Prereqs" : "2.132830",
+                  "CPAN::Meta::Requirements" : "2.121",
+                  "Module::Metadata" : "1.000019",
+                  "Module::Runtime" : "0"
+               }
+            }
+         }
+      },
+      "graphical_reports" : {
+         "description" : "Graphical Reports",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "GD" : "1.20",
+                  "GD::Graph" : "0",
+                  "GD::Text" : "0",
+                  "Template::Plugin::GD::Image" : "0"
+               }
+            }
+         }
+      },
+      "html_desc" : {
+         "description" : "More HTML in Product/Group Descriptions",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "HTML::Parser" : "3.67",
+                  "HTML::Scrubber" : "0"
+               }
+            }
+         }
+      },
+      "inbound_email" : {
+         "description" : "Inbound Email",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Email::Reply" : "0",
+                  "HTML::FormatText::WithLinks" : "0.13"
+               }
+            }
+         }
+      },
+      "jobqueue" : {
+         "description" : "Mail Queueing",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Daemon::Generic" : "0",
+                  "TheSchwartz" : "1.10"
+               }
+            }
+         }
+      },
+      "jsonrpc" : {
+         "description" : "JSON-RPC Interface",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "JSON::RPC" : "0"
+               }
+            }
+         }
+      },
+      "markdown" : {
+         "description" : "Markdown syntax support for comments",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Text::MultiMarkdown" : "1.000034"
+               }
+            }
+         }
+      },
+      "memcached" : {
+         "description" : "Memcached Support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Cache::Memcached::Fast" : "0.17"
+               }
+            }
+         }
+      },
+      "mod_perl" : {
+         "description" : "mod_perl support under Apache",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Apache2::SizeLimit" : "0.96",
+                  "mod_perl2" : "1.999022"
+               }
+            }
+         }
+      },
+      "moving" : {
+         "description" : "Move Bugs Between Installations",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "MIME::Parser" : "5.406",
+                  "XML::Twig" : "0"
+               }
+            }
+         }
+      },
+      "mysql" : {
+         "description" : "MySQL database support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "DBD::mysql" : "4.001"
+               }
+            }
+         }
+      },
+      "new_charts" : {
+         "description" : "New Charts",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Chart::Lines" : "v2.4.10",
+                  "GD" : "1.20"
+               }
+            }
+         }
+      },
+      "old_charts" : {
+         "description" : "Old Charts",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Chart::Lines" : "v2.4.10",
+                  "GD" : "1.20"
+               }
+            }
+         }
+      },
+      "oracle" : {
+         "description" : "Oracle database support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "DBD::Oracle" : "1.19"
+               }
+            }
+         }
+      },
+      "patch_viewer" : {
+         "description" : "Patch Viewer",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "PatchReader" : "v0.9.6"
+               }
+            }
+         }
+      },
+      "pg" : {
+         "description" : "Postgres database support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "DBD::Pg" : "v2.19.3"
+               }
+            }
+         }
+      },
+      "psgi" : {
+         "description" : "Plack/PSGI support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "CGI::Compile" : "0",
+                  "CGI::Emulate::PSGI" : "0",
+                  "Plack" : "1.0031"
+               }
+            }
+         }
+      },
+      "smtp_auth" : {
+         "description" : "SMTP Authentication",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Authen::SASL" : "0"
+               }
+            }
+         }
+      },
+      "smtp_ssl" : {
+         "description" : "SSL Support for SMTP",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "Net::SMTP::SSL" : "1.01"
+               }
+            }
+         }
+      },
+      "sqlite" : {
+         "description" : "SQLite database support",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "DBD::SQLite" : "1.29"
+               }
+            }
+         }
+      },
+      "typesniffer" : {
+         "description" : "Sniff MIME type of attachments",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "File::MimeInfo::Magic" : "0",
+                  "IO::Scalar" : "0"
+               }
+            }
+         }
+      },
+      "updates" : {
+         "description" : "Automatic Update Notifications",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "LWP::UserAgent" : "0",
+                  "XML::Twig" : "0"
+               }
+            }
+         }
+      },
+      "xmlrpc" : {
+         "description" : "XML-RPC Interface",
+         "prereqs" : {
+            "runtime" : {
+               "requires" : {
+                  "SOAP::Lite" : "0.712",
+                  "XMLRPC::Lite" : "0.712"
+               }
+            }
+         }
+      }
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "6.55"
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : "6.55"
+         }
+      },
+      "runtime" : {
+         "recommends" : {
+            "CPAN::Meta::Prereqs" : "2.132830",
+            "CPAN::Meta::Requirements" : "2.121",
+            "Module::Metadata" : "1.000019",
+            "Module::Runtime" : "0",
+            "Safe" : "2.30"
+         },
+         "requires" : {
+            "CGI" : "4.09",
+            "DBI" : "1.614",
+            "Date::Format" : "2.23",
+            "DateTime" : "0.75",
+            "DateTime::TimeZone" : "1.64",
+            "Digest::SHA" : "0",
+            "Email::MIME" : "1.904",
+            "Email::Sender" : "1.300011",
+            "HTTP::Request" : "0",
+            "HTTP::Response" : "0",
+            "JSON::XS" : "2.01",
+            "List::MoreUtils" : "0.32",
+            "Math::Random::ISAAC" : "v1.0.1",
+            "Module::Runtime" : "0",
+            "Moo" : "2",
+            "Template" : "3.008",
+            "Test::Taint" : "1.06",
+            "URI" : "1.55",
+            "perl" : "5.014000"
+         }
+      },
+      "test" : {
+         "requires" : {
+            "Pod::Checker" : "0",
+            "Pod::Coverage" : "0",
+            "Test2::Suite" : "0",
+            "Test::More" : "0",
+            "Test::Perl::Critic" : "0"
+         }
+      }
+   },
+   "release_status" : "stable",
+   "version" : "v5.1.1+",
+   "x_serialization_backend" : "JSON::PP version 2.27300"
+}
diff --git a/META.yml b/META.yml
new file mode 100644
index 0000000000..ddc99cfa39
--- /dev/null
+++ b/META.yml
@@ -0,0 +1,194 @@
+---
+abstract: 'Bugzilla Bug Tracking System'
+author:
+  - 'Bugzilla Developers <developers@bugzilla.org>'
+build_requires:
+  ExtUtils::MakeMaker: '6.55'
+  Pod::Checker: '0'
+  Pod::Coverage: '0'
+  Test2::Suite: '0'
+  Test::More: '0'
+  Test::Perl::Critic: '0'
+configure_requires:
+  ExtUtils::MakeMaker: '6.55'
+dynamic_config: 1
+generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150005'
+license: unknown
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: '1.4'
+name: Bugzilla
+no_index:
+  directory:
+    - t
+    - inc
+optional_features:
+  auth_delegation:
+    description: 'Auth Delegation'
+    requires:
+      LWP::UserAgent: '0'
+  auth_ldap:
+    description: 'LDAP Authentication'
+    requires:
+      Net::LDAP: '0'
+  auth_radius:
+    description: 'RADIUS Authentication'
+    requires:
+      Authen::Radius: '0'
+  csp:
+    description: 'Content-Security-Policy support'
+    requires:
+      MooX::StrictConstructor: '0.008'
+      Type::Tiny: '1'
+  db_from_env:
+    description: 'Support for using $ENV{DATABASE_URL}'
+    requires:
+      URI::db: '0.17'
+  detect_charset:
+    description: 'Automatic charset detection for text attachments'
+    requires:
+      Encode: '2.21'
+      Encode::Detect: '0'
+  documentation:
+    description: Documentation
+    requires:
+      File::Copy::Recursive: '0'
+      File::Which: '0'
+  features:
+    description: 'Modules required to enable any feature'
+    requires:
+      CPAN::Meta::Prereqs: '2.132830'
+      CPAN::Meta::Requirements: '2.121'
+      Module::Metadata: '1.000019'
+      Module::Runtime: '0'
+  graphical_reports:
+    description: 'Graphical Reports'
+    requires:
+      GD: '1.20'
+      GD::Graph: '0'
+      GD::Text: '0'
+      Template::Plugin::GD::Image: '0'
+  html_desc:
+    description: 'More HTML in Product/Group Descriptions'
+    requires:
+      HTML::Parser: '3.67'
+      HTML::Scrubber: '0'
+  inbound_email:
+    description: 'Inbound Email'
+    requires:
+      Email::Reply: '0'
+      HTML::FormatText::WithLinks: '0.13'
+  jobqueue:
+    description: 'Mail Queueing'
+    requires:
+      Daemon::Generic: '0'
+      TheSchwartz: '1.10'
+  jsonrpc:
+    description: 'JSON-RPC Interface'
+    requires:
+      JSON::RPC: '0'
+  markdown:
+    description: 'Markdown syntax support for comments'
+    requires:
+      Text::MultiMarkdown: '1.000034'
+  memcached:
+    description: 'Memcached Support'
+    requires:
+      Cache::Memcached::Fast: '0.17'
+  mod_perl:
+    description: 'mod_perl support under Apache'
+    requires:
+      Apache2::SizeLimit: '0.96'
+      mod_perl2: '1.999022'
+  moving:
+    description: 'Move Bugs Between Installations'
+    requires:
+      MIME::Parser: '5.406'
+      XML::Twig: '0'
+  mysql:
+    description: 'MySQL database support'
+    requires:
+      DBD::mysql: '4.001'
+  new_charts:
+    description: 'New Charts'
+    requires:
+      Chart::Lines: v2.4.10
+      GD: '1.20'
+  old_charts:
+    description: 'Old Charts'
+    requires:
+      Chart::Lines: v2.4.10
+      GD: '1.20'
+  oracle:
+    description: 'Oracle database support'
+    requires:
+      DBD::Oracle: '1.19'
+  patch_viewer:
+    description: 'Patch Viewer'
+    requires:
+      PatchReader: v0.9.6
+  pg:
+    description: 'Postgres database support'
+    requires:
+      DBD::Pg: v2.19.3
+  psgi:
+    description: 'Plack/PSGI support'
+    requires:
+      CGI::Compile: '0'
+      CGI::Emulate::PSGI: '0'
+      Plack: '1.0031'
+  smtp_auth:
+    description: 'SMTP Authentication'
+    requires:
+      Authen::SASL: '0'
+  smtp_ssl:
+    description: 'SSL Support for SMTP'
+    requires:
+      Net::SMTP::SSL: '1.01'
+  sqlite:
+    description: 'SQLite database support'
+    requires:
+      DBD::SQLite: '1.29'
+  typesniffer:
+    description: 'Sniff MIME type of attachments'
+    requires:
+      File::MimeInfo::Magic: '0'
+      IO::Scalar: '0'
+  updates:
+    description: 'Automatic Update Notifications'
+    requires:
+      LWP::UserAgent: '0'
+      XML::Twig: '0'
+  xmlrpc:
+    description: 'XML-RPC Interface'
+    requires:
+      SOAP::Lite: '0.712'
+      XMLRPC::Lite: '0.712'
+recommends:
+  CPAN::Meta::Prereqs: '2.132830'
+  CPAN::Meta::Requirements: '2.121'
+  Module::Metadata: '1.000019'
+  Module::Runtime: '0'
+  Safe: '2.30'
+requires:
+  CGI: '4.09'
+  DBI: '1.614'
+  Date::Format: '2.23'
+  DateTime: '0.75'
+  DateTime::TimeZone: '1.64'
+  Digest::SHA: '0'
+  Email::MIME: '1.904'
+  Email::Sender: '1.300011'
+  HTTP::Request: '0'
+  HTTP::Response: '0'
+  JSON::XS: '2.01'
+  List::MoreUtils: '0.32'
+  Math::Random::ISAAC: v1.0.1
+  Module::Runtime: '0'
+  Moo: '2'
+  Template: '3.008'
+  Test::Taint: '1.06'
+  URI: '1.55'
+  perl: '5.014000'
+version: v5.1.1+
+x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/Makefile.PL b/Makefile.PL
new file mode 100644
index 0000000000..1e966dd020
--- /dev/null
+++ b/Makefile.PL
@@ -0,0 +1,400 @@
+#!/usr/bin/perl
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# This file has detailed POD docs, do "perldoc checksetup.pl" to see them.
+
+######################################################################
+# Initialization
+######################################################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5);
+
+use ExtUtils::MakeMaker 6.55;
+use Bugzilla::Constants qw(BUGZILLA_VERSION);
+use File::Basename;
+use File::Spec;
+
+BEGIN {
+    if ($ENV{BZ_SILENT_MAKEFILE}) {
+        open STDOUT, '>>', File::Spec->devnull;
+        open STDERR, '>>', File::Spec->devnull;
+    }
+}
+
+# META.json and META.yml exist only for the benefit of older
+# installs where cpanm can't get the optional features out of Makefile.PL
+# Unfortunately having META.json and META.yml committed to the repo is weird
+# and MakeMaker always prefers their content to the internal data (unless CPAN::META
+# is not installed).
+# Since we (Bugzilla) require this cludge, we hide the files from MakeMaker.
+BEGIN {
+    warn "Hiding META.{json,yml} from MakeMaker...\n";
+    rename( 'META.json', 'META.json.hide' ) || unlink("META.json");
+    rename( 'META.yml',  'META.yml.hide' )  || unlink("META.yml");
+
+    if (!eval { ExtUtils::MakeMaker->VERSION('6.57_07') }) {
+        warn "WARNING: ExtUtils::MakeMaker should be at least 6.57_07 in order to support updating META.json files\n";
+    }
+}
+
+END {
+    warn "Unhiding META.{json,yml}...\n";
+    rename( 'META.json.hide', 'META.json' );
+    rename( 'META.yml.hide',  'META.yml' );
+}
+
+# PREREQ_PM
+my %requires = (
+    'CGI'                 => '4.09',
+    'DBI'                 => '1.614',
+    'Date::Format'        => '2.23',
+    'DateTime'            => '0.75',
+    'DateTime::TimeZone'  => '1.64',
+    'Digest::SHA'         => 0,
+    'Email::MIME'         => '1.904',
+    'Email::Sender'       => '1.300011',
+    'Email::Address'      => 0,
+    'HTTP::Request'       => 0,
+    'HTTP::Response'      => 0,
+    'JSON::XS'            => '2.01',
+    'List::MoreUtils'     => '0.32',
+    'Math::Random::ISAAC' => '1.0.1',
+    'Moo'                 => 2,
+    'Module::Runtime'     => 0,
+    'Template'            => '3.008',
+    'Test::Taint'         => '1.06',
+    'URI'                 => '1.55',
+);
+my %build_requires = (
+    'ExtUtils::MakeMaker' => '6.55',
+);
+my %test_requires = (
+    'Test::More'         => 0,
+    'Test2::Suite'       => 0,
+    'Pod::Checker'       => 0,
+    'Pod::Coverage'      => 0,
+    'Test::Perl::Critic' => 0
+);
+my %recommends = ( Safe => '2.30' );
+my %all_features = (
+    'CPAN::Meta::Prereqs'      => '2.132830',
+    'CPAN::Meta::Requirements' => '2.121',
+    'Module::Metadata'         => '1.000019',
+    'Module::Runtime'          => 0,
+);
+
+# Windows requires some additional modules.
+if ( $^O eq 'MSWin32' ) {
+    # 0.45 implements the GetConsoleOutputCP() method.
+    # It also supports Windows 7. Set this to 0.52 to support Windows 10.
+    $requires{'Win32'}      = '0.45';
+    # 0.63 fixes a problem with Strawberry Perl 5.14.1.
+    $requires{'Win32::API'} = '0.63';
+    $requires{'DateTime::TimeZone::Local::Win32'} = '1.64';
+}
+
+my %optional_features = (
+    features => {
+        prereqs => { runtime => { requires => \%all_features, } },
+        description => 'Modules required to enable any feature',
+    },
+    smtp_auth => {
+        prereqs => { runtime => { requires => { 'Authen::SASL' => 0 } } },
+        description => 'SMTP Authentication'
+    },
+    detect_charset => {
+        prereqs => {
+            runtime =>
+                { requires => { 'Encode::Detect' => 0, Encode => '2.21' } }
+        },
+        description => 'Automatic charset detection for text attachments'
+    },
+    new_charts => {
+        description => 'New Charts',
+        prereqs     => {
+            runtime =>
+                { requires => { 'Chart::Lines' => 'v2.4.10', GD => '1.20' } }
+        }
+    },
+    html_desc => {
+        description => 'More HTML in Product/Group Descriptions',
+        prereqs     => {
+            runtime => {
+                requires =>
+                    { 'HTML::Parser' => '3.67', 'HTML::Scrubber' => 0 }
+            }
+        }
+    },
+    markdown => {
+        description => 'Markdown syntax support for comments',
+        prereqs     => {
+            runtime => { requires => { 'Text::MultiMarkdown' => '1.000034' } }
+        }
+    },
+    pg => {
+        prereqs => { runtime => { requires => { 'DBD::Pg' => 'v2.19.3' } } },
+        description => 'Postgres database support'
+    },
+    memcached => {
+        description => 'Memcached Support',
+        prereqs     => {
+            runtime => { requires => { 'Cache::Memcached::Fast' => '0.17' } }
+        }
+    },
+    auth_delegation => {
+        description => 'Auth Delegation',
+        prereqs => { runtime => { requires => { 'LWP::UserAgent' => 0 } } }
+    },
+    updates => {
+        description => 'Automatic Update Notifications',
+        prereqs     => {
+            runtime =>
+                { requires => { 'LWP::UserAgent' => 0, 'XML::Twig' => 0 } }
+        }
+    },
+    auth_radius => {
+        description => 'RADIUS Authentication',
+        prereqs => { runtime => { requires => { 'Authen::Radius' => 0 } } }
+    },
+    documentation => {
+        prereqs => {
+            runtime => {
+                requires =>
+                    {
+                        'File::Which'                  => 0,
+                        'File::Copy::Recursive'        => 0,
+                        'Pod::Simple::Search'          => 0,
+                        'Pod::POM::View::Restructured' => 0,
+                    }
+            }
+        },
+        description => 'Documentation',
+    },
+    xmlrpc => {
+        description => 'XML-RPC Interface',
+        prereqs     => {
+            runtime => {
+                requires => {
+                    'XMLRPC::Lite' => '0.712',
+                    'SOAP::Lite'   => '0.712',
+                }
+            }
+        }
+    },
+    auth_ldap => {
+        prereqs => { runtime => { requires => { 'Net::LDAP' => 0 } } },
+        description => 'LDAP Authentication'
+    },
+    old_charts => {
+        prereqs => {
+            runtime =>
+                { requires => { GD => '1.20', 'Chart::Lines' => 'v2.4.10' } }
+        },
+        description => 'Old Charts'
+    },
+    moving => {
+        prereqs => {
+            runtime => {
+                requires => { 'MIME::Parser' => '5.406', 'XML::Twig' => 0 }
+            }
+        },
+        description => 'Move Bugs Between Installations'
+    },
+    oracle => {
+        description => 'Oracle database support',
+        prereqs => { runtime => { requires => { 'DBD::Oracle' => '1.19' } } }
+    },
+    typesniffer => {
+        prereqs => {
+            runtime => {
+                requires =>
+                    { 'IO::Scalar' => 0, 'File::MimeInfo::Magic' => 0 }
+            }
+        },
+        description => 'Sniff MIME type of attachments'
+    },
+    sqlite => {
+        prereqs => { runtime => { requires => { 'DBD::SQLite' => '1.29' } } },
+        description => 'SQLite database support'
+    },
+    smtp_ssl => {
+        prereqs =>
+            { runtime => { requires => { 'Net::SMTP::SSL' => '1.01' } } },
+        description => 'SSL Support for SMTP'
+    },
+    mysql => {
+        description => 'MySQL database support',
+        prereqs => { runtime => { requires => { 'DBD::mysql' => '4.001' } } }
+    },
+    jsonrpc => {
+        description => 'JSON-RPC Interface',
+        prereqs     => {
+            runtime =>
+                { requires => { 'JSON::RPC' => 0 } }
+        }
+    },
+    graphical_reports => {
+        description => 'Graphical Reports',
+        prereqs     => {
+            runtime => {
+                requires => {
+                    'GD::Text'                    => 0,
+                    'Template::Plugin::GD::Image' => 0,
+                    'GD::Graph'                   => 0,
+                    GD                            => '1.20',
+                }
+            }
+        }
+    },
+    mod_perl => {
+        description => 'mod_perl support under Apache',
+        prereqs     => {
+            runtime => {
+                requires => {
+                    'mod_perl2'          => '1.999022',
+                    'Apache2::SizeLimit' => '0.96',
+                }
+            }
+        }
+    },
+    inbound_email => {
+        prereqs => {
+            runtime => {
+                requires => {
+                    'Email::Reply'                => 0,
+                    'HTML::FormatText::WithLinks' => '0.13'
+                }
+            }
+        },
+        description => 'Inbound Email'
+    },
+    patch_viewer => {
+        description => 'Patch Viewer',
+        prereqs => { runtime => { requires => { PatchReader => '0.9.6' } } }
+    },
+    jobqueue => {
+        description => 'Mail Queueing',
+        prereqs     => {
+            runtime => {
+                requires => { TheSchwartz => '1.10', 'Daemon::Generic' => 0 }
+            }
+        }
+    },
+    psgi => {
+        description => 'Plack/PSGI support',
+        prereqs     => {
+            runtime => {
+                requires => {
+                    Plack                => '1.0031',
+                    'CGI::Compile'       => 0,
+                    'CGI::Emulate::PSGI' => 0
+                }
+            }
+        }
+    },
+    csp => {
+        description => 'Content-Security-Policy support',
+        prereqs     => {
+            runtime => {
+                requires => {
+                    'Type::Tiny' => 1,
+                    'MooX::StrictConstructor' => 0.008,
+                }
+            }
+        }
+    },
+    db_from_env => {
+        description => 'Support for using $ENV{DATABASE_URL}',
+        prereqs => {
+            runtime => {
+                requires => { 'URI::db' => '0.17' },
+            },
+        },
+    },
+);
+
+for my $file ( glob("extensions/*/Config.pm") ) {
+    my $dir  = dirname($file);
+    my $name = basename($dir);
+
+    next if -f File::Spec->catfile( $dir, "disabled" );
+    require $file;
+    my $class = "Bugzilla::Extension::$name";
+    if ( $class->can("REQUIRED_MODULES") ) {
+        foreach my $required_module ( @{ $class->REQUIRED_MODULES() } ) {
+            $requires{ $required_module->{module} }
+                = $required_module->{version};
+        }
+    }
+
+    if ( $class->can('OPTIONAL_MODULES') ) {
+        my $default_feature = 'extension_' . lc($name) . '_optional';
+        foreach my $mod ( @{ $class->OPTIONAL_MODULES } ) {
+            my @features
+                = $mod->{feature} ? @{ $mod->{feature} } : ($default_feature);
+            foreach my $feature (@features) {
+                $optional_features{$feature}{prereqs}{runtime}{requires}
+                    { $mod->{module} } = $mod->{version} // 0;
+            }
+        }
+    }
+}
+
+WriteMakefile(
+    NAME             => 'Bugzilla',
+    AUTHOR           => q{Bugzilla Developers <developers@bugzilla.org>},
+    VERSION          => BUGZILLA_VERSION,
+    ABSTRACT         => 'Bugzilla Bug Tracking System',
+    LICENSE          => 'Mozilla_2_0',
+    MIN_PERL_VERSION => '5.14.0',
+    CONFIGURE_REQUIRES => { 'ExtUtils::MakeMaker' => $build_requires{'ExtUtils::MakeMaker'} },
+    PREREQ_PM          => { %requires },
+    BUILD_REQUIRES     => { %build_requires },
+    TEST_REQUIRES      => { %test_requires },
+    META_MERGE => {
+        "meta-spec" => {
+            url     => "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+            version => "2"
+        },
+        dynamic_config => 1,
+        prereqs        => {
+            build   => { requires => { %build_requires } },
+            runtime => { requires => { %requires }, recommends => { %all_features, %recommends } },
+            test    => { requires => { %test_requires } },
+        },
+        optional_features => \%optional_features,
+    },
+);
+
+sub MY::postamble {
+    return <<MAKE;
+GEN_CPANFILE_ARGS = -A -U mod_perl -U oracle
+cpanfile: MYMETA.json
+\t\$(PERLRUN) gen-cpanfile.pl \$(GEN_CPANFILE_ARGS)
+
+checksetup_lib: Makefile.PL
+\tcpanm -L .checksetup_lib --notest \\
+            CPAN::Meta JSON::PP CPAN::Meta::Requirements \\
+            Module::Metadata\@$all_features{'Module::Metadata'}
+\t-rm -fr .checksetup_lib/man
+\t-rm -fr .checksetup_lib/lib/perl5/*/.meta
+\t-rm -fr .checksetup_lib/lib/perl5/Test
+\t-rm -fr .checksetup_lib/lib/perl5/ok.pm
+\t-find .checksetup_lib '(' -name '*.pod' -or -name .packlist ')' -print0 | xargs -0 rm -f
+
+META.json: Makefile.PL
+\tmake distmeta 2>&1 /dev/null; mv */META.json .
+
+META.yml: Makefile.PL
+\tmake distmeta 2>&1 /dev/null; mv */META.yml .
+MAKE
+}
diff --git a/README b/README
deleted file mode 100644
index 041aebc13d..0000000000
--- a/README
+++ /dev/null
@@ -1,92 +0,0 @@
-What is Bugzilla?
-=================
-Bugzilla is a free bug-tracking system that is developed by an active
-community of volunteers in the Mozilla community. You can install and
-use it without having to pay any license fee.
-
-Minimum requirements
-====================
-It can be installed on Windows, Mac OS X, Linux and other Unix flavors.
-Bugzilla is written in Perl, meaning that Perl must be installed on your system.
-You will also need a web server as well as a DB server (see below).
-
-Installation & Upgrading
-========================
-The documentation to install, upgrade, configure and use Bugzilla can be found
-in different formats:
-* docs/en/html/Bugzilla-Guide.html (HTML version)
-* docs/en/txt/Bugzilla-Guide.txt (text version)
-* docs/en/pdf/Bugzilla-Guide.pdf (PDF version)
-
-If the documentation is missing, you can get it online by visiting
-http://www.bugzilla.org/docs/ from where you can select the documentation
-corresponding to the Bugzilla version you are installing.
-
-Bugzilla Quick Start Guide
-==========================
-(or, how to get Bugzilla up and running in 10 steps)
-Christian Reis <kiko@async.com.br>
-
-This express installation guide is for "normal" Bugzilla installations,
-which means a Linux or Unix system on which Apache, Perl, MySQL or PostgreSQL
-and a Sendmail compatible MTA are available. For other configurations, please
-see the "Installing Bugzilla" section of the Bugzilla Guide in the docs/ directory.
-
-1. Decide from which URL and directory under your webserver root you
-   will be serving the Bugzilla webpages.
-
-2. Unpack the distribution into the chosen directory (there is no copying or
-   installation involved).
-
-3. Run ./checksetup.pl, look for unsolved requirements, and install them.
-   You can run checksetup as many times as necessary to check if
-   everything required has been installed.
-
-   These will usually include assorted Perl modules, MySQL or PostgreSQL,
-   and a MTA.
-
-   After a successful dependency check, checksetup should complain that
-   localconfig needs to be edited.
-
-4. Edit the localconfig file, in particular the $webservergroup and
-   $db_* variables. In particular, $db_name and $db_user will define
-   your database setup in step 5.
-
-5. Create a user permission for the name supplied as $db_user with
-   read/write access to the database whose name is given by $db_name.
-
-   If you are not familiar with MySQL permissions, it's a good idea to
-   use the mysql_setpermission script that is installed with the MySQL
-   distribution, and be sure to read Bugzilla Security - MySQL section
-   in the Bugzilla Guide or PostgreSQL documentation.
-
-6. Run checksetup.pl once more; if all goes well, it should set up the
-   Bugzilla database for you. If not, return to step 5.
-
-   checksetup.pl should ask you, this time, for the administrator's
-   email address and password. These will be used for the initial
-   Bugzilla administrator account.
-
-7. Configure Apache (or install and configure, if you don't have it up
-   yet) to point to the Bugzilla directory. You can choose between
-   mod_cgi and mod_perl. The Bugzilla documentation has detailed information
-   for both modes.
-
-8. Visit the URL you chose for Bugzilla. Your browser should display the
-   default Bugzilla home page. You should then log in as the
-   administrator by following the "Log in" link and supplying the
-   account information you provided in step 6.
-
-9. Visit the "Parameters" page, as suggested by the page displayed to you.
-   Set up the relevant parameters for your local setup.
-
-10. That's it. If anything unexpected comes up:
-
-    - read the error message carefully,
-    - backtrack through the steps above,
-    - check the official installation guide.
-
-Support and installation questions should be directed to the
-support-bugzilla@lists.mozilla.org mailing list.
-
-Further support information is at http://www.bugzilla.org/support/
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000000..53fc3b3ae8
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,105 @@
+============================================
+Bugzilla: A Free and Open-Source Bug Tracker
+============================================
+
+Bugzilla is free and open source web-based bug-tracking software that is
+developed by an active group of volunteers in the Mozilla community, and
+used by thousands of projects and companies around the world.
+
+----
+|homepage| |documentation| |irc| |docker_pulls| |license|
+----
+
+Usage
+=====
+
+Bugzilla requires Perl 5.14 (or newer) and tools to compile and install perl
+modules, including make(1) and a C compiler.
+
+For Developers
+--------------
+
+Debian/Ubuntu users: you probably need to run the following:
+
+.. code-block:: bash
+
+    sudo apt-get install git perl cpanminus build-essential libexpat-dev libssl-dev
+
+CentOS / Fedora users:
+
+.. code-block:: bash
+
+     sudo yum group install -y "Development tools"
+     sudo yum install -y perl-App-cpanminus
+
+After that, you should run the following command from a git clone of this repository:
+
+.. code-block:: bash
+
+    perl checksetup.pl --cpanm
+
+At this point ``localconfig`` can be edited to specify database connection parameters. If SQLite is acceptable,
+no edits are required.
+
+The checksetup.pl script should be run again to set up the database schema.
+
+.. code-block:: bash
+
+    perl checksetup.pl
+
+It will ask for some details, such as login name and password.
+
+Finally, a webserver can be started by the following:
+
+.. code-block:: bash
+
+    perl app.psgi
+
+Navigate to http://localhost:5000/ and login with the username and password provided earlier to checksetup.
+Remember to set the urlbase on http://localhost:5000/editparams.cgi. "http://localhost:5000" will probably suffice.
+
+For Operations
+--------------
+
+For a production setup, see the `installation guide <http://bugzilla.readthedocs.io/en/latest/installing/index.html>`__
+
+Links and Other Resources
+=========================
+
+-  Join irc.mozilla.org #bugzilla (or use the `Bugzilla IRC Gateway <http://landfill.bugzilla.org/irc/>`__)
+-  Ask questions on the `Support <https://www.mozilla.org/en-US/about/forums/#support-bugzilla>`__
+   mailing list
+- `Report Bugs <https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla>`__
+   (Please do not file test bugs in this installation of Bugzilla.)
+-  Contributing a patch? Join us from 11:00 to 12:00 US/Eastern every Thursday in Bugzilla IRC Channel for `Contributor Office Hours <http://goo.gl/2Wz8x6>`__.
+-  If you haven't already, subscribe to the `Development <https://www.mozilla.org/en-US/about/forums/#dev-apps-bugzilla>`__
+   mailing list.
+
+License
+-------
+
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+This Source Code Form is "Incompatible With Secondary Licenses", as
+defined by the Mozilla Public License, v. 2.0.
+
+However, this is all only relevant to you if you want to modify the code and
+redistribute it. As with all open source software, there are no restrictions
+on running it, or on modifying it for your own purposes.
+
+.. |homepage| image:: https://img.shields.io/badge/home-bugzilla.org-blue.svg
+   :target: http://bugzilla.org
+.. |docker_pulls| image:: https://img.shields.io/docker/pulls/dklawren/docker-bugzilla.svg
+   :target: https://hub.docker.com/r/dklawren/docker-bugzilla/
+   :alt: docker pulls
+.. |documentation| image:: https://readthedocs.org/projects/bugzilla/badge/?version=latest
+   :target: http://bugzilla.readthedocs.io/en/latest/
+   :alt: Documentation
+.. |irc| image:: https://img.shields.io/badge/chat-%23bugzilla-blue.svg
+   :target: http://landfill.bugzilla.org/irc/
+   :alt: Chat with us on IRC
+.. |license| image:: https://img.shields.io/github/license/bugzilla/bugzilla.svg?maxAge=2592000
+   :target: #license
+   :alt: License
diff --git a/admin.cgi b/admin.cgi
index 1dc9b2c1bd..de1f30529a 100755
--- a/admin.cgi
+++ b/admin.cgi
@@ -6,24 +6,25 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $user = Bugzilla->login(LOGIN_REQUIRED);
+my $user     = Bugzilla->login(LOGIN_REQUIRED);
 
 print $cgi->header();
 
 $user->can_administer
-  || ThrowUserError('auth_failure', {action => 'access', object => 'administrative_pages'});
+  || ThrowUserError('auth_failure',
+  {action => 'access', object => 'administrative_pages'});
 
 $template->process('admin/admin.html.tmpl')
   || ThrowTemplateError($template->error());
diff --git a/app.psgi b/app.psgi
new file mode 100644
index 0000000000..50e341f6ba
--- /dev/null
+++ b/app.psgi
@@ -0,0 +1,116 @@
+#!/usr/bin/perl
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use File::Basename;
+use File::Spec;
+
+BEGIN {
+    require lib;
+    my $dir = File::Spec->rel2abs( dirname(__FILE__) );
+    lib->import(
+        $dir,
+        File::Spec->catdir( $dir, "lib" ),
+        File::Spec->catdir( $dir, qw(local lib perl5) )
+    );
+
+    # disable "use lib" from now on
+    no warnings qw(redefine);
+    *lib::import = sub { };
+}
+
+use Bugzilla::Constants ();
+
+use Plack;
+use Plack::Builder;
+use Plack::App::URLMap;
+use Plack::App::WrapCGI;
+use Plack::Response;
+
+use constant STATIC => qw(
+    data/assets
+    data/webdot
+    docs
+    extensions/[^/]+/web
+    graphs
+    images
+    js
+    skins
+);
+
+$ENV{BZ_PLACK} = 'Plack/' . Plack->VERSION;
+
+my $app = builder {
+    my $static_paths
+        = join( '|', sort { length $b <=> length $a || $a cmp $b } STATIC );
+    enable 'Static',
+        path => qr{^/($static_paths)/},
+        root => Bugzilla::Constants::bz_locations->{cgi_path};
+
+    my $shutdown_app
+        = Plack::App::WrapCGI->new( script => 'shutdown.cgi' )->to_app;
+    my @scripts = glob('*.cgi');
+
+    my %cgi_app;
+    foreach my $script (@scripts) {
+        my $base_name = basename($script);
+
+        next if $base_name eq 'shutdown.cgi';
+        my $app
+            = eval { Plack::App::WrapCGI->new( script => $script )->to_app };
+
+        # Some CGI scripts won't compile if not all optional Perl modules are
+        # installed. That's expected.
+        unless ($app) {
+            warn "Cannot compile $script: $@\nSkipping!\n";
+            next;
+        }
+
+        my $wrapper = sub {
+            my $ret = Bugzilla::init_page();
+            my $res
+                = ( $ret eq '-1' && $script ne 'editparams.cgi' )
+                ? $shutdown_app->(@_)
+                : $app->(@_);
+            Bugzilla::_cleanup();
+            return $res;
+        };
+        $cgi_app{$base_name} = $wrapper;
+    }
+
+    foreach my $cgi_name ( keys %cgi_app ) {
+        mount "/$cgi_name" => $cgi_app{$cgi_name};
+    }
+
+    # so mount / => $app will make *all* files redirect to the index.
+    # instead we use an inline middleware to rewrite / to /index.cgi
+    enable sub {
+        my $app = shift;
+        return sub {
+            my $env = shift;
+            $env->{PATH_INFO} = '/index.cgi' if $env->{PATH_INFO} eq '/';
+            return $app->($env);
+        };
+    };
+
+    mount "/rest" => $cgi_app{"rest.cgi"};
+
+};
+
+unless (caller) {
+    require Plack::Runner;
+    my $runner = Plack::Runner->new;
+    $runner->parse_options(@ARGV);
+    $runner->run($app);
+    exit 0;
+}
+
+return $app;
diff --git a/attachment.cgi b/attachment.cgi
index 5db8f5909c..cf5c6a6432 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -6,18 +6,18 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::BugMail;
 use Bugzilla::Constants;
 use Bugzilla::Error;
-use Bugzilla::Flag; 
-use Bugzilla::FlagType; 
+use Bugzilla::Flag;
+use Bugzilla::FlagType;
 use Bugzilla::User;
 use Bugzilla::Util;
 use Bugzilla::Bug;
@@ -25,15 +25,18 @@ use Bugzilla::Attachment;
 use Bugzilla::Attachment::PatchReader;
 use Bugzilla::Token;
 
-use Encode qw(encode find_encoding);
+use Encode qw(find_encoding);
+use URI::Escape qw(uri_escape_utf8);
+use Cwd qw(realpath);
 
 # For most scripts we don't make $cgi and $template global variables. But
 # when preparing Bugzilla for mod_perl, this script used these
 # variables in so many subroutines that it was easier to just
 # make them globals.
-local our $cgi = Bugzilla->cgi;
-local our $template = Bugzilla->template;
-local our $vars = {};
+local our $cgi                              = Bugzilla->cgi;
+local our $template                         = Bugzilla->template;
+local our $vars                             = {};
+local $Bugzilla::CGI::ALLOW_UNSAFE_RESPONSE = 1;
 
 # All calls to this script should contain an "action" variable whose
 # value determines what the user wants to do.  The code below checks
@@ -47,57 +50,48 @@ my $format = $cgi->param('format') || '';
 # You must use the appropriate urlbase/sslbase param when doing anything
 # but viewing an attachment, or a raw diff.
 if ($action ne 'view'
-    && (($action !~ /^(?:interdiff|diff)$/) || $format ne 'raw'))
+  && (($action !~ /^(?:interdiff|diff)$/) || $format ne 'raw'))
 {
-    do_ssl_redirect_if_required();
-    if ($cgi->url_is_attachment_base) {
-        $cgi->redirect_to_urlbase;
-    }
-    Bugzilla->login();
+  do_ssl_redirect_if_required();
+  if ($cgi->url_is_attachment_base) {
+    $cgi->redirect_to_urlbase;
+  }
+  Bugzilla->login();
 }
 
 # When viewing an attachment, do not request credentials if we are on
 # the alternate host. Let view() decide when to call Bugzilla->login.
-if ($action eq "view")
-{
-    view();
+if ($action eq "view") {
+  view();
 }
-elsif ($action eq "interdiff")
-{
-    interdiff();
+elsif ($action eq "interdiff") {
+  interdiff();
 }
-elsif ($action eq "diff")
-{
-    diff();
+elsif ($action eq "diff") {
+  diff();
 }
-elsif ($action eq "viewall") 
-{ 
-    viewall(); 
+elsif ($action eq "viewall") {
+  viewall();
 }
-elsif ($action eq "enter") 
-{ 
-    Bugzilla->login(LOGIN_REQUIRED);
-    enter(); 
+elsif ($action eq "enter") {
+  Bugzilla->login(LOGIN_REQUIRED);
+  enter();
 }
-elsif ($action eq "insert")
-{
-    Bugzilla->login(LOGIN_REQUIRED);
-    insert();
+elsif ($action eq "insert") {
+  Bugzilla->login(LOGIN_REQUIRED);
+  insert();
 }
-elsif ($action eq "edit") 
-{ 
-    edit(); 
+elsif ($action eq "edit") {
+  edit();
 }
-elsif ($action eq "update") 
-{ 
-    Bugzilla->login(LOGIN_REQUIRED);
-    update();
+elsif ($action eq "update") {
+  Bugzilla->login(LOGIN_REQUIRED);
+  update();
 }
 elsif ($action eq "delete") {
-    delete_attachment();
+  delete_attachment();
 }
-else 
-{ 
+else {
   ThrowUserError('unknown_action', {action => $action});
 }
 
@@ -119,72 +113,73 @@ exit;
 # Returns an attachment object.
 
 sub validateID {
-    my($param, $dont_validate_access) = @_;
-    $param ||= 'id';
+  my ($param, $dont_validate_access) = @_;
+  $param ||= 'id';
 
-    # If we're not doing interdiffs, check if id wasn't specified and
-    # prompt them with a page that allows them to choose an attachment.
-    # Happens when calling plain attachment.cgi from the urlbar directly
-    if ($param eq 'id' && !$cgi->param('id')) {
-        print $cgi->header();
-        $template->process("attachment/choose.html.tmpl", $vars) ||
-            ThrowTemplateError($template->error());
-        exit;
-    }
-    
-    my $attach_id = $cgi->param($param);
-
-    # Validate the specified attachment id. detaint kills $attach_id if
-    # non-natural, so use the original value from $cgi in our exception
-    # message here.
-    detaint_natural($attach_id)
-        || ThrowUserError("invalid_attach_id",
-                          { attach_id => scalar $cgi->param($param) });
-  
-    # Make sure the attachment exists in the database.
-    my $attachment = new Bugzilla::Attachment({ id => $attach_id, cache => 1 })
-        || ThrowUserError("invalid_attach_id", { attach_id => $attach_id });
-
-    return $attachment if ($dont_validate_access || check_can_access($attachment));
+  # If we're not doing interdiffs, check if id wasn't specified and
+  # prompt them with a page that allows them to choose an attachment.
+  # Happens when calling plain attachment.cgi from the urlbar directly
+  if ($param eq 'id' && !$cgi->param('id')) {
+    print $cgi->header();
+    $template->process("attachment/choose.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+
+  my $attach_id = $cgi->param($param);
+
+  # Validate the specified attachment id. detaint kills $attach_id if
+  # non-natural, so use the original value from $cgi in our exception
+  # message here.
+  detaint_natural($attach_id)
+    || ThrowUserError("invalid_attach_id",
+    {attach_id => scalar $cgi->param($param)});
+
+  # Make sure the attachment exists in the database.
+  my $attachment = new Bugzilla::Attachment({id => $attach_id, cache => 1})
+    || ThrowUserError("invalid_attach_id", {attach_id => $attach_id});
+
+  return $attachment if ($dont_validate_access || check_can_access($attachment));
 }
 
 # Make sure the current user has access to the specified attachment.
 sub check_can_access {
-    my $attachment = shift;
-    my $user = Bugzilla->user;
-
-    # Make sure the user is authorized to access this attachment's bug.
-    Bugzilla::Bug->check({ id => $attachment->bug_id, cache => 1 });
-    if ($attachment->isprivate && $user->id != $attachment->attacher->id 
-        && !$user->is_insider) 
-    {
-        ThrowUserError('auth_failure', {action => 'access',
-                                        object => 'attachment',
-                                        attach_id => $attachment->id});
-    }
-    return 1;
+  my $attachment = shift;
+  my $user       = Bugzilla->user;
+
+  # Make sure the user is authorized to access this attachment's bug.
+  Bugzilla::Bug->check({id => $attachment->bug_id, cache => 1});
+  if ( $attachment->isprivate
+    && $user->id != $attachment->attacher->id
+    && !$user->is_insider)
+  {
+    ThrowUserError('auth_failure',
+      {action => 'access', object => 'attachment', attach_id => $attachment->id});
+  }
+  return 1;
 }
 
 # Determines if the attachment is public -- that is, if users who are
 # not logged in have access to the attachment
 sub attachmentIsPublic {
-    my $attachment = shift;
+  my $attachment = shift;
 
-    return 0 if Bugzilla->params->{'requirelogin'};
-    return 0 if $attachment->isprivate;
+  return 0 if Bugzilla->params->{'requirelogin'};
+  return 0 if $attachment->isprivate;
 
-    my $anon_user = new Bugzilla::User;
-    return $anon_user->can_see_bug($attachment->bug_id);
+  my $anon_user = new Bugzilla::User;
+  return $anon_user->can_see_bug($attachment->bug_id);
 }
 
 # Validates format of a diff/interdiff. Takes a list as an parameter, which
 # defines the valid format values. Will throw an error if the format is not
 # in the list. Returns either the user selected or default format.
 sub validateFormat {
+
   # receives a list of legal formats; first item is a default
   my $format = $cgi->param('format') || $_[0];
   if (not grep($_ eq $format, @_)) {
-     ThrowUserError("invalid_format", { format  => $format, formats => \@_ });
+    ThrowUserError("invalid_format", {format => $format, formats => \@_});
   }
 
   return $format;
@@ -193,125 +188,139 @@ sub validateFormat {
 # Gets the attachment object(s) generated by validateID, while ensuring
 # attachbase and token authentication is used when required.
 sub get_attachment {
-    my @field_names = @_ ? @_ : qw(id);
-
-    my %attachments;
-
-    if (use_attachbase()) {
-        # Load each attachment, and ensure they are all from the same bug
-        my $bug_id = 0;
+  my @field_names = @_ ? @_ : qw(id);
+
+  my %attachments;
+
+  if (use_attachbase()) {
+
+    # Load each attachment, and ensure they are all from the same bug
+    my $bug_id = 0;
+    foreach my $field_name (@field_names) {
+      my $attachment = validateID($field_name, 1);
+      if (!$bug_id) {
+        $bug_id = $attachment->bug_id;
+      }
+      elsif ($attachment->bug_id != $bug_id) {
+        ThrowUserError('attachment_bug_id_mismatch');
+      }
+      $attachments{$field_name} = $attachment;
+    }
+    my @args = map { $_ . '=' . $attachments{$_}->id } @field_names;
+    my $cgi_params = $cgi->canonicalise_query(@field_names, 't', 'Bugzilla_login',
+      'Bugzilla_password');
+    push(@args, $cgi_params) if $cgi_params;
+    my $path = 'attachment.cgi?' . join('&', @args);
+
+    # Make sure the attachment is served from the correct server.
+    if ($cgi->url_is_attachment_base($bug_id)) {
+
+      # No need to validate the token for public attachments. We cannot request
+      # credentials as we are on the alternate host.
+      if (!all_attachments_are_public(\%attachments)) {
+        my $token = $cgi->param('t');
+        my ($userid, undef, $token_data) = Bugzilla::Token::GetTokenData($token);
+        my %token_data  = unpack_token_data($token_data);
+        my $valid_token = 1;
         foreach my $field_name (@field_names) {
-            my $attachment = validateID($field_name, 1);
-            if (!$bug_id) {
-                $bug_id = $attachment->bug_id;
-            } elsif ($attachment->bug_id != $bug_id) {
-                ThrowUserError('attachment_bug_id_mismatch');
-            }
-            $attachments{$field_name} = $attachment;
-        }
-        my @args = map { $_ . '=' . $attachments{$_}->id } @field_names;
-        my $cgi_params = $cgi->canonicalise_query(@field_names, 't',
-            'Bugzilla_login', 'Bugzilla_password');
-        push(@args, $cgi_params) if $cgi_params;
-        my $path = 'attachment.cgi?' . join('&', @args);
-
-        # Make sure the attachment is served from the correct server.
-        if ($cgi->url_is_attachment_base($bug_id)) {
-            # No need to validate the token for public attachments. We cannot request
-            # credentials as we are on the alternate host.
-            if (!all_attachments_are_public(\%attachments)) {
-                my $token = $cgi->param('t');
-                my ($userid, undef, $token_data) = Bugzilla::Token::GetTokenData($token);
-                my %token_data = unpack_token_data($token_data);
-                my $valid_token = 1;
-                foreach my $field_name (@field_names) {
-                    my $token_id = $token_data{$field_name};
-                    if (!$token_id
-                        || !detaint_natural($token_id)
-                        || $attachments{$field_name}->id != $token_id)
-                    {
-                        $valid_token = 0;
-                        last;
-                    }
-                }
-                unless ($userid && $valid_token) {
-                    # Not a valid token.
-                    print $cgi->redirect('-location' => correct_urlbase() . $path);
-                    exit;
-                }
-                # Change current user without creating cookies.
-                Bugzilla->set_user(new Bugzilla::User($userid));
-                # Tokens are single use only, delete it.
-                delete_token($token);
-            }
+          my $token_id = $token_data{$field_name};
+          if ( !$token_id
+            || !detaint_natural($token_id)
+            || $attachments{$field_name}->id != $token_id)
+          {
+            $valid_token = 0;
+            last;
+          }
         }
-        elsif ($cgi->url_is_attachment_base) {
-            # If we come here, this means that each bug has its own host
-            # for attachments, and that we are trying to view one attachment
-            # using another bug's host. That's not desired.
-            $cgi->redirect_to_urlbase;
-        }
-        else {
-            # We couldn't call Bugzilla->login earlier as we first had to
-            # make sure we were not going to request credentials on the
-            # alternate host.
-            Bugzilla->login();
-            my $attachbase = Bugzilla->params->{'attachment_base'};
-            # Replace %bugid% by the ID of the bug the attachment 
-            # belongs to, if present.
-            $attachbase =~ s/\%bugid\%/$bug_id/;
-            if (all_attachments_are_public(\%attachments)) {
-                # No need for a token; redirect to attachment base.
-                print $cgi->redirect(-location => $attachbase . $path);
-                exit;
-            } else {
-                # Make sure the user can view the attachment.
-                foreach my $field_name (@field_names) {
-                    check_can_access($attachments{$field_name});
-                }
-                # Create a token and redirect.
-                my $token = url_quote(issue_session_token(pack_token_data(\%attachments)));
-                print $cgi->redirect(-location => $attachbase . "$path&t=$token");
-                exit;
-            }
+        unless ($userid && $valid_token) {
+
+          # Not a valid token.
+          print $cgi->redirect('-location' => correct_urlbase() . $path);
+          exit;
         }
-    } else {
-        do_ssl_redirect_if_required();
-        # No alternate host is used. Request credentials if required.
-        Bugzilla->login();
+
+        # Change current user without creating cookies.
+        Bugzilla->set_user(new Bugzilla::User($userid));
+
+        # Tokens are single use only, delete it.
+        delete_token($token);
+      }
+    }
+    elsif ($cgi->url_is_attachment_base) {
+
+      # If we come here, this means that each bug has its own host
+      # for attachments, and that we are trying to view one attachment
+      # using another bug's host. That's not desired.
+      $cgi->redirect_to_urlbase;
+    }
+    else {
+      # We couldn't call Bugzilla->login earlier as we first had to
+      # make sure we were not going to request credentials on the
+      # alternate host.
+      Bugzilla->login();
+      my $attachbase = Bugzilla->params->{'attachment_base'};
+
+      # Replace %bugid% by the ID of the bug the attachment
+      # belongs to, if present.
+      $attachbase =~ s/\%bugid\%/$bug_id/;
+      if (all_attachments_are_public(\%attachments)) {
+
+        # No need for a token; redirect to attachment base.
+        print $cgi->redirect(-location => $attachbase . $path);
+        exit;
+      }
+      else {
+        # Make sure the user can view the attachment.
         foreach my $field_name (@field_names) {
-            $attachments{$field_name} = validateID($field_name);
+          check_can_access($attachments{$field_name});
         }
+
+        # Create a token and redirect.
+        my $token = url_quote(issue_session_token(pack_token_data(\%attachments)));
+        print $cgi->redirect(-location => $attachbase . "$path&t=$token");
+        exit;
+      }
+    }
+  }
+  else {
+    do_ssl_redirect_if_required();
+
+    # No alternate host is used. Request credentials if required.
+    Bugzilla->login();
+    foreach my $field_name (@field_names) {
+      $attachments{$field_name} = validateID($field_name);
     }
+  }
 
-    return wantarray
-        ? map { $attachments{$_} } @field_names
-        : $attachments{$field_names[0]};
+  return
+    wantarray
+    ? map { $attachments{$_} } @field_names
+    : $attachments{$field_names[0]};
 }
 
 sub all_attachments_are_public {
-    my $attachments = shift;
-    foreach my $field_name (keys %$attachments) {
-        if (!attachmentIsPublic($attachments->{$field_name})) {
-            return 0;
-        }
+  my $attachments = shift;
+  foreach my $field_name (keys %$attachments) {
+    if (!attachmentIsPublic($attachments->{$field_name})) {
+      return 0;
     }
-    return 1;
+  }
+  return 1;
 }
 
 sub pack_token_data {
-    my $attachments = shift;
-    return join(' ', map { $_ . '=' . $attachments->{$_}->id } keys %$attachments);
+  my $attachments = shift;
+  return join(' ', map { $_ . '=' . $attachments->{$_}->id } keys %$attachments);
 }
 
 sub unpack_token_data {
-    my @token_data = split(/ /, shift || '');
-    my %data;
-    foreach my $token (@token_data) {
-        my ($field_name, $attach_id) = split('=', $token);
-        $data{$field_name} = $attach_id;
-    }
-    return %data;
+  my @token_data = split(/ /, shift || '');
+  my %data;
+  foreach my $token (@token_data) {
+    my ($field_name, $attach_id) = split('=', $token);
+    $data{$field_name} = $attach_id;
+  }
+  return %data;
 }
 
 ################################################################################
@@ -320,262 +329,311 @@ sub unpack_token_data {
 
 # Display an attachment.
 sub view {
-    my $attachment = get_attachment();
+  my $attachment = get_attachment();
 
-    # At this point, Bugzilla->login has been called if it had to.
-    my $contenttype = $attachment->contenttype;
-    my $filename = $attachment->filename;
+  # At this point, Bugzilla->login has been called if it had to.
+  my $contenttype = $attachment->contenttype;
+  my $filename    = $attachment->filename;
 
-    # Bug 111522: allow overriding content-type manually in the posted form
-    # params.
-    if (defined $cgi->param('content_type')) {
-        $contenttype = $attachment->_check_content_type($cgi->param('content_type'));
-    }
+  # Bug 111522: allow overriding content-type manually in the posted form
+  # params.
+  if (my $content_type = $cgi->param('content_type')) {
+    $contenttype = $attachment->_check_content_type($content_type);
+  }
 
-    # Return the appropriate HTTP response headers.
-    $attachment->datasize || ThrowUserError("attachment_removed");
-
-    $filename =~ s/^.*[\/\\]//;
-    # escape quotes and backslashes in the filename, per RFCs 2045/822
-    $filename =~ s/\\/\\\\/g; # escape backslashes
-    $filename =~ s/"/\\"/g; # escape quotes
-
-    # Avoid line wrapping done by Encode, which we don't need for HTTP
-    # headers. See discussion in bug 328628 for details.
-    local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 10000;
-    $filename = encode('MIME-Q', $filename);
-
-    my $disposition = Bugzilla->params->{'allow_attachment_display'} ? 'inline' : 'attachment';
-
-    # Don't send a charset header with attachments--they might not be UTF-8.
-    # However, we do allow people to explicitly specify a charset if they
-    # want.
-    if ($contenttype !~ /\bcharset=/i) {
-        # In order to prevent Apache from adding a charset, we have to send a
-        # charset that's a single space.
-        $cgi->charset(' ');
-        if (Bugzilla->feature('detect_charset') && $contenttype =~ /^text\//) {
-            my $encoding = detect_encoding($attachment->data);
-            if ($encoding) {
-                $cgi->charset(find_encoding($encoding)->mime_name);
-            }
-        }
+  # Return the appropriate HTTP response headers.
+  $attachment->datasize || ThrowUserError("attachment_removed");
+
+  $filename =~ s/^.*[\/\\]//;
+
+  # escape quotes and backslashes in the filename, per RFCs 2045/822
+  $filename =~ s/\\/\\\\/g;    # escape backslashes
+  $filename =~ s/"/\\"/g;      # escape quotes
+      # Follow RFC 6266 section 4.1 (which itself points to RFC 5987 section 3.2)
+  $filename = uri_escape_utf8($filename);
+
+  my $disposition
+    = (Bugzilla->params->{'allow_attachment_display'} && $attachment->is_viewable)
+    ? 'inline'
+    : 'attachment';
+
+  # Don't send a charset header with attachments--they might not be UTF-8.
+  # However, we do allow people to explicitly specify a charset if they
+  # want.
+  if ($contenttype !~ /\bcharset=/i) {
+
+    # In order to prevent Apache from adding a charset, we have to send a
+    # charset that's a single space.
+    $cgi->charset(' ');
+    if (Bugzilla->feature('detect_charset') && $contenttype =~ /^text\//) {
+      my $encoding = detect_encoding($attachment->data);
+      if ($encoding) {
+        $cgi->charset(find_encoding($encoding)->mime_name);
+      }
     }
-    print $cgi->header(-type=>"$contenttype; name=\"$filename\"",
-                       -content_disposition=> "$disposition; filename=\"$filename\"",
-                       -content_length => $attachment->datasize);
-    disable_utf8();
-    print $attachment->data;
+  }
+  my $sendfile_header = {};
+  my $sendfile_param  = Bugzilla->params->{'xsendfile_header'};
+  if ($attachment->is_on_filesystem && $sendfile_param ne 'off') {
+
+    # attachment is on filesystem and Admin turned on feature.
+    # This means we can let webserver handle the request and stream the file
+    # for us. This is called the X-Sendfile feature. see bug 1073264.
+    my $attachment_path = realpath($attachment->_get_local_filename());
+    $sendfile_header->{$sendfile_param} = $attachment_path;
+  }
+
+  # IE8 and older do not support RFC 6266. So for these old browsers
+  # we still pass the old 'filename' attribute. Modern browsers will
+  # automatically pick the new 'filename*' attribute.
+  print $cgi->header(
+    -type => $contenttype,
+    -content_disposition =>
+      "$disposition; filename=\"$filename\"; filename*=UTF-8''$filename",
+    -content_length => $attachment->datasize,
+    %$sendfile_header
+  );
+  if ($attachment->is_on_filesystem && $sendfile_param ne 'off') {
+
+    # in case of X-Sendfile, we do not print the data.
+    # that is handled directly by the webserver.
+    return;
+  }
+  disable_utf8();
+  print $attachment->data;
 }
 
 sub interdiff {
-    # Retrieve and validate parameters
-    my $format = validateFormat('html', 'raw');
-    my($old_attachment, $new_attachment);
-    if ($format eq 'raw') {
-        ($old_attachment, $new_attachment) = get_attachment('oldid', 'newid');
-    } else {
-        $old_attachment = validateID('oldid');
-        $new_attachment = validateID('newid');
-    }
 
-    Bugzilla::Attachment::PatchReader::process_interdiff(
-        $old_attachment, $new_attachment, $format);
+  # Retrieve and validate parameters
+  my $format = validateFormat('html', 'raw');
+  my ($old_attachment, $new_attachment);
+  if ($format eq 'raw') {
+    ($old_attachment, $new_attachment) = get_attachment('oldid', 'newid');
+  }
+  else {
+    $old_attachment = validateID('oldid');
+    $new_attachment = validateID('newid');
+  }
+
+  Bugzilla::Attachment::PatchReader::process_interdiff($old_attachment,
+    $new_attachment, $format);
 }
 
 sub diff {
-    # Retrieve and validate parameters
-    my $format = validateFormat('html', 'raw');
-    my $attachment = $format eq 'raw' ? get_attachment() : validateID();
-
-    # If it is not a patch, view normally.
-    if (!$attachment->ispatch) {
-        view();
-        return;
-    }
 
-    Bugzilla::Attachment::PatchReader::process_diff($attachment, $format);
+  # Retrieve and validate parameters
+  my $format = validateFormat('html', 'raw');
+  my $attachment = $format eq 'raw' ? get_attachment() : validateID();
+
+  # If it is not a patch, view normally.
+  if (!$attachment->ispatch) {
+    view();
+    return;
+  }
+
+  Bugzilla::Attachment::PatchReader::process_diff($attachment, $format);
 }
 
 # Display all attachments for a given bug in a series of IFRAMEs within one
 # HTML page.
 sub viewall {
-    # Retrieve and validate parameters
-    my $bug = Bugzilla::Bug->check({ id => scalar $cgi->param('bugid'), cache => 1 });
 
-    my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bug);
-    # Ignore deleted attachments.
-    @$attachments = grep { $_->datasize } @$attachments;
+  # Retrieve and validate parameters
+  my $bug = Bugzilla::Bug->check({id => scalar $cgi->param('bugid'), cache => 1});
 
-    if ($cgi->param('hide_obsolete')) {
-        @$attachments = grep { !$_->isobsolete } @$attachments;
-        $vars->{'hide_obsolete'} = 1;
-    }
+  my $attachments = Bugzilla::Attachment->get_attachments_by_bug($bug);
 
-    # Define the variables and functions that will be passed to the UI template.
-    $vars->{'bug'} = $bug;
-    $vars->{'attachments'} = $attachments;
+  # Ignore deleted attachments.
+  @$attachments = grep { $_->datasize } @$attachments;
 
-    print $cgi->header();
+  if ($cgi->param('hide_obsolete')) {
+    @$attachments = grep { !$_->isobsolete } @$attachments;
+    $vars->{'hide_obsolete'} = 1;
+  }
 
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("attachment/show-multiple.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  # Define the variables and functions that will be passed to the UI template.
+  $vars->{'bug'}         = $bug;
+  $vars->{'attachments'} = $attachments;
+
+  print $cgi->header();
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process("attachment/show-multiple.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 # Display a form for entering a new attachment.
 sub enter {
-    # Retrieve and validate parameters
-    my $bug = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
-    my $bugid = $bug->id;
-    Bugzilla::Attachment->_check_bug($bug);
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    # Retrieve the attachments the user can edit from the database and write
-    # them into an array of hashes where each hash represents one attachment.
-  
-    my ($can_edit, $not_private) = ('', '');
-    if (!$user->in_group('editbugs', $bug->product_id)) {
-        $can_edit = "AND submitter_id = " . $user->id;
-    }
-    if (!$user->is_insider) {
-        $not_private = "AND isprivate = 0";
-    }
-    my $attach_ids = $dbh->selectcol_arrayref(
-        "SELECT attach_id
+
+  # Retrieve and validate parameters
+  my $bug   = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
+  my $bugid = $bug->id;
+  Bugzilla::Attachment->_check_bug($bug);
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  # Retrieve the attachments the user can edit from the database and write
+  # them into an array of hashes where each hash represents one attachment.
+
+  my ($can_edit, $not_private) = ('', '');
+  if (!$user->in_group('editbugs', $bug->product_id)) {
+    $can_edit = "AND submitter_id = " . $user->id;
+  }
+  if (!$user->is_insider) {
+    $not_private = "AND isprivate = 0";
+  }
+  my $attach_ids = $dbh->selectcol_arrayref(
+    "SELECT attach_id
            FROM attachments
           WHERE bug_id = ?
                 AND isobsolete = 0
                 $can_edit $not_private
-       ORDER BY attach_id",
-         undef, $bugid);
-
-    # Define the variables and functions that will be passed to the UI template.
-    $vars->{'bug'} = $bug;
-    $vars->{'attachments'} = Bugzilla::Attachment->new_from_list($attach_ids);
-
-    my $flag_types = Bugzilla::FlagType::match({
-        'target_type'  => 'attachment',
-        'product_id'   => $bug->product_id,
-        'component_id' => $bug->component_id
-    });
-    $vars->{'flag_types'} = $flag_types;
-    $vars->{'any_flags_requesteeble'} =
-        grep { $_->is_requestable && $_->is_requesteeble } @$flag_types;
-    $vars->{'token'} = issue_session_token('create_attachment');
-
-    print $cgi->header();
-
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("attachment/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+       ORDER BY attach_id", undef, $bugid
+  );
+
+  # Define the variables and functions that will be passed to the UI template.
+  $vars->{'bug'}         = $bug;
+  $vars->{'attachments'} = Bugzilla::Attachment->new_from_list($attach_ids);
+
+  my $flag_types = Bugzilla::FlagType::match({
+    'target_type'  => 'attachment',
+    'product_id'   => $bug->product_id,
+    'component_id' => $bug->component_id
+  });
+  $vars->{'flag_types'} = $flag_types;
+  $vars->{'any_flags_requesteeble'}
+    = grep { $_->is_requestable && $_->is_requesteeble } @$flag_types;
+  $vars->{'token'} = issue_session_token('create_attachment');
+
+  print $cgi->header();
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process("attachment/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 # Insert a new attachment into the database.
 sub insert {
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    $dbh->bz_start_transaction;
-
-    # Retrieve and validate parameters
-    my $bug = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
-    my $bugid = $bug->id;
-    my ($timestamp) = $dbh->selectrow_array("SELECT NOW()");
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  $dbh->bz_start_transaction;
+
+  # Retrieve and validate parameters
+  my $bug         = Bugzilla::Bug->check(scalar $cgi->param('bugid'));
+  my $bugid       = $bug->id;
+  my ($timestamp) = $dbh->selectrow_array("SELECT NOW()");
+
+  # Detect if the user already used the same form to submit an attachment
+  my $token = trim(scalar $cgi->param('token'));
+  check_token_data($token, 'create_attachment', 'index.cgi');
+
+  # Check attachments the user tries to mark as obsolete.
+  my @obsolete_attachments;
+  if ($cgi->param('obsolete')) {
+    my @obsolete = $cgi->multi_param('obsolete');
+    @obsolete_attachments
+      = Bugzilla::Attachment->validate_obsolete($bug, \@obsolete);
+  }
 
-    # Detect if the user already used the same form to submit an attachment
-    my $token = trim($cgi->param('token'));
-    check_token_data($token, 'create_attachment', 'index.cgi');
+  my $minor_update = $cgi->param('minor_update') ? 1 : 0;
+  $minor_update = $bug->has_unsent_changes ? 0 : $minor_update;
+
+  # Must be called before create() as it may alter $cgi->param('ispatch').
+  my $content_type = Bugzilla::Attachment::get_content_type();
+
+  # Get the filehandle of the attachment.
+  my $data_fh     = $cgi->upload('data');
+  my $attach_text = $cgi->param('attach_text');
+
+  my $attachment = Bugzilla::Attachment->create({
+    bug         => $bug,
+    creation_ts => $timestamp,
+    data        => $attach_text || $data_fh,
+    description => scalar $cgi->param('description'),
+    filename    => $attach_text ? "file_$bugid.txt" : $data_fh,
+    ispatch     => scalar $cgi->param('ispatch'),
+    isprivate   => scalar $cgi->param('isprivate'),
+    mimetype    => $content_type,
+  });
+
+  # Delete the token used to create this attachment.
+  delete_token($token);
+
+  foreach my $obsolete_attachment (@obsolete_attachments) {
+    $obsolete_attachment->set_is_obsolete(1);
+    $obsolete_attachment->update($timestamp);
+  }
 
-    # Check attachments the user tries to mark as obsolete.
-    my @obsolete_attachments;
-    if ($cgi->param('obsolete')) {
-        my @obsolete = $cgi->param('obsolete');
-        @obsolete_attachments = Bugzilla::Attachment->validate_obsolete($bug, \@obsolete);
+  my ($flags, $new_flags)
+    = Bugzilla::Flag->extract_flags_from_cgi($vars, SKIP_REQUESTEE_ON_ERROR,
+    {bug => $bug, attachment => $attachment});
+  $attachment->set_flags($flags, $new_flags);
+
+  # Insert a comment about the new attachment into the database.
+  my $comment = $cgi->param('comment');
+  $comment = '' unless defined $comment;
+  my $is_markdown = ($user->use_markdown && $cgi->param('use_markdown')) ? 1 : 0;
+  $bug->add_comment(
+    $comment,
+    {
+      isprivate   => $attachment->isprivate,
+      type        => CMT_ATTACHMENT_CREATED,
+      extra_data  => $attachment->id,
+      is_markdown => $is_markdown
     }
+  );
 
-    # Must be called before create() as it may alter $cgi->param('ispatch').
-    my $content_type = Bugzilla::Attachment::get_content_type();
-
-    # Get the filehandle of the attachment.
-    my $data_fh = $cgi->upload('data');
-    my $attach_text = $cgi->param('attach_text');
-
-    my $attachment = Bugzilla::Attachment->create(
-        {bug           => $bug,
-         creation_ts   => $timestamp,
-         data          => $attach_text || $data_fh,
-         description   => scalar $cgi->param('description'),
-         filename      => $attach_text ? "file_$bugid.txt" : $data_fh,
-         ispatch       => scalar $cgi->param('ispatch'),
-         isprivate     => scalar $cgi->param('isprivate'),
-         mimetype      => $content_type,
-         });
-
-    # Delete the token used to create this attachment.
-    delete_token($token);
+  # Assign the bug to the user, if they are allowed to take it
+  my $owner = "";
+  if ($cgi->param('takebug') && $user->in_group('editbugs', $bug->product_id)) {
+
+    # When taking a bug, we have to follow the workflow.
+    my $bug_status = $cgi->param('bug_status') || '';
+    ($bug_status) = grep { $_->name eq $bug_status } @{$bug->status->can_change_to};
 
-    foreach my $obsolete_attachment (@obsolete_attachments) {
-        $obsolete_attachment->set_is_obsolete(1);
-        $obsolete_attachment->update($timestamp);
+    if ( $bug_status
+      && $bug_status->is_open
+      && ($bug_status->name ne 'UNCONFIRMED' || $bug->product_obj->allows_unconfirmed)
+      )
+    {
+      $bug->set_bug_status($bug_status->name);
+      $bug->clear_resolution();
     }
 
-    my ($flags, $new_flags) = Bugzilla::Flag->extract_flags_from_cgi(
-                                  $bug, $attachment, $vars, SKIP_REQUESTEE_ON_ERROR);
-    $attachment->set_flags($flags, $new_flags);
+    # Make sure the person we are taking the bug from gets mail.
+    $owner = $bug->assigned_to->login;
+    $bug->set_assigned_to($user);
+  }
 
-    # Insert a comment about the new attachment into the database.
-    my $comment = $cgi->param('comment');
-    $comment = '' unless defined $comment;
-    $bug->add_comment($comment, { isprivate => $attachment->isprivate,
-                                  type => CMT_ATTACHMENT_CREATED,
-                                  extra_data => $attachment->id });
-
-    # Assign the bug to the user, if they are allowed to take it
-    my $owner = "";
-    if ($cgi->param('takebug') && $user->in_group('editbugs', $bug->product_id)) {
-        # When taking a bug, we have to follow the workflow.
-        my $bug_status = $cgi->param('bug_status') || '';
-        ($bug_status) = grep { $_->name eq $bug_status }
-                        @{ $bug->status->can_change_to };
-
-        if ($bug_status && $bug_status->is_open
-            && ($bug_status->name ne 'UNCONFIRMED'
-                || $bug->product_obj->allows_unconfirmed))
-        {
-            $bug->set_bug_status($bug_status->name);
-            $bug->clear_resolution();
-        }
-        # Make sure the person we are taking the bug from gets mail.
-        $owner = $bug->assigned_to->login;
-        $bug->set_assigned_to($user);
-    }
+  $bug->add_cc($user) if $cgi->param('addselfcc');
+  $bug->update($timestamp);
 
-    $bug->add_cc($user) if $cgi->param('addselfcc');
-    $bug->update($timestamp);
+  # We have to update the attachment after updating the bug, to ensure new
+  # comments are available.
+  $attachment->update($timestamp);
 
-    # We have to update the attachment after updating the bug, to ensure new
-    # comments are available.
-    $attachment->update($timestamp);
+  $dbh->bz_commit_transaction;
 
-    $dbh->bz_commit_transaction;
+  # Define the variables and functions that will be passed to the UI template.
+  $vars->{'attachment'} = $attachment;
 
-    # Define the variables and functions that will be passed to the UI template.
-    $vars->{'attachment'} = $attachment;
-    # We cannot reuse the $bug object as delta_ts has eventually been updated
-    # since the object was created.
-    $vars->{'bugs'} = [new Bugzilla::Bug($bugid)];
-    $vars->{'header_done'} = 1;
-    $vars->{'contenttypemethod'} = $cgi->param('contenttypemethod');
+  # We cannot reuse the $bug object as delta_ts has eventually been updated
+  # since the object was created.
+  $vars->{'bugs'}              = [new Bugzilla::Bug($bugid)];
+  $vars->{'header_done'}       = 1;
+  $vars->{'contenttypemethod'} = $cgi->param('contenttypemethod');
 
-    my $recipients = { 'changer' => $user, 'owner' => $owner };
-    $vars->{'sent_bugmail'} = Bugzilla::BugMail::Send($bugid, $recipients);
+  my $recipients = {'changer' => $user, 'owner' => $owner};
+  my $params = {'minor_update' => $minor_update};
+  $vars->{'sent_bugmail'} = Bugzilla::BugMail::Send($bugid, $recipients, $params);
 
-    print $cgi->header();
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("attachment/created.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
+  print $cgi->header();
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process("attachment/created.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 # Displays a form for editing attachment properties.
@@ -583,227 +641,244 @@ sub insert {
 # is private and the user does not belong to the insider group.
 # Validations are done later when the user submits changes.
 sub edit {
-    my $attachment = validateID();
+  my $attachment = validateID();
 
-    my $bugattachments =
-        Bugzilla::Attachment->get_attachments_by_bug($attachment->bug);
+  my $bugattachments
+    = Bugzilla::Attachment->get_attachments_by_bug($attachment->bug);
 
-    my $any_flags_requesteeble = grep { $_->is_requestable && $_->is_requesteeble }
-                                 @{ $attachment->flag_types };
-    # Useful in case a flagtype is no longer requestable but a requestee
-    # has been set before we turned off that bit.
-    $any_flags_requesteeble ||= grep { $_->requestee_id } @{ $attachment->flags };
-    $vars->{'any_flags_requesteeble'} = $any_flags_requesteeble;
-    $vars->{'attachment'} = $attachment;
-    $vars->{'attachments'} = $bugattachments;
+  my $any_flags_requesteeble = grep { $_->is_requestable && $_->is_requesteeble }
+    @{$attachment->flag_types};
 
-    print $cgi->header();
+  # Useful in case a flagtype is no longer requestable but a requestee
+  # has been set before we turned off that bit.
+  $any_flags_requesteeble ||= grep { $_->requestee_id } @{$attachment->flags};
+  $vars->{'any_flags_requesteeble'} = $any_flags_requesteeble;
+  $vars->{'attachment'}             = $attachment;
+  $vars->{'attachments'}            = $bugattachments;
 
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("attachment/edit.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
+  print $cgi->header();
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process("attachment/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 # Updates an attachment record. Only users with "editbugs" privileges,
 # (or the original attachment's submitter) can edit the attachment.
 # Users cannot edit the content of the attachment itself.
 sub update {
-    my $user = Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
-
-    # Start a transaction in preparation for updating the attachment.
-    $dbh->bz_start_transaction();
-
-    # Retrieve and validate parameters
-    my $attachment = validateID();
-    my $bug = $attachment->bug;
-    $attachment->_check_bug;
-    my $can_edit = $attachment->validate_can_edit;
-
-    if ($can_edit) {
-        $attachment->set_description(scalar $cgi->param('description'));
-        $attachment->set_is_patch(scalar $cgi->param('ispatch'));
-        $attachment->set_content_type(scalar $cgi->param('contenttypeentry'));
-        $attachment->set_is_obsolete(scalar $cgi->param('isobsolete'));
-        $attachment->set_is_private(scalar $cgi->param('isprivate'));
-        $attachment->set_filename(scalar $cgi->param('filename'));
-
-        # Now make sure the attachment has not been edited since we loaded the page.
-        my $delta_ts = $cgi->param('delta_ts');
-        my $modification_time = $attachment->modification_time;
-
-        if ($delta_ts && $delta_ts ne $modification_time) {
-            datetime_from($delta_ts)
-              or ThrowCodeError('invalid_timestamp', { timestamp => $delta_ts });
-            ($vars->{'operations'}) = $bug->get_activity($attachment->id, $delta_ts);
-
-            # If the modification date changed but there is no entry in
-            # the activity table, this means someone commented only.
-            # In this case, there is no reason to midair.
-            if (scalar(@{$vars->{'operations'}})) {
-                $cgi->param('delta_ts', $modification_time);
-                # The token contains the old modification_time. We need a new one.
-                $cgi->param('token', issue_hash_token([$attachment->id, $modification_time]));
-
-                $vars->{'attachment'} = $attachment;
-
-                print $cgi->header();
-                # Warn the user about the mid-air collision and ask them what to do.
-                $template->process("attachment/midair.html.tmpl", $vars)
-                  || ThrowTemplateError($template->error());
-                exit;
-            }
-        }
-    }
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
+
+  # Start a transaction in preparation for updating the attachment.
+  $dbh->bz_start_transaction();
+
+  # Retrieve and validate parameters
+  my $attachment = validateID();
+  my $bug        = $attachment->bug;
+  $attachment->_check_bug;
+  my $can_edit = $attachment->validate_can_edit;
+
+  if ($can_edit) {
+    $attachment->set_description(scalar $cgi->param('description'));
+    $attachment->set_is_patch(scalar $cgi->param('ispatch'));
+    $attachment->set_content_type(scalar $cgi->param('contenttypeentry'));
+    $attachment->set_is_obsolete(scalar $cgi->param('isobsolete'));
+    $attachment->set_is_private(scalar $cgi->param('isprivate'));
+    $attachment->set_filename(scalar $cgi->param('filename'));
+
+    # Now make sure the attachment has not been edited since we loaded the page.
+    my $delta_ts          = $cgi->param('delta_ts');
+    my $modification_time = $attachment->modification_time;
+
+    if ($delta_ts && $delta_ts ne $modification_time) {
+      datetime_from($delta_ts)
+        or ThrowCodeError('invalid_timestamp', {timestamp => $delta_ts});
+      ($vars->{'operations'}) = $bug->get_activity($attachment->id, $delta_ts);
+
+      # If the modification date changed but there is no entry in
+      # the activity table, this means someone commented only.
+      # In this case, there is no reason to midair.
+      if (scalar(@{$vars->{'operations'}})) {
+        $cgi->param('delta_ts', $modification_time);
+
+        # The token contains the old modification_time. We need a new one.
+        $cgi->param('token', issue_hash_token([$attachment->id, $modification_time]));
+
+        $vars->{'attachment'} = $attachment;
 
-    # We couldn't do this check earlier as we first had to validate attachment ID
-    # and display the mid-air collision page if modification_time changed.
-    my $token = $cgi->param('token');
-    check_hash_token($token, [$attachment->id, $attachment->modification_time]);
-
-    # If the user submitted a comment while editing the attachment,
-    # add the comment to the bug. Do this after having validated isprivate!
-    my $comment = $cgi->param('comment');
-    if (defined $comment && trim($comment) ne '') {
-        $bug->add_comment($comment, { isprivate => $attachment->isprivate,
-                                      type => CMT_ATTACHMENT_UPDATED,
-                                      extra_data => $attachment->id });
+        print $cgi->header();
+
+        # Warn the user about the mid-air collision and ask them what to do.
+        $template->process("attachment/midair.html.tmpl", $vars)
+          || ThrowTemplateError($template->error());
+        exit;
+      }
     }
+  }
 
-    $bug->add_cc($user) if $cgi->param('addselfcc');
+  # We couldn't do this check earlier as we first had to validate attachment ID
+  # and display the mid-air collision page if modification_time changed.
+  my $token = $cgi->param('token');
+  check_hash_token($token, [$attachment->id, $attachment->modification_time]);
+
+  my $minor_update = $cgi->param('minor_update') ? 1 : 0;
+  $minor_update = $bug->has_unsent_changes ? 0 : $minor_update;
+
+  # If the user submitted a comment while editing the attachment,
+  # add the comment to the bug. Do this after having validated isprivate!
+  my $comment = $cgi->param('comment');
+  if (defined $comment && trim($comment) ne '') {
+    $bug->add_comment(
+      $comment,
+      {
+        isprivate  => $attachment->isprivate,
+        type       => CMT_ATTACHMENT_UPDATED,
+        extra_data => $attachment->id
+      }
+    );
+  }
+
+  $bug->add_cc($user) if $cgi->param('addselfcc');
 
-    my ($flags, $new_flags) =
-      Bugzilla::Flag->extract_flags_from_cgi($bug, $attachment, $vars);
+  my ($flags, $new_flags)
+    = Bugzilla::Flag->extract_flags_from_cgi($vars, undef,
+    {bug => $bug, attachment => $attachment});
+
+  if ($can_edit) {
+    $attachment->set_flags($flags, $new_flags);
+  }
 
-    if ($can_edit) {
-        $attachment->set_flags($flags, $new_flags);
+  # Requestees can set flags targetted to them, even if they cannot
+  # edit the attachment. Flag setters can edit their own flags too.
+  elsif (scalar @$flags) {
+    my %flag_list = map { $_->{id} => $_ } @$flags;
+    my $flag_objs = Bugzilla::Flag->new_from_list([keys %flag_list]);
+
+    my @editable_flags;
+    foreach my $flag_obj (@$flag_objs) {
+      if ($flag_obj->setter_id == $user->id
+        || ($flag_obj->requestee_id && $flag_obj->requestee_id == $user->id))
+      {
+        push(@editable_flags, $flag_list{$flag_obj->id});
+      }
     }
-    # Requestees can set flags targetted to them, even if they cannot
-    # edit the attachment. Flag setters can edit their own flags too.
-    elsif (scalar @$flags) {
-        my %flag_list = map { $_->{id} => $_ } @$flags;
-        my $flag_objs = Bugzilla::Flag->new_from_list([keys %flag_list]);
-
-        my @editable_flags;
-        foreach my $flag_obj (@$flag_objs) {
-            if ($flag_obj->setter_id == $user->id
-                || ($flag_obj->requestee_id && $flag_obj->requestee_id == $user->id))
-            {
-                push(@editable_flags, $flag_list{$flag_obj->id});
-            }
-        }
 
-        if (scalar @editable_flags) {
-            $attachment->set_flags(\@editable_flags, []);
-            # Flag changes must be committed.
-            $can_edit = 1;
-        }
+    if (scalar @editable_flags) {
+      $attachment->set_flags(\@editable_flags, []);
+
+      # Flag changes must be committed.
+      $can_edit = 1;
     }
+  }
 
-    # Figure out when the changes were made.
-    my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
+  # Figure out when the changes were made.
+  my $timestamp = $dbh->selectrow_array('SELECT LOCALTIMESTAMP(0)');
 
-    # Commit the comment, if any.
-    # This has to happen before updating the attachment, to ensure new comments
-    # are available to $attachment->update.
-    $bug->update($timestamp);
+  # Commit the comment, if any.
+  # This has to happen before updating the attachment, to ensure new comments
+  # are available to $attachment->update.
+  $bug->update($timestamp);
 
-    if ($can_edit) {
-        my $changes = $attachment->update($timestamp);
-        # If there are changes, we updated delta_ts in the DB. We have to
-        # reflect this change in the bug object.
-        $bug->{delta_ts} = $timestamp if scalar(keys %$changes);
-    }
+  if ($can_edit) {
+    my $changes = $attachment->update($timestamp);
 
-    # Commit the transaction now that we are finished updating the database.
-    $dbh->bz_commit_transaction();
+    # If there are changes, we updated delta_ts in the DB. We have to
+    # reflect this change in the bug object.
+    $bug->{delta_ts} = $timestamp if scalar(keys %$changes);
+  }
 
-    # Define the variables and functions that will be passed to the UI template.
-    $vars->{'attachment'} = $attachment;
-    $vars->{'bugs'} = [$bug];
-    $vars->{'header_done'} = 1;
-    $vars->{'sent_bugmail'} = 
-        Bugzilla::BugMail::Send($bug->id, { 'changer' => $user });
+  # Commit the transaction now that we are finished updating the database.
+  $dbh->bz_commit_transaction();
 
-    print $cgi->header();
+  # Define the variables and functions that will be passed to the UI template.
+  $vars->{'attachment'}   = $attachment;
+  $vars->{'bugs'}         = [$bug];
+  $vars->{'header_done'}  = 1;
+  $vars->{'sent_bugmail'} = Bugzilla::BugMail::Send(
+    $bug->id,
+    {'changer'      => $user},
+    {'minor_update' => $minor_update}
+  );
 
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("attachment/updated.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process("attachment/updated.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 # Only administrators can delete attachments.
 sub delete_attachment {
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    my $dbh = Bugzilla->dbh;
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  my $dbh  = Bugzilla->dbh;
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $user->in_group('admin')
-      || ThrowUserError('auth_failure', {group  => 'admin',
-                                         action => 'delete',
-                                         object => 'attachment'});
-
-    Bugzilla->params->{'allow_attachment_deletion'}
-      || ThrowUserError('attachment_deletion_disabled');
-
-    # Make sure the administrator is allowed to edit this attachment.
-    my $attachment = validateID();
-    Bugzilla::Attachment->_check_bug($attachment->bug);
-
-    $attachment->datasize || ThrowUserError('attachment_removed');
-
-    # We don't want to let a malicious URL accidentally delete an attachment.
-    my $token = trim($cgi->param('token'));
-    if ($token) {
-        my ($creator_id, $date, $event) = Bugzilla::Token::GetTokenData($token);
-        unless ($creator_id
-                  && ($creator_id == $user->id)
-                  && ($event eq 'delete_attachment' . $attachment->id))
-        {
-            # The token is invalid.
-            ThrowUserError('token_does_not_exist');
-        }
+  $user->in_group('admin')
+    || ThrowUserError('auth_failure',
+    {group => 'admin', action => 'delete', object => 'attachment'});
 
-        my $bug = new Bugzilla::Bug($attachment->bug_id);
+  Bugzilla->params->{'allow_attachment_deletion'}
+    || ThrowUserError('attachment_deletion_disabled');
 
-        # The token is valid. Delete the content of the attachment.
-        my $msg;
-        $vars->{'attachment'} = $attachment;
-        $vars->{'reason'} = clean_text($cgi->param('reason') || '');
+  # Make sure the administrator is allowed to edit this attachment.
+  my $attachment = validateID();
+  Bugzilla::Attachment->_check_bug($attachment->bug);
 
-        $template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg)
-          || ThrowTemplateError($template->error());
+  $attachment->datasize || ThrowUserError('attachment_removed');
+
+  # We don't want to let a malicious URL accidentally delete an attachment.
+  my $token = trim(scalar $cgi->param('token'));
+  if ($token) {
+    my ($creator_id, $date, $event) = Bugzilla::Token::GetTokenData($token);
+    unless ($creator_id
+      && ($creator_id == $user->id)
+      && ($event eq 'delete_attachment' . $attachment->id))
+    {
+      # The token is invalid.
+      ThrowUserError('token_does_not_exist');
+    }
 
-        # Paste the reason provided by the admin into a comment.
-        $bug->add_comment($msg);
+    my $bug = new Bugzilla::Bug($attachment->bug_id);
 
-        $attachment->remove_from_db();
+    # The token is valid. Delete the content of the attachment.
+    my $msg;
+    $vars->{'attachment'} = $attachment;
+    $vars->{'reason'} = clean_text($cgi->param('reason') || '');
 
-        # Now delete the token.
-        delete_token($token);
+    $template->process("attachment/delete_reason.txt.tmpl", $vars, \$msg)
+      || ThrowTemplateError($template->error());
 
-        # Insert the comment.
-        $bug->update();
+    # Paste the reason provided by the admin into a comment.
+    $bug->add_comment($msg);
 
-        # Required to display the bug the deleted attachment belongs to.
-        $vars->{'bugs'} = [$bug];
-        $vars->{'header_done'} = 1;
+    $attachment->remove_from_db();
 
-        $vars->{'sent_bugmail'} =
-            Bugzilla::BugMail::Send($bug->id, { 'changer' => $user });
+    # Now delete the token.
+    delete_token($token);
 
-        $template->process("attachment/updated.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-    }
-    else {
-        # Create a token.
-        $token = issue_session_token('delete_attachment' . $attachment->id);
+    # Insert the comment.
+    $bug->update();
 
-        $vars->{'a'} = $attachment;
-        $vars->{'token'} = $token;
+    # Required to display the bug the deleted attachment belongs to.
+    $vars->{'bugs'}        = [$bug];
+    $vars->{'header_done'} = 1;
 
-        $template->process("attachment/confirm-delete.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-    }
+    $vars->{'sent_bugmail'}
+      = Bugzilla::BugMail::Send($bug->id, {'changer' => $user});
+
+    $template->process("attachment/updated.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+  }
+  else {
+    # Create a token.
+    $token = issue_session_token('delete_attachment' . $attachment->id);
+
+    $vars->{'a'}     = $attachment;
+    $vars->{'token'} = $token;
+
+    $template->process("attachment/confirm-delete.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+  }
 }
diff --git a/auth.cgi b/auth.cgi
new file mode 100755
index 0000000000..6ef3e2b282
--- /dev/null
+++ b/auth.cgi
@@ -0,0 +1,142 @@
+#!/usr/bin/perl -T
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5);
+
+use Bugzilla;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::Hook;
+use Bugzilla::Util qw(trick_taint);
+use Bugzilla::Token qw(issue_auth_delegation_token check_auth_delegation_token);
+use Bugzilla::Mailer qw(MessageToMTA);
+
+use URI;
+use URI::QueryParam;
+use Digest::SHA qw(sha256_hex);
+use LWP::UserAgent ();
+use JSON qw(decode_json encode_json);
+
+Bugzilla->login(LOGIN_REQUIRED);
+
+ThrowUserError('auth_delegation_disabled')
+  unless Bugzilla->params->{auth_delegation};
+
+my $cgi      = Bugzilla->cgi;
+my $template = Bugzilla->template;
+my $user     = Bugzilla->user;
+my $callback = $cgi->param('callback')
+  or ThrowUserError("auth_delegation_missing_callback");
+my $description = $cgi->param('description')
+  or ThrowUserError("auth_delegation_missing_description");
+
+trick_taint($callback);
+trick_taint($description);
+
+my $callback_uri = URI->new($callback);
+$callback_uri->scheme =~ /^https?$/
+  or ThrowUserError('auth_delegation_illegal_protocol',
+  {protocol => $callback_uri->scheme});
+my $callback_base = $callback_uri->clone;
+$callback_base->query(undef);
+
+my $skip_confirmation = 0;
+my %args              = (
+  skip_confirmation => \$skip_confirmation,
+  callback          => $callback_uri,
+  description       => $description,
+  callback_base     => $callback_base
+);
+
+Bugzilla::Hook::process('auth_delegation_confirm', \%args);
+
+my $confirmed = lc($cgi->request_method) eq 'post' && $cgi->param('confirm');
+
+if ($confirmed || $skip_confirmation) {
+  my $token = $cgi->param('token');
+  unless ($skip_confirmation) {
+    ThrowUserError("auth_delegation_missing_token") unless $token;
+    trick_taint($token);
+
+    unless (check_auth_delegation_token($token, $callback)) {
+      ThrowUserError('auth_delegation_invalid_token',
+        {token => $token, callback => $callback});
+    }
+  }
+  my $app_id = sha256_hex($callback_uri, $description);
+  my $keys
+    = Bugzilla::User::APIKey->match({
+    user_id => $user->id, app_id => $app_id, revoked => 0,
+    });
+
+  my $api_key;
+  if (@$keys) {
+    $api_key = $keys->[0];
+  }
+  else {
+    $api_key
+      = Bugzilla::User::APIKey->create({
+      user_id => $user->id, description => $description, app_id => $app_id,
+      });
+    my $template = Bugzilla->template_inner($user->setting('lang'));
+    my $vars = {user => $user, new_key => $api_key};
+    my $message;
+    $template->process('email/new-api-key.txt.tmpl', $vars, \$message)
+      or ThrowTemplateError($template->error());
+
+    MessageToMTA($message);
+  }
+
+  my $ua = LWP::UserAgent->new();
+  $ua->timeout(2);
+  $ua->protocols_allowed(['http', 'https']);
+
+  # If the URL of the proxy is given, use it, else get this information
+  # from the environment variable.
+  my $proxy_url = Bugzilla->params->{'proxy_url'};
+  if ($proxy_url) {
+    $ua->proxy(['http', 'https'], $proxy_url);
+  }
+  else {
+    $ua->env_proxy;
+  }
+  my $content = encode_json(
+    {client_api_key => $api_key->api_key, client_api_login => $user->login});
+  my $resp = $ua->post(
+    $callback_uri,
+    'Content-Type' => 'application/json',
+    Content        => $content
+  );
+  if ($resp->code == 200) {
+    $callback_uri->query_param(client_api_login => $user->login);
+    eval {
+      my $data = decode_json($resp->content);
+      $callback_uri->query_param(callback_result => $data->{result});
+    };
+    if ($@) {
+      ThrowUserError('auth_delegation_json_error', {json_text => $resp->content});
+    }
+    else {
+      print $cgi->redirect($callback_uri);
+    }
+  }
+  else {
+    ThrowUserError('auth_delegation_post_error', {code => $resp->code});
+  }
+}
+else {
+  $args{token} = issue_auth_delegation_token($callback);
+
+  print $cgi->header();
+  $template->process("account/auth/delegation.html.tmpl", \%args)
+    or ThrowTemplateError($template->error());
+}
diff --git a/buglist.cgi b/buglist.cgi
index daee34c9bc..1b92210e67 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -25,13 +25,14 @@ use Bugzilla::Product;
 use Bugzilla::Field;
 use Bugzilla::Status;
 use Bugzilla::Token;
+use Bugzilla::Hook;
 
 use Date::Parse;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # We have to check the login here to get the correct footer if an error is
 # thrown and to prevent a logged out user to use QuickSearch if 'requirelogin'
@@ -42,26 +43,28 @@ $cgi->redirect_search_url();
 
 my $buffer = $cgi->query_string();
 if (length($buffer) == 0) {
-    ThrowUserError("buglist_parameters_required");
+  ThrowUserError("buglist_parameters_required");
 }
 
 
 # Determine whether this is a quicksearch query.
 my $searchstring = $cgi->param('quicksearch');
 if (defined($searchstring)) {
-    $buffer = quicksearch($searchstring);
-    # Quicksearch may do a redirect, in which case it does not return.
-    # If it does return, it has modified $cgi->params so we can use them here
-    # as if this had been a normal query from the beginning.
+  $buffer = quicksearch($searchstring);
+
+  # Quicksearch may do a redirect, in which case it does not return.
+  # If it does return, it has modified $cgi->params so we can use them here
+  # as if this had been a normal query from the beginning.
 }
 
 # If configured to not allow empty words, reject empty searches from the
-# Find a Specific Bug search form, including words being a single or 
+# Find a Specific Bug search form, including words being a single or
 # several consecutive whitespaces only.
-if (!Bugzilla->params->{'search_allow_no_criteria'}
-    && defined($cgi->param('content')) && $cgi->param('content') =~ /^\s*$/)
+if ( !Bugzilla->params->{'search_allow_no_criteria'}
+  && defined($cgi->param('content'))
+  && $cgi->param('content') =~ /^\s*$/)
 {
-    ThrowUserError("buglist_parameters_required");
+  ThrowUserError("buglist_parameters_required");
 }
 
 ################################################################################
@@ -73,44 +76,23 @@ my $dotweak = $cgi->param('tweak') ? 1 : 0;
 
 # Log the user in
 if ($dotweak) {
-    Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->login(LOGIN_REQUIRED);
 }
 
 # Hack to support legacy applications that think the RDF ctype is at format=rdf.
-if (defined $cgi->param('format') && $cgi->param('format') eq "rdf"
-    && !defined $cgi->param('ctype')) {
-    $cgi->param('ctype', "rdf");
-    $cgi->delete('format');
+if ( defined $cgi->param('format')
+  && $cgi->param('format') eq "rdf"
+  && !defined $cgi->param('ctype'))
+{
+  $cgi->param('ctype', "rdf");
+  $cgi->delete('format');
 }
 
 # Treat requests for ctype=rss as requests for ctype=atom
 if (defined $cgi->param('ctype') && $cgi->param('ctype') eq "rss") {
-    $cgi->param('ctype', "atom");
+  $cgi->param('ctype', "atom");
 }
 
-# Determine the format in which the user would like to receive the output.
-# Uses the default format if the user did not specify an output format;
-# otherwise validates the user's choice against the list of available formats.
-my $format = $template->get_format("list/list", scalar $cgi->param('format'),
-                                   scalar $cgi->param('ctype'));
-
-# Use server push to display a "Please wait..." message for the user while
-# executing their query if their browser supports it and they are viewing
-# the bug list as HTML and they have not disabled it by adding &serverpush=0
-# to the URL.
-#
-# Server push is compatible with Gecko-based browsers and Opera, but not with
-# MSIE, Lynx or Safari (bug 441496).
-
-my $serverpush =
-  $format->{'extension'} eq "html"
-    && exists $ENV{'HTTP_USER_AGENT'} 
-      && $ENV{'HTTP_USER_AGENT'} =~ /(Mozilla.[3-9]|Opera)/
-        && $ENV{'HTTP_USER_AGENT'} !~ /compatible/i
-          && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident|KHTML)/
-            && !defined($cgi->param('serverpush'))
-              || $cgi->param('serverpush');
-
 my $order = $cgi->param('order') || "";
 
 # The params object to use for the actual query itself
@@ -119,25 +101,26 @@ my $params;
 # If the user is retrieving the last bug list they looked at, hack the buffer
 # storing the query string so that it looks like a query retrieving those bugs.
 if (my $last_list = $cgi->param('regetlastlist')) {
-    my $bug_ids;
-
-    # Logged-out users use the old cookie method for storing the last search.
-    if (!$user->id or $last_list eq 'cookie') {
-        $bug_ids = $cgi->cookie('BUGLIST') or ThrowUserError("missing_cookie");
-        $bug_ids =~ s/[:-]/,/g;
-        $order ||= "reuse last sort";
-    }
-    # But logged in users store the last X searches in the DB so they can
-    # have multiple bug lists available.
-    else {
-        my $last_search = Bugzilla::Search::Recent->check(
-            { id => $last_list });
-        $bug_ids = join(',', @{ $last_search->bug_list });
-        $order ||= $last_search->list_order;
-    }
-    # set up the params for this new query
-    $params = new Bugzilla::CGI({ bug_id => $bug_ids, order => $order });
-    $params->param('list_id', $last_list);
+  my $bug_ids;
+
+  # Logged-out users use the old cookie method for storing the last search.
+  if (!$user->id or $last_list eq 'cookie') {
+    $bug_ids = $cgi->cookie('BUGLIST') or ThrowUserError("missing_cookie");
+    $bug_ids =~ s/[:-]/,/g;
+    $order ||= "reuse last sort";
+  }
+
+  # But logged in users store the last X searches in the DB so they can
+  # have multiple bug lists available.
+  else {
+    my $last_search = Bugzilla::Search::Recent->check({id => $last_list});
+    $bug_ids = join(',', @{$last_search->bug_list});
+    $order ||= $last_search->list_order;
+  }
+
+  # set up the params for this new query
+  $params = new Bugzilla::CGI({bug_id => $bug_ids, order => $order});
+  $params->param('list_id', $last_list);
 }
 
 # Figure out whether or not the user is doing a fulltext search.  If not,
@@ -145,12 +128,12 @@ if (my $last_list = $cgi->param('regetlastlist')) {
 # and order by, since relevance only exists when doing a fulltext search.
 my $fulltext = 0;
 if ($cgi->param('content')) { $fulltext = 1 }
-my @charts = map(/^field(\d-\d-\d)$/ ? $1 : (), $cgi->param());
+my @charts = map { /^field(\d-\d-\d)$/ ? $1 : () } $cgi->multi_param();
 foreach my $chart (@charts) {
-    if ($cgi->param("field$chart") eq 'content' && $cgi->param("value$chart")) {
-        $fulltext = 1;
-        last;
-    }
+  if ($cgi->param("field$chart") eq 'content' && $cgi->param("value$chart")) {
+    $fulltext = 1;
+    last;
+  }
 }
 
 ################################################################################
@@ -158,34 +141,35 @@ foreach my $chart (@charts) {
 ################################################################################
 
 sub DiffDate {
-    my ($datestr) = @_;
-    my $date = str2time($datestr);
-    my $age = time() - $date;
-
-    if( $age < 18*60*60 ) {
-        $date = format_time($datestr, '%H:%M:%S');
-    } elsif( $age < 6*24*60*60 ) {
-        $date = format_time($datestr, '%a %H:%M');
-    } else {
-        $date = format_time($datestr, '%Y-%m-%d');
-    }
-    return $date;
+  my ($datestr) = @_;
+  my $date      = str2time($datestr);
+  my $age       = time() - $date;
+
+  if ($age < 18 * 60 * 60) {
+    $date = format_time($datestr, '%H:%M:%S');
+  }
+  elsif ($age < 6 * 24 * 60 * 60) {
+    $date = format_time($datestr, '%a %H:%M');
+  }
+  else {
+    $date = format_time($datestr, '%Y-%m-%d');
+  }
+  return $date;
 }
 
 sub LookupNamedQuery {
-    my ($name, $sharer_id) = @_;
+  my ($name, $sharer_id) = @_;
 
-    Bugzilla->login(LOGIN_REQUIRED);
+  Bugzilla->login(LOGIN_REQUIRED);
 
-    my $query = Bugzilla::Search::Saved->check(
-        { user => $sharer_id, name => $name, _error => 'missing_query' });
+  my $query = Bugzilla::Search::Saved->check(
+    {user => $sharer_id, name => $name, _error => 'missing_query'});
 
-    $query->url
-       || ThrowUserError("buglist_parameters_required");
+  $query->url || ThrowUserError("buglist_parameters_required");
 
-    # Detaint $sharer_id.
-    $sharer_id = $query->user->id if $sharer_id;
-    return wantarray ? ($query->url, $query->id, $sharer_id) : $query->url;
+  # Detaint $sharer_id.
+  $sharer_id = $query->user->id if $sharer_id;
+  return wantarray ? ($query->url, $query->id, $sharer_id) : $query->url;
 }
 
 # Inserts a Named Query (a "Saved Search") into the database, or
@@ -197,119 +181,121 @@ sub LookupNamedQuery {
 #              will throw a UserError. Leading and trailing whitespace
 #              will be stripped from this value before it is inserted
 #              into the DB.
-# query - The query part of the buglist.cgi URL, unencoded. Must not be 
+# query - The query part of the buglist.cgi URL, unencoded. Must not be
 #         empty, or we will throw a UserError.
-# link_in_footer (optional) - 1 if the Named Query should be 
+# link_in_footer (optional) - 1 if the Named Query should be
 # displayed in the user's footer, 0 otherwise.
 #
 # All parameters are validated before passing them into the database.
 #
-# Returns: A boolean true value if the query existed in the database 
+# Returns: A boolean true value if the query existed in the database
 # before, and we updated it. A boolean false value otherwise.
 sub InsertNamedQuery {
-    my ($query_name, $query, $link_in_footer) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    $query_name = trim($query_name);
-    my ($query_obj) = grep {lc($_->name) eq lc($query_name)} @{Bugzilla->user->queries};
-
-    if ($query_obj) {
-        $query_obj->set_name($query_name);
-        $query_obj->set_url($query);
-        $query_obj->update();
-    } else {
-        Bugzilla::Search::Saved->create({
-            name           => $query_name,
-            query          => $query,
-            link_in_footer => $link_in_footer
-        });
-    }
-
-    return $query_obj ? 1 : 0;
+  my ($query_name, $query, $link_in_footer) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  $query_name = trim($query_name);
+  my ($query_obj)
+    = grep { lc($_->name) eq lc($query_name) } @{Bugzilla->user->queries};
+
+  if ($query_obj) {
+    $query_obj->set_name($query_name);
+    $query_obj->set_url($query);
+    $query_obj->update();
+  }
+  else {
+    Bugzilla::Search::Saved->create({
+      name => $query_name, query => $query, link_in_footer => $link_in_footer
+    });
+  }
+
+  return $query_obj ? 1 : 0;
 }
 
 sub LookupSeries {
-    my ($series_id) = @_;
-    detaint_natural($series_id) || ThrowCodeError("invalid_series_id");
-    
-    my $dbh = Bugzilla->dbh;
-    my $result = $dbh->selectrow_array("SELECT query FROM series " .
-                                       "WHERE series_id = ?"
-                                       , undef, ($series_id));
-    $result
-           || ThrowCodeError("invalid_series_id", {'series_id' => $series_id});
-    return $result;
+  my ($series_id) = @_;
+  detaint_natural($series_id) || ThrowCodeError("invalid_series_id");
+
+  my $dbh = Bugzilla->dbh;
+  my $result
+    = $dbh->selectrow_array("SELECT query FROM series " . "WHERE series_id = ?",
+    undef, ($series_id));
+  $result || ThrowCodeError("invalid_series_id", {'series_id' => $series_id});
+  return $result;
 }
 
 sub GetQuip {
-    my $dbh = Bugzilla->dbh;
-    # COUNT is quick because it is cached for MySQL. We may want to revisit
-    # this when we support other databases.
-    my $count = $dbh->selectrow_array("SELECT COUNT(quip)"
-                                    . " FROM quips WHERE approved = 1");
-    my $random = int(rand($count));
-    my $quip = 
-        $dbh->selectrow_array("SELECT quip FROM quips WHERE approved = 1 " . 
-                              $dbh->sql_limit(1, $random));
-    return $quip;
+  my $dbh = Bugzilla->dbh;
+
+  # COUNT is quick because it is cached for MySQL. We may want to revisit
+  # this when we support other databases.
+  my $count = $dbh->selectrow_array(
+    "SELECT COUNT(quip)" . " FROM quips WHERE approved = 1");
+  my $random = int(rand($count));
+  my $quip   = $dbh->selectrow_array(
+    "SELECT quip FROM quips WHERE approved = 1 " . $dbh->sql_limit(1, $random));
+  return $quip;
 }
 
 # Return groups available for at least one product of the buglist.
 sub GetGroups {
-    my $product_names = shift;
-    my $user = Bugzilla->user;
-    my %legal_groups;
+  my $product_names = shift;
+  my $user          = Bugzilla->user;
+  my %legal_groups;
 
-    foreach my $product_name (@$product_names) {
-        my $product = Bugzilla::Product->new({name => $product_name, cache => 1});
+  foreach my $product_name (@$product_names) {
+    my $product = Bugzilla::Product->new({name => $product_name, cache => 1});
 
-        foreach my $gid (keys %{$product->group_controls}) {
-            # The user can only edit groups they belong to.
-            next unless $user->in_group_id($gid);
+    foreach my $gid (keys %{$product->group_controls}) {
 
-            # The user has no control on groups marked as NA or MANDATORY.
-            my $group = $product->group_controls->{$gid};
-            next if ($group->{membercontrol} == CONTROLMAPMANDATORY
-                     || $group->{membercontrol} == CONTROLMAPNA);
+      # The user can only edit groups they belong to.
+      next unless $user->in_group_id($gid);
 
-            # It's fine to include inactive groups. Those will be marked
-            # as "remove only" when editing several bugs at once.
-            $legal_groups{$gid} ||= $group->{group};
-        }
+      # The user has no control on groups marked as NA or MANDATORY.
+      my $group = $product->group_controls->{$gid};
+      next
+        if ($group->{membercontrol} == CONTROLMAPMANDATORY
+        || $group->{membercontrol} == CONTROLMAPNA);
+
+      # It's fine to include inactive groups. Those will be marked
+      # as "remove only" when editing several bugs at once.
+      $legal_groups{$gid} ||= $group->{group};
     }
-    # Return a list of group objects.
-    return [values %legal_groups];
+  }
+
+  # Return a list of group objects.
+  return [values %legal_groups];
 }
 
 sub _get_common_flag_types {
-    my $component_ids = shift;
-    my $user = Bugzilla->user;
-
-    # Get all the different components in the bug list
-    my $components = Bugzilla::Component->new_from_list($component_ids);
-    my %flag_types;
-    my @flag_types_ids;
-    foreach my $component (@$components) {
-        foreach my $flag_type (@{$component->flag_types->{'bug'}}) {
-            push @flag_types_ids, $flag_type->id;
-            $flag_types{$flag_type->id} = $flag_type;
-        }
-    }
-
-    # We only want flags that appear in all components
-    my %common_flag_types;
-    foreach my $id (keys %flag_types) {
-        my $flag_type_count = scalar grep { $_ == $id } @flag_types_ids;
-        $common_flag_types{$id} = $flag_types{$id}
-            if $flag_type_count == scalar @$components;
+  my $component_ids = shift;
+  my $user          = Bugzilla->user;
+
+  # Get all the different components in the bug list
+  my $components = Bugzilla::Component->new_from_list($component_ids);
+  my %flag_types;
+  my @flag_types_ids;
+  foreach my $component (@$components) {
+    foreach my $flag_type (@{$component->flag_types->{'bug'}}) {
+      push @flag_types_ids, $flag_type->id;
+      $flag_types{$flag_type->id} = $flag_type;
     }
-
-    # We only show flags that a user can request.
-    my @show_flag_types
-        = grep { $user->can_request_flag($_) } values %common_flag_types;
-    my $any_flags_requesteeble = grep { $_->is_requesteeble } @show_flag_types;
-
-    return(\@show_flag_types, $any_flags_requesteeble);
+  }
+
+  # We only want flags that appear in all components
+  my %common_flag_types;
+  foreach my $id (keys %flag_types) {
+    my $flag_type_count = scalar grep { $_ == $id } @flag_types_ids;
+    $common_flag_types{$id} = $flag_types{$id}
+      if $flag_type_count == scalar @$components;
+  }
+
+  # We only show flags that a user can request.
+  my @show_flag_types
+    = grep { $user->can_request_flag($_) } values %common_flag_types;
+  my $any_flags_requesteeble = grep { $_->is_requesteeble } @show_flag_types;
+
+  return (\@show_flag_types, $any_flags_requesteeble);
 }
 
 ################################################################################
@@ -322,65 +308,56 @@ my $sharer_id;
 
 # Backwards-compatibility - the old interface had cmdtype="runnamed" to run
 # a named command, and we can't break this because it's in bookmarks.
-if ($cmdtype eq "runnamed") {  
-    $cmdtype = "dorem";
-    $remaction = "run";
+if ($cmdtype eq "runnamed") {
+  $cmdtype   = "dorem";
+  $remaction = "run";
 }
 
 # Now we're going to be running, so ensure that the params object is set up,
-# using ||= so that we only do so if someone hasn't overridden this 
+# using ||= so that we only do so if someone hasn't overridden this
 # earlier, for example by setting up a named query search.
 
 # This will be modified, so make a copy.
 $params ||= new Bugzilla::CGI($cgi);
 
-# Generate a reasonable filename for the user agent to suggest to the user
-# when the user saves the bug list.  Uses the name of the remembered query
-# if available.  We have to do this now, even though we return HTTP headers 
-# at the end, because the fact that there is a remembered query gets 
-# forgotten in the process of retrieving it.
-my $disp_prefix = "bugs";
-if ($cmdtype eq "dorem" && $remaction =~ /^run/) {
-    $disp_prefix = $cgi->param('namedcmd');
-}
-
 # Take appropriate action based on user's request.
-if ($cmdtype eq "dorem") {  
-    if ($remaction eq "run") {
-        my $query_id;
-        ($buffer, $query_id, $sharer_id) =
-          LookupNamedQuery(scalar $cgi->param("namedcmd"),
-                           scalar $cgi->param('sharer_id'));
-        # If this is the user's own query, remember information about it
-        # so that it can be modified easily.
-        $vars->{'searchname'} = $cgi->param('namedcmd');
-        if (!$cgi->param('sharer_id') ||
-            $cgi->param('sharer_id') == $user->id) {
-            $vars->{'searchtype'} = "saved";
-            $vars->{'search_id'} = $query_id;
-        }
-        $params = new Bugzilla::CGI($buffer);
-        $order = $params->param('order') || $order;
-
-    }
-    elsif ($remaction eq "runseries") {
-        $buffer = LookupSeries(scalar $cgi->param("series_id"));
-        $vars->{'searchname'} = $cgi->param('namedcmd');
-        $vars->{'searchtype'} = "series";
-        $params = new Bugzilla::CGI($buffer);
-        $order = $params->param('order') || $order;
+if ($cmdtype eq "dorem") {
+  if ($remaction eq "run") {
+    my $query_id;
+    ($buffer, $query_id, $sharer_id)
+      = LookupNamedQuery(scalar $cgi->param("namedcmd"),
+      scalar $cgi->param('sharer_id'));
+
+    # If this is the user's own query, remember information about it
+    # so that it can be modified easily.
+    $vars->{'searchname'} = $cgi->param('namedcmd');
+    if (!$cgi->param('sharer_id') || $cgi->param('sharer_id') == $user->id) {
+      $vars->{'searchtype'} = "saved";
+      $vars->{'search_id'}  = $query_id;
     }
-    elsif ($remaction eq "forget") {
-        $user = Bugzilla->login(LOGIN_REQUIRED);
-        # Copy the name into a variable, so that we can trick_taint it for
-        # the DB. We know it's safe, because we're using placeholders in 
-        # the SQL, and the SQL is only a DELETE.
-        my $qname = $cgi->param('namedcmd');
-        trick_taint($qname);
-
-        # Do not forget the saved search if it is being used in a whine
-        my $whines_in_use = 
-            $dbh->selectcol_arrayref('SELECT DISTINCT whine_events.subject
+    $params = new Bugzilla::CGI($buffer);
+    $order = $params->param('order') || $order;
+
+  }
+  elsif ($remaction eq "runseries") {
+    $buffer               = LookupSeries(scalar $cgi->param("series_id"));
+    $vars->{'searchname'} = $cgi->param('namedcmd');
+    $vars->{'searchtype'} = "series";
+    $params               = new Bugzilla::CGI($buffer);
+    $order                = $params->param('order') || $order;
+  }
+  elsif ($remaction eq "forget") {
+    $user = Bugzilla->login(LOGIN_REQUIRED);
+
+    # Copy the name into a variable, so that we can trick_taint it for
+    # the DB. We know it's safe, because we're using placeholders in
+    # the SQL, and the SQL is only a DELETE.
+    my $qname = $cgi->param('namedcmd');
+    trick_taint($qname);
+
+    # Do not forget the saved search if it is being used in a whine
+    my $whines_in_use = $dbh->selectcol_arrayref(
+      'SELECT DISTINCT whine_events.subject
                                                  FROM whine_events
                                            INNER JOIN whine_queries
                                                    ON whine_queries.eventid
@@ -389,92 +366,136 @@ if ($cmdtype eq "dorem") {
                                                       = ?
                                                   AND whine_queries.query_name
                                                       = ?
-                                      ', undef, $user->id, $qname);
-        if (scalar(@$whines_in_use)) {
-            ThrowUserError('saved_search_used_by_whines', 
-                           { subjects    => join(',', @$whines_in_use),
-                             search_name => $qname                      }
-            );
-        }
-
-        # If we are here, then we can safely remove the saved search
-        my $query_id;
-        ($buffer, $query_id) = LookupNamedQuery(scalar $cgi->param("namedcmd"),
-                                                $user->id);
-        if ($query_id) {
-            # Make sure the user really wants to delete their saved search.
-            my $token = $cgi->param('token');
-            check_hash_token($token, [$query_id, $qname]);
-
-            $dbh->do('DELETE FROM namedqueries
-                            WHERE id = ?',
-                     undef, $query_id);
-            $dbh->do('DELETE FROM namedqueries_link_in_footer
-                            WHERE namedquery_id = ?',
-                     undef, $query_id);
-            $dbh->do('DELETE FROM namedquery_group_map
-                            WHERE namedquery_id = ?',
-                     undef, $query_id);
-            Bugzilla->memcached->clear({ table => 'namedqueries', id => $query_id });
-        }
+                                      ', undef, $user->id, $qname
+    );
+    if (scalar(@$whines_in_use)) {
+      ThrowUserError('saved_search_used_by_whines',
+        {subjects => join(',', @$whines_in_use), search_name => $qname});
+    }
 
-        # Now reset the cached queries
-        $user->flush_queries_cache();
-
-        print $cgi->header();
-        # Generate and return the UI (HTML page) from the appropriate template.
-        $vars->{'message'} = "buglist_query_gone";
-        $vars->{'namedcmd'} = $qname;
-        $vars->{'url'} = "buglist.cgi?newquery=" . url_quote($buffer)
-                         . "&cmdtype=doit&remtype=asnamed&newqueryname=" . url_quote($qname)
-                         . "&token=" . url_quote(issue_hash_token(['savedsearch']));
-        $template->process("global/message.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-        exit;
+    # If we are here, then we can safely remove the saved search
+    my $query_id;
+    ($buffer, $query_id)
+      = LookupNamedQuery(scalar $cgi->param("namedcmd"), $user->id);
+    if ($query_id) {
+
+      # Make sure the user really wants to delete their saved search.
+      my $token = $cgi->param('token');
+      check_hash_token($token, [$query_id, $qname]);
+
+      $dbh->do(
+        'DELETE FROM namedqueries
+                            WHERE id = ?', undef, $query_id
+      );
+      $dbh->do(
+        'DELETE FROM namedqueries_link_in_footer
+                            WHERE namedquery_id = ?', undef, $query_id
+      );
+      $dbh->do(
+        'DELETE FROM namedquery_group_map
+                            WHERE namedquery_id = ?', undef, $query_id
+      );
+      Bugzilla->memcached->clear({table => 'namedqueries', id => $query_id});
     }
+
+    # Now reset the cached queries
+    $user->flush_queries_cache();
+
+    print $cgi->header();
+
+    # Generate and return the UI (HTML page) from the appropriate template.
+    $vars->{'message'}  = "buglist_query_gone";
+    $vars->{'namedcmd'} = $qname;
+    $vars->{'url'}
+      = "buglist.cgi?newquery="
+      . url_quote($buffer)
+      . "&cmdtype=doit&remtype=asnamed&newqueryname="
+      . url_quote($qname)
+      . "&token="
+      . url_quote(issue_hash_token(['savedsearch']));
+    $template->process("global/message.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
 }
 elsif (($cmdtype eq "doit") && defined $cgi->param('remtype')) {
-    if ($cgi->param('remtype') eq "asdefault") {
-        $user = Bugzilla->login(LOGIN_REQUIRED);
-        my $token = $cgi->param('token');
-        check_hash_token($token, ['searchknob']);
-        $buffer = $params->canonicalise_query('cmdtype', 'remtype',
-                                              'query_based_on', 'token');
-        InsertNamedQuery(DEFAULT_QUERY_NAME, $buffer);
-        $vars->{'message'} = "buglist_new_default_query";
+  if ($cgi->param('remtype') eq "asdefault") {
+    $user = Bugzilla->login(LOGIN_REQUIRED);
+    my $token = $cgi->param('token');
+    check_hash_token($token, ['searchknob']);
+    $buffer = $params->canonicalise_query('cmdtype', 'remtype', 'query_based_on',
+      'token');
+    InsertNamedQuery(DEFAULT_QUERY_NAME, $buffer);
+    $vars->{'message'} = "buglist_new_default_query";
+  }
+  elsif ($cgi->param('remtype') eq "asnamed") {
+    $user = Bugzilla->login(LOGIN_REQUIRED);
+    my $query_name = $cgi->param('newqueryname');
+    my $new_query  = $cgi->param('newquery');
+    my $token      = $cgi->param('token');
+    check_hash_token($token, ['savedsearch']);
+    my $existed_before = InsertNamedQuery($query_name, $new_query, 1);
+    if ($existed_before) {
+      $vars->{'message'} = "buglist_updated_named_query";
     }
-    elsif ($cgi->param('remtype') eq "asnamed") {
-        $user = Bugzilla->login(LOGIN_REQUIRED);
-        my $query_name = $cgi->param('newqueryname');
-        my $new_query = $cgi->param('newquery');
-        my $token = $cgi->param('token');
-        check_hash_token($token, ['savedsearch']);
-        my $existed_before = InsertNamedQuery($query_name, $new_query, 1);
-        if ($existed_before) {
-            $vars->{'message'} = "buglist_updated_named_query";
-        }
-        else {
-            $vars->{'message'} = "buglist_new_named_query";
-        }
-        $vars->{'queryname'} = $query_name;
+    else {
+      $vars->{'message'} = "buglist_new_named_query";
+    }
+    $vars->{'queryname'} = $query_name;
 
-        # Make sure to invalidate any cached query data, so that the footer is
-        # correctly displayed
-        $user->flush_queries_cache();
+    # Make sure to invalidate any cached query data, so that the footer is
+    # correctly displayed
+    $user->flush_queries_cache();
 
-        print $cgi->header();
-        $template->process("global/message.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-        exit;
-    }
+    print $cgi->header();
+    $template->process("global/message.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
 }
 
 # backward compatibility hack: if the saved query doesn't say which
 # form was used to create it, assume it was on the advanced query
 # form - see bug 252295
 if (!$params->param('query_format')) {
-    $params->param('query_format', 'advanced');
-    $buffer = $params->query_string;
+  $params->param('query_format', 'advanced');
+  $buffer = $params->query_string;
+}
+
+# Determine the format in which the user would like to receive the output.
+# Uses the default format if the user did not specify an output format;
+# otherwise validates the user's choice against the list of available formats.
+my $format = $template->get_format(
+  "list/list",
+  scalar $params->param('format'),
+  scalar $params->param('ctype')
+);
+
+# Use server push to display a "Please wait..." message for the user while
+# executing their query if their browser supports it and they are viewing
+# the bug list as HTML and they have not disabled it by adding &serverpush=0
+# to the URL.
+#
+# Server push is compatible with Gecko-based browsers and Opera, but not with
+# MSIE, Lynx or Safari (bug 441496).
+
+my $serverpush
+  = $format->{'extension'} eq "html"
+  && exists $ENV{'HTTP_USER_AGENT'}
+  && $ENV{'HTTP_USER_AGENT'} =~ /(Mozilla.[3-9]|Opera)/
+  && $ENV{'HTTP_USER_AGENT'} !~ /compatible/i
+  && $ENV{'HTTP_USER_AGENT'} !~ /(?:WebKit|Trident|KHTML)/
+  && !defined($cgi->param('serverpush')) || $cgi->param('serverpush');
+
+
+# Generate a reasonable filename for the user agent to suggest to the user
+# when the user saves the bug list.  Uses the name of the remembered query
+# if available.  We have to do this now, even though we return HTTP headers
+# at the end, because the fact that there is a remembered query gets
+# forgotten in the process of retrieving it.
+my $disp_prefix = "bugs";
+if ($cmdtype eq "dorem" && $remaction =~ /^run/) {
+  $disp_prefix = $cgi->param('namedcmd');
 }
 
 ################################################################################
@@ -487,40 +508,42 @@ my $columns = Bugzilla::Search::COLUMNS;
 # Display Column Determination
 ################################################################################
 
-# Determine the columns that will be displayed in the bug list via the 
+# Determine the columns that will be displayed in the bug list via the
 # columnlist CGI parameter, the user's preferences, or the default.
 my @displaycolumns = ();
 if (defined $params->param('columnlist')) {
-    if ($params->param('columnlist') eq "all") {
-        # If the value of the CGI parameter is "all", display all columns,
-        # but remove the redundant "short_desc" column.
-        @displaycolumns = grep($_ ne 'short_desc', keys(%$columns));
-    }
-    else {
-        @displaycolumns = split(/[ ,]+/, $params->param('columnlist'));
-    }
+  if ($params->param('columnlist') eq "all") {
+
+    # If the value of the CGI parameter is "all", display all columns,
+    # but remove the redundant "short_desc" column.
+    @displaycolumns = grep($_ ne 'short_desc', keys(%$columns));
+  }
+  else {
+    @displaycolumns = split(/[ ,]+/, $params->param('columnlist'));
+  }
 }
 elsif (defined $cgi->cookie('COLUMNLIST')) {
-    # 2002-10-31 Rename column names (see bug 176461)
-    my $columnlist = $cgi->cookie('COLUMNLIST');
-    $columnlist =~ s/\bowner\b/assigned_to/;
-    $columnlist =~ s/\bowner_realname\b/assigned_to_realname/;
-    $columnlist =~ s/\bplatform\b/rep_platform/;
-    $columnlist =~ s/\bseverity\b/bug_severity/;
-    $columnlist =~ s/\bstatus\b/bug_status/;
-    $columnlist =~ s/\bsummaryfull\b/short_desc/;
-    $columnlist =~ s/\bsummary\b/short_short_desc/;
-
-    # Use the columns listed in the user's preferences.
-    @displaycolumns = split(/ /, $columnlist);
+
+  # 2002-10-31 Rename column names (see bug 176461)
+  my $columnlist = $cgi->cookie('COLUMNLIST');
+  $columnlist =~ s/\bowner\b/assigned_to/;
+  $columnlist =~ s/\bowner_realname\b/assigned_to_realname/;
+  $columnlist =~ s/\bplatform\b/rep_platform/;
+  $columnlist =~ s/\bseverity\b/bug_severity/;
+  $columnlist =~ s/\bstatus\b/bug_status/;
+  $columnlist =~ s/\bsummaryfull\b/short_desc/;
+  $columnlist =~ s/\bsummary\b/short_short_desc/;
+
+  # Use the columns listed in the user's preferences.
+  @displaycolumns = split(/ /, $columnlist);
 }
 else {
-    # Use the default list of columns.
-    @displaycolumns = DEFAULT_COLUMN_LIST;
+  # Use the default list of columns.
+  @displaycolumns = DEFAULT_COLUMN_LIST;
 }
 
-# Weed out columns that don't actually exist to prevent the user 
-# from hacking their column list cookie to grab data to which they 
+# Weed out columns that don't actually exist to prevent the user
+# from hacking their column list cookie to grab data to which they
 # should not have access.  Detaint the data along the way.
 @displaycolumns = grep($columns->{$_} && trick_taint($_), @displaycolumns);
 
@@ -531,14 +554,14 @@ else {
 # Remove the timetracking columns if they are not a part of the group
 # (happens if a user had access to time tracking and it was revoked/disabled)
 if (!$user->is_timetracker) {
-   foreach my $tt_field (TIMETRACKING_FIELDS) {
-       @displaycolumns = grep($_ ne $tt_field, @displaycolumns);
-   }
+  foreach my $tt_field (TIMETRACKING_FIELDS) {
+    @displaycolumns = grep($_ ne $tt_field, @displaycolumns);
+  }
 }
 
 # Remove the relevance column if the user is not doing a fulltext search.
 if (grep('relevance', @displaycolumns) && !$fulltext) {
-    @displaycolumns = grep($_ ne 'relevance', @displaycolumns);
+  @displaycolumns = grep($_ ne 'relevance', @displaycolumns);
 }
 
 ################################################################################
@@ -550,13 +573,14 @@ if (grep('relevance', @displaycolumns) && !$fulltext) {
 # The bug ID is always selected because bug IDs are always displayed.
 # Severity, priority, resolution and status are required for buglist
 # CSS classes.
-my @selectcolumns = ("bug_id", "bug_severity", "priority", "bug_status",
-                     "resolution", "product");
+my @selectcolumns
+  = ("bug_id", "bug_severity", "priority", "bug_status", "resolution",
+  "product");
 
 # remaining and actual_time are required for percentage_complete calculation:
 if (grep { $_ eq "percentage_complete" } @displaycolumns) {
-    push (@selectcolumns, "remaining_time");
-    push (@selectcolumns, "actual_time");
+  push(@selectcolumns, "remaining_time");
+  push(@selectcolumns, "actual_time");
 }
 
 # Make sure that the login_name version of a field is always also
@@ -564,58 +588,51 @@ if (grep { $_ eq "percentage_complete" } @displaycolumns) {
 # display the login name when the realname is empty.
 my @realname_fields = grep(/_realname$/, @displaycolumns);
 foreach my $item (@realname_fields) {
-    my $login_field = $item;
-    $login_field =~ s/_realname$//;
-    if (!grep($_ eq $login_field, @selectcolumns)) {
-        push(@selectcolumns, $login_field);
-    }
+  my $login_field = $item;
+  $login_field =~ s/_realname$//;
+  if (!grep($_ eq $login_field, @selectcolumns)) {
+    push(@selectcolumns, $login_field);
+  }
 }
 
 # Display columns are selected because otherwise we could not display them.
 foreach my $col (@displaycolumns) {
-    push (@selectcolumns, $col) if !grep($_ eq $col, @selectcolumns);
+  push(@selectcolumns, $col) if !grep($_ eq $col, @selectcolumns);
 }
 
-# If the user is editing multiple bugs, we also make sure to select the 
+# If the user is editing multiple bugs, we also make sure to select the
 # status, because the values of that field determines what options the user
 # has for modifying the bugs.
 if ($dotweak) {
-    push(@selectcolumns, "bug_status") if !grep($_ eq 'bug_status', @selectcolumns);
-    push(@selectcolumns, "bugs.component_id");
+  push(@selectcolumns, "bug_status") if !grep($_ eq 'bug_status', @selectcolumns);
+  push(@selectcolumns, "bugs.component_id");
 }
 
 if ($format->{'extension'} eq 'ics') {
-    push(@selectcolumns, "opendate") if !grep($_ eq 'opendate', @selectcolumns);
-    if (Bugzilla->params->{'timetrackinggroup'}) {
-        push(@selectcolumns, "deadline") if !grep($_ eq 'deadline', @selectcolumns);
-    }
+  push(@selectcolumns, "opendate") if !grep($_ eq 'opendate', @selectcolumns);
+  if (Bugzilla->params->{'timetrackinggroup'}) {
+    push(@selectcolumns, "deadline") if !grep($_ eq 'deadline', @selectcolumns);
+  }
 }
 
 if ($format->{'extension'} eq 'atom') {
-    # The title of the Atom feed will be the same one as for the bug list.
-    $vars->{'title'} = $cgi->param('title');
-
-    # This is the list of fields that are needed by the Atom filter.
-    my @required_atom_columns = (
-      'short_desc',
-      'opendate',
-      'changeddate',
-      'reporter',
-      'reporter_realname',
-      'priority',
-      'bug_severity',
-      'assigned_to',
-      'assigned_to_realname',
-      'bug_status',
-      'product',
-      'component',
-      'resolution'
-    );
-    push(@required_atom_columns, 'target_milestone') if Bugzilla->params->{'usetargetmilestone'};
 
-    foreach my $required (@required_atom_columns) {
-        push(@selectcolumns, $required) if !grep($_ eq $required,@selectcolumns);
-    }
+  # The title of the Atom feed will be the same one as for the bug list.
+  $vars->{'title'} = $cgi->param('title');
+
+  # This is the list of fields that are needed by the Atom filter.
+  my @required_atom_columns = (
+    'short_desc',           'opendate',   'changeddate',  'reporter',
+    'reporter_realname',    'priority',   'bug_severity', 'assigned_to',
+    'assigned_to_realname', 'bug_status', 'product',      'component',
+    'resolution'
+  );
+  push(@required_atom_columns, 'target_milestone')
+    if Bugzilla->params->{'usetargetmilestone'};
+
+  foreach my $required (@required_atom_columns) {
+    push(@selectcolumns, $required) if !grep($_ eq $required, @selectcolumns);
+  }
 }
 
 ################################################################################
@@ -627,76 +644,70 @@ if ($format->{'extension'} eq 'atom') {
 # First check if we'll want to reuse the last sorting order; that happens if
 # the order is not defined or its value is "reuse last sort"
 if (!$order || $order =~ /^reuse/i) {
-    if ($cgi->cookie('LASTORDER')) {
-        $order = $cgi->cookie('LASTORDER');
-       
-        # Cookies from early versions of Specific Search included this text,
-        # which is now invalid.
-        $order =~ s/ LIMIT 200//;
-    }
-    else {
-        $order = '';  # Remove possible "reuse" identifier as unnecessary
-    }
+  if ($cgi->cookie('LASTORDER')) {
+    $order = $cgi->cookie('LASTORDER');
+
+    # Cookies from early versions of Specific Search included this text,
+    # which is now invalid.
+    $order =~ s/ LIMIT 200//;
+  }
+  else {
+    $order = '';    # Remove possible "reuse" identifier as unnecessary
+  }
 }
 
 my @order_columns;
 if ($order) {
-    # Convert the value of the "order" form field into a list of columns
-    # by which to sort the results.
-    ORDER: for ($order) {
-        /^Bug Number$/ && do {
-            @order_columns = ("bug_id");
-            last ORDER;
-        };
-        /^Importance$/ && do {
-            @order_columns = ("priority", "bug_severity");
-            last ORDER;
-        };
-        /^Assignee$/ && do {
-            @order_columns = ("assigned_to", "bug_status", "priority",
-                              "bug_id");
-            last ORDER;
-        };
-        /^Last Changed$/ && do {
-            @order_columns = ("changeddate", "bug_status", "priority",
-                              "assigned_to", "bug_id");
-            last ORDER;
-        };
-        do {
-            # A custom list of columns. Bugzilla::Search will validate items.
-            @order_columns = split(/\s*,\s*/, $order);
-        };
-    }
+
+  # Convert the value of the "order" form field into a list of columns
+  # by which to sort the results.
+  my $descending = $params->param('descending') ? " DESC" : "";
+  my %order_types = (
+    "Bug Number" => ["bug_id$descending"],
+    "Importance" => ["priority$descending", "bug_severity"],
+    "Assignee"   => ["assigned_to$descending", "bug_status", "priority", "bug_id"],
+    "Last Changed" =>
+      ["changeddate$descending", "bug_status", "priority", "assigned_to", "bug_id"],
+  );
+  if ($order_types{$order}) {
+    @order_columns = @{$order_types{$order}};
+  }
+  else {
+    @order_columns = split(/\s*,\s*/, $order);
+  }
 }
 
 if (!scalar @order_columns) {
-    # DEFAULT
-    @order_columns = ("bug_status", "priority", "assigned_to", "bug_id");
+
+  # DEFAULT
+  @order_columns = ("bug_status", "priority", "assigned_to", "bug_id");
 }
 
 # In the HTML interface, by default, we limit the returned results,
 # which speeds up quite a few searches where people are really only looking
 # for the top results.
 if ($format->{'extension'} eq 'html' && !defined $params->param('limit')) {
-    $params->param('limit', Bugzilla->params->{'default_search_limit'});
-    $vars->{'default_limited'} = 1;
+  $params->param('limit', Bugzilla->params->{'default_search_limit'});
+  $vars->{'default_limited'} = 1;
 }
 
 # Generate the basic SQL query that will be used to generate the bug list.
-my $search = new Bugzilla::Search('fields' => \@selectcolumns, 
-                                  'params' => scalar $params->Vars,
-                                  'order'  => \@order_columns,
-                                  'sharer' => $sharer_id);
+my $search = new Bugzilla::Search(
+  'fields' => \@selectcolumns,
+  'params' => scalar $params->Vars,
+  'order'  => \@order_columns,
+  'sharer' => $sharer_id
+);
 
 $order = join(',', $search->order);
 
 if (scalar @{$search->invalid_order_columns}) {
-    $vars->{'message'} = 'invalid_column_name';
-    $vars->{'invalid_fragments'} = $search->invalid_order_columns;
+  $vars->{'message'}           = 'invalid_column_name';
+  $vars->{'invalid_fragments'} = $search->invalid_order_columns;
 }
 
-if ($fulltext and grep { /^relevance/ } $search->order) {
-    $vars->{'message'} = 'buglist_sorted_by_relevance'
+if ($fulltext and grep {/^relevance/} $search->order) {
+  $vars->{'message'} = 'buglist_sorted_by_relevance';
 }
 
 # We don't want saved searches and other buglist things to save
@@ -710,22 +721,22 @@ $params->delete('limit') if $vars->{'default_limited'};
 # Time to use server push to display an interim message to the user until
 # the query completes and we can display the bug list.
 if ($serverpush) {
-    print $cgi->multipart_init();
-    print $cgi->multipart_start(-type => 'text/html');
-
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process("list/server-push.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-
-    # Under mod_perl, flush stdout so that the page actually shows up.
-    if ($ENV{MOD_PERL}) {
-        require Apache2::RequestUtil;
-        Apache2::RequestUtil->request->rflush();
-    }
-
-    # Don't do multipart_end() until we're ready to display the replacement
-    # page, otherwise any errors that happen before then (like SQL errors)
-    # will result in a blank page being shown to the user instead of the error.
+  print $cgi->multipart_init();
+  print $cgi->multipart_start(-type => 'text/html');
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process("list/server-push.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+
+  # Under mod_perl, flush stdout so that the page actually shows up.
+  if ($ENV{MOD_PERL}) {
+    require Apache2::RequestUtil;
+    Apache2::RequestUtil->request->rflush();
+  }
+
+  # Don't do multipart_end() until we're ready to display the replacement
+  # page, otherwise any errors that happen before then (like SQL errors)
+  # will result in a blank page being shown to the user instead of the error.
 }
 
 # Connect to the shadow database if this installation is using one to improve
@@ -742,24 +753,25 @@ $::SIG{PIPE} = 'DEFAULT';
 my ($data, $extra_data) = $search->data;
 $vars->{'search_description'} = $search->search_description;
 
-if ($cgi->param('debug')
-    && Bugzilla->params->{debug_group}
-    && $user->in_group(Bugzilla->params->{debug_group})
-) {
-    $vars->{'debug'} = 1;
-    $vars->{'queries'} = $extra_data;
-    my $query_time = 0;
-    $query_time += $_->{'time'} foreach @$extra_data;
-    $vars->{'query_time'} = $query_time;
-    # Explains are limited to admins because you could use them to figure
-    # out how many hidden bugs are in a particular product (by doing
-    # searches and looking at the number of rows the explain says it's
-    # examining).
-    if ($user->in_group('admin')) {
-        foreach my $query (@$extra_data) {
-            $query->{explain} = $dbh->bz_explain($query->{sql});
-        }
+if ( $cgi->param('debug')
+  && Bugzilla->params->{debug_group}
+  && $user->in_group(Bugzilla->params->{debug_group}))
+{
+  $vars->{'debug'}   = 1;
+  $vars->{'queries'} = $extra_data;
+  my $query_time = 0;
+  $query_time += $_->{'time'} foreach @$extra_data;
+  $vars->{'query_time'} = $query_time;
+
+  # Explains are limited to admins because you could use them to figure
+  # out how many hidden bugs are in a particular product (by doing
+  # searches and looking at the number of rows the explain says it's
+  # examining).
+  if ($user->in_group('admin')) {
+    foreach my $query (@$extra_data) {
+      $query->{explain} = $dbh->bz_explain($query->{sql});
     }
+  }
 }
 
 ################################################################################
@@ -771,72 +783,74 @@ if ($cgi->param('debug')
 
 # If we're doing time tracking, then keep totals for all bugs.
 my $percentage_complete = grep($_ eq 'percentage_complete', @displaycolumns);
-my $estimated_time      = grep($_ eq 'estimated_time', @displaycolumns);
-my $remaining_time      = grep($_ eq 'remaining_time', @displaycolumns)
-                            || $percentage_complete;
-my $actual_time         = grep($_ eq 'actual_time', @displaycolumns)
-                            || $percentage_complete;
-
-my $time_info = { 'estimated_time' => 0,
-                  'remaining_time' => 0,
-                  'actual_time' => 0,
-                  'percentage_complete' => 0,
-                  'time_present' => ($estimated_time || $remaining_time ||
-                                     $actual_time || $percentage_complete),
-                };
-
-my $bugowners = {};
-my $bugproducts = {};
+my $estimated_time      = grep($_ eq 'estimated_time',      @displaycolumns);
+my $remaining_time
+  = grep($_ eq 'remaining_time', @displaycolumns) || $percentage_complete;
+my $actual_time
+  = grep($_ eq 'actual_time', @displaycolumns) || $percentage_complete;
+
+my $time_info = {
+  'estimated_time'      => 0,
+  'remaining_time'      => 0,
+  'actual_time'         => 0,
+  'percentage_complete' => 0,
+  'time_present' =>
+    ($estimated_time || $remaining_time || $actual_time || $percentage_complete),
+};
+
+my $bugowners       = {};
+my $bugproducts     = {};
 my $bugcomponentids = {};
-my $bugcomponents = {};
-my $bugstatuses = {};
+my $bugcomponents   = {};
+my $bugstatuses     = {};
 my @bugidlist;
 
-my @bugs; # the list of records
+my @bugs;    # the list of records
 
 foreach my $row (@$data) {
-    my $bug = {}; # a record
-
-    # Slurp the row of data into the record.
-    # The second from last column in the record is the number of groups
-    # to which the bug is restricted.
-    foreach my $column (@selectcolumns) {
-        $bug->{$column} = shift @$row;
-    }
-
-    # Process certain values further (i.e. date format conversion).
-    if ($bug->{'changeddate'}) {
-        $bug->{'changeddate'} =~ 
-            s/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/$1-$2-$3 $4:$5:$6/;
-
-        $bug->{'changedtime'} = $bug->{'changeddate'}; # for iCalendar and Atom
-        $bug->{'changeddate'} = DiffDate($bug->{'changeddate'});
-    }
-
-    if ($bug->{'opendate'}) {
-        $bug->{'opentime'} = $bug->{'opendate'}; # for iCalendar
-        $bug->{'opendate'} = DiffDate($bug->{'opendate'});
-    }
-
-    # Record the assignee, product, and status in the big hashes of those things.
-    $bugowners->{$bug->{'assigned_to'}} = 1 if $bug->{'assigned_to'};
-    $bugproducts->{$bug->{'product'}} = 1 if $bug->{'product'};
-    $bugcomponentids->{$bug->{'bugs.component_id'}} = 1 if $bug->{'bugs.component_id'};
-    $bugcomponents->{$bug->{'component'}} = 1 if $bug->{'component'};
-    $bugstatuses->{$bug->{'bug_status'}} = 1 if $bug->{'bug_status'};
-
-    $bug->{'secure_mode'} = undef;
-
-    # Add the record to the list.
-    push(@bugs, $bug);
-
-    # Add id to list for checking for bug privacy later
-    push(@bugidlist, $bug->{'bug_id'});
-
-    # Compute time tracking info.
-    $time_info->{'estimated_time'} += $bug->{'estimated_time'} if ($estimated_time);
-    $time_info->{'remaining_time'} += $bug->{'remaining_time'} if ($remaining_time);
-    $time_info->{'actual_time'}    += $bug->{'actual_time'}    if ($actual_time);
+  my $bug = {};    # a record
+
+  # Slurp the row of data into the record.
+  # The second from last column in the record is the number of groups
+  # to which the bug is restricted.
+  foreach my $column (@selectcolumns) {
+    $bug->{$column} = shift @$row;
+  }
+
+  # Process certain values further (i.e. date format conversion).
+  if ($bug->{'changeddate'}) {
+    $bug->{'changeddate'}
+      =~ s/^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/$1-$2-$3 $4:$5:$6/;
+
+    $bug->{'changedtime'} = $bug->{'changeddate'};          # for iCalendar and Atom
+    $bug->{'changeddate'} = DiffDate($bug->{'changeddate'});
+  }
+
+  if ($bug->{'opendate'}) {
+    $bug->{'opentime'} = $bug->{'opendate'};                # for iCalendar
+    $bug->{'opendate'} = DiffDate($bug->{'opendate'});
+  }
+
+  # Record the assignee, product, and status in the big hashes of those things.
+  $bugowners->{$bug->{'assigned_to'}} = 1 if $bug->{'assigned_to'};
+  $bugproducts->{$bug->{'product'}}   = 1 if $bug->{'product'};
+  $bugcomponentids->{$bug->{'bugs.component_id'}} = 1
+    if $bug->{'bugs.component_id'};
+  $bugcomponents->{$bug->{'component'}} = 1 if $bug->{'component'};
+  $bugstatuses->{$bug->{'bug_status'}}  = 1 if $bug->{'bug_status'};
+
+  $bug->{'secure_mode'} = undef;
+
+  # Add the record to the list.
+  push(@bugs, $bug);
+
+  # Add id to list for checking for bug privacy later
+  push(@bugidlist, $bug->{'bug_id'});
+
+  # Compute time tracking info.
+  $time_info->{'estimated_time'} += $bug->{'estimated_time'} if ($estimated_time);
+  $time_info->{'remaining_time'} += $bug->{'remaining_time'} if ($remaining_time);
+  $time_info->{'actual_time'}    += $bug->{'actual_time'}    if ($actual_time);
 }
 
 # Check for bug privacy and set $bug->{'secure_mode'} to 'implied' or 'manual'
@@ -844,39 +858,41 @@ foreach my $row (@$data) {
 # or because of human choice
 my %min_membercontrol;
 if (@bugidlist) {
-    my $sth = $dbh->prepare(
-        "SELECT DISTINCT bugs.bug_id, MIN(group_control_map.membercontrol) " .
-          "FROM bugs " .
-    "INNER JOIN bug_group_map " .
-            "ON bugs.bug_id = bug_group_map.bug_id " .
-     "LEFT JOIN group_control_map " .
-            "ON group_control_map.product_id = bugs.product_id " .
-           "AND group_control_map.group_id = bug_group_map.group_id " .
-         "WHERE " . $dbh->sql_in('bugs.bug_id', \@bugidlist) . 
-            $dbh->sql_group_by('bugs.bug_id'));
-    $sth->execute();
-    while (my ($bug_id, $min_membercontrol) = $sth->fetchrow_array()) {
-        $min_membercontrol{$bug_id} = $min_membercontrol || CONTROLMAPNA;
+  my $sth
+    = $dbh->prepare(
+        "SELECT DISTINCT bugs.bug_id, MIN(group_control_map.membercontrol) "
+      . "FROM bugs "
+      . "INNER JOIN bug_group_map "
+      . "ON bugs.bug_id = bug_group_map.bug_id "
+      . "LEFT JOIN group_control_map "
+      . "ON group_control_map.product_id = bugs.product_id "
+      . "AND group_control_map.group_id = bug_group_map.group_id "
+      . "WHERE "
+      . $dbh->sql_in('bugs.bug_id', \@bugidlist)
+      . $dbh->sql_group_by('bugs.bug_id'));
+  $sth->execute();
+  while (my ($bug_id, $min_membercontrol) = $sth->fetchrow_array()) {
+    $min_membercontrol{$bug_id} = $min_membercontrol || CONTROLMAPNA;
+  }
+  foreach my $bug (@bugs) {
+    next unless defined($min_membercontrol{$bug->{'bug_id'}});
+    if ($min_membercontrol{$bug->{'bug_id'}} == CONTROLMAPMANDATORY) {
+      $bug->{'secure_mode'} = 'implied';
     }
-    foreach my $bug (@bugs) {
-        next unless defined($min_membercontrol{$bug->{'bug_id'}});
-        if ($min_membercontrol{$bug->{'bug_id'}} == CONTROLMAPMANDATORY) {
-            $bug->{'secure_mode'} = 'implied';
-        }
-        else {
-            $bug->{'secure_mode'} = 'manual';
-        }
+    else {
+      $bug->{'secure_mode'} = 'manual';
     }
+  }
 }
 
 # Compute percentage complete without rounding.
-my $sum = $time_info->{'actual_time'}+$time_info->{'remaining_time'};
+my $sum = $time_info->{'actual_time'} + $time_info->{'remaining_time'};
 if ($sum > 0) {
-    $time_info->{'percentage_complete'} = 100*$time_info->{'actual_time'}/$sum;
+  $time_info->{'percentage_complete'} = 100 * $time_info->{'actual_time'} / $sum;
+}
+else {    # remaining_time <= 0
+  $time_info->{'percentage_complete'} = 0;
 }
-else { # remaining_time <= 0 
-    $time_info->{'percentage_complete'} = 0
-}                             
 
 ################################################################################
 # Template Variable Definition
@@ -884,45 +900,45 @@ else { # remaining_time <= 0
 
 # Define the variables and functions that will be passed to the UI template.
 
-$vars->{'bugs'} = \@bugs;
-$vars->{'buglist'} = \@bugidlist;
-$vars->{'columns'} = $columns;
+$vars->{'bugs'}           = \@bugs;
+$vars->{'buglist'}        = \@bugidlist;
+$vars->{'columns'}        = $columns;
 $vars->{'displaycolumns'} = \@displaycolumns;
 
 $vars->{'openstates'} = [BUG_STATE_OPEN];
-$vars->{'closedstates'} = [map {$_->name} closed_bug_statuses()];
+$vars->{'closedstates'} = [map { $_->name } closed_bug_statuses()];
 
 # The iCal file needs priorities ordered from 1 to 9 (highest to lowest)
 # If there are more than 9 values, just make all the lower ones 9
 if ($format->{'extension'} eq 'ics') {
-    my $n = 1;
-    $vars->{'ics_priorities'} = {};
-    my $priorities = get_legal_field_values('priority');
-    foreach my $p (@$priorities) {
-        $vars->{'ics_priorities'}->{$p} = ($n > 9) ? 9 : $n++;
-    }
+  my $n = 1;
+  $vars->{'ics_priorities'} = {};
+  my $priorities = get_legal_field_values('priority');
+  foreach my $p (@$priorities) {
+    $vars->{'ics_priorities'}->{$p} = ($n > 9) ? 9 : $n++;
+  }
 }
 
-$vars->{'order'} = $order;
+$vars->{'order'}       = $order;
 $vars->{'caneditbugs'} = 1;
-$vars->{'time_info'} = $time_info;
+$vars->{'time_info'}   = $time_info;
 
 if (!$user->in_group('editbugs')) {
-    foreach my $product (keys %$bugproducts) {
-        my $prod = Bugzilla::Product->new({name => $product, cache => 1});
-        if (!$user->in_group('editbugs', $prod->id)) {
-            $vars->{'caneditbugs'} = 0;
-            last;
-        }
+  foreach my $product (keys %$bugproducts) {
+    my $prod = Bugzilla::Product->new({name => $product, cache => 1});
+    if (!$user->in_group('editbugs', $prod->id)) {
+      $vars->{'caneditbugs'} = 0;
+      last;
     }
+  }
 }
 
 my @bugowners = keys %$bugowners;
-if (scalar(@bugowners) > 1 && $user->in_group('editbugs')) {
-    my $suffix = Bugzilla->params->{'emailsuffix'};
-    map(s/$/$suffix/, @bugowners) if $suffix;
-    my $bugowners = join(",", @bugowners);
-    $vars->{'bugowners'} = $bugowners;
+if ( scalar(@bugowners) > 1
+  && $user->in_group('editbugs')
+  && Bugzilla->params->{'use_email_as_login'})
+{
+  $vars->{'bugowners'} = join(",", @bugowners);
 }
 
 # Whether or not to split the column titles across two rows to make
@@ -930,7 +946,7 @@ if (scalar(@bugowners) > 1 && $user->in_group('editbugs')) {
 $vars->{'splitheader'} = $cgi->cookie('SPLITHEADER') ? 1 : 0;
 
 if ($user->settings->{'display_quips'}->{'value'} eq 'on') {
-    $vars->{'quip'} = GetQuip();
+  $vars->{'quip'} = GetQuip();
 }
 
 $vars->{'currenttime'} = localtime(time());
@@ -940,18 +956,20 @@ $vars->{'currenttime'} = localtime(time());
 my @products = keys %$bugproducts;
 my $one_product;
 if (scalar(@products) == 1) {
-    $one_product = Bugzilla::Product->new({ name => $products[0], cache => 1 });
+  $one_product = Bugzilla::Product->new({name => $products[0], cache => 1});
 }
+
 # This is used in the "Zarroo Boogs" case.
-elsif (my @product_input = $cgi->param('product')) {
-    if (scalar(@product_input) == 1 and $product_input[0] ne '') {
-        $one_product = Bugzilla::Product->new({ name => $product_input[0], cache => 1 });
-    }
+elsif (my @product_input = $cgi->multi_param('product')) {
+  if (scalar(@product_input) == 1 and $product_input[0] ne '') {
+    $one_product = Bugzilla::Product->new({name => $product_input[0], cache => 1});
+  }
 }
-# We only want the template to use it if the user can actually 
+
+# We only want the template to use it if the user can actually
 # enter bugs against it.
 if ($one_product && $user->can_enter_product($one_product)) {
-    $vars->{'one_product'} = $one_product;
+  $vars->{'one_product'} = $one_product;
 }
 
 # See if there's only one component in all the results (or only one component
@@ -959,126 +977,130 @@ if ($one_product && $user->can_enter_product($one_product)) {
 my @components = keys %$bugcomponents;
 my $one_component;
 if (scalar(@components) == 1) {
-    $vars->{one_component} = $components[0];
+  $vars->{one_component} = $components[0];
 }
+
 # This is used in the "Zarroo Boogs" case.
-elsif (my @component_input = $cgi->param('component')) {
-    if (scalar(@component_input) == 1 and $component_input[0] ne '') {
-        $vars->{one_component}= $cgi->param('component');
-    }
+elsif (my @component_input = $cgi->multi_param('component')) {
+  if (scalar(@component_input) == 1 and $component_input[0] ne '') {
+    $vars->{one_component} = $cgi->param('component');
+  }
 }
 
 # The following variables are used when the user is making changes to multiple bugs.
 if ($dotweak && scalar @bugs) {
-    if (!$vars->{'caneditbugs'}) {
-        ThrowUserError('auth_failure', {group  => 'editbugs',
-                                        action => 'modify',
-                                        object => 'multiple_bugs'});
-    }
-    $vars->{'dotweak'} = 1;
-  
-    # issue_session_token needs to write to the master DB.
-    Bugzilla->switch_to_main_db();
-    $vars->{'token'} = issue_session_token('buglist_mass_change');
-    Bugzilla->switch_to_shadow_db();
-
-    $vars->{'products'} = $user->get_enterable_products;
-    $vars->{'platforms'} = get_legal_field_values('rep_platform');
-    $vars->{'op_sys'} = get_legal_field_values('op_sys');
-    $vars->{'priorities'} = get_legal_field_values('priority');
-    $vars->{'severities'} = get_legal_field_values('bug_severity');
-    $vars->{'resolutions'} = get_legal_field_values('resolution');
-
-    ($vars->{'flag_types'}, $vars->{any_flags_requesteeble})
-        = _get_common_flag_types([keys %$bugcomponentids]);
-
-    # Convert bug statuses to their ID.
-    my @bug_statuses = map {$dbh->quote($_)} keys %$bugstatuses;
-    my $bug_status_ids =
-      $dbh->selectcol_arrayref('SELECT id FROM bug_status
-                               WHERE ' . $dbh->sql_in('value', \@bug_statuses));
-
-    # This query collects new statuses which are common to all current bug statuses.
-    # It also accepts transitions where the bug status doesn't change.
-    $bug_status_ids =
-      $dbh->selectcol_arrayref(
-            'SELECT DISTINCT sw1.new_status
+  if (!$vars->{'caneditbugs'}) {
+    ThrowUserError('auth_failure',
+      {group => 'editbugs', action => 'modify', object => 'multiple_bugs'});
+  }
+  $vars->{'dotweak'} = 1;
+
+  # issue_session_token needs to write to the master DB.
+  Bugzilla->switch_to_main_db();
+  $vars->{'token'} = issue_session_token('buglist_mass_change');
+  Bugzilla->switch_to_shadow_db();
+
+  $vars->{'products'}    = $user->get_enterable_products;
+  $vars->{'platforms'}   = get_legal_field_values('rep_platform');
+  $vars->{'op_sys'}      = get_legal_field_values('op_sys');
+  $vars->{'priorities'}  = get_legal_field_values('priority');
+  $vars->{'severities'}  = get_legal_field_values('bug_severity');
+  $vars->{'resolutions'} = get_legal_field_values('resolution');
+
+  ($vars->{'flag_types'}, $vars->{any_flags_requesteeble})
+    = _get_common_flag_types([keys %$bugcomponentids]);
+
+  # Convert bug statuses to their ID.
+  my @bug_statuses = map { $dbh->quote($_) } keys %$bugstatuses;
+  my $bug_status_ids = $dbh->selectcol_arrayref(
+    'SELECT id FROM bug_status
+                               WHERE ' . $dbh->sql_in('value', \@bug_statuses)
+  );
+
+  # This query collects new statuses which are common to all current bug statuses.
+  # It also accepts transitions where the bug status doesn't change.
+  $bug_status_ids = $dbh->selectcol_arrayref(
+    'SELECT DISTINCT sw1.new_status
                FROM status_workflow sw1
          INNER JOIN bug_status
                  ON bug_status.id = sw1.new_status
               WHERE bug_status.isactive = 1
-                AND NOT EXISTS 
+                AND NOT EXISTS
                    (SELECT * FROM status_workflow sw2
-                     WHERE sw2.old_status != sw1.new_status 
+                     WHERE sw2.old_status != sw1.new_status
                            AND '
-                         . $dbh->sql_in('sw2.old_status', $bug_status_ids)
-                         . ' AND NOT EXISTS 
+      . $dbh->sql_in('sw2.old_status', $bug_status_ids) . ' AND NOT EXISTS
                            (SELECT * FROM status_workflow sw3
                              WHERE sw3.new_status = sw1.new_status
-                                   AND sw3.old_status = sw2.old_status))');
-
-    $vars->{'current_bug_statuses'} = [keys %$bugstatuses];
-    $vars->{'new_bug_statuses'} = Bugzilla::Status->new_from_list($bug_status_ids);
-
-    # The groups the user belongs to and which are editable for the given buglist.
-    $vars->{'groups'} = GetGroups(\@products);
-
-    # If all bugs being changed are in the same product, the user can change
-    # their version and component, so generate a list of products, a list of
-    # versions for the product (if there is only one product on the list of
-    # products), and a list of components for the product.
-    if ($one_product) {
-        $vars->{'versions'} = [map($_->name, grep($_->is_active, @{ $one_product->versions }))];
-        $vars->{'components'} = [map($_->name, grep($_->is_active, @{ $one_product->components }))];
-        if (Bugzilla->params->{'usetargetmilestone'}) {
-            $vars->{'milestones'} = [map($_->name, grep($_->is_active,
-                                               @{ $one_product->milestones }))];
-        }
+                                   AND sw3.old_status = sw2.old_status))'
+  );
+
+  $vars->{'current_bug_statuses'} = [keys %$bugstatuses];
+  $vars->{'new_bug_statuses'} = Bugzilla::Status->new_from_list($bug_status_ids);
+
+  # The groups the user belongs to and which are editable for the given buglist.
+  $vars->{'groups'} = GetGroups(\@products);
+
+  # If all bugs being changed are in the same product, the user can change
+  # their version and component, so generate a list of products, a list of
+  # versions for the product (if there is only one product on the list of
+  # products), and a list of components for the product.
+  if ($one_product) {
+    $vars->{'versions'}
+      = [map($_->name, grep($_->is_active, @{$one_product->versions}))];
+    $vars->{'components'}
+      = [map($_->name, grep($_->is_active, @{$one_product->components}))];
+    if (Bugzilla->params->{'usetargetmilestone'}) {
+      $vars->{'milestones'}
+        = [map($_->name, grep($_->is_active, @{$one_product->milestones}))];
+    }
+  }
+  else {
+    # We will only show the values at are active in all products.
+    my %values = ();
+    my @fields = ('components', 'versions');
+    if (Bugzilla->params->{'usetargetmilestone'}) {
+      push @fields, 'milestones';
     }
-    else {
-        # We will only show the values at are active in all products.
-        my %values = ();
-        my @fields = ('components', 'versions');
-        if (Bugzilla->params->{'usetargetmilestone'}) {
-            push @fields, 'milestones';
-        }
 
-        # Go through each product and count the number of times each field
-        # is used
-        foreach my $product_name (@products) {
-            my $product = Bugzilla::Product->new({name => $product_name, cache => 1});
-            foreach my $field (@fields) {
-                my $list = $product->$field;
-                foreach my $item (@$list) {
-                    ++$values{$field}{$item->name} if $item->is_active;
-                }
-            }
+    # Go through each product and count the number of times each field
+    # is used
+    foreach my $product_name (@products) {
+      my $product = Bugzilla::Product->new({name => $product_name, cache => 1});
+      foreach my $field (@fields) {
+        my $list = $product->$field;
+        foreach my $item (@$list) {
+          ++$values{$field}{$item->name} if $item->is_active;
         }
+      }
+    }
 
-        # Now we get the list of each field and see which values have
-        # $product_count (i.e. appears in every product)
-        my $product_count = scalar(@products);
-        foreach my $field (@fields) {
-            my @values = grep { $values{$field}{$_} == $product_count } keys %{$values{$field}};
-            if (scalar @values) {
-                @{$vars->{$field}} = $field eq 'version'
-                    ? sort { vers_cmp(lc($a), lc($b)) } @values
-                    : sort { lc($a) cmp lc($b) } @values
-            }
-
-            # Do we need to show a warning about limited visiblity?
-            if (@values != scalar keys %{$values{$field}}) {
-                $vars->{excluded_values} = 1;
-            }
-        }
+    # Now we get the list of each field and see which values have
+    # $product_count (i.e. appears in every product)
+    my $product_count = scalar(@products);
+    foreach my $field (@fields) {
+      my @values
+        = grep { $values{$field}{$_} == $product_count } keys %{$values{$field}};
+      if (scalar @values) {
+        @{$vars->{$field}}
+          = $field eq 'version'
+          ? sort { vers_cmp(lc($a), lc($b)) } @values
+          : sort { lc($a) cmp lc($b) } @values;
+      }
+
+      # Do we need to show a warning about limited visiblity?
+      if (@values != scalar keys %{$values{$field}}) {
+        $vars->{excluded_values} = 1;
+      }
     }
+  }
 }
 
 # If we're editing a stored query, use the existing query name as default for
 # the "Remember search as" field.
 $vars->{'defaultsavename'} = $cgi->param('query_based_on');
 
-# If we did a quick search then redisplay the previously entered search 
+# If we did a quick search then redisplay the previously entered search
 # string in the text field.
 $vars->{'quicksearch'} = $searchstring;
 
@@ -1092,42 +1114,45 @@ my $contenttype;
 my $disposition = "inline";
 
 if ($format->{'extension'} eq "html") {
-    my $list_id = $cgi->param('list_id') || $cgi->param('regetlastlist');
-    my $search = $user->save_last_search(
-        { bugs => \@bugidlist, order => $order, vars => $vars, list_id => $list_id });
-    $cgi->param('list_id', $search->id) if $search;
-    $contenttype = "text/html";
+  my $list_id = $cgi->param('list_id') || $cgi->param('regetlastlist');
+  my $search = $user->save_last_search(
+    {bugs => \@bugidlist, order => $order, vars => $vars, list_id => $list_id});
+  $cgi->param('list_id', $search->id) if $search;
+  $contenttype = "text/html";
 }
 else {
-    $contenttype = $format->{'ctype'};
+  $contenttype = $format->{'ctype'};
 }
 
 # Set 'urlquerypart' once the buglist ID is known.
-$vars->{'urlquerypart'} = $params->canonicalise_query('order', 'cmdtype',
-                                                      'query_based_on',
-                                                      'token');
+$vars->{'urlquerypart'}
+  = $params->canonicalise_query('order', 'cmdtype', 'query_based_on', 'token');
 
 if ($format->{'extension'} eq "csv") {
-    # We set CSV files to be downloaded, as they are designed for importing
-    # into other programs.
-    $disposition = "attachment";
 
-    # If the user clicked the CSV link in the search results,
-    # They should get the Field Description, not the column name in the db
-    $vars->{'human'} = $cgi->param('human');
+  # We set CSV files to be downloaded, as they are designed for importing
+  # into other programs.
+  $disposition = "attachment";
+
+  # If the user clicked the CSV link in the search results,
+  # They should get the Field Description, not the column name in the db
+  $vars->{'human'} = $cgi->param('human');
 }
 
-$cgi->close_standby_message($contenttype, $disposition, $disp_prefix, $format->{'extension'});
+$cgi->close_standby_message($contenttype, $disposition, $disp_prefix,
+  $format->{'extension'});
 
 ################################################################################
 # Content Generation
 ################################################################################
 
+Bugzilla::Hook::process("buglist_format",
+  {'vars' => $vars, 'format' => $format, 'params' => $params});
+
 # Generate and return the UI (HTML page) from the appropriate template.
 $template->process($format->{'template'}, $vars)
   || ThrowTemplateError($template->error());
 
-
 ################################################################################
 # Script Conclusion
 ################################################################################
diff --git a/chart.cgi b/chart.cgi
index 96ac9e1cf7..d3ecdf3134 100755
--- a/chart.cgi
+++ b/chart.cgi
@@ -27,11 +27,11 @@
 # Bonus:
 # Offer subscription when you get a "series already exists" error?
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -46,313 +46,318 @@ use Bugzilla::Token;
 # when preparing Bugzilla for mod_perl, this script used these
 # variables in so many subroutines that it was easier to just
 # make them globals.
-local our $cgi = Bugzilla->cgi;
+local our $cgi      = Bugzilla->cgi;
 local our $template = Bugzilla->template;
-local our $vars = {};
+local our $vars     = {};
 my $dbh = Bugzilla->dbh;
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 if (!Bugzilla->feature('new_charts')) {
-    ThrowUserError('feature_disabled', { feature => 'new_charts' });
+  ThrowUserError('feature_disabled', {feature => 'new_charts'});
 }
 
 # Go back to query.cgi if we are adding a boolean chart parameter.
-if (grep(/^cmd-/, $cgi->param())) {
-    my $params = $cgi->canonicalise_query("format", "ctype", "action");
-    print $cgi->redirect("query.cgi?format=" . $cgi->param('query_format') .
-                                               ($params ? "&$params" : ""));
-    exit;
+if (grep(/^cmd-/, $cgi->multi_param())) {
+  my $params = $cgi->canonicalise_query("format", "ctype", "action");
+  print $cgi->redirect("query.cgi?format="
+      . $cgi->param('query_format')
+      . ($params ? "&$params" : ""));
+  exit;
 }
 
-my $action = $cgi->param('action');
+my $action    = $cgi->param('action');
 my $series_id = $cgi->param('series_id');
-$vars->{'doc_section'} = 'using.html#charts';
+$vars->{'doc_section'} = 'using/reports-and-charts.html#charts';
 
 # Because some actions are chosen by buttons, we can't encode them as the value
 # of the action param, because that value is localization-dependent. So, we
 # encode it in the name, as "action-<action>". Some params even contain the
 # series_id they apply to (e.g. subscribe, unsubscribe).
-my @actions = grep(/^action-/, $cgi->param());
+my @actions = grep(/^action-/, $cgi->multi_param());
 if ($actions[0] && $actions[0] =~ /^action-([^\d]+)(\d*)$/) {
-    $action = $1;
-    $series_id = $2 if $2;
+  $action = $1;
+  $series_id = $2 if $2;
 }
 
 $action ||= "assemble";
 
 # Go to buglist.cgi if we are doing a search.
 if ($action eq "search") {
-    my $params = $cgi->canonicalise_query("format", "ctype", "action");
-    print $cgi->redirect("buglist.cgi" . ($params ? "?$params" : ""));
-    exit;
+  my $params = $cgi->canonicalise_query("format", "ctype", "action");
+  print $cgi->redirect("buglist.cgi" . ($params ? "?$params" : ""));
+  exit;
 }
 
-$user->in_group(Bugzilla->params->{"chartgroup"})
-  || ThrowUserError("auth_failure", {group  => Bugzilla->params->{"chartgroup"},
-                                     action => "use",
-                                     object => "charts"});
+$user->in_group(Bugzilla->params->{"chartgroup"}) || ThrowUserError(
+  "auth_failure",
+  {
+    group  => Bugzilla->params->{"chartgroup"},
+    action => "use",
+    object => "charts"
+  }
+);
 
 # Only admins may create public queries
 $user->in_group('admin') || $cgi->delete('public');
 
 # All these actions relate to chart construction.
 if ($action =~ /^(assemble|add|remove|sum|subscribe|unsubscribe)$/) {
-    # These two need to be done before the creation of the Chart object, so
-    # that the changes they make will be reflected in it.
-    if ($action =~ /^subscribe|unsubscribe$/) {
-        detaint_natural($series_id) || ThrowCodeError("invalid_series_id");
-        my $series = new Bugzilla::Series($series_id);
-        $series->$action($user->id);
-    }
-
-    my $chart = new Bugzilla::Chart($cgi);
-
-    if ($action =~ /^remove|sum$/) {
-        $chart->$action(getSelectedLines());
-    }
-    elsif ($action eq "add") {
-        my @series_ids = getAndValidateSeriesIDs();
-        $chart->add(@series_ids);
-    }
 
-    view($chart);
+  # These two need to be done before the creation of the Chart object, so
+  # that the changes they make will be reflected in it.
+  if ($action =~ /^subscribe|unsubscribe$/) {
+    detaint_natural($series_id) || ThrowCodeError("invalid_series_id");
+    my $series = new Bugzilla::Series($series_id);
+    $series->$action($user->id);
+  }
+
+  my $chart = new Bugzilla::Chart($cgi);
+
+  if ($action =~ /^remove|sum$/) {
+    $chart->$action(getSelectedLines());
+  }
+  elsif ($action eq "add") {
+    my @series_ids = getAndValidateSeriesIDs();
+    $chart->add(@series_ids);
+  }
+
+  view($chart);
 }
 elsif ($action eq "plot") {
-    plot();
+  plot();
 }
 elsif ($action eq "wrap") {
-    # For CSV "wrap", we go straight to "plot".
-    if ($cgi->param('ctype') && $cgi->param('ctype') eq "csv") {
-        plot();
-    }
-    else {
-        wrap();
-    }
+
+  # For CSV "wrap", we go straight to "plot".
+  if ($cgi->param('ctype') && $cgi->param('ctype') eq "csv") {
+    plot();
+  }
+  else {
+    wrap();
+  }
 }
 elsif ($action eq "create") {
-    assertCanCreate($cgi);
-    my $token = $cgi->param('token');
-    check_hash_token($token, ['create-series']);
-    
-    my $series = new Bugzilla::Series($cgi);
+  assertCanCreate($cgi);
+  my $token = $cgi->param('token');
+  check_hash_token($token, ['create-series']);
 
-    ThrowUserError("series_already_exists", {'series' => $series})
-      if $series->existsInDatabase;
+  my $series = new Bugzilla::Series($cgi);
 
-    $series->writeToDatabase();
-    $vars->{'message'} = "series_created";
-    $vars->{'series'} = $series;
+  ThrowUserError("series_already_exists", {'series' => $series})
+    if $series->existsInDatabase;
 
-    my $chart = new Bugzilla::Chart($cgi);
-    view($chart);
+  $series->writeToDatabase();
+  $vars->{'message'} = "series_created";
+  $vars->{'series'}  = $series;
+
+  my $chart = new Bugzilla::Chart($cgi);
+  view($chart);
 }
 elsif ($action eq "edit") {
-    my $series = assertCanEdit($series_id);
-    edit($series);
+  my $series = assertCanEdit($series_id);
+  edit($series);
 }
 elsif ($action eq "alter") {
-    my $series = assertCanEdit($series_id);
-    my $token = $cgi->param('token');
-    check_hash_token($token, [$series->id, $series->name]);
-    # XXX - This should be replaced by $series->set_foo() methods.
-    $series = new Bugzilla::Series($cgi);
-
-    # We need to check if there is _another_ series in the database with
-    # our (potentially new) name. So we call existsInDatabase() to see if
-    # the return value is us or some other series we need to avoid stomping
-    # on.
-    my $id_of_series_in_db = $series->existsInDatabase();
-    if (defined($id_of_series_in_db) && 
-        $id_of_series_in_db != $series->{'series_id'}) 
-    {
-        ThrowUserError("series_already_exists", {'series' => $series});
-    }
-    
-    $series->writeToDatabase();
-    $vars->{'changes_saved'} = 1;
-    
-    edit($series);
+  my $series = assertCanEdit($series_id);
+  my $token  = $cgi->param('token');
+  check_hash_token($token, [$series->id, $series->name]);
+
+  # XXX - This should be replaced by $series->set_foo() methods.
+  $series = new Bugzilla::Series($cgi);
+
+  # We need to check if there is _another_ series in the database with
+  # our (potentially new) name. So we call existsInDatabase() to see if
+  # the return value is us or some other series we need to avoid stomping
+  # on.
+  my $id_of_series_in_db = $series->existsInDatabase();
+  if (defined($id_of_series_in_db)
+    && $id_of_series_in_db != $series->{'series_id'})
+  {
+    ThrowUserError("series_already_exists", {'series' => $series});
+  }
+
+  $series->writeToDatabase();
+  $vars->{'changes_saved'} = 1;
+
+  edit($series);
 }
 elsif ($action eq "confirm-delete") {
-    $vars->{'series'} = assertCanEdit($series_id);
+  $vars->{'series'} = assertCanEdit($series_id);
 
-    print $cgi->header();
-    $template->process("reports/delete-series.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("reports/delete-series.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 elsif ($action eq "delete") {
-    my $series = assertCanEdit($series_id);
-    my $token = $cgi->param('token');
-    check_hash_token($token, [$series->id, $series->name]);
-
-    $dbh->bz_start_transaction();
-
-    $series->remove_from_db();
-    # Remove (sub)categories which no longer have any series.
-    foreach my $cat (qw(category subcategory)) {
-        my $is_used = $dbh->selectrow_array("SELECT COUNT(*) FROM series WHERE $cat = ?",
-                                             undef, $series->{"${cat}_id"});
-        if (!$is_used) {
-            $dbh->do('DELETE FROM series_categories WHERE id = ?',
-                      undef, $series->{"${cat}_id"});
-        }
+  my $series = assertCanEdit($series_id);
+  my $token  = $cgi->param('token');
+  check_hash_token($token, [$series->id, $series->name]);
+
+  $dbh->bz_start_transaction();
+
+  $series->remove_from_db();
+
+  # Remove (sub)categories which no longer have any series.
+  foreach my $cat (qw(category subcategory)) {
+    my $is_used
+      = $dbh->selectrow_array("SELECT COUNT(*) FROM series WHERE $cat = ?",
+      undef, $series->{"${cat}_id"});
+    if (!$is_used) {
+      $dbh->do('DELETE FROM series_categories WHERE id = ?',
+        undef, $series->{"${cat}_id"});
     }
-    $dbh->bz_commit_transaction();
+  }
+  $dbh->bz_commit_transaction();
 
-    $vars->{'message'} = "series_deleted";
-    $vars->{'series'} = $series;
-    view();
+  $vars->{'message'} = "series_deleted";
+  $vars->{'series'}  = $series;
+  view();
 }
 elsif ($action eq "convert_search") {
-    my $saved_search = $cgi->param('series_from_search') || '';
-    my ($query) = grep { $_->name eq $saved_search } @{ $user->queries };
-    my $url = '';
-    if ($query) {
-        my $params = new Bugzilla::CGI($query->edit_link);
-        # These two parameters conflict with the one below.
-        $url = $params->canonicalise_query('format', 'query_format');
-        $url = '&amp;' . html_quote($url);
-    }
-    print $cgi->redirect(-location => correct_urlbase() . "query.cgi?format=create-series$url");
+  my $saved_search = $cgi->param('series_from_search') || '';
+  my ($query) = grep { $_->name eq $saved_search } @{$user->queries};
+  my $url = '';
+  if ($query) {
+    my $params = new Bugzilla::CGI($query->edit_link);
+
+    # These two parameters conflict with the one below.
+    $url = $params->canonicalise_query('format', 'query_format');
+    $url = '&amp;' . html_quote($url);
+  }
+  print $cgi->redirect(
+    -location => correct_urlbase() . "query.cgi?format=create-series$url");
 }
 else {
-    ThrowUserError('unknown_action', {action => $action});
+  ThrowUserError('unknown_action', {action => $action});
 }
 
 exit;
 
 # Find any selected series and return either the first or all of them.
 sub getAndValidateSeriesIDs {
-    my @series_ids = grep(/^\d+$/, $cgi->param("name"));
+  my @series_ids = grep(/^\d+$/, $cgi->multi_param("name"));
 
-    return wantarray ? @series_ids : $series_ids[0];
+  return wantarray ? @series_ids : $series_ids[0];
 }
 
 # Return a list of IDs of all the lines selected in the UI.
 sub getSelectedLines {
-    my @ids = map { /^select(\d+)$/ ? $1 : () } $cgi->param();
+  my @ids = map { /^select(\d+)$/a ? $1 : () } $cgi->multi_param();
 
-    return @ids;
+  return @ids;
 }
 
-# Check if the user is the owner of series_id or is an admin. 
+# Check if the user is the owner of series_id or is an admin.
 sub assertCanEdit {
-    my $series_id = shift;
-    my $user = Bugzilla->user;
+  my $series_id = shift;
+  my $user      = Bugzilla->user;
 
-    my $series = new Bugzilla::Series($series_id)
-      || ThrowCodeError('invalid_series_id');
+  my $series
+    = new Bugzilla::Series($series_id) || ThrowCodeError('invalid_series_id');
 
-    if (!$user->in_group('admin') && $series->{creator_id} != $user->id) {
-        ThrowUserError('illegal_series_edit');
-    }
+  if (!$user->in_group('admin') && $series->{creator_id} != $user->id) {
+    ThrowUserError('illegal_series_edit');
+  }
 
-    return $series;
+  return $series;
 }
 
 # Check if the user is permitted to create this series with these parameters.
 sub assertCanCreate {
-    my ($cgi) = shift;
-    my $user = Bugzilla->user;
+  my ($cgi) = shift;
+  my $user = Bugzilla->user;
 
-    $user->in_group("editbugs") || ThrowUserError("illegal_series_creation");
+  $user->in_group("editbugs") || ThrowUserError("illegal_series_creation");
 
-    # Check permission for frequency
-    my $min_freq = 7;
-    if ($cgi->param('frequency') < $min_freq && !$user->in_group("admin")) {
-        ThrowUserError("illegal_frequency", { 'minimum' => $min_freq });
-    }
+  # Check permission for frequency
+  my $min_freq = 7;
+  if ($cgi->param('frequency') < $min_freq && !$user->in_group("admin")) {
+    ThrowUserError("illegal_frequency", {'minimum' => $min_freq});
+  }
 }
 
 sub validateWidthAndHeight {
-    $vars->{'width'} = $cgi->param('width');
-    $vars->{'height'} = $cgi->param('height');
-
-    if (defined($vars->{'width'})) {
-       (detaint_natural($vars->{'width'}) && $vars->{'width'} > 0)
-         || ThrowUserError("invalid_dimensions");
-    }
-
-    if (defined($vars->{'height'})) {
-       (detaint_natural($vars->{'height'}) && $vars->{'height'} > 0)
-         || ThrowUserError("invalid_dimensions");
-    }
-
-    # The equivalent of 2000 square seems like a very reasonable maximum size.
-    # This is merely meant to prevent accidental or deliberate DOS, and should
-    # have no effect in practice.
-    if ($vars->{'width'} && $vars->{'height'}) {
-       (($vars->{'width'} * $vars->{'height'}) <= 4000000)
-         || ThrowUserError("chart_too_large");
-    }
+  $vars->{'width'}  = $cgi->param('width');
+  $vars->{'height'} = $cgi->param('height');
+
+  if (defined($vars->{'width'})) {
+    (detaint_natural($vars->{'width'}) && $vars->{'width'} > 0)
+      || ThrowUserError("invalid_dimensions");
+  }
+
+  if (defined($vars->{'height'})) {
+    (detaint_natural($vars->{'height'}) && $vars->{'height'} > 0)
+      || ThrowUserError("invalid_dimensions");
+  }
+
+  # The equivalent of 2000 square seems like a very reasonable maximum size.
+  # This is merely meant to prevent accidental or deliberate DOS, and should
+  # have no effect in practice.
+  if ($vars->{'width'} && $vars->{'height'}) {
+    (($vars->{'width'} * $vars->{'height'}) <= 4000000)
+      || ThrowUserError("chart_too_large");
+  }
 }
 
 sub edit {
-    my $series = shift;
+  my $series = shift;
 
-    $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
-    $vars->{'default'} = $series;
-    $vars->{'message'} = 'series_updated' if $vars->{'changes_saved'};
+  $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
+  $vars->{'default'}  = $series;
+  $vars->{'message'}  = 'series_updated' if $vars->{'changes_saved'};
 
-    print $cgi->header();
-    $template->process("reports/edit-series.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("reports/edit-series.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub plot {
-    validateWidthAndHeight();
-    $vars->{'chart'} = new Bugzilla::Chart($cgi);
-
-    my $format = $template->get_format("reports/chart", "", scalar($cgi->param('ctype')));
+  validateWidthAndHeight();
+  $vars->{'chart'} = new Bugzilla::Chart($cgi);
 
-    # Debugging PNGs is a pain; we need to be able to see the error messages
-    if ($cgi->param('debug')) {
-        print $cgi->header();
-        $vars->{'chart'}->dump();
-    }
+  my $format
+    = $template->get_format("reports/chart", "", scalar($cgi->param('ctype')));
 
-    print $cgi->header($format->{'ctype'});
-    disable_utf8() if ($format->{'ctype'} =~ /^image\//);
+  $cgi->set_dated_content_disp('inline', 'chart', $format->{extension});
+  print $cgi->header($format->{'ctype'});
+  disable_utf8() if ($format->{'ctype'} =~ /^image\//);
 
-    $template->process($format->{'template'}, $vars)
-      || ThrowTemplateError($template->error());
+  $template->process($format->{'template'}, $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub wrap {
-    validateWidthAndHeight();
-    
-    # We create a Chart object so we can validate the parameters
-    my $chart = new Bugzilla::Chart($cgi);
-    
-    $vars->{'time'} = localtime(time());
-
-    $vars->{'imagebase'} = $cgi->canonicalise_query(
-                "action", "action-wrap", "ctype", "format", "width", "height");
-
-    print $cgi->header();
-    $template->process("reports/chart.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  validateWidthAndHeight();
+
+  # We create a Chart object so we can validate the parameters
+  my $chart = new Bugzilla::Chart($cgi);
+
+  $vars->{'time'} = localtime(time());
+
+  $vars->{'imagebase'}
+    = $cgi->canonicalise_query("action", "action-wrap", "ctype", "format",
+    "width", "height");
+
+  print $cgi->header();
+  $template->process("reports/chart.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub view {
-    my $chart = shift;
-
-    # Set defaults
-    foreach my $field ('category', 'subcategory', 'name', 'ctype') {
-        $vars->{'default'}{$field} = $cgi->param($field) || 0;
-    }
+  my $chart = shift;
 
-    # Pass the state object to the display UI.
-    $vars->{'chart'} = $chart;
-    $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
+  # Set defaults
+  foreach my $field ('category', 'subcategory', 'name', 'ctype') {
+    $vars->{'default'}{$field} = $cgi->param($field) || 0;
+  }
 
-    print $cgi->header();
+  # Pass the state object to the display UI.
+  $vars->{'chart'}    = $chart;
+  $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
 
-    # If we have having problems with bad data, we can set debug=1 to dump
-    # the data structure.
-    $chart->dump() if $cgi->param('debug');
+  print $cgi->header();
 
-    $template->process("reports/create-chart.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $template->process("reports/create-chart.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
diff --git a/checksetup.pl b/checksetup.pl
index 50ca8bda87..a63e53dce5 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -12,21 +12,28 @@
 # Initialization
 ######################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use File::Basename;
+BEGIN { chdir dirname($0); }
+use lib qw(. lib local/lib/perl5 .checksetup_lib/lib/perl5);
+
+# the @INC which checksetup needs to operate against.
+our @BUGZILLA_INC = grep { !/checksetup_lib/ } @INC;
+
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
+
+# Bug 1270550 - Tie::Hash::NamedCapture must be loaded before Safe.
+use Tie::Hash::NamedCapture;
 use Safe;
 
-BEGIN { chdir dirname($0); }
-use lib qw(. lib);
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
-use Bugzilla::Install::Util qw(install_string get_version_and_os 
-                               init_console success);
+use Bugzilla::Install::Util qw(install_string get_version_and_os
+  init_console success);
 
 ######################################################################
 # Live Code
@@ -40,28 +47,76 @@
 init_console();
 
 my %switch;
-GetOptions(\%switch, 'help|h|?', 'check-modules', 'no-templates|t',
-                     'verbose|v|no-silent', 'make-admin=s', 
-                     'reset-password=s', 'version|V');
+GetOptions(
+  \%switch,         'help|h|?',
+  'no-templates|t', 'verbose|v|no-silent',
+  'cpanm:s',        'check-modules',
+  'make-admin=s',   'reset-password=s',
+  'version|V',      'no-permissions|p'
+);
 
 # Print the help message if that switch was selected.
 pod2usage({-verbose => 1, -exitval => 1}) if $switch{'help'};
 
-# Read in the "answers" file if it exists, for running in 
+# Read in the "answers" file if it exists, for running in
 # non-interactive mode.
 my $answers_file = $ARGV[0];
 my $silent = $answers_file && !$switch{'verbose'};
-
 print(install_string('header', get_version_and_os()) . "\n") unless $silent;
 exit 0 if $switch{'version'};
-# Check required --MODULES--
-my $module_results = check_requirements(!$silent);
-Bugzilla::Install::Requirements::print_module_instructions(
-    $module_results, !$silent);
-exit 1 if !$module_results->{pass};
-# Break out if checking the modules is all we have been asked to do.
-exit 0 if $switch{'check-modules'};
 
+if (defined $switch{cpanm}) {
+  my $default = join(
+    ' ', qw(
+      all notest -oracle -mysql -pg -mod_perl -old_charts -new_charts
+      -graphical_reports -detect_charset -auth_radius -auth_ldap
+      )
+  );
+  my @features = split(/\s+/, $switch{cpanm} || $default);
+  my @cpanm_args = ('-l', 'local', '--installdeps');
+  while (my $feature = shift @features) {
+    if ($feature eq 'all') {
+      push @cpanm_args, '--with-all-features';
+    }
+    elsif ($feature eq 'default') {
+      unshift @features, split(/\s+/, $default);
+    }
+    elsif ($feature eq 'notest'
+      || $feature eq 'skip-satisfied'
+      || $feature eq 'quiet')
+    {
+      push @cpanm_args, "--$feature";
+    }
+    elsif ($feature =~ /^-(.+)$/) {
+      push @cpanm_args, "--without-feature=$1";
+    }
+    else {
+      push @cpanm_args, "--with-feature=$feature";
+    }
+  }
+  print "cpanm @cpanm_args \".\"\n" if !$silent;
+  my $rv = system('cpanm', @cpanm_args, '.');
+  exit 1 if $rv != 0;
+}
+
+$ENV{PERL_MM_USE_DEFAULT} = 1;
+$ENV{BZ_SILENT_MAKEFILE}  = 1;
+system($^X, "Makefile.PL");
+
+my $meta = load_cpan_meta();
+if (keys %{$meta->{optional_features}} < 1) {
+  warn "Your version of ExtUtils::MakeMaker is probably too old\n";
+  warn "Falling back to static (and wrong) META.json\n";
+  unlink('MYMETA.json');
+  $meta = load_cpan_meta();
+}
+my $requirements = check_cpan_requirements($meta, \@BUGZILLA_INC, !$silent);
+
+exit 1 unless $requirements->{ok};
+
+check_all_cpan_features($meta, \@BUGZILLA_INC, !$silent);
+
+exit 0 if $switch{'check-modules'};
 ###########################################################################
 # Load Bugzilla Modules
 ###########################################################################
@@ -85,7 +140,7 @@
 
 require Bugzilla::Install::Filesystem;
 import Bugzilla::Install::Filesystem qw(update_filesystem create_htaccess
-                                        fix_all_file_permissions);
+  fix_all_file_permissions);
 require Bugzilla::Install::DB;
 require Bugzilla::DB;
 require Bugzilla::Template;
@@ -99,8 +154,8 @@
 # Check and update --LOCAL-- configuration
 ###########################################################################
 
-print "Reading " .  bz_locations()->{'localconfig'} . "...\n" unless $silent;
-update_localconfig({ output => !$silent });
+print "Reading " . bz_locations()->{'localconfig'} . "...\n" unless $silent;
+update_localconfig({output => !$silent});
 my $lc_hash = Bugzilla->localconfig;
 
 ###########################################################################
@@ -116,8 +171,10 @@
 
 # now get a handle to the database:
 my $dbh = Bugzilla->dbh;
+
 # Create the tables, and do any database-specific schema changes.
 $dbh->bz_setup_database();
+
 # Populate the tables that hold the values for the <select> fields.
 $dbh->bz_populate_enum_tables();
 
@@ -125,7 +182,7 @@
 # Check --DATA-- directory
 ###########################################################################
 
-update_filesystem({ index_html => $lc_hash->{'index_html'} });
+update_filesystem({index_html => $lc_hash->{'index_html'}});
 create_htaccess() if $lc_hash->{'create_htaccess'};
 
 # Remove parameters from the params file that no longer exist in Bugzilla,
@@ -137,13 +194,13 @@
 ###########################################################################
 
 Bugzilla::Template::precompile_templates(!$silent)
-    unless $switch{'no-templates'};
+  unless $switch{'no-templates'};
 
 ###########################################################################
 # Set proper rights (--CHMOD--)
 ###########################################################################
 
-fix_all_file_permissions(!$silent);
+fix_all_file_permissions(!$silent) unless $switch{'no-permissions'};
 
 ###########################################################################
 # Check GraphViz setup
@@ -151,7 +208,15 @@
 
 # If we are using a local 'dot' binary, verify the specified binary exists
 # and that the generated images are accessible.
-check_graphviz(!$silent) if Bugzilla->params->{'webdotbase'};
+check_webdotbase(!$silent) if $lc_hash->{'webdotbase'};
+
+###########################################################################
+# Check font file setup
+###########################################################################
+
+# If we are using a local font file, verify the specified file exists and
+# that it has the correct extension.
+check_font_file(!$silent) if $lc_hash->{'font_file'};
 
 ###########################################################################
 # Changes to the fielddefs --TABLE--
@@ -194,7 +259,7 @@
 Bugzilla::Install::create_admin();
 
 Bugzilla::Install::reset_password($switch{'reset-password'})
-    if $switch{'reset-password'};
+  if $switch{'reset-password'};
 
 ###########################################################################
 # Create default Product
@@ -202,7 +267,7 @@
 
 Bugzilla::Install::create_default_product();
 
-Bugzilla::Hook::process('install_before_final_checks', { silent => $silent });
+Bugzilla::Hook::process('install_before_final_checks', {silent => $silent});
 
 ###########################################################################
 # Final checks
@@ -212,13 +277,12 @@
 Bugzilla->memcached->clear_all();
 
 # Check if the default parameter for urlbase is still set, and if so, give
-# notification that they should go and visit editparams.cgi 
+# notification that they should go and visit editparams.cgi
 if (Bugzilla->params->{'urlbase'} eq '') {
-    print "\n" . get_text('install_urlbase_default') . "\n"
-        unless $silent;
+  print "\n" . get_text('install_urlbase_default') . "\n" unless $silent;
 }
 if (!$silent) {
-    success(get_text('install_success'));
+  success(get_text('install_success'));
 }
 
 __END__
@@ -229,10 +293,11 @@ =head1 NAME
 
 =head1 SYNOPSIS
 
- ./checksetup.pl [--help|--check-modules|--version]
- ./checksetup.pl [SCRIPT [--verbose]] [--no-templates|-t]
+ ./checksetup.pl [--help|--version|--check-modules]
+ ./checksetup.pl [SCRIPT [--verbose]] [--no-templates|-t] [--no-permissions|-p]
                  [--make-admin=user@domain.com]
                  [--reset-password=user@domain.com]
+                 [--cpanm[=OPTIONS]]
 
 =head1 OPTIONS
 
@@ -250,10 +315,6 @@ =head1 OPTIONS
 
 Display this help text
 
-=item B<--check-modules>
-
-Only check for correct module dependencies and quit afterward.
-
 =item B<--make-admin>=username@domain.com
 
 Makes the specified user into a Bugzilla administrator. This is
@@ -280,6 +341,20 @@ =head1 OPTIONS
 Display the version of Bugzilla, Perl, and some info about the
 system that Bugzilla is being installed on, and then exit.
 
+=item B<--no-permissions> (B<-p>)
+
+Don't update file permissions. Owner, group, and mode of files and
+directories will not be changed. Use this if your installation is
+managed by a software packaging system such as RPM or APT.
+
+=item B<--check-modules>
+
+Only check for correct module dependencies and quit afterward.
+
+=item B<--cpanm[=OPTIONS]>
+
+Use F<cpanm> to install all missing modules or as directed by the OPTIONS.
+
 =back
 
 =head1 DESCRIPTION
@@ -321,7 +396,8 @@ =head2 How Checksetup Works
 =item 1
 
 Checks if the required and optional perl modules are installed,
-using L<Bugzilla::Install::Requirements/check_requirements>.
+using L<Bugzilla::Install::Requirements/check_cpan_requirements>
+and L<Bugzilla::Install::Requirements/check_all_cpan_features>.
 
 =item 2
 
@@ -453,12 +529,11 @@ =head1 RUNNING CHECKSETUP NON-INTERACTIVELY
 
  (Any localconfig variable or parameter can be specified as above.)
 
+ $answer{'ADMIN_LOGIN'} = 'myadmin';
  $answer{'ADMIN_EMAIL'} = 'myadmin@mydomain.net';
  $answer{'ADMIN_PASSWORD'} = 'fooey';
  $answer{'ADMIN_REALNAME'} = 'Joel Peshkin';
 
- $answer{'SMTP_SERVER'} = 'mail.mydomain.net';
-
  $answer{'NO_PAUSE'} = 1
 
 C<NO_PAUSE> means "never stop and prompt the user to hit Enter to continue,
diff --git a/clean-bug-user-last-visit.pl b/clean-bug-user-last-visit.pl
index 57486bfed8..85bc93e91e 100755
--- a/clean-bug-user-last-visit.pl
+++ b/clean-bug-user-last-visit.pl
@@ -19,10 +19,10 @@ =head1 DESCRIPTION
 
 =cut
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -31,8 +31,6 @@ =head1 DESCRIPTION
 
 my $dbh = Bugzilla->dbh;
 my $sql = 'DELETE FROM bug_user_last_visit WHERE last_visit_ts < '
-  . $dbh->sql_date_math('NOW()',
-                        '-',
-                        Bugzilla->params->{last_visit_keep_days},
-                        'DAY');
+  . $dbh->sql_date_math('NOW()', '-', Bugzilla->params->{last_visit_keep_days},
+  'DAY');
 $dbh->do($sql);
diff --git a/colchange.cgi b/colchange.cgi
index 77d9f11eef..84bff074fe 100755
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -24,146 +24,155 @@ use Storable qw(dclone);
 
 # Maps parameters that control columns to the names of columns.
 use constant COLUMN_PARAMS => {
-    'useclassification'   => ['classification'],
-    'usetargetmilestone'  => ['target_milestone'],
-    'useqacontact'        => ['qa_contact', 'qa_contact_realname'],
-    'usestatuswhiteboard' => ['status_whiteboard'],
-    'timetrackinggroup'   => ['deadline'],
+  'useclassification'   => ['classification'],
+  'usetargetmilestone'  => ['target_milestone'],
+  'useqacontact'        => ['qa_contact', 'qa_contact_realname'],
+  'usestatuswhiteboard' => ['status_whiteboard'],
+  'timetrackinggroup'   => ['deadline'],
 };
 
 # We only show these columns if an object of this type exists in the
 # database.
-use constant COLUMN_CLASSES => {
-    'Bugzilla::Flag'    => 'flagtypes.name',
-    'Bugzilla::Keyword' => 'keywords',
-};
+use constant COLUMN_CLASSES =>
+  {'Bugzilla::Flag' => 'flagtypes.name', 'Bugzilla::Keyword' => 'keywords',};
 
 my $user = Bugzilla->login();
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 my $columns = dclone(Bugzilla::Search::COLUMNS);
 
 # You can't manually select "relevance" as a column you want to see.
 delete $columns->{'relevance'};
 
-foreach my $param (keys %{ COLUMN_PARAMS() }) {
-    next if Bugzilla->params->{$param};
-    foreach my $column (@{ COLUMN_PARAMS->{$param} }) {
-        delete $columns->{$column};
-    }
+foreach my $param (keys %{COLUMN_PARAMS()}) {
+  next if Bugzilla->params->{$param};
+  foreach my $column (@{COLUMN_PARAMS->{$param}}) {
+    delete $columns->{$column};
+  }
 }
 
-foreach my $class (keys %{ COLUMN_CLASSES() }) {
-    eval("use $class; 1;") || die $@;
-    my $column = COLUMN_CLASSES->{$class};
-    delete $columns->{$column} if !$class->any_exist;
+foreach my $class (keys %{COLUMN_CLASSES()}) {
+  eval("use $class; 1;") || die $@;
+  my $column = COLUMN_CLASSES->{$class};
+  delete $columns->{$column} if !$class->any_exist;
 }
 
 if (!$user->is_timetracker) {
-    foreach my $column (TIMETRACKING_FIELDS) {
-        delete $columns->{$column};
-    }
+  foreach my $column (TIMETRACKING_FIELDS) {
+    delete $columns->{$column};
+  }
 }
 
 $vars->{'columns'} = $columns;
 
 my @collist;
-if (defined $cgi->param('rememberedquery')) {
-    my $search;
-    if (defined $cgi->param('saved_search')) {
-        $search = new Bugzilla::Search::Saved($cgi->param('saved_search'));
-    }
-
-    my $token = $cgi->param('token');
-    if ($search) {
-        check_hash_token($token, [$search->id, $search->name]);
-    }
-    else {
-        check_hash_token($token, ['default-list']);
-    }
-
-    my $splitheader = 0;
-    if (defined $cgi->param('resetit')) {
-        @collist = DEFAULT_COLUMN_LIST;
-    } else {
-        if (defined $cgi->param("selected_columns")) {
-            @collist = grep { exists $columns->{$_} } 
-                            $cgi->param("selected_columns");
-        }
-        if (defined $cgi->param('splitheader')) {
-            $splitheader = $cgi->param('splitheader')? 1: 0;
-        }
-    }
-    my $list = join(" ", @collist);
-
-    if ($list) {
-        # Only set the cookie if this is not a saved search.
-        # Saved searches have their own column list
-        if (!$cgi->param('save_columns_for_search')) {
-            $cgi->send_cookie(-name => 'COLUMNLIST',
-                              -value => $list,
-                              -expires => 'Fri, 01-Jan-2038 00:00:00 GMT');
-        }
-    }
-    else {
-        $cgi->remove_cookie('COLUMNLIST');
-    }
-    if ($splitheader) {
-        $cgi->send_cookie(-name => 'SPLITHEADER',
-                          -value => $splitheader,
-                          -expires => 'Fri, 01-Jan-2038 00:00:00 GMT');
+if (my $rememberedquery = $cgi->param('rememberedquery')) {
+  my $search;
+  if (my $saved_search = $cgi->param('saved_search')) {
+    $search = new Bugzilla::Search::Saved($saved_search);
+  }
+
+  my $token = $cgi->param('token');
+  if ($search) {
+    check_hash_token($token, [$search->id, $search->name]);
+  }
+  else {
+    check_hash_token($token, ['default-list']);
+  }
+
+  my $splitheader = 0;
+  if (defined $cgi->param('resetit')) {
+    @collist = DEFAULT_COLUMN_LIST;
+  }
+  else {
+    if (defined $cgi->param("selected_columns")) {
+      @collist = grep { exists $columns->{$_} } $cgi->multi_param("selected_columns");
     }
-    else {
-        $cgi->remove_cookie('SPLITHEADER');
+    if (defined $cgi->param('splitheader')) {
+      $splitheader = $cgi->param('splitheader') ? 1 : 0;
     }
-
-    $vars->{'message'} = "change_columns";
-
-    if ($cgi->param('save_columns_for_search')
-        && defined $search && $search->user->id == $user->id)
-    {
-        my $params = new Bugzilla::CGI($search->url);
-        $params->param('columnlist', join(",", @collist));
-        $search->set_url($params->query_string());
-        $search->update();
+  }
+  my $list = join(" ", @collist);
+
+  if ($list) {
+
+    # Only set the cookie if this is not a saved search.
+    # Saved searches have their own column list
+    if (!$cgi->param('save_columns_for_search')) {
+      $cgi->send_cookie(
+        -name    => 'COLUMNLIST',
+        -value   => $list,
+        -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'
+      );
     }
-
-    my $params = new Bugzilla::CGI($cgi->param('rememberedquery'));
+  }
+  else {
+    $cgi->remove_cookie('COLUMNLIST');
+  }
+  if ($splitheader) {
+    $cgi->send_cookie(
+      -name    => 'SPLITHEADER',
+      -value   => $splitheader,
+      -expires => 'Fri, 01-Jan-2038 00:00:00 GMT'
+    );
+  }
+  else {
+    $cgi->remove_cookie('SPLITHEADER');
+  }
+
+  $vars->{'message'} = "change_columns";
+
+  if ( $cgi->param('save_columns_for_search')
+    && defined $search
+    && $search->user->id == $user->id)
+  {
+    my $params = new Bugzilla::CGI($search->url);
     $params->param('columnlist', join(",", @collist));
-    $vars->{'redirect_url'} = "buglist.cgi?".$params->query_string();
-
-
-    # If we're running on Microsoft IIS, $cgi->redirect discards
-    # the Set-Cookie lines. In mod_perl, $cgi->redirect with cookies
-    # causes the page to be rendered as text/plain.
-    # Workaround is to use the old-fashioned  redirection mechanism. 
-    # See bug 214466 and bug 376044 for details.
-    if ($ENV{'MOD_PERL'} 
-        || $ENV{'SERVER_SOFTWARE'} =~ /Microsoft-IIS/
-        || $ENV{'SERVER_SOFTWARE'} =~ /Sun ONE Web/)
-    {
-      print $cgi->header(-type => "text/html",
-                         -refresh => "0; URL=$vars->{'redirect_url'}");
-    }
-    else {
-      print $cgi->redirect($vars->{'redirect_url'});
-      exit;
-    }
-    
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+    $search->set_url($params->query_string());
+    $search->update();
+  }
+
+  utf8::decode($rememberedquery);
+  my $params = new Bugzilla::CGI($rememberedquery);
+  $params->param('columnlist', join(",", @collist));
+  $vars->{'redirect_url'} = "buglist.cgi?" . $params->query_string();
+
+
+  # If we're running on Microsoft IIS, $cgi->redirect discards
+  # the Set-Cookie lines. In mod_perl, $cgi->redirect with cookies
+  # causes the page to be rendered as text/plain.
+  # Workaround is to use the old-fashioned  redirection mechanism.
+  # See bug 214466 and bug 376044 for details.
+  if ( $ENV{'MOD_PERL'}
+    || $ENV{'SERVER_SOFTWARE'} =~ /Microsoft-IIS/
+    || $ENV{'SERVER_SOFTWARE'} =~ /Sun ONE Web/)
+  {
+    print $cgi->header(
+      -type    => "text/html",
+      -refresh => "0; URL=$vars->{'redirect_url'}"
+    );
+  }
+  else {
+    print $cgi->redirect($vars->{'redirect_url'});
     exit;
+  }
+
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if (defined $cgi->param('columnlist')) {
-    @collist = split(/[ ,]+/, $cgi->param('columnlist'));
-} elsif (defined $cgi->cookie('COLUMNLIST')) {
-    @collist = split(/ /, $cgi->cookie('COLUMNLIST'));
-} else {
-    @collist = DEFAULT_COLUMN_LIST;
+  @collist = split(/[ ,]+/, $cgi->param('columnlist'));
+}
+elsif (defined $cgi->cookie('COLUMNLIST')) {
+  @collist = split(/ /, $cgi->cookie('COLUMNLIST'));
+}
+else {
+  @collist = DEFAULT_COLUMN_LIST;
 }
 
 $vars->{'collist'} = \@collist;
@@ -173,12 +182,12 @@ $vars->{'buffer'} = $cgi->query_string();
 
 my $search;
 if (defined $cgi->param('query_based_on')) {
-    my $searches = $user->queries;
-    my ($search) = grep($_->name eq $cgi->param('query_based_on'), @$searches);
+  my $searches = $user->queries;
+  my ($search) = grep($_->name eq $cgi->param('query_based_on'), @$searches);
 
-    if ($search) {
-        $vars->{'saved_search'} = $search;
-    }
+  if ($search) {
+    $vars->{'saved_search'} = $search;
+  }
 }
 
 # Generate and return the UI (HTML page) from the appropriate template.
diff --git a/collectstats.pl b/collectstats.pl
index 3473c9e718..59aa72a4f7 100755
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Getopt::Long qw(:config bundling);
 use Pod::Usage;
@@ -37,7 +37,7 @@
 # in the regenerate mode).
 $| = 1;
 
-my $datadir = bz_locations()->{'datadir'};
+my $datadir   = bz_locations()->{'datadir'};
 my $graphsdir = bz_locations()->{'graphsdir'};
 
 # We use a dummy product instance with ID 0, representing all products
@@ -47,10 +47,11 @@
 # Tidy up after graphing module
 my $cwd = Cwd::getcwd();
 if (chdir($graphsdir)) {
-    unlink <./*.gif>;
-    unlink <./*.png>;
-    # chdir("..") doesn't work if graphs is a symlink, see bug 429378
-    chdir($cwd);
+  unlink <./*.gif>;
+  unlink <./*.png>;
+
+  # chdir("..") doesn't work if graphs is a symlink, see bug 429378
+  chdir($cwd);
 }
 
 my $dbh = Bugzilla->switch_to_shadow_db();
@@ -60,9 +61,9 @@
 # may have existed in the past, or have been renamed. We want them all.
 my $fields = {};
 foreach my $field ('bug_status', 'resolution') {
-    my $values = get_legal_field_values($field);
-    my $old_values = $dbh->selectcol_arrayref(
-                             "SELECT bugs_activity.added
+  my $values     = get_legal_field_values($field);
+  my $old_values = $dbh->selectcol_arrayref(
+    "SELECT bugs_activity.added
                                 FROM bugs_activity
                           INNER JOIN fielddefs
                                   ON fielddefs.id = bugs_activity.fieldid
@@ -80,15 +81,16 @@
                            LEFT JOIN $field
                                   ON $field.value = bugs_activity.removed
                                WHERE fielddefs.name = ?
-                                 AND $field.id IS NULL",
-                               undef, ($field, $field));
+                                 AND $field.id IS NULL", undef, ($field, $field)
+  );
 
-    push(@$values, @$old_values);
-    $fields->{$field} = $values;
+  push(@$values, @$old_values);
+  $fields->{$field} = $values;
 }
 
-my @statuses = @{$fields->{'bug_status'}};
+my @statuses    = @{$fields->{'bug_status'}};
 my @resolutions = @{$fields->{'resolution'}};
+
 # Exclude "" from the resolution list.
 @resolutions = grep {$_} @resolutions;
 
@@ -97,30 +99,34 @@
 # at once and stuff it into some data structures.
 my (%bug_status, %bug_resolution, %removed);
 if ($switch{'regenerate'}) {
-    %bug_resolution = @{ $dbh->selectcol_arrayref(
-        'SELECT bug_id, resolution FROM bugs', {Columns=>[1,2]}) };
-    %bug_status = @{ $dbh->selectcol_arrayref(
-        'SELECT bug_id, bug_status FROM bugs', {Columns=>[1,2]}) };
-
-    my $removed_sth = $dbh->prepare(
+  %bug_resolution = @{
+    $dbh->selectcol_arrayref('SELECT bug_id, resolution FROM bugs',
+      {Columns => [1, 2]})
+  };
+  %bug_status = @{
+    $dbh->selectcol_arrayref('SELECT bug_id, bug_status FROM bugs',
+      {Columns => [1, 2]})
+  };
+
+  my $removed_sth = $dbh->prepare(
         q{SELECT bugs_activity.bug_id, bugs_activity.removed,}
-        . $dbh->sql_to_days('bugs_activity.bug_when')
-       . q{ FROM bugs_activity
+      . $dbh->sql_to_days('bugs_activity.bug_when')
+      . q{ FROM bugs_activity
            WHERE bugs_activity.fieldid = ?
-        ORDER BY bugs_activity.bug_when});
-
-    %removed = (bug_status => {}, resolution => {});
-    foreach my $field (qw(bug_status resolution)) {
-        my $field_id = Bugzilla::Field->check($field)->id;
-        my $rows = $dbh->selectall_arrayref($removed_sth, undef, $field_id);
-        my $hash = $removed{$field};
-        foreach my $row (@$rows) {
-            my ($bug_id, $removed, $when) = @$row;
-            $hash->{$bug_id} ||= [];
-            push(@{ $hash->{$bug_id} }, { when    => int($when),
-                                          removed => $removed });
-        }
+        ORDER BY bugs_activity.bug_when}
+  );
+
+  %removed = (bug_status => {}, resolution => {});
+  foreach my $field (qw(bug_status resolution)) {
+    my $field_id = Bugzilla::Field->check($field)->id;
+    my $rows     = $dbh->selectall_arrayref($removed_sth, undef, $field_id);
+    my $hash     = $removed{$field};
+    foreach my $row (@$rows) {
+      my ($bug_id, $removed, $when) = @$row;
+      $hash->{$bug_id} ||= [];
+      push(@{$hash->{$bug_id}}, {when => int($when), removed => $removed});
     }
+  }
 }
 
 my $tstart = time;
@@ -130,84 +136,85 @@
 
 my $dir = "$datadir/mining";
 if (!-d $dir) {
-    mkdir $dir or die "mkdir $dir failed: $!";
-    fix_dir_permissions($dir);
+  mkdir $dir or die "mkdir $dir failed: $!";
+  fix_dir_permissions($dir);
 }
 
 foreach (@myproducts) {
-    if ($switch{'regenerate'}) {
-        regenerate_stats($dir, $_, \%bug_resolution, \%bug_status, \%removed);
-    } else {
-        &collect_stats($dir, $_);
-    }
+  if ($switch{'regenerate'}) {
+    regenerate_stats($dir, $_, \%bug_resolution, \%bug_status, \%removed);
+  }
+  else {
+    &collect_stats($dir, $_);
+  }
 }
+
 # Fix permissions for all files in mining/.
 fix_dir_permissions($dir);
 
 my $tend = time;
+
 # Uncomment the following line for performance testing.
 #say "Total time taken " . delta_time($tstart, $tend);
 
 CollectSeriesData();
 
 sub collect_stats {
-    my $dir = shift;
-    my $product = shift;
-    my $when = localtime (time);
-    my $dbh = Bugzilla->dbh;
-
-    my $file = join '/', $dir, $product->id;
-    my $exists = -f $file;
-
-    # if the file exists, get the old status and resolution list for that product.
-    my @data;
-    @data = get_old_data($file) if $exists;
-
-    # If @data is not empty, then we have to recreate the data file.
-    if (scalar(@data)) {
-        open(DATA, '>', $file)
-          || ThrowCodeError('chart_file_open_fail', {'filename' => $file});
-    }
-    else {
-        open(DATA, '>>', $file)
-          || ThrowCodeError('chart_file_open_fail', {'filename' => $file});
-    }
+  my $dir     = shift;
+  my $product = shift;
+  my $when    = localtime(time);
+  my $dbh     = Bugzilla->dbh;
 
-    if (Bugzilla->params->{'utf8'}) {
-        binmode DATA, ':utf8';
-    }
-
-    # Now collect current data.
-    my @row = (today());
-    my $status_sql = q{SELECT COUNT(*) FROM bugs WHERE bug_status = ?};
-    my $reso_sql   = q{SELECT COUNT(*) FROM bugs WHERE resolution = ?};
+  my $file = join '/', $dir, $product->id;
+  my $exists = -f $file;
 
-    if ($product->id) {
-        $status_sql .= q{ AND product_id = ?};
-        $reso_sql   .= q{ AND product_id = ?};
-    }
+  # if the file exists, get the old status and resolution list for that product.
+  my @data;
+  @data = get_old_data($file) if $exists;
 
-    my $sth_status = $dbh->prepare($status_sql);
-    my $sth_reso   = $dbh->prepare($reso_sql);
-
-    my @values ;
-    foreach my $status (@statuses) {
-        @values = ($status);
-        push (@values, $product->id) if ($product->id);
-        my $count = $dbh->selectrow_array($sth_status, undef, @values);
-        push(@row, $count);
-    }
-    foreach my $resolution (@resolutions) {
-        @values = ($resolution);
-        push (@values, $product->id) if ($product->id);
-        my $count = $dbh->selectrow_array($sth_reso, undef, @values);
-        push(@row, $count);
-    }
-
-    if (!$exists || scalar(@data)) {
-        my $fields = join('|', ('DATE', @statuses, @resolutions));
-        my $product_name = $product->name;
-        print DATA <<FIN;
+  # If @data is not empty, then we have to recreate the data file.
+  if (scalar(@data)) {
+    open(DATA, '>', $file)
+      || ThrowCodeError('chart_file_open_fail', {'filename' => $file});
+  }
+  else {
+    open(DATA, '>>', $file)
+      || ThrowCodeError('chart_file_open_fail', {'filename' => $file});
+  }
+
+  binmode DATA, ':utf8';
+
+  # Now collect current data.
+  my @row        = (today());
+  my $status_sql = q{SELECT COUNT(*) FROM bugs WHERE bug_status = ?};
+  my $reso_sql   = q{SELECT COUNT(*) FROM bugs WHERE resolution = ?};
+
+  if ($product->id) {
+    $status_sql .= q{ AND product_id = ?};
+    $reso_sql   .= q{ AND product_id = ?};
+  }
+
+  my $sth_status = $dbh->prepare($status_sql);
+  my $sth_reso   = $dbh->prepare($reso_sql);
+
+  my @values;
+  foreach my $status (@statuses) {
+    @values = ($status);
+    push(@values, $product->id) if ($product->id);
+    my $count = $dbh->selectrow_array($sth_status, undef, @values);
+    push(@row, $count);
+  }
+  foreach my $resolution (@resolutions) {
+    @values = ($resolution);
+    push(@values, $product->id) if ($product->id);
+    my $count = $dbh->selectrow_array($sth_reso, undef, @values);
+    push(@row, $count);
+  }
+
+  if (!$exists || scalar(@data)) {
+    my $fields = join('|', ('DATE', @statuses, @resolutions));
+    my $product_name = $product->name;
+    print DATA <<FIN;
 # Bugzilla Daily Bug Stats
 #
 # Do not edit me! This file is generated.
@@ -216,103 +223,107 @@ sub collect_stats {
 # Product: $product_name
 # Created: $when
 FIN
-    }
-
-    # Add existing data, if needed. Note that no count is not treated
-    # the same way as a count with 0 bug.
-    foreach my $data (@data) {
-        print DATA join('|', map {defined $data->{$_} ? $data->{$_} : ''}
-                                 ('DATE', @statuses, @resolutions)) . "\n";
-    }
-    print DATA (join '|', @row) . "\n";
-    close DATA;
+  }
+
+  # Add existing data, if needed. Note that no count is not treated
+  # the same way as a count with 0 bug.
+  foreach my $data (@data) {
+    print DATA join('|',
+      map { defined $data->{$_} ? $data->{$_} : '' }
+        ('DATE', @statuses, @resolutions))
+      . "\n";
+  }
+  print DATA (join '|', @row) . "\n";
+  close DATA;
 }
 
 sub get_old_data {
-    my $file = shift;
-
-    open(DATA, '<', $file)
-      || ThrowCodeError('chart_file_open_fail', {'filename' => $file});
-
-    if (Bugzilla->params->{'utf8'}) {
-        binmode DATA, ':utf8';
-    }
-
-    my @data;
-    my @columns;
-    my $recreate = 0;
-    while (<DATA>) {
-        chomp;
-        next unless $_;
-        if (/^# fields?:\s*(.+)\s*$/) {
-            @columns = split(/\|/, $1);
-            # Compare this list with @statuses and @resolutions.
-            # If they are identical, then we can safely append new data
-            # to the end of the file; else we have to recreate it.
-            $recreate = 1;
-            my @new_cols = ($columns[0], @statuses, @resolutions);
-            if (scalar(@columns) == scalar(@new_cols)) {
-                my $identical = 1;
-                for (0 .. $#columns) {
-                    $identical = 0 if ($columns[$_] ne $new_cols[$_]);
-                }
-                last if $identical;
-            }
-        }
-        next unless $recreate;
-        next if (/^#/); # Ignore comments.
-        # If we have to recreate the file, we have to load all existing
-        # data first.
-        my @line = split /\|/;
-        my %data;
-        foreach my $column (@columns) {
-            $data{$column} = shift @line;
+  my $file = shift;
+
+  open(DATA, '<', $file)
+    || ThrowCodeError('chart_file_open_fail', {'filename' => $file});
+
+  binmode DATA, ':utf8';
+
+  my @data;
+  my @columns;
+  my $recreate = 0;
+  while (<DATA>) {
+    chomp;
+    next unless $_;
+    if (/^# fields?:\s*(.+)\s*$/) {
+      @columns = split(/\|/, $1);
+
+      # Compare this list with @statuses and @resolutions.
+      # If they are identical, then we can safely append new data
+      # to the end of the file; else we have to recreate it.
+      $recreate = 1;
+      my @new_cols = ($columns[0], @statuses, @resolutions);
+      if (scalar(@columns) == scalar(@new_cols)) {
+        my $identical = 1;
+        for (0 .. $#columns) {
+          $identical = 0 if ($columns[$_] ne $new_cols[$_]);
         }
-        push(@data, \%data);
+        last if $identical;
+      }
+    }
+    next unless $recreate;
+    next if (/^#/);  # Ignore comments.
+                     # If we have to recreate the file, we have to load all existing
+                     # data first.
+    my @line = split /\|/;
+    my %data;
+    foreach my $column (@columns) {
+      $data{$column} = shift @line;
     }
-    close(DATA);
-    return @data;
+    push(@data, \%data);
+  }
+  close(DATA);
+  return @data;
 }
 
 # This regenerates all statistics from the database.
 sub regenerate_stats {
-    my ($dir, $product, $bug_resolution, $bug_status, $removed) = @_;
-
-    my $dbh = Bugzilla->dbh;
-    my $when = localtime(time());
-    my $tstart = time();
-
-    my $file = join '/', $dir, $product->id;
-
-    my $and_product = "";
-
-    my @values = ();
-    if ($product->id) {
-        $and_product = q{ AND product_id = ?};
-        push (@values, $product->id);
-    }
-
-    # Determine the start date from the date the first bug in the
-    # database was created, and the end date from the current day.
-    # If there were no bugs in the search, return early.
-    my $query = q{SELECT } .
-                $dbh->sql_to_days('creation_ts') . q{ AS start_day, } .
-                $dbh->sql_to_days('current_date') . q{ AS end_day, } . 
-                $dbh->sql_to_days("'1970-01-01'") . 
-                 qq{ FROM bugs
-                   WHERE } . $dbh->sql_to_days('creation_ts') . 
-                         qq{ IS NOT NULL $and_product 
+  my ($dir, $product, $bug_resolution, $bug_status, $removed) = @_;
+
+  my $dbh    = Bugzilla->dbh;
+  my $when   = localtime(time());
+  my $tstart = time();
+
+  my $file = join '/', $dir, $product->id;
+
+  my $and_product = "";
+
+  my @values = ();
+  if ($product->id) {
+    $and_product = q{ AND product_id = ?};
+    push(@values, $product->id);
+  }
+
+  # Determine the start date from the date the first bug in the
+  # database was created, and the end date from the current day.
+  # If there were no bugs in the search, return early.
+  my $query
+    = q{SELECT }
+    . $dbh->sql_to_days('creation_ts')
+    . q{ AS start_day, }
+    . $dbh->sql_to_days('current_date')
+    . q{ AS end_day, }
+    . $dbh->sql_to_days("'1970-01-01'")
+    . qq{ FROM bugs
+                   WHERE }
+    . $dbh->sql_to_days('creation_ts') . qq{ IS NOT NULL $and_product 
                 ORDER BY start_day } . $dbh->sql_limit(1);
-    my ($start, $end, $base) = $dbh->selectrow_array($query, undef, @values);
+  my ($start, $end, $base) = $dbh->selectrow_array($query, undef, @values);
 
-    if (!defined $start) {
-        return;
-    }
+  if (!defined $start) {
+    return;
+  }
 
-    if (open DATA, ">$file") {
-        my $fields = join('|', ('DATE', @statuses, @resolutions));
-        my $product_name = $product->name;
-        print DATA <<FIN;
+  if (open DATA, ">", $file) {
+    my $fields = join('|', ('DATE', @statuses, @resolutions));
+    my $product_name = $product->name;
+    print DATA <<FIN;
 # Bugzilla Daily Bug Stats
 #
 # Do not edit me! This file is generated.
@@ -321,66 +332,69 @@ sub regenerate_stats {
 # Product: $product_name
 # Created: $when
 FIN
-        # For each day, generate a line of statistics.
-        my $total_days = $end - $start;
-        my @bugs;
-        for (my $day = $start + 1; $day <= $end; $day++) {
-            # Some output feedback
-            my $percent_done = ($day - $start - 1) * 100 / $total_days;
-            printf "\rRegenerating %s \[\%.1f\%\%]", $product_name,
-                                                     $percent_done;
-
-            # Get a list of bugs that were created the previous day, and
-            # add those bugs to the list of bugs for this product.
-            $query = qq{SELECT bug_id 
+
+    # For each day, generate a line of statistics.
+    my $total_days = $end - $start;
+    my @bugs;
+    for (my $day = $start + 1; $day <= $end; $day++) {
+
+      # Some output feedback
+      my $percent_done = ($day - $start - 1) * 100 / $total_days;
+      printf "\rRegenerating %s \[\%.1f\%\%]", $product_name, $percent_done;
+
+      # Get a list of bugs that were created the previous day, and
+      # add those bugs to the list of bugs for this product.
+      $query = qq{SELECT bug_id 
                           FROM bugs
-                         WHERE bugs.creation_ts < } . 
-                         $dbh->sql_from_days($day - 1) . 
-                         q{ AND bugs.creation_ts >= } . 
-                         $dbh->sql_from_days($day - 2) . 
-                        $and_product . q{ ORDER BY bug_id};
-
-            my $bug_ids = $dbh->selectcol_arrayref($query, undef, @values);
-            push(@bugs, @$bug_ids);
-
-            my %bugcount;
-            foreach (@statuses) { $bugcount{$_} = 0; }
-            foreach (@resolutions) { $bugcount{$_} = 0; }
-            # Get information on bug states and resolutions.
-            for my $bug (@bugs) {
-                my $status = _get_value(
-                    $removed->{'bug_status'}->{$bug},
-                    $bug_status,  $day, $bug);
-
-                if (defined $bugcount{$status}) {
-                    $bugcount{$status}++;
-                }
-
-                my $resolution = _get_value(
-                    $removed->{'resolution'}->{$bug},
-                    $bug_resolution, $day, $bug);
-
-                if (defined $bugcount{$resolution}) {
-                    $bugcount{$resolution}++;
-                }
-            }
-
-            # Generate a line of output containing the date and counts
-            # of bugs in each state.
-            my $date = sqlday($day, $base);
-            print DATA "$date";
-            foreach (@statuses) { print DATA "|$bugcount{$_}"; }
-            foreach (@resolutions) { print DATA "|$bugcount{$_}"; }
-            print DATA "\n";
+                         WHERE bugs.creation_ts < }
+        . $dbh->sql_from_days($day - 1)
+        . q{ AND bugs.creation_ts >= }
+        . $dbh->sql_from_days($day - 2)
+        . $and_product
+        . q{ ORDER BY bug_id};
+
+      my $bug_ids = $dbh->selectcol_arrayref($query, undef, @values);
+      push(@bugs, @$bug_ids);
+
+      my %bugcount;
+      foreach (@statuses)    { $bugcount{$_} = 0; }
+      foreach (@resolutions) { $bugcount{$_} = 0; }
+
+      # Get information on bug states and resolutions.
+      for my $bug (@bugs) {
+        my $status
+          = _get_value($removed->{'bug_status'}->{$bug}, $bug_status, $day, $bug);
+
+        if (defined $bugcount{$status}) {
+          $bugcount{$status}++;
         }
 
-        # Finish up output feedback for this product.
-        my $tend = time;
-        say "\rRegenerating " . $product_name . ' [100.0%] - ' .
-            delta_time($tstart, $tend);
+        my $resolution
+          = _get_value($removed->{'resolution'}->{$bug}, $bug_resolution, $day, $bug);
 
-        close DATA;
+        if (defined $bugcount{$resolution}) {
+          $bugcount{$resolution}++;
+        }
+      }
+
+      # Generate a line of output containing the date and counts
+      # of bugs in each state.
+      my $date = sqlday($day, $base);
+      print DATA "$date";
+      foreach (@statuses)    { print DATA "|$bugcount{$_}"; }
+      foreach (@resolutions) { print DATA "|$bugcount{$_}"; }
+      print DATA "\n";
     }
+
+    # Finish up output feedback for this product.
+    my $tend = time;
+    say "\rRegenerating "
+      . $product_name
+      . ' [100.0%] - '
+      . delta_time($tstart, $tend);
+
+    close DATA;
+  }
 }
 
 # A helper for --regenerate.
@@ -388,105 +402,117 @@ sub regenerate_stats {
 # at the beginning of the day.  If there were no status/resolution
 # changes on or after that day, the status was the same as it
 # is today (the "current" value).  Otherwise, the status was equal to the
-# first "previous value" entry in the bugs_activity table for that 
+# first "previous value" entry in the bugs_activity table for that
 # bug made on or after that day.
 sub _get_value {
-    my ($removed, $current, $day, $bug) = @_;
+  my ($removed, $current, $day, $bug) = @_;
 
-    # Get the first change that's on or after this day.
-    my $item = first { $_->{when} >= $day } @{ $removed || [] };
+  # Get the first change that's on or after this day.
+  my $item = first { $_->{when} >= $day } @{$removed || []};
 
-    # If there's no change on or after this day, then we just return the
-    # current value.
-    return $item ? $item->{removed} : $current->{$bug};
+  # If there's no change on or after this day, then we just return the
+  # current value.
+  return $item ? $item->{removed} : $current->{$bug};
 }
 
 sub today {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
+  my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
+  return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
 }
 
 sub today_dash {
-    my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
-    return sprintf "%04d-%02d-%02d", 1900 + $year, ++$mon, $dom;
+  my ($dom, $mon, $year) = (localtime(time))[3, 4, 5];
+  return sprintf "%04d-%02d-%02d", 1900 + $year, ++$mon, $dom;
 }
 
 sub sqlday {
-    my ($day, $base) = @_;
-    $day = ($day - $base) * 86400;
-    my ($dom, $mon, $year) = (gmtime($day))[3, 4, 5];
-    return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
+  my ($day, $base) = @_;
+  $day = ($day - $base) * 86400;
+  my ($dom, $mon, $year) = (gmtime($day))[3, 4, 5];
+  return sprintf "%04d%02d%02d", 1900 + $year, ++$mon, $dom;
 }
 
 sub delta_time {
-    my $tstart = shift;
-    my $tend = shift;
-    my $delta = $tend - $tstart;
-    my $hours = int($delta/3600);
-    my $minutes = int($delta/60) - ($hours * 60);
-    my $seconds = $delta - ($minutes * 60) - ($hours * 3600);
-    return sprintf("%02d:%02d:%02d" , $hours, $minutes, $seconds);
+  my $tstart  = shift;
+  my $tend    = shift;
+  my $delta   = $tend - $tstart;
+  my $hours   = int($delta / 3600);
+  my $minutes = int($delta / 60) - ($hours * 60);
+  my $seconds = $delta - ($minutes * 60) - ($hours * 3600);
+  return sprintf("%02d:%02d:%02d", $hours, $minutes, $seconds);
 }
 
 sub CollectSeriesData {
-    # We need some way of randomising the distribution of series, such that
-    # all of the series which are to be run every 7 days don't run on the same
-    # day. This is because this might put the server under severe load if a
-    # particular frequency, such as once a week, is very common. We achieve
-    # this by only running queries when:
-    # (days_since_epoch + series_id) % frequency = 0. So they'll run every
-    # <frequency> days, but the start date depends on the series_id.
-    my $days_since_epoch = int(time() / (60 * 60 * 24));
-    my $today = today_dash();
-
-    # We save a copy of the main $dbh and then switch to the shadow and get
-    # that one too. Remember, these may be the same.
-    my $dbh = Bugzilla->switch_to_main_db();
-    my $shadow_dbh = Bugzilla->switch_to_shadow_db();
-    
-    my $serieses = $dbh->selectall_hashref("SELECT series_id, query, creator " .
-                      "FROM series " .
-                      "WHERE frequency != 0 AND " . 
-                      "MOD(($days_since_epoch + series_id), frequency) = 0",
-                      "series_id");
-
-    # We prepare the insertion into the data table, for efficiency.
-    my $sth = $dbh->prepare("INSERT INTO series_data " .
-                            "(series_id, series_date, series_value) " .
-                            "VALUES (?, " . $dbh->quote($today) . ", ?)");
-
-    # We delete from the table beforehand, to avoid SQL errors if people run
-    # collectstats.pl twice on the same day.
-    my $deletesth = $dbh->prepare("DELETE FROM series_data 
-                                   WHERE series_id = ? AND series_date = " .
-                                   $dbh->quote($today));
-                                     
-    foreach my $series_id (keys %$serieses) {
-        # We set up the user for Search.pm's permission checking - each series
-        # runs with the permissions of its creator.
-        my $user = new Bugzilla::User($serieses->{$series_id}->{'creator'});
-        my $cgi = new Bugzilla::CGI($serieses->{$series_id}->{'query'});
-        my $data;
-
-        # Do not die if Search->new() detects invalid data, such as an obsolete
-        # login name or a renamed product or component, etc.
-        eval {
-            my $search = new Bugzilla::Search('params' => scalar $cgi->Vars,
-                                              'fields' => ["bug_id"],
-                                              'allow_unlimited' => 1,
-                                              'user'   => $user);
-            $data = $search->data;
-        };
-
-        if (!$@) {
-            # We need to count the returned rows. Without subselects, we can't
-            # do this directly in the SQL for all queries. So we do it by hand.
-            my $count = scalar(@$data) || 0;
-
-            $deletesth->execute($series_id);
-            $sth->execute($series_id, $count);
-        }
+
+  # We need some way of randomising the distribution of series, such that
+  # all of the series which are to be run every 7 days don't run on the same
+  # day. This is because this might put the server under severe load if a
+  # particular frequency, such as once a week, is very common. We achieve
+  # this by only running queries when:
+  # (days_since_epoch + series_id) % frequency = 0. So they'll run every
+  # <frequency> days, but the start date depends on the series_id.
+  my $days_since_epoch = int(time() / (60 * 60 * 24));
+  my $today = today_dash();
+
+  # We save a copy of the main $dbh and then switch to the shadow and get
+  # that one too. Remember, these may be the same.
+  my $dbh        = Bugzilla->switch_to_main_db();
+  my $shadow_dbh = Bugzilla->switch_to_shadow_db();
+
+  my $serieses = $dbh->selectall_hashref(
+    "SELECT series_id, query, creator "
+      . "FROM series "
+      . "WHERE frequency != 0 AND "
+      . "MOD(($days_since_epoch + series_id), frequency) = 0",
+    "series_id"
+  );
+
+  # We prepare the insertion into the data table, for efficiency.
+  my $sth
+    = $dbh->prepare("INSERT INTO series_data "
+      . "(series_id, series_date, series_value) "
+      . "VALUES (?, "
+      . $dbh->quote($today)
+      . ", ?)");
+
+  # We delete from the table beforehand, to avoid SQL errors if people run
+  # collectstats.pl twice on the same day.
+  my $deletesth = $dbh->prepare(
+    "DELETE FROM series_data 
+                                   WHERE series_id = ? AND series_date = "
+      . $dbh->quote($today)
+  );
+
+  foreach my $series_id (keys %$serieses) {
+
+    # We set up the user for Search.pm's permission checking - each series
+    # runs with the permissions of its creator.
+    my $user = new Bugzilla::User($serieses->{$series_id}->{'creator'});
+    my $cgi  = new Bugzilla::CGI($serieses->{$series_id}->{'query'});
+    my $data;
+
+    # Do not die if Search->new() detects invalid data, such as an obsolete
+    # login name or a renamed product or component, etc.
+    eval {
+      my $search = new Bugzilla::Search(
+        'params'          => scalar $cgi->Vars,
+        'fields'          => ["bug_id"],
+        'allow_unlimited' => 1,
+        'user'            => $user
+      );
+      $data = $search->data;
+    };
+
+    if (!$@) {
+
+      # We need to count the returned rows. Without subselects, we can't
+      # do this directly in the SQL for all queries. So we do it by hand.
+      my $count = scalar(@$data) || 0;
+
+      $deletesth->execute($series_id);
+      $sth->execute($series_id, $count);
     }
+  }
 }
 
 __END__
diff --git a/config.cgi b/config.cgi
index 56a9a3f8a1..13ef30bdbd 100755
--- a/config.cgi
+++ b/config.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -31,60 +31,64 @@ Bugzilla->switch_to_shadow_db;
 # If the 'requirelogin' parameter is on and the user is not
 # authenticated, return empty fields.
 if (Bugzilla->params->{'requirelogin'} && !$user->id) {
-    display_data();
-    exit;
+  display_data();
+  exit;
 }
 
 # Pass a bunch of Bugzilla configuration to the templates.
 my $vars = {};
-$vars->{'priority'}  = get_legal_field_values('priority');
-$vars->{'severity'}  = get_legal_field_values('bug_severity');
-$vars->{'platform'}  = get_legal_field_values('rep_platform');
-$vars->{'op_sys'}    = get_legal_field_values('op_sys');
-$vars->{'keywords'}  = [Bugzilla::Keyword->get_all];
+$vars->{'priority'}   = get_legal_field_values('priority');
+$vars->{'severity'}   = get_legal_field_values('bug_severity');
+$vars->{'platform'}   = get_legal_field_values('rep_platform');
+$vars->{'op_sys'}     = get_legal_field_values('op_sys');
+$vars->{'keywords'}   = [Bugzilla::Keyword->get_all];
 $vars->{'resolution'} = get_legal_field_values('resolution');
-$vars->{'status'}    = get_legal_field_values('bug_status');
-$vars->{'custom_fields'} =
-    [ grep {$_->is_select} Bugzilla->active_custom_fields ];
+$vars->{'status'}     = get_legal_field_values('bug_status');
+$vars->{'custom_fields'}
+  = [grep { $_->is_select } Bugzilla->active_custom_fields];
 
 # Include a list of product objects.
 if ($cgi->param('product')) {
-    my @products = $cgi->param('product');
-    foreach my $product_name (@products) {
-        # We don't use check() because config.cgi outputs mostly
-        # in XML and JS and we don't want to display an HTML error
-        # instead of that.
-        my $product = new Bugzilla::Product({ name => $product_name });
-        if ($product && $user->can_see_product($product->name)) {
-            push (@{$vars->{'products'}}, $product);
-        }
+  my @products = $cgi->multi_param('product');
+  foreach my $product_name (@products) {
+
+    # We don't use check() because config.cgi outputs mostly
+    # in XML and JS and we don't want to display an HTML error
+    # instead of that.
+    my $product = new Bugzilla::Product({name => $product_name});
+    if ($product && $user->can_see_product($product->name)) {
+      push(@{$vars->{'products'}}, $product);
     }
-} else {
-    $vars->{'products'} = $user->get_selectable_products;
+  }
+}
+else {
+  $vars->{'products'} = $user->get_selectable_products;
 }
 
 # We set the 2nd argument to 1 to also preload flag types.
 Bugzilla::Product::preload($vars->{'products'}, 1);
 
 if (Bugzilla->params->{'useclassification'}) {
-    my $class = {};
-    # Get all classifications with at least one selectable product.
-    foreach my $product (@{$vars->{'products'}}) {
-        $class->{$product->classification_id} ||= $product->classification;
-    }
-    my @classifications = sort {$a->sortkey <=> $b->sortkey
-        || lc($a->name) cmp lc($b->name)} (values %$class);
-    $vars->{'class_names'} = $class;
-    $vars->{'classifications'} = \@classifications;
+  my $class = {};
+
+  # Get all classifications with at least one selectable product.
+  foreach my $product (@{$vars->{'products'}}) {
+    $class->{$product->classification_id} ||= $product->classification;
+  }
+  my @classifications
+    = sort { $a->sortkey <=> $b->sortkey || lc($a->name) cmp lc($b->name) }
+    (values %$class);
+  $vars->{'class_names'}     = $class;
+  $vars->{'classifications'} = \@classifications;
 }
 
 # Allow consumers to specify whether or not they want flag data.
 if (defined $cgi->param('flags')) {
-    $vars->{'show_flags'} = $cgi->param('flags');
+  $vars->{'show_flags'} = $cgi->param('flags');
 }
 else {
-    # We default to sending flag data.
-    $vars->{'show_flags'} = 1;
+  # We default to sending flag data.
+  $vars->{'show_flags'} = 1;
 }
 
 # Create separate lists of open versus resolved statuses.  This should really
@@ -92,31 +96,33 @@ else {
 my @open_status;
 my @closed_status;
 foreach my $status (@{$vars->{'status'}}) {
-    is_open_state($status) ? push(@open_status, $status) 
-                           : push(@closed_status, $status);
+  is_open_state($status)
+    ? push(@open_status,   $status)
+    : push(@closed_status, $status);
 }
-$vars->{'open_status'} = \@open_status;
+$vars->{'open_status'}   = \@open_status;
 $vars->{'closed_status'} = \@closed_status;
 
 # Generate a list of fields that can be queried.
 my @fields = @{Bugzilla::Field->match({obsolete => 0})};
+
 # Exclude fields the user cannot query.
 if (!$user->is_timetracker) {
-    foreach my $tt_field (TIMETRACKING_FIELDS) {
-        @fields = grep { $_->name ne $tt_field } @fields;
-    }
+  foreach my $tt_field (TIMETRACKING_FIELDS) {
+    @fields = grep { $_->name ne $tt_field } @fields;
+  }
 }
 
 my %FIELD_PARAMS = (
-    classification    => 'useclassification',
-    target_milestone  => 'usetargetmilestone',
-    qa_contact        => 'useqacontact',
-    status_whiteboard => 'usestatuswhiteboard',
-    see_also          => 'use_see_also',
+  classification    => 'useclassification',
+  target_milestone  => 'usetargetmilestone',
+  qa_contact        => 'useqacontact',
+  status_whiteboard => 'usestatuswhiteboard',
+  see_also          => 'use_see_also',
 );
 foreach my $field (@fields) {
-    my $param = $FIELD_PARAMS{$field->name};
-    $field->{is_active} =  Bugzilla->params->{$param} if $param;
+  my $param = $FIELD_PARAMS{$field->name};
+  $field->{is_active} = Bugzilla->params->{$param} if $param;
 }
 $vars->{'field'} = \@fields;
 
@@ -124,33 +130,37 @@ display_data($vars);
 
 
 sub display_data {
-    my $vars = shift;
-
-    my $cgi      = Bugzilla->cgi;
-    my $template = Bugzilla->template;
-
-    # Determine how the user would like to receive the output; 
-    # default is JavaScript.
-    my $format = $template->get_format("config", scalar($cgi->param('format')),
-                                       scalar($cgi->param('ctype')) || "js");
-
-    # Generate the configuration data.
-    my $output;
-    $template->process($format->{'template'}, $vars, \$output)
-      || ThrowTemplateError($template->error());
-
-    # Wide characters cause md5_base64() to die.
-    my $digest_data = $output;
-    utf8::encode($digest_data) if utf8::is_utf8($digest_data);
-    my $digest = md5_base64($digest_data);
-
-    if ($cgi->check_etag($digest)) {
-        print $cgi->header(-ETag   => $digest,
-                           -status => '304 Not Modified');
-        exit;
-    }
+  my $vars = shift;
+
+  my $cgi      = Bugzilla->cgi;
+  my $template = Bugzilla->template;
+
+  # Determine how the user would like to receive the output;
+  # default is JavaScript.
+  my $format = $template->get_format(
+    "config",
+    scalar($cgi->param('format')),
+    scalar($cgi->param('ctype')) || "js"
+  );
+
+  # Generate the configuration data.
+  my $output;
+  $template->process($format->{'template'}, $vars, \$output)
+    || ThrowTemplateError($template->error());
+
+  # Remove leading whitespaces, to save some bandwidth.
+  $output =~ s/^\s+(?=<)//gm if $format->{'ctype'} =~ /rdf/;
+
+  # Wide characters cause md5_base64() to die.
+  my $digest_data = $output;
+  utf8::encode($digest_data) if utf8::is_utf8($digest_data);
+  my $digest = md5_base64($digest_data);
+
+  if ($cgi->check_etag($digest)) {
+    print $cgi->header(-ETag => $digest, -status => '304 Not Modified');
+    exit;
+  }
 
-    print $cgi->header (-ETag => $digest,
-                        -type => $format->{'ctype'});
-    print $output;
+  print $cgi->header(-ETag => $digest, -type => $format->{'ctype'});
+  print $output;
 }
diff --git a/contrib/Bugzilla.pm b/contrib/Bugzilla.pm
index 31e0a0f6d0..6806b36ebc 100644
--- a/contrib/Bugzilla.pm
+++ b/contrib/Bugzilla.pm
@@ -4,7 +4,7 @@
 
 package Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -36,7 +36,7 @@ use warnings;
 #######################################################################
 
 use constant BZ_ROOT_DIR => '/usr/share/bugzilla/lib';
-use constant BZ_LIB_DIR => BZ_ROOT_DIR . '/lib';
+use constant BZ_LIB_DIR  => BZ_ROOT_DIR . '/lib';
 
 #######################################################################
 #   DO NOT EDIT THE CODE BELOW, UNLESS YOU KNOW WHAT YOU ARE DOING!!  #
diff --git a/contrib/README b/contrib/README
index f820629252..f0d83086a2 100644
--- a/contrib/README
+++ b/contrib/README
@@ -33,6 +33,10 @@ bz_webservice_demo.pl --  An example script that demonstrates how to talk to
            recode.pl --  Script to convert a database from one encoding 
                          (or multiple encodings)  to UTF-8.
 
+             replyrc --  A config file for Reply (a perl shell) that loads
+                         Bugzilla, extensions and provides a few utility
+                         functions for manipulating Bugzilla data.
+
       sendbugmail.pl --  This script is a drop-in replacement for the
                          'processmail' script which used to be shipped
                          with Bugzilla, but was replaced by the
diff --git a/contrib/bz_webservice_demo.pl b/contrib/bz_webservice_demo.pl
index af8c253084..c6fd77eeb8 100755
--- a/contrib/bz_webservice_demo.pl
+++ b/contrib/bz_webservice_demo.pl
@@ -18,7 +18,7 @@ =head1 SYNOPSIS
 
 =cut
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -50,21 +50,22 @@ =head1 SYNOPSIS
 my $fetch_extension_info = 0;
 my $debug;
 
-GetOptions('help|h|?'       => \$help,
-           'uri=s'          => \$Bugzilla_uri,
-           'login:s'        => \$Bugzilla_login,
-           'password=s'     => \$Bugzilla_password,
-           'restrictlogin!' => \$Bugzilla_restrict,
-           'bug_id:s'       => \$bug_id,
-           'product_name:s' => \$product_name,
-           'create:s'       => \$create_file_name,
-           'field:s'        => \$legal_field_values,
-           'comment:s'      => \$add_comment,
-           'private:i'      => \$private,
-           'worktime:f'     => \$work_time,
-           'extension_info' => \$fetch_extension_info,
-           'debug'          => \$debug
-          ) or pod2usage({'-verbose' => 0, '-exitval' => 1});
+GetOptions(
+  'help|h|?'       => \$help,
+  'uri=s'          => \$Bugzilla_uri,
+  'login:s'        => \$Bugzilla_login,
+  'password=s'     => \$Bugzilla_password,
+  'restrictlogin!' => \$Bugzilla_restrict,
+  'bug_id:s'       => \$bug_id,
+  'product_name:s' => \$product_name,
+  'create:s'       => \$create_file_name,
+  'field:s'        => \$legal_field_values,
+  'comment:s'      => \$add_comment,
+  'private:i'      => \$private,
+  'worktime:f'     => \$work_time,
+  'extension_info' => \$fetch_extension_info,
+  'debug'          => \$debug
+) or pod2usage({'-verbose' => 0, '-exitval' => 1});
 
 =head1 OPTIONS
 
@@ -171,7 +172,7 @@ =head2 Debugging
 =cut
 
 if ($debug) {
-   $proxy->import(+trace => 'debug');
+  $proxy->import(+trace => 'debug');
 }
 
 =head2 Checking Bugzilla's version
@@ -184,7 +185,8 @@ =head2 Checking Bugzilla's version
 
 $soapresult = $proxy->call('Bugzilla.version');
 _die_on_fault($soapresult);
-print 'Connecting to a Bugzilla of version ' . $soapresult->result()->{version} . ".\n";
+print 'Connecting to a Bugzilla of version '
+  . $soapresult->result()->{version} . ".\n";
 
 =head2 Checking Bugzilla's timezone
 
@@ -217,22 +219,27 @@ =head3 Using Bugzilla's CGI Variable Authentication
 =cut
 
 if (defined($Bugzilla_login)) {
-    if ($Bugzilla_login ne '') {
-        # Log in.
-        $soapresult = $proxy->call('User.login',
-                                   { login => $Bugzilla_login,
-                                     password => $Bugzilla_password,
-                                     restrict_login => $Bugzilla_restrict } );
-        $Bugzilla_token = $soapresult->result->{token};
-        _die_on_fault($soapresult);
-        print "Login successful.\n";
-    }
-    else {
-        # Log out.
-        $soapresult = $proxy->call('User.logout');
-        _die_on_fault($soapresult);
-        print "Logout successful.\n";
-    }
+  if ($Bugzilla_login ne '') {
+
+    # Log in.
+    $soapresult = $proxy->call(
+      'User.login',
+      {
+        login          => $Bugzilla_login,
+        password       => $Bugzilla_password,
+        restrict_login => $Bugzilla_restrict
+      }
+    );
+    $Bugzilla_token = $soapresult->result->{token};
+    _die_on_fault($soapresult);
+    print "Login successful.\n";
+  }
+  else {
+    # Log out.
+    $soapresult = $proxy->call('User.logout');
+    _die_on_fault($soapresult);
+    print "Logout successful.\n";
+  }
 }
 
 =head2 Getting Extension Information
@@ -242,16 +249,16 @@ =head2 Getting Extension Information
 =cut
 
 if ($fetch_extension_info) {
-    $soapresult = $proxy->call('Bugzilla.extensions', {token => $Bugzilla_token});
-    _die_on_fault($soapresult);
-    my $extensions = $soapresult->result()->{extensions};
-    foreach my $extensionname (keys(%$extensions)) {
-        print "Extension '$extensionname' information\n";
-        my $extension = $extensions->{$extensionname};
-        foreach my $data (keys(%$extension)) {
-            print '  ' . $data . ' => ' . $extension->{$data} . "\n";
-        }
+  $soapresult = $proxy->call('Bugzilla.extensions', {token => $Bugzilla_token});
+  _die_on_fault($soapresult);
+  my $extensions = $soapresult->result()->{extensions};
+  foreach my $extensionname (keys(%$extensions)) {
+    print "Extension '$extensionname' information\n";
+    my $extension = $extensions->{$extensionname};
+    foreach my $data (keys(%$extension)) {
+      print '  ' . $data . ' => ' . $extension->{$data} . "\n";
     }
+  }
 }
 
 =head2 Retrieving Bug Information
@@ -259,26 +266,25 @@ =head2 Retrieving Bug Information
 Call C<Bug.get> with the ID of the bug you want to know more of.
 The call will return a C<Bugzilla::Bug> object.
 
-Note: You can also use "Bug.get_bugs" for compatibility with Bugzilla 3.0 API.
-
 =cut
 
 if ($bug_id) {
-    $soapresult = $proxy->call('Bug.get', { ids => [$bug_id], token => $Bugzilla_token});
-    _die_on_fault($soapresult);
-    $result = $soapresult->result;
-    my $bug = $result->{bugs}->[0];
-    foreach my $field (keys(%$bug)) {
-        my $value = $bug->{$field};
-        if (ref($value) eq 'HASH') {
-            foreach (keys %$value) {
-                print "$_: " . $value->{$_} . "\n";
-            }
-        }
-        else {
-            print "$field: $value\n";
-        }
+  $soapresult
+    = $proxy->call('Bug.get', {ids => [$bug_id], token => $Bugzilla_token});
+  _die_on_fault($soapresult);
+  $result = $soapresult->result;
+  my $bug = $result->{bugs}->[0];
+  foreach my $field (keys(%$bug)) {
+    my $value = $bug->{$field};
+    if (ref($value) eq 'HASH') {
+      foreach (keys %$value) {
+        print "$_: " . $value->{$_} . "\n";
+      }
+    }
+    else {
+      print "$field: $value\n";
     }
+  }
 }
 
 =head2 Retrieving Product Information
@@ -289,27 +295,28 @@ =head2 Retrieving Product Information
 =cut
 
 if ($product_name) {
-    $soapresult = $proxy->call('Product.get', {'names' => [$product_name], token => $Bugzilla_token});
-    _die_on_fault($soapresult);
-    $result = $soapresult->result()->{'products'}->[0];
-
-    # Iterate all entries, the values may be scalars or array refs with hash refs.
-    foreach my $key (sort(keys %$result)) {
-      my $value = $result->{$key};
-
-      if (ref($value)) {
-        my $counter = 0;
-        foreach my $hash (@$value) {
-          while (my ($innerKey, $innerValue) = each %$hash) {
-            print "$key.$counter.$innerKey: $innerValue\n";
-          }
-          ++$counter;
+  $soapresult = $proxy->call('Product.get',
+    {'names' => [$product_name], token => $Bugzilla_token});
+  _die_on_fault($soapresult);
+  $result = $soapresult->result()->{'products'}->[0];
+
+  # Iterate all entries, the values may be scalars or array refs with hash refs.
+  foreach my $key (sort(keys %$result)) {
+    my $value = $result->{$key};
+
+    if (ref($value)) {
+      my $counter = 0;
+      foreach my $hash (@$value) {
+        while (my ($innerKey, $innerValue) = each %$hash) {
+          print "$key.$counter.$innerKey: $innerValue\n";
         }
+        ++$counter;
       }
-      else {
-        print "$key: $value\n"
-      }
     }
+    else {
+      print "$key: $value\n";
+    }
+  }
 }
 
 =head2 Creating A Bug
@@ -322,20 +329,20 @@ =head2 Creating A Bug
 =cut
 
 if ($create_file_name) {
-    my $bug_fields = do "$create_file_name";
-    $bug_fields->{Bugzilla_token} = $Bugzilla_token;
-    $soapresult = $proxy->call('Bug.create', \%$bug_fields);
-    _die_on_fault($soapresult);
-    $result = $soapresult->result;
-
-    if (ref($result) eq 'HASH') {
-        foreach (keys(%$result)) {
-            print "$_: $$result{$_}\n";
-        }
-    }
-    else {
-        print "$result\n";
+  my $bug_fields = do "$create_file_name";
+  $bug_fields->{Bugzilla_token} = $Bugzilla_token;
+  $soapresult = $proxy->call('Bug.create', \%$bug_fields);
+  _die_on_fault($soapresult);
+  $result = $soapresult->result;
+
+  if (ref($result) eq 'HASH') {
+    foreach (keys(%$result)) {
+      print "$_: $$result{$_}\n";
     }
+  }
+  else {
+    print "$result\n";
+  }
 
 }
 
@@ -348,11 +355,12 @@ =head2 Getting Legal Field Values
 =cut
 
 if ($legal_field_values) {
-    $soapresult = $proxy->call('Bug.legal_values', {field => $legal_field_values, token => $Bugzilla_token} );
-    _die_on_fault($soapresult);
-    $result = $soapresult->result;
+  $soapresult = $proxy->call('Bug.legal_values',
+    {field => $legal_field_values, token => $Bugzilla_token});
+  _die_on_fault($soapresult);
+  $result = $soapresult->result;
 
-    print join("\n", @{$result->{values}}) . "\n";
+  print join("\n", @{$result->{values}}) . "\n";
 }
 
 =head2 Adding a comment to a bug
@@ -364,15 +372,23 @@ =head2 Adding a comment to a bug
 =cut
 
 if ($add_comment) {
-    if ($bug_id) {
-        $soapresult = $proxy->call('Bug.add_comment', {id => $bug_id,
-            comment => $add_comment, private => $private, work_time => $work_time, token => $Bugzilla_token});
-        _die_on_fault($soapresult);
-        print "Comment added.\n";
-    }
-    else {
-        print "A --bug_id must be supplied to add a comment.";
-    }
+  if ($bug_id) {
+    $soapresult = $proxy->call(
+      'Bug.add_comment',
+      {
+        id        => $bug_id,
+        comment   => $add_comment,
+        private   => $private,
+        work_time => $work_time,
+        token     => $Bugzilla_token
+      }
+    );
+    _die_on_fault($soapresult);
+    print "Comment added.\n";
+  }
+  else {
+    print "A --bug_id must be supplied to add a comment.";
+  }
 }
 
 =head1 NOTES
@@ -409,18 +425,19 @@ =head1 SEE ALSO
 =cut
 
 sub _die_on_fault {
-    my $soapresult = shift;
-
-    if ($soapresult->fault) {
-        my ($package, $filename, $line) = caller;
-        die $soapresult->faultcode . ' ' . $soapresult->faultstring .
-            " in SOAP call near $filename line $line.\n";
-    }
+  my $soapresult = shift;
+
+  if ($soapresult->fault) {
+    my ($package, $filename, $line) = caller;
+    die $soapresult->faultcode . ' '
+      . $soapresult->faultstring
+      . " in SOAP call near $filename line $line.\n";
+  }
 }
 
 sub _syntaxhelp {
-    my $msg = shift;
+  my $msg = shift;
 
-    print "Error: $msg\n";
-    pod2usage({'-verbose' => 0, '-exitval' => 1});
+  print "Error: $msg\n";
+  pod2usage({'-verbose' => 0, '-exitval' => 1});
 }
diff --git a/contrib/bzdbcopy.pl b/contrib/bzdbcopy.pl
index fcdbefd56d..2b929401d6 100755
--- a/contrib/bzdbcopy.pl
+++ b/contrib/bzdbcopy.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::DB;
@@ -22,51 +22,56 @@
 #####################################################################
 
 # Settings for the 'Source' DB that you are copying from.
-use constant SOURCE_DB_TYPE => 'Mysql';
-use constant SOURCE_DB_NAME => 'bugs';
-use constant SOURCE_DB_USER => 'bugs';
+use constant SOURCE_DB_TYPE     => 'Mysql';
+use constant SOURCE_DB_NAME     => 'bugs';
+use constant SOURCE_DB_USER     => 'bugs';
 use constant SOURCE_DB_PASSWORD => '';
-use constant SOURCE_DB_HOST => 'localhost';
+use constant SOURCE_DB_HOST     => 'localhost';
 
 # Settings for the 'Target' DB that you are copying to.
-use constant TARGET_DB_TYPE => 'Pg';
-use constant TARGET_DB_NAME => 'bugs';
-use constant TARGET_DB_USER => 'bugs';
+use constant TARGET_DB_TYPE     => 'Pg';
+use constant TARGET_DB_NAME     => 'bugs';
+use constant TARGET_DB_USER     => 'bugs';
 use constant TARGET_DB_PASSWORD => '';
-use constant TARGET_DB_HOST => 'localhost';
+use constant TARGET_DB_HOST     => 'localhost';
 
 #####################################################################
 # MAIN SCRIPT
 #####################################################################
 
-print "Connecting to the '" . SOURCE_DB_NAME . "' source database on " 
-      . SOURCE_DB_TYPE . "...\n";
+print "Connecting to the '"
+  . SOURCE_DB_NAME
+  . "' source database on "
+  . SOURCE_DB_TYPE . "...\n";
 my $source_db = Bugzilla::DB::_connect({
-    db_driver => SOURCE_DB_TYPE, 
-    db_host   => SOURCE_DB_HOST, 
-    db_name   => SOURCE_DB_NAME, 
-    db_user   => SOURCE_DB_USER, 
-    db_pass   => SOURCE_DB_PASSWORD,
+  db_driver => SOURCE_DB_TYPE,
+  db_host   => SOURCE_DB_HOST,
+  db_name   => SOURCE_DB_NAME,
+  db_user   => SOURCE_DB_USER,
+  db_pass   => SOURCE_DB_PASSWORD,
 });
+
 # Don't read entire tables into memory.
 if (SOURCE_DB_TYPE eq 'Mysql') {
-    $source_db->{'mysql_use_result'} = 1;
+  $source_db->{'mysql_use_result'} = 1;
 
-    # MySQL cannot have two queries running at the same time. Ensure the schema
-    # is loaded from the database so bz_column_info will not execute a query
-    $source_db->_bz_real_schema;
+  # MySQL cannot have two queries running at the same time. Ensure the schema
+  # is loaded from the database so bz_column_info will not execute a query
+  $source_db->_bz_real_schema;
 }
 
-print "Connecting to the '" . TARGET_DB_NAME . "' target database on "
-      . TARGET_DB_TYPE . "...\n";
+print "Connecting to the '"
+  . TARGET_DB_NAME
+  . "' target database on "
+  . TARGET_DB_TYPE . "...\n";
 my $target_db = Bugzilla::DB::_connect({
-    db_driver => TARGET_DB_TYPE,
-    db_host   => TARGET_DB_HOST, 
-    db_name   => TARGET_DB_NAME, 
-    db_user   => TARGET_DB_USER,
-    db_pass   => TARGET_DB_PASSWORD,
+  db_driver => TARGET_DB_TYPE,
+  db_host   => TARGET_DB_HOST,
+  db_name   => TARGET_DB_NAME,
+  db_user   => TARGET_DB_USER,
+  db_pass   => TARGET_DB_PASSWORD,
 });
-my $ident_char = $target_db->get_info( 29 ); # SQL_IDENTIFIER_QUOTE_CHAR
+my $ident_char = $target_db->get_info(29);    # SQL_IDENTIFIER_QUOTE_CHAR
 
 # We use the table list from the target DB, because if somebody
 # has customized their source DB, we still want the script to work,
@@ -79,136 +84,145 @@
 # Instead of figuring out some fancy algorithm to insert data in the right
 # order and not break FK integrity, we just drop them all.
 $target_db->bz_drop_foreign_keys();
+
 # We start a transaction on the target DB, which helps when we're doing
 # so many inserts.
 $target_db->bz_start_transaction();
 foreach my $table (@table_list) {
-    my @serial_cols;
-    print "Reading data from the source '$table' table on " 
-          . SOURCE_DB_TYPE . "...\n";
-    my @table_columns = $target_db->bz_table_columns_real($table);
-    # The column names could be quoted using the quote identifier char
-    # Remove these chars as different databases use different quote chars
-    @table_columns = map { s/^\Q$ident_char\E?(.*?)\Q$ident_char\E?$/$1/; $_ }
-                         @table_columns;
-
-    my ($total) = $source_db->selectrow_array("SELECT COUNT(*) FROM $table");
-    my $select_query = "SELECT " . join(',', @table_columns) . " FROM $table";
-    my $select_sth = $source_db->prepare($select_query);
-    $select_sth->execute();
-
-    my $insert_query = "INSERT INTO $table ( " . join(',', @table_columns) 
-                       . " ) VALUES (";
-    $insert_query .= '?,' foreach (@table_columns);
-    # Remove the last comma.
-    chop($insert_query);
-    $insert_query .= ")";
-    my $insert_sth = $target_db->prepare($insert_query);
-
-    print "Clearing out the target '$table' table on " 
-          . TARGET_DB_TYPE . "...\n";
-    $target_db->do("DELETE FROM $table");
-
-    # Oracle doesn't like us manually inserting into tables that have
-    # auto-increment PKs set, because of the way we made auto-increment
-    # fields work.
-    if ($target_db->isa('Bugzilla::DB::Oracle')) {
-        foreach my $column (@table_columns) {
-            my $col_info = $source_db->bz_column_info($table, $column);
-            if ($col_info && $col_info->{TYPE} =~ /SERIAL/i) {
-                print "Dropping the sequence + trigger on $table.$column...\n";
-                $target_db->do("DROP TRIGGER ${table}_${column}_TR");
-                $target_db->do("DROP SEQUENCE ${table}_${column}_SEQ");
-            }
-        }
+  my @serial_cols;
+  print "Reading data from the source '$table' table on "
+    . SOURCE_DB_TYPE . "...\n";
+  my @table_columns = $target_db->bz_table_columns_real($table);
+
+  # The column names could be quoted using the quote identifier char
+  # Remove these chars as different databases use different quote chars
+  @table_columns
+    = map { s/^\Q$ident_char\E?(.*?)\Q$ident_char\E?$/$1/; $_ } @table_columns;
+
+  my ($total) = $source_db->selectrow_array("SELECT COUNT(*) FROM $table");
+  my $select_query = "SELECT " . join(',', @table_columns) . " FROM $table";
+  my $select_sth = $source_db->prepare($select_query);
+  $select_sth->execute();
+
+  my $insert_query
+    = "INSERT INTO $table ( " . join(',', @table_columns) . " ) VALUES (";
+  $insert_query .= '?,' foreach (@table_columns);
+
+  # Remove the last comma.
+  chop($insert_query);
+  $insert_query .= ")";
+  my $insert_sth = $target_db->prepare($insert_query);
+
+  print "Clearing out the target '$table' table on " . TARGET_DB_TYPE . "...\n";
+  $target_db->do("DELETE FROM $table");
+
+  # Oracle doesn't like us manually inserting into tables that have
+  # auto-increment PKs set, because of the way we made auto-increment
+  # fields work.
+  if ($target_db->isa('Bugzilla::DB::Oracle')) {
+    foreach my $column (@table_columns) {
+      my $col_info = $source_db->bz_column_info($table, $column);
+      if ($col_info && $col_info->{TYPE} =~ /SERIAL/i) {
+        print "Dropping the sequence + trigger on $table.$column...\n";
+        $target_db->do("DROP TRIGGER ${table}_${column}_TR");
+        $target_db->do("DROP SEQUENCE ${table}_${column}_SEQ");
+      }
     }
-    
-    print "Writing data to the target '$table' table on " 
-          . TARGET_DB_TYPE . "...\n";
-    my $count = 0;
-    while (my $row = $select_sth->fetchrow_arrayref) {
-        # Each column needs to be bound separately, because
-        # many columns need to be dealt with specially.
-        my $colnum = 0;
-        foreach my $column (@table_columns) {
-            # bind_param args start at 1, but arrays start at 0.
-            my $param_num = $colnum + 1;
-            my $already_bound;
-
-            # Certain types of columns need special handling.
-            my $col_info = $source_db->bz_column_info($table, $column);
-            if ($col_info && $col_info->{TYPE} eq 'LONGBLOB') {
-                $insert_sth->bind_param($param_num, 
-                    $row->[$colnum], $target_db->BLOB_TYPE);
-                $already_bound = 1;
-            }
-            elsif ($col_info && $col_info->{TYPE} =~ /decimal/) {
-                # In MySQL, decimal cols can be too long.
-                my $col_type = $col_info->{TYPE};
-                $col_type =~ /decimal\((\d+),(\d+)\)/;
-                my ($precision, $decimals) = ($1, $2);
-                # If it's longer than precision + decimal point
-                if ( length($row->[$colnum]) > ($precision + 1) ) {
-                    # Truncate it to the highest allowed value.
-                    my $orig_value = $row->[$colnum];
-                    $row->[$colnum] = '';
-                    my $non_decimal = $precision - $decimals;
-                    $row->[$colnum] .= '9' while ($non_decimal--);
-                    $row->[$colnum] .= '.';
-                    $row->[$colnum] .= '9' while ($decimals--);
-                    print "Truncated value $orig_value to " . $row->[$colnum] 
-                         . " for $table.$column.\n";
-                }
-            }
-            elsif ($col_info && $col_info->{TYPE} =~ /DATETIME/i) {
-                my $date = $row->[$colnum];
-                # MySQL can have strange invalid values for Datetimes.
-                $row->[$colnum] = '1901-01-01 00:00:00'
-                    if $date && $date eq '0000-00-00 00:00:00';
-            }
-
-            $insert_sth->bind_param($param_num, $row->[$colnum])
-                unless $already_bound;
-            $colnum++;
-        }
+  }
 
-        $insert_sth->execute();
-        $count++;
-        indicate_progress({ current => $count, total => $total, every => 100 });
-    }
+  print "Writing data to the target '$table' table on "
+    . TARGET_DB_TYPE . "...\n";
+  my $count = 0;
+  while (my $row = $select_sth->fetchrow_arrayref) {
 
-    # For some DBs, we have to do clever things with auto-increment fields.
+    # Each column needs to be bound separately, because
+    # many columns need to be dealt with specially.
+    my $colnum = 0;
     foreach my $column (@table_columns) {
-        next if $target_db->isa('Bugzilla::DB::Mysql');
-        my $col_info = $source_db->bz_column_info($table, $column);
-        if ($col_info && $col_info->{TYPE} =~ /SERIAL/i) {
-            my ($max_val) = $target_db->selectrow_array(
-                    "SELECT MAX($column) FROM $table");
-            # Set the sequence to the current max value + 1.
-            $max_val = 0 if !defined $max_val;
-            $max_val++;
-            print "\nSetting the next value for $table.$column to $max_val.";
-            if ($target_db->isa('Bugzilla::DB::Pg')) {
-                # PostgreSQL doesn't like it when you insert values into
-                # a serial field; it doesn't increment the counter 
-                # automatically.
-                $target_db->bz_set_next_serial_value($table, $column);
-            }
-            elsif ($target_db->isa('Bugzilla::DB::Oracle')) {
-                # Oracle increments the counter on every insert, and *always*
-                # sets the field, even if you gave it a value. So if there
-                # were already rows in the target DB (like the default rows
-                # created by checksetup), you'll get crazy values in your
-                # id columns. So we just dropped the sequences above and
-                # we re-create them here, starting with the right number.
-                my @sql = $target_db->_bz_real_schema->_get_create_seq_ddl(
-                    $table, $column, $max_val);
-                $target_db->do($_) foreach @sql;
-            }
+
+      # bind_param args start at 1, but arrays start at 0.
+      my $param_num = $colnum + 1;
+      my $already_bound;
+
+      # Certain types of columns need special handling.
+      my $col_info = $source_db->bz_column_info($table, $column);
+      if ($col_info && $col_info->{TYPE} eq 'LONGBLOB') {
+        $insert_sth->bind_param($param_num, $row->[$colnum], $target_db->BLOB_TYPE);
+        $already_bound = 1;
+      }
+      elsif ($col_info && $col_info->{TYPE} =~ /decimal/) {
+
+        # In MySQL, decimal cols can be too long.
+        my $col_type = $col_info->{TYPE};
+        $col_type =~ /decimal\((\d+),(\d+)\)/;
+        my ($precision, $decimals) = ($1, $2);
+
+        # If it's longer than precision + decimal point
+        if (length($row->[$colnum]) > ($precision + 1)) {
+
+          # Truncate it to the highest allowed value.
+          my $orig_value = $row->[$colnum];
+          $row->[$colnum] = '';
+          my $non_decimal = $precision - $decimals;
+          $row->[$colnum] .= '9' while ($non_decimal--);
+          $row->[$colnum] .= '.';
+          $row->[$colnum] .= '9' while ($decimals--);
+          print "Truncated value $orig_value to "
+            . $row->[$colnum]
+            . " for $table.$column.\n";
         }
+      }
+      elsif ($col_info && $col_info->{TYPE} =~ /DATETIME/i) {
+        my $date = $row->[$colnum];
+
+        # MySQL can have strange invalid values for Datetimes.
+        $row->[$colnum] = '1901-01-01 00:00:00'
+          if $date && $date eq '0000-00-00 00:00:00';
+      }
+
+      $insert_sth->bind_param($param_num, $row->[$colnum]) unless $already_bound;
+      $colnum++;
+    }
+
+    $insert_sth->execute();
+    $count++;
+    indicate_progress({current => $count, total => $total, every => 100});
+  }
+
+  # For some DBs, we have to do clever things with auto-increment fields.
+  foreach my $column (@table_columns) {
+    next if $target_db->isa('Bugzilla::DB::Mysql');
+    my $col_info = $source_db->bz_column_info($table, $column);
+    if ($col_info && $col_info->{TYPE} =~ /SERIAL/i) {
+      my ($max_val) = $target_db->selectrow_array("SELECT MAX($column) FROM $table");
+
+      # Set the sequence to the current max value + 1.
+      $max_val = 0 if !defined $max_val;
+      $max_val++;
+      print "\nSetting the next value for $table.$column to $max_val.";
+      if ($target_db->isa('Bugzilla::DB::Pg')) {
+
+        # PostgreSQL doesn't like it when you insert values into
+        # a serial field; it doesn't increment the counter
+        # automatically.
+        $target_db->bz_set_next_serial_value($table, $column);
+      }
+      elsif ($target_db->isa('Bugzilla::DB::Oracle')) {
+
+        # Oracle increments the counter on every insert, and *always*
+        # sets the field, even if you gave it a value. So if there
+        # were already rows in the target DB (like the default rows
+        # created by checksetup), you'll get crazy values in your
+        # id columns. So we just dropped the sequences above and
+        # we re-create them here, starting with the right number.
+        my @sql
+          = $target_db->_bz_real_schema->_get_create_seq_ddl($table, $column, $max_val);
+        $target_db->do($_) foreach @sql;
+      }
     }
+  }
 
-    print "\n\n";
+  print "\n\n";
 }
 
 print "Committing changes to the target database...\n";
diff --git a/contrib/console.pl b/contrib/console.pl
index fe2342cd9b..9e8f520f9b 100755
--- a/contrib/console.pl
+++ b/contrib/console.pl
@@ -10,7 +10,7 @@
 
 use File::Basename;
 BEGIN { chdir dirname($0) . "/.."; }
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -20,115 +20,120 @@
 use Term::ReadLine;
 use Data::Dumper;
 $Data::Dumper::Sortkeys = 1;
-$Data::Dumper::Terse = 1;
-$Data::Dumper::Indent = 1;
-$Data::Dumper::Useqq = 1;
+$Data::Dumper::Terse    = 1;
+$Data::Dumper::Indent   = 1;
+$Data::Dumper::Useqq    = 1;
 $Data::Dumper::Maxdepth = 1;
-$Data::Dumper::Deparse = 0;
+$Data::Dumper::Deparse  = 0;
 
 my $sysname = get_text('term', {term => 'Bugzilla'});
 my $term = new Term::ReadLine "$sysname Console";
 read_history($term);
 END { write_history($term) }
 
-while ( defined (my $input = $term->readline("$sysname> ")) ) {
-    my @res = eval($input);
-    if ($@) {
-        warn $@;
-    }
-    else {
-        print Dumper(@res);
-    }
+while (defined(my $input = $term->readline("$sysname> "))) {
+  my @res = eval($input);
+  if ($@) {
+    warn $@;
+  }
+  else {
+    print Dumper(@res);
+  }
 }
 print STDERR "\n";
 exit 0;
 
 # d: full dump (normal behavior is limited to depth of 1)
 sub d {
-    local $Data::Dumper::Maxdepth = 0;
-    local $Data::Dumper::Deparse = 1;
-    print Dumper(@_);
-    return ();
+  local $Data::Dumper::Maxdepth = 0;
+  local $Data::Dumper::Deparse  = 1;
+  print Dumper(@_);
+  return ();
 }
 
 # p: print as a single string (normal behavior puts list items on separate lines)
 sub p {
-    no warnings; # suppress possible undefined var message 
-    print(@_, "\n");
-    return ();
+  no warnings;    # suppress possible undefined var message
+  print(@_, "\n");
+  return ();
 }
 
 sub filter {
-    my $name = shift;
-    my $filter = Bugzilla->template->{SERVICE}->{CONTEXT}->{CONFIG}->{FILTERS}->{$name};
-    if (scalar @_) {
-        return $filter->(@_);
-    }
-    else {
-        return $filter;
-    }
+  my $name = shift;
+  my $filter
+    = Bugzilla->template->{SERVICE}->{CONTEXT}->{CONFIG}->{FILTERS}->{$name};
+  if (scalar @_) {
+    return $filter->(@_);
+  }
+  else {
+    return $filter;
+  }
 }
 
-sub b { get_object('Bugzilla::Bug', @_) }
-sub u { get_object('Bugzilla::User', @_) }
+sub b { get_object('Bugzilla::Bug',   @_) }
+sub u { get_object('Bugzilla::User',  @_) }
 sub f { get_object('Bugzilla::Field', @_) }
 
 sub get_object {
-    my $class = shift;
-    $_ = shift;
-    my @results = ();
-    
-    if (ref $_ eq 'HASH' && keys %$_) {
-        @results = @{$class->match($_)};
-    }
-    elsif (m/^\d+$/) {
-        @results = ($class->new($_));
-    }
-    elsif (m/\w/i && grep {$_ eq 'name'} ($class->_get_db_columns)) {
-        @results = @{$class->match({name => $_})};
-    }
-    else {
-        @results = ();
-    }
-    
-    if (wantarray) {
-        return @results;
-    }
-    else {
-        return shift @results;
-    }
+  my $class = shift;
+  $_ = shift;
+  my @results = ();
+
+  if (ref $_ eq 'HASH' && keys %$_) {
+    @results = @{$class->match($_)};
+  }
+  elsif (m/^\d+$/) {
+    @results = ($class->new($_));
+  }
+  elsif (m/\w/i && grep { $_ eq 'name' } ($class->_get_db_columns)) {
+    @results = @{$class->match({name => $_})};
+  }
+  else {
+    @results = ();
+  }
+
+  if (wantarray) {
+    return @results;
+  }
+  else {
+    return shift @results;
+  }
 }
 
 sub read_history {
-    my ($term) = @_;
-    
-    if (open HIST, "<$ENV{HOME}/.bugzilla_console_history") {
-        foreach (<HIST>) {
-            chomp;
-            $term->addhistory($_);
-        }
-        close HIST;
+  my ($term) = @_;
+
+  if (open HIST, "<$ENV{HOME}/.bugzilla_console_history") {
+    foreach (<HIST>) {
+      chomp;
+      $term->addhistory($_);
     }
+    close HIST;
+  }
 }
 
 sub write_history {
-    my ($term) = @_;
-
-    if ($term->can('GetHistory') && open HIST, ">$ENV{HOME}/.bugzilla_console_history") {
-        my %seen_hist = ();
-        my @hist = ();
-        foreach my $line (reverse $term->GetHistory()) {
-            next unless $line =~ m/\S/;
-            next if $seen_hist{$line};
-            $seen_hist{$line} = 1;
-            push @hist, $line;
-            last if (scalar @hist > 500);
-        }
-        foreach (reverse @hist) {
-            print HIST $_, "\n";
-        }
-        close HIST;
+  my ($term) = @_;
+
+  if (
+    $term->can('GetHistory') && open HIST,
+    ">$ENV{HOME}/.bugzilla_console_history"
+    )
+  {
+    my %seen_hist = ();
+    my @hist      = ();
+    foreach my $line (reverse $term->GetHistory()) {
+      next unless $line =~ m/\S/;
+      next if $seen_hist{$line};
+      $seen_hist{$line} = 1;
+      push @hist, $line;
+      last if (scalar @hist > 500);
+    }
+    foreach (reverse @hist) {
+      print HIST $_, "\n";
     }
+    close HIST;
+  }
 }
 
 __END__
diff --git a/contrib/convert-workflow.pl b/contrib/convert-workflow.pl
index d9bffb7bbe..2a00d42df0 100755
--- a/contrib/convert-workflow.pl
+++ b/contrib/convert-workflow.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Config qw(:admin);
@@ -18,14 +18,14 @@
 use Bugzilla::Status;
 use Getopt::Long;
 
-my $confirmed   = new Bugzilla::Status({ name => 'CONFIRMED' });
-my $in_progress = new Bugzilla::Status({ name => 'IN_PROGRESS' });
+my $confirmed   = new Bugzilla::Status({name => 'CONFIRMED'});
+my $in_progress = new Bugzilla::Status({name => 'IN_PROGRESS'});
 
 if ($confirmed and $in_progress) {
-    print "You are already using the new workflow.\n";
-    exit 1;
+  print "You are already using the new workflow.\n";
+  exit 1;
 }
-my $enable_unconfirmed  = 0;
+my $enable_unconfirmed = 0;
 my $result = GetOptions("enable-unconfirmed" => \$enable_unconfirmed);
 
 print <<END;
@@ -44,9 +44,10 @@
 
 END
 if ($enable_unconfirmed) {
-    print "UNCONFIRMED will be enabled in all products.\n";
-} else {
-    print <<END;
+  print "UNCONFIRMED will be enabled in all products.\n";
+}
+else {
+  print <<END;
 If you also want to enable the UNCONFIRMED status in every product,
 restart this script with the --enable-unconfirmed option.
 END
@@ -55,103 +56,116 @@ END
 getc;
 
 my $dbh = Bugzilla->dbh;
+
 # This is an array instead of a hash so that we can be sure that
 # the translation happens in the right order. In particular, we
 # want NEW to be renamed to CONFIRMED, instead of having REOPENED
 # be the one that gets renamed.
 my @translation = (
-    [NEW      => 'CONFIRMED'],
-    [ASSIGNED => 'IN_PROGRESS'],
-    [REOPENED => 'CONFIRMED'],
-    [CLOSED   => 'VERIFIED'],
+  [NEW      => 'CONFIRMED'],
+  [ASSIGNED => 'IN_PROGRESS'],
+  [REOPENED => 'CONFIRMED'],
+  [CLOSED   => 'VERIFIED'],
 );
 
 my $status_field = Bugzilla::Field->check('bug_status');
 $dbh->bz_start_transaction();
 foreach my $pair (@translation) {
-    my ($from, $to) = @$pair;
-    print "Converting $from to $to...\n";
-    # There is no FK on bugs.bug_status pointing to bug_status.value,
-    # so it's fine to update the bugs table first.
-    $dbh->do('UPDATE bugs SET bug_status = ? WHERE bug_status = ?',
-             undef, $to, $from);
-
-    if (Bugzilla->params->{'duplicate_or_move_bug_status'} eq $from) {
-        SetParam('duplicate_or_move_bug_status', $to);
-        write_params();
-    }
-
-    foreach my $what (qw(added removed)) {
-        $dbh->do("UPDATE bugs_activity SET $what = ?
-                   WHERE fieldid = ? AND $what = ?",
-                 undef, $to, $status_field->id, $from);
-    }
-
-    # Delete any transitions where it now appears that
-    # a bug moved from a status to itself.
-    $dbh->do('DELETE FROM bugs_activity WHERE fieldid = ? AND added = removed',
-             undef, $status_field->id);
-
-    # If the new status already exists, just delete the old one, but retain
-    # the workflow items from it.
-    my $new_status = new Bugzilla::Status({ name => $to });
-    my $old_status = new Bugzilla::Status({ name => $from });
-
-    if ($new_status && $old_status) {
-        my $to_id = $new_status->id;
-        my $from_id = $old_status->id;
-        # The subselect collects existing transitions from the target bug status.
-        # The main select collects existing transitions from the renamed bug status.
-        # The diff tells us which transitions are missing from the target bug status.
-        my $missing_transitions =
-          $dbh->selectcol_arrayref('SELECT sw1.new_status
+  my ($from, $to) = @$pair;
+  print "Converting $from to $to...\n";
+
+  # There is no FK on bugs.bug_status pointing to bug_status.value,
+  # so it's fine to update the bugs table first.
+  $dbh->do('UPDATE bugs SET bug_status = ? WHERE bug_status = ?',
+    undef, $to, $from);
+
+  if (Bugzilla->params->{'duplicate_or_move_bug_status'} eq $from) {
+    SetParam('duplicate_or_move_bug_status', $to);
+    write_params();
+  }
+
+  foreach my $what (qw(added removed)) {
+    $dbh->do(
+      "UPDATE bugs_activity SET $what = ?
+                   WHERE fieldid = ? AND $what = ?", undef, $to, $status_field->id,
+      $from
+    );
+  }
+
+  # Delete any transitions where it now appears that
+  # a bug moved from a status to itself.
+  $dbh->do('DELETE FROM bugs_activity WHERE fieldid = ? AND added = removed',
+    undef, $status_field->id);
+
+  # If the new status already exists, just delete the old one, but retain
+  # the workflow items from it.
+  my $new_status = new Bugzilla::Status({name => $to});
+  my $old_status = new Bugzilla::Status({name => $from});
+
+  if ($new_status && $old_status) {
+    my $to_id   = $new_status->id;
+    my $from_id = $old_status->id;
+
+    # The subselect collects existing transitions from the target bug status.
+    # The main select collects existing transitions from the renamed bug status.
+    # The diff tells us which transitions are missing from the target bug status.
+    my $missing_transitions = $dbh->selectcol_arrayref(
+      'SELECT sw1.new_status
                                       FROM status_workflow sw1
                                      WHERE sw1.old_status = ?
                                        AND sw1.new_status NOT IN (SELECT sw2.new_status
                                                                     FROM status_workflow sw2
                                                                    WHERE sw2.old_status = ?)',
-                                     undef, ($from_id, $to_id));
-
-        $dbh->do('UPDATE status_workflow SET old_status = ? WHERE old_status = ? AND '
-                 . $dbh->sql_in('new_status', $missing_transitions),
-                 undef, ($to_id, $from_id)) if @$missing_transitions;
-
-        # The subselect collects existing transitions to the target bug status.
-        # The main select collects existing transitions to the renamed bug status.
-        # The diff tells us which transitions are missing to the target bug status.
-        # We have to explicitly exclude NULL from the subselect, because NOT IN
-        # doesn't know what to do with it (neither true nor false) and no data is returned.
-        $missing_transitions =
-          $dbh->selectcol_arrayref('SELECT sw1.old_status
+      undef, ($from_id, $to_id)
+    );
+
+    $dbh->do(
+      'UPDATE status_workflow SET old_status = ? WHERE old_status = ? AND '
+        . $dbh->sql_in('new_status', $missing_transitions),
+      undef,
+      ($to_id, $from_id)
+    ) if @$missing_transitions;
+
+ # The subselect collects existing transitions to the target bug status.
+ # The main select collects existing transitions to the renamed bug status.
+ # The diff tells us which transitions are missing to the target bug status.
+ # We have to explicitly exclude NULL from the subselect, because NOT IN
+ # doesn't know what to do with it (neither true nor false) and no data is returned.
+    $missing_transitions = $dbh->selectcol_arrayref(
+      'SELECT sw1.old_status
                                       FROM status_workflow sw1
                                      WHERE sw1.new_status = ?
                                        AND sw1.old_status NOT IN (SELECT sw2.old_status
                                                                     FROM status_workflow sw2
                                                                    WHERE sw2.new_status = ?
                                                                      AND sw2.old_status IS NOT NULL)',
-                                     undef, ($from_id, $to_id));
-
-        $dbh->do('UPDATE status_workflow SET new_status = ? WHERE new_status = ? AND '
-                 . $dbh->sql_in('old_status', $missing_transitions),
-                 undef, ($to_id, $from_id)) if @$missing_transitions;
-
-        # Delete rows where old_status = new_status, and then the old status itself.
-        $dbh->do('DELETE FROM status_workflow WHERE old_status = new_status');
-        $dbh->do('DELETE FROM bug_status WHERE value = ?', undef, $from);
-    }
-    # Otherwise, rename the old status to the new one.
-    elsif ($old_status) {
-        $dbh->do('UPDATE bug_status SET value = ? WHERE value = ?',
-                 undef, $to, $from);
-    }
-
-    Bugzilla::Search::Saved->rename_field_value('bug_status', $from, $to);
-    Bugzilla::Series->Bugzilla::Search::Saved::rename_field_value('bug_status',
-        $from, $to);
+      undef, ($from_id, $to_id)
+    );
+
+    $dbh->do(
+      'UPDATE status_workflow SET new_status = ? WHERE new_status = ? AND '
+        . $dbh->sql_in('old_status', $missing_transitions),
+      undef,
+      ($to_id, $from_id)
+    ) if @$missing_transitions;
+
+    # Delete rows where old_status = new_status, and then the old status itself.
+    $dbh->do('DELETE FROM status_workflow WHERE old_status = new_status');
+    $dbh->do('DELETE FROM bug_status WHERE value = ?', undef, $from);
+  }
+
+  # Otherwise, rename the old status to the new one.
+  elsif ($old_status) {
+    $dbh->do('UPDATE bug_status SET value = ? WHERE value = ?', undef, $to, $from);
+  }
+
+  Bugzilla::Search::Saved->rename_field_value('bug_status', $from, $to);
+  Bugzilla::Series->Bugzilla::Search::Saved::rename_field_value('bug_status',
+    $from, $to);
 }
 if ($enable_unconfirmed) {
-    print "Enabling UNCONFIRMED in all products...\n";
-    $dbh->do('UPDATE products SET allows_unconfirmed = 1');
+  print "Enabling UNCONFIRMED in all products...\n";
+  $dbh->do('UPDATE products SET allows_unconfirmed = 1');
 }
 $dbh->bz_commit_transaction();
 Bugzilla->memcached->clear_all();
diff --git a/contrib/extension-convert.pl b/contrib/extension-convert.pl
index 91a77b8394..6fd9073fd1 100755
--- a/contrib/extension-convert.pl
+++ b/contrib/extension-convert.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -21,8 +21,7 @@
 use File::Find;
 use File::Path qw(mkpath rmtree);
 
-my $from = $ARGV[0]
-  or die <<END;
+my $from = $ARGV[0] or die <<END;
 You must specify the name of the extension you are converting from,
 as the first argument.
 END
@@ -32,33 +31,33 @@ END
 
 my $from_dir = "$extdir/$from";
 if (!-d $from_dir) {
-    die "$from_dir does not exist.\n";
+  die "$from_dir does not exist.\n";
 }
 
 my $to_dir = "$extdir/$extension_name";
 if (-d $to_dir) {
-    die "$to_dir already exists, not converting.\n";
+  die "$to_dir already exists, not converting.\n";
 }
 
 if (ON_WINDOWS) {
-    # There's no easy way to recursively copy a directory on Windows.
-    print "WARNING: This will modify the contents of $from_dir.\n",
-          "Press Ctrl-C to stop or any other key to continue...\n";
-    getc;
-    move($from_dir, $to_dir) 
-        || die "rename of $from_dir to $to_dir failed: $!";
+
+  # There's no easy way to recursively copy a directory on Windows.
+  print "WARNING: This will modify the contents of $from_dir.\n",
+    "Press Ctrl-C to stop or any other key to continue...\n";
+  getc;
+  move($from_dir, $to_dir) || die "rename of $from_dir to $to_dir failed: $!";
 }
 else {
-    print "Copying $from_dir to $to_dir...\n";
-    system("cp", "-r", $from_dir, $to_dir);
+  print "Copying $from_dir to $to_dir...\n";
+  system("cp", "-r", $from_dir, $to_dir);
 }
 
-# Make sure we don't accidentally modify the $from_dir anywhere else 
+# Make sure we don't accidentally modify the $from_dir anywhere else
 # in this script.
 undef $from_dir;
 
 if (!-d $to_dir) {
-    die "$to_dir was not created.\n";
+  die "$to_dir was not created.\n";
 }
 
 my $version = get_version($to_dir);
@@ -96,7 +95,7 @@ END
 open(my $config_fh, '>', "$to_dir/Config.pm") || die "$to_dir/Config.pm: $!";
 print $config_fh $config_pm;
 close($config_fh);
-open(my $extension_fh, '>', "$to_dir/Extension.pm") 
+open(my $extension_fh, '>', "$to_dir/Extension.pm")
   || die "$to_dir/Extension.pm: $!";
 print $extension_fh $extension_pm;
 close($extension_fh);
@@ -109,176 +108,179 @@ END
 ###############
 
 sub rename_module_packages {
-    my ($dir, $name) = @_;
-    my $lib_dir = "$dir/lib";
-
-    # We don't want things like Bugzilla::Extension::Testopia::Testopia.
-    if (-d "$lib_dir/$name") {
-        print "Moving contents of $lib_dir/$name into $lib_dir...\n";
-        foreach my $file (glob("$lib_dir/$name/*")) {
-            my $dirname = dirname($file);
-            my $basename = basename($file);
-            rename($file, "$dirname/../$basename") || warn "$file: $!\n";
-        }
+  my ($dir, $name) = @_;
+  my $lib_dir = "$dir/lib";
+
+  # We don't want things like Bugzilla::Extension::Testopia::Testopia.
+  if (-d "$lib_dir/$name") {
+    print "Moving contents of $lib_dir/$name into $lib_dir...\n";
+    foreach my $file (glob("$lib_dir/$name/*")) {
+      my $dirname  = dirname($file);
+      my $basename = basename($file);
+      rename($file, "$dirname/../$basename") || warn "$file: $!\n";
     }
+  }
 
-    my @modules;
-    find({ wanted   => sub { $_ =~ /\.pm$/i and push(@modules, $_) }, 
-           no_chdir => 1 }, $lib_dir);
-    my %module_rename;
-    foreach my $file (@modules) {
-        open(my $fh, '<', $file) || die "$file: $!";
-        my $content = do { local $/ = undef; <$fh> };
-        close($fh);
-        if ($content =~ /^package (\S+);/m) {
-            my $package = $1;
-            my $new_name = $file;
-            $new_name =~ s/^$lib_dir\///;
-            $new_name =~ s/\.pm$//;
-            $new_name = join('::', File::Spec->splitdir($new_name));
-            $new_name = "Bugzilla::Extension::${name}::$new_name";
-            print "Renaming $package to $new_name...\n";
-            $content =~ s/^package \Q$package\E;/package \Q$new_name\E;/;
-            open(my $write_fh, '>', $file) || die "$file: $!";
-            print $write_fh $content;
-            close($write_fh);
-            $module_rename{$package} = $new_name;
-        }
+  my @modules;
+  find({wanted => sub { $_ =~ /\.pm$/i and push(@modules, $_) }, no_chdir => 1},
+    $lib_dir);
+  my %module_rename;
+  foreach my $file (@modules) {
+    open(my $fh, '<', $file) || die "$file: $!";
+    my $content = do { local $/ = undef; <$fh> };
+    close($fh);
+    if ($content =~ /^package (\S+);/m) {
+      my $package  = $1;
+      my $new_name = $file;
+      $new_name =~ s/^$lib_dir\///;
+      $new_name =~ s/\.pm$//;
+      $new_name = join('::', File::Spec->splitdir($new_name));
+      $new_name = "Bugzilla::Extension::${name}::$new_name";
+      print "Renaming $package to $new_name...\n";
+      $content =~ s/^package \Q$package\E;/package \Q$new_name\E;/;
+      open(my $write_fh, '>', $file) || die "$file: $!";
+      print $write_fh $content;
+      close($write_fh);
+      $module_rename{$package} = $new_name;
     }
+  }
 
-    print "Renaming module names inside of library and code files...\n";
-    my @code_files = glob("$dir/code/*.pl");
-    rename_modules_internally(\%module_rename, [@modules, @code_files]);
+  print "Renaming module names inside of library and code files...\n";
+  my @code_files = glob("$dir/code/*.pl");
+  rename_modules_internally(\%module_rename, [@modules, @code_files]);
 }
 
 sub rename_modules_internally {
-    my ($rename, $files) = @_;
-
-    # We can't use \b because :: matches \b.
-    my $break = qr/^|[^\w:]|$/;
-    foreach my $file (@$files) {
-        open(my $fh, '<', $file) || die "$file: $!";
-        my $content = do { local $/ = undef; <$fh> };
-        close($fh);
-        foreach my $old_name (keys %$rename) {
-            my $new_name = $rename->{$old_name};
-            $content =~ s/($break)\Q$old_name\E($break)/$1$new_name$2/gms;
-        }
-        open(my $write_fh, '>', $file) || die "$file: $!";
-        print $write_fh $content;
-        close($write_fh);
+  my ($rename, $files) = @_;
+
+  # We can't use \b because :: matches \b.
+  my $break = qr/^|[^\w:]|$/;
+  foreach my $file (@$files) {
+    open(my $fh, '<', $file) || die "$file: $!";
+    my $content = do { local $/ = undef; <$fh> };
+    close($fh);
+    foreach my $old_name (keys %$rename) {
+      my $new_name = $rename->{$old_name};
+      $content =~ s/($break)\Q$old_name\E($break)/$1$new_name$2/gms;
     }
+    open(my $write_fh, '>', $file) || die "$file: $!";
+    print $write_fh $content;
+    close($write_fh);
+  }
 }
 
 sub get_version {
-    my ($dir) = @_;
-    print "Getting version info from info.pl...\n";
-    my $info;
-    {
-        local @INC = ("$dir/lib", @INC);
-        $info = do "$dir/info.pl"; die $@ if $@;
-    }
-    return $info->{version};
+  my ($dir) = @_;
+  print "Getting version info from info.pl...\n";
+  my $info;
+  {
+    local @INC = ("$dir/lib", @INC);
+    $info = do "$dir/info.pl";
+    die $@ if $@;
+  }
+  return $info->{version};
 }
 
 sub get_install_requirements {
-    my ($dir) = @_;
-    my $file = "$dir/code/install-requirements.pl";
-    return '' if !-f $file;
-
-    print "Moving install-requirements.pl code into Config.pm...\n";
-    my ($modules, $code) = process_code_file($file);
-    $modules = join('', @$modules);
-    $code = join('', @$code);
-    if ($modules) {
-        return "$modules\n\n$code";
-    }
-    return $code;
+  my ($dir) = @_;
+  my $file = "$dir/code/install-requirements.pl";
+  return '' if !-f $file;
+
+  print "Moving install-requirements.pl code into Config.pm...\n";
+  my ($modules, $code) = process_code_file($file);
+  $modules = join('', @$modules);
+  $code    = join('', @$code);
+  if ($modules) {
+    return "$modules\n\n$code";
+  }
+  return $code;
 }
 
 sub process_code_file {
-    my ($file) = @_;
-    open(my $fh, '<', $file) || die "$file: $!";
-    my $stuff_started;
-    my (@modules, @code);
-    foreach my $line (<$fh>) {
-        $stuff_started = 1 if $line !~ /^#/;
-        next if !$stuff_started;
-        next if $line =~ /^use (warnings|strict|lib|Bugzilla)[^\w:]/;
-        if ($line =~ /^(?:use|require)\b/) {
-            push(@modules, $line);
-        }
-        else {
-            push(@code, $line);
-        }
+  my ($file) = @_;
+  open(my $fh, '<', $file) || die "$file: $!";
+  my $stuff_started;
+  my (@modules, @code);
+  foreach my $line (<$fh>) {
+    $stuff_started = 1 if $line !~ /^#/;
+    next if !$stuff_started;
+    next if $line =~ /^use (warnings|strict|lib|Bugzilla)[^\w:]/;
+    if ($line =~ /^(?:use|require)\b/) {
+      push(@modules, $line);
+    }
+    else {
+      push(@code, $line);
     }
-    close $fh;
-    return (\@modules, \@code);
+  }
+  close $fh;
+  return (\@modules, \@code);
 }
 
 sub code_files_to_subroutines {
-    my ($dir) = @_;
-
-    my @dir_files = glob("$dir/code/*.pl");
-    my (@all_modules, @subroutines);
-    foreach my $file (@dir_files) {
-        next if $file =~ /install-requirements/;
-        print "Moving $file code into Extension.pm...\n";
-        my ($modules, $code) = process_code_file($file);
-        my @code_lines = map { "    $_" } @$code;
-        my $code_string = join('', @code_lines);
-        $code_string =~ s/Bugzilla->hook_args/\$args/g;
-        $code_string =~ s/my\s+\$args\s+=\s+\$args;//gs;
-        chomp($code_string);
-        push(@all_modules, @$modules);
-        my $name = basename($file);
-        $name =~ s/-/_/;
-        $name =~ s/\.pl$//;
-
-        my $subroutine = <<END;
+  my ($dir) = @_;
+
+  my @dir_files = glob("$dir/code/*.pl");
+  my (@all_modules, @subroutines);
+  foreach my $file (@dir_files) {
+    next if $file =~ /install-requirements/;
+    print "Moving $file code into Extension.pm...\n";
+    my ($modules, $code) = process_code_file($file);
+    my @code_lines = map {"    $_"} @$code;
+    my $code_string = join('', @code_lines);
+    $code_string =~ s/Bugzilla->hook_args/\$args/g;
+    $code_string =~ s/my\s+\$args\s+=\s+\$args;//gs;
+    chomp($code_string);
+    push(@all_modules, @$modules);
+    my $name = basename($file);
+    $name =~ s/-/_/;
+    $name =~ s/\.pl$//;
+
+    my $subroutine = <<END;
 sub $name {
     my (\$self, \$args) = \@_;
 $code_string
 }
 END
-        push(@subroutines, $subroutine);
-    }
+    push(@subroutines, $subroutine);
+  }
 
-    my %seen_modules = map { trim($_) => 1 } @all_modules;
-    my $module_string = join("\n", sort keys %seen_modules);
-    my $subroutine_string = join("\n", @subroutines);
-    return ($module_string, $subroutine_string);
+  my %seen_modules = map { trim($_) => 1 } @all_modules;
+  my $module_string     = join("\n", sort keys %seen_modules);
+  my $subroutine_string = join("\n", @subroutines);
+  return ($module_string, $subroutine_string);
 }
 
 sub move_template_hooks {
-    my ($dir) = @_;
-    foreach my $lang (glob("$dir/template/*")) {
-        next if !_file_matters($lang);
-        my $hook_container = "$lang/default/hook";
-        mkpath($hook_container) || warn "$hook_container: $!";
-        # Hooks can be in all sorts of weird places, including
-        # template/default/hook.
-        foreach my $file (glob("$lang/*")) {
-            next if !_file_matters($file, 1);
-            my $dirname = basename($file);
-            print "Moving $file to $hook_container/$dirname...\n";
-            rename($file, "$hook_container/$dirname") || die "move failed: $!";
-        }
+  my ($dir) = @_;
+  foreach my $lang (glob("$dir/template/*")) {
+    next if !_file_matters($lang);
+    my $hook_container = "$lang/default/hook";
+    mkpath($hook_container) || warn "$hook_container: $!";
+
+    # Hooks can be in all sorts of weird places, including
+    # template/default/hook.
+    foreach my $file (glob("$lang/*")) {
+      next if !_file_matters($file, 1);
+      my $dirname = basename($file);
+      print "Moving $file to $hook_container/$dirname...\n";
+      rename($file, "$hook_container/$dirname") || die "move failed: $!";
     }
+  }
 }
 
 sub _file_matters {
-     my ($path, $tmpl) = @_;
-     my @ignore = qw(default custom CVS);
-     my $file = basename($path);
-     return 0 if grep(lc($_) eq lc($file), @ignore);
-      # Hidden files
-     return 0 if $file =~ /^\./;
-     if ($tmpl) {
-         return 1 if $file =~ /\.tmpl$/;
-     }
-     return 0 if !-d $path;
-     return 1;
+  my ($path, $tmpl) = @_;
+  my @ignore = qw(default custom CVS);
+  my $file   = basename($path);
+  return 0 if grep(lc($_) eq lc($file), @ignore);
+
+  # Hidden files
+  return 0 if $file =~ /^\./;
+  if ($tmpl) {
+    return 1 if $file =~ /\.tmpl$/;
+  }
+  return 0 if !-d $path;
+  return 1;
 }
 
 __END__
diff --git a/contrib/fixperms.pl b/contrib/fixperms.pl
index 33b042c66b..55e8e90b89 100755
--- a/contrib/fixperms.pl
+++ b/contrib/fixperms.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);
diff --git a/contrib/merge-users.pl b/contrib/merge-users.pl
index 86b209ab24..fc58a303f9 100755
--- a/contrib/merge-users.pl
+++ b/contrib/merge-users.pl
@@ -6,7 +6,7 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -31,7 +31,7 @@ =head1 SYNOPSIS
 
 =cut
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -44,7 +44,7 @@ =head1 SYNOPSIS
 my $dbh = Bugzilla->dbh;
 
 # Display the help if called with --help or -?.
-my $help  = 0;
+my $help = 0;
 my $result = GetOptions("help|?" => \$help);
 pod2usage(0) if $help;
 
@@ -53,49 +53,54 @@ =head1 SYNOPSIS
 my $old = $ARGV[0] || die "You must specify an old user account.\n";
 my $old_id;
 if ($old =~ /^id:(\d+)$/) {
-    # As the old user account may be a deleted one, we don't
-    # check whether this user ID is valid or not.
-    # If it never existed, no damage will be done.
-    $old_id = $1;
+
+  # As the old user account may be a deleted one, we don't
+  # check whether this user ID is valid or not.
+  # If it never existed, no damage will be done.
+  $old_id = $1;
 }
 else {
-    trick_taint($old);
-    $old_id = $dbh->selectrow_array('SELECT userid FROM profiles
-                                      WHERE login_name = ?',
-                                      undef, $old);
+  trick_taint($old);
+  $old_id = $dbh->selectrow_array(
+    'SELECT userid FROM profiles
+                                      WHERE login_name = ?', undef, $old
+  );
 }
 if ($old_id) {
-    print "OK, old user account $old found; user ID: $old_id.\n";
+  print "OK, old user account $old found; user ID: $old_id.\n";
 }
 else {
-    die "The old user account $old does not exist.\n";
+  die "The old user account $old does not exist.\n";
 }
 
 my $new = $ARGV[1] || die "You must specify a new user account.\n";
 my $new_id;
 if ($new =~ /^id:(\d+)$/) {
-    $new_id = $1;
-    # Make sure this user ID exists.
-    $new_id = $dbh->selectrow_array('SELECT userid FROM profiles
-                                      WHERE userid = ?',
-                                      undef, $new_id);
+  $new_id = $1;
+
+  # Make sure this user ID exists.
+  $new_id = $dbh->selectrow_array(
+    'SELECT userid FROM profiles
+                                      WHERE userid = ?', undef, $new_id
+  );
 }
 else {
-    trick_taint($new);
-    $new_id = $dbh->selectrow_array('SELECT userid FROM profiles
-                                      WHERE login_name = ?',
-                                      undef, $new);
+  trick_taint($new);
+  $new_id = $dbh->selectrow_array(
+    'SELECT userid FROM profiles
+                                      WHERE login_name = ?', undef, $new
+  );
 }
 if ($new_id) {
-    print "OK, new user account $new found; user ID: $new_id.\n";
+  print "OK, new user account $new found; user ID: $new_id.\n";
 }
 else {
-    die "The new user account $new does not exist.\n";
+  die "The new user account $new does not exist.\n";
 }
 
 # Make sure the old and new accounts are different.
 if ($old_id == $new_id) {
-    die "\nBoth accounts are identical. There is nothing to migrate.\n";
+  die "\nBoth accounts are identical. There is nothing to migrate.\n";
 }
 
 
@@ -112,32 +117,34 @@ =head1 SYNOPSIS
 # We set the tables that require custom stuff (multiple columns to check)
 # here, but the simple stuff is all handled below by bz_get_related_fks.
 my %changes = (
-    cc              => ['who bug_id'],
-    # Tables affecting global behavior / other users.
-    component_cc    => ['user_id component_id'],
-    watch           => ['watcher watched', 'watched watcher'],
-    # Tables affecting the user directly.
-    namedqueries    => ['userid name'],
-    namedqueries_link_in_footer => ['user_id namedquery_id'],
-    user_group_map  => ['user_id group_id isbless grant_type'],
-    email_setting   => ['user_id relationship event'],
-    profile_setting => ['user_id setting_name'],
-
-    # Only do it if mailto_type = 0, i.e is pointing to a user account!
-    # This requires to be done separately due to this condition.
-    whine_schedules => [], # ['mailto'],
+  cc => ['who bug_id'],
+
+  # Tables affecting global behavior / other users.
+  component_cc => ['user_id component_id'],
+  watch        => ['watcher watched', 'watched watcher'],
+
+  # Tables affecting the user directly.
+  namedqueries                => ['userid name'],
+  namedqueries_link_in_footer => ['user_id namedquery_id'],
+  user_group_map              => ['user_id group_id isbless grant_type'],
+  email_setting               => ['user_id relationship event'],
+  profile_setting             => ['user_id setting_name'],
+
+  # Only do it if mailto_type = 0, i.e is pointing to a user account!
+  # This requires to be done separately due to this condition.
+  whine_schedules => [],    # ['mailto'],
 );
 
 my $userid_fks = $dbh->bz_get_related_fks('profiles', 'userid');
 foreach my $item (@$userid_fks) {
-    my ($table, $column) = @$item;
-    $changes{$table} ||= [];
-    push(@{ $changes{$table} }, $column);
+  my ($table, $column) = @$item;
+  $changes{$table} ||= [];
+  push(@{$changes{$table}}, $column);
 }
 
 # Delete all old records for these tables; no migration.
 foreach my $table (qw(logincookies tokens profiles)) {
-    $changes{$table} = [];
+  $changes{$table} = [];
 }
 
 # Start the transaction
@@ -145,7 +152,7 @@ =head1 SYNOPSIS
 
 # Delete old records from logincookies and tokens tables.
 $dbh->do('DELETE FROM logincookies WHERE userid = ?', undef, $old_id);
-$dbh->do('DELETE FROM tokens WHERE userid = ?', undef, $old_id);
+$dbh->do('DELETE FROM tokens WHERE userid = ?',       undef, $old_id);
 
 # Special care needs to be done with bug_user_last_visit table as the
 # source user and destination user may have visited the same bug id at one time.
@@ -158,78 +165,87 @@ =head1 SYNOPSIS
                AND earlier.last_visit_ts < later.last_visit_ts
                AND earlier.bug_id = later.bug_id)
      WHERE (earlier.user_id = ? OR earlier.user_id = ?)
-           AND (later.user_id = ? OR later.user_id = ?)",
-    undef, $old_id, $new_id, $old_id, $new_id);
+           AND (later.user_id = ? OR later.user_id = ?)", undef, $old_id,
+  $new_id, $old_id, $new_id);
 
 if (@$dupe_ids) {
-    $dbh->do("DELETE FROM bug_user_last_visit WHERE " .
-             $dbh->sql_in('id', $dupe_ids));
+  $dbh->do(
+    "DELETE FROM bug_user_last_visit WHERE " . $dbh->sql_in('id', $dupe_ids));
 }
 
 # Migrate records from old user to new user.
 foreach my $table (keys %changes) {
-    foreach my $column_list (@{ $changes{$table} }) {
-        # Get all columns to consider. There is always at least
-        # one column given: the one to update.
-        my @columns = split(/[\s]+/, $column_list);
-        my $cols_to_check = join(' AND ', map {"$_ = ?"} @columns);
-        # The first column of the list is the one to update.
-        my $col_to_update = shift @columns;
-
-        # Will be used to migrate the old user account to the new one.
-        my $sth_update = $dbh->prepare("UPDATE $table
+  foreach my $column_list (@{$changes{$table}}) {
+
+    # Get all columns to consider. There is always at least
+    # one column given: the one to update.
+    my @columns = split(/[\s]+/, $column_list);
+    my $cols_to_check = join(' AND ', map {"$_ = ?"} @columns);
+
+    # The first column of the list is the one to update.
+    my $col_to_update = shift @columns;
+
+    # Will be used to migrate the old user account to the new one.
+    my $sth_update = $dbh->prepare(
+      "UPDATE $table
                                            SET $col_to_update = ?
-                                         WHERE $cols_to_check");
+                                         WHERE $cols_to_check"
+    );
 
-        # Do we have additional columns to take care of?
-        if (scalar(@columns)) {
-            my $cols_to_query = join(', ', @columns);
+    # Do we have additional columns to take care of?
+    if (scalar(@columns)) {
+      my $cols_to_query = join(', ', @columns);
 
-            # Get existing entries for the old user account.
-            my $old_entries = 
-                $dbh->selectall_arrayref("SELECT $cols_to_query
+      # Get existing entries for the old user account.
+      my $old_entries = $dbh->selectall_arrayref(
+        "SELECT $cols_to_query
                                             FROM $table
-                                           WHERE $col_to_update = ?",
-                                          undef, $old_id);
+                                           WHERE $col_to_update = ?", undef, $old_id
+      );
 
-            # Will be used to check whether the same entry exists
-            # for the new user account.
-            my $sth_select = $dbh->prepare("SELECT COUNT(*)
+      # Will be used to check whether the same entry exists
+      # for the new user account.
+      my $sth_select = $dbh->prepare(
+        "SELECT COUNT(*)
                                               FROM $table
-                                             WHERE $cols_to_check");
-
-            # Will be used to delete duplicated entries.
-            my $sth_delete = $dbh->prepare("DELETE FROM $table
-                                             WHERE $cols_to_check");
-
-            foreach my $entry (@$old_entries) {
-                my $exists = $dbh->selectrow_array($sth_select, undef,
-                                                   ($new_id, @$entry));
-
-                if ($exists) {
-                    $sth_delete->execute($old_id, @$entry);
-                }
-                else {
-                    $sth_update->execute($new_id, $old_id, @$entry);
-                }
-            }
+                                             WHERE $cols_to_check"
+      );
+
+      # Will be used to delete duplicated entries.
+      my $sth_delete = $dbh->prepare(
+        "DELETE FROM $table
+                                             WHERE $cols_to_check"
+      );
+
+      foreach my $entry (@$old_entries) {
+        my $exists = $dbh->selectrow_array($sth_select, undef, ($new_id, @$entry));
+
+        if ($exists) {
+          $sth_delete->execute($old_id, @$entry);
         }
-        # No check required. Update the column directly.
         else {
-            $sth_update->execute($new_id, $old_id);
+          $sth_update->execute($new_id, $old_id, @$entry);
         }
-        print "OK, records in the '$col_to_update' column of the '$table' table\n" .
-              "have been migrated to the new user account.\n";
+      }
     }
+
+    # No check required. Update the column directly.
+    else {
+      $sth_update->execute($new_id, $old_id);
+    }
+    print "OK, records in the '$col_to_update' column of the '$table' table\n"
+      . "have been migrated to the new user account.\n";
+  }
 }
 
 # Only update 'whine_schedules' if mailto_type = 0.
 # (i.e. is pointing to a user ID).
-$dbh->do('UPDATE whine_schedules SET mailto = ?
-           WHERE mailto = ? AND mailto_type = ?',
-          undef, ($new_id, $old_id, 0));
-print "OK, records in the 'mailto' column of the 'whine_schedules' table\n" .
-      "have been migrated to the new user account.\n";
+$dbh->do(
+  'UPDATE whine_schedules SET mailto = ?
+           WHERE mailto = ? AND mailto_type = ?', undef, ($new_id, $old_id, 0)
+);
+print "OK, records in the 'mailto' column of the 'whine_schedules' table\n"
+  . "have been migrated to the new user account.\n";
 
 # Delete the old record from the profiles table.
 $dbh->do('DELETE FROM profiles WHERE userid = ?', undef, $old_id);
diff --git a/contrib/mysqld-watcher.pl b/contrib/mysqld-watcher.pl
index be93dcbb5d..57a0f1206c 100755
--- a/contrib/mysqld-watcher.pl
+++ b/contrib/mysqld-watcher.pl
@@ -8,12 +8,12 @@
 
 # mysqld-watcher.pl - a script that watches the running instance of
 # mysqld and kills off any long-running SELECTs against the shadow_db
-# 
-use 5.10.1;
+#
+use 5.14.0;
 use strict;
 use warnings;
 
-# some configurables: 
+# some configurables:
 
 # length of time before a thread is eligible to be killed, in seconds
 #
@@ -40,65 +40,70 @@
 # queries so we know which queries are taking too long to run, but complete
 # queries with line breaks get missed by this script, so we get abbreviated
 # queries as well to make sure we don't miss any.
-foreach my $command ("/opt/mysql/bin/mysqladmin --verbose processlist", 
-                     "/opt/mysql/bin/mysqladmin processlist")
+foreach my $command (
+  "/opt/mysql/bin/mysqladmin --verbose processlist",
+  "/opt/mysql/bin/mysqladmin processlist"
+  )
 {
-    close(STDIN);
-    open(STDIN, "$command |");
+  close(STDIN);
+  open(STDIN, "$command |");
 
-    # iterate through the running threads
-    #
-    while ( <STDIN> ) { 
-        my @F = split(/\|/);
+  # iterate through the running threads
+  #
+  while (<STDIN>) {
+    my @F = split(/\|/);
 
-        # if this line is not the correct number of fields, or if the thread-id
-        # field contains Id, skip this line.  both these cases indicate that this
-        # line contains pretty-printing gunk and not thread info.
-        #
-        next if ( $#F != 9 || $F[1] =~ /Id/); 
+    # if this line is not the correct number of fields, or if the thread-id
+    # field contains Id, skip this line.  both these cases indicate that this
+    # line contains pretty-printing gunk and not thread info.
+    #
+    next if ($#F != 9 || $F[1] =~ /Id/);
 
-        if ( $F[4] =~ /shadow_bugs/             # shadowbugs database in use
-             && $F[5] =~ /Query/                # this is actually a query
-             && $F[6] > $long_query_time        # this query has taken too long
-             && $F[8] =~ /(select|SELECT)/      # only kill a select
-             && !defined($long->{$F[1]}) )      # haven't seen this one already
-        {
-	    $long->{$F[1]} = \@F;
-            system("/opt/mysql/bin/mysqladmin", "kill", $F[1]);
-        }
+    if (
+      $F[4] =~ /shadow_bugs/           # shadowbugs database in use
+      && $F[5] =~ /Query/              # this is actually a query
+      && $F[6] > $long_query_time      # this query has taken too long
+      && $F[8] =~ /(select|SELECT)/    # only kill a select
+      && !defined($long->{$F[1]})
+      )                                # haven't seen this one already
+    {
+      $long->{$F[1]} = \@F;
+      system("/opt/mysql/bin/mysqladmin", "kill", $F[1]);
     }
+  }
 }
 
 # send an email message
 #
-# should perhaps be moved to somewhere more global for use in bugzilla as a 
+# should perhaps be moved to somewhere more global for use in bugzilla as a
 # whole; should also do more error-checking
 #
 sub sendEmail($$$$) {
-    ($#_ == 3) || die("sendEmail: invalid number of arguments");
-    my ($from, $to, $subject, $body) = @_;
+  ($#_ == 3) || die("sendEmail: invalid number of arguments");
+  my ($from, $to, $subject, $body) = @_;
+
+  open(MTA, "|$mta_program");
+  print MTA "From: $from\n";
+  print MTA "To: $to\n";
+  print MTA "Subject: $subject\n";
+  print MTA "\n";
+  print MTA $body;
+  print MTA "\n";
+  close(MTA);
 
-    open(MTA, "|$mta_program");
-    print MTA "From: $from\n";
-    print MTA "To: $to\n";
-    print MTA "Subject: $subject\n";
-    print MTA "\n";
-    print MTA $body;
-    print MTA "\n";
-    close(MTA);
-   
 }
 
 # if we found anything, kill the database thread and send mail about it
 #
 if (scalar(keys(%$long))) {
-    my $message = "";
-    foreach my $process_id (keys(%$long)) {
-        my $qry = $long->{$process_id};
-        $message .= join(" ", @$qry) . "\n\n";
-    }
+  my $message = "";
+  foreach my $process_id (keys(%$long)) {
+    my $qry = $long->{$process_id};
+    $message .= join(" ", @$qry) . "\n\n";
+  }
 
-    # fire off an email telling the maintainer that we had to kill some threads
-    #
-    sendEmail($mail_from, $mail_to, "long running MySQL thread(s) killed", $message);
+  # fire off an email telling the maintainer that we had to kill some threads
+  #
+  sendEmail($mail_from, $mail_to, "long running MySQL thread(s) killed",
+    $message);
 }
diff --git a/contrib/new-locale.pl b/contrib/new-locale.pl
new file mode 100755
index 0000000000..e4325c5be9
--- /dev/null
+++ b/contrib/new-locale.pl
@@ -0,0 +1,19 @@
+#!/usr/bin/perl -w
+
+use File::Find;
+use File::Copy::Recursive qw(dircopy);
+
+($ARGV[0] && $ARGV[0] =~ /\w\w(-\w\w)?/) || usage();
+
+sub process {
+  if ($_ eq 'en' && $File::Find::name !~ /\/data\//) {
+    dircopy($_, $ARGV[0]);
+  }
+}
+
+find(\&process, ".");
+
+sub usage {
+  print "Usage: new-locale.pl <lang code>\n";
+  print " e.g.: new-locale.pl fr\n";
+}
diff --git a/contrib/recode.pl b/contrib/recode.pl
index e6da47b924..656bacc3b8 100755
--- a/contrib/recode.pl
+++ b/contrib/recode.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -32,21 +32,26 @@
 # For certain tables, we can't automatically determine their Primary Key.
 # So, we specify it here as a string.
 use constant SPECIAL_KEYS => {
-    # bugs_activity since 4.4 has a unique primary key added
-    bugs_activity     => 'bug_id,bug_when,fieldid',
-    profile_setting   => 'user_id,setting_name',
-    # profiles_activity since 4.4 has a unique primary key added
-    profiles_activity => 'userid,profiles_when,fieldid',
-    setting_value     => 'name,value',
-    # longdescs didn't used to have a PK, before 2.20.
-    longdescs         => 'bug_id,bug_when',
-    # The 2.16 versions table lacked a PK
-    versions          => 'product_id,value',
-    # These are all for earlier versions of Bugzilla. On a modern
-    # version of Bugzilla, this script will ignore these (thanks to
-    # code further down).
-    components        => 'program,value',
-    products          => 'product',
+
+  # bugs_activity since 4.4 has a unique primary key added
+  bugs_activity   => 'bug_id,bug_when,fieldid',
+  profile_setting => 'user_id,setting_name',
+
+  # profiles_activity since 4.4 has a unique primary key added
+  profiles_activity => 'userid,profiles_when,fieldid',
+  setting_value     => 'name,value',
+
+  # longdescs didn't used to have a PK, before 2.20.
+  longdescs => 'bug_id,bug_when',
+
+  # The 2.16 versions table lacked a PK
+  versions => 'product_id,value',
+
+  # These are all for earlier versions of Bugzilla. On a modern
+  # version of Bugzilla, this script will ignore these (thanks to
+  # code further down).
+  components => 'program,value',
+  products   => 'product',
 };
 
 ###############
@@ -55,18 +60,18 @@
 
 # "truncate" is a file operation in perl, so we can't use that name.
 sub trunc {
-    my ($str) = @_;
-    my $truncated = substr($str, 0, MAX_STRING_LEN);
-    if (length($truncated) ne length($str)) {
-        $truncated .= '...';
-    }
-    return $truncated;
+  my ($str) = @_;
+  my $truncated = substr($str, 0, MAX_STRING_LEN);
+  if (length($truncated) ne length($str)) {
+    $truncated .= '...';
+  }
+  return $truncated;
 }
 
 sub is_valid_utf8 {
-    my ($str) = @_;
-    Encode::_utf8_on($str);
-    return is_utf8($str, 1);
+  my ($str) = @_;
+  Encode::_utf8_on($str);
+  return is_utf8($str, 1);
 }
 
 ###############
@@ -75,170 +80,173 @@ sub is_valid_utf8 {
 
 my %switch;
 GetOptions(\%switch, 'dry-run', 'guess', 'charset=s', 'show-failures',
-                     'overrides=s', 'help|h');
+  'overrides=s', 'help|h');
 
-pod2usage({ -verbose => 1 }) if $switch{'help'};
+pod2usage({-verbose => 1}) if $switch{'help'};
 
 # You have to specify at least one of these switches.
-pod2usage({ -verbose => 0 }) if (!$switch{'charset'} && !$switch{'guess'});
+pod2usage({-verbose => 0}) if (!$switch{'charset'} && !$switch{'guess'});
 
 if (exists $switch{'charset'}) {
-    $switch{'charset'} = resolve_alias($switch{'charset'})
-        || die "'$switch{charset}' is not a valid charset.";
+  $switch{'charset'} = resolve_alias($switch{'charset'})
+    || die "'$switch{charset}' is not a valid charset.";
 }
 
 if ($switch{'guess'}) {
-    if (!eval { require Encode::Detect::Detector }) {
-        my $root = ROOT_USER;
-        print STDERR <<EOT;
+  if (!Bugzilla->has_feature('detect_charset')) {
+    my $root = ROOT_USER;
+    print STDERR <<EOT;
 Using --guess requires that Encode::Detect be installed. To install
 Encode::Detect, run the following command:
 
-  $^X install-module.pl Encode::Detect
+   cpanm --installdeps --with-feature=detect_charset -l local .
 
 EOT
-        exit;
-    }
+    exit;
+  }
+  require Encode::Detect;
 }
 
 my %overrides;
 if (exists $switch{'overrides'}) {
-    my $file = new IO::File($switch{'overrides'}, 'r') 
-        || die "$switch{overrides}: $!";
-    my @lines = $file->getlines();
-    $file->close();
-    foreach my $line (@lines) {
-        chomp($line);
-        my ($digest, $encoding) = split(' ', $line);
-        $overrides{$digest} = $encoding;
-    }
+  my $file = new IO::File($switch{'overrides'}, 'r')
+    || die "$switch{overrides}: $!";
+  my @lines = $file->getlines();
+  $file->close();
+  foreach my $line (@lines) {
+    chomp($line);
+    my ($digest, $encoding) = split(' ', $line);
+    $overrides{$digest} = $encoding;
+  }
 }
 
 my $dbh = Bugzilla->dbh;
 
 if ($dbh->isa('Bugzilla::DB::Mysql')) {
-    # Get the actual current encoding of the DB.
-    my $collation_data = $dbh->selectrow_arrayref(
-        "SHOW VARIABLES LIKE 'character_set_database'");
-    my $db_charset = $collation_data->[1];
-    # Set our connection encoding to *that* encoding, so that MySQL
-    # correctly accepts our changes.
-    $dbh->do("SET NAMES $db_charset");
-    # Make the database give us raw bytes.
-    $dbh->do('SET character_set_results = NULL')
+
+  # Get the actual current encoding of the DB.
+  my $collation_data
+    = $dbh->selectrow_arrayref("SHOW VARIABLES LIKE 'character_set_database'");
+  my $db_charset = $collation_data->[1];
+
+  # Set our connection encoding to *that* encoding, so that MySQL
+  # correctly accepts our changes.
+  $dbh->do("SET NAMES $db_charset");
+
+  # Make the database give us raw bytes.
+  $dbh->do('SET character_set_results = NULL');
 }
 
 $dbh->begin_work;
 
 foreach my $table ($dbh->bz_table_list_real) {
-    my @columns = $dbh->bz_table_columns($table);
-
-    my $pk = SPECIAL_KEYS->{$table};
-    if ($pk) {
-        # Assure that we're on a version of Bugzilla where those keys
-        # actually exist.
-        foreach my $column (split ',', $pk) {
-            $pk = undef if !$dbh->bz_column_info($table, $column);
-        }
+  my @columns = $dbh->bz_table_columns($table);
+
+  my $pk = SPECIAL_KEYS->{$table};
+  if ($pk) {
+
+    # Assure that we're on a version of Bugzilla where those keys
+    # actually exist.
+    foreach my $column (split ',', $pk) {
+      $pk = undef if !$dbh->bz_column_info($table, $column);
     }
+  }
 
-    # Figure out the primary key.
+  # Figure out the primary key.
+  foreach my $column (@columns) {
+    my $def = $dbh->bz_column_info($table, $column);
+    $pk = $column if $def->{PRIMARYKEY};
+  }
+
+  # If there's no PK, it's defined by a UNIQUE index.
+  if (!$pk) {
     foreach my $column (@columns) {
-        my $def = $dbh->bz_column_info($table, $column);
-        $pk = $column if $def->{PRIMARYKEY};
-    }
-    # If there's no PK, it's defined by a UNIQUE index.
-    if (!$pk) {
-        foreach my $column (@columns) {
-            my $index = $dbh->bz_index_info($table, "${table}_${column}_idx");
-            if ($index && ref($index) eq 'HASH') {
-                $pk = join(',', @{$index->{FIELDS}}) 
-                    if $index->{TYPE} eq 'UNIQUE';
-            }
-        }
+      my $index = $dbh->bz_index_info($table, "${table}_${column}_idx");
+      if ($index && ref($index) eq 'HASH') {
+        $pk = join(',', @{$index->{FIELDS}}) if $index->{TYPE} eq 'UNIQUE';
+      }
     }
+  }
 
-    foreach my $column (@columns) {
-        my $def = $dbh->bz_column_info($table, $column);
-        # If this is a text column, it may need work.
-        if ($def->{TYPE} =~ /text|char/i) {
-            # If there's still no PK, we're upgrading from 2.14 or earlier.
-            # We can't reliably determine the PK (or at least, I don't want to
-            # maintain code to record what the PK was at all points in history).
-            # So instead we just use the field itself.
-            $pk = $column if !$pk;
-
-            print "Converting $table.$column...\n";
-            my $sth = $dbh->prepare("SELECT $column, $pk FROM $table 
+  foreach my $column (@columns) {
+    my $def = $dbh->bz_column_info($table, $column);
+
+    # If this is a text column, it may need work.
+    if ($def->{TYPE} =~ /text|char/i) {
+
+      # If there's still no PK, we're upgrading from 2.14 or earlier.
+      # We can't reliably determine the PK (or at least, I don't want to
+      # maintain code to record what the PK was at all points in history).
+      # So instead we just use the field itself.
+      $pk = $column if !$pk;
+
+      print "Converting $table.$column...\n";
+      my $sth = $dbh->prepare(
+        "SELECT $column, $pk FROM $table 
                                       WHERE $column IS NOT NULL
-                                            AND $column != ''");
-
-            my @pk_array = map {"$_ = ?"} split(',', $pk);
-            my $pk_where = join(' AND ', @pk_array);
-            my $update_sth = $dbh->prepare(
-                "UPDATE $table SET $column = ? WHERE $pk_where");
-
-            $sth->execute();
-
-            while (my @result = $sth->fetchrow_array) {
-                my $data = shift @result;
-                # Wide characters cause md5_base64() to die.
-                my $digest_data = utf8::is_utf8($data) 
-                                  ? Encode::encode_utf8($data) : $data;
-                my $digest = md5_base64($digest_data);
-
-                my @primary_keys = reverse split(',', $pk);
-                # We copy the array so that we can pop things from it without
-                # affecting the original.
-                my @pk_data = @result;
-                my $pk_line = join (', ',
-                    map { "$_ = " . pop @pk_data } @primary_keys);
-
-                my $encoding;
-                if ($switch{'guess'}) {
-                    $encoding = detect_encoding($data);
-
-                    # We only show failures if they don't appear to be
-                    # ASCII.
-                    if ($switch{'show-failures'} && !$encoding
-                        && !is_valid_utf8($data)) 
-                    {
-                        my $truncated = trunc($data);
-                        print "Row: [$pk_line]\n",
-                              "Failed to guess: Key: $digest",
-                              " DATA: $truncated\n";
-                    }
-
-                    # If we fail a guess, and the data is valid UTF-8,
-                    # just assume we failed because it's UTF-8.
-                    next if is_valid_utf8($data);
-                }
-
-                # If we couldn't detect the charset (or were instructed
-                # not to try), we fall back to --charset. If there's no 
-                # fallback, we just do nothing.
-                if (!$encoding && $switch{'charset'}) {
-                    $encoding = $switch{'charset'};
-                }
-
-                $encoding = $overrides{$digest} if $overrides{$digest};
-
-                # We only fix it if it's not ASCII or UTF-8 already.
-                if ($encoding && !grep($_ eq $encoding, IGNORE_ENCODINGS)) {
-                    my $decoded = encode('utf8', decode($encoding, $data));
-                    if ($switch{'dry-run'} && $data ne $decoded) {
-                        print "Row:  [$pk_line]\n",
-                              "From: [" . trunc($data) . "] Key: $digest\n",
-                              "To:   [" . trunc($decoded) . "]",
-                              " Encoding : $encoding\n";
-                    }
-                    else {
-                        $update_sth->execute($decoded, @result);
-                    }
-                }
-            } # while (my @result = $sth->fetchrow_array)
-        } # if ($column->{TYPE} =~ /text|char/i)
-    } # foreach my $column (@columns)
+                                            AND $column != ''"
+      );
+
+      my @pk_array = map {"$_ = ?"} split(',', $pk);
+      my $pk_where = join(' AND ', @pk_array);
+      my $update_sth = $dbh->prepare("UPDATE $table SET $column = ? WHERE $pk_where");
+
+      $sth->execute();
+
+      while (my @result = $sth->fetchrow_array) {
+        my $data = shift @result;
+
+        # Wide characters cause md5_base64() to die.
+        my $digest_data = utf8::is_utf8($data) ? Encode::encode_utf8($data) : $data;
+        my $digest = md5_base64($digest_data);
+
+        my @primary_keys = reverse split(',', $pk);
+
+        # We copy the array so that we can pop things from it without
+        # affecting the original.
+        my @pk_data = @result;
+        my $pk_line = join(', ', map { "$_ = " . pop @pk_data } @primary_keys);
+
+        my $encoding;
+        if ($switch{'guess'}) {
+          $encoding = detect_encoding($data);
+
+          # We only show failures if they don't appear to be
+          # ASCII.
+          if ($switch{'show-failures'} && !$encoding && !is_valid_utf8($data)) {
+            my $truncated = trunc($data);
+            print "Row: [$pk_line]\n", "Failed to guess: Key: $digest",
+              " DATA: $truncated\n";
+          }
+
+          # If we fail a guess, and the data is valid UTF-8,
+          # just assume we failed because it's UTF-8.
+          next if is_valid_utf8($data);
+        }
+
+        # If we couldn't detect the charset (or were instructed
+        # not to try), we fall back to --charset. If there's no
+        # fallback, we just do nothing.
+        if (!$encoding && $switch{'charset'}) {
+          $encoding = $switch{'charset'};
+        }
+
+        $encoding = $overrides{$digest} if $overrides{$digest};
+
+        # We only fix it if it's not ASCII or UTF-8 already.
+        if ($encoding && !grep($_ eq $encoding, IGNORE_ENCODINGS)) {
+          my $decoded = encode('utf8', decode($encoding, $data));
+          if ($switch{'dry-run'} && $data ne $decoded) {
+            print "Row:  [$pk_line]\n", "From: [" . trunc($data) . "] Key: $digest\n",
+              "To:   [" . trunc($decoded) . "]", " Encoding : $encoding\n";
+          }
+          else {
+            $update_sth->execute($decoded, @result);
+          }
+        }
+      }    # while (my @result = $sth->fetchrow_array)
+    }    # if ($column->{TYPE} =~ /text|char/i)
+  }    # foreach my $column (@columns)
 }
 
 $dbh->commit;
diff --git a/contrib/replyrc b/contrib/replyrc
new file mode 100644
index 0000000000..b465135b64
--- /dev/null
+++ b/contrib/replyrc
@@ -0,0 +1,30 @@
+# This is a config file for Reply,
+# which is a cpan distribution. You can install it with "cpan Reply" or "cpanm Reply".
+# To use this config file, either copy as ~/.replyrc or run the following command:
+# reply --cfg `pwd`/contrib/replyrc
+
+script_line1 = use strict;
+script_line2 = use warnings;
+script_line3 = use v5.14;
+script_line4 = use Bugzilla;
+script_line5 = Bugzilla->extensions; 1;
+script_line6 = sub filter { Bugzilla->template->{SERVICE}->{CONTEXT}->{CONFIG}->{FILTERS}->{$_[0]} }
+script_line7 = sub b { Bugzilla::Bug->new(@_) }
+script_line8 = sub u { Bugzilla::User->new(@_) }
+script_line9 = sub f { Bugzilla::Field->new(@_) }
+
+[Interrupt]
+[FancyPrompt]
+[DataDumper]
+[Colors]
+[ReadLine]
+[Hints]
+[Packages]
+[LexicalPersistence]
+[ResultCache]
+[Autocomplete::Packages]
+[Autocomplete::Lexicals]
+[Autocomplete::Functions]
+[Autocomplete::Globals]
+[Autocomplete::Methods]
+[Autocomplete::Commands]
diff --git a/contrib/sendbugmail.pl b/contrib/sendbugmail.pl
index 223d91f6c6..e8031d7753 100755
--- a/contrib/sendbugmail.pl
+++ b/contrib/sendbugmail.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Util;
@@ -20,16 +20,16 @@
 my $dbh = Bugzilla->dbh;
 
 sub usage {
-    say STDERR "Usage: $0 bug_id user_email";
-    exit;
+  say STDERR "Usage: $0 bug_id user_email";
+  exit;
 }
 
 if (($#ARGV < 1) || ($#ARGV > 2)) {
-    usage();
+  usage();
 }
 
 # Get the arguments.
-my $bugnum = $ARGV[0];
+my $bugnum  = $ARGV[0];
 my $changer = $ARGV[1];
 
 # Validate the bug number.
@@ -40,8 +40,8 @@ sub usage {
 
 detaint_natural($bugnum);
 
-my ($id) = $dbh->selectrow_array("SELECT bug_id FROM bugs WHERE bug_id = ?", 
-                                 undef, $bugnum);
+my ($id) = $dbh->selectrow_array("SELECT bug_id FROM bugs WHERE bug_id = ?",
+  undef, $bugnum);
 
 if (!$id) {
   say STDERR "Bug number $bugnum does not exist.";
@@ -51,25 +51,26 @@ sub usage {
 # Validate the changer address.
 my $match = Bugzilla->params->{'emailregexp'};
 if ($changer !~ /$match/) {
-    say STDERR "Changer \"$changer\" doesn't match email regular expression.";
-    usage();
+  say STDERR "Changer \"$changer\" doesn't match email regular expression.";
+  usage();
 }
-my $changer_user = new Bugzilla::User({ name => $changer });
+my $changer_user = new Bugzilla::User({name => $changer});
 unless ($changer_user) {
-    say STDERR "\"$changer\" is not a valid user.";
-    usage();
+  say STDERR "\"$changer\" is not a valid user.";
+  usage();
 }
 
 # Send the email.
-my $outputref = Bugzilla::BugMail::Send($bugnum, {'changer' => $changer_user });
+my $outputref = Bugzilla::BugMail::Send($bugnum, {'changer' => $changer_user});
 
 # Report the results.
 my $sent = scalar(@{$outputref->{sent}});
 
 if ($sent) {
-    say "email sent to $sent recipients:";
-} else {
-    say "No email sent.";
+  say "email sent to $sent recipients:";
+}
+else {
+  say "No email sent.";
 }
 
 foreach my $sent (@{$outputref->{sent}}) {
@@ -78,12 +79,12 @@ sub usage {
 
 # This document is copyright (C) 2004 Perforce Software, Inc.  All rights
 # reserved.
-# 
+#
 # Redistribution and use of this document in any form, with or without
 # modification, is permitted provided that redistributions of this
 # document retain the above copyright notice, this condition and the
 # following disclaimer.
-# 
+#
 # THIS DOCUMENT IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 # IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
diff --git a/contrib/sendunsentbugmail.pl b/contrib/sendunsentbugmail.pl
index b9034aa8de..3d11145ae7 100755
--- a/contrib/sendunsentbugmail.pl
+++ b/contrib/sendunsentbugmail.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -19,28 +19,28 @@
 my $dbh = Bugzilla->dbh;
 
 my $list = $dbh->selectcol_arrayref(
-        'SELECT bug_id FROM bugs
+  'SELECT bug_id FROM bugs
           WHERE (lastdiffed IS NULL OR lastdiffed < delta_ts)
             AND delta_ts < '
-                . $dbh->sql_date_math('NOW()', '-', 30, 'MINUTE') .
-     ' ORDER BY bug_id');
+    . $dbh->sql_date_math('NOW()', '-', 30, 'MINUTE') . ' ORDER BY bug_id'
+);
 
 if (scalar(@$list) > 0) {
-    say "OK, now attempting to send unsent mail";
-    say scalar(@$list) . " bugs found with possibly unsent mail.\n";
-    foreach my $bugid (@$list) {
-        my $start_time = time;
-        say "Sending mail for bug $bugid...";
-        my $outputref = Bugzilla::BugMail::Send($bugid);
-        if ($ARGV[0] && $ARGV[0] eq "--report") {
-          say "Mail sent to:";
-          say $_ foreach (sort @{$outputref->{sent}});
-        }
-        else {
-            my $sent = scalar @{$outputref->{sent}};
-            say "$sent mails sent.";
-            say "Took " . (time - $start_time) . " seconds.\n";
-        }
+  say "OK, now attempting to send unsent mail";
+  say scalar(@$list) . " bugs found with possibly unsent mail.\n";
+  foreach my $bugid (@$list) {
+    my $start_time = time;
+    say "Sending mail for bug $bugid...";
+    my $outputref = Bugzilla::BugMail::Send($bugid);
+    if ($ARGV[0] && $ARGV[0] eq "--report") {
+      say "Mail sent to:";
+      say $_ foreach (sort @{$outputref->{sent}});
     }
-    say "Unsent mail has been sent.";
+    else {
+      my $sent = scalar @{$outputref->{sent}};
+      say "$sent mails sent.";
+      say "Took " . (time - $start_time) . " seconds.\n";
+    }
+  }
+  say "Unsent mail has been sent.";
 }
diff --git a/contrib/syncLDAP.pl b/contrib/syncLDAP.pl
index f618624ec3..7a610ac55a 100755
--- a/contrib/syncLDAP.pl
+++ b/contrib/syncLDAP.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Net::LDAP;
 use Bugzilla;
@@ -19,47 +19,49 @@
 my $cgi = Bugzilla->cgi;
 my $dbh = Bugzilla->dbh;
 
-my $readonly = 0;
+my $readonly  = 0;
 my $nodisable = 0;
-my $noupdate = 0;
-my $nocreate = 0;
-my $quiet    = 0;
+my $noupdate  = 0;
+my $nocreate  = 0;
+my $quiet     = 0;
 
 ###
 # Do some preparations
 ###
-foreach my $arg (@ARGV)
-{
-   if($arg eq '-r') {
-      $readonly = 1;
-   }
-   elsif($arg eq '-d') {
-      $nodisable = 1;
-   }
-   elsif($arg eq '-u') {
-      $noupdate = 1;
-   }
-   elsif($arg eq '-c') {
-      $nocreate = 1;
-   }
-   elsif($arg eq '-q') {
-      $quiet = 1;
-   }
-   else {
-         print "LDAP Sync Script\n";
-         print "Syncronizes the users table from the LDAP server with the Bugzilla users.\n";
-         print "Takes mail-attribute from preferences and description from 'cn' or,\n";
-         print "if not available, from the uid-attribute.\n\n";
-         print "usage:\n syncLDAP.pl [options]\n\n";
-         print "options:\n";
-         print " -r Readonly, do not make changes to Bugzilla tables\n";
-         print " -d No disable, don't disable login by users who are not in LDAP\n";
-         print " -u No update, don't update users, which have different description in LDAP\n";
-         print " -c No create, don't create users, which are in LDAP but not in Bugzilla\n";
-         print " -q Quiet mode, give less output\n";
-         print "\n";
-         exit;
-   }
+foreach my $arg (@ARGV) {
+  if ($arg eq '-r') {
+    $readonly = 1;
+  }
+  elsif ($arg eq '-d') {
+    $nodisable = 1;
+  }
+  elsif ($arg eq '-u') {
+    $noupdate = 1;
+  }
+  elsif ($arg eq '-c') {
+    $nocreate = 1;
+  }
+  elsif ($arg eq '-q') {
+    $quiet = 1;
+  }
+  else {
+    print "LDAP Sync Script\n";
+    print
+      "Syncronizes the users table from the LDAP server with the Bugzilla users.\n";
+    print "Takes mail-attribute from preferences and description from 'cn' or,\n";
+    print "if not available, from the uid-attribute.\n\n";
+    print "usage:\n syncLDAP.pl [options]\n\n";
+    print "options:\n";
+    print " -r Readonly, do not make changes to Bugzilla tables\n";
+    print " -d No disable, don't disable login by users who are not in LDAP\n";
+    print
+      " -u No update, don't update users, which have different description in LDAP\n";
+    print
+      " -c No create, don't create users, which are in LDAP but not in Bugzilla\n";
+    print " -q Quiet mode, give less output\n";
+    print "\n";
+    exit;
+  }
 }
 
 my %ldap_users;
@@ -67,13 +69,18 @@
 ###
 # Get current bugzilla users
 ###
-my %bugzilla_users = %{ $dbh->selectall_hashref(
-    'SELECT login_name AS new_login_name, realname, disabledtext ' .
-    'FROM profiles', 'new_login_name') };
+my %bugzilla_users = %{
+  $dbh->selectall_hashref(
+    'SELECT login_name AS new_login_name, realname, disabledtext '
+      . 'FROM profiles',
+    'new_login_name'
+  )
+};
 
 foreach my $login_name (keys %bugzilla_users) {
-    # remove whitespaces
-    $bugzilla_users{$login_name}{'realname'} =~ s/^\s+|\s+$//g;
+
+  # remove whitespaces
+  $bugzilla_users{$login_name}{'realname'} =~ s/^\s+|\s+$//g;
 }
 
 ###
@@ -81,72 +88,79 @@
 ###
 my $LDAPserver = Bugzilla->params->{"LDAPserver"};
 if ($LDAPserver eq "") {
-   print "No LDAP server defined in bugzilla preferences.\n";
-   exit;
+  print "No LDAP server defined in bugzilla preferences.\n";
+  exit;
 }
 
 my $LDAPconn;
-if($LDAPserver =~ /:\/\//) {
-    # if the "LDAPserver" parameter is in uri scheme
-    $LDAPconn = Net::LDAP->new($LDAPserver, version => 3);
-} else {
-    my $LDAPport = "389";  # default LDAP port
-    if($LDAPserver =~ /:/) {
-        ($LDAPserver, $LDAPport) = split(":",$LDAPserver);
-    }
-    $LDAPconn = Net::LDAP->new($LDAPserver, port => $LDAPport, version => 3);
+if ($LDAPserver =~ /:\/\//) {
+
+  # if the "LDAPserver" parameter is in uri scheme
+  $LDAPconn = Net::LDAP->new($LDAPserver, version => 3);
+}
+else {
+  my $LDAPport = "389";    # default LDAP port
+  if ($LDAPserver =~ /:/) {
+    ($LDAPserver, $LDAPport) = split(":", $LDAPserver);
+  }
+  $LDAPconn = Net::LDAP->new($LDAPserver, port => $LDAPport, version => 3);
 }
 
-if(!$LDAPconn) {
-   print "Connecting to LDAP server failed. Check LDAPserver setting.\n";
-   exit;
+if (!$LDAPconn) {
+  print "Connecting to LDAP server failed. Check LDAPserver setting.\n";
+  exit;
 }
 my $mesg;
 if (Bugzilla->params->{"LDAPbinddn"}) {
-    my ($LDAPbinddn,$LDAPbindpass) = split(":",Bugzilla->params->{"LDAPbinddn"});
-    $mesg = $LDAPconn->bind($LDAPbinddn, password => $LDAPbindpass);
+  my ($LDAPbinddn, $LDAPbindpass) = split(":", Bugzilla->params->{"LDAPbinddn"});
+  $mesg = $LDAPconn->bind($LDAPbinddn, password => $LDAPbindpass);
 }
 else {
-    $mesg = $LDAPconn->bind();
+  $mesg = $LDAPconn->bind();
 }
-if($mesg->code) {
-   print "Binding to LDAP server failed: " . $mesg->error . "\nCheck LDAPbinddn setting.\n";
-   exit;
+if ($mesg->code) {
+  print "Binding to LDAP server failed: "
+    . $mesg->error
+    . "\nCheck LDAPbinddn setting.\n";
+  exit;
 }
 
 # We've got our anonymous bind;  let's look up the users.
-$mesg = $LDAPconn->search( base   => Bugzilla->params->{"LDAPBaseDN"},
-                           scope  => "sub",
-                           filter => '(&(' . Bugzilla->params->{"LDAPuidattribute"} . "=*)" . Bugzilla->params->{"LDAPfilter"} . ')',
-                         );
-                         
-
-if(! $mesg->count) {
-   print "LDAP lookup failure. Check LDAPBaseDN setting.\n";
-   exit;
+$mesg = $LDAPconn->search(
+  base   => Bugzilla->params->{"LDAPBaseDN"},
+  scope  => "sub",
+  filter => '(&('
+    . Bugzilla->params->{"LDAPuidattribute"} . "=*)"
+    . Bugzilla->params->{"LDAPfilter"} . ')',
+);
+
+
+if (!$mesg->count) {
+  print "LDAP lookup failure. Check LDAPBaseDN setting.\n";
+  exit;
 }
-   
-my %val = %{ $mesg->as_struct };
-
-while( my ($key, $value) = each(%val) ) {
-
-   my @login_name = @{ $value->{Bugzilla->params->{"LDAPmailattribute"}} };
-   my @realname  = @{ $value->{"cn"} };
-
-   # no mail entered? go to next
-   if(! @login_name) { 
-      print "$key has no valid mail address\n";
-      next; 
-   }
-
-   # no cn entered? use uid instead
-   if(! @realname) { 
-       @realname = @{ $value->{Bugzilla->params->{"LDAPuidattribute"}} };
-   }
-  
-   my $login = shift @login_name;
-   my $real = shift @realname;
-   $ldap_users{$login} = { realname => $real };
+
+my %val = %{$mesg->as_struct};
+
+while (my ($key, $value) = each(%val)) {
+
+  my @login_name = @{$value->{Bugzilla->params->{"LDAPmailattribute"}}};
+  my @realname   = @{$value->{"cn"}};
+
+  # no mail entered? go to next
+  if (!@login_name) {
+    print "$key has no valid mail address\n";
+    next;
+  }
+
+  # no cn entered? use uid instead
+  if (!@realname) {
+    @realname = @{$value->{Bugzilla->params->{"LDAPuidattribute"}}};
+  }
+
+  my $login = shift @login_name;
+  my $real  = shift @realname;
+  $ldap_users{$login} = {realname => $real};
 }
 
 print "\n" unless $quiet;
@@ -159,120 +173,126 @@
 my %create_users;
 
 print "Bugzilla-Users: \n" unless $quiet;
-while( my ($key, $value) = each(%bugzilla_users) ) {
-  print " " . $key . " '" . $value->{'realname'} . "' " . $value->{'disabledtext'} ."\n" unless $quiet==1;
-  if(!exists $ldap_users{$key}){
-     if($value->{'disabledtext'} eq '') {
-       $disable_users{$key} = $value;
-     }
+while (my ($key, $value) = each(%bugzilla_users)) {
+  print " "
+    . $key . " '"
+    . $value->{'realname'} . "' "
+    . $value->{'disabledtext'} . "\n"
+    unless $quiet == 1;
+  if (!exists $ldap_users{$key}) {
+    if ($value->{'disabledtext'} eq '') {
+      $disable_users{$key} = $value;
+    }
   }
 }
 
 print "\nLDAP-Users: \n" unless $quiet;
-while( my ($key, $value) = each(%ldap_users) ) {
-  print " " . $key . " '" . $value->{'realname'} . "'\n" unless $quiet==1;
-  if(!defined $bugzilla_users{$key}){
+while (my ($key, $value) = each(%ldap_users)) {
+  print " " . $key . " '" . $value->{'realname'} . "'\n" unless $quiet == 1;
+  if (!defined $bugzilla_users{$key}) {
     $create_users{$key} = $value;
   }
-  else { 
+  else {
     my $bugzilla_user_value = $bugzilla_users{$key};
-    if($bugzilla_user_value->{'realname'} ne $value->{'realname'}) {
+    if ($bugzilla_user_value->{'realname'} ne $value->{'realname'}) {
       $update_users{$key} = $value;
     }
   }
 }
 
 print "\nDetecting email changes: \n" unless $quiet;
-while( my ($create_key, $create_value) = each(%create_users) ) {
-  while( my ($disable_key, $disable_value) = each(%disable_users) ) {
-    if($create_value->{'realname'} eq $disable_value->{'realname'}) {
-       print " " . $disable_key . " => " . $create_key ."'\n" unless $quiet==1;
-       $update_users{$disable_key} = { realname => $create_value->{'realname'},
-                                       new_login_name => $create_key };
-       delete $create_users{$create_key};
-       delete $disable_users{$disable_key};
+while (my ($create_key, $create_value) = each(%create_users)) {
+  while (my ($disable_key, $disable_value) = each(%disable_users)) {
+    if ($create_value->{'realname'} eq $disable_value->{'realname'}) {
+      print " " . $disable_key . " => " . $create_key . "'\n" unless $quiet == 1;
+      $update_users{$disable_key}
+        = {realname => $create_value->{'realname'}, new_login_name => $create_key};
+      delete $create_users{$create_key};
+      delete $disable_users{$disable_key};
     }
   }
 }
 
-if($quiet == 0) {
-   print "\nUsers to disable login for: \n";
-   while( my ($key, $value) = each(%disable_users) ) {
-     print " " . $key . " '" . $value->{'realname'} . "'\n";
-   }
-   
-   print "\nUsers to update: \n";
-   while( my ($key, $value) = each(%update_users) ) {
-     print " " . $key . " '" . $value->{'realname'} . "' ";
-     if(defined $value->{'new_login_name'}) {
-       print "has changed email to " . $value->{'new_login_name'};
-     }
-     print "\n";
-   }
-   
-   print "\nUsers to create: \n";
-   while( my ($key, $value) = each(%create_users) ) {
-     print " " . $key . " '" . $value->{'realname'} . "'\n";
-   }
-   
-   print "\n\n";
+if ($quiet == 0) {
+  print "\nUsers to disable login for: \n";
+  while (my ($key, $value) = each(%disable_users)) {
+    print " " . $key . " '" . $value->{'realname'} . "'\n";
+  }
+
+  print "\nUsers to update: \n";
+  while (my ($key, $value) = each(%update_users)) {
+    print " " . $key . " '" . $value->{'realname'} . "' ";
+    if (defined $value->{'new_login_name'}) {
+      print "has changed email to " . $value->{'new_login_name'};
+    }
+    print "\n";
+  }
+
+  print "\nUsers to create: \n";
+  while (my ($key, $value) = each(%create_users)) {
+    print " " . $key . " '" . $value->{'realname'} . "'\n";
+  }
+
+  print "\n\n";
 }
 
 
 ###
 # now do the DB-Update
 ###
-if($readonly == 0) {
-   print "Performing DB update:\nPhase 1: disabling login for users not in LDAP... " unless $quiet;
+if ($readonly == 0) {
+  print
+    "Performing DB update:\nPhase 1: disabling login for users not in LDAP... "
+    unless $quiet;
 
-   my $sth_disable = $dbh->prepare(
-       'UPDATE profiles
+  my $sth_disable = $dbh->prepare(
+    'UPDATE profiles
            SET disabledtext = ?
-         WHERE ' . $dbh->sql_istrcmp('login_name', '?'));
+         WHERE ' . $dbh->sql_istrcmp('login_name', '?')
+  );
 
-   if($nodisable == 0) {
-      while( my ($key, $value) = each(%disable_users) ) {
-        $sth_disable->execute('auto-disabled by ldap sync', $key);
-      }
-      print "done!\n" unless $quiet;
-   }
-   else {
-      print "disabled!\n" unless $quiet;
-   }
-   
-   print "Phase 2: updating existing users... " unless $quiet;
-
-   if($noupdate == 0) {
-      while( my ($key, $value) = each(%update_users) ) {
-        my $user = Bugzilla::User->check($key);
-        if(defined $value->{'new_login_name'}) {
-          $user->set_login($value->{'new_login_name'});
-        } else {
-          $user->set_name($value->{'realname'});
-        }
-        $user->update();
+  if ($nodisable == 0) {
+    while (my ($key, $value) = each(%disable_users)) {
+      $sth_disable->execute('auto-disabled by ldap sync', $key);
+    }
+    print "done!\n" unless $quiet;
+  }
+  else {
+    print "disabled!\n" unless $quiet;
+  }
+
+  print "Phase 2: updating existing users... " unless $quiet;
+
+  if ($noupdate == 0) {
+    while (my ($key, $value) = each(%update_users)) {
+      my $user = Bugzilla::User->check($key);
+      if (defined $value->{'new_login_name'}) {
+        $user->set_login($value->{'new_login_name'});
       }
-      print "done!\n" unless $quiet;
-   }
-   else {
-      print "disabled!\n" unless $quiet;
-   }
-   
-   print "Phase 3: creating new users... " unless $quiet;
-   if($nocreate == 0) {
-      while( my ($key, $value) = each(%create_users) ) {
-        Bugzilla::User->create({
-            login_name => $key, 
-            realname   => $value->{'realname'},
-            cryptpassword   => '*'});
+      else {
+        $user->set_name($value->{'realname'});
       }
-      print "done!\n" unless $quiet;
-   }
-   else {
-      print "disabled!\n" unless $quiet;
-   }
+      $user->update();
+    }
+    print "done!\n" unless $quiet;
+  }
+  else {
+    print "disabled!\n" unless $quiet;
+  }
+
+  print "Phase 3: creating new users... " unless $quiet;
+  if ($nocreate == 0) {
+    while (my ($key, $value) = each(%create_users)) {
+      Bugzilla::User->create({
+        login_name => $key, realname => $value->{'realname'}, cryptpassword => '*'
+      });
+    }
+    print "done!\n" unless $quiet;
+  }
+  else {
+    print "disabled!\n" unless $quiet;
+  }
 }
-else
-{
-   print "No changes to DB because readonly mode\n" unless $quiet;
+else {
+  print "No changes to DB because readonly mode\n" unless $quiet;
 }
diff --git a/createaccount.cgi b/createaccount.cgi
index 21d6cc8db3..b2ee95f20b 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -20,30 +20,42 @@ use Bugzilla::Token;
 # Just in case someone already has an account, let them get the correct footer
 # on an error message. The user is logged out just after the account is
 # actually created.
-my $user = Bugzilla->login(LOGIN_OPTIONAL);
-my $cgi = Bugzilla->cgi;
+my $user     = Bugzilla->login(LOGIN_OPTIONAL);
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = { doc_section => 'using.html#create-a-bugzilla-account' };
+my $vars     = {doc_section => 'using/creating-an-account.html'};
 
 print $cgi->header();
 
-$user->check_account_creation_enabled;
-my $login = $cgi->param('login');
+my $email = $cgi->param('email');
+my $login
+  = Bugzilla->params->{'use_email_as_login'} ? $email : $cgi->param('login');
 
-if (defined($login)) {
-    # Check the hash token to make sure this user actually submitted
-    # the create account form.
-    my $token = $cgi->param('token');
-    check_hash_token($token, ['create_account']);
+my $request_new_password = $cgi->param('request_new_password');
 
-    $user->check_and_send_account_creation_confirmation($login);
-    $vars->{'login'} = $login;
+if ($request_new_password) {
+  $template->process('account/request-new-password.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
+}
+elsif ($email && $login) {
+  $user->check_account_creation_enabled;
+
+  # Check the hash token to make sure this user actually submitted
+  # the create account form.
+  my $token = $cgi->param('token');
+  check_hash_token($token, ['create_account']);
 
-    $template->process("account/created.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $user->check_and_send_account_creation_confirmation($login, $email);
+  $vars->{'login'} = $login;
+  $vars->{'email'} = $email;
+
+  $template->process("account/created.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
+else {
+  $user->check_account_creation_enabled;
 
-# Show the standard "would you like to create an account?" form.
-$template->process("account/create.html.tmpl", $vars)
-  || ThrowTemplateError($template->error());
+  # Show the standard "would you like to create an account?" form.
+  $template->process('account/create.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
+}
diff --git a/describecomponents.cgi b/describecomponents.cgi
index f74dc75f43..67d5ad2613 100755
--- a/describecomponents.cgi
+++ b/describecomponents.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -19,10 +19,10 @@ use Bugzilla::Error;
 use Bugzilla::Classification;
 use Bugzilla::Product;
 
-my $user = Bugzilla->login();
-my $cgi = Bugzilla->cgi;
+my $user     = Bugzilla->login();
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 print $cgi->header();
 
@@ -33,37 +33,41 @@ my $product_name = trim($cgi->param('product') || '');
 my $product = new Bugzilla::Product({'name' => $product_name});
 
 unless ($product && $user->can_access_product($product->name)) {
-    # Products which the user is allowed to see.
-    my @products = @{$user->get_accessible_products};
 
-    if (scalar(@products) == 0) {
-        ThrowUserError("no_products");
-    }
-    # If there is only one product available but the user entered
-    # another product name, we display a list with this single
-    # product only, to not confuse the user with components of a
-    # product they didn't request.
-    elsif (scalar(@products) > 1 || $product_name) {
-        $vars->{'classifications'} = sort_products_by_classification(\@products);
-        $vars->{'target'} = "describecomponents.cgi";
-        # If an invalid product name is given, or the user is not
-        # allowed to access that product, a message is displayed
-        # with a list of the products the user can choose from.
-        if ($product_name) {
-            $vars->{'message'} = "product_invalid";
-            # Do not use $product->name here, else you could use
-            # this way to determine whether the product exists or not.
-            $vars->{'product'} = $product_name;
-        }
-
-        $template->process("global/choose-product.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-        exit;
+  # Products which the user is allowed to see.
+  my @products = @{$user->get_accessible_products};
+
+  if (scalar(@products) == 0) {
+    ThrowUserError("no_products");
+  }
+
+  # If there is only one product available but the user entered
+  # another product name, we display a list with this single
+  # product only, to not confuse the user with components of a
+  # product they didn't request.
+  elsif (scalar(@products) > 1 || $product_name) {
+    $vars->{'classifications'} = sort_products_by_classification(\@products);
+    $vars->{'target'}          = "describecomponents.cgi";
+
+    # If an invalid product name is given, or the user is not
+    # allowed to access that product, a message is displayed
+    # with a list of the products the user can choose from.
+    if ($product_name) {
+      $vars->{'message'} = "product_invalid";
+
+      # Do not use $product->name here, else you could use
+      # this way to determine whether the product exists or not.
+      $vars->{'product'} = $product_name;
     }
 
-    # If there is only one product available and the user didn't specify
-    # any product name, we show this product.
-    $product = $products[0];
+    $template->process("global/choose-product.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+
+  # If there is only one product available and the user didn't specify
+  # any product name, we show this product.
+  $product = $products[0];
 }
 
 ######################################################################
diff --git a/describekeywords.cgi b/describekeywords.cgi
index 31bf0c13e1..0ce3b2b3a6 100755
--- a/describekeywords.cgi
+++ b/describekeywords.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Error;
@@ -18,16 +18,16 @@ use Bugzilla::Keyword;
 
 my $user = Bugzilla->login();
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # Run queries against the shadow DB.
 Bugzilla->switch_to_shadow_db;
 
 $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 if (!@{$vars->{keywords}}) {
-    ThrowUserError("no_keywords");
+  ThrowUserError("no_keywords");
 }
 
 print $cgi->header();
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000..9228a47815
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+bugzilla:
+  build: .
+  ports:
+    - "8080:80"
+  volumes:
+    - ".:/home/bugzilla/devel/htdocs/docker"
diff --git a/docker_files/LICENSE b/docker_files/LICENSE
new file mode 100644
index 0000000000..f0e5c79e18
--- /dev/null
+++ b/docker_files/LICENSE
@@ -0,0 +1,362 @@
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. "Contributor"
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+
+     means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the terms of
+        a Secondary License.
+
+1.6. "Executable Form"
+
+     means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+
+     means a work that combines Covered Software with other material, in a
+     separate file or files, that is not Covered Software.
+
+1.8. "License"
+
+     means this document.
+
+1.9. "Licensable"
+
+     means having the right to grant, to the maximum extent possible, whether
+     at the time of the initial grant or subsequently, any and all of the
+     rights conveyed by this License.
+
+1.10. "Modifications"
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. "Patent Claims" of a Contributor
+
+      means any patent claim(s), including without limitation, method,
+      process, and apparatus claims, in any patent Licensable by such
+      Contributor that would be infringed, but for the grant of the License,
+      by the making, using, selling, offering for sale, having made, import,
+      or transfer of either its Contributions or its Contributor Version.
+
+1.12. "Secondary License"
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. "Source Code Form"
+
+      means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, "You" includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, "control" means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or
+        as part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its
+        Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution
+     become effective for each Contribution on the date the Contributor first
+     distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under
+     this License. No additional rights or licenses will be implied from the
+     distribution or licensing of Covered Software under this License.
+     Notwithstanding Section 2.1(b) above, no patent license is granted by a
+     Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party's
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of
+        its Contributions.
+
+     This License does not grant any rights in the trademarks, service marks,
+     or logos of any Contributor (except as may be necessary to comply with
+     the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this
+     License (see Section 10.2) or under the terms of a Secondary License (if
+     permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its
+     Contributions are its original creation(s) or it has sufficient rights to
+     grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under
+     applicable copyright doctrines of fair use, fair dealing, or other
+     equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under
+     the terms of this License. You must inform recipients that the Source
+     Code Form of the Covered Software is governed by the terms of this
+     License, and how they can obtain a copy of this License. You may not
+     attempt to alter or restrict the recipients' rights in the Source Code
+     Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this
+        License, or sublicense it under different terms, provided that the
+        license for the Executable Form does not attempt to limit or alter the
+        recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for
+     the Covered Software. If the Larger Work is a combination of Covered
+     Software with a work governed by one or more Secondary Licenses, and the
+     Covered Software is not Incompatible With Secondary Licenses, this
+     License permits You to additionally distribute such Covered Software
+     under the terms of such Secondary License(s), so that the recipient of
+     the Larger Work may, at their option, further distribute the Covered
+     Software under the terms of either this License or such Secondary
+     License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices
+     (including copyright notices, patent notices, disclaimers of warranty, or
+     limitations of liability) contained within the Source Code Form of the
+     Covered Software, except that You may alter any license notices to the
+     extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on
+     behalf of any Contributor. You must make it absolutely clear that any
+     such warranty, support, indemnity, or liability obligation is offered by
+     You alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute,
+   judicial order, or regulation then You must: (a) comply with the terms of
+   this License to the maximum extent possible; and (b) describe the
+   limitations and the code they affect. Such description must be placed in a
+   text file included with all distributions of the Covered Software under
+   this License. Except to the extent prohibited by statute or regulation,
+   such description must be sufficiently detailed for a recipient of ordinary
+   skill to be able to understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing
+     basis, if such Contributor fails to notify You of the non-compliance by
+     some reasonable means prior to 60 days after You have come back into
+     compliance. Moreover, Your grants from a particular Contributor are
+     reinstated on an ongoing basis if such Contributor notifies You of the
+     non-compliance by some reasonable means, this is the first time You have
+     received notice of non-compliance with this License from such
+     Contributor, and You become compliant prior to 30 days after Your receipt
+     of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions,
+     counter-claims, and cross-claims) alleging that a Contributor Version
+     directly or indirectly infringes any patent, then the rights granted to
+     You by any and all Contributors for the Covered Software under Section
+     2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an "as is" basis,
+   without warranty of any kind, either expressed, implied, or statutory,
+   including, without limitation, warranties that the Covered Software is free
+   of defects, merchantable, fit for a particular purpose or non-infringing.
+   The entire risk as to the quality and performance of the Covered Software
+   is with You. Should any Covered Software prove defective in any respect,
+   You (not any Contributor) assume the cost of any necessary servicing,
+   repair, or correction. This disclaimer of warranty constitutes an essential
+   part of this License. No use of  any Covered Software is authorized under
+   this License except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from
+   such party's negligence to the extent applicable law prohibits such
+   limitation. Some jurisdictions do not allow the exclusion or limitation of
+   incidental or consequential damages, so this exclusion and limitation may
+   not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts
+   of a jurisdiction where the defendant maintains its principal place of
+   business and such litigation shall be governed by laws of that
+   jurisdiction, without reference to its conflict-of-law provisions. Nothing
+   in this Section shall prevent a party's ability to bring cross-claims or
+   counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject
+   matter hereof. If any provision of this License is held to be
+   unenforceable, such provision shall be reformed only to the extent
+   necessary to make it enforceable. Any law or regulation which provides that
+   the language of a contract shall be construed against the drafter shall not
+   be used to construe this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version
+      of the License under which You originally received the Covered Software,
+      or under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a
+      modified version of this License if you rename the license and remove
+      any references to the name of the license steward (except to note that
+      such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+      Licenses If You choose to distribute Source Code Form that is
+      Incompatible With Secondary Licenses under the terms of this version of
+      the License, the notice described in Exhibit B of this License must be
+      attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file,
+then You may include the notice in a location (such as a LICENSE file in a
+relevant directory) where a recipient would be likely to look for such a
+notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+
+      This Source Code Form is "Incompatible
+      With Secondary Licenses", as defined by
+      the Mozilla Public License, v. 2.0.
\ No newline at end of file
diff --git a/docker_files/README.md b/docker_files/README.md
new file mode 100644
index 0000000000..00d7117305
--- /dev/null
+++ b/docker_files/README.md
@@ -0,0 +1,96 @@
+Docker Bugzilla
+===============
+
+Configure a running Bugzilla system using Docker
+
+## Features
+
+* Running latest Centos
+* Preconfigured with initial data and test product
+* Running Apache2 and MySQL Community Server 5.6
+* Code resides in `/home/bugzilla/devel/htdocs/bugzilla and can be updated,
+  diffed, and branched using standard git commands
+
+## How to install Docker Docker Machine and Docker Compose
+
+* Visit [Docker][docker] and get docker up and running on your system.
+
+## Important docker Notes
+
+Before building, you will need to change value in the checksetup_answers.txt`
+file to match the IP address of the Docker Machine VM. You can find the IP
+address by running `docker-machine ip`.
+
+For example, using a text editor, change the following line in
+`checksetup_answers.txt` from:
+
+` $answer{'urlbase'} = 'http://localhost:8080/bugzilla/';`
+
+to
+
+` $answer{'urlbase'} = 'http://192.168.59.103:8080/bugzilla/';`
+
+## How to build Bugzilla Docker image
+
+To build a fresh image, just change to the directory containing the checked out
+files and run the below command:
+
+```bash
+$ docker-compose build
+```
+
+## How to start Bugzilla Docker image
+
+To start a new container (or rerun your last container) you simply do:
+
+```bash
+$ docker-compose up
+```
+
+This will stay in the foreground and you will see the output from `supervisord`. You
+can use the `-d` option to run the container in the background.
+
+To stop, start or remove the container that was created from the last run, you can do:
+
+```bash
+$ docker-compose stop
+$ docker-compose start
+$ docker-compose rm
+```
+
+## How to access the Bugzilla container
+
+If you are using Linux, you can simply point your browser to
+`http://localhost:8080/bugzilla` to see the the Bugzilla home page.
+
+If using Docker Machine, you will need to use the IP address of the VM. You can
+find the IP address using the `docker-machine ip` command. For example:
+
+```bash
+$ docker-machine ip
+192.168.59.103
+```
+
+So would then point your browser to `http://192.168.59.103:8080/bugzilla`.
+
+The Administrator username is `admin@bugzilla.org` and the password is `password`.
+You can use the Administrator account to creat other users, add products or
+components, etc.
+
+You can also shell into the container using `docker exec` command. You will need to
+determine the container name or ID of the running container. Here is an example:
+
+```bash
+$ docker ps
+CONTAINER ID  IMAGE            COMMAND                 CREATED         STATUS         PORTS                           NAMES
+2522438509d3  master_bugzilla  "/usr/bin/supervisord"  38 seconds ago  Up 37 seconds  5900/tcp, 0.0.0.0:8080->80/tcp  master_bugzilla_1
+$ docker exec -it master_bugzilla_1 su - bugzlla
+Last login: Thu Jan 21 14:24:06 UTC 2016
+[bugzilla@2522438509d3 ~]$
+```
+
+## TODO
+
+* Enable SSL support.
+
+[docker]: https://docs.docker.com/installation/
diff --git a/docker_files/bugzilla.conf b/docker_files/bugzilla.conf
new file mode 100644
index 0000000000..c33bb6cfad
--- /dev/null
+++ b/docker_files/bugzilla.conf
@@ -0,0 +1,16 @@
+User bugzilla
+Group bugzilla
+ServerName localhost:80
+#PerlSwitches -wT
+#PerlConfigRequire /home/bugzilla/devel/htdocs/bugzilla/mod_perl.pl
+<VirtualHost *:80>
+    AddHandler cgi-script .cgi
+    ServerName localhost
+    DocumentRoot "/home/bugzilla/devel/htdocs"
+    <Directory "/home/bugzilla/devel/htdocs">
+        DirectoryIndex index.cgi
+        Options Indexes FollowSymLinks ExecCGI
+        AllowOverride All
+        Require all granted
+    </Directory>
+</VirtualHost>
diff --git a/docker_files/bugzilla_config.sh b/docker_files/bugzilla_config.sh
new file mode 100755
index 0000000000..64099260c6
--- /dev/null
+++ b/docker_files/bugzilla_config.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+cd $BUGZILLA_ROOT
+
+# Configure database
+/usr/bin/mysqld_safe &
+sleep 5
+mysql -u root mysql -e "GRANT ALL PRIVILEGES ON *.* TO bugs@localhost IDENTIFIED BY 'bugs'; FLUSH PRIVILEGES;"
+mysql -u root mysql -e "CREATE DATABASE bugs CHARACTER SET = 'utf8';"
+
+perl checksetup.pl /docker_files/checksetup_answers.txt
+perl checksetup.pl /docker_files/checksetup_answers.txt
+
+mysqladmin -u root shutdown
diff --git a/docker_files/buildbot_step b/docker_files/buildbot_step
new file mode 100644
index 0000000000..99eafcfa35
--- /dev/null
+++ b/docker_files/buildbot_step
@@ -0,0 +1,69 @@
+#! /bin/bash -e
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+buildbot_step_help() {
+  echo "Run a command and wrap it in buildbot step format"
+  echo "  $0 - <buildbot step> [bash args...]"
+}
+
+bb_time() {
+  # Parser dies if this is longer then 6 chars long.
+  nano=$(date +%N | cut -c1-6)
+  echo "$(date '+%Y-%m-%d %H:%M:%S.')$nano"
+}
+
+bb_echo() {
+  echo "========= $1 ========="
+}
+
+bb_line() {
+  local type=$1 # Finished/Started
+  local step=$2 # Name of step
+  local code=$3 # Exit code
+  local duration=$4 # Elapsed time in seconds
+  local time=$(bb_time)
+
+  bb_echo "$type $step (results: $code, elapsed: $duration secs) (at $time)"
+}
+
+# Intentionally the full name of this executable so sourcing this file also
+# works as expected...
+buildbot_step() {
+  local step=$1
+  local command=${@:2}
+  local start_time=$(date +%s)
+  local exit_code=0
+
+  bb_line "Started" "$step" 0 0
+  if eval "$command";
+  then
+    exit_code=$?
+  else
+    exit_code=$?
+  fi
+
+  local end_time=$(date +%s)
+  local duration=$(($end_time-$start_time))
+
+  bb_line "Finished" "$step" $exit_code $duration
+  return $exit_code
+}
+
+
+# When this script is not being sourced invoke command directly.
+if [ "$(basename $0)" == "buildbot_step" ];
+then
+  if [ $# -lt 2 ];
+  then
+    buildbot_step_help
+    exit 1
+  fi
+  buildbot_step "$@"
+  exit $?
+fi
+
diff --git a/docker_files/checksetup_answers.txt b/docker_files/checksetup_answers.txt
new file mode 100644
index 0000000000..8dcfead4b6
--- /dev/null
+++ b/docker_files/checksetup_answers.txt
@@ -0,0 +1,25 @@
+$answer{'ADMIN_EMAIL'} = 'admin@bugzilla.org';
+$answer{'ADMIN_OK'} = 'Y';
+$answer{'ADMIN_PASSWORD'} = 'password';
+$answer{'ADMIN_REALNAME'} = 'QA Admin';
+$answer{'NO_PAUSE'} = 1;
+$answer{'create_htaccess'} = '';
+$answer{'db_check'} = 1;
+$answer{'db_driver'} = 'mysql';
+$answer{'db_host'} = 'localhost';
+$answer{'db_mysql_ssl_ca_file'} = '';
+$answer{'db_mysql_ssl_ca_path'} = '';
+$answer{'db_mysql_ssl_client_cert'} = '';
+$answer{'db_mysql_ssl_client_key'} = '';
+$answer{'db_name'} = 'bugs',
+$answer{'db_pass'} = 'bugs';
+$answer{'db_port'} = 0;
+$answer{'db_sock'} = '';
+$answer{'db_user'} = 'bugs';
+$answer{'diffpath'} = '/usr/bin';
+$answer{'index_html'} = 0;
+$answer{'interdiffbin'} = '/usr/bin/interdiff';
+$answer{'memcached_servers'} = "localhost:11211";
+$answer{'urlbase'} = 'http://localhost:8080/bugzilla/';
+$answer{'use_suexec'} = '';
+$answer{'webservergroup'} = 'bugzilla';
diff --git a/docker_files/install_deps.sh b/docker_files/install_deps.sh
new file mode 100755
index 0000000000..4d9a126ac2
--- /dev/null
+++ b/docker_files/install_deps.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+cd $BUGZILLA_ROOT
+
+# Install Perl dependencies
+CPANM="cpanm -l local --quiet --skip-satisfied"
+
+$CPANM --installdeps --with-all-features \
+       --without-feature oracle --without-feature sqlite --without-feature pg .
+
+# Building PDF documentation
+if [ ! -x "/usr/bin/rst2pdf" ]; then
+    pip install rst2pdf
+fi
+
+# For UI testing support (--notest because it tries to connect to a running server)
+$CPANM --notest Test::WWW::Selenium
+
+# Remove CPAN build files to minimize disk usage
+rm -rf ~/.cpanm
diff --git a/docker_files/my.cnf b/docker_files/my.cnf
new file mode 100644
index 0000000000..b7e035ce5f
--- /dev/null
+++ b/docker_files/my.cnf
@@ -0,0 +1,42 @@
+[mysql]
+max_allowed_packet=1G
+
+[mysqld]
+user                   = bugzilla
+default_storage_engine = InnoDB
+socket                 = /var/lib/mysql/mysql.sock
+pid_file               = /var/lib/mysql/mysql.pid
+key_buffer_size        = 32M
+myisam_recover         = FORCE,BACKUP
+max_allowed_packet     = 1G
+max_connect_errors     = 1000000
+innodb                 = FORCE
+datadir                = /var/lib/mysql
+character-set-server   = utf8mb4
+collation-server       = utf8mb4_general_ci
+
+tmp_table_size         = 32M
+max_heap_table_size    = 32M
+query_cache_type       = 0
+query_cache_size       = 0
+max_connections        = 500
+thread_cache_size      = 50
+#open_files_limit       = 65535
+table_definition_cache = 1024
+table_open_cache       = 2048
+
+innodb_flush_method            = O_DIRECT
+innodb_log_files_in_group      = 2
+innodb_log_file_size           = 256M
+innodb_flush_log_at_trx_commit = 2
+innodb_file_per_table          = 1
+innodb_buffer_pool_size        = 1G
+innodb_flush_neighbors         = 0
+innodb_flush_log_at_trx_commit = 2
+
+log_error                      = /var/lib/mysql/mysql-error.log
+log_queries_not_using_indexes  = 0
+slow_query_log                 = 0
+slow_query_log_file            = /var/lib/mysql/mysql-slow.log
+general_log                    = 0
+general_log_file               = /var/lib/mysql/bmo_query.log
diff --git a/docker_files/my_config.sh b/docker_files/my_config.sh
new file mode 100755
index 0000000000..fb2c4a6d74
--- /dev/null
+++ b/docker_files/my_config.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# Add any custom setup instructions here
diff --git a/docker_files/rpm_list b/docker_files/rpm_list
new file mode 100644
index 0000000000..2eb2948ea3
--- /dev/null
+++ b/docker_files/rpm_list
@@ -0,0 +1,23 @@
+ImageMagick-perl
+dbus-x11
+expat-devel
+firefox
+gd-devel
+httpd-devel
+java-1.7.0-openjdk
+memcached
+mod_perl
+mysql-community-devel
+mysql-community-server
+openssl
+openssl-devel
+perl-core
+perl-GD
+postfix
+python-devel
+python-pip
+python-reportlab
+python-sphinx
+sudo
+supervisor
+tigervnc-server-minimal
diff --git a/docker_files/runtests.sh b/docker_files/runtests.sh
new file mode 100755
index 0000000000..04152189f1
--- /dev/null
+++ b/docker_files/runtests.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+if [ -z "$TEST_SUITE" ]; then
+    TEST_SUITE=sanity
+fi
+
+set -e
+
+# Output to log file as well as STDOUT/STDERR
+exec > >(tee /runtests.log) 2>&1
+
+echo "== Retrieving Bugzilla code"
+echo "Checking out $GITHUB_BASE_GIT $GITHUB_BASE_BRANCH ..."
+mv $BUGZILLA_ROOT ${BUGZILLA_ROOT}.back
+git clone $GITHUB_BASE_GIT --single-branch --depth 1 --branch $GITHUB_BASE_BRANCH $BUGZILLA_ROOT
+rsync -a ${BUGZILLA_ROOT}.back/local/ ${BUGZILLA_ROOT}/local/
+cd $BUGZILLA_ROOT
+if [ "$GITHUB_BASE_REV" != "" ]; then
+    echo "Switching to revision $GITHUB_BASE_REV ..."
+    git checkout -q $GITHUB_BASE_REV
+fi
+
+echo -e "\n== Checking dependencies for changes"
+/docker_files/install_deps.sh
+
+if [ "$TEST_SUITE" = "sanity" ]; then
+    cd $BUGZILLA_ROOT
+    /bin/bash /docker_files/buildbot_step "Sanity" prove -f -v t/*.t
+    exit $?
+fi
+
+if [ "$TEST_SUITE" = "docs" ]; then
+    cd $BUGZILLA_ROOT/docs
+    /bin/bash /docker_files/buildbot_step "Documentation" perl makedocs.pl --with-pdf
+    exit $?
+fi
+
+echo -e "\n== Starting database"
+/usr/bin/mysqld_safe &
+sleep 3
+
+echo -e "\n== Starting memcached"
+/usr/bin/memcached -u memcached -d
+sleep 3
+
+echo -e "\n== Updating configuration"
+sed -e "s?%DB%?$BUGS_DB_DRIVER?g" --in-place xt/config/checksetup_answers.txt
+echo "\$answer{'memcached_servers'} = 'localhost:11211';" >> xt/config/checksetup_answers.txt
+
+echo -e "\n== Running checksetup"
+cd $BUGZILLA_ROOT
+./checksetup.pl xt/config/checksetup_answers.txt
+./checksetup.pl xt/config/checksetup_answers.txt
+
+echo -e "\n== Generating test data"
+cd $BUGZILLA_ROOT/xt/config
+perl generate_test_data.pl
+
+echo -e "\n== Starting web server"
+sed -e "s?^#Perl?Perl?" --in-place /etc/httpd/conf.d/bugzilla.conf
+/usr/sbin/httpd &
+sleep 3
+
+cd $BUGZILLA_ROOT
+if [ "$TEST_SUITE" = "selenium" ]; then
+    export DISPLAY=:0
+
+    # Setup dbus for Firefox
+    dbus-uuidgen > /var/lib/dbus/machine-id
+
+    echo -e "\n== Starting virtual frame buffer and vnc server"
+    Xvnc $DISPLAY -screen 0 1280x1024x16 -ac -SecurityTypes=None \
+         -extension RANDR 2>&1 | tee /xvnc.log &
+    sleep 5
+
+    echo -e "\n== Starting Selenium server"
+    java -jar /selenium-server.jar -log /selenium.log > /dev/null 2>&1 &
+    sleep 5
+
+    # Set NO_TESTS=1 if just want selenium services
+    # but no tests actually executed.
+    [ $NO_TESTS ] && exit 0
+
+    /bin/bash /docker_files/buildbot_step "Selenium" prove -f -v xt/selenium/*.t
+    exit $?
+fi
+
+if [ "$TEST_SUITE" = "webservices" ]; then
+    /bin/bash /docker_files/buildbot_step "Webservices" prove -f -v xt/{rest,webservice}/*.t
+    exit $?
+fi
diff --git a/docker_files/sudoers b/docker_files/sudoers
new file mode 100644
index 0000000000..04d3829597
--- /dev/null
+++ b/docker_files/sudoers
@@ -0,0 +1,9 @@
+Defaults    env_reset
+Defaults    env_keep =  "COLORS DISPLAY HOSTNAME HISTSIZE INPUTRC KDEDIR LS_COLORS"
+Defaults    env_keep += "MAIL PS1 PS2 QTDIR USERNAME LANG LC_ADDRESS LC_CTYPE"
+Defaults    env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES"
+Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
+Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
+Defaults    secure_path = /sbin:/bin:/usr/sbin:/usr/bin
+root	ALL=(ALL) 	ALL
+%wheel	ALL=(ALL)	NOPASSWD: ALL
diff --git a/docker_files/supervisord.conf b/docker_files/supervisord.conf
new file mode 100644
index 0000000000..4a3d49fcd0
--- /dev/null
+++ b/docker_files/supervisord.conf
@@ -0,0 +1,25 @@
+[supervisord]
+nodaemon=true
+logfile=/var/log/supervisor/supervisord.log
+logfile_maxbytes=50MB
+logfile_backups=10
+loglevel=debug
+pidfile=/var/run/supervisord.pid
+minfds=1024
+minprocs=200
+
+[program:httpd]
+command=/usr/sbin/httpd -DFOREGROUND
+
+[program:mysqld]
+command=/usr/bin/mysqld_safe
+
+[program:postfix]
+command = /usr/sbin/postfix start
+startsecs = 0
+autorestart = false
+
+[program:memcached]
+command=/usr/bin/memcached -u memcached
+stderr_logfile=/var/log/supervisor/memcached.log
+stdout_logfile=/var/log/supervisor/memcached.log
diff --git a/docs/TODO b/docs/TODO
index 4e4afd14f1..25d5e2a7b9 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -10,3 +10,7 @@ HTML Output:
 * Auto-highlighter thinks # in "bash#" is a comment char
 * Style definition lists to have the term in bold
 * Fix bug lifecycle image original doc link
+
+Topics to cover:
+
+* email_in.pl
diff --git a/docs/en/Makefile b/docs/en/Makefile
index fc9af11e01..8c3621f314 100644
--- a/docs/en/Makefile
+++ b/docs/en/Makefile
@@ -39,7 +39,7 @@ help:
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 clean:
-	-rm -rf $(BUILDDIR)/*
+	find $(BUILDDIR) -maxdepth 1 -type d -not -name rst -not -name images -not -name . -exec rm -rf {} \;
 
 html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
diff --git a/docs/en/images/RTD1.png b/docs/en/images/RTD1.png
new file mode 100644
index 0000000000..04c8c73087
Binary files /dev/null and b/docs/en/images/RTD1.png differ
diff --git a/docs/en/images/RTD10.png b/docs/en/images/RTD10.png
new file mode 100644
index 0000000000..74c599412d
Binary files /dev/null and b/docs/en/images/RTD10.png differ
diff --git a/docs/en/images/RTD2.png b/docs/en/images/RTD2.png
new file mode 100644
index 0000000000..adb5c14166
Binary files /dev/null and b/docs/en/images/RTD2.png differ
diff --git a/docs/en/images/RTD3.png b/docs/en/images/RTD3.png
new file mode 100644
index 0000000000..4c6816d1e4
Binary files /dev/null and b/docs/en/images/RTD3.png differ
diff --git a/docs/en/images/RTD4.png b/docs/en/images/RTD4.png
new file mode 100644
index 0000000000..2f1ab8bf90
Binary files /dev/null and b/docs/en/images/RTD4.png differ
diff --git a/docs/en/images/RTD5.png b/docs/en/images/RTD5.png
new file mode 100644
index 0000000000..e4612ec209
Binary files /dev/null and b/docs/en/images/RTD5.png differ
diff --git a/docs/en/images/RTD6.png b/docs/en/images/RTD6.png
new file mode 100644
index 0000000000..c204c03bf8
Binary files /dev/null and b/docs/en/images/RTD6.png differ
diff --git a/docs/en/images/RTD7.png b/docs/en/images/RTD7.png
new file mode 100644
index 0000000000..ceaec2920b
Binary files /dev/null and b/docs/en/images/RTD7.png differ
diff --git a/docs/en/images/RTD8.png b/docs/en/images/RTD8.png
new file mode 100644
index 0000000000..ab135948e5
Binary files /dev/null and b/docs/en/images/RTD8.png differ
diff --git a/docs/en/images/RTD9.png b/docs/en/images/RTD9.png
new file mode 100644
index 0000000000..25431bed6e
Binary files /dev/null and b/docs/en/images/RTD9.png differ
diff --git a/docs/en/images/bugzilla.png b/docs/en/images/bugzilla.png
new file mode 100644
index 0000000000..eb973b43e3
Binary files /dev/null and b/docs/en/images/bugzilla.png differ
diff --git a/docs/en/rst/_static/bugzilla.css b/docs/en/rst/_static/bugzilla.css
index c3d8ea7814..06f5c83752 100644
--- a/docs/en/rst/_static/bugzilla.css
+++ b/docs/en/rst/_static/bugzilla.css
@@ -1,3 +1,21 @@
 @import 'default.css';
 
 dt { font-weight: bold; }
+
+/* Custom roles */
+.param    { font-weight: bold; }
+.paramval { font-family: monospace; }
+.group    { font-family: monospace; }
+.field    { font-weight: bold; }
+.command  { font-family: monospace; font-size: 130% }
+
+.admonition-todo {
+  background-color: lightpink;
+  border: 2px darkred solid;
+}
+
+/* Make Buggie's antenna not take up so much space */
+.logo {
+  display: block;
+  margin-top: -20px;
+}
diff --git a/docs/en/rst/about.rst b/docs/en/rst/about.rst
deleted file mode 100644
index 3ebde939da..0000000000
--- a/docs/en/rst/about.rst
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-.. _about:
-
-================
-About This Guide
-================
-
-.. _introduction:
-
-Introduction
-############
-
-This is the documentation for version |version| of Bugzilla, a
-bug-tracking system from mozilla.org.
-Bugzilla is an enterprise-class piece of software
-that tracks millions of bugs and issues for hundreds of
-organizations around the world.
-
-The most current version of this document can always be found on the
-`Bugzilla
-Documentation Page <http://www.bugzilla.org/docs/>`_.
-
-.. _copyright:
-
-Copyright Information
-#####################
-
-This document is copyright (c) 2000-2014 by the various
-Bugzilla contributors who wrote it.
-
-    Permission is granted to copy, distribute and/or modify this
-    document under the terms of the GNU Free Documentation
-    License, Version 1.1 or any later version published by the
-    Free Software Foundation; with no Invariant Sections, no
-    Front-Cover Texts, and with no Back-Cover Texts. A copy of
-    the license is included in :ref:`gfdl`.
-
-If you have any questions regarding this document, its
-copyright, or publishing this document in non-electronic form,
-please contact the Bugzilla Team.
-
-.. _disclaimer:
-
-Disclaimer
-##########
-
-No liability for the contents of this document can be accepted.
-Follow the instructions herein at your own risk.
-This document may contain errors
-and inaccuracies that may damage your system, cause your partner
-to leave you, your boss to fire you, your cats to
-pee on your furniture and clothing, and global thermonuclear
-war. Proceed with caution.
-
-Naming of particular products or brands should not be seen as
-endorsements, with the exception of the term "GNU/Linux". We
-wholeheartedly endorse the use of GNU/Linux; it is an extremely
-versatile, stable,
-and robust operating system that offers an ideal operating
-environment for Bugzilla.
-
-Although the Bugzilla development team has taken great care to
-ensure that all exploitable bugs have been fixed, security holes surely
-exist in any piece of code. Great care should be taken both in
-the installation and usage of this software. The Bugzilla development
-team members assume no liability for your use of Bugzilla. You have
-the source code, and are responsible for auditing it yourself to ensure
-your security needs are met.
-
-.. COMMENT: Section 2: New Versions
-
-.. _newversions:
-
-New Versions
-############
-
-This is version |version| of The Bugzilla Guide. It is so named
-to match the current version of Bugzilla.
-
-.. todo:: BZ-DEVEL This version of the guide, like its associated Bugzilla version, is a
-   development version.
-
-The latest version of this guide can always be found at `<http://www.bugzilla.org/docs/>`_. However, you should read
-the version which came with the Bugzilla release you are using.
-
-In addition, there are Bugzilla template localization projects in
-`several languages <http://www.bugzilla.org/download/#localizations>`_.
-They may have translated documentation available. If you would like to
-volunteer to translate the Guide into additional languages, please visit the
-`Bugzilla L10n team <https://wiki.mozilla.org/Bugzilla:L10n>`_
-page.
-
-.. _credits:
-
-Credits
-#######
-
-The people listed below have made enormous contributions to the
-creation of this Guide, through their writing, dedicated hacking efforts,
-numerous e-mail and IRC support sessions, and overall excellent
-contribution to the Bugzilla community:
-
-.. COMMENT: TODO: This is evil... there has to be a valid way to get this look
-
-Matthew P. Barnson mbarnson@sisna.com
-    for the Herculean task of pulling together the Bugzilla Guide
-    and shepherding it to 2.14.
-
-Terry Weissman terry@mozilla.org
-    for initially writing Bugzilla and creating the README upon
-    which the UNIX installation documentation is largely based.
-
-Tara Hernandez tara@tequilarists.org
-    for keeping Bugzilla development going strong after Terry left
-    mozilla.org and for running landfill.
-
-Dave Lawrence dkl@redhat.com
-    for providing insight into the key differences between Red
-    Hat's customized Bugzilla.
-
-Dawn Endico endico@mozilla.org
-    for being a hacker extraordinaire and putting up with Matthew's
-    incessant questions and arguments on irc.mozilla.org in #mozwebtools
-
-Jacob Steenhagen jake@bugzilla.org
-    for taking over documentation during the 2.17 development
-    period.
-
-Dave Miller justdave@bugzilla.org
-    for taking over as project lead when Tara stepped down and
-    continually pushing for the documentation to be the best it can be.
-
-Thanks also go to the following people for significant contributions
-to this documentation:
-Kevin Brannen, Vlad Dascalu, Ben FrantzDale, Eric Hanson, Zach Lipton, Gervase Markham, Andrew Pearson, Joe Robins, Spencer Smith, Ron Teitelbaum, Shane Travis, Martin Wulffeld.
-
-Also, thanks are due to the members of the
-`mozilla.support.bugzilla <news://news.mozilla.org/mozilla.support.bugzilla>`_
-newsgroup (and its predecessor, netscape.public.mozilla.webtools).
-Without your discussions, insight, suggestions, and patches,
-this could never have happened.
-
-.. _conventions:
-
-Document Conventions
-####################
-
-This document uses the following conventions:
-
-.. warning:: This is a warning - something you should be aware of.
-
-.. note:: This is just a note, for your information.
-
-A filename or a path to a filename is displayed like this:
-:file:`/path/to/filename.ext`
-
-A command to type in the shell is displayed like this:
-:command:`command --arguments`
-
-bash$ represents a normal user's prompt under bash shell
-
-bash# represents a root user's prompt under bash shell
-
-A sample of code is illustrated like this:
-
-::
-
-    First Line of Code
-    Second Line of Code
-    ...
-
-This documentation is maintained in reStructured Text format.
-Changes are best submitted as diffs, attached
-to a bug filed in the `Bugzilla Documentation <https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla;component=Documentation>`_
-component.
-
diff --git a/docs/en/rst/about/index.rst b/docs/en/rst/about/index.rst
new file mode 100644
index 0000000000..761206873b
--- /dev/null
+++ b/docs/en/rst/about/index.rst
@@ -0,0 +1,128 @@
+.. _about:
+
+========================
+About This Documentation
+========================
+
+This is the documentation for version |version| of Bugzilla, a bug-tracking
+system from Mozilla. Bugzilla is an enterprise-class piece of software
+that tracks millions of bugs and issues for thousands of organizations around
+the world.
+
+The most current version of this document can always be found on the
+`Bugzilla website <http://www.bugzilla.org/docs/>`_.
+
+.. _evaluating:
+
+Evaluating Bugzilla
+###################
+
+If you want to try out Bugzilla to see if it meets your needs, you can do so
+on `Landfill <https://landfill.bugzilla.org>`_, our test server.
+The `Bugzilla FAQ <https://wiki.mozilla.org/Bugzilla:FAQ>`_ may also
+be helpful, as it answers a number of questions people sometimes have about
+whether Bugzilla is for them.
+
+.. _getting-help:
+
+Getting More Help
+#################
+
+If this document does not answer your questions, we run a
+`Mozilla forum <https://www.mozilla.org/about/forums/#support-bugzilla>`_
+which can be accessed as a newsgroup, mailing list, or over the web as a
+Google Group. Please
+`search it <https://groups.google.com/forum/#!forum/mozilla.support.bugzilla>`_
+first, and then ask your question there.
+
+If you need a guaranteed response, commercial support is
+`available <http://www.bugzilla.org/support/consulting.html>`_ for Bugzilla
+from a number of people and organizations.
+
+.. _conventions:
+
+Document Conventions
+####################
+
+This document uses the following conventions:
+
+.. warning:: This is a warning—something you should be aware of.
+
+.. note:: This is just a note, for your information.
+
+A filename or a path to a filename is displayed like this:
+:file:`/path/to/filename.ext`
+
+A command to type in the shell is displayed like this:
+:command:`command --arguments`
+
+A sample of code is illustrated like this:
+
+::
+
+    First Line of Code
+    Second Line of Code
+    ...
+
+This documentation is maintained in
+`reStructured Text
+<http://docutils.sourceforge.net/docs/user/rst/quickstart.html>`_ format using
+the `Sphinx <http://www.sphinx-doc.org/>`_ documentation system. It has
+recently been rewritten, so it undoubtedly has bugs. Please file any you find, in
+the `Bugzilla Documentation
+<https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla;component=Documentation>`_
+component in Mozilla's installation of Bugzilla. If you also want to make a
+patch, that would be wonderful. Changes are best submitted as diffs, attached
+to a bug. There is a :ref:`Style Guide <style-guide>` to help you write any
+new text and markup.
+
+.. _license:
+
+License
+#######
+
+Bugzilla is `free <http://www.gnu.org/philosophy/free-sw.html>`_ and
+`open source <http://opensource.org/osd>`_ software, which means (among other
+things) that you can download it, install it, and run it for any purpose
+whatsoever without the need for license or payment. Isn't that refreshing?
+
+Bugzilla's code is made available under the
+`Mozilla Public License 2.0 <http://www.mozilla.org/MPL/2.0/>`_ (MPL),
+specifically the variant which is Incompatible with Secondary Licenses.
+However, again, if you only want to install and run Bugzilla, you don't need
+to worry about that; it's only relevant if you redistribute the code or any
+changes you make.
+
+Bugzilla's documentation is made available under the
+`Creative Commons CC-BY-SA International License 4.0
+<https://creativecommons.org/licenses/by-sa/4.0/>`_,
+or any later version.
+
+.. _credits:
+
+Credits
+#######
+
+The people listed below have made significant contributions to the
+creation of this documentation:
+
+Andrew Pearson,
+Ben FrantzDale,
+Byron Jones,
+Dave Lawrence,
+Dave Miller,
+Dawn Endico,
+Eric Hanson,
+Gervase Markham,
+Jacob Steenhagen,
+Joe Robins,
+Kevin Brannen,
+Martin Wulffeld,
+Matthew P. Barnson,
+Ron Teitelbaum,
+Shane Travis,
+Spencer Smith,
+Tara Hernandez,
+Terry Weissman,
+Vlad Dascalu,
+Zach Lipton.
diff --git a/docs/en/rst/administering/categorization.rst b/docs/en/rst/administering/categorization.rst
new file mode 100644
index 0000000000..770e354e09
--- /dev/null
+++ b/docs/en/rst/administering/categorization.rst
@@ -0,0 +1,419 @@
+.. _categorization:
+
+===============================================================
+Classifications, Products, Components, Versions, and Milestones
+===============================================================
+
+Bugs in Bugzilla are classified into one of a set of admin-defined Components.
+Components are themselves each part of a single Product. Optionally, Products
+can be part of a single Classification, adding a third level to the hierarchy.
+
+.. _classifications:
+
+Classifications
+###############
+
+Classifications are used to group several related products into one
+distinct entity.
+
+For example, if a company makes computer games,
+they could have a classification of "Games", and a separate
+product for each game. This company might also have a
+``Common`` classification, containing products representing units of
+technology used in multiple games, and perhaps an ``Other`` classification
+containing a few special products that represent items that are not actually
+shipping products (for example, "Website", or "Administration").
+
+The classifications layer is disabled by default; it can be turned
+on or off using the :param:`useclassification` parameter
+in the *Bug Fields* section of :ref:`parameters`.
+
+Access to the administration of classifications is controlled using
+the *editclassifications* system group, which defines
+a privilege for creating, destroying, and editing classifications.
+
+When activated, classifications will introduce an additional
+step when filling bugs (dedicated to classification selection), and they
+will also appear in the advanced search form.
+
+.. _products:
+
+Products
+########
+
+Products usually represent real-world shipping products.
+Many of Bugzilla's settings are configurable on a per-product basis.
+
+When creating or editing products the following options are
+available:
+
+Product
+    The name of the product
+
+Description
+    A brief description of the product
+
+Open for bug entry
+    Deselect this box to prevent new bugs from being
+    entered against this product.
+
+Enable the UNCONFIRMED status in this product
+    Select this option if you want to use the UNCONFIRMED status
+    (see :ref:`workflow`)
+
+Default milestone
+    Select the default milestone for this product.
+
+Version
+    Specify the default version for this product.
+
+Create chart datasets for this product
+    Bugzilla has a :ref:`charting system <charts>` which can plot defined
+    searches over time. Selecting this checkbox will create some useful
+    searches in the charts system relating to the new product - e.g. a search
+    for each status and resolution.
+
+It is compulsory to create at least one :ref:`component <components>` in a product, and
+so you will be asked for the details of that too.
+
+When editing a product you can change all of the above, and there is also a
+link to edit Group Access Controls; see :ref:`product-group-controls`.
+
+.. _create-product:
+
+Creating New Products
+=====================
+
+To create a new product:
+
+#. Select ``Administration`` from the footer and then
+   choose ``Products`` from the main administration page.
+
+#. Select the ``Add`` link in the bottom right.
+
+#. Enter the details as outlined above.
+
+.. _edit-products:
+
+Editing Products
+================
+
+To edit an existing product, click the "Products" link from the
+"Administration" page. If the :param:`useclassification` parameter is
+turned on, a table of existing classifications is displayed,
+including an "Unclassified" category. The table indicates how many products
+are in each classification. Click on the classification name to see its
+products. If the :param:`useclassification` parameter is not in use, the table
+lists all products directly. The product table summarizes the information
+defined when the product was created. Click on the product name to edit these
+properties, and to access links to other product attributes such as the
+product's components, versions, milestones, and group access controls.
+
+.. _comps-vers-miles-products:
+
+Adding or Editing Components, Versions and Target Milestones
+============================================================
+
+To add new or edit existing Components, Versions, or Target Milestones
+to a Product, select the "Edit Components", "Edit Versions", or "Edit
+Milestones" links from the "Edit Product" page. A table of existing
+Components, Versions, or Milestones is displayed. Click on an item name
+to edit the properties of that item. Below the table is a link to add
+a new Component, Version, or Milestone.
+
+For more information on components, see :ref:`components`.
+
+For more information on versions, see :ref:`versions`.
+
+For more information on milestones, see :ref:`milestones`.
+
+.. _product-group-controls:
+
+Assigning Group Controls to Products
+====================================
+
+On the ``Edit Product`` page, there is a link called
+``Edit Group Access Controls``. The settings on this page
+control the relationship of the groups to the product being edited.
+
+Group Access Controls are an important aspect of using groups for
+isolating products and restricting access to bugs filed against those
+products. For more information on groups, including how to create, edit,
+add users to, and alter permission of, see :ref:`groups`.
+
+After selecting the "Edit Group Access Controls" link from the "Edit
+Product" page, a table containing all user-defined groups for this
+Bugzilla installation is displayed. The system groups that are created
+when Bugzilla is installed are not applicable to Group Access Controls.
+Below is description of what each of these fields means.
+
+Groups may be applicable (i.e. bugs in this product can be associated
+with this group), default (i.e. bugs in this product are in this group
+by default), and mandatory (i.e. bugs in this product must be associated
+with this group) for each product. Groups can also control access
+to bugs for a given product, or be used to make bugs for a product
+totally read-only unless the group restrictions are met. The best way to
+understand these relationships is by example. See
+:ref:`group-control-examples` for examples of
+product and group relationships.
+
+.. note:: Products and Groups are not limited to a one-to-one relationship.
+   Multiple groups can be associated with the same product, and groups
+   can be associated with more than one product.
+
+If any group has *Entry* selected, then the
+product will restrict bug entry to only those users
+who are members of *all* the groups with
+*Entry* selected.
+
+If any group has *Canedit* selected,
+then the product will be read-only for any users
+who are not members of *all* of the groups with
+*Canedit* selected. *Only* users who
+are members of all the *Canedit* groups
+will be able to edit bugs for this product. This is an additional
+restriction that enables finer-grained control over products rather
+than just all-or-nothing access levels.
+
+The following settings let you
+choose privileges on a *per-product basis*.
+This is a convenient way to give privileges to
+some users for some products only, without having
+to give them global privileges which would affect
+all products.
+
+Any group having *editcomponents*
+selected  allows users who are in this group to edit all
+aspects of this product, including components, milestones,
+and versions.
+
+Any group having *canconfirm* selected
+allows users who are in this group to confirm bugs
+in this product.
+
+Any group having *editbugs* selected allows
+users who are in this group to edit all fields of
+bugs in this product.
+
+The *MemberControl* and
+*OtherControl* are used in tandem to determine which
+bugs will be placed in this group. The only allowable combinations of
+these two parameters are listed in a table on the "Edit Group Access Controls"
+page. Consult this table for details on how these fields can be used.
+Examples of different uses are described below.
+
+.. _group-control-examples:
+
+Common Applications of Group Controls
+=====================================
+
+The use of groups is best explained by providing examples that illustrate
+configurations for common use cases. The examples follow a common syntax:
+*Group: Entry, MemberControl, OtherControl, CanEdit,
+EditComponents, CanConfirm, EditBugs*, where "Group" is the name
+of the group being edited for this product. The other fields all
+correspond to the table on the "Edit Group Access Controls" page. If any
+of these options are not listed, it means they are not checked.
+
+Basic Product/Group Restriction
+-------------------------------
+
+Suppose there is a product called "Bar". You would like to make it so that only
+users in the group "Foo" can enter bugs in the "Bar" product. Additionally,
+bugs filed in product "Bar" must be visible only to users in "Foo" (plus, by
+default, the reporter, assignee, and CC list of each bug) at all times.
+Furthermore, only members of group "Foo" should be able to edit bugs filed
+against product "Bar", even if other users could see the bug. This arrangement
+would achieved by the following:
+
+::
+
+    Product Bar:
+    foo: ENTRY, MANDATORY/MANDATORY, CANEDIT
+
+Perhaps such strict restrictions are not needed for product "Bar". Instead,
+you would like to make it so that only members of group "Foo" can
+enter bugs in product "Bar", but bugs in "Bar" are not required to be
+restricted in visibility to people in "Foo". Anyone with permission
+to edit a particular bug in product "Bar" can put the bug in group "Foo", even
+if they themselves are not in "Foo".
+
+Furthermore, anyone in group "Foo" can edit all aspects of the components of
+product "Bar", can confirm bugs in product "Bar", and can edit all fields of
+any bug in product "Bar". That would be done like this:
+
+::
+
+    Product Bar:
+    foo: ENTRY, SHOWN/SHOWN, EDITCOMPONENTS, CANCONFIRM, EDITBUGS
+
+General User Access With Security Group
+---------------------------------------
+
+To permit any user to file bugs against "Product A",
+and to permit any user to submit those bugs into a
+group called "Security":
+
+::
+
+    Product A:
+    security: SHOWN/SHOWN
+
+General User Access With A Security Product
+-------------------------------------------
+
+To permit any user to file bugs against product called "Security"
+while keeping those bugs from becoming visible to anyone
+outside the group "SecurityWorkers" (unless a member of the
+"SecurityWorkers" group removes that restriction):
+
+::
+
+    Product Security:
+    securityworkers: DEFAULT/MANDATORY
+
+Product Isolation With a Common Group
+-------------------------------------
+
+To permit users of "Product A" to access the bugs for
+"Product A", users of "Product B" to access the bugs for
+"Product B", and support staff, who are members of the "Support
+Group" to access both, three groups are needed:
+
+#. Support Group: Contains members of the support staff.
+
+#. AccessA Group: Contains users of product A and the Support group.
+
+#. AccessB Group: Contains users of product B and the Support group.
+
+Once these three groups are defined, the product group controls
+can be set to:
+
+::
+
+    Product A:
+    AccessA: ENTRY, MANDATORY/MANDATORY
+    Product B:
+    AccessB: ENTRY, MANDATORY/MANDATORY
+
+Perhaps the "Support Group" wants more control. For example,
+the "Support Group"  could be permitted to make bugs inaccessible to
+users of both groups "AccessA" and "AccessB".
+Then, the "Support Group" could be permitted to publish
+bugs relevant to all users in a third product (let's call it
+"Product Common") that is read-only
+to anyone outside the "Support Group". In this way the "Support Group"
+could control bugs that should be seen by both groups.
+That configuration would be:
+
+::
+
+    Product A:
+    AccessA: ENTRY, MANDATORY/MANDATORY
+    Support: SHOWN/NA
+    Product B:
+    AccessB: ENTRY, MANDATORY/MANDATORY
+    Support: SHOWN/NA
+    Product Common:
+    Support: ENTRY, DEFAULT/MANDATORY, CANEDIT
+
+Make a Product Read Only
+------------------------
+
+Sometimes a product is retired and should no longer have
+new bugs filed against it (for example, an older version of a software
+product that is no longer supported). A product can be made read-only
+by creating a group called "readonly" and adding products to the
+group as needed:
+
+::
+
+    Product A:
+    ReadOnly: ENTRY, NA/NA, CANEDIT
+
+.. note:: For more information on Groups outside of how they relate to products
+   see :ref:`groups`.
+
+.. _components:
+
+Components
+##########
+
+Components are subsections of a Product. E.g. the computer game
+you are designing may have a "UI"
+component, an "API" component, a "Sound System" component, and a
+"Plugins" component, each overseen by a different programmer. It
+often makes sense to divide Components in Bugzilla according to the
+natural divisions of responsibility within your Product or
+company.
+
+Each component has a default assignee and, if you turned it on in the :ref:`parameters`,
+a QA Contact. The default assignee should be the primary person who fixes bugs in
+that component. The QA Contact should be the person who will ensure
+these bugs are completely fixed. The Assignee, QA Contact, and Reporter
+will get email when new bugs are created in this Component and when
+these bugs change. Default Assignee and Default QA Contact fields only
+dictate the *default assignments*;
+these can be changed on bug submission, or at any later point in
+a bug's life.
+
+To create a new Component:
+
+#. Select the ``Edit components`` link
+   from the ``Edit product`` page.
+
+#. Select the ``Add`` link in the bottom right.
+
+#. Fill out the ``Component`` field, a
+   short ``Description``, the
+   ``Default Assignee``, ``Default CC List``,
+   and ``Default QA Contact`` (if enabled).
+   The ``Component Description`` field may contain a
+   limited subset of HTML tags. The ``Default Assignee``
+   field must be a login name already existing in the Bugzilla database.
+
+.. _versions:
+
+Versions
+########
+
+Versions are the revisions of the product, such as "Flinders
+3.1", "Flinders 95", and "Flinders 2000". Version is not a multi-select
+field; the usual practice is to select the earliest version known to have
+the bug.
+
+To create and edit Versions:
+
+#. From the "Edit product" screen, select "Edit Versions".
+
+#. You will notice that the product already has the default
+   version "undefined". Click the "Add" link in the bottom right.
+
+#. Enter the name of the Version. This field takes text only.
+   Then click the "Add" button.
+
+.. _milestones:
+
+Milestones
+##########
+
+Milestones are "targets" that you plan to get a bug fixed by. For
+example, if you have a bug that you plan to fix for your 3.0 release, it
+would be assigned the milestone of 3.0.
+
+.. note:: Milestone options will only appear for a Product if you turned
+   on the :param:`usetargetmilestone` parameter in the "Bug Fields" tab of
+   the :ref:`parameters` page.
+
+To create new Milestones and set Default Milestones:
+
+#. Select "Edit milestones" from the "Edit product" page.
+
+#. Select "Add" in the bottom right corner.
+
+#. Enter the name of the Milestone in the "Milestone" field. You
+   can optionally set the "sortkey", which is a positive or negative
+   number (-32768 to 32767) that defines where in the list this particular
+   milestone appears. This is because milestones often do not
+   occur in alphanumeric order; for example, "Future" might be
+   after "Release 1.2". Select "Add".
diff --git a/docs/en/rst/administering/custom-fields.rst b/docs/en/rst/administering/custom-fields.rst
new file mode 100644
index 0000000000..b782028493
--- /dev/null
+++ b/docs/en/rst/administering/custom-fields.rst
@@ -0,0 +1,148 @@
+.. _custom-fields:
+
+Custom Fields
+#############
+
+Custom Fields are fields defined by the administrator, in addition to those
+which come with Bugzilla by default. Custom Fields are treated like any other
+field—they can be set in bugs and used for search queries.
+
+Administrators should keep in mind that
+adding too many fields can make the user interface more complicated and
+harder to use. Custom Fields should be added only when necessary and with
+careful consideration.
+
+.. note:: Before adding a Custom Field, make sure that Bugzilla cannot already
+   do the desired behavior. Many Bugzilla options are not enabled by
+   default, and many times Administrators find that simply enabling
+   certain options that already exist is sufficient.
+
+Administrators can manage Custom Fields using the
+``Custom Fields`` link on the Administration page. The Custom
+Fields administration page displays a list of Custom Fields, if any exist,
+and a link to "Add a new custom field".
+
+.. _add-custom-fields:
+
+Adding Custom Fields
+====================
+
+To add a new Custom Field, click the "Add a new custom field" link. This
+page displays several options for the new field, described below.
+
+The following attributes must be set for each new custom field:
+
+- *Name:*
+  The name of the field in the database, used internally. This name
+  MUST begin with ``cf_`` to prevent confusion with
+  standard fields. If this string is omitted, it will
+  be automatically added to the name entered.
+
+- *Description:*
+  A brief string used as the label for this Custom Field.
+  That is the string that users will see, and it should be
+  short and explicit.
+
+- *Type:*
+  The type of field to create. There are
+  several types available:
+
+  Bug ID:
+      A field where you can enter the ID of another bug from
+      the same Bugzilla installation. To point to a bug in a remote
+      installation, use the See Also field instead.
+  Large Text Box:
+      A multiple line box for entering free text.
+  Free Text:
+      A single line box for entering free text.
+  Multiple-Selection Box:
+      A list box where multiple options
+      can be selected. After creating this field, it must be edited
+      to add the selection options. See
+      :ref:`edit-values-list` for information about
+      editing legal values.
+  Drop Down:
+      A list box where only one option can be selected.
+      After creating this field, it must be edited to add the
+      selection options. See
+      :ref:`edit-values-list` for information about
+      editing legal values.
+  Date/Time:
+      A date field.
+
+- *Sortkey:*
+  Integer that determines in which order Custom Fields are
+  displayed in the User Interface, especially when viewing a bug.
+  Fields with lower values are displayed first.
+
+- *Reverse Relationship Description:*
+  When the custom field is of type ``Bug ID``, you can
+  enter text here which will be used as label in the referenced
+  bug to list bugs which point to it. This gives you the ability
+  to have a mutual relationship between two bugs.
+
+- *Can be set on bug creation:*
+  Boolean that determines whether this field can be set on
+  bug creation. If not selected, then a bug must be created
+  before this field can be set. See :ref:`filing`
+  for information about filing bugs.
+
+- *Displayed in bugmail for new bugs:*
+  Boolean that determines whether the value set on this field
+  should appear in bugmail when the bug is filed. This attribute
+  has no effect if the field cannot be set on bug creation.
+
+- *Is obsolete:*
+  Boolean that determines whether this field should
+  be displayed at all. Obsolete Custom Fields are hidden.
+
+- *Is mandatory:*
+  Boolean that determines whether this field must be set.
+  For single and multi-select fields, this means that a (non-default)
+  value must be selected; for text and date fields, some text
+  must be entered.
+
+- *Field only appears when:*
+  A custom field can be made visible when some criteria is met.
+  For instance, when the bug belongs to one or more products,
+  or when the bug is of some given severity. If left empty, then
+  the custom field will always be visible, in all bugs.
+
+- *Field that controls the values that appear in this field:*
+  When the custom field is of type ``Drop Down`` or
+  ``Multiple-Selection Box``, you can restrict the
+  availability of the values of the custom field based on the
+  value of another field. This criteria is independent of the
+  criteria used in the ``Field only appears when``
+  setting. For instance, you may decide that some given value
+  ``valueY`` is only available when the bug status
+  is RESOLVED while the value ``valueX`` should
+  always be listed.
+  Once you have selected the field that should control the
+  availability of the values of this custom field, you can
+  edit values of this custom field to set the criteria; see
+  :ref:`edit-values-list`.
+
+.. _edit-custom-fields:
+
+Editing Custom Fields
+=====================
+
+As soon as a Custom Field is created, its name and type cannot be
+changed. If this field is a drop-down menu, its legal values can
+be set as described in :ref:`edit-values-list`. All
+other attributes can be edited as described above.
+
+.. _delete-custom-fields:
+
+Deleting Custom Fields
+======================
+
+Only custom fields that are marked as obsolete, and that have never
+been used, can be deleted completely (else the integrity
+of the bug history would be compromised). For custom fields marked
+as obsolete, a "Delete" link will appear in the ``Action``
+column. If the custom field has been used in the past, the deletion
+will be rejected. Marking the field as obsolete, however, is sufficient
+to hide it from the user interface entirely.
+
diff --git a/docs/en/rst/administering/extensions.rst b/docs/en/rst/administering/extensions.rst
new file mode 100644
index 0000000000..2c54b84637
--- /dev/null
+++ b/docs/en/rst/administering/extensions.rst
@@ -0,0 +1,18 @@
+.. _installed-extensions-admin:
+
+Installed Extensions
+====================
+
+Bugzilla can be enhanced using extensions (see :ref:`extensions`). If an
+extension comes with documentation in the appropriate format, and you build
+your own copy of the Bugzilla documentation using :file:`makedocs.pl`, then
+the documentation for your installed extensions will show up here.
+
+Your Bugzilla installation has the following extensions available (as of the
+last time you compiled the documentation):
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+   
+   ../extensions/*/index-admin
diff --git a/docs/en/rst/administering/field-values.rst b/docs/en/rst/administering/field-values.rst
new file mode 100644
index 0000000000..b7380cbdf1
--- /dev/null
+++ b/docs/en/rst/administering/field-values.rst
@@ -0,0 +1,45 @@
+.. _field-values:
+
+Field Values
+############
+
+Legal values for the operating system, platform, bug priority and
+severity, and custom fields of type ``Drop Down`` and
+``Multiple-Selection Box`` (see :ref:`custom-fields`),
+as well as the list of valid bug statuses and resolutions, can be
+customized from the same interface. You can add, edit, disable, and
+remove the values that can be used with these fields.
+
+.. _edit-values-list:
+
+Viewing/Editing Legal Values
+============================
+
+Editing legal values requires ``admin`` privileges.
+Select "Field Values" from the Administration page. A list of all
+fields, both system and Custom, for which legal values
+can be edited appears. Click a field name to edit its legal values.
+
+There is no limit to how many values a field can have, but each value
+must be unique to that field. The sortkey is important to display these
+values in the desired order.
+
+When the availability of the values of a custom field is controlled
+by another field, you can select from here which value of the other field
+must be set for the value of the custom field to appear.
+
+.. _edit-values-delete:
+
+Deleting Legal Values
+=====================
+
+Legal values from Custom Fields can be deleted, but only if the
+following two conditions are respected:
+
+#. The value is not set as the default for the field.
+
+#. No bug is currently using this value.
+
+If any of these conditions is not respected, the value cannot be deleted.
+The only way to delete these values is to reassign bugs to another value
+and to set another value as default for the field.
diff --git a/docs/en/rst/administering/flags.rst b/docs/en/rst/administering/flags.rst
new file mode 100644
index 0000000000..0b13690a35
--- /dev/null
+++ b/docs/en/rst/administering/flags.rst
@@ -0,0 +1,155 @@
+.. _flags-admin:
+
+Flags
+#####
+
+If you have the :group:`editcomponents` permission, you can
+edit Flag Types from the main administration page. Clicking the
+:guilabel:`Flags` link will bring you to the :guilabel:`Administer
+Flag Types` page. Here, you can select whether you want
+to create (or edit) a Bug flag or an Attachment flag.
+
+The two flag types have the same administration interface, and the interface
+for creating a flag and editing a flag have the same set of fields.
+
+.. _flags-edit:
+
+Flag Properties
+===============
+
+Name
+    This is the name of the flag. This will be displayed
+    to Bugzilla users who are looking at or setting the flag.
+    The name may contain any valid Unicode characters except commas
+    and spaces.
+
+Description
+    The description describes the flag in more detail. It is visible
+    in a tooltip when hovering over a flag either in the :guilabel:`Show Bug`
+    or :guilabel:`Edit Attachment` pages. This field can be as
+    long as you like and can contain any character you want.
+
+Category
+    You can set a flag to be visible or not visible on any combination of
+    products and components.
+
+    Default behaviour for a newly created flag is to appear on all
+    products and all components, which is why ``__Any__:__Any__``
+    is already entered in the :guilabel:`Inclusions` box.
+    If this is not your desired behaviour, you must either set some
+    exclusions (for products on which you don't want the flag to appear),
+    or you must remove ``__Any__:__Any__`` from the :guilabel:`Inclusions` box
+    and define products/components specifically for this flag.
+
+    To create an Inclusion, select a Product from the top drop-down box.
+    You may also select a specific component from the bottom drop-down box.
+    (Setting ``__Any__`` for Product translates to
+    "all the products in this Bugzilla".
+    Selecting  ``__Any__`` in the Component field means
+    "all components in the selected product.")
+    Selections made, press :guilabel:`Include`, and your
+    Product/Component pairing will show up in the :guilabel:`Inclusions` box on the right.
+
+    To create an Exclusion, the process is the same: select a Product from the
+    top drop-down box, select a specific component if you want one, and press
+    :guilabel:`Exclude`. The Product/Component pairing will show up in the
+    :guilabel:`Exclusions` box on the right.
+
+    This flag *will* appear and *can* be set for any
+    products/components appearing in the :guilabel:`Inclusions` box
+    (or which fall under the appropriate ``__Any__``).
+    This flag *will not* appear (and therefore *cannot* be set) on
+    any products appearing in the :guilabel:`Exclusions` box.
+    *IMPORTANT: Exclusions override inclusions.*
+
+    You may select a Product without selecting a specific Component,
+    but you cannot select a Component without a Product. If you do so,
+    Bugzilla will display an error message, even if all your products
+    have a component by that name. You will also see an error if you
+    select a Component that does not belong to the selected Product.
+
+    *Example:* Let's say you have a product called
+    ``Jet Plane`` that has thousands of components. You want
+    to be able to ask if a problem should be fixed in the next model of
+    plane you release. We'll call the flag ``fixInNext``.
+    However, one component in ``Jet Plane`` is
+    called ``Pilot``, and it doesn't make sense to release a
+    new pilot, so you don't want to have the flag show up in that component.
+    So, you include ``Jet Plane:__Any__`` and you exclude
+    ``Jet Plane:Pilot``.
+
+Sort Key
+    Flags normally show up in alphabetical order. If you want them to
+    show up in a different order, you can use this key set the order on each flag.
+    Flags with a lower sort key will appear before flags with a higher
+    sort key. Flags that have the same sort key will be sorted alphabetically.
+
+Active
+    Sometimes you might want to keep old flag information in the
+    Bugzilla database but stop users from setting any new flags of this type.
+    To do this, uncheck :guilabel:`active`. Deactivated
+    flags will still show up in the UI if they are ``?``, ``+``, or ``-``, but
+    they may only be cleared (unset) and cannot be changed to a new value.
+    Once a deactivated flag is cleared, it will completely disappear from a
+    bug/attachment and cannot be set again.
+
+Requestable
+    New flags are, by default, "requestable", meaning that they
+    offer users the ``?`` option, as well as ``+``
+    and ``-``.
+    To remove the ``?`` option, uncheck "requestable".
+
+Specifically Requestable
+    By default this box is checked for new flags, meaning that users may make
+    flag requests of specific individuals. Unchecking this box will remove the
+    text box next to a flag; if it is still requestable, then requests
+    cannot target specific users and are open to anyone (called a
+    request "to the wind" in Bugzilla). Removing this after specific
+    requests have been made will not remove those requests; that data will
+    stay in the database (though it will no longer appear to the user).
+
+Multiplicable
+    Any flag with :guilabel:`Multiplicable:guilabel:` set (default for new flags
+    is 'on') may be set more than once. After being set once, an unset flag
+    of the same type will appear below it with "addl." (short for
+    "additional") before the name. There is no limit to the number of
+    times a Multiplicable flags may be set on the same bug/attachment.
+
+CC List
+    If you want certain users to be notified every time this flag is
+    set to ``?``, ``-``, or ``+``, or is unset, add them here. This is a comma-separated
+    list of email addresses that need not be restricted to Bugzilla usernames.
+
+Grant Group
+    When this field is set to some given group, only users in the group
+    can set the flag to ``+`` and ``-``. This
+    field does not affect who can request or cancel the flag. For that,
+    see the :guilabel:`Request Group` field below. If this field
+    is left blank, all users can set or delete this flag. This field is
+    useful for restricting which users can approve or reject requests.
+
+Request Group
+    When this field is set to some given group, only users in the group
+    can request or cancel this flag. Note that this field has no effect
+    if the :guilabel:`Grant Group` field is empty. You can set the
+    value of this field to a different group, but both fields have to be
+    set to a group for this field to have an effect.
+
+.. _flags-delete:
+
+Deleting a Flag
+===============
+
+When you are at the :guilabel:`Administer Flag Types` screen,
+you will be presented with a list of Bug flags and a list of Attachment
+Flags.
+
+To delete a flag, click on the :guilabel:`Delete` link next to
+the flag description.
+
+.. warning:: Once you delete a flag, it is *gone* from
+   your Bugzilla. All the data for that flag will be deleted.
+   Everywhere that flag was set, it will disappear,
+   and you cannot get that data back. If you want to keep flag data,
+   but don't want anybody to set any new flags or change current flags,
+   unset :guilabel:`active` in the flag Edit form.
diff --git a/docs/en/rst/administering/groups.rst b/docs/en/rst/administering/groups.rst
new file mode 100644
index 0000000000..a14bb689e9
--- /dev/null
+++ b/docs/en/rst/administering/groups.rst
@@ -0,0 +1,191 @@
+.. _groups:
+
+Groups and Security
+###################
+
+Groups allow for separating bugs into logical divisions.
+Groups are typically used
+to isolate bugs that should only be seen by certain people. For
+example, a company might create a different group for each one of its customers
+or partners. Group permissions could be set so that each partner or customer would
+only have access to their own bugs. Or, groups might be used to create
+variable access controls for different departments within an organization.
+Another common use of groups is to associate groups with products,
+creating isolation and access control on a per-product basis.
+
+Groups and group behaviors are controlled in several places:
+
+#. The group configuration page. To view or edit existing groups, or to
+   create new groups, access the "Groups" link from the "Administration"
+   page. This section of the manual deals primarily with the aspect of
+   group controls accessed on this page.
+
+#. Global configuration parameters. Bugzilla has several parameters
+   that control the overall default group behavior and restriction
+   levels. For more information on the parameters that control
+   group behavior globally, see :ref:`param-group-security`.
+
+#. Product association with groups. Most of the functionality of groups
+   and group security is controlled at the product level. Some aspects
+   of group access controls for products are discussed in this section,
+   but for more detail see :ref:`product-group-controls`.
+
+#. Group access for users. See :ref:`users-and-groups` for
+   details on how users are assigned group access.
+
+Group permissions are such that if a bug belongs to a group, only members
+of that group can see the bug. If a bug is in more than one group, only
+members of *all* the groups that the bug is in can see
+the bug. For information on granting read-only access to certain people and
+full edit access to others, see :ref:`product-group-controls`.
+
+.. note:: By default, bugs can also be seen by the Assignee, the Reporter, and
+   everyone on the CC List, regardless of whether or not the bug would
+   typically be viewable by them. Visibility to the Reporter and CC List can
+   be overridden (on a per-bug basis) by bringing up the bug, finding the
+   section that starts with ``Users in the roles selected below...``
+   and un-checking the box next to either 'Reporter' or 'CC List' (or both).
+
+.. _create-groups:
+
+Creating Groups
+===============
+
+To create a new group, follow the steps below:
+
+#. Select the ``Administration`` link in the page footer,
+   and then select the ``Groups`` link from the
+   Administration page.
+
+#. A table of all the existing groups is displayed. Below the table is a
+   description of all the fields. To create a new group, select the
+   ``Add Group`` link under the table of existing groups.
+
+#. There are five fields to fill out. These fields are documented below
+   the form. Choose a name and description for the group. Decide whether
+   this group should be used for bugs (in all likelihood this should be
+   selected). Optionally, choose a regular expression that will
+   automatically add any matching users to the group, and choose an
+   icon that will help identify user comments for the group. The regular
+   expression can be useful, for example, to automatically put all users
+   from the same company into one group (if the group is for a specific
+   customer or partner).
+
+   .. note:: If ``User RegExp`` is filled out, users whose email
+      addresses match the regular expression will automatically be
+      members of the group as long as their email addresses continue
+      to match the regular expression. If their email address changes
+      and no longer matches the regular expression, they will be removed
+      from the group. Versions 2.16 and older of Bugzilla did not automatically
+      remove users whose email addresses no longer matched the RegExp.
+
+   .. warning:: If specifying a domain in the regular expression, end
+      the regexp with a "$". Otherwise, when granting access to
+      "@mycompany\\.com", access will also be granted to
+      'badperson@mycompany.com.cracker.net'. Use the syntax,
+      '@mycompany\\.com$' for the regular expression.
+
+#. After the new group is created, it can be edited for additional options.
+   The "Edit Group" page allows for specifying other groups that should be included
+   in this group and which groups should be permitted to add and delete
+   users from this group. For more details, see :ref:`edit-groups`.
+
+.. _edit-groups:
+
+Editing Groups and Assigning Group Permissions
+==============================================
+
+To access the "Edit Groups" page, select the
+``Administration`` link in the page footer,
+and then select the ``Groups`` link from the Administration page.
+A table of all the existing groups is displayed. Click on a group name
+you wish to edit or control permissions for.
+
+The "Edit Groups" page contains the same five fields present when
+creating a new group. Below that are two additional sections, "Group
+Permissions" and "Mass Remove". The "Mass Remove" option simply removes
+all users from the group who match the regular expression entered. The
+"Group Permissions" section requires further explanation.
+
+The "Group Permissions" section on the "Edit Groups" page contains four sets
+of permissions that control the relationship of this group to other
+groups. If the :param:`usevisibilitygroups` parameter is in use (see
+:ref:`parameters`) two additional sets of permissions are displayed.
+Each set consists of two select boxes. On the left, a select box
+with a list of all existing groups. On the right, a select box listing
+all groups currently selected for this permission setting (this box will
+be empty for new groups). The way these controls allow groups to relate
+to one another is called *inheritance*.
+Each of the six permissions is described below.
+
+*Groups That Are a Member of This Group*
+    Members of any groups selected here will automatically have
+    membership in this group. In other words, members of any selected
+    group will inherit membership in this group.
+
+*Groups That This Group Is a Member Of*
+    Members of this group will inherit membership to any group
+    selected here. For example, suppose the group being edited is
+    an Admin group. If there are two products  (Product1 and Product2)
+    and each product has its
+    own group (Group1 and Group2), and the Admin group
+    should have access to both products,
+    simply select both Group1 and Group2 here.
+
+*Groups That Can Grant Membership in This Group*
+    The members of any group selected here will be able add users
+    to this group, even if they themselves are not in this group.
+
+*Groups That This Group Can Grant Membership In*
+    Members of this group can add users to any group selected here,
+    even if they themselves are not in the selected groups.
+
+*Groups That Can See This Group*
+    Members of any selected group can see the users in this group.
+    This setting is only visible if the :param:`usevisibilitygroups` parameter
+    is enabled on the Bugzilla Configuration page. See
+    :ref:`parameters` for information on configuring Bugzilla.
+
+*Groups That This Group Can See*
+    Members of this group can see members in any of the selected groups.
+    This setting is only visible if the :param:`usevisibilitygroups` parameter
+    is enabled on the the Bugzilla Configuration page. See
+    :ref:`parameters` for information on configuring Bugzilla.
+
+.. _users-and-groups:
+
+Assigning Users to Groups
+=========================
+
+A User can become a member of a group in several ways:
+
+#. The user can be explicitly placed in the group by editing
+   the user's profile. This can be done by accessing the "Users" page
+   from the "Administration" page. Use the search form to find the user
+   you want to edit group membership for, and click on their email
+   address in the search results to edit their profile. The profile
+   page lists all the groups and indicates if the user is a member of
+   the group either directly or indirectly. More information on indirect
+   group membership is below. For more details on User Administration,
+   see :ref:`users`.
+
+#. The group can include another group of which the user is
+   a member. This is indicated by square brackets around the checkbox
+   next to the group name in the user's profile.
+   See :ref:`edit-groups` for details on group inheritance.
+
+#. The user's email address can match the regular expression
+   that has been specified to automatically grant membership to
+   the group. This is indicated by "\*" around the check box by the
+   group name in the user's profile.
+   See :ref:`create-groups` for details on
+   the regular expression option when creating groups.
+
+Assigning Group Controls to Products
+====================================
+
+The primary functionality of groups is derived from the relationship of
+groups to products. The concepts around segregating access to bugs with
+product group controls can be confusing. For details and examples on this
+topic, see :ref:`product-group-controls`.
+
diff --git a/docs/en/rst/administering/index.rst b/docs/en/rst/administering/index.rst
new file mode 100644
index 0000000000..c478193231
--- /dev/null
+++ b/docs/en/rst/administering/index.rst
@@ -0,0 +1,26 @@
+.. _administering:
+
+====================
+Administration Guide
+====================
+
+For those with :group:`admin` privileges, Bugzilla can be administered using
+the :guilabel:`Administration` link in the header. The administrative
+controls are divided into several sections:
+
+.. toctree::
+   :maxdepth: 2
+
+   parameters
+   preferences
+   users
+   categorization
+   flags
+   custom-fields
+   field-values
+   workflow
+   groups
+   keywords
+   whining
+   quips
+   extensions
diff --git a/docs/en/rst/administering/keywords.rst b/docs/en/rst/administering/keywords.rst
new file mode 100644
index 0000000000..5edacf8b33
--- /dev/null
+++ b/docs/en/rst/administering/keywords.rst
@@ -0,0 +1,14 @@
+.. _keywords:
+
+Keywords
+########
+
+The administrator can define keywords which can be used to tag and
+categorise bugs. For example, the keyword "regression" is commonly used.
+A company might have a policy stating all regressions
+must be fixed by the next release—this keyword can make tracking those
+bugs much easier. Keywords are global, rather than per product. 
+
+Keywords can be created, edited, deactivated, or deleted by clicking the "Keywords"
+link in the admin page. There are three fields for each keyword—the keyword
+itself, a brief description, and if the keyword is active or not.
diff --git a/docs/en/rst/administering/parameters.rst b/docs/en/rst/administering/parameters.rst
new file mode 100644
index 0000000000..3b4b42983e
--- /dev/null
+++ b/docs/en/rst/administering/parameters.rst
@@ -0,0 +1,857 @@
+.. _parameters:
+
+Parameters
+##########
+
+Bugzilla is configured by changing various parameters, accessed
+from the :guilabel:`Parameters` link, which is found on the Administration
+page. The parameters are divided into several categories,
+accessed via the menu on the left.
+
+.. _param-required-settings:
+
+Required Settings
+=================
+
+The core required parameters for any Bugzilla installation are set
+here. :param:`urlbase` is always required; the other parameters should be
+set, or it must be explicitly decided not to
+set them, before the new Bugzilla installation starts to be used.
+
+urlbase
+    Defines the fully qualified domain name and web
+    server path to this Bugzilla installation.
+    For example, if the Bugzilla query page is
+    :file:`http://www.foo.com/bugzilla/query.cgi`,
+    the :param:`urlbase` should be set
+    to :paramval:`http://www.foo.com/bugzilla/`.
+
+ssl_redirect
+    If enabled, Bugzilla will force HTTPS (SSL) connections, by
+    automatically redirecting any users who try to use a non-SSL
+    connection. Also, when this is enabled, Bugzilla will send out links
+    using :param:`sslbase` in emails instead of :param:`urlbase`.
+
+sslbase
+    Defines the fully qualified domain name and web
+    server path for HTTPS (SSL) connections to this Bugzilla installation.
+    For example, if the Bugzilla main page is
+    :file:`https://www.foo.com/bugzilla/index.cgi`,
+    the :param:`sslbase` should be set
+    to :paramval:`https://www.foo.com/bugzilla/`.
+
+.. _param-general:
+
+General
+=======
+
+maintainer
+    Email address of the person
+    responsible for maintaining this Bugzilla installation.
+    The address need not be that of a valid Bugzilla account.
+
+shutdownhtml
+    If there is any text in this field, this Bugzilla installation will
+    be completely disabled and this text will appear instead of all
+    Bugzilla pages for all users, including Admins. Used in the event
+    of site maintenance or outage situations.
+
+announcehtml
+    Any text in this field will be displayed at the top of every HTML
+    page in this Bugzilla installation. The text is not wrapped in any
+    tags. For best results, wrap the text in a ``<div>``
+    tag. Any style attributes from the CSS can be applied. For example,
+    to make the text green inside of a red box, add ``id=message``
+    to the ``<div>`` tag.
+
+upgrade_notification
+    Enable or disable a notification on the homepage of this Bugzilla
+    installation when a newer version of Bugzilla is available. This
+    notification is only visible to administrators. Choose :paramval:`disabled`
+    to turn off the notification. Otherwise, choose which version of
+    Bugzilla you want to be notified about: :paramval:`development_snapshot` is the
+    latest release from the master branch, :paramval:`latest_stable_release` is the most
+    recent release available on the most recent stable branch, and
+    :paramval:`stable_branch_release` is the most recent release on the branch
+    this installation is based on.
+
+.. _param-administrative-policies:
+
+Administrative Policies
+=======================
+
+This page contains parameters for basic administrative functions.
+Options include whether to allow the deletion of bugs and users,
+and whether to allow users to change their email address.
+
+allowbugdeletion
+    The pages to edit products and components can delete all associated bugs
+    when you delete a product (or component). Since that is a pretty scary idea,
+    you have to turn on this option before any such deletions will ever happen.
+
+allowemailchange
+    Users can change their own email address through the preferences. Note that
+    the change is validated by emailing both addresses, so switching this option
+    on will not let users use an invalid address.
+
+allowuserdeletion
+    The user editing pages are capable of letting you delete user accounts.
+    Bugzilla will issue a warning in case you'd run into inconsistencies when
+    you're about to do so, but such deletions still remain scary. So, you have
+    to turn on this option before any such deletions will ever happen.
+
+last_visit_keep_days
+    This option controls how many days Bugzilla will remember that users have
+    visited specific bugs.
+
+.. _param-user-authentication:
+
+User Authentication
+===================
+
+This page contains the settings that control how this Bugzilla
+installation will do its authentication. Choose what authentication
+mechanism to use (the Bugzilla database, or an external source such
+as LDAP), and set basic behavioral parameters. For example, choose
+whether to require users to login to browse bugs, the management
+of authentication cookies, and the regular expression used to
+validate email addresses. Some parameters are highlighted below.
+
+auth_env_id
+    Environment variable used by external authentication system to store a unique
+    identifier for each user. Leave it blank if there isn't one or if this method
+    of authentication is not being used.
+
+auth_env_email
+    Environment variable used by external authentication system to store each
+    user's email address. This is a required field for environmental authentication.
+    Leave it blank if you are not going to use this feature.
+
+auth_env_realname
+    Environment variable used by external authentication system to store the
+    user's real name. Leave it blank if there isn't one or if this method of
+    authentication is not being used.
+
+user_info_class
+    Mechanism(s) to be used for gathering a user's login information. More than
+    one may be selected. If the first one returns nothing, the second is tried,
+    and so on. The types are:
+
+    * :paramval:`CGI`: asks for username and password via CGI form interface.
+    * :paramval:`Env`: info for a pre-authenticated user is passed in system
+      environment variables.
+
+user_verify_class
+    Mechanism(s) to be used for verifying (authenticating) information gathered
+    by user_info_class. More than one may be selected. If the first one cannot
+    find the user, the second is tried, and so on. The types are:
+
+    * :paramval:`DB`: Bugzilla's built-in authentication. This is the most common
+      choice.
+    * :paramval:`RADIUS`: RADIUS authentication using a RADIUS server. Using
+      this method requires additional parameters to be set. Please see
+      :ref:`param-radius` for more information.
+    * :paramval:`LDAP`: LDAP authentication using an LDAP server. Using this
+      method requires additional parameters to be set. Please see :ref:`param-ldap`
+      for more information.
+
+rememberlogin
+    Controls management of session cookies.
+
+    * :paramval:`on` - Session cookies never expire (the user has to login only
+      once per browser).
+    * :paramval:`off` - Session cookies last until the users session ends (the
+      user will have to login in each new browser session).
+    * :paramval:`defaulton`/:paramval:`defaultoff` - Default behavior as described
+      above, but user can choose whether Bugzilla will remember their login or not.
+
+requirelogin
+    If this option is set, all access to the system beyond the front page will
+    require a login. No anonymous users will be permitted.
+
+emailregexp
+    Defines the regular expression used to validate email addresses used for
+    login names. The default attempts to match fully qualified email addresses
+    (i.e. 'user\@example.com') in a slightly more restrictive way than what is
+    allowed in RFC 2822. Another popular value to put here is :paramval:`^[^@]+`,
+    which means 'local usernames, no @ allowed.'
+
+emailregexpdesc
+    This description is shown to the user to explain which email addresses are
+    allowed by the :param:`emailregexp` param.
+
+createemailregexp
+    This defines the (case-insensitive) regexp to use for email addresses that
+    are permitted to self-register. The default (:paramval:`.*`) permits any
+    account matching the emailregexp to be created. If this parameter is left
+    blank, no users will be permitted to create their own accounts and all
+    accounts will have to be created by an administrator.
+
+password_complexity
+    Set the complexity required for passwords. In all cases must the passwords
+    be at least 6 characters long.
+
+    * :paramval:`no_constraints` - No complexity required.
+    * :paramval:`mixed_letters` - Passwords must contain at least one UPPER
+      and one lower case letter.
+    * :paramval:`letters_numbers` - Passwords must contain at least one UPPER
+      and one lower case letter and a number.
+    * :paramval:`letters_numbers_specialchars` - Passwords must contain at least
+      one letter, a number and a special character.
+
+password_check_on_login
+    If set, Bugzilla will check that the password meets the current complexity
+    rules and minimum length requirements when the user logs into the Bugzilla
+    web interface. If it doesn't, the user would not be able to log in, and will
+    receive a message to reset their password.
+
+auth_delegation
+    If set, Bugzilla will allow other websites to request API keys from its own
+    users. See :ref:`auth-delegation`.
+
+.. _param-attachments:
+
+Attachments
+===========
+
+This page allows for setting restrictions and other parameters
+regarding attachments to bugs. For example, control size limitations
+and whether to allow pointing to external files via a URI.
+
+allow_attachment_display
+    If this option is on, users will be able to view attachments from their
+    browser, if their browser supports the attachment's MIME type. If this
+    option is off, users are forced to download attachments, even if the browser
+    is able to display them.
+
+    If you do not trust your users (e.g. if your Bugzilla is public), you should
+    either leave this option off, or configure and set the :param:`attachment_base`
+    parameter (see below). Untrusted users may upload attachments that could be
+    potentially damaging if viewed directly in the browser.
+
+attachment_base
+    When the :param:`allow_attachment_display` parameter is on, it is possible
+    for a malicious attachment to steal your cookies or perform an attack on
+    Bugzilla using your credentials.
+
+    If you would like additional security on attachments to avoid this, set this
+    parameter to an alternate URL for your Bugzilla that is not the same as
+    :param:`urlbase` or :param:`sslbase`. That is, a different domain name that
+    resolves to this exact same Bugzilla installation.
+
+    For added security, you can insert ``%bugid%`` into the URL, which will be
+    replaced with the ID of the current bug that the attachment is on, when you
+    access an attachment. This will limit attachments to accessing only other
+    attachments on the same bug. Remember, though, that all those possible domain
+    names (such as 1234.your.domain.com) must point to this same Bugzilla instance.
+    To set this up you need to investigate wildcard DNS.
+
+allow_attachment_deletion
+    If this option is on, administrators will be able to delete the contents
+    of attachments (i.e. replace the attached file with a 0 byte file),
+    leaving only the metadata.
+
+xsendfile_header
+    By default, attachments are served by Bugzilla. If you enable filesystem
+    file storage for large files using the :param:`maxlocalattachment`
+    parameter then you can have those files served directly by the webserver,
+    which avoids copying them entirely into memory, and this may result in a
+    performance improvement. To do this, configure your webserver appropriately
+    and then set the correct header, as follows:
+
+    * Apache: ``X-Sendfile`` header; see `webserver documentation
+      <https://tn123.org/mod_xsendfile/>`_ for configuration instructions
+    * nginx: ``X-Accel-Redirect`` header; see `webserver documentation
+      <http://wiki.nginx.org/X-accel>`_ for configuration instructions
+    * lighttpd: ``X-LIGHTTPD-send-file`` header; see `webserver documentation
+      <http://redmine.lighttpd.net/projects/1/wiki/X-LIGHTTPD-send-file>`_  for
+      configuration instructions
+
+    Please note that attachments stored in the database cannot be offloaded in
+    this way.
+
+maxattachmentsize
+    The maximum size (in kilobytes) of attachments to be stored in the database.
+    If a file larger than this size is attached to a bug, Bugzilla will look at
+    the :param:`maxlocalattachment` parameter to determine if the file can be
+    stored locally on the web server. If the file size exceeds both limits,
+    then the attachment is rejected. Setting both parameters to 0 will prevent
+    attaching files to bugs.
+
+    Some databases have default limits which prevent storing larger attachments
+    in the database. E.g. MySQL has a parameter called
+    `max_allowed_packet <http://dev.mysql.com/doc/refman/5.1/en/packet-too-large.html>`_,
+    whose default varies by distribution. Setting :param:`maxattachmentsize`
+    higher than your current setting for this value will produce an error.
+
+maxlocalattachment
+    The maximum size (in megabytes) of attachments to be stored locally on the
+    web server. If set to a value lower than the :param:`maxattachmentsize`
+    parameter, attachments will never be kept on the local filesystem.
+
+    Whether you use this feature or not depends on your environment. Reasons
+    to store some or all attachments as files might include poor database
+    performance for large binary blobs, ease of backup/restore/browsing, or
+    even filesystem-level deduplication support. However, you need to be aware
+    of any limits on how much data your webserver environment can store. If in
+    doubt, leave the value at 0.
+
+    Note that changing this value does not affect any already-submitted attachments.
+
+.. _param-bug-change-policies:
+
+Bug Change Policies
+===================
+
+Set policy on default behavior for bug change events. For example,
+choose which status to set a bug to when it is marked as a duplicate,
+and choose whether to allow bug reporters to set the priority or
+target milestone. Also allows for configuration of what changes
+should require the user to make a comment, described below.
+
+duplicate_or_move_bug_status
+    When a bug is marked as a duplicate of another one, use this bug status.
+
+letsubmitterchoosepriority
+    If this is on, then people submitting bugs can choose an initial priority
+    for that bug. If off, then all bugs initially have the default priority
+    selected here.
+
+letsubmitterchoosemilestone
+    If this is on, then people submitting bugs can choose the Target Milestone
+    for that bug. If off, then all bugs initially have the default milestone
+    for the product being filed in.
+
+commenton*
+    All these fields allow you to dictate what changes can pass
+    without comment and which must have a comment from the
+    person who changed them.  Often, administrators will allow
+    users to add themselves to the CC list, accept bugs, or
+    change the Status Whiteboard without adding a comment as to
+    their reasons for the change, yet require that most other
+    changes come with an explanation.
+    Set the "commenton" options according to your site policy. It
+    is a wise idea to require comments when users resolve, reassign, or
+    reopen bugs at the very least.
+
+    .. note:: It is generally far better to require a developer comment
+       when resolving bugs than not. Few things are more annoying to bug
+       database users than having a developer mark a bug "fixed" without
+       any comment as to what the fix was (or even that it was truly
+       fixed!)
+
+resolution_forbidden_with_open_blockers
+    This option will prevent users from resolving bugs as the chosen resolution
+    if they have unresolved dependencies. If using Bugzilla's default
+    resolutions, the most common value to choose is FIXED, because if a bug
+    is fixed, either is dependencies are actually fixed (and should be marked
+    as such) or the dependency is mistaken and should be removed. Only the
+    chosen resolution is affected; users will be still able to resolve bugs to
+    other resolutions even if they have unresolved dependent bugs.
+
+.. _param-bugfields:
+
+Bug Fields
+==========
+
+The parameters in this section determine the default settings of
+several Bugzilla fields for new bugs and whether
+certain fields are used. For example, choose whether to use the
+:field:`Target Milestone` field or the :field:`Status Whiteboard` field.
+
+useclassification
+    If this is on, Bugzilla will associate each product with a specific
+    classification. But you must have :group:`editclassification` permissions
+    enabled in order to edit classifications.
+
+usetargetmilestone
+    Do you wish to use the :field:`Target Milestone` field?
+
+useqacontact
+    This allows you to define an email address for each component,
+    in addition to that of the default assignee, that will be sent
+    carbon copies of incoming bugs.
+
+usestatuswhiteboard
+    This defines whether you wish to have a free-form, overwritable field
+    associated with each bug. The advantage of the :field:`Status Whiteboard`
+    is that it can be deleted or modified with ease and provides an
+    easily searchable field for indexing bugs that have some trait in
+    common.
+
+use_see_also
+    Do you wish to use the :field:`See Also` field? It allows you mark bugs
+    in other bug tracker installations as being related. Disabling this field
+    prevents addition of new relationships, but existing ones will continue to
+    appear.
+
+defaultpriority
+    This is the priority that newly entered bugs are set to.
+
+defaultseverity
+    This is the severity that newly entered bugs are set to.
+
+defaultplatform
+    This is the platform that is preselected on the bug entry form.
+    You can leave this empty; Bugzilla will then use the platform that the
+    browser is running on as the default.
+
+defaultopsys
+    This is the operating system that is preselected on the bug entry form.
+    You can leave this empty; Bugzilla will then use the operating system
+    that the browser reports to be running on as the default.
+
+collapsed_comment_tags
+    A comma-separated list of tags which, when applied to comments, will
+    cause them to be collapsed by default.
+
+.. _param-group-security:
+
+Group Security
+==============
+
+Bugzilla allows for the creation of different groups, with the
+ability to restrict the visibility of bugs in a group to a set of
+specific users. Specific products can also be associated with
+groups, and users restricted to only see products in their groups.
+Several parameters are described in more detail below. Most of the
+configuration of groups and their relationship to products is done
+on the :guilabel:`Groups` and :guilabel:`Product` pages of the
+:guilabel:`Administration` area.
+The options on this page control global default behavior.
+For more information on Groups and Group Security, see
+:ref:`groups`.
+
+chartgroup
+    The name of the group of users who can use the 'New Charts' feature.
+    Administrators should ensure that the public categories and series
+    definitions do not divulge confidential information before enabling this
+    for an untrusted population. If left blank, no users will be able to use
+    New Charts.
+
+insidergroup
+    The name of the group of users who can see/change private comments and
+    attachments.
+
+timetrackinggroup
+    The name of the group of users who can see/change time tracking information.
+
+querysharegroup
+    The name of the group of users who are allowed to share saved
+    searches with one another. For more information on using
+    saved searches, see :ref:`saved-searches`.
+
+comment_taggers_group
+    The name of the group of users who can tag comments. Setting this to empty
+    disables comment tagging.
+
+debug_group
+    The name of the group of users who can view the actual SQL query generated
+    when viewing bug lists and reports. Do not expose this information to
+    untrusted users.
+
+usevisibilitygroups
+    If selected, user visibility will be restricted to members of
+    groups, as selected in the group configuration settings.
+    Each user-defined group can be allowed to see members of selected
+    other groups.
+    For details on configuring groups (including the visibility
+    restrictions) see :ref:`edit-groups`.
+
+or_groups
+    Define the visibility of a bug which is in multiple groups. If
+    this is on (recommended), a user only needs to be a member of one
+    of the bug's groups in order to view it. If it is off, a user
+    needs to be a member of all the bug's groups. Note that in either
+    case, a user's role on the bug (e.g. reporter), if any, may also
+    affect their permissions.
+
+.. _param-ldap:
+
+LDAP
+====
+
+LDAP authentication is a module for Bugzilla's plugin
+authentication architecture. This page contains all the parameters
+necessary to configure Bugzilla for use with LDAP authentication.
+
+The existing authentication
+scheme for Bugzilla uses email addresses as the primary user ID and a
+password to authenticate that user. All places within Bugzilla that
+require a user ID (e.g assigning a bug) use the email
+address. The LDAP authentication builds on top of this scheme, rather
+than replacing it. The initial log-in is done with a username and
+password for the LDAP directory. Bugzilla tries to bind to LDAP using
+those credentials and, if successful, tries to map this account to a
+Bugzilla account. An LDAP mail attribute must be defined.
+If an account for this address
+already exists in the Bugzilla installation, it will log in to that account.
+If no account for that email address exists, one is created at the time
+of login. (In this case, Bugzilla will attempt to use the "displayName"
+or "cn" attribute to determine the user's full name.) After
+authentication, all other user-related tasks are still handled by email
+address, not LDAP username. For example, bugs are still assigned by
+email address and users are still queried by email address.
+
+.. warning:: Because the Bugzilla account is not created until the first time
+   a user logs in, a user who has not yet logged is unknown to Bugzilla.
+   This means they cannot be used as an assignee or QA contact (default or
+   otherwise), added to any CC list, or any other such operation. One
+   possible workaround is the :file:`bugzilla_ldapsync.rb`
+   script in the :file:`contrib`
+   directory. Another possible solution is fixing :bug:`201069`.
+
+Parameters required to use LDAP Authentication:
+
+user_verify_class (in the Authentication section)
+    If you want to list :paramval:`LDAP` here,
+    make sure to have set up the other parameters listed below.
+    Unless you have other (working) authentication methods listed as
+    well, you may otherwise not be able to log back in to Bugzilla once
+    you log out.
+    If this happens to you, you will need to manually edit
+    :file:`data/params.json` and set :param:`user_verify_class` to
+    :paramval:`DB`.
+
+LDAPserver
+    This parameter should be set to the name (and optionally the
+    port) of your LDAP server. If no port is specified, it assumes
+    the default LDAP port of 389.
+    For example: :paramval:`ldap.company.com`
+    or :paramval:`ldap.company.com:3268`
+    You can also specify a LDAP URI, so as to use other
+    protocols, such as LDAPS or LDAPI. If the port was not specified in
+    the URI, the default is either 389 or 636 for 'LDAP' and 'LDAPS'
+    schemes respectively.
+
+    .. note:: In order to use SSL with LDAP, specify a URI with "ldaps://".
+       This will force the use of SSL over port 636.
+       For example, normal LDAP :paramval:`ldap://ldap.company.com`, LDAP over
+       SSL :paramval:`ldaps://ldap.company.com`, or LDAP over a UNIX
+       domain socket :paramval:`ldapi://%2fvar%2flib%2fldap_sock`.
+
+LDAPstarttls
+    Whether to require encrypted communication once a normal LDAP connection
+    is achieved with the server.
+
+LDAPbinddn [Optional]
+    Some LDAP servers will not allow an anonymous bind to search
+    the directory. If this is the case with your configuration you
+    should set the :param:`LDAPbinddn` parameter to the user account Bugzilla
+    should use instead of the anonymous bind.
+    Ex. :paramval:`cn=default,cn=user:password`
+
+LDAPBaseDN
+    The location in
+    your LDAP tree that you would like to search for email addresses.
+    Your uids should be unique under the DN specified here.
+    Ex. :paramval:`ou=People,o=Company`
+
+LDAPuidattribute
+    The attribute
+    which contains the unique UID of your users. The value retrieved
+    from this attribute will be used when attempting to bind as the
+    user to confirm their password.
+    Ex. :paramval:`uid`
+
+LDAPmailattribute
+    The name of the
+    attribute which contains the email address your users will enter
+    into the Bugzilla login boxes.
+    Ex. :paramval:`mail`
+
+LDAPfilter
+    LDAP filter to AND with the LDAPuidattribute for filtering the list of
+    valid users.
+
+.. _param-radius:
+
+RADIUS
+======
+
+RADIUS authentication is a module for Bugzilla's plugin
+authentication architecture. This page contains all the parameters
+necessary for configuring Bugzilla to use RADIUS authentication.
+
+.. note:: Most caveats that apply to LDAP authentication apply to RADIUS
+   authentication as well. See :ref:`param-ldap` for details.
+
+Parameters required to use RADIUS Authentication:
+
+user_verify_class (in the Authentication section)
+    If you want to list :paramval:`RADIUS` here,
+    make sure to have set up the other parameters listed below.
+    Unless you have other (working) authentication methods listed as
+    well, you may otherwise not be able to log back in to Bugzilla once
+    you log out.
+    If this happens to you, you will need to manually edit
+    :file:`data/params.json` and set :param:`user_verify_class` to
+    :paramval:`DB`.
+
+RADIUS_server
+    The name (and optionally the port) of your RADIUS server.
+
+RADIUS_secret
+    The RADIUS server's secret.
+
+RADIUS_NAS_IP
+    The NAS-IP-Address attribute to be used when exchanging data with your
+    RADIUS server. If unspecified, 127.0.0.1 will be used.
+
+RADIUS_email_suffix
+    Bugzilla needs an email address for each user account.
+    Therefore, it needs to determine the email address corresponding
+    to a RADIUS user.
+    Bugzilla offers only a simple way to do this: it can concatenate
+    a suffix to the RADIUS user name to convert it into an email
+    address.
+    You can specify this suffix in the :param:`RADIUS_email_suffix` parameter.
+    If this simple solution does not work for you, you'll
+    probably need to modify
+    :file:`Bugzilla/Auth/Verify/RADIUS.pm` to match your
+    requirements.
+
+.. _param-email:
+
+Email
+=====
+
+This page contains all of the parameters for configuring how
+Bugzilla deals with the email notifications it sends. See below
+for a summary of important options.
+
+mail_delivery_method
+    This is used to specify how email is sent, or if it is sent at
+    all.  There are several options included for different MTAs,
+    along with two additional options that disable email sending.
+    :paramval:`Test` does not send mail, but instead saves it in
+    :file:`data/mailer.testfile` for later review.
+    :paramval:`None` disables email sending entirely.
+
+mailfrom
+    This is the email address that will appear in the "From" field
+    of all emails sent by this Bugzilla installation. Some email
+    servers require mail to be from a valid email address; therefore,
+    it is recommended to choose a valid email address here.
+
+use_mailer_queue
+    In a large Bugzilla installation, updating bugs can be very slow because
+    Bugzilla sends all email at once. If you enable this parameter, Bugzilla
+    will queue all mail and then send it in the background. This requires that
+    you have installed certain Perl modules (as listed by :file:`checksetup.pl`
+    for this feature), and that you are running the :file:`jobqueue.pl` daemon
+    (otherwise your mail won't get sent). This affects all mail sent by Bugzilla,
+    not just bug updates.
+
+smtpserver
+    The SMTP server address, if the :param:`mail_delivery_method`
+    parameter is set to :paramval:`SMTP`.  Use :paramval:`localhost` if you have
+    a local MTA running; otherwise, use a remote SMTP server.  Append ":" and
+    the port number if a non-default port is needed.
+
+smtp_username
+    Username to use for SASL authentication to the SMTP server.  Leave
+    this parameter empty if your server does not require authentication.
+
+smtp_password
+    Password to use for SASL authentication to the SMTP server. This
+    parameter will be ignored if the :param:`smtp_username`
+    parameter is left empty.
+
+smtp_ssl
+    Enable SSL support for connection to the SMTP server.
+
+smtp_debug
+    This parameter allows you to enable detailed debugging output.
+    Log messages are printed the web server's error log.
+
+whinedays
+    Set this to the number of days you want to let bugs go
+    in the CONFIRMED state before notifying people they have
+    untouched new bugs. If you do not plan to use this feature, simply
+    do not set up the :ref:`whining cron job <installation-whining>` described
+    in the installation instructions, or set this value to "0" (never whine).
+
+globalwatchers
+    This allows you to define specific users who will
+    receive notification each time any new bug in entered, or when
+    any existing bug changes, subject to the normal groupset
+    permissions. It may be useful for sending notifications to a
+    mailing list, for instance.
+
+.. _param-querydefaults:
+
+Query Defaults
+==============
+
+This page controls the default behavior of Bugzilla in regards to
+several aspects of querying bugs. Options include what the default
+query options are, what the "My Bugs" page returns, whether users
+can freely add bugs to the quip list, and how many duplicate bugs are
+needed to add a bug to the "most frequently reported" list.
+
+quip_list_entry_control
+    Controls how easily users can add entries to the quip list.
+
+    * :paramval:`open` - Users may freely add to the quip list, and their
+      entries will immediately be available for viewing.
+    * :paramval:`moderated` - Quips can be entered but need to be approved by
+      a moderator before they will be shown.
+    * :paramval:`closed` - No new additions to the quips list are allowed.
+
+mybugstemplate
+    This is the URL to use to bring up a simple 'all of my bugs' list
+    for a user. %userid% will get replaced with the login name of a
+    user. Special characters must be URL encoded.
+
+defaultquery
+    This is the default query that initially comes up when you access
+    the advanced query page. It's in URL-parameter format.
+
+search_allow_no_criteria
+    When turned off, a query must have some criteria specified to limit the
+    number of bugs returned to the user. When turned on, a user is allowed to
+    run a query with no criteria and get all bugs in the entire installation
+    that they can see. Turning this parameter on is not recommended on large
+    installations.
+
+default_search_limit
+    By default, Bugzilla limits searches done in the web interface to returning
+    only this many results, for performance reasons. (This only affects the HTML
+    format of search results—CSV, XML, and other formats are exempted.) Users
+    can click a link on the search result page to see all the results.
+
+    Usually you should not have to change this—the default value should be
+    acceptable for most installations.
+
+max_search_results
+    The maximum number of bugs that a search can ever return. Tabular and
+    graphical reports are exempted from this limit, however.
+
+
+
+.. _param-shadowdatabase:
+
+Shadow Database
+===============
+
+This page controls whether a shadow database is used. If your Bugzilla is
+not large, you will not need these options.
+
+A standard large database setup involves a single master server and a pool of
+read-only slaves (which Bugzilla calls the "shadowdb"). Queries which are not
+updating data can be directed to the slave pool, removing the load/locking
+from the master, freeing it up to handle writes. Bugzilla will switch to the
+shadowdb when it knows it doesn't need to update the database (e.g. when
+searching, or displaying a bug to a not-logged-in user).
+
+Bugzilla does not make sure the shadowdb is kept up to date, so, if you use
+one, you will need to set up replication in your database server.
+
+If your shadowdb is on a different machine, specify :param:`shadowdbhost`
+and :param:`shadowdbport`. If it's on the same machine, specify
+:param:`shadowdbsock`.
+
+shadowdbhost
+    The host the shadow database is on.
+
+shadowdbport
+    The port the shadow database is on.
+
+shadowdbsock
+    The socket used to connect to the shadow database, if the host is the
+    local machine.
+
+shadowdb
+    The database name of the shadow database.
+
+.. _admin-memcached:
+
+Memcached
+=========
+
+memcached_servers
+    If this option is set, Bugzilla will integrate with `Memcached
+    <http://www.memcached.org/>`_. Specify one or more servers, separated by
+    spaces, using hostname:port notation (for example:
+    :paramval:`127.0.0.1:11211`).
+
+memcached_namespace
+    Specify a string to prefix each key on Memcached.
+
+.. _admin-usermatching:
+
+User Matching
+=============
+
+The settings on this page control how users are selected and queried
+when adding a user to a bug. For example, users need to be selected
+when assigning the bug, adding to the CC list, or
+selecting a QA contact. With the :param:`usemenuforusers` parameter, it is
+possible to configure Bugzilla to
+display a list of users in the fields instead of an empty text field.
+If users are selected via a text box, this page also
+contains parameters for how user names can be queried and matched
+when entered.
+
+usemenuforusers
+    If this option is set, Bugzilla will offer you a list to select from
+    (instead of a text entry field) where a user needs to be selected. This
+    option should not be enabled on sites where there are a large number of
+    users.
+
+ajax_user_autocompletion
+    If this option is set, typing characters in a certain user fields
+    will display a list of matches that can be selected from. It is
+    recommended to only turn this on if you are using mod_perl;
+    otherwise, the response will be irritatingly slow.
+
+maxusermatches
+    Provide no more than this many matches when a user is searched for.
+    If set to '1', no users will be displayed on ambiguous
+    matches. This is useful for user-privacy purposes. A value of zero
+    means no limit.
+
+confirmuniqueusermatch
+    Whether a confirmation screen should be displayed when only one user
+    matches a search entry.
+
+.. _admin-advanced:
+
+Advanced
+========
+
+inbound_proxies
+    When inbound traffic to Bugzilla goes through a proxy, Bugzilla thinks that
+    the IP address of the proxy is the IP address of every single user. If you
+    enter a comma-separated list of IPs in this parameter, then Bugzilla will
+    trust any ``X-Forwarded-For`` header sent from those IPs, and use the value
+    of that header as the end user's IP address.
+
+proxy_url
+    If this Bugzilla installation is behind a proxy, enter the proxy
+    information here to enable Bugzilla to access the Internet. Bugzilla
+    requires Internet access to utilize the
+    :param:`upgrade_notification` parameter. If the
+    proxy requires authentication, use the syntax:
+    :paramval:`http://user:pass@proxy_url/`.
+
+strict_transport_security
+    Enables the sending of the Strict-Transport-Security header along with HTTP
+    responses on SSL connections. This adds greater security to your SSL
+    connections by forcing the browser to always access your domain over SSL
+    and never accept an invalid certificate. However, it should only be used
+    if you have the :param:`ssl_redirect` parameter turned on, Bugzilla is the
+    only thing running on its domain (i.e., your :param:`urlbase` is something
+    like :paramval:`http://bugzilla.example.com/`), and you never plan to stop
+    supporting SSL.
+
+    * :paramval:`off` - Don't send the Strict-Transport-Security header with
+      requests.
+    * :paramval:`this_domain_only` - Send the Strict-Transport-Security header
+      with all requests, but only support it for the current domain.
+    * :paramval:`include_subdomains` - Send the Strict-Transport-Security header
+      along with the includeSubDomains flag, which will apply the security change
+      to all subdomains. This is especially useful when combined with an
+      :param:`attachment_base` that exists as (a) subdomain(s) under the main
+      Bugzilla domain.
diff --git a/docs/en/rst/administering/preferences.rst b/docs/en/rst/administering/preferences.rst
new file mode 100644
index 0000000000..0b89c7b13e
--- /dev/null
+++ b/docs/en/rst/administering/preferences.rst
@@ -0,0 +1,10 @@
+.. _default-preferences:
+
+Default Preferences
+###################
+
+Each user of Bugzilla can set certain preferences about how they want
+Bugzilla to behave. Here, you can say whether or not each of the possible
+preferences is available to the user and, if it is, what the default value
+is.
+
diff --git a/docs/en/rst/administering/quips.rst b/docs/en/rst/administering/quips.rst
new file mode 100644
index 0000000000..789304a33a
--- /dev/null
+++ b/docs/en/rst/administering/quips.rst
@@ -0,0 +1,38 @@
+.. _quips:
+
+Quips
+#####
+
+Quips are small user-defined messages (often quotes or witty sayings) that
+can be configured to appear at the top of search results. Each Bugzilla
+installation has its own specific quips. Whenever a quip needs to be
+displayed, a random selection is made from the pool of already existing quips.
+
+Quip submission is controlled by :param:`quip_list_entry_control`
+parameter.  It has several possible values: open, moderated, or closed.
+In order to enable quips approval you need to set this parameter to
+"moderated". In this way, users are free to submit quips for addition,
+but an administrator must explicitly approve them before they are
+actually used.
+
+In order to see the user interface for the quips, you can
+click on a quip when it is displayed together with the search
+results.  You can also go directly to the quips.cgi URL
+(prefixed with the usual web location of the Bugzilla installation).
+Once the quip interface is displayed, the "view and edit the whole
+quip list" link takes you to the quips administration page, which
+lists all quips available in the database.
+
+Next to each quip there is a checkbox, under the
+"Approved" column. Quips that have this checkbox checked are
+already approved and will appear next to the search results.
+The ones that have it unchecked are still preserved in the
+database but will not appear on search results pages.
+User submitted quips have initially the checkbox unchecked.
+
+Also, there is a delete link next to each quip,
+which can be used in order to permanently delete a quip.
+
+Display of quips is controlled by the *display_quips*
+user preference.  Possible values are "on" and "off".
+
diff --git a/docs/en/rst/administering/users.rst b/docs/en/rst/administering/users.rst
new file mode 100644
index 0000000000..3e3ab207f8
--- /dev/null
+++ b/docs/en/rst/administering/users.rst
@@ -0,0 +1,198 @@
+.. _users:
+
+Users
+#####
+
+.. _defaultuser:
+
+Creating Admin Users
+====================
+
+When you first run checksetup.pl after installing Bugzilla, it will
+prompt you for the username (email address) and password for the first
+admin user. If for some reason you delete all the admin users,
+re-running checksetup.pl will again prompt you for a username and
+password and make a new admin.
+
+If you wish to add more administrative users, add them to the "admin" group.
+
+.. _user-account-search:
+
+Searching For Users
+===================
+
+If you have ``editusers`` privileges or if you are allowed
+to grant privileges for some groups, the :guilabel:`Users` link
+will appear in the Administration page.
+
+The first screen is a search form to search for existing user
+accounts. You can run searches based either on the user ID, real
+name, login name or email address. The search can be conducted
+in different ways using the listbox to the right of the text entry
+box. You can match by case-insensitive substring (the default),
+regular expression, a *reverse* regular expression
+match (which finds every user name which does NOT match the regular
+expression), or the exact string if you know exactly who you are
+looking for. The search can be restricted to users who are in a
+specific group. By default, the restriction is turned off.
+
+The search returns a list of
+users matching your criteria. User properties can be edited by clicking
+the login name. The Account History of a user can be viewed by clicking
+the "View" link in the Account History column. The Account History
+displays changes that have been made to the user account, the time of
+the change and the user who made the change. For example, the Account
+History page will display details of when a user was added or removed
+from a group.
+
+.. _modifyusers:
+
+Modifying Users
+===============
+
+Once you have found your user, you can change the following
+fields:
+
+- *Email Address*:
+  This is the user's full email address. Unless you turn off the
+  :param:`allowemailchange` parameter, users can change their
+  email address to any other valid email address they control.
+
+- *Login Name*:
+  If the "use_email_as_login" parameter is switched off, the user also has
+  a separate login name, which is (or can be) different from their email
+  address.
+
+- *Real Name*: The user's real name. Note that
+  Bugzilla does not require this to create an account.
+
+- *Password*:
+  You can change the user's password here. Users can automatically
+  request a new password, so you shouldn't need to do this often.
+  If you want to disable an account, see Disable Text below.
+
+- *Bugmail Disabled*:
+  Check this checkbox to disable bugmail and whinemail completely
+  for this account. Note that this does not prevent the user logging in or
+  taking any other action.
+
+- *Disable Text*:
+  If you type anything in this box, including just a space, the
+  user is prevented from logging in and from making any changes to
+  bugs via the web interface.
+  The HTML you type in this box is presented to the user when
+  they attempt to perform these actions and should explain
+  why the account was disabled.
+  Users with disabled accounts will continue to receive
+  mail from Bugzilla; furthermore, they will not be able
+  to log in themselves to change their own preferences and
+  stop it. If you want an account (disabled or active) to
+  stop receiving mail, simply check the
+  ``Bugmail Disabled`` checkbox above.
+
+  .. note:: Even users whose accounts have been disabled can still
+     submit bugs via the email gateway, if one exists.
+     The email gateway should *not* be
+     enabled for secure installations of Bugzilla.
+
+  .. warning:: Don't disable all the administrator accounts!
+
+- *<groupname>*:
+  Checkboxes will appear here to allow you to add users to, or
+  remove them from, permission groups. The first checkbox gives the
+  user the ability to add and remove other users as members of
+  this group. The second checkbox makes the user himself a member
+  of the group.
+
+  Bugzilla has a number of built-in groups. For the full set of groups and their
+  capabilities, see :ref:`permissions`. This list will also contain any groups
+  you have created.
+
+.. _createnewusers:
+
+Creating New Users
+==================
+
+.. _self-registration:
+
+Self-Registration
+-----------------
+
+By default, users can create their own user accounts by clicking the
+``New Account`` link at the bottom of each page (assuming
+they aren't logged in as someone else already). If you want to disable
+this self-registration, or if you want to restrict who can create their
+own user account, you have to edit the :param:`createemailregexp`
+parameter in the ``Configuration`` page; see
+:ref:`parameters`.
+
+.. _user-account-creation:
+
+Administrator Registration
+--------------------------
+
+Users with ``editusers`` privileges, such as administrators,
+can create user accounts for other users:
+
+#. After logging in, click the "Users" link at the footer of
+   the query page, and then click "Add a new user".
+
+#. Fill out the form presented. This page is self-explanatory.
+   When done, click "Submit".
+
+   .. note:: Adding a user this way will *not*
+      send an email informing them of their username and password.
+      While useful for creating dummy accounts (watchers which
+      shuttle mail to another system, for instance, or email
+      addresses which are a mailing list), in general it is
+      preferable to log out and use the ``New Account``
+      button to create users, as it will pre-populate all the
+      required fields and also notify the user of her account name
+      and password.
+
+.. _user-account-deletion:
+
+Deleting Users
+==============
+
+If the :param:`allowuserdeletion` parameter is turned on (see
+:ref:`parameters`) then you can also delete user accounts.
+Note that, most of the time, this is not the best thing to do. If only
+a warning in a yellow box is displayed, then the deletion is safe.
+If a warning is also displayed in a red box, then you should NOT try
+to delete the user account, else you will get referential integrity
+problems in your database, which can lead to unexpected behavior,
+such as bugs not appearing in bug lists anymore, or data displaying
+incorrectly. You have been warned!
+
+.. _impersonatingusers:
+
+Impersonating Users
+===================
+
+There may be times when an administrator would like to do something as
+another user.  The :command:`sudo` feature may be used to do
+this.
+
+.. note:: To use the sudo feature, you must be in the
+   *bz_sudoers* group.  By default, all
+   administrators are in this group.
+
+If you have access to this feature, you may start a session by
+going to the Edit Users page, Searching for a user and clicking on
+their login.  You should see a link below their login name titled
+"Impersonate this user".  Click on the link.  This will take you
+to a page where you will see a description of the feature and
+instructions for using it.  After reading the text, simply
+enter the login of the user you would like to impersonate, provide
+a short message explaining why you are doing this, and press the
+button.
+
+As long as you are using this feature, everything you do will be done
+as if you were logged in as the user you are impersonating.
+
+.. warning:: The user you are impersonating will not be told about what you are
+   doing.  If you do anything that results in mail being sent, that
+   mail will appear to be from the user you are impersonating.  You
+   should be extremely careful while using this feature.
+
diff --git a/docs/en/rst/administering/whining.rst b/docs/en/rst/administering/whining.rst
new file mode 100644
index 0000000000..dc101ab9b8
--- /dev/null
+++ b/docs/en/rst/administering/whining.rst
@@ -0,0 +1,145 @@
+.. _whining:
+
+Whining
+#######
+
+Whining is a feature in Bugzilla that can regularly annoy users at
+specified times.  Using this feature, users can execute saved searches
+at specific times (e.g. the 15th of the month at midnight) or at
+regular intervals (e.g. every 15 minutes on Sundays).  The results of the
+searches are sent to the user, either as a single email or as one email
+per bug, along with some descriptive text.
+
+.. warning:: Throughout this section it will be assumed that all users are members
+   of the bz_canusewhines group, membership in which is required in order
+   to use the Whining system.  You can easily make all users members of
+   the bz_canusewhines group by setting the User RegExp to ".*" (without
+   the quotes).
+
+   Also worth noting is the bz_canusewhineatothers group.  Members of this
+   group can create whines for any user or group in Bugzilla using an
+   extended form of the whining interface.  Features only available to
+   members of the bz_canusewhineatothers group will be noted in the
+   appropriate places.
+
+.. note:: For whining to work, a special Perl script must be executed at regular
+   intervals.  More information on this is available in :ref:`installation-whining`.
+
+.. note:: This section does not cover the whineatnews.pl script.
+   See :ref:`installation-whining-cron` for more information on
+   The Whining Cron.
+
+.. _whining-overview:
+
+The Event
+=========
+
+The whining system defines an "Event" as one or more queries being
+executed at regular intervals, with the results of said queries (if
+there are any) being emailed to the user.  Events are created by
+clicking on the "Add new event" button.
+
+Once a new event is created, the first thing to set is the "Email
+subject line".  The contents of this field will be used in the subject
+line of every email generated by this event.  In addition to setting a
+subject, space is provided to enter some descriptive text that will be
+included at the top of each message (to help you in understanding why
+you received the email in the first place).
+
+The next step is to specify when the Event is to be run (the Schedule)
+and what searches are to be performed (the Searches).
+
+.. _whining-schedule:
+
+Whining Schedule
+================
+
+Each whining event is associated with zero or more schedules.  A
+schedule is used to specify when the search (specified below) is to be
+run.  A new event starts out with no schedules (which means it will
+never run, as it is not scheduled to run).  To add a schedule, press
+the "Add a new schedule" button.
+
+Each schedule includes an interval, which you use to tell Bugzilla
+when the event should be run.  An event can be run on certain days of
+the week, certain days of the month, during weekdays (defined as
+Monday through Friday), or every day.
+
+.. warning:: Be careful if you set your event to run on the 29th, 30th, or 31st of
+   the month, as your event may not run exactly when expected.  If you
+   want your event to run on the last day of the month, select "Last day
+   of the month" as the interval.
+
+Once you have specified the day(s) on which the event is to be run, you
+should now specify the time at which the event is to be run.  You can
+have the event run at a certain hour on the specified day(s), or
+every hour, half-hour, or quarter-hour on the specified day(s).
+
+If a single schedule does not execute an event as many times as you
+would want, you can create another schedule for the same event.  For
+example, if you want to run an event on days whose numbers are
+divisible by seven, you would need to add four schedules to the event,
+setting the schedules to run on the 7th, 14th, 21st, and 28th (one day
+per schedule) at whatever time (or times) you choose.
+
+.. note:: If you are a member of the bz_canusewhineatothers group, then you
+   will be presented with another option: "Mail to".  Using this you
+   can control who will receive the emails generated by this event.  You
+   can choose to send the emails to a single user (identified by email
+   address) or a single group (identified by group name).  To send to
+   multiple users or groups, create a new schedule for each additional
+   user/group.
+
+.. _whining-query:
+
+Whining Searches
+================
+
+Each whining event is associated with zero or more searches.  A search
+is any saved search to be run as part of the specified schedule (see
+above).  You start out without any searches associated with the event
+(which means that the event will not run, as there will never be any
+results to return).  To add a search, press the "Add a search" button.
+
+The first field to examine in your newly added search is the Sort field.
+Searches are run, and results included, in the order specified by the
+Sort field.  Searches with smaller Sort values will run before searches
+with bigger Sort values.
+
+The next field to examine is the Search field.  This is where you
+choose the actual search that is to be run.  Instead of defining search
+parameters here, you are asked to choose from the list of saved
+searches (the same list that appears at the bottom of every Bugzilla
+page).  You are only allowed to choose from searches that you have
+saved yourself (the default saved search, "My Bugs", is not a valid
+choice).  If you do not have any saved searches, you can take this
+opportunity to create one (see :ref:`list`).
+
+.. note:: When running searches, the whining system acts as if you are the user
+   executing the search.  This means that the whining system will ignore
+   bugs that match your search but that you cannot access.
+
+Once you have chosen the saved search to be executed, give the search a
+descriptive title.  This title will appear in the email, above the
+results of the search.  If you choose "One message per bug", the search
+title will appear at the top of each email that contains a bug matching
+your search.
+
+Finally, decide if the results of the search should be sent in a single
+email, or if each bug should appear in its own email.
+
+.. warning:: Think carefully before checking the "One message per bug" box.  If
+   you create a search that matches thousands of bugs, you will receive
+   thousands of emails!
+
+Saving Your Changes
+===================
+
+Once you have defined at least one schedule and created at least one
+search, go ahead and "Update/Commit".  This will save your Event and make
+it available for immediate execution.
+
+.. note:: If you ever feel like deleting your event, you may do so using the
+   "Remove Event" button in the upper-right corner of each Event.  You
+   can also modify an existing event, so long as you "Update/Commit"
+   after completing your modifications.
diff --git a/docs/en/rst/administering/workflow.rst b/docs/en/rst/administering/workflow.rst
new file mode 100644
index 0000000000..337faac1df
--- /dev/null
+++ b/docs/en/rst/administering/workflow.rst
@@ -0,0 +1,32 @@
+.. _workflow:
+
+Workflow
+########
+
+The bug status workflow—which statuses are valid transitions from which
+other statuses—can be customized.
+
+You need to begin by defining the statuses and resolutions you want to use
+(see :ref:`field-values`). By convention, these are in all capital letters.
+
+Only one bug status, UNCONFIRMED, can never be renamed nor deleted. However,
+it can be disabled entirely on a per-product basis (see :ref:`categorization`).
+The status referred to by the :param:`duplicate_or_move_bug_status` parameter, if
+set, is also undeletable. To make it deletable,
+simply set the value of that parameter to a different status.
+
+Aside from the empty value, one resolution, DUPLICATE, cannot be renamed or deleted.
+
+Once you have defined your statuses, you can configure the workflow of
+how a bug moves between them. The workflow configuration
+page displays all existing bug statuses twice: first on the left for the
+starting status, and on the top for the target status in the transition.
+If the checkbox is checked, then the transition from the left to the top
+status is legal; if it's unchecked, that transition is forbidden.
+
+The status used as the :param:`duplicate_or_move_bug_status` parameter
+(normally RESOLVED or its equivalent) is required to be a legal transition
+from every other bug status, and so this is enforced on the page.
+
+The "View Comments Required on Status Transitions" link below the table
+lets you set which transitions require a comment from the user.
diff --git a/docs/en/rst/administration.rst b/docs/en/rst/administration.rst
deleted file mode 100644
index df7631fdbd..0000000000
--- a/docs/en/rst/administration.rst
+++ /dev/null
@@ -1,2149 +0,0 @@
-
-
-.. _administration:
-
-======================
-Administering Bugzilla
-======================
-
-.. _parameters:
-
-Bugzilla Configuration
-######################
-
-Bugzilla is configured by changing various parameters, accessed
-from the "Parameters" link in the Administration page (the
-Administration page can be found by clicking the "Administration"
-link in the footer). The parameters are divided into several categories,
-accessed via the menu on the left. Following is a description of the
-different categories and important parameters within those categories.
-
-.. _param-requiredsettings:
-
-Required Settings
-=================
-
-The core required parameters for any Bugzilla installation are set
-here. These parameters must be set before a new Bugzilla installation
-can be used. Administrators should review this list before
-deploying a new Bugzilla installation.
-
-maintainer
-    Email address of the person
-    responsible for maintaining this Bugzilla installation.
-    The address need not be that of a valid Bugzilla account.
-
-urlbase
-    Defines the fully qualified domain name and web
-    server path to this Bugzilla installation.
-    For example, if the Bugzilla query page is
-    :file:`http://www.foo.com/bugzilla/query.cgi`,
-    the ``urlbase`` should be set
-    to :file:`http://www.foo.com/bugzilla/`.
-
-docs_urlbase
-    Defines path to the Bugzilla documentation. This can be a fully
-    qualified domain name, or a path relative to "urlbase".
-    For example, if the "Bugzilla Configuration" page
-    of the documentation is
-    :file:`http://www.foo.com/bugzilla/docs/html/parameters.html`,
-    set the ``docs_urlbase``
-    to :file:`http://www.foo.com/bugzilla/docs/html/`.
-
-sslbase
-    Defines the fully qualified domain name and web
-    server path for HTTPS (SSL) connections to this Bugzilla installation.
-    For example, if the Bugzilla main page is
-    :file:`https://www.foo.com/bugzilla/index.cgi`,
-    the ``sslbase`` should be set
-    to :file:`https://www.foo.com/bugzilla/`.
-
-ssl_redirect
-    If enabled, Bugzilla will force HTTPS (SSL) connections, by
-    automatically redirecting any users who try to use a non-SSL
-    connection.
-
-cookiedomain
-    Defines the domain for Bugzilla cookies. This is typically left blank.
-    If there are multiple hostnames that point to the same webserver, which
-    require the same cookie, then this parameter can be utilized. For
-    example, If your website is at
-    :file:`https://www.foo.com/`, setting this to
-    :file:`.foo.com/` will also allow
-    :file:`bar.foo.com/` to access Bugzilla cookies.
-
-cookiepath
-    Defines a path, relative to the web server root, that Bugzilla
-    cookies will be restricted to. For example, if the
-    :command:`urlbase` is set to
-    :file:`http://www.foo.com/bugzilla/`, the
-    :command:`cookiepath` should be set to
-    :file:`/bugzilla/`. Setting it to "/" will allow all sites
-    served by this web server or virtual host to read Bugzilla cookies.
-
-utf8
-    Determines whether to use UTF-8 (Unicode) encoding for all text in
-    Bugzilla. New installations should set this to true to avoid character
-    encoding problems. Existing databases should set this to true only
-    after the data has been converted from existing legacy character
-    encoding to UTF-8, using the
-    :file:`contrib/recode.pl` script.
-
-    .. note:: If you turn this parameter from "off" to "on", you must
-       re-run :file:`checksetup.pl` immediately afterward.
-
-shutdownhtml
-    If there is any text in this field, this Bugzilla installation will
-    be completely disabled and this text will appear instead of all
-    Bugzilla pages for all users, including Admins. Used in the event
-    of site maintenance or outage situations.
-
-    .. note:: Although regular log-in capability is disabled
-       while :command:`shutdownhtml`
-       is enabled, safeguards are in place to protect the unfortunate
-       admin who loses connection to Bugzilla. Should this happen to you,
-       go directly to the :file:`editparams.cgi` (by typing
-       the URL in manually, if necessary). Doing this will prompt you to
-       log in, and your name/password will be accepted here (but nowhere
-       else).
-
-announcehtml
-    Any text in this field will be displayed at the top of every HTML
-    page in this Bugzilla installation. The text is not wrapped in any
-    tags. For best results, wrap the text in a ``<div>``
-    tag. Any style attributes from the CSS can be applied. For example,
-    to make the text green inside of a red box, add ``id=message``
-    to the ``<div>`` tag.
-
-proxy_url
-    If this Bugzilla installation is behind a proxy, enter the proxy
-    information here to enable Bugzilla to access the Internet. Bugzilla
-    requires Internet access to utilize the
-    :command:`upgrade_notification` parameter (below). If the
-    proxy requires authentication, use the syntax:
-    :file:`http://user:pass@proxy_url/`.
-
-upgrade_notification
-    Enable or disable a notification on the homepage of this Bugzilla
-    installation when a newer version of Bugzilla is available. This
-    notification is only visible to administrators. Choose "disabled",
-    to turn off the notification. Otherwise, choose which version of
-    Bugzilla you want to be notified about: "development_snapshot" is the
-    latest release on the trunk; "latest_stable_release" is the most
-    recent release available on the most recent stable branch;
-    "stable_branch_release" the most recent release on the branch
-    this installation is based on.
-
-.. _param-admin-policies:
-
-Administrative Policies
-=======================
-
-This page contains parameters for basic administrative functions.
-Options include whether to allow the deletion of bugs and users,
-and whether to allow users to change their email address.
-
-.. _param-user-authentication:
-
-User Authentication
-===================
-
-This page contains the settings that control how this Bugzilla
-installation will do its authentication. Choose what authentication
-mechanism to use (the Bugzilla database, or an external source such
-as LDAP), and set basic behavioral parameters. For example, choose
-whether to require users to login to browse bugs, the management
-of authentication cookies, and the regular expression used to
-validate email addresses. Some parameters are highlighted below.
-
-emailregexp
-    Defines the regular expression used to validate email addresses
-    used for login names. The default attempts to match fully
-    qualified email addresses (i.e. 'user@example.com') in a slightly
-    more restrictive way than what is allowed in RFC 2822.
-    Some Bugzilla installations allow only local user names (i.e 'user'
-    instead of 'user@example.com'). In that case, this parameter
-    should be used to define the email domain.
-
-emailsuffix
-    This string is appended to login names when actually sending
-    email to a user. For example,
-    If :command:`emailregexp` has been set to allow
-    local usernames,
-    then this parameter would contain the email domain for all users
-    (i.e. '@example.com').
-
-.. _param-attachments:
-
-Attachments
-===========
-
-This page allows for setting restrictions and other parameters
-regarding attachments to bugs. For example, control size limitations
-and whether to allow pointing to external files via a URI.
-
-.. _param-bug-change-policies:
-
-Bug Change Policies
-===================
-
-Set policy on default behavior for bug change events. For example,
-choose which status to set a bug to when it is marked as a duplicate,
-and choose whether to allow bug reporters to set the priority or
-target milestone. Also allows for configuration of what changes
-should require the user to make a comment, described below.
-
-commenton*
-    All these fields allow you to dictate what changes can pass
-    without comment, and which must have a comment from the
-    person who changed them.  Often, administrators will allow
-    users to add themselves to the CC list, accept bugs, or
-    change the Status Whiteboard without adding a comment as to
-    their reasons for the change, yet require that most other
-    changes come with an explanation.
-    Set the "commenton" options according to your site policy. It
-    is a wise idea to require comments when users resolve, reassign, or
-    reopen bugs at the very least.
-
-    .. note:: It is generally far better to require a developer comment
-       when resolving bugs than not. Few things are more annoying to bug
-       database users than having a developer mark a bug "fixed" without
-       any comment as to what the fix was (or even that it was truly
-       fixed!)
-
-noresolveonopenblockers
-    This option will prevent users from resolving bugs as FIXED if
-    they have unresolved dependencies. Only the FIXED resolution
-    is affected. Users will be still able to resolve bugs to
-    resolutions other than FIXED if they have unresolved dependent
-    bugs.
-
-.. _param-bugfields:
-
-Bug Fields
-==========
-
-The parameters in this section determine the default settings of
-several Bugzilla fields for new bugs, and also control whether
-certain fields are used. For example, choose whether to use the
-"target milestone" field or the "status whiteboard" field.
-
-useqacontact
-    This allows you to define an email address for each component,
-    in addition to that of the default assignee, who will be sent
-    carbon copies of incoming bugs.
-
-usestatuswhiteboard
-    This defines whether you wish to have a free-form, overwritable field
-    associated with each bug. The advantage of the Status Whiteboard is
-    that it can be deleted or modified with ease, and provides an
-    easily-searchable field for indexing some bugs that have some trait
-    in common.
-
-.. _param-bugmoving:
-
-Bug Moving
-==========
-
-This page controls whether this Bugzilla installation allows certain
-users to move bugs to an external database. If bug moving is enabled,
-there are a number of parameters that control bug moving behaviors.
-For example, choose which users are allowed to move bugs, the location
-of the external database, and the default product and component that
-bugs moved *from* other bug databases to this
-Bugzilla installation are assigned to.
-
-.. _param-dependency-graphs:
-
-Dependency Graphs
-=================
-
-This page has one parameter that sets the location of a Web Dot
-server, or of the Web Dot binary on the local system, that is used
-to generate dependency graphs. Web Dot is a CGI program that creates
-images from :file:`.dot` graphic description files. If
-no Web Dot server or binary is specified, then dependency graphs will
-be disabled.
-
-.. _param-group-security:
-
-Group Security
-==============
-
-Bugzilla allows for the creation of different groups, with the
-ability to restrict the visibility of bugs in a group to a set of
-specific users. Specific products can also be associated with
-groups, and users restricted to only see products in their groups.
-Several parameters are described in more detail below. Most of the
-configuration of groups and their relationship to products is done
-on the "Groups" and "Product" pages of the "Administration" area.
-The options on this page control global default behavior.
-For more information on Groups and Group Security, see
-:ref:`groups`
-
-makeproductgroups
-    Determines whether or not to automatically create groups
-    when new products are created. If this is on, the groups will be
-    used for querying bugs.
-
-usevisibilitygroups
-    If selected, user visibility will be restricted to members of
-    groups, as selected in the group configuration settings.
-    Each user-defined group can be allowed to see members of selected
-    other groups.
-    For details on configuring groups (including the visibility
-    restrictions) see :ref:`edit-groups`.
-
-querysharegroup
-    The name of the group of users who are allowed to share saved
-    searches with one another. For more information on using
-    saved searches, see :ref:`savedsearches`.
-
-.. _bzldap:
-
-LDAP Authentication
-===================
-
-LDAP authentication is a module for Bugzilla's plugin
-authentication architecture. This page contains all the parameters
-necessary to configure Bugzilla for use with LDAP authentication.
-
-The existing authentication
-scheme for Bugzilla uses email addresses as the primary user ID, and a
-password to authenticate that user. All places within Bugzilla that
-require a user ID (e.g assigning a bug) use the email
-address. The LDAP authentication builds on top of this scheme, rather
-than replacing it. The initial log-in is done with a username and
-password for the LDAP directory. Bugzilla tries to bind to LDAP using
-those credentials and, if successful, tries to map this account to a
-Bugzilla account. If an LDAP mail attribute is defined, the value of this
-attribute is used, otherwise the "emailsuffix" parameter is appended to LDAP
-username to form a full email address. If an account for this address
-already exists in the Bugzilla installation, it will log in to that account.
-If no account for that email address exists, one is created at the time
-of login. (In this case, Bugzilla will attempt to use the "displayName"
-or "cn" attribute to determine the user's full name.) After
-authentication, all other user-related tasks are still handled by email
-address, not LDAP username. For example, bugs are still assigned by
-email address and users are still queried by email address.
-
-.. warning:: Because the Bugzilla account is not created until the first time
-   a user logs in, a user who has not yet logged is unknown to Bugzilla.
-   This means they cannot be used as an assignee or QA contact (default or
-   otherwise), added to any CC list, or any other such operation. One
-   possible workaround is the :file:`bugzilla_ldapsync.rb`
-   script in the :file:`contrib`
-   directory. Another possible solution is fixing
-   `bug
-   201069 <https://bugzilla.mozilla.org/show_bug.cgi?id=201069>`_.
-
-Parameters required to use LDAP Authentication:
-
-user_verify_class
-    If you want to list ``LDAP`` here,
-    make sure to have set up the other parameters listed below.
-    Unless you have other (working) authentication methods listed as
-    well, you may otherwise not be able to log back in to Bugzilla once
-    you log out.
-    If this happens to you, you will need to manually edit
-    :file:`data/params.json` and set user_verify_class to
-    ``DB``.
-
-LDAPserver
-    This parameter should be set to the name (and optionally the
-    port) of your LDAP server. If no port is specified, it assumes
-    the default LDAP port of 389.
-    For example: ``ldap.company.com``
-    or ``ldap.company.com:3268``
-    You can also specify a LDAP URI, so as to use other
-    protocols, such as LDAPS or LDAPI. If port was not specified in
-    the URI, the default is either 389 or 636 for 'LDAP' and 'LDAPS'
-    schemes respectively.
-
-    .. note:: In order to use SSL with LDAP, specify a URI with "ldaps://".
-       This will force the use of SSL over port 636.
-       For example, normal LDAP:
-       ``ldap://ldap.company.com``, LDAP over SSL:
-       ``ldaps://ldap.company.com`` or LDAP over a UNIX
-       domain socket ``ldapi://%2fvar%2flib%2fldap_sock``.
-
-LDAPbinddn \[Optional]
-    Some LDAP servers will not allow an anonymous bind to search
-    the directory. If this is the case with your configuration you
-    should set the LDAPbinddn parameter to the user account Bugzilla
-    should use instead of the anonymous bind.
-    Ex. ``cn=default,cn=user:password``
-
-LDAPBaseDN
-    The LDAPBaseDN parameter should be set to the location in
-    your LDAP tree that you would like to search for email addresses.
-    Your uids should be unique under the DN specified here.
-    Ex. ``ou=People,o=Company``
-
-LDAPuidattribute
-    The LDAPuidattribute parameter should be set to the attribute
-    which contains the unique UID of your users. The value retrieved
-    from this attribute will be used when attempting to bind as the
-    user to confirm their password.
-    Ex. ``uid``
-
-LDAPmailattribute
-    The LDAPmailattribute parameter should be the name of the
-    attribute which contains the email address your users will enter
-    into the Bugzilla login boxes.
-    Ex. ``mail``
-
-.. _bzradius:
-
-RADIUS Authentication
-=====================
-
-RADIUS authentication is a module for Bugzilla's plugin
-authentication architecture. This page contains all the parameters
-necessary for configuring Bugzilla to use RADIUS authentication.
-
-.. note:: Most caveats that apply to LDAP authentication apply to RADIUS
-   authentication as well. See :ref:`bzldap` for details.
-
-Parameters required to use RADIUS Authentication:
-
-user_verify_class
-    If you want to list ``RADIUS`` here,
-    make sure to have set up the other parameters listed below.
-    Unless you have other (working) authentication methods listed as
-    well, you may otherwise not be able to log back in to Bugzilla once
-    you log out.
-    If this happens to you, you will need to manually edit
-    :file:`data/params.json` and set user_verify_class to
-    ``DB``.
-
-RADIUS_server
-    This parameter should be set to the name (and optionally the
-    port) of your RADIUS server.
-
-RADIUS_secret
-    This parameter should be set to the RADIUS server's secret.
-
-RADIUS_email_suffix
-    Bugzilla needs an e-mail address for each user account.
-    Therefore, it needs to determine the e-mail address corresponding
-    to a RADIUS user.
-    Bugzilla offers only a simple way to do this: it can concatenate
-    a suffix to the RADIUS user name to convert it into an e-mail
-    address.
-    You can specify this suffix in the RADIUS_email_suffix parameter.
-    If this simple solution does not work for you, you'll
-    probably need to modify
-    :file:`Bugzilla/Auth/Verify/RADIUS.pm` to match your
-    requirements.
-
-.. _param-email:
-
-Email
-=====
-
-This page contains all of the parameters for configuring how
-Bugzilla deals with the email notifications it sends. See below
-for a summary of important options.
-
-mail_delivery_method
-    This is used to specify how email is sent, or if it is sent at
-    all.  There are several options included for different MTAs,
-    along with two additional options that disable email sending.
-    "Test" does not send mail, but instead saves it in
-    :file:`data/mailer.testfile` for later review.
-    "None" disables email sending entirely.
-
-mailfrom
-    This is the email address that will appear in the "From" field
-    of all emails sent by this Bugzilla installation. Some email
-    servers require mail to be from a valid email address, therefore
-    it is recommended to choose a valid email address here.
-
-smtpserver
-    This is the SMTP server address, if the ``mail_delivery_method``
-    parameter is set to SMTP.  Use "localhost" if you have a local MTA
-    running, otherwise use a remote SMTP server.  Append ":" and the port
-    number, if a non-default port is needed.
-
-smtp_username
-    Username to use for SASL authentication to the SMTP server.  Leave
-    this parameter empty if your server does not require authentication.
-
-smtp_password
-    Password to use for SASL authentication to the SMTP server. This
-    parameter will be ignored if the ``smtp_username``
-    parameter is left empty.
-
-smtp_ssl
-    Enable SSL support for connection to the SMTP server.
-
-smtp_debug
-    This parameter allows you to enable detailed debugging output.
-    Log messages are printed the web server's error log.
-
-whinedays
-    Set this to the number of days you want to let bugs go
-    in the CONFIRMED state before notifying people they have
-    untouched new bugs. If you do not plan to use this feature, simply
-    do not set up the whining cron job described in the installation
-    instructions, or set this value to "0" (never whine).
-
-globalwatcher
-    This allows you to define specific users who will
-    receive notification each time a new bug in entered, or when
-    an existing bug changes, according to the normal groupset
-    permissions. It may be useful for sending notifications to a
-    mailing-list, for instance.
-
-.. _param-patchviewer:
-
-Patch Viewer
-============
-
-This page contains configuration parameters for the CVS server,
-Bonsai server and LXR server that Bugzilla will use to enable the
-features of the Patch Viewer. Bonsai is a tool that enables queries
-to a CVS tree. LXR is a tool that can cross reference and index source
-code.
-
-.. _param-querydefaults:
-
-Query Defaults
-==============
-
-This page controls the default behavior of Bugzilla in regards to
-several aspects of querying bugs. Options include what the default
-query options are, what the "My Bugs" page returns, whether users
-can freely add bugs to the quip list, and how many duplicate bugs are
-needed to add a bug to the "most frequently reported" list.
-
-.. _param-shadowdatabase:
-
-Shadow Database
-===============
-
-This page controls whether a shadow database is used, and all the
-parameters associated with the shadow database. Versions of Bugzilla
-prior to 3.2 used the MyISAM table type, which supports
-only table-level write locking. With MyISAM, any time someone is making a change to
-a bug, the entire table is locked until the write operation is complete.
-Locking for write also blocks reads until the write is complete.
-
-The ``shadowdb`` parameter was designed to get around
-this limitation. While only a single user is allowed to write to
-a table at a time, reads can continue unimpeded on a read-only
-shadow copy of the database.
-
-.. note:: As of version 3.2, Bugzilla no longer uses the MyISAM table type.
-   Instead, InnoDB is used, which can do transaction-based locking.
-   Therefore, the limitations the Shadow Database feature was designed
-   to workaround no longer exist.
-
-.. _admin-usermatching:
-
-User Matching
-=============
-
-The settings on this page control how users are selected and queried
-when adding a user to a bug. For example, users need to be selected
-when choosing who the bug is assigned to, adding to the CC list or
-selecting a QA contact. With the "usemenuforusers" parameter, it is
-possible to configure Bugzilla to
-display a list of users in the fields instead of an empty text field.
-This should only be used in Bugzilla installations with a small number
-of users. If users are selected via a text box, this page also
-contains parameters for how user names can be queried and matched
-when entered.
-
-Another setting called 'ajax_user_autocompletion' enables certain
-user fields to display a list of matched user names as a drop down after typing
-a few characters. Note that it is recommended to use mod_perl when
-enabling 'ajax_user_autocompletion'.
-
-.. _useradmin:
-
-User Administration
-###################
-
-.. _defaultuser:
-
-Creating the Default User
-=========================
-
-When you first run checksetup.pl after installing Bugzilla, it
-will prompt you for the administrative username (email address) and
-password for this "super user". If for some reason you delete
-the "super user" account, re-running checksetup.pl will again prompt
-you for this username and password.
-
-.. note:: If you wish to add more administrative users, add them to
-   the "admin" group and, optionally, edit the tweakparams, editusers,
-   creategroups, editcomponents, and editkeywords groups to add the
-   entire admin group to those groups (which is the case by default).
-
-.. _manageusers:
-
-Managing Other Users
-====================
-
-.. _user-account-search:
-
-Searching for existing users
-----------------------------
-
-If you have ``editusers`` privileges or if you are allowed
-to grant privileges for some groups, the ``Users`` link
-will appear in the Administration page.
-
-The first screen is a search form to search for existing user
-accounts. You can run searches based either on the user ID, real
-name or login name (i.e. the email address, or just the first part
-of the email address if the "emailsuffix" parameter is set).
-The search can be conducted
-in different ways using the listbox to the right of the text entry
-box. You can match by case-insensitive substring (the default),
-regular expression, a *reverse* regular expression
-match (which finds every user name which does NOT match the regular
-expression), or the exact string if you know exactly who you are
-looking for. The search can be restricted to users who are in a
-specific group. By default, the restriction is turned off.
-
-The search returns a list of
-users matching your criteria. User properties can be edited by clicking
-the login name. The Account History of a user can be viewed by clicking
-the "View" link in the Account History column. The Account History
-displays changes that have been made to the user account, the time of
-the change and the user who made the change. For example, the Account
-History page will display details of when a user was added or removed
-from a group.
-
-.. _createnewusers:
-
-Creating new users
-------------------
-
-.. _self-registration:
-
-Self-registration
-~~~~~~~~~~~~~~~~~
-
-By default, users can create their own user accounts by clicking the
-``New Account`` link at the bottom of each page (assuming
-they aren't logged in as someone else already). If you want to disable
-this self-registration, or if you want to restrict who can create his
-own user account, you have to edit the ``createemailregexp``
-parameter in the ``Configuration`` page, see
-:ref:`parameters`.
-
-.. _user-account-creation:
-
-Accounts created by an administrator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Users with ``editusers`` privileges, such as administrators,
-can create user accounts for other users:
-
-#. After logging in, click the "Users" link at the footer of
-   the query page, and then click "Add a new user".
-
-#. Fill out the form presented. This page is self-explanatory.
-   When done, click "Submit".
-
-   .. note:: Adding a user this way will *not*
-      send an email informing them of their username and password.
-      While useful for creating dummy accounts (watchers which
-      shuttle mail to another system, for instance, or email
-      addresses which are a mailing list), in general it is
-      preferable to log out and use the ``New Account``
-      button to create users, as it will pre-populate all the
-      required fields and also notify the user of her account name
-      and password.
-
-.. _modifyusers:
-
-Modifying Users
----------------
-
-Once you have found your user, you can change the following
-fields:
-
-- *Login Name*:
-  This is generally the user's full email address. However, if you
-  have are using the ``emailsuffix`` parameter, this may
-  just be the user's login name. Note that users can now change their
-  login names themselves (to any valid email address).
-
-- *Real Name*: The user's real name. Note that
-  Bugzilla does not require this to create an account.
-
-- *Password*:
-  You can change the user's password here. Users can automatically
-  request a new password, so you shouldn't need to do this often.
-  If you want to disable an account, see Disable Text below.
-
-- *Bugmail Disabled*:
-  Mark this checkbox to disable bugmail and whinemail completely
-  for this account. This checkbox replaces the data/nomail file
-  which existed in older versions of Bugzilla.
-
-- *Disable Text*:
-  If you type anything in this box, including just a space, the
-  user is prevented from logging in, or making any changes to
-  bugs via the web interface.
-  The HTML you type in this box is presented to the user when
-  they attempt to perform these actions, and should explain
-  why the account was disabled.
-  Users with disabled accounts will continue to receive
-  mail from Bugzilla; furthermore, they will not be able
-  to log in themselves to change their own preferences and
-  stop it. If you want an account (disabled or active) to
-  stop receiving mail, simply check the
-  ``Bugmail Disabled`` checkbox above.
-
-  .. note:: Even users whose accounts have been disabled can still
-     submit bugs via the e-mail gateway, if one exists.
-     The e-mail gateway should *not* be
-     enabled for secure installations of Bugzilla.
-
-  .. warning:: Don't disable all the administrator accounts!
-
-- *<groupname>*:
-  If you have created some groups, e.g. "securitysensitive", then
-  checkboxes will appear here to allow you to add users to, or
-  remove them from, these groups. The first checkbox gives the
-  user the ability to add and remove other users as members of
-  this group. The second checkbox adds the user himself as a member
-  of the group.
-
-- *canconfirm*:
-  This field is only used if you have enabled the "unconfirmed"
-  status. If you enable this for a user,
-  that user can then move bugs from "Unconfirmed" to a "Confirmed"
-  status (e.g.: "New" status).
-
-- *creategroups*:
-  This option will allow a user to create and destroy groups in
-  Bugzilla.
-
-- *editbugs*:
-  Unless a user has this bit set, they can only edit those bugs
-  for which they are the assignee or the reporter. Even if this
-  option is unchecked, users can still add comments to bugs.
-
-- *editcomponents*:
-  This flag allows a user to create new products and components,
-  as well as modify and destroy those that have no bugs associated
-  with them. If a product or component has bugs associated with it,
-  those bugs must be moved to a different product or component
-  before Bugzilla will allow them to be destroyed.
-
-- *editkeywords*:
-  If you use Bugzilla's keyword functionality, enabling this
-  feature allows a user to create and destroy keywords. As always,
-  the keywords for existing bugs containing the keyword the user
-  wishes to destroy must be changed before Bugzilla will allow it
-  to die.
-
-- *editusers*:
-  This flag allows a user to do what you're doing right now: edit
-  other users. This will allow those with the right to do so to
-  remove administrator privileges from other users or grant them to
-  themselves. Enable with care.
-
-- *tweakparams*:
-  This flag allows a user to change Bugzilla's Params
-  (using :file:`editparams.cgi`.)
-
-- *<productname>*:
-  This allows an administrator to specify the products
-  in which a user can see bugs. If you turn on the
-  ``makeproductgroups`` parameter in
-  the Group Security Panel in the Parameters page,
-  then Bugzilla creates one group per product (at the time you create
-  the product), and this group has exactly the same name as the
-  product itself. Note that for products that already exist when
-  the parameter is turned on, the corresponding group will not be
-  created. The user must still have the ``editbugs``
-  privilege to edit bugs in these products.
-
-.. _user-account-deletion:
-
-Deleting Users
---------------
-
-If the ``allowuserdeletion`` parameter is turned on, see
-:ref:`parameters`, then you can also delete user accounts.
-Note that this is most of the time not the best thing to do. If only
-a warning in a yellow box is displayed, then the deletion is safe.
-If a warning is also displayed in a red box, then you should NOT try
-to delete the user account, else you will get referential integrity
-problems in your database, which can lead to unexpected behavior,
-such as bugs not appearing in bug lists anymore, or data displaying
-incorrectly. You have been warned!
-
-.. _impersonatingusers:
-
-Impersonating Users
--------------------
-
-There may be times when an administrator would like to do something as
-another user.  The :command:`sudo` feature may be used to do
-this.
-
-.. note:: To use the sudo feature, you must be in the
-   *bz_sudoers* group.  By default, all
-   administrators are in this group.
-
-If you have access to this feature, you may start a session by
-going to the Edit Users page, Searching for a user and clicking on
-their login.  You should see a link below their login name titled
-"Impersonate this user".  Click on the link.  This will take you
-to a page where you will see a description of the feature and
-instructions for using it.  After reading the text, simply
-enter the login of the user you would like to impersonate, provide
-a short message explaining why you are doing this, and press the
-button.
-
-As long as you are using this feature, everything you do will be done
-as if you were logged in as the user you are impersonating.
-
-.. warning:: The user you are impersonating will not be told about what you are
-   doing.  If you do anything that results in mail being sent, that
-   mail will appear to be from the user you are impersonating.  You
-   should be extremely careful while using this feature.
-
-.. _classifications:
-
-Classifications
-###############
-
-Classifications tend to be used in order to group several related
-products into one distinct entity.
-
-The classifications layer is disabled by default; it can be turned
-on or off using the useclassification parameter,
-in the *Bug Fields* section of the edit parameters screen.
-
-Access to the administration of classifications is controlled using
-the *editclassifications* system group, which defines
-a privilege for creating, destroying, and editing classifications.
-
-When activated, classifications will introduce an additional
-step when filling bugs (dedicated to classification selection), and they
-will also appear in the advanced search form.
-
-.. _products:
-
-Products
-########
-
-Products typically represent real-world
-shipping products. Products can be given
-:ref:`classifications`.
-For example, if a company makes computer games,
-they could have a classification of "Games", and a separate
-product for each game. This company might also have a
-``Common`` product for units of technology used
-in multiple games, and perhaps a few special products that
-represent items that are not actually shipping products
-(for example, "Website", or "Administration").
-
-Many of Bugzilla's settings are configurable on a per-product
-basis. The number of ``votes`` available to
-users is set per-product, as is the number of votes
-required to move a bug automatically from the UNCONFIRMED
-status to the CONFIRMED status.
-
-When creating or editing products the following options are
-available:
-
-Product
-    The name of the product
-
-Description
-    A brief description of the product
-
-Default milestone
-    Select the default milestone for this product.
-
-Closed for bug entry
-    Select this box to prevent new bugs from being
-    entered against this product.
-
-Maximum votes per person
-    Maximum votes a user is allowed to give for this
-    product
-
-Maximum votes a person can put on a single bug
-    Maximum votes a user is allowed to give for this
-    product in a single bug
-
-Confirmation threshold
-    Number of votes needed to automatically remove any
-    bug against this product from the UNCONFIRMED state
-
-Version
-    Specify which version of the product bugs will be
-    entered against.
-
-Create chart datasets for this product
-    Select to make chart datasets available for this product.
-
-When editing a product there is also a link to edit Group Access Controls,
-see :ref:`product-group-controls`.
-
-.. _create-product:
-
-Creating New Products
-=====================
-
-To create a new product:
-
-#. Select ``Administration`` from the footer and then
-   choose ``Products`` from the main administration page.
-
-#. Select the ``Add`` link in the bottom right.
-
-#. Enter the name of the product and a description. The
-   Description field may contain HTML.
-
-#. When the product is created, Bugzilla will give a message
-   stating that a component must be created before any bugs can
-   be entered against the new product. Follow the link to create
-   a new component. See :ref:`components` for more
-   information.
-
-.. _edit-products:
-
-Editing Products
-================
-
-To edit an existing product, click the "Products" link from the
-"Administration" page. If the 'useclassification' parameter is
-turned on, a table of existing classifications is displayed,
-including an "Unclassified" category. The table indicates how many products
-are in each classification. Click on the classification name to see its
-products. If the 'useclassification' parameter is not in use, the table
-lists all products directly. The product table summarizes the information
-about the product defined
-when the product was created. Click on the product name to edit these
-properties, and to access links to other product attributes such as the
-product's components, versions, milestones, and group access controls.
-
-.. _comps-vers-miles-products:
-
-Adding or Editing Components, Versions and Target Milestones
-============================================================
-
-To edit existing, or add new, Components, Versions or Target Milestones
-to a Product, select the "Edit Components", "Edit Versions" or "Edit
-Milestones" links from the "Edit Product" page. A table of existing
-Components, Versions or Milestones is displayed. Click on a item name
-to edit the properties of that item. Below the table is a link to add
-a new Component, Version or Milestone.
-
-For more information on components, see :ref:`components`.
-
-For more information on versions, see :ref:`versions`.
-
-For more information on milestones, see :ref:`milestones`.
-
-.. _product-group-controls:
-
-Assigning Group Controls to Products
-====================================
-
-On the ``Edit Product`` page, there is a link called
-``Edit Group Access Controls``. The settings on this page
-control the relationship of the groups to the product being edited.
-
-Group Access Controls are an important aspect of using groups for
-isolating products and restricting access to bugs filed against those
-products. For more information on groups, including how to create, edit
-add users to, and alter permission of, see :ref:`groups`.
-
-After selecting the "Edit Group Access Controls" link from the "Edit
-Product" page, a table containing all user-defined groups for this
-Bugzilla installation is displayed. The system groups that are created
-when Bugzilla is installed are not applicable to Group Access Controls.
-Below is description of what each of these fields means.
-
-Groups may be applicable (e.g bugs in this product can be associated
-with this group) , default (e.g. bugs in this product are in this group
-by default), and mandatory (e.g. bugs in this product must be associated
-with this group) for each product. Groups can also control access
-to bugs for a given product, or be used to make bugs for a product
-totally read-only unless the group restrictions are met. The best way to
-understand these relationships is by example. See
-:ref:`group-control-examples` for examples of
-product and group relationships.
-
-.. note:: Products and Groups are not limited to a one-to-one relationship.
-   Multiple groups can be associated with the same product, and groups
-   can be associated with more than one product.
-
-If any group has *Entry* selected, then the
-product will restrict bug entry to only those users
-who are members of *all* the groups with
-*Entry* selected.
-
-If any group has *Canedit* selected,
-then the product will be read-only for any users
-who are not members of *all* of the groups with
-*Canedit* selected. *Only* users who
-are members of all the *Canedit* groups
-will be able to edit bugs for this product. This is an additional
-restriction that enables finer-grained control over products rather
-than just all-or-nothing access levels.
-
-The following settings let you
-choose privileges on a *per-product basis*.
-This is a convenient way to give privileges to
-some users for some products only, without having
-to give them global privileges which would affect
-all products.
-
-Any group having *editcomponents*
-selected  allows users who are in this group to edit all
-aspects of this product, including components, milestones
-and versions.
-
-Any group having *canconfirm* selected
-allows users who are in this group to confirm bugs
-in this product.
-
-Any group having *editbugs* selected allows
-users who are in this group to edit all fields of
-bugs in this product.
-
-The *MemberControl* and
-*OtherControl* are used in tandem to determine which
-bugs will be placed in this group. The only allowable combinations of
-these two parameters are listed in a table on the "Edit Group Access Controls"
-page. Consult this table for details on how these fields can be used.
-Examples of different uses are described below.
-
-.. _group-control-examples:
-
-Common Applications of Group Controls
-=====================================
-
-The use of groups is best explained by providing examples that illustrate
-configurations for common use cases. The examples follow a common syntax:
-*Group: Entry, MemberControl, OtherControl, CanEdit,
-EditComponents, CanConfirm, EditBugs*. Where "Group" is the name
-of the group being edited for this product. The other fields all
-correspond to the table on the "Edit Group Access Controls" page. If any
-of these options are not listed, it means they are not checked.
-
-Basic Product/Group Restriction
--------------------------------
-
-Suppose there is a product called "Bar". The
-"Bar" product can only have bugs entered against it by users in the
-group "Foo". Additionally, bugs filed against product "Bar" must stay
-restricted to users to "Foo" at all times. Furthermore, only members
-of group "Foo" can edit bugs filed against product "Bar", even if other
-users could see the bug. This arrangement would achieved by the
-following:
-
-::
-
-    Product Bar:
-    foo: ENTRY, MANDATORY/MANDATORY, CANEDIT
-
-Perhaps such strict restrictions are not needed for product "Bar". A
-more lenient way to configure product "Bar" and group "Foo" would be:
-
-::
-
-    Product Bar:
-    foo: ENTRY, SHOWN/SHOWN, EDITCOMPONENTS, CANCONFIRM, EDITBUGS
-
-The above indicates that for product "Bar", members of group "Foo" can
-enter bugs. Any one with permission to edit a bug against product "Bar"
-can put the bug
-in group "Foo", even if they themselves are not in "Foo". Anyone in group
-"Foo" can edit all aspects of the components of product "Bar", can confirm
-bugs against product "Bar", and can edit all fields of any bug against
-product "Bar".
-
-General User Access With Security Group
----------------------------------------
-
-To permit any user to file bugs against "Product A",
-and to permit any user to submit those bugs into a
-group called "Security":
-
-::
-
-    Product A:
-    security: SHOWN/SHOWN
-
-General User Access With A Security Product
--------------------------------------------
-
-To permit any user to file bugs against product called "Security"
-while keeping those bugs from becoming visible to anyone
-outside the group "SecurityWorkers" (unless a member of the
-"SecurityWorkers" group removes that restriction):
-
-::
-
-    Product Security:
-    securityworkers: DEFAULT/MANDATORY
-
-Product Isolation With a Common Group
--------------------------------------
-
-To permit users of "Product A" to access the bugs for
-"Product A", users of "Product B" to access the bugs for
-"Product B", and support staff, who are members of the "Support
-Group" to access both, three groups are needed:
-
-#. Support Group: Contains members of the support staff.
-
-#. AccessA Group: Contains users of product A and the Support group.
-
-#. AccessB Group: Contains users of product B and the Support group.
-
-Once these three groups are defined, the product group controls
-can be set to:
-
-::
-
-    Product A:
-    AccessA: ENTRY, MANDATORY/MANDATORY
-    Product B:
-    AccessB: ENTRY, MANDATORY/MANDATORY
-
-Perhaps the "Support Group" wants more control. For example,
-the "Support Group"  could be permitted to make bugs inaccessible to
-users of both groups "AccessA" and "AccessB".
-Then, the "Support Group" could be permitted to publish
-bugs relevant to all users in a third product (let's call it
-"Product Common") that is read-only
-to anyone outside the "Support Group". In this way the "Support Group"
-could control bugs that should be seen by both groups.
-That configuration would be:
-
-::
-
-    Product A:
-    AccessA: ENTRY, MANDATORY/MANDATORY
-    Support: SHOWN/NA
-    Product B:
-    AccessB: ENTRY, MANDATORY/MANDATORY
-    Support: SHOWN/NA
-    Product Common:
-    Support: ENTRY, DEFAULT/MANDATORY, CANEDIT
-
-Make a Product Read Only
-------------------------
-
-Sometimes a product is retired and should no longer have
-new bugs filed against it (for example, an older version of a software
-product that is no longer supported). A product can be made read-only
-by creating a group called "readonly" and adding products to the
-group as needed:
-
-::
-
-    Product A:
-    ReadOnly: ENTRY, NA/NA, CANEDIT
-
-.. note:: For more information on Groups outside of how they relate to products
-   see :ref:`groups`.
-
-.. _components:
-
-Components
-##########
-
-Components are subsections of a Product. E.g. the computer game
-you are designing may have a "UI"
-component, an "API" component, a "Sound System" component, and a
-"Plugins" component, each overseen by a different programmer. It
-often makes sense to divide Components in Bugzilla according to the
-natural divisions of responsibility within your Product or
-company.
-
-Each component has a default assignee and (if you turned it on in the parameters),
-a QA Contact. The default assignee should be the primary person who fixes bugs in
-that component. The QA Contact should be the person who will ensure
-these bugs are completely fixed. The Assignee, QA Contact, and Reporter
-will get email when new bugs are created in this Component and when
-these bugs change. Default Assignee and Default QA Contact fields only
-dictate the
-*default assignments*;
-these can be changed on bug submission, or at any later point in
-a bug's life.
-
-To create a new Component:
-
-#. Select the ``Edit components`` link
-   from the ``Edit product`` page
-
-#. Select the ``Add`` link in the bottom right.
-
-#. Fill out the ``Component`` field, a
-   short ``Description``, the
-   ``Default Assignee``, ``Default CC List``
-   and ``Default QA Contact`` (if enabled).
-   The ``Component Description`` field may contain a
-   limited subset of HTML tags. The ``Default Assignee``
-   field must be a login name already existing in the Bugzilla database.
-
-.. _versions:
-
-Versions
-########
-
-Versions are the revisions of the product, such as "Flinders
-3.1", "Flinders 95", and "Flinders 2000". Version is not a multi-select
-field; the usual practice is to select the earliest version known to have
-the bug.
-
-To create and edit Versions:
-
-#. From the "Edit product" screen, select "Edit Versions"
-
-#. You will notice that the product already has the default
-   version "undefined". Click the "Add" link in the bottom right.
-
-#. Enter the name of the Version. This field takes text only.
-   Then click the "Add" button.
-
-.. _milestones:
-
-Milestones
-##########
-
-Milestones are "targets" that you plan to get a bug fixed by. For
-example, you have a bug that you plan to fix for your 3.0 release, it
-would be assigned the milestone of 3.0.
-
-.. note:: Milestone options will only appear for a Product if you turned
-   on the "usetargetmilestone" parameter in the "Bug Fields" tab of the
-   "Parameters" page.
-
-To create new Milestones, and set Default Milestones:
-
-#. Select "Edit milestones" from the "Edit product" page.
-
-#. Select "Add" in the bottom right corner.
-
-#. Enter the name of the Milestone in the "Milestone" field. You
-   can optionally set the "sortkey", which is a positive or negative
-   number (-32768 to 32767) that defines where in the list this particular
-   milestone appears. This is because milestones often do not
-   occur in alphanumeric order For example, "Future" might be
-   after "Release 1.2". Select "Add".
-
-.. _flags-overview:
-
-Flags
-#####
-
-Flags are a way to attach a specific status to a bug or attachment,
-either ``+`` or ``-``. The meaning of these symbols depends on the text
-the flag itself, but contextually they could mean pass/fail,
-accept/reject, approved/denied, or even a simple yes/no. If your site
-allows requestable flags, then users may set a flag to ``?`` as a
-request to another user that they look at the bug/attachment, and set
-the flag to its correct status.
-
-.. _flags-simpleexample:
-
-A Simple Example
-================
-
-A developer might want to ask their manager,
-``Should we fix this bug before we release version 2.0?``
-They might want to do this for a *lot* of bugs,
-so it would be nice to streamline the process...
-
-In Bugzilla, it would work this way:
-
-#. The Bugzilla administrator creates a flag type called
-   ``blocking2.0`` that shows up on all bugs in
-   your product.
-   It shows up on the ``Show Bug`` screen
-   as the text ``blocking2.0`` with a drop-down box next
-   to it. The drop-down box contains four values: an empty space,
-   ``?``, ``-``, and ``+``.
-
-#. The developer sets the flag to ``?``.
-
-#. The manager sees the ``blocking2.0``
-   flag with a ``?`` value.
-
-#. If the manager thinks the feature should go into the product
-   before version 2.0 can be released, he sets the flag to
-   ``+``. Otherwise, he sets it to ``-``.
-
-#. Now, every Bugzilla user who looks at the bug knows whether or
-   not the bug needs to be fixed before release of version 2.0.
-
-.. _flags-about:
-
-About Flags
-===========
-
-.. _flag-values:
-
-Values
-------
-
-Flags can have three values:
-
-``?``
-    A user is requesting that a status be set. (Think of it as 'A question is being asked'.)
-
-``-``
-    The status has been set negatively. (The question has been answered ``no``.)
-
-``+``
-    The status has been set positively.
-    (The question has been answered ``yes``.)
-
-Actually, there's a fourth value a flag can have --
-``unset`` -- which shows up as a blank space. This
-just means that nobody has expressed an opinion (or asked
-someone else to express an opinion) about this bug or attachment.
-
-.. _flag-askto:
-
-Using flag requests
-===================
-
-If a flag has been defined as 'requestable', and a user has enough privileges
-to request it (see below), the user can set the flag's status to ``?``.
-This status indicates that someone (a.k.a. ``the requester``) is asking
-someone else to set the flag to either ``+`` or ``-``.
-
-If a flag has been defined as 'specifically requestable',
-a text box will appear next to the flag into which the requester may
-enter a Bugzilla username. That named person (a.k.a. ``the requestee``)
-will receive an email notifying them of the request, and pointing them
-to the bug/attachment in question.
-
-If a flag has *not* been defined as 'specifically requestable',
-then no such text-box will appear. A request to set this flag cannot be made of
-any specific individual, but must be asked ``to the wind``.
-A requester may ``ask the wind`` on any flag simply by leaving the text-box blank.
-
-.. _flag-types:
-
-Two Types of Flags
-==================
-
-Flags can go in two places: on an attachment, or on a bug.
-
-.. _flag-type-attachment:
-
-Attachment Flags
-----------------
-
-Attachment flags are used to ask a question about a specific
-attachment on a bug.
-
-Many Bugzilla installations use this to
-request that one developer ``review`` another
-developer's code before they check it in. They attach the code to
-a bug report, and then set a flag on that attachment called
-``review`` to
-``review?boss@domain.com``.
-boss@domain.com is then notified by email that
-he has to check out that attachment and approve it or deny it.
-
-For a Bugzilla user, attachment flags show up in three places:
-
-#. On the list of attachments in the ``Show Bug``
-   screen, you can see the current state of any flags that
-   have been set to ?, +, or -. You can see who asked about
-   the flag (the requester), and who is being asked (the
-   requestee).
-
-#. When you ``Edit`` an attachment, you can
-   see any settable flag, along with any flags that have
-   already been set. This ``Edit Attachment``
-   screen is where you set flags to ?, -, +, or unset them.
-
-#. Requests are listed in the ``Request Queue``, which
-   is accessible from the ``My Requests`` link (if you are
-   logged in) or ``Requests`` link (if you are logged out)
-   visible in the footer of all pages.
-
-.. _flag-type-bug:
-
-Bug Flags
----------
-
-Bug flags are used to set a status on the bug itself. You can
-see Bug Flags in the ``Show Bug`` and ``Requests``
-screens, as described above.
-
-Only users with enough privileges (see below) may set flags on bugs.
-This doesn't necessarily include the assignee, reporter, or users with the
-``editbugs`` permission.
-
-.. _flags-admin:
-
-Administering Flags
-===================
-
-If you have the ``editcomponents`` permission, you can
-edit Flag Types from the main administration page. Clicking the
-``Flags`` link will bring you to the ``Administer
-Flag Types`` page. Here, you can select whether you want
-to create (or edit) a Bug flag, or an Attachment flag.
-
-No matter which you choose, the interface is the same, so we'll
-just go over it once.
-
-.. _flags-edit:
-
-Editing a Flag
---------------
-
-To edit a flag's properties, just click the flag's name.
-That will take you to the same
-form as described below (:ref:`flags-create`).
-
-.. _flags-create:
-
-Creating a Flag
----------------
-
-When you click on the ``Create a Flag Type for...``
-link, you will be presented with a form. Here is what the fields in
-the form mean:
-
-.. _flags-create-field-name:
-
-Name
-~~~~
-
-This is the name of the flag. This will be displayed
-to Bugzilla users who are looking at or setting the flag.
-The name may contain any valid Unicode characters except commas
-and spaces.
-
-.. _flags-create-field-description:
-
-Description
-~~~~~~~~~~~
-
-The description describes the flag in more detail. It is visible
-in a tooltip when hovering over a flag either in the ``Show Bug``
-or ``Edit Attachment`` pages. This field can be as
-long as you like, and can contain any character you want.
-
-.. _flags-create-field-category:
-
-Category
-~~~~~~~~
-
-Default behaviour for a newly-created flag is to appear on
-products and all components, which is why ``__Any__:__Any__``
-is already entered in the ``Inclusions`` box.
-If this is not your desired behaviour, you must either set some
-exclusions (for products on which you don't want the flag to appear),
-or you must remove ``__Any__:__Any__`` from the Inclusions box
-and define products/components specifically for this flag.
-
-To create an Inclusion, select a Product from the top drop-down box.
-You may also select a specific component from the bottom drop-down box.
-(Setting ``__Any__`` for Product translates to,
-``all the products in this Bugzilla``.
-Selecting  ``__Any__`` in the Component field means
-``all components in the selected product.``)
-Selections made, press ``Include``, and your
-Product/Component pairing will show up in the ``Inclusions`` box on the right.
-
-To create an Exclusion, the process is the same; select a Product from the
-top drop-down box, select a specific component if you want one, and press
-``Exclude``. The Product/Component pairing will show up in the
-``Exclusions`` box on the right.
-
-This flag *will* and *can* be set for any
-products/components that appearing in the ``Inclusions`` box
-(or which fall under the appropriate ``__Any__``).
-This flag *will not* appear (and therefore cannot be set) on
-any products appearing in the ``Exclusions`` box.
-*IMPORTANT: Exclusions override inclusions.*
-
-You may select a Product without selecting a specific Component,
-but you can't select a Component without a Product, or to select a
-Component that does not belong to the named Product. If you do so,
-Bugzilla will display an error message, even if all your products
-have a component by that name.
-
-*Example:* Let's say you have a product called
-``Jet Plane`` that has thousands of components. You want
-to be able to ask if a problem should be fixed in the next model of
-plane you release. We'll call the flag ``fixInNext``.
-But, there's one component in ``Jet Plane,``
-called ``Pilot.`` It doesn't make sense to release a
-new pilot, so you don't want to have the flag show up in that component.
-So, you include ``Jet Plane:__Any__`` and you exclude
-``Jet Plane:Pilot``.
-
-.. _flags-create-field-sortkey:
-
-Sort Key
-~~~~~~~~
-
-Flags normally show up in alphabetical order. If you want them to
-show up in a different order, you can use this key set the order on each flag.
-Flags with a lower sort key will appear before flags with a higher
-sort key. Flags that have the same sort key will be sorted alphabetically,
-but they will still be after flags with a lower sort key, and before flags
-with a higher sort key.
-
-*Example:* I have AFlag (Sort Key 100), BFlag (Sort Key 10),
-CFlag (Sort Key 10), and DFlag (Sort Key 1). These show up in
-the order: DFlag, BFlag, CFlag, AFlag.
-
-.. _flags-create-field-active:
-
-Active
-~~~~~~
-
-Sometimes, you might want to keep old flag information in the
-Bugzilla database, but stop users from setting any new flags of this type.
-To do this, uncheck ``active``. Deactivated
-flags will still show up in the UI if they are ?, +, or -, but they
-may only be cleared (unset), and cannot be changed to a new value.
-Once a deactivated flag is cleared, it will completely disappear from a
-bug/attachment, and cannot be set again.
-
-.. _flags-create-field-requestable:
-
-Requestable
-~~~~~~~~~~~
-
-New flags are, by default, ``requestable``, meaning that they
-offer users the ``?`` option, as well as ``+``
-and ``-``.
-To remove the ? option, uncheck ``requestable``.
-
-.. _flags-create-field-specific:
-
-Specifically Requestable
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default this box is checked for new flags, meaning that users may make
-flag requests of specific individuals. Unchecking this box will remove the
-text box next to a flag; if it is still requestable, then requests may
-only be made ``to the wind.`` Removing this after specific
-requests have been made will not remove those requests; that data will
-stay in the database (though it will no longer appear to the user).
-
-.. _flags-create-field-multiplicable:
-
-Multiplicable
-~~~~~~~~~~~~~
-
-Any flag with ``Multiplicable`` set (default for new flags is 'on')
-may be set more than once. After being set once, an unset flag
-of the same type will appear below it with ``addl.`` (short for
-``additional``) before the name. There is no limit to the number of
-times a Multiplicable flags may be set on the same bug/attachment.
-
-.. _flags-create-field-cclist:
-
-CC List
-~~~~~~~
-
-If you want certain users to be notified every time this flag is
-set to ?, -, +, or unset, add them here. This is a comma-separated
-list of email addresses that need not be restricted to Bugzilla usernames.
-
-.. _flags-create-grant-group:
-
-Grant Group
-~~~~~~~~~~~
-
-When this field is set to some given group, only users in the group
-can set the flag to ``+`` and ``-``. This
-field does not affect who can request or cancel the flag. For that,
-see the ``Request Group`` field below. If this field
-is left blank, all users can set or delete this flag. This field is
-useful for restricting which users can approve or reject requests.
-
-.. _flags-create-request-group:
-
-Request Group
-~~~~~~~~~~~~~
-
-When this field is set to some given group, only users in the group
-can request or cancel this flag. Note that this field has no effect
-if the ``grant group`` field is empty. You can set the
-value of this field to a different group, but both fields have to be
-set to a group for this field to have an effect.
-
-.. COMMENT: flags-create
-
-.. _flags-delete:
-
-Deleting a Flag
----------------
-
-When you are at the ``Administer Flag Types`` screen,
-you will be presented with a list of Bug flags and a list of Attachment
-Flags.
-
-To delete a flag, click on the ``Delete`` link next to
-the flag description.
-
-.. warning:: Once you delete a flag, it is *gone* from
-   your Bugzilla. All the data for that flag will be deleted.
-   Everywhere that flag was set, it will disappear,
-   and you cannot get that data back. If you want to keep flag data,
-   but don't want anybody to set any new flags or change current flags,
-   unset ``active`` in the flag Edit form.
-
-.. COMMENT: flags-admin
-
-.. COMMENT: XXX We should add a "Uses of Flags" section, here, with examples.
-
-.. COMMENT: flags
-
-.. _keywords:
-
-Keywords
-########
-
-The administrator can define keywords which can be used to tag and
-categorise bugs. For example, the keyword "regression" is commonly used.
-A company might have a policy stating all regressions
-must be fixed by the next release - this keyword can make tracking those
-bugs much easier.
-
-Keywords are global, rather than per-product. If the administrator changes
-a keyword currently applied to any bugs, the keyword cache must be rebuilt
-using the :ref:`sanitycheck` script. Currently keywords cannot
-be marked obsolete to prevent future usage.
-
-Keywords can be created, edited or deleted by clicking the "Keywords"
-link in the admin page. There are two fields for each keyword - the keyword
-itself and a brief description. Once created, keywords can be selected
-and applied to individual bugs in that bug's "Details" section.
-
-.. _custom-fields:
-
-Custom Fields
-#############
-
-The release of Bugzilla 3.0 added the ability to create Custom Fields.
-Custom Fields are treated like any other field - they can be set in bugs
-and used for search queries. Administrators should keep in mind that
-adding too many fields can make the user interface more complicated and
-harder to use. Custom Fields should be added only when necessary and with
-careful consideration.
-
-.. note:: Before adding a Custom Field, make sure that Bugzilla cannot already
-   do the desired behavior. Many Bugzilla options are not enabled by
-   default, and many times Administrators find that simply enabling
-   certain options that already exist is sufficient.
-
-Administrators can manage Custom Fields using the
-``Custom Fields`` link on the Administration page. The Custom
-Fields administration page displays a list of Custom Fields, if any exist,
-and a link to "Add a new custom field".
-
-.. _add-custom-fields:
-
-Adding Custom Fields
-====================
-
-To add a new Custom Field, click the "Add a new custom field" link. This
-page displays several options for the new field, described below.
-
-The following attributes must be set for each new custom field:
-
-- *Name:*
-  The name of the field in the database, used internally. This name
-  MUST begin with ``cf_`` to prevent confusion with
-  standard fields. If this string is omitted, it will
-  be automatically added to the name entered.
-
-- *Description:*
-  A brief string which is used as the label for this Custom Field.
-  That is the string that users will see, and should be
-  short and explicit.
-
-- *Type:*
-  The type of field to create. There are
-  several types available:
-
-  Bug ID:
-      A field where you can enter the ID of another bug from
-      the same Bugzilla installation. To point to a bug in a remote
-      installation, use the See Also field instead.
-  Large Text Box:
-      A multiple line box for entering free text.
-  Free Text:
-      A single line box for entering free text.
-  Multiple-Selection Box:
-      A list box where multiple options
-      can be selected. After creating this field, it must be edited
-      to add the selection options. See
-      :ref:`edit-values-list` for information about
-      editing legal values.
-  Drop Down:
-      A list box where only one option can be selected.
-      After creating this field, it must be edited to add the
-      selection options. See
-      :ref:`edit-values-list` for information about
-      editing legal values.
-  Date/Time:
-      A date field. This field appears with a
-      calendar widget for choosing the date.
-
-- *Sortkey:*
-  Integer that determines in which order Custom Fields are
-  displayed in the User Interface, especially when viewing a bug.
-  Fields with lower values are displayed first.
-
-- *Reverse Relationship Description:*
-  When the custom field is of type ``Bug ID``, you can
-  enter text here which will be used as label in the referenced
-  bug to list bugs which point to it. This gives you the ability
-  to have a mutual relationship between two bugs.
-
-- *Can be set on bug creation:*
-  Boolean that determines whether this field can be set on
-  bug creation. If not selected, then a bug must be created
-  before this field can be set. See :ref:`bugreports`
-  for information about filing bugs.
-
-- *Displayed in bugmail for new bugs:*
-  Boolean that determines whether the value set on this field
-  should appear in bugmail when the bug is filed. This attribute
-  has no effect if the field cannot be set on bug creation.
-
-- *Is obsolete:*
-  Boolean that determines whether this field should
-  be displayed at all. Obsolete Custom Fields are hidden.
-
-- *Is mandatory:*
-  Boolean that determines whether this field must be set.
-  For single and multi-select fields, this means that a (non-default)
-  value must be selected, and for text and date fields, some text
-  must be entered.
-
-- *Field only appears when:*
-  A custom field can be made visible when some criteria is met.
-  For instance, when the bug belongs to one or more products,
-  or when the bug is of some given severity. If left empty, then
-  the custom field will always be visible, in all bugs.
-
-- *Field that controls the values that appear in this field:*
-  When the custom field is of type ``Drop Down`` or
-  ``Multiple-Selection Box``, you can restrict the
-  availability of the values of the custom field based on the
-  value of another field. This criteria is independent of the
-  criteria used in the ``Field only appears when``
-  setting. For instance, you may decide that some given value
-  ``valueY`` is only available when the bug status
-  is RESOLVED while the value ``valueX`` should
-  always be listed.
-  Once you have selected the field which should control the
-  availability of the values of this custom field, you can
-  edit values of this custom field to set the criteria, see
-  :ref:`edit-values-list`.
-
-.. _edit-custom-fields:
-
-Editing Custom Fields
-=====================
-
-As soon as a Custom Field is created, its name and type cannot be
-changed. If this field is a drop down menu, its legal values can
-be set as described in :ref:`edit-values-list`. All
-other attributes can be edited as described above.
-
-.. _delete-custom-fields:
-
-Deleting Custom Fields
-======================
-
-Only custom fields which are marked as obsolete, and which never
-have been used, can be deleted completely (else the integrity
-of the bug history would be compromised). For custom fields marked
-as obsolete, a "Delete" link will appear in the ``Action``
-column. If the custom field has been used in the past, the deletion
-will be rejected. But marking the field as obsolete is sufficient
-to hide it from the user interface entirely.
-
-.. _edit-values:
-
-Legal Values
-############
-
-Legal values for the operating system, platform, bug priority and
-severity, custom fields of type ``Drop Down`` and
-``Multiple-Selection Box`` (see :ref:`custom-fields`),
-as well as the list of valid bug statuses and resolutions can be
-customized from the same interface. You can add, edit, disable and
-remove values which can be used with these fields.
-
-.. _edit-values-list:
-
-Viewing/Editing legal values
-============================
-
-Editing legal values requires ``admin`` privileges.
-Select "Field Values" from the Administration page. A list of all
-fields, both system fields and Custom Fields, for which legal values
-can be edited appears. Click a field name to edit its legal values.
-
-There is no limit to how many values a field can have, but each value
-must be unique to that field. The sortkey is important to display these
-values in the desired order.
-
-When the availability of the values of a custom field is controlled
-by another field, you can select from here which value of the other field
-must be set for the value of the custom field to appear.
-
-.. _edit-values-delete:
-
-Deleting legal values
-=====================
-
-Legal values from Custom Fields can be deleted, but only if the
-following two conditions are respected:
-
-#. The value is not used by default for the field.
-
-#. No bug is currently using this value.
-
-If any of these conditions is not respected, the value cannot be deleted.
-The only way to delete these values is to reassign bugs to another value
-and to set another value as default for the field.
-
-.. _bug_status_workflow:
-
-Bug Status Workflow
-###################
-
-The bug status workflow is no longer hardcoded but can be freely customized
-from the web interface. Only one bug status cannot be renamed nor deleted,
-UNCONFIRMED, but the workflow involving it is free. The configuration
-page displays all existing bug statuses twice, first on the left for bug
-statuses we come from and on the top for bug statuses we move to.
-If the checkbox is checked, then the transition between the two bug statuses
-is legal, else it's forbidden independently of your privileges. The bug status
-used for the "duplicate_or_move_bug_status" parameter must be part of the
-workflow as that is the bug status which will be used when duplicating or
-moving a bug, so it must be available from each bug status.
-
-When the workflow is set, the "View Current Triggers" link below the table
-lets you set which transitions require a comment from the user.
-
-.. _voting:
-
-Voting
-######
-
-All of the code for voting in Bugzilla has been moved into an
-extension, called "Voting", in the :file:`extensions/Voting/`
-directory. To enable it, you must remove the :file:`disabled`
-file from that directory, and run :file:`checksetup.pl`.
-
-Voting allows users to be given a pot of votes which they can allocate
-to bugs, to indicate that they'd like them fixed.
-This allows developers to gauge
-user need for a particular enhancement or bugfix. By allowing bugs with
-a certain number of votes to automatically move from "UNCONFIRMED" to
-"CONFIRMED", users of the bug system can help high-priority bugs garner
-attention so they don't sit for a long time awaiting triage.
-
-To modify Voting settings:
-
-#. Navigate to the "Edit product" screen for the Product you
-   wish to modify
-
-#. *Maximum Votes per person*:
-   Setting this field to "0" disables voting.
-
-#. *Maximum Votes a person can put on a single
-   bug*:
-   It should probably be some number lower than the
-   "Maximum votes per person". Don't set this field to "0" if
-   "Maximum votes per person" is non-zero; that doesn't make
-   any sense.
-
-#. *Number of votes a bug in this product needs to
-   automatically get out of the UNCONFIRMED state*:
-   Setting this field to "0" disables the automatic move of
-   bugs from UNCONFIRMED to CONFIRMED.
-
-#. Once you have adjusted the values to your preference, click
-   "Update".
-
-.. _quips:
-
-Quips
-#####
-
-Quips are small text messages that can be configured to appear
-next to search results. A Bugzilla installation can have its own specific
-quips. Whenever a quip needs to be displayed, a random selection
-is made from the pool of already existing quips.
-
-Quip submission is controlled by the *quip_list_entry_control*
-parameter.  It has several possible values: open, moderated, or closed.
-In order to enable quips approval you need to set this parameter to
-"moderated". In this way, users are free to submit quips for addition
-but an administrator must explicitly approve them before they are
-actually used.
-
-In order to see the user interface for the quips, it is enough to click
-on a quip when it is displayed together with the search results. Or
-it can be seen directly in the browser by visiting the quips.cgi URL
-(prefixed with the usual web location of the Bugzilla installation).
-Once the quip interface is displayed, it is enough to click the
-"view and edit the whole quip list" in order to see the administration
-page. A page with all the quips available in the database will
-be displayed.
-
-Next to each quip there is a checkbox, under the
-"Approved" column. Quips who have this checkbox checked are
-already approved and will appear next to the search results.
-The ones that have it unchecked are still preserved in the
-database but they will not appear on search results pages.
-User submitted quips have initially the checkbox unchecked.
-
-Also, there is a delete link next to each quip,
-which can be used in order to permanently delete a quip.
-
-Display of quips is controlled by the *display_quips*
-user preference.  Possible values are "on" and "off".
-
-.. _groups:
-
-Groups and Group Security
-#########################
-
-Groups allow for separating bugs into logical divisions.
-Groups are typically used
-to isolate bugs that should only be seen by certain people. For
-example, a company might create a different group for each one of its customers
-or partners. Group permissions could be set so that each partner or customer would
-only have access to their own bugs. Or, groups might be used to create
-variable access controls for different departments within an organization.
-Another common use of groups is to associate groups with products,
-creating isolation and access control on a per-product basis.
-
-Groups and group behaviors are controlled in several places:
-
-#. The group configuration page. To view or edit existing groups, or to
-   create new groups, access the "Groups" link from the "Administration"
-   page. This section of the manual deals primarily with the aspect of
-   group controls accessed on this page.
-
-#. Global configuration parameters. Bugzilla has several parameters
-   that control the overall default group behavior and restriction
-   levels. For more information on the parameters that control
-   group behavior globally, see :ref:`param-group-security`.
-
-#. Product association with groups. Most of the functionality of groups
-   and group security is controlled at the product level. Some aspects
-   of group access controls for products are discussed in this section,
-   but for more detail see :ref:`product-group-controls`.
-
-#. Group access for users. See :ref:`users-and-groups` for
-   details on how users are assigned group access.
-
-Group permissions are such that if a bug belongs to a group, only members
-of that group can see the bug. If a bug is in more than one group, only
-members of *all* the groups that the bug is in can see
-the bug. For information on granting read-only access to certain people and
-full edit access to others, see :ref:`product-group-controls`.
-
-.. note:: By default, bugs can also be seen by the Assignee, the Reporter, and
-   by everyone on the CC List, regardless of whether or not the bug would
-   typically be viewable by them. Visibility to the Reporter and CC List can
-   be overridden (on a per-bug basis) by bringing up the bug, finding the
-   section that starts with ``Users in the roles selected below...``
-   and un-checking the box next to either 'Reporter' or 'CC List' (or both).
-
-.. _create-groups:
-
-Creating Groups
-===============
-
-To create a new group, follow the steps below:
-
-#. Select the ``Administration`` link in the page footer,
-   and then select the ``Groups`` link from the
-   Administration page.
-
-#. A table of all the existing groups is displayed. Below the table is a
-   description of all the fields. To create a new group, select the
-   ``Add Group`` link under the table of existing groups.
-
-#. There are five fields to fill out. These fields are documented below
-   the form. Choose a name and description for the group. Decide whether
-   this group should be used for bugs (in all likelihood this should be
-   selected). Optionally, choose a regular expression that will
-   automatically add any matching users to the group, and choose an
-   icon that will help identify user comments for the group. The regular
-   expression can be useful, for example, to automatically put all users
-   from the same company into one group (if the group is for a specific
-   customer or partner).
-
-   .. note:: If ``User RegExp`` is filled out, users whose email
-      addresses match the regular expression will automatically be
-      members of the group as long as their email addresses continue
-      to match the regular expression. If their email address changes
-      and no longer matches the regular expression, they will be removed
-      from the group. Versions 2.16 and older of Bugzilla did not automatically
-      remove users who's email addresses no longer matched the RegExp.
-
-   .. warning:: If specifying a domain in the regular expression, end
-      the regexp with a "$". Otherwise, when granting access to
-      "@mycompany\\.com", access will also be granted to
-      'badperson@mycompany.com.cracker.net'. Use the syntax,
-      '@mycompany\\.com$' for the regular expression.
-
-#. After the new group is created, it can be edited for additional options.
-   The "Edit Group" page allows for specifying other groups that should be included
-   in this group and which groups should be permitted to add and delete
-   users from this group. For more details, see :ref:`edit-groups`.
-
-.. _edit-groups:
-
-Editing Groups and Assigning Group Permissions
-==============================================
-
-To access the "Edit Groups" page, select the
-``Administration`` link in the page footer,
-and then select the ``Groups`` link from the Administration page.
-A table of all the existing groups is displayed. Click on a group name
-you wish to edit or control permissions for.
-
-The "Edit Groups" page contains the same five fields present when
-creating a new group. Below that are two additional sections, "Group
-Permissions," and "Mass Remove". The "Mass Remove" option simply removes
-all users from the group who match the regular expression entered. The
-"Group Permissions" section requires further explanation.
-
-The "Group Permissions" section on the "Edit Groups" page contains four sets
-of permissions that control the relationship of this group to other
-groups. If the 'usevisibilitygroups' parameter is in use (see
-:ref:`parameters`) two additional sets of permissions are displayed.
-Each set consists of two select boxes. On the left, a select box
-with a list of all existing groups. On the right, a select box listing
-all groups currently selected for this permission setting (this box will
-be empty for new groups). The way these controls allow groups to relate
-to one another is called *inheritance*.
-Each of the six permissions is described below.
-
-*Groups That Are a Member of This Group*
-    Members of any groups selected here will automatically have
-    membership in this group. In other words, members of any selected
-    group will inherit membership in this group.
-
-*Groups That This Group Is a Member Of*
-    Members of this group will inherit membership to any group
-    selected here. For example, suppose the group being edited is
-    an Admin group. If there are two products  (Product1 and Product2)
-    and each product has its
-    own group (Group1 and Group2), and the Admin group
-    should have access to both products,
-    simply select both Group1 and Group2 here.
-
-*Groups That Can Grant Membership in This Group*
-    The members of any group selected here will be able add users
-    to this group, even if they themselves are not in this group.
-
-*Groups That This Group Can Grant Membership In*
-    Members of this group can add users to any group selected here,
-    even if they themselves are not in the selected groups.
-
-*Groups That Can See This Group*
-    Members of any selected group can see the users in this group.
-    This setting is only visible if the 'usevisibilitygroups' parameter
-    is enabled on the Bugzilla Configuration page. See
-    :ref:`parameters` for information on configuring Bugzilla.
-
-*Groups That This Group Can See*
-    Members of this group can see members in any of the selected groups.
-    This setting is only visible if the 'usevisibilitygroups' parameter
-    is enabled on the the Bugzilla Configuration page. See
-    :ref:`parameters` for information on configuring Bugzilla.
-
-.. _users-and-groups:
-
-Assigning Users to Groups
-=========================
-
-A User can become a member of a group in several ways:
-
-#. The user can be explicitly placed in the group by editing
-   the user's profile. This can be done by accessing the "Users" page
-   from the "Administration" page. Use the search form to find the user
-   you want to edit group membership for, and click on their email
-   address in the search results to edit their profile. The profile
-   page lists all the groups, and indicates if the user is a member of
-   the group either directly or indirectly. More information on indirect
-   group membership is below. For more details on User administration,
-   see :ref:`useradmin`.
-
-#. The group can include another group of which the user is
-   a member. This is indicated by square brackets around the checkbox
-   next to the group name in the user's profile.
-   See :ref:`edit-groups` for details on group inheritance.
-
-#. The user's email address can match the regular expression
-   that has been specified to automatically grant membership to
-   the group. This is indicated by "\*" around the check box by the
-   group name in the user's profile.
-   See :ref:`create-groups` for details on
-   the regular expression option when creating groups.
-
-Assigning Group Controls to Products
-====================================
-
-The primary functionality of groups is derived from the relationship of
-groups to products. The concepts around segregating access to bugs with
-product group controls can be confusing. For details and examples on this
-topic, see :ref:`product-group-controls`.
-
-.. _sanitycheck:
-
-Checking and Maintaining Database Integrity
-###########################################
-
-Over time it is possible for the Bugzilla database to become corrupt
-or to have anomalies.
-This could happen through normal usage of Bugzilla, manual database
-administration outside of the Bugzilla user interface, or from some
-other unexpected event. Bugzilla includes a "Sanity Check" script that
-can perform several basic database checks, and repair certain problems or
-inconsistencies.
-
-To run the "Sanity Check" script, log in as an Administrator and click the
-"Sanity Check" link in the admin page. Any problems that are found will be
-displayed in red letters. If the script is capable of fixing a problem,
-it will present a link to initiate the fix. If the script cannot
-fix the problem it will require manual database administration or recovery.
-
-The "Sanity Check" script can also be run from the command line via the perl
-script :file:`sanitycheck.pl`. The script can also be run as
-a :command:`cron` job. Results will be delivered by email.
-
-The "Sanity Check" script should be run on a regular basis as a matter of
-best practice.
-
-.. warning:: The "Sanity Check" script is no substitute for a competent database
-   administrator. It is only designed to check and repair basic database
-   problems.
-
-
diff --git a/docs/en/rst/api/core/v1/attachment.rst b/docs/en/rst/api/core/v1/attachment.rst
new file mode 100644
index 0000000000..65f862ff0a
--- /dev/null
+++ b/docs/en/rst/api/core/v1/attachment.rst
@@ -0,0 +1,425 @@
+Attachments
+===========
+
+The Bugzilla API for creating, changing, and getting the details of attachments.
+
+.. _rest_attachments:
+
+Get Attachment
+--------------
+
+This allows you to get data about attachments, given a list of bugs and/or
+attachment IDs. Private attachments will only be returned if you are in the
+appropriate group or if you are the submitter of the attachment.
+
+**Request**
+
+To get all current attachments for a bug:
+
+.. code-block:: text
+
+   GET /rest/bug/(bug_id)/attachment
+
+To get a specific attachment based on attachment ID:
+
+.. code-block:: text
+
+   GET /rest/bug/attachment/(attachment_id)
+
+One of the below must be specified.
+
+=================  ====  ======================================================
+name               type  description
+=================  ====  ======================================================
+**bug_id**         int   Integer bug ID.
+**attachment_id**  int   Integer attachment ID.
+=================  ====  ======================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+      "bugs" : {
+         "1345" : [
+            { (attachment) },
+            { (attachment) }
+         ],
+         "9874" : [
+            { (attachment) },
+            { (attachment) }
+         ],
+      },
+      "attachments" : {
+         "234" : { (attachment) },
+         "123" : { (attachment) },
+      }
+   }
+
+An object containing two elements: ``bugs`` and ``attachments``.
+
+The attachments for the bug that you specified in the ``bug_id`` argument in
+input are returned in ``bugs`` on output. ``bugs`` is a object that has integer
+bug IDs for keys and the values are arrays of objects as attachments.
+(Fields for attachments are described below.)
+
+For the attachment that you specified directly in ``attachment_id``, they
+are returned in ``attachments`` on output. This is a object where the attachment
+ids point directly to objects describing the individual attachment.
+
+The fields for each attachment (where it says ``(attachment)`` in the
+sample response above) are:
+
+================  ========  =====================================================
+name              type      description
+================  ========  =====================================================
+data              base64    The raw data of the attachment, encoded as Base64.
+size              int       The length (in bytes) of the attachment.
+creation_time     datetime  The time the attachment was created.
+last_change_time  datetime  The last time the attachment was modified.
+id                int       The numeric ID of the attachment.
+bug_id            int       The numeric ID of the bug that the attachment is
+                            attached to.
+file_name         string    The file name of the attachment.
+summary           string    A short string describing the attachment.
+content_type      string    The MIME type of the attachment.
+is_private        boolean   ``true`` if the attachment is private (only visible
+                            to a certain group called the "insidergroup",
+                            ``false`` otherwise.
+is_obsolete       boolean   ``true`` if the attachment is obsolete, ``false``
+                            otherwise.
+is_patch          boolean   ``true`` if the attachment is a patch, ``false``
+                            otherwise.
+creator           string    The login name of the user that created the
+                            attachment.
+flags             array     Array of objects, each containing the information
+                            about the flag currently set for each attachment.
+                            Each flag object contains items described in the
+                            Flag object below.
+================  ========  =====================================================
+
+Flag object:
+
+=================  ========  ====================================================
+name               type      description
+=================  ========  ====================================================
+id                 int       The ID of the flag.
+name               string    The name of the flag.
+type_id            int       The type ID of the flag.
+creation_date      datetime  The timestamp when this flag was originally created.
+modification_date  datetime  The timestamp when the flag was last modified.
+status             string    The current status of the flag such as ?, +, or -.
+setter             string    The login name of the user who created or last
+                             modified the flag.
+requestee          string    The login name of the user this flag has been
+                             requested to be granted or denied. Note, this field
+                             is only returned if a requestee is set.
+=================  ========  ====================================================
+
+**Errors**
+
+This method can throw all the same errors as :ref:`rest_single_bug`. In addition,
+it can also throw the following error:
+
+* 304 (Auth Failure, Attachment is Private)
+  You specified the id of a private attachment in the "attachment_ids"
+  argument, and you are not in the "insider group" that can see
+  private attachments.
+
+.. _rest_add_attachment:
+
+Create Attachment
+-----------------
+
+This allows you to add an attachment to a bug in Bugzilla.
+
+**Request**
+
+To create attachment on a current bug:
+
+.. code-block:: text
+
+   POST /rest/bug/(bug_id)/attachment
+
+.. code-block:: js
+
+   {
+     "ids" : [ 35 ],
+     "is_patch" : true,
+     "comment" : "This is a new attachment comment",
+     "is_markdown" : true,
+     "summary" : "Test Attachment",
+     "content_type" : "text/plain",
+     "data" : "(Some base64 encoded content)",
+     "file_name" : "test_attachment.patch",
+     "obsoletes" : [],
+     "is_private" : false,
+     "flags" : [
+       {
+         "name" : "review",
+         "status" : "?",
+         "requestee" : "user@bugzilla.org",
+         "new" : true
+       }
+     ]
+   }
+
+
+The params to include in the POST body, as well as the returned
+data format, are the same as below. The ``bug_id`` param will be
+overridden as it it pulled from the URL path.
+
+================  =======  ======================================================
+name              type     description
+================  =======  ======================================================
+**ids**           array    The IDs or aliases of bugs that you want to add this
+                           attachment to. The same attachment and comment will be
+                           added to all these bugs.
+**data**          base64   The content of the attachment. You must encode it in
+                           base64 using an appropriate client library such as
+                           ``MIME::Base64`` for Perl.
+**file_name**     string   The "file name" that will be displayed in the UI for
+                           this attachment and also downloaded copies will be
+                           given.
+**summary**       string   A short string describing the attachment.
+**content_type**  string   The MIME type of the attachment, like ``text/plain``
+                           or ``image/png``.
+comment           string   A comment to add along with this attachment.
+is_patch          boolean  ``true`` if Bugzilla should treat this attachment as a
+                           patch. If you specify this, you do not need to specify
+                           a ``content_type``. The ``content_type`` of the
+                           attachment will be forced to ``text/plain``. Defaults
+                           to ``false`` if not specified.
+is_private        boolean  ``true`` if the attachment should be private
+                           (restricted to the "insidergroup"), ``false`` if the
+                           attachment should be public. Defaults to ``false`` if
+                           not specified.
+is_markdown       boolean  If set to ``true``, the comment has Markdown structures;
+                           otherwise, it is normal text.
+flags             array    Flags objects to add to the attachment. The object
+                           format is described in the Flag object below.
+================  =======  ======================================================
+
+Flag object:
+
+To create a flag, at least the ``status`` and the ``type_id`` or ``name`` must
+be provided. An optional requestee can be passed if the flag type is requestable
+to a specific user.
+
+=========  ======  ==============================================================
+name       type    description
+=========  ======  ==============================================================
+name       string  The name of the flag type.
+type_id    int     The internal flag type ID.
+status     string  The flags new status (i.e. "?", "+", "-" or "X" to clear a
+                   flag).
+requestee  string  The login of the requestee if the flag type is requestable to
+                   a specific user.
+=========  ======  ==============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "ids" : [
+       "2797"
+     ]
+   }
+
+====  =====  =========================
+name  type   description
+====  =====  =========================
+ids   array  Attachment IDs created.
+====  =====  =========================
+
+**Errors**
+
+This method can throw all the same errors as :ref:`rest_single_bug`, plus:
+
+* 129 (Flag Status Invalid)
+  The flag status is invalid.
+* 130 (Flag Modification Denied)
+  You tried to request, grant, or deny a flag but only a user with the required
+  permissions may make the change.
+* 131 (Flag not Requestable from Specific Person)
+  You can't ask a specific person for the flag.
+* 133 (Flag Type not Unique)
+  The flag type specified matches several flag types. You must specify
+  the type id value to update or add a flag.
+* 134 (Inactive Flag Type)
+  The flag type is inactive and cannot be used to create new flags.
+* 140 (Markdown Disabled)
+  You tried to set the "is_markdown" flag of the comment to true but the Markdown feature is not enabled.
+* 600 (Attachment Too Large)
+  You tried to attach a file that was larger than Bugzilla will accept.
+* 601 (Invalid MIME Type)
+  You specified a "content_type" argument that was blank, not a valid
+  MIME type, or not a MIME type that Bugzilla accepts for attachments.
+* 603 (File Name Not Specified)
+  You did not specify a valid for the "file_name" argument.
+* 604 (Summary Required)
+  You did not specify a value for the "summary" argument.
+* 606 (Empty Data)
+  You set the "data" field to an empty string.
+
+.. _rest_update_attachment:
+
+Update Attachment
+-----------------
+
+This allows you to update attachment metadata in Bugzilla.
+
+**Request**
+
+To update attachment metadata on a current attachment:
+
+.. code-block:: text
+
+   PUT /rest/bug/attachment/(attachment_id)
+
+.. code-block:: js
+
+   {
+     "ids" : [ 2796 ],
+     "summary" : "Test XML file",
+     "comment" : "Changed this from a patch to a XML file",
+     "is_markdown" : true,
+     "content_type" : "text/xml",
+     "is_patch" : 0
+   }
+
+=================  =====  =======================================================
+name               type   description
+=================  =====  =======================================================
+**attachment_id**  int    Integer attachment ID.
+**ids**            array  The IDs of the attachments you want to update.
+=================  =====  =======================================================
+
+============  =======  ==========================================================
+name          type     description
+============  =======  ==========================================================
+file_name     string   The "file name" that will be displayed in the UI for this
+                       attachment.
+summary       string   A short string describing the attachment.
+comment       string   An optional comment to add to the attachment's bug.
+is_markdown   boolean  If set to ``true``, the comment has Markdown structures;
+                       otherwise, it is normal text.
+content_type  string   The MIME type of the attachment, like ``text/plain``
+                       or ``image/png``.
+is_patch      boolean  ``true`` if Bugzilla should treat this attachment as a
+                       patch. If you specify this, you do not need to specify a
+                       ``content_type``. The ``content_type`` of the attachment
+                       will be forced to ``text/plain``.
+is_private    boolean  ``true`` if the attachment should be private (restricted
+                       to the "insidergroup"), ``false`` if the attachment
+                       should be public.
+is_obsolete   boolean  ``true`` if the attachment is obsolete, ``false``
+                       otherwise.
+flags         array    An array of Flag objects with changes to the flags. The
+                       object format is described in the Flag object below.
+============  =======  ==========================================================
+
+Flag object:
+
+The following values can be specified. At least the ``status`` and one of
+``type_id``, ``id``, or ``name`` must be specified. If a type_id or name matches
+a single currently set flag, the flag will be updated unless ``new`` is specified.
+
+=========  =======  =============================================================
+name       type     description
+=========  =======  =============================================================
+name       string   The name of the flag that will be created or updated.
+type_id    int      The internal flag type ID that will be created or updated.
+                    You will need to specify the ``type_id`` if more than one
+                    flag type of the same name exists.
+status     string   The flags new status (i.e. "?", "+", "-" or "X" to clear a
+                    flag).
+requestee  string   The login of the requestee if the flag type is requestable
+                    to a specific user.
+id         int      Use ID to specify the flag to be updated. You will need to
+                    specify the ``id`` if more than one flag is set of the same
+                    name.
+new        boolean  Set to true if you specifically want a new flag to be
+                    created.
+=========  =======  =============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "attachments" : [
+       {
+         "changes" : {
+           "content_type" : {
+             "added" : "text/xml",
+             "removed" : "text/plain"
+           },
+           "is_patch" : {
+             "added" : "0",
+             "removed" : "1"
+           },
+           "summary" : {
+             "added" : "Test XML file",
+             "removed" : "test patch"
+           }
+         },
+         "id" : 2796,
+         "last_change_time" : "2014-09-29T14:41:53Z"
+       }
+     ]
+   }
+
+``attachments`` (array) Change objects with the following items:
+
+================  ========  =====================================================
+name              type      description
+================  ========  =====================================================
+id                int       The ID of the attachment that was updated.
+last_change_time  datetime  The exact time that this update was done at, for this
+                            attachment. If no update was done (that is, no fields
+                            had their values changed and no comment was added)
+                            then this will instead be the last time the
+                            attachment was updated.
+changes           object    The changes that were actually done on this
+                            attachment. The keys are the names of the fields that
+                            were changed, and the values are an object with two
+                            items:
+
+                            * added: (string) The values that were added to this
+                              field. Possibly a comma-and-space-separated list
+                              if multiple values were added.
+                            * removed: (string) The values that were removed from
+                              this field.
+================  ========  =====================================================
+
+**Errors**
+
+This method can throw all the same errors as :ref:`rest_single_bug`, plus:
+
+* 129 (Flag Status Invalid)
+  The flag status is invalid.
+* 130 (Flag Modification Denied)
+  You tried to request, grant, or deny a flag but only a user with the required
+  permissions may make the change.
+* 131 (Flag not Requestable from Specific Person)
+  You can't ask a specific person for the flag.
+* 132 (Flag not Unique)
+  The flag specified has been set multiple times. You must specify the id
+  value to update the flag.
+* 133 (Flag Type not Unique)
+  The flag type specified matches several flag types. You must specify
+  the type id value to update or add a flag.
+* 134 (Inactive Flag Type)
+  The flag type is inactive and cannot be used to create new flags.
+* 140 (Markdown Disabled)
+  You tried to set the "is_markdown" flag of the "comment" to true but Markdown feature is
+  not enabled.
+* 601 (Invalid MIME Type)
+  You specified a "content_type" argument that was blank, not a valid
+  MIME type, or not a MIME type that Bugzilla accepts for attachments.
+* 603 (File Name Not Specified)
+  You did not specify a valid for the "file_name" argument.
+* 604 (Summary Required)
+  You did not specify a value for the "summary" argument.
diff --git a/docs/en/rst/api/core/v1/bug-user-last-visit.rst b/docs/en/rst/api/core/v1/bug-user-last-visit.rst
new file mode 100644
index 0000000000..2c37826628
--- /dev/null
+++ b/docs/en/rst/api/core/v1/bug-user-last-visit.rst
@@ -0,0 +1,116 @@
+Bug User Last Visited
+=====================
+
+.. _rest-bug-user-last-visit-update:
+
+Update Last Visited
+-------------------
+
+Update the last-visited time for the specified bug and current user.
+
+**Request**
+
+To update the time for a single bug id:
+
+.. code-block:: text
+
+   POST /rest/bug_user_last_visit/(id)
+
+To update one or more bug ids at once:
+
+.. code-block:: text
+
+   POST /rest/bug_user_last_visit
+
+.. code-block:: js
+
+   {
+     "ids" : [35,36,37]
+   }
+
+=======  =====  ==============================
+name     type   description
+=======  =====  ==============================
+**id**   int    An integer bug id.
+**ids**  array  One or more bug ids to update.
+=======  =====  ==============================
+
+**Response**
+
+.. code-block:: js
+
+   [
+     {
+       "id" : 100,
+       "last_visit_ts" : "2014-10-16T17:38:24Z"
+     }
+   ]
+
+An array of objects containing the items:
+
+=============  ========  ============================================
+name           type      description
+=============  ========  ============================================
+id             int       The bug id.
+last_visit_ts  datetime  The timestamp the user last visited the bug.
+=============  ========  ============================================
+
+**Errors**
+
+* 1300 (User Not Involved with Bug)
+  The caller's account is not involved with the bug id provided.
+
+.. _rest-bug-user-last-visit-get:
+
+Get Last Visited
+----------------
+
+**Request**
+
+Get the last-visited timestamp for one or more specified bug ids or get a
+list of the last 20 visited bugs and their timestamps.
+
+To return the last-visited timestamp for a single bug id:
+
+.. code-block:: text
+
+   GET /rest/bug_user_last_visit/(id)
+
+To return more than one specific bug timestamps:
+
+.. code-block:: text
+
+   GET /rest/bug_user_last_visit/123?ids=234&ids=456
+
+To return just the most recent 20 timestamps:
+
+.. code-block:: text
+
+   GET /rest/bug_user_last_visit
+
+=======  =====  ============================================
+name     type   description
+=======  =====  ============================================
+**id**   int    An integer bug id.
+**ids**  array  One or more optional bug ids to get.
+=======  =====  ============================================
+
+**Response**
+
+.. code-block:: js
+
+   [
+     {
+       "id" : 100,
+       "last_visit_ts" : "2014-10-16T17:38:24Z"
+     }
+   ]
+
+An array of objects containing the following items:
+
+=============  ========  ============================================
+name           type      description
+=============  ========  ============================================
+id             int       The bug id.
+last_visit_ts  datetime  The timestamp the user last visited the bug.
+=============  ========  ============================================
diff --git a/docs/en/rst/api/core/v1/bug.rst b/docs/en/rst/api/core/v1/bug.rst
new file mode 100644
index 0000000000..9c62802b65
--- /dev/null
+++ b/docs/en/rst/api/core/v1/bug.rst
@@ -0,0 +1,1095 @@
+Bugs
+====
+
+The REST API for creating, changing, and getting the details of bugs.
+
+This part of the Bugzilla REST API allows you to file new bugs in Bugzilla and
+to get information about existing bugs.
+
+.. _rest_single_bug:
+
+Get Bug
+-------
+
+Gets information about particular bugs in the database.
+
+**Request**
+
+To get information about a particular bug using its ID or alias:
+
+.. code-block::  text
+
+   GET /rest/bug/(id_or_alias)
+
+You can also use :ref:`rest_search_bugs` to return more than one bug at a time
+by specifying bug IDs as the search terms.
+
+.. code-block:: text
+
+   GET /rest/bug?id=12434,43421
+
+================  =====  ======================================================
+name              type   description
+================  =====  ======================================================
+**id_or_alias**   mixed  An integer bug ID or a bug alias string.
+================  =====  ======================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "faults": [],
+     "bugs": [
+       {
+         "assigned_to_detail": {
+           "id": 2,
+           "real_name": "Test User",
+           "name": "user@bugzilla.org",
+           "email": "user@bugzilla.org"
+         },
+         "flags": [
+           {
+             "type_id": 11,
+             "modification_date": "2014-09-28T21:03:47Z",
+             "name": "blocker",
+             "status": "?",
+             "id": 2906,
+             "setter": "user@bugzilla.org",
+             "creation_date": "2014-09-28T21:03:47Z"
+           }
+         ],
+         "resolution": "INVALID",
+         "id": 35,
+         "qa_contact": "",
+         "version": "1.0",
+         "status": "RESOLVED",
+         "creator": "user@bugzilla.org",
+         "cf_drop_down": "---",
+         "summary": "test bug",
+         "last_change_time": "2014-09-23T19:12:17Z",
+         "platform": "All",
+         "url": "",
+         "classification": "Unclassified",
+         "cc_detail": [
+           {
+             "id": 786,
+             "real_name": "Foo Bar",
+             "name": "foo@bar.com",
+             "email": "foo@bar.com"
+           },
+         ],
+         "priority": "P1",
+         "is_confirmed": true,
+         "creation_time": "2000-07-25T13:50:04Z",
+         "assigned_to": "user@bugzilla.org",
+         "flags": [],
+         "alias": [],
+         "cf_large_text": "",
+         "groups": [],
+         "op_sys": "All",
+         "cf_bug_id": null,
+         "depends_on": [],
+         "is_cc_accessible": true,
+         "is_open": false,
+         "cf_qa_list_4": "---",
+         "keywords": [],
+         "cc": [
+           "foo@bar.com",
+         ],
+         "see_also": [],
+         "deadline": null,
+         "is_creator_accessible": true,
+         "whiteboard": "",
+         "dupe_of": null,
+         "target_milestone": "---",
+         "cf_mulitple_select": [],
+         "component": "SaltSprinkler",
+         "severity": "critical",
+         "cf_date": null,
+         "product": "FoodReplicator",
+         "creator_detail": {
+           "id": 28,
+           "real_name": "hello",
+           "name": "user@bugzilla.org",
+           "email": "namachi@netscape.com"
+         },
+         "cf_free_text": "",
+         "blocks": []
+       }
+     ]
+   }
+
+``bugs`` (array) Each bug object contains information about the bugs with valid
+ids containing the following items:
+
+These fields are returned by default or by specifying ``_default`` in
+``include_fields``.
+
+=====================  ========  ================================================
+name                   type      description
+=====================  ========  ================================================
+actual_time            double    The total number of hours that this bug has
+                                 taken so far. If you are not in the time-tracking
+                                 group, this field will not be included in the
+                                 return value.
+alias                  array     The unique aliases of this bug. An empty array
+                                 will be returned if this bug has no aliases.
+assigned_to            string    The login name of the user to whom the bug is
+                                 assigned.
+assigned_to_detail     object    An object containing detailed user information
+                                 for the assigned_to. To see the keys included
+                                 in the user detail object, see below.
+blocks                 array     The IDs of bugs that are "blocked" by this bug.
+cc                     array     The login names of users on the CC list of this
+                                 bug.
+cc_detail              array     Array of objects containing detailed user
+                                 information for each of the cc list members.
+                                 To see the keys included in the user detail
+                                 object, see below.
+classification         string    The name of the current classification the bug
+                                 is in.
+component              string    The name of the current component of this bug.
+creation_time          datetime  When the bug was created.
+creator                string    The login name of the person who filed this bug
+                                 (the reporter).
+creator_detail         object    An object containing detailed user information
+                                 for the creator. To see the keys included in the
+                                 user detail object, see below.
+deadline               string    The day that this bug is due to be completed, in
+                                 the format ``YYYY-MM-DD``.
+depends_on             array     The IDs of bugs that this bug "depends on".
+dupe_of                int       The bug ID of the bug that this bug is a
+                                 duplicate of. If this bug isn't a duplicate of
+                                 any bug, this will be null.
+estimated_time         double    The number of hours that it was estimated that
+                                 this bug would take. If you are not in the
+                                 time-tracking group, this field will not be
+                                 included in the return value.
+flags                  array     An array of objects containing the information
+                                 about flags currently set for the bug. Each flag
+                                 objects contains the following items
+groups                 array     The names of all the groups that this bug is in.
+id                     int       The unique numeric ID of this bug.
+is_cc_accessible       boolean   If true, this bug can be accessed by members of
+                                 the CC list, even if they are not in the groups
+                                 the bug is restricted to.
+is_confirmed           boolean   ``true`` if the bug has been confirmed. Usually
+                                 this means that the bug has at some point been
+                                 moved out of the ``UNCONFIRMED`` status and into
+                                 another open status.
+is_open                boolean   ``true`` if this bug is open, ``false`` if it
+                                 is closed.
+is_creator_accessible  boolean   If ``true``, this bug can be accessed by the
+                                 creator of the bug, even if they are not a
+                                 member of the groups the bug is restricted to.
+keywords               array     Each keyword that is on this bug.
+last_change_time       datetime  When the bug was last changed.
+op_sys                 string    The name of the operating system that the bug
+                                 was filed against.
+platform               string    The name of the platform (hardware) that the bug
+                                 was filed against.
+priority               string    The priority of the bug.
+product                string    The name of the product this bug is in.
+qa_contact             string    The login name of the current QA Contact on the
+                                 bug.
+qa_contact_detail      object    An object containing detailed user information
+                                 for the qa_contact. To see the keys included in
+                                 the user detail object, see below.
+remaining_time         double    The number of hours of work remaining until work
+                                 on this bug is complete. If you are not in the
+                                 time-tracking group, this field will not be
+                                 included in the return value.
+resolution             string    The current resolution of the bug, or an empty
+                                 string if the bug is open.
+see_also               array     The URLs in the See Also field on the bug.
+severity               string    The current severity of the bug.
+status                 string    The current status of the bug.
+summary                string    The summary of this bug.
+target_milestone       string    The milestone that this bug is supposed to be
+                                 fixed by, or for closed bugs, the milestone that
+                                 it was fixed for.
+update_token           string    The token that you would have to pass to the
+                                 ``process_bug.cgi`` page in order to update this
+                                 bug. This changes every time the bug is updated.
+                                 This field is not returned to logged-out users.
+url                    string    A URL that demonstrates the problem described in
+                                 the bug, or is somehow related to the bug report.
+version                string    The version the bug was reported against.
+whiteboard             string    The value of the "status whiteboard" field on
+                                 the bug.
+=====================  ========  ================================================
+
+Custom fields:
+
+Every custom field in this installation will also be included in the
+return value. Most fields are returned as strings. However, some field types have
+different return values.
+
+Normally custom fields are returned by default similar to normal bug fields or
+you can specify only custom fields by using ``_custom`` in ``include_fields``.
+
+Extra fields:
+
+These fields are returned only by specifying ``_extra`` or the field name in
+``include_fields``.
+
+==========  =====  ====================================================================
+name        type   description
+==========  =====  ====================================================================
+tags        array  Each array item is a tag name. Note that tags are
+                   personal to the currently logged in user and are not the same as
+                   comment tags.
+duplicates  array  Each array item is a bug ID that is a duplicate of this bug.
+==========  =====  ====================================================================
+
+User object:
+
+=========  ======  ==============================================================
+name       type    description
+=========  ======  ==============================================================
+id         int     The user ID for this user.
+real_name  string  The 'real' name for this user, if any.
+name       string  The user's Bugzilla login.
+=========  ======  ==============================================================
+
+Flag object:
+
+=================  ========  ====================================================
+name               type      description
+=================  ========  ====================================================
+id                 int       The ID of the flag.
+name               string    The name of the flag.
+type_id            int       The type ID of the flag.
+creation_date      datetime  The timestamp when this flag was originally created.
+modification_date  datetime  The timestamp when the flag was last modified.
+status             string    The current status of the flag.
+setter             string    The login name of the user who created or last
+                             modified the flag.
+requestee          string    The login name of the user this flag has been
+                             requested to be granted or denied. Note, this field
+                             is only returned if a requestee is set.
+=================  ========  ====================================================
+
+Custom field object:
+
+You can specify to only return custom fields by specifying ``_custom`` or the
+field name in ``include_fields``.
+
+* Bug ID Fields: (int)
+* Multiple-Selection Fields: (array of strings)
+* Date/Time Fields: (datetime)
+
+**Errors**
+
+* 100 (Invalid Bug Alias)
+  If you specified an alias and there is no bug with that alias.
+* 101 (Invalid Bug ID)
+  The bug_id you specified doesn't exist in the database.
+* 102 (Access Denied)
+  You do not have access to the bug_id you specified.
+
+**History**
+
+Since Bugzilla 6.0, the email address of users is private and is no longer
+returned as part of the user object.
+
+.. _rest_history:
+
+Bug History
+-----------
+
+Gets the history of changes for particular bugs in the database.
+
+**Request**
+
+To get the history for a specific bug ID:
+
+.. code-block:: text
+
+   GET /rest/bug/(id)/history
+
+To get the history for a bug since a specific date:
+
+.. code-block:: text
+
+   GET /rest/bug/(id)/history?new_since=YYYY-MM-DD
+
+=========  ========  ============================================================
+name       type      description
+=========  ========  ============================================================
+**id**     mixed     An integer bug ID or alias.
+new_since  datetime  A datetime timestamp to only show history since.
+=========  ========  ============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "bugs": [
+       {
+         "alias": [],
+         "history": [
+           {
+             "when": "2014-09-23T19:12:17Z",
+             "who": "user@bugzilla.org",
+             "changes": [
+               {
+                 "added": "P1",
+                 "field_name": "priority",
+                 "removed": "P2"
+               },
+               {
+                 "removed": "blocker",
+                 "field_name": "severity",
+                 "added": "critical"
+               }
+             ]
+           },
+           {
+             "when": "2014-09-28T21:03:47Z",
+             "who": "user@bugzilla.org",
+             "changes": [
+               {
+                 "added": "blocker?",
+                 "removed": "",
+                 "field_name": "flagtypes.name"
+               }
+             ]
+           }
+         ],
+         "id": 35
+       }
+     ]
+   }
+
+``bugs`` (array) Bug objects each containing the following items:
+
+=======  =====  =================================================================
+name     type   description
+=======  =====  =================================================================
+id       int    The numeric ID of the bug.
+alias    array  The unique aliases of this bug. An empty array will be returned
+                if this bug has no aliases.
+history  array  An array of History objects.
+=======  =====  =================================================================
+
+History object:
+
+=======  ========  ==============================================================
+name     type      description
+=======  ========  ==============================================================
+when     datetime  The date the bug activity/change happened.
+who      string    The login name of the user who performed the bug change.
+changes  array     An array of Change objects which contain all the changes that
+                   happened to the bug at this time (as specified by ``when``).
+=======  ========  ==============================================================
+
+Change object:
+
+=============  ======  ==========================================================
+name           type    description
+=============  ======  ==========================================================
+field_name     string  The name of the bug field that has changed.
+removed        string  The previous value of the bug field which has been
+                       deleted by the change.
+added          string  The new value of the bug field which has been added
+                       by the change.
+attachment_id  int     The ID of the attachment that was changed.
+                       This only appears if the change was to an attachment,
+                       otherwise ``attachment_id`` will not be present in this
+                       object.
+=============  ======  ==========================================================
+
+**Errors**
+
+Same as :ref:`rest_single_bug`.
+
+.. _rest_search_bugs:
+
+Search Bugs
+-----------
+
+Allows you to search for bugs based on particular criteria.
+
+**Request**
+
+To search for bugs:
+
+.. code-block:: text
+
+   GET /rest/bug
+
+Unless otherwise specified in the description of a parameter, bugs are
+returned if they match *exactly* the criteria you specify in these
+parameters. That is, we don't match against substrings--if a bug is in
+the "Widgets" product and you ask for bugs in the "Widg" product, you
+won't get anything.
+
+Criteria are joined in a logical AND. That is, you will be returned
+bugs that match *all* of the criteria, not bugs that match *any* of
+the criteria.
+
+Each parameter can be either the type it says, or a list of the types
+it says. If you pass an array, it means "Give me bugs with *any* of
+these values." For example, if you wanted bugs that were in either
+the "Foo" or "Bar" products, you'd pass:
+
+.. code-block:: text
+
+   GET /rest/bug?product=Foo&product=Bar
+
+Some Bugzillas may treat your arguments case-sensitively, depending
+on what database system they are using. Most commonly, though, Bugzilla is
+not case-sensitive with the arguments passed (because MySQL is the
+most-common database to use with Bugzilla, and MySQL is not case sensitive).
+
+In addition to the fields listed below, you may also use criteria that
+is similar to what is used in the Advanced Search screen of the Bugzilla
+UI. This includes fields specified by ``Search by Change History`` and
+``Custom Search``. The easiest way to determine what the field names are and what
+format Bugzilla expects is to first construct your query using the
+Advanced Search UI, execute it and use the query parameters in they URL
+as your query for the REST call.
+
+================  ========  =====================================================
+name              type      description
+================  ========  =====================================================
+alias             array     The unique aliases of this bug. An empty array will
+                            be returned if this bug has no aliases.
+assigned_to       string    The login name of a user that a bug is assigned to.
+component         string    The name of the Component that the bug is in. Note
+                            that if there are multiple Components with the same
+                            name, and you search for that name, bugs in *all*
+                            those Components will be returned. If you don't want
+                            this, be sure to also specify the ``product`` argument.
+creation_time     datetime  Searches for bugs that were created at this time or
+                            later. May not be an array.
+creator           string    The login name of the user who created the bug. You
+                            can also pass this argument with the name
+                            ``reporter``, for backwards compatibility with
+                            older Bugzillas.
+id                int       The numeric ID of the bug.
+last_change_time  datetime  Searches for bugs that were modified at this time
+                            or later. May not be an array.
+limit             int       Limit the number of results returned. If the limit
+                            is more than zero and higher than the maximum limit
+                            set by the administrator, then the maximum limit will
+                            be used instead. If you set the limit equal to zero,
+                            then all matching results will be returned instead.
+longdescs.count   int       The number of comments a bug has. The bug's description 
+                            is the first comment. For example, to find bugs which someone
+                            has commented on after they have been filed, search on 
+                            ``longdescs.count`` *greater than* 1.
+offset            int       Used in conjunction with the ``limit`` argument,
+                            ``offset`` defines the starting position for the
+                            search. For example, given a search that would
+                            return 100 bugs, setting ``limit`` to 10 and
+                            ``offset`` to 10 would return bugs 11 through 20
+                            from the set of 100.
+op_sys            string    The "Operating System" field of a bug.
+platform          string    The Platform (sometimes called "Hardware") field of
+                            a bug.
+priority          string    The Priority field on a bug.
+product           string    The name of the Product that the bug is in.
+resolution        string    The current resolution--only set if a bug is closed.
+                            You can find open bugs by searching for bugs with an
+                            empty resolution.
+severity          string    The Severity field on a bug.
+status            string    The current status of a bug (not including its
+                            resolution, if it has one, which is a separate field
+                            above).
+summary           string    Searches for substrings in the single-line Summary
+                            field on bugs. If you specify an array, then bugs
+                            whose summaries match *any* of the passed substrings
+                            will be returned. Note that unlike searching in the
+                            Bugzilla UI, substrings are not split on spaces. So
+                            searching for ``foo bar`` will match "This is a foo
+                            bar" but not "This foo is a bar". ``['foo', 'bar']``,
+                            would, however, match the second item.
+tags              string    Searches for a bug with the specified tag. If you
+                            specify an array, then any bugs that match *any* of
+                            the tags will be returned. Note that tags are
+                            personal to the currently logged in user.
+target_milestone  string    The Target Milestone field of a bug. Note that even
+                            if this Bugzilla does not have the Target Milestone
+                            field enabled, you can still search for bugs by
+                            Target Milestone. However, it is likely that in that
+                            case, most bugs will not have a Target Milestone set
+                            (it defaults to "---" when the field isn't enabled).
+qa_contact        string    The login name of the bug's QA Contact. Note that
+                            even if this Bugzilla does not have the QA Contact
+                            field enabled, you can still search for bugs by QA
+                            Contact (though it is likely that no bug will have a
+                            QA Contact set, if the field is disabled).
+url               string    The "URL" field of a bug.
+version           string    The Version field of a bug.
+whiteboard        string    Search the "Status Whiteboard" field on bugs for a
+                            substring. Works the same as the ``summary`` field
+                            described above, but searches the Status Whiteboard
+                            field.
+quicksearch       string    Search for bugs using quicksearch syntax.
+================  ========  =====================================================
+
+**Response**
+
+The same as :ref:`rest_single_bug`.
+
+**Errors**
+
+If you specify an invalid value for a particular field, you just won't
+get any results for that value.
+
+* 1000 (Parameters Required)
+  You may not search without any search terms.
+
+.. _rest_create_bug:
+
+Create Bug
+----------
+
+This allows you to create a new bug in Bugzilla. If you specify any
+invalid fields, an error will be thrown stating which field is invalid.
+If you specify any fields you are not allowed to set, they will just be
+set to their defaults or ignored.
+
+You cannot currently set all the items here that you can set on enter_bug.cgi.
+
+The WebService interface may allow you to set things other than those listed
+here, but realize that anything undocumented here may likely change in the
+future.
+
+**Request**
+
+To create a new bug in Bugzilla.
+
+.. code-block:: text
+
+   POST /rest/bug
+
+.. code-block:: js
+
+   {
+     "product" : "TestProduct",
+     "component" : "TestComponent",
+     "version" : "unspecified",
+     "summary" : "'This is a test bug - please disregard",
+     "alias" : "SomeAlias",
+     "op_sys" : "All",
+     "priority" : "P1",
+     "rep_platform" : "All"
+   }
+
+Some params must be set, or an error will be thrown. These params are
+marked in **bold**.
+
+Some parameters can have defaults set in Bugzilla, by the administrator.
+If these parameters have defaults set, you can omit them. These parameters
+are marked (defaulted).
+
+Clients that want to be able to interact uniformly with multiple
+Bugzillas should always set both the params marked required and those
+marked (defaulted), because some Bugzillas may not have defaults set
+for (defaulted) parameters, and then this method will throw an error
+if you don't specify them.
+
+==================  =======  ====================================================
+name                type     description
+==================  =======  ====================================================
+**product**         string   The name of the product the bug is being filed
+                             against.
+**component**       string   The name of a component in the product above.
+**summary**         string   A brief description of the bug being filed.
+**version**         string   A version of the product above; the version the
+                             bug was found in.
+description         string   (defaulted) The initial description for this bug.
+                             Some Bugzilla installations require this to not be
+                             blank.
+op_sys              string   (defaulted) The operating system the bug was
+                             discovered on.
+platform            string   (defaulted) What type of hardware the bug was
+                             experienced on.
+priority            string   (defaulted) What order the bug will be fixed in by
+                             the developer, compared to the developer's other
+                             bugs.
+severity            string   (defaulted) How severe the bug is.
+alias               array    One or more brief aliases for the bug that can be
+                             used instead of a bug number when accessing this bug.
+                             Must be unique in all of this Bugzilla.
+assigned_to         string   A user to assign this bug to, if you don't want it
+                             to be assigned to the component owner.
+cc                  array    An array of usernames to CC on this bug.
+comment_is_private  boolean  If set to ``true``, the description is private,
+                             otherwise it is assumed to be public.
+comment_tags        array    An array of strings to add as comment tags for the
+                             description.
+is_markdown         boolean  If set to ``true``, the description has Markdown
+                             structures; otherwise it is normal text.
+groups              array    An array of group names to put this bug into. You
+                             can see valid group names on the Permissions tab of
+                             the Preferences screen, or, if you are an
+                             administrator, in the Groups control panel. If you
+                             don't specify this argument, then the bug will be
+                             added into all the groups that are set as being
+                             "Default" for this product. (If you want to avoid
+                             that, you should specify ``groups`` as an empty
+                             array.)
+keywords            array    One or more keywords to set on this bug.
+qa_contact          string   If this installation has QA Contacts enabled, you
+                             can set the QA Contact here if you don't want to
+                             use the component's default QA Contact.
+status              string   The status that this bug should start out as. Note
+                             that only certain statuses can be set on bug
+                             creation.
+resolution          string   If you are filing a closed bug, then you will have
+                             to specify a resolution. You cannot currently
+                             specify a resolution of ``DUPLICATE``   for new
+                             bugs, though. That must be done with
+                             :ref:`rest_update_bug`.
+target_milestone    string   A valid target milestone for this product.
+flags               array    Flags objects to add to the bug. The object format
+                             is described in the Flag object below.
+==================  =======  ====================================================
+
+Flag object:
+
+To create a flag, at least the ``status`` and the ``type_id`` or ``name`` must
+be provided. An optional requestee can be passed if the flag type is requestable
+to a specific user.
+
+=========  ======  ==============================================================
+name       type    description
+=========  ======  ==============================================================
+name       string  The name of the flag type.
+type_id    int     The internal flag type ID.
+status     string  The flags new status (i.e. "?", "+", "-" or "X" to clear flag).
+requestee  string  The login of the requestee if the flag type is requestable
+                   to a specific user.
+=========  ======  ==============================================================
+
+In addition to the above parameters, if your installation has any custom
+fields, you can set them just by passing in the name of the field and
+its value as a string.
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id" : 12345
+   }
+
+====  ====  ======================================
+name  type  description
+====  ====  ======================================
+id    int   This is the ID of the newly-filed bug.
+====  ====  ======================================
+
+**Errors**
+
+* 51 (Invalid Object)
+  You specified a field value that is invalid. The error message will have
+  more details.
+* 103 (Invalid Alias)
+  The alias you specified is invalid for some reason. See the error message
+  for more details.
+* 104 (Invalid Field)
+  One of the drop-down fields has an invalid value, or a value entered in a
+  text field is too long. The error message will have more detail.
+* 105 (Invalid Component)
+  You didn't specify a component.
+* 106 (Invalid Product)
+  Either you didn't specify a product, this product doesn't exist, or
+  you don't have permission to enter bugs in this product.
+* 107 (Invalid Summary)
+  You didn't specify a summary for the bug.
+* 116 (Dependency Loop)
+  You specified values in the "blocks" or "depends_on" fields
+  that would cause a circular dependency between bugs.
+* 120 (Group Restriction Denied)
+  You tried to restrict the bug to a group which does not exist, or which
+  you cannot use with this product.
+* 129 (Flag Status Invalid)
+  The flag status is invalid.
+* 130 (Flag Modification Denied)
+  You tried to request, grant, or deny a flag but only a user with the required
+  permissions may make the change.
+* 131 (Flag not Requestable from Specific Person)
+  You can't ask a specific person for the flag.
+* 133 (Flag Type not Unique)
+  The flag type specified matches several flag types. You must specify
+  the type id value to update or add a flag.
+* 134 (Inactive Flag Type)
+  The flag type is inactive and cannot be used to create new flags.
+* 504 (Invalid User)
+  Either the QA Contact, Assignee, or CC lists have some invalid user
+  in them. The error message will have more details.
+
+.. _rest_update_bug:
+
+Update Bug
+----------
+
+Allows you to update the fields of a bug. Automatically sends emails
+out about the changes.
+
+**Request**
+
+To update the fields of a current bug.
+
+.. code-block:: text
+
+   PUT /rest/bug/(id_or_alias)
+
+.. code-block:: js
+
+   {
+     "ids" : [35],
+     "status" : "IN_PROGRESS",
+     "keywords" : {
+       "add" : ["funny", "stupid"]
+     }
+   }
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. You can specify the ID or alias of the bug to update
+either in the URL path and/or in the ``ids`` param. You can use both and they
+will be combined so you can edit more than one bug at a time.
+
+===============  =====  =========================================================
+name             type   description
+===============  =====  =========================================================
+**id_or_alias**  mixed  An integer bug ID or alias.
+**ids**          array  The IDs or aliases of the bugs that you want to modify.
+===============  =====  =========================================================
+
+All following fields specify the values you want to set on the bugs you are
+updating.
+
+=====================  =======  =================================================
+name                   type     description
+=====================  =======  =================================================
+alias                  object   These specify the aliases of a bug that can be
+                                used instead of a bug number when acessing this
+                                bug. To set these, you should pass an object as
+                                the value. The object may contain the following
+                                items:
+
+                                * ``add`` (array) Aliases to add to this field.
+                                * ``remove`` (array) Aliases to remove from this
+                                  field. If the aliases are not already in the
+                                  field, they will be ignored.
+                                * ``set`` (array) An exact set of aliases to set
+                                  this field to, overriding the current value.
+                                  If you specify ``set``, then ``add`` and
+                                  ``remove`` will be ignored.
+
+                                You can only set this if you are modifying a
+                                single bug. If there is more than one bug
+                                specified in ``ids``, passing in a value for
+                                ``alias`` will cause an error to be thrown.
+
+                                For backwards compatibility, you can also
+                                specify a single string. This will be treated as
+                                if you specified the set key above.
+assigned_to            string   The full login name of the user this bug is
+                                assigned to.
+blocks                 object   (Same as ``depends_on`` below)
+depends_on             object   These specify the bugs that this bug blocks or
+                                depends on, respectively. To set these, you
+                                should pass an object as the value. The object
+                                may contain the following items:
+
+                                * ``add`` (array) Bug IDs to add to this field.
+                                * ``remove`` (array) Bug IDs to remove from this
+                                  field. If the bug IDs are not already in the
+                                  field, they will be ignored.
+                                * ``set`` (array of) An exact set of bug IDs to
+                                  set this field to, overriding the current
+                                  value. If you specify ``set``, then ``add``
+                                  and ``remove`` will be ignored.
+cc                     object   The users on the cc list. To modify this field,
+                                pass an object, which may have the following
+                                items:
+
+                                * ``add`` (array) User names to add to the CC
+                                  list. They must be full user names, and an
+                                  error will be thrown if you pass in an invalid
+                                  user name.
+                                * ``remove`` (array) User names to remove from
+                                  the CC list. They must be full user names, and
+                                  an error will be thrown if you pass in an
+                                  invalid user name.
+is_cc_accessible       boolean  Whether or not users in the CC list are allowed
+                                to access the bug, even if they aren't in a group
+                                that can normally access the bug.
+comment                object   A comment on the change. The object may contain
+                                the following items:
+
+                                * ``body`` (string) The actual text of the
+                                  comment. For compatibility with the parameters
+                                  to :ref:`rest_add_comment`, you can also call
+                                  this field ``comment``, if you want.
+                                * ``is_private`` (boolean) Whether the comment is
+                                  private or not. If you try to make a comment
+                                  private and you don't have the permission to,
+                                  an error will be thrown.
+                                * ``is_markdown`` (boolean) If set to ``true``,
+                                  the comment has Markdown structures, otherwise
+                                  it is normal text.
+comment_is_private     object   This is how you update the privacy of comments
+                                that are already on a bug. This is a object,
+                                where the keys are the ``int`` ID of comments
+                                (not their count on a bug, like #1, #2, #3, but
+                                their globally-unique ID, as returned by
+                                :ref:`rest_comments` and the value is a
+                                ``boolean`` which specifies whether that comment
+                                should become private (``true``) or public
+                                (``false``).
+
+                                The comment IDs must be valid for the bug being
+                                updated. Thus, it is not practical to use this
+                                while updating multiple bugs at once, as a single
+                                comment ID will never be valid on multiple bugs.
+comment_tags           array    An array of strings to add as comment tags for
+                                the new comment.
+component              string   The Component the bug is in.
+deadline               date     The Deadline field is a date specifying when the
+                                bug must be completed by, in the format
+                                ``YYYY-MM-DD``.
+dupe_of                int      The bug that this bug is a duplicate of. If you
+                                want to mark a bug as a duplicate, the safest
+                                thing to do is to set this value and *not* set
+                                the ``status`` or ``resolution`` fields. They will
+                                automatically be set by Bugzilla to the
+                                appropriate values for duplicate bugs.
+estimated_time         double   The total estimate of time required to fix the
+                                bug, in hours. This is the *total* estimate, not
+                                the amount of time remaining to fix it.
+flags                  array    An array of Flag change objects. The items needed
+                                are described below.
+groups                 object   The groups a bug is in. To modify this field,
+                                pass an object, which may have the following
+                                items:
+
+                                * ``add`` (array) The names of groups to add.
+                                  Passing in an invalid group name or a group
+                                  that you cannot add to this bug will cause an
+                                  error to be thrown.
+                                * ``remove`` (array) The names of groups to
+                                  remove. Passing in an invalid group name or a
+                                  group that you cannot remove from this bug
+                                  will cause an error to be thrown.
+keywords               object   Keywords on the bug. To modify this field, pass
+                                an object, which may have the following items:
+
+                                * ``add`` (array) The names of keywords to add
+                                  to the field on the bug. Passing something that
+                                  isn't a valid keyword name will cause an error
+                                  to be thrown.
+                                * ``remove`` (array) The names of keywords to
+                                  remove from the field on the bug. Passing
+                                  something that isn't a valid keyword name will
+                                  cause an error to be thrown.
+                                * ``set`` (array) An exact set of keywords to set
+                                  the field to, on the bug. Passing something
+                                  that isn't a valid keyword name will cause an
+                                  error to be thrown. Specifying ``set``
+                                  overrides ``add`` and ``remove``.
+op_sys                 string   The Operating System ("OS") field on the bug.
+platform               string   The Platform or "Hardware" field on the bug.
+priority               string   The Priority field on the bug.
+product                string   The name of the product that the bug is in. If
+                                you change this, you will probably also want to
+                                change ``target_milestone``, ``version``, and
+                                ``component``, since those have different legal
+                                values in every product.
+
+                                If you cannot change the ``target_milestone``
+                                field, it will be reset to the default for the
+                                product, when you move a bug to a new product.
+
+                                You may also wish to add or remove groups, as
+                                which groups are
+                                valid on a bug depends on the product. Groups
+                                that are not valid in the new product will be
+                                automatically removed, and groups which are
+                                mandatory in the new product will be automatically
+                                added, but no other automatic group changes will
+                                be done.
+
+                                .. note::
+                                   Users can only move a bug into a product if
+                                   they would normally have permission to file
+                                   new bugs in that product.
+qa_contact             string   The full login name of the bug's QA Contact.
+is_creator_accessible  boolean  Whether or not the bug's reporter is allowed
+                                to access the bug, even if they aren't in a group
+                                that can normally access the bug.
+remaining_time         double   How much work time is remaining to fix the bug,
+                                in hours. If you set ``work_time`` but don't
+                                explicitly set ``remaining_time``, then the
+                                ``work_time`` will be deducted from the bug's
+                                ``remaining_time``.
+reset_assigned_to      boolean  If true, the ``assigned_to`` field will be
+                                reset to the default for the component that the
+                                bug is in. (If you have set the component at the
+                                same time as using this, then the component used
+                                will be the new component, not the old one.)
+reset_qa_contact       boolean  If true, the ``qa_contact`` field will be reset
+                                to the default for the component that the bug is
+                                in. (If you have set the component at the same
+                                time as using this, then the component used will
+                                be the new component, not the old one.)
+resolution             string   The current resolution. May only be set if you
+                                are closing a bug or if you are modifying an
+                                already-closed bug. Attempting to set the
+                                resolution to *any* value (even an empty or null
+                                string) on an open bug will cause an error to be
+                                thrown.
+
+                                .. note::
+                                   If you change the ``status`` field to an open
+                                   status, the resolution field will automatically
+                                   be cleared, so you don't have to clear it
+                                   manually.
+see_also               object   The See Also field on a bug, specifying URLs to
+                                bugs in other bug trackers. To modify this field,
+                                pass an object, which may have the following
+                                items:
+
+                                * ``add`` (array) URLs to add to the field. Each
+                                  URL must be a valid URL to a bug-tracker, or
+                                  an error will be thrown.
+                                * ``remove`` (array) URLs to remove from the
+                                  field. Invalid URLs will be ignored.
+severity               string   The Severity field of a bug.
+status                 string   The status you want to change the bug to. Note
+                                that if a bug is changing from open to closed,
+                                you should also specify a ``resolution``.
+summary                string   The Summary field of the bug.
+target_milestone       string   The bug's Target Milestone.
+url                    string   The "URL" field of a bug.
+version                string   The bug's Version field.
+whiteboard             string   The Status Whiteboard field of a bug.
+work_time              double   The number of hours worked on this bug as part
+                                of this change.
+                                If you set ``work_time`` but don't explicitly
+                                set ``remaining_time``, then the ``work_time``
+                                will be deducted from the bug's ``remaining_time``.
+=====================  =======  =================================================
+
+You can also set the value of any custom field by passing its name as
+a parameter, and the value to set the field to. For multiple-selection
+fields, the value should be an array of strings.
+
+Flag change object:
+
+The following values can be specified. At least the ``status`` and one of
+``type_id``, ``id``, or ``name`` must be specified. If a ``type_id`` or
+``name`` matches a single currently set flag, the flag will be updated unless
+``new`` is specified.
+
+==========  =======  ============================================================
+name        type     description
+==========  =======  ============================================================
+name        string   The name of the flag that will be created or updated.
+type_id     int      The internal flag type ID that will be created or updated.
+                     You will need to specify the ``type_id`` if more than one
+                     flag type of the same name exists.
+**status**  string   The flags new status (i.e. "?", "+", "-" or "X" to clear a
+                     flag).
+requestee   string   The login of the requestee if the flag type is requestable
+                     to a specific user.
+id          int      Use ID to specify the flag to be updated. You will need to
+                     specify the ``id`` if more than one flag is set of the same
+                     name.
+new         boolean  Set to true if you specifically want a new flag to be
+                     created.
+==========  =======  ============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "bugs" : [
+       {
+         "alias" : [],
+         "changes" : {
+           "keywords" : {
+             "added" : "funny, stupid",
+             "removed" : ""
+           },
+             "status" : {
+               "added" : "IN_PROGRESS",
+               "removed" : "CONFIRMED"
+           }
+         },
+         "id" : 35,
+         "last_change_time" : "2014-09-29T14:25:35Z"
+       }
+     ]
+   }
+
+``bugs`` (array) This points to an array of objects with the following items:
+
+================  ========  =====================================================
+name              type      description
+================  ========  =====================================================
+id                int       The ID of the bug that was updated.
+alias             array     The aliases of the bug that was updated, if this bug
+                            has any alias.
+last_change_time  datetime  The exact time that this update was done at, for
+                            this bug. If no update was done (that is, no fields
+                            had their values changed and no comment was added)
+                            then this will instead be the last time the bug was
+                            updated.
+changes           object    The changes that were actually done on this bug. The
+                            keys are the names of the fields that were changed,
+                            and the values are an object with two keys:
+
+                            * ``added`` (string) The values that were added to
+                              this field, possibly a comma-and-space-separated
+                              list if multiple values were added.
+                            * ``removed`` (string) The values that were removed
+                              from this field, possibly a
+                              comma-and-space-separated list if multiple values
+                              were removed.
+================  ========  =====================================================
+
+Currently, some fields are not tracked in changes: ``comment``,
+``comment_is_private``, and ``work_time``. This means that they will not
+show up in the return value even if they were successfully updated.
+This may change in a future version of Bugzilla.
+
+**Errors**
+
+This method can throw all the same errors as :ref:`rest_single_bug`, plus:
+
+* 129 (Flag Status Invalid)
+  The flag status is invalid.
+* 130 (Flag Modification Denied)
+  You tried to request, grant, or deny a flag but only a user with the required
+  permissions may make the change.
+* 131 (Flag not Requestable from Specific Person)
+  You can't ask a specific person for the flag.
+* 132 (Flag not Unique)
+  The flag specified has been set multiple times. You must specify the id
+  value to update the flag.
+* 133 (Flag Type not Unique)
+  The flag type specified matches several flag types. You must specify
+  the type id value to update or add a flag.
+* 134 (Inactive Flag Type)
+  The flag type is inactive and cannot be used to create new flags.
+* 140 (Markdown Disabled)
+  You tried to set the "is_markdown" flag of the "comment" to true but Markdown feature is
+  not enabled.
+* 601 (Invalid MIME Type)
+  You specified a "content_type" argument that was blank, not a valid
+  MIME type, or not a MIME type that Bugzilla accepts for attachments.
+* 603 (File Name Not Specified)
+  You did not specify a valid for the "file_name" argument.
+* 604 (Summary Required)
+  You did not specify a value for the "summary" argument.
diff --git a/docs/en/rst/api/core/v1/bugzilla.rst b/docs/en/rst/api/core/v1/bugzilla.rst
new file mode 100644
index 0000000000..f0ba58e654
--- /dev/null
+++ b/docs/en/rst/api/core/v1/bugzilla.rst
@@ -0,0 +1,280 @@
+Bugzilla Information
+====================
+
+These methods are used to get general configuration information about this
+Bugzilla instance.
+
+Version
+-------
+
+Returns the current version of Bugzilla. Normally in the format of ``X.X`` or
+``X.X.X``. For example, ``4.4`` for the initial release of a new branch. Or
+``4.4.6`` for a minor release on the same branch.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/version
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "version": "4.5.5+"
+   }
+
+=======  ======  =========================================
+name     type    description
+=======  ======  =========================================
+version  string  The current version of this Bugzilla
+=======  ======  =========================================
+
+Extensions
+----------
+
+Gets information about the extensions that are currently installed and enabled
+in this Bugzilla.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/extensions
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "extensions": {
+       "Voting": {
+         "version": "4.5.5+"
+       },
+       "BmpConvert": {
+         "version": "1.0"
+       }
+     }
+   }
+
+==========  ======  ====================================================
+name        type    description
+==========  ======  ====================================================
+extensions  object  An object containing the extensions enabled as keys.
+                    Each extension object contains the following keys:
+
+                    * ``version`` (string) The version of the extension.
+==========  ======  ====================================================
+
+Timezone
+--------
+
+Returns the timezone in which Bugzilla expects to receive dates and times on the API.
+Currently hard-coded to UTC ("+0000"). This is unlikely to change.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/timezone
+
+.. code-block:: js
+
+   {
+     "timezone": "+0000"
+   }
+
+**Response**
+
+========  ======  ===============================================================
+name      type    description
+========  ======  ===============================================================
+timezone  string  The timezone offset as a string in (+/-)XXXX (RFC 2822) format.
+========  ======  ===============================================================
+
+Time
+----
+
+Gets information about what time the Bugzilla server thinks it is, and
+what timezone it's running in.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/time
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "db_time": "2014-09-26T18:01:30Z",
+     "web_time": "2014-09-26T18:01:30Z",
+   }
+
+=============  ======  ==========================================================
+name           type    description
+=============  ======  ==========================================================
+db_time        string  The current time in UTC, according to the Bugzilla
+                       database server.
+
+                       Note that Bugzilla assumes that the database and the
+                       webserver are running in the same time zone. However,
+                       if the web server and the database server aren't
+                       synchronized or some reason, *this* is the time that
+                       you should rely on for doing searches and other input
+                       to the WebService.
+web_time       string  This is the current time in UTC, according to
+                       Bugzilla's web server.
+
+                       This might be different by a second from ``db_time``
+                       since this comes from a different source. If it's any
+                       more different than a second, then there is likely
+                       some problem with this Bugzilla instance. In this
+                       case you should rely  on the ``db_time``, not the
+                       ``web_time``.
+=============  ======  ==========================================================
+
+Parameters
+----------
+
+Returns parameter values currently used in this Bugzilla.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/parameters
+
+**Response**
+
+Example response for anonymous user:
+
+.. code-block:: js
+
+   {
+      "parameters" : {
+         "maintainer" : "admin@example.com",
+         "requirelogin" : "0"
+      }
+   }
+
+Example response for authenticated user:
+
+.. code-block:: js
+
+   {
+      "parameters" : {
+          "allowemailchange" : "1",
+          "attachment_base" : "http://bugzilla.example.com/",
+          "commentonchange_resolution" : "0",
+          "commentonduplicate" : "0",
+          "createemailregexp" : ".*",
+          "defaultopsys" : "",
+          "defaultplatform" : "",
+          "defaultpriority" : "--",
+          "defaultseverity" : "normal",
+          "duplicate_or_move_bug_status" : "RESOLVED",
+          "emailregexp" : "^[\\w\\.\\+\\-=']+@[\\w\\.\\-]+\\.[\\w\\-]+$",
+          "letsubmitterchoosemilestone" : "1",
+          "letsubmitterchoosepriority" : "1",
+          "mailfrom" : "bugzilla-daemon@example.com",
+          "maintainer" : "admin@example.com",
+          "maxattachmentsize" : "1000",
+          "maxlocalattachment" : "0",
+          "password_complexity" : "no_constraints",
+          "rememberlogin" : "on",
+          "requirelogin" : "0",
+          "resolution_forbidden_with_open_blockers" : "FIXED",
+          "urlbase" : "http://bugzilla.example.com/",
+          "use_see_also" : "1",
+          "useclassification" : "1",
+          "usemenuforusers" : "0",
+          "useqacontact" : "1",
+          "usestatuswhiteboard" : "1",
+          "usetargetmilestone" : "1",
+      }
+   }
+
+A logged-out user can only access the ``maintainer`` and ``requirelogin``
+parameters.
+
+A logged-in user can access the following parameters (listed alphabetically):
+
+* allowemailchange
+* attachment_base
+* commentonchange_resolution
+* commentonduplicate
+* defaultopsys
+* defaultplatform
+* defaultpriority
+* defaultseverity
+* duplicate_or_move_bug_status
+* emailregexpdesc
+* letsubmitterchoosemilestone
+* letsubmitterchoosepriority
+* mailfrom
+* maintainer
+* maxattachmentsize
+* maxlocalattachment
+* password_complexity
+* rememberlogin
+* requirelogin
+* resolution_forbidden_with_open_blockers
+* search_allow_no_criteria
+* urlbase
+* use_see_also
+* useclassification
+* usemenuforusers
+* useqacontact
+* usestatuswhiteboard
+* usetargetmilestone
+
+A user in the tweakparams group can access all existing parameters.
+New parameters can appear or obsolete parameters can disappear depending
+on the version of Bugzilla and on extensions being installed.
+The list of parameters returned by this method is not stable and will
+never be stable.
+
+Last Audit Time
+---------------
+
+Gets the most recent timestamp among all of the events recorded in the audit_log
+table.
+
+**Request**
+
+To get most recent audit timestamp for all classes:
+
+.. code-block:: text
+
+   GET /rest/last_audit_time
+
+To get the the most recent audit timestamp for the ``Bugzilla::Product`` class:
+
+.. code-block:: text
+
+   GET /rest/last_audit_time?class=Bugzilla::Product
+
+=====  =====  ===================================================================
+name   type   description
+=====  =====  ===================================================================
+class  array  The class names are defined as ``Bugzilla::<class_name>"`` such as
+              Bugzilla:Product`` for products.
+=====  =====  ===================================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "last_audit_time": "2014-09-23T18:03:38Z"
+   }
+
+===============  ======  ====================================================
+name             type    description
+===============  ======  ====================================================
+last_audit_time  string  The maximum of the at_time from the audit_log.
+===============  ======  ====================================================
diff --git a/docs/en/rst/api/core/v1/classification.rst b/docs/en/rst/api/core/v1/classification.rst
new file mode 100644
index 0000000000..efff5e50f0
--- /dev/null
+++ b/docs/en/rst/api/core/v1/classification.rst
@@ -0,0 +1,79 @@
+Classifications
+===============
+
+This part of the Bugzilla API allows you to deal with the available
+classifications. You will be able to get information about them as well as
+manipulate them.
+
+.. _rest_get_classification:
+
+Get Classification
+------------------
+
+Returns an object containing information about a set of classifications.
+
+**Request**
+
+To return information on a single classification using the ID or name:
+
+.. code-block:: text
+
+   GET /rest/classification/(id_or_name)
+
+==============  =====  =====================================
+name            type   description
+==============  =====  =====================================
+**id_or_name**  mixed  An Integer classification ID or name.
+==============  =====  =====================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "classifications": [
+       {
+         "sort_key": 0,
+         "description": "Unassigned to any classifications",
+         "products": [
+           {
+             "id": 2,
+             "name": "FoodReplicator",
+             "description": "Software that controls a piece of hardware that will create any food item through a voice interface."
+           },
+           {
+             "description": "Silk, etc.",
+             "name": "Spider Secretions",
+             "id": 4
+           }
+         ],
+         "id": 1,
+         "name": "Unclassified"
+       }
+     ]
+   }
+
+``classifications`` (array) Each object is a classification that the user is
+authorized to see and has the following items:
+
+===========  ======  ============================================================
+name         type    description
+===========  ======  ============================================================
+id           int     The ID of the classification.
+name         string  The name of the classification.
+description  string  The description of the classificaion.
+sort_key     int     The value which determines the order the classification is
+                     sorted.
+products     array   Products the user is authorized to access within the
+                     classification. The product object keys are described below.
+===========  ======  ============================================================
+
+Product object:
+
+===========  ======  ================================
+name         type    description
+===========  ======  ================================
+name         string  The name of the product.
+id           int     The ID of the product.
+description  string  The description of the product.
+===========  ======  ================================
diff --git a/docs/en/rst/api/core/v1/comment.rst b/docs/en/rst/api/core/v1/comment.rst
new file mode 100644
index 0000000000..5160495eaf
--- /dev/null
+++ b/docs/en/rst/api/core/v1/comment.rst
@@ -0,0 +1,300 @@
+Comments
+========
+
+.. _rest_comments:
+
+Get Comments
+------------
+
+This allows you to get data about comments, given a bug ID or comment ID.
+
+**Request**
+
+To get all comments for a particular bug using the bug ID or alias:
+
+.. code-block:: text
+
+   GET /rest/bug/(id_or_alias)/comment
+
+To get a specific comment based on the comment ID:
+
+.. code-block:: text
+
+   GET /rest/bug/comment/(comment_id)
+
+===============  ========  ======================================================
+name             type      description
+===============  ========  ======================================================
+**id_or_alias**  mixed     A single integer bug ID or alias.
+**comment_id**   int       A single integer comment ID.
+new_since        datetime  If specified, the method will only return comments
+                           *newer* than this time. This only affects comments
+                           returned from the ``ids`` argument. You will always be
+                           returned all comments you request in the
+                           ``comment_ids`` argument, even if they are older than
+                           this date.
+===============  ========  ======================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "bugs": {
+       "35": {
+         "comments": [
+           {
+             "time": "2000-07-25T13:50:04Z",
+             "text": "test bug to fix problem in removing from cc list.",
+             "bug_id": 35,
+             "count": 0,
+             "attachment_id": null,
+             "is_private": false,
+             "is_markdown" : true,
+             "tags": [],
+             "creator": "user@bugzilla.org",
+             "creation_time": "2000-07-25T13:50:04Z",
+             "id": 75
+           }
+         ]
+       }
+     },
+     "comments": {}
+   }
+
+Two items are returned:
+
+``bugs`` This is used for bugs specified in ``ids``. This is an object,
+where the keys are the numeric IDs of the bugs, and the value is
+a object with a single key, ``comments``, which is an array of comments.
+(The format of comments is described below.)
+
+Any individual bug will only be returned once, so if you specify an ID
+multiple times in ``ids``, it will still only be returned once.
+
+``comments`` Each individual comment requested in ``comment_ids`` is
+returned here, in a object where the numeric comment ID is the key,
+and the value is the comment. (The format of comments is described below.)
+
+A "comment" as described above is a object that contains the following items:
+
+=============  ========  ========================================================
+name           type      description
+=============  ========  ========================================================
+id             int       The globally unique ID for the comment.
+bug_id         int       The ID of the bug that this comment is on.
+attachment_id  int       If the comment was made on an attachment, this will be
+                         the ID of that attachment. Otherwise it will be null.
+count          int       The number of the comment local to the bug. The
+                         Description is 0, comments start with 1.
+text           string    The actual text of the comment.
+creator        string    The login name of the comment's author.
+time           datetime  The time (in Bugzilla's timezone) that the comment was
+                         added.
+creation_time  datetime  This is exactly same as the ``time`` key. Use this
+                         field instead of ``time`` for consistency with other
+                         methods including :ref:`rest_single_bug` and
+                         :ref:`rest_attachments`.
+
+                         For compatibility, ``time`` is still usable. However,
+                         please note that ``time`` may be deprecated and removed
+                         in a future release.
+
+is_private     boolean   ``true`` if this comment is private (only visible to a
+                         certain group called the "insidergroup"), ``false``
+                         otherwise.
+is_markdown    boolean   ``true`` if this comment needs Markdown processing;
+                         ``false`` otherwise.
+tags           array     An array of comment tags currently set for the comment.
+=============  ========  ========================================================
+
+**Errors**
+
+This method can throw all the same errors as :ref:`rest_single_bug`. In addition,
+it can also throw the following errors:
+
+* 110 (Comment Is Private)
+  You specified the id of a private comment in the "comment_ids"
+  argument, and you are not in the "insider group" that can see
+  private comments.
+* 111 (Invalid Comment ID)
+  You specified an id in the "comment_ids" argument that is invalid--either
+  you specified something that wasn't a number, or there is no comment with
+  that id.
+
+.. _rest_add_comment:
+
+Create Comments
+---------------
+
+This allows you to add a comment to a bug in Bugzilla.
+
+**Request**
+
+To create a comment on a current bug.
+
+.. code-block:: text
+
+   POST /rest/bug/(id)/comment
+
+.. code-block:: js
+
+   {
+     "comment" : "This is an additional comment",
+     "is_private" : false,
+     "is_markdown" : true,
+   }
+
+============  =======  ===========================================================
+name          type     description
+============  =======  ===========================================================
+**id**        int      The ID or alias of the bug to append a comment to.
+**comment**   string   The comment to append to the bug. If this is empty
+                       or all whitespace, an error will be thrown saying that you
+                       did not set the ``comment`` parameter.
+comment_tags  array    An array of strings to add as comment tags for the new
+                       comment.
+is_private    boolean  If set to ``true``, the comment is private, otherwise it is
+                       assumed to be public.
+is_markdown   boolean  If set to ``true``, the comment has Markdown structures;
+                       otherwise it is normal text.
+work_time     double   Adds this many hours to the "Hours Worked" on the bug.
+                       If you are not in the time tracking group, this value will
+                       be ignored.
+============  =======  ===========================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id" : 789
+   }
+
+====  ====  =================================
+name  type  description
+====  ====  =================================
+id    int   ID of the newly-created comment.
+====  ====  =================================
+
+**Errors**
+
+* 54 (Hours Worked Too Large)
+  You specified a "work_time" larger than the maximum allowed value of
+  "99999.99".
+* 100 (Invalid Bug Alias)
+  If you specified an alias and there is no bug with that alias.
+* 101 (Invalid Bug ID)
+  The id you specified doesn't exist in the database.
+* 109 (Bug Edit Denied)
+  You did not have the necessary rights to edit the bug.
+* 113 (Can't Make Private Comments)
+  You tried to add a private comment, but don't have the necessary rights.
+* 114 (Comment Too Long)
+  You tried to add a comment longer than the maximum allowed length
+  (65,535 characters).
+* 140 (Markdown Disabled)
+  You tried to set the "is_markdown" flag to true but the Markdown feature
+  is not enabled.
+
+.. _rest_search_comment_tags:
+
+Search Comment Tags
+-------------------
+
+Searches for tags which contain the provided substring.
+
+**Request**
+
+To search for comment tags:
+
+.. code-block:: text
+
+   GET /rest/bug/comment/tags/(query)
+
+Example:
+
+.. code-block:: text
+
+   GET /rest/bug/comment/tags/spa
+
+=========  ======  ====================================================
+name       type    description
+=========  ======  ====================================================
+**query**  string  Only tags containing this substring will be returned.
+limit      int     If provided will return no more than ``limit`` tags.
+                   Defaults to ``10``.
+=========  ======  ====================================================
+
+**Response**
+
+.. code-block:: js
+
+   [
+     "spam"
+   ]
+
+An array of matching tags.
+
+**Errors**
+
+This method can throw all of the errors that :ref:`rest_single_bug` throws, plus:
+
+* 125 (Comment Tagging Disabled)
+  Comment tagging support is not available or enabled.
+
+.. _rest_update_comment_tags:
+
+Update Comment Tags
+-------------------
+
+Adds or removes tags from a comment.
+
+**Request**
+
+To update the tags comments attached to a comment:
+
+.. code-block:: text
+
+   PUT /rest/bug/comment/(comment_id)/tags
+
+Example:
+
+.. code-block:: js
+
+   {
+     "comment_id" : 75,
+     "add" : ["spam", "bad"]
+   }
+
+==============  =====  ====================================
+name            type   description
+==============  =====  ====================================
+**comment_id**  int    The ID of the comment to update.
+add             array  The tags to attach to the comment.
+remove          array  The tags to detach from the comment.
+==============  =====  ====================================
+
+**Response**
+
+.. code-block:: js
+
+   [
+     "bad",
+     "spam"
+   ]
+
+An array of strings containing the comment's updated tags.
+
+**Errors**
+
+This method can throw all of the errors that :ref:`rest_single_bug` throws, plus:
+
+* 125 (Comment Tagging Disabled)
+  Comment tagging support is not available or enabled.
+* 126 (Invalid Comment Tag)
+  The comment tag provided was not valid (eg. contains invalid characters).
+* 127 (Comment Tag Too Short)
+  The comment tag provided is shorter than the minimum length.
+* 128 (Comment Tag Too Long)
+  The comment tag provided is longer than the maximum length.
diff --git a/docs/en/rst/api/core/v1/component.rst b/docs/en/rst/api/core/v1/component.rst
new file mode 100644
index 0000000000..bc5120312c
--- /dev/null
+++ b/docs/en/rst/api/core/v1/component.rst
@@ -0,0 +1,230 @@
+Components
+==========
+
+This part of the Bugzilla API allows you to deal with the available product
+components. You will be able to get information about them as well as manipulate
+them.
+
+.. _rest_create_component:
+
+Create Component
+----------------
+
+This allows you to create a new component in Bugzilla. You must be authenticated
+and be in the *editcomponents* group to perform this action.
+
+**Request**
+
+To create a new component:
+
+.. code-block:: text
+
+   POST /rest/component
+
+.. code-block:: js
+
+   {
+     "product" : "TestProduct",
+     "name" : "New Component",
+     "description" : "This is a new component",
+     "default_assignee" : "dkl@mozilla.com"
+   }
+
+Some params must be set, or an error will be thrown. These params are
+shown in **bold**.
+
+====================  =======  ==================================================
+name                  type     description
+====================  =======  ==================================================
+**name**              string   The name of the new component.
+**product**           string   The name of the product that the component must
+                               be added to. This product must already exist, and
+                               the user have the necessary permissions to edit
+                               components for it.
+**description**       string   The description of the new component.
+**default_assignee**  string   The login name of the default assignee of the
+                               component.
+default_cc            array    Each string representing one login name of the
+                               default CC list.
+default_qa_contact    string   The login name of the default QA contact for the
+                               component.
+is_open               boolean  1 if you want to enable the component for bug
+                               creations. 0 otherwise. Default is 1.
+====================  =======  ==================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id": 27
+   }
+
+====  ====  ========================================
+name  type  description
+====  ====  ========================================
+id    int   The ID of the newly-added component.
+====  ====  ========================================
+
+**Errors**
+
+* 304 (Authorization Failure)
+  You are not authorized to create a new component.
+* 1200 (Component already exists)
+  The name that you specified for the new component already exists in the
+  specified product.
+
+.. _rest_update_component:
+
+Update Component
+----------------
+
+This allows you to update one or more components in Bugzilla.
+
+**Request**
+
+.. code-block:: text
+
+   PUT /rest/component/<component_id>
+   PUT /rest/component/<product_name>/<component_name>
+
+The params to include in the PUT body as well as the returned data format,
+are the same as below. The "ids" and "names" params will be overridden as
+it is pulled from the URL path.
+
+==================  =======  ==============================================================
+name                type     description
+==================  =======  ==============================================================
+**ids**             array    Numeric ids of the components that you wish to update.
+**names**           array    Objects with names of the components that you wish to update.
+                             The object keys are "product" and "component", representing
+                             the name of the product and the component you wish to change.
+name                string   A new name for this component. If you try to set this while
+                             updating more than one component for a product, an error
+                             will occur, as component names must be unique per product.
+description         string   Update the long description for these components to this value.
+default_assignee    string   The login name of the default assignee of the component.
+default_cc          array    An array of strings with each element representing one
+                             login name of the default CC list.
+default_qa_contact  string   The login name of the default QA contact for the component.
+is_open             boolean  True if the component is currently allowing bugs to be
+                             entered into it, False otherwise.
+==================  =======  ==============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "components" : [
+       {
+         "id" : 123,
+         "changes" : {
+           "name" : {
+             "removed" : "FooName",
+             "added"   : "BarName"
+           },
+           "default_assignee" : {
+             "removed" : "foo@company.com",
+             "added"   : "bar@company.com"
+           }
+         }
+       }
+     ]
+   }
+
+An object with a single field "components". This points to an array of objects
+with the following fields:
+
+=======  =======  =================================================================
+name     type     description
+=======  =======  =================================================================
+id       int      The id of the component that was updated.
+changes  object   The changes that were actually done on this component. The keys
+                  are the names of the fields that were changed, and the values
+                  are an object with two keys:
+
+                  added (string) The value that this field was changed to.
+                  removed (string) The value that was previously set in this field.
+=======  =======  =================================================================
+
+Note that booleans will be represented with the strings '1' and '0'.
+
+**Errors**
+
+* 51 (User does not exist)
+  One of the contact e-mail addresses is not a valid Bugzilla user.
+* 106 (Product access denied)
+  The product you are trying to modify does not exist or you don't have access to it.
+* 706 (Product admin denied)
+  You do not have the permission to change components for this product.
+* 105 (Component name too long)
+  The name specified for this component was longer than the maximum
+  allowed length.
+* 1200 (Component name already exists)
+  You specified the name of a component that already exists.
+  (Component names must be unique per product in Bugzilla.)
+* 1210 (Component blank name)
+  You must specify a non-blank name for this component.
+* 1211 (Component must have description)
+  You must specify a description for this component.
+* 1212 (Component name is not unique)
+  You have attempted to set more than one component in the same product with the
+  same name. Component names must be unique in each product.
+* 1213 (Component needs a default assignee)
+  A default assignee is required for this component.
+
+.. _rest_delete_component:
+
+Delete Component
+----------------
+
+This allows you to delete one or more components in Bugzilla.
+
+**Request**
+
+.. code-block:: text
+
+   DELETE /rest/component/<component_id>
+   DELETE /rest/component/<product_name>/<component_name>
+
+=========  =====  ============================================================
+name       type   description
+=========  =====  ============================================================
+**ids**    int    Numeric ids of the components that you wish to delete.
+**names**  array  Objects containing the names of the components that you wish
+                  to delete. The object keys are "product" and "component",
+                  representing the name of the product and the component you
+                  wish to delete.
+=========  =====  ============================================================
+
+**Response**
+
+An object with a single field "components". This points to an array of objects
+with the following field:
+
+====  ====  =========================================
+name  type  description
+====  ====  =========================================
+id    int   The id of the component that was deleted.
+====  ====  =========================================
+
+.. code-block:: js
+
+   {
+     "components" : [
+       {
+         "id" : 123,
+       }
+     ]
+   }
+
+**Errors**
+
+* 106 (Product access denied)
+  The product you are trying to modify does not exist or you don't have access to it.
+* 706 (Product admin denied)
+  You do not have the permission to delete components for this product.
+* 1202 (Component has bugs)
+  The component you are trying to delete currently has bugs assigned to it.
+  You must move these bugs before trying to delete the component.
diff --git a/docs/en/rst/api/core/v1/field.rst b/docs/en/rst/api/core/v1/field.rst
new file mode 100644
index 0000000000..a9ad65eff3
--- /dev/null
+++ b/docs/en/rst/api/core/v1/field.rst
@@ -0,0 +1,253 @@
+Bug Fields
+==========
+
+The Bugzilla API for getting details about bug fields.
+
+.. _rest_fields:
+
+Fields
+------
+
+Get information about valid bug fields, including the lists of legal values
+for each field.
+
+**Request**
+
+To get information about all fields:
+
+.. code-block:: text
+
+   GET /rest/field/bug
+
+To get information related to a single field:
+
+.. code-block:: text
+
+   GET /rest/field/bug/(id_or_name)
+
+==========  =====  ==========================================================
+name        type   description
+==========  =====  ==========================================================
+id_or_name  mixed  An integer field ID or string representing the field name.
+==========  =====  ==========================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "fields": [
+       {
+         "display_name": "Priority",
+         "name": "priority",
+         "type": 2,
+         "is_mandatory": false,
+         "value_field": null,
+         "values": [
+           {
+             "sortkey": 100,
+             "sort_key": 100,
+             "visibility_values": [],
+             "name": "P1"
+           },
+           {
+             "sort_key": 200,
+             "name": "P2",
+             "visibility_values": [],
+             "sortkey": 200
+           },
+           {
+             "sort_key": 300,
+             "visibility_values": [],
+             "name": "P3",
+             "sortkey": 300
+           },
+           {
+             "sort_key": 400,
+             "name": "P4",
+             "visibility_values": [],
+             "sortkey": 400
+           },
+           {
+             "name": "P5",
+             "visibility_values": [],
+             "sort_key": 500,
+             "sortkey": 500
+           }
+         ],
+         "visibility_values": [],
+         "visibility_field": null,
+         "is_on_bug_entry": false,
+         "is_custom": false,
+         "id": 13
+       }
+     ]
+   }
+
+``field`` (array) Field objects each containing the following items:
+
+=================  =======  =====================================================
+name               type     description
+=================  =======  =====================================================
+id                 int      An integer ID uniquely identifying this field in this
+                            installation only.
+type               int      The number of the fieldtype. The following values are
+                            defined:
+
+                            * ``0`` Field type unknown
+                            * ``1`` Single-line string field
+                            * ``2`` Single value field
+                            * ``3`` Multiple value field
+                            * ``4`` Multi-line text value
+                            * ``5`` Date field with time
+                            * ``6`` Bug ID field
+                            * ``7`` See Also field
+                            * ``8`` Keywords field
+                            * ``9`` Date field
+                            * ``10`` Integer field
+
+is_custom          boolean  ``true`` when this is a custom field, ``false``
+                            otherwise.
+name               string   The internal name of this field. This is a unique
+                            identifier for this field. If this is not a custom
+                            field, then this name will be the same across all
+                            Bugzilla installations.
+display_name       string   The name of the field, as it is shown in the user
+                            interface.
+is_mandatory       boolean  ``true`` if the field must have a value when filing
+                            new bugs. Also, mandatory fields cannot have their
+                            value cleared when updating bugs.
+is_on_bug_entry    boolean  For custom fields, this is ``true`` if the field is
+                            shown when you enter a new bug. For standard fields,
+                            this is currently always ``false``, even if the field
+                            shows up when entering a bug. (To know whether or not
+                            a standard field is valid on bug entry, see
+                            :ref:`rest_create_bug`.
+visibility_field   string   The name of a field that controls the visibility of
+                            this field in the user interface. This field only
+                            appears in the user interface when the named field is
+                            equal to one of the values is ``visibility_values``.
+                            Can be null.
+visibility_values  array    This field is only shown when ``visibility_field``
+                            matches one of these string values. When
+                            ``visibility_field`` is null, then this is an empty
+                            array.
+value_field        string   The name of the field that controls whether or not
+                            particular values of the field are shown in the user
+                            interface. Can be null.
+values             array    Objects representing the legal values for
+                            select-type (drop-down and multiple-selection)
+                            fields. This is  also populated for the
+                            ``component``, ``version``, ``target_milestone``,
+                            and ``keywords`` fields, but not for the ``product``
+                            field (you must use ``get_accessible_products`` for
+                            that). For fields that aren't select-type fields,
+                            this will simply be an empty array. Each object
+                            contains the items described in the Value object
+                            below.
+=================  =======  =====================================================
+
+Value object:
+
+=================  =======  =====================================================
+name               type     description
+=================  =======  =====================================================
+name               string   The actual value--this is what you would specify for
+                            this field in ``create``, etc.
+sort_key           int      Values, when displayed in a list, are sorted first by
+                            this integer and then secondly by their name.
+visibility_values  array    If ``value_field`` is defined for this field, then
+                            this value is only shown if the ``value_field`` is
+                            set to one of the values listed in this array. Note
+                            that for per-product fields, ``value_field`` is set
+                            to ``product`` and ``visibility_values`` will reflect
+                            which product(s) this value appears in.
+is_active          boolean  This value is defined only for certain
+                            product-specific fields such as version,
+                            target_milestone or component. When true, the value
+                            is active; otherwise the value is not active.
+description        string   The description of the value. This item is only
+                            included for the ``keywords`` field.
+is_open            boolean  For ``bug_status`` values, determines whether this
+                            status specifies that the bug is "open" (``true``)
+                            or "closed" (``false``). This item is only included
+                            for the ``bug_status`` field.
+can_change_to      array    For ``bug_status`` values, this is an array of
+                            objects that determine which statuses you can
+                            transition to from this status. (This item is only
+                            included for the ``bug_status`` field.)
+
+                            Each object contains the following items:
+
+                            * name: (string) The name of the new status
+                            * comment_required: (boolean) ``true`` if a comment
+                              is required when you change a bug into this status
+                              using this transition.
+=================  =======  =====================================================
+
+**Errors**
+
+* 51 (Invalid Field Name or Id)
+  You specified an invalid field name or id.
+
+.. _rest_legal_values:
+
+Legal Values
+------------
+
+**DEPRECATED** Use ''Fields'' instead.
+
+Tells you what values are allowed for a particular field.
+
+**Request**
+
+To get information on the values for a field based on field name:
+
+.. code-block:: text
+
+   GET /rest/field/bug/(field)/values
+
+To get information based on field name and a specific product:
+
+.. code-block:: text
+
+   GET /rest/field/bug/(field)/(product_id)/values
+
+==========  ======  =============================================================
+name        type    description
+==========  ======  =============================================================
+field       string  The name of the field you want information about.
+                    This should be the same as the name you would use in
+                    :ref:`rest_create_bug`, below.
+product_id  int     If you're picking a product-specific field, you have to
+                    specify the ID of the product you want the values for.
+==========  ======  =============================================================
+
+**Resppnse**
+
+.. code-block:: js
+
+   {
+     "values": [
+       "P1",
+       "P2",
+       "P3",
+       "P4",
+       "P5"
+     ]
+   }
+
+==========  ======  =============================================================
+name        type    description
+==========  ======  =============================================================
+values      array   The legal values for this field. The values will be sorted
+                    as they normally would be in Bugzilla.
+==========  ======  =============================================================
+
+**Errors**
+
+* 106 (Invalid Product)
+  You were required to specify a product, and either you didn't, or you
+  specified an invalid product (or a product that you can't access).
+* 108 (Invalid Field Name)
+  You specified a field that doesn't exist or isn't a drop-down field.
diff --git a/docs/en/rst/api/core/v1/flagtype.rst b/docs/en/rst/api/core/v1/flagtype.rst
new file mode 100644
index 0000000000..d962f7d91c
--- /dev/null
+++ b/docs/en/rst/api/core/v1/flagtype.rst
@@ -0,0 +1,434 @@
+Flag Types
+==========
+
+This part of the Bugzilla API allows you to get and create bug and attachment
+flags.
+
+.. _rest_flagtype_get:
+
+Get Flag Type
+-------------
+
+Get information about valid flag types that can be set for bugs and attachments.
+
+**Request**
+
+To get information about all flag types for a product:
+
+.. code-block:: text
+
+   GET /rest/flag_type/(product)
+
+To get information about flag_types for a product and component:
+
+.. code-block:: text
+
+   GET /rest/flag_type/(product)/(component)
+
+.. code-block:: js
+
+   {
+     "bug": [
+       {
+         "is_multiplicable": false,
+         "is_requesteeble": false,
+         "values": [
+           "X",
+           "?",
+           "+",
+           "-"
+         ],
+         "id": 11,
+         "type": "bug",
+         "is_active": true,
+         "description": "Blocks the next release",
+         "name": "blocker"
+       },
+       {
+         "is_requesteeble": false,
+         "is_multiplicable": false,
+         "is_active": true,
+         "description": "Regression found?",
+         "name": "regression",
+         "id": 10,
+         "type": "bug",
+         "values": [
+           "X",
+           "?",
+           "+",
+           "-"
+         ]
+       },
+     ],
+     "attachment": [
+       {
+         "is_requesteeble": true,
+         "is_multiplicable": true,
+         "name": "review",
+         "is_active": true,
+         "description": "Review the patch for correctness and applicability to the problem.",
+         "type": "attachment",
+         "id": 1,
+         "values": [
+           "X",
+           "?",
+           "+",
+           "-"
+         ]
+       },
+       {
+         "name": "approval",
+         "description": "Approve the patch for check-in to the tree.",
+         "is_active": true,
+         "values": [
+           "X",
+           "?",
+           "+",
+           "-"
+         ],
+         "type": "attachment",
+         "id": 3,
+         "is_multiplicable": false,
+         "is_requesteeble": false
+       }
+     ]
+   }
+
+You must pass a product name and an optional component name. If the product or
+component names contains a ``/`` character, up will need to url encode it.
+
+===========  ======  ============================================================
+name         type    description
+===========  ======  ============================================================
+**product**  string  The name of a valid product.
+component    string  An optional valid component name associated with the
+                     product.
+===========  ======  ============================================================
+
+**Response**
+
+An object containing two items, ``bug`` and ``attachment``. Each value is an
+array of objects, containing the following items:
+
+================  =======  ======================================================
+name              type     description
+================  =======  ======================================================
+id                int      An integer ID uniquely identifying this flag type.
+name              string   The name for the flag type.
+type              string   The target of the flag type which is either ``bug``
+                           or ``attachment``.
+description       string   The description of the flag type.
+values            array    String values that the user can set on the flag type.
+is_requesteeble   boolean  Users can ask specific other users to set flags of
+                           this type.
+is_multiplicable  boolean  Multiple flags of this type can be set for the same
+                           bug or attachment.
+================  =======  ======================================================
+
+**Errors**
+
+* 106 (Product Access Denied)
+  Either the product does not exist or you don't have access to it.
+* 51 (Invalid Component)
+  The component provided does not exist in the product.
+
+.. _rest_flagtype_create:
+
+Create Flag Type
+----------------
+
+Create a new flag type. You must be authenticated and be in the *editcomponents*
+group to perform this action.
+
+**Request**
+
+.. code-block:: text
+
+   POST /rest/flag_type
+
+.. code-block:: js
+
+   {
+     "name" : "feedback",
+     "description" : "This attachment needs feedback",
+     "inclusions" : [ "WorldControl "],
+     "target_type" : "attachment"
+   }
+
+Some params must be set, or an error will be thrown. The required params are
+marked in **bold**.
+
+===========================  =======  ===========================================
+name                         type     description
+===========================  =======  ===========================================
+**name**                     string   The name of the new flag type.
+**description**              string   A description for the flag type.
+target_type                  string   The new flag is either for a ``bug`` or an
+                                      ``attachment``.
+inclusions                   array    An array of strings or an object containing
+                                      product names, and optionally component
+                                      names. If you provide a string, the flag
+                                      type will be shown on all bugs in that
+                                      product. If you provide an object, the key
+                                      represents the product name, and the value
+                                      is the components of the product to be
+                                      included.
+exclusions                   array    An array of strings or an object containing
+                                      product names. This uses the same format as
+                                      ``inclusions``. This will exclude the flag
+                                      from all products and components specified.
+sortkey                      int      A number between 1 and 32767 by which this
+                                      type will be sorted when displayed to users
+                                      in a list; ignore if you don't care what
+                                      order the types appear in or if you want
+                                      them to appear in alphabetical order.
+is_active                    boolean  Flag of this type appear in the UI and can
+                                      be set. Default is ``true``.
+is_requestable               boolean  Users can ask for flags of this type to be
+                                      set. Default is ``true``.
+cc_list                      array    If the flag type is requestable, who should
+                                      receive e-mail notification of requests.
+                                      This is an array of e-mail addresses which\
+                                      do not need to be Bugzilla logins.
+is_specifically_requestable  boolean  Users can ask specific other users to
+                                      set flags of this type as opposed to just
+                                      asking the wind. Default is ``true``.
+is_multiplicable             boolean  Multiple flags of this type can be set on
+                                      the same bug. Default is ``true``.
+grant_group                  string   The group allowed to grant/deny flags of
+                                      this type (to allow all users to grant/deny
+                                      these flags, select no group). Default is
+                                      no group.
+request_group                string   If flags of this type are requestable, the
+                                      group allowed to request them (to allow all
+                                      users to request these flags, select no
+                                      group). Note that the request group alone
+                                      has no effect if the grant group is not
+                                      defined! Default is no group.
+===========================  =======  ===========================================
+
+An example for ``inclusions`` and/or ``exclusions``:
+
+.. code-block:: js
+
+   [
+     "FooProduct"
+   ]
+
+   {
+     "BarProduct" : [ "C1", "C3" ],
+     "BazProduct" : [ "C7" ]
+   }
+
+This flag will be added to **all** components of ``FooProduct``, components C1
+and C3 of ``BarProduct``, and C7 of ``BazProduct``.
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id": 13
+   }
+
+=======  ====  ==============================================
+name     type  description
+=======  ====  ==============================================
+flag_id  int   ID of the new FlagType object is returned.
+=======  ====  ==============================================
+
+**Errors**
+
+* 51 (Group Does Not Exist)
+  The group name you entered does not exist, or you do not have access to it.
+* 105 (Unknown component)
+  The component does not exist for this product.
+* 106 (Product Access Denied)
+  Either the product does not exist or you don't have editcomponents privileges
+  to it.
+* 501 (Illegal Email Address)
+  One of the e-mail address in the CC list is invalid. An e-mail in the CC
+  list does NOT need to be a valid Bugzilla user.
+* 1101 (Flag Type Name invalid)
+  You must specify a non-blank name for this flag type. It must
+  no contain spaces or commas, and must be 50 characters or less.
+* 1102 (Flag type must have description)
+  You must specify a description for this flag type.
+* 1103 (Flag type CC list is invalid
+  The CC list must be 200 characters or less.
+* 1104 (Flag Type Sort Key Not Valid)
+  The sort key is not a valid number.
+* 1105 (Flag Type Not Editable)
+  This flag type is not available for the products you can administer. Therefore
+  you can not edit attributes of the flag type, other than the inclusion and
+  exclusion list.
+
+.. _rest_flagtype_update:
+
+Update Flag Type
+----------------
+
+This allows you to update a flag type in Bugzilla. You must be authenticated
+and be in the *editcomponents* group to perform this action.
+
+**Request**
+
+.. code-block:: text
+
+   PUT /rest/flag_type/(id_or_name)
+
+.. code-block:: js
+
+   {
+     "ids" : [13],
+     "name" : "feedback-new",
+     "is_requestable" : false
+   }
+
+You can edit a single flag type by passing the ID or name of the flag type
+in the URL. To edit more than one flag type, you can specify addition IDs or
+flag type names using the ``ids`` or ``names`` parameters respectively.
+
+One of the below must be specified.
+
+==============  =====  ==========================================================
+name            type   description
+==============  =====  ==========================================================
+**id_or_name**  mixed  Integer flag type ID or name.
+**ids**         array  Numeric IDs of the flag types that you wish to update.
+**names**       array  Names of the flag types that you wish to update. If many
+                       flag types have the same name, this will change **all**
+                       of them.
+==============  =====  ==========================================================
+
+The following parameters specify the new values you want to set for the flag
+types you are updating.
+
+===========================  =======  ===========================================
+name                         type     description
+===========================  =======  ===========================================
+name                         string   A short name identifying this type.
+description                  string   A comprehensive description of this type.
+inclusions                   array    An array of strings or an object containing
+                                      product names, and optionally component
+                                      names. If you provide a string, the flag
+                                      type will be shown on all bugs in that
+                                      product. If you provide an object, the key
+                                      represents the product name, and the value
+                                      is the components of the product to be
+                                      included.
+exclusions                   array    An array of strings or an object containing
+                                      product names. This uses the same format as
+                                      ``inclusions``. This will exclude the flag
+                                      from all products and components specified.
+sortkey                      int      A number between 1 and 32767 by which this
+                                      type will be sorted when displayed to users
+                                      in a list; ignore if you don't care what
+                                      order the types appear in or if you want
+                                      them to appear in alphabetical order.
+is_active                    boolean  Flag of this type appear in the UI and can
+                                      be set.
+is_requestable               boolean  Users can ask for flags of this type to be
+                                      set.
+cc_list                      array    If the flag type is requestable, who should
+                                      receive e-mail notification of requests.
+                                      This is an array of e-mail addresses
+                                      which do not need to be Bugzilla logins.
+is_specifically_requestable  boolean  Users can ask specific other users to set
+                                      flags of this type as opposed to just
+                                      asking the wind.
+is_multiplicable             boolean  Multiple flags of this type can be set on
+                                      the same bug.
+grant_group                  string   The group allowed to grant/deny flags of
+                                      this type (to allow all users to grant/deny
+                                      these flags, select no group).
+request_group                string   If flags of this type are requestable, the
+                                      group allowed to request them (to allow all
+                                      users to request these flags, select no
+                                      group). Note that the request group alone
+                                      has no effect if the grant group is not
+                                      defined!
+===========================  =======  ===========================================
+
+An example for ``inclusions`` and/or ``exclusions``:
+
+.. code-block:: js
+
+   [
+     "FooProduct",
+   ]
+
+   {
+     "BarProduct" : [ "C1", "C3" ],
+     "BazProduct" : [ "C7" ]
+   }
+
+This flag will be added to **all** components of ``FooProduct``,
+components C1 and C3 of ``BarProduct``, and C7 of ``BazProduct``.
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "flagtypes": [
+       {
+         "name": "feedback-new",
+         "changes": {
+           "is_requestable": {
+             "added": "0",
+             "removed": "1"
+           },
+           "name": {
+             "removed": "feedback",
+             "added": "feedback-new"
+           }
+         },
+         "id": 13
+       }
+     ]
+   }
+
+``flagtypes`` (array) Flag change objects containing the following items:
+
+=======  ======  ================================================================
+name     type    description
+=======  ======  ================================================================
+id       int     The ID of the flag type that was updated.
+name     string  The name of the flag type that was updated.
+changes  object  The changes that were actually done on this flag type.
+                 The keys are the names of the fields that were changed, and the
+                 values are an object with two items:
+
+                 * added: (string) The value that this field was changed to.
+                 * removed: (string) The value that was previously set in this
+                   field.
+=======  ======  ================================================================
+
+Booleans changes will be represented with the strings '1' and '0'.
+
+**Errors**
+
+* 51 (Group Does Not Exist)
+  The group name you entered does not exist, or you do not have access to it.
+* 105 (Unknown component)
+  The component does not exist for this product.
+* 106 (Product Access Denied)
+  Either the product does not exist or you don't have editcomponents privileges
+  to it.
+* 501 (Illegal Email Address)
+  One of the e-mail address in the CC list is invalid. An e-mail in the CC
+  list does NOT need to be a valid Bugzilla user.
+* 1101 (Flag Type Name invalid)
+  You must specify a non-blank name for this flag type. It must
+  no contain spaces or commas, and must be 50 characters or less.
+* 1102 (Flag type must have description)
+  You must specify a description for this flag type.
+* 1103 (Flag type CC list is invalid
+  The CC list must be 200 characters or less.
+* 1104 (Flag Type Sort Key Not Valid)
+  The sort key is not a valid number.
+* 1105 (Flag Type Not Editable)
+  This flag type is not available for the products you can administer. Therefore
+  you can not edit attributes of the flag type, other than the inclusion and
+  exclusion list.
diff --git a/docs/en/rst/api/core/v1/general.rst b/docs/en/rst/api/core/v1/general.rst
new file mode 100644
index 0000000000..f44b5b76f0
--- /dev/null
+++ b/docs/en/rst/api/core/v1/general.rst
@@ -0,0 +1,266 @@
+General
+=======
+
+This is the standard REST API for external programs that want to interact
+with Bugzilla. It provides a REST interface to various Bugzilla functions.
+
+Basic Information
+-----------------
+
+**Browsing**
+
+If the ``Accept`` header of a request is set to ``text/html`` (as it is by an
+ordinary web browser) then the API will return the JSON data as a HTML
+page which the browser can display. In other words, you can play with the
+API using just your browser to see results in a human-readable form.
+This is a good way to try out the various GET calls, even if you can't use
+it for POST or PUT.
+
+**Data Format**
+
+The REST API only supports JSON input, and either JSON or JSONP output.
+So objects sent and received must be in JSON format.
+
+On every request, you must set both the ``Accept`` and ``Content-Type`` HTTP
+headers to the MIME type of the data format you are using to communicate with
+the API. ``Content-Type`` tells the API how to interpret your request, and
+``Accept`` tells it how you want your data back. ``Content-Type`` must be
+``application/json``. ``Accept`` can be either that, or
+``application/javascript`` for JSONP. In the latter`case, add a ``callback``
+parameter to name your callback.
+
+Parameters may also be passed in as part of the query string for non-GET
+requests and will override any matching parameters in the request body.
+
+Example request which returns the current version of Bugzilla:
+
+.. code-block:: http
+
+   GET /rest/version HTTP/1.1
+   Host: bugzilla.example.com
+   Accept: application/json
+
+Example response:
+
+.. code-block:: http
+
+   HTTP/1.1 200 OK
+   Vary: Accept
+   Content-Type: application/json
+
+   {
+     "version" : "4.2.9+"
+   }
+
+**Errors**
+
+When an error occurs over REST, an object is returned with the key ``error``
+set to ``true``.
+
+The error contents look similar to:
+
+.. code-block:: js
+
+   {
+     "error": true,
+     "message": "Some message here",
+     "code": 123
+   }
+
+Common Data Types
+-----------------
+
+The Bugzilla API uses the following various types of parameters:
+
+========  ======================================================================
+ type     description
+========  ======================================================================
+int       Integer.
+double    A floating-point number.
+string    A string.
+email     A string representing an email address. This value, when returned,
+          may be filtered based on if the user is logged in or not.
+date      A specific date. Example format: ``YYYY-MM-DD``.
+datetime  A date/time. Timezone should be in UTC unless otherwise noted.
+          Example format: ``YYYY-MM-DDTHH24:MI:SSZ``.
+boolean   ``true`` or ``false``.
+base64    A base64-encoded string. This is the only way to transfer
+          binary data via the API.
+array     An array. There may be mixed types in an array. ``[`` and ``]`` are
+          used to represent the beginning and end of arrays.
+object    A mapping of keys to values. Called a "hash", "dict", or "map" in
+          some other programming languages. The keys are strings, and the
+          values can be any type. ``{`` and ``}`` are used to represent the
+          beginning and end of objects.
+========  ======================================================================
+
+Parameters that are required will be displayed in **bold** in the parameters
+table for each API method.
+
+Authentication
+--------------
+
+Some methods do not require you to log in. An example of this is
+:ref:`rest_single_bug`. However, authenticating yourself allows you to see
+non-public information, for example, a bug that is not publicly visible.
+
+There are several ways to authenticate yourself:
+
+**API Keys**
+
+You can specify ``Bugzilla_api_key`` or simply ``api_key`` as an argument to
+any call, and you will be logged in as that user if the key is correct and has
+not been revoked. You can set up an API key by using the :ref:`API Keys tab <api-keys>`
+in the Preferences pages.
+
+API keys may also be requested via :ref:`Authentication Delegation <auth-delegation>`.
+
+**Login and Password**
+
+You can specify ``Bugzilla_login`` and ``Bugzilla_password`` or simply
+``login`` and ``password`` respectively, as arguments to any call, and you will
+be logged in as that user if your credentials are correct.
+
+======================  =======  ==============================================
+name                    type     description
+======================  =======  ==============================================
+**Bugzilla_login**      string   A user's login name.
+**Bugzilla_password**   string   That user's password.
+Bugzilla_restrictlogin  boolean  If true, then your login will only be
+                                 valid for your IP address.
+======================  =======  ==============================================
+
+The ``Bugzilla_restrictlogin`` option is only used when you have also
+specified ``Bugzilla_login`` and ``Bugzilla_password``.
+
+There is also a deprecated method of authentication described below that will be
+removed in the version after Bugzilla 5.0.
+
+**Bugzilla Tokens**
+
+You can use :ref:`rest_user_login` to log in as a Bugzilla user. This issues a
+token that you must then use in future calls. Just use the value for ``token``
+and pass as either ``Bugzilla_token`` or simply ``token`` as arguments to an
+API call.
+
+==================  ======  ===================================================
+name                type    description
+==================  ======  ===================================================
+**Bugzilla_token**  string  You can specify this as argument to any call,
+                            and you will be logged in as that user if the
+                            token is correct. This is the token returned
+                            when calling :ref:`rest_user_login` mentioned
+                            above.
+==================  ======  ===================================================
+
+An error is thrown if you pass an invalid token; you will need to log in again
+to get a new token.
+
+Also starting with Bugzilla 5.0, login cookies are no longer returned by
+:ref:`rest_user_login` due to security concerns.
+
+Alternatively, authentication credentials can be provided via one of the following headers:
+
+* X-BUGZILLA-LOGIN
+* X-BUGZILLA-PASSWORD
+* X-BUGZILLA-API-KEY
+* X-BUGZILLA-TOKEN
+
+Credentials passed as part of the query string take precedence over the header credentials.
+
+Useful Parameters
+-----------------
+
+Many calls take common arguments. These are documented below and linked from
+the individual calls where these parameters are used.
+
+**Including Fields**
+
+Many calls return an array of objects with various fields in the objects. (For
+example, :ref:`rest_single_bug` returns a list of ``bugs`` that have fields like
+``id``, ``summary``,  ``creation_time``, etc.)
+
+These parameters allow you to limit what fields are present in the objects, to
+improve performance or save some bandwidth.
+
+``include_fields``: The (case-sensitive) names of fields in the response data.
+Only the fields specified in the object will be returned, the rest will not be
+included. Fields should be comma delimited.
+
+Invalid field names are ignored.
+
+Example request to :ref:`rest_user_get`:
+
+.. code-block:: text
+
+   GET /rest/user/1?include_fields=id,name
+
+would return something like:
+
+.. code-block:: js
+
+   {
+     "users" : [
+       {
+         "id" : 1,
+         "name" : "user@domain.com"
+       }
+     ]
+   }
+
+**Excluding Fields**
+
+``exclude_fields``: The (case-sensitive) names of fields in the return value. The
+fields specified will not be included in the returned objects. Fields should
+be comma delimited.
+
+Invalid field names are ignored.
+
+Specifying fields here overrides ``include_fields``, so if you specify a
+field in both, it will be excluded, not included.
+
+Example request to :ref:`rest_user_get`:
+
+.. code-block:: js
+
+   GET /rest/user/1?exclude_fields=name
+
+would return something like:
+
+.. code-block:: js
+
+   {
+     "users" : [
+       {
+         "id" : 1,
+         "real_name" : "John Smith"
+       }
+     ]
+   }
+
+Some calls support specifying "subfields". If a call states that it supports
+"subfield" restrictions, you can restrict what information is returned within
+the first field. For example, if you call :ref:`rest_product_get` with an
+``include_fields`` of ``components.name``, then only the component name would be
+returned (and nothing else). You can include the main field, and exclude a
+subfield.
+
+There are several shortcut identifiers to ask for only certain groups of
+fields to be returned or excluded:
+
+=========  =====================================================================
+value      description
+=========  =====================================================================
+_all       All possible fields are returned if this is specified in
+           ``include_fields``.
+_default   Default fields are returned if ``include_fields`` is empty or
+           this is specified. This is useful if you want the default
+           fields in addition to a field that is not normally returned.
+_extra     Extra fields are not returned by default and need to be manually
+           specified in ``include_fields`` either by exact field name, or adding
+           ``_extra``.
+ _custom   Custom fields are normally returned by default unless this is added
+           to ``exclude_fields``. Also you can use it in ``include_fields`` if
+           for example you want specific field names plus all custom fields.
+           Custom fields are normally only relevant to bug objects.
+=========  =====================================================================
diff --git a/docs/en/rst/api/core/v1/group.rst b/docs/en/rst/api/core/v1/group.rst
new file mode 100644
index 0000000000..13367e392e
--- /dev/null
+++ b/docs/en/rst/api/core/v1/group.rst
@@ -0,0 +1,304 @@
+Groups
+======
+
+The API for creating, changing, and getting information about groups.
+
+.. _rest_group_create:
+
+Create Group
+------------
+
+This allows you to create a new group in Bugzilla. You must be authenticated and
+be in the *creategroups* group to perform this action.
+
+**Request**
+
+.. code-block:: text
+
+   POST /rest/group
+
+.. code-block:: js
+
+   {
+     "name" : "secret-group",
+     "description" : "Too secret for you!",
+     "is_active" : true
+   }
+
+Some params must be set, or an error will be thrown. The required params are
+marked in **bold**.
+
+===============  =======  =======================================================
+name             type     description
+===============  =======  =======================================================
+**name**         string   A short name for this group. Must be unique. This
+                          is not usually displayed in the user interface, except
+                          in a few places.
+**description**  string   A human-readable name for this group. Should be
+                          relatively short. This is what will normally appear in
+                          the UI as the name of the group.
+user_regexp      string   A regular expression. Any user whose Bugzilla username
+                          matches this regular expression will automatically be
+                          granted membership in this group.
+is_active        boolean  ``true`` if new group can be used for bugs, ``false``
+                          if this is a group that will only contain users and no
+                          bugs will be restricted to it.
+icon_url         string   A URL pointing to a small icon used to identify the
+                          group. This icon will show up next to users' names in
+                          various parts of Bugzilla if they are in this group.
+===============  =======  =======================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id": 22
+   }
+
+====  ====  ==============================
+name  type  description
+====  ====  ==============================
+id    int   ID of the newly-created group.
+====  ====  ==============================
+
+**Errors**
+
+* 800 (Empty Group Name)
+  You must specify a value for the "name" field.
+* 801 (Group Exists)
+  There is already another group with the same "name".
+* 802 (Group Missing Description)
+  You must specify a value for the "description" field.
+* 803 (Group Regexp Invalid)
+  You specified an invalid regular expression in the "user_regexp" field.
+
+.. _rest_group_update:
+
+Update Group
+------------
+
+This allows you to update a group in Bugzilla. You must be authenticated and be
+in the *creategroups* group to perform this action.
+
+**Request**
+
+To update a group using the group ID or name:
+
+.. code-block:: text
+
+   PUT /rest/group/(id_or_name)
+
+.. code-block:: js
+
+   {
+     "name" : "secret-group",
+     "description" : "Too secret for you! (updated description)",
+     "is_active" : false
+   }
+
+You can edit a single group by passing the ID or name of the group
+in the URL. To edit more than one group, you can specify addition IDs or
+group names using the ``ids`` or ``names`` parameters respectively.
+
+One of the below must be specified.
+
+==============  =====  ==========================================================
+name            type   description
+==============  =====  ==========================================================
+**id_or_name**  mixed  Integer group or name.
+**ids**         array  IDs of groups to update.
+**names**       array  Names of groups to update.
+==============  =====  ==========================================================
+
+The following parameters specify the new values you want to set for the group(s)
+you are updating.
+
+===========  =======  ===========================================================
+name         type     description
+===========  =======  ===========================================================
+name         string   A new name for the groups. If you try to set this while
+                      updating more than one group, an error will occur, as
+                      group names must be unique.
+description  string   A new description for the groups. This is what will appear
+                      in the UI as the name of the groups.
+user_regexp  string   A new regular expression for email. Will automatically
+                      grant membership to these groups to anyone with an email
+                      address that matches this perl regular expression.
+is_active    boolean  Set if groups are active and eligible to be used for bugs.
+                      ``true`` if bugs can be restricted to this group, ``false``
+                      otherwise.
+icon_url     string   A URL pointing to an icon that will appear next to the name
+                      of users who are in this group.
+===========  =======  ===========================================================
+
+**Response**
+
+.. code-block:: js
+
+  {
+    "groups": [
+      {
+        "changes": {
+          "description": {
+            "added": "Too secret for you! (updated description)",
+            "removed": "Too secret for you!"
+          },
+          "is_active": {
+            "removed": "1",
+            "added": "0"
+          }
+        },
+        "id": "22"
+      }
+    ]
+  }
+
+``groups`` (array) Group change objects, each containing the following items:
+
+=======  ======  ================================================================
+name     type    description
+=======  ======  ================================================================
+id       int     The ID of the group that was updated.
+changes  object  The changes that were actually done on this group. The
+                 keys are the names of the fields that were changed, and the
+                 values are an object with two items:
+
+                 * added: (string) The values that were added to this field,
+                   possibly a comma-and-space-separated list if multiple values
+                   were added.
+                 * removed: (string) The values that were removed from this
+                   field, possibly a comma-and-space-separated list if multiple
+                   values were removed.
+=======  ======  ================================================================
+
+**Errors**
+
+The same as :ref:`rest_group_create`.
+
+.. _rest_group_get:
+
+Get Group
+---------
+
+Returns information about Bugzilla groups.
+
+**Request**
+
+To return information about a specific group ID or name:
+
+.. code-block:: text
+
+   GET /rest/group/(id_or_name)
+
+You can also return information about more than one specific group by using the
+following in your query string:
+
+.. code-block:: text
+
+   GET /rest/group?ids=1&ids=2&ids=3
+   GET /group?names=ProductOne&names=Product2
+
+If neither IDs nor names are passed, and you are in the creategroups or
+editusers group, then all groups will be retrieved. Otherwise, only groups
+that you have bless privileges for will be returned.
+
+==========  =======  ============================================================
+name        type     description
+==========  =======  ============================================================
+id_or_name  mixed    Integer group ID or name.
+ids         array    Integer IDs of groups.
+names       array    Names of groups.
+membership  boolean  Set to 1 then a list of members of the passed groups names
+                     and IDs will be returned.
+==========  =======  ============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "groups": [
+       {
+         "membership": [
+           {
+             "real_name": "Bugzilla User",
+             "can_login": true,
+             "name": "user@bugzilla.org",
+             "login_denied_text": "",
+             "id": 85,
+             "email_enabled": false,
+             "email": "user@bugzilla.org"
+           },
+         ],
+         "is_active": true,
+         "description": "Test Group",
+         "user_regexp": "",
+         "is_bug_group": true,
+         "name": "TestGroup",
+         "id": 9
+       }
+     ]
+   }
+
+If the user is a member of the *creategroups* group they will receive
+information about all groups or groups matching the criteria that they passed.
+You have to be in the creategroups group unless you're requesting membership
+information.
+
+If the user is not a member of the *creategroups* group, but they are in the
+"editusers" group or have bless privileges to the groups they require
+membership information for, the is_active, is_bug_group and user_regexp values
+are not supplied.
+
+The return value will be an object containing group names as the keys; each
+value will be an object that describes the group and has the following items:
+
+============  ======  ===========================================================
+name          type    description
+============  ======  ===========================================================
+id            int     The unique integer ID that Bugzilla uses to identify this
+                      group. Even if the name of the group changes, this ID will
+                      stay the same.
+name          string  The name of the group.
+description   string  The description of the group.
+is_bug_group  int     Whether this group is to be used for bug reports or is
+                      only administrative specific.
+user_regexp   string  A regular expression that allows users to be added to
+                      this group if their login matches.
+is_active     int     Whether this group is currently active or not.
+users         array   User objects that are members of this group; only
+                      returned if the user sets the ``membership`` parameter to
+                      1. Each user object has the items describe in the User
+                      object below.
+============  ======  ===========================================================
+
+User object:
+
+=============  =======  =========================================================
+name           type     description
+=============  =======  =========================================================
+id             int      The ID of the user.
+real_name      string   The actual name of the user.
+email          string   The email address of the user.
+name           string   The login name of the user. Note that in some situations
+                        this is different than their email.
+can_login      boolean  A boolean value to indicate if the user can login into
+                        bugzilla.
+email_enabled  boolean  A boolean value to indicate if bug-related mail will
+                        be sent to the user or not.
+disabled_text  string   A text field that holds the reason for disabling a user
+                        from logging into Bugzilla. If empty, then the user
+                        account is enabled; otherwise it is disabled/closed.
+=============  =======  =========================================================
+
+**Errors**
+
+* 51 (Invalid Object)
+  A non existing group name was passed to the function, as a result no
+  group object existed for that invalid name.
+* 805 (Cannot view groups)
+  Logged-in users are not authorized to edit bugzilla groups as they are not
+  members of the creategroups group in bugzilla, or they are not authorized to
+  access group member's information as they are not members of the "editusers"
+  group or can bless the group.
diff --git a/docs/en/rst/api/core/v1/index.rst b/docs/en/rst/api/core/v1/index.rst
new file mode 100644
index 0000000000..933aeed968
--- /dev/null
+++ b/docs/en/rst/api/core/v1/index.rst
@@ -0,0 +1,18 @@
+Core API v1
+===========
+
+.. toctree::
+
+   general
+   attachment
+   bug
+   bug-user-last-visit
+   bugzilla
+   classification
+   comment
+   component
+   field
+   flagtype
+   group
+   product
+   user
diff --git a/docs/en/rst/api/core/v1/product.rst b/docs/en/rst/api/core/v1/product.rst
new file mode 100644
index 0000000000..4819bbbbe9
--- /dev/null
+++ b/docs/en/rst/api/core/v1/product.rst
@@ -0,0 +1,448 @@
+Products
+========
+
+This part of the Bugzilla API allows you to list the available products and
+get information about them.
+
+.. _rest_product_list:
+
+List Products
+-------------
+
+Returns a list of the IDs of the products the user can search on.
+
+**Request**
+
+To get a list of product IDs a user can select such as for querying bugs:
+
+.. code-block:: text
+
+   GET /rest/product_selectable
+
+To get a list of product IDs a user can enter a bug against:
+
+.. code-block:: text
+
+   GET /rest/product_enterable
+
+To get a list of product IDs a user can search or enter bugs against.
+
+.. code-block:: text
+
+   GET /rest/product_accessible
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "ids": [
+       "2",
+       "3",
+       "19",
+       "1",
+       "4"
+     ]
+   }
+
+====  =====  ======================================
+name  type   description
+====  =====  ======================================
+ids   array  List of integer product IDs.
+====  =====  ======================================
+
+.. _rest_product_get:
+
+Get Product
+-----------
+
+Returns a list of information about the products passed to it.
+
+**Request**
+
+To return information about a specific type of products such as
+``accessible``, ``selectable``, or ``enterable``:
+
+.. code-block:: text
+
+   GET /rest/product?type=accessible
+
+To return information about a specific product by ``id`` or ``name``:
+
+.. code-block:: text
+
+   GET /rest/product/(id_or_name)
+
+You can also return information about more than one product by using the
+following parameters in your query string:
+
+.. code-block:: text
+
+   GET /rest/product?ids=1&ids=2&ids=3
+   GET /rest/product?names=ProductOne&names=Product2
+
+==========  ======  =============================================================
+name        type    description
+==========  ======  =============================================================
+id_or_name  mixed   Integer product ID or product name.
+ids         array   Product IDs
+names       array   Product names
+type        string  The group of products to return. Valid values are
+                    ``accessible`` (default), ``selectable``, and ``enterable``.
+                    ``type`` can be a single value or an array of values if more
+                    than one group is needed with duplicates removed.
+==========  ======  =============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "products": [
+       {
+         "id": 1,
+         "default_milestone": "---",
+         "components": [
+           {
+             "is_active": true,
+             "default_assigned_to": "admin@bugzilla.org",
+             "id": 1,
+             "sort_key": 0,
+             "name": "TestComponent",
+             "flag_types": {
+               "bug": [
+                 {
+                   "is_active": true,
+                   "grant_group": null,
+                   "cc_list": "",
+                   "is_requestable": true,
+                   "id": 3,
+                   "is_multiplicable": true,
+                   "name": "needinfo",
+                   "request_group": null,
+                   "is_requesteeble": true,
+                   "sort_key": 0,
+                   "description": "needinfo"
+                 }
+               ],
+               "attachment": [
+                 {
+                   "description": "Review",
+                   "is_multiplicable": true,
+                   "name": "review",
+                   "is_requesteeble": true,
+                   "request_group": null,
+                   "sort_key": 0,
+                   "cc_list": "",
+                   "grant_group": null,
+                   "is_requestable": true,
+                   "id": 2,
+                   "is_active": true
+                 }
+               ]
+             },
+             "default_qa_contact": "",
+             "description": "This is a test component."
+           }
+         ],
+         "is_active": true,
+         "classification": "Unclassified",
+         "versions": [
+           {
+             "id": 1,
+             "name": "unspecified",
+             "is_active": true,
+             "sort_key": 0
+           }
+         ],
+         "description": "This is a test product.",
+         "has_unconfirmed": true,
+         "milestones": [
+           {
+             "name": "---",
+             "is_active": true,
+             "sort_key": 0,
+             "id": 1
+           }
+         ],
+         "name": "TestProduct"
+       }
+     ]
+   }
+
+``products`` (array) Each product object has the following items:
+
+=================  =======  =====================================================
+name               type     description
+=================  =======  =====================================================
+id                 int      An integer ID uniquely identifying the product in
+                            this installation only.
+name               string   The name of the product. This is a unique identifier
+                            for the product.
+description        string   A description of the product, which may contain HTML.
+is_active          boolean  A boolean indicating if the product is active.
+default_milestone  string   The name of the default milestone for the product.
+has_unconfirmed    boolean  Indicates whether the UNCONFIRMED bug status is
+                            available for this product.
+classification     string   The classification name for the product.
+components         array    Each component object has the items described in the
+                            Component object below.
+versions           array    Each object describes a version, and has the
+                            following items: ``name``, ``sort_key`` and
+                            ``is_active``.
+milestones         array    Each object describes a milestone, and has the
+                            following items: ``name``, ``sort_key`` and
+                            ``is_active``.
+=================  =======  =====================================================
+
+If the user tries to access a product that is not in the list of accessible
+products for the user, or a product that does not exist, that is silently
+ignored, and no information about that product is returned.
+
+Component object:
+
+===================  =======  ===================================================
+name                 type     description
+===================  =======  ===================================================
+id                   int      An integer ID uniquely identifying the component in
+                              this installation only.
+name                 string   The name of the component.  This is a unique
+                              identifier for this component.
+description          string   A description of the component, which may contain
+                              HTML.
+default_assigned_to  string   The login name of the user to whom new bugs
+                              will be assigned by default.
+default_qa_contact   string   The login name of the user who will be set as
+                              the QA Contact for new bugs by default. Empty
+                              string if the QA contact is not defined.
+sort_key             int      Components, when displayed in a list, are sorted
+                              first by this integer and then secondly by their
+                              name.
+is_active            boolean  A boolean indicating if the component is active.
+                              Inactive components are not enabled for new bugs.
+flag_types           object   An object containing two items ``bug`` and
+                              ``attachment`` that each contains an array of
+                              objects, where each describes a flagtype. The
+                              flagtype items are described in the Flagtype
+                              object below.
+===================  =======  ===================================================
+
+Flagtype object:
+
+================  =======  ======================================================
+name              type     description
+================  =======  ======================================================
+id                int      Returns the ID of the flagtype.
+name              string   Returns the name of the flagtype.
+description       string   Returns the description of the flagtype.
+cc_list           string   Returns the concatenated CC list for the flagtype, as
+                           a single string.
+sort_key          int      Returns the sortkey of the flagtype.
+is_active         boolean  Returns whether the flagtype is active or disabled.
+                           Flags being in a disabled flagtype are not deleted.
+                           It only prevents you from adding new flags to it.
+is_requestable    boolean  Returns whether you can request for the given
+                           flagtype (i.e. whether the '?' flag is available or
+                           not).
+is_requesteeble   boolean  Returns whether you can ask someone specifically
+                           or not.
+is_multiplicable  boolean  Returns whether you can have more than one
+                           flag for the given flagtype in a given bug/attachment.
+grant_group       int      the group ID that is allowed to grant/deny flags of
+                           this type. If the item is not included all users are
+                           allowed to grant/deny this flagtype.
+request_group     int      The group ID that is allowed to request the flag if
+                           the flag is of the type requestable. If the item is
+                           not included all users are allowed request this
+                           flagtype.
+================  =======  ======================================================
+
+.. _rest_product_create:
+
+Create Product
+--------------
+
+This allows you to create a new product in Bugzilla.
+
+**Request**
+
+.. code-block:: text
+
+   POST /rest/product
+
+.. code-block:: js
+
+   {
+     "name" : "AnotherProduct",
+     "description" : "Another Product",
+     "classification" : "Unclassified",
+     "is_open" : false,
+     "has_unconfirmed" : false,
+     "version" : "unspecified"
+   }
+
+Some params must be set, or an error will be thrown. The required params are
+marked in bold.
+
+=================  =======  =====================================================
+name               type     description
+=================  =======  =====================================================
+**name**           string   The name of this product. Must be globally unique
+                            within Bugzilla.
+**description**    string   A description for this product. Allows some simple
+                            HTML.
+**version**        string   The default version for this product.
+has_unconfirmed    boolean  Allow the UNCONFIRMED status to be set on bugs in
+                            this product. Default: true.
+classification     string   The name of the Classification which contains this
+                            product.
+default_milestone  string   The default milestone for this product. Default
+                            '---'.
+is_open            boolean  ``true`` if the product is currently allowing bugs
+                            to be entered into it. Default: ``true``.
+create_series      boolean  ``true`` if you want series for New Charts to be
+                            created for this new product. Default: ``true``.
+=================  =======  =====================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id": 20
+   }
+
+Returns an object with the following items:
+
+====  ====  =====================================
+name  type  description
+====  ====  =====================================
+id    int   ID of the newly-filed product.
+====  ====  =====================================
+
+**Errors**
+
+* 51 (Classification does not exist)
+  You must specify an existing classification name.
+* 700 (Product blank name)
+  You must specify a non-blank name for this product.
+* 701 (Product name too long)
+  The name specified for this product was longer than the maximum
+  allowed length.
+* 702 (Product name already exists)
+  You specified the name of a product that already exists.
+  (Product names must be globally unique in Bugzilla.)
+* 703 (Product must have description)
+  You must specify a description for this product.
+* 704 (Product must have version)
+  You must specify a version for this product.
+
+.. _rest_product_update:
+
+Update Product
+--------------
+
+This allows you to update a product in Bugzilla.
+
+**Request**
+
+.. code-block:: text
+
+   PUT /rest/product/(id_or_name)
+
+You can edit a single product by passing the ID or name of the product
+in the URL. To edit more than one product, you can specify addition IDs or
+product names using the ``ids`` or ``names`` parameters respectively.
+
+.. code-block:: js
+
+   {
+     "ids" : [123],
+     "name" : "BarName",
+     "has_unconfirmed" : false
+   }
+
+One of the below must be specified.
+
+==============  =====  ==========================================================
+name            type   description
+==============  =====  ==========================================================
+**id_or_name**  mixed  Integer product ID or name.
+**ids**         array  Numeric IDs of the products that you wish to update.
+**names**       array  Names of the products that you wish to update.
+==============  =====  ==========================================================
+
+The following parameters specify the new values you want to set for the product(s)
+you are updating.
+
+=================  =======  =====================================================
+name               type     description
+=================  =======  =====================================================
+name               string   A new name for this product. If you try to set this
+                            while updating more than one product, an error will
+                            occur, as product names must be unique.
+default_milestone  string   When a new bug is filed, what milestone does it
+                            get by default if the user does not choose one? Must
+                            represent a milestone that is valid for this product.
+description        string   Update the long description for these products to
+                            this value.
+has_unconfirmed    boolean  Allow the UNCONFIRMED status to be set on bugs in
+                            products.
+is_open            boolean  ``true`` if the product is currently allowing bugs
+                            to be entered into it, ``false`` otherwise.
+=================  =======  =====================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+      "products" : [
+         {
+            "id" : 123,
+            "changes" : {
+               "name" : {
+                  "removed" : "FooName",
+                  "added" : "BarName"
+               },
+               "has_unconfirmed" : {
+                  "removed" : "1",
+                  "added" : "0"
+               }
+            }
+         }
+      ]
+   }
+
+``products`` (array) Product change objects containing the following items:
+
+=======  ======  ================================================================
+name     type    description
+=======  ======  ================================================================
+id       int     The ID of the product that was updated.
+changes  object  The changes that were actually done on this product. The
+                 keys are the names of the fields that were changed, and the
+                 values are an object with two items:
+
+                 * added: (string) The value that this field was changed to.
+                 * removed: (string) The value that was previously set in this
+                   field.
+=======  ======  ================================================================
+
+Booleans will be represented with the strings '1' and '0' for changed values
+as they are stored as strings in the database currently.
+
+**Errors**
+
+* 700 (Product blank name)
+  You must specify a non-blank name for this product.
+* 701 (Product name too long)
+  The name specified for this product was longer than the maximum
+  allowed length.
+* 702 (Product name already exists)
+  You specified the name of a product that already exists.
+  (Product names must be globally unique in Bugzilla.)
+* 703 (Product must have description)
+  You must specify a description for this product.
+* 705 (Product must define a default milestone)
+  You must define a default milestone.
diff --git a/docs/en/rst/api/core/v1/user.rst b/docs/en/rst/api/core/v1/user.rst
new file mode 100644
index 0000000000..3942e50740
--- /dev/null
+++ b/docs/en/rst/api/core/v1/user.rst
@@ -0,0 +1,466 @@
+Users
+=====
+
+This part of the Bugzilla API allows you to create user accounts, get information
+about user accounts and to log in or out using an existing account.
+
+.. _rest_user_login:
+
+Login
+-----
+
+Logging in with a username and password is required for many Bugzilla
+installations, in order to search for private bugs, post new bugs, etc. This
+method allows you to retrieve a token that can be used as authentication for
+subsequent API calls. Otherwise yuou will need to pass your ``login`` and
+``password`` with each call.
+
+This method will be going away in the future in favor of using *API keys*.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/login?login=foo@example.com&password=toosecrettoshow
+
+==============  =======  ========================================================
+name            type     description
+==============  =======  ========================================================
+**login**       string   The user's login name.
+**password**    string   The user's password.
+restrict_login  boolean  If set to a true value, the token returned by this
+                         method will only be valid from the IP address which
+                         called this method.
+==============  =======  ========================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "token": "786-OLaWfBisMY",
+     "id": 786
+   }
+
+========  ======  ===============================================================
+name      type    description
+========  ======  ===============================================================
+id        int     Numeric ID of the user that was logged in.
+token     string  Token which can be passed in the parameters as
+                  authentication in other calls. The token can be sent along
+                  with any future requests to the webservice, for the duration
+                  of the session, i.e. til :ref:`rest_user_logout` is called.
+========  ======  ===============================================================
+
+**Errors**
+
+* 300 (Invalid Username or Password)
+  The username does not exist, or the password is wrong.
+* 301 (Login Disabled)
+  The ability to login with this account has been disabled.  A reason may be
+  specified with the error.
+* 305 (New Password Required)
+  The current password is correct, but the user is asked to change
+  their password.
+* 50 (Param Required)
+  A login or password parameter was not provided.
+
+.. _rest_user_logout:
+
+Logout
+------
+
+Log out the user. Basically it invalidates the token provided so it cannot be
+re-used. Does nothing if the token is not in use. Will also clear any existing
+authentication cookies the client may still have stored.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/logout?token=1234-VWvO51X69r
+
+=====  ======  ===================================================
+name   type    description
+=====  ======  ===================================================
+token  string   The user's token used for authentication.
+=====  ======  ===================================================
+
+.. _rest_user_valid_login:
+
+Valid Login
+-----------
+
+This method will verify whether a client's cookies or current login token is
+still valid or have expired. A valid username that matches must be provided as
+well.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/valid_login?login=foo@example.com&token=1234-VWvO51X69r
+
+=========  =======  =============================================================
+name       type     description
+=========  =======  =============================================================
+**login**  string   The login name that matches the provided cookies or token.
+token      string   Persistent login token currently being used for
+                    authentication.
+=========  =======  =============================================================
+
+**Response**
+
+Returns true/false depending on if the current token is valid for the provided
+username.
+
+.. _rest_user_create:
+
+Create User
+-----------
+
+Creates a user account directly in Bugzilla, password and all. Instead of this,
+you should use **Offer Account by Email** when possible because that makes sure
+that the email address specified can actually receive an email. This function
+does not check that. You must be authenticated and be in the *editusers* group
+to perform this action.
+
+**Request**
+
+.. code-block:: text
+
+   POST /rest/user
+
+.. code-block:: js
+
+   {
+     "email" : "user@bugzilla.org",
+     "full_name" : "Test User",
+     "password" : "K16ldRr922I1"
+   }
+
+==========  ======  =============================================================
+name        type    description
+==========  ======  =============================================================
+**login**   string  The login name for the new user. Ignored if the
+                    *use_email_as_login* parameter is true.
+**email**   string  The email address for the new user.
+full_name   string  The user's full name. Will be set to empty if not specified.
+password    string  The password for the new user account, in plain text. It
+                    will be stripped of leading and trailing whitespace. If
+                    blank or not specified, the new created account will
+                    exist in Bugzilla but will not be allowed to log in
+                    using DB authentication until a password is set either
+                    by the user (through resetting their password) or by the
+                    administrator.
+==========  ======  =============================================================
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id": 58707
+   }
+
+====  ====  ============================================
+name  type  desciption
+====  ====  ============================================
+id    int   The numeric ID of the user that was created.
+====  ====  ============================================
+
+**Errors**
+
+* 502 (Password Too Short)
+  The password specified is too short. (Usually, this means the
+  password is under three characters.)
+
+**History**
+
+The *login* parameter has been added in Bugzilla 6.0.
+
+.. _rest_user_update:
+
+Update User
+-----------
+
+Updates an existing user account in Bugzilla. You must be authenticated and be
+in the *editusers* group to perform this action.
+
+If you are not in the *editusers* group, you may add or remove users from groups
+if you have bless permissions for the groups you wish to modify. All other changes
+will be ignored.
+
+**Request**
+
+.. code-block:: text
+
+   PUT /rest/user/(id_or_name)
+
+You can edit a single user by passing the ID or login name of the user
+in the URL. To edit more than one user, you can specify addition IDs or
+login names using the ``ids`` or ``names`` parameters respectively.
+
+=================  =======  =====================================================
+ name              type     description
+=================  =======  =====================================================
+**id_or_name**     mixed    Either the ID or the login name of the user to
+                            update.
+**ids**            array    Additional IDs of users to update.
+**names**          array    Additional login names of users to update.
+full_name          string   The new name of the user.
+email              string   The email of the user. Also note that you can only
+                            update one user at a time when changing the login
+                            name / email. (An error will be thrown if you try to
+                            update this field for multiple users at once.)
+password           string   The password of the user.
+email_enabled      boolean  A boolean value to enable/disable sending
+                            bug-related mail to the user.
+login_denied_text  string   A text field that holds the reason for disabling a
+                            user from logging into Bugzilla. If empty, then the
+                            user account is enabled; otherwise it is
+                            disabled/closed.
+groups             object   These specify the groups that this user is directly
+                            a member of. To set these, you should pass an object
+                            as the value. The object's items are described in
+                            the Groups update objects below.
+bless_groups       object   This is the same as groups but affects what groups
+                            a user has direct membership to bless that group.
+                            It takes the same inputs as groups.
+=================  =======  =====================================================
+
+Groups and bless groups update object:
+
+======  =====  ==================================================================
+name    type   description
+======  =====  ==================================================================
+add     array  The group IDs or group names that the user should be added to.
+remove  array  The group IDs or group names that the user should be removed from.
+set     array  Integers or strings which are an exact set of group IDs and group
+               names that the user should be a member of. This does not remove
+               groups from the user when the person making the change does not
+               have the bless privilege for the group.
+======  =====  ==================================================================
+
+If you specify ``set``, then ``add`` and ``remove`` will be ignored. A group in
+both the ``add`` and ``remove`` list will be added. Specifying a group that the
+user making the change does not have bless rights will generate an error.
+
+**Response**
+
+* users: (array) List of user change objects with the following items:
+
+=======  ======  ================================================================
+name     type    description
+=======  ======  ================================================================
+id       int     The ID of the user that was updated.
+changes  object  The changes that were actually done on this user. The keys
+                 are the names of the fields that were changed, and the values
+                 are an object with two items:
+
+                 * added: (string) The values that were added to this field,
+                   possibly a comma-and-space-separated list if multiple values
+                   were added.
+                 * removed: (string) The values that were removed from this
+                   field, possibly a comma-and-space-separated list if multiple
+                   values were removed.
+=======  ======  ================================================================
+
+**Errors**
+
+* 51 (Bad Login Name)
+  You passed an invalid login name in the "names" array.
+* 304 (Authorization Required)
+  Logged-in users are not authorized to edit other users.
+
+.. _rest_user_get:
+
+Get User
+--------
+
+Gets information about user accounts in Bugzilla.
+
+**Request**
+
+To get information about a single user in Bugzilla:
+
+.. code-block:: text
+
+   GET /rest/user/(id_or_name)
+
+To get multiple users by name or ID:
+
+.. code-block:: text
+
+   GET /rest/user?names=foo@bar.com&name=test@bugzilla.org
+   GET /rest/user?ids=123&ids=321
+
+To get user matching a search string:
+
+.. code-block:: text
+
+   GET /rest/user?match=foo
+
+To get user by using an integer ID value or by using ``match``, you must be
+authenticated.
+
+================  =======  ======================================================
+name              type     description
+================  =======  ======================================================
+id_or_name        mixed    An integer user ID or login name of the user.
+ids               array    Integer user IDs. Logged=out users cannot pass
+                           this parameter to this function. If they try,
+                           they will get an error. Logged=in users will get
+                           an error if they specify the ID of a user they
+                           cannot see.
+names             array    Login names.
+match             array    This works just like "user matching" in Bugzilla
+                           itself. Users will be returned whose real name
+                           or login name contains any one of the specified
+                           strings. Users that you cannot see will not be
+                           included in the returned list.
+
+                           Most installations have a limit on how many
+                           matches are returned for each string; the default
+                           is 1000 but can be changed by the Bugzilla
+                           administrator.
+
+                           Logged-out users cannot use this argument, and
+                           an error will be thrown if they try. (This is to
+                           make it harder for spammers to harvest email
+                           addresses from Bugzilla, and also to enforce the
+                           user visibility restrictions that are
+                           implemented on some Bugzillas.)
+limit             int      Limit the number of users matched by the
+                           ``match`` parameter. If the value is greater than the
+                           system limit, the system limit will be used.
+                           This parameter is only valid when using the ``match``
+                           parameter.
+group_ids         array    Numeric IDs for groups that a user can be in.
+groups            array    Names of groups that a user can be in. If
+                           ``group_ids`` or ``groups`` are specified, they
+                           limit the return value to users who are in *any*
+                           of the groups specified.
+include_disabled  boolean  By default, when using the ``match`` parameter,
+                           disabled users are excluded from the returned
+                           results unless their full username is identical
+                           to the match string. Setting ``include_disabled`` to
+                           ``true`` will include disabled users in the returned
+                           results even if their username doesn't fully match
+                           the input string.
+================  =======  ======================================================
+
+**Response**
+
+* users: (array) Each object describes a user and has the following items:
+
+=================  =======  =====================================================
+name               type     description
+=================  =======  =====================================================
+id                 int      The unique integer ID that Bugzilla uses to represent
+                            this user. Even if the user's login name changes,
+                            this will not change.
+real_name          string   The actual name of the user. May be blank.
+email              string   The email address of the user.
+name               string   The login name of the user.
+can_login          boolean  A boolean value to indicate if the user can login
+                            into bugzilla.
+email_enabled      boolean  A boolean value to indicate if bug-related mail will
+                            be sent to the user or not.
+login_denied_text  string   A text field that holds the reason for disabling a
+                            user from logging into Bugzilla. If empty then the
+                            user account is enabled; otherwise it is
+                            disabled/closed.
+groups             array    Groups the user is a member of. If the currently
+                            logged in user is querying their own account or is a
+                            member of the 'editusers' group, the array will
+                            contain all the groups that the user is a member of.
+                            Otherwise, the array will only contain groups that
+                            the logged in user can bless. Each object describes
+                            the group and contains the items described in the
+                            Group object below.
+saved_searches     array    User's saved searches, each having the following
+                            Search object items described below.
+saved_reports      array    User's saved reports, each having the following
+                            Search object items described below.
+=================  =======  =====================================================
+
+Group object:
+
+===========  ======  ============================================================
+name         type    description
+===========  ======  ============================================================
+id           int     The group ID
+name         string  The name of the group
+description  string  The description for the group
+===========  ======  ============================================================
+
+Search object:
+
+=====  ======  ==================================================================
+name   type    description
+=====  ======  ==================================================================
+id     int     An integer ID uniquely identifying the saved report.
+name   string  The name of the saved report.
+query  string  The CGI parameters for the saved report.
+=====  ======  ==================================================================
+
+If you are not authenticated when you call this function, you will only be
+returned the ``id``, ``name``, and ``real_name`` items. If you are authenticated
+and not in 'editusers' group, you will only be returned the ``id``, ``name``,
+``real_name``, ``can_login``, and ``groups`` items. The groups
+returned are filtered based on your permission to bless each group. The
+``saved_searches`` and ``saved_reports`` items are only returned if you are
+querying your own account, even if you are in the editusers group.
+
+**Errors**
+
+* 51 (Bad Login Name or Group ID)
+  You passed an invalid login name in the "names" array or a bad
+  group ID in the "group_ids" argument.
+* 52 (Invalid Parameter)
+  The value used must be an integer greater than zero.
+* 304 (Authorization Required)
+  You are logged in, but you are not authorized to see one of the users you
+  wanted to get information about by user id.
+* 505 (User Access By Id or User-Matching Denied)
+  Logged-out users cannot use the "ids" or "match" arguments to this
+  function.
+* 804 (Invalid Group Name)
+  You passed a group name in the "groups" argument which either does not
+  exist or you do not belong to it.
+
+.. _rest_user_whoami:
+
+Who Am I
+--------
+
+Allows for validating a user's API key, token, or username and password.
+If successfully authenticated, it returns simple information about the
+logged in user.
+
+**Request**
+
+.. code-block:: text
+
+   GET /rest/whoami
+
+**Response**
+
+.. code-block:: js
+
+   {
+     "id" : "1234",
+     "name" : "user@bugzulla.org",
+     "real_name" : "Test User",
+   }
+
+========== ======  =====================================================
+name       type    description
+========== ======  =====================================================
+id         int     The unique integer ID that Bugzilla uses to represent
+                   this user. Even if the user's login name changes,
+                   this will not change.
+real_name  string  The actual name of the user. May be blank.
+name       string  string  The login name of the user.
+========== ======  =====================================================
diff --git a/docs/en/rst/api/index.rst b/docs/en/rst/api/index.rst
new file mode 100644
index 0000000000..840bcadd19
--- /dev/null
+++ b/docs/en/rst/api/index.rst
@@ -0,0 +1,14 @@
+.. _apis:
+
+WebService API Reference
+========================
+
+This Bugzilla installation has the following WebService APIs available
+(as of the last time you compiled the documentation). Documentation for
+the deprecated :ref:`XML-RPC and JSON-RPC APIs <api-list>` is also available.
+
+.. toctree::
+   :glob:
+
+   core/v*/index
+   ../extensions/*/api/v*/index
diff --git a/docs/en/rst/conf.py b/docs/en/rst/conf.py
index e55874a67b..cfbca34a20 100644
--- a/docs/en/rst/conf.py
+++ b/docs/en/rst/conf.py
@@ -12,6 +12,8 @@
 # serve to show the default.
 
 import sys, os, re
+import os.path
+import shutil
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -25,7 +27,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.todo']
+extensions = ['sphinx.ext.todo', 'sphinx.ext.extlinks']
 
 if tags.has('enable_rst2pdf'):
   extensions.append('rst2pdf.pdfbuilder')
@@ -44,7 +46,7 @@
 
 # General information about the project.
 project = u'Bugzilla'
-copyright = u'2014, The Bugzilla Team'
+copyright = u'2016, The Bugzilla Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -78,7 +80,7 @@
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = []
+exclude_patterns = ['**.inc.rst']
 
 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -100,6 +102,21 @@
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+rst_prolog = """
+.. role:: param
+    :class: param
+
+.. role:: paramval
+    :class: paramval
+
+.. role:: group
+    :class: group
+
+.. role:: field
+    :class: field
+
+.. |min-perl-ver| replace:: 5.14.0
+"""
 
 # -- Options for HTML output ---------------------------------------------------
 
@@ -126,7 +143,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = "../images/bugzilla.png"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -158,7 +175,7 @@
 #html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+html_use_index = False
 
 # If true, the index is split into individual pages for each letter.
 #html_split_index = False
@@ -170,7 +187,7 @@
 #html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+html_show_copyright = False
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
@@ -183,7 +200,6 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Bugzilladoc'
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
@@ -194,7 +210,7 @@
 #'pointsize': '10pt',
 
 # Additional stuff for the LaTeX preamble.
-#'preamble': '',
+'preamble': '\setcounter{tocdepth}{4}',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
@@ -258,11 +274,6 @@
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
 #texinfo_show_urls = 'footnote'
 
-# Global substitutions and other markup required in every page
-rst_epilog = """
-.. |min-perl-ver| replace:: 5.10.1
-"""
-
 # -- Options for PDF output --------------------------------------------------
 
 # Grouping the document tree into PDF files. List of tuples
@@ -360,3 +371,69 @@
 
 # Background images fitting mode
 pdf_fit_background_mode = 'scale'
+
+# -- Options for Sphinx extensions -------------------------------------------
+
+# Temporary highlighting of TODO items
+todo_include_todos = True
+
+# The readthedocs.org website cannot access POD.
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if on_rtd:
+    base_api_url = 'https://www.bugzilla.org/docs/tip/en/html/integrating/internals/'
+else:
+    base_api_url = '../integrating/internals/'
+
+extlinks = {'bug': ('https://bugzilla.mozilla.org/show_bug.cgi?id=%s', 'bug  '),
+            'api': (base_api_url + '%s', '')}
+
+# -- Assemble extension documentation ------------------------------------------
+
+# os.getcwd() is docs/$lang/rst
+lang = os.path.basename(os.path.dirname(os.getcwd()))
+
+# This is technically defined in Bugzilla/Constants.pm in Perl, but it's
+# unlikely to change if we use a relative path.
+ext_dir = "../../../extensions"
+
+# Still, check just in case, so if it ever changes, we know
+if (os.path.isdir(ext_dir)):
+    # Clear out removed extensions docs
+    for dir in os.listdir("extensions"):
+        # A .gitignore file is required as git doesn't like empty directories
+        if dir == ".gitignore":
+            continue
+
+        src = os.path.join(ext_dir, dir)
+
+        # extension dir missing, assume uninstalled
+        if not os.path.isdir(src):
+            shutil.rmtree(os.path.join("extensions", dir))
+
+    # Copy in new copies
+    for ext_name in os.listdir(ext_dir):
+        ext_path = os.path.join(ext_dir, ext_name)
+        # Ignore files in the extensions/ directory (e.g. create.pl)
+        if not os.path.isdir(ext_path):
+            continue
+
+        # Ignore disabled extensions
+        if os.path.isfile(os.path.join(ext_path, "disabled")):
+            continue
+
+        src = os.path.join(ext_path, "docs", lang, "rst")
+
+        # Ignore extensions without rst docs in this language
+        if not os.path.isdir(src):
+            continue
+
+        dst = os.path.join("extensions", ext_name)
+
+        # remove old docs
+        if (os.path.isdir(dst)):
+            shutil.rmtree(dst)
+
+        shutil.copytree(src, dst)
+else:
+    print "Warning: Bugzilla extension directory not found: " + ext_dir
diff --git a/docs/en/rst/customization.rst b/docs/en/rst/customization.rst
deleted file mode 100644
index 01f7fce1d2..0000000000
--- a/docs/en/rst/customization.rst
+++ /dev/null
@@ -1,481 +0,0 @@
-.. highlight:: perl
-
-.. _customization:
-
-====================
-Customizing Bugzilla
-====================
-
-.. _extensions:
-
-Bugzilla Extensions
-###################
-
-One of the best ways to customize Bugzilla is by writing a Bugzilla
-Extension. Bugzilla Extensions let you modify both the code and
-UI of Bugzilla in a way that can be distributed to other Bugzilla
-users and ported forward to future versions of Bugzilla with minimal
-effort.
-
-See the `Bugzilla Extension
-documentation <../html/api/Bugzilla/Extension.html>`_ for information on how to write an Extension.
-
-.. _cust-skins:
-
-Custom Skins
-############
-
-Bugzilla allows you to have multiple skins. These are custom CSS and possibly
-also custom images for Bugzilla. To create a new custom skin, you have two
-choices:
-
-- Make a single CSS file, and put it in the
-  :file:`skins/contrib` directory.
-
-- Make a directory that contains all the same CSS file
-  names as :file:`skins/standard/`, and put
-  your directory in :file:`skins/contrib/`.
-
-After you put the file or the directory there, make sure to run checksetup.pl
-so that it can reset the file permissions correctly.
-
-After you have installed the new skin, it will show up as an option in the
-user's General Preferences. If you would like to force a particular skin on all
-users, just select it in the Default Preferences and then uncheck "Enabled" on
-the preference.
-
-.. _cust-templates:
-
-Template Customization
-######################
-
-Administrators can configure the look and feel of Bugzilla without
-having to edit Perl files or face the nightmare of massive merge
-conflicts when they upgrade to a newer version in the future.
-
-Templatization also makes localized versions of Bugzilla possible,
-for the first time. It's possible to have Bugzilla's UI language
-determined by the user's browser. More information is available in
-:ref:`template-http-accept`.
-
-.. _template-directory:
-
-Template Directory Structure
-============================
-
-The template directory structure starts with top level directory
-named :file:`template`, which contains a directory
-for each installed localization. The next level defines the
-language used in the templates. Bugzilla comes with English
-templates, so the directory name is :file:`en`,
-and we will discuss :file:`template/en` throughout
-the documentation. Below :file:`template/en` is the
-:file:`default` directory, which contains all the
-standard templates shipped with Bugzilla.
-
-.. warning:: A directory :file:`data/templates` also exists;
-   this is where Template Toolkit puts the compiled versions of
-   the templates from either the default or custom directories.
-   *Do not* directly edit the files in this
-   directory, or all your changes will be lost the next time
-   Template Toolkit recompiles the templates.
-
-.. _template-method:
-
-Choosing a Customization Method
-===============================
-
-If you want to edit Bugzilla's templates, the first decision
-you must make is how you want to go about doing so. There are two
-choices, and which you use depends mainly on the scope of your
-modifications, and the method you plan to use to upgrade Bugzilla.
-
-The first method of making customizations is to directly edit the
-templates found in :file:`template/en/default`.
-This is probably the best way to go about it if you are going to
-be upgrading Bugzilla through Bzr, because if you then execute
-a :command:`bzr update`, any changes you have made will
-be merged automagically with the updated versions.
-
-.. note:: If you use this method, and Bzr conflicts occur during an
-   update, the conflicted templates (and possibly other parts
-   of your installation) will not work until they are resolved.
-
-The second method is to copy the templates to be modified
-into a mirrored directory structure under
-:file:`template/en/custom`. Templates in this
-directory structure automatically override any identically-named
-and identically-located templates in the
-:file:`default` directory.
-
-.. note:: The :file:`custom` directory does not exist
-   at first and must be created if you want to use it.
-
-The second method of customization should be used if you
-use the overwriting method of upgrade, because otherwise
-your changes will be lost.  This method may also be better if
-you are using the Bzr method of upgrading and are going to make major
-changes, because it is guaranteed that the contents of this directory
-will not be touched during an upgrade, and you can then decide whether
-to continue using your own templates, or make the effort to merge your
-changes into the new versions by hand.
-
-Using this method, your installation may break if incompatible
-changes are made to the template interface.  Such changes should
-be documented in the release notes, provided you are using a
-stable release of Bugzilla.  If you use using unstable code, you will
-need to deal with this one yourself, although if possible the changes
-will be mentioned before they occur in the deprecations section of the
-previous stable release's release notes.
-
-.. note:: Regardless of which method you choose, it is recommended that
-   you run :command:`./checksetup.pl` after
-   editing any templates in the :file:`template/en/default`
-   directory, and after creating or editing any templates in
-   the :file:`custom` directory.
-
-.. warning:: It is *required* that you run :command:`./checksetup.pl` after
-   creating a new
-   template in the :file:`custom` directory. Failure
-   to do so will raise an incomprehensible error message.
-
-.. _template-edit:
-
-How To Edit Templates
-=====================
-
-.. note:: If you are making template changes that you intend on submitting back
-   for inclusion in standard Bugzilla, you should read the relevant
-   sections of the
-   `Developers'
-   Guide <http://www.bugzilla.org/docs/developer.html>`_.
-
-The syntax of the Template Toolkit language is beyond the scope of
-this guide. It's reasonably easy to pick up by looking at the current
-templates; or, you can read the manual, available on the
-`Template Toolkit home
-page <http://www.template-toolkit.org>`_.
-
-One thing you should take particular care about is the need
-to properly HTML filter data that has been passed into the template.
-This means that if the data can possibly contain special HTML characters
-such as <, and the data was not intended to be HTML, they need to be
-converted to entity form, i.e. &lt;.  You use the 'html' filter in the
-Template Toolkit to do this (or the 'uri' filter to encode special
-characters in URLs).  If you forget, you may open up your installation
-to cross-site scripting attacks.
-
-Editing templates is a good way of doing a ``poor man's custom
-fields``.
-For example, if you don't use the Status Whiteboard, but want to have
-a free-form text entry box for ``Build Identifier``,
-then you can just
-edit the templates to change the field labels. It's still be called
-status_whiteboard internally, but your users don't need to know that.
-
-.. _template-formats:
-
-Template Formats and Types
-==========================
-
-Some CGI's have the ability to use more than one template. For example,
-:file:`buglist.cgi` can output itself as RDF, or as two
-formats of HTML (complex and simple). The mechanism that provides this
-feature is extensible.
-
-Bugzilla can support different types of output, which again can have
-multiple formats. In order to request a certain type, you can append
-the &ctype=<contenttype> (such as rdf or html) to the
-:file:`<cginame>.cgi` URL. If you would like to
-retrieve a certain format, you can use the &format=<format>
-(such as simple or complex) in the URL.
-
-To see if a CGI supports multiple output formats and types, grep the
-CGI for ``get_format``. If it's not present, adding
-multiple format/type support isn't too hard - see how it's done in
-other CGIs, e.g. config.cgi.
-
-To make a new format template for a CGI which supports this,
-open a current template for
-that CGI and take note of the INTERFACE comment (if present.) This
-comment defines what variables are passed into this template. If
-there isn't one, I'm afraid you'll have to read the template and
-the code to find out what information you get.
-
-Write your template in whatever markup or text style is appropriate.
-
-You now need to decide what content type you want your template
-served as. The content types are defined in the
-:file:`Bugzilla/Constants.pm` file in the
-:file:`contenttypes`
-constant. If your content type is not there, add it. Remember
-the three- or four-letter tag assigned to your content type.
-This tag will be part of the template filename.
-
-.. note:: After adding or changing a content type, it's suitable to
-   edit :file:`Bugzilla/Constants.pm` in order to reflect
-   the changes. Also, the file should be kept up to date after an
-   upgrade if content types have been customized in the past.
-
-Save the template as :file:`<stubname>-<formatname>.<contenttypetag>.tmpl`.
-Try out the template by calling the CGI as
-:file:`<cginame>.cgi?format=<formatname>&ctype=<type>` .
-
-.. _template-specific:
-
-Particular Templates
-====================
-
-There are a few templates you may be particularly interested in
-customizing for your installation.
-
-:command:`index.html.tmpl`:
-This is the Bugzilla front page.
-
-:command:`global/header.html.tmpl`:
-This defines the header that goes on all Bugzilla pages.
-The header includes the banner, which is what appears to users
-and is probably what you want to edit instead.  However the
-header also includes the HTML HEAD section, so you could for
-example add a stylesheet or META tag by editing the header.
-
-:command:`global/banner.html.tmpl`:
-This contains the ``banner``, the part of the header
-that appears
-at the top of all Bugzilla pages.  The default banner is reasonably
-barren, so you'll probably want to customize this to give your
-installation a distinctive look and feel.  It is recommended you
-preserve the Bugzilla version number in some form so the version
-you are running can be determined, and users know what docs to read.
-
-:command:`global/footer.html.tmpl`:
-This defines the footer that goes on all Bugzilla pages.  Editing
-this is another way to quickly get a distinctive look and feel for
-your Bugzilla installation.
-
-:command:`global/variables.none.tmpl`:
-This defines a list of terms that may be changed in order to
-``brand`` the Bugzilla instance In this way, terms
-like ``bugs`` can be replaced with ``issues``
-across the whole Bugzilla installation. The name
-``Bugzilla`` and other words can be customized as well.
-
-:command:`list/table.html.tmpl`:
-This template controls the appearance of the bug lists created
-by Bugzilla. Editing this template allows per-column control of
-the width and title of a column, the maximum display length of
-each entry, and the wrap behaviour of long entries.
-For long bug lists, Bugzilla inserts a 'break' every 100 bugs by
-default; this behaviour is also controlled by this template, and
-that value can be modified here.
-
-:command:`bug/create/user-message.html.tmpl`:
-This is a message that appears near the top of the bug reporting page.
-By modifying this, you can tell your users how they should report
-bugs.
-
-:command:`bug/process/midair.html.tmpl`:
-This is the page used if two people submit simultaneous changes to the
-same bug.  The second person to submit their changes will get this page
-to tell them what the first person did, and ask if they wish to
-overwrite those changes or go back and revisit the bug.  The default
-title and header on this page read "Mid-air collision detected!"  If
-you work in the aviation industry, or other environment where this
-might be found offensive (yes, we have true stories of this happening)
-you'll want to change this to something more appropriate for your
-environment.
-
-:command:`bug/create/create.html.tmpl` and
-:command:`bug/create/comment.txt.tmpl`:
-You may not wish to go to the effort of creating custom fields in
-Bugzilla, yet you want to make sure that each bug report contains
-a number of pieces of important information for which there is not
-a special field. The bug entry system has been designed in an
-extensible fashion to enable you to add arbitrary HTML widgets,
-such as drop-down lists or textboxes, to the bug entry page
-and have their values appear formatted in the initial comment.
-A hidden field that indicates the format should be added inside
-the form in order to make the template functional. Its value should
-be the suffix of the template filename. For example, if the file
-is called :file:`create-cust.html.tmpl`, then
-
-::
-
-    <input type="hidden" name="format" value="cust">
-
-should be used inside the form.
-
-An example of this is the mozilla.org
-`guided
-bug submission form <http://landfill.bugzilla.org/bugzilla-tip/enter_bug.cgi?product=WorldControl;format=guided>`_. The code for this comes with the Bugzilla
-distribution as an example for you to copy. It can be found in the
-files
-:file:`create-guided.html.tmpl` and
-:file:`comment-guided.html.tmpl`.
-
-So to use this feature, create a custom template for
-:file:`enter_bug.cgi`. The default template, on which you
-could base it, is
-:file:`custom/bug/create/create.html.tmpl`.
-Call it :file:`create-<formatname>.html.tmpl`, and
-in it, add widgets for each piece of information you'd like
-collected - such as a build number, or set of steps to reproduce.
-
-Then, create a template like
-:file:`custom/bug/create/comment.txt.tmpl`, and call it
-:file:`comment-<formatname>.txt.tmpl`. This
-template should reference the form fields you have created using
-the syntax :file:`[% form.<fieldname> %]`. When a
-bug report is
-submitted, the initial comment attached to the bug report will be
-formatted according to the layout of this template.
-
-For example, if your custom enter_bug template had a field
-
-::
-
-    <input type="text" name="buildid" size="30">
-
-and then your comment.txt.tmpl had
-
-::
-
-    BuildID: \[% form.buildid %]
-
-then something like
-
-::
-
-    BuildID: 20020303
-
-would appear in the initial comment.
-
-.. _template-http-accept:
-
-Configuring Bugzilla to Detect the User's Language
-==================================================
-
-Bugzilla honours the user's Accept: HTTP header. You can install
-templates in other languages, and Bugzilla will pick the most appropriate
-according to a priority order defined by you. Many
-language templates can be obtained from `<http://www.bugzilla.org/download.html#localizations>`_. Instructions
-for submitting new languages are also available from that location.
-
-.. _cust-change-permissions:
-
-Customizing Who Can Change What
-###############################
-
-.. warning:: This feature should be considered experimental; the Bugzilla code you
-   will be changing is not stable, and could change or move between
-   versions. Be aware that if you make modifications as outlined here,
-   you may have
-   to re-make them or port them if Bugzilla changes internally between
-   versions, and you upgrade.
-
-Companies often have rules about which employees, or classes of employees,
-are allowed to change certain things in the bug system. For example,
-only the bug's designated QA Contact may be allowed to VERIFY the bug.
-Bugzilla has been
-designed to make it easy for you to write your own custom rules to define
-who is allowed to make what sorts of value transition.
-
-By default, assignees, QA owners and users
-with *editbugs* privileges can edit all fields of bugs,
-except group restrictions (unless they are members of the groups they
-are trying to change). Bug reporters also have the ability to edit some
-fields, but in a more restrictive manner. Other users, without
-*editbugs* privileges, cannot edit
-bugs, except to comment and add themselves to the CC list.
-
-For maximum flexibility, customizing this means editing Bugzilla's Perl
-code. This gives the administrator complete control over exactly who is
-allowed to do what. The relevant method is called
-:file:`check_can_change_field()`,
-and is found in :file:`Bug.pm` in your
-Bugzilla/ directory. If you open that file and search for
-``sub check_can_change_field``, you'll find it.
-
-This function has been carefully commented to allow you to see exactly
-how it works, and give you an idea of how to make changes to it.
-Certain marked sections should not be changed - these are
-the ``plumbing`` which makes the rest of the function work.
-In between those sections, you'll find snippets of code like:
-
-::
-
-    # Allow the assignee to change anything.
-    if ($ownerid eq $whoid) {
-        return 1;
-    }
-
-It's fairly obvious what this piece of code does.
-
-So, how does one go about changing this function? Well, simple changes
-can be made just by removing pieces - for example, if you wanted to
-prevent any user adding a comment to a bug, just remove the lines marked
-``Allow anyone to change comments.`` If you don't want the
-Reporter to have any special rights on bugs they have filed, just
-remove the entire section that deals with the Reporter.
-
-More complex customizations are not much harder. Basically, you add
-a check in the right place in the function, i.e. after all the variables
-you are using have been set up. So, don't look at $ownerid before
-$ownerid has been obtained from the database. You can either add a
-positive check, which returns 1 (allow) if certain conditions are true,
-or a negative check, which returns 0 (deny.) E.g.:
-
-::
-
-    if ($field eq "qacontact") {
-        if (Bugzilla->user->in_group("quality_assurance")) {
-            return 1;
-        }
-        else {
-            return 0;
-        }
-    }
-
-This says that only users in the group "quality_assurance" can change
-the QA Contact field of a bug.
-
-Getting more weird:
-
-::
-
-    if (($field eq "priority") &&
-        (Bugzilla->user->email =~ /.*\\@example\\.com$/))
-    {
-        if ($oldvalue eq "P1") {
-            return 1;
-        }
-        else {
-            return 0;
-        }
-    }
-
-This says that if the user is trying to change the priority field,
-and their email address is @example.com, they can only do so if the
-old value of the field was "P1". Not very useful, but illustrative.
-
-.. warning:: If you are modifying :file:`process_bug.cgi` in any
-   way, do not change the code that is bounded by DO_NOT_CHANGE blocks.
-   Doing so could compromise security, or cause your installation to
-   stop working entirely.
-
-For a list of possible field names, look at the bugs table in the
-database. If you need help writing custom rules for your organization,
-ask in the newsgroup.
-
-.. _integration:
-
-Integrating Bugzilla with Third-Party Tools
-###########################################
-
-Many utilities and applications can integrate with Bugzilla,
-either on the client- or server-side. None of them are maintained
-by the Bugzilla community, nor are they tested during our
-QA tests, so use them at your own risk. They are listed at
-`<https://wiki.mozilla.org/Bugzilla:Addons>`_.
-
-
diff --git a/docs/en/rst/extensions.rst b/docs/en/rst/extensions.rst
deleted file mode 100644
index 91eaab9521..0000000000
--- a/docs/en/rst/extensions.rst
+++ /dev/null
@@ -1,11 +0,0 @@
-Extensions
-==========
-
-Your Bugzilla installation has the following extensions available (as of the
-last time you compiled the documentation):
-
-.. toctree::
-   :maxdepth: 1
-   :glob:
-   
-   extensions/*
diff --git a/docs/en/rst/extensions/.gitignore b/docs/en/rst/extensions/.gitignore
new file mode 100644
index 0000000000..2bf5214894
--- /dev/null
+++ b/docs/en/rst/extensions/.gitignore
@@ -0,0 +1,6 @@
+# Git doesn't like having empty directories in the repo.
+# So we have this file.
+# It says to ignore everything in this directory.
+*
+# Except this file, of course.
+!.gitignore
diff --git a/docs/en/rst/gfdl.rst b/docs/en/rst/gfdl.rst
deleted file mode 100644
index 4c831a1d43..0000000000
--- a/docs/en/rst/gfdl.rst
+++ /dev/null
@@ -1,408 +0,0 @@
-
-
-.. _gfdl:
-
-==============================
-GNU Free Documentation License
-==============================
-
-.. COMMENT: - GNU Project - Free Software Foundation (FSF)
-
-.. COMMENT: LINK REV="made" HREF="mailto:webmasters@gnu.org"
-
-.. COMMENT: section>
-            <title>GNU Free Documentation License</title
-
-Version 1.1, March 2000
-
-    Copyright (C) 2000 Free Software Foundation, Inc. 51 Franklin Street,
-    Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and
-    distribute verbatim copies of this license document, but changing it is
-    not allowed.
-
-.. _gfdl-0:
-
-Preamble
-########
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone the
-effective freedom to copy and redistribute it, with or without modifying
-it, either commercially or noncommercially. Secondarily, this License
-preserves for the author and publisher a way to get credit for their
-work, while not being considered responsible for modifications made by
-others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense. It
-complements the GNU General Public License, which is a copyleft license
-designed for free software.
-
-We have designed this License in order to use it for manuals for
-free software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does. But this License is not limited to software manuals; it
-can be used for any textual work, regardless of subject matter or whether
-it is published as a printed book. We recommend this License principally
-for works whose purpose is instruction or reference.
-
-.. _gfdl-1:
-
-Applicability and Definition
-############################
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed under
-the terms of this License. The "Document", below, refers to any such
-manual or work. Any member of the public is a licensee, and is addressed
-as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section
-of the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject. (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.) The relationship could be a matter of historical connection
-with the subject or with related matters, or of legal, commercial,
-philosophical, ethical or political position regarding them.
-
-The "Invariant Sections" are certain Secondary Sections whose
-titles are designated, as being those of Invariant Sections, in the
-notice that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are
-listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says
-that the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the general
-public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or for
-automatic translation to a variety of formats suitable for input to text
-formatters. A copy made in an otherwise Transparent file format whose
-markup has been designed to thwart or discourage subsequent modification
-by readers is not Transparent. A copy that is not "Transparent" is called
-"Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML or
-XML using a publicly available DTD, and standard-conforming simple HTML
-designed for human modification. Opaque formats include PostScript, PDF,
-proprietary formats that can be read and edited only by proprietary word
-processors, SGML or XML for which the DTD and/or processing tools are not
-generally available, and the machine-generated HTML produced by some word
-processors for output purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page. For works in formats
-which do not have any title page as such, "Title Page" means the text
-near the most prominent appearance of the work's title, preceding the
-beginning of the body of the text.
-
-.. _gfdl-2:
-
-Verbatim Copying
-################
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies to
-the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License. You may not use technical
-measures to obstruct or control the reading or further copying of the
-copies you make or distribute. However, you may accept compensation in
-exchange for copies. If you distribute a large enough number of copies
-you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above,
-and you may publicly display copies.
-
-.. _gfdl-3:
-
-Copying in Quantity
-###################
-
-If you publish printed copies of the Document numbering more than
-100, and the Document's license notice requires Cover Texts, you must
-enclose the copies in covers that carry, clearly and legibly, all these
-Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts
-on the back cover. Both covers must also clearly and legibly identify you
-as the publisher of these copies. The front cover must present the full
-title with all words of the title equally prominent and visible. You may
-add other material on the covers in addition. Copying with changes
-limited to the covers, as long as they preserve the title of the Document
-and satisfy these conditions, can be treated as verbatim copying in other
-respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit reasonably)
-on the actual cover, and continue the rest onto adjacent pages.
-
-If you publish or distribute Opaque copies of the Document
-numbering more than 100, you must either include a machine-readable
-Transparent copy along with each Opaque copy, or state in or with each
-Opaque copy a publicly-accessible computer-network location containing a
-complete Transparent copy of the Document, free of added material, which
-the general network-using public has access to download anonymously at no
-charge using public-standard network protocols. If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location until
-at least one year after the last time you distribute an Opaque copy
-(directly or through your agents or retailers) of that edition to the
-public.
-
-It is requested, but not required, that you contact the authors of
-the Document well before redistributing any large number of copies, to
-give them a chance to provide you with an updated version of the
-Document.
-
-.. _gfdl-4:
-
-Modifications
-#############
-
-You may copy and distribute a Modified Version of the Document
-under the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution and
-modification of the Modified Version to whoever possesses a copy of it.
-In addition, you must do these things in the Modified Version:
-
-#. Use in the Title Page (and on the covers, if any) a title
-   distinct from that of the Document, and from those of previous
-   versions (which should, if there were any, be listed in the History
-   section of the Document). You may use the same title as a previous
-   version if the original publisher of that version gives
-   permission.
-
-#. List on the Title Page, as authors, one or more persons or
-   entities responsible for authorship of the modifications in the
-   Modified Version, together with at least five of the principal
-   authors of the Document (all of its principal authors, if it has less
-   than five).
-
-#. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-
-#. Preserve all the copyright notices of the Document.
-
-#. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-
-#. Include, immediately after the copyright notices, a license
-   notice giving the public permission to use the Modified Version under
-   the terms of this License, in the form shown in the Addendum
-   below.
-
-#. Preserve in that license notice the full lists of Invariant
-   Sections and required Cover Texts given in the Document's license
-   notice.
-
-#. Include an unaltered copy of this License.
-
-#. Preserve the section entitled "History", and its title, and add
-   to it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page. If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-
-#. Preserve the network location, if any, given in the Document
-   for public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions it
-   was based on. These may be placed in the "History" section. You may
-   omit a network location for a work that was published at least four
-   years before the Document itself, or if the original publisher of the
-   version it refers to gives permission.
-
-#. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements and/or
-   dedications given therein.
-
-#. Preserve all the Invariant Sections of the Document, unaltered
-   in their text and in their titles. Section numbers or the equivalent
-   are not considered part of the section titles.
-
-#. Delete any section entitled "Endorsements". Such a section may
-   not be included in the Modified Version.
-
-#. Do not retitle any existing section as "Endorsements" or to
-   conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all of
-these sections as invariant. To do this, add their titles to the list of
-Invariant Sections in the Modified Version's license notice. These titles
-must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various parties--for
-example, statements of peer review or that the text has been approved by
-an organization as the authoritative definition of a standard.
-
-You may add a passage of up to five words as a Front-Cover Text,
-and a passage of up to 25 words as a Back-Cover Text, to the end of the
-list of Cover Texts in the Modified Version. Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or through
-arrangements made by) any one entity. If the Document already includes a
-cover text for the same cover, previously added by you or by arrangement
-made by the same entity you are acting on behalf of, you may not add
-another; but you may replace the old one, on explicit permission from the
-previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this
-License give permission to use their names for publicity for or to assert
-or imply endorsement of any Modified Version.
-
-.. _gfdl-5:
-
-Combining Documents
-###################
-
-You may combine the Document with other documents released under
-this License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and list
-them all as Invariant Sections of your combined work in its license
-notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single copy.
-If there are multiple Invariant Sections with the same name but different
-contents, make the title of each such section unique by adding at the end
-of it, in parentheses, the name of the original author or publisher of
-that section if known, or else a unique number. Make the same adjustment
-to the section titles in the list of Invariant Sections in the license
-notice of the combined work.
-
-In the combination, you must combine any sections entitled
-"History" in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements", and
-any sections entitled "Dedications". You must delete all sections
-entitled "Endorsements."
-
-.. _gfdl-6:
-
-Collections of Documents
-########################
-
-You may make a collection consisting of the Document and other
-documents released under this License, and replace the individual copies
-of this License in the various documents with a single copy that is
-included in the collection, provided that you follow the rules of this
-License for verbatim copying of each of the documents in all other
-respects.
-
-You may extract a single document from such a collection, and
-distribute it individually under this License, provided you insert a copy
-of this License into the extracted document, and follow this License in
-all other respects regarding verbatim copying of that document.
-
-.. _gfdl-7:
-
-Aggregation with Independent Works
-##################################
-
-A compilation of the Document or its derivatives with other
-separate and independent documents or works, in or on a volume of a
-storage or distribution medium, does not as a whole count as a Modified
-Version of the Document, provided no compilation copyright is claimed for
-the compilation. Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they are
-not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter of
-the entire aggregate, the Document's Cover Texts may be placed on covers
-that surround only the Document within the aggregate. Otherwise they must
-appear on covers around the whole aggregate.
-
-.. _gfdl-8:
-
-Translation
-###########
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include translations
-of some or all Invariant Sections in addition to the original versions of
-these Invariant Sections. You may include a translation of this License
-provided that you also include the original English version of this
-License. In case of a disagreement between the translation and the
-original English version of this License, the original English version
-will prevail.
-
-.. _gfdl-9:
-
-Termination
-###########
-
-You may not copy, modify, sublicense, or distribute the Document
-except as expressly provided for under this License. Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License. However, parties
-who have received copies, or rights, from you under this License will not
-have their licenses terminated so long as such parties remain in full
-compliance.
-
-.. _gfdl-10:
-
-Future Revisions of this License
-################################
-
-The Free Software Foundation may publish new, revised versions of
-the GNU Free Documentation License from time to time. Such new versions
-will be similar in spirit to the present version, but may differ in
-detail to address new problems or concerns. See
-`<http://www.gnu.org/copyleft/>`_.
-
-Each version of the License is given a distinguishing version
-number. If the Document specifies that a particular numbered version of
-this License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or of
-any later version that has been published (not as a draft) by the Free
-Software Foundation. If the Document does not specify a version number of
-this License, you may choose any version ever published (not as a draft)
-by the Free Software Foundation.
-
-.. _gfdl-howto:
-
-How to use this License for your documents
-##########################################
-
-To use this License in a document you have written, include a copy
-of the License in the document and put the following copyright and
-license notices just after the title page:
-
-    Copyright (c) YEAR YOUR NAME. Permission is granted to copy,
-    distribute and/or modify this document under the terms of the GNU Free
-    Documentation License, Version 1.1 or any later version published by
-    the Free Software Foundation; with the Invariant Sections being LIST
-    THEIR TITLES, with the Front-Cover Texts being LIST, and with the
-    Back-Cover Texts being LIST. A copy of the license is included in the
-    section entitled "GNU Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant
-Sections" instead of saying which ones are invariant. If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover
-Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of free
-software license, such as the GNU General Public License, to permit their
-use in free software.
-
diff --git a/docs/en/rst/index.rst b/docs/en/rst/index.rst
index f2bd14f18b..ff8ff3146a 100644
--- a/docs/en/rst/index.rst
+++ b/docs/en/rst/index.rst
@@ -1,23 +1,15 @@
-.. Bugzilla documentation master file, created by
-   sphinx-quickstart on Tue Sep  3 16:11:00 2013.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
+======================
 Bugzilla Documentation
 ======================
 
 .. toctree::
-   :maxdepth: 3
-   :numbered:
+   :maxdepth: 1
+   :numbered: 4
 
-   about
-   installation
-   administration
-   security
-   using
-   extensions
-   customization
-   patches
-   troubleshooting
-   modules
-   gfdl
+   about/index
+   using/index
+   installing/index
+   administering/index
+   integrating/index
+   api/index
+   localizing/index
diff --git a/docs/en/rst/installation.rst b/docs/en/rst/installation.rst
deleted file mode 100644
index ca69667f46..0000000000
--- a/docs/en/rst/installation.rst
+++ /dev/null
@@ -1,1813 +0,0 @@
-.. highlight:: console
-
-.. _installing-bugzilla:
-
-===================
-Installing Bugzilla
-===================
-
-.. _installation:
-
-Installation
-############
-
-.. note:: If you just want to *use* Bugzilla,
-   you do not need to install it. None of this chapter is relevant to
-   you. Ask your Bugzilla administrator for the URL to access it from
-   your web browser.
-
-The Bugzilla server software is usually installed on Linux or
-Solaris.
-If you are installing on another OS, check :ref:`os-specific`
-before you start your installation to see if there are any special
-instructions.
-
-This guide assumes that you have administrative access to the
-Bugzilla machine. It not possible to
-install and run Bugzilla itself without administrative access except
-in the very unlikely event that every single prerequisite is
-already installed.
-
-.. warning:: The installation process may make your machine insecure for
-   short periods of time. Make sure there is a firewall between you
-   and the Internet.
-
-You are strongly recommended to make a backup of your system
-before installing Bugzilla (and at regular intervals thereafter :-).
-
-In outline, the installation proceeds as follows:
-
-#. :ref:`Install Perl <install-perl>`
-   (|min-perl-ver| or above)
-
-#. :ref:`Install a Database Engine <install-database>`
-
-#. :ref:`Install a Webserver <install-webserver>`
-
-#. :ref:`Install Bugzilla <install-bzfiles>`
-
-#. :ref:`Install Perl modules <install-perlmodules>`
-
-#. :ref:`Install a Mail Transfer Agent <install-MTA>`
-   (Sendmail 8.7 or above, or an MTA that is Sendmail-compatible with at least this version)
-
-#. Configure all of the above.
-
-.. _install-perl:
-
-Perl
-====
-
-Installed Version Test:
-::
-
-    $ perl -v
-
-Any machine that doesn't have Perl on it is a sad machine indeed.
-If you don't have it and your OS doesn't provide official packages,
-visit `<http://www.perl.org>`_.
-Although Bugzilla runs with Perl |min-perl-ver|,
-it's a good idea to be using the latest stable version.
-
-.. _install-database:
-
-Database Engine
-===============
-
-Bugzilla supports MySQL, PostgreSQL and Oracle as database servers.
-You only require one of these systems to make use of Bugzilla.
-
-.. _install-mysql:
-
-MySQL
------
-
-Installed Version Test:
-::
-
-    $ mysql -V
-
-If you don't have it and your OS doesn't provide official packages,
-visit `<http://www.mysql.com>`_. You need MySQL version
-5.0.15 or higher.
-
-.. note:: Many of the binary
-   versions of MySQL store their data files in :file:`/var`.
-   On some Unix systems, this is part of a smaller root partition,
-   and may not have room for your bug database. To change the data
-   directory, you have to build MySQL from source yourself, and
-   set it as an option to :file:`configure`.
-
-If you install from something other than a packaging/installation
-system, such as .rpm (RPM Package Manager), .deb (Debian Package), .exe
-(Windows Executable), or .msi (Windows Installer), make sure the MySQL
-server is started when the machine boots.
-
-.. _install-pg:
-
-PostgreSQL
-----------
-
-Installed Version Test:
-::
-
-    $ psql -V
-
-If you don't have it and your OS doesn't provide official packages,
-visit `<http://www.postgresql.org/>`_. You need PostgreSQL
-version 8.03.0000 or higher.
-
-If you install from something other than a packaging/installation
-system, such as .rpm (RPM Package Manager), .deb (Debian Package), .exe
-(Windows Executable), or .msi (Windows Installer), make sure the
-PostgreSQL server is started when the machine boots.
-
-.. _install-oracle:
-
-Oracle
-------
-
-Installed Version Test:
-
-.. code-block:: sql
-
-    SELECT * FROM v$version
-
-(you first have to log in into your DB)
-
-If you don't have it and your OS doesn't provide official packages,
-visit `<http://www.oracle.com/>`_. You need Oracle
-version 10.02.0 or higher.
-
-If you install from something other than a packaging/installation
-system, such as .rpm (RPM Package Manager), .deb (Debian Package), .exe
-(Windows Executable), or .msi (Windows Installer), make sure the
-Oracle server is started when the machine boots.
-
-.. _install-webserver:
-
-Web Server
-==========
-
-Installed Version Test: view the default welcome page at
-`http://<your-machine>/` .
-
-You have freedom of choice here, pretty much any web server that
-is capable of running CGI
-scripts will work.
-However, we strongly recommend using the Apache web server
-(either 1.3.x or 2.x), and the installation instructions usually assume
-you are using it. If you have got Bugzilla working using another web server,
-please share your experiences with us by filing a bug in
-`Bugzilla Documentation <http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla;component=Documentation>`_.
-
-If you don't have Apache and your OS doesn't provide official packages,
-visit `<http://httpd.apache.org/>`_.
-
-.. _install-bzfiles:
-
-Bugzilla
-========
-
-`Download a Bugzilla tarball <http://www.bugzilla.org/download/>`_
-(or `check it out from Bzr <https://wiki.mozilla.org/Bugzilla:Bzr>`_)
-and place it in a suitable directory, accessible by the default web server user
-(probably ``apache`` or ``www``).
-Good locations are either directly in the web server's document directories or
-in :file:`/usr/local` with a symbolic link to the web server's
-document directories or an alias in the web server's configuration.
-
-.. warning:: The default Bugzilla distribution is NOT designed to be placed
-   in a :file:`cgi-bin` directory. This
-   includes any directory which is configured using the
-   ``ScriptAlias`` directive of Apache.
-
-Once all the files are in a web accessible directory, make that
-directory writable by your web server's user. This is a temporary step
-until you run the
-:file:`checksetup.pl`
-script, which locks down your installation.
-
-.. _install-perlmodules:
-
-Perl Modules
-============
-
-Bugzilla's installation process is based
-on a script called :file:`checksetup.pl`.
-The first thing it checks is whether you have appropriate
-versions of all the required
-Perl modules. The aim of this section is to pass this check.
-When it passes, proceed to :ref:`configuration`.
-
-At this point, you need to :file:`su` to root. You should
-remain as root until the end of the install. To check you have the
-required modules, run:
-
-::
-
-    # ./checksetup.pl --check-modules
-
-:file:`checksetup.pl` will print out a list of the
-required and optional Perl modules, together with the versions
-(if any) installed on your machine.
-The list of required modules is reasonably long; however, you
-may already have several of them installed.
-
-The preferred way to install missing Perl modules is to use the package
-manager provided by your operating system (e.g ``rpm``, ``apt-get`` or
-``yum`` on Linux distros, or ``ppm`` on Windows
-if using ActivePerl, see :ref:`win32-perl-modules`).
-If some Perl modules are still missing or are too old, then we recommend
-using the :file:`install-module.pl` script (doesn't work
-with ActivePerl on Windows). For instance, on Unix,
-you invoke :file:`install-module.pl` as follows:
-
-::
-
-    # perl install-module.pl <modulename>
-
-.. note:: Many people complain that Perl modules will not install for
-   them. Most times, the error messages complain that they are missing a
-   file in
-   ``@INC``.
-   Virtually every time, this error is due to permissions being set too
-   restrictively for you to compile Perl modules or not having the
-   necessary Perl development libraries installed on your system.
-   Consult your local UNIX systems administrator for help solving these
-   permissions issues; if you
-   *are*
-   the local UNIX sysadmin, please consult the newsgroup/mailing list
-   for further assistance or hire someone to help you out.
-
-.. note:: If you are using a package-based system, and attempting to install the
-   Perl modules from CPAN, you may need to install the "development" packages for
-   MySQL and GD before attempting to install the related Perl modules. The names of
-   these packages will vary depending on the specific distribution you are using,
-   but are often called :file:`<packagename>-devel`.
-
-If for some reason you really need to install the Perl modules manually, see
-:ref:`install-perlmodules-manual`.
-
-.. _install-MTA:
-
-Mail Transfer Agent (MTA)
-=========================
-
-Bugzilla is dependent on the availability of an e-mail system for its
-user authentication and for other tasks.
-
-.. note:: This is not entirely true.  It is possible to completely disable
-   email sending, or to have Bugzilla store email messages in a
-   file instead of sending them.  However, this is mainly intended
-   for testing, as disabling or diverting email on a production
-   machine would mean that users could miss important events (such
-   as bug changes or the creation of new accounts).
-   For more information, see the ``mail_delivery_method`` parameter
-   in :ref:`parameters`.
-
-On Linux, any Sendmail-compatible MTA (Mail Transfer Agent) will
-suffice.  Sendmail, Postfix, qmail and Exim are examples of common
-MTAs. Sendmail is the original Unix MTA, but the others are easier to
-configure, and therefore many people replace Sendmail with Postfix or
-Exim. They are drop-in replacements, so Bugzilla will not
-distinguish between them.
-
-If you are using Sendmail, version 8.7 or higher is required.
-If you are using a Sendmail-compatible MTA, it must be congruent with
-at least version 8.7 of Sendmail.
-
-Consult the manual for the specific MTA you choose for detailed
-installation instructions. Each of these programs will have their own
-configuration files where you must configure certain parameters to
-ensure that the mail is delivered properly. They are implemented
-as services, and you should ensure that the MTA is in the auto-start
-list of services for the machine.
-
-If a simple mail sent with the command-line 'mail' program
-succeeds, then Bugzilla should also be fine.
-
-.. _using-mod_perl-with-bugzilla:
-
-Installing Bugzilla on mod_perl
-===============================
-
-It is now possible to run the Bugzilla software under ``mod_perl`` on
-Apache. ``mod_perl`` has some additional requirements to that of running
-Bugzilla under ``mod_cgi`` (the standard and previous way).
-
-Bugzilla requires ``mod_perl`` to be installed, which can be
-obtained from `<http://perl.apache.org>`_ - Bugzilla requires
-version 1.999022 (AKA 2.0.0-RC5) to be installed.
-
-.. _configuration:
-
-Configuration
-#############
-
-.. warning:: Poorly-configured MySQL and Bugzilla installations have
-   given attackers full access to systems in the past. Please take the
-   security parts of these guidelines seriously, even for Bugzilla
-   machines hidden away behind your firewall. Be certain to
-   read :ref:`security` for some important security tips.
-
-.. _localconfig:
-
-localconfig
-===========
-
-You should now run :file:`checksetup.pl` again, this time
-without the ``--check-modules`` switch.
-
-::
-
-    # ./checksetup.pl
-
-This time, :file:`checksetup.pl` should tell you that all
-the correct modules are installed and will display a message about, and
-write out a  file called, :file:`localconfig`. This file
-contains the default settings for a number of Bugzilla parameters.
-
-Load this file in your editor. The only two values you
-*need* to change are $db_driver and $db_pass,
-respectively the type of the database and the password for
-the user you will create for your database. Pick a strong
-password (for simplicity, it should not contain single quote
-characters) and put it here. $db_driver can be either 'mysql',
-'Pg', 'Oracle' or 'Sqlite'.
-
-.. note:: In Oracle, ``$db_name`` should actually be
-   the SID name of your database (e.g. "XE" if you are using Oracle XE).
-
-You may need to change the value of
-*webservergroup* if your web server does not
-run in the "apache" group.  On Debian, for example, Apache runs in
-the "www-data" group.  If you are going to run Bugzilla on a
-machine where you do not have root access (such as on a shared web
-hosting account), you will need to leave
-*webservergroup* empty, ignoring the warnings
-that :file:`checksetup.pl` will subsequently display
-every time it is run.
-
-.. warning:: If you are using suexec, you should use your own primary group
-   for *webservergroup* rather than leaving it
-   empty, and see the additional directions in the suexec section :ref:`suexec`.
-
-The other options in the :file:`localconfig` file
-are documented by their accompanying comments. If you have a slightly
-non-standard database setup, you may wish to change one or more of
-the other "$db_*" parameters.
-
-.. _database-engine:
-
-Database Server
-===============
-
-This section deals with configuring your database server for use
-with Bugzilla. Currently, MySQL (:ref:`mysql`),
-PostgreSQL (:ref:`postgresql`), Oracle (:ref:`oracle`)
-and SQLite (:ref:`sqlite`) are available.
-
-.. _database-schema:
-
-Bugzilla Database Schema
-------------------------
-
-The Bugzilla database schema is available at
-`Ravenbrook <http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/>`_.
-This very valuable tool can generate a written description of
-the Bugzilla database schema for any version of Bugzilla. It
-can also generate a diff between two versions to help someone
-see what has changed.
-
-.. _mysql:
-
-MySQL
------
-
-.. warning:: MySQL's default configuration is insecure.
-   We highly recommend to run :file:`mysql_secure_installation`
-   on Linux or the MySQL installer on Windows, and follow the instructions.
-   Important points to note are:
-
-#. Be sure that the root account has a secure password set.
-#. Do not create an anonymous account, and if it exists, say "yes"
-   to remove it.
-#. If your web server and MySQL server are on the same machine,
-   you should disable the network access.
-
-.. _mysql-max-allowed-packet:
-
-Allow large attachments and many comments
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, MySQL will only allow you to insert things
-into the database that are smaller than 1MB. Attachments
-may be larger than this. Also, Bugzilla combines all comments
-on a single bug into one field for full-text searching, and the
-combination of all comments on a single bug could in some cases
-be larger than 1MB.
-
-To change MySQL's default, you need to edit your MySQL
-configuration file, which is usually :file:`/etc/my.cnf`
-on Linux. We recommend that you allow at least 4MB packets by
-adding the "max_allowed_packet" parameter to your MySQL
-configuration in the "\[mysqld]" section, like this:
-
-::
-
-    [mysqld]
-    # Allow packets up to 4MB
-    max_allowed_packet=4M
-
-Allow small words in full-text indexes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, words must be at least four characters in length
-in order to be indexed by MySQL's full-text indexes. This causes
-a lot of Bugzilla specific words to be missed, including "cc",
-"ftp" and "uri".
-
-MySQL can be configured to index those words by setting the
-ft_min_word_len param to the minimum size of the words to index.
-This can be done by modifying the :file:`/etc/my.cnf`
-according to the example below:
-
-::
-
-    [mysqld]
-    # Allow small words in full-text indexes
-    ft_min_word_len=2
-
-Rebuilding the indexes can be done based on documentation found at
-`<http://www.mysql.com/doc/en/Fulltext_Fine-tuning.html>`_.
-
-.. _install-setupdatabase-adduser:
-
-Add a user to MySQL
-~~~~~~~~~~~~~~~~~~~
-
-You need to add a new MySQL user for Bugzilla to use.
-(It's not safe to have Bugzilla use the MySQL root account.)
-The following instructions assume the defaults in
-:file:`localconfig`; if you changed those,
-you need to modify the SQL command appropriately. You will
-need the $db_pass password you
-set in :file:`localconfig` in
-:ref:`localconfig`.
-
-We use an SQL :command:`GRANT` command to create
-a ``bugs`` user. This also restricts the
-``bugs`` user to operations within a database
-called ``bugs``, and only allows the account
-to connect from ``localhost``. Modify it to
-reflect your setup if you will be connecting from another
-machine or as a different user.
-
-Run the :file:`mysql` command-line client and enter:
-
-.. code-block:: sql
-
-    GRANT SELECT, INSERT,
-    UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
-    CREATE TEMPORARY TABLES, DROP, REFERENCES ON bugs.*
-    TO bugs@localhost IDENTIFIED BY '$db_pass';
-
-    FLUSH PRIVILEGES;
-
-Permit attachments table to grow beyond 4GB
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-By default, MySQL will limit the size of a table to 4GB.
-This limit is present even if the underlying filesystem
-has no such limit.  To set a higher limit, follow these
-instructions.
-
-After you have completed the rest of the installation (or at least the
-database setup parts), you should run the :file:`MySQL`
-command-line client and enter the following, replacing ``$bugs_db``
-with your Bugzilla database name (*bugs* by default):
-
-.. code-block:: sql
-
-    USE $bugs_db;
-    
-    ALTER TABLE attachments AVG_ROW_LENGTH=1000000, MAX_ROWS=20000;
-
-The above command will change the limit to 20GB. Mysql will have
-to make a temporary copy of your entire table to do this. Ideally,
-you should do this when your attachments table is still small.
-
-.. note:: This does not affect Big Files, attachments that are stored directly
-   on disk instead of in the database.
-
-.. _postgresql:
-
-PostgreSQL
-----------
-
-Add a User to PostgreSQL
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need to add a new user to PostgreSQL for the Bugzilla
-application to use when accessing the database. The following instructions
-assume the defaults in :file:`localconfig`; if you
-changed those, you need to modify the commands appropriately. You will
-need the $db_pass password you
-set in :file:`localconfig` in
-:ref:`localconfig`.
-
-On most systems, to create the user in PostgreSQL, you will need to
-login as the root user, and then
-
-::
-
-    # su - postgres
-
-As the postgres user, you then need to create a new user:
-
-::
-
-    $ createuser -U postgres -dRSP bugs
-
-When asked for a password, provide the password which will be set as
-$db_pass in :file:`localconfig`.
-The created user will not be a superuser (-S) and will not be able to create
-new users (-R). He will only have the ability to create databases (-d).
-
-Configure PostgreSQL
-~~~~~~~~~~~~~~~~~~~~
-
-Now, you will need to edit :file:`pg_hba.conf` which is
-usually located in :file:`/var/lib/pgsql/data/`. In this file,
-you will need to add a new line to it as follows:
-
-``host   all    bugs   127.0.0.1    255.255.255.255  md5``
-
-This means that for TCP/IP (host) connections, allow connections from
-'127.0.0.1' to 'all' databases on this server from the 'bugs' user, and use
-password authentication (md5) for that user.
-
-Now, you will need to restart PostgreSQL, but you will need to fully
-stop and start the server rather than just restarting due to the possibility
-of a change to :file:`postgresql.conf`. After the server has
-restarted, you will need to edit :file:`localconfig`, finding
-the ``$db_driver`` variable and setting it to
-``Pg`` and changing the password in ``$db_pass``
-to the one you picked previously, while setting up the account.
-
-.. _oracle:
-
-Oracle
-------
-
-Create a New Tablespace
-~~~~~~~~~~~~~~~~~~~~~~~
-
-You can use the existing tablespace or create a new one for Bugzilla.
-To create a new tablespace, run the following command:
-
-.. code-block:: sql
-
-    CREATE TABLESPACE bugs
-    DATAFILE '*$path_to_datafile*' SIZE 500M
-    AUTOEXTEND ON NEXT 30M MAXSIZE UNLIMITED
-
-Here, the name of the tablespace is 'bugs', but you can
-choose another name. *$path_to_datafile* is
-the path to the file containing your database, for instance
-:file:`/u01/oradata/bugzilla.dbf`.
-The initial size of the database file is set in this example to 500 Mb,
-with an increment of 30 Mb everytime we reach the size limit of the file.
-
-Add a User to Oracle
-~~~~~~~~~~~~~~~~~~~~
-
-The user name and password must match what you set in
-:file:`localconfig` (``$db_user``
-and ``$db_pass``, respectively). Here, we assume that
-the user name is 'bugs' and the tablespace name is the same
-as above.
-
-.. code-block:: sql
-
-    CREATE USER bugs
-    IDENTIFIED BY "$db_pass"
-    DEFAULT TABLESPACE bugs
-    TEMPORARY TABLESPACE TEMP
-    PROFILE DEFAULT;
-    -- GRANT/REVOKE ROLE PRIVILEGES
-    GRANT CONNECT TO bugs;
-    GRANT RESOURCE TO bugs;
-    -- GRANT/REVOKE SYSTEM PRIVILEGES
-    GRANT UNLIMITED TABLESPACE TO bugs;
-    GRANT EXECUTE ON CTXSYS.CTX_DDL TO bugs;
-
-Configure the Web Server
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you use Apache, append these lines to :file:`httpd.conf`
-to set ORACLE_HOME and LD_LIBRARY_PATH. For instance:
-
-.. code-block:: apache
-
-    SetEnv ORACLE_HOME /u01/app/oracle/product/10.2.0/
-    SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/
-
-When this is done, restart your web server.
-
-.. _sqlite:
-
-SQLite
-------
-
-.. warning:: Due to SQLite's `concurrency
-   limitations <http://sqlite.org/faq.html#q5>`_ we recommend SQLite only for small and development
-   Bugzilla installations.
-
-No special configuration is required to run Bugzilla on SQLite.
-The database will be stored in :file:`data/db/$db_name`,
-where ``$db_name`` is the database name defined
-in :file:`localconfig`.
-
-checksetup.pl
-=============
-
-Next, rerun :file:`checksetup.pl`. It reconfirms
-that all the modules are present, and notices the altered
-localconfig file, which it assumes you have edited to your
-satisfaction. It compiles the UI templates,
-connects to the database using the 'bugs'
-user you created and the password you defined, and creates the
-'bugs' database and the tables therein.
-
-After that, it asks for details of an administrator account. Bugzilla
-can have multiple administrators - you can create more later - but
-it needs one to start off with.
-Enter the email address of an administrator, his or her full name,
-and a suitable Bugzilla password.
-
-:file:`checksetup.pl` will then finish. You may rerun
-:file:`checksetup.pl` at any time if you wish.
-
-.. _http:
-
-Web server
-==========
-
-Configure your web server according to the instructions in the
-appropriate section. (If it makes a difference in your choice,
-the Bugzilla Team recommends Apache.) To check whether your web server
-is correctly configured, try to access :file:`testagent.cgi`
-from your web server. If "OK" is displayed, then your configuration
-is successful. Regardless of which web server
-you are using, however, ensure that sensitive information is
-not remotely available by properly applying the access controls in
-:ref:`security-webserver-access`. You can run
-:file:`testserver.pl` to check if your web server serves
-Bugzilla files as expected.
-
-.. _http-apache:
-
-Bugzilla using Apache
----------------------
-
-You have two options for running Bugzilla under Apache -
-:ref:`mod_cgi <http-apache-mod_cgi>` (the default) and
-:ref:`mod_perl <http-apache-mod_perl>` (new in Bugzilla
-2.23)
-
-.. _http-apache-mod_cgi:
-
-Apache *httpd* with mod_cgi
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To configure your Apache web server to work with Bugzilla while using
-mod_cgi, do the following:
-
-#. Load :file:`httpd.conf` in your editor.
-   In Fedora and Red Hat Linux, this file is found in
-   :file:`/etc/httpd/conf`.
-
-#. Apache uses ``<Directory>``
-   directives to permit fine-grained permission setting. Add the
-   following lines to a directive that applies to the location
-   of your Bugzilla installation. (If such a section does not
-   exist, you'll want to add one.) In this example, Bugzilla has
-   been installed at :file:`/var/www/html/bugzilla`.
-
-.. code-block:: apache
-
-       <Directory /var/www/html/bugzilla>
-       AddHandler cgi-script .cgi
-       Options +ExecCGI
-       DirectoryIndex index.cgi index.html
-       AllowOverride Limit FileInfo Indexes Options
-       </Directory>
-
-These instructions: allow apache to run .cgi files found
-within the bugzilla directory; instructs the server to look
-for a file called :file:`index.cgi` or, if not
-found, :file:`index.html` if someone
-only types the directory name into the browser; and allows
-Bugzilla's :file:`.htaccess` files to override
-some global permissions.
-
-.. note:: It is possible to make these changes globally, or to the
-   directive controlling Bugzilla's parent directory (e.g.
-   ``<Directory /var/www/html/>``).
-   Such changes would also apply to the Bugzilla directory...
-   but they would also apply to many other places where they
-   may or may not be appropriate. In most cases, including
-   this one, it is better to be as restrictive as possible
-   when granting extra access.
-
-.. note:: On Windows, you may have to also add the
-   ``ScriptInterpreterSource Registry-Strict``
-   line, see :ref:`Windows specific notes <win32-http>`.
-
-#. :file:`checksetup.pl` can set tighter permissions
-   on Bugzilla's files and directories if it knows what group the
-   web server runs as. Find the ``Group``
-   line in :file:`httpd.conf`, place the value found
-   there in the *$webservergroup* variable
-   in :file:`localconfig`, then rerun :file:`checksetup.pl`.
-
-#. Optional: If Bugzilla does not actually reside in the webspace
-   directory, but instead has been symbolically linked there, you
-   will need to add the following to the
-   ``Options`` line of the Bugzilla
-   ``<Directory>`` directive
-   (the same one as in the step above):
-
-.. code-block:: apache
-
-       +FollowSymLinks
-
-Without this directive, Apache will not follow symbolic links
-to places outside its own directory structure, and you will be
-unable to run Bugzilla.
-
-Apache *httpd * log files with bugzilla
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-For security reasons it is recommended to prevent Apache from logging
-query strings.
-
-For example:
-When external systems interact with Bugzilla via webservices (REST/XMLRPC/JSONRPC)
-they include the user's credentials as part of the URL (query-string). For security
-reasons we recommend configuring Apache to not include the query-string in its log
-files to avoid storing passwords in clear text on the server.
-
-#. Load :file:`httpd.conf` or :file:`apache2.conf` in your editor.
-	 In most of the Linux distributions this file is found in :folder:`/etc/httpd/conf/httpd.conf`
-	 or in :folder:`/etc/apache2/apache2.conf`.
-
-#. Find the following line in the above mentioned file.
-   LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined.
-
-#. Replace \"%r\" with \"%m	%U\".
-
-#. Now restart Apache.
-
-.. _http-apache-mod_perl:
-
-Apache *httpd* with mod_perl
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Some configuration is required to make Bugzilla work with Apache
-and mod_perl
-
-#. Load :file:`httpd.conf` in your editor.
-   In Fedora and Red Hat Linux, this file is found in :file:`/etc/httpd/conf`.
-
-#. Add the following information to your httpd.conf file, substituting
-   where appropriate with your own local paths.
-
-   .. note:: This should be used instead of the <Directory> block
-      shown above. This should also be above any other ``mod_perl``
-      directives within the :file:`httpd.conf` and must be specified
-      in the order as below.
-
-   .. warning:: You should also ensure that you have disabled ``KeepAlive``
-      support in your Apache install when utilizing Bugzilla under mod_perl
-
-.. code-block:: apache
-
-       PerlSwitches -w -T
-       PerlConfigRequire /var/www/html/bugzilla/mod_perl.pl
-
-#. :file:`checksetup.pl` can set tighter permissions
-   on Bugzilla's files and directories if it knows what group the
-   web server runs as. Find the ``Group``
-   line in :file:`httpd.conf`, place the value found
-   there in the *$webservergroup* variable
-   in :file:`localconfig`, then rerun :file:`checksetup.pl`.
-
-On restarting Apache, Bugzilla should now be running within the
-mod_perl environment. Please ensure you have run checksetup.pl to set
-permissions before you restart Apache.
-
-.. note:: Please bear the following points in mind when looking at using
-   Bugzilla under mod_perl:
-
-   - mod_perl support in Bugzilla can take up a HUGE amount of RAM. You could be
-     looking at 30MB per httpd child, easily. Basically, you just need a lot of RAM.
-     The more RAM you can get, the better. mod_perl is basically trading RAM for
-     speed. At least 2GB total system RAM is recommended for running Bugzilla under
-     mod_perl.
-   - Under mod_perl, you have to restart Apache if you make any manual change to
-     any Bugzilla file. You can't just reload--you have to actually
-     *restart* the server (as in make sure it stops and starts
-     again). You *can* change localconfig and the params file
-     manually, if you want, because those are re-read every time you load a page.
-   - You must run in Apache's Prefork MPM (this is the default). The Worker MPM
-     may not work--we haven't tested Bugzilla's mod_perl support under threads.
-     (And, in fact, we're fairly sure it *won't* work.)
-   - Bugzilla generally expects to be the only mod_perl application running on
-     your entire server. It may or may not work if there are other applications also
-     running under mod_perl. It does try its best to play nice with other mod_perl
-     applications, but it still may have conflicts.
-   - It is recommended that you have one Bugzilla instance running under mod_perl
-     on your server. Bugzilla has not been tested with more than one instance running.
-
-.. _http-iis:
-
-Microsoft *Internet Information Services*
------------------------------------------
-
-If you are running Bugzilla on Windows and choose to use
-Microsoft's *Internet Information Services*
-or *Personal Web Server* you will need
-to perform a number of other configuration steps as explained below.
-You may also want to refer to the following Microsoft Knowledge
-Base articles:
-`245225 - HOW TO: Configure and Test a PERL Script with IIS 4.0,
-5.0, and 5.1 <http://support.microsoft.com/default.aspx?scid=kb;en-us;245225>`_
-(for *Internet Information Services*) and
-`231998 - HOW TO: FP2000: How to Use Perl with Microsoft Personal Web
-Server on Windows 95/98 <http://support.microsoft.com/default.aspx?scid=kb;en-us;231998>`_
-(for *Personal Web Server*).
-
-You will need to create a virtual directory for the Bugzilla
-install.  Put the Bugzilla files in a directory that is named
-something *other* than what you want your
-end-users accessing.  That is, if you want your users to access
-your Bugzilla installation through
-``http://<yourdomainname>/Bugzilla``, then do
-*not* put your Bugzilla files in a directory
-named ``Bugzilla``.  Instead, place them in a different
-location, and then use the IIS Administration tool to create a
-Virtual Directory named "Bugzilla" that acts as an alias for the
-actual location of the files.  When creating that virtual directory,
-make sure you add the ``Execute (such as ISAPI applications or
-CGI)`` access permission.
-
-You will also need to tell IIS how to handle Bugzilla's
-.cgi files. Using the IIS Administration tool again, open up
-the properties for the new virtual directory and select the
-Configuration option to access the Script Mappings. Create an
-entry mapping .cgi to:
-
-::
-
-    <full path to perl.exe >\perl.exe -x<full path to Bugzilla> -wT "%s" %s
-
-For example:
-
-::
-
-    c:\perl\bin\perl.exe -xc:\bugzilla -wT "%s" %s
-
-.. note:: The ActiveState install may have already created an entry for
-   .pl files that is limited to ``GET,HEAD,POST``. If
-   so, this mapping should be *removed* as
-   Bugzilla's .pl files are not designed to be run via a web server.
-
-IIS will also need to know that the index.cgi should be treated
-as a default document.  On the Documents tab page of the virtual
-directory properties, you need to add index.cgi as a default
-document type.  If you  wish, you may remove the other default
-document types for this particular virtual directory, since Bugzilla
-doesn't use any of them.
-
-Also, and this can't be stressed enough, make sure that files
-such as :file:`localconfig` and your
-:file:`data` directory are
-secured as described in :ref:`security-webserver-access`.
-
-.. _install-config-bugzilla:
-
-Bugzilla
-========
-
-Your Bugzilla should now be working. Access
-:file:`http://<your-bugzilla-server>/` -
-you should see the Bugzilla
-front page. If not, consult the Troubleshooting section,
-:ref:`troubleshooting`.
-
-.. note:: The URL above may be incorrect if you installed Bugzilla into a
-   subdirectory or used a symbolic link from your web site root to
-   the Bugzilla directory.
-
-Log in with the administrator account you defined in the last
-:file:`checksetup.pl` run. You should go through
-the Parameters page and see if there are any you wish to change.
-They key parameters are documented in :ref:`parameters`;
-you should certainly alter
-:command:`maintainer` and :command:`urlbase`;
-you may also want to alter
-:command:`cookiepath` or :command:`requirelogin`.
-
-Bugzilla has several optional features which require extra
-configuration. You can read about those in
-:ref:`extraconfig`.
-
-.. _extraconfig:
-
-Optional Additional Configuration
-#################################
-
-Bugzilla has a number of optional features. This section describes how
-to configure or enable them.
-
-Bug Graphs
-==========
-
-If you have installed the necessary Perl modules you
-can start collecting statistics for the nifty Bugzilla
-graphs.
-
-::
-
-    # crontab -e
-
-This should bring up the crontab file in your editor.
-Add a cron entry like this to run
-:file:`collectstats.pl`
-daily at 5 after midnight:
-
-.. code-block:: none
-
-    5 0 * * * cd <your-bugzilla-directory> && ./collectstats.pl
-
-After two days have passed you'll be able to view bug graphs from
-the Reports page.
-
-.. note:: Windows does not have 'cron', but it does have the Task
-   Scheduler, which performs the same duties. There are also
-   third-party tools that can be used to implement cron, such as
-   `nncron <http://www.nncron.ru/>`_.
-
-.. _installation-whining-cron:
-
-The Whining Cron
-================
-
-What good are
-bugs if they're not annoying? To help make them more so you
-can set up Bugzilla's automatic whining system to complain at engineers
-which leave their bugs in the CONFIRMED state without triaging them.
-
-This can be done by adding the following command as a daily
-crontab entry, in the same manner as explained above for bug
-graphs. This example runs it at 12.55am.
-
-.. code-block:: none
-
-    55 0 * * * cd <your-bugzilla-directory> && ./whineatnews.pl
-
-.. note:: Windows does not have 'cron', but it does have the Task
-   Scheduler, which performs the same duties. There are also
-   third-party tools that can be used to implement cron, such as
-   `nncron <http://www.nncron.ru/>`_.
-
-.. _installation-whining:
-
-Whining
-=======
-
-As of Bugzilla 2.20, users can configure Bugzilla to regularly annoy
-them at regular intervals, by having Bugzilla execute saved searches
-at certain times and emailing the results to the user.  This is known
-as "Whining".  The process of configuring Whining is described
-in :ref:`whining`, but for it to work a Perl script must be
-executed at regular intervals.
-
-This can be done by adding the following command as a daily
-crontab entry, in the same manner as explained above for bug
-graphs. This example runs it every 15 minutes.
-
-.. code-block:: none
-
-    */15 * * * * cd <your-bugzilla-directory> && ./whine.pl
-
-.. note:: Whines can be executed as often as every 15 minutes, so if you specify
-   longer intervals between executions of whine.pl, some users may not
-   be whined at as often as they would expect.  Depending on the person,
-   this can either be a very Good Thing or a very Bad Thing.
-
-.. note:: Windows does not have 'cron', but it does have the Task
-   Scheduler, which performs the same duties. There are also
-   third-party tools that can be used to implement cron, such as
-   `nncron <http://www.nncron.ru/>`_.
-
-.. _apache-addtype:
-
-Serving Alternate Formats with the right MIME type
-==================================================
-
-Some Bugzilla pages have alternate formats, other than just plain
-HTML. In particular, a few Bugzilla pages can
-output their contents as either XUL (a special
-Mozilla format, that looks like a program GUI)
-or RDF (a type of structured XML
-that can be read by various programs).
-
-In order for your users to see these pages correctly, Apache must
-send them with the right MIME type. To do this,
-add the following lines to your Apache configuration, either in the
-``<VirtualHost>`` section for your
-Bugzilla, or in the ``<Directory>``
-section for your Bugzilla:
-
-.. code-block:: apache
-
-    AddType application/vnd.mozilla.xul+xml .xul
-    AddType application/rdf+xml .rdf
-
-.. _multiple-bz-dbs:
-
-Multiple Bugzilla databases with a single installation
-######################################################
-
-The previous instructions referred to a standard installation, with
-one unique Bugzilla database. However, you may want to host several
-distinct installations, without having several copies of the code. This is
-possible by using the PROJECT environment variable. When accessed,
-Bugzilla checks for the existence of this variable, and if present, uses
-its value to check for an alternative configuration file named
-:file:`localconfig.<PROJECT>` in the same location as
-the default one (:file:`localconfig`). It also checks for
-customized templates in a directory named
-:file:`<PROJECT>` in the same location as the
-default one (:file:`template/<langcode>`). By default
-this is :file:`template/en/default` so PROJECT's templates
-would be located at :file:`template/en/PROJECT`.
-
-To set up an alternate installation, just export PROJECT=foo before
-running :command:`checksetup.pl` for the first time. It will
-result in a file called :file:`localconfig.foo` instead of
-:file:`localconfig`. Edit this file as described above, with
-reference to a new database, and re-run :command:`checksetup.pl`
-to populate it. That's all.
-
-Now you have to configure the web server to pass this environment
-variable when accessed via an alternate URL, such as virtual host for
-instance. The following is an example of how you could do it in Apache,
-other Webservers may differ.
-
-.. code-block:: apache
-
-    <VirtualHost 212.85.153.228:80>
-    ServerName foo.bar.baz
-    SetEnv PROJECT foo
-    Alias /bugzilla /var/www/bugzilla
-    </VirtualHost>
-
-Don't forget to also export this variable before accessing Bugzilla
-by other means, such as cron tasks for instance.
-
-.. _os-specific:
-
-OS-Specific Installation Notes
-##############################
-
-Many aspects of the Bugzilla installation can be affected by the
-operating system you choose to install it on. Sometimes it can be made
-easier and others more difficult. This section will attempt to help you
-understand both the difficulties of running on specific operating systems
-and the utilities available to make it easier.
-
-If you have anything to add or notes for an operating system not covered,
-please file a bug in `Bugzilla Documentation <http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla;component=Documentation>`_.
-
-.. _os-win32:
-
-Microsoft Windows
-=================
-
-Making Bugzilla work on Windows is more difficult than making it
-work on Unix.  For that reason, we still recommend doing so on a Unix
-based system such as GNU/Linux.  That said, if you do want to get
-Bugzilla running on Windows, you will need to make the following
-adjustments. A detailed step-by-step
-`installation guide for Windows <https://wiki.mozilla.org/Bugzilla:Win32Install>`_ is also available
-if you need more help with your installation.
-
-.. _win32-perl:
-
-Win32 Perl
-----------
-
-Perl for Windows can be obtained from
-`ActiveState <http://www.activestate.com/>`_.
-You should be able to find a compiled binary at `<http://aspn.activestate.com/ASPN/Downloads/ActivePerl/>`_.
-The following instructions assume that you are using version
-|min-perl-ver| of ActiveState.
-
-.. note:: These instructions are for 32-bit versions of Windows. If you are
-   using a 64-bit version of Windows, you will need to install 32-bit
-   Perl in order to install the 32-bit modules as described below.
-
-.. _win32-perl-modules:
-
-Perl Modules on Win32
----------------------
-
-Bugzilla on Windows requires the same perl modules found in
-:ref:`install-perlmodules`. The main difference is that
-windows uses PPM instead
-of CPAN. ActiveState provides a GUI to manage Perl modules. We highly
-recommend that you use it. If you prefer to use ppm from the
-command-line, type:
-
-::
-
-    C:\perl> ppm install <module name>
-
-If you are using Perl |min-perl-ver|, the best source for the Windows PPM modules
-needed for Bugzilla is probably the theory58S website, which you can add
-to your list of repositories as follows:
-
-::
-
-    ppm repo add theory58S http://cpan.uwinnipeg.ca/PPMPackages/10xx/
-
-If you are using Perl 5.12 or newer, you no longer need to add
-this repository. All modules you need are already available from
-the ActiveState repository.
-
-.. note:: The PPM repository stores modules in 'packages' that may have
-   a slightly different name than the module.  If retrieving these
-   modules from there, you will need to pay attention to the information
-   provided when you run :command:`checksetup.pl` as it will
-   tell you what package you'll need to install.
-
-.. note:: If you are behind a corporate firewall, you will need to let the
-   ActiveState PPM utility know how to get through it to access
-   the repositories by setting the HTTP_proxy system environmental
-   variable. For more information on setting that variable, see
-   the ActiveState documentation.
-
-.. _win32-http:
-
-Serving the web pages
----------------------
-
-As is the case on Unix based systems, any web server should
-be able to handle Bugzilla; however, the Bugzilla Team still
-recommends Apache whenever asked. No matter what web server
-you choose, be sure to pay attention to the security notes
-in :ref:`security-webserver-access`. More
-information on configuring specific web servers can be found
-in :ref:`http`.
-
-.. note:: The web server looks at :file:`/usr/bin/perl` to
-   call Perl. If you are using Apache on windows, you can set the
-   `ScriptInterpreterSource <http://httpd.apache.org/docs-2.0/mod/core.html#scriptinterpretersource>`_
-   directive in your Apache config file to make it look at the
-   right place: insert the line
-
-   ::
-       ScriptInterpreterSource Registry-Strict
-
-   into your :file:`httpd.conf` file, and create the key
-
-   ::
-       HKEY_CLASSES_ROOT\\.cgi\\Shell\\ExecCGI\\Command
-
-   with ``C:\\Perl\\bin\\perl.exe -T`` as value (adapt to your
-   path if needed) in the registry. When this is done, restart Apache.
-
-.. _win32-email:
-
-Sending Email
--------------
-
-To enable Bugzilla to send email on Windows, the server running the
-Bugzilla code must be able to connect to, or act as, an SMTP server.
-
-.. _os-macosx:
-
-*Mac OS X*
-==========
-
-Making Bugzilla work on Mac OS X requires the following
-adjustments.
-
-.. _macosx-sendmail:
-
-Sendmail
---------
-
-In Mac OS X 10.3 and later,
-`Postfix <http://www.postfix.org/>`_
-is used as the built-in email server.  Postfix provides an executable
-that mimics sendmail enough to fool Bugzilla, as long as Bugzilla can
-find it. Bugzilla is able to find the fake sendmail executable without
-any assistance.
-
-.. _macosx-libraries:
-
-Libraries & Perl Modules on Mac OS X
-------------------------------------
-
-Apple does not include the GD library with Mac OS X. Bugzilla
-needs this for bug graphs.
-
-You can use MacPorts (`<http://www.macports.org/>`_)
-or Fink (`<http://sourceforge.net/projects/fink/>`_), both
-of which are similar in nature to the CPAN installer, but install
-common unix programs.
-
-Follow the instructions for setting up MacPorts or Fink.
-Once you have one installed, you'll want to use it to install the
-:file:`gd2` package.
-
-Fink will prompt you for a number of dependencies, type 'y' and hit
-enter to install all of the dependencies and then watch it work. You will
-then be able to use CPAN to
-install the GD Perl module.
-
-.. note:: To prevent creating conflicts with the software that Apple
-   installs by default, Fink creates its own directory tree at :file:`/sw`
-   where it installs most of
-   the software that it installs. This means your libraries and headers
-   will be at :file:`/sw/lib` and :file:`/sw/include` instead
-   of :file:`/usr/lib` and :file:`/usr/include`. When the
-   Perl module config script asks where your :file:`libgd`
-   is, be sure to tell it :file:`/sw/lib`.
-
-Also available via MacPorts and Fink is
-:file:`expat`. After installing the expat package, you
-will be able to install XML::Parser using CPAN. If you use fink, there
-is one caveat. Unlike recent versions of
-the GD module, XML::Parser doesn't prompt for the location of the
-required libraries. When using CPAN, you will need to use the following
-command sequence:
-
-::
-
-    # perl -MCPAN -e'look XML::Parser'
-    # perl Makefile.PL EXPATLIBPATH=/sw/lib EXPATINCPATH=/sw/include
-    # make; make test; make install
-    # exit
-
-The :command:`look` command will download the module and spawn
-a new shell with the extracted files as the current working directory.
-
-You should watch the output from these :command:`make` commands,
-especially ``make test`` as errors may prevent
-XML::Parser from functioning correctly with Bugzilla.
-
-The :command:`exit` command will return you to your original shell.
-
-.. _os-linux:
-
-Linux Distributions
-===================
-
-Many Linux distributions include Bugzilla and its
-dependencies in their native package management systems.
-Installing Bugzilla with root access on any Linux system
-should be as simple as finding the Bugzilla package in the
-package management application and installing it using the
-normal command syntax. Several distributions also perform
-the proper web server configuration automatically on installation.
-
-Please consult the documentation of your Linux
-distribution for instructions on how to install packages,
-or for specific instructions on installing Bugzilla with
-native package management tools. There is also a
-`Bugzilla Wiki Page <http://wiki.mozilla.org/Bugzilla:Linux_Distro_Installation>`_ for distro-specific installation
-notes.
-
-.. _nonroot:
-
-UNIX (non-root) Installation Notes
-##################################
-
-Introduction
-============
-
-If you are running a \*NIX OS as non-root, either due
-to lack of access (web hosts, for example) or for security
-reasons, this will detail how to install Bugzilla on such
-a setup. It is recommended that you read through the
-:ref:`installation`
-first to get an idea on the installation steps required.
-(These notes will reference to steps in that guide.)
-
-MySQL
-=====
-
-You may have MySQL installed as root. If you're
-setting up an account with a web host, a MySQL account
-needs to be set up for you. From there, you can create
-the bugs account, or use the account given to you.
-
-.. warning:: You may have problems trying to set up :command:`GRANT`
-   permissions to the database.
-   If you're using a web host, chances are that you have a
-   separate database which is already locked down (or one big
-   database with limited/no access to the other areas), but you
-   may want to ask your system administrator what the security
-   settings are set to, and/or run the :command:`GRANT`
-   command for you.
-   Also, you will probably not be able to change the MySQL
-   root user password (for obvious reasons), so skip that
-   step.
-
-Running MySQL as Non-Root
--------------------------
-
-The Custom Configuration Method
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Create a file .my.cnf in your
-home directory (using /home/foo in this example)
-as follows....
-
-::
-
-    [mysqld]
-    datadir=/home/foo/mymysql
-    socket=/home/foo/mymysql/thesock
-    port=8081
-    [mysql]
-    socket=/home/foo/mymysql/thesock
-    port=8081
-    [mysql.server]
-    user=mysql
-    basedir=/var/lib
-    [safe_mysqld]
-    err-log=/home/foo/mymysql/the.log
-    pid-file=/home/foo/mymysql/the.pid
-
-The Custom Built Method
-~~~~~~~~~~~~~~~~~~~~~~~
-
-You can install MySQL as a not-root, if you really need to.
-Build it with PREFIX set to :file:`/home/foo/mysql`,
-or use pre-installed executables, specifying that you want
-to put all of the data files in :file:`/home/foo/mysql/data`.
-If there is another MySQL server running on the system that you
-do not own, use the -P option to specify a TCP port that is not
-in use.
-
-Starting the Server
-~~~~~~~~~~~~~~~~~~~
-
-After your mysqld program is built and any .my.cnf file is
-in place, you must initialize the databases (ONCE).
-
-::
-
-    $ mysql_install_db
-
-Then start the daemon with
-
-::
-
-    $ safe_mysql &
-
-After you start mysqld the first time, you then connect to
-it as "root" and :command:`GRANT` permissions to other
-users. (Again, the MySQL root account has nothing to do with
-the \*NIX root account.)
-
-.. note:: You will need to start the daemons yourself. You can either
-   ask your system administrator to add them to system startup files, or
-   add a crontab entry that runs a script to check on these daemons
-   and restart them if needed.
-
-.. warning:: Do NOT run daemons or other services on a server without first
-   consulting your system administrator! Daemons use up system resources
-   and running one may be in violation of your terms of service for any
-   machine on which you are a user!
-
-Perl
-====
-
-On the extremely rare chance that you don't have Perl on
-the machine, you will have to build the sources
-yourself. The following commands should get your system
-installed with your own personal version of Perl:
-
-::
-
-    $ wget http://perl.org/CPAN/src/stable.tar.gz
-    $ tar zvxf stable.tar.gz
-    $ cd perl-|min-perl-ver|
-    $ sh Configure -de -Dprefix=/home/foo/perl
-    $ make && make test && make install
-
-Once you have Perl installed into a directory (probably
-in :file:`~/perl/bin`), you will need to
-install the Perl Modules, described below.
-
-.. _install-perlmodules-nonroot:
-
-Perl Modules
-============
-
-Installing the Perl modules as a non-root user is accomplished by
-running the :file:`install-module.pl`
-script. For more details on this script, see the
-`install-module.pl documentation <../html/api/install-module.html>`_.
-
-HTTP Server
-===========
-
-Ideally, this also needs to be installed as root and
-run under a special web server account. As long as
-the web server will allow the running of \*.cgi files outside of a
-cgi-bin, and a way of denying web access to certain files (such as a
-.htaccess file), you should be good in this department.
-
-Running Apache as Non-Root
---------------------------
-
-You can run Apache as a non-root user, but the port will need
-to be set to one above 1024. If you type :command:`httpd -V`,
-you will get a list of the variables that your system copy of httpd
-uses. One of those, namely HTTPD_ROOT, tells you where that
-installation looks for its config information.
-
-From there, you can copy the config files to your own home
-directory to start editing. When you edit those and then use the -d
-option to override the HTTPD_ROOT compiled into the web server, you
-get control of your own customized web server.
-
-.. note:: You will need to start the daemons yourself. You can either
-   ask your system administrator to add them to system startup files, or
-   add a crontab entry that runs a script to check on these daemons
-   and restart them if needed.
-
-.. warning:: Do NOT run daemons or other services on a server without first
-   consulting your system administrator! Daemons use up system resources
-   and running one may be in violation of your terms of service for any
-   machine on which you are a user!
-
-Bugzilla
-========
-
-When you run :command:`./checksetup.pl` to create
-the :file:`localconfig` file, it will list the Perl
-modules it finds. If one is missing, go back and double-check the
-module installation from :ref:`install-perlmodules-nonroot`,
-then delete the :file:`localconfig` file and try again.
-
-.. warning:: One option in :file:`localconfig` you
-   might have problems with is the web server group. If you can't
-   successfully browse to the :file:`index.cgi` (like
-   a Forbidden error), you may have to relax your permissions,
-   and blank out the web server group. Of course, this may pose
-   as a security risk. Having a properly jailed shell and/or
-   limited access to shell accounts may lessen the security risk,
-   but use at your own risk.
-
-.. _suexec:
-
-suexec or shared hosting
-------------------------
-
-If you are running on a system that uses suexec (most shared
-hosting environments do this), you will need to set the
-*webservergroup* value in :file:`localconfig`
-to match *your* primary group, rather than the one
-the web server runs under.  You will need to run the following
-shell commands after running :command:`./checksetup.pl`,
-every time you run it (or modify :file:`checksetup.pl`
-to do them for you via the system() command).
-
-::
-
-    for i in docs graphs images js skins; do find $i -type d -exec chmod o+rx {} \\; ; done
-    for i in jpg gif css js png html rdf xul; do find . -name \\*.$i -exec chmod o+r {} \\; ; done
-    find . -name .htaccess -exec chmod o+r {} \\;
-    chmod o+x . data data/webdot
-
-Pay particular attention to the number of semicolons and dots.
-They are all important.  A future version of Bugzilla will
-hopefully be able to do this for you out of the box.
-
-.. _upgrade:
-
-Upgrading to New Releases
-#########################
-
-Upgrading to new Bugzilla releases is very simple. There is
-a script named :file:`checksetup.pl` included with
-Bugzilla that will automatically do all of the database migration
-for you.
-
-The following sections explain how to upgrade from one
-version of Bugzilla to another. Whether you are upgrading
-from one bug-fix version to another (such as 4.2 to 4.2.1)
-or from one major version to another (such as from 4.0 to 4.2),
-the instructions are always the same.
-
-.. note:: Any examples in the following sections are written as though the
-   user were updating to version 4.2.1, but the procedures are the
-   same no matter what version you're updating to. Also, in the
-   examples, the user's Bugzilla installation is found
-   at :file:`/var/www/html/bugzilla`. If that is not the
-   same as the location of your Bugzilla installation, simply
-   substitute the proper paths where appropriate.
-
-.. _upgrade-before:
-
-Before You Upgrade
-==================
-
-Before you start your upgrade, there are a few important
-steps to take:
-
-#. Read the `Release
-   Notes <http://www.bugzilla.org/releases/>`_ of the version you're upgrading to,
-   particularly the "Notes for Upgraders" section.
-
-#. View the Sanity Check (:ref:`sanitycheck`) page
-   on your installation before upgrading. Attempt to fix all warnings
-   that the page produces before you go any further, or you may
-   experience problems  during your upgrade.
-
-#. Shut down your Bugzilla installation by putting some HTML or
-   text in the shutdownhtml parameter
-   (see :ref:`parameters`).
-
-#. Make a backup of the Bugzilla database.
-   *THIS IS VERY IMPORTANT*. If
-   anything goes wrong during the upgrade, your installation
-   can be corrupted beyond recovery. Having a backup keeps you safe.
-
-   .. warning:: Upgrading is a one-way process. You cannot "downgrade" an
-      upgraded Bugzilla. If you wish to revert to the old Bugzilla
-      version for any reason, you will have to restore your database
-      from this backup.
-
-   Here are some sample commands you could use to backup
-   your database, depending on what database system you're
-   using. You may have to modify these commands for your
-   particular setup.
-
-   MySQL:
-       mysqldump --opt -u bugs -p bugs > bugs.sql
-   PostgreSQL:
-       pg_dump --no-privileges --no-owner -h localhost -U bugs
-       > bugs.sql
-
-.. _upgrade-files:
-
-Getting The New Bugzilla
-========================
-
-There are three ways to get the new version of Bugzilla.
-We'll list them here briefly and then explain them
-more later.
-
-Bzr (:ref:`upgrade-bzr`)
-    If you have :command:`bzr` installed on your machine
-    and you have Internet access, this is the easiest way to
-    upgrade, particularly if you have made modifications
-    to the code or templates of Bugzilla.
-
-Download the tarball (:ref:`upgrade-tarball`)
-    This is a very simple way to upgrade, and good if you
-    haven't made many (or any) modifications to the code or
-    templates of your Bugzilla.
-
-Patches (:ref:`upgrade-patches`)
-    If you have made modifications to your Bugzilla, and
-    you don't have Internet access or you don't want to use
-    bzr, then this is the best way to upgrade.
-    You can only do minor upgrades (such as 4.2 to 4.2.1 or
-    4.2.1 to 4.2.2) with patches.
-
-.. _upgrade-modified:
-
-If you have modified your Bugzilla
-----------------------------------
-
-If you have modified the code or templates of your Bugzilla,
-then upgrading requires a bit more thought and effort.
-A discussion of the various methods of updating compared with
-degree and methods of local customization can be found in
-:ref:`template-method`.
-
-The larger the jump you are trying to make, the more difficult it
-is going to be to upgrade if you have made local customizations.
-Upgrading from 4.2 to 4.2.1 should be fairly painless even if
-you are heavily customized, but going from 2.18 to 4.2 is going
-to mean a fair bit of work re-writing your local changes to use
-the new files, logic, templates, etc. If you have done no local
-changes at all, however, then upgrading should be approximately
-the same amount of work regardless of how long it has been since
-your version was released.
-
-.. _upgrade-bzr:
-
-Upgrading using Bzr
--------------------
-
-This requires that you have bzr installed (most Unix machines do),
-and requires that you are able to access
-`bzr.mozilla.org <http://bzr.mozilla.org/bugzilla/>`_,
-which may not be an option if you don't have Internet access.
-
-The following shows the sequence of commands needed to update a
-Bugzilla installation via Bzr, and a typical series of results.
-These commands assume that you already have Bugzilla installed
-using Bzr.
-
-.. warning:: If your installation is still using CVS, you must first convert
-   it to Bzr. A very detailed step by step documentation can be
-   found on `wiki.mozilla.org <https://wiki.mozilla.org/Bugzilla:Moving_From_CVS_To_Bazaar>`_.
-
-::
-
-    $ cd /var/www/html/bugzilla
-    $ bzr switch 4.2
-      (only run the previous command when not yet running 4.2)
-    $ bzr up -r tag:bugzilla-4.2.1
-    +N  extensions/MoreBugUrl/
-    +N  extensions/MoreBugUrl/Config.pm
-    +N  extensions/MoreBugUrl/Extension.pm
-    ...
-    M  Bugzilla/Attachment.pm
-    M  Bugzilla/Attachment/PatchReader.pm
-    M  Bugzilla/Bug.pm
-    ...
-    All changes applied successfully.
-
-.. warning:: If a line in the output from :command:`bzr up` mentions
-   a conflict, then that represents a file with local changes that
-   Bzr was unable to properly merge. You need to resolve these
-   conflicts manually before Bugzilla (or at least the portion using
-   that file) will be usable.
-
-.. _upgrade-tarball:
-
-Upgrading using the tarball
----------------------------
-
-If you are unable (or unwilling) to use Bzr, another option that's
-always available is to obtain the latest tarball from the `Download Page <http://www.bugzilla.org/download/>`_ and
-create a new Bugzilla installation from that.
-
-This sequence of commands shows how to get the tarball from the
-command-line; it is also possible to download it from the site
-directly in a web browser. If you go that route, save the file
-to the :file:`/var/www/html`
-directory (or its equivalent, if you use something else) and
-omit the first three lines of the example.
-
-::
-
-    $ cd /var/www/html
-    $ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.2.1.tar.gz
-    ...
-    $ tar xzvf bugzilla-4.2.1.tar.gz
-    bugzilla-4.2.1/
-    bugzilla-4.2.1/colchange.cgi
-    ...
-    $ cd bugzilla-4.2.1
-    $ cp ../bugzilla/localconfig* .
-    $ cp -r ../bugzilla/data .
-    $ cd ..
-    $ mv bugzilla bugzilla.old
-    $ mv bugzilla-4.2.1 bugzilla
-
-.. warning:: The :command:`cp` commands both end with periods which
-   is a very important detail--it means that the destination
-   directory is the current working directory.
-
-.. warning:: If you have some extensions installed, you will have to copy them
-   to the new bugzilla directory too. Extensions are located in :file:`bugzilla/extensions/`.
-   Only copy those you
-   installed, not those managed by the Bugzilla team.
-
-This upgrade method will give you a clean install of Bugzilla.
-That's fine if you don't have any local customizations that you
-want to maintain. If you do have customizations, then you will
-need to reapply them by hand to the appropriate files.
-
-.. _upgrade-patches:
-
-Upgrading using patches
------------------------
-
-A patch is a collection of all the bug fixes that have been made
-since the last bug-fix release.
-
-If you are doing a bug-fix upgrade—that is, one where only the
-last number of the revision changes, such as from 4.2 to
-4.2.1—then you have the option of obtaining and applying a
-patch file from the `Download Page <http://www.bugzilla.org/download/>`_.
-
-As above, this example starts with obtaining the file via the
-command line. If you have already downloaded it, you can omit the
-first two commands.
-
-::
-
-    $ cd /var/www/html/bugzilla
-    $ wget http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.2-to-4.2.1.diff.gz
-    ...
-    $ gunzip bugzilla-4.2-to-4.2.1.diff.gz
-    $ patch -p1 < bugzilla-4.2-to-4.2.1.diff
-    patching file Bugzilla/Constants.pm
-    patching file enter_bug.cgi
-    ...
-
-.. warning:: Be aware that upgrading from a patch file does not change the
-   entries in your :file:`.bzr` directory.
-   This could make it more difficult to upgrade using Bzr
-   (:ref:`upgrade-bzr`) in the future.
-
-.. _upgrade-completion:
-
-Completing Your Upgrade
-=======================
-
-Now that you have the new Bugzilla code, there are a few final
-steps to complete your upgrade.
-
-#. If your new Bugzilla installation is in a different
-   directory or on a different machine than your old Bugzilla
-   installation, make sure that you have copied the
-   :file:`data` directory and the
-   :file:`localconfig` file from your old Bugzilla
-   installation. (If you followed the tarball instructions
-   above, this has already happened.)
-
-#. If this is a major update, check that the configuration
-   (:ref:`configuration`) for your new Bugzilla is
-   up-to-date. Sometimes the configuration requirements change
-   between major versions.
-
-#. If you didn't do it as part of the above configuration step,
-   now you need to run :command:`checksetup.pl`, which
-   will do everything required to convert your existing database
-   and settings for the new version:
-
-   ::
-   
-       $ :command:`cd /var/www/html/bugzilla`
-       $ :command:`./checksetup.pl`
-
-   .. warning:: The period at the beginning of the
-      command :command:`./checksetup.pl` is important and cannot
-      be omitted.
-
-   .. warning:: If this is a major upgrade (say, 3.6 to 4.2 or similar),
-      running :command:`checksetup.pl` on a large
-      installation (75,000 or more bugs) can take a long time,
-      possibly several hours.
-
-#. Clear any HTML or text that you put into the shutdownhtml
-   parameter, to re-activate Bugzilla.
-
-#. View the Sanity Check (:ref:`sanitycheck`) page in your
-   upgraded Bugzilla.
-   It is recommended that, if possible, you fix any problems
-   you see, immediately. Failure to do this may mean that Bugzilla
-   will not work correctly. Be aware that if the sanity check page
-   contains more errors after an upgrade, it doesn't necessarily
-   mean there are more errors in your database than there were
-   before, as additional tests are added to the sanity check over
-   time, and it is possible that those errors weren't being
-   checked for in the old version.
-
-.. _upgrade-notifications:
-
-Automatic Notifications of New Releases
-=======================================
-
-Bugzilla 3.0 introduced the ability to automatically notify
-administrators when new releases are available, based on the
-``upgrade_notification`` parameter, see
-:ref:`parameters`. Administrators will see these
-notifications when they access the :file:`index.cgi`
-page, i.e. generally when logging in. Bugzilla will check once per
-day for new releases, unless the parameter is set to
-``disabled``. If you are behind a proxy, you may have to set
-the ``proxy_url`` parameter accordingly. If the proxy
-requires authentication, use the
-``http://user:pass@proxy_url/`` syntax.
-
-
diff --git a/docs/en/rst/installing/apache-windows.rst b/docs/en/rst/installing/apache-windows.rst
new file mode 100644
index 0000000000..c119e1b131
--- /dev/null
+++ b/docs/en/rst/installing/apache-windows.rst
@@ -0,0 +1,136 @@
+.. _apache-windows:
+
+Apache on Windows
+#################
+
+Bugzilla supports all versions of Apache 2.2.x and 2.4.x.
+
+Installing
+==========
+
+Download the Apache HTTP Server as a :file:`.zip` archive either from the
+`Apache Lounge website <http://www.apachelounge.com/download>`_ or from the
+`Apache Haus website <http://www.apachehaus.com/cgi-bin/download.plx>`_.
+
+Unzip the archive into :file:`C:\\Apache24`. If you move it elsewhere, then
+you must edit several variables in :file:`httpd.conf`, including ``ServerRoot``
+and ``DocumentRoot``.
+
+You must now edit the Apache configuration file :file:`C:\\Apache24\\conf\\httpd.conf`
+and do the following steps:
+
+#. Uncomment ``LoadModule cgi_module modules/mod_cgi.so`` at the beginning of the
+   file to enable CGI support.
+#. Uncomment ``AddHandler cgi-script .cgi`` to register :file:`.cgi` files
+   as CGI scripts. For this handler to work, you must create a key in the
+   Windows registry named ``HKEY_CLASSES_ROOT\.cgi\Shell\ExecCGI\Command`` with
+   the default value pointing to the full path of :file:`perl.exe` with a ``-T``
+   parameter. For example :file:`C:\\Perl\\bin\\perl.exe -T` if you use ActivePerl,
+   or :file:`C:\\Strawberry\\perl\\bin\\perl.exe -T` if you use Strawberry Perl.
+#. Add an Alias and a Directory for Bugzilla:
+
+.. code-block:: apache
+
+    Alias "/bugzilla/" "C:/bugzilla/"
+    <Directory "C:/bugzilla">
+        ScriptInterpreterSource Registry-Strict
+        Options +ExecCGI +FollowSymLinks
+        DirectoryIndex index.cgi index.html
+        AllowOverride All
+        Require all granted
+    </Directory>
+
+.. warning:: The above block takes a simple approach to access control and is
+             correct for Apache 2.4. For Apache 2.2, replace ``Require all granted``
+             with ``Allow from all``. If you have other access control
+             requirements, you may need to make further modifications.
+
+You now save your changes and start Apache as a service. From the Windows
+command line (:file:`cmd.exe`):
+
+:command:`C:\\Apache24\\bin>httpd.exe -k install`
+
+That's it! Bugzilla is now accessible from http://localhost/bugzilla.
+
+Apache Account Permissions
+==========================
+
+By default Apache installs itself to run as the SYSTEM account. For security
+reasons it's better the reconfigure the service to run as an Apache user.
+Create a new Windows user that is a member of **no** groups, and reconfigure
+the Apache2 service to run as that account.
+
+Whichever account you are running Apache as, SYSTEM or otherwise, needs write
+and modify access to the following directories and all their subdirectories.
+Depending on your version of Windows, this access may already be granted.
+
+* :file:`C:\\Bugzilla\\data`
+* :file:`C:\\Apache24\\logs`
+* :file:`C:\\Windows\\Temp`
+
+Note that :file:`C:\\Bugzilla\\data` is created the first time you run
+:file:`checksetup.pl`.
+
+Logging
+=======
+
+Unless you want to keep statistics on how many hits your Bugzilla install is
+getting, it's a good idea to disable logging by commenting out the
+``CustomLog`` directive in the Apache config file.
+
+If you don't disable logging, you should at least disable logging of "query
+strings". When external systems interact with Bugzilla via webservices
+(REST/XMLRPC/JSONRPC) they include the user's credentials as part of the URL
+(in the query string). Therefore, to avoid storing passwords in clear text
+on the server we recommend configuring Apache to not include the query string
+in its log files.
+
+#. Find the following line in the Apache config file, which defines the
+   logging format for ``vhost_combined``:
+
+   .. code-block:: apache
+
+      LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+
+#. Replace ``%r`` with ``%m %U``.
+
+(If you have configured Apache differently, a different log line might apply.
+Adjust these instructions accordingly.)
+
+Using Apache with SSL
+=====================
+
+If you want to enable SSL with Apache, i.e. access Bugzilla from
+https://localhost/bugzilla, you need to do some extra steps:
+
+#. Edit :file:`C:\\Apache24\\conf\\httpd.conf` and uncomment these lines:
+
+   * ``LoadModule ssl_module modules/mod_ssl.so``
+   * ``LoadModule socache_shmcb_module modules/mod_socache_shmcb.so``
+   * ``Include conf/extra/httpd-ssl.conf``
+
+#. Create your :file:`.key` and :file:`.crt` files using :file:`openssl.exe`
+   provided with Apache:
+
+   :command:`C:\\Apache24\\bin>openssl.exe req -x509 -nodes -days 730 -newkey rsa:2048 -keyout server.key -out server.crt`
+
+   :file:`openssl.exe` will ask you a few questions about your location and
+   your company name to populate fields of the certificate.
+
+#. Once the key and the certificate for your server are generated, move them
+   into :file:`C:\\Apache24\\conf` so that their location matches the
+   ``SSLCertificateFile`` and ``SSLCertificateKeyFile`` variables defined in
+   :file:`C:\\Apache24\\conf\\extra\\httpd-ssl.conf` (which you don't need to
+   edit).
+
+.. note:: This process leads to a self-signed certificate which will generate
+         browser warnings on first visit. If your Bugzilla has a public DNS
+         name, you can get a cert from a CA which will not have this problem.
+
+Restart Apache
+==============
+
+Finally, restart Apache to pick up the changes, either from the Services
+console or from the command line:
+
+:command:`C:\\Apache24\\bin>httpd.exe -k restart`
diff --git a/docs/en/rst/installing/apache.rst b/docs/en/rst/installing/apache.rst
new file mode 100644
index 0000000000..37442d9268
--- /dev/null
+++ b/docs/en/rst/installing/apache.rst
@@ -0,0 +1,192 @@
+.. This document is shared among all non-Windows OSes.
+
+.. _apache:
+
+Apache
+######
+
+You have three options for running Bugzilla under Apache -
+:ref:`mod_cgi <apache-mod_cgi>` (the default), :ref:`mod_perl <apache-mod_perl>`
+and :ref:`mod_proxy <apache-mod_proxy>` (to run Bugzilla as a PSGI application).
+mod_perl and mod_proxy are faster but take more resources. You should
+probably only consider them if your Bugzilla is going to be heavily used.
+
+These instructions require editing the Apache configuration file, which is:
+
+* Fedora/Red Hat: :file:`/etc/httpd/conf/httpd.conf`
+* Debian/Ubuntu: :file:`/etc/apache2/apache2.conf`
+* Mac OS X: :file:`/etc/apache2/httpd.conf`
+
+Alternatively, on Debian or Ubuntu, you can instead put the below code into a
+separate file in the directory :file:`/etc/apache2/sites-enabled/`.
+
+In these instructions, when asked to restart Apache, the command is:
+
+:command:`sudo apachectl start`
+
+(or run it as root if your OS installation does not use sudo).
+
+Securing Apache
+===============
+
+When external systems interact with Bugzilla via webservices
+(REST/XMLRPC/JSONRPC) they include the user's credentials as part of the URL
+(in the "query string"). Therefore, to avoid storing passwords in clear text
+on the server we recommend configuring Apache to not include the query string
+in its log files.
+
+#. Edit the Apache configuration file (see above).
+
+#. Find the following line in the above mentioned file, which defines the
+   logging format for ``vhost_combined``:
+
+   .. code-block:: apache
+
+      LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+
+#. Replace ``%r`` with ``%m %U``.
+
+#. Restart Apache.
+
+.. _apache-mod_cgi:
+
+Apache with mod_cgi
+===================
+
+To configure your Apache web server to work with Bugzilla while using
+mod_cgi, do the following:
+
+#. Edit the Apache configuration file (see above).
+
+#. Create a ``<Directory>`` directive that applies to the location
+   of your Bugzilla installation. In this example, Bugzilla has
+   been installed at :file:`/var/www/html/bugzilla`. On Mac OS X, use
+   :file:`/Library/WebServer/Documents/bugzilla`.
+
+.. code-block:: apache
+
+   <Directory /var/www/html/bugzilla>
+     AddHandler cgi-script .cgi
+     Options +ExecCGI +FollowSymLinks
+     DirectoryIndex index.cgi index.html
+     AllowOverride All
+   </Directory>
+
+These instructions allow Apache to run .cgi files found within the Bugzilla
+directory; instructs the server to look for a file called :file:`index.cgi`
+or, if not found, :file:`index.html` if someone only types the directory name
+into the browser; and allows Bugzilla's :file:`.htaccess` files to override
+some global permissions.
+
+On some Linux distributions you will need to enable the Apache CGI
+module. On Debian/Ubuntu, this is done with:
+
+:command:`sudo a2enmod cgi`
+
+If you find that the webserver is returning the Perl code as text rather
+than executing it, then this is the problem.
+
+.. _apache-mod_perl:
+
+Apache with mod_perl
+====================
+
+Some configuration is required to make Bugzilla work with Apache
+and mod_perl.
+
+.. note:: It is not known whether anyone has even tried mod_perl on Mac OS X.
+
+#. Edit the Apache configuration file (see above).
+
+#. Add the following information, substituting where appropriate with your
+   own local paths.
+
+   .. code-block:: apache
+
+       PerlSwitches -w -T
+       PerlConfigRequire /var/www/html/bugzilla/mod_perl.pl
+
+   .. note:: This should be used instead of the <Directory> block
+      shown above. This should also be above any other ``mod_perl``
+      directives within the :file:`httpd.conf` and the directives must be
+      specified in the order above.
+
+   .. warning:: You should also ensure that you have disabled ``KeepAlive``
+      support in your Apache install when utilizing Bugzilla under mod_perl
+      or you may suffer a
+      `performance penalty <http://modperlbook.org/html/11-4-KeepAlive.html>`_.
+
+On restarting Apache, Bugzilla should now be running within the
+mod_perl environment.
+
+Please bear the following points in mind when considering using Bugzilla
+under mod_perl:
+
+* mod_perl support in Bugzilla can take up a HUGE amount of RAM - easily
+  30MB per httpd child. The more RAM you can get, the better. mod_perl is
+  basically trading RAM for speed. At least 2GB total system RAM is
+  recommended for running Bugzilla under mod_perl.
+  
+* Under mod_perl, you have to restart Apache if you make any manual change to
+  any Bugzilla file. You can't just reload--you have to actually
+  *restart* the server (as in make sure it stops and starts
+  again). You *can* change :file:`localconfig` and the :file:`params` file
+  manually, if you want, because those are re-read every time you load a page.
+
+* You must run in Apache's Prefork MPM (this is the default). The Worker MPM
+  may not work -- we haven't tested Bugzilla's mod_perl support under threads.
+  (And, in fact, we're fairly sure it *won't* work.)
+
+* Bugzilla generally expects to be the only mod_perl application running on
+  your entire server. It may or may not work if there are other applications also
+  running under mod_perl. It does try its best to play nice with other mod_perl
+  applications, but it still may have conflicts.
+
+* It is recommended that you have one Bugzilla instance running under mod_perl
+  on your server. Bugzilla has not been tested with more than one instance running.
+
+.. _apache-mod_proxy:
+
+Apache with mod_proxy
+=====================
+
+Bugzilla can run as a PSGI application, which greatly improves performance
+compared to mod_cgi.
+
+#. Install the `Plack <http://search.cpan.org/~miyagawa/Plack/script/plackup>`_
+   module. This will install the :file:`plackup` script used below.
+
+#. Run :file:`plackup` from the :file:`bugzilla/` root directory:
+
+   :command:`plackup -s Gazelle --port 5000 -E production -a app.psgi`
+
+   This command starts :file:`plackup` using the
+   `Gazelle <http://search.cpan.org/~kazeburo/Gazelle/lib/Gazelle.pm>`_ handler.
+   Other PSGI handlers can be used, such as
+   `Starman <http://search.cpan.org/~miyagawa/Starman/lib/Starman.pm>`_.
+
+#. Edit the Apache configuration file (see above).
+
+#. Add the following lines:
+
+   .. code-block:: apache
+
+      <Location /bugzilla/>
+          ProxyPreserveHost On
+          ProxyPass "http://localhost:5000/"
+          ProxyPassReverse "http://localhost:5000/"
+          # Will pass either 'https' or 'http' (without quotes).
+          RequestHeader set X-Forwarded-Proto %{REQUEST_SCHEME}s
+          # Will pass the original path to the script, required to determine
+          # if we are on the attachment host.
+          RequestHeader set X-Forwarded-URI %{REQUEST_URI}s
+      </Location>
+
+      # Do not redirect requests for images and static CSS and JS files.
+      <LocationMatch "^/bugzilla/(data/(assets|webdot)|graphs|images)/">
+          ProxyPass "!"
+      </LocationMatch>
+
+#. Restart Apache.
+
+#. Set the :param:`inbound_proxies` parameter to :paramval:`127.0.0.1`.
diff --git a/docs/en/rst/installing/backups.rst b/docs/en/rst/installing/backups.rst
new file mode 100644
index 0000000000..4b1953c443
--- /dev/null
+++ b/docs/en/rst/installing/backups.rst
@@ -0,0 +1,38 @@
+.. _backups:
+
+Backups
+#######
+
+Database
+========
+
+Here are some sample commands you could use to backup
+your database, depending on what database system you're
+using. You may have to modify these commands for your
+particular setup. Replace the $VARIABLEs with appropriate values for your
+setup.
+
+MySQL
+-----
+
+:command:`mysqldump --max-allowed-packet=32M -u $USERNAME -p $DATABASENAME > backup.sql`
+
+The value for :command:`max-allowed-packet` should be the value you've set in
+your :ref:`MySQL configuration file <mysql>`, and should be larger than the
+largest attachment in your database. See the
+`mysqldump documentation <http://dev.mysql.com/doc/mysql/en/mysqldump.html>`_
+for more information on :file:`mysqldump`.
+
+PostgreSQL
+----------
+
+:command:`pg_dump --no-privileges --no-owner -h localhost -U $USERNAME > bugs.sql`
+
+Bugzilla
+========
+
+The Bugzilla directory contains some data files and configuration files which
+you would want to retain. A simple recursive copy will do the job here.
+
+:command:`cp -rp $BUGZILLA_HOME /var/backups/bugzilla`
+
diff --git a/docs/en/rst/installing/db_server.rst b/docs/en/rst/installing/db_server.rst
new file mode 100644
index 0000000000..8a7d89633b
--- /dev/null
+++ b/docs/en/rst/installing/db_server.rst
@@ -0,0 +1,18 @@
+.. _db_server:
+
+Database Server
+###############
+
+Bugzilla requires a database to store its data. We recommend either MySQL or
+PostgreSQL for production installations. Oracle 10 should work fine, but very
+little or no testing has been done with Oracle 11 and 12. SQLite is easy to
+configure but, due to its limitations, it should only be used for testing
+purposes and very small installations.
+
+.. toctree::
+   :maxdepth: 1
+
+   mysql
+   postgresql
+   oracle
+   sqlite
diff --git a/docs/en/rst/installing/essential-post-install-config.rst b/docs/en/rst/installing/essential-post-install-config.rst
new file mode 100644
index 0000000000..472899a75c
--- /dev/null
+++ b/docs/en/rst/installing/essential-post-install-config.rst
@@ -0,0 +1,168 @@
+.. _essential-post-install-config:
+
+Essential Post-Installation Configuration
+#########################################
+
+Bugzilla is configured in the Administration Parameters. Log in with the
+administrator account you defined in the last :file:`checksetup.pl` run,
+then click :guilabel:`Administration` in the header, and then
+:guilabel:`Parameters`. You will see the different parameter sections
+down the left hand side of the page.
+
+.. _config-essential-params:
+
+Parameters
+==========
+
+There are a few parameters which it is very important to define (or
+explicitly decide not to change).
+
+The first set of these are in the :guilabel:`Required Settings` section.
+
+* :param:`urlbase`: this is the URL by which people should access
+  Bugzilla's front page.
+* :param:`sslbase`: if you have configured SSL on your Bugzilla server,
+  this is the SSL URL by which people should access Bugzilla's front page.
+* :param:`ssl_redirect`: Set this if you want everyone to be redirected
+  to use the SSL version. Recommended if you have set up SSL.
+
+You may want to put your email address in the :param:`maintainer`
+parameter in the :guilabel:`General` section. This will then let people
+know who to contact if they see problems or hit errors.
+
+If you don't want just anyone able to read your Bugzilla, set the
+:param:`requirelogin` parameter in the :guilabel:`User Authentication`
+section, and change or clear the :param:`createemailregexp` parameter.
+
+.. _email:
+
+Email
+=====
+
+Bugzilla requires the ability to set up email. You have a number of choices
+here. The simplest is to get Gmail or some other email provider to do the
+work for you, but you can also hand the mail off to a local email server,
+or run one yourself on the Bugzilla machine.
+
+Bugzilla's approach to email is configured in the :guilabel:`Email` section
+of the Parameters.
+
+.. _install-MTA:
+
+Use Another Mail Server
+-----------------------
+
+This section corresponds to choosing a :param:`mail_delivery_method` of
+:paramval:`SMTP`.
+
+This method passes the email off to an existing mail server. Your
+organization may well already have one running for their internal email, and
+may prefer to use it for confidentiality reasons. If so, you need the
+following information about it:
+
+* The domain name of the server (Parameter: :param:`smtpserver`)
+* The username and password to use (Parameters: :param:`smtp_username` and 
+  :param:`smtp_password`)
+* Whether the server uses SSL (Parameter: :param:`smtp_ssl`)
+* The address you should be sending mail 'From' (Parameter:
+  :param:`mailfrom`)
+
+If your organization does not run its own mail server, you can use the
+services of one of any number of popular email providers.
+
+Gmail
+'''''
+
+Visit https://gmail.com and create a new Gmail account for your Bugzilla to
+use. Then, set the following parameter values in the "Email" section:
+
+* :param:`mail_delivery_method`: :paramval:`SMTP`
+* :param:`mailfrom`: :paramval:`new_gmail_address@gmail.com`
+* :param:`smtpserver`: :paramval:`smtp.gmail.com:465`
+* :param:`smtp_username`: :paramval:`new_gmail_address@gmail.com`
+* :param:`smtp_password`: :paramval:`new_gmail_password`
+* :param:`smtp_ssl`: :paramval:`On`
+
+Run Your Own Mail Server
+------------------------
+
+This section corresponds to choosing a :param:`mail_delivery_method` of
+:paramval:`Sendmail`.
+
+Unless you know what you are doing, and can deal with the possible problems
+of spam, bounces and blocklists, it is probably unwise to set up your own
+mail server just for Bugzilla. However, if you wish to do so, some guidance
+follows.
+
+On Linux, any Sendmail-compatible MTA (Mail Transfer Agent) will
+suffice.  Sendmail, Postfix, qmail and Exim are examples of common
+MTAs. Sendmail is the original Unix MTA, but the others are easier to
+configure, and therefore many people replace Sendmail with Postfix or
+Exim. They are drop-in replacements, so Bugzilla will not
+distinguish between them.
+
+If you are using Sendmail, version 8.7 or higher is required. If you are
+using a Sendmail-compatible MTA, it must be compatible with at least version
+8.7 of Sendmail.
+
+On Mac OS X 10.3 and later, `Postfix <http://www.postfix.org/>`_
+is used as the built-in email server.  Postfix provides an executable
+that mimics sendmail enough to satisfy Bugzilla.
+
+On Windows, if you find yourself unable to use Bugzilla's built-in SMTP
+support (e.g. because the necessary Perl modules are not available), you can
+use :paramval:`Sendmail` with a little application called
+`sendmail.exe <http://glob.com.au/sendmail/>`_, which provides
+sendmail-compatible calling conventions and encapsulates the SMTP
+communication to another mail server. Like Bugzilla, :command:`sendmail.exe`
+can be configured to log SMTP communication to a file in case of problems.
+
+Detailed information on configuring an MTA is outside the scope of this
+document. Consult the manual for the specific MTA you choose for detailed
+installation instructions. Each of these programs will have their own
+configuration files where you must configure certain parameters to
+ensure that the mail is delivered properly. They are implemented
+as services, and you should ensure that the MTA is in the auto-start
+list of services for the machine.
+
+If a simple mail sent with the command-line :file:`mail` program
+succeeds, then Bugzilla should also be fine.
+
+Troubleshooting
+---------------
+
+If you are having trouble, check that any configured SMTP server can be
+reached from your Bugzilla server and that any given authentication
+credentials are valid. If these things seem correct and your mails are still
+not sending, check if your OS uses SELinux or AppArmor. Either of these
+may prevent your web server from sending email. The SELinux boolean
+`httpd_can_sendmail <http://selinuxproject.org/page/ApacheRecipes#Allow_the_Apache_HTTP_Server_to_send_mail>`_
+may need to be set to True.
+   
+If all those things don't help, activate the :param:`smtp_debug` parameter
+and check your webserver logs.
+
+.. _config-products:
+
+Products, Components, Versions and Milestones
+=============================================
+
+Bugs in Bugzilla are categorised into Products and, inside those Products,
+Components (and, optionally, if you turn on the :param:`useclassifications`
+parameter, Classifications as a level above Products).
+
+Bugzilla comes with a single Product, called "TestProduct", which contains a
+single component, imaginatively called "TestComponent". You will want to
+create your own Products and their Components. It's OK to have just one
+Component inside a Product. Products have Versions (which represents the
+version of the software in which a bug was found) and Target Milestones
+(which represent the future version of the product in which the bug is
+hopefully to be fixed - or, for RESOLVED bugs, was fixed. You may also want
+to add some of those.
+
+Once you've created your own, you will want to delete TestProduct (which
+will delete TestComponent automatically). Note that if you've filed a bug in
+TestProduct to try Bugzilla out, you'll need to move it elsewhere before it's
+possible to delete TestProduct.
+
+Now, you may want to do some of the :ref:`optional-post-install-config`.
diff --git a/docs/en/rst/installing/iis.rst b/docs/en/rst/installing/iis.rst
new file mode 100644
index 0000000000..320b8f73c5
--- /dev/null
+++ b/docs/en/rst/installing/iis.rst
@@ -0,0 +1,130 @@
+.. _iis:
+
+Microsoft IIS
+#############
+
+Bugzilla works with IIS as a normal CGI application. These instructions assume
+that you are using Windows 7 or Windows 10. Procedures for other versions are
+probably similar.
+
+Begin by starting Internet Information Services (IIS) Manager.
+:guilabel:`Start` --> :guilabel:`Administrators Tools` -->
+:guilabel:`Internet Information Services (IIS) Manager`. Or run the command:
+
+:command:`inetmgr`
+
+Create a New Application
+========================
+
+Expand your :guilabel:`Server` until the :guilabel:`Default Web Site` shows
+its children.
+
+Right-click :guilabel:`Default Web Site` and select
+:guilabel:`Add Application` from the menu.
+
+Unde :guilabel:`Alias`, enter the alias for the website. This is the path
+below the domain where you want Bugzilla to appear.
+
+Under :guilabel:`Physical Path`, enter the path to Bugzilla,
+:file:`C:\\Bugzilla`.
+
+When finished, click :guilabel:`OK`.
+
+Configure the Default Document
+==============================
+
+Click on the Application that you just created. Double-click on
+:guilabel:`Default Document`, and click :guilabel:`Add` underneath the
+Actions menu.
+
+Under :guilabel:`Name`, enter ``index.cgi``.
+
+All other default documents can be removed for this application.
+
+.. warning:: Do not delete the default document from the :guilabel:`Default Website`.
+
+Add Handler Mappings
+====================
+
+Ensure that you are at the Default Website. Under :guilabel:`IIS`,
+double-click :guilabel:`Handler Mappings`. Under :guilabel:`Actions`, click
+:guilabel:`Add Script Map`. You need to do this twice.
+
+For the first one, set the following values (replacing paths if necessary):
+
+* :guilabel:`Request Path`: ``*.pl``
+* :guilabel:`Executable`: ``C:\Perl\bin\perl.exe "%s" %s``
+* :guilabel:`Name`: ``Perl Script Map``
+
+At the prompt select :guilabel:`Yes`.
+
+.. note:: The ActiveState Perl installer may have already created an entry for
+   .pl files that is limited to ``GET,HEAD,POST``. If so, this mapping should
+   be removed, as Bugzilla's .pl files are not designed to be run via a web
+   server.
+
+For the second one, set the following values (replacing paths if necessary):
+
+* :guilabel:`Request Path`: ``*.cgi``
+* :guilabel:`Executable`: ``C:\Perl\bin\perl.exe "%s" %s``
+* :guilabel:`Name`: ``CGI Script Map``
+
+At the prompt select :guilabel:`Yes`.
+
+Bugzilla Application
+====================
+
+Ensure that you are at the Bugzilla Application. Under :guilabel:`IIS`,
+double-click :guilabel:`Handler Mappings`. Under :guilabel:`Actions`, click
+:guilabel:`Add Script Map`.
+
+Set the following values (replacing paths if necessary):
+
+* :guilabel:`Request Path`: ``*.cgi``
+* :guilabel:`Executable`: ``C:\Perl\bin\perl.exe -x"C:\Bugzilla" -wT "%s" %s``
+* :guilabel:`Name`: ``Bugzilla``
+
+At the prompt select :guilabel:`Yes`.
+
+Now it's time to restart the IIS server to take these changes into account.
+From the top-level menu, which contains the name of your machine, click
+:guilabel:`Restart` under :guilabel:`Manage Server`. Or run the command:
+
+:command:`iisreset`
+
+Enable Rewrite Rules for REST
+=============================
+
+REST URLs are usually of the form http://.../bugzilla/rest/version instead of
+http://.../bugzilla/rest.cgi/version. To let IIS redirect rest/ URLs to rest.cgi,
+you need to download and install the
+`URL Rewrite extension for IIS <http://www.iis.net/downloads/microsoft/url-rewrite>`_.
+Direct download links are available at the bottom of the page for both x86 and
+x64 Windows.
+
+Once installed, you open the IIS Manager again and go to your Bugzilla
+Application. From here, double-click :guilabel:`URL Rewrite`. Then click
+:guilabel:`Add Rule(s)` under the :guilabel:`Actions` menu and click
+:guilabel:`Blank rule` in the :guilabel:`Inbound rules` section.
+
+Fill the fields as follows. Other fields do not need to be edited.
+
+* :guilabel:`Name`: ``REST``
+* :guilabel:`Pattern`: ``^rest/(.*)$``
+* :guilabel:`Rewrite URL`: ``rest.cgi/{R:1}``
+
+There is no need to restart IIS. Changes take effect immediately.
+
+Common Problems
+===============
+
+Bugzilla runs but it's not possible to log in
+  You've probably configured IIS to use ActiveState's ISAPI DLL -- in other
+  words you're using PerlEx, or the executable IIS is configured to use is
+  :file:`PerlS.dll` or :file:`Perl30.dll`.
+
+  Reconfigure IIS to use :file:`perl.exe`.
+
+IIS returns HTTP 502 errors
+  You probably forgot the ``-T`` argument to :file:`perl` when configuring the
+  executable in IIS.
diff --git a/docs/en/rst/installing/index.rst b/docs/en/rst/installing/index.rst
new file mode 100644
index 0000000000..06d0276803
--- /dev/null
+++ b/docs/en/rst/installing/index.rst
@@ -0,0 +1,38 @@
+.. highlight:: console
+
+.. _installing:
+
+==================================
+Installation and Maintenance Guide
+==================================
+
+.. note:: If you just want to *use* Bugzilla,
+   you do not need to install it. None of this chapter is relevant to
+   you. Ask your Bugzilla administrator for the URL to access it from
+   your web browser. You may want to read the :ref:`using`.
+
+Bugzilla can be installed under Linux, Windows, Mac OS X, and perhaps other
+operating systems. However, if you are setting it up on a dedicated machine
+and you have control of the operating system to use, the Bugzilla team
+wholeheartedly recommends Linux as an extremely versatile, stable, and robust
+operating system that provides an ideal environment for Bugzilla. In that
+case, you may want to read the :ref:`Quick Start instructions <quick-start>`.
+
+.. toctree::
+   :maxdepth: 1
+
+   quick-start
+   linux
+   windows
+   mac-os-x
+   web_server
+   db_server
+   essential-post-install-config
+   optional-post-install-config
+   migrating
+   moving
+   upgrading
+   backups
+   sanity-check
+   merging-accounts
+   multiple-bugzillas
diff --git a/docs/en/rst/installing/installing-end.inc.rst b/docs/en/rst/installing/installing-end.inc.rst
new file mode 100644
index 0000000000..6e34395acb
--- /dev/null
+++ b/docs/en/rst/installing/installing-end.inc.rst
@@ -0,0 +1,66 @@
+localconfig
+===========
+
+You should now change into the Bugzilla directory and run
+:file:`checksetup.pl`, without any parameters:
+
+|checksetupcommand|
+
+:file:`checksetup.pl` will write out a file called :file:`localconfig`.
+This file contains the default settings for a number of
+Bugzilla parameters, the most important of which are the group your web
+server runs as, and information on how to connect to your database.
+
+Load this file in your editor. You will need to check/change ``$db_driver``
+and ``$db_pass``, which are respectively the type of the database you are
+using and the password for the ``bugs`` database user you have created.
+``$db_driver`` can be either ``mysql``, ``Pg`` (PostgreSQL), ``Oracle`` or
+``Sqlite``. All values are case sensitive.
+
+Set the value of ``$webservergroup`` to the group your web server runs as.
+
+* Fedora/Red Hat: ``apache``
+* Debian/Ubuntu: ``www-data``
+* Mac OS X: ``_www``
+* Windows: ignore this setting; it does nothing
+
+The other options in the :file:`localconfig` file are documented by their
+accompanying comments. If you have a non-standard database setup, you may
+need to change one or more of the other ``$db_*`` parameters.
+
+.. note:: If you are using Oracle, ``$db_name`` should be set to
+   the SID name of your database (e.g. ``XE`` if you are using Oracle XE).
+
+checksetup.pl
+=============
+
+Next, run :file:`checksetup.pl` an additional time:
+
+|checksetupcommand|
+
+It reconfirms that all the modules are present, and notices the altered
+localconfig file, which it assumes you have edited to your
+satisfaction. It compiles the UI templates,
+connects to the database using the ``bugs``
+user you created and the password you defined, and creates the
+``bugs`` database and the tables therein.
+
+After that, it asks for details of an administrator account. Bugzilla
+can have multiple administrators - you can create more later - but
+it needs one to start off with.
+Enter the email address of an administrator, his or her full name,
+and a suitable Bugzilla password.
+
+:file:`checksetup.pl` will then finish. You may rerun
+:file:`checksetup.pl` at any time if you wish.
+
+Success
+=======
+
+Your Bugzilla should now be working. Check by running:
+
+|testservercommand|
+
+If that passes, access ``http://<your-bugzilla-server>/`` in your browser -
+you should see the Bugzilla front page. Of course, if you installed Bugzilla
+in a subdirectory, make sure that's in the URL.
diff --git a/docs/en/rst/installing/linux.rst b/docs/en/rst/installing/linux.rst
new file mode 100644
index 0000000000..ac88f98d9c
--- /dev/null
+++ b/docs/en/rst/installing/linux.rst
@@ -0,0 +1,199 @@
+.. _linux:
+
+Linux
+#####
+
+Some Linux distributions include Bugzilla and its dependencies in their
+package management systems. If you have root access, installing Bugzilla on
+any Linux system could be as simple as finding the Bugzilla package in the
+package management application and installing it. There may be a small bit
+of additional configuration required.
+
+If you are installing your machine from scratch, :ref:`quick-start` may be
+the best instructions for you.
+
+.. _linux-install-packages:
+
+Install Packages
+================
+
+Use your distribution's package manager to install Perl, your preferred
+database engine (MySQL if in doubt), and a webserver (Apache if in doubt).
+Some distributions even have a Bugzilla package, although that will vary
+in age.
+
+The commands below will install those things and some of Bugzilla's other
+prerequisites as well. If you find a package doesn't install or the name
+is not found, just remove it from the list and reissue the command. If you
+want to use a different database or webserver, substitute the package
+names as appropriate.
+
+Fedora and Red Hat
+------------------
+
+The following command will install Red Hat's packaged version of Bugzilla:
+
+:command:`yum install bugzilla httpd mysql-server`
+
+Then, you can skip to :ref:`configuring your database <linux-config-database>`.
+It may be useful to know that Fedora stores the Bugzilla files in
+:file:`/usr/share/bugzilla`, so that's where you'll run :file:`checksetup.pl`.
+
+If you want to install a version of Bugzilla from the Bugzilla project, you
+will instead need:
+
+:command:`yum install httpd mysql-server mod_perl mod_perl-devel httpd-devel
+gd-devel mysql-devel rst2pdf
+graphviz patchutils gcc 'perl(Apache2::SizeLimit)' 'perl(Authen::Radius)'
+'perl(Authen::SASL)' 'perl(Cache::Memcached)' 'perl(CGI)' 'perl(Chart::Lines)'
+'perl(Daemon::Generic)' 'perl(Date::Format)' 'perl(DateTime)'
+'perl(DateTime::TimeZone)' 'perl(DBI)' 'perl(Digest::SHA)' 'perl(Email::MIME)'
+'perl(Email::Reply)' 'perl(Email::Sender)' 'perl(Encode)' 'perl(Encode::Detect)'
+'perl(File::MimeInfo::Magic)' 'perl(File::Slurp)' 'perl(GD)' 'perl(GD::Graph)'
+'perl(GD::Text)' 'perl(HTML::FormatText::WithLinks)' 'perl(HTML::Parser)'
+'perl(HTML::Scrubber)' 'perl(IO::Scalar)' 'perl(JSON::RPC)' 'perl(JSON::XS)'
+'perl(List::MoreUtils)' 'perl(LWP::UserAgent)' 'perl(Math::Random::ISAAC)'
+'perl(MIME::Parser)' 'perl(mod_perl2)' 'perl(Net::LDAP)' 'perl(Net::SMTP::SSL)'
+'perl(PatchReader)' 'perl(SOAP::Lite)' 'perl(Template)' 'perl(File::Which)'
+'perl(Template::Plugin::GD::Image)' 'perl(Test::Taint)' 'perl(TheSchwartz)'
+'perl(URI)' 'perl(XMLRPC::Lite)' 'perl(XML::Twig)'`
+
+If you are running RHEL6, you will have to enable the "RHEL Server Optional"
+channel in RHN to get some of those packages. 
+
+If you plan to use a database other than MySQL, you will need to also install
+the appropriate packages for that.
+
+Ubuntu and Debian
+-----------------
+
+:command:`apt-get install git nano`
+
+:command:`apt-get install apache2 mysql-server libappconfig-perl
+libdate-calc-perl libtemplate-perl libmime-perl build-essential
+libdatetime-timezone-perl libdatetime-perl libemail-sender-perl
+libemail-mime-perl libemail-mime-modifier-perl libdbi-perl libdbd-mysql-perl
+libcgi-pm-perl libmath-random-isaac-perl libmath-random-isaac-xs-perl
+apache2-mpm-prefork libapache2-mod-perl2 libapache2-mod-perl2-dev
+libchart-perl libxml-perl libxml-twig-perl perlmagick libgd-graph-perl
+libtemplate-plugin-gd-perl libsoap-lite-perl libhtml-scrubber-perl
+libjson-rpc-perl libdaemon-generic-perl libtheschwartz-perl
+libtest-taint-perl libauthen-radius-perl libfile-slurp-perl
+libencode-detect-perl libmodule-build-perl libnet-ldap-perl libfile-which-perl
+libauthen-sasl-perl libtemplate-perl-doc libfile-mimeinfo-perl
+libhtml-formattext-withlinks-perl libgd-dev libmysqlclient-dev lynx-cur
+graphviz python-sphinx rst2pdf`
+
+If you plan to use a database other than MySQL, you will need to also install
+the appropriate packages for that.
+
+Gentoo
+------
+
+:command:`emerge -av bugzilla`
+
+will install Bugzilla and all its dependencies. If you don't have the vhosts
+USE flag enabled, Bugzilla will end up in :file:`/var/www/localhost/bugzilla`.
+
+Then, you can skip to :ref:`configuring your database
+<linux-config-database>`.
+
+.. _linux-install-perl:
+
+Perl
+====
+
+Test which version of Perl you have installed with:
+::
+
+    $ perl -v
+
+Bugzilla requires at least Perl |min-perl-ver|.
+
+.. _linux-install-bzfiles:
+
+Bugzilla
+========
+
+The best way to get Bugzilla is to check it out from git:
+
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla`
+
+Run the above command in your home directory, replacing "X.X" with the 2-digit
+version number of the stable release of Bugzilla that you want - e.g. "4.4".
+
+If that's not possible, you can
+`download a tarball of Bugzilla <http://www.bugzilla.org/download/>`_.
+
+Place Bugzilla in a suitable directory, accessible by the default web server
+user (probably ``apache`` or ``www-data``).
+Good locations are either directly in the web server's document directory
+(often :file:`/var/www/html`) or in :file:`/usr/local`, either with a
+symbolic link to the web server's document directory or an alias in the web
+server's configuration.
+
+.. warning:: The default Bugzilla distribution is NOT designed to be placed
+   in a :file:`cgi-bin` directory. This
+   includes any directory which is configured using the
+   ``ScriptAlias`` directive of Apache.
+
+.. _linux-install-perl-modules:
+
+Perl Modules
+============
+
+Bugzilla requires a number of Perl modules. You can install these globally
+using your system's package manager, or install Bugzilla-only copies. At
+times, Bugzilla may require a version of a Perl module newer than the one
+your distribution packages, in which case you will need to install a
+Bugzilla-only copy of the newer version.
+
+To make sure you have all the core requirements to run Bugzilla, you should run the following command:
+
+:command:`perl Makefile.PL`
+
+Should this command warn about missing prerequisites -- or prerequisites that
+are too old, you may use :file:`cpanm` to install these.
+
+:command:`cpanm --installdeps -l local .`
+
+If you want a more full-featured Bugzilla, use the following command:
+
+:command:`cpanm --installdeps -l local --with-all-features --without-feature mod_perl --without-feature oracle --without-feature mysql --without-feature pg .`
+
+If you don't have :file:`cpanm` installed, you can either find it in your
+:file:`cpanminus` or :file:`perl-App-cpanminus` package, or
+`download it <http://cpanmin.us>`_  from cpanmin.us.
+
+.. _linux-config-webserver:
+
+Web Server
+==========
+
+Any web server that is capable of running CGI scripts can be made to work.
+We have specific configuration instructions for the following:
+
+* :ref:`apache`
+* :ref:`nginx`
+
+.. _linux-config-database:
+
+Database Engine
+===============
+
+Bugzilla supports MySQL, PostgreSQL, Oracle and SQLite as database servers.
+You only require one of these systems to make use of Bugzilla. MySQL is
+most commonly used. SQLite is good for trial installations as it requires no
+setup. Configure your server according to the instructions below:
+
+* :ref:`mysql`
+* :ref:`postgresql`
+* :ref:`oracle`
+* :ref:`sqlite`
+
+.. |checksetupcommand| replace:: :command:`./checksetup.pl`
+.. |testservercommand| replace:: :command:`./testserver.pl http://<your-bugzilla-server>/`
+
+.. include:: installing-end.inc.rst
+
+Next, do the :ref:`essential-post-install-config`.
diff --git a/docs/en/rst/installing/mac-os-x.rst b/docs/en/rst/installing/mac-os-x.rst
new file mode 100644
index 0000000000..3bf9ea92a5
--- /dev/null
+++ b/docs/en/rst/installing/mac-os-x.rst
@@ -0,0 +1,127 @@
+.. _mac-os-x:
+
+Mac OS X
+########
+
+.. _macosx-install-packages:
+
+.. note:: The Bugzilla team has very little Mac expertise and we've not been
+          able to do a successful install of the latest version. We got
+          close, though. If you've managed it, tell us how and we can update
+          these docs!
+
+Install Packages
+================
+
+OS X 10.7 provides Perl 5.12 and Apache 2.2. Install the following additional
+packages:
+
+* git: Download an installer from
+  `the git website <http://www.git-scm.com/downloads>`_. 
+* MySQL: Download an installer from
+  `the MySQL website <http://dev.mysql.com/downloads/mysql/>`_.
+
+.. _macosx-install-bzfiles:
+
+Bugzilla
+========
+
+The best way to get Bugzilla is to check it out from git:
+
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla`
+
+Run the above command in your home directory, replacing "X.X" with the 2-digit
+version number of the stable release of Bugzilla that you want - e.g. "4.4".
+This will place Bugzilla in the directory :file:`$HOME/bugzilla`.
+
+If that's not possible, you can
+`download a tarball of Bugzilla <http://www.bugzilla.org/download/>`_.
+
+.. _macosx-libraries:
+
+Additional System Libraries
+===========================
+
+Apple does not include the GD library with Mac OS X. Bugzilla needs this if
+you want to display bug graphs, and you need to install it before you try
+installing the GD Perl module.
+
+You can use `MacPorts <http://www.macports.org/>`_, `Homebrew <http://brew.sh/>`_ or
+`Fink <http://sourceforge.net/projects/fink/>`_, all of which can install common
+Unix programs on Mac OS X.
+
+If you don't have one of the above installed already, pick one and follow the
+instructions for setting it up. Then, use it to install the :file:`gd2` package
+(MacPorts/Fink) or the :file:`gd` package (Brew).
+
+The package manager may prompt you to install a number of dependencies; you
+will need to agree to this.
+
+.. note:: To prevent creating conflicts with the software that Apple
+   installs by default, Fink creates its own directory tree at :file:`/sw`
+   where it installs most of
+   the software that it installs. This means your libraries and headers
+   will be at :file:`/sw/lib` and :file:`/sw/include` instead
+   of :file:`/usr/lib` and :file:`/usr/include`. When the
+   Perl module config script for the GD module asks where your :file:`libgd`
+   is, be sure to tell it :file:`/sw/lib`.
+
+.. _macosx-install-perl-modules:
+
+Perl Modules
+============
+
+Bugzilla requires a number of Perl modules. Generally, the best way to install
+these is with the cpanm command.
+
+Generally, the best way to install these is with :file:`cpanm`:
+
+:command:`cpanm --installdeps -l local .`
+
+If you want a more full-featured Bugzilla:
+
+:command:`cpanm --installdeps -l local --with-all-features --without-feature oracle --without-feature mysql --without-feature pg .`
+
+If you don't have :file:`cpanm` installed, you can
+`download it <http://cpanmin.us>`_  from cpanmin.us.
+
+.. _macosx-config-webserver:
+
+Web Server
+==========
+
+Any web server that is capable of running CGI scripts can be made to work.
+We have specific configuration instructions for the following:
+
+* :ref:`apache`
+
+You'll need to create a symbolic link so the webserver can see Bugzilla:
+
+:command:`cd /Library/WebServer/Documents`
+
+:command:`sudo ln -s $HOME/bugzilla bugzilla`
+
+In :guilabel:`System Preferences` --> :guilabel:`Sharing`, enable the
+:guilabel:`Web Sharing` checkbox to start Apache. 
+
+.. _macosx-config-database:
+
+Database Engine
+===============
+
+Bugzilla supports MySQL, PostgreSQL, Oracle and SQLite as database servers.
+You only require one of these systems to make use of Bugzilla. MySQL is
+most commonly used on Mac OS X. (In fact, we have no reports of anyone using
+anything else.) Configure your server according to the instructions below:
+
+* :ref:`mysql`
+* :ref:`postgresql`
+* :ref:`oracle`
+* :ref:`sqlite`
+
+.. |checksetupcommand| replace:: :command:`perl checksetup.pl`
+.. |testservercommand| replace:: :command:`perl testserver.pl http://<your-bugzilla-server>/`
+
+.. include:: installing-end.inc.rst
+
+Next, do the :ref:`essential-post-install-config`.
diff --git a/docs/en/rst/installing/merging-accounts.rst b/docs/en/rst/installing/merging-accounts.rst
new file mode 100644
index 0000000000..4dbdb807f1
--- /dev/null
+++ b/docs/en/rst/installing/merging-accounts.rst
@@ -0,0 +1,14 @@
+Merging Accounts
+################
+
+Sometimes, users create a second account, perhaps because they don't realise
+they can change the email address associated with their original account.
+And then, once they discover this, they don't want to abandon the history
+associated with either account.
+
+The best way forward in this case would be to merge one of their accounts
+into the other one, so it looked like the target account had done all the
+actions of both. In Bugzilla's :file:`contrib` directory, there is a script
+called :file:`merge-users.pl`. While code in this directory is not officially
+supported by the Bugzilla team, this script may be useful to you in
+solving the above problem.
diff --git a/docs/en/rst/installing/migrating-from-1.inc.rst b/docs/en/rst/installing/migrating-from-1.inc.rst
new file mode 100644
index 0000000000..d834a8605d
--- /dev/null
+++ b/docs/en/rst/installing/migrating-from-1.inc.rst
@@ -0,0 +1,7 @@
+.. This file is included in multiple places, so can't have labels as they
+   appear as duplicates.
+   
+The procedure to migrate to Git is as follows. The idea is to switch version
+control systems without changing the version of Bugzilla you are using,
+to minimise the risk of conflict or problems. Any upgrade can then
+happen as a separate step.
diff --git a/docs/en/rst/installing/migrating-from-2.inc.rst b/docs/en/rst/installing/migrating-from-2.inc.rst
new file mode 100644
index 0000000000..889e5c3d86
--- /dev/null
+++ b/docs/en/rst/installing/migrating-from-2.inc.rst
@@ -0,0 +1,149 @@
+.. This file is included in multiple places, so can't have labels as they
+   appear as duplicates.
+
+Download Code from Git
+======================
+
+First, you need to find what version of Bugzilla you are using. It should be
+in the top right corner of the front page but, if not, open the file
+:file:`Bugzilla/Constants.pm` in your Bugzilla directory and search for
+``BUGZILLA_VERSION``.
+
+Then, you need to download an additional copy of your *current* version of
+Bugzilla from the git repository, and place it in a separate directory
+alongside your existing Bugzilla installation (which we will assume is in a
+directory called :file:`bugzilla`).
+
+To do this, you will need a copy of the :command:`git` program. All Linux
+distributions have it; search your package manager for "git". On Windows or
+Mac OS X, you can
+`download the official build <http://www.git-scm.com/downloads>`_.
+
+Once git is installed, run these commands to pull a copy of Bugzilla:
+
+:command:`git clone https://github.com/bugzilla/bugzilla bugzilla-new`
+
+:command:`cd bugzilla-new`
+
+:command:`git checkout release-$VERSION`
+
+Replace $VERSION with the three-digit version number of your current Bugzilla,
+e.g. "4.2.2". (If the the final digit would have been a 0, omit it - so use
+"4.4" for the first release in the 4.4 series.)
+
+You will get a message about a 'detached HEAD'. Don't worry; your head is
+still firmly attached to your shoulders.
+
+Save Any Local Customizations
+=============================
+
+Go into your original Bugzilla directory and run this command:
+
+|diffcommand|
+
+If you have made customizations to your Bugzilla, and you made them by
+changing the Bugzilla code itself (rather than using the Extension system),
+then :file:`patch.diff` will have significant content. You will want to keep a copy
+of those changes by keeping a copy of this file and any files referenced in it
+by "Only in" lines. If the file has zero size or only insignificant content,
+you haven't made any local customizations of this sort.
+
+Shut Down Bugzilla
+==================
+
+At this point, you should shut down Bugzilla to make sure nothing changes
+while you make the switch. Go into the administrative interface and put an
+appropriate message into the :param:`shutdownhtml` parameter, which is in the
+"General" section of the administration parameters. As the name implies, HTML
+is allowed.
+
+This would be a good time to make :ref:`backups`. We shouldn't be affecting
+the database, but you can't be too careful.
+
+Copy Across Data and Modules
+============================
+
+Copy the contents of the following directories from your current installation
+of Bugzilla into the corresponding directory in :file:`bugzilla-new/`:
+
+.. code-block:: none
+
+  lib/
+  data/
+  template/en/custom (may or may not exist)
+
+You also need to copy any extensions you have written or installed, which are
+in the :file:`extensions/` directory. |extstatusinfo|
+
+Lastly, copy the following file from your current installation of Bugzilla
+into the corresponding place in :file:`bugzilla-new/`:
+
+.. code-block:: none
+
+  localconfig
+
+This file contains your database password and access details. Because your
+two versions of Bugzilla are the same, this should all work fine.
+
+Reapply Local Customizations
+============================
+
+If your :file:`patch.diff` file was zero sized, you can
+jump to the next step. Otherwise, you have to apply the patch to your new
+installation. If you are on Windows and you don’t have the :command:`patch`
+program, you can download it from
+`GNUWin <http://gnuwin32.sourceforge.net/packages/patch.htm>`_. Once
+downloaded, you must copy patch.exe into the Windows directory. 
+
+Copy :file:`patch.diff` into the :file:`bugzilla-new` directory and then do:
+
+:command:`patch -p0 --dry-run < patch.diff`
+
+The patch should apply cleanly because you have exactly the same version of
+Bugzilla in both directories. If it does, remove the :command:`--dry-run` and
+rerun the command to apply it for real. If it does not apply cleanly, it is
+likely that you have managed to get a Bugzilla version mismatch between the
+two directories.
+
+Swap The New Version In
+=======================
+
+Now we swap the directories over, and run checksetup.pl to confirm that all
+is well. From the directory containing the :file:`bugzilla` and
+:file:`bugzilla-new` directories, run:
+
+:command:`mv bugzilla bugzilla-old`
+
+:command:`mv bugzilla-new bugzilla`
+
+:command:`cd bugzilla`
+
+:command:`./checksetup.pl`
+
+Running :file:`checksetup.pl` should not result in any changes to your database at
+the end of the run. If it does, then it's most likely that the two versions
+of Bugzilla you have are not, in fact, the same.
+
+Re-enable Bugzilla
+==================
+
+Go into the administrative interface and clear the contents of the
+:param:`shutdownhtml` parameter.
+
+Test Bugzilla
+=============
+
+Use your Bugzilla for several days to check that the switch has had no
+detrimental effects. Then, if necessary, follow the instructions in
+:ref:`upgrading-with-git` to upgrade to the latest version of Bugzilla.
+
+Rolling Back
+============
+
+If something goes wrong at any stage of the switching process (e.g. your
+patch doesn't apply, or checksetup doesn't complete), you can always just
+switch the directories back (if you've got that far) and re-enable Bugzilla
+(if you disabled it) and then seek help. Even if you have re-enabled Bugzilla,
+and find a problem a little while down the road, you are still using the same
+version so there would be few side effects to switching the directories back
+a day or three later.
diff --git a/docs/en/rst/installing/migrating-from-a-tarball.rst b/docs/en/rst/installing/migrating-from-a-tarball.rst
new file mode 100644
index 0000000000..852cb8dbe7
--- /dev/null
+++ b/docs/en/rst/installing/migrating-from-a-tarball.rst
@@ -0,0 +1,15 @@
+.. _migrating-from-a-tarball:
+
+Migrating from a Tarball
+########################
+
+.. |diffcommand|   replace:: :command:`diff -ru -x data -x lib -x docs -x .git -x CVS -x .cvsignore -x .bzr -x .bzrignore -x .bzrrev ../bugzilla-new . > ../patch.diff`
+
+.. |extstatusinfo| replace:: Copy across any subdirectories which do not exist
+                             in your new install.
+
+The procedure to migrate to Git is as follows. The idea is to switch without
+changing the version of Bugzilla you are using, to minimise the risk of
+conflict or problems. Any upgrade can then happen as a separate step. 
+
+.. include:: migrating-from-2.inc.rst
diff --git a/docs/en/rst/installing/migrating-from-bzr.rst b/docs/en/rst/installing/migrating-from-bzr.rst
new file mode 100644
index 0000000000..c9b0f3e83e
--- /dev/null
+++ b/docs/en/rst/installing/migrating-from-bzr.rst
@@ -0,0 +1,32 @@
+.. _migrating-from-bazaar:
+
+Migrating from Bazaar
+#####################
+
+.. |updatecommand| replace:: :command:`bzr up -r tag:bugzilla-$VERSION`
+.. |diffcommand|   replace:: :command:`bzr diff > patch.diff`
+.. |extstatusinfo| replace:: The command :command:`bzr status extensions/` should help you work out what you added, if anything.
+
+.. include:: migrating-from-1.inc.rst
+
+The old bzr.mozilla.org server has been decommissioned. This may not
+be a problem but, in some cases, running some of the commands below will
+make :command:`bzr` attempt to contact the server and time out. If and
+only if that happens to you, you will need to switch to the new server,
+as follows. Enter your Bugzilla directory and run:
+
+:command:`bzr info`
+
+and look at the Location: section of the output.
+If it says "light checkout root" then run:
+
+:command:`bzr -Ossl.cert_reqs=none switch https://bzr.bugzilla.org/bugzilla/$VERSION`
+
+Alternatively, if it says "branch root" or "checkout root" then run:
+
+:command:`bzr -Ossl.cert_reqs=none pull --remember https://bzr.bugzilla.org/bugzilla/$VERSION`
+
+Replace $VERSION with the two-digit version number of your current
+Bugzilla, e.g. "4.2" (see below for how to find that).
+
+.. include:: migrating-from-2.inc.rst
diff --git a/docs/en/rst/installing/migrating-from-cvs.rst b/docs/en/rst/installing/migrating-from-cvs.rst
new file mode 100644
index 0000000000..76f6253f2e
--- /dev/null
+++ b/docs/en/rst/installing/migrating-from-cvs.rst
@@ -0,0 +1,13 @@
+.. _migrating-from-cvs:
+
+Migrating from CVS
+##################
+
+.. |updatecommand| replace:: :command:`cvs update -rBUGZILLA-$VERSION-STABLE -dP`
+.. |diffcommand|   replace:: :command:`cvs diff -puN > patch.diff`
+.. |extstatusinfo| replace:: The command :command:`cvs status extensions/` should help you work out what you added, if anything.
+
+.. include:: migrating-from-1.inc.rst
+.. include:: migrating-from-2.inc.rst
+
+
diff --git a/docs/en/rst/installing/migrating.rst b/docs/en/rst/installing/migrating.rst
new file mode 100644
index 0000000000..8fc0de5f45
--- /dev/null
+++ b/docs/en/rst/installing/migrating.rst
@@ -0,0 +1,22 @@
+.. _migrating-from-other-btses:
+
+Migrating From Other Bug-Tracking Systems
+#########################################
+
+Bugzilla has a framework you can use for migrating from other bug-tracking
+systems - :api:`Bugzilla::Migrate <Bugzilla/Migrate.html>`.
+It provides the infrastructure you will need,
+but requires a module to be written to define the specifics of the system you
+are coming from. One exists for
+`Gnats <https://www.gnu.org/software/gnats/>`_. If you write one for a
+popular system, please share your code with us.
+
+Alternatively, Bugzilla comes with a script, :file:`importxml.pl`, which
+imports bugs in Bugzilla's XML format. You can see examples of this format
+by clicking the :guilabel:`XML` link at the bottom of a bug in a running
+Bugzilla. You would need to read the script to see how it handles errors,
+default values, creating non-existing values and so on.
+
+Bugzilla::Migrate is preferred if possible.
+
+
diff --git a/docs/en/rst/installing/moving.rst b/docs/en/rst/installing/moving.rst
new file mode 100644
index 0000000000..966acda072
--- /dev/null
+++ b/docs/en/rst/installing/moving.rst
@@ -0,0 +1,66 @@
+.. _moving:
+
+Moving Bugzilla Between Machines
+################################
+
+Sometimes it's necessary to take a working installation of Bugzilla and move
+it to new hardware. This page explains how to do that, assuming that you
+have Bugzilla's webserver and database on the same machine, and you are moving
+both of them.
+
+You are advised to install the same version of Bugzilla on the new
+machine as the old machine - any :ref:`upgrade <upgrading>` you also need to
+do can then be done as a separate step. But if you do install a newer version,
+things should still work.
+
+1. Shut down your Bugzilla by loading the front page, going to
+   :guilabel:`Administration` | :guilabel:`Parameters` | :guilabel:`General`
+   and putting some explanatory text into the :param:`shutdownhtml` parameter.
+
+2. Make a :ref:`backup <backups>` of the bugs database.
+
+3. On your new machine, install Bugzilla using the instructions at
+   :ref:`installing`. Look at the old machine if you need to know what values
+   you used for configuring e.g. MySQL.
+
+4. Copy the :file:`data` directory and the :file:`localconfig` file from the
+   old Bugzilla installation to the new one.
+
+5. If anything about your database configuration changed (location of the
+   server, username, password, etc.) as part of the move, update the
+   appropriate variables in :file:`localconfig`.
+
+6. If the new URL to your new Bugzilla installation is different from the old
+   one, update the :param:`urlbase` parameter in :file:`data/params.json`
+   using a text editor.
+
+7. Copy the database backup file from your old server to the new one.
+
+8. Create an empty ``bugs`` database on the new server. For MySQL, that would
+   look like this:
+
+   :command:`mysql -u root -p -e "CREATE DATABASE bugs DEFAULT CHARACTER SET utf8;"`
+
+9. Import your backup file into your new ``bugs`` database. Again, for MySQL:
+
+   :command:`mysql -u root -p bugs < $BACKUP_FILE_NAME`
+
+   If you get an error about "packet too large" or "MySQL server has gone
+   away", you need to adjust the ``max_allowed_packet`` setting in
+   your :file:`my.cnf` file (usually :file:`/etc/my.cnf`) file to match or
+   exceed the value configured in the same file in your old version of MySQL.
+
+   If there are *any* errors during this step, you have to work out what
+   went wrong, and then drop the database, create it again using the step
+   above, and run the import again.
+
+10. Run :file:`checksetup.pl` to make sure all is OK.
+    (Unless you are using a newer version of Bugzilla on your new server, this
+    should not make any changes.)
+
+    :command:`./checksetup.pl`
+
+11. Activate your new Bugzilla by loading the front page on the new server,
+    going to :guilabel:`Administration` | :guilabel:`Parameters` |
+    :guilabel:`General` and removing the text from the :param:`shutdownhtml`
+    parameter.
diff --git a/docs/en/rst/installing/multiple-bugzillas.rst b/docs/en/rst/installing/multiple-bugzillas.rst
new file mode 100644
index 0000000000..ac66268236
--- /dev/null
+++ b/docs/en/rst/installing/multiple-bugzillas.rst
@@ -0,0 +1,42 @@
+.. _multiple-bz-dbs:
+
+One Installation, Multiple Instances
+####################################
+
+This is a somewhat specialist feature; if you don't know whether you need it,
+you don't. It is useful to admins who want to run many separate instances of
+Bugzilla from a single installed codebase.
+
+This is possible by using the ``PROJECT`` environment variable. When accessed,
+Bugzilla checks for the existence of this variable, and if present, uses
+its value to check for an alternative configuration file named
+:file:`localconfig.<PROJECT>` in the same location as
+the default one (:file:`localconfig`). It also checks for
+customized templates in a directory named
+:file:`<PROJECT>` in the same location as the
+default one (:file:`template/<langcode>`). By default
+this is :file:`template/en/default` so ``PROJECT``'s templates
+would be located at :file:`template/en/PROJECT`.
+
+To set up an alternate installation, just export ``PROJECT=foo`` before
+running :command:`checksetup.pl` for the first time. Project names may
+contain only letters, numbers, underscores, and hyphens. It will
+result in a file called :file:`localconfig.foo` instead of
+:file:`localconfig`. Edit this file as described above, with
+reference to a new database, and re-run :command:`checksetup.pl`
+to populate it. That's all.
+
+Now you have to configure the web server to pass this environment
+variable when accessed via an alternate URL, such as virtual host for
+instance. The following is an example of how you could do it in Apache,
+other Webservers may differ.
+
+.. code-block:: apache
+
+    <VirtualHost 12.34.56.78:80>
+        ServerName bugzilla.example.com
+        SetEnv PROJECT foo
+    </VirtualHost>
+
+Don't forget to also export this variable before accessing Bugzilla
+by other means, such as repeating tasks like those above.
diff --git a/docs/en/rst/installing/mysql.rst b/docs/en/rst/installing/mysql.rst
new file mode 100644
index 0000000000..1107547a61
--- /dev/null
+++ b/docs/en/rst/installing/mysql.rst
@@ -0,0 +1,143 @@
+.. _mysql:
+
+MySQL
+#####
+
+You need MySQL version 5.0.15 or higher.
+
+It's possible to test which version of MySQL you have installed with:
+
+:command:`mysql -V`
+
+Installing
+==========
+
+Windows
+-------
+
+Download the MySQL 32-bit or 64-bit MSI installer from the
+`MySQL website <http://www.mysql.com/downloads/mysql/>`_ (~28 MB).
+
+MySQL has a standard Windows installer. It's ok to select a Typical MySQL
+install (the default). The rest of this documentation assumes assume you
+have installed MySQL into :file:`C:\\mysql`. Adjust paths appropriately if not.
+
+Linux/Mac OS X
+--------------
+
+The package install instructions given previously should have installed MySQL
+on your machine, if it didn't come with it already. Run:
+
+:command:`mysql_secure_installation`
+
+and follow its advice.
+
+If you did install MySQL manually rather than from a package, make sure the
+server is started when the machine boots.
+
+.. _mysql-add-user:
+
+Add a User
+==========
+
+You need to add a new MySQL user for Bugzilla to use. Run the :file:`mysql`
+command-line client and enter:
+
+::
+
+    GRANT SELECT, INSERT,
+    UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
+    CREATE TEMPORARY TABLES, DROP, REFERENCES ON bugs.*
+    TO bugs@localhost IDENTIFIED BY '$DB_PASS';
+
+    FLUSH PRIVILEGES;
+
+You need to replace ``$DB_PASS`` with a strong password you have chosen.
+Write that password down somewhere.
+
+The above command permits an account called ``bugs``
+to connect from the local machine, ``localhost``. Modify the command to
+reflect your setup if you will be connecting from another
+machine or as a different user.
+
+Change Configuration
+====================
+
+To change MySQL's configuration, you need to edit your MySQL
+configuration file, which is:
+
+* Red Hat/Fedora: :file:`/etc/my.cnf`
+* Debian/Ubuntu: :file:`/etc/mysql/my.cnf`
+* Windows: :file:`C:\\mysql\\bin\\my.ini`
+* Mac OS X: :file:`/etc/my/cnf`
+
+.. _mysql-max-allowed-packet:
+
+Allow Large Attachments and Many Comments
+-----------------------------------------
+
+By default on some systems, MySQL will only allow you to insert things
+into the database that are smaller than 1MB.
+
+Bugzilla attachments
+may be larger than this. Also, Bugzilla combines all comments
+on a single bug into one field for full-text searching, and the
+combination of all comments on a single bug could in some cases
+be larger than 1MB.
+
+We recommend that you allow at least 16MB packets by
+adding or altering the ``max_allowed_packet`` parameter in your MySQL
+configuration in the ``[mysqld]`` section, so that the number is at least
+16M, like this (note that it's ``M``, not ``MB``):
+
+::
+
+    [mysqld]
+    # Allow packets up to 16M
+    max_allowed_packet=16M
+
+.. _mysql-small-words:
+
+Allow Small Words in Full-Text Indexes
+--------------------------------------
+
+By default, words must be at least four characters in length
+in order to be indexed by MySQL's full-text indexes. This causes
+a lot of Bugzilla-specific words to be missed, including "cc",
+"ftp" and "uri".
+
+MySQL can be configured to index those words by setting the
+``ft_min_word_len`` param to the minimum size of the words to index.
+
+::
+
+    [mysqld]
+    # Allow small words in full-text indexes
+    ft_min_word_len=2
+
+.. _mysql-attach-table-size:
+
+Permit Attachments Table to Grow Beyond 4GB
+===========================================
+
+This is optional configuration for Bugzillas which are expected to become
+very large, and needs to be done after Bugzilla is fully installed.
+
+By default, MySQL will limit the size of a table to 4GB.
+This limit is present even if the underlying filesystem
+has no such limit.  To set a higher limit, run the :file:`mysql`
+command-line client and enter the following, replacing ``$bugs_db``
+with your Bugzilla database name (which is ``bugs`` by default):
+
+.. code-block:: sql
+
+    USE $bugs_db;
+    
+    ALTER TABLE attachments AVG_ROW_LENGTH=1000000, MAX_ROWS=20000;
+
+The above command will change the limit to 20GB. MySQL will have
+to make a temporary copy of your entire table to do this, so ideally
+you should do this when your attachments table is still small.
+
+.. note:: If you have set the setting in Bugzilla which allows large
+   attachments to be stored on disk, the above change does not affect that.
diff --git a/docs/en/rst/installing/nginx.rst b/docs/en/rst/installing/nginx.rst
new file mode 100644
index 0000000000..79a1d767fe
--- /dev/null
+++ b/docs/en/rst/installing/nginx.rst
@@ -0,0 +1,87 @@
+.. _nginx:
+
+Nginx
+#####
+
+Note: Running with nginx requires much more setup and a fair bit of knowledge
+about web server configuration. Most users will want to use Apache instead.
+
+You can run Bugzilla under nginx using the traditional CGI emulation method
+with fcgiwrap, as a PSGI application using Plack's FCGI handler, or via proxy
+to a server directly supporting CGI or PSGI. The last method is not recommended
+and will not be discussed further here.
+
+If using fcgiwrap, configure that in the normal way.
+
+If using Plack, install that, then arrange for the following command to be run
+on startup:
+
+:command:`plackup -s FCGI --listen /run/bugzilla.sock /var/www/html/bugzilla/app.psgi`
+
+For any configuration:
+
+It is highly recommended that you configure a system user specifically for
+Bugzilla and set the ``$use_suexec`` variable in localconfig to 1. Either way,
+make sure that ``$webservergroup`` is set to the user that is actually running
+Bugzilla.
+
+Use the following server block, adjusting to taste. Angle brackets are placed
+around the strings that must be changed.
+
+.. code-block:: nginx
+
+    server {
+        server_name <bugs.example.com>;
+
+        root </var/www/html/bugzilla>;
+
+        # optional if you don't have the autoindex module or have it off already
+        autoindex off;
+
+        # these do not conflict. see nginx's "location" documentation for more
+        # information.
+        location /attachments { return 403; }
+        location /Bugzilla { return 403; }
+        location /lib { return 403; }
+        location /template { return 403; }
+        location /contrib { return 403; }
+        location /t { return 403; }
+        location /xt { return 403; }
+        location /data { return 403; }
+        location /graphs { return 403; }
+        location /rest {
+            rewrite ^/rest/(.*)$ rest.cgi/$1 last;
+        }
+
+        location ~ (\.pm|\.pl|\.psgi|\.tmpl|localconfig.*|cpanfile)$ { return 403; }
+        # if you are using webdot. adjust the IP to point to your webdot server.
+        #location ~ ^/data/webdot/[^/]*\.dot$ { allow 127.0.0.1; deny all; }
+        location ~ ^/data/webdot/[^/]*\.png$ { }
+        location ~ ^/graphs/[^/]*\.(png|gif) { }
+        location ~ \.(css|js)$ {
+            expires 1y;
+            add_header Cache-Control public;
+        }
+        location ~ \.cgi$ {
+            location ~ ^/(json|xml)rpc\.cgi {
+                # authenticated queries contain plain text passwords in the
+                # query string, so we replace $request with $uri. adjust if you
+                # aren't using "combined" log format.
+                access_log </var/log/nginx/bugzilla.log>
+                    '$remote_addr - $remote_user [$time_local] '
+                    '"$uri" $status $body_bytes_sent '
+                    '"$http_referer" "$http_user_agent"';
+            }
+            include fastcgi_params;
+            # omit the following two lines if using fcgiwrap
+            fastcgi_param SCRIPT_NAME '';
+            fastcgi_param PATH_INFO $uri;
+            fastcgi_param BZ_CACHE_CONTROL 1;
+            fastcgi_pass <unix:/run/bugzilla.sock>;
+        }
+
+        # optional but highly recommended due to the large sizes of these files
+        gzip on;
+        # add whatever global types you have specified; this option does not stack.
+        gzip_types text/xml application/rdf+xml;
+    }
diff --git a/docs/en/rst/installing/optional-post-install-config.rst b/docs/en/rst/installing/optional-post-install-config.rst
new file mode 100644
index 0000000000..76fe0c8304
--- /dev/null
+++ b/docs/en/rst/installing/optional-post-install-config.rst
@@ -0,0 +1,175 @@
+.. _optional-post-install-config:
+
+Optional Post-Install Configuration
+###################################
+
+Bugzilla has a number of optional features. This section describes how
+to configure or enable them.
+
+.. _recurring-tasks:
+
+Recurring Tasks
+===============
+
+Several of the below features require you to set up a script to run at
+recurring intervals. The method of doing this varies by operating system.
+
+Linux
+-----
+
+Run:
+
+:command:`crontab -e`
+
+This should bring up the crontab file in your editor. Add the relevant
+cron line from the sections below in order to enable the corresponding
+feature.
+
+Windows
+-------
+
+Windows comes with a Task Scheduler. To run a particular script, do the
+following:
+
+#. :guilabel:`Control Panel` --> :guilabel:`Scheduled Tasks` -->
+   :guilabel:`Add Scheduled Task`
+
+#. Next
+
+#. Browse
+
+#. Find :file:`perl.exe` (normally :file:`C:\\Perl\\bin\\perl.exe`)
+
+#. Give the task a name, such as "Bugzilla <scriptname>"
+
+#. Request the task be performed at your desired time and interval
+
+#. If you're running Apache as a user, not as SYSTEM, enter that user
+   here. Otherwise you're best off creating an account that has write access
+   to the Bugzilla directory and using that
+
+#. Tick "Open Advanced Properties.." and click Finish
+
+#. Append the script name to the end of the "Run" field. eg
+   :command:`C:\\Perl\\bin\\perl.exe C:\\Bugzilla\\<scriptname>`
+
+#. Change "start in" to the Bugzilla directory
+
+.. _installation-bug-graphs:
+
+Bug Graphs
+==========
+
+If you have installed the necessary Perl modules, as indicated by
+:file:`checksetup.pl`, you can ask Bugzilla to regularly collect statistics
+so that you can see graphs and charts.
+
+On Linux, use a cron line as follows:
+
+.. code-block:: none
+
+    5 0 * * * cd <your-bugzilla-directory> && ./collectstats.pl
+
+On Windows, schedule the :file:`collectstats.pl` script to run daily.
+
+After two days have passed you'll be able to view bug graphs from
+the Reports page.
+
+.. _installation-whining:
+
+Whining
+=======
+
+Users can configure Bugzilla to annoy them at regular intervals, by having
+Bugzilla execute saved searches at certain times and emailing the results to
+the user.  This is known as "Whining".  The details of how a user configures
+Whining is described in :ref:`whining`, but for it to work a Perl script must
+be executed at regular intervals.
+
+On Linux, use a cron line as follows:
+
+.. code-block:: none
+
+    */15 * * * * cd <your-bugzilla-directory> && ./whine.pl
+
+On Windows, schedule the :file:`whine.pl` script to run every 15 minutes.
+
+.. _installation-whining-cron:
+
+Whining at Untriaged Bugs
+=========================
+
+It's possible for bugs to languish in an untriaged state. Bugzilla has a
+specific system to issue complaints about this particular problem to all the
+relevant engineers automatically by email.
+
+On Linux, use a cron line as follows:
+
+.. code-block:: none
+
+    55 0 * * * cd <your-bugzilla-directory> && ./whineatnews.pl
+
+On Windows, schedule the :file:`whineatnews.pl` script to run daily.
+
+Dependency Graphs
+=================
+
+Bugzilla can draw graphs of the dependencies (depends on/blocks relationships)
+between bugs, if you install a package called :file:`graphviz`.
+
+Linux
+-----
+
+Put the complete path to the :file:`dot` command (from the ``graphviz``
+package) in the :param:`webdotbase` variable in the :file:`localconfig` file.
+E.g. :paramval:`/usr/bin/dot`.
+
+Windows
+-------
+
+Download and install Graphviz from
+`the Graphviz website <http://www.graphviz.org/Download_windows.php>`_. Put
+the complete path to :file:`dot.exe` in the :param:`webdotbase` variable in the
+:file:`localconfig` file. E.g. :paramval:`C:\\Program Files (x86)\\Graphviz2.38\\bin\\dot.exe`.
+
+Documentation
+=============
+
+Bugzilla has extensive documentation and help, written in
+`reStructured Text <http://sphinx-doc.org/rest.html>`_
+format. A generic compiled copy exists on
+`bugzilla.readthedocs.org <https://bugzilla.readthedocs.org/>`_, and
+:guilabel:`Help` links point to it by default. You can also build and use
+a local copy of the documentation, for instance because you have added Bugzilla
+extensions which come with documentation, or because your users don't have
+Internet access from their machines.
+
+Bugzilla will automatically detect that you've compiled the documentation
+and link to it in preference to the copy on the Internet. Don't forget to
+recompile it when you upgrade Bugzilla or install new extensions.
+
+Linux
+-----
+
+* Install `Sphinx <http://sphinx-doc.org/>`_. Most Linux distros have it in
+  a package named :file:`python-sphinx`.
+
+* Then go to your Bugzilla directory and run:
+
+  :command:`docs/makedocs.pl`
+
+Windows
+-------
+
+* Download and install `Python <https://www.python.org/downloads/>`_.
+  Both Python 2.7 and 3.x will work. Adding :file:`python` to the :param:`PATH`
+  environment variable, as suggested by the Python installer, will make your
+  life easier.
+
+* Install `Sphinx <http://sphinx-doc.org/>`_. Run :command:`cmd.exe` and type:
+
+  :command:`pip install sphinx`
+
+* Then go to your :file:`C:\\bugzilla\\docs` directory and run:
+
+  :command:`makedocs.pl`
diff --git a/docs/en/rst/installing/oracle.rst b/docs/en/rst/installing/oracle.rst
new file mode 100644
index 0000000000..860b61fe63
--- /dev/null
+++ b/docs/en/rst/installing/oracle.rst
@@ -0,0 +1,69 @@
+.. _oracle:
+
+Oracle
+######
+
+.. warning:: Bugzilla supports Oracle, but none of the current developers run
+   it. Your mileage may vary.
+
+You need Oracle version 10.02.0 or later.
+
+.. _oracle-tablespace:
+
+Create a New Tablespace
+=======================
+
+You can use the existing tablespace or create a new one for Bugzilla.
+To create a new tablespace, run the following command:
+
+::
+
+    CREATE TABLESPACE bugs
+    DATAFILE '*$path_to_datafile*' SIZE 500M
+    AUTOEXTEND ON NEXT 30M MAXSIZE UNLIMITED
+
+Here, the name of the tablespace is 'bugs', but you can
+choose another name. *$path_to_datafile* is
+the path to the file containing your database, for instance
+:file:`/u01/oradata/bugzilla.dbf`.
+The initial size of the database file is set in this example to 500 Mb,
+with an increment of 30 Mb everytime we reach the size limit of the file.
+
+.. _oracle-add-user:
+
+Add a User to Oracle
+====================
+
+The user name and password must match what you set in :file:`localconfig`
+(``$db_user`` and ``$db_pass``, respectively). Here, we assume that
+the user name is 'bugs' and the tablespace name is the same
+as above.
+
+::
+
+    CREATE USER bugs
+    IDENTIFIED BY "$db_pass"
+    DEFAULT TABLESPACE bugs
+    TEMPORARY TABLESPACE TEMP
+    PROFILE DEFAULT;
+    -- GRANT/REVOKE ROLE PRIVILEGES
+    GRANT CONNECT TO bugs;
+    GRANT RESOURCE TO bugs;
+    -- GRANT/REVOKE SYSTEM PRIVILEGES
+    GRANT UNLIMITED TABLESPACE TO bugs;
+    GRANT EXECUTE ON CTXSYS.CTX_DDL TO bugs;
+
+.. _oracle_webserver:
+
+Configure the Web Server
+========================
+
+If you use Apache, append these lines to :file:`httpd.conf`
+to set ORACLE_HOME and LD_LIBRARY_PATH. For instance:
+
+.. code-block:: apache
+
+    SetEnv ORACLE_HOME /u01/app/oracle/product/10.2.0/
+    SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/
+
+When this is done, restart your web server.
diff --git a/docs/en/rst/installing/postgresql.rst b/docs/en/rst/installing/postgresql.rst
new file mode 100644
index 0000000000..762650d55e
--- /dev/null
+++ b/docs/en/rst/installing/postgresql.rst
@@ -0,0 +1,64 @@
+.. _postgresql:
+
+PostgreSQL
+##########
+
+Test which version of PostgreSQL you have installed with:
+
+:command:`psql -V`
+
+You need PostgreSQL version 9.0 or higher.
+
+If you install PostgreSQL manually rather than from a package, make sure the
+server is started when the machine boots.
+
+.. _posgresql-add-user:
+
+Add a User and Create a DB
+==========================
+
+You need to add a new user to PostgreSQL for the Bugzilla
+application to use when accessing the database. The following instructions
+assume the defaults in :file:`localconfig`; if you
+changed those, you need to modify the commands appropriately.
+
+On most systems, to create a user in PostgreSQL, login as the root user, and
+then switch to being the postgres (Unix) user:
+
+:command:`su - postgres`
+
+As the postgres user, you then need to create a new user:
+
+:command:`createuser -U postgres -DRSP bugs`
+
+When asked for a password, provide one and write it down for later reference.
+
+The created user will not be a superuser (-S) and will not be able to create
+new users (-R) or create databases (-D).
+
+Next we will create a database for bugzilla to use
+
+:command:`createdb -U postgres -O bugs bugs`
+
+This will create a database named `bugs` that is owned (-O) by the `bugs` user.
+
+.. _postgresql-access:
+
+Permit Access
+=============
+
+Edit the file :file:`pg_hba.conf` which is
+usually located in :file:`/var/lib/pgsql/data/`. In this file,
+you will need to add a new line to it as follows:
+
+::
+
+    host   all    bugs   127.0.0.1    255.255.255.255  md5
+
+This means that for TCP/IP (host) connections, allow connections from
+'127.0.0.1' to 'all' databases on this server from the 'bugs' user, and use
+password authentication ('md5') for that user.
+
+Now, you will need to stop and start PostgreSQL fully. (Do not use any
+'restart' command, due to the possibility of a change to
+:file:`postgresql.conf`.)
diff --git a/docs/en/rst/installing/quick-start.rst b/docs/en/rst/installing/quick-start.rst
new file mode 100644
index 0000000000..b7e96516c4
--- /dev/null
+++ b/docs/en/rst/installing/quick-start.rst
@@ -0,0 +1,215 @@
+.. _quick-start:
+
+Quick Start (Ubuntu Linux 14.04)
+################################
+
+This quick start guide makes installing Bugzilla as simple as possible for
+those who are able to choose their environment. It creates a system using
+Ubuntu Linux 14.04 LTS, Apache and MySQL. It requires a little familiarity
+with Linux and the command line.
+
+Obtain Your Hardware
+====================
+
+Ubuntu 14.04 LTS Server requires a 64-bit processor.
+Bugzilla itself has no prerequisites beyond that, although you should pick
+reliable hardware. You can also probably use any 64-bit virtual machine
+or cloud instance that you have root access on. 
+
+Install the OS
+==============
+
+Get `Ubuntu Server 14.04 LTS <http://www.ubuntu.com/download/server>`_
+and follow the `installation instructions <http://www.ubuntu.com/download/server/install-ubuntu-server>`_.
+Here are some tips:
+
+* Choose any server name you like.
+* When creating the initial Linux user, call it ``bugzilla``, give it a 
+  strong password, and write that password down.
+* You do not need an encrypted home directory.
+* Choose all the defaults for the "partitioning" part (excepting of course
+  where the default is "No" and you need to press "Yes" to continue).
+* Choose "install security updates automatically" unless you want to do
+  them manually.
+* From the install options, choose "OpenSSH Server" and "LAMP Server".
+* Set the password for the MySQL root user to a strong password, and write
+  that password down.
+* Install the Grub boot loader to the Master Boot Record.
+
+Reboot when the installer finishes.
+
+Become root
+===========
+
+ssh to the machine as the 'bugzilla' user, or start a console. Then:
+
+:command:`sudo su`
+   
+Install Prerequisites
+=====================
+
+:command:`apt-get install git nano`
+
+:command:`apt-get install apache2 mysql-server libappconfig-perl libdate-calc-perl libtemplate-perl libmime-perl build-essential libdatetime-timezone-perl libdatetime-perl libemail-sender-perl libemail-mime-perl libemail-mime-modifier-perl libdbi-perl libdbd-mysql-perl libcgi-pm-perl libmath-random-isaac-perl libmath-random-isaac-xs-perl apache2-mpm-prefork libapache2-mod-perl2 libapache2-mod-perl2-dev libchart-perl libxml-perl libxml-twig-perl perlmagick libgd-graph-perl libtemplate-plugin-gd-perl libsoap-lite-perl libhtml-scrubber-perl libjson-rpc-perl libdaemon-generic-perl libtheschwartz-perl libtest-taint-perl libauthen-radius-perl libfile-slurp-perl libencode-detect-perl libmodule-build-perl libnet-ldap-perl libauthen-sasl-perl libtemplate-perl-doc libfile-mimeinfo-perl libhtml-formattext-withlinks-perl libfile-which-perl libgd-dev libmysqlclient-dev lynx-cur graphviz python-sphinx rst2pdf`
+
+This will take a little while. It's split into two commands so you can do
+the next steps (up to step 7) in another terminal while you wait for the
+second command to finish. If you start another terminal, you will need to
+:command:`sudo su` again.
+
+Download Bugzilla
+=================
+
+Get it from our Git repository:
+
+:command:`cd /var/www/html`
+
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla bugzilla`
+
+(where "X.X" is the 2-digit version number of the stable release of Bugzilla
+that you want - e.g. 5.0)
+
+Configure MySQL
+===============
+
+The following instructions use the simple :file:`nano` editor, but feel
+free to use any text editor you are comfortable with.
+
+:command:`nano /etc/mysql/my.cnf`
+
+Set the following values, which increase the maximum attachment size and
+make it possible to search for short words and terms:
+
+* Alter on Line 52: ``max_allowed_packet=100M``
+* Add as new line 32, in the ``[mysqld]`` section: ``ft_min_word_len=2``
+
+Save and exit.
+
+Then, add a user to MySQL for Bugzilla to use:
+
+:command:`mysql -u root -p -e "GRANT ALL PRIVILEGES ON bugs.* TO bugs@localhost IDENTIFIED BY '$db_pass'"`
+
+Replace ``$db_pass`` with a strong password you have generated. Write it down.
+When you run the above command, it will prompt you for the MySQL root password
+that you configured when you installed Ubuntu. You should make ``$db_pass``
+different to that password.
+
+Restart MySQL:
+
+:command:`service mysql restart`
+
+Configure Apache
+================
+
+:command:`nano /etc/apache2/sites-available/bugzilla.conf`
+
+Paste in the following and save:
+
+.. code-block:: apache
+
+ ServerName localhost
+
+ <Directory /var/www/html/bugzilla>
+   AddHandler cgi-script .cgi
+   Options +ExecCGI
+   DirectoryIndex index.cgi index.html
+   AllowOverride All
+ </Directory>
+
+:command:`a2ensite bugzilla`
+
+:command:`a2enmod cgi headers expires`
+
+:command:`service apache2 restart`
+
+Check Setup
+===========
+
+Bugzilla comes with a :file:`checksetup.pl` script which helps with the
+installation process. It will need to be run twice. The first time, it
+generates a config file (called :file:`localconfig`) for the database
+access information, and the second time (step 10)
+it uses the info you put in the config file to set up the database.
+
+:command:`cd /var/www/html/bugzilla`
+
+:command:`./checksetup.pl`
+
+Edit :file:`localconfig`
+========================
+
+:command:`nano localconfig`
+
+You will need to set the following values:
+
+* Line 29: set ``$webservergroup`` to ``www-data``
+* Line 67: set ``$db_pass`` to the password for the ``bugs`` user you created
+  in MySQL a few steps ago
+
+Check Setup (again)
+===================
+
+Run the :file:`checksetup.pl` script again to set up the database.
+
+:command:`./checksetup.pl`
+
+It will ask you to give an email address, real name and password for the
+first Bugzilla account to be created, which will be an administrator.
+Write down the email address and password you set.
+
+Test Server
+===========
+
+:command:`./testserver.pl http://localhost/bugzilla`
+
+All the tests should pass. You may get warnings about deprecation from
+the ``Chart::Base`` Perl module; if so, just ignore them.
+
+Access Via Web Browser
+======================
+
+Access the front page:
+
+:command:`lynx http://localhost/bugzilla`
+
+It's not really possible to use Bugzilla for real through Lynx, but you
+can view the front page to validate visually that it's up and running.
+
+You might well need to configure your DNS such that the server has, and
+is reachable by, a name rather than IP address. Doing so is out of scope
+of this document. In the mean time, it is available on your local network
+at ``http://<ip address>/bugzilla``, where ``<ip address>`` is (unless you
+have a complex network setup) the "inet addr" value displayed when you run
+:command:`ifconfig eth0`.
+
+Configure Bugzilla
+==================
+
+Once you have worked out how to access your Bugzilla in a graphical
+web browser, bring up the front page, click :guilabel:`Log In` in the
+header, and log in as the admin user you defined in step 10.
+
+Click the :guilabel:`Parameters` link on the page it gives you, and set
+the following parameters in the :guilabel:`Required Settings` section:
+
+* :param:`urlbase`:
+  :paramval:`http://<servername>/bugzilla/` or :paramval:`http://<ip address>/bugzilla/`
+
+Click :guilabel:`Save Changes` at the bottom of the page.
+
+There are several ways to get Bugzilla to send email. The easiest is to
+use Gmail, so we do that here so you have it working. Visit
+https://gmail.com and create a new Gmail account for your Bugzilla to use.
+Then, open the :guilabel:`Email` section of the Parameters using the link
+in the left column, and set the following parameter values:
+
+* :param:`mail_delivery_method`: :paramval:`SMTP`
+* :param:`mailfrom`: :paramval:`new_gmail_address@gmail.com`
+* :param:`smtpserver`: :paramval:`smtp.gmail.com:465`
+* :param:`smtp_username`: :paramval:`new_gmail_address@gmail.com`
+* :param:`smtp_password`: :paramval:`new_gmail_password`
+* :param:`smtp_ssl`: :paramval:`On`
+
+Click :guilabel:`Save Changes` at the bottom of the page.
+
+And you're all ready to go. :-)
diff --git a/docs/en/rst/installing/sanity-check.rst b/docs/en/rst/installing/sanity-check.rst
new file mode 100644
index 0000000000..4f8fb11c69
--- /dev/null
+++ b/docs/en/rst/installing/sanity-check.rst
@@ -0,0 +1,26 @@
+.. _sanity-check:
+
+Sanity Check
+############
+
+Over time it is possible for the Bugzilla database to become corrupt
+or to have anomalies. This could happen through manual database
+administration outside of the Bugzilla user interface, or from some
+other unexpected event. Bugzilla includes a "Sanity Check" that
+can perform several basic database checks, and repair certain problems or
+inconsistencies.
+
+To run a Sanity Check, log in as an Administrator and click the
+:guilabel:`Sanity Check` link in the admin page. Any problems that are found
+will be displayed in red letters. If the script is capable of fixing a
+problem, it will present a link to initiate the fix. If the script cannot
+fix the problem it will require manual database administration or recovery.
+
+Sanity Check can also be run from the command line via the perl
+script :file:`sanitycheck.pl`. The script can also be run as
+a :command:`cron` job. Results will be delivered by email to an address
+specified on the command line.
+
+Sanity Check should be run on a regular basis as a matter of
+best practice.
+
diff --git a/docs/en/rst/installing/sqlite.rst b/docs/en/rst/installing/sqlite.rst
new file mode 100644
index 0000000000..bf59536669
--- /dev/null
+++ b/docs/en/rst/installing/sqlite.rst
@@ -0,0 +1,14 @@
+.. _sqlite:
+
+SQLite
+######
+
+.. warning:: Due to SQLite's `concurrency
+   limitations <http://sqlite.org/faq.html#q5>`_ we recommend SQLite only for
+   small and development Bugzilla installations.
+
+Once you have SQLite installed, no additional configuration is required to
+run Bugzilla.
+
+The database will be stored in :file:`$BUGZILLA_HOME/data/db/$db_name`, where
+``$db_name`` is the database name defined in :file:`localconfig`.
diff --git a/docs/en/rst/installing/upgrading-customizations.rst b/docs/en/rst/installing/upgrading-customizations.rst
new file mode 100644
index 0000000000..c99c6a9f7d
--- /dev/null
+++ b/docs/en/rst/installing/upgrading-customizations.rst
@@ -0,0 +1,20 @@
+.. _upgrading-customizations:
+
+Upgrading a Customized or Extended Bugzilla
+###########################################
+
+If your Bugzilla has been customized or uses extensions, you will need to
+make your customizations or extensions work with your new version of Bugzilla.
+If this is the case, you are particularly strongly recommended to do a test
+upgrade on a test system and use that to help you port forward your
+customizations.
+
+If your extension came from a third party, look to see if an updated version
+is available for the version of Bugzilla you are upgrading to. If not, and
+you want to continue using it, you'll need to port it forward yourself.
+
+If you are upgrading from a version of Bugzilla earlier than 3.6 and have
+extensions for which a newer version is not available from an upstream source,
+then you need to convert them. This is because the extension format changed
+in version 3.6. There is a file called :file:`extension-convert.pl` in the
+:file:`contrib` directory which may be able to help you with that.
diff --git a/docs/en/rst/installing/upgrading-with-1.inc.rst b/docs/en/rst/installing/upgrading-with-1.inc.rst
new file mode 100644
index 0000000000..4861f6ea90
--- /dev/null
+++ b/docs/en/rst/installing/upgrading-with-1.inc.rst
@@ -0,0 +1,41 @@
+Before You Upgrade
+==================
+
+Before you start your upgrade, there are a few important
+steps to take:
+
+#. Read the
+   `Release Notes <http://www.bugzilla.org/releases/>`_ of the version you're
+   upgrading to and all intermediate versions, particularly the "Notes for
+   Upgraders" sections, if present. They may make you aware of additional
+   considerations.
+
+#. Run the :ref:`sanity-check` on your installation. Attempt to fix all
+   warnings that the page produces before you start, or it's
+   possible that you may experience problems during your upgrade.
+
+#. Work out how to :ref:`back up <backups>` your Bugzilla entirely, and
+   how to restore from a backup if need be.
+
+Customized Bugzilla?
+--------------------
+
+If you have modified the code or templates of your Bugzilla,
+then upgrading requires a bit more thought and effort than the simple process
+below. See :ref:`template-method` for a discussion of the various methods of
+code customization that may have been used.
+
+The larger the jump you are trying to make, the more difficult it
+is going to be to upgrade if you have made local code customizations.
+Upgrading from 4.2 to 4.2.1 should be fairly painless even if
+you are heavily customized, but going from 2.18 to 4.2 is going
+to mean a fair bit of work re-writing your local changes to use
+the new files, logic, templates, etc. If you have done no local
+changes at all, however, then upgrading should be approximately
+the same amount of work regardless of how long it has been since
+your version was released.
+
+If you have made customizations, you should do the upgrade on a test system
+with the same configuration and make sure all your customizations still work.
+If not, port and test them so you have them ready to reapply once you do
+the upgrade for real.
diff --git a/docs/en/rst/installing/upgrading-with-2.inc.rst b/docs/en/rst/installing/upgrading-with-2.inc.rst
new file mode 100644
index 0000000000..d8e2dbfaa0
--- /dev/null
+++ b/docs/en/rst/installing/upgrading-with-2.inc.rst
@@ -0,0 +1,32 @@
+Upgrading the Database
+======================
+
+Run :file:`checksetup.pl`. This will do everything required to convert
+your existing database and settings to the new version.
+
+:command:`cd $BUGZILLA_HOME`
+
+:command:`./checksetup.pl`
+
+   .. warning:: For some upgrades, running :file:`checksetup.pl` on a large
+      installation (75,000 or more bugs) can take a long time,
+      possibly several hours, if e.g. indexes need to be rebuilt. If this
+      length of downtime would be a problem for you, you can determine
+      timings for your particular situation by doing a test upgrade on a
+      development server with the production data.
+
+:file:`checksetup.pl` may also tell you that you need some additional
+Perl modules, or newer versions of the ones you have. You will need to
+install these, either system-wide or using the :file:`install-module.pl`
+script that :file:`checksetup.pl` recommends.
+
+Finishing The Upgrade
+=====================
+
+#. Reactivate Bugzilla by clear the text that you put into the
+   :param:`shutdownhtml` parameter.
+
+#. Run another :ref:`sanity-check` on your
+   upgraded Bugzilla. It is recommended that you fix any problems
+   you see immediately. Failure to do this may mean that Bugzilla
+   may not work entirely correctly. 
diff --git a/docs/en/rst/installing/upgrading-with-a-tarball.rst b/docs/en/rst/installing/upgrading-with-a-tarball.rst
new file mode 100644
index 0000000000..2bbfb31586
--- /dev/null
+++ b/docs/en/rst/installing/upgrading-with-a-tarball.rst
@@ -0,0 +1,74 @@
+.. _upgrading-with-a-tarball:
+
+Upgrading with a Tarball
+########################
+
+If you are unable (or unwilling) to use Git, another option is to obtain a
+tarball of the latest version from our website and upgrade your Bugzilla
+installation using that.
+
+Without a source code management system to help you, the process may be
+trickier.
+
+.. include:: upgrading-with-1.inc.rst
+
+As you are using a tarball and not an SCM, it's not at all easy to see if
+you've made local code customizations. You may have to use institutional
+knowledge, or download a fresh copy of your *current* version of Bugzilla
+and compare the two directories. If you find that you have, you'll need
+to turn them into a patch file, perhaps by diffing the two directories,
+and then reapply that patch file later. If you are customizing Bugzilla
+locally, please consider
+:ref:`rebasing your install on top of git <migrating-from-a-tarball>`.
+
+.. _upgrade-files-tarball:
+
+Getting The New Bugzilla
+========================
+
+Download a copy of the latest version of Bugzilla from the
+`Download Page <http://www.bugzilla.org/download/>`_ into a separate
+directory (which we will call :file:`bugzilla-new`) alongside your existing
+Bugzilla installation (which we will assume is in a directory called
+:file:`bugzilla`).
+
+Copy Across Data and Modules
+============================
+
+Copy the contents of the following directories from your current installation
+of Bugzilla into the corresponding directory in :file:`bugzilla-new/`:
+
+.. code-block:: none
+
+  lib/
+  data/
+  template/en/custom (may or may not exist)
+
+You also need to copy any extensions you have written or installed, which are
+in the :file:`extensions/` directory. Bugzilla ships with some extensions,
+so again if you want to know if any of the installed extensions are yours,
+you may have to compare with a clean copy of your current version. You can
+disregard any which have a :file:`disabled` file - those are not enabled.
+
+Lastly, copy the following file from your current installation of Bugzilla
+into the corresponding place in :file:`bugzilla-new/`:
+
+.. code-block:: none
+
+  localconfig
+
+This file contains your database password and access details.
+
+Swap The New Version In
+=======================
+
+Now we swap the directories over. From the directory containing the
+:file:`bugzilla` and :file:`bugzilla-new` directories, run:
+
+:command:`mv bugzilla bugzilla-old`
+
+:command:`mv bugzilla-new bugzilla`
+
+:command:`cd bugzilla`
+
+.. include:: upgrading-with-2.inc.rst
diff --git a/docs/en/rst/installing/upgrading-with-git.rst b/docs/en/rst/installing/upgrading-with-git.rst
new file mode 100644
index 0000000000..8559513497
--- /dev/null
+++ b/docs/en/rst/installing/upgrading-with-git.rst
@@ -0,0 +1,81 @@
+.. _upgrading-with-git:
+
+Upgrading with Git
+##################
+
+Upgrading to new Bugzilla releases is very simple, and you can upgrade
+from any version to any later version in one go - there is no need for
+intermediate steps. There is a script named :file:`checksetup.pl` included
+with Bugzilla that will automatically do all of the database migration
+for you.
+
+Bugzilla is now hosted on Github, but we used to be hosted on git.mozilla.org.
+If you got the code from git.mozilla.org, you need to point your
+checkout at Github instead. To find out, run:
+
+:command:`git remote -v`
+
+If you see "git.mozilla.org" anywhere in the output, then run:
+
+:command:`git remote set-url origin https://github.com/bugzilla/bugzilla`
+
+This change will only ever need to be done once.
+
+.. include:: upgrading-with-1.inc.rst
+
+You can see if you have local code customizations using:
+
+:command:`git diff`
+
+If that comes up empty, then run:
+
+:command:`git log | head`
+
+and see if the last commit looks like one made by the Bugzilla team, or
+by you. If it looks like it was made by us, then you have made no local
+code customizations.
+
+.. _start-upgrade-git:
+
+Starting the Upgrade
+====================
+
+When you are ready to go:
+
+#. Shut down your Bugzilla installation by putting some explanatory text
+   in the :param:`shutdownhtml` parameter.
+
+#. Make all necessary :ref:`backups <backups>`.
+   *THIS IS VERY IMPORTANT*. If anything goes wrong during the upgrade,
+   having a backup allows you to roll back to a known good state.
+
+.. _upgrade-files-git:
+
+Getting The New Bugzilla
+========================
+
+In the commands below, ``$BUGZILLA_HOME`` represents the directory
+in which Bugzilla is installed. Assuming you followed the installation
+instructions and your Bugzilla is a checkout of a stable branch,
+you can get the latest point release of your current version by simply doing:
+
+:command:`cd $BUGZILLA_HOME`
+
+:command:`git pull`
+
+If you want to upgrade to a newer release of Bugzilla, then you will
+additionally need to do:
+
+:command:`git checkout release-X.X-stable`
+
+where "X.X" is the 2-digit version number of the stable version you want to
+upgrade to (e.g. "4.4").
+
+.. note:: Do not attempt to downgrade Bugzilla this way - it won't work.
+
+If you have local code customizations, git will attempt to merge them. If
+it fails, then you should implement the plan you came up with when you
+detected these customizations in the step above, before you started the
+upgrade.
+
+.. include:: upgrading-with-2.inc.rst
diff --git a/docs/en/rst/installing/upgrading.rst b/docs/en/rst/installing/upgrading.rst
new file mode 100644
index 0000000000..f37998cf8f
--- /dev/null
+++ b/docs/en/rst/installing/upgrading.rst
@@ -0,0 +1,68 @@
+.. _upgrading:
+
+Upgrading
+#########
+
+You can upgrade Bugzilla from any version to any later version in one go—there
+is no need to pass through intermediate versions.
+
+.. warning:: Upgrading is a one-way process. You cannot "downgrade" an
+   upgraded Bugzilla. If you wish to revert to the old Bugzilla
+   version for any reason, you will have to restore your system
+   from a backup. Those with critical data or large installations may wish
+   to test the upgrade on a development server first, using a copy of the
+   production data and configuration.
+ 
+Bugzilla uses the Git version control system to store its code. A modern
+Bugzilla installation consists of a checkout of a stable version of the code
+from our Git repository. This makes upgrading much easier. If this is
+already true of your installation, see :ref:`upgrading-with-git`.
+
+Before Git, we used to use Bazaar and, before that, CVS. If your installation
+of Bugzilla consists of a checkout from one of those two systems, you need to
+upgrade in two steps:
+
+1. Move to running from a Git checkout, while staying on exactly the same release.
+2. Upgrade to the latest Bugzilla using the instructions for :ref:`upgrading-with-git`.
+
+See :ref:`migrating-from-bazaar` or :ref:`migrating-from-cvs` as appropriate.
+
+Some Bugzillas were installed simply by downloading a copy of the code as
+an archive file ("tarball"). However, recent tarballs have included source
+code management system information, so you may be able to use the Git, Bzr
+or CVS instructions.
+
+If you aren't sure which of these categories you fall into, to find out which
+version control system your copy of Bugzilla recognizes, look for the
+following subdirectories in your root Bugzilla directory:
+
+* :file:`.git`: you installed using Git - follow :ref:`upgrading-with-git`.
+* :file:`.bzr`: you installed using Bazaar - follow :ref:`migrating-from-bazaar`.
+* :file:`CVS`: you installed using CVS - follow :ref:`migrating-from-cvs`.
+* None of the above: you installed using an old tarball - follow
+  :ref:`migrating-from-a-tarball`.
+
+It is also possible, particularly if your server machine does not have and
+cannot be configured to have access to the public internet, to upgrade using
+a tarball. See :ref:`upgrading-with-a-tarball`.
+
+Whichever path you use, you may need help with
+:ref:`upgrading-customizations`.
+
+.. toctree::
+   :maxdepth: 1
+
+   upgrading-with-git
+   migrating-from-bzr
+   migrating-from-cvs
+   migrating-from-a-tarball
+   upgrading-with-a-tarball
+   upgrading-customizations
+
+Bugzilla can automatically notify administrators when new releases are
+available if the :param:`upgrade_notification` parameter is set.
+Administrators will see these notifications when they access the Bugzilla home
+page. Bugzilla will check once per day for new releases. If you are behind a
+proxy, you may have to set the :param:`proxy_url` parameter accordingly. If
+the proxy requires authentication, use the
+:paramval:`http://user:pass@proxy_url/` syntax.
diff --git a/docs/en/rst/installing/web_server.rst b/docs/en/rst/installing/web_server.rst
new file mode 100644
index 0000000000..3dfeb6a13e
--- /dev/null
+++ b/docs/en/rst/installing/web_server.rst
@@ -0,0 +1,14 @@
+.. _web_server:
+
+Web Server
+##########
+
+Bugzilla requires a web server. It supports the following:
+
+.. toctree::
+   :maxdepth: 1
+
+   apache
+   apache-windows
+   iis
+   nginx
diff --git a/docs/en/rst/installing/windows.rst b/docs/en/rst/installing/windows.rst
new file mode 100644
index 0000000000..76bda63b78
--- /dev/null
+++ b/docs/en/rst/installing/windows.rst
@@ -0,0 +1,188 @@
+.. _windows:
+
+Windows
+#######
+
+Making Bugzilla work on Windows is not more difficult than making it work on
+Linux. However, fewer developers use Windows to test Bugzilla and so we would
+still recommend using Linux for large sites to get better support.
+
+.. windows-install-perl:
+
+Perl
+====
+
+You have two main choices to install Perl on Windows: ActivePerl and Strawberry
+Perl.
+
+The ActivePerl Windows Installer can be downloaded from the
+`ActiveState website <http://www.activestate.com/activeperl/downloads>`_.
+Perl will be installed by default into :file:`C:\\Perl`. It is not
+recommended to install Perl into a directory containing a space, such as
+:file:`C:\\Program Files`. Once the install has completed, log out and log in
+again to pick up the changes to the ``PATH`` environment variable.
+
+The Strawberry Perl Windows Installer can be downloaded from the
+`Strawberry Perl website <http://strawberryperl.com>`_. Perl will be installed
+by default into :file:`C:\\Strawberry`.
+
+One big advantage of Strawberry Perl over ActivePerl is that with Strawberry
+Perl, you can use the usual tools available on other OSes to install missing
+Perl modules directly from CPAN, whereas ActivePerl requires you to use its own
+:file:`ppm` tool to download pre-compiled Perl modules from ActiveState.
+The modules in the ActivePerl repository may be a bit older than those on CPAN.
+
+.. _windows-install-bzfiles:
+
+Bugzilla
+========
+
+The best way to get Bugzilla is to check it out from git. Download and install
+git from the `git website <http://git-scm.com/download>`_, and then run:
+
+:command:`git clone --branch release-X.X-stable https://github.com/bugzilla/bugzilla C:\\bugzilla`
+
+where "X.X" is the 2-digit version number of the stable release of Bugzilla
+that you want (e.g. 5.0).
+
+The rest of this documentation assumes you have installed Bugzilla into
+:file:`C:\\bugzilla`. Adjust paths appropriately if not.
+
+If it's not possible to use git (e.g. because your Bugzilla machine has no
+internet access), you can
+`download a tarball of Bugzilla <http://www.bugzilla.org/download/>`_ and
+copy it across. Bugzilla comes as a 'tarball' (:file:`.tar.gz` extension),
+which any competent Windows archiving tool should be able to open.
+
+.. windows-install-perl-modules:
+
+Perl Modules
+============
+
+Bugzilla requires a number of Perl modules to be installed. Some of them are
+mandatory, and some others, which enable additional features, are optional.
+
+If you are using ActivePerl, these modules are available in the ActiveState
+repository, and are installed with the :file:`ppm` tool. You can either use it
+on the command line as below, or just type :command:`ppm`, and you will get a GUI.
+If you use a proxy server or a firewall you may have trouble running PPM.
+This is covered in the
+`ActivePerl FAQ <http://aspn.activestate.com/ASPN/docs/ActivePerl/faq/ActivePerl-faq2.html#ppm_and_proxies>`_.
+
+Install the following mandatory modules with:
+
+:command:`ppm install <modulename>`
+
+* CGI.pm
+* Digest-SHA
+* TimeDate
+* DateTime
+* DateTime-TimeZone
+* DBI
+* Template-Toolkit
+* Email-Sender
+* Email-MIME
+* URI
+* List-MoreUtils
+* Math-Random-ISAAC
+* File-Slurp
+* JSON-XS
+* Win32
+* Win32-API
+* DateTime-TimeZone-Local-Win32
+
+The following modules enable various optional Bugzilla features; try and
+install them, but don't worry too much to begin with if you can't get them
+installed:
+
+* GD
+* Chart
+* Template-GD
+* GDTextUtil
+* GDGraph
+* MIME-tools
+* libwww-perl
+* XML-Twig
+* PatchReader
+* perl-ldap
+* Authen-SASL
+* Net-SMTP-SSL
+* RadiusPerl
+* SOAP-Lite
+* XMLRPC-Lite
+* JSON-RPC
+* Test-Taint
+* HTML-Parser
+* HTML-Scrubber
+* Encode
+* Encode-Detect
+* Email-Reply
+* HTML-FormatText-WithLinks
+* TheSchwartz
+* Daemon-Generic
+* mod_perl
+* Apache-SizeLimit
+* File-MimeInfo
+* IO-stringy
+* Cache-Memcached
+* Text-Markdown
+* File-Copy-Recursive
+
+If you are using Strawberry Perl, you should use the :file:`cpanm`
+script to install modules, which is the same script used for Linux. Some of
+the required modules are already installed by default. The remaining ones can
+be installed using the command:
+
+:command:`cpanm -l local <modulename>`
+
+The list of modules to install will be displayed by :file:`checksetup.pl`; see
+below.
+
+.. warning:: In master, :file:`checksetup.pl` no longer lists these modules.
+   This will be fixed in :bug:`1251100`.
+
+.. _windows-config-webserver:
+
+Web Server
+==========
+
+Any web server that is capable of running CGI scripts can be made to work.
+We have specific instructions for the following:
+
+* :ref:`apache-windows`
+* :ref:`iis`
+
+.. windows-config-database:
+
+Database Engine
+===============
+
+Bugzilla supports MySQL, PostgreSQL, Oracle and SQLite as database servers.
+You only require one of these systems to make use of Bugzilla. MySQL is
+most commonly used, and is the only one for which Windows instructions have
+been tested. SQLite is good for trial installations as it requires no
+setup. Configure your server according to the instructions below:
+
+* :ref:`mysql`
+* :ref:`postgresql`
+* :ref:`oracle`
+* :ref:`sqlite`
+
+.. |checksetupcommand| replace:: :command:`checksetup.pl`
+.. |testservercommand| replace:: :command:`testserver.pl http://<your-bugzilla-server>/`
+
+.. include:: installing-end.inc.rst
+
+If you don't see the main Bugzilla page, but instead see "It works!!!",
+then somehow your Apache has not picked up your modifications to
+:file:`httpd.conf`. If you are on Windows 7 or later, this could be due to a
+new feature called "VirtualStore". `This blog post
+<http://blog.netscraps.com/bugs/apache-httpd-conf-changes-ignored-in-windows-7.html>`_
+may help to solve the problem.
+
+If you get an "Internal Error..." message, it could be that
+``ScriptInterpreterSource Registry-Strict`` is not set in your
+:ref:`Apache configuration <apache-windows>`. Check again if it is set
+properly.
+
+Next, do the :ref:`essential-post-install-config`.
diff --git a/docs/en/rst/integrating/apis.rst b/docs/en/rst/integrating/apis.rst
new file mode 100644
index 0000000000..54ee3273a1
--- /dev/null
+++ b/docs/en/rst/integrating/apis.rst
@@ -0,0 +1,77 @@
+.. _api-list:
+
+APIs
+####
+
+Bugzilla has a number of APIs that you can call in your code to extract
+information from and put information into Bugzilla. Some are deprecated and
+will soon be removed. Which one to use? Short answer: the
+:ref:`REST WebService API v1 <apis>`
+should be used for all new integrations, but keep an eye out for version 2,
+coming soon.
+
+The APIs currently available are as follows:
+
+Core Module API
+===============
+
+Most of the core Bugzilla modules have extensive documentation inside the modules
+themselves. You can view the :api:`POD documentation <index.html>` to help with
+using the core modules in your extensions.
+
+Ad-Hoc APIs
+===========
+
+Various pages on Bugzilla are available in machine-parseable formats as well
+as HTML. For example, bugs can be downloaded as XML, and buglists as CSV.
+CSV is useful for spreadsheet import. There should be links on the HTML page
+to alternate data formats where they are available.
+
+XML-RPC
+=======
+
+Bugzilla has an :api:`XML-RPC API <Bugzilla/WebService/Server/XMLRPC.html>`.
+This will receive no further updates and will be removed in a future version
+of Bugzilla.
+
+Endpoint: :file:`/xmlrpc.cgi`
+
+JSON-RPC
+========
+
+Bugzilla has a :api:`JSON-RPC API <Bugzilla/WebService/Server/JSONRPC.html>`.
+This will receive no further updates and will be removed in a future version
+of Bugzilla.
+
+Endpoint: :file:`/jsonrpc.cgi`
+
+REST
+====
+
+Bugzilla has a :ref:`REST API <apis>` which is the currently-recommended API
+for integrating with Bugzilla. The current REST API is version 1. It is stable,
+and so will not be changed in a backwardly-incompatible way.
+
+**This is the currently-recommended API for new development.**
+
+Endpoint: :file:`/rest`
+
+BzAPI/BzAPI-Compatible REST
+===========================
+
+The first ever REST API for Bugzilla was implemented using an external proxy
+called `BzAPI <https://wiki.mozilla.org/Bugzilla:BzAPI>`_. This became popular
+enough that a BzAPI-compatible shim on top of the (native) REST API has been
+written, to allow code which used the BzAPI API to take advantage of the
+speed improvements of direct integration without needing to be rewritten.
+The shim is an extension which you would need to install in your Bugzilla.
+
+Neither BzAPI nor this BzAPI-compatible API shim will receive any further
+updates, and they should not be used for new code.
+
+REST v2
+=======
+
+The future of Bugzilla's APIs is version 2 of the REST API, which will take
+the best of the current REST API and the BzAPI API. It is still under
+development.
diff --git a/docs/en/rst/integrating/auth-delegation.rst b/docs/en/rst/integrating/auth-delegation.rst
new file mode 100644
index 0000000000..811da0d90a
--- /dev/null
+++ b/docs/en/rst/integrating/auth-delegation.rst
@@ -0,0 +1,30 @@
+.. _auth-delegation:
+
+Authentication Delegation via API Keys
+######################################
+
+Bugzilla provides a mechanism for web apps to request (with the user's consent)
+an API key. API keys allow the web app to perform any action as the user and are as
+a result very powerful. Because of this power, this feature is disabled by default.
+
+Authentication Flow
+-------------------
+
+The authentication process begins by directing the user to th the Bugzilla site's auth.cgi.
+For the sake of this example, our application's URL is `http://app.example.org`
+and the Bugzilla site is `http://bugs.example.org`.
+
+1. Provide a link or redirect the user to `http://bugs.example.org/auth.cgi?callback=http://app.example.org/callback&description=app%description`
+2. Assuming the user is agreeable, they will be redirected to `http://app.example.org/callback` via a GET request
+   with two additional parameters: `client_api_key` and `client_api_login`.
+3. Finally, you should check that the API key and login are valid, using the :ref:`rest_user_valid_login` REST
+   resource.
+
+Your application should take measures to ensure when receiving a user at your
+callback URL that you previously redirected them to Bugzilla. The simplest method would be ensuring the callback url always has the
+hostname and path you specified, with only the query string parameters varying.
+
+The description should include the name of your application, in a form that will be recognizable to users.
+This description is used in the :ref:`API Keys tab <api-keys>` in the Preferences page.
+
+The API key passed to the callback will be valid until the user revokes it.
diff --git a/docs/en/rst/integrating/extensions.rst b/docs/en/rst/integrating/extensions.rst
new file mode 100644
index 0000000000..6a3fd8d3f3
--- /dev/null
+++ b/docs/en/rst/integrating/extensions.rst
@@ -0,0 +1,199 @@
+.. _extensions:
+
+Extensions
+##########
+
+One of the best ways to customize Bugzilla is by using a Bugzilla
+Extension. Extensions can modify both the code and UI of Bugzilla in a way
+that can be distributed to other Bugzilla users and ported forward to future
+versions of Bugzilla with minimal effort. We maintain a
+`list of available extensions <https://wiki.mozilla.org/Bugzilla:Addons>`_
+written by other people on our wiki. You would need to
+make sure that the extension in question works with your version of Bugzilla.
+
+Or, you can write your own extension. See the :api:`Bugzilla Extension
+documentation <Bugzilla/Extension.html>`
+for the core documentation on how to do that. It would make sense to read
+the section on :ref:`templates`. There is also a sample extension in
+:file:`$BUGZILLA_HOME/extensions/Example/` which gives examples of how to
+use all the code hooks.
+
+This section explains how to achieve some common tasks using the Extension APIs.
+
+Adding A New Page to Bugzilla
+=============================
+
+There are occasions where it's useful to add a new page to Bugzilla which
+has little or no relation to other pages, and perhaps doesn't use very much
+Bugzilla data. A help page, or a custom report for example. The best mechanism
+for this is to use :file:`page.cgi` and the ``page_before_template`` hook.
+
+Altering Data On An Existing Page
+=================================
+
+The ``template_before_process`` hook can be used to tweak the data displayed
+on a particular existing page, if you know what template is used. It has
+access to all the template variables before they are passed to the templating
+engine.
+
+Adding New Fields To Bugs
+=========================
+
+To add new fields to a bug, you need to do the following:
+
+* Add an ``install_update_db`` hook to add the fields by calling
+  ``Bugzilla::Field->create`` (only if the field doesn't already exist).
+  Here's what it might look like for a single field:
+
+  .. code-block:: perl
+
+    my $field = new Bugzilla::Field({ name => $name });
+    return if $field;
+ 
+    $field = Bugzilla::Field->create({
+        name        => $name,
+        description => $description,
+        type        => $type,        # From list in Constants.pm
+        enter_bug   => 0,
+        buglist     => 0,
+        custom      => 1,
+    });
+
+* Push the name of the field onto the relevant arrays in the ``bug_columns``
+  and ``bug_fields`` hooks.
+
+* If you want direct accessors, or other functions on the object, you need to
+  add a BEGIN block to your Extension.pm:
+
+  .. code-block:: perl
+
+    BEGIN { 
+       *Bugzilla::Bug::is_foopy = \&_bug_is_foopy; 
+    }
+ 
+    ...
+ 
+    sub _bug_is_foopy {
+        return $_[0]->{'is_foopy'};
+    }
+
+* You don't have to change ``Bugzilla/DB/Schema.pm``.
+
+* You can use ``bug_end_of_create``, ``bug_end_of_create_validators``, and
+  ``bug_end_of_update`` to create or update the values for your new field.
+
+Adding New Fields To Other Things
+=================================
+
+If you are adding the new fields to an object other than a bug, you need to
+go a bit lower-level. With reference to the instructions above:
+
+* In ``install_update_db``, use ``bz_add_column`` instead
+
+* Push on the columns in ``object_columns`` and ``object_update_columns``
+  instead of ``bug_columns``.
+
+* Add validators for the values in ``object_validators``
+
+The process for adding accessor functions is the same.
+
+You can use the hooks ``object_end_of_create``,
+``object_end_of_create_validators``, ``object_end_of_set_all``, and
+``object_end_of_update`` to create or update the values for the new object
+fields you have added. In the hooks you can check the object type being
+operated on and skip any objects you don't care about. For example, if you
+added a new field to the ``products`` table:
+
+.. code-block:: perl
+
+    sub object_end_of_create {
+        my ($self, $args) = @_;
+        my $class = $args->{'class'};
+        my $object = $args->{'object'};
+        if ($class->isa('Bugzilla::Product') {
+            [...]
+        }
+    }
+
+You will need to do this filtering for most of the hooks whose names begin with
+``object_``.
+
+Adding Admin Configuration Panels
+=================================
+
+If you add new functionality to Bugzilla, it may well have configurable
+options or parameters. The way to allow an administrator to set those
+is to add a new configuration panel.
+
+As well as using the ``config_add_panels`` hook, you will need a template to
+define the UI strings for the panel. See the templates in
+:file:`template/en/default/admin/params` for examples, and put your own
+template in :file:`template/en/default/admin/params` in your extension's
+directory.
+
+You can access param values from Templates using::
+
+    [% Param('param_name') %]
+
+and from code using:
+
+.. code-block:: perl
+
+    Bugzilla->params->{'param_name'}
+
+Adding User Preferences
+=======================
+
+To add a new user preference:
+
+* Call ``add_setting('setting_name', ['some_option', 'another_option'],
+  'some_option')`` in the ``install_before_final_checks`` hook. (The last
+  parameter is the name of the option which should be the default.)
+
+* Add descriptions for the identifiers for your setting and choices
+  (setting_name, some_option etc.) to the hash defined in
+  :file:`global/setting-descs.none.tmpl`. Do this in a template hook:
+  :file:`hook/global/setting-descs-settings.none.tmpl`. Your code can see the
+  hash variable; just set more members in it.
+
+* To change behaviour based on the setting, reference it in templates using
+  ``[% user.settings.setting_name.value %]``. Reference it in code using
+  ``$user->settings->{'setting_name'}->{'value'}``. The value will be one of
+  the option tag names (e.g. some_option).
+
+.. _who-can-change-what:
+
+Altering Who Can Change What
+============================
+
+Companies often have rules about which employees, or classes of employees,
+are allowed to change certain things in the bug system. For example,
+only the bug's designated QA Contact may be allowed to VERIFY the bug.
+Bugzilla has been
+designed to make it easy for you to write your own custom rules to define
+who is allowed to make what sorts of value transition.
+
+By default, assignees, QA owners and users
+with *editbugs* privileges can edit all fields of bugs,
+except group restrictions (unless they are members of the groups they
+are trying to change). Bug reporters also have the ability to edit some
+fields, but in a more restrictive manner. Other users, without
+*editbugs* privileges, cannot edit
+bugs, except to comment and add themselves to the CC list.
+
+Because this kind of change is such a common request, we have added a
+specific hook for it that :ref:`extensions` can call. It's called
+``bug_check_can_change_field``, and it's documented :api:`in the Hooks
+documentation <Bugzilla/Hook.html#bug_check_can_change_field>`.
+
+Checking Syntax
+===============
+
+It's not immediately obvious how to check the syntax of your extension's
+Perl modules, if it contains any. Running :command:`checksetup.pl` might do
+some of it, but the errors aren't necessarily massively informative.
+
+:command:`perl -Mlib=lib -MBugzilla -e 'BEGIN { Bugzilla->extensions; } use Bugzilla::Extension::ExtensionName::Class;'`
+
+(run from ``$BUGZILLA_HOME``) is what you need.
+
diff --git a/docs/en/rst/integrating/faq.rst b/docs/en/rst/integrating/faq.rst
new file mode 100644
index 0000000000..1b33e9623b
--- /dev/null
+++ b/docs/en/rst/integrating/faq.rst
@@ -0,0 +1,27 @@
+
+.. _customization-faq:
+
+Customization FAQ
+=================
+
+How do I...
+
+...add a new field on a bug?
+  Use :ref:`custom-fields` or, if you just want new form fields on bug entry
+  but don't need Bugzilla to track the field separately thereafter, you can
+  use a :ref:`custom bug entry form <custom-bug-entry>`.
+
+...change the name of a built-in bug field?
+  :ref:`Edit <templates>` the relevant value in the template
+  :file:`template/en/default/global/field-descs.none.tmpl`.
+
+...use a word other than 'bug' to describe bugs?
+  :ref:`Edit or override <templates>` the appropriate values in the template
+  :file:`template/en/default/global/variables.none.tmpl`.
+  
+...call the system something other than 'Bugzilla'?
+  :ref:`Edit or override <templates>` the appropriate value in the template
+  :file:`template/en/default/global/variables.none.tmpl`.
+  
+...alter who can change what field when?
+  See :ref:`who-can-change-what`.
diff --git a/docs/en/rst/integrating/index.rst b/docs/en/rst/integrating/index.rst
new file mode 100644
index 0000000000..ea7d8a7f3a
--- /dev/null
+++ b/docs/en/rst/integrating/index.rst
@@ -0,0 +1,24 @@
+.. highlight:: perl
+
+.. _integrating:
+
+===================================
+Integration and Customization Guide
+===================================
+
+You may find that Bugzilla already does what you want it to do, you just
+need to configure it correctly. Read the :ref:`administering` sections
+carefully to see if that's the case for you. If not, then this chapter
+explains how to use the available mechanisms for integration and customization.
+
+.. toctree::
+   :maxdepth: 2
+
+   faq
+   languages
+   skins
+   templates
+   extensions
+   apis
+   auth-delegation
+   internals/index
diff --git a/docs/en/rst/integrating/languages.rst b/docs/en/rst/integrating/languages.rst
new file mode 100644
index 0000000000..01586d3fe9
--- /dev/null
+++ b/docs/en/rst/integrating/languages.rst
@@ -0,0 +1,19 @@
+Languages
+=========
+
+Bugzilla's templates can be localized, although it's a `big job
+<https://wiki.mozilla.org/Bugzilla:L10n:Guide>`_. If you have
+a localized set of templates for your version of Bugzilla, Bugzilla can 
+support multiple languages at once. In that case, Bugzilla honours the user's
+``Accept-Language`` HTTP header when deciding which language to serve. If
+multiple languages are installed, a menu will display in the header allowing
+the user to manually select a different language. If they do this, their
+choice will override the ``Accept-Language`` header.
+
+Many language templates can be obtained from
+`the localization section of the Bugzilla website
+<http://www.bugzilla.org/download.html#localizations>`_. Instructions
+for submitting new languages are also available from that location. There's
+also a `list of localization teams
+<https://wiki.mozilla.org/Bugzilla:L10n:Localization_Teams>`_; you might
+want to contact someone to ask about the status of their localization.
diff --git a/docs/en/rst/integrating/skins.rst b/docs/en/rst/integrating/skins.rst
new file mode 100644
index 0000000000..4c1d8e254c
--- /dev/null
+++ b/docs/en/rst/integrating/skins.rst
@@ -0,0 +1,27 @@
+.. _skins:
+
+Skins
+=====
+
+Bugzilla supports skins - ways of changing the look of the UI without altering
+its underlying structure. It ships with two - "Classic" and "Dusk". You can
+find some more listed
+`on the wiki <https://wiki.mozilla.org/Bugzilla:Addons#Skins>`_, and there
+are a couple more which are part of
+`bugzilla.mozilla.org <https://github.com/mozilla-bteam/bmo>`_.
+However, in each
+case you may need to check that the skin supports the version of Bugzilla
+you have. 
+
+To create a new custom skin, make a directory that contains all the same CSS
+file names as :file:`skins/standard/`, and put your directory in
+:file:`skins/contrib/`. Then, add your CSS to the appropriate files.
+
+After you put the directory there, make sure to run :file:`checksetup.pl` so
+that it can set the file permissions correctly.
+
+After you have installed the new skin, it will show up as an option in the
+user's :guilabel:`Preferences`, on the :guilabel:`General` tab. If you would
+like to force a particular skin on all users, just select that skin in the
+:guilabel:`Default Preferences` in the :guilabel:`Administration` UI, and
+then uncheck "Enabled" on the preference, so users cannot change it.
diff --git a/docs/en/rst/integrating/templates.rst b/docs/en/rst/integrating/templates.rst
new file mode 100644
index 0000000000..f30b4a8482
--- /dev/null
+++ b/docs/en/rst/integrating/templates.rst
@@ -0,0 +1,289 @@
+.. _templates:
+
+Templates
+#########
+
+Bugzilla uses a system of templates to define its user interface. The standard
+templates can be modified, replaced or overridden. You can also use template
+hooks in an :ref:`extension <extensions>` to add or modify the
+behaviour of templates using a stable interface.
+
+.. _template-directory:
+
+Template Directory Structure
+============================
+
+The template directory structure starts with top level directory
+named :file:`template`, which contains a directory
+for each installed localization. Bugzilla comes with English
+templates, so the directory name is :file:`en`,
+and we will discuss :file:`template/en` throughout
+the documentation. Below :file:`template/en` is the
+:file:`default` directory, which contains all the
+standard templates shipped with Bugzilla.
+
+.. warning:: A directory :file:`data/template` also exists;
+   this is where Template Toolkit puts the compiled versions (i.e. Perl code)
+   of the templates. *Do not* directly edit the files in this
+   directory, or all your changes will be lost the next time
+   Template Toolkit recompiles the templates.
+
+.. _template-method:
+
+Choosing a Customization Method
+===============================
+
+If you want to edit Bugzilla's templates, the first decision
+you must make is how you want to go about doing so. There are three
+choices, and which you use depends mainly on the scope of your
+modifications, and the method you plan to use to upgrade Bugzilla.
+
+#. You can directly edit the templates found in :file:`template/en/default`.
+
+#. You can copy the templates to be modified into a mirrored directory
+   structure under :file:`template/en/custom`. Templates in this
+   directory structure automatically override any identically-named
+   and identically-located templates in the
+   :file:`template/en/default` directory. (The :file:`custom` directory does
+   not exist by default and must be created if you want to use it.)
+
+#. You can use the hooks built into many of the templates to add or modify
+   the UI from an :ref:`extension <extensions>`. Hooks generally don't go away
+   and have a stable interface. 
+
+The third method is the best if there are hooks in the appropriate places
+and the change you want to do is possible using hooks. It's not very easy
+to modify existing UI using hooks; they are most commonly used for additions.
+You can make modifications if you add JS code which then makes the
+modifications when the page is loaded. You can remove UI by adding CSS to hide
+it.
+
+Unlike code hooks, there is no requirement to document template hooks, so
+you just have to open up the template and see (search for ``Hook.process``).
+
+If there are no hooks available, then the second method of customization
+should be used if you are going to make major changes, because it is
+guaranteed that the contents of the :file:`custom` directory will not be
+touched during an upgrade, and you can then decide whether
+to revert to the standard templates, continue using yours, or make the effort
+to merge your changes into the new versions by hand. It's also good for
+entirely new files, and for a few files like
+:file:`bug/create/user-message.html.tmpl` which are designed to be entirely
+replaced.
+
+Using the second method, your user interface may break if incompatible
+changes are made to the template interface. Templates do change regularly
+and so interface changes are not individually documented, and you would
+need to work out what had changed and adapt your template accordingly.
+
+For minor changes, the convenience of the first method is hard to beat. When
+you upgrade Bugzilla, :command:`git` will merge your changes into the new
+version for you. On the downside, if the merge fails then Bugzilla will not
+work properly until you have fixed the problem and re-integrated your code.
+
+Also, you can see what you've changed using :command:`git diff`, which you
+can't if you fork the file into the :file:`custom` directory.
+
+.. _template-edit:
+
+How To Edit Templates
+=====================
+
+.. note:: If you are making template changes that you intend on submitting 
+   back for inclusion in standard Bugzilla, you should read the relevant
+   sections of the
+   `Developers' Guide <http://www.bugzilla.org/docs/developer.html>`_.
+
+Bugzilla uses a templating system called Template Toolkit. The syntax of the
+language is beyond the scope of this guide. It's reasonably easy to pick up by
+looking at the current templates; or, you can read the manual, available on
+the `Template Toolkit home page <http://www.template-toolkit.org>`_.
+
+One thing you should take particular care about is the need
+to properly HTML filter data that has been passed into the template.
+This means that if the data can possibly contain special HTML characters
+such as ``<``, and the data was not intended to be HTML, they need to be
+converted to entity form, i.e. ``&lt;``.  You use the ``html`` filter in the
+Template Toolkit to do this (or the ``uri`` filter to encode special
+characters in URLs).  If you forget, you may open up your installation
+to cross-site scripting attacks.
+
+
+You should run :command:`./checksetup.pl` after editing any templates. Failure
+to do so may mean either that your changes are not picked up, or that the
+permissions on the edited files are wrong so the webserver can't read them. 
+
+.. _template-formats:
+
+Template Formats and Types
+==========================
+
+Some CGI's have the ability to use more than one template. For example,
+:file:`buglist.cgi` can output itself as two formats of HTML (complex and
+simple). Each of these is a separate template. The mechanism that provides
+this feature is extensible - you can create new templates to add new formats.
+
+You might use this feature to e.g. add a custom bug entry form for a
+particular subset of users or a particular type of bug.
+
+Bugzilla can also support different types of output - e.g. bugs are available
+as HTML and as XML, and this mechanism is extensible also to add new content
+types. However, instead of using such interfaces or enhancing Bugzilla to add
+more, you would be better off using the :ref:`apis` to integrate with
+Bugzilla.
+
+To see if a CGI supports multiple output formats and types, grep the
+CGI for ``get_format``. If it's not present, adding
+multiple format/type support isn't too hard - see how it's done in
+other CGIs, e.g. :file:`config.cgi`.
+
+To make a new format template for a CGI which supports this,
+open a current template for
+that CGI and take note of the INTERFACE comment (if present.) This
+comment defines what variables are passed into this template. If
+there isn't one, I'm afraid you'll have to read the template and
+the code to find out what information you get.
+
+Write your template in whatever markup or text style is appropriate.
+
+You now need to decide what content type you want your template
+served as. The content types are defined in the
+:file:`Bugzilla/Constants.pm` file in the :file:`contenttypes`
+constant. If your content type is not there, add it. Remember
+the three- or four-letter tag assigned to your content type.
+This tag will be part of the template filename.
+
+Save your new template as
+:file:`<stubname>-<formatname>.<contenttypetag>.tmpl`.
+Try out the template by calling the CGI as
+``<cginame>.cgi?format=<formatname>``. Add ``&ctype=<type>`` if the type is
+not HTML.
+
+.. _template-specific:
+
+Particular Templates
+====================
+
+There are a few templates you may be particularly interested in
+customizing for your installation.
+
+:file:`index.html.tmpl`:
+  This is the Bugzilla front page.
+
+:file:`global/header.html.tmpl`:
+  This defines the header that goes on all Bugzilla pages.
+  The header includes the banner, which is what appears to users
+  and is probably what you want to edit instead.  However the
+  header also includes the HTML HEAD section, so you could for
+  example add a stylesheet or META tag by editing the header.
+
+:file:`global/banner.html.tmpl`:
+  This contains the ``banner``, the part of the header that appears
+  at the top of all Bugzilla pages.  The default banner is reasonably
+  barren, so you'll probably want to customize this to give your
+  installation a distinctive look and feel.  It is recommended you
+  preserve the Bugzilla version number in some form so the version
+  you are running can be determined, and users know what docs to read.
+
+:file:`global/footer.html.tmpl`:
+  This defines the footer that goes on all Bugzilla pages.  Editing
+  this is another way to quickly get a distinctive look and feel for
+  your Bugzilla installation.
+
+:file:`global/variables.none.tmpl`:
+  This allows you to change the word 'bug' to something else (e.g. "issue")
+  throughout the interface, and also to change the name Bugzilla to something
+  else (e.g. "FooCorp Bug Tracker").
+
+:file:`list/table.html.tmpl`:
+  This template controls the appearance of the bug lists created
+  by Bugzilla. Editing this template allows per-column control of
+  the width and title of a column, the maximum display length of
+  each entry, and the wrap behaviour of long entries.
+  For long bug lists, Bugzilla inserts a 'break' every 100 bugs by
+  default; this behaviour is also controlled by this template, and
+  that value can be modified here.
+
+:file:`bug/create/user-message.html.tmpl`:
+  This is a message that appears near the top of the bug reporting page.
+  By modifying this, you can tell your users how they should report
+  bugs.
+
+:file:`bug/process/midair.html.tmpl`:
+  This is the page used if two people submit simultaneous changes to the
+  same bug.  The second person to submit their changes will get this page
+  to tell them what the first person did, and ask if they wish to
+  overwrite those changes or go back and revisit the bug.  The default
+  title and header on this page read "Mid-air collision detected!"  If
+  you work in the aviation industry, or other environment where this
+  might be found offensive (yes, we have true stories of this happening)
+  you'll want to change this to something more appropriate for your
+  environment.
+
+.. _custom-bug-entry:
+
+:file:`bug/create/create.html.tmpl` and :file:`bug/create/comment.txt.tmpl`:
+    You may not wish to go to the effort of creating custom fields in
+    Bugzilla, yet you want to make sure that each bug report contains
+    a number of pieces of important information for which there is not
+    a special field. The bug entry system has been designed in an
+    extensible fashion to enable you to add arbitrary HTML widgets,
+    such as drop-down lists or textboxes, to the bug entry page
+    and have their values appear formatted in the initial comment.
+
+    An example of this is the `guided bug submission form
+    <http://landfill.bugzilla.org/bugzilla-tip/enter_bug.cgi?product=WorldControl;format=guided>`_.
+    The code for this comes with the Bugzilla distribution as an example for
+    you to copy. It can be found in the files
+    :file:`create-guided.html.tmpl` and :file:`comment-guided.html.tmpl`.
+        
+    A hidden field that indicates the format should be added inside
+    the form in order to make the template functional. Its value should
+    be the suffix of the template filename. For example, if the file
+    is called :file:`create-guided.html.tmpl`, then
+
+    ::
+
+        <input type="hidden" name="format" value="guided">
+
+    is used inside the form.
+
+    So to use this feature, create a custom template for
+    :file:`enter_bug.cgi`. The default template, on which you
+    could base it, is
+    :file:`default/bug/create/create.html.tmpl`.
+    Call it :file:`custom/bug/create/create-<formatname>.html.tmpl`, and
+    in it, add form inputs for each piece of information you'd like
+    collected - such as a build number, or set of steps to reproduce.
+
+    Then, create a template based on
+    :file:`default/bug/create/comment.txt.tmpl`, and call it
+    :file:`custom/bug/create/comment-<formatname>.txt.tmpl`.
+    It needs a couple of lines of boilerplate at the top like this::
+
+        [% USE Bugzilla %]
+        [% cgi = Bugzilla.cgi %
+
+    Then, this template can reference the form fields you have created using
+    the syntax ``[% cgi.param("field_name") %]``. When a bug report is
+    submitted, the initial comment attached to the bug report will be
+    formatted according to the layout of this template.
+
+    For example, if your custom enter_bug template had a field::
+
+        <input type="text" name="buildid" size="30">
+
+    and then your comment.txt.tmpl had::
+
+        [% USE Bugzilla %]
+        [% cgi = Bugzilla.cgi %]
+        Build Identifier: [%+ cgi.param("buildid") %]
+
+    then something like::
+
+        Build Identifier: 20140303
+
+    would appear in the initial comment.
+
+    This system allows you to gather structured data in bug reports without
+    the overhead and UI complexity of a large number of custom fields.
diff --git a/docs/en/rst/localizing/caveats.rst b/docs/en/rst/localizing/caveats.rst
new file mode 100644
index 0000000000..b08dc4f472
--- /dev/null
+++ b/docs/en/rst/localizing/caveats.rst
@@ -0,0 +1,308 @@
+.. _caveats:
+
+Template Caveats
+################
+
+================
+[% %] and [%+ %]
+================
+
+``[% %]`` is used by Template Toolkit to enclose some TT code, which will be
+often be replaced by a variable or something else when the template is
+rendered.
+
+Generally, you should follow the exact text layout of the English version, but
+if you need to change the position of a ``[% %]`` block in a line, you should
+be aware of this rule: when two ``[% %]`` blocks are following each other,
+the second member will not be separated with a space from the first one, even
+if you separate them with a space. For instance, these lines of template code:
+
+.. raw:: html
+
+  <pre>
+    [% ELSIF message_tag == "bug_duplicate_of" %]
+      This [% terms.bug %] has been marked as a duplicate of <mark>[% terms.bug %] [% dupe_of FILTER html %]</mark>
+  </pre>
+
+will display in the browser as:
+
+.. code-block:: text
+
+  This bug has been marked as duplicate of bug12345
+
+To preserve whitespace, you should add a "+" sign inside the second member:
+
+.. raw:: html
+
+  <pre>
+    [% ELSIF message_tag == "bug_duplicate_of" %]
+       This [% terms.bug %] has been marked as a duplicate of [% terms.bug %] [%<mark>+</mark> dupe_of FILTER html %]
+  </pre>
+
+Will then be displayed as:
+
+.. code-block:: text
+
+  This bug has been marked as duplicate of bug 12345
+
+This is the same when a [% %] member is at the beginning of a new line. These
+lines of template code:
+
+.. code-block:: text
+
+          [% IF groups_added_to.size %]
+            <li>
+              The account has been added to the
+              [% groups_added_to.join(', ') FILTER html %]
+              group[% 's' IF groups_added_to.size > 1 %].
+            </li>
+          [% END %]
+
+will be shown as:
+
+.. code-block:: text
+
+  The account has been added to thebz_sudo_protect group.
+
+Again, insert a "+" sign:
+
+.. raw:: html
+
+  <pre>
+          [% IF groups_added_to.size %]
+            &lt;li&gt;
+              The account has been added to the
+              [%<mark>+</mark> groups_added_to.join(', ') FILTER html %]
+              group[% 's' IF groups_added_to.size > 1 %].
+            &lt;/li&gt;
+          [% END %]
+  </pre>
+
+So that the sentence is displayed as:
+
+.. code-block:: text
+
+  The account has been added to the bz_sudo_protect group.
+
+Sometimes, pluralization is dealt with using explicit Template Toolkit code,
+which needs to be altered for your language.
+
+For example, if one wanted to localize the previous example into French,
+the words order would not be not correct and the markup has to be rearranged.
+The member ``[% groups_added_to.join(', ') FILTER html %]`` will actually display
+the name of one group or several group names separated with a comma and a space (', ').
+The member ``[% 's' IF groups_added_to.size > 1 %]`` will add an "s"
+to the word "group" if there is more than one. In French, the group name should be put
+after the term "group" and words need to be declensed when plural is used. That
+would give for instance the following:
+
+.. code-block:: text
+
+          [% IF groups_added_to.size %]
+            <li>
+              Le compte a été ajouté
+              [% IF groups_added_to.size > 1 %]
+              aux groupes[% ELSE %]au groupe[% END %][%+ groups_added_to.join(', ') FILTER html %].
+            </li>
+          [% END %]
+
+The browser would then display for one group:
+
+.. raw:: html
+
+  Le compte a été ajouté <mark>au groupe</mark> bz_sudo_protect
+
+And for several groups:
+
+.. raw:: html
+
+  Le compte a été ajouté <mark>aux groupes</mark> bz_sudo_protect, canconfirm, editbugs
+
+===============================
+Double quotes and single quotes
+===============================
+
+Template Toolkit strings in directives are quote-delimited, and can use either
+single or double quotes. But, obviously, you can't put double quotes inside
+a double-quoted string. The following example will break the user interface:
+
+.. code-block:: text
+
+    [% ELSIF message_tag == "buglist_adding_field" %]
+      [% title = "Adding field to search page..." %]
+      [% link  = "Click here if the page "does not" redisplay automatically." %]
+
+
+Instead, you can escape them with a backslash ("\"):
+
+.. code-block:: text
+
+    [% ELSIF message_tag == "buglist_adding_field" %]
+      [% title = "Adding field to search page..." %]
+      [% link  = "Click here if the page \"does not\" redisplay automatically." %]
+
+
+Or you can substitute the surrounding double quotes with single quotes:
+
+.. code-block:: text
+
+    [% ELSIF message_tag == "buglist_adding_field" %]
+      [% title = "Adding field to search page..." %]
+      [% link  = 'Click here if the page "does not" redisplay automatically.' %]
+
+===========
+Declensions
+===========
+
+English only deals with one plural form and has no declension. Your locale
+might need to implement declensions, and reorder words inside a sentence.
+
+Let's say we have the following:
+
+.. code-block:: text
+
+    [% IF !Param("allowbugdeletion") %]
+    <p>
+      Sorry, there
+
+      [% IF comp.bug_count > 1 %]
+        are [% comp.bug_count %] [%+ terms.bugs %]
+      [% ELSE %]
+         is [% comp.bug_count %] [%+ terms.bug %]
+      [% END %]
+
+      pending for this component. You should reassign
+
+      [% IF comp.bug_count > 1 %]
+         these [% terms.bugs %]
+      [% ELSE %]
+         this [% terms.bug %]
+      [% END %]
+
+      to another component before deleting this component.
+    </p>
+    [% ELSE %]
+
+Here, the following expression comp.bug_count obviously gives the count number of bugs
+for a component. ``IF comp.bug_count > 1`` means "if there are more than one bug".
+
+Let's say your language has to deal with three plural forms and that the terms "bug" and
+"pending" should be declensed as well.
+
+First, you'll have to populate the :file:`/template/en/default/global/variables.none.tmpl`
+file with the declensions for "bug", which would give something like:
+
+.. code-block:: text
+
+  [% terms = {
+    "bug0" => "declension for zero bug",
+    "bug" => "declension for one bug",
+    "bug2" => "declension for two bugs",
+    "bug3" => "declension for three bugs",
+    "bugs" => "declension for more than three bugs",
+
+
+Then, the previous code should look like:
+
+.. code-block:: text
+
+    [% IF !Param("allowbugdeletion") %]
+    <p>
+      Sorry, there
+
+      [% IF comp.bug_count > 3 %]
+        are [% comp.bug_count %] pending [% terms.bugs %]
+      [% ELSE %]
+        [% IF comp.bug_count == 0 %]
+         is [% comp.bug_count %] pending [% terms.bug0 %]
+      [% ELSE %]
+        [% IF comp.bug_count == 1 %]
+         is [% comp.bug_count %] pending [% terms.bug %]
+      [% ELSE %]
+        [% IF comp.bug_count == 2 %]
+         are [% comp.bug_count %] pending [% terms.bug2 %]
+      [% ELSE %]
+        [% IF comp.bug_count == 3 %]
+         are [% comp.bug_count %] pending [% terms.bug3 %]
+      [% END %]
+
+      for this component. You should reassign
+
+      [% IF comp.bug_count > 1 %]
+         these [% terms.bugs %]
+      [% ELSE %]
+         this [% terms.bug %]
+      [% END %]
+
+      to another component before deleting this component.
+    </p>
+    [% ELSE %]
+
+==========
+$terms.foo
+==========
+
+As seen previously, term substitutions can be made across all template files.
+Such substitutions are defined in ``*.none.tmpl`` files, which are:
+
+* template/en/default/global/field-descs.none.tmpl
+* template/en/default/global/variables.none.tmpl
+* template/en/default/global/value-descs.none.tmpl
+* template/en/default/global/reason-descs.none.tmpl
+* template/en/default/global/setting-descs.none.tmpl
+* template/en/default/bug/field-help.none.tmpl
+
+These variables appear in the template files under three different forms.
+``[% terms.foo %]`` is the standard, simple substitution of a term into a run
+of text. ``$terms.foo`` is used when substituting into a Template Toolkit
+string, and ``${terms.foo}`` is used when you need to separate the variable
+name from the surrounding content to resolve ambiguity.
+
+To illustrate this last point: during your localizing contribution, you may
+have to reorganize sentences, and sometimes a variable of the form
+``$terms.foo`` will come at the end of a sentence which ends with a full stop,
+like this:
+
+.. raw:: html
+
+  <pre>
+    defaultplatform => "Plateforme qui est pré-sélectionnée dans le formulaire de soumission " _
+                       "de <mark>$terms.bug.</mark>&lt;br&gt; " _
+                       "Vous pouvez laisser ce champ vide : " _
+                       "Bugzilla utilisera alors la plateforme indiquée par le navigateur.",
+  </pre>
+
+If you leave it like that, the substitution would not take place and the
+result in the user interface would be wrong. Instead, change the form
+``$terms.foo`` into the form ``${terms.foo}``, like this:
+
+.. raw:: html
+
+  <pre>
+    defaultplatform => "Plateforme qui est pré-sélectionnée dans le formulaire de soumission " _
+                       "de <mark>${terms.bug}.</mark>&lt;br&gt; " _
+                       "Vous pouvez laisser ce champ vide : " _
+                       "Bugzilla utilisera alors la plateforme indiquée par le navigateur.",
+  </pre>
+
+========
+b[% %]ug
+========
+
+Once and a while you would find something like:
+
+.. code-block:: text
+
+  A b[% %]ug on b[% %]ugs.debian.org.
+
+You remember that the file :file:`variables.none.tmpl` holds the substitutions
+for different terms. The release process of Bugzilla has a script that
+parses all the templates to check if you wrote the bare word "bug" instead of
+"$terms.bug" or similar, to make sure that this feature keeps working.
+
+In the example above, we really want to write the term "bug" and we neither
+want it to be substituted afterwards nor be warned by the test script.
+
+This check only looks at the English terms bug, bugs, and Bugzilla, so you can
+safely ignore the ``[% %]`` and localize ``b[% %]ug``, but you would keep
+``b[% %]ugs.debian.org`` unchanged as it's a URL.
diff --git a/docs/en/rst/localizing/checking-templates.rst b/docs/en/rst/localizing/checking-templates.rst
new file mode 100644
index 0000000000..0bd390c93f
--- /dev/null
+++ b/docs/en/rst/localizing/checking-templates.rst
@@ -0,0 +1,73 @@
+.. _checking-templates:
+
+Checking Templates
+##################
+
+Checking Syntax
+---------------
+
+This step is important because if you have some wrong syntax in your template, this will break the user interface.
+
+You can see the checking scripts in the ``t/`` subdirectory in your Bugzilla root directory.
+
+To check the localized templates, you would only need to run these three ones:
+
+* t/004template.t
+* t/008filter.t
+* t/009bugwords.t
+
+So run e.g.:
+
+:command:`prove -Q t/004template.t`
+
+If your templates are valid, you should see a result like this:
+
+.. raw:: html
+
+  <pre>
+  t/004template.t .. ok         
+  <span class="green">All tests successful.</span>
+  Files=1, Tests=1236,  5 wallclock secs ( 0.11 usr  0.00 sys +  4.70 cusr  0.05 csys =  4.86 CPU)
+  Result: PASS
+  </pre>
+
+If something went wrong, you will see something like this:
+
+.. raw:: html
+
+  <pre>
+  #   Failed test 'template/fr/default/index.html.tmpl has bad syntax --ERROR'
+  #   at t/004template.t line 106.
+  # Looks like you failed 1 test of 1236.
+  
+  Test Summary Report
+  -------------------
+  <mark>t/004template.t (Wstat: 256 Tests: 1236 Failed: 1)
+    Failed test:  671
+    Non-zero exit status: 1</mark>
+  Files=1, Tests=1236,  4 wallclock secs ( 0.09 usr  0.01 sys +  4.74 cusr  0.04 csys =  4.88 CPU)
+  Result: FAIL
+  </pre>
+
+where you would hopefully see the faulty template and the line number where the error occurred.
+
+Then, fix the error and run the scripts again.
+
+Viewing In Bugzilla
+-------------------
+
+Once your templates have good syntax, you will want to use them in Bugzilla.
+
+Run:
+
+:command:`./checksetup.pl`
+
+to compile the templates and clear the language cache. Bugzilla will then
+have a language chooser in the top right corner. By default, it uses the
+``Accept-Language`` HTTP header to decide which version to serve you, but you can
+override that by choosing a version explicitly. This is then remembered
+in a cookie.
+
+Choose the language you have localized in, if it's not already chosen for
+you, and then view every page in Bugzilla to test your templates :-) This
+may take some time...
diff --git a/docs/en/rst/localizing/compiling-documentation.rst b/docs/en/rst/localizing/compiling-documentation.rst
new file mode 100644
index 0000000000..06f61709ff
--- /dev/null
+++ b/docs/en/rst/localizing/compiling-documentation.rst
@@ -0,0 +1,112 @@
+.. _compiling-documentation:
+
+Compiling The Documentation
+###########################
+
+To compile the documentation, you need the Sphinx software and the :command:`rst2pdf` tool.
+You should have both already if you followed the installation process.
+
+.. note:: PDF generation does not work currently with ``python3-sphinx`` package.
+
+You can test that you are able to compile the docs by running the following command in the :file:`docs/` directory:
+
+:command:`./makedocs.pl`
+
+This will generate the English documentation files in HTML, PDF and plain text formats in the :file:`docs/en` directory
+and its subdirectories.
+
+If all is running fine, you can then copy your localized directory in the :file:`docs/` directory. You should have then
+three directories:
+
+.. code-block: text
+
+  |-- docs
+  |    |-- ab-CD
+  |    |-- en
+  |    |-- lib
+
+You should now customize the file :file:`docs/ab-CD/rst/conf.py`. Here are the sections you should edit:
+
+.. raw:: html
+
+  <pre>
+  # General information about the project.
+  project = u'<mark>Bugzilla</mark>'
+  copyright = u'<mark>2014, The Bugzilla Team</mark>'
+  </pre>
+
+.. raw:: html
+
+  <pre>latex_documents = [
+    ('index', 'Bugzilla.tex', u'<mark>Bugzilla Documentation</mark>',
+     u'<mark>The Bugzilla Team</mark>', 'manual'),
+  ]
+  </pre>
+
+.. raw:: html
+
+  <pre>
+  man_pages = [
+      ('index', 'bugzilla', u'<mark>Bugzilla Documentation</mark>',
+       [u'<mark>The Bugzilla Team</mark>'], 1)
+  ]
+  </pre>
+
+.. raw:: html
+
+  <pre>
+  texinfo_documents = [
+    ('index', 'Bugzilla', u'<mark>Bugzilla Documentation</mark>',
+     u'<mark>The Bugzilla Team</mark>', 'Bugzilla', 'One line description of project.',
+     'Miscellaneous'),
+  ]
+  </pre>
+
+.. raw:: html
+
+  <pre>
+  pdf_documents = [
+  ('index', u'<mark>Bugzilla</mark>', u'<mark>Bugzilla Documentation</mark>', u'<mark>The Bugzilla Team</mark>'),
+  ]
+  </pre>
+
+.. raw:: html
+
+  <pre>
+  rst_epilog = <mark>u</mark>"""
+  
+  ----------
+  
+  <mark>This documentation undoubtedly has bugs; if you find some, please file
+  them `here &lt;https://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation&gt;`_.</mark>
+  """
+  </pre>
+
+For this last section, pay attention to the letter ``u`` added before the three double quotes: it is not present in the English
+version of this file. This letter indicates that the text following will contain non-ASCII characters and your language will probably
+needs non-ASCII characters. If you omit to add this letter and that your localization contains non-ASCII characters, the compilation
+of the documentation will not work. The multiple dashes are here for formatting purposes and will render as a line in the HTML version.
+
+Another section you will want to edit is the following one:
+
+.. code-block:: text
+
+  # The language for content autogenerated by Sphinx. Refer to documentation
+  # for a list of supported languages.
+  #language = None
+
+If your locale is available for Sphinx (to find out, consult the `Sphinx documentation <http://sphinx-doc.org/config.html#confval-language>`_)
+then you should uncomment the line and specify your locale code here:
+
+.. raw:: html
+
+  <pre>
+  # The language for content autogenerated by Sphinx. Refer to documentation
+  # for a list of supported languages.
+  <mark>language = 'fr'</mark>
+  </pre>
+
+If your locale is not available for Sphinx, then the labels for navigation elements -- next, previous, search box, etc. -- will not be localized.
+
+
+
diff --git a/docs/en/rst/localizing/files-to-be-localized.rst b/docs/en/rst/localizing/files-to-be-localized.rst
new file mode 100644
index 0000000000..f25ce91e72
--- /dev/null
+++ b/docs/en/rst/localizing/files-to-be-localized.rst
@@ -0,0 +1,35 @@
+.. _files-to-be-localized:
+
+Files To Be Localized
+#####################
+
+There are several different types of files to be localized:
+
+Templates
+---------
+
+\*.tmpl files
+   These files are `Template Toolkit <http://template-toolkit.org/>`_
+   templates, which are used to generate the HTML pages which make up
+   Bugzilla's user interface. There are templates in both
+   the :file:`extensions` and :file:`template` subdirectories.
+
+strings.txt.pl:
+   This is a Perl file. It contains strings which are used when displaying
+   information or error messages during Bugzilla's setup, when the templating
+   infrastructure is not available. It is located in the
+   :file:`template/en/default/setup` directory.
+
+Documentation
+-------------
+
+\*.rst files:
+   These files are `ReStructuredText <http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html>`_,
+   and contain Bugzilla's documentation. There are reST files in the
+   :file:`docs` and :file:`extensions/Example/docs/en/rst` subdirectories.
+
+bzLifecycle.xml:
+   This is an XML source file for the diagramming tool
+   `Dia <https://wiki.gnome.org/Apps/Dia>`_. It is used to generate the flow
+   diagram showing the different states in a bug lifecycle, which is part of
+   the documentation.
diff --git a/docs/en/rst/localizing/get-the-source.rst b/docs/en/rst/localizing/get-the-source.rst
new file mode 100644
index 0000000000..d4c62a95c3
--- /dev/null
+++ b/docs/en/rst/localizing/get-the-source.rst
@@ -0,0 +1,58 @@
+.. _get-the-source:
+
+Get The Source Files
+####################
+
+First, you need to install Bugzilla and get it running. See the
+:ref:`installing`.
+
+The installed software should have the following tree structure:
+
+.. raw:: html
+
+  <pre>
+  |-- Bugzilla
+  |-- contrib
+  |-- docs
+  |   `-- <mark>en</mark>
+  |-- extensions
+  |   |-- BmpConvert
+  |   |-- Example
+  |   |   |-- docs
+  |   |   |   `-- <mark>en</mark>
+  |   |   |-- lib
+  |   |   `-- template
+  |   |       `-- <mark>en</mark>
+  |   |-- MoreBugUrl
+  |   |   |-- lib
+  |   |   `-- template
+  |   |       `-- <mark>en</mark>
+  |   `-- Voting
+  |       |-- template
+  |       |   `-- <mark>en</mark>
+  |-- images
+  |-- js
+  |-- template
+  |   `-- <mark>en</mark>
+  | ...
+  </pre>
+
+All localizable content is in directories called ``en``, for English. You
+are going to create a parallel set of directories named after your locale
+code, and build your localized version in there.
+
+So next, you need to work out your locale code. You
+can find the locale code matching your language on
+`this wiki page <https://wiki.mozilla.org/L10n:Simple_locale_names>`_.
+For instance, ``fr`` is used for French and ``ca`` for Catalan. You can
+also use a four-letter locale code, e.g. ``pt-BR`` for Brazilian Portuguese or
+``zh-CN`` for Chinese (Simplified). In the rest of this guide, your locale
+code will be represented by ``ab-CD``.
+
+Open a terminal and go to your Bugzilla installation's top-level directory
+and then run:
+
+:command:`contrib/new-locale.pl ab-CD`
+
+This will make a copy of all the English documentation for you, in parallel
+directories to the "en" directories, named after your locale code.
diff --git a/docs/en/rst/localizing/hosting-documentation.rst b/docs/en/rst/localizing/hosting-documentation.rst
new file mode 100644
index 0000000000..0bf4e8df89
--- /dev/null
+++ b/docs/en/rst/localizing/hosting-documentation.rst
@@ -0,0 +1,96 @@
+.. _hosting-documentation:
+
+Hosting The Documentation On readthedocs.org
+############################################
+
+You will want to make your templates and documentation available in a
+localization tarball for sites to install. However, Bugzilla's main
+documentation site is readthedocs.org. If you put your localized documentation
+up on that site, then it can be linked in with the main Bugzilla docs and
+appear as an alternative version.
+
+To do this, you need to have a
+`DVCS <https://en.wikipedia.org/wiki/Distributed_revision_control>`_ repository
+of your files accessible from the Internet. ReadTheDocs.org currently supports
+Mercurial, Git, Subversion and Bazaar repositories, but if you are working in
+a clone of the main Bugzilla repo, you will be using Git.
+You can create your repository on sites such as
+`Github <https://github.com/>`_ or `sourceforge.net <https://sourceforge.net/>`_.
+It is both easiest and best if you publish your entire code tree, including the
+Bugzilla source code, as some of it is needed to compile the docs.
+
+You should localize on the branch or head named after the major number of the
+release, for instance '``5.0``'. If you are making your own repo rather than
+cloning the Bugzilla one, you should name your branches in this way also.
+
+Then, get on the `readthedocs.org <https://readthedocs.org>`_ site and create
+an account by clicking on the button :guilabel:`Sign up`. Fill up the form and
+click on the :guilabel:`Sign Up »` button:
+
+.. image:: ../../images/RTD1.png
+
+*Sign Up Form*
+
+On the page that appears, click on the :guilabel:`Import a Project` button:
+
+.. image:: ../../images/RTD2.png
+
+*Ready to share your documentation*
+
+Then, either connect to your GitHub account or click on the :guilabel:`Manually Import Project`
+button. The manual way will be explained below.
+
+.. image:: ../../images/RTD3.png
+
+*Import a Project*
+
+You should now name your project, following the naming rule ``bugzilla-ab-CD`` --where ab-CD is your locale code--,
+specify the URL for your repository and its type, and tick the :guilabel:`Edit advanced project options:` square. Click then
+on the :guilabel:`Next` button:
+
+.. image:: ../../images/RTD4.png
+
+*Project Details*
+
+Fill now the new form, especially the :guilabel:`Description`, :guilabel:`Documentation` and :guilabel:`Language` fields. The other
+fields can be ignored and modified later if necessary. Then, click on the :guilabel:`Finish` button:
+
+.. image:: ../../images/RTD5.png
+
+*Project Extra Details*
+
+Now, click on the :guilabel:`Versions` button in the navigation header and in the :guilabel:`Inactive Versions` section, choose
+the version you want to activate by clicking on the :guilabel:`Edit` button:
+
+.. image:: ../../images/RTD6.png
+
+*Versions*
+
+.. image:: ../../images/RTD7.png
+
+*Inactive versions*
+
+Tick the :guilabel:`Active:` square and click on the :guilabel:`Save` button:
+
+.. image:: ../../images/RTD8.png
+
+*Editing Version*
+
+Now, click on the :guilabel:`Overview` button in the navigation header. The version you have just made active should appear there.
+In the :guilabel:`Build a version` dropdown list, select the version you want to compile and click on the :guilabel:`Build` button to compile
+your localized documentation:
+
+.. image:: ../../images/RTD9.png
+
+*Overview*
+
+.. image:: ../../images/RTD10.png
+
+*Compilation Results*
+
+If the result is ``Passed``, your documentation has been successfully compiled. If the result is ``Failed``, click
+on the link to see what went wrong and fix it.
+
+Finally, you should inform the Bugzilla Project that the documentation is ready in your language by sending a mail to
+the mailing-list ``developers AT bugzilla.org`` giving your project name, that is ``bugzilla-ab-CD``. They can
+then link your docs into the main Bugzilla docs so that they show up as an alternative language.
diff --git a/docs/en/rst/localizing/index.rst b/docs/en/rst/localizing/index.rst
new file mode 100644
index 0000000000..18c5e73816
--- /dev/null
+++ b/docs/en/rst/localizing/index.rst
@@ -0,0 +1,25 @@
+.. _l10n:
+
+==================
+Localization Guide
+==================
+
+Bugzilla's user interface can be localized into another language. This guide
+explains how to do that. It assumes you are using Linux or some other operating
+system with a Unix-like command line available.
+
+.. toctree::
+   :maxdepth: 2
+
+   get-the-source
+   files-to-be-localized
+   localizing-templates
+   caveats
+   checking-templates
+   localizing-bzlifecycle
+   localizing-documentation
+   compiling-documentation
+   shipping
+   hosting-documentation
+   up-to-date
+
diff --git a/docs/en/rst/localizing/localizing-bzlifecycle.rst b/docs/en/rst/localizing/localizing-bzlifecycle.rst
new file mode 100644
index 0000000000..71d569f8b3
--- /dev/null
+++ b/docs/en/rst/localizing/localizing-bzlifecycle.rst
@@ -0,0 +1,15 @@
+.. _localizing-bzlifecycle:
+
+Localizing bzLifecycle.xml
+##########################
+
+.. image:: ../../images/bzLifecycle.png
+
+This picture shows the lifecycle of a bug through its different statuses and
+resolutions. This picture is included in the documentation. It was generated
+using `Dia <https://wiki.gnome.org/Apps/Dia>`_.
+
+To localize it, open the file :file:`docs/ab-CD/images/bzLifecycle.xml` with
+``Dia``, localize it and export it as a .png file by selecting the
+:guilabel:`Pixbuf[png] (*.png)` filter in the dropdown. You need to save it as
+:file:`docs/ab-CD/images/bzLifecycle.png`.
diff --git a/docs/en/rst/localizing/localizing-documentation.rst b/docs/en/rst/localizing/localizing-documentation.rst
new file mode 100644
index 0000000000..7d30fa1c80
--- /dev/null
+++ b/docs/en/rst/localizing/localizing-documentation.rst
@@ -0,0 +1,32 @@
+.. _localizing-documentation:
+
+Localizing The Documentation
+############################
+
+The Bugzilla documentation uses `reStructured Text (reST) <http://docutils.sourceforge.net/rst.html>`_,
+as extended by our documentation compilation tool, `Sphinx <http://sphinx-doc.org/>`_.
+
+`The Sphinx documentation <http://sphinx-doc.org/latest/rest.html>`_
+gives a good introduction to reST and the Sphinx-specific extensions. Reading
+that one immediately-linked page should be enough to get started. Later, the
+`inline markup section <http://sphinx-doc.org/latest/markup/inline.html>`_
+is worth a read.
+
+As with the template files, the ``.rst`` files should be localized using an UTF8 compliant editor.
+
+Spacing, blank lines and indentation are very important in reStructured Text, so be sure to follow exactly
+the pattern of the English, otherwise your localized version will not look the same as the English one.
+
+Though I recommend that you read the documents stated above, here are a few rules:
+
+.. raw:: html
+
+  <ul>
+    <li>In <code>index.rst</code> files, never localize what is under the <code>.. toctree::</code> directive: these are file names.</li>
+    <li>Never localize a term surrounded with a double dot and two colons. For instance: <code><mark>.. warning::</mark> This is a warning</code>. This
+    will be automatically localized if necessary at compilation time. You can localize any text that comes after ("This is a warning" in this example).</li>
+    <li>Exception: do not localize what is located after the directive <code>.. highlight:: console</code>. The word console here is for formatting purpose.</li>
+    <li>Do not localize a term surrounded with two colons or with the signs lesser than and greater than:
+    <code>:<mark>ref</mark>:`<span class="green">DĂ©marrage rapide</span>&lt;<mark>quick-start</mark>&gt;`</code>. "ref" is a reserved word and "quick-start" is a file name. In the following syntax example, do not localize "using"
+    as it is also a file name: <code>:<mark>ref</mark>:`<mark>using</mark>`</code></li>
+  </ul>
diff --git a/docs/en/rst/localizing/localizing-templates.rst b/docs/en/rst/localizing/localizing-templates.rst
new file mode 100644
index 0000000000..f66b8e07bf
--- /dev/null
+++ b/docs/en/rst/localizing/localizing-templates.rst
@@ -0,0 +1,144 @@
+.. _localizing-templates:
+
+Localizing The Templates
+########################
+
+.. note:: Use an UTF-8-compliant editor, like Gedit, Kate or Emacs under
+          GNU/Linux systems or Notepad++ under Windows systems, and make sure
+          you save the templates using the UTF-8 encoding.
+
+Templates contain both code and localizable strings mixed together. So the
+question arises: what is to be localized and what is not? Here are some
+examples to help you localize the correct parts of each file.
+
+You can see at the top of each template file lines like these:
+
+.. code-block:: text
+
+  [%# This Source Code Form is subject to the terms of the Mozilla Public
+    # License, v. 2.0. If a copy of the MPL was not distributed with this
+    # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+    #
+    # This Source Code Form is "Incompatible With Secondary Licenses", as
+    # defined by the Mozilla Public License, v. 2.0.
+    #%]
+
+DO NOT translate any text located between ``[%#`` and ``#%]``. Such text is a
+comment.
+
+Here are some examples of what does need to be translated:
+
+.. raw:: html
+
+  <pre>
+  [% title = BLOCK %]<mark>Delete Component '</mark>[% comp.name FILTER html %]<mark>'
+  of Product '</mark>[% product.name FILTER html %]<mark>'</mark>
+    [% END %]
+
+  [% PROCESS global/header.html.tmpl
+    title = title
+  %]
+  
+  &lt;table border="1" cellpadding="4" cellspacing="0"&gt;
+  &lt;tr bgcolor="#6666FF"&gt;
+    &lt;th valign="top" align="left"&gt;<mark>Field</mark>&lt;/th&gt;
+    &lt;th valign="top" align="left"&gt;<mark>Value</mark>&lt;/th&gt;
+  &lt;/tr&gt;
+  </pre>
+
+As a general rule, never
+translate capitalized words enclosed between ``[%`` and ``%]`` - these are
+Template Toolkit directives. Here is the localized version of the above:
+
+.. raw:: html
+
+  <pre>
+  [% title = BLOCK %]<mark>Supprimer le composant « </mark>[% comp.name FILTER html %]<mark> »
+  du produit « </mark>[% product.name FILTER html %]<mark> »</mark>
+    [% END %]
+  
+  [% PROCESS global/header.html.tmpl
+    title = title
+  %]
+  
+  &lt;table border="1" cellpadding="4" cellspacing="0"&gt;
+  &lt;tr bgcolor="#6666FF"&gt;
+    &lt;th valign="top" align="left"&gt;<mark>Champ</mark>&lt;/th&gt;
+    &lt;th valign="top" align="left"&gt;<mark>Valeur</mark>&lt;/th&gt;
+  &lt;/tr&gt;
+  </pre>
+
+Another common occurrence in the templates is text enclosed between an opening
+and a closing tag, or in an HTML attribute value:
+
+.. raw:: html
+
+  <pre>
+  &lt;td valign="top"&gt;<mark>Description du produit :</mark>&lt;/td&gt;
+  
+  &lt;td valign="top"&gt;[% IF product.disallow_new %]<mark>Oui</mark>[% ELSE %]<mark>Non</mark>[% END %]&lt;/td&gt;
+  
+    &lt;a title="<mark>Liste des</mark> [% terms.bugs %] <mark>pour le composant « </mark>[% comp.name FILTER html %]<mark> »</mark>"
+       href="buglist.cgi?component=[% comp.name FILTER url_quote %]&amp;product=
+            [%- product.name FILTER url_quote %]"&gt;[% comp.bug_count %]&lt;/a&gt;
+  </pre>
+
+You will encounter many buttons you will want to localize. These look like this:
+
+.. raw:: html
+
+  <pre>
+    &lt;input type="submit" id="create" value="<mark>Add</mark>"&gt;
+    &lt;input type="hidden" name="action" value="new"&gt;
+    &lt;input type="hidden" name='product' value="[% product.name FILTER html %]"&gt;
+    &lt;input type="hidden" name="token" value="[% token FILTER html %]"&gt;
+  </pre>
+
+Whenever you see this, the only line that needs to be localized is the one
+with ``type="submit"``. DO NOT translate lines with ``type="hidden"``:
+
+.. raw:: html
+
+  <pre>
+    &lt;input type="submit" id="create" value="<mark>Ajouter</mark>"&gt;
+    &lt;input type="hidden" name="action" value="new"&gt;
+    &lt;input type="hidden" name='product' value="[% product.name FILTER html %]"&gt;
+    &lt;input type="hidden" name="token" value="[% token FILTER html %]"&gt;
+  </pre>
+
+
+Some of the templates are a bit special. One such is
+:file:`/template/en/default/global/variables.none.tmpl`.
+This file contains several terms that are be substituted all around the
+template files. In particular, it contains code so the administrator can easily and
+consistently use whatever alternative term their organization uses for "bug"
+and also for "Bugzilla" (i.e. the name of the system). Whenever you see expressions like
+``&terms.ABug`` or ``&terms.bugs`` in templates, they will be replaced in the
+user interface with the corresponding value from this file.
+
+As these are commonly-requested changes, you probably want to retain this
+flexibility in your localization, although you may have to alter exactly how
+it works if your language does not have exact equivalents for "a" and "the".
+
+.. raw:: html
+ 
+  <pre>
+  [% terms = {
+    "bug" => "<mark>bug</mark>",
+    "Bug" => "<mark>Bug</mark>",
+    "abug" => "<mark>a bug</mark>",
+    "Abug" => "<mark>A bug</mark>",
+    "ABug" => "<mark>A Bug</mark>",
+    "bugs" => "<mark>bugs</mark>",
+    "Bugs" => "<mark>Bugs</mark>",
+    "zeroSearchResults" => "<mark>Zarro Boogs found</mark>",
+    "bit" => "<mark>bit</mark>",
+    "bits" => "<mark>bits</mark>",
+    "Bugzilla" => "<mark>Bugzilla</mark>"
+    }
+  %]
+  </pre>
+
+You need to come up with an equivalent set of mappings for your language, and
+then whenever you are talking about bugs in the user interface, use your
+equivalent of ``&terms.ABug`` or ``&terms.bugs`` and friends instead.
diff --git a/docs/en/rst/localizing/shipping.rst b/docs/en/rst/localizing/shipping.rst
new file mode 100644
index 0000000000..8afabc3b7c
--- /dev/null
+++ b/docs/en/rst/localizing/shipping.rst
@@ -0,0 +1,16 @@
+.. _localizing-templates:
+
+Shipping
+########
+
+Once you have localized everything, you will want to ship it. The best way
+of doing this is still to create a tarball of all your files, which the
+Bugzilla administrator will untar in their ``$BUGZILLA_HOME`` directory.
+
+This command will find all of the files you've localized and put them into
+an appropriate tarball. Don't forget to replace both instances of ``ab-CD``:
+
+Open a terminal and go to your Bugzilla installation's top-level directory
+and then run:
+
+:command:`find -name "ab-CD" -print0 -o -path "./data" -prune | tar -cjvf ../bugzilla-ab-CD.tar.bz2 --null -T -`
diff --git a/docs/en/rst/localizing/up-to-date.rst b/docs/en/rst/localizing/up-to-date.rst
new file mode 100644
index 0000000000..27f9992b8a
--- /dev/null
+++ b/docs/en/rst/localizing/up-to-date.rst
@@ -0,0 +1,20 @@
+.. _up-to-date:
+
+Keeping Templates and Documentation Up-To-Date
+##############################################
+
+Some localizers like to keep their locale up to date with the development
+trunk; others like to do all the work in one go when the software nears
+release. If you are of the former sort, you should watch the Bugzilla Git
+repositories to catch the changes in the files.
+
+To do so, you can subscribe to the Atom or RSS feeds that log every commit in the repositories.
+
+The list of commits can be found
+on `this page <https://github.com/bugzilla/bugzilla/commits/master>`_.
+The branch named "master" is the current focus of Bugzilla development,
+and the place from which the next release will come.
+If you want to watch a different branch, select it from the dropdown "Branch:"
+widget in the top left. Once you have your branch, add ".atom" to the end of
+the URL in the URL bar to get a feed you can subscribe to.
+You will be notified about each commit that happens on this branch.
diff --git a/docs/en/rst/modules.rst b/docs/en/rst/modules.rst
deleted file mode 100644
index 4740161805..0000000000
--- a/docs/en/rst/modules.rst
+++ /dev/null
@@ -1,126 +0,0 @@
-.. highlight:: console
-
-.. _install-perlmodules-manual:
-
-===================================
-Manual Installation of Perl Modules
-===================================
-
-.. _modules-manual-instructions:
-
-Instructions
-############
-
-If you need to install Perl modules manually, here's how it's done.
-Download the module using the link given in the next section, and then
-apply this magic incantation, as root:
-
-::
-
-    # tar -xzvf <module>.tar.gz
-    # cd <module>
-    # perl Makefile.PL
-    # make
-    # make test
-    # make install
-
-.. note:: In order to compile source code under Windows you will need to obtain
-   a 'make' utility.  The :command:`nmake` utility provided with
-   Microsoft Visual C++ may be used.  As an alternative, there is a
-   utility called :command:`dmake` available from CPAN which is
-   written entirely in Perl.
-   As described in :ref:`modules-manual-download`, however, most
-   packages already exist and are available from ActiveState or theory58S.
-   We highly recommend that you install them using the ppm GUI available with
-   ActiveState and to add the theory58S repository to your list of repositories.
-
-.. _modules-manual-download:
-
-Download Locations
-##################
-
-.. note:: Running Bugzilla on Windows requires the use of ActiveState
-   Perl |min-perl-ver| or higher. Many modules already exist in the core
-   distribution of ActiveState Perl. Additional modules can be downloaded
-   from `<http://cpan.uwinnipeg.ca/PPMPackages/10xx/>`_
-   if you use Perl |min-perl-ver|.
-
-CGI:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/CGI.pm/>`_
-* Documentation: `<http://perldoc.perl.org/CGI.html>`_
-
-Data-Dumper:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/Data-Dumper/>`_
-* Documentation: `<http://search.cpan.org/dist/Data-Dumper/Dumper.pm>`_
-
-Date::Format (part of TimeDate):
-
-* CPAN Download Page: `<http://search.cpan.org/dist/TimeDate/>`_
-* Documentation: `<http://search.cpan.org/dist/TimeDate/lib/Date/Format.pm>`_
-
-DBI:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/DBI/>`_
-* Documentation: `<http://dbi.perl.org/docs/>`_
-
-DBD::mysql:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/DBD-mysql/>`_
-* Documentation: `<http://search.cpan.org/dist/DBD-mysql/lib/DBD/mysql.pm>`_
-
-DBD::Pg:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/DBD-Pg/>`_
-* Documentation: `<http://search.cpan.org/dist/DBD-Pg/Pg.pm>`_
-
-Template-Toolkit:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/Template-Toolkit/>`_
-* Documentation: `<http://www.template-toolkit.org/docs.html>`_
-
-GD:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/GD/>`_
-* Documentation: `<http://search.cpan.org/dist/GD/GD.pm>`_
-
-Template::Plugin::GD:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/Template-GD/>`_
-* Documentation: `<http://www.template-toolkit.org/docs/aqua/Modules/index.html>`_
-
-MIME::Parser (part of MIME-tools):
-
-* CPAN Download Page: `<http://search.cpan.org/dist/MIME-tools/>`_
-* Documentation: `<http://search.cpan.org/dist/MIME-tools/lib/MIME/Parser.pm>`_
-
-.. _modules-manual-optional:
-
-Optional Modules
-################
-
-Chart::Lines:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/Chart/>`_
-* Documentation: `<http://search.cpan.org/dist/Chart/Chart.pod>`_
-
-GD::Graph:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/GDGraph/>`_
-* Documentation: `<http://search.cpan.org/dist/GDGraph/Graph.pm>`_
-
-GD::Text::Align (part of GD::Text::Util):
-
-* CPAN Download Page: `<http://search.cpan.org/dist/GDTextUtil/>`_
-* Documentation: `<http://search.cpan.org/dist/GDTextUtil/Text/Align.pm>`_
-
-XML::Twig:
-
-* CPAN Download Page: `<http://search.cpan.org/dist/XML-Twig/>`_
-* Documentation: `<http://standards.ieee.org/resources/spasystem/twig/twig_stable.html>`_
-
-PatchReader:
-
-* CPAN Download Page: `<http://search.cpan.org/author/JKEISER/PatchReader/>`_
-* Documentation: `<http://www.johnkeiser.com/mozilla/Patch_Viewer.html>`_
diff --git a/docs/en/rst/patches.rst b/docs/en/rst/patches.rst
deleted file mode 100644
index 688d17105d..0000000000
--- a/docs/en/rst/patches.rst
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-.. _patches:
-
-=======
-Contrib
-=======
-
-There are a number of unofficial Bugzilla add-ons in the
-:file:`$BUGZILLA_ROOT/contrib/`
-directory. This section documents them.
-
-.. _cmdline:
-
-Command-line Search Interface
-#############################
-
-There are a suite of Unix utilities for searching Bugzilla from the
-command line. They live in the
-:file:`contrib/cmdline` directory.
-There are three files - :file:`query.conf`,
-:file:`buglist` and :file:`bugs`.
-
-.. warning:: These files pre-date the templatization work done as part of the
-   2.16 release, and have not been updated.
-
-:file:`query.conf` contains the mapping from
-options to field names and comparison types. Quoted option names
-are ``grepped`` for, so it should be easy to edit this
-file. Comments (#) have no effect; you must make sure these lines
-do not contain any quoted ``option``.
-
-:file:`buglist` is a shell script that submits a
-Bugzilla query and writes the resulting HTML page to stdout.
-It supports both short options, (such as ``-Afoo``
-or ``-Rbar``) and long options (such
-as ``--assignedto=foo`` or ``--reporter=bar``).
-If the first character of an option is not ``-``, it is
-treated as if it were prefixed with ``--default=``.
-
-The column list is taken from the COLUMNLIST environment variable.
-This is equivalent to the ``Change Columns`` option
-that is available when you list bugs in buglist.cgi. If you have
-already used Bugzilla, grep for COLUMNLIST in your cookies file
-to see your current COLUMNLIST setting.
-
-:file:`bugs` is a simple shell script which calls
-:file:`buglist` and extracts the
-bug numbers from the output. Adding the prefix
-``http://bugzilla.mozilla.org/buglist.cgi?bug_id=``
-turns the bug list into a working link if any bugs are found.
-Counting bugs is easy. Pipe the results through
-:command:`sed -e 's/,/ /g' | wc | awk '{printf $2 "\\n"}'`
-
-Akkana Peck says she has good results piping
-:file:`buglist` output through
-:command:`w3m -T text/html -dump`
-
-.. _cmdline-bugmail:
-
-Command-line 'Send Unsent Bug-mail' tool
-########################################
-
-Within the :file:`contrib` directory
-exists a utility with the descriptive (if compact) name
-of :file:`sendunsentbugmail.pl`. The purpose of this
-script is, simply, to send out any bug-related mail that should
-have been sent by now, but for one reason or another has not.
-
-To accomplish this task, :file:`sendunsentbugmail.pl` uses
-the same mechanism as the :file:`sanitycheck.cgi` script;
-it scans through the entire database looking for bugs with changes that
-were made more than 30 minutes ago, but where there is no record of
-anyone related to that bug having been sent mail. Having compiled a list,
-it then uses the standard rules to determine who gets mail, and sends it
-out.
-
-As the script runs, it indicates the bug for which it is currently
-sending mail; when it has finished, it gives a numerical count of how
-many mails were sent and how many people were excluded. (Individual
-user names are not recorded or displayed.) If the script produces
-no output, that means no unsent mail was detected.
-
-*Usage*: move the sendunsentbugmail.pl script
-up into the main directory, ensure it has execute permission, and run it
-from the command line (or from a cron job) with no parameters.
-
-
diff --git a/docs/en/rst/security.rst b/docs/en/rst/security.rst
deleted file mode 100644
index 17dfc73a22..0000000000
--- a/docs/en/rst/security.rst
+++ /dev/null
@@ -1,167 +0,0 @@
-
-
-.. _security:
-
-=================
-Bugzilla Security
-=================
-
-While some of the items in this chapter are related to the operating
-system Bugzilla is running on or some of the support software required to
-run Bugzilla, it is all related to protecting your data. This is not
-intended to be a comprehensive guide to securing Linux, Apache, MySQL, or
-any other piece of software mentioned. There is no substitute for active
-administration and monitoring of a machine. The key to good security is
-actually right in the middle of the word: *U R It*.
-
-While programmers in general always strive to write secure code,
-accidents can and do happen. The best approach to security is to always
-assume that the program you are working with isn't 100% secure and restrict
-its access to other parts of your machine as much as possible.
-
-.. _security-os:
-
-Operating System
-################
-
-.. _security-os-ports:
-
-TCP/IP Ports
-============
-
-.. COMMENT: TODO: Get exact number of ports
-
-The TCP/IP standard defines more than 65,000 ports for sending
-and receiving traffic. Of those, Bugzilla needs exactly one to operate
-(different configurations and options may require up to 3). You should
-audit your server and make sure that you aren't listening on any ports
-you don't need to be. It's also highly recommended that the server
-Bugzilla resides on, along with any other machines you administer, be
-placed behind some kind of firewall.
-
-.. _security-os-accounts:
-
-System User Accounts
-====================
-
-Many daemons, such
-as Apache's :file:`httpd` or MySQL's
-:file:`mysqld`, run as either ``root`` or
-``nobody``. This is even worse on Windows machines where the
-majority of services
-run as ``SYSTEM``. While running as ``root`` or
-``SYSTEM`` introduces obvious security concerns, the
-problems introduced by running everything as ``nobody`` may
-not be so obvious. Basically, if you run every daemon as
-``nobody`` and one of them gets compromised it can
-compromise every other daemon running as ``nobody`` on your
-machine. For this reason, it is recommended that you create a user
-account for each daemon.
-
-.. note:: You will need to set the ``webservergroup`` option
-   in :file:`localconfig` to the group your web server runs
-   as. This will allow :file:`./checksetup.pl` to set file
-   permissions on Unix systems so that nothing is world-writable.
-
-.. _security-os-chroot:
-
-The :file:`chroot` Jail
-=======================
-
-If your system supports it, you may wish to consider running
-Bugzilla inside of a :file:`chroot` jail. This option
-provides unprecedented security by restricting anything running
-inside the jail from accessing any information outside of it. If you
-wish to use this option, please consult the documentation that came
-with your system.
-
-.. _security-webserver:
-
-Web server
-##########
-
-.. _security-webserver-access:
-
-Disabling Remote Access to Bugzilla Configuration Files
-=======================================================
-
-There are many files that are placed in the Bugzilla directory
-area that should not be accessible from the web server. Because of the way
-Bugzilla is currently layed out, the list of what should and should not
-be accessible is rather complicated. A quick way is to run
-:file:`testserver.pl` to check if your web server serves
-Bugzilla files as expected. If not, you may want to follow the few
-steps below.
-
-.. note:: Bugzilla ships with the ability to create :file:`.htaccess`
-   files that enforce these rules. Instructions for enabling these
-   directives in Apache can be found in :ref:`http-apache`
-
-- In the main Bugzilla directory, you should:
-  - Block: :file:`*.pl`, :file:`*localconfig*`
-
-- In :file:`data`:
-  - Block everything
-
-- In :file:`data/webdot`:
-
-  - If you use a remote webdot server:
-
-    - Block everything
-    - But allow :file:`*.dot`
-      only for the remote webdot server
-  - Otherwise, if you use a local GraphViz:
-
-    - Block everything
-    - But allow: :file:`*.png`, :file:`*.gif`, :file:`*.jpg`, :file:`*.map`
-  - And if you don't use any dot:
-
-    - Block everything
-
-- In :file:`Bugzilla`:
-  - Block everything
-
-- In :file:`template`:
-  - Block everything
-
-Be sure to test that data that should not be accessed remotely is
-properly blocked. Of particular interest is the localconfig file which
-contains your database password. Also, be aware that many editors
-create temporary and backup files in the working directory and that
-those should also not be accessible. For more information, see
-`bug 186383 <http://bugzilla.mozilla.org/show_bug.cgi?id=186383>`_
-or
-`Bugtraq ID 6501 <http://online.securityfocus.com/bid/6501>`_.
-To test, simply run :file:`testserver.pl`, as said above.
-
-.. note:: Be sure to check :ref:`http` for instructions
-   specific to the web server you use.
-
-.. _security-bugzilla:
-
-Bugzilla
-########
-
-.. _security-bugzilla-charset:
-
-Prevent users injecting malicious Javascript
-============================================
-
-If you installed Bugzilla version 2.22 or later from scratch,
-then the *utf8* parameter is switched on by default.
-This makes Bugzilla explicitly set the character encoding, following
-`a
-CERT advisory <http://www.cert.org/tech_tips/malicious_code_mitigation.html#3>`_ recommending exactly this.
-The following therefore does not apply to you; just keep
-*utf8* turned on.
-
-If you've upgraded from an older version, then it may be possible
-for a Bugzilla user to take advantage of character set encoding
-ambiguities to inject HTML into Bugzilla comments.
-This could include malicious scripts.
-This is because due to internationalization concerns, we are unable to
-turn the *utf8* parameter on by default for upgraded
-installations.
-Turning it on manually will prevent this problem.
-
-
diff --git a/docs/en/rst/style.rst b/docs/en/rst/style.rst
index 8fd9dc0373..a1d6d78351 100644
--- a/docs/en/rst/style.rst
+++ b/docs/en/rst/style.rst
@@ -1,5 +1,7 @@
 :orphan:
 
+.. _style-guide:
+
 ==============================
 Writing Bugzilla Documentation
 ==============================
@@ -8,8 +10,10 @@ The Bugzilla documentation uses
 `reStructured Text (reST) <http://docutils.sourceforge.net/rst.html>`_,
 as extended by our documentation compilation tool,
 `Sphinx <http://sphinx-doc.org/>`_. This document is a reST document for
-demonstration purposes. When you build the docs, it gets built (at least in
-the HTML version) as a standalone file, although it isn't as readable in that
+demonstration purposes. To learn from it, you need to read it in reST form.
+
+When you build the docs, this document gets built (at least in
+the HTML version) as a standalone file, although it isn't as useful in that
 form because some of the directives discussed are invisible or change when
 rendered.
 
@@ -19,14 +23,15 @@ that one immediately-linked page should be enough to get started. Later, the
 `inline markup section <http://sphinx-doc.org/latest/markup/inline.html>`_
 is worth a read.
 
-Bugzilla's particular documentation conventions are as follows.
+Bugzilla's particular documentation conventions are as follows:
 
 Block Directives
 ################
 
-Every heading should be preceded by an anchor, with a globally-unique name
-with no spaces. Then we demonstrate the available heading levels we haven't
-used yet:
+Chapter headings use the double-equals, page title headings the #, and then
+the three other levels are headings within a page. Every heading should be
+preceded by an anchor, with a globally-unique name with no spaces. Now, we
+demonstrate the available heading levels we haven't used yet:
 
 .. _uniqueanchorname:
 
@@ -62,6 +67,10 @@ Other block types:
 Use both of the above block types sparingly. Consider putting the information
 in the main text, omitting it, or (if long) placing it in a subsidiary file.
 
+.. todo:: This is some documentation-related task that still needs doing.
+          This is useful for short-term todos during development; however,
+          consider filing a bug for todos which will persist longer.
+
 Code gets highlighted using Pygments. Choose the highlighter at the top of
 each file using:
 
@@ -72,30 +81,44 @@ this:
 
 .. code-block:: perl
 
-  # This is some Perl code
-  print "Hello";
+   # This is some Perl code
+   print "Hello";
 
 There is a
 `list of all available lexer names <http://pygments.org/docs/lexers/>`_
 available. We currently use ``console``, ``perl``, and ``sql``. ``none`` is
 also a valid value.
 
+Use 4-space indentation, except where a different value is better so that
+things line up. So normally two spaces for bulleted lists, and 3 spaces
+for .. blocks.
+
 Inline Directives
 #################
 
 .. warning:: Remember that reST does not support nested inline markup. So you
    can't have a substitution inside a link, or bold inside italics.
 
-A filename or a path to a filename is displayed like this:
-:file:`/path/to/filename.ext`
+* A filename or a path to a filename:
+  :file:`/path/to/{variable-bit-of-path}/filename.ext`
+
+* A command to type in the shell:
+  :command:`command --arguments`
+
+* A parameter name:
+  :param:`shutdownhtml`
+
+* A parameter value:
+  :paramval:`DB`
+
+* A group name:
+  :group:`editbugs`
 
-A command to type in the shell is displayed like this:
-:command:`command --arguments`
+* A bug field name:
+  :field:`Summary`
 
-We place static values for substitution (using |subst-name|) in the file
-:file:`$BUGZILLA_HOME/docs/definitions.rst.tmpl`.
-This gets built into definitions.rst, with the script adding some definitions
-for minimum module versions etc. generated from the source itself. Lines in
-that file look like this:
+* Any string from the UI:
+  :guilabel:`Administration`
 
-.. |subst-name| replace:: Some Text Here
+* A specific BMO bug:
+  :bug:`201069`
diff --git a/docs/en/rst/troubleshooting.rst b/docs/en/rst/troubleshooting.rst
deleted file mode 100644
index 64b9263a45..0000000000
--- a/docs/en/rst/troubleshooting.rst
+++ /dev/null
@@ -1,239 +0,0 @@
-.. highlight:: console
-
-.. _troubleshooting:
-
-===============
-Troubleshooting
-===============
-
-This section gives solutions to common Bugzilla installation
-problems. If none of the section headings seems to match your
-problem, read the general advice.
-
-.. _general-advice:
-
-General Advice
-##############
-
-If you can't get :file:`checksetup.pl` to run to
-completion, it normally explains what's wrong and how to fix it.
-If you can't work it out, or if it's being uncommunicative, post
-the errors in the
-`mozilla.support.bugzilla <news://news.mozilla.org/mozilla.support.bugzilla>`_
-newsgroup.
-
-If you have made it all the way through
-:ref:`installation` (Installation) and
-:ref:`configuration` (Configuration) but accessing the Bugzilla
-URL doesn't work, the first thing to do is to check your web server error
-log. For Apache, this is often located at
-:file:`/etc/logs/httpd/error_log`. The error messages
-you see may be self-explanatory enough to enable you to diagnose and
-fix the problem. If not, see below for some commonly-encountered
-errors. If that doesn't help, post the errors to the newsgroup.
-
-Bugzilla can also log all user-based errors (and many code-based errors)
-that occur, without polluting the web server's error log.  To enable
-Bugzilla error logging, create a file that Bugzilla can write to, named
-:file:`errorlog`, in the Bugzilla :file:`data`
-directory.  Errors will be logged as they occur, and will include the type
-of the error, the IP address and username (if available) of the user who
-triggered the error, and the values of all environment variables; if a
-form was being submitted, the data in the form will also be included.
-To disable error logging, delete or rename the
-:file:`errorlog` file.
-
-.. _trbl-testserver:
-
-The Apache web server is not serving Bugzilla pages
-###################################################
-
-After you have run :command:`checksetup.pl` twice,
-run :command:`testserver.pl http://yoursite.yourdomain/yoururl`
-to confirm that your web server is configured properly for
-Bugzilla.
-
-::
-
-    $ ./testserver.pl http://landfill.bugzilla.org/bugzilla-tip
-    TEST-OK Webserver is running under group id in $webservergroup.
-    TEST-OK Got ant picture.
-    TEST-OK Webserver is executing CGIs.
-    TEST-OK Webserver is preventing fetch of http://landfill.bugzilla.org/bugzilla-tip/localconfig.
-
-.. _trbl-perlmodule:
-
-I installed a Perl module, but :file:`checksetup.pl` claims it's not installed!
-###############################################################################
-
-This could be caused by one of two things:
-
-#. You have two versions of Perl on your machine. You are installing
-   modules into one, and Bugzilla is using the other. Rerun the CPAN
-   commands (or manual compile) using the full path to Perl from the
-   top of :file:`checksetup.pl`. This will make sure you
-   are installing the modules in the right place.
-
-#. The permissions on your library directories are set incorrectly.
-   They must, at the very least, be readable by the web server user or
-   group. It is recommended that they be world readable.
-
-.. _trbl-dbdSponge:
-
-DBD::Sponge::db prepare failed
-##############################
-
-The following error message may appear due to a bug in DBD::mysql
-(over which the Bugzilla team have no control):
-
-::
-
-    DBD::Sponge::db prepare failed: Cannot determine NUM_OF_FIELDS at D:/Perl/site/lib/DBD/mysql.pm line 248.
-    SV = NULL(0x0) at 0x20fc444
-    REFCNT = 1
-    FLAGS = (PADBUSY,PADMY)
-
-To fix this, go to
-:file:`<path-to-perl>/lib/DBD/sponge.pm`
-in your Perl installation and replace
-
-.. code-block:: perl
-
-    my $numFields;
-    if ($attribs->{'NUM_OF_FIELDS'}) {
-        $numFields = $attribs->{'NUM_OF_FIELDS'};
-    }
-    elsif ($attribs->{'NAME'}) {
-        $numFields = @{$attribs->{NAME}};
-    }
-
-with
-
-.. code-block:: perl
-
-    my $numFields;
-    if ($attribs->{'NUM_OF_FIELDS'}) {
-        $numFields = $attribs->{'NUM_OF_FIELDS'};
-    }
-    elsif ($attribs->{'NAMES'}) {
-        $numFields = @{$attribs->{NAMES}};
-    }
-
-(note the S added to NAME.)
-
-.. _paranoid-security:
-
-cannot chdir(/var/spool/mqueue)
-###############################
-
-If you are installing Bugzilla on SuSE Linux, or some other
-distributions with ``paranoid`` security options, it is
-possible that the checksetup.pl script may fail with the error:
-::
-
-    cannot chdir(/var/spool/mqueue): Permission denied
-
-This is because your :file:`/var/spool/mqueue`
-directory has a mode of ``drwx------``.
-Type :command:`chmod 755 :file:`/var/spool/mqueue``
-as root to fix this problem. This will allow any process running on your
-machine the ability to *read* the
-:file:`/var/spool/mqueue` directory.
-
-.. _trbl-relogin-everyone:
-
-Everybody is constantly being forced to relogin
-###############################################
-
-The most-likely cause is that the ``cookiepath`` parameter
-is not set correctly in the Bugzilla configuration.  You can change this (if
-you're a Bugzilla administrator) from the editparams.cgi page via the web interface.
-
-The value of the cookiepath parameter should be the actual directory
-containing your Bugzilla installation, *as seen by the end-user's
-web browser*. Leading and trailing slashes are mandatory. You can
-also set the cookiepath to any directory which is a parent of the Bugzilla
-directory (such as '/', the root directory). But you can't put something
-that isn't at least a partial match or it won't work. What you're actually
-doing is restricting the end-user's browser to sending the cookies back only
-to that directory.
-
-How do you know if you want your specific Bugzilla directory or the
-whole site?
-
-If you have only one Bugzilla running on the server, and you don't
-mind having other applications on the same server with it being able to see
-the cookies (you might be doing this on purpose if you have other things on
-your site that share authentication with Bugzilla), then you'll want to have
-the cookiepath set to "/", or to a sufficiently-high enough directory that
-all of the involved apps can see the cookies.
-
-.. _trbl-relogin-everyone-share:
-
-Examples of urlbase/cookiepath pairs for sharing login cookies
-==============================================================
-
-|    urlbase is http://bugzilla.mozilla.org/
-|    cookiepath is /
-
-
-|    urlbase is http://tools.mysite.tld/bugzilla/
-|    but you have http://tools.mysite.tld/someotherapp/ which shares
-|    authentication with your Bugzilla
-|
-|    cookiepath is /
-
-On the other hand, if you have more than one Bugzilla running on the
-server (some people do - we do on landfill) then you need to have the
-cookiepath restricted enough so that the different Bugzillas don't
-confuse their cookies with one another.
-
-.. _trbl-relogin-everyone-restrict:
-
-Examples of urlbase/cookiepath pairs to restrict the login cookie
-=================================================================
-
-|    urlbase is http://landfill.bugzilla.org/bugzilla-tip/
-|    cookiepath is /bugzilla-tip/
-
-|    urlbase is http://landfill.bugzilla.org/bugzilla-4.0-branch/
-|    cookiepath is /bugzilla-4.0-branch/
-
-If you had cookiepath set to ``/`` at any point in the
-past and need to set it to something more restrictive
-(i.e. ``/bugzilla/``), you can safely do this without
-requiring users to delete their Bugzilla-related cookies in their
-browser (this is true starting with Bugzilla 2.18 and Bugzilla 2.16.5).
-
-.. _trbl-index:
-
-:file:`index.cgi` doesn't show up unless specified in the URL
-#############################################################
-
-You probably need to set up your web server in such a way that it
-will serve the index.cgi page as an index page.
-
-If you are using Apache, you can do this by adding
-:file:`index.cgi` to the end of the
-``DirectoryIndex`` line
-as mentioned in :ref:`http-apache`.
-
-.. _trbl-passwd-encryption:
-
-checksetup.pl reports "Client does not support authentication protocol requested by server..."
-##############################################################################################
-
-This error is occurring because you are using the new password
-encryption that comes with MySQL 4.1, while your
-:file:`DBD::mysql` module was compiled against an
-older version of MySQL. If you recompile :file:`DBD::mysql`
-against the current MySQL libraries (or just obtain a newer version
-of this module) then the error may go away.
-
-If that does not fix the problem, or if you cannot recompile the
-existing module (e.g. you're running Windows) and/or don't want to
-replace it (e.g. you want to keep using a packaged version), then a
-workaround is available from the MySQL docs:
-`<http://dev.mysql.com/doc/mysql/en/Old_client.html>`_
-
-
diff --git a/docs/en/rst/using.rst b/docs/en/rst/using.rst
deleted file mode 100644
index 69bc556e2a..0000000000
--- a/docs/en/rst/using.rst
+++ /dev/null
@@ -1,1380 +0,0 @@
-
-
-.. _using:
-
-==============
-Using Bugzilla
-==============
-
-.. _using-intro:
-
-Introduction
-############
-
-This section contains information for end-users of Bugzilla.  There
-is a machine with many Bugzilla test installations, called
-`Landfill <http://landfill.bugzilla.org/>`_, which you are
-welcome to play with (if it's up). However, not all of the Bugzilla
-installations there will necessarily have all Bugzilla features enabled,
-and different installations run different versions, so some things may not
-quite work as this document describes.
-
-Frequently Asked Questions (FAQ) are available and answered on
-`wiki.mozilla.org <http://wiki.mozilla.org/Bugzilla:FAQ>`_.
-They may cover some questions you have which are left unanswered.
-
-.. _myaccount:
-
-Create a Bugzilla Account
-#########################
-
-If you want to use Bugzilla, first you need to create an account.
-Consult with the administrator responsible for your installation of
-Bugzilla for the URL you should use to access it. If you're
-test-driving Bugzilla, use an installation on
-`Landfill <http://landfill.bugzilla.org/>`_.
-
-#. On the home page :file:`index.cgi`, click the
-   ``Open a new Bugzilla account`` link, or the
-   ``New Account`` link available in the footer of pages.
-   Now enter your email address, then click the ``Send``
-   button.
-
-   .. note:: If none of these links is available, this means that the
-      administrator of the installation has disabled self-registration.
-      This means that only an administrator can create accounts
-      for other users. One reason could be that this installation is
-      private.
-
-   .. note:: Also, if only some users are allowed to create an account on
-      the installation, you may see these links but your registration
-      may fail if your email address doesn't match the ones accepted
-      by the installation. This is another way to restrict who can
-      access and edit bugs in this installation.
-
-#. Within moments, and if your registration is accepted, you should
-   receive an email to the address you provided, which contains your
-   login name (generally the same as the email address), and two URLs
-   with a token (a random string generated by the installation) to
-   confirm, respectively cancel, your registration. This is a way to
-   prevent users from abusing the generation of user accounts, for
-   instance by entering inexistent email addresses, or email addresses
-   which do not belong to them.
-
-#. By default, you have 3 days to confirm your registration. Past this
-   timeframe, the token is invalidated and the registration is
-   automatically canceled. You can also cancel this registration sooner
-   by using the appropriate URL in the email you got.
-
-#. If you confirm your registration, Bugzilla will ask you your real name
-   (optional, but recommended) and your password, which must be between
-   3 and 16 characters long.
-
-#. Now all you need to do is to click the ``Log In``
-   link in the footer at the bottom of the page in your browser,
-   enter your email address and password you just chose into the
-   login form, and click the ``Log in`` button.
-
-You are now logged in. Bugzilla uses cookies to remember you are
-logged in so, unless you have cookies disabled or your IP address changes,
-you should not have to log in again during your session.
-
-.. _bug_page:
-
-Anatomy of a Bug
-################
-
-The core of Bugzilla is the screen which displays a particular
-bug. It's a good place to explain some Bugzilla concepts.
-`Bug 1 on Landfill <http://landfill.bugzilla.org/bugzilla-tip/show_bug.cgi?id=1>`_
-is a good example. Note that the labels for most fields are hyperlinks;
-clicking them will take you to context-sensitive help on that
-particular field. Fields marked * may not be present on every
-installation of Bugzilla.
-
-#. *Product and Component*:
-   Bugs are divided up by Product and Component, with a Product
-   having one or more Components in it. For example,
-   bugzilla.mozilla.org's "Bugzilla" Product is composed of several
-   Components:
-
-   Administration:
-       Administration of a Bugzilla installation.
-   Bugzilla-General:
-       Anything that doesn't fit in the other components, or spans
-       multiple components.
-   Creating/Changing Bugs:
-       Creating, changing, and viewing bugs.
-   Documentation:
-       The Bugzilla documentation, including The Bugzilla Guide.
-   Email:
-       Anything to do with email sent by Bugzilla.
-   Installation:
-       The installation process of Bugzilla.
-   Query/Buglist:
-       Anything to do with searching for bugs and viewing the
-       buglists.
-   Reporting/Charting:
-       Getting reports from Bugzilla.
-   User Accounts:
-       Anything about managing a user account from the user's perspective.
-       Saved queries, creating accounts, changing passwords, logging in,
-       etc.
-   User Interface:
-       General issues having to do with the user interface cosmetics (not
-       functionality) including cosmetic issues, HTML templates,
-       etc.
-
-#. *Status and Resolution:*
-   These define exactly what state the bug is in - from not even
-   being confirmed as a bug, through to being fixed and the fix
-   confirmed by Quality Assurance. The different possible values for
-   Status and Resolution on your installation should be documented in the
-   context-sensitive help for those items.
-
-#. *Assigned To:*
-   The person responsible for fixing the bug.
-
-#. *\*QA Contact:*
-   The person responsible for quality assurance on this bug.
-
-#. *\*URL:*
-   A URL associated with the bug, if any.
-
-#. *Summary:*
-   A one-sentence summary of the problem.
-
-#. *\*Status Whiteboard:*
-   (a.k.a. Whiteboard) A free-form text area for adding short notes
-   and tags to a bug.
-
-#. *\*Keywords:*
-   The administrator can define keywords which you can use to tag and
-   categorise bugs - e.g. The Mozilla Project has keywords like crash
-   and regression.
-
-#. *Platform and OS:*
-   These indicate the computing environment where the bug was
-   found.
-
-#. *Version:*
-   The "Version" field is usually used for versions of a product which
-   have been released, and is set to indicate which versions of a
-   Component have the particular problem the bug report is
-   about.
-
-#. *Priority:*
-   The bug assignee uses this field to prioritize his or her bugs.
-   It's a good idea not to change this on other people's bugs.
-
-#. *Severity:*
-   This indicates how severe the problem is - from blocker
-   ("application unusable") to trivial ("minor cosmetic issue"). You
-   can also use this field to indicate whether a bug is an enhancement
-   request.
-
-#. *\*Target:*
-   (a.k.a. Target Milestone) A future version by which the bug is to
-   be fixed. e.g. The Bugzilla Project's milestones for future
-   Bugzilla versions are 2.18, 2.20, 3.0, etc. Milestones are not
-   restricted to numbers, thought - you can use any text strings, such
-   as dates.
-
-#. *Reporter:*
-   The person who filed the bug.
-
-#. *CC list:*
-   A list of people who get mail when the bug changes.
-
-#. *\*Time Tracking:*
-   This form can be used for time tracking.
-   To use this feature, you have to be blessed group membership
-   specified by the ``timetrackinggroup`` parameter.
-
-   Orig. Est.:
-       This field shows the original estimated time.
-   Current Est.:
-       This field shows the current estimated time.
-       This number is calculated from ``Hours Worked``
-       and ``Hours Left``.
-   Hours Worked:
-       This field shows the number of hours worked.
-   Hours Left:
-       This field shows the ``Current Est.`` -
-       ``Hours Worked``.
-       This value + ``Hours Worked`` will become the
-       new Current Est.
-   %Complete:
-       This field shows what percentage of the task is complete.
-   Gain:
-       This field shows the number of hours that the bug is ahead of the
-       ``Orig. Est.``.
-   Deadline:
-       This field shows the deadline for this bug.
-
-#. *Attachments:*
-   You can attach files (e.g. testcases or patches) to bugs. If there
-   are any attachments, they are listed in this section.
-
-#. *\*Dependencies:*
-   If this bug cannot be fixed unless other bugs are fixed (depends
-   on), or this bug stops other bugs being fixed (blocks), their
-   numbers are recorded here.
-
-#. *\*Votes:*
-   Whether this bug has any votes.
-
-#. *Additional Comments:*
-   You can add your two cents to the bug discussion here, if you have
-   something worthwhile to say.
-
-.. _lifecycle:
-
-Life Cycle of a Bug
-###################
-
-The life cycle of a bug, also known as workflow, is customizable to match
-the needs of your organization, see :ref:`bug_status_workflow`.
-:ref:`lifecycle-image` contains a graphical representation of
-the default workflow using the default bug statuses. If you wish to
-customize this image for your site, the
-`diagram file <../images/bzLifecycle.xml>`_
-is available in `Dia's <http://www.gnome.org/projects/dia>`_
-native XML format.
-
-.. _lifecycle-image:
-
-Lifecycle of a Bugzilla Bug
-===========================
-
-.. image:: ../images/bzLifecycle.png
-
-.. _query:
-
-Searching for Bugs
-##################
-
-The Bugzilla Search page is the interface where you can find
-any bug report, comment, or patch currently in the Bugzilla system.
-`You can play with it on
-Landfill <http://landfill.bugzilla.org/bugzilla-tip/query.cgi?format=advanced>`_.
-
-The Search page has controls for selecting different possible
-values for all of the fields in a bug, as described above. For some
-fields, multiple values can be selected. In those cases, Bugzilla
-returns bugs where the content of the field matches any one of the selected
-values. If none is selected, then the field can take any value.
-
-After a search is run, you can save it as a Saved Search, which
-will appear in the page footer. If you are in the group defined
-by the "querysharegroup" parameter, you may share your queries
-with other users, see :ref:`savedsearches` for more details.
-
-.. _boolean:
-
-Boolean Charts
-==============
-
-Highly advanced querying is done using Boolean Charts.
-
-The boolean charts further restrict the set of results
-returned by a query. It is possible to search for bugs
-based on elaborate combinations of criteria.
-
-The simplest boolean searches have only one term. These searches
-permit the selected left *field*
-to be compared using a
-selectable *operator* to a
-specified *value.*
-Using the "And," "Or," and "Add Another Boolean Chart" buttons,
-additional terms can be included in the query, further
-altering the list of bugs returned by the query.
-
-There are three fields in each row of a boolean search.
-
-- *Field:*
-  the items being searched
-
-- *Operator:*
-  the comparison operator
-
-- *Value:*
-  the value to which the field is being compared
-
-.. _pronouns:
-
-Pronoun Substitution
---------------------
-
-Sometimes, a query needs to compare a user-related field
-(such as ReportedBy) with a role-specific user (such as the
-user running the query or the user to whom each bug is assigned).
-When the operator is either "equals" or "notequals", the value
-can be "%reporter%", "%assignee%", "%qacontact%", or "%user%".
-The user pronoun
-refers to the user who is executing the query or, in the case
-of whining reports, the user who will be the recipient
-of the report. The reporter, assignee, and qacontact
-pronouns refer to the corresponding fields in the bug.
-
-Boolean charts also let you type a group name in any user-related
-field if the operator is either "equals", "notequals" or "anyexact".
-This will let you query for any member belonging (or not) to the
-specified group. The group name must be entered following the
-"%group.foo%" syntax, where "foo" is the group name.
-So if you are looking for bugs reported by any user being in the
-"editbugs" group, then you can type "%group.editbugs%".
-
-.. _negation:
-
-Negation
---------
-
-At first glance, negation seems redundant. Rather than
-searching for
-
-    NOT("summary" "contains the string" "foo"),
-
-one could search for
-
-    ("summary" "does not contain the string" "foo").
-
-However, the search
-
-    ("CC" "does not contain the string" "@mozilla.org")
-
-would find every bug where anyone on the CC list did not contain
-"@mozilla.org" while
-
-    NOT("CC" "contains the string" "@mozilla.org")
-
-would find every bug where there was nobody on the CC list who
-did contain the string. Similarly, the use of negation also permits
-complex expressions to be built using terms OR'd together and then
-negated. Negation permits queries such as
-
-    NOT(("product" "equals" "update") OR
-    ("component" "equals" "Documentation"))
-
-to find bugs that are neither
-in the update product or in the documentation component or
-
-    NOT(("commenter" "equals" "%assignee%") OR
-    ("component" "equals" "Documentation"))
-
-to find non-documentation
-bugs on which the assignee has never commented.
-
-.. _multiplecharts:
-
-Multiple Charts
----------------
-
-The terms within a single row of a boolean chart are all
-constraints on a single piece of data. If you are looking for
-a bug that has two different people cc'd on it, then you need
-to use two boolean charts. A search for
-
-    ("cc" "contains the string" "foo@") AND
-    ("cc" "contains the string" "@mozilla.org")
-
-would return only bugs with "foo@mozilla.org" on the cc list.
-If you wanted bugs where there is someone on the cc list
-containing "foo@" and someone else containing "@mozilla.org",
-then you would need two boolean charts.
-
-    First chart: ("cc" "contains the string" "foo@")
-    Second chart: ("cc" "contains the string" "@mozilla.org")
-
-The bugs listed will be only the bugs where ALL the charts are true.
-
-.. _quicksearch:
-
-Quicksearch
-===========
-
-Quicksearch is a single-text-box query tool which uses
-metacharacters to indicate what is to be searched. For example, typing
-"``foo|bar``"
-into Quicksearch would search for "foo" or "bar" in the
-summary and status whiteboard of a bug; adding
-"``:BazProduct``" would
-search only in that product.
-You can use it to find a bug by its number or its alias, too.
-
-You'll find the Quicksearch box in Bugzilla's footer area.
-On Bugzilla's front page, there is an additional
-`quicksearcgh help <../../../page.cgi?id=quicksearch.html>`_
-link which details how to use it.
-
-.. _casesensitivity:
-
-Case Sensitivity in Searches
-============================
-
-Bugzilla queries are case-insensitive and accent-insensitive, when
-used with either MySQL or Oracle databases. When using Bugzilla with
-PostgreSQL, however, some queries are case-sensitive. This is due to
-the way PostgreSQL handles case and accent sensitivity.
-
-.. _list:
-
-Bug Lists
-=========
-
-If you run a search, a list of matching bugs will be returned.
-
-The format of the list is configurable. For example, it can be
-sorted by clicking the column headings. Other useful features can be
-accessed using the links at the bottom of the list:
-
-Long Format:
-    this gives you a large page with a non-editable summary of the fields
-    of each bug.
-
-XML:
-    get the buglist in the XML format.
-
-CSV:
-    get the buglist as comma-separated values, for import into e.g.
-    a spreadsheet.
-
-Feed:
-    get the buglist as an Atom feed.  Copy this link into your
-    favorite feed reader.  If you are using Firefox, you can also
-    save the list as a live bookmark by clicking the live bookmark
-    icon in the status bar.  To limit the number of bugs in the feed,
-    add a limit=n parameter to the URL.
-
-iCalendar:
-    Get the buglist as an iCalendar file. Each bug is represented as a
-    to-do item in the imported calendar.
-
-Change Columns:
-    change the bug attributes which appear in the list.
-
-Change several bugs at once:
-    If your account is sufficiently empowered, and more than one bug
-    appear in the bug list, this link is displayed which lets you make
-    the same change to all the bugs in the list - for example, changing
-    their assignee.
-
-Send mail to bug assignees:
-    If more than one bug appear in the bug list and there are at least
-    two distinct bug assignees, this links is displayed which lets you
-    easily send a mail to the assignees of all bugs on the list.
-
-Edit Search:
-    If you didn't get exactly the results you were looking for, you can
-    return to the Query page through this link and make small revisions
-    to the query you just made so you get more accurate results.
-
-Remember Search As:
-    You can give a search a name and remember it; a link will appear
-    in your page footer giving you quick access to run it again later.
-
-.. _individual-buglists:
-
-Adding/removing tags to/from bugs
-=================================
-
-You can add and remove tags from individual bugs, which let you find and
-manage bugs more easily. Tags are per-user and so are only visible and editable
-by the user who created them. You can then run queries using tags as a criteria,
-either by using the Advanced Search form, or simply by typing "tag:my_tag_name"
-in the QuickSearch box at the top (or bottom) of the page. Tags can also be
-displayed in buglists.
-
-This feature is useful when you want to keep track of several bugs, but
-for different reasons. Instead of adding yourself to the CC list of all
-these bugs and mixing all these reasons, you can now store these bugs in
-separate lists, e.g. ``Keep in mind``, ``Interesting bugs``,
-or ``Triage``. One big advantage of this way to manage bugs
-is that you can easily add or remove tags from bugs one by one.
-
-.. _bugreports:
-
-Filing Bugs
-###########
-
-.. _fillingbugs:
-
-Reporting a New Bug
-===================
-
-Years of bug writing experience has been distilled for your
-reading pleasure into the
-`Bug Writing Guidelines <http://landfill.bugzilla.org/bugzilla-tip/page.cgi?id=bug-writing.html>`_.
-While some of the advice is Mozilla-specific, the basic principles of
-reporting Reproducible, Specific bugs, isolating the Product you are
-using, the Version of the Product, the Component which failed, the
-Hardware Platform, and Operating System you were using at the time of
-the failure go a long way toward ensuring accurate, responsible fixes
-for the bug that bit you.
-
-The procedure for filing a bug is as follows:
-
-#. Click the ``New`` link available in the footer
-   of pages, or the ``Enter a new bug report`` link
-   displayed on the home page of the Bugzilla installation.
-
-   .. note:: If you want to file a test bug to see how Bugzilla works,
-      you can do it on one of our test installations on
-      `Landfill <http://landfill.bugzilla.org/>`_.
-
-#. You first have to select the product in which you found a bug.
-
-#. You now see a form where you can specify the component (part of
-   the product which is affected by the bug you discovered; if you have
-   no idea, just select ``General`` if such a component exists),
-   the version of the program you were using, the Operating System and
-   platform your program is running on and the severity of the bug (if the
-   bug you found crashes the program, it's probably a major or a critical
-   bug; if it's a typo somewhere, that's something pretty minor; if it's
-   something you would like to see implemented, then that's an enhancement).
-
-#. You now have to give a short but descriptive summary of the bug you found.
-   ``My program is crashing all the time`` is a very poor summary
-   and doesn't help developers at all. Try something more meaningful or
-   your bug will probably be ignored due to a lack of precision.
-   The next step is to give a very detailed list of steps to reproduce
-   the problem you encountered. Try to limit these steps to a minimum set
-   required to reproduce the problem. This will make the life of
-   developers easier, and the probability that they consider your bug in
-   a reasonable timeframe will be much higher.
-
-   .. note:: Try to make sure that everything in the summary is also in the first
-      comment. Summaries are often updated and this will ensure your original
-      information is easily accessible.
-
-#. As you file the bug, you can also attach a document (testcase, patch,
-   or screenshot of the problem).
-
-#. Depending on the Bugzilla installation you are using and the product in
-   which you are filing the bug, you can also request developers to consider
-   your bug in different ways (such as requesting review for the patch you
-   just attached, requesting your bug to block the next release of the
-   product, and many other product specific requests).
-
-#. Now is a good time to read your bug report again. Remove all misspellings,
-   otherwise your bug may not be found by developers running queries for some
-   specific words, and so your bug would not get any attention.
-   Also make sure you didn't forget any important information developers
-   should know in order to reproduce the problem, and make sure your
-   description of the problem is explicit and clear enough.
-   When you think your bug report is ready to go, the last step is to
-   click the ``Commit`` button to add your report into the database.
-
-You do not need to put "any" or similar strings in the URL field.
-If there is no specific URL associated with the bug, leave this
-field blank.
-
-If you feel a bug you filed was incorrectly marked as a
-DUPLICATE of another, please question it in your bug, not
-the bug it was duped to. Feel free to CC the person who duped it
-if they are not already CCed.
-
-.. _cloningbugs:
-
-Clone an Existing Bug
-=====================
-
-Starting with version 2.20, Bugzilla has a feature that allows you
-to clone an existing bug. The newly created bug will inherit
-most settings from the old bug. This allows you to track more
-easily similar concerns in a new bug. To use this, go to the bug
-that you want to clone, then click the ``Clone This Bug``
-link on the bug page. This will take you to the ``Enter Bug``
-page that is filled with the values that the old bug has.
-You can change those values and/or texts if needed.
-
-.. _attachments:
-
-Attachments
-###########
-
-You should use attachments, rather than comments, for large chunks of ASCII
-data, such as trace, debugging output files, or log files. That way, it
-doesn't bloat the bug for everyone who wants to read it, and cause people to
-receive fat, useless mails.
-
-You should make sure to trim screenshots. There's no need to show the
-whole screen if you are pointing out a single-pixel problem.
-
-Bugzilla stores and uses a Content-Type for each attachment
-(e.g. text/html). To download an attachment as a different
-Content-Type (e.g. application/xhtml+xml), you can override this
-using a 'content_type' parameter on the URL, e.g.
-:file:`&content_type=text/plain`.
-
-Also, you can enter the URL pointing to the attachment instead of
-uploading the attachment itself. For example, this is useful if you want to
-point to an external application, a website or a very large file. Note that
-there is no guarantee that the source file will always be available, nor
-that its content will remain unchanged.
-
-Another way to attach data is to paste text directly in the text field,
-and Bugzilla will convert it into an attachment. This is pretty useful
-when you do copy and paste, and you don't want to put the text in a temporary
-file first.
-
-.. _patchviewer:
-
-Patch Viewer
-============
-
-Viewing and reviewing patches in Bugzilla is often difficult due to improper
-format and the inherent readability issues that raw patches present.  Patch
-Viewer is an enhancement to Bugzilla designed to fix that by offering linking
-to sections.
-
-Patch viewer allows you to:
-
-+ View patches in color, with side-by-side view rather than trying
-  to interpret the contents of the patch.
-
-+ See the difference between two patches.
-
-+ Collapse and expand sections of a patch for easy
-  reading.
-
-+ Link to a particular section of a patch for discussion or
-  review
-
-+ Create a rawtext unified format diff out of any patch, no
-  matter what format it came from
-
-.. _patchviewer_view:
-
-Viewing Patches in Patch Viewer
--------------------------------
-
-The main way to view a patch in patch viewer is to click on the
-"Diff" link next to a patch in the Attachments list on a bug. You may
-also do this within the edit window by clicking the "View Attachment As
-Diff" button in the Edit Attachment screen.
-
-.. _patchviewer_diff:
-
-Seeing the Difference Between Two Patches
------------------------------------------
-
-To see the difference between two patches, you must first view the
-newer patch in Patch Viewer.  Then select the older patch from the
-dropdown at the top of the page ("Differences between \[dropdown] and
-this patch") and click the "Diff" button. This will show you what
-is new or changed in the newer patch.
-
-.. _patchviewer_collapse:
-
-Collapsing and Expanding Sections of a Patch
---------------------------------------------
-
-To view only a certain set of files in a patch (for example, if a
-patch is absolutely huge and you want to only review part of it at a
-time), you can click the "(+)" and "(-)" links next to each file (to
-expand it or collapse it). If you want to collapse all files or expand
-all files, you can click the "Collapse All" and "Expand All" links at the
-top of the page.
-
-.. _patchviewer_link:
-
-Linking to a Section of a Patch
--------------------------------
-
-To link to a section of a patch (for example, if you want to be
-able to give someone a URL to show them which part you are talking
-about) you simply click the "Link Here" link on the section header. The
-resulting URL can be copied and used in discussion.
-
-.. _patchviewer_unified_diff:
-
-Creating a Unified Diff
------------------------
-
-If the patch is not in a format that you like, you can turn it
-into a unified diff format by clicking the "Raw Unified" link at the top
-of the page.
-
-.. _hintsandtips:
-
-Hints and Tips
-##############
-
-This section distills some Bugzilla tips and best practices
-that have been developed.
-
-Autolinkification
-=================
-
-Bugzilla comments are plain text - so typing <U> will
-produce less-than, U, greater-than rather than underlined text.
-However, Bugzilla will automatically make hyperlinks out of certain
-sorts of text in comments. For example, the text
-"http://www.bugzilla.org" will be turned into a link:
-`<http://www.bugzilla.org>`_.
-Other strings which get linkified in the obvious manner are:
-
-+ bug 12345
-
-+ bugs 123, 456, 789
-
-+ comment 7
-
-+ comments 1, 2, 3, 4
-
-+ bug 23456, comment 53
-
-+ attachment 4321
-
-+ mailto:george@example.com
-
-+ george@example.com
-
-+ ftp://ftp.mozilla.org
-
-+ Most other sorts of URL
-
-A corollary here is that if you type a bug number in a comment,
-you should put the word "bug" before it, so it gets autolinkified
-for the convenience of others.
-
-.. _commenting:
-
-Comments
-========
-
-If you are changing the fields on a bug, only comment if
-either you have something pertinent to say, or Bugzilla requires it.
-Otherwise, you may spam people unnecessarily with bug mail.
-To take an example: a user can set up their account to filter out messages
-where someone just adds themselves to the CC field of a bug
-(which happens a lot.) If you come along, add yourself to the CC field,
-and add a comment saying "Adding self to CC", then that person
-gets a pointless piece of mail they would otherwise have avoided.
-
-Don't use sigs in comments. Signing your name ("Bill") is acceptable,
-if you do it out of habit, but full mail/news-style
-four line ASCII art creations are not.
-
-.. _markdown:
-
-Markdown
---------
-
-Markdown lets you write your comments in a structured plain-text format and
-have your comments generated as HTML. For example, you may use Markdown for
-making a part of your comment look italic or bold in the generated HTML. Bugzilla
-supports most of the structures defined by `standard Markdown <http://daringfireball.net/projects/markdown/basics>`_.
-but does NOT support inline images and inline HTML. For a complete reference on
-supported Markdown structures, please see the `syntax help <../../../page.cgi?id=markdown.html>`_
-link next to the markdown checkbox for new comments.
-
-To use the Markdown feature, make sure that ``Enable Markdown support for comments`` is set to ``on``
-in your :ref:`userpreferences` and that you also check the ``Use Markdown for this comment`` option below
-the comment box when you want to submit a new comment.
-
-.. _comment-wrapping:
-
-Server-Side Comment Wrapping
-============================
-
-Bugzilla stores comments unwrapped and wraps them at display time. This
-ensures proper wrapping in all browsers. Lines beginning with the ">"
-character are assumed to be quotes, and are not wrapped.
-
-.. _dependencytree:
-
-Dependency Tree
-===============
-
-On the ``Dependency tree`` page linked from each bug
-page, you can see the dependency relationship from the bug as a
-tree structure.
-
-You can change how much depth to show, and you can hide resolved bugs
-from this page. You can also collaps/expand dependencies for
-each bug on the tree view, using the \[-]/\[+] buttons that appear
-before its summary. This option is not available for terminal
-bugs in the tree (that don't have further dependencies).
-
-.. _timetracking:
-
-Time Tracking Information
-#########################
-
-Users who belong to the group specified by the ``timetrackinggroup``
-parameter have access to time-related fields. Developers can see
-deadlines and estimated times to fix bugs, and can provide time spent
-on these bugs. Users who do not belong to this group can only see the deadline,
-but not edit it. Other time-related fields remain invisible to them.
-
-At any time, a summary of the time spent by developers on bugs is
-accessible either from bug lists when clicking the ``Time Summary``
-button or from individual bugs when clicking the ``Summarize time``
-link in the time tracking table. The :file:`summarize_time.cgi`
-page lets you view this information either per developer or per bug,
-and can be split on a month basis to have greater details on how time
-is spent by developers.
-
-As soon as a bug is marked as RESOLVED, the remaining time expected
-to fix the bug is set to zero. This lets QA people set it again for
-their own usage, and it will be set to zero again when the bug will
-be marked as CLOSED.
-
-.. _userpreferences:
-
-User Preferences
-################
-
-Once logged in, you can customize various aspects of
-Bugzilla via the "Preferences" link in the page footer.
-The preferences are split into five tabs:
-
-.. _generalpreferences:
-
-General Preferences
-===================
-
-This tab allows you to change several default settings of Bugzilla.
-
-- Bugzilla's general appearance (skin) - select which skin to use.
-  Bugzilla supports adding custom skins.
-
-- Quote the associated comment when you click on its reply link - sets
-  the behavior of the comment "Reply" link. Options include quoting the
-  full comment, just reference the comment number, or turn the link off.
-
-- Language used in email - select which language email will be sent in,
-  from the list of available languages.
-
-- After changing a bug - This controls what page is displayed after
-  changes to a bug are submitted. The options include to show the bug
-  just modified, to show the next bug in your list, or to do nothing.
-
-- Enable tags for bugs - turn bug tagging on or off.
-
-- Zoom textareas large when in use (requires JavaScript) - enable or
-  disable the automatic expanding of text areas when  text is being
-  entered into them.
-
-- Field separator character for CSV files -
-  Select between a comma and semi-colon for exported CSV bug lists.
-
-- Automatically add me to the CC list of bugs I change - set default
-  behavior of CC list. Options include "Always", "Never", and "Only
-  if I have no role on them".
-
-- When viewing a bug, show comments in this order -
-  controls the order of comments. Options include "Oldest
-  to Newest", "Newest to Oldest" and "Newest to Oldest, but keep the
-  bug description at the top".
-
-- Show a quip at the top of each bug list - controls
-  whether a quip will be shown on the Bug list page.
-
-.. _emailpreferences:
-
-Email Preferences
-=================
-
-This tab allows you to enable or disable email notification on
-specific events.
-
-In general, users have almost complete control over how much (or
-how little) email Bugzilla sends them. If you want to receive the
-maximum amount of email possible, click the ``Enable All
-Mail`` button. If you don't want to receive any email from
-Bugzilla at all, click the ``Disable All Mail`` button.
-
-.. note:: A Bugzilla administrator can stop a user from receiving
-   bugmail by clicking the ``Bugmail Disabled`` checkbox
-   when editing the user account. This is a drastic step
-   best taken only for disabled accounts, as it overrides
-   the user's individual mail preferences.
-
-There are two global options -- ``Email me when someone
-asks me to set a flag`` and ``Email me when someone
-sets a flag I asked for``. These define how you want to
-receive bugmail with regards to flags. Their use is quite
-straightforward; enable the checkboxes if you want Bugzilla to
-send you mail under either of the above conditions.
-
-If you'd like to set your bugmail to something besides
-'Completely ON' and 'Completely OFF', the
-``Field/recipient specific options`` table
-allows you to do just that. The rows of the table
-define events that can happen to a bug -- things like
-attachments being added, new comments being made, the
-priority changing, etc. The columns in the table define
-your relationship with the bug:
-
-- Reporter - Where you are the person who initially
-  reported the bug. Your name/account appears in the
-  ``Reporter:`` field.
-
-- Assignee - Where you are the person who has been
-  designated as the one responsible for the bug. Your
-  name/account appears in the ``Assigned To:``
-  field of the bug.
-
-- QA Contact - You are one of the designated
-  QA Contacts for the bug. Your account appears in the
-  ``QA Contact:`` text-box of the bug.
-
-- CC - You are on the list CC List for the bug.
-  Your account appears in the ``CC:`` text box
-  of the bug.
-
-- Voter - You have placed one or more votes for the bug.
-  Your account appears only if someone clicks on the
-  ``Show votes for this bug`` link on the bug.
-
-.. note:: Some columns may not be visible for your installation, depending
-   on your site's configuration.
-
-To fine-tune your bugmail, decide the events for which you want
-to receive bugmail; then decide if you want to receive it all
-the time (enable the checkbox for every column), or only when
-you have a certain relationship with a bug (enable the checkbox
-only for those columns). For example: if you didn't want to
-receive mail when someone added themselves to the CC list, you
-could uncheck all the boxes in the ``CC Field Changes``
-line. As another example, if you never wanted to receive email
-on bugs you reported unless the bug was resolved, you would
-un-check all boxes in the ``Reporter`` column
-except for the one on the ``The bug is resolved or
-verified`` row.
-
-.. note:: Bugzilla adds the ``X-Bugzilla-Reason`` header to
-   all bugmail it sends, describing the recipient's relationship
-   (AssignedTo, Reporter, QAContact, CC, or Voter) to the bug.
-   This header can be used to do further client-side filtering.
-
-Bugzilla has a feature called ``Users Watching``.
-When you enter one or more comma-delineated user accounts (usually email
-addresses) into the text entry box, you will receive a copy of all the
-bugmail those users are sent (security settings permitting).
-This powerful functionality enables seamless transitions as developers
-change projects or users go on holiday.
-
-.. note:: The ability to watch other users may not be available in all
-   Bugzilla installations. If you don't see this feature, and feel
-   that you need it, speak to your administrator.
-
-Each user listed in the ``Users watching you`` field
-has you listed in their ``Users to watch`` list
-and can get bugmail according to your relationship to the bug and
-their ``Field/recipient specific options`` setting.
-
-.. _savedsearches:
-
-Saved Searches
-==============
-
-On this tab you can view and run any Saved Searches that you have
-created, and also any Saved Searches that other members of the group
-defined in the "querysharegroup" parameter have shared.
-Saved Searches can be added to the page footer from this screen.
-If somebody is sharing a Search with a group she or he is allowed to
-:ref:`assign users to <groups>`, the sharer may opt to have
-the Search show up in the footer of the group's direct members by default.
-
-.. _accountpreferences:
-
-Account Information
-===================
-
-On this tab, you can change your basic account information,
-including your password, email address and real name. For security
-reasons, in order to change anything on this page you must type your
-*current* password into the ``Password``
-field at the top of the page.
-If you attempt to change your email address, a confirmation
-email is sent to both the old and new addresses, with a link to use to
-confirm the change. This helps to prevent account hijacking.
-
-.. _apikey:
-
-API Keys
-========
-
-API keys are used to authenticate WebService API calls. You can create more than
-one API key if required. Each API key has an optional description which can help
-you record what each key is used for.
-
-On this page, you can unrevoke, revoke and change the description of existing
-API keys for your login. A revoked key means that it cannot be used. The
-description for purely for your information, and is optional.
-
-You can also create a new API key by selecting the check box under the 'New
-API key' section of the page.
-
-.. _permissionsettings:
-
-Permissions
-===========
-
-This is a purely informative page which outlines your current
-permissions on this installation of Bugzilla.
-
-A complete list of permissions is below. Only users with
-*editusers* privileges can change the permissions
-of other users.
-
-admin
-    Indicates user is an Administrator.
-
-bz_canusewhineatothers
-    Indicates user can configure whine reports for other users.
-
-bz_canusewhines
-    Indicates user can configure whine reports for self.
-
-bz_quip_moderators
-    Indicates user can moderate quips.
-
-bz_sudoers
-    Indicates user can perform actions as other users.
-
-bz_sudo_protect
-    Indicates user cannot be impersonated by other users.
-
-canconfirm
-    Indicates user can confirm a bug or mark it a duplicate.
-
-creategroups
-    Indicates user can create and destroy groups.
-
-editbugs
-    Indicates user can edit all bug fields.
-
-editclassifications
-    Indicates user can create, destroy, and edit classifications.
-
-editcomponents
-    Indicates user can create, destroy, and edit components.
-
-editkeywords
-    Indicates user can create, destroy, and edit keywords.
-
-editusers
-    Indicates user can edit or disable users.
-
-tweakparams
-    Indicates user can change Parameters.
-
-.. note:: For more information on how permissions work in Bugzilla (i.e. who can
-   change what), see  :ref:`cust-change-permissions`.
-
-.. _reporting:
-
-Reports and Charts
-##################
-
-As well as the standard buglist, Bugzilla has two more ways of
-viewing sets of bugs. These are the reports (which give different
-views of the current state of the database) and charts (which plot
-the changes in particular sets of bugs over time.)
-
-.. _reports:
-
-Reports
-=======
-
-A report is a view of the current state of the bug database.
-
-You can run either an HTML-table-based report, or a graphical
-line/pie/bar-chart-based one. The two have different pages to
-define them, but are close cousins - once you've defined and
-viewed a report, you can switch between any of the different
-views of the data at will.
-
-Both report types are based on the idea of defining a set of bugs
-using the standard search interface, and then choosing some
-aspect of that set to plot on the horizontal and/or vertical axes.
-You can also get a form of 3-dimensional report by choosing to have
-multiple images or tables.
-
-So, for example, you could use the search form to choose "all
-bugs in the WorldControl product", and then plot their severity
-against their component to see which component had had the largest
-number of bad bugs reported against it.
-
-Once you've defined your parameters and hit "Generate Report",
-you can switch between HTML, CSV, Bar, Line and Pie. (Note: Pie
-is only available if you didn't define a vertical axis, as pie
-charts don't have one.) The other controls are fairly self-explanatory;
-you can change the size of the image if you find text is overwriting
-other text, or the bars are too thin to see.
-
-.. _charts:
-
-Charts
-======
-
-A chart is a view of the state of the bug database over time.
-
-Bugzilla currently has two charting systems - Old Charts and New
-Charts. Old Charts have been part of Bugzilla for a long time; they
-chart each status and resolution for each product, and that's all.
-They are deprecated, and going away soon - we won't say any more
-about them.
-New Charts are the future - they allow you to chart anything you
-can define as a search.
-
-.. note:: Both charting forms require the administrator to set up the
-   data-gathering script. If you can't see any charts, ask them whether
-   they have done so.
-
-An individual line on a chart is called a data set.
-All data sets are organised into categories and subcategories. The
-data sets that Bugzilla defines automatically use the Product name
-as a Category and Component names as Subcategories, but there is no
-need for you to follow that naming scheme with your own charts if
-you don't want to.
-
-Data sets may be public or private. Everyone sees public data sets in
-the list, but only their creator sees private data sets. Only
-administrators can make data sets public.
-No two data sets, even two private ones, can have the same set of
-category, subcategory and name. So if you are creating private data
-sets, one idea is to have the Category be your username.
-
-Creating Charts
----------------
-
-You create a chart by selecting a number of data sets from the
-list, and pressing Add To List for each. In the List Of Data Sets
-To Plot, you can define the label that data set will have in the
-chart's legend, and also ask Bugzilla to Sum a number of data sets
-(e.g. you could Sum data sets representing RESOLVED, VERIFIED and
-CLOSED in a particular product to get a data set representing all
-the resolved bugs in that product.)
-
-If you've erroneously added a data set to the list, select it
-using the checkbox and click Remove. Once you add more than one
-data set, a "Grand Total" line
-automatically appears at the bottom of the list. If you don't want
-this, simply remove it as you would remove any other line.
-
-You may also choose to plot only over a certain date range, and
-to cumulate the results - that is, to plot each one using the
-previous one as a baseline, so the top line gives a sum of all
-the data sets. It's easier to try than to explain :-)
-
-Once a data set is in the list, one can also perform certain
-actions on it. For example, one can edit the
-data set's parameters (name, frequency etc.) if it's one you
-created or if you are an administrator.
-
-Once you are happy, click Chart This List to see the chart.
-
-.. _charts-new-series:
-
-Creating New Data Sets
-----------------------
-
-You may also create new data sets of your own. To do this,
-click the "create a new data set" link on the Create Chart page.
-This takes you to a search-like interface where you can define
-the search that Bugzilla will plot. At the bottom of the page,
-you choose the category, sub-category and name of your new
-data set.
-
-If you have sufficient permissions, you can make the data set public,
-and reduce the frequency of data collection to less than the default
-seven days.
-
-.. _flags:
-
-Flags
-#####
-
-A flag is a kind of status that can be set on bugs or attachments
-to indicate that the bugs/attachments are in a certain state.
-Each installation can define its own set of flags that can be set
-on bugs or attachments.
-
-If your installation has defined a flag, you can set or unset that flag,
-and if your administrator has enabled requesting of flags, you can submit
-a request for another user to set the flag.
-
-To set a flag, select either "+" or "-" from the drop-down menu next to
-the name of the flag in the "Flags" list.  The meaning of these values are
-flag-specific and thus cannot be described in this documentation,
-but by way of example, setting a flag named "review" to "+" may indicate
-that the bug/attachment has passed review, while setting it to "-"
-may indicate that the bug/attachment has failed review.
-
-To unset a flag, click its drop-down menu and select the blank value.
-Note that marking an attachment as obsolete automatically cancels all
-pending requests for the attachment.
-
-If your administrator has enabled requests for a flag, request a flag
-by selecting "?" from the drop-down menu and then entering the username
-of the user you want to set the flag in the text field next to the menu.
-
-A set flag appears in bug reports and on "edit attachment" pages with the
-abbreviated username of the user who set the flag prepended to the
-flag name. For example, if Jack sets a "review" flag to "+", it appears
-as Jack: review [ + ]
-
-A requested flag appears with the user who requested the flag prepended
-to the flag name and the user who has been requested to set the flag
-appended to the flag name within parentheses.  For example, if Jack
-asks Jill for review, it appears as Jack: review [ ? ] (Jill).
-
-You can browse through open requests made of you and by you by selecting
-'My Requests' from the footer. You can also look at open requests limited
-by other requesters, requestees, products, components, and flag names from
-this page. Note that you can use '-' for requestee to specify flags with
-'no requestee' set.
-
-.. _whining:
-
-Whining
-#######
-
-Whining is a feature in Bugzilla that can regularly annoy users at
-specified times.  Using this feature, users can execute saved searches
-at specific times (i.e. the 15th of the month at midnight) or at
-regular intervals (i.e. every 15 minutes on Sundays).  The results of the
-searches are sent to the user, either as a single email or as one email
-per bug, along with some descriptive text.
-
-.. warning:: Throughout this section it will be assumed that all users are members
-   of the bz_canusewhines group, membership in which is required in order
-   to use the Whining system.  You can easily make all users members of
-   the bz_canusewhines group by setting the User RegExp to ".*" (without
-   the quotes).
-
-   Also worth noting is the bz_canusewhineatothers group.  Members of this
-   group can create whines for any user or group in Bugzilla using a
-   extended form of the whining interface.  Features only available to
-   members of the bz_canusewhineatothers group will be noted in the
-   appropriate places.
-
-.. note:: For whining to work, a special Perl script must be executed at regular
-   intervals.  More information on this is available in :ref:`installation-whining`.
-
-.. note:: This section does not cover the whineatnews.pl script.
-   See :ref:`installation-whining-cron` for more information on
-   The Whining Cron.
-
-.. _whining-overview:
-
-The Event
-=========
-
-The whining system defines an "Event" as one or more queries being
-executed at regular intervals, with the results of said queries (if
-there are any) being emailed to the user.  Events are created by
-clicking on the "Add new event" button.
-
-Once a new event is created, the first thing to set is the "Email
-subject line".  The contents of this field will be used in the subject
-line of every email generated by this event.  In addition to setting a
-subject, space is provided to enter some descriptive text that will be
-included at the top of each message (to help you in understanding why
-you received the email in the first place).
-
-The next step is to specify when the Event is to be run (the Schedule)
-and what searches are to be performed (the Searches).
-
-.. _whining-schedule:
-
-Whining Schedule
-================
-
-Each whining event is associated with zero or more schedules.  A
-schedule is used to specify when the search (specified below) is to be
-run.  A new event starts out with no schedules (which means it will
-never run, as it is not scheduled to run).  To add a schedule, press
-the "Add a new schedule" button.
-
-Each schedule includes an interval, which you use to tell Bugzilla
-when the event should be run.  An event can be run on certain days of
-the week, certain days of the month, during weekdays (defined as
-Monday through Friday), or every day.
-
-.. warning:: Be careful if you set your event to run on the 29th, 30th, or 31st of
-   the month, as your event may not run exactly when expected.  If you
-   want your event to run on the last day of the month, select "Last day
-   of the month" as the interval.
-
-Once you have specified the day(s) on which the event is to be run, you
-should now specify the time at which the event is to be run.  You can
-have the event run at a certain hour on the specified day(s), or
-every hour, half-hour, or quarter-hour on the specified day(s).
-
-If a single schedule does not execute an event as many times as you
-would want, you can create another schedule for the same event.  For
-example, if you want to run an event on days whose numbers are
-divisible by seven, you would need to add four schedules to the event,
-setting the schedules to run on the 7th, 14th, 21st, and 28th (one day
-per schedule) at whatever time (or times) you choose.
-
-.. note:: If you are a member of the bz_canusewhineatothers group, then you
-   will be presented with another option: "Mail to".  Using this you
-   can control who will receive the emails generated by this event.  You
-   can choose to send the emails to a single user (identified by email
-   address) or a single group (identified by group name).  To send to
-   multiple users or groups, create a new schedule for each additional
-   user/group.
-
-.. _whining-query:
-
-Whining Searches
-================
-
-Each whining event is associated with zero or more searches.  A search
-is any saved search to be run as part of the specified schedule (see
-above).  You start out without any searches associated with the event
-(which means that the event will not run, as there will never be any
-results to return).  To add a search, press the "Add a search" button.
-
-The first field to examine in your newly added search is the Sort field.
-Searches are run, and results included, in the order specified by the
-Sort field.  Searches with smaller Sort values will run before searches
-with bigger Sort values.
-
-The next field to examine is the Search field.  This is where you
-choose the actual search that is to be run.  Instead of defining search
-parameters here, you are asked to choose from the list of saved
-searches (the same list that appears at the bottom of every Bugzilla
-page).  You are only allowed to choose from searches that you have
-saved yourself (the default saved search, "My Bugs", is not a valid
-choice).  If you do not have any saved searches, you can take this
-opportunity to create one (see :ref:`list`).
-
-.. note:: When running searches, the whining system acts as if you are the user
-   executing the search.  This means that the whining system will ignore
-   bugs that match your search, but that you cannot access.
-
-Once you have chosen the saved search to be executed, give the search a
-descriptive title.  This title will appear in the email, above the
-results of the search.  If you choose "One message per bug", the search
-title will appear at the top of each email that contains a bug matching
-your search.
-
-Finally, decide if the results of the search should be sent in a single
-email, or if each bug should appear in its own email.
-
-.. warning:: Think carefully before checking the "One message per bug" box.  If
-   you create a search that matches thousands of bugs, you will receive
-   thousands of emails!
-
-Saving Your Changes
-===================
-
-Once you have defined at least one schedule, and created at least one
-search, go ahead and "Update/Commit".  This will save your Event and make
-it available for immediate execution.
-
-.. note:: If you ever feel like deleting your event, you may do so using the
-   "Remove Event" button in the upper-right corner of each Event.  You
-   can also modify an existing event, so long as you "Update/Commit"
-   after completing your modifications.
-
-
diff --git a/docs/en/rst/using/creating-an-account.rst b/docs/en/rst/using/creating-an-account.rst
new file mode 100644
index 0000000000..0ea42ee5db
--- /dev/null
+++ b/docs/en/rst/using/creating-an-account.rst
@@ -0,0 +1,39 @@
+.. _creating-an-account:
+
+Creating an Account
+###################
+
+If you want to use a particular installation of Bugzilla, first you need to
+create an account. Ask the administrator responsible for your installation
+for the URL you should use to access it. If you're test-driving Bugzilla,
+you can use one of the installations on
+`Landfill <http://landfill.bugzilla.org/>`_.
+
+The process of creating an account is similar to many other websites.
+
+#. On the home page, click the :guilabel:`New Account` link in the header.
+   Enter your email address, then click the ``Send``
+   button.
+
+   .. note:: If the :guilabel:`New Account` link is not available, this means that the
+      administrator of the installation has disabled self-registration.
+      Speak to the administrator to find out how to get an account.
+
+#. Within moments, you should
+   receive an email to the address you provided, which contains your
+   login name (generally the same as the email address), and a URL to
+   click to confirm your registration.
+
+#. Once you confirm your registration, Bugzilla will ask you your real name
+   (optional, but recommended) and ask you to choose a password. Depending
+   on how your Bugzilla is configured, there may be minimum complexity
+   requirements for the password.
+
+#. Now all you need to do is to click the :guilabel:`Log In`
+   link in the header or footer,
+   enter your email address and the password you just chose into the
+   login form, and click the :guilabel:`Log in` button.
+
+You are now logged in. Bugzilla uses cookies to remember you are
+logged in, so, unless you have cookies disabled or your IP address changes,
+you should not have to log in again during your session.
diff --git a/docs/en/rst/using/editing.rst b/docs/en/rst/using/editing.rst
new file mode 100644
index 0000000000..c147d9d3b9
--- /dev/null
+++ b/docs/en/rst/using/editing.rst
@@ -0,0 +1,98 @@
+.. _editing:
+
+Editing a Bug
+#############
+
+.. _attachments:
+
+Attachments
+===========
+
+Attachments are used to attach relevant files to bugs - patches, screenshots,
+test cases, debugging aids or logs, or anything else binary or too large to
+fit into a comment.
+
+You should use attachments, rather than comments, for large chunks of plain
+text data, such as trace, debugging output files, or log files. That way, it
+doesn't bloat the bug for everyone who wants to read it, and cause people to
+receive large, useless mails.
+
+You should make sure to trim screenshots. There's no need to show the
+whole screen if you are pointing out a single-pixel problem.
+
+Bugzilla stores and uses a Content-Type for each attachment
+(e.g. text/html). To download an attachment as a different
+Content-Type (e.g. application/xhtml+xml), you can override this
+using a 'content_type' parameter on the URL, e.g.
+:file:`&content_type=text/plain`.
+
+Also, you can enter the URL pointing to the attachment instead of
+uploading the attachment itself. For example, this is useful if you want to
+point to an external application, a website or a very large file.
+
+It's also possible to create an attachment by pasting text directly in a text
+field; Bugzilla will convert it into an attachment. This is pretty useful
+when you are copying and pasting, to avoid the extra step of saving the text
+in a temporary file.
+
+.. _editing-flags:
+
+Flags
+=====
+
+To set a flag, select either :guilabel:`+` or :guilabel:`-` from the drop-down
+menu next to the name of the flag in the :guilabel:`Flags` list. The meaning
+of these values are flag-specific and thus cannot be described in this
+documentation, but by way of example, setting a flag named :guilabel:`review`
+:guilabel:`+` may indicate that the bug/attachment has passed review, while
+setting it to :guilabel:`-` may indicate that the bug/attachment has failed
+review.
+
+To unset a flag, click its drop-down menu and select the blank value.
+Note that marking an attachment as obsolete automatically cancels all
+pending requests for the attachment.
+
+If your administrator has enabled requests for a flag, request a flag
+by selecting :guilabel:`?` from the drop-down menu and then entering the
+username of the user you want to set the flag in the text field next to the
+menu.
+
+.. _time-tracking:
+
+Time Tracking
+=============
+
+Users who belong to the group specified by the ``timetrackinggroup``
+parameter have access to time-related fields. Developers can see
+deadlines and estimated times to fix bugs, and can provide time spent
+on these bugs. Users who do not belong to this group can only see the deadline
+but not edit it. Other time-related fields remain invisible to them.
+
+At any time, a summary of the time spent by developers on bugs is
+accessible either from bug lists when clicking the ``Time Summary``
+button or from individual bugs when clicking the ``Summarize time``
+link in the time tracking table. The :file:`summarize_time.cgi`
+page lets you view this information either per developer or per bug
+and can be split on a month basis to have greater details on how time
+is spent by developers.
+
+As soon as a bug is marked as RESOLVED, the remaining time expected
+to fix the bug is set to zero. This lets QA people set it again for
+their own usage, and it will be set to zero again when the bug is
+marked as VERIFIED.
+
+.. _lifecycle:
+
+Life Cycle of a Bug
+===================
+
+The life cycle of a bug, also known as workflow, is customizable to match
+the needs of your organization (see :ref:`workflow`).
+The image below contains a graphical representation of
+the default workflow using the default bug statuses. If you wish to
+customize this image for your site, the
+`diagram file <../../images/bzLifecycle.xml>`_
+is available in `Dia's <http://www.gnome.org/projects/dia>`_
+native XML format.
+
+.. image:: ../../images/bzLifecycle.png
diff --git a/docs/en/rst/using/extensions.rst b/docs/en/rst/using/extensions.rst
new file mode 100644
index 0000000000..28bae5be54
--- /dev/null
+++ b/docs/en/rst/using/extensions.rst
@@ -0,0 +1,18 @@
+.. _installed-extensions-user:
+
+Installed Extensions
+====================
+
+Bugzilla can be enhanced using extensions (see :ref:`extensions`). If an
+extension comes with documentation in the appropriate format, and you build
+your own copy of the Bugzilla documentation using :file:`makedocs.pl`, then
+the documentation for your installed extensions will show up here.
+
+Your Bugzilla installation has the following extensions available (as of the
+last time you compiled the documentation):
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   ../extensions/*/index-user
diff --git a/docs/en/rst/using/filing.rst b/docs/en/rst/using/filing.rst
new file mode 100644
index 0000000000..788cebbd51
--- /dev/null
+++ b/docs/en/rst/using/filing.rst
@@ -0,0 +1,82 @@
+.. _filing:
+
+Filing a Bug
+############
+
+Reporting a New Bug
+===================
+
+Years of bug writing experience has been distilled for your
+reading pleasure into the
+`Bug Writing Guidelines <http://landfill.bugzilla.org/bugzilla-tip/page.cgi?id=bug-writing.html>`_.
+While some of the advice is Mozilla-specific, the basic principles of
+reporting Reproducible, Specific bugs and isolating the Product you are
+using, the Version of the Product, the Component which failed, the Hardware
+Platform, and Operating System you were using at the time of the failure go a
+long way toward ensuring accurate, responsible fixes for the bug that bit you.
+
+.. note:: If you want to file a test bug to see how Bugzilla works,
+   you can do it on one of our test installations on
+   `Landfill <http://landfill.bugzilla.org/>`_. Please don't do it on anyone's
+   production Bugzilla installation.
+
+The procedure for filing a bug is as follows:
+
+#. Click the :guilabel:`New` link available in the header or footer
+   of pages, or the :guilabel:`File a Bug` link on the home page.
+
+#. First, you have to select the product in which you found a bug.
+
+#. You now see a form where you can specify the component (part of
+   the product which is affected by the bug you discovered; if you have
+   no idea, just select :guilabel:`General` if such a component exists),
+   the version of the program you were using, the operating system and
+   platform your program is running on and the severity of the bug (if the
+   bug you found crashes the program, it's probably a major or a critical
+   bug; if it's a typo somewhere, that's something pretty minor; if it's
+   something you would like to see implemented, then that's an enhancement).
+
+#. You also need to provide a short but descriptive summary of the bug you found.
+   "My program is crashing all the time" is a very poor summary
+   and doesn't help developers at all. Try something more meaningful or
+   your bug will probably be ignored due to a lack of precision.
+   In the Description, give a detailed list of steps to reproduce
+   the problem you encountered. Try to limit these steps to a minimum set
+   required to reproduce the problem. This will make the life of
+   developers easier, and the probability that they consider your bug in
+   a reasonable timeframe will be much higher.
+
+   .. note:: Try to make sure that everything in the Summary is also in the 
+      Description. Summaries are often updated and this will ensure your original
+      information is easily accessible.
+
+#. As you file the bug, you can also attach a document (testcase, patch,
+   or screenshot of the problem).
+
+#. Depending on the Bugzilla installation you are using and the product in
+   which you are filing the bug, you can also request developers to consider
+   your bug in different ways (such as requesting review for the patch you
+   just attached, requesting your bug to block the next release of the
+   product, and many other product-specific requests).
+
+#. Now is a good time to read your bug report again. Remove all misspellings;
+   otherwise, your bug may not be found by developers running queries for some
+   specific words, and so your bug would not get any attention.
+   Also make sure you didn't forget any important information developers
+   should know in order to reproduce the problem, and make sure your
+   description of the problem is explicit and clear enough.
+   When you think your bug report is ready to go, the last step is to
+   click the :guilabel:`Submit Bug` button to add your report into the database.
+
+.. _cloning-a-bug:
+
+Clone an Existing Bug
+=====================
+
+Bugzilla allows you to "clone" an existing bug. The newly created bug will
+inherit most settings from the old bug. This allows you to track similar
+concerns that require different handling in a new bug. To use this, go to
+the bug that you want to clone, then click the :guilabel:`Clone This Bug`
+link on the bug page. This will take you to the :guilabel:`Enter Bug`
+page that is filled with the values that the old bug has.
+You can then change the values and/or text if needed.
diff --git a/docs/en/rst/using/finding.rst b/docs/en/rst/using/finding.rst
new file mode 100644
index 0000000000..a8e18eef21
--- /dev/null
+++ b/docs/en/rst/using/finding.rst
@@ -0,0 +1,259 @@
+.. _finding:
+
+Finding Bugs
+############
+
+Bugzilla has a number of different search options.
+
+.. note:: Bugzilla queries are case-insensitive and accent-insensitive when
+    used with either MySQL or Oracle databases. When using Bugzilla with
+    PostgreSQL, however, some queries are case sensitive. This is due to
+    the way PostgreSQL handles case and accent sensitivity.
+
+.. _quicksearch:
+
+Quicksearch
+===========
+
+Quicksearch is a single-text-box query tool. You'll find it in
+Bugzilla's header or footer.
+
+Quicksearch uses
+metacharacters to indicate what is to be searched. For example, typing
+
+  ``foo|bar``
+
+into Quicksearch would search for "foo" or "bar" in the
+summary and status whiteboard of a bug; adding
+
+  ``:BazProduct``
+
+would search only in that product.
+
+You can also use it to go directly to a bug by entering its number or its
+alias.
+
+Simple Search
+=============
+
+Simple Search is good for finding one particular bug. It works like internet
+search engines - just enter some keywords and off you go.
+
+Advanced Search
+===============
+
+The Advanced Search page is used to produce a list of all bugs fitting
+exact criteria. `You can play with it on
+Landfill <http://landfill.bugzilla.org/bugzilla-tip/query.cgi?format=advanced>`_.
+
+Advanced Search has controls for selecting different possible
+values for all of the fields in a bug, as described above. For some
+fields, multiple values can be selected. In those cases, Bugzilla
+returns bugs where the content of the field matches any one of the selected
+values. If none is selected, then the field can take any value.
+
+After a search is run, you can save it as a Saved Search, which
+will appear in the page footer. If you are in the group defined
+by the "querysharegroup" parameter, you may share your queries
+with other users; see :ref:`saved-searches` for more details.
+
+.. _custom-search:
+
+Custom Search
+=============
+
+Highly advanced querying is done using the :guilabel:`Custom Search` feature
+of the :guilabel:`Advanced Search` page.
+
+The search criteria here further restrict the set of results
+returned by a query, over and above those defined in the fields at the top
+of the page. It is thereby possible to search for bugs
+based on elaborate combinations of criteria.
+
+The simplest custom searches have only one term. These searches
+permit the selected *field*
+to be compared using a
+selectable *operator* to a
+specified *value.* Much of this could be reproduced using the standard
+fields. However, you can then combine terms using "Match ANY" or "Match ALL",
+using parentheses for combining and priority, in order to construct searches
+of almost arbitrary complexity.
+
+There are three fields in each row (known as a "term") of a custom search:
+
+- *Field:*
+  the name of the field being searched
+
+- *Operator:*
+  the comparison operator
+
+- *Value:*
+  the value to which the field is being compared
+
+The list of available *fields* contains all the fields defined for a bug,
+including any custom fields, and then also some pseudofields like
+:guilabel:`Assignee Real Name`, :guilabel:`Days Since Bug Changed`,
+:guilabel:`Time Since Assignee Touched` and other things it may be useful to
+search on.
+
+There are a wide range of *operators* available, not all of which may make
+sense for a particular field. There are various string-matching operations
+(including regular expressions), numerical comparisons (which also work for
+dates), and also the ability to search for change information—when a field
+changed, what it changed from or to, and who did it. There are special
+operators for :guilabel:`is empty` and :guilabel:`is not empty`, because
+Bugzilla can't tell the difference between a value field left blank on
+purpose and one left blank by accident.
+
+You can have an arbitrary number of rows, and the dropdown box above them
+defines how they relate—:guilabel:`Match ALL of the following separately`,
+:guilabel:`Match ANY of the following separately`, or :guilabel:`Match ALL of
+the following against the same field`. The difference between the first and
+the third can be illustrated with a comment search. If you have a search::
+
+    Comment   contains the string   "Fred"
+    Comment   contains the string   "Barney"
+
+then under the first regime (match separately) the search would return bugs
+where "Fred" appeared in one comment and "Barney" in the same or any other
+comment, whereas under the second (match against the same field), both strings
+would need to occur in exactly the same comment.
+
+.. _advanced-features:
+
+Advanced Features
+-----------------
+
+If you click :guilabel:`Show Advanced Features`, then more capabilities appear.
+You can negate any row with a checkbox (see below) and also group lines of the
+search with parentheses to determine how different search terms relate. Within
+each bracketed set, you get the choice of combining them using ALL (i.e. AND)
+or ANY (i.e. OR).
+
+Negation
+--------
+
+At first glance, negation seems redundant. Rather than
+searching for::
+
+    NOT ( summary   contains the string   "foo" )
+
+one could search for::
+
+    summary   does not contain the string   "foo"
+
+However, the search::
+
+    CC   does not contain the string   "@mozilla.org"
+
+would find every bug where anyone on the CC list did not contain
+"@mozilla.org" while::
+
+    NOT ( CC   contains the string   "@mozilla.org" )
+
+would find every bug where there was nobody on the CC list who
+did contain the string. Similarly, the use of negation also permits
+complex expressions to be built using terms OR'd together and then
+negated. Negation permits queries such as::
+
+    NOT ( ( product   equals   "Update" )
+          OR
+          ( component   equals   "Documentation" )
+        )
+
+to find bugs that are neither
+in the :guilabel:`Update` product or in the :guilabel:`Documentation` component
+or::
+
+    NOT ( ( commenter   equals   "%assignee%" )
+          OR
+          (component   equals   "Documentation" )
+        )
+
+to find non-documentation bugs on which the assignee has never commented.
+
+.. _pronouns:
+
+Pronoun Substitution
+--------------------
+
+Sometimes, a query needs to compare a user-related field
+(such as :guilabel:`Reporter`) with a role-specific user (such as the
+user running the query or the user to whom each bug is assigned). For
+example, you may want to find all bugs that are assigned to the person
+who reported them.
+
+When the :guilabel:`Custom Search` operator is either :guilabel:`equals` or
+:guilabel:`notequals`, the value can be "%reporter%", "%assignee%",
+"%qacontact%", or "%user%". These are known as "pronouns". The user pronoun
+refers to the user who is executing the query or, in the case
+of whining reports, the user who will be the recipient
+of the report. The reporter, assignee, and qacontact
+pronouns refer to the corresponding fields in the bug.
+
+This feature also lets you search by a user's group memberships. If the
+operator is either :guilabel:`equals`, :guilabel:`notequals` or
+:guilabel:`anyexact`, you can search for
+whether a user belongs (or not) to the specified group. The group name must be
+entered using "%group.foo%" syntax, where "foo" is the group name.
+So if you are looking for bugs reported by any user being in the
+"editbugs" group, then you can use::
+
+    reporter   equals   "%group.editbugs%"
+
+.. _list:
+
+Bug Lists
+=========
+
+The result of a search is a list of matching bugs.
+
+The format of the list is configurable. For example, it can be
+sorted by clicking the column headings. Other useful features can be
+accessed using the links at the bottom of the list:
+
+Long Format:
+    this gives you a large page with a non-editable summary of the fields
+    of each bug.
+
+XML (icon):
+    get the buglist in an XML format.
+
+CSV (icon):
+    get the buglist as comma-separated values, for import into e.g.
+    a spreadsheet.
+
+Feed (icon):
+    get the buglist as an Atom feed.  Copy this link into your
+    favorite feed reader.  If you are using Firefox, you can also
+    save the list as a live bookmark by clicking the live bookmark
+    icon in the status bar.  To limit the number of bugs in the feed,
+    add a limit=n parameter to the URL.
+
+iCalendar (icon):
+    Get the buglist as an iCalendar file. Each bug is represented as a
+    to-do item in the imported calendar.
+
+Change Columns:
+    change the bug attributes which appear in the list.
+
+Change Several Bugs At Once:
+    If your account is sufficiently empowered, and more than one bug
+    appears in the bug list, this link is displayed and lets you easily make
+    the same change to all the bugs in the list - for example, changing
+    their assignee.
+
+Send Mail to Bug Assignees:
+    If more than one bug appear in the bug list and there are at least
+    two distinct bug assignees, this links is displayed which lets you
+    easily send a mail to the assignees of all bugs on the list.
+
+Edit Search:
+    If you didn't get exactly the results you were looking for, you can
+    return to the Query page through this link and make small revisions
+    to the query you just made so you get more accurate results.
+
+Remember Search As:
+    You can give a search a name and remember it; a link will appear
+    in your page footer giving you quick access to run it again later.
+
diff --git a/docs/en/rst/using/index.rst b/docs/en/rst/using/index.rst
new file mode 100644
index 0000000000..73aa707c31
--- /dev/null
+++ b/docs/en/rst/using/index.rst
@@ -0,0 +1,19 @@
+.. _using:
+
+==========
+User Guide
+==========
+
+.. toctree::
+   :maxdepth: 2
+
+   creating-an-account
+   filing
+   understanding
+   editing
+   finding
+   reports-and-charts
+   tips
+   preferences
+   extensions
+
diff --git a/docs/en/rst/using/preferences.rst b/docs/en/rst/using/preferences.rst
new file mode 100644
index 0000000000..f0ffc5c1a5
--- /dev/null
+++ b/docs/en/rst/using/preferences.rst
@@ -0,0 +1,214 @@
+.. _user-preferences:
+
+User Preferences
+################
+
+Once logged in, you can customize various aspects of
+Bugzilla via the "Preferences" link in the page footer.
+The preferences are split into a number of tabs, detailed in the sections
+below.
+
+.. _generalpreferences:
+
+General Preferences
+===================
+
+This tab allows you to change several default settings of Bugzilla.
+Administrators have the power to remove preferences from this list, so you
+may not see all the preferences available.
+
+Each preference should be self-explanatory.
+
+.. _emailpreferences:
+
+Email Preferences
+=================
+
+This tab allows you to enable or disable email notification on
+specific events.
+
+In general, users have almost complete control over how much (or
+how little) email Bugzilla sends them. If you want to receive the
+maximum amount of email possible, click the ``Enable All
+Mail`` button. If you don't want to receive any email from
+Bugzilla at all, click the ``Disable All Mail`` button.
+
+.. note:: A Bugzilla administrator can stop a user from receiving
+   bugmail by clicking the ``Bugmail Disabled`` checkbox
+   when editing the user account. This is a drastic step
+   best taken only for disabled accounts, as it overrides
+   the user's individual mail preferences.
+
+There are two global options -- ``Email me when someone
+asks me to set a flag`` and ``Email me when someone
+sets a flag I asked for``. These define how you want to
+receive bugmail with regards to flags. Their use is quite
+straightforward: enable the checkboxes if you want Bugzilla to
+send you mail under either of the above conditions.
+
+If you'd like to set your bugmail to something besides
+'Completely ON' and 'Completely OFF', the
+``Field/recipient specific options`` table
+allows you to do just that. The rows of the table
+define events that can happen to a bug -- things like
+attachments being added, new comments being made, the
+priority changing, etc. The columns in the table define
+your relationship with the bug - reporter, assignee, QA contact (if enabled)
+or CC list member.
+
+To fine-tune your bugmail, decide the events for which you want
+to receive bugmail; then decide if you want to receive it all
+the time (enable the checkbox for every column) or only when
+you have a certain relationship with a bug (enable the checkbox
+only for those columns). For example, if you didn't want to
+receive mail when someone added themselves to the CC list, you
+could uncheck all the boxes in the ``CC Field Changes``
+line. As another example, if you never wanted to receive email
+on bugs you reported unless the bug was resolved, you would
+uncheck all boxes in the ``Reporter`` column
+except for the one on the ``The bug is resolved or
+verified`` row.
+
+.. note:: Bugzilla adds the ``X-Bugzilla-Reason`` header to
+   all bugmail it sends, describing the recipient's relationship
+   (AssignedTo, Reporter, QAContact, CC, or Voter) to the bug.
+   This header can be used to do further client-side filtering.
+
+Bugzilla has a feature called ``User Watching``.
+When you enter one or more comma-delineated user accounts (usually email
+addresses) into the text entry box, you will receive a copy of all the
+bugmail those users are sent (security settings permitting).
+This powerful functionality enables seamless transitions as developers
+change projects or users go on holiday.
+
+Each user listed in the ``Users watching you`` field
+has you listed in their ``Users to watch`` list
+and can get bugmail according to your relationship to the bug and
+their ``Field/recipient specific options`` setting.
+
+Lastly, you can define a list of bugs on which you no longer wish to receive
+any email, ever. (You can also add bugs to this list individually by checking
+the "Ignore Bug Mail" checkbox on the bug page for that bug.) This is useful
+for ignoring bugs where you are the reporter, as that's a role it's not
+possible to stop having.
+
+.. _saved-searches:
+
+Saved Searches
+==============
+
+On this tab you can view and run any Saved Searches that you have
+created, and any Saved Searches that other members of the group
+defined in the :param:`querysharegroup` parameter have shared.
+Saved Searches can be added to the page footer from this screen.
+If somebody is sharing a Search with a group they are allowed to
+:ref:`assign users to <groups>`, the sharer may opt to have
+the Search show up in the footer of the group's direct members by default.
+
+.. _account-information:
+
+Account Information
+===================
+
+On this tab, you can change your basic account information,
+including your password, email address and real name. For security
+reasons, in order to change anything on this page you must type your
+*current* password into the ``Password``
+field at the top of the page.
+If you attempt to change your email address, a confirmation
+email is sent to both the old and new addresses with a link to use to
+confirm the change. This helps to prevent account hijacking.
+
+.. _api-keys:
+
+API Keys
+========
+
+API keys allow you to give a "token" to some external software so it can log
+in to the WebService API as you without knowing your password. You can then
+revoke that token if you stop using the web service, and you don't need to
+change your password everywhere.
+
+You can create more than one API key if required. Each API key has an optional
+description which can help you record what it is used for.
+
+On this page, you can unrevoke, revoke and change the description of existing
+API keys for your login. A revoked key means that it cannot be used. The
+description is optional and purely for your information.
+
+You can also create a new API key by selecting the checkbox under the 'New
+API key' section of the page.
+
+.. _permissions:
+
+Permissions
+===========
+
+This is an informational page which outlines your current
+permissions on this installation of Bugzilla.
+
+A complete list of available permissions in a default install of Bugzilla is
+below. Your administrator may have defined other permissions. Only users with
+the *editusers* permission can change the permissions of other users.
+
+admin
+    User is an administrator, which (in normal circumstances) means they can
+    do anything.
+
+tweakparams
+    Permits user to change administration :ref:`Parameters <parameters>`, and
+    to enable, disable and change the default value of
+    :ref:`General Preferences <generalpreferences>`.
+
+bz_sudoers
+    Permits user to impersonate and perform actions as other users. This is
+    useful for admins to reproduce problems with Bugzilla, such as permissions
+    problems, that other users see.
+
+bz_sudo_protect
+    Indicates user cannot be impersonated by other users who have the
+    *bz_sudoers* permission.
+
+creategroups
+    Permits user to create, delete and edit permission groups.
+
+editclassifications
+    Permits user to create, delete and edit classifications.
+
+editcomponents
+    Permits user to create, delete and edit products, components,
+    versions, milestones and flag types.
+
+    This capability can also be given on a per-product basis.
+
+editkeywords
+    Permits user to create, delete and edit keywords.
+
+editusers
+    Permits user to create, disable and edit users.
+
+canconfirm
+    Permits user to confirm a bug (move it from UNCONFIRMED to
+    another status).
+
+    This permission is only used if you are using the UNCONFIRMED status in
+    any products. The *editbugs* permission implies this permission.
+
+    This capability can also be given on a per-product basis.
+
+editbugs
+    Permits user to edit all fields on a bug. Without this permission, users
+    can only edit bugs where they are the reporter or the assignee, or add
+    comments.
+
+    This capability can also be given on a per-product basis.
+
+bz_canusewhines
+    Permits user to configure whine reports to be sent to themselves.
+
+bz_canusewhineatothers
+    Permits user to configure whine reports to be sent to other users.
+
+bz_quip_moderators
+    Permits user to moderate the list of quips (pithy sayings at the top of
+    bug lists).
diff --git a/docs/en/rst/using/reports-and-charts.rst b/docs/en/rst/using/reports-and-charts.rst
new file mode 100644
index 0000000000..659cd5cbd4
--- /dev/null
+++ b/docs/en/rst/using/reports-and-charts.rst
@@ -0,0 +1,120 @@
+.. _reports-and-charts:
+
+Reports and Charts
+##################
+
+As well as the standard buglist, Bugzilla has two more ways of
+viewing sets of bugs. These are the reports (which give different
+views of the current state of the database) and charts (which plot
+the changes in particular sets of bugs over time).
+
+.. _reports:
+
+Reports
+=======
+
+A report is a view of the current state of the bug database.
+
+You can run either an HTML-table-based report, or a graphical
+line/pie/bar-chart-based one. The two have different pages to
+define them but are close cousins - once you've defined and
+viewed a report, you can switch between any of the different
+views of the data at will.
+
+Both report types are based on the idea of defining a set of bugs
+using the standard search interface and then choosing some
+aspect of that set to plot on the horizontal and/or vertical axes.
+You can also get a form of 3-dimensional report by choosing to have
+multiple images or tables.
+
+So, for example, you could use the search form to choose "all
+bugs in the WorldControl product" and then plot their severity
+against their component to see which component had had the largest
+number of bad bugs reported against it.
+
+Once you've defined your parameters and hit :guilabel:`Generate Report`,
+you can switch between HTML, CSV, Bar, Line and Pie. (Note: Pie
+is only available if you didn't define a vertical axis, as pie
+charts don't have one.) The other controls are fairly self-explanatory;
+you can change the size of the image if you find text is overwriting
+other text, or the bars are too thin to see.
+
+.. _charts:
+
+Charts
+======
+
+A chart is a view of the state of the bug database over time.
+
+Bugzilla currently has two charting systems - Old Charts and New
+Charts. Old Charts have been part of Bugzilla for a long time; they
+chart each status and resolution for each product, and that's all.
+They are deprecated, and going away soon - we won't say any more
+about them.
+New Charts are the future - they allow you to chart anything you
+can define as a search.
+
+.. note:: Both charting forms require the administrator to set up the
+   data-gathering script. If you can't see any charts, ask them whether
+   they have done so.
+
+An individual line on a chart is called a data set.
+All data sets are organised into categories and subcategories. The
+data sets that Bugzilla defines automatically use the Product name
+as a :guilabel:`Category` and Component names as :guilabel:`Subcategories`,
+but there is no need for you to follow that naming scheme with your own
+charts if you don't want to.
+
+Data sets may be public or private. Everyone sees public data sets in
+the list, but only their creator sees private data sets. Only
+administrators can make data sets public.
+No two data sets, even two private ones, can have the same set of
+category, subcategory and name. So if you are creating private data
+sets, one idea is to have the :guilabel:`Category` be your username.
+
+Creating Charts
+---------------
+
+You create a chart by selecting a number of data sets from the
+list and pressing :guilabel:`Add To List` for each. In the
+:guilabel:`List Of Data Sets To Plot`, you can define the label that data
+set will have in the chart's legend and also ask Bugzilla to :guilabel:`Sum`
+a number of data sets (e.g. you could :guilabel:`Sum` data sets representing
+:guilabel:`RESOLVED`, :guilabel:`VERIFIED` and :guilabel:`CLOSED` in a
+particular product to get a data set representing all the resolved bugs in
+that product.)
+
+If you've erroneously added a data set to the list, select it
+using the checkbox and click :guilabel:`Remove`. Once you add more than one
+data set, a :guilabel:`Grand Total` line
+automatically appears at the bottom of the list. If you don't want
+this, simply remove it as you would remove any other line.
+
+You may also choose to plot only over a certain date range, and
+to cumulate the results, that is, to plot each one using the
+previous one as a baseline so the top line gives a sum of all
+the data sets. It's easier to try than to explain :-)
+
+Once a data set is in the list, you can also perform certain
+actions on it. For example, you can edit the
+data set's parameters (name, frequency etc.) if it's one you
+created or if you are an administrator.
+
+Once you are happy, click :guilabel:`Chart This List` to see the chart.
+
+.. _charts-new-series:
+
+Creating New Data Sets
+----------------------
+
+You may also create new data sets of your own. To do this,
+click the :guilabel:`create a new data set` link on the
+:guilabel:`Create Chart` page. This takes you to a search-like interface
+where you can define the search that Bugzilla will plot. At the bottom of the
+page, you choose the category, sub-category and name of your new
+data set.
+
+If you have sufficient permissions, you can make the data set public,
+and reduce the frequency of data collection to less than the default
+of seven days.
+
diff --git a/docs/en/rst/using/tips.rst b/docs/en/rst/using/tips.rst
new file mode 100644
index 0000000000..2548a03aa2
--- /dev/null
+++ b/docs/en/rst/using/tips.rst
@@ -0,0 +1,86 @@
+.. _pro-tips:
+
+Pro Tips
+########
+
+This section distills some Bugzilla tips and best practices
+that have been developed.
+
+Autolinkification
+=================
+
+Bugzilla comments are plain text - so typing <U> will
+produce less-than, U, greater-than rather than underlined text.
+However, Bugzilla will automatically make hyperlinks out of certain
+sorts of text in comments. For example, the text
+``http://www.bugzilla.org`` will be turned into a link:
+`<http://www.bugzilla.org>`_.
+Other strings which get linkified in the obvious manner are:
+
++ bug 12345
+
++ bugs 123, 456, 789
+
++ comment 7
+
++ comments 1, 2, 3, 4
+
++ bug 23456, comment 53
+
++ attachment 4321
+
++ mailto\:george\@example.com
+
++ george\@example.com
+
++ ftp\://ftp.mozilla.org
+
++ Most other sorts of URL
+
+A corollary here is that if you type a bug number in a comment,
+you should put the word "bug" before it, so it gets autolinkified
+for the convenience of others.
+
+.. _commenting:
+
+Comments
+========
+
+If you are changing the fields on a bug, only comment if
+either you have something pertinent to say or Bugzilla requires it.
+Otherwise, you may spam people unnecessarily with bugmail.
+To take an example: a user can set up their account to filter out messages
+where someone just adds themselves to the CC field of a bug
+(which happens a lot). If you come along, add yourself to the CC field,
+and add a comment saying "Adding self to CC", then that person
+gets a pointless piece of mail they would otherwise have avoided.
+
+Don't use sigs in comments. Signing your name ("Bill") is acceptable,
+if you do it out of habit, but full mail/news-style
+four line ASCII art creations are not.
+
+If you feel a bug you filed was incorrectly marked as a
+DUPLICATE of another, please question it in your bug, not
+the bug it was duped to. Feel free to CC the person who duped it
+if they are not already CCed.
+
+.. _markdown:
+
+Markdown
+--------
+
+Markdown is a structured plain-text format which lets you write comments that
+have more styling than plain text. For example, you may use Markdown for
+making a part of your comment look italic or bold in the generated HTML.
+Bugzilla supports most of the structures defined by
+`standard Markdown <http://daringfireball.net/projects/markdown/basics>`_,
+but does **not** support inline images and inline HTML. For a complete
+reference on supported Markdown structures, please see the
+`syntax help <https://landfill.bugzilla.org/bugzilla-tip/page.cgi?id=markdown.html>`_ link
+next to the Markdown checkbox for new comments.
+
+To use the Markdown feature, make sure that :guilabel:`Enable Markdown
+support for comments` is set to :guilabel:`on`
+in your :ref:`user-preferences` and that you also check the :guilabel:`Use
+Markdown for this comment` option below the comment box when you want to
+submit a new comment which uses Markdown.
diff --git a/docs/en/rst/using/understanding.rst b/docs/en/rst/using/understanding.rst
new file mode 100644
index 0000000000..c52bd2167c
--- /dev/null
+++ b/docs/en/rst/using/understanding.rst
@@ -0,0 +1,303 @@
+.. _understanding:
+
+Understanding a Bug
+###################
+
+The core of Bugzilla is the screen which displays a particular
+bug. Note that the labels for most fields are hyperlinks;
+clicking them will take you to context-sensitive help on that
+particular field. Fields marked * may not be present on every
+installation of Bugzilla.
+
+*Summary:*
+   A one-sentence summary of the problem, displayed in the header next to
+   the bug number.
+
+*Status (and Resolution):*
+   These define exactly what state the bug is in—from not even
+   being confirmed as a bug, through to being fixed and the fix
+   confirmed by Quality Assurance. The different possible values for
+   Status and Resolution on your installation should be documented in the
+   context-sensitive help for those items.
+
+*Alias:*
+   A unique short text name for the bug, which can be used instead of the
+   bug number.
+
+*Product and Component*:
+   Bugs are divided up by Product and Component, with a Product
+   having one or more Components in it. 
+
+*Version:*
+   The "Version" field usually contains the numbers or names of released
+   versions of the product. It is used to indicate the version(s) affected by
+   the bug report.
+
+*Hardware (Platform and OS):*
+   These indicate the computing environment where the bug was
+   found.
+
+*Importance (Priority and Severity):*
+   The Priority field is used to prioritize bugs, either by the assignee,
+   or someone else with authority to direct their time such as a project
+   manager. It's a good idea not to change this on other people's bugs. The
+   default values are P1 to P5.
+
+   The Severity field indicates how severe the problem is—from blocker
+   ("application unusable") to trivial ("minor cosmetic issue"). You
+   can also use this field to indicate whether a bug is an enhancement
+   request.
+
+*\*Target Milestone:*
+   A future version by which the bug is to
+   be fixed. e.g. The Bugzilla Project's milestones for future
+   Bugzilla versions are 4.4, 5.0, 6.0, etc. Milestones are not
+   restricted to numbers, though—you can use any text strings, such
+   as dates.
+
+*Assigned To:*
+   The person responsible for fixing the bug.
+
+*\*QA Contact:*
+   The person responsible for quality assurance on this bug.
+
+*URL:*
+   A URL associated with the bug, if any.
+
+*\*Whiteboard:*
+   A free-form text area for adding short notes and tags to a bug.
+
+*Keywords:*
+   The administrator can define keywords which you can use to tag and
+   categorise bugs—e.g. ``crash`` or ``regression``.
+
+*Personal Tags:*
+   Unlike Keywords which are global and visible by all users, Personal Tags
+   are personal and can only be viewed and edited by their author. Editing
+   them won't send any notifications to other users. Use them to tag and keep
+   track of sets of bugs that you personally care about, using your own
+   classification system.
+
+*Dependencies (Depends On and Blocks):*
+   If this bug cannot be fixed unless other bugs are fixed (depends
+   on), or this bug stops other bugs being fixed (blocks), their
+   numbers are recorded here.
+
+   Clicking the :guilabel:`Dependency tree` link shows
+   the dependency relationships of the bug as a tree structure.
+   You can change how much depth to show, and you can hide resolved bugs
+   from this page. You can also collapse/expand dependencies for
+   each non-terminal bug on the tree view, using the [-]/[+] buttons that
+   appear before the summary.
+
+*Reported:*
+   The person who filed the bug, and the date and time they did it.
+
+*Modified:*
+   The date and time the bug was last changed.
+
+*CC List:*
+   A list of people who get mail when the bug changes, in addition to the
+   Reporter, Assignee and QA Contact (if enabled).
+
+*Ignore Bug Mail:*
+   Set this if you want never to get bugmail from this bug again. See also
+   :ref:`emailpreferences`.
+
+*\*See Also:*
+   Bugs, in this Bugzilla, other Bugzillas, or other bug trackers, that are
+   related to this one.
+
+*Flags:*
+   A flag is a kind of status that can be set on bugs or attachments
+   to indicate that the bugs/attachments are in a certain state.
+   Each installation can define its own set of flags that can be set
+   on bugs or attachments. See :ref:`flags`.
+
+*\*Time Tracking:*
+   This form can be used for time tracking.
+   To use this feature, you have to be a member of the group
+   specified by the :param:`timetrackinggroup` parameter. See
+   :ref:`time-tracking` for more information.
+
+   Orig. Est.:
+       This field shows the original estimated time.
+   Current Est.:
+       This field shows the current estimated time.
+       This number is calculated from ``Hours Worked``
+       and ``Hours Left``.
+   Hours Worked:
+       This field shows the number of hours worked.
+   Hours Left:
+       This field shows the ``Current Est.`` -
+       ``Hours Worked``.
+       This value + ``Hours Worked`` will become the
+       new Current Est.
+   %Complete:
+       This field shows what percentage of the task is complete.
+   Gain:
+       This field shows the number of hours that the bug is ahead of the
+       ``Orig. Est.``.
+   Deadline:
+       This field shows the deadline for this bug.
+
+*Attachments:*
+   You can attach files (e.g. test cases or patches) to bugs. If there
+   are any attachments, they are listed in this section. See
+   :ref:`attachments` for more information.
+
+*Additional Comments:*
+   You can add your two cents to the bug discussion here, if you have
+   something worthwhile to say.
+
+.. _flags:
+
+Flags
+=====
+
+Flags are a way to attach a specific status to a bug or attachment,
+either ``+`` or ``-``. The meaning of these symbols depends on the name of
+the flag itself, but contextually they could mean pass/fail,
+accept/reject, approved/denied, or even a simple yes/no. If your site
+allows requestable flags, then users may set a flag to ``?`` as a
+request to another user that they look at the bug/attachment and set
+the flag to its correct status.
+
+A set flag appears in bug reports and on "edit attachment" pages with the
+abbreviated username of the user who set the flag prepended to the
+flag name. For example, if Jack sets a "review" flag to ``+``, it appears
+as :guilabel:`Jack: review [ + ]`.
+
+A requested flag appears with the user who requested the flag prepended
+to the flag name and the user who has been requested to set the flag
+appended to the flag name within parentheses.  For example, if Jack
+asks Jill for review, it appears as :guilabel:`Jack: review [ ? ] (Jill)`.
+
+You can browse through open requests made of you and by you by selecting
+:guilabel:`My Requests` from the footer. You can also look at open requests
+limited by other requesters, requestees, products, components, and flag names.
+Note that you can use '-' for requestee to specify flags with no requestee
+set.
+
+.. _flags-simpleexample:
+
+A Simple Example
+----------------
+
+A developer might want to ask their manager,
+"Should we fix this bug before we release version 2.0?"
+They might want to do this for a *lot* of bugs,
+so they decide to streamline the process. So:
+
+#. The Bugzilla administrator creates a flag type called blocking2.0 for bugs
+   in your product. It shows up on the :guilabel:`Show Bug` screen as the text
+   :guilabel:`blocking2.0` with a drop-down box next to it. The drop-down box
+   contains four values: an empty space, ``?``, ``-``, and ``+``.
+
+#. The developer sets the flag to ``?``.
+
+#. The manager sees the :guilabel:`blocking2.0`
+   flag with a ``?`` value.
+
+#. If the manager thinks the feature should go into the product
+   before version 2.0 can be released, they set the flag to
+   ``+``. Otherwise, they set it to ``-``.
+
+#. Now, every Bugzilla user who looks at the bug knows whether or
+   not the bug needs to be fixed before release of version 2.0.
+
+.. _flags-about:
+
+About Flags
+-----------
+
+Flags can have four values:
+
+``?``
+    A user is requesting that a status be set. (Think of it as 'A question is being asked'.)
+
+``-``
+    The status has been set negatively. (The question has been answered ``no``.)
+
+``+``
+    The status has been set positively.
+    (The question has been answered ``yes``.)
+
+``_``
+    ``unset`` actually shows up as a blank space. This just means that nobody
+    has expressed an opinion (or asked someone else to express an opinion)
+    about the matter covered by this flag.
+
+.. _flag-askto:
+
+Flag Requests
+-------------
+
+If a flag has been defined as :guilabel:`requestable`, and a user has enough
+privileges to request it (see below), the user can set the flag's status to
+``?``. This status indicates that someone (a.k.a. "the requester") is asking
+someone else to set the flag to either ``+`` or ``-``.
+
+If a flag has been defined as :guilabel:`specifically requestable`,
+a text box will appear next to the flag into which the requester may
+enter a Bugzilla username. That named person (a.k.a. "the requestee")
+will receive an email notifying them of the request, and pointing them
+to the bug/attachment in question.
+
+If a flag has *not* been defined as :guilabel:`specifically requestable`,
+then no such text box will appear. A request to set this flag cannot be made
+of any specific individual; these requests are open for anyone to answer. In
+Bugzilla this is known as "asking the wind". A requester may ask the wind on
+any flag simply by leaving the text box blank.
+
+.. _flag-types:
+
+.. _flag-type-attachment:
+
+Attachment Flags
+----------------
+
+There are two types of flags: bug flags and attachment flags.
+
+Attachment flags are used to ask a question about a specific
+attachment on a bug.
+
+Many Bugzilla installations use this to
+request that one developer review another
+developer's code before they check it in. They attach the code to
+a bug report, and then set a flag on that attachment called
+:guilabel:`review` to
+:guilabel:`review? reviewer@example.com`.
+reviewer\@example.com is then notified by email that
+they have to check out that attachment and approve it or deny it.
+
+For a Bugzilla user, attachment flags show up in three places:
+
+#. On the list of attachments in the :guilabel:`Show Bug`
+   screen, you can see the current state of any flags that
+   have been set to ``?``, ``+``, or ``-``. You can see who asked about
+   the flag (the requester), and who is being asked (the
+   requestee).
+
+#. When you edit an attachment, you can
+   see any settable flag, along with any flags that have
+   already been set. The :guilabel:`Edit Attachment`
+   screen is where you set flags to ``?``, ``-``, ``+``, or unset them.
+
+#. Requests are listed in the :guilabel:`Request Queue`, which
+   is accessible from the :guilabel:`My Requests` link (if you are
+   logged in) or :guilabel:`Requests` link (if you are logged out)
+   visible on all pages.
+
+.. _flag-type-bug:
+
+Bug Flags
+---------
+
+Bug flags are used to set a status on the bug itself. You can
+see Bug Flags in the :guilabel:`Show Bug` and :guilabel:`Requests`
+screens, as described above.
+
+Only users with enough privileges (see below) may set flags on bugs.
+This doesn't necessarily include the assignee, reporter, or users with the
+:group:`editbugs` permission.
diff --git a/docs/lib/Pod/Simple/HTML/Bugzilla.pm b/docs/lib/Pod/Simple/HTML/Bugzilla.pm
index 66e1d7b59b..e139f70813 100644
--- a/docs/lib/Pod/Simple/HTML/Bugzilla.pm
+++ b/docs/lib/Pod/Simple/HTML/Bugzilla.pm
@@ -7,61 +7,62 @@
 
 package Pod::Simple::HTML::Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
+use warnings;
 
 use parent qw(Pod::Simple::HTML);
 
 # Without this constant, HTMLBatch will throw undef warnings.
 use constant VERSION    => $Pod::Simple::HTML::VERSION;
 use constant CODE_CLASS => ' class="code"';
-use constant META_CT  => '<meta http-equiv="Content-Type" content="text/html;'
-                         . ' charset=UTF-8">';
-use constant DOCTYPE  => '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01'
-    . ' Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+use constant META_CT    => '<meta http-equiv="Content-Type" content="text/html;'
+  . ' charset=UTF-8">';
+use constant DOCTYPE => '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01'
+  . ' Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
 
 sub new {
-    my $self    = shift->SUPER::new(@_);
+  my $self = shift->SUPER::new(@_);
 
-    my $doctype      = $self->DOCTYPE;
-    my $content_type = $self->META_CT;
+  my $doctype      = $self->DOCTYPE;
+  my $content_type = $self->META_CT;
 
-    my $html_pre_title = <<END_HTML;
+  my $html_pre_title = <<END_HTML;
 $doctype
 <html>
   <head>
     <title>
 END_HTML
 
-    my $html_post_title = <<END_HTML;
+  my $html_post_title = <<END_HTML;
 </title>
     $content_type
   </head>
   <body id="pod">
 END_HTML
 
-    $self->html_header_before_title($html_pre_title);
-    $self->html_header_after_title($html_post_title);
+  $self->html_header_before_title($html_pre_title);
+  $self->html_header_after_title($html_post_title);
 
-    # Fix some tags to have classes so that we can adjust them.
-    my $code = CODE_CLASS;
-    $self->{'Tagmap'}->{'Verbatim'} = "\n<pre $code>";
-    $self->{'Tagmap'}->{'VerbatimFormatted'} = "\n<pre $code>";
-    $self->{'Tagmap'}->{'F'} = "<em $code>";
-    $self->{'Tagmap'}->{'C'} = "<code $code>";
+  # Fix some tags to have classes so that we can adjust them.
+  my $code = CODE_CLASS;
+  $self->{'Tagmap'}->{'Verbatim'}          = "\n<pre $code>";
+  $self->{'Tagmap'}->{'VerbatimFormatted'} = "\n<pre $code>";
+  $self->{'Tagmap'}->{'F'}                 = "<em $code>";
+  $self->{'Tagmap'}->{'C'}                 = "<code $code>";
 
-    # Don't put head4 tags into the Table of Contents. We have this
-    delete $Pod::Simple::HTML::ToIndex{'head4'};
+  # Don't put head4 tags into the Table of Contents. We have this
+  delete $Pod::Simple::HTML::ToIndex{'head4'};
 
-    return $self;
+  return $self;
 }
 
 # Override do_beginning to put the name of the module at the top
 sub do_beginning {
-    my $self = shift;
-    $self->SUPER::do_beginning(@_);
-    print {$self->{'output_fh'}} "<h1>" . $self->get_short_title . "</h1>";
-    return 1;
+  my $self = shift;
+  $self->SUPER::do_beginning(@_);
+  print {$self->{'output_fh'}} "<h1>" . $self->get_short_title . "</h1>";
+  return 1;
 }
 
 1;
diff --git a/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm b/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
index bc60d0374a..88e699a4e2 100644
--- a/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
+++ b/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
@@ -7,8 +7,9 @@
 
 package Pod::Simple::HTMLBatch::Bugzilla;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
+use warnings;
 
 use parent qw(Pod::Simple::HTMLBatch);
 
@@ -20,90 +21,92 @@ BEGIN { *esc = \&Pod::Simple::HTML::esc }
 # Note that if you leave out a category here, it will not be indexed
 # in the contents file, even though its HTML POD will still exist.
 use constant FILE_TRANSLATION => {
-    Files      => ['importxml', 'contrib', 'checksetup', 'email_in', 
-                   'install-module', 'sanitycheck', 'jobqueue', 'migrate',
-                   'collectstats'],
-    Modules    => ['bugzilla'],
-    Extensions => ['extensions'],
+  Files => [
+    'importxml',      'contrib',     'checksetup', 'email_in',
+    'install-module', 'sanitycheck', 'jobqueue',   'migrate',
+    'collectstats'
+  ],
+  Modules    => ['bugzilla'],
+  Extensions => ['extensions'],
 };
 
 # This is basically copied from Pod::Simple::HTMLBatch, and overridden
 # so that we can format things more nicely.
 sub _write_contents_middle {
-    my ($self, $Contents, $outfile, $toplevel2submodules) = @_;
-
-    my $file_trans = FILE_TRANSLATION;
-
-    # For every top-level category...
-    foreach my $category (sort keys %$file_trans) {
-        # Get all of the HTMLBatch categories that should be in this
-        # category.
-        my @category_data;
-        foreach my $b_category (@{$file_trans->{$category}}) {
-            my $data = $toplevel2submodules->{$b_category};
-            push(@category_data, @$data) if $data;
-        }
-        next unless @category_data;
-
-        my @downlines = sort {$a->[-1] cmp $b->[-1]} @category_data;
-
-        # And finally, actually print out the table for this category. 
-        printf $Contents qq[<dt><a name="%s">%s</a></dt>\n<dd>\n],
-                esc($category), esc($category);
-        print $Contents '<table class="pod_desc_table">' . "\n";
-
-        # For every POD...
-        my $row_count = 0;
-        foreach my $e (@downlines) {
-            $row_count++;
-            my $even_or_odd = $row_count % 2 ? 'even' : 'odd';
-            my $name = esc($e->[0]);
-            my $path = join( "/", '.', esc(@{$e->[3]}) )
-               . $Pod::Simple::HTML::HTML_EXTENSION;
-            my $description = $self->{bugzilla_desc}->{$name} || '';
-            $description = esc($description);
-            my $html = <<END_HTML;
+  my ($self, $Contents, $outfile, $toplevel2submodules) = @_;
+
+  my $file_trans = FILE_TRANSLATION;
+
+  # For every top-level category...
+  foreach my $category (sort keys %$file_trans) {
+
+    # Get all of the HTMLBatch categories that should be in this
+    # category.
+    my @category_data;
+    foreach my $b_category (@{$file_trans->{$category}}) {
+      my $data = $toplevel2submodules->{$b_category};
+      push(@category_data, @$data) if $data;
+    }
+    next unless @category_data;
+
+    my @downlines = sort { $a->[-1] cmp $b->[-1] } @category_data;
+
+    # And finally, actually print out the table for this category.
+    printf $Contents qq[<dt><a name="%s">%s</a></dt>\n<dd>\n], esc($category),
+      esc($category);
+    print $Contents '<table class="pod_desc_table">' . "\n";
+
+    # For every POD...
+    my $row_count = 0;
+    foreach my $e (@downlines) {
+      $row_count++;
+      my $even_or_odd = $row_count % 2 ? 'even' : 'odd';
+      my $name = esc($e->[0]);
+      my $path = join("/", '.', esc(@{$e->[3]})) . $Pod::Simple::HTML::HTML_EXTENSION;
+      my $description = $self->{bugzilla_desc}->{$name} || '';
+      $description = esc($description);
+      my $html = <<END_HTML;
 <tr class="$even_or_odd">
   <th><a href="$path">$name</a></th>
   <td>$description</td>
 </tr>
 END_HTML
-      
-            print $Contents $html;
-        }
-        print $Contents "</table></dd>\n\n";
+
+      print $Contents $html;
     }
+    print $Contents "</table></dd>\n\n";
+  }
 
-    return 1;
+  return 1;
 }
 
 # This stores the name and description for each file, so that
 # we can get that information out later.
 sub note_for_contents_file {
-    my $self = shift;
-    my $retval = $self->SUPER::note_for_contents_file(@_);
-
-    my ($namelets, $infile) = @_;
-    my $parser   = $self->html_render_class->new;
-    $parser->set_source($infile);
-    my $full_title = $parser->get_title;
-    $full_title =~ /^\S+\s+-+\s+(.+)/;
-    my $description = $1;
-    
-    $self->{bugzilla_desc} ||= {};
-    $self->{bugzilla_desc}->{join('::', @$namelets)} = $description;
-
-    return $retval;
+  my $self   = shift;
+  my $retval = $self->SUPER::note_for_contents_file(@_);
+
+  my ($namelets, $infile) = @_;
+  my $parser = $self->html_render_class->new;
+  $parser->set_source($infile);
+  my $full_title = $parser->get_title;
+  $full_title =~ /^\S+\s+-+\s+(.+)/;
+  my $description = $1;
+
+  $self->{bugzilla_desc} ||= {};
+  $self->{bugzilla_desc}->{join('::', @$namelets)} = $description;
+
+  return $retval;
 }
 
 # Exclude modules being in lib/.
 sub find_all_pods {
-    my($self, $dirs) = @_;
-    my $mod2path = $self->SUPER::find_all_pods($dirs);
-    foreach my $mod (keys %$mod2path) {
-        delete $mod2path->{$mod} if $mod =~ /^lib::/;
-    }
-    return $mod2path;
+  my ($self, $dirs) = @_;
+  my $mod2path = $self->SUPER::find_all_pods($dirs);
+  foreach my $mod (keys %$mod2path) {
+    delete $mod2path->{$mod} if $mod =~ /^lib::/;
+  }
+  return $mod2path;
 }
 
 1;
diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index 4f0f52579d..4d3e107aee 100755
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -12,95 +12,220 @@
 #
 # 1) Sphinx documentation builder (python-sphinx package on Debian/Ubuntu)
 #
-# 2) pdflatex, which means the following Debian/Ubuntu packages:
-#    * texlive-latex-base
-#    * texlive-latex-recommended
-#    * texlive-latex-extra
-#    * texlive-fonts-recommended
+# 2a) rst2pdf
+# or
+# 2b) pdflatex, which means the following Debian/Ubuntu packages:
+#     * texlive-latex-base
+#     * texlive-latex-recommended
+#     * texlive-latex-extra
+#     * texlive-fonts-recommended
 #
 # All these TeX packages together are close to a gig :-| But after you've
 # installed them, you can remove texlive-latex-extra-doc to save 400MB.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
+use warnings;
 
-use Cwd;
-use File::Find;
-use File::Copy;
-
-# We need to be in this directory to use our libraries.
-BEGIN {
-    require File::Basename;
-    import File::Basename qw(dirname);
-    chdir dirname($0);
-}
-
-use lib qw(.. ../lib lib);
-
-# We only compile our POD if Pod::Simple is installed. We do the checks
-# this way so that if there's a compile error in Pod::Simple::HTML::Bugzilla,
-# makedocs doesn't just silently fail, but instead actually tells us there's
-# a compile error.
-my $pod_simple;
-if (eval { require Pod::Simple }) {
-    require Pod::Simple::HTMLBatch::Bugzilla;
-    require Pod::Simple::HTML::Bugzilla;
-    $pod_simple = 1;
-};
+use File::Basename;
+BEGIN { chdir dirname($0); }
 
-use Bugzilla::Constants qw(BUGZILLA_VERSION);
+use lib qw(.. ../lib lib ../local/lib/perl5);
+use open ':encoding(utf8)';
 
-use File::Path qw(rmtree);
+use Cwd;
+use File::Copy::Recursive qw(rcopy);
+use File::Path qw(rmtree make_path);
 use File::Which qw(which);
+use Pod::Simple;
+use Pod::ParseLink;
+
+use Bugzilla::Constants qw(BUGZILLA_VERSION bz_locations);
+use Pod::Simple::Search;
+use Pod::POM::View::Restructured;
+use Tie::File;
+use File::Spec::Functions qw(:ALL);
 
 ###############################################################################
 # Subs
 ###############################################################################
 
 my $error_found = 0;
+
 sub MakeDocs {
-    my ($name, $cmdline) = @_;
+  my ($name, $cmdline) = @_;
 
-    say "Creating $name documentation ..." if defined $name;
-    say "$cmdline\n";
-    system($cmdline) == 0
-        or $error_found = 1;
-    print "\n";
+  say "Creating $name documentation ..." if defined $name;
+  system('make', $cmdline) == 0 or $error_found = 1;
+  print "\n";
 }
 
-sub make_pod {
-    say "Creating API documentation...";
-
-    my $converter = Pod::Simple::HTMLBatch::Bugzilla->new;
-    # Don't output progress information.
-    $converter->verbose(0);
-    $converter->html_render_class('Pod::Simple::HTML::Bugzilla');
-
-    my $doctype      = Pod::Simple::HTML::Bugzilla->DOCTYPE;
-    my $content_type = Pod::Simple::HTML::Bugzilla->META_CT;
-    my $bz_version   = BUGZILLA_VERSION;
-
-    my $contents_start = <<END_HTML;
-$doctype
-<html>
-  <head>
-    $content_type
-    <title>Bugzilla $bz_version API Documentation</title>
-  </head>
-  <body class="contentspage">
-    <h1>Bugzilla $bz_version API Documentation</h1>
-END_HTML
-
-    $converter->contents_page_start($contents_start);
-    $converter->contents_page_end("</body></html>");
-    $converter->add_css('./../../../style.css');
-    $converter->javascript_flurry(0);
-    $converter->css_flurry(0);
-    mkdir("html");
-    mkdir("html/api");
-    $converter->batch_convert(['../../'], 'html/api/');
-
-    print "\n";
+# Compile all the POD and make it part of the API docs
+# Also duplicate some Extension docs into the User section, Admin section, and
+# WebService docs
+sub pod2rst {
+  my $path = shift;
+
+  say "Converting POD to RST...";
+  my $name2path
+    = Pod::Simple::Search->new->inc(0)->verbose(0)->survey(@{['../']});
+
+  my $ind_path = catdir($path, 'rst', 'integrating', 'internals');
+  rmtree($ind_path);
+  make_path($ind_path);
+
+  my $FILE;
+  open($FILE, '>', catfile($ind_path, 'index.rst')) || die("Can't open rst file");
+  print($FILE <<'EOI');
+.. highlight:: perl
+
+.. _developer
+
+===================================
+Developer Documentation
+===================================
+
+This section exposes the POD for all modules and scripts, including extensions,
+in Bugzilla.
+
+.. toctree::
+   :maxdepth: 2
+
+EOI
+
+  foreach my $mod (sort keys %$name2path) {
+
+    # Ignoring library files;
+    if ($mod =~ /^b?(lib::|local)/) {
+      delete $name2path->{$mod};
+      next;
+    }
+
+    my $title = $mod;
+
+    my $ext = $title =~ s/^extensions:://;
+    $title =~ s/lib:://;
+    $title =~ s/::Extension$// if ($ext);
+    my $header = "=" x length($title);
+
+    my $abs_path = $name2path->{$mod};
+    my $fpath = abs2rel($abs_path, '..');
+    my ($volume, $directories, $file) = splitpath($fpath);
+    $directories =~ s/lib\///;
+    $directories = '.' if ($directories eq '');
+
+    my $dir_path = catdir($ind_path, $directories);
+    make_path($dir_path);
+    $file =~ s/\.[^.]*$//;
+    my $out_file = $file . '.rst';
+    my $full_out_file = catfile($dir_path, $out_file);
+
+    my $callbacks = {
+      link => sub {
+        my $text = shift;
+
+        my @results = parselink($text);
+
+        # A link to another page.
+        if (defined($results[1]) && defined($results[2])) {
+          if ($results[2] =~ /^http/) {
+            return ($results[2], $results[1]);
+          }
+          elsif ($results[2] =~ m/Bugzilla/) {
+            my $depth = scalar(split('/', $directories));
+            my @split = split('::', $results[2]);
+            my $base  = '../' x $depth;
+            my $url   = $base . join('/', @split);
+            $url .= '.html';
+            $url .= '#' . $results[3] if defined $results[3];
+            return ($url, $results[1]);
+          }
+          else {
+            # Not a Bugzilla package, link to CPAN.
+            my $url = 'http://search.cpan.org/search?query=' . $results[2] . '&mode=all';
+            return ($url, $results[1]);
+          }
+        }
+
+        # A Link within a page
+        elsif (defined($results[1]) && defined($results[4])) {
+          my $anchor = $results[1];
+          $anchor =~ s/"//g;
+          return ("#$anchor", $anchor);
+        }
+        else {
+          die "Don't know how to parse $text";
+        }
+      }
+    };
+    my $conv = Pod::POM::View::Restructured->new(
+      {namespace => $title, callbacks => $callbacks});
+    my $rv = $conv->convert_file($abs_path, $title, $full_out_file, $callbacks);
+    print($FILE "   ", catfile($directories, $out_file), "\n");
+
+    if ($ext) {
+      my $api_path = catdir($path, 'rst', $directories);
+      my $adminfile = catfile($api_path, "index-admin.rst");
+      my $userfile  = catfile($api_path, "index-user.rst");
+      my $apifile   = catfile($api_path, 'api', 'v1', 'index.rst');
+      make_path($api_path) unless -d $api_path;
+
+      # Add Core doc to User & Admin guides
+      if ($file eq 'Extension') {
+        my $FH;
+        open($FH, '<', $full_out_file) || die "$full_out_file: $!";
+        my @lines = <$FH>;
+        close $FH;
+
+        my @array;
+
+        # ensure out of order docs are at the top of the page without
+        # playing with file handles
+        tie @array, 'Tie::File', $adminfile or die "$adminfile: $!";
+        unshift @array, @lines, "", "", ".. toctree::", "", "";
+        untie @array;
+
+        tie @array, 'Tie::File', $userfile or die "$userfile: $!";
+        unshift @array, @lines, "", "", ".. toctree::", "", "";
+        untie @array;
+
+      }
+
+      # Add Config doc to Admin guide
+      elsif ($file eq 'Config') {
+        rcopy($full_out_file, $api_path);
+        `perl -E 'say "   $file.rst"' >> "$adminfile"`;
+      }
+
+      # Add WebServices doc to API docs
+      elsif ($file eq 'WebService') {
+        my $apidir = catdir($api_path, 'api', 'v1');
+        make_path($apidir) unless -d $apidir;
+        `perl -E 'say ".. toctree::\n\n"' >> $apifile` unless -f $apifile;
+
+        my $FH;
+        open($FH, '<', $full_out_file) || die "$full_out_file: $!";
+        my @lines = <$FH>;
+        close $FH;
+
+        my @array;
+
+        tie @array, 'Tie::File', $apifile or die "$apifile: $!";
+        unshift @array, @lines;
+        untie @array;
+      }
+      elsif ($api_path =~ /WebService\/$/) {
+        my $apidir = catdir($api_path, '..', 'api', 'v1');
+        $apifile = catfile($apidir, 'index.rst');
+        make_path($apidir) unless -d $apidir;
+        rcopy($full_out_file, $apidir);
+        `perl -E 'say ".. toctree::\n\n"' >> $apifile` unless -f $apifile;
+        `perl -E 'say "   $file.rst"' >> $apifile`;
+      }
+    }
+  }
+
+  close($FILE);
 }
 
 ###############################################################################
@@ -108,59 +233,49 @@ sub make_pod {
 ###############################################################################
 
 my @langs;
+
 # search for sub directories which have a 'rst' sub-directory
 opendir(LANGS, './');
 foreach my $dir (readdir(LANGS)) {
-    next if (($dir eq '.') || ($dir eq '..') || (! -d $dir));
-    if (-d "$dir/rst") {
-        push(@langs, $dir);
-    }
+  next if (($dir eq '.') || ($dir eq '..') || (!-d $dir));
+  if (-d "$dir/rst") {
+    push(@langs, $dir);
+  }
 }
 closedir(LANGS);
 
 my $docparent = getcwd();
 foreach my $lang (@langs) {
-    chdir "$docparent/$lang";
 
-    make_pod() if $pod_simple;
+  rmtree("$lang/html", 0, 1);
+  rmtree("$lang/txt",  0, 1);
 
-    next if grep { $_ eq '--pod-only' } @ARGV;
+  my @sub_dirs = grep {-d} glob("$lang/rst/extensions/*");
+  rmtree(@sub_dirs, {verbose => 0, safe => 1});
 
-    # Collect up local extension documentation into the extensions/ dir.
-    sub wanted {
-        if ($File::Find::dir =~ /\/doc\/?$/ &&
-            $_ =~ /\.rst$/)
-        {
-            copy($File::Find::name, "rst/extensions");
-        }
-    };
+  pod2rst("$docparent/$lang");
 
-    # Clear out old extensions docs
-    rmtree('rst/extensions', 0, 1);
-    mkdir('rst/extensions');
-    
-    find({
-        'wanted' => \&wanted,
-        'no_chdir' => 1,
-    }, "$docparent/../extensions");
-
-    MakeDocs('HTML', 'make html');
-    MakeDocs('TXT', 'make text');
-
-    if (grep { $_ eq '--with-pdf' } @ARGV) {
-        if (which('pdflatex')) {
-            MakeDocs('PDF', 'make latexpdf');
-        }
-        elsif (which('rst2pdf')) {
-            rmtree('pdf', 0, 1);
-            MakeDocs('PDF', 'make pdf');
-        }
-        else {
-            say 'pdflatex or rst2pdf not found. Skipping PDF file creation';
-        }
+  next if grep { $_ eq '--pod-only' } @ARGV;
+
+  chdir "$docparent/$lang";
+
+  MakeDocs('HTML', 'html');
+  MakeDocs('TXT',  'text');
+
+  if (grep { $_ eq '--with-pdf' } @ARGV) {
+    if (which('pdflatex')) {
+      MakeDocs('PDF', 'latexpdf');
+    }
+    elsif (which('rst2pdf')) {
+      rmtree('pdf', 0, 1);
+      MakeDocs('PDF', 'pdf');
+    }
+    else {
+      say 'pdflatex or rst2pdf not found. Skipping PDF file creation';
     }
+  }
 
-    rmtree('doctrees', 0, 1);
+  rmtree('doctrees', 0, 1);
 }
 
 die "Error occurred building the documentation\n" if $error_found;
diff --git a/duplicates.cgi b/duplicates.cgi
index c1bf036be3..d23051fd8d 100755
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -21,21 +21,22 @@ use Bugzilla::Field;
 use Bugzilla::Product;
 
 use constant DEFAULTS => {
-    # We want to show bugs which:
-    # a) Aren't CLOSED; and
-    # b)  i) Aren't VERIFIED; OR
-    #    ii) Were resolved INVALID/WONTFIX
-    #
-    # The rationale behind this is that people will eventually stop
-    # reporting fixed bugs when they get newer versions of the software,
-    # but if the bug is determined to be erroneous, people will still
-    # keep reporting it, so we do need to show it here.
-    fully_exclude_status  => ['CLOSED'],
-    partly_exclude_status => ['VERIFIED'],
-    except_resolution => ['INVALID', 'WONTFIX'],
-    changedsince => 7,
-    maxrows      => 20,
-    sortby       => 'count',
+
+  # We want to show bugs which:
+  # a) Aren't CLOSED; and
+  # b)  i) Aren't VERIFIED; OR
+  #    ii) Were resolved INVALID/WONTFIX
+  #
+  # The rationale behind this is that people will eventually stop
+  # reporting fixed bugs when they get newer versions of the software,
+  # but if the bug is determined to be erroneous, people will still
+  # keep reporting it, so we do need to show it here.
+  fully_exclude_status  => ['CLOSED'],
+  partly_exclude_status => ['VERIFIED'],
+  except_resolution     => ['INVALID', 'WONTFIX'],
+  changedsince          => 7,
+  maxrows               => 20,
+  sortby                => 'count',
 };
 
 ###############
@@ -48,92 +49,93 @@ use constant DEFAULTS => {
 # in $count is a duplicate of another bug in $count, we add their counts
 # together under the target bug.
 sub add_indirect_dups {
-    my ($counts, $dups) = @_;
+  my ($counts, $dups) = @_;
 
-    foreach my $add_from (keys %$dups) {
-        my $add_to     = walk_dup_chain($dups, $add_from);
-        my $add_amount = delete $counts->{$add_from} || 0;
-        $counts->{$add_to} += $add_amount;
-    }
+  foreach my $add_from (keys %$dups) {
+    my $add_to = walk_dup_chain($dups, $add_from);
+    my $add_amount = delete $counts->{$add_from} || 0;
+    $counts->{$add_to} += $add_amount;
+  }
 }
 
 sub walk_dup_chain {
-    my ($dups, $from_id) = @_;
-    my $to_id = $dups->{$from_id};
-    my %seen;
-    while (my $bug_id = $dups->{$to_id}) {
-        if ($seen{$bug_id}) {
-            warn "Duplicate loop: $to_id -> $bug_id\n";
-            last;
-        }
-        $seen{$bug_id} = 1;
-        $to_id = $bug_id;
+  my ($dups, $from_id) = @_;
+  my $to_id = $dups->{$from_id};
+  my %seen;
+  while (my $bug_id = $dups->{$to_id}) {
+    if ($seen{$bug_id}) {
+      warn "Duplicate loop: $to_id -> $bug_id\n";
+      last;
     }
-    # Optimize for future calls to add_indirect_dups.
-    $dups->{$from_id} = $to_id;
-    return $to_id;
+    $seen{$bug_id} = 1;
+    $to_id = $bug_id;
+  }
+
+  # Optimize for future calls to add_indirect_dups.
+  $dups->{$from_id} = $to_id;
+  return $to_id;
 }
 
 # Get params from URL
 sub formvalue {
-    my ($name) = (@_);
-    my $cgi = Bugzilla->cgi;
-    if (defined $cgi->param($name)) {
-        return $cgi->param($name);
-    }
-    elsif (exists DEFAULTS->{$name}) {
-        return ref DEFAULTS->{$name} ? @{ DEFAULTS->{$name} } 
-                                     : DEFAULTS->{$name};
-    }
-    return undef;
+  my ($name) = (@_);
+  my $cgi = Bugzilla->cgi;
+  if (defined $cgi->param($name)) {
+    return $cgi->param($name);
+  }
+  elsif (exists DEFAULTS->{$name}) {
+    return ref DEFAULTS->{$name} ? @{DEFAULTS->{$name}} : DEFAULTS->{$name};
+  }
+  return undef;
 }
 
 sub sort_duplicates {
-    my ($a, $b, $sort_by) = @_;
-    if ($sort_by eq 'count' or $sort_by eq 'delta') {
-        return $a->{$sort_by} <=> $b->{$sort_by};
-    }
-    if ($sort_by =~ /^(bug_)?id$/) {
-        return $a->{'bug'}->$sort_by <=> $b->{'bug'}->$sort_by;
-    }
-    return $a->{'bug'}->$sort_by cmp $b->{'bug'}->$sort_by;
-    
+  my ($a, $b, $sort_by) = @_;
+  if ($sort_by eq 'count' or $sort_by eq 'delta') {
+    return $a->{$sort_by} <=> $b->{$sort_by};
+  }
+  if ($sort_by =~ /^(bug_)?id$/) {
+    return $a->{'bug'}->$sort_by <=> $b->{'bug'}->$sort_by;
+  }
+  return $a->{'bug'}->$sort_by cmp $b->{'bug'}->$sort_by;
+
 }
 
 ###############
 # Main Script #
 ###############
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $user = Bugzilla->login();
+my $user     = Bugzilla->login();
 
 my $dbh = Bugzilla->switch_to_shadow_db();
 
 my $changedsince = formvalue("changedsince");
-my $maxrows = formvalue("maxrows");
-my $openonly = formvalue("openonly");
-my $sortby = formvalue("sortby");
+my $maxrows      = formvalue("maxrows");
+my $openonly     = formvalue("openonly");
+my $sortby       = formvalue("sortby");
 if (!grep(lc($_) eq lc($sortby), qw(count delta id))) {
-    Bugzilla::Field->check($sortby);
+  Bugzilla::Field->check($sortby);
 }
 my $reverse = formvalue("reverse");
+
 # Reverse count and delta by default.
 if (!defined $reverse) {
-    if ($sortby eq 'count' or $sortby eq 'delta') {
-        $reverse = 1;
-    }
-    else {
-        $reverse = 0;
-    }
+  if ($sortby eq 'count' or $sortby eq 'delta') {
+    $reverse = 1;
+  }
+  else {
+    $reverse = 0;
+  }
 }
-my @query_products = $cgi->param('product');
-my $sortvisible = formvalue("sortvisible");
+my @query_products = $cgi->multi_param('product');
+my $sortvisible    = formvalue("sortvisible");
 my @bugs;
 if ($sortvisible) {
-    my @limit_to_ids = (split(/[:,]/, formvalue("bug_id") || ''));
-    @bugs = @{ Bugzilla::Bug->new_from_list(\@limit_to_ids) };
-    @bugs = @{ $user->visible_bugs(\@bugs) };
+  my @limit_to_ids = (split(/[:,]/, formvalue("bug_id") || ''));
+  @bugs = @{Bugzilla::Bug->new_from_list(\@limit_to_ids)};
+  @bugs = @{$user->visible_bugs(\@bugs)};
 }
 
 # Make sure all products are valid.
@@ -144,101 +146,117 @@ $sortby = "count" if $sortby eq "dup_count";
 
 my $origmaxrows = $maxrows;
 detaint_natural($maxrows)
-  || ThrowUserError("invalid_maxrows", { maxrows => $origmaxrows});
+  || ThrowUserError("invalid_maxrows", {maxrows => $origmaxrows});
 
 my $origchangedsince = $changedsince;
 detaint_natural($changedsince)
-  || ThrowUserError("invalid_changedsince", 
-                    { changedsince => $origchangedsince });
+  || ThrowUserError("invalid_changedsince",
+  {changedsince => $origchangedsince});
 
-my %total_dups = @{$dbh->selectcol_arrayref(
+my %total_dups = @{
+  $dbh->selectcol_arrayref(
     "SELECT dupe_of, COUNT(dupe)
        FROM duplicates
-   GROUP BY dupe_of", {Columns => [1,2]})};
+   GROUP BY dupe_of", {Columns => [1, 2]}
+  )
+};
 
-my %dupe_relation = @{$dbh->selectcol_arrayref(
+my %dupe_relation = @{
+  $dbh->selectcol_arrayref(
     "SELECT dupe, dupe_of FROM duplicates
-      WHERE dupe IN (SELECT dupe_of FROM duplicates)",
-    {Columns => [1,2]})};
+      WHERE dupe IN (SELECT dupe_of FROM duplicates)", {Columns => [1, 2]}
+  )
+};
 add_indirect_dups(\%total_dups, \%dupe_relation);
 
 my $reso_field_id = get_field_id('resolution');
-my %since_dups = @{$dbh->selectcol_arrayref(
+my %since_dups    = @{
+  $dbh->selectcol_arrayref(
     "SELECT dupe_of, COUNT(dupe)
        FROM duplicates INNER JOIN bugs_activity 
                        ON bugs_activity.bug_id = duplicates.dupe 
       WHERE added = 'DUPLICATE' AND fieldid = ? 
             AND bug_when >= "
-                . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', '?', 'DAY') .
- " GROUP BY dupe_of", {Columns=>[1,2]},
-    $reso_field_id, $changedsince)};
+      . $dbh->sql_date_math('LOCALTIMESTAMP(0)', '-', '?', 'DAY')
+      . " GROUP BY dupe_of", {Columns => [1, 2]}, $reso_field_id, $changedsince
+  )
+};
 add_indirect_dups(\%since_dups, \%dupe_relation);
 
 # Enforce the MOST_FREQUENT_THRESHOLD constant and the "bug_id" cgi param.
 foreach my $id (keys %total_dups) {
-    if ($total_dups{$id} < MOST_FREQUENT_THRESHOLD) {
-        delete $total_dups{$id};
-        next;
-    }
-    if ($sortvisible and !grep($_->id == $id, @bugs)) {
-        delete $total_dups{$id};
-    }
+  if ($total_dups{$id} < MOST_FREQUENT_THRESHOLD) {
+    delete $total_dups{$id};
+    next;
+  }
+  if ($sortvisible and !grep($_->id == $id, @bugs)) {
+    delete $total_dups{$id};
+  }
 }
 
 if (!@bugs) {
-    @bugs = @{ Bugzilla::Bug->new_from_list([keys %total_dups]) };
-    @bugs = @{ $user->visible_bugs(\@bugs) };
+  @bugs = @{Bugzilla::Bug->new_from_list([keys %total_dups])};
+  @bugs = @{$user->visible_bugs(\@bugs)};
 }
 
-my @fully_exclude_status = formvalue('fully_exclude_status');
+my @fully_exclude_status  = formvalue('fully_exclude_status');
 my @partly_exclude_status = formvalue('partly_exclude_status');
-my @except_resolution = formvalue('except_resolution');
+my @except_resolution     = formvalue('except_resolution');
 
 # Filter bugs by criteria
 my @result_bugs;
 foreach my $bug (@bugs) {
-    # It's possible, if somebody specified a bug ID that wasn't a dup
-    # in the "buglist" parameter and specified $sortvisible that there
-    # would be bugs in the list with 0 dups, so we want to avoid that.
-    next if !$total_dups{$bug->id};
-
-    next if ($openonly and !$bug->isopened);
-    # If the bug has a status in @fully_exclude_status, we skip it,
-    # no question.
-    next if grep($_ eq $bug->bug_status, @fully_exclude_status);
-    # If the bug has a status in @partly_exclude_status, we skip it...
-    if (grep($_ eq $bug->bug_status, @partly_exclude_status)) {
-        # ...unless it has a resolution in @except_resolution.
-        next if !grep($_ eq $bug->resolution, @except_resolution);
-    }
 
-    if (scalar @query_products) {
-        next if !grep($_->id == $bug->product_id, @query_products);
-    }
+  # It's possible, if somebody specified a bug ID that wasn't a dup
+  # in the "buglist" parameter and specified $sortvisible that there
+  # would be bugs in the list with 0 dups, so we want to avoid that.
+  next if !$total_dups{$bug->id};
 
-    # Note: maximum row count is dealt with later.
-    push (@result_bugs, { bug => $bug,
-                          count => $total_dups{$bug->id},
-                          delta => $since_dups{$bug->id} || 0 });
+  next if ($openonly and !$bug->isopened);
+
+  # If the bug has a status in @fully_exclude_status, we skip it,
+  # no question.
+  next if grep($_ eq $bug->bug_status, @fully_exclude_status);
+
+  # If the bug has a status in @partly_exclude_status, we skip it...
+  if (grep($_ eq $bug->bug_status, @partly_exclude_status)) {
+
+    # ...unless it has a resolution in @except_resolution.
+    next if !grep($_ eq $bug->resolution, @except_resolution);
+  }
+
+  if (scalar @query_products) {
+    next if !grep($_->id == $bug->product_id, @query_products);
+  }
+
+  # Note: maximum row count is dealt with later.
+  push(
+    @result_bugs,
+    {
+      bug   => $bug,
+      count => $total_dups{$bug->id},
+      delta => $since_dups{$bug->id} || 0
+    }
+  );
 }
 @bugs = @result_bugs;
 @bugs = sort { sort_duplicates($a, $b, $sortby) } @bugs;
 if ($reverse) {
-    @bugs = reverse @bugs;
+  @bugs = reverse @bugs;
 }
-@bugs = @bugs[0..$maxrows-1] if scalar(@bugs) > $maxrows;
+@bugs = @bugs[0 .. $maxrows - 1] if scalar(@bugs) > $maxrows;
 
 my %vars = (
-    bugs     => \@bugs,
-    bug_ids  => [map { $_->{'bug'}->id } @bugs],
-    sortby   => $sortby,
-    openonly => $openonly,
-    maxrows  => $maxrows,
-    reverse  => $reverse,
-    format   => scalar $cgi->param('format'),
-    product  => [map { $_->name } @query_products],
-    sortvisible  => $sortvisible,
-    changedsince => $changedsince,
+  bugs         => \@bugs,
+  bug_ids      => [map { $_->{'bug'}->id } @bugs],
+  sortby       => $sortby,
+  openonly     => $openonly,
+  maxrows      => $maxrows,
+  reverse      => $reverse,
+  format       => scalar $cgi->param('format'),
+  product      => [map { $_->name } @query_products],
+  sortvisible  => $sortvisible,
+  changedsince => $changedsince,
 );
 
 my $format = $template->get_format("reports/duplicates", $vars{'format'});
diff --git a/editclassifications.cgi b/editclassifications.cgi
index b06ce27ad9..b453a904c8 100755
--- a/editclassifications.cgi
+++ b/editclassifications.cgi
@@ -7,11 +7,11 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -20,28 +20,27 @@ use Bugzilla::Error;
 use Bugzilla::Classification;
 use Bugzilla::Token;
 
-my $dbh = Bugzilla->dbh;
-my $cgi = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
 local our $vars = {};
 
 sub LoadTemplate {
-    my $action = shift;
-    my $cgi = Bugzilla->cgi;
-    my $template = Bugzilla->template;
-
-    $vars->{'classifications'} = [Bugzilla::Classification->get_all]
-      if ($action eq 'select');
-    # There is currently only one section about classifications,
-    # so all pages point to it. Let's define it here.
-    $vars->{'doc_section'} = 'administration.html#classifications';
-
-    $action =~ /(\w+)/;
-    $action = $1;
-    print $cgi->header();
-    $template->process("admin/classifications/$action.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $action   = shift;
+  my $template = Bugzilla->template;
+
+  $vars->{'classifications'} = [Bugzilla::Classification->get_all]
+    if ($action eq 'select');
+
+  # There is currently only one section about classifications,
+  # so all pages point to it. Let's define it here.
+  $vars->{'doc_section'} = 'administering/categorization.html#classifications';
+
+  $action =~ /(\w+)/;
+  $action = $1;
+  $template->process("admin/classifications/$action.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -52,13 +51,12 @@ my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 print $cgi->header();
 
-$user->in_group('editclassifications')
-  || ThrowUserError("auth_failure", {group  => "editclassifications",
-                                     action => "edit",
-                                     object => "classifications"});
+$user->in_group('editclassifications') || ThrowUserError("auth_failure",
+  {group => "editclassifications", action => "edit", object => "classifications"}
+);
 
-ThrowUserError("auth_classification_not_enabled") 
-    unless Bugzilla->params->{"useclassification"};
+ThrowUserError("auth_classification_not_enabled")
+  unless Bugzilla->params->{"useclassification"};
 
 #
 # often used variables
@@ -79,8 +77,8 @@ LoadTemplate('select') unless $action;
 #
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_classification');
-    LoadTemplate($action);
+  $vars->{'token'} = issue_session_token('add_classification');
+  LoadTemplate($action);
 }
 
 #
@@ -88,20 +86,21 @@ if ($action eq 'add') {
 #
 
 if ($action eq 'new') {
-    check_token_data($token, 'add_classification');
+  check_token_data($token, 'add_classification');
 
-    my $classification =
-      Bugzilla::Classification->create({name        => $class_name,
-                                        description => scalar $cgi->param('description'),
-                                        sortkey     => scalar $cgi->param('sortkey')});
+  my $classification = Bugzilla::Classification->create({
+    name        => $class_name,
+    description => scalar $cgi->param('description'),
+    sortkey     => scalar $cgi->param('sortkey')
+  });
 
-    delete_token($token);
+  delete_token($token);
 
-    $vars->{'message'} = 'classification_created';
-    $vars->{'classification'} = $classification;
-    $vars->{'classifications'} = [Bugzilla::Classification->get_all];
-    $vars->{'token'} = issue_session_token('reclassify_classifications');
-    LoadTemplate('reclassify');
+  $vars->{'message'}         = 'classification_created';
+  $vars->{'classification'}  = $classification;
+  $vars->{'classifications'} = [Bugzilla::Classification->get_all];
+  $vars->{'token'}           = issue_session_token('reclassify_classifications');
+  LoadTemplate('reclassify');
 }
 
 #
@@ -112,20 +111,20 @@ if ($action eq 'new') {
 
 if ($action eq 'del') {
 
-    my $classification = Bugzilla::Classification->check($class_name);
+  my $classification = Bugzilla::Classification->check($class_name);
 
-    if ($classification->id == 1) {
-        ThrowUserError("classification_not_deletable");
-    }
+  if ($classification->id == 1) {
+    ThrowUserError("classification_not_deletable");
+  }
 
-    if ($classification->product_count()) {
-        ThrowUserError("classification_has_products");
-    }
+  if ($classification->product_count()) {
+    ThrowUserError("classification_has_products");
+  }
 
-    $vars->{'classification'} = $classification;
-    $vars->{'token'} = issue_session_token('delete_classification');
+  $vars->{'classification'} = $classification;
+  $vars->{'token'}          = issue_session_token('delete_classification');
 
-    LoadTemplate($action);
+  LoadTemplate($action);
 }
 
 #
@@ -133,15 +132,15 @@ if ($action eq 'del') {
 #
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_classification');
+  check_token_data($token, 'delete_classification');
 
-    my $classification = Bugzilla::Classification->check($class_name);
-    $classification->remove_from_db;
-    delete_token($token);
+  my $classification = Bugzilla::Classification->check($class_name);
+  $classification->remove_from_db;
+  delete_token($token);
 
-    $vars->{'message'} = 'classification_deleted';
-    $vars->{'classification'} = $classification;
-    LoadTemplate('select');
+  $vars->{'message'}        = 'classification_deleted';
+  $vars->{'classification'} = $classification;
+  LoadTemplate('select');
 }
 
 #
@@ -151,12 +150,12 @@ if ($action eq 'delete') {
 #
 
 if ($action eq 'edit') {
-    my $classification = Bugzilla::Classification->check($class_name);
+  my $classification = Bugzilla::Classification->check($class_name);
 
-    $vars->{'classification'} = $classification;
-    $vars->{'token'} = issue_session_token('edit_classification');
+  $vars->{'classification'} = $classification;
+  $vars->{'token'}          = issue_session_token('edit_classification');
 
-    LoadTemplate($action);
+  LoadTemplate($action);
 }
 
 #
@@ -164,24 +163,24 @@ if ($action eq 'edit') {
 #
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_classification');
+  check_token_data($token, 'edit_classification');
 
-    my $class_old_name = trim($cgi->param('classificationold') || '');
-    my $classification = Bugzilla::Classification->check($class_old_name);
+  my $class_old_name = trim($cgi->param('classificationold') || '');
+  my $classification = Bugzilla::Classification->check($class_old_name);
 
-    $classification->set_all({
-        name        => $class_name,
-        description => scalar $cgi->param('description'),
-        sortkey     => scalar $cgi->param('sortkey'),
-    });
+  $classification->set_all({
+    name        => $class_name,
+    description => scalar $cgi->param('description'),
+    sortkey     => scalar $cgi->param('sortkey'),
+  });
 
-    my $changes = $classification->update;
-    delete_token($token);
+  my $changes = $classification->update;
+  delete_token($token);
 
-    $vars->{'message'} = 'classification_updated';
-    $vars->{'classification'} = $classification;
-    $vars->{'changes'} = $changes;
-    LoadTemplate('select');
+  $vars->{'message'}        = 'classification_updated';
+  $vars->{'classification'} = $classification;
+  $vars->{'changes'}        = $changes;
+  LoadTemplate('select');
 }
 
 #
@@ -189,44 +188,47 @@ if ($action eq 'update') {
 #
 
 if ($action eq 'reclassify') {
-    my $classification = Bugzilla::Classification->check($class_name);
-
-    my $sth = $dbh->prepare("UPDATE products SET classification_id = ?
-                             WHERE name = ?");
-    my @names;
-
-    if (defined $cgi->param('add_products')) {
-        check_token_data($token, 'reclassify_classifications');
-        if (defined $cgi->param('prodlist')) {
-            foreach my $prod ($cgi->param("prodlist")) {
-                trick_taint($prod);
-                $sth->execute($classification->id, $prod);
-                push @names, $prod;
-            }
-        }
-        delete_token($token);
-    } elsif (defined $cgi->param('remove_products')) {
-        check_token_data($token, 'reclassify_classifications');
-        if (defined $cgi->param('myprodlist')) {
-            foreach my $prod ($cgi->param("myprodlist")) {
-                trick_taint($prod);
-                $sth->execute(1, $prod);
-                push @names, $prod;
-            }
-        }
-        delete_token($token);
+  my $classification = Bugzilla::Classification->check($class_name);
+
+  my $sth = $dbh->prepare(
+    "UPDATE products SET classification_id = ?
+                             WHERE name = ?"
+  );
+  my @names;
+
+  if (defined $cgi->param('add_products')) {
+    check_token_data($token, 'reclassify_classifications');
+    if (defined $cgi->param('prodlist')) {
+      foreach my $prod ($cgi->multi_param("prodlist")) {
+        trick_taint($prod);
+        $sth->execute($classification->id, $prod);
+        push @names, $prod;
+      }
+    }
+    delete_token($token);
+  }
+  elsif (defined $cgi->param('remove_products')) {
+    check_token_data($token, 'reclassify_classifications');
+    if (defined $cgi->param('myprodlist')) {
+      foreach my $prod ($cgi->multi_param('myprodlist')) {
+        trick_taint($prod);
+        $sth->execute(1, $prod);
+        push @names, $prod;
+      }
     }
+    delete_token($token);
+  }
 
-    $vars->{'classifications'} = [Bugzilla::Classification->get_all];
-    $vars->{'classification'} = $classification;
-    $vars->{'token'} = issue_session_token('reclassify_classifications');
+  $vars->{'classifications'} = [Bugzilla::Classification->get_all];
+  $vars->{'classification'}  = $classification;
+  $vars->{'token'}           = issue_session_token('reclassify_classifications');
 
-    foreach my $name (@names) {
-        Bugzilla->memcached->clear({ table => 'products', name => $name });
-    }
-    Bugzilla->memcached->clear_config();
+  foreach my $name (@names) {
+    Bugzilla->memcached->clear({table => 'products', name => $name});
+  }
+  Bugzilla->memcached->clear_config();
 
-    LoadTemplate($action);
+  LoadTemplate($action);
 }
 
 #
diff --git a/editcomponents.cgi b/editcomponents.cgi
index 7442365f35..b17feb06c0 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -20,12 +20,13 @@ use Bugzilla::User;
 use Bugzilla::Component;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
+
 # There is only one section about components in the documentation,
 # so all actions point to the same page.
-$vars->{'doc_section'} = 'administration.html#components';
+$vars->{'doc_section'} = 'administering/categorization.html#components';
 
 #
 # Preliminary checks:
@@ -37,16 +38,15 @@ print $cgi->header();
 
 $user->in_group('editcomponents')
   || scalar(@{$user->get_products_by_permission('editcomponents')})
-  || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                     action => "edit",
-                                     object => "components"});
+  || ThrowUserError("auth_failure",
+  {group => "editcomponents", action => "edit", object => "components"});
 
 #
 # often used variables
 #
-my $product_name  = trim($cgi->param('product')     || '');
-my $comp_name     = trim($cgi->param('component')   || '');
-my $action        = trim($cgi->param('action')      || '');
+my $product_name = trim($cgi->param('product')   || '');
+my $comp_name    = trim($cgi->param('component') || '');
+my $action       = trim($cgi->param('action')    || '');
 my $showbugcounts = (defined $cgi->param('showbugcounts'));
 my $token         = $cgi->param('token');
 
@@ -55,18 +55,19 @@ my $token         = $cgi->param('token');
 #
 
 unless ($product_name) {
-    my $selectable_products = $user->get_selectable_products;
-    # If the user has editcomponents privs for some products only,
-    # we have to restrict the list of products to display.
-    unless ($user->in_group('editcomponents')) {
-        $selectable_products = $user->get_products_by_permission('editcomponents');
-    }
-    $vars->{'products'} = $selectable_products;
-    $vars->{'showbugcounts'} = $showbugcounts;
-
-    $template->process("admin/components/select-product.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $selectable_products = $user->get_selectable_products;
+
+  # If the user has editcomponents privs for some products only,
+  # we have to restrict the list of products to display.
+  unless ($user->in_group('editcomponents')) {
+    $selectable_products = $user->get_products_by_permission('editcomponents');
+  }
+  $vars->{'products'}      = $selectable_products;
+  $vars->{'showbugcounts'} = $showbugcounts;
+
+  $template->process("admin/components/select-product.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 my $product = $user->check_can_admin_product($product_name);
@@ -76,11 +77,11 @@ my $product = $user->check_can_admin_product($product_name);
 #
 
 unless ($action) {
-    $vars->{'showbugcounts'} = $showbugcounts;
-    $vars->{'product'} = $product;
-    $template->process("admin/components/list.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'showbugcounts'} = $showbugcounts;
+  $vars->{'product'}       = $product;
+  $template->process("admin/components/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -90,11 +91,11 @@ unless ($action) {
 #
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_component');
-    $vars->{'product'} = $product;
-    $template->process("admin/components/create.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'token'}   = issue_session_token('add_component');
+  $vars->{'product'} = $product;
+  $template->process("admin/components/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -102,40 +103,42 @@ if ($action eq 'add') {
 #
 
 if ($action eq 'new') {
-    check_token_data($token, 'add_component');
-    # Do the user matching
-    Bugzilla::User::match_field ({
-        'initialowner'     => { 'type' => 'single' },
-        'initialqacontact' => { 'type' => 'single' },
-        'initialcc'        => { 'type' => 'multi'  },
-    });
-
-    my $default_assignee   = trim($cgi->param('initialowner')     || '');
-    my $default_qa_contact = trim($cgi->param('initialqacontact') || '');
-    my $description        = trim($cgi->param('description')      || '');
-    my @initial_cc         = $cgi->param('initialcc');
-    my $isactive           = $cgi->param('isactive');
-
-    my $component = Bugzilla::Component->create({
-        name             => $comp_name,
-        product          => $product,
-        description      => $description,
-        initialowner     => $default_assignee,
-        initialqacontact => $default_qa_contact,
-        initial_cc       => \@initial_cc,
-        # XXX We should not be creating series for products that we
-        # didn't create series for.
-        create_series    => 1,
-   });
-
-    $vars->{'message'} = 'component_created';
-    $vars->{'comp'} = $component;
-    $vars->{'product'} = $product;
-    delete_token($token);
-
-    $template->process("admin/components/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'add_component');
+
+  # Do the user matching
+  Bugzilla::User::match_field({
+    'initialowner'     => {'type' => 'single'},
+    'initialqacontact' => {'type' => 'single'},
+    'initialcc'        => {'type' => 'multi'},
+  });
+
+  my $default_assignee   = trim($cgi->param('initialowner')     || '');
+  my $default_qa_contact = trim($cgi->param('initialqacontact') || '');
+  my $description        = trim($cgi->param('description')      || '');
+  my @initial_cc         = $cgi->multi_param('initialcc');
+  my $isactive           = $cgi->param('isactive');
+
+  my $component = Bugzilla::Component->create({
+    name             => $comp_name,
+    product          => $product,
+    description      => $description,
+    initialowner     => $default_assignee,
+    initialqacontact => $default_qa_contact,
+    initial_cc       => \@initial_cc,
+
+    # XXX We should not be creating series for products that we
+    # didn't create series for.
+    create_series => 1,
+  });
+
+  $vars->{'message'} = 'component_created';
+  $vars->{'comp'}    = $component;
+  $vars->{'product'} = $product;
+  delete_token($token);
+
+  $template->process("admin/components/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -145,14 +148,14 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'del') {
-    $vars->{'token'} = issue_session_token('delete_component');
-    $vars->{'comp'} =
-      Bugzilla::Component->check({ product => $product, name => $comp_name });
-    $vars->{'product'} = $product;
-
-    $template->process("admin/components/confirm-delete.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'token'} = issue_session_token('delete_component');
+  $vars->{'comp'}
+    = Bugzilla::Component->check({product => $product, name => $comp_name});
+  $vars->{'product'} = $product;
+
+  $template->process("admin/components/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -160,21 +163,21 @@ if ($action eq 'del') {
 #
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_component');
-    my $component =
-        Bugzilla::Component->check({ product => $product, name => $comp_name });
+  check_token_data($token, 'delete_component');
+  my $component
+    = Bugzilla::Component->check({product => $product, name => $comp_name});
 
-    $component->remove_from_db;
+  $component->remove_from_db;
 
-    $vars->{'message'} = 'component_deleted';
-    $vars->{'comp'} = $component;
-    $vars->{'product'} = $product;
-    $vars->{'no_edit_component_link'} = 1;
-    delete_token($token);
+  $vars->{'message'}                = 'component_deleted';
+  $vars->{'comp'}                   = $component;
+  $vars->{'product'}                = $product;
+  $vars->{'no_edit_component_link'} = 1;
+  delete_token($token);
 
-    $template->process("admin/components/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/components/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -184,19 +187,19 @@ if ($action eq 'delete') {
 #
 
 if ($action eq 'edit') {
-    $vars->{'token'} = issue_session_token('edit_component');
-    my $component =
-        Bugzilla::Component->check({ product => $product, name => $comp_name });
-    $vars->{'comp'} = $component;
+  $vars->{'token'} = issue_session_token('edit_component');
+  my $component
+    = Bugzilla::Component->check({product => $product, name => $comp_name});
+  $vars->{'comp'} = $component;
 
-    $vars->{'initial_cc_names'} = 
-        join(', ', map($_->login, @{$component->initial_cc}));
+  $vars->{'initial_cc_names'}
+    = join(', ', map($_->login, @{$component->initial_cc}));
 
-    $vars->{'product'} = $product;
+  $vars->{'product'} = $product;
 
-    $template->process("admin/components/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/components/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -204,41 +207,42 @@ if ($action eq 'edit') {
 #
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_component');
-    # Do the user matching
-    Bugzilla::User::match_field ({
-        'initialowner'     => { 'type' => 'single' },
-        'initialqacontact' => { 'type' => 'single' },
-        'initialcc'        => { 'type' => 'multi'  },
-    });
-
-    my $comp_old_name         = trim($cgi->param('componentold')     || '');
-    my $default_assignee      = trim($cgi->param('initialowner')     || '');
-    my $default_qa_contact    = trim($cgi->param('initialqacontact') || '');
-    my $description           = trim($cgi->param('description')      || '');
-    my @initial_cc            = $cgi->param('initialcc');
-    my $isactive              = $cgi->param('isactive');
-  
-    my $component =
-        Bugzilla::Component->check({ product => $product, name => $comp_old_name });
-
-    $component->set_name($comp_name);
-    $component->set_description($description);
-    $component->set_default_assignee($default_assignee);
-    $component->set_default_qa_contact($default_qa_contact);
-    $component->set_cc_list(\@initial_cc);
-    $component->set_is_active($isactive);
-    my $changes = $component->update();
-
-    $vars->{'message'} = 'component_updated';
-    $vars->{'comp'} = $component;
-    $vars->{'product'} = $product;
-    $vars->{'changes'} = $changes;
-    delete_token($token);
-
-    $template->process("admin/components/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'edit_component');
+
+  # Do the user matching
+  Bugzilla::User::match_field({
+    'initialowner'     => {'type' => 'single'},
+    'initialqacontact' => {'type' => 'single'},
+    'initialcc'        => {'type' => 'multi'},
+  });
+
+  my $comp_old_name      = trim($cgi->param('componentold')     || '');
+  my $default_assignee   = trim($cgi->param('initialowner')     || '');
+  my $default_qa_contact = trim($cgi->param('initialqacontact') || '');
+  my $description        = trim($cgi->param('description')      || '');
+  my @initial_cc         = $cgi->multi_param('initialcc');
+  my $isactive           = $cgi->param('isactive');
+
+  my $component
+    = Bugzilla::Component->check({product => $product, name => $comp_old_name});
+
+  $component->set_name($comp_name);
+  $component->set_description($description);
+  $component->set_default_assignee($default_assignee);
+  $component->set_default_qa_contact($default_qa_contact);
+  $component->set_cc_list(\@initial_cc);
+  $component->set_is_active($isactive);
+  my $changes = $component->update();
+
+  $vars->{'message'} = 'component_updated';
+  $vars->{'comp'}    = $component;
+  $vars->{'product'} = $product;
+  $vars->{'changes'} = $changes;
+  delete_token($token);
+
+  $template->process("admin/components/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 # No valid action found
diff --git a/editfields.cgi b/editfields.cgi
index e8351bdd69..e56134d3f1 100755
--- a/editfields.cgi
+++ b/editfields.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -19,153 +19,157 @@ use Bugzilla::Util;
 use Bugzilla::Field;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # Make sure the user is logged in and is an administrator.
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 $user->in_group('admin')
-  || ThrowUserError('auth_failure', {group  => 'admin',
-                                     action => 'edit',
-                                     object => 'custom_fields'});
+  || ThrowUserError('auth_failure',
+  {group => 'admin', action => 'edit', object => 'custom_fields'});
 
 my $action = trim($cgi->param('action') || '');
-my $token  = $cgi->param('token');
+my $token = $cgi->param('token');
 
 print $cgi->header();
 
 # List all existing custom fields if no action is given.
 if (!$action) {
-    $template->process('admin/custom_fields/list.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
+  $template->process('admin/custom_fields/list.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
+
 # Interface to add a new custom field.
 elsif ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_field');
+  $vars->{'token'} = issue_session_token('add_field');
 
-    $template->process('admin/custom_fields/create.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
+  $template->process('admin/custom_fields/create.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 elsif ($action eq 'new') {
-    check_token_data($token, 'add_field');
-    $vars->{'field'} = Bugzilla::Field->create({
-        name        => scalar $cgi->param('name'),
-        description => scalar $cgi->param('desc'),
-        long_desc   => scalar $cgi->param('long_desc'),
-        type        => scalar $cgi->param('type'),
-        sortkey     => scalar $cgi->param('sortkey'),
-        mailhead    => scalar $cgi->param('new_bugmail'),
-        enter_bug   => scalar $cgi->param('enter_bug'),
-        obsolete    => scalar $cgi->param('obsolete'),
-        custom      => 1,
-        buglist     => 1,
-        visibility_field_id => scalar $cgi->param('visibility_field_id'),
-        visibility_values => [ $cgi->param('visibility_values') ],
-        value_field_id => scalar $cgi->param('value_field_id'),
-        reverse_desc => scalar $cgi->param('reverse_desc'),
-        is_mandatory => scalar $cgi->param('is_mandatory'),
-    });
-
-    delete_token($token);
-
-    $vars->{'message'} = 'custom_field_created';
-
-    $template->process('admin/custom_fields/list.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
+  check_token_data($token, 'add_field');
+  $vars->{'field'} = Bugzilla::Field->create({
+    name                => scalar $cgi->param('name'),
+    description         => scalar $cgi->param('desc'),
+    long_desc           => scalar $cgi->param('long_desc'),
+    type                => scalar $cgi->param('type'),
+    sortkey             => scalar $cgi->param('sortkey'),
+    mailhead            => scalar $cgi->param('new_bugmail'),
+    enter_bug           => scalar $cgi->param('enter_bug'),
+    obsolete            => scalar $cgi->param('obsolete'),
+    custom              => 1,
+    buglist             => 1,
+    visibility_field_id => scalar $cgi->param('visibility_field_id'),
+    visibility_values   => [$cgi->multi_param('visibility_values')],
+    value_field_id      => scalar $cgi->param('value_field_id'),
+    reverse_desc        => scalar $cgi->param('reverse_desc'),
+    is_mandatory        => scalar $cgi->param('is_mandatory'),
+  });
+
+  delete_token($token);
+
+  $vars->{'message'} = 'custom_field_created';
+
+  $template->process('admin/custom_fields/list.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 elsif ($action eq 'edit') {
-    my $name = $cgi->param('name') || ThrowUserError('field_missing_name');
-    # Custom field names must start with "cf_".
-    if ($name !~ /^cf_/) {
-        $name = 'cf_' . $name;
-    }
-    my $field = new Bugzilla::Field({'name' => $name});
-    $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
-
-    $vars->{'field'} = $field;
-    $vars->{'token'} = issue_session_token('edit_field');
-
-    $template->process('admin/custom_fields/edit.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
+  my $name = $cgi->param('name') || ThrowUserError('field_missing_name');
+
+  # Custom field names must start with "cf_".
+  if ($name !~ /^cf_/) {
+    $name = 'cf_' . $name;
+  }
+  my $field = new Bugzilla::Field({'name' => $name});
+  $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
+
+  $vars->{'field'} = $field;
+  $vars->{'token'} = issue_session_token('edit_field');
+
+  $template->process('admin/custom_fields/edit.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 elsif ($action eq 'update') {
-    check_token_data($token, 'edit_field');
-    my $name = $cgi->param('name');
-
-    # Validate fields.
-    $name || ThrowUserError('field_missing_name');
-    # Custom field names must start with "cf_".
-    if ($name !~ /^cf_/) {
-        $name = 'cf_' . $name;
-    }
-    my $field = new Bugzilla::Field({'name' => $name});
-    $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
-
-    $field->set_description($cgi->param('desc'));
-    $field->set_long_desc($cgi->param('long_desc'));
-    $field->set_sortkey($cgi->param('sortkey'));
-    $field->set_in_new_bugmail($cgi->param('new_bugmail'));
-    $field->set_enter_bug($cgi->param('enter_bug'));
-    $field->set_obsolete($cgi->param('obsolete'));
-    $field->set_is_mandatory($cgi->param('is_mandatory'));
-    $field->set_visibility_field($cgi->param('visibility_field_id'));
-    $field->set_visibility_values([ $cgi->param('visibility_values') ]);
-    $field->set_value_field($cgi->param('value_field_id'));
-    $field->set_reverse_desc($cgi->param('reverse_desc'));
-    $field->update();
-
-    delete_token($token);
-
-    $vars->{'field'}   = $field;
-    $vars->{'message'} = 'custom_field_updated';
-
-    $template->process('admin/custom_fields/list.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
+  check_token_data($token, 'edit_field');
+  my $name = $cgi->param('name');
+
+  # Validate fields.
+  $name || ThrowUserError('field_missing_name');
+
+  # Custom field names must start with "cf_".
+  if ($name !~ /^cf_/) {
+    $name = 'cf_' . $name;
+  }
+  my $field = new Bugzilla::Field({'name' => $name});
+  $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
+
+  $field->set_description(scalar $cgi->param('desc'));
+  $field->set_long_desc(scalar $cgi->param('long_desc'));
+  $field->set_sortkey(scalar $cgi->param('sortkey'));
+  $field->set_in_new_bugmail(scalar $cgi->param('new_bugmail'));
+  $field->set_enter_bug(scalar $cgi->param('enter_bug'));
+  $field->set_obsolete(scalar $cgi->param('obsolete'));
+  $field->set_is_mandatory(scalar $cgi->param('is_mandatory'));
+  $field->set_visibility_field(scalar $cgi->param('visibility_field_id'));
+  $field->set_visibility_values([$cgi->multi_param('visibility_values')]);
+  $field->set_value_field(scalar $cgi->param('value_field_id'));
+  $field->set_reverse_desc(scalar $cgi->param('reverse_desc'));
+  $field->update();
+
+  delete_token($token);
+
+  $vars->{'field'}   = $field;
+  $vars->{'message'} = 'custom_field_updated';
+
+  $template->process('admin/custom_fields/list.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 elsif ($action eq 'del') {
-    my $name = $cgi->param('name');
-
-    # Validate field.
-    $name || ThrowUserError('field_missing_name');
-    # Custom field names must start with "cf_".
-    if ($name !~ /^cf_/) {
-        $name = 'cf_' . $name;
-    }
-    my $field = new Bugzilla::Field({'name' => $name});
-    $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
-
-    $vars->{'field'} = $field;
-    $vars->{'token'} = issue_session_token('delete_field');
-
-    $template->process('admin/custom_fields/confirm-delete.html.tmpl', $vars)
-            || ThrowTemplateError($template->error());
+  my $name = $cgi->param('name');
+
+  # Validate field.
+  $name || ThrowUserError('field_missing_name');
+
+  # Custom field names must start with "cf_".
+  if ($name !~ /^cf_/) {
+    $name = 'cf_' . $name;
+  }
+  my $field = new Bugzilla::Field({'name' => $name});
+  $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
+
+  $vars->{'field'} = $field;
+  $vars->{'token'} = issue_session_token('delete_field');
+
+  $template->process('admin/custom_fields/confirm-delete.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 elsif ($action eq 'delete') {
-    check_token_data($token, 'delete_field');
-    my $name = $cgi->param('name');
-
-    # Validate fields.
-    $name || ThrowUserError('field_missing_name');
-    # Custom field names must start with "cf_".
-    if ($name !~ /^cf_/) {
-        $name = 'cf_' . $name;
-    }
-    my $field = new Bugzilla::Field({'name' => $name});
-    $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
-
-    # Calling remove_from_db will check if field can be deleted.
-    # If the field cannot be deleted, it will throw an error.
-    $field->remove_from_db();
-    
-    $vars->{'field'}   = $field;
-    $vars->{'message'} = 'custom_field_deleted';
-    
-    delete_token($token);
-
-    $template->process('admin/custom_fields/list.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
+  check_token_data($token, 'delete_field');
+  my $name = $cgi->param('name');
+
+  # Validate fields.
+  $name || ThrowUserError('field_missing_name');
+
+  # Custom field names must start with "cf_".
+  if ($name !~ /^cf_/) {
+    $name = 'cf_' . $name;
+  }
+  my $field = new Bugzilla::Field({'name' => $name});
+  $field || ThrowUserError('customfield_nonexistent', {'name' => $name});
+
+  # Calling remove_from_db will check if field can be deleted.
+  # If the field cannot be deleted, it will throw an error.
+  $field->remove_from_db();
+
+  $vars->{'field'}   = $field;
+  $vars->{'message'} = 'custom_field_deleted';
+
+  delete_token($token);
+
+  $template->process('admin/custom_fields/list.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 else {
-    ThrowUserError('unknown_action', {action => $action});
+  ThrowUserError('unknown_action', {action => $action});
 }
diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index d848d250a5..70878d70ed 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -23,405 +23,430 @@ use Bugzilla::Product;
 use Bugzilla::Token;
 
 # Make sure the user is logged in and has the right privileges.
-my $user = Bugzilla->login(LOGIN_REQUIRED);
-my $cgi = Bugzilla->cgi;
+my $user     = Bugzilla->login(LOGIN_REQUIRED);
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
 
 print $cgi->header();
 
 $user->in_group('editcomponents')
   || scalar(@{$user->get_products_by_permission('editcomponents')})
-  || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                     action => "edit",
-                                     object => "flagtypes"});
+  || ThrowUserError("auth_failure",
+  {group => "editcomponents", action => "edit", object => "flagtypes"});
 
 # We need this everywhere.
-my $vars = get_products_and_components();
+my $vars     = get_products_and_components();
 my @products = @{$vars->{products}};
 
-my $action = $cgi->param('action') || 'list';
-my $token  = $cgi->param('token');
+my $action    = $cgi->param('action') || 'list';
+my $token     = $cgi->param('token');
 my $prod_name = $cgi->param('product');
 my $comp_name = $cgi->param('component');
-my $flag_id = $cgi->param('id');
+my $flag_id   = $cgi->param('id');
 
 my ($product, $component);
 
 if ($prod_name) {
-    # Make sure the user is allowed to view this product name.
-    # Users with global editcomponents privs can see all product names.
-    ($product) = grep { lc($_->name) eq lc($prod_name) } @products;
-    $product || ThrowUserError('product_access_denied', { name => $prod_name });
+
+  # Make sure the user is allowed to view this product name.
+  # Users with global editcomponents privs can see all product names.
+  ($product) = grep { lc($_->name) eq lc($prod_name) } @products;
+  $product || ThrowUserError('product_access_denied', {name => $prod_name});
 }
 
 if ($comp_name) {
-    $product || ThrowUserError('flag_type_component_without_product');
-    ($component) = grep { lc($_->name) eq lc($comp_name) } @{$product->components};
-    $component || ThrowUserError('product_unknown_component', { product => $product->name,
-                                                                comp => $comp_name });
+  $product || ThrowUserError('flag_type_component_without_product');
+  ($component) = grep { lc($_->name) eq lc($comp_name) } @{$product->components};
+  $component
+    || ThrowUserError('product_unknown_component',
+    {product => $product->name, comp => $comp_name});
 }
 
 # If 'categoryAction' is set, it has priority over 'action'.
-if (my ($category_action) = grep { $_ =~ /^categoryAction-(?:\w+)$/ } $cgi->param()) {
-    $category_action =~ s/^categoryAction-//;
-
-    my @inclusions = $cgi->param('inclusions');
-    my @exclusions = $cgi->param('exclusions');
-    my @categories;
-    if ($category_action =~ /^(in|ex)clude$/) {
-        if (!$user->in_group('editcomponents') && !$product) {
-            # The user can only add the flag type to products they can administrate.
-            foreach my $prod (@products) {
-                push(@categories, $prod->id . ':0')
-            }
-        }
-        else {
-            my $category = ($product ? $product->id : 0) . ':' .
-                           ($component ? $component->id : 0);
-            push(@categories, $category);
-        }
+if (my ($category_action)
+  = grep { $_ =~ /^categoryAction-(?:\w+)$/ } $cgi->multi_param())
+{
+  $category_action =~ s/^categoryAction-//;
+
+  my @inclusions = $cgi->multi_param('inclusions');
+  my @exclusions = $cgi->multi_param('exclusions');
+  my @categories;
+  if ($category_action =~ /^(in|ex)clude$/) {
+    if (!$user->in_group('editcomponents') && !$product) {
+
+      # The user can only add the flag type to products they can administrate.
+      foreach my $prod (@products) {
+        push(@categories, $prod->id . ':0');
+      }
     }
-
-    if ($category_action eq 'include') {
-        foreach my $category (@categories) {
-            push(@inclusions, $category) unless grep($_ eq $category, @inclusions);
-        }
+    else {
+      my $category
+        = ($product ? $product->id : 0) . ':' . ($component ? $component->id : 0);
+      push(@categories, $category);
     }
-    elsif ($category_action eq 'exclude') {
-        foreach my $category (@categories) {
-            push(@exclusions, $category) unless grep($_ eq $category, @exclusions);
-        }
+  }
+
+  if ($category_action eq 'include') {
+    foreach my $category (@categories) {
+      push(@inclusions, $category) unless grep($_ eq $category, @inclusions);
     }
-    elsif ($category_action eq 'removeInclusion') {
-        my @inclusion_to_remove = $cgi->param('inclusion_to_remove');
-        foreach my $remove (@inclusion_to_remove) {
-            @inclusions = grep { $_ ne $remove } @inclusions;
-        }
+  }
+  elsif ($category_action eq 'exclude') {
+    foreach my $category (@categories) {
+      push(@exclusions, $category) unless grep($_ eq $category, @exclusions);
     }
-    elsif ($category_action eq 'removeExclusion') {
-        my @exclusion_to_remove = $cgi->param('exclusion_to_remove');
-        foreach my $remove (@exclusion_to_remove) {
-            @exclusions = grep { $_ ne $remove } @exclusions;
-        }
+  }
+  elsif ($category_action eq 'removeInclusion') {
+    my @inclusion_to_remove = $cgi->multi_param('inclusion_to_remove');
+    foreach my $remove (@inclusion_to_remove) {
+      @inclusions = grep { $_ ne $remove } @inclusions;
     }
-
-    $vars->{'groups'} = get_settable_groups();
-    $vars->{'action'} = $action;
-
-    my $type = {};
-    $type->{$_} = $cgi->param($_) foreach $cgi->param();
-    # Make sure boolean fields are defined, else they fall back to 1.
-    foreach my $boolean (qw(is_active is_requestable is_requesteeble is_multiplicable)) {
-        $type->{$boolean} ||= 0;
+  }
+  elsif ($category_action eq 'removeExclusion') {
+    my @exclusion_to_remove = $cgi->multi_param('exclusion_to_remove');
+    foreach my $remove (@exclusion_to_remove) {
+      @exclusions = grep { $_ ne $remove } @exclusions;
     }
-
-    # That's what I call a big hack. The template expects to see a group object.
-    $type->{'grant_group'} = {};
-    $type->{'grant_group'}->{'name'} = $cgi->param('grant_group');
-    $type->{'request_group'} = {};
-    $type->{'request_group'}->{'name'} = $cgi->param('request_group');
-
-    $vars->{'inclusions'} = clusion_array_to_hash(\@inclusions, \@products);
-    $vars->{'exclusions'} = clusion_array_to_hash(\@exclusions, \@products);
-
-    $vars->{'type'} = $type;
-    $vars->{'token'} = $token;
-    $vars->{'check_clusions'} = 1;
-    $vars->{'can_fully_edit'} = $cgi->param('can_fully_edit');
-
-    $template->process("admin/flag-type/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  }
+
+  $vars->{'groups'} = get_settable_groups();
+  $vars->{'action'} = $action;
+
+  my $type = {};
+  $type->{$_} = $cgi->param($_) foreach $cgi->param();
+
+  # Make sure boolean fields are defined, else they fall back to 1.
+  foreach
+    my $boolean (qw(is_active is_requestable is_requesteeble is_multiplicable))
+  {
+    $type->{$boolean} ||= 0;
+  }
+
+  # That's what I call a big hack. The template expects to see a group object.
+  $type->{'grant_group'}             = {};
+  $type->{'grant_group'}->{'name'}   = $cgi->param('grant_group');
+  $type->{'request_group'}           = {};
+  $type->{'request_group'}->{'name'} = $cgi->param('request_group');
+
+  $vars->{'inclusions'} = clusion_array_to_hash(\@inclusions, \@products);
+  $vars->{'exclusions'} = clusion_array_to_hash(\@exclusions, \@products);
+
+  $vars->{'type'}           = $type;
+  $vars->{'token'}          = $token;
+  $vars->{'check_clusions'} = 1;
+  $vars->{'can_fully_edit'} = $cgi->param('can_fully_edit');
+
+  $template->process("admin/flag-type/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'list') {
-    my $product_id = $product ? $product->id : 0;
-    my $component_id = $component ? $component->id : 0;
-    my $show_flag_counts = $cgi->param('show_flag_counts') ? 1 : 0;
-    my $group_id = $cgi->param('group');
-    if ($group_id) {
-        detaint_natural($group_id) || ThrowUserError('invalid_group_ID');
-    }
-
-    my $bug_flagtypes;
-    my $attach_flagtypes;
+  my $product_id       = $product                        ? $product->id   : 0;
+  my $component_id     = $component                      ? $component->id : 0;
+  my $show_flag_counts = $cgi->param('show_flag_counts') ? 1              : 0;
+  my $group_id         = $cgi->param('group');
+  if ($group_id) {
+    detaint_natural($group_id) || ThrowUserError('invalid_group_ID');
+  }
+
+  my $bug_flagtypes;
+  my $attach_flagtypes;
+
+  # If a component is given, restrict the list to flag types available
+  # for this component.
+  if ($component) {
+    $bug_flagtypes    = $component->flag_types->{'bug'};
+    $attach_flagtypes = $component->flag_types->{'attachment'};
 
-    # If a component is given, restrict the list to flag types available
-    # for this component.
-    if ($component) {
-        $bug_flagtypes = $component->flag_types->{'bug'};
-        $attach_flagtypes = $component->flag_types->{'attachment'};
+    # Filter flag types if a group ID is given.
+    $bug_flagtypes    = filter_group($bug_flagtypes,    $group_id);
+    $attach_flagtypes = filter_group($attach_flagtypes, $group_id);
 
-        # Filter flag types if a group ID is given.
-        $bug_flagtypes = filter_group($bug_flagtypes, $group_id);
-        $attach_flagtypes = filter_group($attach_flagtypes, $group_id);
+  }
 
-    }
-    # If only a product is specified but no component, then restrict the list
-    # to flag types available in at least one component of that product.
-    elsif ($product) {
-        $bug_flagtypes = $product->flag_types->{'bug'};
-        $attach_flagtypes = $product->flag_types->{'attachment'};
-
-        # Filter flag types if a group ID is given.
-        $bug_flagtypes = filter_group($bug_flagtypes, $group_id);
-        $attach_flagtypes = filter_group($attach_flagtypes, $group_id);
-    }
-    # If no product is given, then show all flag types available.
-    else {
-        my $flagtypes = get_editable_flagtypes(\@products, $group_id);
-        $bug_flagtypes = [grep { $_->target_type eq 'bug' } @$flagtypes];
-        $attach_flagtypes = [grep { $_->target_type eq 'attachment' } @$flagtypes];
-    }
+  # If only a product is specified but no component, then restrict the list
+  # to flag types available in at least one component of that product.
+  elsif ($product) {
+    $bug_flagtypes    = $product->flag_types->{'bug'};
+    $attach_flagtypes = $product->flag_types->{'attachment'};
 
-    if ($show_flag_counts) {
-        my %bug_lists;
-        my %map = ('+' => 'granted', '-' => 'denied', '?' => 'pending');
-
-        foreach my $flagtype (@$bug_flagtypes, @$attach_flagtypes) {
-            $bug_lists{$flagtype->id} = {};
-            my $flags = Bugzilla::Flag->match({type_id => $flagtype->id});
-            # Build lists of bugs, triaged by flag status.
-            push(@{$bug_lists{$flagtype->id}->{$map{$_->status}}}, $_->bug_id) foreach @$flags;
-        }
-        $vars->{'bug_lists'} = \%bug_lists;
-        $vars->{'show_flag_counts'} = 1;
+    # Filter flag types if a group ID is given.
+    $bug_flagtypes    = filter_group($bug_flagtypes,    $group_id);
+    $attach_flagtypes = filter_group($attach_flagtypes, $group_id);
+  }
+
+  # If no product is given, then show all flag types available.
+  else {
+    my $flagtypes = get_editable_flagtypes(\@products, $group_id);
+    $bug_flagtypes    = [grep { $_->target_type eq 'bug' } @$flagtypes];
+    $attach_flagtypes = [grep { $_->target_type eq 'attachment' } @$flagtypes];
+  }
+
+  if ($show_flag_counts) {
+    my %bug_lists;
+    my %map = ('+' => 'granted', '-' => 'denied', '?' => 'pending');
+
+    foreach my $flagtype (@$bug_flagtypes, @$attach_flagtypes) {
+      $bug_lists{$flagtype->id} = {};
+      my $flags = Bugzilla::Flag->match({type_id => $flagtype->id});
+
+      # Build lists of bugs, triaged by flag status.
+      push(@{$bug_lists{$flagtype->id}->{$map{$_->status}}}, $_->bug_id)
+        foreach @$flags;
     }
-
-    $vars->{'selected_product'} = $product ? $product->name : '';
-    $vars->{'selected_component'} = $component ? $component->name : '';
-    $vars->{'bug_types'} = $bug_flagtypes;
-    $vars->{'attachment_types'} = $attach_flagtypes;
-
-    $template->process("admin/flag-type/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+    $vars->{'bug_lists'}        = \%bug_lists;
+    $vars->{'show_flag_counts'} = 1;
+  }
+
+  $vars->{'selected_product'}   = $product   ? $product->name   : '';
+  $vars->{'selected_component'} = $component ? $component->name : '';
+  $vars->{'bug_types'}          = $bug_flagtypes;
+  $vars->{'attachment_types'}   = $attach_flagtypes;
+
+  $template->process("admin/flag-type/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'enter') {
-    my $type = $cgi->param('target_type');
-    ($type eq 'bug' || $type eq 'attachment')
-      || ThrowCodeError('flag_type_target_type_invalid', { target_type => $type });
-
-    $vars->{'action'} = 'insert';
-    $vars->{'token'} = issue_session_token('add_flagtype');
-    $vars->{'type'} = { 'target_type' => $type };
-    # Only users with global editcomponents privs can add a flagtype
-    # to all products.
-    $vars->{'inclusions'} = { '__Any__:__Any__' => '0:0' }
-      if $user->in_group('editcomponents');
-    $vars->{'can_fully_edit'} = 1;
-    # Get a list of groups available to restrict this flag type against.
-    $vars->{'groups'} = get_settable_groups();
-
-    $template->process("admin/flag-type/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $type = $cgi->param('target_type');
+  ($type eq 'bug' || $type eq 'attachment')
+    || ThrowCodeError('flag_type_target_type_invalid', {target_type => $type});
+
+  $vars->{'action'} = 'insert';
+  $vars->{'token'}  = issue_session_token('add_flagtype');
+  $vars->{'type'}   = {'target_type' => $type};
+
+  # Only users with global editcomponents privs can add a flagtype
+  # to all products.
+  $vars->{'inclusions'} = {'__Any__:__Any__' => '0:0'}
+    if $user->in_group('editcomponents');
+  $vars->{'can_fully_edit'} = 1;
+
+  # Get a list of groups available to restrict this flag type against.
+  $vars->{'groups'} = get_settable_groups();
+
+  $template->process("admin/flag-type/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'edit' || $action eq 'copy') {
-    my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
-    $vars->{'type'} = $flagtype;
-    $vars->{'can_fully_edit'} = $can_fully_edit;
-
-    if ($user->in_group('editcomponents')) {
-        $vars->{'inclusions'} = $flagtype->inclusions;
-        $vars->{'exclusions'} = $flagtype->exclusions;
-    }
-    else {
-        # Filter products the user shouldn't know about.
-        $vars->{'inclusions'} = clusion_array_to_hash([values %{$flagtype->inclusions}], \@products);
-        $vars->{'exclusions'} = clusion_array_to_hash([values %{$flagtype->exclusions}], \@products);
-    }
-
-    if ($action eq 'copy') {
-        $vars->{'action'} = "insert";
-        $vars->{'token'} = issue_session_token('add_flagtype');
-    }
-    else { 
-        $vars->{'action'} = "update";
-        $vars->{'token'} = issue_session_token('edit_flagtype');
-    }
-
-    # Get a list of groups available to restrict this flag type against.
-    $vars->{'groups'} = get_settable_groups();
-
-    $template->process("admin/flag-type/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
+  $vars->{'type'}           = $flagtype;
+  $vars->{'can_fully_edit'} = $can_fully_edit;
+
+  if ($user->in_group('editcomponents')) {
+    $vars->{'inclusions'} = $flagtype->inclusions;
+    $vars->{'exclusions'} = $flagtype->exclusions;
+  }
+  else {
+    # Filter products the user shouldn't know about.
+    $vars->{'inclusions'}
+      = clusion_array_to_hash([values %{$flagtype->inclusions}], \@products);
+    $vars->{'exclusions'}
+      = clusion_array_to_hash([values %{$flagtype->exclusions}], \@products);
+  }
+
+  if ($action eq 'copy') {
+    $vars->{'action'} = "insert";
+    $vars->{'token'}  = issue_session_token('add_flagtype');
+  }
+  else {
+    $vars->{'action'} = "update";
+    $vars->{'token'}  = issue_session_token('edit_flagtype');
+  }
+
+  # Get a list of groups available to restrict this flag type against.
+  $vars->{'groups'} = get_settable_groups();
+
+  $template->process("admin/flag-type/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'insert') {
-    check_token_data($token, 'add_flagtype');
-
-    my $name             = $cgi->param('name');
-    my $description      = $cgi->param('description');
-    my $target_type      = $cgi->param('target_type');
-    my $cc_list          = $cgi->param('cc_list');
-    my $sortkey          = $cgi->param('sortkey');
-    my $is_active        = $cgi->param('is_active');
-    my $is_requestable   = $cgi->param('is_requestable');
-    my $is_specifically  = $cgi->param('is_requesteeble');
-    my $is_multiplicable = $cgi->param('is_multiplicable');
-    my $grant_group      = $cgi->param('grant_group');
-    my $request_group    = $cgi->param('request_group');
-    my @inclusions       = $cgi->param('inclusions');
-    my @exclusions       = $cgi->param('exclusions');
-
-    # Filter inclusion and exclusion lists to products the user can see.
-    unless ($user->in_group('editcomponents')) {
-        @inclusions = values %{clusion_array_to_hash(\@inclusions, \@products)};
-        @exclusions = values %{clusion_array_to_hash(\@exclusions, \@products)};
-    }
-
-    my $flagtype = Bugzilla::FlagType->create({
-        name        => $name,
-        description => $description,
-        target_type => $target_type,
-        cc_list     => $cc_list,
-        sortkey     => $sortkey,
-        is_active   => $is_active,
-        is_requestable   => $is_requestable,
-        is_requesteeble  => $is_specifically,
-        is_multiplicable => $is_multiplicable,
-        grant_group      => $grant_group,
-        request_group    => $request_group,
-        inclusions       => \@inclusions,
-        exclusions       => \@exclusions
-    });
-
-    delete_token($token);
-
-    $vars->{'name'} = $flagtype->name;
-    $vars->{'message'} = "flag_type_created";
-
-    my $flagtypes = get_editable_flagtypes(\@products);
-    $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @$flagtypes];
-    $vars->{'attachment_types'} = [grep { $_->target_type eq 'attachment' } @$flagtypes];
-
-    $template->process("admin/flag-type/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'add_flagtype');
+
+  my $name             = $cgi->param('name');
+  my $description      = $cgi->param('description');
+  my $target_type      = $cgi->param('target_type');
+  my $cc_list          = $cgi->param('cc_list');
+  my $sortkey          = $cgi->param('sortkey');
+  my $is_active        = $cgi->param('is_active');
+  my $is_requestable   = $cgi->param('is_requestable');
+  my $is_specifically  = $cgi->param('is_requesteeble');
+  my $is_multiplicable = $cgi->param('is_multiplicable');
+  my $grant_group      = $cgi->param('grant_group');
+  my $request_group    = $cgi->param('request_group');
+  my @inclusions       = $cgi->multi_param('inclusions');
+  my @exclusions       = $cgi->multi_param('exclusions');
+
+  # Filter inclusion and exclusion lists to products the user can see.
+  unless ($user->in_group('editcomponents')) {
+    @inclusions = values %{clusion_array_to_hash(\@inclusions, \@products)};
+    @exclusions = values %{clusion_array_to_hash(\@exclusions, \@products)};
+  }
+
+  my $flagtype = Bugzilla::FlagType->create({
+    name             => $name,
+    description      => $description,
+    target_type      => $target_type,
+    cc_list          => $cc_list,
+    sortkey          => $sortkey,
+    is_active        => $is_active,
+    is_requestable   => $is_requestable,
+    is_requesteeble  => $is_specifically,
+    is_multiplicable => $is_multiplicable,
+    grant_group      => $grant_group,
+    request_group    => $request_group,
+    inclusions       => \@inclusions,
+    exclusions       => \@exclusions
+  });
+
+  delete_token($token);
+
+  $vars->{'name'}    = $flagtype->name;
+  $vars->{'message'} = "flag_type_created";
+
+  my $flagtypes = get_editable_flagtypes(\@products);
+  $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @$flagtypes];
+  $vars->{'attachment_types'}
+    = [grep { $_->target_type eq 'attachment' } @$flagtypes];
+
+  $template->process("admin/flag-type/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_flagtype');
-
-    my $name             = $cgi->param('name');
-    my $description      = $cgi->param('description');
-    my $cc_list          = $cgi->param('cc_list');
-    my $sortkey          = $cgi->param('sortkey');
-    my $is_active        = $cgi->param('is_active');
-    my $is_requestable   = $cgi->param('is_requestable');
-    my $is_specifically  = $cgi->param('is_requesteeble');
-    my $is_multiplicable = $cgi->param('is_multiplicable');
-    my $grant_group      = $cgi->param('grant_group');
-    my $request_group    = $cgi->param('request_group');
-    my @inclusions       = $cgi->param('inclusions');
-    my @exclusions       = $cgi->param('exclusions');
-
-    my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
-    if ($cgi->param('check_clusions') && !$user->in_group('editcomponents')) {
-        # Filter inclusion and exclusion lists to products the user can edit.
-        @inclusions = values %{clusion_array_to_hash(\@inclusions, \@products)};
-        @exclusions = values %{clusion_array_to_hash(\@exclusions, \@products)};
-        # Bring back the products the user cannot edit.
-        foreach my $item (values %{$flagtype->inclusions}) {
-            my ($prod_id, $comp_id) = split(':', $item);
-            push(@inclusions, $item) unless grep { $_->id == $prod_id } @products;
-        }
-        foreach my $item (values %{$flagtype->exclusions}) {
-            my ($prod_id, $comp_id) = split(':', $item);
-            push(@exclusions, $item) unless grep { $_->id == $prod_id } @products;
-        }
+  check_token_data($token, 'edit_flagtype');
+
+  my $name             = $cgi->param('name');
+  my $description      = $cgi->param('description');
+  my $cc_list          = $cgi->param('cc_list');
+  my $sortkey          = $cgi->param('sortkey');
+  my $is_active        = $cgi->param('is_active');
+  my $is_requestable   = $cgi->param('is_requestable');
+  my $is_specifically  = $cgi->param('is_requesteeble');
+  my $is_multiplicable = $cgi->param('is_multiplicable');
+  my $grant_group      = $cgi->param('grant_group');
+  my $request_group    = $cgi->param('request_group');
+  my @inclusions       = $cgi->multi_param('inclusions');
+  my @exclusions       = $cgi->multi_param('exclusions');
+
+  my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
+  if ($cgi->param('check_clusions') && !$user->in_group('editcomponents')) {
+
+    # Filter inclusion and exclusion lists to products the user can edit.
+    @inclusions = values %{clusion_array_to_hash(\@inclusions, \@products)};
+    @exclusions = values %{clusion_array_to_hash(\@exclusions, \@products)};
+
+    # Bring back the products the user cannot edit.
+    foreach my $item (values %{$flagtype->inclusions}) {
+      my ($prod_id, $comp_id) = split(':', $item);
+      push(@inclusions, $item) unless grep { $_->id == $prod_id } @products;
     }
-
-    if ($can_fully_edit) {
-        $flagtype->set_name($name);
-        $flagtype->set_description($description);
-        $flagtype->set_cc_list($cc_list);
-        $flagtype->set_sortkey($sortkey);
-        $flagtype->set_is_active($is_active);
-        $flagtype->set_is_requestable($is_requestable);
-        $flagtype->set_is_specifically_requestable($is_specifically);
-        $flagtype->set_is_multiplicable($is_multiplicable);
-        $flagtype->set_grant_group($grant_group);
-        $flagtype->set_request_group($request_group);
+    foreach my $item (values %{$flagtype->exclusions}) {
+      my ($prod_id, $comp_id) = split(':', $item);
+      push(@exclusions, $item) unless grep { $_->id == $prod_id } @products;
     }
-    $flagtype->set_clusions({ inclusions => \@inclusions, exclusions => \@exclusions})
-      if $cgi->param('check_clusions');
-    my $changes = $flagtype->update();
-
-    delete_token($token);
-
-    $vars->{'flagtype'} = $flagtype;
-    $vars->{'changes'} = $changes;
-    $vars->{'message'} = 'flag_type_updated';
-
-    my $flagtypes = get_editable_flagtypes(\@products);
-    $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @$flagtypes];
-    $vars->{'attachment_types'} = [grep { $_->target_type eq 'attachment' } @$flagtypes];
-
-    $template->process("admin/flag-type/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  }
+
+  if ($can_fully_edit) {
+    $flagtype->set_name($name);
+    $flagtype->set_description($description);
+    $flagtype->set_cc_list($cc_list);
+    $flagtype->set_sortkey($sortkey);
+    $flagtype->set_is_active($is_active);
+    $flagtype->set_is_requestable($is_requestable);
+    $flagtype->set_is_specifically_requestable($is_specifically);
+    $flagtype->set_is_multiplicable($is_multiplicable);
+    $flagtype->set_grant_group($grant_group);
+    $flagtype->set_request_group($request_group);
+  }
+  $flagtype->set_clusions(
+    {inclusions => \@inclusions, exclusions => \@exclusions})
+    if $cgi->param('check_clusions');
+  my $changes = $flagtype->update();
+
+  delete_token($token);
+
+  $vars->{'flagtype'} = $flagtype;
+  $vars->{'changes'}  = $changes;
+  $vars->{'message'}  = 'flag_type_updated';
+
+  my $flagtypes = get_editable_flagtypes(\@products);
+  $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @$flagtypes];
+  $vars->{'attachment_types'}
+    = [grep { $_->target_type eq 'attachment' } @$flagtypes];
+
+  $template->process("admin/flag-type/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'confirmdelete') {
-    my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
-    ThrowUserError('flag_type_cannot_delete', { flagtype => $flagtype }) unless $can_fully_edit;
+  my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
+  ThrowUserError('flag_type_cannot_delete', {flagtype => $flagtype})
+    unless $can_fully_edit;
 
-    $vars->{'flag_type'} = $flagtype;
-    $vars->{'token'} = issue_session_token('delete_flagtype');
+  $vars->{'flag_type'} = $flagtype;
+  $vars->{'token'}     = issue_session_token('delete_flagtype');
 
-    $template->process("admin/flag-type/confirm-delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/flag-type/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_flagtype');
+  check_token_data($token, 'delete_flagtype');
 
-    my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
-    ThrowUserError('flag_type_cannot_delete', { flagtype => $flagtype }) unless $can_fully_edit;
+  my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
+  ThrowUserError('flag_type_cannot_delete', {flagtype => $flagtype})
+    unless $can_fully_edit;
 
-    $flagtype->remove_from_db();
+  $flagtype->remove_from_db();
 
-    delete_token($token);
+  delete_token($token);
 
-    $vars->{'name'} = $flagtype->name;
-    $vars->{'message'} = "flag_type_deleted";
+  $vars->{'name'}    = $flagtype->name;
+  $vars->{'message'} = "flag_type_deleted";
 
-    my @flagtypes = Bugzilla::FlagType->get_all;
-    $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @flagtypes];
-    $vars->{'attachment_types'} = [grep { $_->target_type eq 'attachment' } @flagtypes];
+  my @flagtypes = Bugzilla::FlagType->get_all;
+  $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @flagtypes];
+  $vars->{'attachment_types'}
+    = [grep { $_->target_type eq 'attachment' } @flagtypes];
 
-    $template->process("admin/flag-type/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/flag-type/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'deactivate') {
-    check_token_data($token, 'delete_flagtype');
+  check_token_data($token, 'delete_flagtype');
 
-    my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
-    ThrowUserError('flag_type_cannot_deactivate', { flagtype => $flagtype }) unless $can_fully_edit;
+  my ($flagtype, $can_fully_edit) = $user->check_can_admin_flagtype($flag_id);
+  ThrowUserError('flag_type_cannot_deactivate', {flagtype => $flagtype})
+    unless $can_fully_edit;
 
-    $flagtype->set_is_active(0);
-    $flagtype->update();
+  $flagtype->set_is_active(0);
+  $flagtype->update();
 
-    delete_token($token);
+  delete_token($token);
 
-    $vars->{'message'} = "flag_type_deactivated";
-    $vars->{'flag_type'} = $flagtype;
+  $vars->{'message'}   = "flag_type_deactivated";
+  $vars->{'flag_type'} = $flagtype;
 
-    my @flagtypes = Bugzilla::FlagType->get_all;
-    $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @flagtypes];
-    $vars->{'attachment_types'} = [grep { $_->target_type eq 'attachment' } @flagtypes];
+  my @flagtypes = Bugzilla::FlagType->get_all;
+  $vars->{'bug_types'} = [grep { $_->target_type eq 'bug' } @flagtypes];
+  $vars->{'attachment_types'}
+    = [grep { $_->target_type eq 'attachment' } @flagtypes];
 
-    $template->process("admin/flag-type/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/flag-type/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 ThrowUserError('unknown_action', {action => $action});
@@ -431,102 +456,124 @@ ThrowUserError('unknown_action', {action => $action});
 #####################
 
 sub get_products_and_components {
-    my $vars = {};
-    my $user = Bugzilla->user;
+  my $vars = {};
+  my $user = Bugzilla->user;
+
+  my @products;
+  if ($user->in_group('editcomponents')) {
+    if (Bugzilla->params->{useclassification}) {
 
-    my @products;
-    if ($user->in_group('editcomponents')) {
-        @products = Bugzilla::Product->get_all;
+      # We want products grouped by classifications.
+      @products = map { @{$_->products} } Bugzilla::Classification->get_all;
     }
     else {
-        @products = @{$user->get_products_by_permission('editcomponents')};
+      @products = Bugzilla::Product->get_all;
     }
-    # We require all unique component names.
-    my %components;
-    foreach my $product (@products) {
-        foreach my $component (@{$product->components}) {
-            $components{$component->name} = 1;
-        }
+  }
+  else {
+    @products = @{$user->get_products_by_permission('editcomponents')};
+
+    if (Bugzilla->params->{useclassification}) {
+      my %class;
+      push(@{$class{$_->classification_id}}, $_) foreach @products;
+
+      # Let's sort the list by classifications.
+      @products = ();
+      push(@products, @{$class{$_->id} || []})
+        foreach Bugzilla::Classification->get_all;
     }
-    $vars->{'products'} = \@products;
-    $vars->{'components'} = [sort(keys %components)];
-    return $vars;
+  }
+
+  my %components;
+  foreach my $product (@products) {
+    $components{$_->name} = 1 foreach @{$product->components};
+  }
+  $vars->{'products'}   = \@products;
+  $vars->{'components'} = [sort(keys %components)];
+  return $vars;
 }
 
 sub get_editable_flagtypes {
-    my ($products, $group_id) = @_;
-    my $flagtypes;
+  my ($products, $group_id) = @_;
+  my $flagtypes;
 
-    if (Bugzilla->user->in_group('editcomponents')) {
-        $flagtypes = Bugzilla::FlagType::match({ group => $group_id });
-        return $flagtypes;
-    }
+  if (Bugzilla->user->in_group('editcomponents')) {
+    $flagtypes = Bugzilla::FlagType::match({group => $group_id});
+    return $flagtypes;
+  }
 
-    my %visible_flagtypes;
-    foreach my $product (@$products) {
-        foreach my $target ('bug', 'attachment') {
-            my $prod_flagtypes = $product->flag_types->{$target};
-            $visible_flagtypes{$_->id} ||= $_ foreach @$prod_flagtypes;
-        }
+  my %visible_flagtypes;
+  foreach my $product (@$products) {
+    foreach my $target ('bug', 'attachment') {
+      my $prod_flagtypes = $product->flag_types->{$target};
+      $visible_flagtypes{$_->id} ||= $_ foreach @$prod_flagtypes;
     }
-    @$flagtypes = sort { $a->sortkey <=> $b->sortkey || $a->name cmp $b->name }
-                    values %visible_flagtypes;
-    # Filter flag types if a group ID is given.
-    $flagtypes = filter_group($flagtypes, $group_id);
-    return $flagtypes;
+  }
+  @$flagtypes = sort { $a->sortkey <=> $b->sortkey || $a->name cmp $b->name }
+    values %visible_flagtypes;
+
+  # Filter flag types if a group ID is given.
+  $flagtypes = filter_group($flagtypes, $group_id);
+  return $flagtypes;
 }
 
 sub get_settable_groups {
-    my $user = Bugzilla->user;
-    my $groups = $user->in_group('editcomponents') ? [Bugzilla::Group->get_all] : $user->groups;
-    return $groups;
+  my $user = Bugzilla->user;
+  my $groups
+    = $user->in_group('editcomponents')
+    ? [Bugzilla::Group->get_all]
+    : $user->groups;
+  return $groups;
 }
 
 sub filter_group {
-    my ($flag_types, $gid) = @_;
-    return $flag_types unless $gid;
+  my ($flag_types, $gid) = @_;
+  return $flag_types unless $gid;
 
-    my @flag_types = grep {($_->grant_group && $_->grant_group->id == $gid)
-                           || ($_->request_group && $_->request_group->id == $gid)} @$flag_types;
+  my @flag_types = grep {
+         ($_->grant_group && $_->grant_group->id == $gid)
+      || ($_->request_group && $_->request_group->id == $gid)
+  } @$flag_types;
 
-    return \@flag_types;
+  return \@flag_types;
 }
 
 # Convert the array @clusions('prod_ID:comp_ID') back to a hash of
 # the form %clusions{'prod_name:comp_name'} = 'prod_ID:comp_ID'
 sub clusion_array_to_hash {
-    my ($array, $visible_products) = @_;
-    my $user = Bugzilla->user;
-    my $has_privs = $user->in_group('editcomponents');
-
-    my %hash;
-    my %products;
-    my %components;
-
-    foreach my $ids (@$array) {
-        my ($product_id, $component_id) = split(":", $ids);
-        my $product_name = "__Any__";
-        my $component_name = "__Any__";
-
-        if ($product_id) {
-            ($products{$product_id}) = grep { $_->id == $product_id } @$visible_products;
-            next unless $products{$product_id};
-            $product_name = $products{$product_id}->name;
-
-            if ($component_id) {
-                ($components{$component_id}) =
-                  grep { $_->id == $component_id } @{$products{$product_id}->components};
-                next unless $components{$component_id};
-                $component_name = $components{$component_id}->name;
-            }
-        }
-        else {
-            # Users with local editcomponents privs cannot use __Any__:__Any__.
-            next unless $has_privs;
-            # It's illegal to select a component without a product.
-            next if $component_id;
-        }
-        $hash{"$product_name:$component_name"} = $ids;
+  my ($array, $visible_products) = @_;
+  my $user      = Bugzilla->user;
+  my $has_privs = $user->in_group('editcomponents');
+
+  my %hash;
+  my %products;
+  my %components;
+
+  foreach my $ids (@$array) {
+    my ($product_id, $component_id) = split(":", $ids);
+    my $product_name   = "__Any__";
+    my $component_name = "__Any__";
+
+    if ($product_id) {
+      ($products{$product_id}) = grep { $_->id == $product_id } @$visible_products;
+      next unless $products{$product_id};
+      $product_name = $products{$product_id}->name;
+
+      if ($component_id) {
+        ($components{$component_id})
+          = grep { $_->id == $component_id } @{$products{$product_id}->components};
+        next unless $components{$component_id};
+        $component_name = $components{$component_id}->name;
+      }
+    }
+    else {
+      # Users with local editcomponents privs cannot use __Any__:__Any__.
+      next unless $has_privs;
+
+      # It's illegal to select a component without a product.
+      next if $component_id;
     }
-    return \%hash;
+    $hash{"$product_name:$component_name"} = $ids;
+  }
+  return \%hash;
 }
diff --git a/editgroups.cgi b/editgroups.cgi
index 287ac11142..ed2a36011b 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -22,36 +22,37 @@ use Bugzilla::Product;
 use Bugzilla::User;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 print $cgi->header();
 
 $user->in_group('creategroups')
-  || ThrowUserError("auth_failure", {group  => "creategroups",
-                                     action => "edit",
-                                     object => "groups"});
+  || ThrowUserError("auth_failure",
+  {group => "creategroups", action => "edit", object => "groups"});
 
 my $action = trim($cgi->param('action') || '');
-my $token  = $cgi->param('token');
+my $token = $cgi->param('token');
 
 # CheckGroupID checks that a positive integer is given and is
 # actually a valid group ID. If all tests are successful, the
 # trimmed group ID is returned.
 
 sub CheckGroupID {
-    my ($group_id) = @_;
-    $group_id = trim($group_id || 0);
-    ThrowUserError("group_not_specified") unless $group_id;
-    (detaint_natural($group_id)
-      && Bugzilla->dbh->selectrow_array("SELECT id FROM groups WHERE id = ?",
-                                        undef, $group_id))
-      || ThrowUserError("invalid_group_ID");
-    return $group_id;
+  my ($group_id) = @_;
+  $group_id = trim($group_id || 0);
+  ThrowUserError("group_not_specified") unless $group_id;
+  (
+    detaint_natural($group_id) && Bugzilla->dbh->selectrow_array(
+      "SELECT id FROM groups WHERE id = ?",
+      undef, $group_id
+    )
+  ) || ThrowUserError("invalid_group_ID");
+  return $group_id;
 }
 
 # CheckGroupRegexp checks that the regular expression is valid
@@ -60,86 +61,86 @@ sub CheckGroupID {
 # is returned.
 
 sub CheckGroupRegexp {
-    my ($regexp) = @_;
-    $regexp = trim($regexp || '');
-    trick_taint($regexp);
-    ThrowUserError("invalid_regexp") unless (eval {qr/$regexp/});
-    return $regexp;
+  my ($regexp) = @_;
+  $regexp = trim($regexp || '');
+  trick_taint($regexp);
+  ThrowUserError("invalid_regexp") unless (eval {qr/$regexp/});
+  return $regexp;
 }
 
 # A helper for displaying the edit.html.tmpl template.
 sub get_current_and_available {
-    my ($group, $vars) = @_;
-
-    my @all_groups         = Bugzilla::Group->get_all;
-    my @members_current    = @{$group->grant_direct(GROUP_MEMBERSHIP)};
-    my @member_of_current  = @{$group->granted_by_direct(GROUP_MEMBERSHIP)};
-    my @bless_from_current = @{$group->grant_direct(GROUP_BLESS)};
-    my @bless_to_current   = @{$group->granted_by_direct(GROUP_BLESS)};
-    my (@visible_from_current, @visible_to_me_current);
+  my ($group, $vars) = @_;
+
+  my @all_groups         = Bugzilla::Group->get_all;
+  my @members_current    = @{$group->grant_direct(GROUP_MEMBERSHIP)};
+  my @member_of_current  = @{$group->granted_by_direct(GROUP_MEMBERSHIP)};
+  my @bless_from_current = @{$group->grant_direct(GROUP_BLESS)};
+  my @bless_to_current   = @{$group->granted_by_direct(GROUP_BLESS)};
+  my (@visible_from_current, @visible_to_me_current);
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+    @visible_from_current  = @{$group->grant_direct(GROUP_VISIBLE)};
+    @visible_to_me_current = @{$group->granted_by_direct(GROUP_VISIBLE)};
+  }
+
+  # Figure out what groups are not currently a member of this group,
+  # and what groups this group is not currently a member of.
+  my (
+    @members_available,  @member_of_available,    @bless_from_available,
+    @bless_to_available, @visible_from_available, @visible_to_me_available
+  );
+  foreach my $group_option (@all_groups) {
     if (Bugzilla->params->{'usevisibilitygroups'}) {
-        @visible_from_current  = @{$group->grant_direct(GROUP_VISIBLE)};
-        @visible_to_me_current = @{$group->granted_by_direct(GROUP_VISIBLE)};
+      push(@visible_from_available, $group_option)
+        if !grep($_->id == $group_option->id, @visible_from_current);
+      push(@visible_to_me_available, $group_option)
+        if !grep($_->id == $group_option->id, @visible_to_me_current);
     }
 
-    # Figure out what groups are not currently a member of this group,
-    # and what groups this group is not currently a member of.
-    my (@members_available, @member_of_available,
-        @bless_from_available, @bless_to_available,
-        @visible_from_available, @visible_to_me_available);
-    foreach my $group_option (@all_groups) {
-        if (Bugzilla->params->{'usevisibilitygroups'}) {
-            push(@visible_from_available, $group_option)
-                if !grep($_->id == $group_option->id, @visible_from_current);
-            push(@visible_to_me_available, $group_option)
-                if !grep($_->id == $group_option->id, @visible_to_me_current);
-        }
-
-        push(@bless_from_available, $group_option)
-            if !grep($_->id == $group_option->id, @bless_from_current);
-
-        # The group itself should never show up in the membership lists,
-        # and should show up in only one of the bless lists (otherwise
-        # you can try to allow it to bless itself twice, leading to a
-        # database unique constraint error).
-        next if $group_option->id == $group->id;
-
-        push(@members_available, $group_option)
-            if !grep($_->id == $group_option->id, @members_current);
-        push(@member_of_available, $group_option)
-            if !grep($_->id == $group_option->id, @member_of_current);
-        push(@bless_to_available, $group_option)
-           if !grep($_->id == $group_option->id, @bless_to_current);
-    }
-
-    $vars->{'members_current'}     = \@members_current;
-    $vars->{'members_available'}   = \@members_available;
-    $vars->{'member_of_current'}   = \@member_of_current;
-    $vars->{'member_of_available'} = \@member_of_available;
-
-    $vars->{'bless_from_current'}   = \@bless_from_current;
-    $vars->{'bless_from_available'} = \@bless_from_available;
-    $vars->{'bless_to_current'}     = \@bless_to_current;
-    $vars->{'bless_to_available'}   = \@bless_to_available;
-
-    if (Bugzilla->params->{'usevisibilitygroups'}) {
-        $vars->{'visible_from_current'}    = \@visible_from_current;
-        $vars->{'visible_from_available'}  = \@visible_from_available;
-        $vars->{'visible_to_me_current'}   = \@visible_to_me_current;
-        $vars->{'visible_to_me_available'} = \@visible_to_me_available;
-    }
+    push(@bless_from_available, $group_option)
+      if !grep($_->id == $group_option->id, @bless_from_current);
+
+    # The group itself should never show up in the membership lists,
+    # and should show up in only one of the bless lists (otherwise
+    # you can try to allow it to bless itself twice, leading to a
+    # database unique constraint error).
+    next if $group_option->id == $group->id;
+
+    push(@members_available, $group_option)
+      if !grep($_->id == $group_option->id, @members_current);
+    push(@member_of_available, $group_option)
+      if !grep($_->id == $group_option->id, @member_of_current);
+    push(@bless_to_available, $group_option)
+      if !grep($_->id == $group_option->id, @bless_to_current);
+  }
+
+  $vars->{'members_current'}     = \@members_current;
+  $vars->{'members_available'}   = \@members_available;
+  $vars->{'member_of_current'}   = \@member_of_current;
+  $vars->{'member_of_available'} = \@member_of_available;
+
+  $vars->{'bless_from_current'}   = \@bless_from_current;
+  $vars->{'bless_from_available'} = \@bless_from_available;
+  $vars->{'bless_to_current'}     = \@bless_to_current;
+  $vars->{'bless_to_available'}   = \@bless_to_available;
+
+  if (Bugzilla->params->{'usevisibilitygroups'}) {
+    $vars->{'visible_from_current'}    = \@visible_from_current;
+    $vars->{'visible_from_available'}  = \@visible_from_available;
+    $vars->{'visible_to_me_current'}   = \@visible_to_me_current;
+    $vars->{'visible_to_me_available'} = \@visible_to_me_available;
+  }
 }
 
 # If no action is specified, get a list of all groups available.
 
 unless ($action) {
-    my @groups = Bugzilla::Group->get_all;
-    $vars->{'groups'} = \@groups;
-    
-    print $cgi->header();
-    $template->process("admin/groups/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my @groups = Bugzilla::Group->get_all;
+  $vars->{'groups'} = \@groups;
+
+  $template->process("admin/groups/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -149,19 +150,18 @@ unless ($action) {
 #
 
 if ($action eq 'changeform') {
-    # Check that an existing group ID is given
-    my $group_id = CheckGroupID($cgi->param('group'));
-    my $group = new Bugzilla::Group($group_id);
 
-    get_current_and_available($group, $vars);
-    $vars->{'group'} = $group;
-    $vars->{'token'}       = issue_session_token('edit_group');
+  # Check that an existing group ID is given
+  my $group_id = CheckGroupID(scalar $cgi->param('group'));
+  my $group    = new Bugzilla::Group($group_id);
 
-    print $cgi->header();
-    $template->process("admin/groups/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  get_current_and_available($group, $vars);
+  $vars->{'group'} = $group;
+  $vars->{'token'} = issue_session_token('edit_group');
 
-    exit;
+  $template->process("admin/groups/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -171,14 +171,12 @@ if ($action eq 'changeform') {
 #
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_group');
-    print $cgi->header();
-    $template->process("admin/groups/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    
-    exit;
-}
+  $vars->{'token'} = issue_session_token('add_group');
 
+  $template->process("admin/groups/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
+}
 
 
 #
@@ -186,34 +184,27 @@ if ($action eq 'add') {
 #
 
 if ($action eq 'new') {
-    check_token_data($token, 'add_group');
-    my $group = Bugzilla::Group->create({
-        name        => scalar $cgi->param('name'),
-        description => scalar $cgi->param('desc'),
-        userregexp  => scalar $cgi->param('regexp'),
-        isactive    => scalar $cgi->param('isactive'),
-        icon_url    => scalar $cgi->param('icon_url'),
-        isbuggroup  => 1,
-    });
-
-    # Permit all existing products to use the new group if makeproductgroups.
-    if ($cgi->param('insertnew')) {
-        $dbh->do('INSERT INTO group_control_map
-                  (group_id, product_id, membercontrol, othercontrol)
-                  SELECT ?, products.id, ?, ? FROM products',
-                  undef, ($group->id, CONTROLMAPSHOWN, CONTROLMAPNA));
-    }
-    delete_token($token);
-
-    $vars->{'message'} = 'group_created';
-    $vars->{'group'} = $group;
-    get_current_and_available($group, $vars);
-    $vars->{'token'} = issue_session_token('edit_group');
-
-    print $cgi->header();
-    $template->process("admin/groups/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'add_group');
+  my $group = Bugzilla::Group->create({
+    name                => scalar $cgi->param('name'),
+    description         => scalar $cgi->param('desc'),
+    userregexp          => scalar $cgi->param('regexp'),
+    isactive            => scalar $cgi->param('isactive'),
+    icon_url            => scalar $cgi->param('icon_url'),
+    isbuggroup          => 1,
+    use_in_all_products => scalar $cgi->param('insertnew'),
+  });
+
+  delete_token($token);
+
+  $vars->{'message'} = 'group_created';
+  $vars->{'group'}   = $group;
+  get_current_and_available($group, $vars);
+  $vars->{'token'} = issue_session_token('edit_group');
+
+  $template->process("admin/groups/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -223,22 +214,22 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'del') {
-    # Check that an existing group ID is given
-    my $group = Bugzilla::Group->check({ id => scalar $cgi->param('group') });
-    $group->check_remove({ test_only => 1 });
-    $vars->{'shared_queries'} =
-        $dbh->selectrow_array('SELECT COUNT(*)
+
+  # Check that an existing group ID is given
+  my $group = Bugzilla::Group->check({id => scalar $cgi->param('group')});
+  $group->check_remove({test_only => 1});
+  $vars->{'shared_queries'} = $dbh->selectrow_array(
+    'SELECT COUNT(*)
                                  FROM namedquery_group_map
-                                WHERE group_id = ?', undef, $group->id);
+                                WHERE group_id = ?', undef, $group->id
+  );
 
-    $vars->{'group'} = $group;
-    $vars->{'token'} = issue_session_token('delete_group');
+  $vars->{'group'} = $group;
+  $vars->{'token'} = issue_session_token('delete_group');
 
-    print $cgi->header();
-    $template->process("admin/groups/delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    
-    exit;
+  $template->process("admin/groups/delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -246,25 +237,25 @@ if ($action eq 'del') {
 #
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_group');
-    # Check that an existing group ID is given
-    my $group = Bugzilla::Group->check({ id => scalar $cgi->param('group') });
-    $vars->{'name'} = $group->name;
-    $group->remove_from_db({
-        remove_from_users => scalar $cgi->param('removeusers'),
-        remove_from_bugs  => scalar $cgi->param('removebugs'),
-        remove_from_flags => scalar $cgi->param('removeflags'),
-        remove_from_products => scalar $cgi->param('unbind'),
-    });
-    delete_token($token);
-
-    $vars->{'message'} = 'group_deleted';
-    $vars->{'groups'} = [Bugzilla::Group->get_all];
-
-    print $cgi->header();
-    $template->process("admin/groups/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'delete_group');
+
+  # Check that an existing group ID is given
+  my $group = Bugzilla::Group->check({id => scalar $cgi->param('group')});
+  $vars->{'name'} = $group->name;
+  $group->remove_from_db({
+    remove_from_users    => scalar $cgi->param('removeusers'),
+    remove_from_bugs     => scalar $cgi->param('removebugs'),
+    remove_from_flags    => scalar $cgi->param('removeflags'),
+    remove_from_products => scalar $cgi->param('unbind'),
+  });
+  delete_token($token);
+
+  $vars->{'message'} = 'group_deleted';
+  $vars->{'groups'}  = [Bugzilla::Group->get_all];
+
+  $template->process("admin/groups/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -272,71 +263,71 @@ if ($action eq 'delete') {
 #
 
 if ($action eq 'postchanges') {
-    check_token_data($token, 'edit_group');
-    my $changes = doGroupChanges();
-    delete_token($token);
-
-    my $group = new Bugzilla::Group($cgi->param('group_id'));
-    get_current_and_available($group, $vars);
-    $vars->{'message'} = 'group_updated';
-    $vars->{'group'}   = $group;
-    $vars->{'changes'} = $changes;
-    $vars->{'token'} = issue_session_token('edit_group');
-
-    print $cgi->header();
-    $template->process("admin/groups/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'edit_group');
+  my $changes = doGroupChanges();
+  delete_token($token);
+
+  my $group = new Bugzilla::Group(scalar $cgi->param('group_id'));
+  get_current_and_available($group, $vars);
+  $vars->{'message'} = 'group_updated';
+  $vars->{'group'}   = $group;
+  $vars->{'changes'} = $changes;
+  $vars->{'token'}   = issue_session_token('edit_group');
+
+  $template->process("admin/groups/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'confirm_remove') {
-    my $group = new Bugzilla::Group(CheckGroupID($cgi->param('group_id')));
-    $vars->{'group'} = $group;
-    $vars->{'regexp'} = CheckGroupRegexp($cgi->param('regexp'));
-    $vars->{'token'} = issue_session_token('remove_group_members');
-    $template->process('admin/groups/confirm-remove.html.tmpl', $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  my $group = new Bugzilla::Group(CheckGroupID(scalar $cgi->param('group_id')));
+  $vars->{'group'}  = $group;
+  $vars->{'regexp'} = CheckGroupRegexp(scalar $cgi->param('regexp'));
+  $vars->{'token'}  = issue_session_token('remove_group_members');
+
+  $template->process('admin/groups/confirm-remove.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'remove_regexp') {
-    check_token_data($token, 'remove_group_members');
-    # remove all explicit users from the group with
-    # gid = $cgi->param('group') that match the regular expression
-    # stored in the DB for that group or all of them period
-
-    my $group  = new Bugzilla::Group(CheckGroupID($cgi->param('group_id')));
-    my $regexp = CheckGroupRegexp($cgi->param('regexp'));
-
-    $dbh->bz_start_transaction();
-
-    my $users = $group->members_direct();
-    my $sth_delete = $dbh->prepare(
-        "DELETE FROM user_group_map
-           WHERE user_id = ? AND isbless = 0 AND group_id = ?");
-
-    my @deleted;
-    foreach my $member (@$users) {
-        if ($regexp eq '' || $member->login =~ m/$regexp/i) {
-            $sth_delete->execute($member->id, $group->id);
-            push(@deleted, $member);
-        }
-    }
-    $dbh->bz_commit_transaction();
+  check_token_data($token, 'remove_group_members');
+
+  # remove all explicit users from the group with
+  # gid = $cgi->param('group') that match the regular expression
+  # stored in the DB for that group or all of them period
+
+  my $group  = new Bugzilla::Group(CheckGroupID(scalar $cgi->param('group_id')));
+  my $regexp = CheckGroupRegexp(scalar $cgi->param('regexp'));
+
+  $dbh->bz_start_transaction();
 
-    $vars->{'users'}  = \@deleted;
-    $vars->{'regexp'} = $regexp;
-    delete_token($token);
+  my $users      = $group->members_direct();
+  my $sth_delete = $dbh->prepare(
+    "DELETE FROM user_group_map
+           WHERE user_id = ? AND isbless = 0 AND group_id = ?"
+  );
 
-    $vars->{'message'} = 'group_membership_removed';
-    $vars->{'group'} = $group->name;
-    $vars->{'groups'} = [Bugzilla::Group->get_all];
+  my @deleted;
+  foreach my $member (@$users) {
+    if ($regexp eq '' || $member->email =~ m/$regexp/i) {
+      $sth_delete->execute($member->id, $group->id);
+      push(@deleted, $member);
+    }
+  }
+  $dbh->bz_commit_transaction();
+
+  $vars->{'users'}  = \@deleted;
+  $vars->{'regexp'} = $regexp;
+  delete_token($token);
 
-    print $cgi->header();
-    $template->process("admin/groups/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $vars->{'message'} = 'group_membership_removed';
+  $vars->{'group'}   = $group->name;
+  $vars->{'groups'}  = [Bugzilla::Group->get_all];
 
-    exit;
+  $template->process("admin/groups/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 # No valid action found
@@ -344,111 +335,120 @@ ThrowUserError('unknown_action', {action => $action});
 
 # Helper sub to handle the making of changes to a group
 sub doGroupChanges {
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
+  my $cgi = Bugzilla->cgi;
+  my $dbh = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    # Check that the given group ID is valid and make a Group.
-    my $group = new Bugzilla::Group(CheckGroupID($cgi->param('group_id')));
+  # Check that the given group ID is valid and make a Group.
+  my $group = new Bugzilla::Group(CheckGroupID(scalar $cgi->param('group_id')));
 
-    if (defined $cgi->param('regexp')) {
-        $group->set_user_regexp($cgi->param('regexp'));
-    }
+  if (defined $cgi->param('regexp')) {
+    $group->set_user_regexp(scalar $cgi->param('regexp'));
+  }
 
-    if ($group->is_bug_group) {
-        if (defined $cgi->param('name')) {
-            $group->set_name($cgi->param('name'));
-        }
-        if (defined $cgi->param('desc')) {
-            $group->set_description($cgi->param('desc'));
-        }
-        # Only set isactive if we came from the right form.
-        if (defined $cgi->param('regexp')) {
-            $group->set_is_active($cgi->param('isactive'));
-        }
+  if ($group->is_bug_group) {
+    if (defined $cgi->param('name')) {
+      $group->set_name(scalar $cgi->param('name'));
+    }
+    if (defined $cgi->param('desc')) {
+      $group->set_description(scalar $cgi->param('desc'));
     }
 
-    if (defined $cgi->param('icon_url')) {
-        $group->set_icon_url($cgi->param('icon_url'));
+    # Only set isactive if we came from the right form.
+    if (defined $cgi->param('regexp')) {
+      $group->set_is_active(scalar $cgi->param('isactive'));
     }
+  }
+
+  if (defined $cgi->param('icon_url')) {
+    $group->set_icon_url(scalar $cgi->param('icon_url'));
+  }
 
-    my $changes = $group->update();
+  my $changes = $group->update();
 
-    my $sth_insert = $dbh->prepare('INSERT INTO group_group_map
+  my $sth_insert = $dbh->prepare(
+    'INSERT INTO group_group_map
                                     (member_id, grantor_id, grant_type)
-                                    VALUES (?, ?, ?)');
+                                    VALUES (?, ?, ?)'
+  );
 
-    my $sth_delete = $dbh->prepare('DELETE FROM group_group_map
+  my $sth_delete = $dbh->prepare(
+    'DELETE FROM group_group_map
                                      WHERE member_id = ?
                                            AND grantor_id = ?
-                                           AND grant_type = ?');
-
-    # First item is the type, second is whether or not it's "reverse" 
-    # (granted_by) (see _do_add for more explanation).
-    my %fields = (
-        members       => [GROUP_MEMBERSHIP, 0],
-        bless_from    => [GROUP_BLESS, 0],
-        visible_from  => [GROUP_VISIBLE, 0],
-        member_of     => [GROUP_MEMBERSHIP, 1],
-        bless_to      => [GROUP_BLESS, 1],
-        visible_to_me => [GROUP_VISIBLE, 1]
-    );
-    while (my ($field, $data) = each %fields) {
-        _do_add($group, $changes, $sth_insert, "${field}_add", 
-                $data->[0], $data->[1]);
-        _do_remove($group, $changes, $sth_delete, "${field}_remove",
-                   $data->[0], $data->[1]);
-    }
-
-    $dbh->bz_commit_transaction();
-    return $changes;
+                                           AND grant_type = ?'
+  );
+
+  # First item is the type, second is whether or not it's "reverse"
+  # (granted_by) (see _do_add for more explanation).
+  my %fields = (
+    members       => [GROUP_MEMBERSHIP, 0],
+    bless_from    => [GROUP_BLESS,      0],
+    visible_from  => [GROUP_VISIBLE,    0],
+    member_of     => [GROUP_MEMBERSHIP, 1],
+    bless_to      => [GROUP_BLESS,      1],
+    visible_to_me => [GROUP_VISIBLE,    1]
+  );
+  while (my ($field, $data) = each %fields) {
+    _do_add($group, $changes, $sth_insert, "${field}_add", $data->[0], $data->[1]);
+    _do_remove($group, $changes, $sth_delete, "${field}_remove", $data->[0],
+      $data->[1]);
+  }
+
+  $dbh->bz_commit_transaction();
+  return $changes;
 }
 
 sub _do_add {
-    my ($group, $changes, $sth_insert, $field, $type, $reverse) = @_;
-    my $cgi = Bugzilla->cgi;
-
-    my $current;
-    # $reverse means we're doing a granted_by--that is, somebody else
-    # is granting us something.
-    if ($reverse) {
-        $current = $group->granted_by_direct($type);
-    }
-    else {
-        $current = $group->grant_direct($type);
-    }
+  my ($group, $changes, $sth_insert, $field, $type, $reverse) = @_;
+  my $cgi = Bugzilla->cgi;
 
-    my $add_items = Bugzilla::Group->new_from_list([$cgi->param($field)]);
+  my $current;
 
-    foreach my $add (@$add_items) {
-        next if grep($_->id == $add->id, @$current);
+  # $reverse means we're doing a granted_by--that is, somebody else
+  # is granting us something.
+  if ($reverse) {
+    $current = $group->granted_by_direct($type);
+  }
+  else {
+    $current = $group->grant_direct($type);
+  }
 
-        $changes->{$field} ||= [];
-        push(@{$changes->{$field}}, $add->name);
-        # They go this direction for a normal "This group is granting
-        # $add something."
-        my @ids = ($add->id, $group->id);
-        # But they get reversed for "This group is being granted something
-        # by $add."
-        @ids = reverse @ids if $reverse;
-        $sth_insert->execute(@ids, $type);
-    }
+  my $add_items = Bugzilla::Group->new_from_list([$cgi->multi_param($field)]);
+
+  foreach my $add (@$add_items) {
+    next if grep($_->id == $add->id, @$current);
+
+    $changes->{$field} ||= [];
+    push(@{$changes->{$field}}, $add->name);
+
+    # They go this direction for a normal "This group is granting
+    # $add something."
+    my @ids = ($add->id, $group->id);
+
+    # But they get reversed for "This group is being granted something
+    # by $add."
+    @ids = reverse @ids if $reverse;
+    $sth_insert->execute(@ids, $type);
+  }
 }
 
 sub _do_remove {
-    my ($group, $changes, $sth_delete, $field, $type, $reverse) = @_;
-    my $cgi = Bugzilla->cgi;
-    my $remove_items = Bugzilla::Group->new_from_list([$cgi->param($field)]);
-
-    foreach my $remove (@$remove_items) {
-        my @ids = ($remove->id, $group->id);
-        # See _do_add for an explanation of $reverse
-        @ids = reverse @ids if $reverse;
-        # Deletions always succeed and are harmless if they fail, so we
-        # don't need to do any checks.
-        $sth_delete->execute(@ids, $type);
-        $changes->{$field} ||= [];
-        push(@{$changes->{$field}}, $remove->name);
-    }
+  my ($group, $changes, $sth_delete, $field, $type, $reverse) = @_;
+  my $cgi          = Bugzilla->cgi;
+  my $remove_items = Bugzilla::Group->new_from_list([$cgi->multi_param($field)]);
+
+  foreach my $remove (@$remove_items) {
+    my @ids = ($remove->id, $group->id);
+
+    # See _do_add for an explanation of $reverse
+    @ids = reverse @ids if $reverse;
+
+    # Deletions always succeed and are harmless if they fail, so we
+    # don't need to do any checks.
+    $sth_delete->execute(@ids, $type);
+    $changes->{$field} ||= [];
+    push(@{$changes->{$field}}, $remove->name);
+  }
 }
diff --git a/editkeywords.cgi b/editkeywords.cgi
index 41496f3622..a2ac45cb90 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -19,25 +19,20 @@ use Bugzilla::Error;
 use Bugzilla::Keyword;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
-
-#
-# Preliminary checks:
-#
+my $vars     = {};
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 print $cgi->header();
 
 $user->in_group('editkeywords')
-  || ThrowUserError("auth_failure", {group  => "editkeywords",
-                                     action => "edit",
-                                     object => "keywords"});
+  || ThrowUserError("auth_failure",
+  {group => "editkeywords", action => "edit", object => "keywords"});
 
-my $action = trim($cgi->param('action')  || '');
+my $action = trim($cgi->param('action') || '');
 my $key_id = $cgi->param('id');
 my $token  = $cgi->param('token');
 
@@ -45,52 +40,42 @@ $vars->{'action'} = $action;
 
 
 if ($action eq "") {
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
-
-    print $cgi->header();
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    exit;
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
-    
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_keyword');
+  $vars->{'token'} = issue_session_token('add_keyword');
 
-    print $cgi->header();
-
-    $template->process("admin/keywords/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-
-    exit;
+  $template->process("admin/keywords/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
 # action='new' -> add keyword entered in the 'action=add' screen
 #
 if ($action eq 'new') {
-    check_token_data($token, 'add_keyword');
-    my $name = $cgi->param('name') || '';
-    my $desc = $cgi->param('description')  || '';
+  check_token_data($token, 'add_keyword');
+  my $name = $cgi->param('name')        || '';
+  my $desc = $cgi->param('description') || '';
 
-    my $keyword = Bugzilla::Keyword->create(
-        { name => $name, description => $desc });
+  my $keyword = Bugzilla::Keyword->create({name => $name, description => $desc});
 
-    delete_token($token);
+  delete_token($token);
 
-    print $cgi->header();
+  $vars->{'message'}  = 'keyword_created';
+  $vars->{'name'}     = $keyword->name;
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    $vars->{'message'} = 'keyword_created';
-    $vars->{'name'} = $keyword->name;
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
-
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
-
 #
 # action='edit' -> present the edit keywords from
 #
@@ -98,79 +83,73 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'edit') {
-    my $keyword = new Bugzilla::Keyword($key_id)
-        || ThrowUserError('invalid_keyword_id', { id => $key_id });
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowUserError('invalid_keyword_id', {id => $key_id});
 
-    $vars->{'keyword'} = $keyword;
-    $vars->{'token'} = issue_session_token('edit_keyword');
+  $vars->{'keyword'} = $keyword;
+  $vars->{'token'}   = issue_session_token('edit_keyword');
 
-    print $cgi->header();
-    $template->process("admin/keywords/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
-
 #
 # action='update' -> update the keyword
 #
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_keyword');
-    my $keyword = new Bugzilla::Keyword($key_id)
-        || ThrowUserError('invalid_keyword_id', { id => $key_id });
-
-    $keyword->set_all({
-        name        => scalar $cgi->param('name'),
-        description => scalar $cgi->param('description'),
-    });
-    my $changes = $keyword->update();
-
-    delete_token($token);
-
-    print $cgi->header();
-
-    $vars->{'message'} = 'keyword_updated';
-    $vars->{'keyword'} = $keyword;
-    $vars->{'changes'} = $changes;
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
-
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'edit_keyword');
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowUserError('invalid_keyword_id', {id => $key_id});
+
+  $keyword->set_all({
+    name        => scalar $cgi->param('name'),
+    description => scalar $cgi->param('description'),
+    is_active   => scalar $cgi->param('is_active'),
+  });
+  my $changes = $keyword->update();
+
+  delete_token($token);
+
+  $vars->{'message'}  = 'keyword_updated';
+  $vars->{'keyword'}  = $keyword;
+  $vars->{'changes'}  = $changes;
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'del') {
-    my $keyword =  new Bugzilla::Keyword($key_id)
-        || ThrowUserError('invalid_keyword_id', { id => $key_id });
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowUserError('invalid_keyword_id', {id => $key_id});
 
-    $vars->{'keyword'} = $keyword;
-    $vars->{'token'} = issue_session_token('delete_keyword');
+  $vars->{'keyword'} = $keyword;
+  $vars->{'token'}   = issue_session_token('delete_keyword');
 
-    print $cgi->header();
-    $template->process("admin/keywords/confirm-delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_keyword');
-    my $keyword =  new Bugzilla::Keyword($key_id)
-        || ThrowUserError('invalid_keyword_id', { id => $key_id });
-
-    $keyword->remove_from_db();
+  check_token_data($token, 'delete_keyword');
+  my $keyword = new Bugzilla::Keyword($key_id)
+    || ThrowUserError('invalid_keyword_id', {id => $key_id});
 
-    delete_token($token);
+  $keyword->remove_from_db();
 
-    print $cgi->header();
+  delete_token($token);
 
-    $vars->{'message'} = 'keyword_deleted';
-    $vars->{'keyword'} = $keyword;
-    $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
+  $vars->{'message'}  = 'keyword_deleted';
+  $vars->{'keyword'}  = $keyword;
+  $vars->{'keywords'} = Bugzilla::Keyword->get_all_with_bug_count();
 
-    $template->process("admin/keywords/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/keywords/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 ThrowUserError('unknown_action', {action => $action});
diff --git a/editmilestones.cgi b/editmilestones.cgi
index e20e623fb9..5b184eb430 100755
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -19,13 +19,14 @@ use Bugzilla::Error;
 use Bugzilla::Milestone;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
+
 # There is only one section about milestones in the documentation,
 # so all actions point to the same page.
-$vars->{'doc_section'} = 'administration.html#milestones';
+$vars->{'doc_section'} = 'administering/categorization.html#milestones';
 
 #
 # Preliminary checks:
@@ -37,18 +38,17 @@ print $cgi->header();
 
 $user->in_group('editcomponents')
   || scalar(@{$user->get_products_by_permission('editcomponents')})
-  || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                     action => "edit",
-                                     object => "milestones"});
+  || ThrowUserError("auth_failure",
+  {group => "editcomponents", action => "edit", object => "milestones"});
 
 #
 # often used variables
 #
-my $product_name   = trim($cgi->param('product')     || '');
-my $milestone_name = trim($cgi->param('milestone')   || '');
-my $sortkey        = trim($cgi->param('sortkey')     || 0);
-my $action         = trim($cgi->param('action')      || '');
-my $showbugcounts = (defined $cgi->param('showbugcounts'));
+my $product_name   = trim($cgi->param('product')   || '');
+my $milestone_name = trim($cgi->param('milestone') || '');
+my $sortkey        = trim($cgi->param('sortkey')   || 0);
+my $action         = trim($cgi->param('action')    || '');
+my $showbugcounts  = (defined $cgi->param('showbugcounts'));
 my $token          = $cgi->param('token');
 my $isactive       = $cgi->param('isactive');
 
@@ -57,18 +57,19 @@ my $isactive       = $cgi->param('isactive');
 #
 
 unless ($product_name) {
-    my $selectable_products = $user->get_selectable_products;
-    # If the user has editcomponents privs for some products only,
-    # we have to restrict the list of products to display.
-    unless ($user->in_group('editcomponents')) {
-        $selectable_products = $user->get_products_by_permission('editcomponents');
-    }
-    $vars->{'products'} = $selectable_products;
-    $vars->{'showbugcounts'} = $showbugcounts;
-
-    $template->process("admin/milestones/select-product.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $selectable_products = $user->get_selectable_products;
+
+  # If the user has editcomponents privs for some products only,
+  # we have to restrict the list of products to display.
+  unless ($user->in_group('editcomponents')) {
+    $selectable_products = $user->get_products_by_permission('editcomponents');
+  }
+  $vars->{'products'}      = $selectable_products;
+  $vars->{'showbugcounts'} = $showbugcounts;
+
+  $template->process("admin/milestones/select-product.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 my $product = $user->check_can_admin_product($product_name);
@@ -79,11 +80,11 @@ my $product = $user->check_can_admin_product($product_name);
 
 unless ($action) {
 
-    $vars->{'showbugcounts'} = $showbugcounts;
-    $vars->{'product'} = $product;
-    $template->process("admin/milestones/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'showbugcounts'} = $showbugcounts;
+  $vars->{'product'}       = $product;
+  $template->process("admin/milestones/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -93,11 +94,11 @@ unless ($action) {
 #
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_milestone');
-    $vars->{'product'} = $product;
-    $template->process("admin/milestones/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'token'}   = issue_session_token('add_milestone');
+  $vars->{'product'} = $product;
+  $template->process("admin/milestones/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -105,20 +106,21 @@ if ($action eq 'add') {
 #
 
 if ($action eq 'new') {
-    check_token_data($token, 'add_milestone');
+  check_token_data($token, 'add_milestone');
 
-    my $milestone = Bugzilla::Milestone->create({ value    => $milestone_name,
-                                                  product  => $product,
-                                                  sortkey  => $sortkey });
+  my $milestone
+    = Bugzilla::Milestone->create({
+    value => $milestone_name, product => $product, sortkey => $sortkey
+    });
 
-    delete_token($token);
+  delete_token($token);
 
-    $vars->{'message'} = 'milestone_created';
-    $vars->{'milestone'} = $milestone;
-    $vars->{'product'} = $product;
-    $template->process("admin/milestones/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'message'}   = 'milestone_created';
+  $vars->{'milestone'} = $milestone;
+  $vars->{'product'}   = $product;
+  $template->process("admin/milestones/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -128,21 +130,21 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'del') {
-    my $milestone = Bugzilla::Milestone->check({ product => $product,
-                                                 name    => $milestone_name });
-    
-    $vars->{'milestone'} = $milestone;
-    $vars->{'product'} = $product;
-
-    # The default milestone cannot be deleted.
-    if ($product->default_milestone eq $milestone->name) {
-        ThrowUserError("milestone_is_default", { milestone => $milestone });
-    }
-    $vars->{'token'} = issue_session_token('delete_milestone');
-
-    $template->process("admin/milestones/confirm-delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $milestone
+    = Bugzilla::Milestone->check({product => $product, name => $milestone_name});
+
+  $vars->{'milestone'} = $milestone;
+  $vars->{'product'}   = $product;
+
+  # The default milestone cannot be deleted.
+  if ($product->default_milestone eq $milestone->name) {
+    ThrowUserError("milestone_is_default", {milestone => $milestone});
+  }
+  $vars->{'token'} = issue_session_token('delete_milestone');
+
+  $template->process("admin/milestones/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -150,20 +152,20 @@ if ($action eq 'del') {
 #
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_milestone');
-    my $milestone = Bugzilla::Milestone->check({ product => $product,
-                                                 name    => $milestone_name });
-    $milestone->remove_from_db;
-    delete_token($token);
-
-    $vars->{'message'} = 'milestone_deleted';
-    $vars->{'milestone'} = $milestone;
-    $vars->{'product'} = $product;
-    $vars->{'no_edit_milestone_link'} = 1;
-
-    $template->process("admin/milestones/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'delete_milestone');
+  my $milestone
+    = Bugzilla::Milestone->check({product => $product, name => $milestone_name});
+  $milestone->remove_from_db;
+  delete_token($token);
+
+  $vars->{'message'}                = 'milestone_deleted';
+  $vars->{'milestone'}              = $milestone;
+  $vars->{'product'}                = $product;
+  $vars->{'no_edit_milestone_link'} = 1;
+
+  $template->process("admin/milestones/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -174,16 +176,16 @@ if ($action eq 'delete') {
 
 if ($action eq 'edit') {
 
-    my $milestone = Bugzilla::Milestone->check({ product => $product,
-                                                 name    => $milestone_name });
+  my $milestone
+    = Bugzilla::Milestone->check({product => $product, name => $milestone_name});
 
-    $vars->{'milestone'} = $milestone;
-    $vars->{'product'} = $product;
-    $vars->{'token'} = issue_session_token('edit_milestone');
+  $vars->{'milestone'} = $milestone;
+  $vars->{'product'}   = $product;
+  $vars->{'token'}     = issue_session_token('edit_milestone');
 
-    $template->process("admin/milestones/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/milestones/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -191,28 +193,29 @@ if ($action eq 'edit') {
 #
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_milestone');
-    my $milestone_old_name = trim($cgi->param('milestoneold') || '');
-    my $milestone = Bugzilla::Milestone->check({ product => $product,
-                                                 name    => $milestone_old_name });
-
-    $milestone->set_name($milestone_name);
-    $milestone->set_sortkey($sortkey);
-    $milestone->set_is_active($isactive);
-    my $changes = $milestone->update();
-    # Reloading the product since the default milestone name
-    # could have been changed.
-    $product = new Bugzilla::Product({ name => $product_name });
-
-    delete_token($token);
-
-    $vars->{'message'} = 'milestone_updated';
-    $vars->{'milestone'} = $milestone;
-    $vars->{'product'} = $product;
-    $vars->{'changes'} = $changes;
-    $template->process("admin/milestones/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'edit_milestone');
+  my $milestone_old_name = trim($cgi->param('milestoneold') || '');
+  my $milestone = Bugzilla::Milestone->check(
+    {product => $product, name => $milestone_old_name});
+
+  $milestone->set_all({
+    name => $milestone_name, sortkey => $sortkey, is_active => $isactive,
+  });
+  my $changes = $milestone->update();
+
+  # Reloading the product since the default milestone name
+  # could have been changed.
+  $product = new Bugzilla::Product({name => $product_name});
+
+  delete_token($token);
+
+  $vars->{'message'}   = 'milestone_updated';
+  $vars->{'milestone'} = $milestone;
+  $vars->{'product'}   = $product;
+  $vars->{'changes'}   = $changes;
+  $template->process("admin/milestones/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 # No valid action found
diff --git a/editparams.cgi b/editparams.cgi
index ae569c2eb4..88222881e5 100755
--- a/editparams.cgi
+++ b/editparams.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -24,131 +24,152 @@ use Bugzilla::User;
 use Bugzilla::User::Setting;
 use Bugzilla::Status;
 
-my $user = Bugzilla->login(LOGIN_REQUIRED);
-my $cgi = Bugzilla->cgi;
+my $user     = Bugzilla->login(LOGIN_REQUIRED);
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 print $cgi->header();
 
 $user->in_group('tweakparams')
-  || ThrowUserError("auth_failure", {group  => "tweakparams",
-                                     action => "access",
-                                     object => "parameters"});
+  || ThrowUserError("auth_failure",
+  {group => "tweakparams", action => "access", object => "parameters"});
 
-my $action = trim($cgi->param('action') || '');
-my $token  = $cgi->param('token');
+my $action        = trim($cgi->param('action') || '');
+my $token         = $cgi->param('token');
 my $current_panel = $cgi->param('section') || 'core';
 $current_panel =~ /^([A-Za-z0-9_-]+)$/;
 $current_panel = $1;
 
 my $current_module;
-my @panels = ();
+my @panels       = ();
 my $param_panels = Bugzilla::Config::param_panels();
 foreach my $panel (keys %$param_panels) {
-    my $module = $param_panels->{$panel};
-    eval("require $module") || die $@;
-    my @module_param_list = "$module"->get_param_list();
-    my $item = { name => lc($panel),
-                 current => ($current_panel eq lc($panel)) ? 1 : 0,
-                 param_list => \@module_param_list,
-                 sortkey => eval "\$${module}::sortkey;"
-               };
-    defined($item->{'sortkey'}) || ($item->{'sortkey'} = 100000);
-    push(@panels, $item);
-    $current_module = $panel if ($current_panel eq lc($panel));
+  my $module = $param_panels->{$panel};
+  eval("require $module") || die $@;
+  my @module_param_list = "$module"->get_param_list();
+  my $item              = {
+    name       => lc($panel),
+    current    => ($current_panel eq lc($panel)) ? 1 : 0,
+    param_list => \@module_param_list,
+    sortkey    => eval "\$${module}::sortkey;"
+  };
+  defined($item->{'sortkey'}) || ($item->{'sortkey'} = 100000);
+  push(@panels, $item);
+  $current_module = $panel if ($current_panel eq lc($panel));
 }
 
-my %hook_panels = map { $_->{name} => { params => $_->{param_list} } }
-                      @panels;
+my %hook_panels = map { $_->{name} => {params => $_->{param_list}} } @panels;
+
 # Note that this hook is also called in Bugzilla::Config.
-Bugzilla::Hook::process('config_modify_panels', { panels => \%hook_panels });
+Bugzilla::Hook::process('config_modify_panels', {panels => \%hook_panels});
 
 $vars->{panels} = \@panels;
 
 if ($action eq 'save' && $current_module) {
-    check_token_data($token, 'edit_parameters');
-    my @changes = ();
-    my @module_param_list = @{ $hook_panels{lc($current_module)}->{params} };
-
-    foreach my $i (@module_param_list) {
-        my $name = $i->{'name'};
-        my $value = $cgi->param($name);
-
-        if (defined $cgi->param("reset-$name") && !$i->{'no_reset'}) {
-            $value = $i->{'default'};
-        } else {
-            if ($i->{'type'} eq 'm') {
-                # This simplifies the code below
-                $value = [ $cgi->param($name) ];
-            } else {
-                # Get rid of windows/mac-style line endings.
-                $value =~ s/\r\n?/\n/g;
-                # assume single linefeed is an empty string
-                $value =~ s/^\n$//;
-            }
-            # Stop complaining if the URL has no trailing slash.
-            # XXX - This hack can go away once bug 303662 is implemented.
-            if ($name =~ /(?<!webdot)base$/) {
-                $value = "$value/" if ($value && $value !~ m#/$#);
-            }
-        }
+  check_token_data($token, 'edit_parameters');
+  my @changes           = ();
+  my @module_param_list = @{$hook_panels{lc($current_module)}->{params}};
 
-        my $changed;
-        if ($i->{'type'} eq 'm') {
-            my @old = sort @{Bugzilla->params->{$name}};
-            my @new = sort @$value;
-            if (scalar(@old) != scalar(@new)) {
-                $changed = 1;
-            } else {
-                $changed = 0; # Assume not changed...
-                for (my $cnt = 0; $cnt < scalar(@old); ++$cnt) {
-                    if ($old[$cnt] ne $new[$cnt]) {
-                        # entry is different, therefore changed
-                        $changed = 1;
-                        last;
-                    }
-                }
-            }
-        } else {
-            $changed = ($value eq Bugzilla->params->{$name})? 0 : 1;
+  foreach my $i (@module_param_list) {
+    my $name  = $i->{'name'};
+    my $value = $cgi->param($name);
+
+    if (defined $cgi->param("reset-$name") && !$i->{'no_reset'}) {
+      $value = $i->{'default'};
+    }
+    else {
+      if ($i->{'type'} eq 'm') {
+
+        # This simplifies the code below
+        $value = [$cgi->param($name)];
+      }
+      else {
+        # Get rid of windows/mac-style line endings.
+        $value =~ s/\r\n?/\n/g;
+
+        # assume single linefeed is an empty string
+        $value =~ s/^\n$//;
+      }
+
+      # Stop complaining if the URL has no trailing slash.
+      # XXX - This hack can go away once bug 303662 is implemented.
+      if ($name =~ /base$/) {
+        $value = "$value/" if ($value && $value !~ m#/$#);
+      }
+    }
+
+    my $changed;
+    if ($i->{'type'} eq 'm') {
+      my @old = sort @{Bugzilla->params->{$name}};
+      my @new = sort @$value;
+      if (scalar(@old) != scalar(@new)) {
+        $changed = 1;
+      }
+      else {
+        $changed = 0;    # Assume not changed...
+        for (my $cnt = 0; $cnt < scalar(@old); ++$cnt) {
+          if ($old[$cnt] ne $new[$cnt]) {
+
+            # entry is different, therefore changed
+            $changed = 1;
+            last;
+          }
         }
+      }
+    }
+    else {
+      $changed = ($value eq Bugzilla->params->{$name}) ? 0 : 1;
+    }
 
-        if ($changed) {
-            if (exists $i->{'checker'}) {
-                my $ok = $i->{'checker'}->($value, $i);
-                if ($ok ne "") {
-                    ThrowUserError('invalid_parameter', { name => $name, err => $ok });
-                }
-            } elsif ($name eq 'globalwatchers') {
-                # can't check this as others, as Bugzilla::Config::Common
-                # cannot use Bugzilla::User
-                foreach my $watcher (split(/[,\s]+/, $value)) {
-                    ThrowUserError(
-                        'invalid_parameter',
-                        { name => $name, err => "no such user $watcher" }
-                    ) unless login_to_id($watcher);
-                }
-            }
-            push(@changes, $name);
-            SetParam($name, $value);
-            if (($name eq "shutdownhtml") && ($value ne "")) {
-                $vars->{'shutdown_is_active'} = 1;
-            }
-            if ($name eq 'duplicate_or_move_bug_status') {
-                Bugzilla::Status::add_missing_bug_status_transitions($value);
-            }
+    if ($changed) {
+      if (exists $i->{'checker'}) {
+        my $ok = $i->{'checker'}->($value, $i);
+        if ($ok ne "") {
+          ThrowUserError('invalid_parameter', {name => $name, err => $ok});
+        }
+      }
+      elsif ($name eq 'globalwatchers') {
+
+        # can't check this as others, as Bugzilla::Config::Common
+        # cannot use Bugzilla::User
+        foreach my $watcher (split(/[,\s]+/, $value)) {
+          ThrowUserError('invalid_parameter',
+            {name => $name, err => "no such user $watcher"})
+            unless login_to_id($watcher);
         }
+      }
+      push(@changes, $name);
+      SetParam($name, $value);
+      if (($name eq "shutdownhtml") && ($value ne "")) {
+        $vars->{'shutdown_is_active'} = 1;
+      }
     }
+  }
+
+  call_param_onchange_handlers(\@changes);
+
+  $vars->{'message'}       = 'parameters_updated';
+  $vars->{'param_changed'} = \@changes;
+
+  write_params();
+  delete_token($token);
+}
+
+if ($cgi->param('save-and-test-mta-params') && $cgi->request_method() eq "POST")
+{
+  my $message;
+  my $mail_template = Bugzilla->template_inner($user->setting('lang'));
+  $mail_template->process('email/mta-test.txt.tmpl', undef, \$message);
+  require Bugzilla::Mailer;
 
-    $vars->{'message'} = 'parameters_updated';
-    $vars->{'param_changed'} = \@changes;
+  # This will throw all sorts of useful errors if mail is not working
+  Bugzilla::Mailer::MessageToMTA($message);
 
-    write_params();
-    delete_token($token);
+  $vars->{'message'} = 'mta_param_tests_run';
 }
 
 $vars->{'token'} = issue_session_token('edit_parameters');
 
 $template->process("admin/params/editparams.html.tmpl", $vars)
-    || ThrowTemplateError($template->error());
+  || ThrowTemplateError($template->error());
diff --git a/editproducts.cgi b/editproducts.cgi
index f2526575eb..70b7250ded 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -26,58 +26,58 @@ use Bugzilla::Token;
 # Preliminary checks:
 #
 
-my $user = Bugzilla->login(LOGIN_REQUIRED);
+my $user  = Bugzilla->login(LOGIN_REQUIRED);
 my $whoid = $user->id;
 
-my $dbh = Bugzilla->dbh;
-my $cgi = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
+
 # Remove this as soon as the documentation about products has been
 # improved and each action has its own section.
-$vars->{'doc_section'} = 'administration.html#products';
+$vars->{'doc_section'} = 'administering/categorization.html#products';
 
 print $cgi->header();
 
 $user->in_group('editcomponents')
   || scalar(@{$user->get_products_by_permission('editcomponents')})
-  || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                     action => "edit",
-                                     object => "products"});
+  || ThrowUserError("auth_failure",
+  {group => "editcomponents", action => "edit", object => "products"});
 
 #
 # often used variables
 #
 my $classification_name = trim($cgi->param('classification') || '');
-my $product_name = trim($cgi->param('product') || '');
-my $action  = trim($cgi->param('action')  || '');
-my $token = $cgi->param('token');
+my $product_name        = trim($cgi->param('product')        || '');
+my $action              = trim($cgi->param('action')         || '');
+my $token               = $cgi->param('token');
 
 #
 # product = '' -> Show nice list of classifications (if
 # classifications enabled)
 #
 
-if (Bugzilla->params->{'useclassification'} 
-    && !$classification_name
-    && !$product_name)
+if ( Bugzilla->params->{'useclassification'}
+  && !$classification_name
+  && !$product_name)
 {
-    my $class;
-    if ($user->in_group('editcomponents')) {
-        $class = [Bugzilla::Classification->get_all];
-    }
-    else {
-        # Only keep classifications containing at least one product
-        # which you can administer.
-        my $products = $user->get_products_by_permission('editcomponents');
-        my %class_ids = map { $_->classification_id => 1 } @$products;
-        $class = Bugzilla::Classification->new_from_list([keys %class_ids]);
-    }
-    $vars->{'classifications'} = $class;
-
-    $template->process("admin/products/list-classifications.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  my $class;
+  if ($user->in_group('editcomponents')) {
+    $class = [Bugzilla::Classification->get_all];
+  }
+  else {
+    # Only keep classifications containing at least one product
+    # which you can administer.
+    my $products = $user->get_products_by_permission('editcomponents');
+    my %class_ids = map { $_->classification_id => 1 } @$products;
+    $class = Bugzilla::Classification->new_from_list([keys %class_ids]);
+  }
+  $vars->{'classifications'} = $class;
+
+  $template->process("admin/products/list-classifications.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 
@@ -87,36 +87,35 @@ if (Bugzilla->params->{'useclassification'}
 #
 
 if (!$action && !$product_name) {
-    my $classification;
-    my $products;
-
+  my $classification;
+  my $products;
+
+  if (Bugzilla->params->{'useclassification'}) {
+    $classification = Bugzilla::Classification->check($classification_name);
+    $products       = $user->get_selectable_products($classification->id);
+    $vars->{'classification'} = $classification;
+  }
+  else {
+    $products = $user->get_selectable_products;
+  }
+
+  # If the user has editcomponents privs for some products only,
+  # we have to restrict the list of products to display.
+  unless ($user->in_group('editcomponents')) {
+    $products = $user->get_products_by_permission('editcomponents');
     if (Bugzilla->params->{'useclassification'}) {
-        $classification = Bugzilla::Classification->check($classification_name);
-        $products = $user->get_selectable_products($classification->id);
-        $vars->{'classification'} = $classification;
-    } else {
-        $products = $user->get_selectable_products;
-    }
-
-    # If the user has editcomponents privs for some products only,
-    # we have to restrict the list of products to display.
-    unless ($user->in_group('editcomponents')) {
-        $products = $user->get_products_by_permission('editcomponents');
-        if (Bugzilla->params->{'useclassification'}) {
-            @$products = grep {$_->classification_id == $classification->id} @$products;
-        }
+      @$products = grep { $_->classification_id == $classification->id } @$products;
     }
-    $vars->{'products'} = $products;
-    $vars->{'showbugcounts'} = $cgi->param('showbugcounts') ? 1 : 0;
+  }
+  $vars->{'products'} = $products;
+  $vars->{'showbugcounts'} = $cgi->param('showbugcounts') ? 1 : 0;
 
-    $template->process("admin/products/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/products/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 
-
-
 #
 # action='add' -> present form for parameters for new product
 #
@@ -124,23 +123,23 @@ if (!$action && !$product_name) {
 #
 
 if ($action eq 'add') {
-    # The user must have the global editcomponents privs to add
-    # new products.
-    $user->in_group('editcomponents')
-      || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                         action => "add",
-                                         object => "products"});
 
-    if (Bugzilla->params->{'useclassification'}) {
-        my $classification = Bugzilla::Classification->check($classification_name);
-        $vars->{'classification'} = $classification;
-    }
-    $vars->{'token'} = issue_session_token('add_product');
+  # The user must have the global editcomponents privs to add
+  # new products.
+  $user->in_group('editcomponents')
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "add", object => "products"});
 
-    $template->process("admin/products/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  if (Bugzilla->params->{'useclassification'}) {
+    my $classification = Bugzilla::Classification->check($classification_name);
+    $vars->{'classification'} = $classification;
+  }
+  $vars->{'token'} = issue_session_token('add_product');
+
+  $template->process("admin/products/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 
@@ -149,61 +148,62 @@ if ($action eq 'add') {
 #
 
 if ($action eq 'new') {
-    # The user must have the global editcomponents privs to add
-    # new products.
-    $user->in_group('editcomponents')
-      || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                         action => "add",
-                                         object => "products"});
-
-    check_token_data($token, 'add_product');
-
-    Bugzilla::User::match_field ({
-        'initialowner'     => { 'type' => 'single' },
-        'initialqacontact' => { 'type' => 'single' },
-        'initialcc'        => { 'type' => 'multi'  },
-    });
-
-    my %product_create_params = (
-        classification   => $classification_name,
-        name             => $product_name,
-        description      => scalar $cgi->param('description'),
-        version          => scalar $cgi->param('version'),
-        defaultmilestone => scalar $cgi->param('defaultmilestone'),
-        isactive         => scalar $cgi->param('is_active'),
-        create_series    => scalar $cgi->param('createseries'),
-        allows_unconfirmed => scalar $cgi->param('allows_unconfirmed'),
-    );
-
-    $dbh->bz_start_transaction();
-    my $product = Bugzilla::Product->create(\%product_create_params);
 
-    my @initial_cc = $cgi->param('initialcc');
-    my %component_create_params = (
-        product          => $product,
-        name             => trim($cgi->param('component') || ''),
-        description      => scalar $cgi->param('comp_desc'),
-        initialowner     => scalar $cgi->param('initialowner'),
-        initialqacontact => scalar $cgi->param('initialqacontact'),
-        initial_cc       => \@initial_cc,
-        create_series    => scalar $cgi->param('createseries'),
-   );
-
-    Bugzilla::Component->create(\%component_create_params);
-    $dbh->bz_commit_transaction();
-
-    delete_token($token);
-
-    $vars->{'message'} = 'product_created';
-    $vars->{'product'} = $product;
-    if (Bugzilla->params->{'useclassification'}) {
-        $vars->{'classification'} = new Bugzilla::Classification($product->classification_id);
-    }
-    $vars->{'token'} = issue_session_token('edit_product');
-
-    $template->process("admin/products/edit.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  # The user must have the global editcomponents privs to add
+  # new products.
+  $user->in_group('editcomponents')
+    || ThrowUserError("auth_failure",
+    {group => "editcomponents", action => "add", object => "products"});
+
+  check_token_data($token, 'add_product');
+
+  Bugzilla::User::match_field({
+    'initialowner'     => {'type' => 'single'},
+    'initialqacontact' => {'type' => 'single'},
+    'initialcc'        => {'type' => 'multi'},
+  });
+
+  my %product_create_params = (
+    classification     => $classification_name,
+    name               => $product_name,
+    description        => scalar $cgi->param('description'),
+    version            => scalar $cgi->param('version'),
+    defaultmilestone   => scalar $cgi->param('defaultmilestone'),
+    isactive           => scalar $cgi->param('is_active'),
+    create_series      => scalar $cgi->param('createseries'),
+    allows_unconfirmed => scalar $cgi->param('allows_unconfirmed'),
+  );
+
+  $dbh->bz_start_transaction();
+  my $product = Bugzilla::Product->create(\%product_create_params);
+
+  my @initial_cc              = $cgi->multi_param('initialcc');
+  my %component_create_params = (
+    product          => $product,
+    name             => trim($cgi->param('component') || ''),
+    description      => scalar $cgi->param('comp_desc'),
+    initialowner     => scalar $cgi->param('initialowner'),
+    initialqacontact => scalar $cgi->param('initialqacontact'),
+    initial_cc       => \@initial_cc,
+    create_series    => scalar $cgi->param('createseries'),
+  );
+
+  Bugzilla::Component->create(\%component_create_params);
+  $dbh->bz_commit_transaction();
+
+  delete_token($token);
+
+  $vars->{'message'} = 'product_created';
+  $vars->{'product'} = $product;
+  if (Bugzilla->params->{'useclassification'}) {
+    $vars->{'classification'}
+      = new Bugzilla::Classification($product->classification_id);
+  }
+  $vars->{'token'} = issue_session_token('edit_product');
+
+  $template->process("admin/products/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -213,19 +213,20 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'del') {
-    my $product = $user->check_can_admin_product($product_name);
+  my $product = $user->check_can_admin_product($product_name);
 
-    if (Bugzilla->params->{'useclassification'}) {
-        $vars->{'classification'} = new Bugzilla::Classification($product->classification_id);
-    }
-    $vars->{'product'} = $product;
-    $vars->{'token'} = issue_session_token('delete_product');
-    
-    Bugzilla::Hook::process('product_confirm_delete', { vars => $vars });
-    
-    $template->process("admin/products/confirm-delete.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  if (Bugzilla->params->{'useclassification'}) {
+    $vars->{'classification'}
+      = new Bugzilla::Classification($product->classification_id);
+  }
+  $vars->{'product'} = $product;
+  $vars->{'token'}   = issue_session_token('delete_product');
+
+  Bugzilla::Hook::process('product_confirm_delete', {vars => $vars});
+
+  $template->process("admin/products/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -233,36 +234,40 @@ if ($action eq 'del') {
 #
 
 if ($action eq 'delete') {
-    my $product = $user->check_can_admin_product($product_name);
-    check_token_data($token, 'delete_product');
+  my $product = $user->check_can_admin_product($product_name);
+  check_token_data($token, 'delete_product');
 
-    $product->remove_from_db({ delete_series => scalar $cgi->param('delete_series')});
-    delete_token($token);
+  $product->remove_from_db(
+    {delete_series => scalar $cgi->param('delete_series')});
+  delete_token($token);
 
-    $vars->{'message'} = 'product_deleted';
-    $vars->{'product'} = $product;
-    $vars->{'no_edit_product_link'} = 1;
+  $vars->{'message'}              = 'product_deleted';
+  $vars->{'product'}              = $product;
+  $vars->{'no_edit_product_link'} = 1;
 
-    if (Bugzilla->params->{'useclassification'}) {
-        $vars->{'classifications'} = $user->in_group('editcomponents') ?
-          [Bugzilla::Classification->get_all] : $user->get_selectable_classifications;
+  if (Bugzilla->params->{'useclassification'}) {
+    $vars->{'classifications'}
+      = $user->in_group('editcomponents')
+      ? [Bugzilla::Classification->get_all]
+      : $user->get_selectable_classifications;
 
-        $template->process("admin/products/list-classifications.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-    }
-    else {
-        my $products = $user->get_selectable_products;
-        # If the user has editcomponents privs for some products only,
-        # we have to restrict the list of products to display.
-        unless ($user->in_group('editcomponents')) {
-            $products = $user->get_products_by_permission('editcomponents');
-        }
-        $vars->{'products'} = $products;
-
-        $template->process("admin/products/list.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
+    $template->process("admin/products/list-classifications.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+  }
+  else {
+    my $products = $user->get_selectable_products;
+
+    # If the user has editcomponents privs for some products only,
+    # we have to restrict the list of products to display.
+    unless ($user->in_group('editcomponents')) {
+      $products = $user->get_products_by_permission('editcomponents');
     }
-    exit;
+    $vars->{'products'} = $products;
+
+    $template->process("admin/products/list.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+  }
+  exit;
 }
 
 #
@@ -273,48 +278,50 @@ if ($action eq 'delete') {
 #
 
 if ($action eq 'edit' || (!$action && $product_name)) {
-    my $product = $user->check_can_admin_product($product_name);
-
-    if (Bugzilla->params->{'useclassification'}) {
-        $vars->{'classification'} = new Bugzilla::Classification($product->classification_id);
-    }
-    $vars->{'product'} = $product;
-    $vars->{'token'} = issue_session_token('edit_product');
-
-    $template->process("admin/products/edit.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  my $product = $user->check_can_admin_product($product_name);
+
+  if (Bugzilla->params->{'useclassification'}) {
+    $vars->{'classification'}
+      = new Bugzilla::Classification($product->classification_id);
+  }
+  $vars->{'product'} = $product;
+  $vars->{'token'}   = issue_session_token('edit_product');
+
+  $template->process("admin/products/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
 # action='update' -> update the product
 #
 if ($action eq 'update') {
-    check_token_data($token, 'edit_product');
-    my $product_old_name = trim($cgi->param('product_old_name') || '');
-    my $product = $user->check_can_admin_product($product_old_name);
-
-    $product->set_all({
-        name        => $product_name,
-        description => scalar $cgi->param('description'),
-        is_active   => scalar $cgi->param('is_active'),
-        allows_unconfirmed => scalar $cgi->param('allows_unconfirmed'),
-        default_milestone  => scalar $cgi->param('defaultmilestone'),
-    });
-
-    my $changes = $product->update();
-
-    delete_token($token);
-
-    if (Bugzilla->params->{'useclassification'}) {
-        $vars->{'classification'} = new Bugzilla::Classification($product->classification_id);
-    }
-    $vars->{'product'} = $product;
-    $vars->{'changes'} = $changes;
-
-    $template->process("admin/products/updated.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  check_token_data($token, 'edit_product');
+  my $product_old_name = trim($cgi->param('product_old_name') || '');
+  my $product = $user->check_can_admin_product($product_old_name);
+
+  $product->set_all({
+    name               => $product_name,
+    description        => scalar $cgi->param('description'),
+    is_active          => scalar $cgi->param('is_active'),
+    allows_unconfirmed => scalar $cgi->param('allows_unconfirmed'),
+    default_milestone  => scalar $cgi->param('defaultmilestone'),
+  });
+
+  my $changes = $product->update();
+
+  delete_token($token);
+
+  if (Bugzilla->params->{'useclassification'}) {
+    $vars->{'classification'}
+      = new Bugzilla::Classification($product->classification_id);
+  }
+  $vars->{'product'} = $product;
+  $vars->{'changes'} = $changes;
+
+  $template->process("admin/products/updated.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -322,14 +329,14 @@ if ($action eq 'update') {
 #
 
 if ($action eq 'editgroupcontrols') {
-    my $product = $user->check_can_admin_product($product_name);
+  my $product = $user->check_can_admin_product($product_name);
 
-    $vars->{'product'} = $product;
-    $vars->{'token'} = issue_session_token('edit_group_controls');
+  $vars->{'product'} = $product;
+  $vars->{'token'}   = issue_session_token('edit_group_controls');
 
-    $template->process("admin/products/groupcontrol/edit.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/products/groupcontrol/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
@@ -337,44 +344,45 @@ if ($action eq 'editgroupcontrols') {
 #
 
 if ($action eq 'updategroupcontrols') {
-    my $product = $user->check_can_admin_product($product_name);
-    check_token_data($token, 'edit_group_controls');
-
-    my @now_na = ();
-    my @now_mandatory = ();
-    foreach my $f ($cgi->param()) {
-        if ($f =~ /^membercontrol_(\d+)$/) {
-            my $id = $1;
-            if ($cgi->param($f) == CONTROLMAPNA) {
-                push @now_na,$id;
-            } elsif ($cgi->param($f) == CONTROLMAPMANDATORY) {
-                push @now_mandatory,$id;
-            }
-        }
+  my $product = $user->check_can_admin_product($product_name);
+  check_token_data($token, 'edit_group_controls');
+
+  my @now_na        = ();
+  my @now_mandatory = ();
+  foreach my $f ($cgi->multi_param()) {
+    if ($f =~ /^membercontrol_(\d+)$/a) {
+      my $id = $1;
+      if ($cgi->param($f) == CONTROLMAPNA) {
+        push @now_na, $id;
+      }
+      elsif ($cgi->param($f) == CONTROLMAPMANDATORY) {
+        push @now_mandatory, $id;
+      }
     }
-    if (!defined $cgi->param('confirmed')) {
-        my $na_groups;
-        if (@now_na) {
-            $na_groups = $dbh->selectall_arrayref(
-                    'SELECT groups.name, COUNT(bugs.bug_id) AS count
+  }
+  if (!defined $cgi->param('confirmed')) {
+    my $na_groups;
+    if (@now_na) {
+      $na_groups = $dbh->selectall_arrayref(
+        'SELECT groups.name, COUNT(bugs.bug_id) AS count
                        FROM bugs
                  INNER JOIN bug_group_map
                          ON bug_group_map.bug_id = bugs.bug_id
                  INNER JOIN groups
                          ON bug_group_map.group_id = groups.id
                       WHERE groups.id IN (' . join(', ', @now_na) . ')
-                        AND bugs.product_id = ? ' .
-                       $dbh->sql_group_by('groups.name'),
-                   {'Slice' => {}}, $product->id);
-        }
-
-        # return the mandatory groups which need to have bug entries
-        # added to the bug_group_map and the corresponding bug count
-
-        my $mandatory_groups;
-        if (@now_mandatory) {
-            $mandatory_groups = $dbh->selectall_arrayref(
-                    'SELECT groups.name,
+                        AND bugs.product_id = ? ' . $dbh->sql_group_by('groups.name'),
+        {'Slice' => {}}, $product->id
+      );
+    }
+
+    # return the mandatory groups which need to have bug entries
+    # added to the bug_group_map and the corresponding bug count
+
+    my $mandatory_groups;
+    if (@now_mandatory) {
+      $mandatory_groups = $dbh->selectall_arrayref(
+        'SELECT groups.name,
                            (SELECT COUNT(bugs.bug_id)
                               FROM bugs
                              WHERE bugs.product_id = ?
@@ -384,46 +392,51 @@ if ($action eq 'updategroupcontrols') {
                            AS count
                       FROM groups
                      WHERE groups.id IN (' . join(', ', @now_mandatory) . ')
-                     ORDER BY groups.name',
-                   {'Slice' => {}}, $product->id);
-            # remove zero counts
-            @$mandatory_groups = grep { $_->{count} } @$mandatory_groups;
-
-        }
-        if (($na_groups && scalar(@$na_groups))
-            || ($mandatory_groups && scalar(@$mandatory_groups)))
-        {
-            $vars->{'product'} = $product;
-            $vars->{'na_groups'} = $na_groups;
-            $vars->{'mandatory_groups'} = $mandatory_groups;
-            $template->process("admin/products/groupcontrol/confirm-edit.html.tmpl", $vars)
-                || ThrowTemplateError($template->error());
-            exit;
-        }
-    }
+                     ORDER BY groups.name', {'Slice' => {}}, $product->id
+      );
+
+      # remove zero counts
+      @$mandatory_groups = grep { $_->{count} } @$mandatory_groups;
 
-    my $groups = Bugzilla::Group->match({isactive => 1, isbuggroup => 1});
-    foreach my $group (@$groups) {
-        my $group_id = $group->id;
-        $product->set_group_controls($group,
-                                     {entry          => scalar $cgi->param("entry_$group_id") || 0,
-                                      membercontrol  => scalar $cgi->param("membercontrol_$group_id") || CONTROLMAPNA,
-                                      othercontrol   => scalar $cgi->param("othercontrol_$group_id") || CONTROLMAPNA,
-                                      canedit        => scalar $cgi->param("canedit_$group_id") || 0,
-                                      editcomponents => scalar $cgi->param("editcomponents_$group_id") || 0,
-                                      editbugs       => scalar $cgi->param("editbugs_$group_id") || 0,
-                                      canconfirm     => scalar $cgi->param("canconfirm_$group_id") || 0});
     }
-    my $changes = $product->update;
+    if ( ($na_groups && scalar(@$na_groups))
+      || ($mandatory_groups && scalar(@$mandatory_groups)))
+    {
+      $vars->{'product'}          = $product;
+      $vars->{'na_groups'}        = $na_groups;
+      $vars->{'mandatory_groups'} = $mandatory_groups;
+      $template->process("admin/products/groupcontrol/confirm-edit.html.tmpl", $vars)
+        || ThrowTemplateError($template->error());
+      exit;
+    }
+  }
+
+  my $groups = Bugzilla::Group->match({isactive => 1, isbuggroup => 1});
+  foreach my $group (@$groups) {
+    my $group_id = $group->id;
+    $product->set_group_controls(
+      $group,
+      {
+        entry         => scalar $cgi->param("entry_$group_id")         || 0,
+        membercontrol => scalar $cgi->param("membercontrol_$group_id") || CONTROLMAPNA,
+        othercontrol  => scalar $cgi->param("othercontrol_$group_id")  || CONTROLMAPNA,
+        canedit       => scalar $cgi->param("canedit_$group_id")       || 0,
+        editcomponents => scalar $cgi->param("editcomponents_$group_id") || 0,
+        editbugs       => scalar $cgi->param("editbugs_$group_id")       || 0,
+        canconfirm     => scalar $cgi->param("canconfirm_$group_id")     || 0
+      }
+    );
+  }
+  my $changes = $product->update;
 
-    delete_token($token);
+  delete_token($token);
 
-    $vars->{'product'} = $product;
-    $vars->{'changes'} = $changes;
+  $vars->{'product'} = $product;
+  $vars->{'changes'} = $changes;
 
-    $template->process("admin/products/groupcontrol/updated.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    exit;
+  $template->process("admin/products/groupcontrol/updated.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 # No valid action found
diff --git a/editsettings.cgi b/editsettings.cgi
index b10a497ba5..95a14b778d 100755
--- a/editsettings.cgi
+++ b/editsettings.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -20,48 +20,47 @@ use Bugzilla::User::Setting;
 use Bugzilla::Token;
 
 my $template = Bugzilla->template;
-my $user = Bugzilla->login(LOGIN_REQUIRED);
-my $cgi = Bugzilla->cgi;
-my $vars = {};
+my $user     = Bugzilla->login(LOGIN_REQUIRED);
+my $cgi      = Bugzilla->cgi;
+my $vars     = {};
 
 print $cgi->header;
 
 $user->in_group('tweakparams')
-  || ThrowUserError("auth_failure", {group  => "tweakparams",
-                                     action => "modify",
-                                     object => "settings"});
+  || ThrowUserError("auth_failure",
+  {group => "tweakparams", action => "modify", object => "settings"});
 
 my $action = trim($cgi->param('action') || '');
 my $token = $cgi->param('token');
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_settings');
-    my $settings = Bugzilla::User::Setting::get_defaults();
-    my $changed = 0;
+  check_token_data($token, 'edit_settings');
+  my $settings = Bugzilla::User::Setting::get_defaults();
+  my $changed  = 0;
 
-    foreach my $name (keys %$settings) {
-        my $old_enabled = $settings->{$name}->{'is_enabled'};
-        my $old_value = $settings->{$name}->{'default_value'};
-        my $enabled = defined $cgi->param("${name}-enabled") || 0;
-        my $value = $cgi->param("${name}");
-        my $setting = new Bugzilla::User::Setting($name);
+  foreach my $name (keys %$settings) {
+    my $old_enabled = $settings->{$name}->{'is_enabled'};
+    my $old_value   = $settings->{$name}->{'default_value'};
+    my $enabled     = defined $cgi->param("${name}-enabled") || 0;
+    my $value       = $cgi->param("${name}");
+    my $setting     = new Bugzilla::User::Setting($name);
 
-        $setting->validate_value($value);
+    $setting->validate_value($value);
 
-        if ($old_enabled != $enabled || $old_value ne $value) {
-            Bugzilla::User::Setting::set_default($name, $value, $enabled);
-            $changed = 1;
-        }
+    if ($old_enabled != $enabled || $old_value ne $value) {
+      Bugzilla::User::Setting::set_default($name, $value, $enabled);
+      $changed = 1;
     }
-    $vars->{'message'} = 'default_settings_updated';
-    $vars->{'changes_saved'} = $changed;
-    Bugzilla->memcached->clear_config();
-    delete_token($token);
+  }
+  $vars->{'message'}       = 'default_settings_updated';
+  $vars->{'changes_saved'} = $changed;
+  Bugzilla->memcached->clear_config();
+  delete_token($token);
 }
 
 # Don't use $settings as defaults may have changed.
 $vars->{'settings'} = Bugzilla::User::Setting::get_defaults();
-$vars->{'token'} = issue_session_token('edit_settings');
+$vars->{'token'}    = issue_session_token('edit_settings');
 
 $template->process("admin/settings/edit.html.tmpl", $vars)
   || ThrowTemplateError($template->error());
diff --git a/editusers.cgi b/editusers.cgi
index a38195a4b8..c37eb56111 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -32,15 +32,18 @@ my $template  = Bugzilla->template;
 my $dbh       = Bugzilla->dbh;
 my $userid    = $user->id;
 my $editusers = $user->in_group('editusers');
-local our $vars     = {};
+local our $vars = {};
 
 # Reject access if there is no sense in continuing.
-$editusers
-    || $user->can_bless()
-    || ThrowUserError("auth_failure", {group  => "editusers",
-                                       reason => "cant_bless",
-                                       action => "edit",
-                                       object => "users"});
+$editusers || $user->can_bless() || ThrowUserError(
+  "auth_failure",
+  {
+    group  => "editusers",
+    reason => "cant_bless",
+    action => "edit",
+    object => "users"
+  }
+);
 
 print $cgi->header();
 
@@ -55,548 +58,594 @@ $vars->{'editusers'} = $editusers;
 mirrorListSelectionValues();
 
 Bugzilla::Hook::process('admin_editusers_action',
-    { vars => $vars, user => $user, action => $action });
+  {vars => $vars, user => $user, action => $action});
 
 ###########################################################################
 if ($action eq 'search') {
-    # Allow to restrict the search to any group the user is allowed to bless.
-    $vars->{'restrictablegroups'} = $user->bless_groups();
-    $template->process('admin/users/search.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
 
-###########################################################################
-} elsif ($action eq 'list') {
-    my $matchvalue    = $cgi->param('matchvalue') || '';
-    my $matchstr      = trim($cgi->param('matchstr'));
-    my $matchtype     = $cgi->param('matchtype');
-    my $grouprestrict = $cgi->param('grouprestrict') || '0';
-    my $is_enabled    = scalar $cgi->param('is_enabled');
-    my $query = 'SELECT DISTINCT userid, login_name, realname, is_enabled, ' .
-                $dbh->sql_date_format('last_seen_date', '%Y-%m-%d') . ' AS last_seen_date ' .
-                'FROM profiles';
-    my @bindValues;
-    my $nextCondition;
-    my $visibleGroups;
-
-    # If a group ID is given, make sure it is a valid one.
-    my $group;
-    if ($grouprestrict) {
-        $group = new Bugzilla::Group(scalar $cgi->param('groupid'));
-        $group || ThrowUserError('invalid_group_ID');
-    }
-
-    if (!$editusers && Bugzilla->params->{'usevisibilitygroups'}) {
-        # Show only users in visible groups.
-        $visibleGroups = $user->visible_groups_as_string();
+  # Allow to restrict the search to any group the user is allowed to bless.
+  $vars->{'restrictablegroups'} = $user->bless_groups();
+  $template->process('admin/users/search.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 
-        if ($visibleGroups) {
-            $query .= qq{, user_group_map AS ugm
+###########################################################################
+}
+elsif ($action eq 'list') {
+  my $matchvalue    = $cgi->param('matchvalue') || '';
+  my $matchstr      = trim(scalar $cgi->param('matchstr'));
+  my $matchtype     = $cgi->param('matchtype');
+  my $grouprestrict = $cgi->param('grouprestrict') || '0';
+
+  # 0 = disabled only, 1 = enabled only, 2 = everyone
+  my $is_enabled = $cgi->param('is_enabled') // 2;
+  my $query
+    = 'SELECT DISTINCT userid, login_name, email, realname, is_enabled, '
+    . $dbh->sql_date_format('last_seen_date', '%Y-%m-%d')
+    . ' AS last_seen_date '
+    . 'FROM profiles';
+  my @bindValues;
+  my $nextCondition;
+  my $visibleGroups;
+
+  # If a group ID is given, make sure it is a valid one.
+  my $group;
+  if ($grouprestrict) {
+    $group = new Bugzilla::Group(scalar $cgi->param('groupid'));
+    $group || ThrowUserError('invalid_group_ID');
+  }
+
+  if (!$editusers && Bugzilla->params->{'usevisibilitygroups'}) {
+
+    # Show only users in visible groups.
+    $visibleGroups = $user->visible_groups_as_string();
+
+    if ($visibleGroups) {
+      $query .= qq{, user_group_map AS ugm
                          WHERE ugm.user_id = profiles.userid
                            AND ugm.isbless = 0
                            AND ugm.group_id IN ($visibleGroups)
                         };
-            $nextCondition = 'AND';
-        }
-    } else {
-        $visibleGroups = 1;
-        if ($grouprestrict eq '1') {
-            $query .= qq{, user_group_map AS ugm
+      $nextCondition = 'AND';
+    }
+  }
+  else {
+    $visibleGroups = 1;
+    if ($grouprestrict eq '1') {
+      $query .= qq{, user_group_map AS ugm
                          WHERE ugm.user_id = profiles.userid
                            AND ugm.isbless = 0
                         };
-            $nextCondition = 'AND';
-        }
-        else {
-            $nextCondition = 'WHERE';
+      $nextCondition = 'AND';
+    }
+    else {
+      $nextCondition = 'WHERE';
+    }
+  }
+
+  if (!$visibleGroups) {
+    $vars->{'users'} = {};
+  }
+  else {
+    # Handle selection by login name, email, real name, or userid.
+    if (defined($matchtype)) {
+      $query .= " $nextCondition ";
+      my $expr = '';
+      if ($matchvalue eq 'userid') {
+        if ($matchstr) {
+          my $stored_matchstr = $matchstr;
+          detaint_natural($matchstr)
+            || ThrowUserError('illegal_user_id', {userid => $stored_matchstr});
         }
+        $expr = "profiles.userid";
+      }
+      elsif ($matchvalue eq 'email') {
+        $expr = 'profiles.email';
+      }
+      elsif ($matchvalue eq 'realname') {
+        $expr = "profiles.realname";
+      }
+      elsif ($matchvalue eq 'extern_id') {
+        $expr = "profiles.extern_id";
+      }
+      else {
+        $expr = "profiles.login_name";
+      }
+
+      if ($matchtype =~ /^(regexp|notregexp|exact)$/) {
+        $matchstr ||= '.';
+      }
+      else {
+        $matchstr = '' unless defined $matchstr;
+      }
+
+      # We can trick_taint because we use the value in a SELECT only,
+      # using a placeholder.
+      trick_taint($matchstr);
+
+      if ($matchtype eq 'regexp') {
+        $query .= $dbh->sql_regexp($expr, '?', 0, $dbh->quote($matchstr));
+      }
+      elsif ($matchtype eq 'notregexp') {
+        $query .= $dbh->sql_not_regexp($expr, '?', 0, $dbh->quote($matchstr));
+      }
+      elsif ($matchtype eq 'exact') {
+        $query .= $expr . ' = ?';
+      }
+      else {    # substr or unknown
+        $query .= $dbh->sql_iposition('?', $expr) . ' > 0';
+      }
+      $nextCondition = 'AND';
+      push(@bindValues, $matchstr);
     }
 
-    if (!$visibleGroups) {
-        $vars->{'users'} = {};
+    # Handle selection by group.
+    if ($grouprestrict eq '1') {
+      my $grouplist
+        = join(',', @{Bugzilla::Group->flatten_group_membership($group->id)});
+      $query .= " $nextCondition ugm.group_id IN($grouplist) ";
     }
-    else {
-        # Handle selection by login name, real name, or userid.
-        if (defined($matchtype)) {
-            $query .= " $nextCondition ";
-            my $expr = "";
-            if ($matchvalue eq 'userid') {
-                if ($matchstr) {
-                    my $stored_matchstr = $matchstr;
-                    detaint_natural($matchstr) 
-                        || ThrowUserError('illegal_user_id', {userid => $stored_matchstr});
-                }
-                $expr = "profiles.userid";
-            } elsif ($matchvalue eq 'realname') {
-                $expr = "profiles.realname";
-            } else {
-                $expr = "profiles.login_name";
-            }
-
-            if ($matchtype =~ /^(regexp|notregexp|exact)$/) {
-                $matchstr ||= '.';
-            }
-            else {
-                $matchstr = '' unless defined $matchstr;
-            }
-            # We can trick_taint because we use the value in a SELECT only,
-            # using a placeholder.
-            trick_taint($matchstr);
-
-            if ($matchtype eq 'regexp') {
-                $query .= $dbh->sql_regexp($expr, '?', 0, $dbh->quote($matchstr));
-            } elsif ($matchtype eq 'notregexp') {
-                $query .= $dbh->sql_not_regexp($expr, '?', 0, $dbh->quote($matchstr));
-            } elsif ($matchtype eq 'exact') {
-                $query .= $expr . ' = ?';
-            } else { # substr or unknown
-                $query .= $dbh->sql_iposition('?', $expr) . ' > 0';
-            }
-            $nextCondition = 'AND';
-            push(@bindValues, $matchstr);
-        }
 
-        # Handle selection by group.
-        if ($grouprestrict eq '1') {
-            my $grouplist = join(',',
-                @{Bugzilla::Group->flatten_group_membership($group->id)});
-            $query .= " $nextCondition ugm.group_id IN($grouplist) ";
-        }
+    detaint_natural($is_enabled);
+    if ($is_enabled && ($is_enabled == 0 || $is_enabled == 1)) {
+      $query .= " $nextCondition profiles.is_enabled = ?";
+      $nextCondition = 'AND';
+      push(@bindValues, $is_enabled);
+    }
 
-        detaint_natural($is_enabled);
-        if ($is_enabled == 0 || $is_enabled == 1) {
-            $query .= " $nextCondition profiles.is_enabled = ?";
-            $nextCondition = 'AND';
-            push(@bindValues, $is_enabled);
-        }
-        $query .= ' ORDER BY profiles.login_name';
+    $query .= ' ORDER BY profiles.login_name';
 
-        $vars->{'users'} = $dbh->selectall_arrayref($query,
-                                                    {'Slice' => {}},
-                                                    @bindValues);
+    $vars->{'users'}
+      = $dbh->selectall_arrayref($query, {'Slice' => {}}, @bindValues);
 
-    }
+  }
 
-    if ($matchtype && $matchtype eq 'exact' && scalar(@{$vars->{'users'}}) == 1) {
-        my $match_user_id = $vars->{'users'}[0]->{'userid'};
-        my $match_user = check_user($match_user_id);
-        edit_processing($match_user);
-    } else {
-        $template->process('admin/users/list.html.tmpl', $vars)
-            || ThrowTemplateError($template->error());
-    }
+  if ($matchtype && $matchtype eq 'exact' && scalar(@{$vars->{'users'}}) == 1) {
+    my $match_user_id = $vars->{'users'}[0]->{'userid'};
+    my $match_user    = check_user($match_user_id);
+    edit_processing($match_user);
+  }
+  else {
+    $template->process('admin/users/list.html.tmpl', $vars)
+      || ThrowTemplateError($template->error());
+  }
 
 ###########################################################################
-} elsif ($action eq 'add') {
-    $editusers || ThrowUserError("auth_failure", {group  => "editusers",
-                                                  action => "add",
-                                                  object => "users"});
+}
+elsif ($action eq 'add') {
+  $editusers
+    || ThrowUserError("auth_failure",
+    {group => "editusers", action => "add", object => "users"});
 
-    $vars->{'token'} = issue_session_token('add_user');
+  $vars->{'token'} = issue_session_token('add_user');
 
-    $template->process('admin/users/create.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
+  $template->process('admin/users/create.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 
 ###########################################################################
-} elsif ($action eq 'new') {
-    $editusers || ThrowUserError("auth_failure", {group  => "editusers",
-                                                  action => "add",
-                                                  object => "users"});
-
-    check_token_data($token, 'add_user');
-
-    # When e.g. the 'Env' auth method is used, the password field
-    # is not displayed. In that case, set the password to *.
-    my $password = $cgi->param('password');
-    $password = '*' if !defined $password;
-
-    my $new_user = Bugzilla::User->create({
-        login_name    => scalar $cgi->param('login'),
-        cryptpassword => $password,
-        realname      => scalar $cgi->param('name'),
-        disabledtext  => scalar $cgi->param('disabledtext'),
-        disable_mail  => scalar $cgi->param('disable_mail'),
-        extern_id     => scalar $cgi->param('extern_id'),
-        });
-
-    userDataToVars($new_user->id);
-
-    delete_token($token);
-
-    if ($cgi->param('notify_user')) {
-        $vars->{'new_user'} = $new_user;
-        my $message;
-      
-        $template->process('email/new-user-details.txt.tmpl', $vars, \$message)
-            || ThrowTemplateError($template->error());
-        MessageToMTA($message);
-    }
+}
+elsif ($action eq 'new') {
+  $editusers
+    || ThrowUserError("auth_failure",
+    {group => "editusers", action => "add", object => "users"});
 
-    # We already display the updated page. We have to recreate a token now.
-    $vars->{'token'} = issue_session_token('edit_user');
-    $vars->{'message'} = 'account_created';
-    $template->process('admin/users/edit.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
+  check_token_data($token, 'add_user');
 
-###########################################################################
-} elsif ($action eq 'edit') {
-    my $otherUser = check_user($otherUserID, $otherUserLogin);
-    edit_processing($otherUser);
+  # When e.g. the 'Env' auth method is used, the password field
+  # is not displayed. In that case, set the password to *.
+  my $password = $cgi->param('password');
+  $password = '*' if !defined $password;
 
-###########################################################################
-} elsif ($action eq 'update') {
-    check_token_data($token, 'edit_user');
-    my $otherUser = check_user($otherUserID, $otherUserLogin);
-    $otherUserID = $otherUser->id;
-
-    # Lock tables during the check+update session.
-    $dbh->bz_start_transaction();
-
-    $editusers || $user->can_see_user($otherUser)
-        || ThrowUserError('auth_failure', {reason => "not_visible",
-                                           action => "modify",
-                                           object => "user"});
-
-    $vars->{'loginold'} = $otherUser->login;
-
-    # Update groups
-    my @group_ids = grep { s/group_// } keys %{ Bugzilla->cgi->Vars };
-    $otherUser->set_groups({ set => \@group_ids });
-
-    # Update profiles table entry; silently skip doing this if the user
-    # is not authorized.
-    my $changes = {};
-    if ($editusers) {
-        $otherUser->set_login($cgi->param('login'));
-        $otherUser->set_name($cgi->param('name'));
-        $otherUser->set_password($cgi->param('password'))
-            if $cgi->param('password');
-        $otherUser->set_disabledtext($cgi->param('disabledtext'));
-        $otherUser->set_disable_mail($cgi->param('disable_mail'));
-        $otherUser->set_extern_id($cgi->param('extern_id'))
-            if defined($cgi->param('extern_id'));
-
-        # Update bless groups
-        my @bless_ids = grep { s/bless_// } keys %{ Bugzilla->cgi->Vars };
-        $otherUser->set_bless_groups({ set => \@bless_ids });
-    }
-    $changes = $otherUser->update();
+  my $login_name = $cgi->param('login');
+  my $email      = $cgi->param('email');
+
+  $login_name = $email if Bugzilla->params->{use_email_as_login};
 
-    $dbh->bz_commit_transaction();
+  my $new_user = Bugzilla::User->create({
+    login_name    => $login_name,
+    email         => $email,
+    cryptpassword => $password,
+    realname      => scalar $cgi->param('name'),
+    disabledtext  => scalar $cgi->param('disabledtext'),
+    disable_mail  => scalar $cgi->param('disable_mail'),
+    extern_id     => scalar $cgi->param('extern_id'),
+  });
 
-    # XXX: userDataToVars may be off when editing ourselves.
-    userDataToVars($otherUserID);
-    delete_token($token);
+  userDataToVars($new_user->id);
 
-    $vars->{'message'} = 'account_updated';
-    $vars->{'changes'} = \%$changes;
-    # We already display the updated page. We have to recreate a token now.
-    $vars->{'token'} = issue_session_token('edit_user');
+  delete_token($token);
 
-    $template->process('admin/users/edit.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
+  if ($cgi->param('notify_user')) {
+    $vars->{'new_user'} = $new_user;
+    my $message;
+
+    $template->process('email/new-user-details.txt.tmpl', $vars, \$message)
+      || ThrowTemplateError($template->error());
+    MessageToMTA($message);
+  }
+
+  # We already display the updated page. We have to recreate a token now.
+  $vars->{'token'}   = issue_session_token('edit_user');
+  $vars->{'message'} = 'account_created';
+  $template->process('admin/users/edit.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
+
+###########################################################################
+}
+elsif ($action eq 'edit') {
+  my $otherUser = check_user($otherUserID, $otherUserLogin);
+  edit_processing($otherUser);
+
+###########################################################################
+}
+elsif ($action eq 'update') {
+  check_token_data($token, 'edit_user');
+  my $otherUser = check_user($otherUserID, $otherUserLogin);
+  $otherUserID = $otherUser->id;
+
+  # Lock tables during the check+update session.
+  $dbh->bz_start_transaction();
+
+  $editusers
+    || $user->can_see_user($otherUser)
+    || ThrowUserError('auth_failure',
+    {reason => "not_visible", action => "modify", object => "user"});
+
+  $vars->{'loginold'} = $otherUser->login;
+
+  # Update groups
+  my @group_ids = grep {s/group_//} keys %{Bugzilla->cgi->Vars};
+  $otherUser->set_groups({set => \@group_ids});
+
+  # Update profiles table entry; silently skip doing this if the user
+  # is not authorized.
+  my $changes = {};
+  if ($editusers) {
+    $otherUser->set_login(scalar $cgi->param('login'))
+      unless Bugzilla->params->{use_email_as_login};
+    $otherUser->set_email(scalar $cgi->param('email'));
+    $otherUser->set_name(scalar $cgi->param('name'));
+    $otherUser->set_password(scalar $cgi->param('password'))
+      if $cgi->param('password');
+    $otherUser->set_disabledtext(scalar $cgi->param('disabledtext'));
+    $otherUser->set_disable_mail(scalar $cgi->param('disable_mail'));
+    $otherUser->set_extern_id(scalar $cgi->param('extern_id'))
+      if defined $cgi->param('extern_id');
+
+    # Update bless groups
+    my @bless_ids = grep {s/bless_//} keys %{Bugzilla->cgi->Vars};
+    $otherUser->set_bless_groups({set => \@bless_ids});
+  }
+  $changes = $otherUser->update();
+
+  $dbh->bz_commit_transaction();
+
+  # XXX: userDataToVars may be off when editing ourselves.
+  userDataToVars($otherUserID);
+  delete_token($token);
+
+  $vars->{'message'} = 'account_updated';
+  $vars->{'changes'} = \%$changes;
+
+  # We already display the updated page. We have to recreate a token now.
+  $vars->{'token'} = issue_session_token('edit_user');
+
+  $template->process('admin/users/edit.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 
 ###########################################################################
-} elsif ($action eq 'del') {
-    my $otherUser = check_user($otherUserID, $otherUserLogin);
-    $otherUserID = $otherUser->id;
-
-    Bugzilla->params->{'allowuserdeletion'} 
-        || ThrowUserError('users_deletion_disabled');
-    $editusers || ThrowUserError('auth_failure', {group  => "editusers",
-                                                  action => "delete",
-                                                  object => "users"});
-    $vars->{'otheruser'}      = $otherUser;
-
-    # Find other cross references.
-    $vars->{'attachments'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM attachments WHERE submitter_id = ?',
-        undef, $otherUserID);
-    $vars->{'assignee_or_qa'} = $dbh->selectrow_array(
-        qq{SELECT COUNT(*)
+}
+elsif ($action eq 'del') {
+  my $otherUser = check_user($otherUserID, $otherUserLogin);
+  $otherUserID = $otherUser->id;
+
+  Bugzilla->params->{'allowuserdeletion'}
+    || ThrowUserError('users_deletion_disabled');
+  $editusers
+    || ThrowUserError('auth_failure',
+    {group => "editusers", action => "delete", object => "users"});
+  $vars->{'otheruser'} = $otherUser;
+
+  # Find other cross references.
+  $vars->{'attachments'}
+    = $dbh->selectrow_array(
+    'SELECT COUNT(*) FROM attachments WHERE submitter_id = ?',
+    undef, $otherUserID);
+  $vars->{'assignee_or_qa'} = $dbh->selectrow_array(
+    qq{SELECT COUNT(*)
            FROM bugs
-           WHERE assigned_to = ? OR qa_contact = ?},
-        undef, ($otherUserID, $otherUserID));
-    $vars->{'reporter'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM bugs WHERE reporter = ?',
-        undef, $otherUserID);
-    $vars->{'cc'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM cc WHERE who = ?',
-        undef, $otherUserID);
-    $vars->{'bugs_activity'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM bugs_activity WHERE who = ?',
-        undef, $otherUserID);
-    $vars->{'component_cc'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM component_cc WHERE user_id = ?',
-        undef, $otherUserID);
-    $vars->{'email_setting'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM email_setting WHERE user_id = ?',
-        undef, $otherUserID);
-    $vars->{'flags'}{'requestee'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM flags WHERE requestee_id = ?',
-        undef, $otherUserID);
-    $vars->{'flags'}{'setter'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM flags WHERE setter_id = ?',
-        undef, $otherUserID);
-    $vars->{'longdescs'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM longdescs WHERE who = ?',
-        undef, $otherUserID);
-    my $namedquery_ids = $dbh->selectcol_arrayref(
-        'SELECT id FROM namedqueries WHERE userid = ?',
-        undef, $otherUserID);
-    $vars->{'namedqueries'} = scalar(@$namedquery_ids);
-    if (scalar(@$namedquery_ids)) {
-        $vars->{'namedquery_group_map'} = $dbh->selectrow_array(
-            'SELECT COUNT(*) FROM namedquery_group_map WHERE namedquery_id IN' .
-            ' (' . join(', ', @$namedquery_ids) . ')');
-    }
-    else {
-        $vars->{'namedquery_group_map'} = 0;
-    }
-    $vars->{'profile_setting'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM profile_setting WHERE user_id = ?',
-        undef, $otherUserID);
-    $vars->{'profiles_activity'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM profiles_activity WHERE who = ? AND userid != ?',
-        undef, ($otherUserID, $otherUserID));
-    $vars->{'quips'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM quips WHERE userid = ?',
-        undef, $otherUserID);
-    $vars->{'series'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM series WHERE creator = ?',
-        undef, $otherUserID);
-    $vars->{'watch'}{'watched'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM watch WHERE watched = ?',
-        undef, $otherUserID);
-    $vars->{'watch'}{'watcher'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM watch WHERE watcher = ?',
-        undef, $otherUserID);
-    $vars->{'whine_events'} = $dbh->selectrow_array(
-        'SELECT COUNT(*) FROM whine_events WHERE owner_userid = ?',
-        undef, $otherUserID);
-    $vars->{'whine_schedules'} = $dbh->selectrow_array(
-        qq{SELECT COUNT(distinct eventid)
+           WHERE assigned_to = ? OR qa_contact = ?}, undef,
+    ($otherUserID, $otherUserID)
+  );
+  $vars->{'reporter'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM bugs WHERE reporter = ?',
+    undef, $otherUserID);
+  $vars->{'cc'} = $dbh->selectrow_array('SELECT COUNT(*) FROM cc WHERE who = ?',
+    undef, $otherUserID);
+  $vars->{'bugs_activity'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM bugs_activity WHERE who = ?',
+    undef, $otherUserID);
+  $vars->{'component_cc'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM component_cc WHERE user_id = ?',
+    undef, $otherUserID);
+  $vars->{'email_setting'}
+    = $dbh->selectrow_array(
+    'SELECT COUNT(*) FROM email_setting WHERE user_id = ?',
+    undef, $otherUserID);
+  $vars->{'flags'}{'requestee'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM flags WHERE requestee_id = ?',
+    undef, $otherUserID);
+  $vars->{'flags'}{'setter'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM flags WHERE setter_id = ?',
+    undef, $otherUserID);
+  $vars->{'longdescs'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM longdescs WHERE who = ?',
+    undef, $otherUserID);
+  my $namedquery_ids
+    = $dbh->selectcol_arrayref('SELECT id FROM namedqueries WHERE userid = ?',
+    undef, $otherUserID);
+  $vars->{'namedqueries'} = scalar(@$namedquery_ids);
+
+  if (scalar(@$namedquery_ids)) {
+    $vars->{'namedquery_group_map'}
+      = $dbh->selectrow_array(
+          'SELECT COUNT(*) FROM namedquery_group_map WHERE namedquery_id IN' . ' ('
+        . join(', ', @$namedquery_ids)
+        . ')');
+  }
+  else {
+    $vars->{'namedquery_group_map'} = 0;
+  }
+  $vars->{'profile_setting'}
+    = $dbh->selectrow_array(
+    'SELECT COUNT(*) FROM profile_setting WHERE user_id = ?',
+    undef, $otherUserID);
+  $vars->{'profiles_activity'}
+    = $dbh->selectrow_array(
+    'SELECT COUNT(*) FROM profiles_activity WHERE who = ? AND userid != ?',
+    undef, ($otherUserID, $otherUserID));
+  $vars->{'quips'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM quips WHERE userid = ?',
+    undef, $otherUserID);
+  $vars->{'series'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM series WHERE creator = ?',
+    undef, $otherUserID);
+  $vars->{'watch'}{'watched'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM watch WHERE watched = ?',
+    undef, $otherUserID);
+  $vars->{'watch'}{'watcher'}
+    = $dbh->selectrow_array('SELECT COUNT(*) FROM watch WHERE watcher = ?',
+    undef, $otherUserID);
+  $vars->{'whine_events'}
+    = $dbh->selectrow_array(
+    'SELECT COUNT(*) FROM whine_events WHERE owner_userid = ?',
+    undef, $otherUserID);
+  $vars->{'whine_schedules'} = $dbh->selectrow_array(
+    qq{SELECT COUNT(distinct eventid)
            FROM whine_schedules
            WHERE mailto = ?
            AND mailto_type = ?
-          },
-        undef, ($otherUserID, MAILTO_USER));
-    $vars->{'token'} = issue_session_token('delete_user');
+          }, undef, ($otherUserID, MAILTO_USER)
+  );
+  $vars->{'token'} = issue_session_token('delete_user');
 
-    $template->process('admin/users/confirm-delete.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
+  $template->process('admin/users/confirm-delete.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 
 ###########################################################################
-} elsif ($action eq 'delete') {
-    check_token_data($token, 'delete_user');
-    my $otherUser = check_user($otherUserID, $otherUserLogin);
-    $otherUserID = $otherUser->id;
-
-    # Cache for user accounts.
-    my %usercache = (0 => new Bugzilla::User());
-    my %updatedbugs;
-
-    # Lock tables during the check+removal session.
-    # XXX: if there was some change on these tables after the deletion
-    #      confirmation checks, we may do something here we haven't warned
-    #      about.
-    $dbh->bz_start_transaction();
-
-    Bugzilla->params->{'allowuserdeletion'}
-        || ThrowUserError('users_deletion_disabled');
-    $editusers || ThrowUserError('auth_failure',
-                                 {group  => "editusers",
-                                  action => "delete",
-                                  object => "users"});
-    @{$otherUser->product_responsibilities()}
-        && ThrowUserError('user_has_responsibility');
-
-    Bugzilla->logout_user($otherUser);
-
-    # Get the named query list so we can delete namedquery_group_map entries.
-    my $namedqueries_as_string = join(', ', @{$dbh->selectcol_arrayref(
-        'SELECT id FROM namedqueries WHERE userid = ?', undef, $otherUserID)});
-
-    # Get the timestamp for LogActivityEntry.
-    my $timestamp = $dbh->selectrow_array('SELECT NOW()');
-
-    # When we update a bug_activity entry, we update the bug timestamp, too.
-    my $sth_set_bug_timestamp =
-        $dbh->prepare('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?');
-
-    # Flags
-    my $flag_ids =
-      $dbh->selectcol_arrayref('SELECT id FROM flags WHERE requestee_id = ?',
-                                undef, $otherUserID);
-
-    my $flags = Bugzilla::Flag->new_from_list($flag_ids);
-
-    $dbh->do('UPDATE flags SET requestee_id = NULL, modification_date = ?
-              WHERE requestee_id = ?', undef, ($timestamp, $otherUserID));
-
-    # We want to remove the requestee but leave the requester alone,
-    # so we have to log these changes manually.
-    my %bugs;
-    push(@{$bugs{$_->bug_id}->{$_->attach_id || 0}}, $_) foreach @$flags;
-    foreach my $bug_id (keys %bugs) {
-        foreach my $attach_id (keys %{$bugs{$bug_id}}) {
-            my @old_summaries = Bugzilla::Flag->snapshot($bugs{$bug_id}->{$attach_id});
-            $_->_set_requestee() foreach @{$bugs{$bug_id}->{$attach_id}};
-            my @new_summaries = Bugzilla::Flag->snapshot($bugs{$bug_id}->{$attach_id});
-            my ($removed, $added) =
-                Bugzilla::Flag->update_activity(\@old_summaries, \@new_summaries);
-            LogActivityEntry($bug_id, 'flagtypes.name', $removed, $added,
-                $userid, $timestamp, undef, $attach_id);
-        }
-        $sth_set_bug_timestamp->execute($timestamp, $bug_id);
-        $updatedbugs{$bug_id} = 1;
-    }
-
-    # Simple deletions in referred tables.
-    $dbh->do('DELETE FROM email_setting WHERE user_id = ?', undef,
-             $otherUserID);
-    $dbh->do('DELETE FROM logincookies WHERE userid = ?', undef, $otherUserID);
-    $dbh->do('DELETE FROM namedqueries WHERE userid = ?', undef, $otherUserID);
-    $dbh->do('DELETE FROM namedqueries_link_in_footer WHERE user_id = ?', undef,
-             $otherUserID);
-    if ($namedqueries_as_string) {
-        $dbh->do('DELETE FROM namedquery_group_map WHERE namedquery_id IN ' .
-                 "($namedqueries_as_string)");
-    }
-    $dbh->do('DELETE FROM profile_setting WHERE user_id = ?', undef,
-             $otherUserID);
-    $dbh->do('DELETE FROM profiles_activity WHERE userid = ? OR who = ?', undef,
-             ($otherUserID, $otherUserID));
-    $dbh->do('DELETE FROM tokens WHERE userid = ?', undef, $otherUserID);
-    $dbh->do('DELETE FROM user_group_map WHERE user_id = ?', undef,
-             $otherUserID);
-    $dbh->do('DELETE FROM watch WHERE watcher = ? OR watched = ?', undef,
-             ($otherUserID, $otherUserID));
-
-    # Deletions in referred tables which need LogActivityEntry.
-    my $buglist = $dbh->selectcol_arrayref('SELECT bug_id FROM cc WHERE who = ?',
-                                            undef, $otherUserID);
-    $dbh->do('DELETE FROM cc WHERE who = ?', undef, $otherUserID);
-    foreach my $bug_id (@$buglist) {
-        LogActivityEntry($bug_id, 'cc', $otherUser->login, '', $userid,
-                         $timestamp);
-        $sth_set_bug_timestamp->execute($timestamp, $bug_id);
-        $updatedbugs{$bug_id} = 1;
-    }
-
-    # Even more complex deletions in referred tables.
-    my $id;
-
-    # 1) Series
-    my $sth_seriesid = $dbh->prepare(
-           'SELECT series_id FROM series WHERE creator = ?');
-    my $sth_deleteSeries = $dbh->prepare(
-           'DELETE FROM series WHERE series_id = ?');
-    my $sth_deleteSeriesData = $dbh->prepare(
-           'DELETE FROM series_data WHERE series_id = ?');
-
-    $sth_seriesid->execute($otherUserID);
-    while ($id = $sth_seriesid->fetchrow_array()) {
-        $sth_deleteSeriesData->execute($id);
-        $sth_deleteSeries->execute($id);
+}
+elsif ($action eq 'delete') {
+  check_token_data($token, 'delete_user');
+  my $otherUser = check_user($otherUserID, $otherUserLogin);
+  $otherUserID = $otherUser->id;
+
+  # Cache for user accounts.
+  my %usercache = (0 => new Bugzilla::User());
+  my %updatedbugs;
+
+  # Lock tables during the check+removal session.
+  # XXX: if there was some change on these tables after the deletion
+  #      confirmation checks, we may do something here we haven't warned
+  #      about.
+  $dbh->bz_start_transaction();
+
+  Bugzilla->params->{'allowuserdeletion'}
+    || ThrowUserError('users_deletion_disabled');
+  $editusers
+    || ThrowUserError('auth_failure',
+    {group => "editusers", action => "delete", object => "users"});
+  @{$otherUser->product_responsibilities()}
+    && ThrowUserError('user_has_responsibility');
+
+  Bugzilla->logout_user($otherUser);
+
+  # Get the named query list so we can delete namedquery_group_map entries.
+  my $namedqueries_as_string = join(
+    ', ',
+    @{
+      $dbh->selectcol_arrayref('SELECT id FROM namedqueries WHERE userid = ?',
+        undef, $otherUserID)
     }
-
-    # 2) Whines
-    my $sth_whineidFromEvents = $dbh->prepare(
-           'SELECT id FROM whine_events WHERE owner_userid = ?');
-    my $sth_deleteWhineEvent = $dbh->prepare(
-           'DELETE FROM whine_events WHERE id = ?');
-    my $sth_deleteWhineQuery = $dbh->prepare(
-           'DELETE FROM whine_queries WHERE eventid = ?');
-    my $sth_deleteWhineSchedule = $dbh->prepare(
-           'DELETE FROM whine_schedules WHERE eventid = ?');
-
-    $dbh->do('DELETE FROM whine_schedules WHERE mailto = ? AND mailto_type = ?',
-             undef, ($otherUserID, MAILTO_USER));
-
-    $sth_whineidFromEvents->execute($otherUserID);
-    while ($id = $sth_whineidFromEvents->fetchrow_array()) {
-        $sth_deleteWhineQuery->execute($id);
-        $sth_deleteWhineSchedule->execute($id);
-        $sth_deleteWhineEvent->execute($id);
+  );
+
+  # Get the timestamp for LogActivityEntry.
+  my $timestamp = $dbh->selectrow_array('SELECT NOW()');
+
+  # When we update a bug_activity entry, we update the bug timestamp, too.
+  my $sth_set_bug_timestamp
+    = $dbh->prepare('UPDATE bugs SET delta_ts = ? WHERE bug_id = ?');
+
+  # Flags
+  my $flag_ids
+    = $dbh->selectcol_arrayref('SELECT id FROM flags WHERE requestee_id = ?',
+    undef, $otherUserID);
+
+  my $flags = Bugzilla::Flag->new_from_list($flag_ids);
+
+  $dbh->do(
+    'UPDATE flags SET requestee_id = NULL, modification_date = ?
+              WHERE requestee_id = ?', undef, ($timestamp, $otherUserID)
+  );
+
+  # We want to remove the requestee but leave the requester alone,
+  # so we have to log these changes manually.
+  my %bugs;
+  push(@{$bugs{$_->bug_id}->{$_->attach_id || 0}}, $_) foreach @$flags;
+  foreach my $bug_id (keys %bugs) {
+    foreach my $attach_id (keys %{$bugs{$bug_id}}) {
+      my @old_summaries = Bugzilla::Flag->snapshot($bugs{$bug_id}->{$attach_id});
+      $_->_set_requestee() foreach @{$bugs{$bug_id}->{$attach_id}};
+      my @new_summaries = Bugzilla::Flag->snapshot($bugs{$bug_id}->{$attach_id});
+      my ($removed, $added)
+        = Bugzilla::Flag->update_activity(\@old_summaries, \@new_summaries);
+      LogActivityEntry($bug_id, 'flagtypes.name', $removed, $added, $userid,
+        $timestamp, undef, $attach_id);
     }
-
-    # 3) Bugs
-    # 3.1) fall back to the default assignee
-    $buglist = $dbh->selectall_arrayref(
-        'SELECT bug_id, initialowner
+    $sth_set_bug_timestamp->execute($timestamp, $bug_id);
+    $updatedbugs{$bug_id} = 1;
+  }
+
+  # Simple deletions in referred tables.
+  $dbh->do('DELETE FROM email_setting WHERE user_id = ?', undef, $otherUserID);
+  $dbh->do('DELETE FROM logincookies WHERE userid = ?',   undef, $otherUserID);
+  $dbh->do('DELETE FROM namedqueries WHERE userid = ?',   undef, $otherUserID);
+  $dbh->do('DELETE FROM namedqueries_link_in_footer WHERE user_id = ?',
+    undef, $otherUserID);
+  if ($namedqueries_as_string) {
+    $dbh->do('DELETE FROM namedquery_group_map WHERE namedquery_id IN '
+        . "($namedqueries_as_string)");
+  }
+  $dbh->do('DELETE FROM profile_setting WHERE user_id = ?', undef, $otherUserID);
+  $dbh->do('DELETE FROM profiles_activity WHERE userid = ? OR who = ?',
+    undef, ($otherUserID, $otherUserID));
+  $dbh->do('DELETE FROM tokens WHERE userid = ?',          undef, $otherUserID);
+  $dbh->do('DELETE FROM user_group_map WHERE user_id = ?', undef, $otherUserID);
+  $dbh->do('DELETE FROM watch WHERE watcher = ? OR watched = ?',
+    undef, ($otherUserID, $otherUserID));
+
+  # Deletions in referred tables which need LogActivityEntry.
+  my $buglist = $dbh->selectcol_arrayref('SELECT bug_id FROM cc WHERE who = ?',
+    undef, $otherUserID);
+  $dbh->do('DELETE FROM cc WHERE who = ?', undef, $otherUserID);
+  foreach my $bug_id (@$buglist) {
+    LogActivityEntry($bug_id, 'cc', $otherUser->login, '', $userid, $timestamp);
+    $sth_set_bug_timestamp->execute($timestamp, $bug_id);
+    $updatedbugs{$bug_id} = 1;
+  }
+
+  # Even more complex deletions in referred tables.
+  my $id;
+
+  # 1) Series
+  my $sth_seriesid
+    = $dbh->prepare('SELECT series_id FROM series WHERE creator = ?');
+  my $sth_deleteSeries = $dbh->prepare('DELETE FROM series WHERE series_id = ?');
+  my $sth_deleteSeriesData
+    = $dbh->prepare('DELETE FROM series_data WHERE series_id = ?');
+
+  $sth_seriesid->execute($otherUserID);
+  while ($id = $sth_seriesid->fetchrow_array()) {
+    $sth_deleteSeriesData->execute($id);
+    $sth_deleteSeries->execute($id);
+  }
+
+  # 2) Whines
+  my $sth_whineidFromEvents
+    = $dbh->prepare('SELECT id FROM whine_events WHERE owner_userid = ?');
+  my $sth_deleteWhineEvent
+    = $dbh->prepare('DELETE FROM whine_events WHERE id = ?');
+  my $sth_deleteWhineQuery
+    = $dbh->prepare('DELETE FROM whine_queries WHERE eventid = ?');
+  my $sth_deleteWhineSchedule
+    = $dbh->prepare('DELETE FROM whine_schedules WHERE eventid = ?');
+
+  $dbh->do('DELETE FROM whine_schedules WHERE mailto = ? AND mailto_type = ?',
+    undef, ($otherUserID, MAILTO_USER));
+
+  $sth_whineidFromEvents->execute($otherUserID);
+  while ($id = $sth_whineidFromEvents->fetchrow_array()) {
+    $sth_deleteWhineQuery->execute($id);
+    $sth_deleteWhineSchedule->execute($id);
+    $sth_deleteWhineEvent->execute($id);
+  }
+
+  # 3) Bugs
+  # 3.1) fall back to the default assignee
+  $buglist = $dbh->selectall_arrayref(
+    'SELECT bug_id, initialowner
          FROM bugs
          INNER JOIN components ON components.id = bugs.component_id
-         WHERE assigned_to = ?', undef, $otherUserID);
-
-    my $sth_updateAssignee = $dbh->prepare(
-        'UPDATE bugs SET assigned_to = ?, delta_ts = ? WHERE bug_id = ?');
-
-    foreach my $bug (@$buglist) {
-        my ($bug_id, $default_assignee_id) = @$bug;
-        $sth_updateAssignee->execute($default_assignee_id,
-                                     $timestamp, $bug_id);
-        $updatedbugs{$bug_id} = 1;
-        $default_assignee_id ||= 0;
-        $usercache{$default_assignee_id} ||=
-            new Bugzilla::User($default_assignee_id);
-        LogActivityEntry($bug_id, 'assigned_to', $otherUser->login,
-                         $usercache{$default_assignee_id}->login,
-                         $userid, $timestamp);
-    }
-
-    # 3.2) fall back to the default QA contact
-    $buglist = $dbh->selectall_arrayref(
-        'SELECT bug_id, initialqacontact
+         WHERE assigned_to = ?', undef, $otherUserID
+  );
+
+  my $sth_updateAssignee = $dbh->prepare(
+    'UPDATE bugs SET assigned_to = ?, delta_ts = ? WHERE bug_id = ?');
+
+  foreach my $bug (@$buglist) {
+    my ($bug_id, $default_assignee_id) = @$bug;
+    $sth_updateAssignee->execute($default_assignee_id, $timestamp, $bug_id);
+    $updatedbugs{$bug_id} = 1;
+    $default_assignee_id ||= 0;
+    $usercache{$default_assignee_id} ||= new Bugzilla::User($default_assignee_id);
+    LogActivityEntry($bug_id, 'assigned_to', $otherUser->login,
+      $usercache{$default_assignee_id}->login,
+      $userid, $timestamp);
+  }
+
+  # 3.2) fall back to the default QA contact
+  $buglist = $dbh->selectall_arrayref(
+    'SELECT bug_id, initialqacontact
          FROM bugs
          INNER JOIN components ON components.id = bugs.component_id
-         WHERE qa_contact = ?', undef, $otherUserID);
-
-    my $sth_updateQAcontact = $dbh->prepare(
-        'UPDATE bugs SET qa_contact = ?, delta_ts = ? WHERE bug_id = ?');
-
-    foreach my $bug (@$buglist) {
-        my ($bug_id, $default_qa_contact_id) = @$bug;
-        $sth_updateQAcontact->execute($default_qa_contact_id,
-                                      $timestamp, $bug_id);
-        $updatedbugs{$bug_id} = 1;
-        $default_qa_contact_id ||= 0;
-        $usercache{$default_qa_contact_id} ||=
-            new Bugzilla::User($default_qa_contact_id);
-        LogActivityEntry($bug_id, 'qa_contact', $otherUser->login,
-                         $usercache{$default_qa_contact_id}->login,
-                         $userid, $timestamp);
-    }
-
-    # Finally, remove the user account itself.
-    $dbh->do('DELETE FROM profiles WHERE userid = ?', undef, $otherUserID);
-
-    $dbh->bz_commit_transaction();
-    delete_token($token);
-
-    # It's complex to determine which items now need to be flushed from
-    # memcached.  As user deletion is expected to be a rare event, we just
-    # flush the entire cache when a user is deleted.
-    Bugzilla->memcached->clear_all();
-
-    $vars->{'message'} = 'account_deleted';
-    $vars->{'otheruser'}{'login'} = $otherUser->login;
-    $vars->{'restrictablegroups'} = $user->bless_groups();
-    $template->process('admin/users/search.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
-
-    # Send mail about what we've done to bugs.
-    # The deleted user is not notified of the changes.
-    foreach (keys(%updatedbugs)) {
-        Bugzilla::BugMail::Send($_, {'changer' => $user} );
-    }
+         WHERE qa_contact = ?', undef, $otherUserID
+  );
+
+  my $sth_updateQAcontact = $dbh->prepare(
+    'UPDATE bugs SET qa_contact = ?, delta_ts = ? WHERE bug_id = ?');
+
+  foreach my $bug (@$buglist) {
+    my ($bug_id, $default_qa_contact_id) = @$bug;
+    $sth_updateQAcontact->execute($default_qa_contact_id, $timestamp, $bug_id);
+    $updatedbugs{$bug_id} = 1;
+    $default_qa_contact_id ||= 0;
+    $usercache{$default_qa_contact_id}
+      ||= new Bugzilla::User($default_qa_contact_id);
+    LogActivityEntry($bug_id, 'qa_contact', $otherUser->login,
+      $usercache{$default_qa_contact_id}->login,
+      $userid, $timestamp);
+  }
+
+  # Finally, remove the user account itself.
+  $dbh->do('DELETE FROM profiles WHERE userid = ?', undef, $otherUserID);
+
+  $dbh->bz_commit_transaction();
+  delete_token($token);
+
+  # It's complex to determine which items now need to be flushed from
+  # memcached.  As user deletion is expected to be a rare event, we just
+  # flush the entire cache when a user is deleted.
+  Bugzilla->memcached->clear_all();
+
+  $vars->{'message'}            = 'account_deleted';
+  $vars->{'otheruser'}{'login'} = $otherUser->login;
+  $vars->{'restrictablegroups'} = $user->bless_groups();
+  $template->process('admin/users/search.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
+
+  # Send mail about what we've done to bugs.
+  # The deleted user is not notified of the changes.
+  foreach (keys(%updatedbugs)) {
+    Bugzilla::BugMail::Send($_, {'changer' => $user});
+  }
 
 ###########################################################################
-} elsif ($action eq 'activity') {
-    my $otherUser = check_user($otherUserID, $otherUserLogin);
+}
+elsif ($action eq 'activity') {
+  my $otherUser = check_user($otherUserID, $otherUserLogin);
 
-    $vars->{'profile_changes'} = $dbh->selectall_arrayref(
-        "SELECT profiles.login_name AS who, " .
-                $dbh->sql_date_format('profiles_activity.profiles_when') . " AS activity_when,
+  $vars->{'profile_changes'} = $dbh->selectall_arrayref(
+        "SELECT profiles.login_name AS who, "
+      . $dbh->sql_date_format('profiles_activity.profiles_when')
+      . " AS activity_when,
                 fielddefs.name AS what,
                 profiles_activity.oldvalue AS removed,
                 profiles_activity.newvalue AS added
@@ -604,18 +653,18 @@ if ($action eq 'search') {
          INNER JOIN profiles ON profiles_activity.who = profiles.userid
          INNER JOIN fielddefs ON fielddefs.id = profiles_activity.fieldid
          WHERE profiles_activity.userid = ?
-         ORDER BY profiles_activity.profiles_when",
-        {'Slice' => {}},
-        $otherUser->id);
+         ORDER BY profiles_activity.profiles_when", {'Slice' => {}}, $otherUser->id
+  );
 
-    $vars->{'otheruser'} = $otherUser;
+  $vars->{'otheruser'} = $otherUser;
 
-    $template->process("account/profile-activity.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
+  $template->process("account/profile-activity.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
 ###########################################################################
-} else {
-    ThrowUserError('unknown_action', {action => $action});
+}
+else {
+  ThrowUserError('unknown_action', {action => $action});
 }
 
 exit;
@@ -627,52 +676,54 @@ exit;
 # Try to build a user object using its ID, else its login name, and throw
 # an error if the user does not exist.
 sub check_user {
-    my ($otherUserID, $otherUserLogin) = @_;
-
-    my $otherUser;
-    my $vars = {};
-
-    if ($otherUserID) {
-        $otherUser = Bugzilla::User->new($otherUserID);
-        $vars->{'user_id'} = $otherUserID;
-    }
-    elsif ($otherUserLogin) {
-        $otherUser = new Bugzilla::User({ name => $otherUserLogin });
-        $vars->{'user_login'} = $otherUserLogin;
-    }
-    ($otherUser && $otherUser->id) || ThrowUserError('invalid_user', $vars);
-
-    return $otherUser;
+  my ($otherUserID, $otherUserLogin) = @_;
+
+  my $otherUser;
+  my $vars = {};
+
+  if ($otherUserID) {
+    $otherUser = Bugzilla::User->new($otherUserID);
+    $vars->{'user_id'} = $otherUserID;
+  }
+  elsif ($otherUserLogin) {
+    $otherUser = new Bugzilla::User({name => $otherUserLogin});
+    $vars->{'user_login'} = $otherUserLogin;
+  }
+  ($otherUser && $otherUser->id) || ThrowUserError('invalid_user', $vars);
+
+  return $otherUser;
 }
 
 # Copy incoming list selection values from CGI params to template variables.
 sub mirrorListSelectionValues {
-    my $cgi = Bugzilla->cgi;
-    if (defined($cgi->param('matchtype'))) {
-        foreach ('matchvalue', 'matchstr', 'matchtype',
-                 'grouprestrict', 'groupid', 'is_enabled')
-        {
-            $vars->{'listselectionvalues'}{$_} = $cgi->param($_);
-        }
+  my $cgi = Bugzilla->cgi;
+  if (defined($cgi->param('matchtype'))) {
+    foreach (
+      'matchvalue',    'matchstr', 'matchtype',
+      'grouprestrict', 'groupid',  'is_enabled'
+      )
+    {
+      $vars->{'listselectionvalues'}{$_} = $cgi->param($_);
     }
+  }
 }
 
 # Retrieve user data for the user editing form. User creation and user
 # editing code rely on this to call derive_groups().
 sub userDataToVars {
-    my $otheruserid = shift;
-    my $otheruser = new Bugzilla::User($otheruserid);
-    my $query;
-    my $user = Bugzilla->user;
-    my $dbh = Bugzilla->dbh;
+  my $otheruserid = shift;
+  my $otheruser   = new Bugzilla::User($otheruserid);
+  my $query;
+  my $user = Bugzilla->user;
+  my $dbh  = Bugzilla->dbh;
 
-    my $grouplist = $otheruser->groups_as_string;
+  my $grouplist = $otheruser->groups_as_string;
 
-    $vars->{'otheruser'} = $otheruser;
-    $vars->{'groups'} = $user->bless_groups();
+  $vars->{'otheruser'} = $otheruser;
+  $vars->{'groups'}    = $user->bless_groups();
 
-    $vars->{'permissions'} = $dbh->selectall_hashref(
-        qq{SELECT id,
+  $vars->{'permissions'} = $dbh->selectall_hashref(
+    qq{SELECT id,
                   COUNT(directmember.group_id) AS directmember,
                   COUNT(regexpmember.group_id) AS regexpmember,
                   (CASE WHEN (groups.id IN ($grouplist)
@@ -698,38 +749,40 @@ sub userDataToVars {
                  AND directbless.isbless = 1
                  AND directbless.grant_type = ?
           } . $dbh->sql_group_by('id'),
-        'id', undef,
-        ($otheruserid, GRANT_DIRECT,
-         $otheruserid, GRANT_REGEXP,
-         $otheruserid, GRANT_DIRECT));
-
-    # Find indirect bless permission.
-    $query = qq{SELECT groups.id
+    'id', undef,
+    (
+      $otheruserid, GRANT_DIRECT, $otheruserid, GRANT_REGEXP,
+      $otheruserid, GRANT_DIRECT
+    )
+  );
+
+  # Find indirect bless permission.
+  $query = qq{SELECT groups.id
                 FROM groups, group_group_map AS ggm
                 WHERE groups.id = ggm.grantor_id
                   AND ggm.member_id IN ($grouplist)
                   AND ggm.grant_type = ?
                } . $dbh->sql_group_by('id');
-    foreach (@{$dbh->selectall_arrayref($query, undef,
-                                        (GROUP_BLESS))}) {
-        # Merge indirect bless permissions into permission variable.
-        $vars->{'permissions'}{${$_}[0]}{'indirectbless'} = 1;
-    }
+  foreach (@{$dbh->selectall_arrayref($query, undef, (GROUP_BLESS))}) {
+
+    # Merge indirect bless permissions into permission variable.
+    $vars->{'permissions'}{${$_}[0]}{'indirectbless'} = 1;
+  }
 }
 
 sub edit_processing {
-    my $otherUser = shift;
-    my $user = Bugzilla->user;
-    my $template = Bugzilla->template;
+  my $otherUser = shift;
+  my $user      = Bugzilla->user;
+  my $template  = Bugzilla->template;
 
-    $user->in_group('editusers') || $user->can_see_user($otherUser)
-        || ThrowUserError('auth_failure', {reason => "not_visible",
-                                           action => "modify",
-                                           object => "user"});
+  $user->in_group('editusers')
+    || $user->can_see_user($otherUser)
+    || ThrowUserError('auth_failure',
+    {reason => "not_visible", action => "modify", object => "user"});
 
-    userDataToVars($otherUser->id);
-    $vars->{'token'} = issue_session_token('edit_user');
+  userDataToVars($otherUser->id);
+  $vars->{'token'} = issue_session_token('edit_user');
 
-    $template->process('admin/users/edit.html.tmpl', $vars)
-       || ThrowTemplateError($template->error());
+  $template->process('admin/users/edit.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
diff --git a/editvalues.cgi b/editvalues.cgi
index 48775fc52a..4d9f094a48 100755
--- a/editvalues.cgi
+++ b/editvalues.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Util;
@@ -25,12 +25,12 @@ use Bugzilla::Field::Choice;
 ###############
 
 sub display_field_values {
-    my $vars = shift;
-    my $template = Bugzilla->template;
-    $vars->{'values'} = $vars->{'field'}->legal_values;
-    $template->process("admin/fieldvalues/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $vars     = shift;
+  my $template = Bugzilla->template;
+  $vars->{'values'} = $vars->{'field'}->legal_values;
+  $template->process("admin/fieldvalues/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 ######################################################################
@@ -43,42 +43,40 @@ my $user = Bugzilla->login(LOGIN_REQUIRED);
 my $dbh      = Bugzilla->dbh;
 my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # Replace this entry by separate entries in templates when
 # the documentation about legal values becomes bigger.
-$vars->{'doc_section'} = 'administration.html#legal-values';
+$vars->{'doc_section'} = 'administering/field-values.html';
 
 print $cgi->header();
 
 $user->in_group('admin')
-  || ThrowUserError('auth_failure', {group  => "admin",
-                                     action => "edit",
-                                     object => "field_values"});
+  || ThrowUserError('auth_failure',
+  {group => "admin", action => "edit", object => "field_values"});
 
 #
 # often-used variables
 #
-my $action = trim($cgi->param('action')  || '');
-my $token  = $cgi->param('token');
+my $action = trim($cgi->param('action') || '');
+my $token = $cgi->param('token');
 
 #
 # field = '' -> Show nice list of fields
 #
 if (!$cgi->param('field')) {
-    my @field_list =
-        @{ Bugzilla->fields({ is_select => 1, is_abnormal => 0 }) };
+  my @field_list = @{Bugzilla->fields({is_select => 1, is_abnormal => 0})};
 
-    $vars->{'fields'} = \@field_list;
-    $template->process("admin/fieldvalues/select-field.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'fields'} = \@field_list;
+  $template->process("admin/fieldvalues/select-field.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 # At this point, the field must be defined.
-my $field = Bugzilla::Field->check($cgi->param('field'));
+my $field = Bugzilla::Field->check(scalar $cgi->param('field'));
 if (!$field->is_select || $field->is_abnormal) {
-    ThrowUserError('fieldname_invalid', { field => $field });
+  ThrowUserError('fieldname_invalid', {field => $field});
 }
 $vars->{'field'} = $field;
 
@@ -92,34 +90,35 @@ display_field_values($vars) unless $action;
 # (next action will be 'new')
 #
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_field_value');
-    $template->process("admin/fieldvalues/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $vars->{'token'} = issue_session_token('add_field_value');
+  $template->process("admin/fieldvalues/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 #
 # action='new' -> add field value entered in the 'action=add' screen
 #
 if ($action eq 'new') {
-    check_token_data($token, 'add_field_value');
+  check_token_data($token, 'add_field_value');
 
-    my $created_value = Bugzilla::Field::Choice->type($field)->create({
-        value   => scalar $cgi->param('value'), 
-        sortkey => scalar $cgi->param('sortkey'),
-        is_open => scalar $cgi->param('is_open'),
-        visibility_value_id => scalar $cgi->param('visibility_value_id'),
-    });
+  my $created_value = Bugzilla::Field::Choice->type($field)->create({
+    value               => scalar $cgi->param('value'),
+    sortkey             => scalar $cgi->param('sortkey'),
+    is_open             => scalar $cgi->param('is_open'),
+    visibility_value_id => scalar $cgi->param('visibility_value_id'),
+  });
 
-    delete_token($token);
+  delete_token($token);
 
-    $vars->{'message'} = 'field_value_created';
-    $vars->{'value'} = $created_value;
-    display_field_values($vars);
+  $vars->{'message'} = 'field_value_created';
+  $vars->{'value'}   = $created_value;
+  display_field_values($vars);
 }
 
 # After this, we always have a value
-my $value = Bugzilla::Field::Choice->type($field)->check($cgi->param('value'));
+my $value
+  = Bugzilla::Field::Choice->type($field)->check(scalar $cgi->param('value'));
 $vars->{'value'} = $value;
 
 #
@@ -127,16 +126,17 @@ $vars->{'value'} = $value;
 # (next action would be 'delete')
 #
 if ($action eq 'del') {
-    # If the value cannot be deleted, throw an error.
-    if ($value->is_static) {
-        ThrowUserError('fieldvalue_not_deletable', $vars);
-    }
-    $vars->{'token'} = issue_session_token('delete_field_value');
 
-    $template->process("admin/fieldvalues/confirm-delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  # If the value cannot be deleted, throw an error.
+  if ($value->is_static) {
+    ThrowUserError('fieldvalue_not_deletable', $vars);
+  }
+  $vars->{'token'} = issue_session_token('delete_field_value');
 
-    exit;
+  $template->process("admin/fieldvalues/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+
+  exit;
 }
 
 
@@ -144,12 +144,12 @@ if ($action eq 'del') {
 # action='delete' -> really delete the field value
 #
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_field_value');
-    $value->remove_from_db();
-    delete_token($token);
-    $vars->{'message'} = 'field_value_deleted';
-    $vars->{'no_edit_link'} = 1;
-    display_field_values($vars);
+  check_token_data($token, 'delete_field_value');
+  $value->remove_from_db();
+  delete_token($token);
+  $vars->{'message'}      = 'field_value_deleted';
+  $vars->{'no_edit_link'} = 1;
+  display_field_values($vars);
 }
 
 
@@ -158,11 +158,11 @@ if ($action eq 'delete') {
 # (next action would be 'update')
 #
 if ($action eq 'edit') {
-    $vars->{'token'} = issue_session_token('edit_field_value');
-    $template->process("admin/fieldvalues/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $vars->{'token'} = issue_session_token('edit_field_value');
+  $template->process("admin/fieldvalues/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 
@@ -170,21 +170,21 @@ if ($action eq 'edit') {
 # action='update' -> update the field value
 #
 if ($action eq 'update') {
-    check_token_data($token, 'edit_field_value');
-    $vars->{'value_old'} = $value->name;
-    my %params = (
-        name    => scalar $cgi->param('value_new'),
-        sortkey => scalar $cgi->param('sortkey'),
-        visibility_value => scalar $cgi->param('visibility_value_id'),
-    );
-    if ($cgi->should_set('is_active')) {
-        $params{is_active} = $cgi->param('is_active');
-    }
-    $value->set_all(\%params);
-    $vars->{'changes'} = $value->update();
-    delete_token($token);
-    $vars->{'message'} = 'field_value_updated';
-    display_field_values($vars);
+  check_token_data($token, 'edit_field_value');
+  $vars->{'value_old'} = $value->name;
+  my %params = (
+    name             => scalar $cgi->param('value_new'),
+    sortkey          => scalar $cgi->param('sortkey'),
+    visibility_value => scalar $cgi->param('visibility_value_id'),
+  );
+  if ($cgi->should_set('is_active')) {
+    $params{is_active} = $cgi->param('is_active');
+  }
+  $value->set_all(\%params);
+  $vars->{'changes'} = $value->update();
+  delete_token($token);
+  $vars->{'message'} = 'field_value_updated';
+  display_field_values($vars);
 }
 
 # No valid action found
diff --git a/editversions.cgi b/editversions.cgi
index 674a20b7e9..691764f76b 100755
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -19,13 +19,14 @@ use Bugzilla::Error;
 use Bugzilla::Version;
 use Bugzilla::Token;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
+
 # There is only one section about versions in the documentation,
 # so all actions point to the same page.
-$vars->{'doc_section'} = 'administration.html#versions';
+$vars->{'doc_section'} = 'administering/categorization.html#versions';
 
 #
 # Preliminary checks:
@@ -37,9 +38,8 @@ print $cgi->header();
 
 $user->in_group('editcomponents')
   || scalar(@{$user->get_products_by_permission('editcomponents')})
-  || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                     action => "edit",
-                                     object => "versions"});
+  || ThrowUserError("auth_failure",
+  {group => "editcomponents", action => "edit", object => "versions"});
 
 #
 # often used variables
@@ -48,26 +48,27 @@ my $product_name = trim($cgi->param('product') || '');
 my $version_name = trim($cgi->param('version') || '');
 my $action       = trim($cgi->param('action')  || '');
 my $showbugcounts = (defined $cgi->param('showbugcounts'));
-my $token        = $cgi->param('token');
-my $isactive     = $cgi->param('isactive');
+my $token         = $cgi->param('token');
+my $isactive      = $cgi->param('isactive');
 
 #
 # product = '' -> Show nice list of products
 #
 
 unless ($product_name) {
-    my $selectable_products = $user->get_selectable_products;
-    # If the user has editcomponents privs for some products only,
-    # we have to restrict the list of products to display.
-    unless ($user->in_group('editcomponents')) {
-        $selectable_products = $user->get_products_by_permission('editcomponents');
-    }
-    $vars->{'products'} = $selectable_products;
-    $vars->{'showbugcounts'} = $showbugcounts;
-
-    $template->process("admin/versions/select-product.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my $selectable_products = $user->get_selectable_products;
+
+  # If the user has editcomponents privs for some products only,
+  # we have to restrict the list of products to display.
+  unless ($user->in_group('editcomponents')) {
+    $selectable_products = $user->get_products_by_permission('editcomponents');
+  }
+  $vars->{'products'}      = $selectable_products;
+  $vars->{'showbugcounts'} = $showbugcounts;
+
+  $template->process("admin/versions/select-product.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 my $product = $user->check_can_admin_product($product_name);
@@ -77,12 +78,12 @@ my $product = $user->check_can_admin_product($product_name);
 #
 
 unless ($action) {
-    $vars->{'showbugcounts'} = $showbugcounts;
-    $vars->{'product'} = $product;
-    $template->process("admin/versions/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $vars->{'showbugcounts'} = $showbugcounts;
+  $vars->{'product'}       = $product;
+  $template->process("admin/versions/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 #
@@ -92,12 +93,12 @@ unless ($action) {
 #
 
 if ($action eq 'add') {
-    $vars->{'token'} = issue_session_token('add_version');
-    $vars->{'product'} = $product;
-    $template->process("admin/versions/create.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $vars->{'token'}   = issue_session_token('add_version');
+  $vars->{'product'} = $product;
+  $template->process("admin/versions/create.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 #
@@ -105,18 +106,18 @@ if ($action eq 'add') {
 #
 
 if ($action eq 'new') {
-    check_token_data($token, 'add_version');
-    my $version = Bugzilla::Version->create(
-        { value => $version_name, product => $product });
-    delete_token($token);
-
-    $vars->{'message'} = 'version_created';
-    $vars->{'version'} = $version;
-    $vars->{'product'} = $product;
-    $template->process("admin/versions/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-
-    exit;
+  check_token_data($token, 'add_version');
+  my $version
+    = Bugzilla::Version->create({value => $version_name, product => $product});
+  delete_token($token);
+
+  $vars->{'message'} = 'version_created';
+  $vars->{'version'} = $version;
+  $vars->{'product'} = $product;
+  $template->process("admin/versions/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+
+  exit;
 }
 
 #
@@ -126,15 +127,15 @@ if ($action eq 'new') {
 #
 
 if ($action eq 'del') {
-    my $version = Bugzilla::Version->check({ product => $product,
-                                             name    => $version_name });
-    $vars->{'version'} = $version;
-    $vars->{'product'} = $product;
-    $vars->{'token'} = issue_session_token('delete_version');
-    $template->process("admin/versions/confirm-delete.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-
-    exit;
+  my $version
+    = Bugzilla::Version->check({product => $product, name => $version_name});
+  $vars->{'version'} = $version;
+  $vars->{'product'} = $product;
+  $vars->{'token'}   = issue_session_token('delete_version');
+  $template->process("admin/versions/confirm-delete.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+
+  exit;
 }
 
 #
@@ -142,21 +143,21 @@ if ($action eq 'del') {
 #
 
 if ($action eq 'delete') {
-    check_token_data($token, 'delete_version');
-    my $version = Bugzilla::Version->check({ product => $product, 
-                                             name    => $version_name });
-    $version->remove_from_db;
-    delete_token($token);
+  check_token_data($token, 'delete_version');
+  my $version
+    = Bugzilla::Version->check({product => $product, name => $version_name});
+  $version->remove_from_db;
+  delete_token($token);
 
-    $vars->{'message'} = 'version_deleted';
-    $vars->{'version'} = $version;
-    $vars->{'product'} = $product;
-    $vars->{'no_edit_version_link'} = 1;
+  $vars->{'message'}              = 'version_deleted';
+  $vars->{'version'}              = $version;
+  $vars->{'product'}              = $product;
+  $vars->{'no_edit_version_link'} = 1;
 
-    $template->process("admin/versions/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $template->process("admin/versions/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 #
@@ -166,16 +167,16 @@ if ($action eq 'delete') {
 #
 
 if ($action eq 'edit') {
-    my $version = Bugzilla::Version->check({ product => $product,
-                                             name    => $version_name });
-    $vars->{'version'} = $version;
-    $vars->{'product'} = $product;
-    $vars->{'token'} = issue_session_token('edit_version');
+  my $version
+    = Bugzilla::Version->check({product => $product, name => $version_name});
+  $vars->{'version'} = $version;
+  $vars->{'product'} = $product;
+  $vars->{'token'}   = issue_session_token('edit_version');
 
-    $template->process("admin/versions/edit.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $template->process("admin/versions/edit.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 
-    exit;
+  exit;
 }
 
 #
@@ -183,30 +184,27 @@ if ($action eq 'edit') {
 #
 
 if ($action eq 'update') {
-    check_token_data($token, 'edit_version');
-    my $version_old_name = trim($cgi->param('versionold') || '');
-    my $version = Bugzilla::Version->check({ product => $product,
-                                             name   => $version_old_name });
-
-    $dbh->bz_start_transaction();
-
-    $version->set_all({
-        value    =>  $version_name,
-        isactive =>  $isactive
-    });
-    my $changes = $version->update();
-
-    $dbh->bz_commit_transaction();
-    delete_token($token);
-
-    $vars->{'message'} = 'version_updated';
-    $vars->{'version'} = $version;
-    $vars->{'product'} = $product;
-    $vars->{'changes'} = $changes;
-    $template->process("admin/versions/list.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-
-    exit;
+  check_token_data($token, 'edit_version');
+  my $version_old_name = trim($cgi->param('versionold') || '');
+  my $version
+    = Bugzilla::Version->check({product => $product, name => $version_old_name});
+
+  $dbh->bz_start_transaction();
+
+  $version->set_all({value => $version_name, isactive => $isactive});
+  my $changes = $version->update();
+
+  $dbh->bz_commit_transaction();
+  delete_token($token);
+
+  $vars->{'message'} = 'version_updated';
+  $vars->{'version'} = $version;
+  $vars->{'product'} = $product;
+  $vars->{'changes'} = $changes;
+  $template->process("admin/versions/list.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+
+  exit;
 }
 
 # No valid action found
diff --git a/editwhines.cgi b/editwhines.cgi
index b11c44949c..749c926881 100755
--- a/editwhines.cgi
+++ b/editwhines.cgi
@@ -10,11 +10,11 @@
 # Script Initialization
 ################################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -41,9 +41,9 @@ my $template = Bugzilla->template;
 my $vars     = {};
 my $dbh      = Bugzilla->dbh;
 
-my $userid   = $user->id;
-my $token    = $cgi->param('token');
-my $sth; # database statement handle
+my $userid = $user->id;
+my $token  = $cgi->param('token');
+my $sth;    # database statement handle
 
 # $events is a hash ref of Bugzilla::Whine objects keyed by event id,
 # that stores the active user's events.
@@ -66,9 +66,8 @@ my $events = get_events($userid);
 
 # First see if this user may use whines
 $user->in_group('bz_canusewhines')
-  || ThrowUserError("auth_failure", {group  => "bz_canusewhines",
-                                     action => "schedule",
-                                     object => "reports"});
+  || ThrowUserError("auth_failure",
+  {group => "bz_canusewhines", action => "schedule", object => "reports"});
 
 # May this user send mail to other users?
 my $can_mail_others = $user->in_group('bz_canusewhineatothers');
@@ -77,240 +76,245 @@ my $can_mail_others = $user->in_group('bz_canusewhineatothers');
 # removed, then what was altered.
 
 if ($cgi->param('update')) {
-    check_token_data($token, 'edit_whine');
-
-    if ($cgi->param("add_event")) {
-        # we create a new event
-        $sth = $dbh->prepare("INSERT INTO whine_events " .
-                             "(owner_userid) " .
-                             "VALUES (?)");
-        $sth->execute($userid);
-    }
-    else {
-        for my $eventid (keys %{$events}) {
-            # delete an entire event
-            if ($cgi->param("remove_event_$eventid")) {
-                # We need to make sure these belong to the same user,
-                # otherwise we could simply delete whatever matched that ID.
-                #
-                # schedules
-                my $schedules = Bugzilla::Whine::Schedule->match({ eventid => $eventid });
-                $sth = $dbh->prepare("DELETE FROM whine_schedules "
-                    . "WHERE id=?");
-                foreach my $schedule (@$schedules) {                    
-                    $sth->execute($schedule->id);
-                }
-
-                # queries
-                $sth = $dbh->prepare("SELECT whine_queries.id " .
-                                     "FROM whine_queries " .
-                                     "LEFT JOIN whine_events " .
-                                     "ON whine_events.id = " .
-                                     "whine_queries.eventid " .
-                                     "WHERE whine_events.id = ? " .
-                                     "AND whine_events.owner_userid = ?");
-                $sth->execute($eventid, $userid);
-                my @ids = @{$sth->fetchall_arrayref};
-                $sth = $dbh->prepare("DELETE FROM whine_queries " .
-                                     "WHERE id=?");
-                for (@ids) {
-                    my $delete_id = $_->[0];
-                    $sth->execute($delete_id);
-                }
-
-                # events
-                $sth = $dbh->prepare("DELETE FROM whine_events " .
-                                     "WHERE id=? AND owner_userid=?");
-                $sth->execute($eventid, $userid);
-            }
-            else {
-                # check the subject, body and mailifnobugs for changes
-                my $subject = ($cgi->param("event_${eventid}_subject") or '');
-                my $body    = ($cgi->param("event_${eventid}_body")    or '');
-                my $mailifnobugs = $cgi->param("event_${eventid}_mailifnobugs") ? 1 : 0;
-
-                trick_taint($subject) if $subject;
-                trick_taint($body)    if $body;
-
-                if ( ($subject ne $events->{$eventid}->subject)
-                  || ($mailifnobugs != $events->{$eventid}->mail_if_no_bugs)
-                  || ($body    ne $events->{$eventid}->body) ) {
-
-                    $sth = $dbh->prepare("UPDATE whine_events " .
-                                         "SET subject=?, body=?, mailifnobugs=? " .
-                                         "WHERE id=?");
-                    $sth->execute($subject, $body, $mailifnobugs, $eventid);
-                }
-
-                # add a schedule
-                if ($cgi->param("add_schedule_$eventid")) {
-                    # the schedule table must be locked before altering
-                    $sth = $dbh->prepare("INSERT INTO whine_schedules " .
-                                         "(eventid, mailto_type, mailto, " .
-                                         "run_day, run_time) " .
-                                         "VALUES (?, ?, ?, 'Sun', 2)");
-                    $sth->execute($eventid, MAILTO_USER, $userid);
-                }
-                # add a query
-                elsif ($cgi->param("add_query_$eventid")) {
-                    $sth = $dbh->prepare("INSERT INTO whine_queries "
-                        . "(eventid) "
-                        . "VALUES (?)");
-                    $sth->execute($eventid);
-                }
-            }
+  check_token_data($token, 'edit_whine');
+
+  if ($cgi->param("add_event")) {
+
+    # we create a new event
+    $sth = $dbh->prepare(
+      "INSERT INTO whine_events " . "(owner_userid) " . "VALUES (?)");
+    $sth->execute($userid);
+  }
+  else {
+    for my $eventid (keys %{$events}) {
+
+      # delete an entire event
+      if ($cgi->param("remove_event_$eventid")) {
+
+        # We need to make sure these belong to the same user,
+        # otherwise we could simply delete whatever matched that ID.
+        #
+        # schedules
+        my $schedules = Bugzilla::Whine::Schedule->match({eventid => $eventid});
+        $sth = $dbh->prepare("DELETE FROM whine_schedules " . "WHERE id=?");
+        foreach my $schedule (@$schedules) {
+          $sth->execute($schedule->id);
+        }
+
+        # queries
+        $sth
+          = $dbh->prepare("SELECT whine_queries.id "
+            . "FROM whine_queries "
+            . "LEFT JOIN whine_events "
+            . "ON whine_events.id = "
+            . "whine_queries.eventid "
+            . "WHERE whine_events.id = ? "
+            . "AND whine_events.owner_userid = ?");
+        $sth->execute($eventid, $userid);
+        my @ids = @{$sth->fetchall_arrayref};
+        $sth = $dbh->prepare("DELETE FROM whine_queries " . "WHERE id=?");
+        for (@ids) {
+          my $delete_id = $_->[0];
+          $sth->execute($delete_id);
+        }
 
-            # now check all of the schedules and queries to see if they need
-            # to be altered or deleted
+        # events
+        $sth = $dbh->prepare(
+          "DELETE FROM whine_events " . "WHERE id=? AND owner_userid=?");
+        $sth->execute($eventid, $userid);
+      }
+      else {
+        # check the subject, body and mailifnobugs for changes
+        my $subject      = $cgi->param("event_${eventid}_subject") // '';
+        my $body         = $cgi->param("event_${eventid}_body") // '';
+        my $mailifnobugs = $cgi->param("event_${eventid}_mailifnobugs") ? 1 : 0;
+
+        trick_taint($subject) if $subject;
+        trick_taint($body)    if $body;
+
+        if ( ($subject ne $events->{$eventid}->subject)
+          || ($mailifnobugs != $events->{$eventid}->mail_if_no_bugs)
+          || ($body ne $events->{$eventid}->body))
+        {
+
+          $sth
+            = $dbh->prepare("UPDATE whine_events "
+              . "SET subject=?, body=?, mailifnobugs=? "
+              . "WHERE id=?");
+          $sth->execute($subject, $body, $mailifnobugs, $eventid);
+        }
 
-            # Check schedules for changes
-            my $schedules = Bugzilla::Whine::Schedule->match({ eventid => $eventid });
-            my @scheduleids = ();
-            foreach my $schedule (@$schedules) {
-                push @scheduleids, $schedule->id;
-            }
+        # add a schedule
+        if ($cgi->param("add_schedule_$eventid")) {
 
-            # we need to double-check all of the user IDs in mailto to make
-            # sure they exist
-            my $arglist = {};   # args for match_field
-            for my $sid (@scheduleids) {
-                if ($cgi->param("mailto_type_$sid") == MAILTO_USER) {
-                    $arglist->{"mailto_$sid"} = {
-                        'type' => 'single',
-                    };
-                }
-            }
-            if (scalar %{$arglist}) {
-                Bugzilla::User::match_field($arglist);
-            }
+          # the schedule table must be locked before altering
+          $sth
+            = $dbh->prepare("INSERT INTO whine_schedules "
+              . "(eventid, mailto_type, mailto, "
+              . "run_day, run_time) "
+              . "VALUES (?, ?, ?, 'Sun', 2)");
+          $sth->execute($eventid, MAILTO_USER, $userid);
+        }
 
-            for my $sid (@scheduleids) {
-                if ($cgi->param("remove_schedule_$sid")) {
-                    # having the assignee id in here is a security failsafe
-                    $sth = $dbh->prepare("SELECT whine_schedules.id " .
-                                         "FROM whine_schedules " .
-                                         "LEFT JOIN whine_events " .
-                                         "ON whine_events.id = " .
-                                         "whine_schedules.eventid " .
-                                         "WHERE whine_events.owner_userid=? " .
-                                         "AND whine_schedules.id =?");
-                    $sth->execute($userid, $sid);
-
-                    my @ids = @{$sth->fetchall_arrayref};
-                    for (@ids) {
-                        $sth = $dbh->prepare("DELETE FROM whine_schedules " .
-                                             "WHERE id=?");
-                        $sth->execute($_->[0]);
-                    }
-                }
-                else {
-                    my $o_day         = $cgi->param("orig_day_$sid") || '';
-                    my $day           = $cgi->param("day_$sid") || '';
-                    my $o_time        = $cgi->param("orig_time_$sid") || 0;
-                    my $time          = $cgi->param("time_$sid") || 0;
-                    my $o_mailto      = $cgi->param("orig_mailto_$sid") || '';
-                    my $mailto        = $cgi->param("mailto_$sid") || '';
-                    my $o_mailto_type = $cgi->param("orig_mailto_type_$sid") || 0;
-                    my $mailto_type   = $cgi->param("mailto_type_$sid") || 0;
-
-                    my $mailto_id = $userid;
-
-                    # get an id for the mailto address
-                    if ($can_mail_others && $mailto) {
-                        if ($mailto_type == MAILTO_USER) {
-                            $mailto_id = login_to_id($mailto);
-                        }
-                        elsif ($mailto_type == MAILTO_GROUP) {
-                            # The group name is used in a placeholder.
-                            trick_taint($mailto);
-                            $mailto_id = Bugzilla::Group::ValidateGroupName($mailto, ($user))
-                                           || ThrowUserError('invalid_group_name', { name => $mailto });
-                        }
-                        else {
-                            # bad value, so it will just mail to the whine
-                            # owner.  $mailto_id was already set above.
-                            $mailto_type = MAILTO_USER;
-                        }
-                    }
-
-                    detaint_natural($mailto_type);
-
-                    if ( ($o_day  ne $day) ||
-                         ($o_time ne $time) ||
-                         ($o_mailto ne $mailto) ||
-                         ($o_mailto_type != $mailto_type) ){
-
-                        trick_taint($day);
-                        trick_taint($time);
-
-                        # the schedule table must be locked
-                        $sth = $dbh->prepare("UPDATE whine_schedules " .
-                                             "SET run_day=?, run_time=?, " .
-                                             "mailto_type=?, mailto=?, " .
-                                             "run_next=NULL " .
-                                             "WHERE id=?");
-                        $sth->execute($day, $time, $mailto_type,
-                                      $mailto_id, $sid);
-                    }
-                }
+        # add a query
+        elsif ($cgi->param("add_query_$eventid")) {
+          $sth
+            = $dbh->prepare("INSERT INTO whine_queries " . "(eventid) " . "VALUES (?)");
+          $sth->execute($eventid);
+        }
+      }
+
+      # now check all of the schedules and queries to see if they need
+      # to be altered or deleted
+
+      # Check schedules for changes
+      my $schedules = Bugzilla::Whine::Schedule->match({eventid => $eventid});
+      my @scheduleids = ();
+      foreach my $schedule (@$schedules) {
+        push @scheduleids, $schedule->id;
+      }
+
+      # we need to double-check all of the user IDs in mailto to make
+      # sure they exist
+      my $arglist = {};    # args for match_field
+      for my $sid (@scheduleids) {
+        if ($cgi->param("mailto_type_$sid") == MAILTO_USER) {
+          $arglist->{"mailto_$sid"} = {'type' => 'single',};
+        }
+      }
+      if (scalar %{$arglist}) {
+        Bugzilla::User::match_field($arglist);
+      }
+
+      for my $sid (@scheduleids) {
+        if ($cgi->param("remove_schedule_$sid")) {
+
+          # having the assignee id in here is a security failsafe
+          $sth
+            = $dbh->prepare("SELECT whine_schedules.id "
+              . "FROM whine_schedules "
+              . "LEFT JOIN whine_events "
+              . "ON whine_events.id = "
+              . "whine_schedules.eventid "
+              . "WHERE whine_events.owner_userid=? "
+              . "AND whine_schedules.id =?");
+          $sth->execute($userid, $sid);
+
+          my @ids = @{$sth->fetchall_arrayref};
+          for (@ids) {
+            $sth = $dbh->prepare("DELETE FROM whine_schedules " . "WHERE id=?");
+            $sth->execute($_->[0]);
+          }
+        }
+        else {
+          my $o_day         = $cgi->param("orig_day_$sid")         || '';
+          my $day           = $cgi->param("day_$sid")              || '';
+          my $o_time        = $cgi->param("orig_time_$sid")        || 0;
+          my $time          = $cgi->param("time_$sid")             || 0;
+          my $o_mailto      = $cgi->param("orig_mailto_$sid")      || '';
+          my $mailto        = $cgi->param("mailto_$sid")           || '';
+          my $o_mailto_type = $cgi->param("orig_mailto_type_$sid") || 0;
+          my $mailto_type   = $cgi->param("mailto_type_$sid")      || 0;
+
+          my $mailto_id = $userid;
+
+          # get an id for the mailto address
+          if ($can_mail_others && $mailto) {
+            if ($mailto_type == MAILTO_USER) {
+              $mailto_id = login_to_id($mailto);
             }
+            elsif ($mailto_type == MAILTO_GROUP) {
 
-            # Check queries for changes
-            my $queries = Bugzilla::Whine::Query->match({ eventid => $eventid });
-            for my $query (@$queries) {
-                my $qid = $query->id;
-                if ($cgi->param("remove_query_$qid")) {
-
-                    $sth = $dbh->prepare("SELECT whine_queries.id " .
-                                         "FROM whine_queries " .
-                                         "LEFT JOIN whine_events " .
-                                         "ON whine_events.id = " .
-                                         "whine_queries.eventid " .
-                                         "WHERE whine_events.owner_userid=? " .
-                                         "AND whine_queries.id =?");
-                    $sth->execute($userid, $qid);
-
-                    for (@{$sth->fetchall_arrayref}) {
-                        $sth = $dbh->prepare("DELETE FROM whine_queries " .
-                                             "WHERE id=?");
-                        $sth->execute($_->[0]);
-                    }
-                }
-                else {
-                    my $o_sort      = $cgi->param("orig_query_sort_$qid") || 0;
-                    my $sort        = $cgi->param("query_sort_$qid") || 0;
-                    my $o_queryname = $cgi->param("orig_query_name_$qid") || '';
-                    my $queryname   = $cgi->param("query_name_$qid") || '';
-                    my $o_title     = $cgi->param("orig_query_title_$qid") || '';
-                    my $title       = $cgi->param("query_title_$qid") || '';
-                    my $o_onemailperbug =
-                            $cgi->param("orig_query_onemailperbug_$qid") || 0;
-                    my $onemailperbug   =
-                            $cgi->param("query_onemailperbug_$qid") ? 1 : 0;
-
-                    if ( ($o_sort != $sort) ||
-                         ($o_queryname ne $queryname) ||
-                         ($o_onemailperbug != $onemailperbug) ||
-                         ($o_title ne $title) ){
-
-                        detaint_natural($sort);
-                        trick_taint($queryname);
-                        trick_taint($title);
-
-                        $sth = $dbh->prepare("UPDATE whine_queries " .
-                                             "SET sortkey=?, " .
-                                             "query_name=?, " .
-                                             "title=?, " .
-                                             "onemailperbug=? " .
-                                             "WHERE id=?");
-                        $sth->execute($sort, $queryname, $title,
-                                      $onemailperbug, $qid);
-                    }
-                }
+              # The group name is used in a placeholder.
+              trick_taint($mailto);
+              $mailto_id = Bugzilla::Group::ValidateGroupName($mailto, ($user))
+                || ThrowUserError('invalid_group_name', {name => $mailto});
             }
+            else {
+              # bad value, so it will just mail to the whine
+              # owner.  $mailto_id was already set above.
+              $mailto_type = MAILTO_USER;
+            }
+          }
+
+          detaint_natural($mailto_type);
+
+          if ( ($o_day ne $day)
+            || ($o_time ne $time)
+            || ($o_mailto ne $mailto)
+            || ($o_mailto_type != $mailto_type))
+          {
+
+            trick_taint($day);
+            trick_taint($time);
+
+            # the schedule table must be locked
+            $sth
+              = $dbh->prepare("UPDATE whine_schedules "
+                . "SET run_day=?, run_time=?, "
+                . "mailto_type=?, mailto=?, "
+                . "run_next=NULL "
+                . "WHERE id=?");
+            $sth->execute($day, $time, $mailto_type, $mailto_id, $sid);
+          }
+        }
+      }
+
+      # Check queries for changes
+      my $queries = Bugzilla::Whine::Query->match({eventid => $eventid});
+      for my $query (@$queries) {
+        my $qid = $query->id;
+        if ($cgi->param("remove_query_$qid")) {
+
+          $sth
+            = $dbh->prepare("SELECT whine_queries.id "
+              . "FROM whine_queries "
+              . "LEFT JOIN whine_events "
+              . "ON whine_events.id = "
+              . "whine_queries.eventid "
+              . "WHERE whine_events.owner_userid=? "
+              . "AND whine_queries.id =?");
+          $sth->execute($userid, $qid);
+
+          for (@{$sth->fetchall_arrayref}) {
+            $sth = $dbh->prepare("DELETE FROM whine_queries " . "WHERE id=?");
+            $sth->execute($_->[0]);
+          }
         }
+        else {
+          my $o_sort          = $cgi->param("orig_query_sort_$qid")          || 0;
+          my $sort            = $cgi->param("query_sort_$qid")               || 0;
+          my $o_queryname     = $cgi->param("orig_query_name_$qid")          || '';
+          my $queryname       = $cgi->param("query_name_$qid")               || '';
+          my $o_title         = $cgi->param("orig_query_title_$qid")         || '';
+          my $title           = $cgi->param("query_title_$qid")              || '';
+          my $o_onemailperbug = $cgi->param("orig_query_onemailperbug_$qid") || 0;
+          my $onemailperbug = $cgi->param("query_onemailperbug_$qid") ? 1 : 0;
+
+          if ( ($o_sort != $sort)
+            || ($o_queryname ne $queryname)
+            || ($o_onemailperbug != $onemailperbug)
+            || ($o_title ne $title))
+          {
+
+            detaint_natural($sort);
+            trick_taint($queryname);
+            trick_taint($title);
+
+            $sth
+              = $dbh->prepare("UPDATE whine_queries "
+                . "SET sortkey=?, "
+                . "query_name=?, "
+                . "title=?, "
+                . "onemailperbug=? "
+                . "WHERE id=?");
+            $sth->execute($sort, $queryname, $title, $onemailperbug, $qid);
+          }
+        }
+      }
     }
-    delete_token($token);
+  }
+  delete_token($token);
 }
 
 $vars->{'mail_others'} = $can_mail_others;
@@ -336,44 +340,43 @@ $events = get_events($userid);
 #
 # build the whine list by event id
 for my $event_id (keys %{$events}) {
-    $events->{$event_id}->{'schedule'} = [];
-    $events->{$event_id}->{'queries'} = [];
-
-    # schedules
-    my $schedules = Bugzilla::Whine::Schedule->match({ eventid => $event_id });
-    foreach my $schedule (@$schedules) {
-        my $mailto_type = $schedule->mailto_is_group ? MAILTO_GROUP 
-                                                     : MAILTO_USER;
-        my $mailto = '';
-        if ($mailto_type == MAILTO_USER) {
-            $mailto = $schedule->mailto->login;
-        }
-        elsif ($mailto_type == MAILTO_GROUP) {
-            $mailto = $schedule->mailto->name;
-        }
-
-        push @{$events->{$event_id}->{'schedule'}},
-             {
-                 'day'         => $schedule->run_day,
-                 'time'        => $schedule->run_time,
-                 'mailto_type' => $mailto_type,
-                 'mailto'      => $mailto,
-                 'id'          => $schedule->id,
-             };
+  $events->{$event_id}->{'schedule'} = [];
+  $events->{$event_id}->{'queries'}  = [];
+
+  # schedules
+  my $schedules = Bugzilla::Whine::Schedule->match({eventid => $event_id});
+  foreach my $schedule (@$schedules) {
+    my $mailto_type = $schedule->mailto_is_group ? MAILTO_GROUP : MAILTO_USER;
+    my $mailto = '';
+    if ($mailto_type == MAILTO_USER) {
+      $mailto = $schedule->mailto->login;
     }
-
-    # queries
-    my $queries = Bugzilla::Whine::Query->match({ eventid => $event_id });
-    for my $query (@$queries) {
-        push @{$events->{$event_id}->{'queries'}}, 
-             {
-                 'name'          => $query->name,
-                 'title'         => $query->title,
-                 'sort'          => $query->sortkey,
-                 'id'            => $query->id,
-                 'onemailperbug' => $query->one_email_per_bug,
-             };
+    elsif ($mailto_type == MAILTO_GROUP) {
+      $mailto = $schedule->mailto->name;
     }
+
+    push @{$events->{$event_id}->{'schedule'}},
+      {
+      'day'         => $schedule->run_day,
+      'time'        => $schedule->run_time,
+      'mailto_type' => $mailto_type,
+      'mailto'      => $mailto,
+      'id'          => $schedule->id,
+      };
+  }
+
+  # queries
+  my $queries = Bugzilla::Whine::Query->match({eventid => $event_id});
+  for my $query (@$queries) {
+    push @{$events->{$event_id}->{'queries'}},
+      {
+      'name'          => $query->name,
+      'title'         => $query->title,
+      'sort'          => $query->sortkey,
+      'id'            => $query->id,
+      'onemailperbug' => $query->one_email_per_bug,
+      };
+  }
 }
 
 $vars->{'events'} = $events;
@@ -384,10 +387,11 @@ $sth->execute($userid);
 
 $vars->{'available_queries'} = [];
 while (my ($query) = $sth->fetchrow_array) {
-    push @{$vars->{'available_queries'}}, $query;
+  push @{$vars->{'available_queries'}}, $query;
 }
 $vars->{'token'} = issue_session_token('edit_whine');
-$vars->{'local_timezone'} = Bugzilla->local_timezone->short_name_for_datetime(DateTime->now());
+$vars->{'local_timezone'}
+  = Bugzilla->local_timezone->short_name_for_datetime(DateTime->now());
 
 $template->process("whine/schedule.html.tmpl", $vars)
   || ThrowTemplateError($template->error());
@@ -395,9 +399,9 @@ $template->process("whine/schedule.html.tmpl", $vars)
 # get_events takes a userid and returns a hash of
 # Bugzilla::Whine objects keyed by event ID.
 sub get_events {
-    my $userid = shift;
-    my $event_rows = Bugzilla::Whine->match({ owner_userid => $userid });
-    my %events = map { $_->{id} => $_ } @$event_rows;
+  my $userid     = shift;
+  my $event_rows = Bugzilla::Whine->match({owner_userid => $userid});
+  my %events     = map { $_->{id} => $_ } @$event_rows;
 
-    return \%events;
+  return \%events;
 }
diff --git a/editworkflow.cgi b/editworkflow.cgi
index 71b14af778..46f4180311 100755
--- a/editworkflow.cgi
+++ b/editworkflow.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -18,123 +18,134 @@ use Bugzilla::Error;
 use Bugzilla::Token;
 use Bugzilla::Status;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi  = Bugzilla->cgi;
+my $dbh  = Bugzilla->dbh;
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 print $cgi->header();
 
 $user->in_group('admin')
-  || ThrowUserError('auth_failure', {group  => 'admin',
-                                     action => 'modify',
-                                     object => 'workflow'});
+  || ThrowUserError('auth_failure',
+  {group => 'admin', action => 'modify', object => 'workflow'});
 
 my $action = $cgi->param('action') || 'edit';
 my $token = $cgi->param('token');
 
 sub get_workflow {
-    my $dbh = Bugzilla->dbh;
-    my $workflow = $dbh->selectall_arrayref('SELECT old_status, new_status, require_comment
-                                             FROM status_workflow');
-    my %workflow;
-    foreach my $row (@$workflow) {
-        my ($old, $new, $type) = @$row;
-        $workflow{$old || 0}{$new} = $type;
-    }
-    return \%workflow;
+  my $dbh      = Bugzilla->dbh;
+  my $workflow = $dbh->selectall_arrayref(
+    'SELECT old_status, new_status, require_comment
+                                             FROM status_workflow'
+  );
+  my %workflow;
+  foreach my $row (@$workflow) {
+    my ($old, $new, $type) = @$row;
+    $workflow{$old || 0}{$new} = $type;
+  }
+  return \%workflow;
 }
 
 sub load_template {
-    my ($filename, $message) = @_;
-    my $template = Bugzilla->template;
-    my $vars = {};
-
-    $vars->{'statuses'} = [Bugzilla::Status->get_all];
-    $vars->{'workflow'} = get_workflow();
-    $vars->{'token'} = issue_session_token("workflow_$filename");
-    $vars->{'message'} = $message;
-
-    $template->process("admin/workflow/$filename.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  my ($filename, $message) = @_;
+  my $template = Bugzilla->template;
+  my $vars     = {};
+
+  $vars->{'statuses'} = [Bugzilla::Status->get_all];
+  $vars->{'workflow'} = get_workflow();
+  $vars->{'token'}    = issue_session_token("workflow_$filename");
+  $vars->{'message'}  = $message;
+
+  $template->process("admin/workflow/$filename.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 if ($action eq 'edit') {
-    load_template('edit');
+  load_template('edit');
 }
 elsif ($action eq 'update') {
-    check_token_data($token, 'workflow_edit');
-    my $statuses = [Bugzilla::Status->get_all];
-    my $workflow = get_workflow();
-
-    my $sth_insert = $dbh->prepare('INSERT INTO status_workflow (old_status, new_status)
-                                    VALUES (?, ?)');
-    my $sth_delete = $dbh->prepare('DELETE FROM status_workflow
-                                    WHERE old_status = ? AND new_status = ?');
-    my $sth_delnul = $dbh->prepare('DELETE FROM status_workflow
-                                    WHERE old_status IS NULL AND new_status = ?');
-
-    # Part 1: Initial bug statuses.
-    foreach my $new (@$statuses) {
-        if ($cgi->param('w_0_' . $new->id)) {
-            $sth_insert->execute(undef, $new->id)
-              unless defined $workflow->{0}->{$new->id};
-        }
-        else {
-            $sth_delnul->execute($new->id);
-        }
+  check_token_data($token, 'workflow_edit');
+  my $statuses = [Bugzilla::Status->get_all];
+  my $workflow = get_workflow();
+
+  my $sth_insert = $dbh->prepare(
+    'INSERT INTO status_workflow (old_status, new_status)
+                                    VALUES (?, ?)'
+  );
+  my $sth_delete = $dbh->prepare(
+    'DELETE FROM status_workflow
+                                    WHERE old_status = ? AND new_status = ?'
+  );
+  my $sth_delnul = $dbh->prepare(
+    'DELETE FROM status_workflow
+                                    WHERE old_status IS NULL AND new_status = ?'
+  );
+
+  # Part 1: Initial bug statuses.
+  foreach my $new (@$statuses) {
+    if ($cgi->param('w_0_' . $new->id)) {
+      $sth_insert->execute(undef, $new->id) unless defined $workflow->{0}->{$new->id};
     }
+    else {
+      $sth_delnul->execute($new->id);
+    }
+  }
 
-    # Part 2: Bug status changes.
-    foreach my $old (@$statuses) {
-        foreach my $new (@$statuses) {
-            next if $old->id == $new->id;
-
-            # All transitions to 'duplicate_or_move_bug_status' must be valid.
-            if ($cgi->param('w_' . $old->id . '_' . $new->id)
-                || ($new->name eq Bugzilla->params->{'duplicate_or_move_bug_status'}))
-            {
-                $sth_insert->execute($old->id, $new->id)
-                  unless defined $workflow->{$old->id}->{$new->id};
-            }
-            else {
-                $sth_delete->execute($old->id, $new->id);
-            }
-        }
+  # Part 2: Bug status changes.
+  foreach my $old (@$statuses) {
+    foreach my $new (@$statuses) {
+      next if $old->id == $new->id;
+
+      # All transitions to 'duplicate_or_move_bug_status' must be valid.
+      if ($cgi->param('w_' . $old->id . '_' . $new->id)
+        || ($new->name eq Bugzilla->params->{'duplicate_or_move_bug_status'}))
+      {
+        $sth_insert->execute($old->id, $new->id)
+          unless defined $workflow->{$old->id}->{$new->id};
+      }
+      else {
+        $sth_delete->execute($old->id, $new->id);
+      }
     }
-    delete_token($token);
-    load_template('edit', 'workflow_updated');
+  }
+  delete_token($token);
+  load_template('edit', 'workflow_updated');
 }
 elsif ($action eq 'edit_comment') {
-    load_template('comment');
+  load_template('comment');
 }
 elsif ($action eq 'update_comment') {
-    check_token_data($token, 'workflow_comment');
-    my $workflow = get_workflow();
-
-    my $sth_update = $dbh->prepare('UPDATE status_workflow SET require_comment = ?
-                                    WHERE old_status = ? AND new_status = ?');
-    my $sth_updnul = $dbh->prepare('UPDATE status_workflow SET require_comment = ?
-                                    WHERE old_status IS NULL AND new_status = ?');
-
-    foreach my $old (keys %$workflow) {
-        # Hashes cannot have undef as a key, so we use 0. But the DB
-        # must store undef, for referential integrity.
-        my $old_id_for_db = $old || undef;
-        foreach my $new (keys %{$workflow->{$old}}) {
-            my $comment_required = $cgi->param("c_${old}_$new") ? 1 : 0;
-            next if ($workflow->{$old}->{$new} == $comment_required);
-            if ($old_id_for_db) {
-                $sth_update->execute($comment_required, $old_id_for_db, $new);
-            }
-            else {
-                $sth_updnul->execute($comment_required, $new);
-            }
-        }
+  check_token_data($token, 'workflow_comment');
+  my $workflow = get_workflow();
+
+  my $sth_update = $dbh->prepare(
+    'UPDATE status_workflow SET require_comment = ?
+                                    WHERE old_status = ? AND new_status = ?'
+  );
+  my $sth_updnul = $dbh->prepare(
+    'UPDATE status_workflow SET require_comment = ?
+                                    WHERE old_status IS NULL AND new_status = ?'
+  );
+
+  foreach my $old (keys %$workflow) {
+
+    # Hashes cannot have undef as a key, so we use 0. But the DB
+    # must store undef, for referential integrity.
+    my $old_id_for_db = $old || undef;
+    foreach my $new (keys %{$workflow->{$old}}) {
+      my $comment_required = $cgi->param("c_${old}_$new") ? 1 : 0;
+      next if ($workflow->{$old}->{$new} == $comment_required);
+      if ($old_id_for_db) {
+        $sth_update->execute($comment_required, $old_id_for_db, $new);
+      }
+      else {
+        $sth_updnul->execute($comment_required, $new);
+      }
     }
-    delete_token($token);
-    load_template('comment', 'workflow_updated');
+  }
+  delete_token($token);
+  load_template('comment', 'workflow_updated');
 }
 else {
-    ThrowUserError('unknown_action', {action => $action});
+  ThrowUserError('unknown_action', {action => $action});
 }
diff --git a/email_in.pl b/email_in.pl
index ae4c42bde5..c9b417ad25 100755
--- a/email_in.pl
+++ b/email_in.pl
@@ -6,7 +6,7 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -14,13 +14,14 @@
 # run from this one so that it can find its modules.
 use Cwd qw(abs_path);
 use File::Basename qw(dirname);
+
 BEGIN {
-    # Untaint the abs_path.
-    my ($a) = abs_path($0) =~ /^(.*)$/;
-    chdir dirname($a);
+  # Untaint the abs_path.
+  my ($a) = abs_path($0) =~ /^(.*)$/;
+  chdir dirname($a);
 }
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Data::Dumper;
 use Email::Address;
@@ -57,10 +58,10 @@ BEGIN
 # These MIME types represent a "body" of an email if they have an
 # "inline" Content-Disposition (or no content disposition).
 use constant BODY_TYPES => qw(
-    text/plain
-    text/html
-    application/xhtml+xml
-    multipart/alternative
+  text/plain
+  text/html
+  application/xhtml+xml
+  multipart/alternative
 );
 
 # $input_email is a global so that it can be used in die_handler.
@@ -71,239 +72,249 @@ BEGIN
 ####################
 
 sub parse_mail {
-    my ($mail_text) = @_;
-    debug_print('Parsing Email');
-    $input_email = Email::MIME->new($mail_text);
-    
-    my %fields = %{ $switch{'default'} || {} };
-    Bugzilla::Hook::process('email_in_before_parse', { mail => $input_email,
-                                                       fields => \%fields });
-
-    my $summary = $input_email->header('Subject');
-    if ($summary =~ /\[\S+ (\d+)\](.*)/i) {
-        $fields{'bug_id'} = $1;
-        $summary = trim($2);
+  my ($mail_text) = @_;
+  debug_print('Parsing Email');
+  $input_email = Email::MIME->new($mail_text);
+
+  my %fields = %{$switch{'default'} || {}};
+  Bugzilla::Hook::process('email_in_before_parse',
+    {mail => $input_email, fields => \%fields});
+
+  my $summary = $input_email->header('Subject');
+  if ($summary =~ /\[\S+ (\d+)\](.*)/i) {
+    $fields{'bug_id'} = $1;
+    $summary = trim($2);
+  }
+
+  # Ignore automatic replies.
+  # XXX - Improve the way to detect such subjects in different languages.
+  my $auto_submitted = $input_email->header('Auto-Submitted') || '';
+  if ($summary =~ /out of( the)? office/i || $auto_submitted eq 'auto-replied') {
+    debug_print("Automatic reply detected: $summary");
+    exit;
+  }
+
+  my ($body, $attachments) = get_body_and_attachments($input_email);
+
+  debug_print("Body:\n" . $body, 3);
+
+  $body = remove_leading_blank_lines($body);
+  my @body_lines = split(/\r?\n/s, $body);
+
+  # If there are fields specified.
+  if ($body =~ /^\s*@/s) {
+    my $current_field;
+    while (my $line = shift @body_lines) {
+
+      # If the sig is starting, we want to keep this in the
+      # @body_lines so that we don't keep the sig as part of the
+      # comment down below.
+      if ($line eq SIGNATURE_DELIMITER) {
+        unshift(@body_lines, $line);
+        last;
+      }
+
+      # Otherwise, we stop parsing fields on the first blank line.
+      $line = trim($line);
+      last if !$line;
+      if ($line =~ /^\@(\w+)\s*(?:=|\s|$)\s*(.*)\s*/) {
+        $current_field = lc($1);
+        $fields{$current_field} = $2;
+      }
+      else {
+        $fields{$current_field} .= " $line";
+      }
     }
-
-    # Ignore automatic replies.
-    # XXX - Improve the way to detect such subjects in different languages.
-    my $auto_submitted = $input_email->header('Auto-Submitted') || '';
-    if ($summary =~ /out of( the)? office/i || $auto_submitted eq 'auto-replied') {
-        debug_print("Automatic reply detected: $summary");
-        exit;
+  }
+
+  %fields = %{Bugzilla::Bug::map_fields(\%fields)};
+
+  my ($reporter) = Email::Address->parse($input_email->header('From'));
+  $fields{'reporter'} = $reporter->address;
+
+  # The summary line only affects us if we're doing a post_bug.
+  # We have to check it down here because there might have been
+  # a bug_id specified in the body of the email.
+  if (!$fields{'bug_id'} && !$fields{'short_desc'}) {
+    $fields{'short_desc'} = $summary;
+  }
+
+  # The Importance/X-Priority headers are only used when creating a new bug.
+  # 1) If somebody specifies a priority, use it.
+  # 2) If there is an Importance or X-Priority header, use it as
+  #    something that is relative to the default priority.
+  #    If the value is High or 1, increase the priority by 1.
+  #    If the value is Low or 5, decrease the priority by 1.
+  # 3) Otherwise, use the default priority.
+  # Note: this will only work if the 'letsubmitterchoosepriority'
+  # parameter is enabled.
+  my $importance
+    = $input_email->header('Importance') || $input_email->header('X-Priority');
+  if (!$fields{'bug_id'} && !$fields{'priority'} && $importance) {
+    my @legal_priorities = @{get_legal_field_values('priority')};
+    my $i
+      = firstidx { $_ eq Bugzilla->params->{'defaultpriority'} } @legal_priorities;
+    if ($importance =~ /(high|[12])/i) {
+      $i-- unless $i == 0;
     }
-
-    my ($body, $attachments) = get_body_and_attachments($input_email);
-
-    debug_print("Body:\n" . $body, 3);
-
-    $body = remove_leading_blank_lines($body);
-    my @body_lines = split(/\r?\n/s, $body);
-
-    # If there are fields specified.
-    if ($body =~ /^\s*@/s) {
-        my $current_field;
-        while (my $line = shift @body_lines) {
-            # If the sig is starting, we want to keep this in the 
-            # @body_lines so that we don't keep the sig as part of the 
-            # comment down below.
-            if ($line eq SIGNATURE_DELIMITER) {
-                unshift(@body_lines, $line);
-                last;
-            }
-            # Otherwise, we stop parsing fields on the first blank line.
-            $line = trim($line);
-            last if !$line;
-            if ($line =~ /^\@(\w+)\s*(?:=|\s|$)\s*(.*)\s*/) {
-                $current_field = lc($1);
-                $fields{$current_field} = $2;
-            }
-            else {
-                $fields{$current_field} .= " $line";
-            }
-        }
+    elsif ($importance =~ /(low|[45])/i) {
+      $i++ unless $i == $#legal_priorities;
     }
+    $fields{'priority'} = $legal_priorities[$i];
+  }
 
-    %fields = %{ Bugzilla::Bug::map_fields(\%fields) };
+  my $comment = '';
 
-    my ($reporter) = Email::Address->parse($input_email->header('From'));
-    $fields{'reporter'} = $reporter->address;
+  # Get the description, except the signature.
+  foreach my $line (@body_lines) {
+    last if $line eq SIGNATURE_DELIMITER;
+    $comment .= "$line\n";
+  }
+  $fields{'comment'} = $comment;
 
-    # The summary line only affects us if we're doing a post_bug.
-    # We have to check it down here because there might have been
-    # a bug_id specified in the body of the email.
-    if (!$fields{'bug_id'} && !$fields{'short_desc'}) {
-        $fields{'short_desc'} = $summary;
-    }
+  my %override = %{$switch{'override'} || {}};
+  foreach my $key (keys %override) {
+    $fields{$key} = $override{$key};
+  }
 
-    # The Importance/X-Priority headers are only used when creating a new bug.
-    # 1) If somebody specifies a priority, use it.
-    # 2) If there is an Importance or X-Priority header, use it as
-    #    something that is relative to the default priority.
-    #    If the value is High or 1, increase the priority by 1.
-    #    If the value is Low or 5, decrease the priority by 1.
-    # 3) Otherwise, use the default priority.
-    # Note: this will only work if the 'letsubmitterchoosepriority'
-    # parameter is enabled.
-    my $importance = $input_email->header('Importance')
-                     || $input_email->header('X-Priority');
-    if (!$fields{'bug_id'} && !$fields{'priority'} && $importance) {
-        my @legal_priorities = @{get_legal_field_values('priority')};
-        my $i = firstidx { $_ eq Bugzilla->params->{'defaultpriority'} } @legal_priorities;
-        if ($importance =~ /(high|[12])/i) {
-            $i-- unless $i == 0;
-        }
-        elsif ($importance =~ /(low|[45])/i) {
-            $i++ unless $i == $#legal_priorities;
-        }
-        $fields{'priority'} = $legal_priorities[$i];
-    }
+  debug_print("Parsed Fields:\n" . Dumper(\%fields), 2);
 
-    my $comment = '';
-    # Get the description, except the signature.
-    foreach my $line (@body_lines) {
-        last if $line eq SIGNATURE_DELIMITER;
-        $comment .= "$line\n";
-    }
-    $fields{'comment'} = $comment;
+  debug_print("Attachments:\n" . Dumper($attachments), 3);
+  if (@$attachments) {
+    $fields{'attachments'} = $attachments;
+  }
 
-    my %override = %{ $switch{'override'} || {} };
-    foreach my $key (keys %override) {
-        $fields{$key} = $override{$key};
-    }
-
-    debug_print("Parsed Fields:\n" . Dumper(\%fields), 2);
-
-    debug_print("Attachments:\n" . Dumper($attachments), 3);
-    if (@$attachments) {
-        $fields{'attachments'} = $attachments;
-    }
-
-    return \%fields;
+  return \%fields;
 }
 
 sub check_email_fields {
-    my ($fields) = @_;
-
-    my ($retval, $non_conclusive_fields) =
-      Bugzilla::User::match_field({
-        'assigned_to'   => { 'type' => 'single' },
-        'qa_contact'    => { 'type' => 'single' },
-        'cc'            => { 'type' => 'multi'  },
-        'newcc'         => { 'type' => 'multi'  }
-      }, $fields, MATCH_SKIP_CONFIRM);
-
-    if ($retval != USER_MATCH_SUCCESS) {
-        ThrowUserError('user_match_too_many', {fields => $non_conclusive_fields});
-    }
+  my ($fields) = @_;
+
+  my ($retval, $non_conclusive_fields) = Bugzilla::User::match_field(
+    {
+      'assigned_to' => {'type' => 'single'},
+      'qa_contact'  => {'type' => 'single'},
+      'cc'          => {'type' => 'multi'},
+      'newcc'       => {'type' => 'multi'}
+    },
+    $fields,
+    MATCH_SKIP_CONFIRM
+  );
+
+  if ($retval != USER_MATCH_SUCCESS) {
+    ThrowUserError('user_match_too_many', {fields => $non_conclusive_fields});
+  }
 }
 
 sub post_bug {
-    my ($fields) = @_;
-    debug_print('Posting a new bug...');
+  my ($fields) = @_;
+  debug_print('Posting a new bug...');
 
-    my $user = Bugzilla->user;
+  my $user = Bugzilla->user;
 
-    check_email_fields($fields);
+  check_email_fields($fields);
 
-    my $bug = Bugzilla::Bug->create($fields);
-    debug_print("Created bug " . $bug->id);
-    return ($bug, $bug->comments->[0]);
+  my $bug = Bugzilla::Bug->create($fields);
+  debug_print("Created bug " . $bug->id);
+  return ($bug, $bug->comments->[0]);
 }
 
 sub process_bug {
-    my ($fields_in) = @_; 
-    my %fields = %$fields_in;
-
-    my $bug_id = $fields{'bug_id'};
-    $fields{'id'} = $bug_id;
-    delete $fields{'bug_id'};
-
-    debug_print("Updating Bug $fields{id}...");
-
-    my $bug = Bugzilla::Bug->check($bug_id);
-
-    if ($fields{'bug_status'}) {
-        $fields{'knob'} = $fields{'bug_status'};
-    }
-    # If no status is given, then we only want to change the resolution.
-    elsif ($fields{'resolution'}) {
-        $fields{'knob'} = 'change_resolution';
-        $fields{'resolution_knob_change_resolution'} = $fields{'resolution'};
-    }
-    if ($fields{'dup_id'}) {
-        $fields{'knob'} = 'duplicate';
-    }
-
-    # Move @cc to @newcc as @cc is used by process_bug.cgi to remove
-    # users from the CC list when @removecc is set.
-    $fields{'newcc'} = delete $fields{'cc'} if $fields{'cc'};
-
-    # Make it possible to remove CCs.
-    if ($fields{'removecc'}) {
-        $fields{'cc'} = [split(',', $fields{'removecc'})];
-        $fields{'removecc'} = 1;
-    }
-
-    check_email_fields(\%fields);
-
-    my $cgi = Bugzilla->cgi;
-    foreach my $field (keys %fields) {
-        $cgi->param(-name => $field, -value => $fields{$field});
-    }
-    $cgi->param('token', issue_hash_token([$bug->id, $bug->delta_ts]));
-
-    require 'process_bug.cgi';
-    debug_print("Bug processed.");
-
-    my $added_comment;
-    if (trim($fields{'comment'})) {
-        # The "old" bug object doesn't contain the comment we just added.
-        $added_comment = Bugzilla::Bug->check($bug_id)->comments->[-1];
-    }
-    return ($bug, $added_comment);
+  my ($fields_in) = @_;
+  my %fields = %$fields_in;
+
+  my $bug_id = $fields{'bug_id'};
+  $fields{'id'} = $bug_id;
+  delete $fields{'bug_id'};
+
+  debug_print("Updating Bug $fields{id}...");
+
+  my $bug = Bugzilla::Bug->check($bug_id);
+
+  if ($fields{'bug_status'}) {
+    $fields{'knob'} = $fields{'bug_status'};
+  }
+
+  # If no status is given, then we only want to change the resolution.
+  elsif ($fields{'resolution'}) {
+    $fields{'knob'}                              = 'change_resolution';
+    $fields{'resolution_knob_change_resolution'} = $fields{'resolution'};
+  }
+  if ($fields{'dup_id'}) {
+    $fields{'knob'} = 'duplicate';
+  }
+
+  # Move @cc to @newcc as @cc is used by process_bug.cgi to remove
+  # users from the CC list when @removecc is set.
+  $fields{'newcc'} = delete $fields{'cc'} if $fields{'cc'};
+
+  # Make it possible to remove CCs.
+  if ($fields{'removecc'}) {
+    $fields{'cc'} = [split(',', $fields{'removecc'})];
+    $fields{'removecc'} = 1;
+  }
+
+  check_email_fields(\%fields);
+
+  my $cgi = Bugzilla->cgi;
+  foreach my $field (keys %fields) {
+    $cgi->param(-name => $field, -value => $fields{$field});
+  }
+  $cgi->param('token', issue_hash_token([$bug->id, $bug->delta_ts]));
+
+  require 'process_bug.cgi';
+  debug_print("Bug processed.");
+
+  my $added_comment;
+  if (trim($fields{'comment'})) {
+
+    # The "old" bug object doesn't contain the comment we just added.
+    $added_comment = Bugzilla::Bug->check($bug_id)->comments->[-1];
+  }
+  return ($bug, $added_comment);
 }
 
 sub handle_attachments {
-    my ($bug, $attachments, $comment) = @_;
-    return if !$attachments;
-    debug_print("Handling attachments...");
-    my $dbh = Bugzilla->dbh;
-    $dbh->bz_start_transaction();
-    my ($update_comment, $update_bug);
-    foreach my $attachment (@$attachments) {
-        debug_print("Inserting Attachment: " . Dumper($attachment), 3);
-        my $type = $attachment->content_type || 'application/octet-stream';
-        # MUAs add stuff like "name=" to content-type that we really don't
-        # want.
-        $type =~ s/;.*//;
-        my $obj = Bugzilla::Attachment->create({
-            bug         => $bug,
-            description => $attachment->filename(1),
-            filename    => $attachment->filename(1),
-            mimetype    => $type,
-            data        => $attachment->body,
-        });
-        # If we added a comment, and our comment does not already have a type,
-        # and this is our first attachment, then we make the comment an 
-        # "attachment created" comment.
-        if ($comment and !$comment->type and !$update_comment) {
-            $comment->set_all({ type       => CMT_ATTACHMENT_CREATED, 
-                                extra_data => $obj->id });
-            $update_comment = 1;
-        }
-        else {
-            $bug->add_comment('', { type => CMT_ATTACHMENT_CREATED,
-                                    extra_data => $obj->id });
-            $update_bug = 1;
-        }
+  my ($bug, $attachments, $comment) = @_;
+  return if !$attachments;
+  debug_print("Handling attachments...");
+  my $dbh = Bugzilla->dbh;
+  $dbh->bz_start_transaction();
+  my ($update_comment, $update_bug);
+  foreach my $attachment (@$attachments) {
+    debug_print("Inserting Attachment: " . Dumper($attachment), 3);
+    my $type = $attachment->content_type || 'application/octet-stream';
+
+    # MUAs add stuff like "name=" to content-type that we really don't
+    # want.
+    $type =~ s/;.*//;
+    my $obj = Bugzilla::Attachment->create({
+      bug         => $bug,
+      description => $attachment->filename(1),
+      filename    => $attachment->filename(1),
+      mimetype    => $type,
+      data        => $attachment->body,
+    });
+
+    # If we added a comment, and our comment does not already have a type,
+    # and this is our first attachment, then we make the comment an
+    # "attachment created" comment.
+    if ($comment and !$comment->type and !$update_comment) {
+      $comment->set_all({type => CMT_ATTACHMENT_CREATED, extra_data => $obj->id});
+      $update_comment = 1;
+    }
+    else {
+      $bug->add_comment('', {type => CMT_ATTACHMENT_CREATED, extra_data => $obj->id});
+      $update_bug = 1;
     }
-    # We only update the comments and bugs at the end of the transaction,
-    # because doing so modifies bugs_fulltext, which is a non-transactional
-    # table.
-    $bug->update() if $update_bug;
-    $comment->update() if $update_comment;
-    $dbh->bz_commit_transaction();
+  }
+
+  # We only update the comments and bugs at the end of the transaction,
+  # because doing so modifies bugs_fulltext, which is a non-transactional
+  # table.
+  $bug->update()     if $update_bug;
+  $comment->update() if $update_comment;
+  $dbh->bz_commit_transaction();
 }
 
 ######################
@@ -311,181 +322,196 @@ sub handle_attachments {
 ######################
 
 sub debug_print {
-    my ($str, $level) = @_;
-    $level ||= 1;
-    print STDERR "$str\n" if $level <= $switch{'verbose'};
+  my ($str, $level) = @_;
+  $level ||= 1;
+  print STDERR "$str\n" if $level <= $switch{'verbose'};
 }
 
 sub get_body_and_attachments {
-    my ($email) = @_;
-
-    my $ct = $email->content_type || 'text/plain';
-    debug_print("Splitting Body and Attachments [Type: $ct]...", 2);
-
-    my ($bodies, $attachments) = split_body_and_attachments($email);
-    debug_print(scalar(@$bodies) . " body part(s) and " . scalar(@$attachments)
-                . " attachment part(s).");
-    debug_print('Bodies: ' . Dumper($bodies), 3);
-
-    # Get the first part of the email that contains a text body,
-    # and make all the other pieces into attachments. (This handles
-    # people or MUAs who accidentally attach text files as an "inline"
-    # attachment.)
-    my $body;
-    while (@$bodies) {
-        my $possible = shift @$bodies;
-        $body = get_text_alternative($possible);
-        if (defined $body) {
-            unshift(@$attachments, @$bodies);
-            last;
-        }
+  my ($email) = @_;
+
+  my $ct = $email->content_type || 'text/plain';
+  debug_print("Splitting Body and Attachments [Type: $ct]...", 2);
+
+  my ($bodies, $attachments) = split_body_and_attachments($email);
+  debug_print(
+        scalar(@$bodies)
+      . " body part(s) and "
+      . scalar(@$attachments)
+      . " attachment part(s).");
+  debug_print('Bodies: ' . Dumper($bodies), 3);
+
+  # Get the first part of the email that contains a text body,
+  # and make all the other pieces into attachments. (This handles
+  # people or MUAs who accidentally attach text files as an "inline"
+  # attachment.)
+  my $body;
+  while (@$bodies) {
+    my $possible = shift @$bodies;
+    $body = get_text_alternative($possible);
+    if (defined $body) {
+      unshift(@$attachments, @$bodies);
+      last;
     }
+  }
 
-    if (!defined $body) {
-        # Note that this only happens if the email does not contain any
-        # text/plain parts. If the email has an empty text/plain part,
-        # you're fine, and this message does NOT get thrown.
-        ThrowUserError('email_no_body');
-    }
+  if (!defined $body) {
+
+    # Note that this only happens if the email does not contain any
+    # text/plain parts. If the email has an empty text/plain part,
+    # you're fine, and this message does NOT get thrown.
+    ThrowUserError('email_no_body');
+  }
+
+  debug_print("Picked Body:\n$body", 2);
 
-    debug_print("Picked Body:\n$body", 2);
-    
-    return ($body, $attachments);
+  return ($body, $attachments);
 }
 
 sub get_text_alternative {
-    my ($email) = @_;
-
-    my @parts = $email->parts;
-    my $body;
-    foreach my $part (@parts) {
-        my $ct = $part->content_type || 'text/plain';
-        my $charset = 'iso-8859-1';
-        # The charset may be quoted.
-        if ($ct =~ /charset="?([^;"]+)/) {
-            $charset= $1;
-        }
-        debug_print("Alternative Part Content-Type: $ct", 2);
-        debug_print("Alternative Part Character Encoding: $charset", 2);
-        # If we find a text/plain body here, return it immediately.
-        if (!$ct || $ct =~ m{^text/plain}i) {
-            return _decode_body($charset, $part->body);
-        }
-        # If we find a text/html body, decode it, but don't return
-        # it immediately, because there might be a text/plain alternative
-        # later. This could be any HTML type.
-        if ($ct =~ m{^application/xhtml\+xml}i or $ct =~ m{text/html}i) {
-            my $parser = HTML::FormatText::WithLinks->new(
-                # Put footnnote indicators after the text, not before it.
-                before_link => '',
-                after_link  => '[%n]',
-                # Convert bold and italics, use "*" for bold instead of "_".
-                with_emphasis => 1,
-                bold_marker => '*',
-                # If the same link appears multiple times, only create
-                # one footnote.
-                unique_links => 1,
-                # If the link text is the URL, don't create a footnote.
-                skip_linked_urls => 1,
-            );
-            $body = _decode_body($charset, $part->body);
-            $body = $parser->parse($body);
-        }
+  my ($email) = @_;
+
+  my @parts = $email->parts;
+  my $body;
+  foreach my $part (@parts) {
+    my $ct = $part->content_type || 'text/plain';
+    my $charset = 'iso-8859-1';
+
+    # The charset may be quoted.
+    if ($ct =~ /charset="?([^;"]+)/) {
+      $charset = $1;
+    }
+    debug_print("Alternative Part Content-Type: $ct",            2);
+    debug_print("Alternative Part Character Encoding: $charset", 2);
+
+    # If we find a text/plain body here, return it immediately.
+    if (!$ct || $ct =~ m{^text/plain}i) {
+      return _decode_body($charset, $part->body);
+    }
+
+    # If we find a text/html body, decode it, but don't return
+    # it immediately, because there might be a text/plain alternative
+    # later. This could be any HTML type.
+    if ($ct =~ m{^application/xhtml\+xml}i or $ct =~ m{text/html}i) {
+      my $parser = HTML::FormatText::WithLinks->new(
+
+        # Put footnnote indicators after the text, not before it.
+        before_link => '',
+        after_link  => '[%n]',
+
+        # Convert bold and italics, use "*" for bold instead of "_".
+        with_emphasis => 1,
+        bold_marker   => '*',
+
+        # If the same link appears multiple times, only create
+        # one footnote.
+        unique_links => 1,
+
+        # If the link text is the URL, don't create a footnote.
+        skip_linked_urls => 1,
+      );
+      $body = _decode_body($charset, $part->body);
+      $body = $parser->parse($body);
     }
+  }
 
-    return $body;
+  return $body;
 }
 
 sub _decode_body {
-    my ($charset, $body) = @_;
-    if (Bugzilla->params->{'utf8'} && !utf8::is_utf8($body)) {
-        return Encode::decode($charset, $body);
-    }
-    return $body;
+  my ($charset, $body) = @_;
+  return utf8::is_utf8($body) ? $body : Encode::decode($charset, $body);
 }
 
 sub remove_leading_blank_lines {
-    my ($text) = @_;
-    $text =~ s/^(\s*\n)+//s;
-    return $text;
+  my ($text) = @_;
+  $text =~ s/^(\s*\n)+//s;
+  return $text;
 }
 
 sub html_strip {
-    my ($var) = @_;
-    # Trivial HTML tag remover (this is just for error messages, really.)
-    $var =~ s/<[^>]*>//g;
-    # And this basically reverses the Template-Toolkit html filter.
-    $var =~ s/\&amp;/\&/g;
-    $var =~ s/\&lt;/</g;
-    $var =~ s/\&gt;/>/g;
-    $var =~ s/\&quot;/\"/g;
-    $var =~ s/&#64;/@/g;
-    # Also remove undesired newlines and consecutive spaces.
-    $var =~ s/[\n\s]+/ /gms;
-    return $var;
+  my ($var) = @_;
+
+  # Trivial HTML tag remover (this is just for error messages, really.)
+  $var =~ s/<[^>]*>//g;
+
+  # And this basically reverses the Template-Toolkit html filter.
+  $var =~ s/\&amp;/\&/g;
+  $var =~ s/\&lt;/</g;
+  $var =~ s/\&gt;/>/g;
+  $var =~ s/\&quot;/\"/g;
+  $var =~ s/&#64;/@/g;
+
+  # Also remove undesired newlines and consecutive spaces.
+  $var =~ s/[\n\s]+/ /gms;
+  return $var;
 }
 
 sub split_body_and_attachments {
-    my ($email) = @_;
-
-    my (@body, @attachments);
-    foreach my $part ($email->parts) {
-        my $ct = lc($part->content_type || 'text/plain');
-        my $disposition = lc($part->header('Content-Disposition') || 'inline');
-        # Remove the charset, etc. from the content-type, we don't care here.
-        $ct =~ s/;.*//;
-        debug_print("Part Content-Type: [$ct]", 2);
-        debug_print("Part Disposition: [$disposition]", 2);
-
-        if ($disposition eq 'inline' and grep($_ eq $ct, BODY_TYPES)) {
-            push(@body, $part);
-            next;
-        }
-        
-        if (scalar($part->parts) == 1) {
-            push(@attachments, $part);
-            next;
-        }
-
-        # If this part has sub-parts, analyze them similarly to how we
-        # did above and return the relevant pieces.
-        my ($add_body, $add_attachments) = split_body_and_attachments($part);
-        push(@body, @$add_body);
-        push(@attachments, @$add_attachments);
+  my ($email) = @_;
+
+  my (@body, @attachments);
+  foreach my $part ($email->parts) {
+    my $ct = lc($part->content_type || 'text/plain');
+    my $disposition = lc($part->header('Content-Disposition') || 'inline');
+
+    # Remove the charset, etc. from the content-type, we don't care here.
+    $ct =~ s/;.*//;
+    debug_print("Part Content-Type: [$ct]",         2);
+    debug_print("Part Disposition: [$disposition]", 2);
+
+    if ($disposition eq 'inline' and grep($_ eq $ct, BODY_TYPES)) {
+      push(@body, $part);
+      next;
     }
 
-    return (\@body, \@attachments);
+    if (scalar($part->parts) == 1) {
+      push(@attachments, $part);
+      next;
+    }
+
+    # If this part has sub-parts, analyze them similarly to how we
+    # did above and return the relevant pieces.
+    my ($add_body, $add_attachments) = split_body_and_attachments($part);
+    push(@body,        @$add_body);
+    push(@attachments, @$add_attachments);
+  }
+
+  return (\@body, \@attachments);
 }
 
 
 sub die_handler {
-    my ($msg) = @_;
-
-    # In Template-Toolkit, [% RETURN %] is implemented as a call to "die".
-    # But of course, we really don't want to actually *die* just because
-    # the user-error or code-error template ended. So we don't really die.
-    return if blessed($msg) && $msg->isa('Template::Exception')
-              && $msg->type eq 'return';
-
-    # If this is inside an eval, then we should just act like...we're
-    # in an eval (instead of printing the error and exiting).
-    die(@_) if $^S;
-
-    # We can't depend on the MTA to send an error message, so we have
-    # to generate one properly.
-    if ($input_email) {
-       $msg =~ s/at .+ line.*$//ms;
-       $msg =~ s/^Compilation failed in require.+$//ms;
-       $msg = html_strip($msg);
-       my $from = Bugzilla->params->{'mailfrom'};
-       my $reply = reply(to => $input_email, from => $from, top_post => 1, 
-                         body => "$msg\n");
-       MessageToMTA($reply->as_string);
-    }
-    print STDERR "$msg\n";
-    # We exit with a successful value, because we don't want the MTA
-    # to *also* send a failure notice.
-    exit;
+  my ($msg) = @_;
+
+  # In Template-Toolkit, [% RETURN %] is implemented as a call to "die".
+  # But of course, we really don't want to actually *die* just because
+  # the user-error or code-error template ended. So we don't really die.
+  return
+       if blessed($msg)
+    && $msg->isa('Template::Exception')
+    && $msg->type eq 'return';
+
+  # If this is inside an eval, then we should just act like...we're
+  # in an eval (instead of printing the error and exiting).
+  die @_ if ($^S // Bugzilla->request_cache->{in_eval});
+
+  # We can't depend on the MTA to send an error message, so we have
+  # to generate one properly.
+  if ($input_email) {
+    $msg =~ s/at .+ line.*$//ms;
+    $msg =~ s/^Compilation failed in require.+$//ms;
+    $msg = html_strip($msg);
+    my $from = Bugzilla->params->{'mailfrom'};
+    my $reply
+      = reply(to => $input_email, from => $from, top_post => 1, body => "$msg\n");
+    MessageToMTA($reply->as_string);
+  }
+  print STDERR "$msg\n";
+
+  # We exit with a successful value, because we don't want the MTA
+  # to *also* send a failure notice.
+  exit;
 }
 
 ###############
@@ -502,29 +528,25 @@ sub die_handler {
 
 Bugzilla->usage_mode(USAGE_MODE_EMAIL);
 
-my @mail_lines = <STDIN>;
-my $mail_text = join("", @mail_lines);
+my @mail_lines  = <STDIN>;
+my $mail_text   = join("", @mail_lines);
 my $mail_fields = parse_mail($mail_text);
 
-Bugzilla::Hook::process('email_in_after_parse', { fields => $mail_fields });
+Bugzilla::Hook::process('email_in_after_parse', {fields => $mail_fields});
 
 my $attachments = delete $mail_fields->{'attachments'};
 
 my $username = $mail_fields->{'reporter'};
-# If emailsuffix is in use, we have to remove it from the email address.
-if (my $suffix = Bugzilla->params->{'emailsuffix'}) {
-    $username =~ s/\Q$suffix\E$//i;
-}
 
 my $user = Bugzilla::User->check($username);
 Bugzilla->set_user($user);
 
 my ($bug, $comment);
 if ($mail_fields->{'bug_id'}) {
-    ($bug, $comment) = process_bug($mail_fields);
+  ($bug, $comment) = process_bug($mail_fields);
 }
 else {
-    ($bug, $comment) = post_bug($mail_fields);
+  ($bug, $comment) = post_bug($mail_fields);
 }
 
 handle_attachments($bug, $attachments, $comment);
@@ -536,7 +558,7 @@ sub die_handler {
 # to wait for $bug->update() to be fully used in email_in.pl first. So
 # currently, process_bug.cgi does the mail sending for bugs, and this does
 # any mail sending for attachments after the first one.
-Bugzilla::BugMail::Send($bug->id, { changer => Bugzilla->user });
+Bugzilla::BugMail::Send($bug->id, {changer => Bugzilla->user});
 debug_print("Sent bugmail");
 
 
diff --git a/enter_bug.cgi b/enter_bug.cgi
index 3f22fe4b84..46efeaaf0c 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -10,17 +10,17 @@
 #
 # enter_bug.cgi
 # -------------
-# Displays bug entry form. Bug fields are specified through popup menus, 
-# drop-down lists, or text fields. Default for these values can be 
+# Displays bug entry form. Bug fields are specified through popup menus,
+# drop-down lists, or text fields. Default for these values can be
 # passed in as parameters to the cgi.
 #
 ##############################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -41,81 +41,90 @@ my $user = Bugzilla->login(LOGIN_REQUIRED);
 my $cloned_bug;
 my $cloned_bug_id;
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # All pages point to the same part of the documentation.
-$vars->{'doc_section'} = 'using.html#filing-bugs';
+$vars->{'doc_section'} = 'using/filing.html';
 
 my $product_name = trim($cgi->param('product') || '');
+
 # Will contain the product object the bug is created in.
 my $product;
 
 if ($product_name eq '') {
-    # If the user cannot enter bugs in any product, stop here.
-    my @enterable_products = @{$user->get_enterable_products};
-    ThrowUserError('no_products') unless scalar(@enterable_products);
 
-    my $classification = Bugzilla->params->{'useclassification'} ?
-        scalar($cgi->param('classification')) : '__all';
+  # If the user cannot enter bugs in any product, stop here.
+  my @enterable_products = @{$user->get_enterable_products};
+  ThrowUserError('no_products') unless scalar(@enterable_products);
 
-    # Unless a real classification name is given, we sort products
-    # by classification.
-    my @classifications;
+  my $classification
+    = Bugzilla->params->{'useclassification'}
+    ? scalar($cgi->param('classification'))
+    : '__all';
 
-    unless ($classification && $classification ne '__all') {
-        @classifications = @{sort_products_by_classification(\@enterable_products)};
-    }
+  # Unless a real classification name is given, we sort products
+  # by classification.
+  my @classifications;
 
-    unless ($classification) {
-        # We know there is at least one classification available,
-        # else we would have stopped earlier.
-        if (scalar(@classifications) > 1) {
-            # We only need classification objects.
-            $vars->{'classifications'} = [map {$_->{'object'}} @classifications];
-
-            $vars->{'target'} = "enter_bug.cgi";
-
-            print $cgi->header();
-            $template->process("global/choose-classification.html.tmpl", $vars)
-               || ThrowTemplateError($template->error());
-            exit;
-        }
-        # If we come here, then there is only one classification available.
-        $classification = $classifications[0]->{'object'}->name;
-    }
+  unless ($classification && $classification ne '__all') {
+    @classifications = @{sort_products_by_classification(\@enterable_products)};
+  }
+
+  unless ($classification) {
+
+    # We know there is at least one classification available,
+    # else we would have stopped earlier.
+    if (scalar(@classifications) > 1) {
+
+      # We only need classification objects.
+      $vars->{'classifications'} = [map { $_->{'object'} } @classifications];
+
+      $vars->{'target'} = "enter_bug.cgi";
 
-    # Keep only enterable products which are in the specified classification.
-    if ($classification ne "__all") {
-        my $class = new Bugzilla::Classification({'name' => $classification});
-        # If the classification doesn't exist, then there is no product in it.
-        if ($class) {
-            @enterable_products
-              = grep {$_->classification_id == $class->id} @enterable_products;
-            @classifications = ({object => $class, products => \@enterable_products});
-        }
-        else {
-            @enterable_products = ();
-        }
+      print $cgi->header();
+      $template->process("global/choose-classification.html.tmpl", $vars)
+        || ThrowTemplateError($template->error());
+      exit;
     }
 
-    if (scalar(@enterable_products) == 0) {
-        ThrowUserError('no_products');
+    # If we come here, then there is only one classification available.
+    $classification = $classifications[0]->{'object'}->name;
+  }
+
+  # Keep only enterable products which are in the specified classification.
+  if ($classification ne "__all") {
+    my $class = new Bugzilla::Classification({'name' => $classification});
+
+    # If the classification doesn't exist, then there is no product in it.
+    if ($class) {
+      @enterable_products
+        = grep { $_->classification_id == $class->id } @enterable_products;
+      @classifications = ({object => $class, products => \@enterable_products});
     }
-    elsif (scalar(@enterable_products) > 1) {
-        $vars->{'classifications'} = \@classifications;
-        $vars->{'target'} = "enter_bug.cgi";
-
-        print $cgi->header();
-        $template->process("global/choose-product.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-        exit;
-    } else {
-        # Only one product exists.
-        $product = $enterable_products[0];
+    else {
+      @enterable_products = ();
     }
+  }
+
+  if (scalar(@enterable_products) == 0) {
+    ThrowUserError('no_products');
+  }
+  elsif (scalar(@enterable_products) > 1) {
+    $vars->{'classifications'} = \@classifications;
+    $vars->{'target'}          = "enter_bug.cgi";
+
+    print $cgi->header();
+    $template->process("global/choose-product.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+  else {
+    # Only one product exists.
+    $product = $enterable_products[0];
+  }
 }
 
 # We need to check and make sure that the user has permission
@@ -126,8 +135,8 @@ $product = $user->can_enter_product($product || $product_name, THROW_ERROR);
 # Useful Subroutines
 ##############################################################################
 sub formvalue {
-    my ($name, $default) = (@_);
-    return Bugzilla->cgi->param($name) || $default || "";
+  my ($name, $default) = (@_);
+  return Bugzilla->cgi->param($name) || $default || "";
 }
 
 ##############################################################################
@@ -135,7 +144,6 @@ sub formvalue {
 ##############################################################################
 
 my $has_editbugs = $user->in_group('editbugs', $product->id);
-my $has_canconfirm = $user->in_group('canconfirm', $product->id);
 
 # If a user is trying to clone a bug
 #   Check that the user has authorization to view the parent bug
@@ -143,139 +151,143 @@ my $has_canconfirm = $user->in_group('canconfirm', $product->id);
 $cloned_bug_id = $cgi->param('cloned_bug_id');
 
 if ($cloned_bug_id) {
-    $cloned_bug = Bugzilla::Bug->check($cloned_bug_id);
-    $cloned_bug_id = $cloned_bug->id;
+  $cloned_bug    = Bugzilla::Bug->check($cloned_bug_id);
+  $cloned_bug_id = $cloned_bug->id;
 }
 
 # If there is only one active component, choose it
 my @active = grep { $_->is_active } @{$product->components};
 if (scalar(@active) == 1) {
-    $cgi->param('component', $active[0]->name);
+  $cgi->param('component', $active[0]->name);
 }
 
 # If there is only one active version, choose it
 @active = grep { $_->is_active } @{$product->versions};
 if (scalar(@active) == 1) {
-    $cgi->param('version', $active[0]->name);
+  $cgi->param('version', $active[0]->name);
 }
 
 my %default;
 
-$vars->{'product'}               = $product;
+$vars->{'product'} = $product;
 
-$vars->{'priority'}              = get_legal_field_values('priority');
-$vars->{'bug_severity'}          = get_legal_field_values('bug_severity');
-$vars->{'rep_platform'}          = get_legal_field_values('rep_platform');
-$vars->{'op_sys'}                = get_legal_field_values('op_sys');
+$vars->{'priority'}     = get_legal_field_values('priority');
+$vars->{'bug_severity'} = get_legal_field_values('bug_severity');
+$vars->{'rep_platform'} = get_legal_field_values('rep_platform');
+$vars->{'op_sys'}       = get_legal_field_values('op_sys');
 
-$vars->{'assigned_to'}           = formvalue('assigned_to');
-$vars->{'assigned_to_disabled'}  = !$has_editbugs;
-$vars->{'cc_disabled'}           = 0;
+$vars->{'assigned_to'}          = formvalue('assigned_to');
+$vars->{'assigned_to_disabled'} = !$has_editbugs;
+$vars->{'cc_disabled'}          = 0;
 
-$vars->{'qa_contact'}           = formvalue('qa_contact');
-$vars->{'qa_contact_disabled'}  = !$has_editbugs;
+$vars->{'qa_contact'}          = formvalue('qa_contact');
+$vars->{'qa_contact_disabled'} = !$has_editbugs;
 
-$vars->{'cloned_bug_id'}         = $cloned_bug_id;
+$vars->{'cloned_bug_id'} = $cloned_bug_id;
 
 $vars->{'token'} = issue_session_token('create_bug');
 
 
 my @enter_bug_fields = grep { $_->enter_bug } Bugzilla->active_custom_fields;
 foreach my $field (@enter_bug_fields) {
-    my $cf_name = $field->name;
-    my $cf_value = $cgi->param($cf_name);
-    if (defined $cf_value) {
-        if ($field->type == FIELD_TYPE_MULTI_SELECT) {
-            $cf_value = [$cgi->param($cf_name)];
-        }
-        $default{$cf_name} = $vars->{$cf_name} = $cf_value;
+  my $cf_name  = $field->name;
+  my $cf_value = $cgi->param($cf_name);
+  if (defined $cf_value) {
+    if ($field->type == FIELD_TYPE_MULTI_SELECT) {
+      $cf_value = [$cgi->multi_param($cf_name)];
     }
+    $default{$cf_name} = $vars->{$cf_name} = $cf_value;
+  }
 }
 
 # This allows the Field visibility and value controls to work with the
 # Classification and Product fields as a parent.
 $default{'classification'} = $product->classification->name;
-$default{'product'} = $product->name;
+$default{'product'}        = $product->name;
 
 if ($cloned_bug_id) {
 
-    $default{'component_'}    = $cloned_bug->component;
-    $default{'priority'}      = $cloned_bug->priority;
-    $default{'bug_severity'}  = $cloned_bug->bug_severity;
-    $default{'rep_platform'}  = $cloned_bug->rep_platform;
-    $default{'op_sys'}        = $cloned_bug->op_sys;
-
-    $vars->{'short_desc'}     = $cloned_bug->short_desc;
-    $vars->{'bug_file_loc'}   = $cloned_bug->bug_file_loc;
-    $vars->{'keywords'}       = $cloned_bug->keywords;
-    $vars->{'dependson'}      = join (", ", $cloned_bug_id, @{$cloned_bug->dependson});
-    $vars->{'blocked'}        = join (", ", @{$cloned_bug->blocked});
-    $vars->{'deadline'}       = $cloned_bug->deadline;
-    $vars->{'estimated_time'} = $cloned_bug->estimated_time;
-
-    if (scalar @{$cloned_bug->cc}) {
-        $vars->{'cc'}         = join (", ", @{$cloned_bug->cc});
-    } else {
-        $vars->{'cc'}         = formvalue('cc');
+  $default{'component_'}   = $cloned_bug->component;
+  $default{'priority'}     = $cloned_bug->priority;
+  $default{'bug_severity'} = $cloned_bug->bug_severity;
+  $default{'rep_platform'} = $cloned_bug->rep_platform;
+  $default{'op_sys'}       = $cloned_bug->op_sys;
+
+  $vars->{'short_desc'}   = $cloned_bug->short_desc;
+  $vars->{'bug_file_loc'} = $cloned_bug->bug_file_loc;
+  $vars->{'keywords'}     = $cloned_bug->keywords;
+  $vars->{'dependson'}    = join(", ", $cloned_bug_id, @{$cloned_bug->dependson});
+  $vars->{'blocked'}      = join(", ", @{$cloned_bug->blocked});
+  $vars->{'deadline'}     = $cloned_bug->deadline;
+  $vars->{'estimated_time'} = $cloned_bug->estimated_time;
+
+  if (scalar @{$cloned_bug->cc}) {
+    $vars->{'cc'} = join(", ", @{$cloned_bug->cc});
+  }
+  else {
+    $vars->{'cc'} = formvalue('cc');
+  }
+
+  foreach my $role (qw(reporter assigned_to qa_contact)) {
+    if ( defined($cloned_bug->$role)
+      && $cloned_bug->$role->id != $user->id
+      && none { $_ eq $cloned_bug->$role->login } @{$cloned_bug->cc})
+    {
+      $vars->{'cc'} = join(", ", $cloned_bug->$role->login, $vars->{'cc'});
     }
+  }
 
-    foreach my $role (qw(reporter assigned_to qa_contact)) {
-        if (defined($cloned_bug->$role)
-            && $cloned_bug->$role->id != $user->id
-            && none { $_ eq $cloned_bug->$role->login } @{$cloned_bug->cc})
-        {
-            $vars->{'cc'} = join (", ", $cloned_bug->$role->login, $vars->{'cc'});
-        }
-    }
+  foreach my $field (@enter_bug_fields) {
+    my $field_name = $field->name;
+    $vars->{$field_name} = $cloned_bug->$field_name;
+  }
 
-    foreach my $field (@enter_bug_fields) {
-        my $field_name = $field->name;
-        $vars->{$field_name} = $cloned_bug->$field_name;
-    }
+  # We need to ensure that we respect the 'insider' status of
+  # the first comment, if it has one. Either way, make a note
+  # that this bug was cloned from another bug.
+  my $bug_desc = $cloned_bug->comments({order => 'oldest_to_newest'})->[0];
+  my $isprivate = $bug_desc->is_private;
 
-    # We need to ensure that we respect the 'insider' status of
-    # the first comment, if it has one. Either way, make a note
-    # that this bug was cloned from another bug.
-    my $bug_desc = $cloned_bug->comments({ order => 'oldest_to_newest' })->[0];
-    my $isprivate = $bug_desc->is_private;
+  $vars->{'comment'}            = "";
+  $vars->{'comment_is_private'} = 0;
 
-    $vars->{'comment'} = "";
-    $vars->{'comment_is_private'} = 0;
+  if (!$isprivate || $user->is_insider) {
 
-    if (!$isprivate || $user->is_insider) {
-        # We use "body" to avoid any format_comment text, which would be
-        # pointless to clone.
-        $vars->{'comment'} = $bug_desc->body;
-        $vars->{'comment_is_private'} = $isprivate;
-    }
+    # We use "body" to avoid any format_comment text, which would be
+    # pointless to clone.
+    $vars->{'comment'}            = $bug_desc->body;
+    $vars->{'comment_is_private'} = $isprivate;
+  }
 
-} # end of cloned bug entry form
+}    # end of cloned bug entry form
 
 else {
-    $default{'component_'}    = formvalue('component');
-    $default{'priority'}      = formvalue('priority', Bugzilla->params->{'defaultpriority'});
-    $default{'bug_severity'}  = formvalue('bug_severity', Bugzilla->params->{'defaultseverity'});
-    $default{'rep_platform'}  = formvalue('rep_platform', 
-                                          Bugzilla->params->{'defaultplatform'} || detect_platform());
-    $default{'op_sys'}        = formvalue('op_sys', 
-                                          Bugzilla->params->{'defaultopsys'} || detect_op_sys());
-
-    $vars->{'alias'}          = formvalue('alias');
-    $vars->{'short_desc'}     = formvalue('short_desc');
-    $vars->{'bug_file_loc'}   = formvalue('bug_file_loc', "http://");
-    $vars->{'keywords'}       = formvalue('keywords');
-    $vars->{'dependson'}      = formvalue('dependson');
-    $vars->{'blocked'}        = formvalue('blocked');
-    $vars->{'deadline'}       = formvalue('deadline');
-    $vars->{'estimated_time'} = formvalue('estimated_time');
-    $vars->{'see_also'}       = formvalue('see_also');
-
-    $vars->{'cc'}             = join(', ', $cgi->param('cc'));
-
-    $vars->{'comment'}        = formvalue('comment');
-    $vars->{'comment_is_private'} = formvalue('comment_is_private');
-
-} # end of normal/bookmarked entry form
+  $default{'component_'} = formvalue('component');
+  $default{'priority'}
+    = formvalue('priority', Bugzilla->params->{'defaultpriority'});
+  $default{'bug_severity'}
+    = formvalue('bug_severity', Bugzilla->params->{'defaultseverity'});
+  $default{'rep_platform'} = formvalue('rep_platform',
+    Bugzilla->params->{'defaultplatform'} || detect_platform());
+  $default{'op_sys'}
+    = formvalue('op_sys', Bugzilla->params->{'defaultopsys'} || detect_op_sys());
+
+  $vars->{'alias'}          = formvalue('alias');
+  $vars->{'short_desc'}     = formvalue('short_desc');
+  $vars->{'bug_file_loc'}   = formvalue('bug_file_loc', "http://");
+  $vars->{'keywords'}       = formvalue('keywords');
+  $vars->{'dependson'}      = formvalue('dependson');
+  $vars->{'blocked'}        = formvalue('blocked');
+  $vars->{'deadline'}       = formvalue('deadline');
+  $vars->{'estimated_time'} = formvalue('estimated_time');
+  $vars->{'see_also'}       = formvalue('see_also');
+
+  $vars->{'cc'} = join(', ', $cgi->multi_param('cc'));
+
+  $vars->{'comment'}            = formvalue('comment');
+  $vars->{'comment_is_private'} = formvalue('comment_is_private');
+
+}    # end of normal/bookmarked entry form
 
 
 # IF this is a cloned bug,
@@ -295,31 +307,35 @@ $vars->{'version'} = $product->versions;
 
 my $version_cookie = $cgi->cookie("VERSION-" . $product->name);
 
-if ( ($cloned_bug_id) &&
-     ($product->name eq $cloned_bug->product ) ) {
-    $default{'version'} = $cloned_bug->version;
-} elsif (formvalue('version')) {
-    $default{'version'} = formvalue('version');
-} elsif (defined $version_cookie
-         and grep { $_->name eq $version_cookie } @{ $vars->{'version'} })
+if (($cloned_bug_id) && ($product->name eq $cloned_bug->product)) {
+  $default{'version'} = $cloned_bug->version;
+}
+elsif (formvalue('version')) {
+  $default{'version'} = formvalue('version');
+}
+elsif (defined $version_cookie
+  and grep { $_->name eq $version_cookie } @{$vars->{'version'}})
 {
-    $default{'version'} = $version_cookie;
-} else {
-    $default{'version'} = $vars->{'version'}->[$#{$vars->{'version'}}]->name;
+  $default{'version'} = $version_cookie;
+}
+else {
+  $default{'version'} = $vars->{'version'}->[$#{$vars->{'version'}}]->name;
 }
 
 # Get list of milestones.
-if ( Bugzilla->params->{'usetargetmilestone'} ) {
-    $vars->{'target_milestone'} = $product->milestones;
-    if (formvalue('target_milestone')) {
-       $default{'target_milestone'} = formvalue('target_milestone');
-    } else {
-       $default{'target_milestone'} = $product->default_milestone;
-    }
+if (Bugzilla->params->{'usetargetmilestone'}) {
+  $vars->{'target_milestone'} = $product->milestones;
+  if (formvalue('target_milestone')) {
+    $default{'target_milestone'} = formvalue('target_milestone');
+  }
+  else {
+    $default{'target_milestone'} = $product->default_milestone;
+  }
 }
 
 # Construct the list of allowable statuses.
-my @statuses = @{ Bugzilla::Bug->new_bug_statuses($product) };
+my @statuses = @{Bugzilla::Bug->new_bug_statuses($product)};
+
 # Exclude closed states from the UI, even if the workflow allows them.
 # The back-end code will still accept them, though.
 # XXX We should remove this when the UI accepts closed statuses and update
@@ -336,28 +352,32 @@ $vars->{'bug_status'} = \@statuses;
 
 my $picked_status = formvalue('bug_status');
 if ($picked_status and grep($_->name eq $picked_status, @statuses)) {
-    $default{'bug_status'} = formvalue('bug_status');
-} else {
-    $default{'bug_status'} = Bugzilla::Bug->default_bug_status(@statuses);
+  $default{'bug_status'} = formvalue('bug_status');
+}
+else {
+  $default{'bug_status'} = Bugzilla::Bug->default_bug_status(@statuses);
 }
 
-my @groups = $cgi->param('groups');
+my @groups = $cgi->multi_param('groups');
 if ($cloned_bug) {
-    my @clone_groups = map { $_->name } @{ $cloned_bug->groups_in };
-    # It doesn't matter if there are duplicate names, since all we check
-    # for in the template is whether or not the group is set.
-    push(@groups, @clone_groups);
+  my @clone_groups = map { $_->name } @{$cloned_bug->groups_in};
+
+  # It doesn't matter if there are duplicate names, since all we check
+  # for in the template is whether or not the group is set.
+  push(@groups, @clone_groups);
 }
 $default{'groups'} = \@groups;
 
-Bugzilla::Hook::process('enter_bug_entrydefaultvars', { vars => $vars });
+Bugzilla::Hook::process('enter_bug_entrydefaultvars', {vars => $vars});
 
 $vars->{'default'} = \%default;
 
-my $format = $template->get_format("bug/create/create",
-                                   scalar $cgi->param('format'), 
-                                   scalar $cgi->param('ctype'));
+my $format = $template->get_format(
+  "bug/create/create",
+  scalar $cgi->param('format'),
+  scalar $cgi->param('ctype')
+);
 
 print $cgi->header($format->{'ctype'});
 $template->process($format->{'template'}, $vars)
-  || ThrowTemplateError($template->error());          
+  || ThrowTemplateError($template->error());
diff --git a/extensions/BmpConvert/Config.pm b/extensions/BmpConvert/Config.pm
index 4984f19a9d..aabb8142e0 100644
--- a/extensions/BmpConvert/Config.pm
+++ b/extensions/BmpConvert/Config.pm
@@ -7,17 +7,12 @@
 
 package Bugzilla::Extension::BmpConvert;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use constant NAME => 'BmpConvert';
-use constant REQUIRED_MODULES => [
-  {
-      package => 'PerlMagick',
-      module  => 'Image::Magick',
-      version => 0,
-  },
-];
+use constant REQUIRED_MODULES =>
+  [{package => 'PerlMagick', module => 'Image::Magick', version => 0,},];
 
 __PACKAGE__->NAME;
diff --git a/extensions/BmpConvert/Extension.pm b/extensions/BmpConvert/Extension.pm
index b8201f106d..8bab7620c4 100644
--- a/extensions/BmpConvert/Extension.pm
+++ b/extensions/BmpConvert/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::BmpConvert;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,29 +18,30 @@ use Image::Magick;
 our $VERSION = '1.0';
 
 sub attachment_process_data {
-    my ($self, $args) = @_;
-    return unless $args->{attributes}->{mimetype} eq 'image/bmp';
-
-    my $data = ${$args->{data}};
-    my $img = Image::Magick->new(magick => 'bmp');
-
-    # $data is a filehandle.
-    if (ref $data) {
-        $img->Read(file => \*$data);
-        $img->set(magick => 'png');
-        $img->Write(file => \*$data);
-    }
-    # $data is a blob.
-    else {
-        $img->BlobToImage($data);
-        $img->set(magick => 'png');
-        $data = $img->ImageToBlob();
-    }
-    undef $img;
-
-    ${$args->{data}} = $data;
-    $args->{attributes}->{mimetype} = 'image/png';
-    $args->{attributes}->{filename} =~ s/^(.+)\.bmp$/$1.png/i;
+  my ($self, $args) = @_;
+  return unless $args->{attributes}->{mimetype} eq 'image/bmp';
+
+  my $data = ${$args->{data}};
+  my $img = Image::Magick->new(magick => 'bmp');
+
+  # $data is a filehandle.
+  if (ref $data) {
+    $img->Read(file => \*$data);
+    $img->set(magick => 'png');
+    $img->Write(file => \*$data);
+  }
+
+  # $data is a blob.
+  else {
+    $img->BlobToImage($data);
+    $img->set(magick => 'png');
+    $data = $img->ImageToBlob();
+  }
+  undef $img;
+
+  ${$args->{data}} = $data;
+  $args->{attributes}->{mimetype} = 'image/png';
+  $args->{attributes}->{filename} =~ s/^(.+)\.bmp$/$1.png/i;
 }
 
- __PACKAGE__->NAME;
+__PACKAGE__->NAME;
diff --git a/extensions/Example/API/1_0/Resource/Example.pm b/extensions/Example/API/1_0/Resource/Example.pm
new file mode 100644
index 0000000000..38a2c3b98e
--- /dev/null
+++ b/extensions/Example/API/1_0/Resource/Example.pm
@@ -0,0 +1,49 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::API::1_0::Resource::Example;
+
+use 5.14.0;
+use strict;
+use warnings;
+use parent qw(Bugzilla::API::1_0::Resource);
+use Bugzilla::Error;
+
+#############
+# Constants #
+#############
+
+use constant READ_ONLY => qw(
+  hello
+  throw_an_error
+);
+
+use constant PUBLIC_METHODS => qw(
+  hello
+  throw_an_error
+);
+
+sub REST_RESOURCES {
+  my $rest_resources = [
+    qr{^/hello$},          {GET => {method => 'hello'}},
+    qr{^/throw_an_error$}, {GET => {method => 'throw_an_error'}}
+  ];
+  return $rest_resources;
+}
+
+###########
+# Methods #
+###########
+
+# This can be called as Example.hello() from the WebService.
+sub hello {
+  return {message => 'Hello!'};
+}
+
+sub throw_an_error { ThrowUserError('example_my_error') }
+
+1;
diff --git a/extensions/Example/Config.pm b/extensions/Example/Config.pm
index e7782ef6ce..727d1dd630 100644
--- a/extensions/Example/Config.pm
+++ b/extensions/Example/Config.pm
@@ -7,26 +7,26 @@
 
 package Bugzilla::Extension::Example;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use constant NAME => 'Example';
-use constant REQUIRED_MODULES => [
-    {
-        package => 'Data-Dumper',
-        module  => 'Data::Dumper',
-        version => 0,
-    },
-];
+use constant REQUIRED_MODULES =>
+  [{package => 'Data-Dumper', module => 'Data::Dumper', version => 0,},];
 
 use constant OPTIONAL_MODULES => [
-    {
-        package => 'Acme',
-        module  => 'Acme',
-        version => 1.11,
-        feature => ['example_acme'],
-    },
+  {
+    package => 'Acme',
+    module  => 'Acme',
+    version => 1.11,
+    feature => ['example_acme'],
+  },
 ];
 
+# The map determines which version of
+# the Core API an extension's API modules
+# were written to work with.
+use constant API_VERSION_MAP => {'1_0' => '1_0', '2_0' => '1_0'};
+
 __PACKAGE__->NAME;
diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm
index 256589dab0..8da0ea07b9 100644
--- a/extensions/Example/Extension.pm
+++ b/extensions/Example/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,9 +18,10 @@ use Bugzilla::Error;
 use Bugzilla::Group;
 use Bugzilla::User;
 use Bugzilla::User::Setting;
-use Bugzilla::Util qw(diff_arrays html_quote);
+use Bugzilla::Util qw(diff_arrays html_quote remote_ip);
 use Bugzilla::Status qw(is_open_state);
 use Bugzilla::Install::Filesystem;
+use Bugzilla::WebService::Constants;
 
 # This is extensions/Example/lib/Util.pm. I can load this here in my
 # Extension.pm only because I have a Config.pm.
@@ -34,357 +35,385 @@ use constant REL_EXAMPLE => -127;
 our $VERSION = '1.0';
 
 sub user_can_administer {
-    my ($self, $args) = @_;
-    my $can_administer = $args->{can_administer};
+  my ($self, $args) = @_;
+  my $can_administer = $args->{can_administer};
 
-    # If you add an option to the admin pages (e.g. by using the Hooks in
-    # template/en/default/admin/admin.html.tmpl), you may want to allow
-    # users in another group view admin.cgi
-    #if (Bugzilla->user->in_group('other_group')) {
-    #    $$can_administer = 1;
-    #}
+  # If you add an option to the admin pages (e.g. by using the Hooks in
+  # template/en/default/admin/admin.html.tmpl), you may want to allow
+  # users in another group view admin.cgi
+  #if (Bugzilla->user->in_group('other_group')) {
+  #    $$can_administer = 1;
+  #}
 }
 
 sub admin_editusers_action {
-    my ($self, $args) = @_;
-    my ($vars, $action, $user) = @$args{qw(vars action user)};
-    my $template = Bugzilla->template;
-
-    if ($action eq 'my_action') {
-        # Allow to restrict the search to any group the user is allowed to bless.
-        $vars->{'restrictablegroups'} = $user->bless_groups();
-        $template->process('admin/users/search.html.tmpl', $vars)
-            || ThrowTemplateError($template->error());
-        exit;
-    }
+  my ($self, $args) = @_;
+  my ($vars, $action, $user) = @$args{qw(vars action user)};
+  my $template = Bugzilla->template;
+
+  if ($action eq 'my_action') {
+
+    # Allow to restrict the search to any group the user is allowed to bless.
+    $vars->{'restrictablegroups'} = $user->bless_groups();
+    $template->process('admin/users/search.html.tmpl', $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
 }
 
 sub attachment_process_data {
-    my ($self, $args) = @_;
-    my $type     = $args->{attributes}->{mimetype};
-    my $filename = $args->{attributes}->{filename};
-
-    # Make sure images have the correct extension.
-    # Uncomment the two lines below to make this check effective.
-    if ($type =~ /^image\/(\w+)$/) {
-        my $format = $1;
-        if ($filename =~ /^(.+)(:?\.[^\.]+)$/) {
-            my $name = $1;
-            #$args->{attributes}->{filename} = "${name}.$format";
-        }
-        else {
-            # The file has no extension. We append it.
-            #$args->{attributes}->{filename} .= ".$format";
-        }
+  my ($self, $args) = @_;
+  my $type     = $args->{attributes}->{mimetype};
+  my $filename = $args->{attributes}->{filename};
+
+  # Make sure images have the correct extension.
+  # Uncomment the two lines below to make this check effective.
+  if ($type =~ /^image\/(\w+)$/) {
+    my $format = $1;
+    if ($filename =~ /^(.+)(:?\.[^\.]+)$/) {
+      my $name = $1;
+
+      #$args->{attributes}->{filename} = "${name}.$format";
+    }
+    else {
+      # The file has no extension. We append it.
+      #$args->{attributes}->{filename} .= ".$format";
     }
+  }
 }
 
 sub auth_login_methods {
-    my ($self, $args) = @_;
-    my $modules = $args->{modules};
-    if (exists $modules->{Example}) {
-        $modules->{Example} = 'Bugzilla/Extension/Example/Auth/Login.pm';
-    }
+  my ($self, $args) = @_;
+  my $modules = $args->{modules};
+  if (exists $modules->{Example}) {
+    $modules->{Example} = 'Bugzilla/Extension/Example/Auth/Login.pm';
+  }
 }
 
 sub auth_verify_methods {
-    my ($self, $args) = @_;
-    my $modules = $args->{modules};
-    if (exists $modules->{Example}) {
-        $modules->{Example} = 'Bugzilla/Extension/Example/Auth/Verify.pm';
-    }
+  my ($self, $args) = @_;
+  my $modules = $args->{modules};
+  if (exists $modules->{Example}) {
+    $modules->{Example} = 'Bugzilla/Extension/Example/Auth/Verify.pm';
+  }
 }
 
 sub bug_check_can_change_field {
-    my ($self, $args) = @_;
-
-    my ($bug, $field, $new_value, $old_value, $priv_results)
-        = @$args{qw(bug field new_value old_value priv_results)};
-
-    my $user = Bugzilla->user;
-
-    # Disallow a bug from being reopened if currently closed unless user 
-    # is in 'admin' group
-    if ($field eq 'bug_status' && $bug->product_obj->name eq 'Example') {
-        if (!is_open_state($old_value) && is_open_state($new_value) 
-            && !$user->in_group('admin')) 
-        {
-            push(@$priv_results, PRIVILEGES_REQUIRED_EMPOWERED);
-            return;
-        }
-    }
+  my ($self, $args) = @_;
 
-    # Disallow a bug's keywords from being edited unless user is the
-    # reporter of the bug 
-    if ($field eq 'keywords' && $bug->product_obj->name eq 'Example' 
-        && $user->login ne $bug->reporter->login) 
-    {
-        push(@$priv_results, PRIVILEGES_REQUIRED_REPORTER);
-        return;
-    }
+  my ($bug, $field, $new_value, $old_value, $priv_results)
+    = @$args{qw(bug field new_value old_value priv_results)};
 
-    # Allow updating of priority even if user cannot normally edit the bug 
-    # and they are in group 'engineering'
-    if ($field eq 'priority' && $bug->product_obj->name eq 'Example'
-        && $user->in_group('engineering')) 
+  my $user = Bugzilla->user;
+
+  # Disallow a bug from being reopened if currently closed unless user
+  # is in 'admin' group
+  if ($field eq 'bug_status' && $bug->product_obj->name eq 'Example') {
+    if (!is_open_state($old_value)
+      && is_open_state($new_value)
+      && !$user->in_group('admin'))
     {
-        push(@$priv_results, PRIVILEGES_REQUIRED_NONE);
-        return;
+      push(@$priv_results, PRIVILEGES_REQUIRED_EMPOWERED);
+      return;
     }
+  }
+
+  # Disallow a bug's keywords from being edited unless user is the
+  # reporter of the bug
+  if ( $field eq 'keywords'
+    && $bug->product_obj->name eq 'Example'
+    && $user->login ne $bug->reporter->login)
+  {
+    push(@$priv_results, PRIVILEGES_REQUIRED_REPORTER);
+    return;
+  }
+
+  # Allow updating of priority even if user cannot normally edit the bug
+  # and they are in group 'engineering'
+  if ( $field eq 'priority'
+    && $bug->product_obj->name eq 'Example'
+    && $user->in_group('engineering'))
+  {
+    push(@$priv_results, PRIVILEGES_REQUIRED_NONE);
+    return;
+  }
 }
 
 sub bug_columns {
-    my ($self, $args) = @_;
-    my $columns = $args->{'columns'};
-    push (@$columns, "delta_ts AS example")
+  my ($self, $args) = @_;
+  my $columns = $args->{'columns'};
+  push(@$columns, "delta_ts AS example");
 }
 
 sub bug_end_of_create {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
+
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my $bug       = $args->{'bug'};
+  my $timestamp = $args->{'timestamp'};
+
+  my $bug_id = $bug->id;
 
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my $bug = $args->{'bug'};
-    my $timestamp = $args->{'timestamp'};
-    
-    my $bug_id = $bug->id;
-    # Uncomment this line to see a line in your webserver's error log whenever
-    # you file a bug.
-    # warn "Bug $bug_id has been filed!";
+  # Uncomment this line to see a line in your webserver's error log whenever
+  # you file a bug.
+  # warn "Bug $bug_id has been filed!";
 }
 
 sub bug_end_of_create_validators {
-    my ($self, $args) = @_;
-    
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my $bug_params = $args->{'params'};
-    
-    # Uncomment this line below to see a line in your webserver's error log
-    # containing all validated bug field values every time you file a bug.
-    # warn Dumper($bug_params);
-    
-    # This would remove all ccs from the bug, preventing ANY ccs from being
-    # added on bug creation.
-    # $bug_params->{cc} = [];
-}
+  my ($self, $args) = @_;
 
-sub bug_start_of_update {
-    my ($self, $args) = @_;
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my $bug_params = $args->{'params'};
 
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my ($bug, $old_bug, $timestamp, $changes) = 
-        @$args{qw(bug old_bug timestamp changes)};
+  # Uncomment this line below to see a line in your webserver's error log
+  # containing all validated bug field values every time you file a bug.
+  # warn Dumper($bug_params);
 
-    foreach my $field (keys %$changes) {
-        my $used_to_be = $changes->{$field}->[0];
-        my $now_it_is  = $changes->{$field}->[1];
-    }
+  # This would remove all ccs from the bug, preventing ANY ccs from being
+  # added on bug creation.
+  # $bug_params->{cc} = [];
+}
 
-    my $old_summary = $old_bug->short_desc;
-
-    my $status_message;
-    if (my $status_change = $changes->{'bug_status'}) {
-        my $old_status = new Bugzilla::Status({ name => $status_change->[0] });
-        my $new_status = new Bugzilla::Status({ name => $status_change->[1] });
-        if ($new_status->is_open && !$old_status->is_open) {
-            $status_message = "Bug re-opened!";
-        }
-        if (!$new_status->is_open && $old_status->is_open) {
-            $status_message = "Bug closed!";
-        }
+sub bug_start_of_update {
+  my ($self, $args) = @_;
+
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my ($bug, $old_bug, $timestamp, $changes)
+    = @$args{qw(bug old_bug timestamp changes)};
+
+  foreach my $field (keys %$changes) {
+    my $used_to_be = $changes->{$field}->[0];
+    my $now_it_is  = $changes->{$field}->[1];
+  }
+
+  my $old_summary = $old_bug->short_desc;
+
+  my $status_message;
+  if (my $status_change = $changes->{'bug_status'}) {
+    my $old_status = new Bugzilla::Status({name => $status_change->[0]});
+    my $new_status = new Bugzilla::Status({name => $status_change->[1]});
+    if ($new_status->is_open && !$old_status->is_open) {
+      $status_message = "Bug re-opened!";
+    }
+    if (!$new_status->is_open && $old_status->is_open) {
+      $status_message = "Bug closed!";
     }
+  }
 
-    my $bug_id = $bug->id;
-    my $num_changes = scalar keys %$changes;
-    my $result = "There were $num_changes changes to fields on bug $bug_id"
-                 . " at $timestamp.";
-    # Uncomment this line to see $result in your webserver's error log whenever
-    # you update a bug.
-    # warn $result;
+  my $bug_id      = $bug->id;
+  my $num_changes = scalar keys %$changes;
+  my $result      = "There were $num_changes changes to fields on bug $bug_id"
+    . " at $timestamp.";
+
+  # Uncomment this line to see $result in your webserver's error log whenever
+  # you update a bug.
+  # warn $result;
 }
 
 sub bug_end_of_update {
-    my ($self, $args) = @_;
-    
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my ($bug, $old_bug, $timestamp, $changes) = 
-        @$args{qw(bug old_bug timestamp changes)};
-    
-    foreach my $field (keys %$changes) {
-        my $used_to_be = $changes->{$field}->[0];
-        my $now_it_is  = $changes->{$field}->[1];
+  my ($self, $args) = @_;
+
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my ($bug, $old_bug, $timestamp, $changes)
+    = @$args{qw(bug old_bug timestamp changes)};
+
+  foreach my $field (keys %$changes) {
+    my $used_to_be = $changes->{$field}->[0];
+    my $now_it_is  = $changes->{$field}->[1];
+  }
+
+  my $old_summary = $old_bug->short_desc;
+
+  my $status_message;
+  if (my $status_change = $changes->{'bug_status'}) {
+    my $old_status = new Bugzilla::Status({name => $status_change->[0]});
+    my $new_status = new Bugzilla::Status({name => $status_change->[1]});
+    if ($new_status->is_open && !$old_status->is_open) {
+      $status_message = "Bug re-opened!";
     }
-
-    my $old_summary = $old_bug->short_desc;
-
-    my $status_message;
-    if (my $status_change = $changes->{'bug_status'}) {
-        my $old_status = new Bugzilla::Status({ name => $status_change->[0] });
-        my $new_status = new Bugzilla::Status({ name => $status_change->[1] });
-        if ($new_status->is_open && !$old_status->is_open) {
-            $status_message = "Bug re-opened!";
-        }
-        if (!$new_status->is_open && $old_status->is_open) {
-            $status_message = "Bug closed!";
-        }
+    if (!$new_status->is_open && $old_status->is_open) {
+      $status_message = "Bug closed!";
     }
-    
-    my $bug_id = $bug->id;
-    my $num_changes = scalar keys %$changes;
-    my $result = "There were $num_changes changes to fields on bug $bug_id"
-                 . " at $timestamp.";
-    # Uncomment this line to see $result in your webserver's error log whenever
-    # you update a bug.
-    # warn $result;
+  }
+
+  my $bug_id      = $bug->id;
+  my $num_changes = scalar keys %$changes;
+  my $result      = "There were $num_changes changes to fields on bug $bug_id"
+    . " at $timestamp.";
+
+  # Uncomment this line to see $result in your webserver's error log whenever
+  # you update a bug.
+  # warn $result;
 }
 
 sub bug_fields {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my $fields = $args->{'fields'};
-    push (@$fields, "example")
+  my $fields = $args->{'fields'};
+  push(@$fields, "example");
 }
 
 sub bug_format_comment {
-    my ($self, $args) = @_;
-    
-    # This replaces every occurrence of the word "foo" with the word
-    # "bar"
-    
-    my $regexes = $args->{'regexes'};
-    push(@$regexes, { match => qr/\bfoo\b/, replace => 'bar' });
-    
-    # And this links every occurrence of the word "bar" to example.com,
-    # but it won't affect "foo"s that have already been turned into "bar"
-    # above (because each regex is run in order, and later regexes don't modify
-    # earlier matches, due to some cleverness in Bugzilla's internals).
-    #
-    # For example, the phrase "foo bar" would become:
-    # bar <a href="http://example.com/bar">bar</a>
-    my $bar_match = qr/\b(bar)\b/;
-    push(@$regexes, { match => $bar_match, replace => \&_replace_bar });
+  my ($self, $args) = @_;
+
+  # This replaces every occurrence of the word "foo" with the word
+  # "bar"
+
+  my $regexes = $args->{'regexes'};
+  push(@$regexes, {match => qr/\bfoo\b/, replace => 'bar'});
+
+  # And this links every occurrence of the word "bar" to example.com,
+  # but it won't affect "foo"s that have already been turned into "bar"
+  # above (because each regex is run in order, and later regexes don't modify
+  # earlier matches, due to some cleverness in Bugzilla's internals).
+  #
+  # For example, the phrase "foo bar" would become:
+  # bar <a href="http://example.com/bar">bar</a>
+  my $bar_match = qr/\b(bar)\b/;
+  push(@$regexes, {match => $bar_match, replace => \&_replace_bar});
 }
 
 # Used by bug_format_comment--see its code for an explanation.
 sub _replace_bar {
-    my $args = shift;
-    # $match is the first parentheses match in the $bar_match regex 
-    # in bug-format_comment.pl. We get up to 10 regex matches as 
-    # arguments to this function.
-    my $match = $args->{matches}->[0];
-    # Remember, you have to HTML-escape any data that you are returning!
-    $match = html_quote($match);
-    return qq{<a href="http://example.com/">$match</a>};
-};
+  my $args = shift;
+
+  # $match is the first parentheses match in the $bar_match regex
+  # in bug-format_comment.pl. We get up to 10 regex matches as
+  # arguments to this function.
+  my $match = $args->{matches}->[0];
+
+  # Remember, you have to HTML-escape any data that you are returning!
+  $match = html_quote($match);
+  return qq{<a href="http://example.com/">$match</a>};
+}
 
 sub buglist_columns {
-    my ($self, $args) = @_;
-    
-    my $columns = $args->{'columns'};
-    $columns->{'example'} = { 'name' => 'bugs.delta_ts' , 'title' => 'Example' };
-    $columns->{'product_desc'} = { 'name'  => 'prod_desc.description',
-                                   'title' => 'Product Description' };
+  my ($self, $args) = @_;
+
+  my $columns = $args->{'columns'};
+  $columns->{'example'} = {'name' => 'bugs.delta_ts', 'title' => 'Example'};
+  $columns->{'product_desc'}
+    = {'name' => 'prod_desc.description', 'title' => 'Product Description'};
 }
 
 sub buglist_column_joins {
-    my ($self, $args) = @_;
-    my $joins = $args->{'column_joins'};
+  my ($self, $args) = @_;
+  my $joins = $args->{'column_joins'};
+
+  # This column is added using the "buglist_columns" hook
+  $joins->{'product_desc'} = {
+    from  => 'product_id',
+    to    => 'id',
+    table => 'products',
+    as    => 'prod_desc',
+    join  => 'INNER',
+  };
+}
+
+sub buglist_format {
+  my ($self, $args) = @_;
+  my $vars   = $args->{'vars'};
+  my $format = $args->{'format'};
+  my $params = $args->{'params'};
 
-    # This column is added using the "buglist_columns" hook
-    $joins->{'product_desc'} = {
-        from  => 'product_id',
-        to    => 'id',
-        table => 'products',
-        as    => 'prod_desc',
-        join  => 'INNER',
-    };
+  if ($format->{'template'} eq "list/list-example.html.tmpl") {
+    $vars->{'example'} = $params->param('example');
+  }
 }
 
 sub search_operator_field_override {
-    my ($self, $args) = @_;
-    
-    my $operators = $args->{'operators'};
+  my ($self, $args) = @_;
 
-    my $original = $operators->{component}->{_non_changed};
-    $operators->{component} = {
-        _non_changed => sub { _component_nonchanged($original, @_) }
-    };
+  my $operators = $args->{'operators'};
+
+  my $original = $operators->{component}->{_non_changed};
+  $operators->{component} = {
+    _non_changed => sub { _component_nonchanged($original, @_) }
+  };
 }
 
 sub _component_nonchanged {
-    my $original = shift;
-    my ($invocant, $args) = @_;
+  my $original = shift;
+  my ($invocant, $args) = @_;
+
+  $invocant->$original($args);
 
-    $invocant->$original($args);
-    # Actually, it does not change anything in the result,
-    # just an example.
-    $args->{term} = $args->{term} . " OR 1=2";
+  # Actually, it does not change anything in the result,
+  # just an example.
+  $args->{term} = $args->{term} . " OR 1=2";
 }
 
 sub bugmail_recipients {
-    my ($self, $args) = @_;
-    my $recipients = $args->{recipients};
-    my $bug = $args->{bug};
-
-    my $user = 
-        new Bugzilla::User({ name => Bugzilla->params->{'maintainer'} });
-
-    if ($bug->id == 1) {
-        # Uncomment the line below to add the maintainer to the recipients
-        # list of every bugmail from bug 1 as though that the maintainer
-        # were on the CC list.
-        #$recipients->{$user->id}->{+REL_CC} = 1;
-
-        # And this line adds the maintainer as though they had the
-        # "REL_EXAMPLE" relationship from the bugmail_relationships hook below.
-        #$recipients->{$user->id}->{+REL_EXAMPLE} = 1;
-    }
+  my ($self, $args) = @_;
+  my $recipients = $args->{recipients};
+  my $bug        = $args->{bug};
+
+  my $user = new Bugzilla::User({name => Bugzilla->params->{'maintainer'}});
+
+  if ($bug->id == 1) {
+
+    # Uncomment the line below to add the maintainer to the recipients
+    # list of every bugmail from bug 1 as though that the maintainer
+    # were on the CC list.
+    #$recipients->{$user->id}->{+REL_CC} = 1;
+
+    # And this line adds the maintainer as though they had the
+    # "REL_EXAMPLE" relationship from the bugmail_relationships hook below.
+    #$recipients->{$user->id}->{+REL_EXAMPLE} = 1;
+  }
 }
 
 sub bugmail_relationships {
-    my ($self, $args) = @_;
-    my $relationships = $args->{relationships};
-    $relationships->{+REL_EXAMPLE} = 'Example';
+  my ($self, $args) = @_;
+  my $relationships = $args->{relationships};
+  $relationships->{+REL_EXAMPLE} = 'Example';
 }
 
 sub cgi_headers {
-    my ($self, $args) = @_;
-    my $headers = $args->{'headers'};
+  my ($self, $args) = @_;
+  my $headers = $args->{'headers'};
 
-    $headers->{'-x_test_header'} = "Test header from Example extension";
+  $headers->{'-x_test_header'} = "Test header from Example extension";
 }
 
 sub config_add_panels {
-    my ($self, $args) = @_;
-    
-    my $modules = $args->{panel_modules};
-    $modules->{Example} = "Bugzilla::Extension::Example::Config";
+  my ($self, $args) = @_;
+
+  my $modules = $args->{panel_modules};
+  $modules->{Example} = "Bugzilla::Extension::Example::Config";
 }
 
 sub config_modify_panels {
-    my ($self, $args) = @_;
-    
-    my $panels = $args->{panels};
-    
-    # Add the "Example" auth methods.
-    my $auth_params = $panels->{'auth'}->{params};
-    my ($info_class)   = grep($_->{name} eq 'user_info_class', @$auth_params);
-    my ($verify_class) = grep($_->{name} eq 'user_verify_class', @$auth_params);
+  my ($self, $args) = @_;
+
+  my $panels = $args->{panels};
 
-    push(@{ $info_class->{choices} },   'CGI,Example');
-    push(@{ $verify_class->{choices} }, 'Example');
+  # Add the "Example" auth methods.
+  my $auth_params = $panels->{'auth'}->{params};
+  my ($info_class)   = grep($_->{name} eq 'user_info_class',   @$auth_params);
+  my ($verify_class) = grep($_->{name} eq 'user_verify_class', @$auth_params);
 
-    push(@$auth_params, { name => 'param_example',
-                          type => 't',
-                          default => 0,
-                          checker => \&check_numeric });    
+  push(@{$info_class->{choices}},   'CGI,Example');
+  push(@{$verify_class->{choices}}, 'Example');
+
+  push(
+    @$auth_params,
+    {
+      name    => 'param_example',
+      type    => 't',
+      default => 0,
+      checker => \&check_numeric
+    }
+  );
 }
 
 sub db_schema_abstract_schema {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
+
 #    $args->{'schema'}->{'example_table'} = {
 #        FIELDS => [
 #            id       => {TYPE => 'SMALLSERIAL', NOTNULL => 1,
@@ -403,630 +432,704 @@ sub db_schema_abstract_schema {
 }
 
 sub email_in_before_parse {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my $subject = $args->{mail}->header('Subject');
-    # Correctly extract the bug ID from email subjects of the form [Bug comp/NNN].
-    if ($subject =~ /\[.*(\d+)\].*/) {
-        $args->{fields}->{bug_id} = $1;
-    }
+  my $subject = $args->{mail}->header('Subject');
+
+  # Correctly extract the bug ID from email subjects of the form [Bug comp/NNN].
+  if ($subject =~ /\[.*(\d+)\].*/) {
+    $args->{fields}->{bug_id} = $1;
+  }
 }
 
 sub email_in_after_parse {
-    my ($self, $args) = @_;
-    my $reporter = $args->{fields}->{reporter};
-    my $dbh = Bugzilla->dbh;
-
-    # No other check needed if this is a valid regular user.
-    return if login_to_id($reporter);
-
-    # The reporter is not a regular user. We create an account for them,
-    # but they can only comment on existing bugs.
-    # This is useful for people who reply by email to bugmails received
-    # in mailing-lists.
-    if ($args->{fields}->{bug_id}) {
-        # WARNING: we return now to skip the remaining code below.
-        # You must understand that removing this line would make the code
-        # below effective! Do it only if you are OK with the behavior
-        # described here.
-        return;
-
-        Bugzilla::User->create({ login_name => $reporter, cryptpassword => '*' });
-
-        # For security reasons, delete all fields unrelated to comments.
-        foreach my $field (keys %{$args->{fields}}) {
-            next if $field =~ /^(?:bug_id|comment|reporter)$/;
-            delete $args->{fields}->{$field};
-        }
-    }
-    else {
-        ThrowUserError('invalid_username', { name => $reporter });
+  my ($self, $args) = @_;
+  my $reporter = $args->{fields}->{reporter};
+  my $dbh      = Bugzilla->dbh;
+
+  # No other check needed if this is a valid regular user.
+  return if login_to_id($reporter);
+
+  # The reporter is not a regular user. We create an account for them,
+  # but they can only comment on existing bugs.
+  # This is useful for people who reply by email to bugmails received
+  # in mailing-lists.
+  if ($args->{fields}->{bug_id}) {
+
+    # WARNING: we return now to skip the remaining code below.
+    # You must understand that removing this line would make the code
+    # below effective! Do it only if you are OK with the behavior
+    # described here.
+    return;
+
+    Bugzilla::User->create({login_name => $reporter, cryptpassword => '*'});
+
+    # For security reasons, delete all fields unrelated to comments.
+    foreach my $field (keys %{$args->{fields}}) {
+      next if $field =~ /^(?:bug_id|comment|reporter)$/;
+      delete $args->{fields}->{$field};
     }
+  }
+  else {
+    ThrowUserError('invalid_username', {name => $reporter});
+  }
 }
 
 sub enter_bug_entrydefaultvars {
-    my ($self, $args) = @_;
-    
-    my $vars = $args->{vars};
-    $vars->{'example'} = 1;
+  my ($self, $args) = @_;
+
+  my $vars = $args->{vars};
+  $vars->{'example'} = 1;
 }
 
 sub error_catch {
-    my ($self, $args) = @_;
-    # Customize the error message displayed when someone tries to access
-    # page.cgi with an invalid page ID, and keep track of this attempt
-    # in the web server log.
-    return unless Bugzilla->error_mode == ERROR_MODE_WEBPAGE;
-    return unless $args->{error} eq 'bad_page_cgi_id';
-
-    my $page_id = $args->{vars}->{page_id};
-    my $login = Bugzilla->user->identity || "Someone";
-    warn "$login attempted to access page.cgi with id = $page_id";
-
-    my $page = $args->{message};
-    my $new_error_msg = "Ah ah, you tried to access $page_id? Good try!";
-    $new_error_msg = html_quote($new_error_msg);
-    # There are better tools to parse an HTML page, but it's just an example.
-    # Since Perl 5.16, we can no longer write "class" inside look-behind
-    # assertions, because "ss" is also seen as the german Ăź character, which
-    # makes Perl 5.16 complain. The right fix is to use the /aa modifier,
-    # but it's only understood since Perl 5.14. So the workaround is to write
-    # "clas[s]" instead of "class". Stupid and ugly hack, but it works with
-    # all Perl versions.
-    $$page =~ s/(?<=<td id="error_msg" clas[s]="throw_error">).*(?=<\/td>)/$new_error_msg/si;
+  my ($self, $args) = @_;
+
+  # Customize the error message displayed when someone tries to access
+  # page.cgi with an invalid page ID, and keep track of this attempt
+  # in the web server log.
+  return unless Bugzilla->error_mode == ERROR_MODE_WEBPAGE;
+  return unless $args->{error} eq 'bad_page_cgi_id';
+
+  my $page_id = $args->{vars}->{page_id};
+  my $login = Bugzilla->user->identity || "Someone";
+  warn "$login attempted to access page.cgi with id = $page_id";
+
+  my $page          = $args->{message};
+  my $new_error_msg = "Ah ah, you tried to access $page_id? Good try!";
+  $new_error_msg = html_quote($new_error_msg);
+
+  # There are better tools to parse an HTML page, but it's just an example.
+  $$page
+    =~ s/<div id="error_msg" class="throw_error">\K(.*)/$new_error_msg<br>$1/siaa;
 }
 
 sub flag_end_of_update {
-    my ($self, $args) = @_;
-    
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my $flag_params = $args;
-    my ($object, $timestamp, $old_flags, $new_flags) =
-        @$flag_params{qw(object timestamp old_flags new_flags)};
-    my ($removed, $added) = diff_arrays($old_flags, $new_flags);
-    my ($granted, $denied) = (0, 0);
-    foreach my $new_flag (@$added) {
-        $granted++ if $new_flag =~ /\+$/;
-        $denied++ if $new_flag =~ /-$/;
-    }
-    my $bug_id = $object->isa('Bugzilla::Bug') ? $object->id 
-                                               : $object->bug_id;
-    my $result = "$granted flags were granted and $denied flags were denied"
-                 . " on bug $bug_id at $timestamp.";
-    # Uncomment this line to see $result in your webserver's error log whenever
-    # you update flags.
-    # warn $result;
+  my ($self, $args) = @_;
+
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my $flag_params = $args;
+  my ($object, $timestamp, $old_flags, $new_flags)
+    = @$flag_params{qw(object timestamp old_flags new_flags)};
+  my ($removed, $added) = diff_arrays($old_flags, $new_flags);
+  my ($granted, $denied) = (0, 0);
+  foreach my $new_flag (@$added) {
+    $granted++ if $new_flag =~ /\+$/;
+    $denied++  if $new_flag =~ /-$/;
+  }
+  my $bug_id = $object->isa('Bugzilla::Bug') ? $object->id : $object->bug_id;
+  my $result = "$granted flags were granted and $denied flags were denied"
+    . " on bug $bug_id at $timestamp.";
+
+  # Uncomment this line to see $result in your webserver's error log whenever
+  # you update flags.
+  # warn $result;
 }
 
 sub group_before_delete {
-    my ($self, $args) = @_;
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
+  my ($self, $args) = @_;
+
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+
+  my $group    = $args->{'group'};
+  my $group_id = $group->id;
 
-    my $group = $args->{'group'};
-    my $group_id = $group->id;
-    # Uncomment this line to see a line in your webserver's error log whenever
-    # you file a bug.
-    # warn "Group $group_id is about to be deleted!";
+  # Uncomment this line to see a line in your webserver's error log whenever
+  # you file a bug.
+  # warn "Group $group_id is about to be deleted!";
 }
 
 sub group_end_of_create {
-    my ($self, $args) = @_;
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my $group = $args->{'group'};
+  my ($self, $args) = @_;
+
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my $group = $args->{'group'};
+
+  my $group_id = $group->id;
 
-    my $group_id = $group->id;
-    # Uncomment this line to see a line in your webserver's error log whenever
-    # you create a new group.
-    #warn "Group $group_id has been created!";
+  # Uncomment this line to see a line in your webserver's error log whenever
+  # you create a new group.
+  #warn "Group $group_id has been created!";
 }
 
 sub group_end_of_update {
-    my ($self, $args) = @_;
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
+  my ($self, $args) = @_;
 
-    my ($group, $changes) = @$args{qw(group changes)};
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
 
-    foreach my $field (keys %$changes) {
-        my $used_to_be = $changes->{$field}->[0];
-        my $now_it_is  = $changes->{$field}->[1];
-    }
+  my ($group, $changes) = @$args{qw(group changes)};
+
+  foreach my $field (keys %$changes) {
+    my $used_to_be = $changes->{$field}->[0];
+    my $now_it_is  = $changes->{$field}->[1];
+  }
 
-    my $group_id = $group->id;
-    my $num_changes = scalar keys %$changes;
-    my $result = 
-        "There were $num_changes changes to fields on group $group_id.";
-    # Uncomment this line to see $result in your webserver's error log whenever
-    # you update a group.
-    #warn $result;
+  my $group_id    = $group->id;
+  my $num_changes = scalar keys %$changes;
+  my $result = "There were $num_changes changes to fields on group $group_id.";
+
+  # Uncomment this line to see $result in your webserver's error log whenever
+  # you update a group.
+  #warn $result;
 }
 
 sub install_before_final_checks {
-    my ($self, $args) = @_;
-    print "Install-before_final_checks hook\n" unless $args->{silent};
-    
-    # Add a new user setting like this:
-    #
-    # add_setting('product_chooser',           # setting name
-    #             ['pretty', 'full', 'small'], # options
-    #             'pretty');                   # default
-    #
-    # To add descriptions for the setting and choices, add extra values to 
-    # the hash defined in global/setting-descs.none.tmpl. Do this in a hook: 
-    # hook/global/setting-descs-settings.none.tmpl .
+  my ($self, $args) = @_;
+  print "Install-before_final_checks hook\n" unless $args->{silent};
+
+  # Add a new user setting like this:
+  #
+  # add_setting('product_chooser',           # setting name
+  #             ['pretty', 'full', 'small'], # options
+  #             'pretty');                   # default
+  #
+  # To add descriptions for the setting and choices, add extra values to
+  # the hash defined in global/setting-descs.none.tmpl. Do this in a hook:
+  # hook/global/setting-descs-settings.none.tmpl .
 }
 
 sub install_filesystem {
-    my ($self, $args) = @_;
-    my $create_dirs  = $args->{'create_dirs'};
-    my $recurse_dirs = $args->{'recurse_dirs'};
-    my $htaccess     = $args->{'htaccess'};
-
-    # Create a new directory in datadir specifically for this extension.
-    # The directory will need to allow files to be created by the extension
-    # code as well as allow the webserver to server content from it.
-    # my $data_path = bz_locations->{'datadir'} . "/" . __PACKAGE__->NAME;
-    # $create_dirs->{$data_path} = Bugzilla::Install::Filesystem::DIR_CGI_WRITE;
-   
-    # Update the permissions of any files and directories that currently reside
-    # in the extension's directory. 
-    # $recurse_dirs->{$data_path} = {
-    #     files => Bugzilla::Install::Filesystem::CGI_READ,
-    #     dirs  => Bugzilla::Install::Filesystem::DIR_CGI_WRITE
-    # };
-    
-    # Create a htaccess file that allows specific content to be served from the 
-    # extension's directory.
-    # $htaccess->{"$data_path/.htaccess"} = {
-    #     perms    => Bugzilla::Install::Filesystem::WS_SERVE,
-    #     contents => Bugzilla::Install::Filesystem::HT_DEFAULT_DENY
-    # };
+  my ($self, $args) = @_;
+  my $create_dirs  = $args->{'create_dirs'};
+  my $recurse_dirs = $args->{'recurse_dirs'};
+  my $htaccess     = $args->{'htaccess'};
+
+  # Create a new directory in datadir specifically for this extension.
+  # The directory will need to allow files to be created by the extension
+  # code as well as allow the webserver to server content from it.
+  # my $data_path = bz_locations->{'datadir'} . "/" . __PACKAGE__->NAME;
+  # $create_dirs->{$data_path} = Bugzilla::Install::Filesystem::DIR_CGI_WRITE;
+
+  # Update the permissions of any files and directories that currently reside
+  # in the extension's directory.
+  # $recurse_dirs->{$data_path} = {
+  #     files => Bugzilla::Install::Filesystem::CGI_READ,
+  #     dirs  => Bugzilla::Install::Filesystem::DIR_CGI_WRITE
+  # };
+
+  # Create a htaccess file that allows specific content to be served from the
+  # extension's directory.
+  # $htaccess->{"$data_path/.htaccess"} = {
+  #     perms    => Bugzilla::Install::Filesystem::WS_SERVE,
+  #     contents => Bugzilla::Install::Filesystem::HT_DEFAULT_DENY
+  # };
 }
 
 sub install_update_db {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
+
 #    $dbh->bz_add_column('example', 'new_column',
 #                        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
 #    $dbh->bz_add_index('example', 'example_new_column_idx', [qw(value)]);
 }
 
 sub install_update_db_fielddefs {
-    my $dbh = Bugzilla->dbh;
-#    $dbh->bz_add_column('fielddefs', 'example_column', 
+  my $dbh = Bugzilla->dbh;
+
+#    $dbh->bz_add_column('fielddefs', 'example_column',
 #                        {TYPE => 'MEDIUMTEXT', NOTNULL => 1, DEFAULT => ''});
 }
 
 sub job_map {
-    my ($self, $args) = @_;
-    
-    my $job_map = $args->{job_map};
-    
-    # This adds the named class (an instance of TheSchwartz::Worker) as a
-    # handler for when a job is added with the name "some_task".
-    $job_map->{'some_task'} = 'Bugzilla::Extension::Example::Job::SomeClass';
-    
-    # Schedule a job like this:
-    # my $queue = Bugzilla->job_queue();
-    # $queue->insert('some_task', { some_parameter => $some_variable });
+  my ($self, $args) = @_;
+
+  my $job_map = $args->{job_map};
+
+  # This adds the named class (an instance of TheSchwartz::Worker) as a
+  # handler for when a job is added with the name "some_task".
+  $job_map->{'some_task'} = 'Bugzilla::Extension::Example::Job::SomeClass';
+
+  # Schedule a job like this:
+  # my $queue = Bugzilla->job_queue();
+  # $queue->insert('some_task', { some_parameter => $some_variable });
 }
 
 sub mailer_before_send {
-    my ($self, $args) = @_;
-    
-    my $email = $args->{email};
-    # If you add a header to an email, it's best to start it with
-    # 'X-Bugzilla-<Extension>' so that you don't conflict with
-    # other extensions.
-    $email->header_set('X-Bugzilla-Example-Header', 'Example');
+  my ($self, $args) = @_;
+
+  my $email = $args->{email};
+
+  # If you add a header to an email, it's best to start it with
+  # 'X-Bugzilla-<Extension>' so that you don't conflict with
+  # other extensions.
+  $email->header_set('X-Bugzilla-Example-Header', 'Example');
+}
+
+sub migrate_modules {
+  my ($self, $args) = @_;
+  $args->{path}   = bz_locations->{'extensionsdir'} . "/Example/lib/Migrate";
+  $args->{prefix} = "Bugzilla::Extension::Example::Migrate";
 }
 
 sub object_before_create {
-    my ($self, $args) = @_;
-    
-    my $class = $args->{'class'};
-    my $object_params = $args->{'params'};
-    
-    # Note that this is a made-up class, for this example.
-    if ($class->isa('Bugzilla::ExampleObject')) {
-        warn "About to create an ExampleObject!";
-        warn "Got the following parameters: " 
-             . join(', ', keys(%$object_params));
-    }
+  my ($self, $args) = @_;
+
+  my $class         = $args->{'class'};
+  my $object_params = $args->{'params'};
+
+  # Note that this is a made-up class, for this example.
+  if ($class->isa('Bugzilla::ExampleObject')) {
+    warn "About to create an ExampleObject!";
+    warn "Got the following parameters: " . join(', ', keys(%$object_params));
+  }
 }
 
 sub object_before_delete {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my $object = $args->{'object'};
+  my $object = $args->{'object'};
 
-    # Note that this is a made-up class, for this example.
-    if ($object->isa('Bugzilla::ExampleObject')) {
-        my $id = $object->id;
-        warn "An object with id $id is about to be deleted!";
-    } 
+  # Note that this is a made-up class, for this example.
+  if ($object->isa('Bugzilla::ExampleObject')) {
+    my $id = $object->id;
+    warn "An object with id $id is about to be deleted!";
+  }
 }
 
 sub object_before_set {
-    my ($self, $args) = @_;
-    
-    my ($object, $field, $value) = @$args{qw(object field value)};
-    
-    # Note that this is a made-up class, for this example.
-    if ($object->isa('Bugzilla::ExampleObject')) {
-        warn "The field $field is changing from " . $object->{$field} 
-             . " to $value!";
-    }
+  my ($self, $args) = @_;
+
+  my ($object, $field, $value) = @$args{qw(object field value)};
+
+  # Note that this is a made-up class, for this example.
+  if ($object->isa('Bugzilla::ExampleObject')) {
+    warn "The field $field is changing from " . $object->{$field} . " to $value!";
+  }
 }
 
 sub object_columns {
-    my ($self, $args) = @_;
-    my ($class, $columns) = @$args{qw(class columns)};
+  my ($self,  $args)    = @_;
+  my ($class, $columns) = @$args{qw(class columns)};
 
-    if ($class->isa('Bugzilla::ExampleObject')) {
-        push(@$columns, 'example');
-    }
+  if ($class->isa('Bugzilla::ExampleObject')) {
+    push(@$columns, 'example');
+  }
 }
 
 sub object_end_of_create {
-    my ($self, $args) = @_;
-    
-    my $class  = $args->{'class'};
-    my $object = $args->{'object'};
+  my ($self, $args) = @_;
 
-    warn "Created a new $class object!";
+  my $class  = $args->{'class'};
+  my $object = $args->{'object'};
+
+  warn "Created a new $class object!";
 }
 
 sub object_end_of_create_validators {
-    my ($self, $args) = @_;
-    
-    my $class = $args->{'class'};
-    my $object_params = $args->{'params'};
-    
-    # Note that this is a made-up class, for this example.
-    if ($class->isa('Bugzilla::ExampleObject')) {
-        # Always set example_field to 1, even if the validators said otherwise.
-        $object_params->{example_field} = 1;
-    }
-    
+  my ($self, $args) = @_;
+
+  my $class         = $args->{'class'};
+  my $object_params = $args->{'params'};
+
+  # Note that this is a made-up class, for this example.
+  if ($class->isa('Bugzilla::ExampleObject')) {
+
+    # Always set example_field to 1, even if the validators said otherwise.
+    $object_params->{example_field} = 1;
+  }
+
 }
 
 sub object_end_of_set {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my ($object, $field) = @$args{qw(object field)};
+  my ($object, $field) = @$args{qw(object field)};
 
-    # Note that this is a made-up class, for this example.
-    if ($object->isa('Bugzilla::ExampleObject')) {
-        warn "The field $field has changed to " . $object->{$field};
-    }
+  # Note that this is a made-up class, for this example.
+  if ($object->isa('Bugzilla::ExampleObject')) {
+    warn "The field $field has changed to " . $object->{$field};
+  }
 }
 
 sub object_end_of_set_all {
-    my ($self, $args) = @_;
-    
-    my $object = $args->{'object'};
-    my $object_params = $args->{'params'};
-    
-    # Note that this is a made-up class, for this example.
-    if ($object->isa('Bugzilla::ExampleObject')) {
-        if ($object_params->{example_field} == 1) {
-            $object->{example_field} = 1;
-        }
+  my ($self, $args) = @_;
+
+  my $object        = $args->{'object'};
+  my $object_params = $args->{'params'};
+
+  # Note that this is a made-up class, for this example.
+  if ($object->isa('Bugzilla::ExampleObject')) {
+    if ($object_params->{example_field} == 1) {
+      $object->{example_field} = 1;
     }
-    
+  }
+
 }
 
 sub object_end_of_update {
-    my ($self, $args) = @_;
-    
-    my ($object, $old_object, $changes) = 
-        @$args{qw(object old_object changes)};
-    
-    # Note that this is a made-up class, for this example.
-    if ($object->isa('Bugzilla::ExampleObject')) {
-        if (defined $changes->{'name'}) {
-            my ($old, $new) = @{ $changes->{'name'} };
-            print "The name field changed from $old to $new!";
-        }
+  my ($self, $args) = @_;
+
+  my ($object, $old_object, $changes) = @$args{qw(object old_object changes)};
+
+  # Note that this is a made-up class, for this example.
+  if ($object->isa('Bugzilla::ExampleObject')) {
+    if (defined $changes->{'name'}) {
+      my ($old, $new) = @{$changes->{'name'}};
+      print "The name field changed from $old to $new!";
     }
+  }
 }
 
 sub object_update_columns {
-    my ($self, $args) = @_;
-    my ($object, $columns) = @$args{qw(object columns)};
+  my ($self,   $args)    = @_;
+  my ($object, $columns) = @$args{qw(object columns)};
 
-    if ($object->isa('Bugzilla::ExampleObject')) {
-        push(@$columns, 'example');
-    }
+  if ($object->isa('Bugzilla::ExampleObject')) {
+    push(@$columns, 'example');
+  }
 }
 
 sub object_validators {
-    my ($self, $args) = @_;
-    my ($class, $validators) = @$args{qw(class validators)};
-
-    if ($class->isa('Bugzilla::Bug')) {
-        # This is an example of adding a new validator.
-        # See the _check_example subroutine below.
-        $validators->{example} = \&_check_example;
-
-        # This is an example of overriding an existing validator.
-        # See the check_short_desc validator below.
-        my $original = $validators->{short_desc};
-        $validators->{short_desc} = sub { _check_short_desc($original, @_) };
-    }
+  my ($self,  $args)       = @_;
+  my ($class, $validators) = @$args{qw(class validators)};
+
+  if ($class->isa('Bugzilla::Bug')) {
+
+    # This is an example of adding a new validator.
+    # See the _check_example subroutine below.
+    $validators->{example} = \&_check_example;
+
+    # This is an example of overriding an existing validator.
+    # See the check_short_desc validator below.
+    my $original = $validators->{short_desc};
+    $validators->{short_desc} = sub { _check_short_desc($original, @_) };
+  }
 }
 
 sub _check_example {
-    my ($invocant, $value, $field) = @_;
-    warn "I was called to validate the value of $field.";
-    warn "The value of $field that I was passed in is: $value";
+  my ($invocant, $value, $field) = @_;
+  warn "I was called to validate the value of $field.";
+  warn "The value of $field that I was passed in is: $value";
 
-    # Make the value always be 1.
-    my $fixed_value = 1;
-    return $fixed_value;
+  # Make the value always be 1.
+  my $fixed_value = 1;
+  return $fixed_value;
 }
 
 sub _check_short_desc {
-    my $original = shift;
-    my $invocant = shift;
-    my $value = $invocant->$original(@_);
-    if ($value !~ /example/i) {
-        # Use this line to make Bugzilla throw an error every time
-        # you try to file a bug or update a bug without the word "example"
-        # in the summary.
-        if (0) {
-            ThrowUserError('example_short_desc_invalid');
-        }
+  my $original = shift;
+  my $invocant = shift;
+  my $value    = $invocant->$original(@_);
+  if ($value !~ /example/i) {
+
+    # Use this line to make Bugzilla throw an error every time
+    # you try to file a bug or update a bug without the word "example"
+    # in the summary.
+    if (0) {
+      ThrowUserError('example_short_desc_invalid');
     }
-    return $value;
+  }
+  return $value;
 }
 
 sub page_before_template {
-    my ($self, $args) = @_;
-    
-    my ($vars, $page) = @$args{qw(vars page_id)};
-    
-    # You can see this hook in action by loading page.cgi?id=example.html
-    if ($page eq 'example.html') {
-        $vars->{cgi_variables} = { Bugzilla->cgi->Vars };
-    }
+  my ($self, $args) = @_;
+
+  my ($vars, $page) = @$args{qw(vars page_id)};
+
+  # You can see this hook in action by loading page.cgi?id=example.html
+  if ($page eq 'example.html') {
+    $vars->{cgi_variables} = {Bugzilla->cgi->Vars};
+  }
 }
 
 sub path_info_whitelist {
-    my ($self, $args) = @_;
-    my $whitelist = $args->{whitelist};
-    push(@$whitelist, "page.cgi");
+  my ($self, $args) = @_;
+  my $whitelist = $args->{whitelist};
+  push(@$whitelist, "page.cgi");
 }
 
 sub post_bug_after_creation {
-    my ($self, $args) = @_;
-    
-    my $vars = $args->{vars};
-    $vars->{'example'} = 1;
+  my ($self, $args) = @_;
+
+  my $vars = $args->{vars};
+  $vars->{'example'} = 1;
 }
 
 sub product_confirm_delete {
-    my ($self, $args) = @_;
-    
-    my $vars = $args->{vars};
-    $vars->{'example'} = 1;
+  my ($self, $args) = @_;
+
+  my $vars = $args->{vars};
+  $vars->{'example'} = 1;
 }
 
 
 sub product_end_of_create {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
+
+  my $product = $args->{product};
 
-    my $product = $args->{product};
+  # For this example, any lines of code that actually make changes to your
+  # database have been commented out.
 
-    # For this example, any lines of code that actually make changes to your
-    # database have been commented out.
+  # This section will take a group that exists in your installation
+  # (possible called test_group) and automatically makes the new
+  # product hidden to only members of the group. Just remove
+  # the restriction if you want the new product to be public.
 
-    # This section will take a group that exists in your installation
-    # (possible called test_group) and automatically makes the new
-    # product hidden to only members of the group. Just remove
-    # the restriction if you want the new product to be public.
+  my $example_group = new Bugzilla::Group({name => 'example_group'});
 
-    my $example_group = new Bugzilla::Group({ name => 'example_group' });
+  if ($example_group) {
+    $product->set_group_controls(
+      $example_group,
+      {
+        entry         => 1,
+        membercontrol => CONTROLMAPMANDATORY,
+        othercontrol  => CONTROLMAPMANDATORY
+      }
+    );
 
-    if ($example_group) {
-        $product->set_group_controls($example_group, 
-                { entry          => 1,
-                  membercontrol  => CONTROLMAPMANDATORY,
-                  othercontrol   => CONTROLMAPMANDATORY });
 #        $product->update();
-    }
+  }
+
+  # This section will automatically add a default component
+  # to the new product called 'No Component'.
 
-    # This section will automatically add a default component
-    # to the new product called 'No Component'.
+  my $default_assignee
+    = new Bugzilla::User({name => Bugzilla->params->{maintainer}});
 
-    my $default_assignee = new Bugzilla::User(
-        { name => Bugzilla->params->{maintainer} });
+  if ($default_assignee) {
 
-    if ($default_assignee) {
 #        Bugzilla::Component->create(
 #            { name             => 'No Component',
 #              product          => $product,
-#              description      => 'Select this component if one does not ' . 
+#              description      => 'Select this component if one does not ' .
 #                                  'exist in the current list of components',
 #              initialowner     => $default_assignee });
-    }
+  }
+}
+
+sub query_format {
+  my ($self, $args) = @_;
+  my $vars    = $args->{'vars'};
+  my $default = $vars->{'default'};
+  my $format  = $args->{'format'};
+
+  # change some default values
+  if ($format->{'template'} eq "search/search-example.html.tmpl") {
+    $default->{'example'}[0] = $default->{'example'}[0] || "example";
+  }
 }
 
 sub quicksearch_map {
-    my ($self, $args) = @_;
-    my $map = $args->{'map'};
+  my ($self, $args) = @_;
+  my $map = $args->{'map'};
 
-    # This demonstrates adding a shorter alias for a long custom field name.
-    $map->{'impact'} = $map->{'cf_long_field_name_for_impact_field'};
+  # This demonstrates adding a shorter alias for a long custom field name.
+  $map->{'impact'} = $map->{'cf_long_field_name_for_impact_field'};
 }
 
 sub sanitycheck_check {
-    my ($self, $args) = @_;
-    
-    my $dbh = Bugzilla->dbh;
-    my $sth;
-    
-    my $status = $args->{'status'};
-    
-    # Check that all users are Australian
-    $status->('example_check_au_user');
-    
-    $sth = $dbh->prepare("SELECT userid, login_name
+  my ($self, $args) = @_;
+
+  my $dbh = Bugzilla->dbh;
+  my $sth;
+
+  my $status = $args->{'status'};
+
+  # Check that all users are Australian
+  $status->('example_check_au_user');
+
+  $sth = $dbh->prepare(
+    "SELECT userid, login_name
                             FROM profiles
-                           WHERE login_name NOT LIKE '%.au'");
-    $sth->execute;
-    
-    my $seen_nonau = 0;
-    while (my ($userid, $login, $numgroups) = $sth->fetchrow_array) {
-        $status->('example_check_au_user_alert',
-                  { userid => $userid, login => $login },
-                  'alert');
-        $seen_nonau = 1;
-    }
-    
-    $status->('example_check_au_user_prompt') if $seen_nonau;
+                           WHERE login_name NOT LIKE '%.au'"
+  );
+  $sth->execute;
+
+  my $seen_nonau = 0;
+  while (my ($userid, $login, $numgroups) = $sth->fetchrow_array) {
+    $status->(
+      'example_check_au_user_alert', {userid => $userid, login => $login}, 'alert'
+    );
+    $seen_nonau = 1;
+  }
+
+  $status->('example_check_au_user_prompt') if $seen_nonau;
 }
 
 sub sanitycheck_repair {
-    my ($self, $args) = @_;
-    
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    
-    my $status = $args->{'status'};
-    
-    if ($cgi->param('example_repair_au_user')) {
-        $status->('example_repair_au_user_start');
-    
-        #$dbh->do("UPDATE profiles
-        #             SET login_name = CONCAT(login_name, '.au')
-        #           WHERE login_name NOT LIKE '%.au'");
-    
-        $status->('example_repair_au_user_end');
-    }
+  my ($self, $args) = @_;
+
+  my $cgi = Bugzilla->cgi;
+  my $dbh = Bugzilla->dbh;
+
+  my $status = $args->{'status'};
+
+  if ($cgi->param('example_repair_au_user')) {
+    $status->('example_repair_au_user_start');
+
+    #$dbh->do("UPDATE profiles
+    #             SET login_name = CONCAT(login_name, '.au')
+    #           WHERE login_name NOT LIKE '%.au'");
+
+    $status->('example_repair_au_user_end');
+  }
 }
 
 sub template_before_create {
-    my ($self, $args) = @_;
-    
-    my $config = $args->{'config'};
-    # This will be accessible as "example_global_variable" in every
-    # template in Bugzilla. See Bugzilla/Template.pm's create() function
-    # for more things that you can set.
-    $config->{VARIABLES}->{example_global_variable} = sub { return 'value' };
+  my ($self, $args) = @_;
+
+  my $config = $args->{'config'};
+
+  # This will be accessible as "example_global_variable" in every
+  # template in Bugzilla. See Bugzilla/Template.pm's create() function
+  # for more things that you can set.
+  $config->{VARIABLES}->{example_global_variable} = sub { return 'value' };
 }
 
 sub template_before_process {
-    my ($self, $args) = @_;
-    
-    my ($vars, $file, $context) = @$args{qw(vars file context)};
+  my ($self, $args) = @_;
 
-    if ($file eq 'bug/edit.html.tmpl') {
-        $vars->{'viewing_the_bug_form'} = 1;
-    }
+  my ($vars, $file, $context) = @$args{qw(vars file context)};
+
+  if ($file eq 'bug/edit.html.tmpl') {
+    $vars->{'viewing_the_bug_form'} = 1;
+  }
+}
+
+sub user_check_account_creation {
+  my ($self, $args) = @_;
+
+  my $login = $args->{login};
+  my $ip    = remote_ip();
+
+  # Log all requests.
+  warn "USER ACCOUNT CREATION REQUEST FOR $login ($ip)";
+
+  # Reject requests based on their email address.
+  if ($login =~ /\@evil\.com$/) {
+    ThrowUserError('account_creation_restricted');
+  }
+
+  # Reject requests based on their IP address.
+  if ($ip =~ /^192\.168\./) {
+    ThrowUserError('account_creation_restricted');
+  }
 }
 
 sub user_preferences {
-    my ($self, $args) = @_;
-    my $tab = $args->{current_tab};
-    my $save = $args->{save_changes};
-    my $handled = $args->{handled};
+  my ($self, $args) = @_;
+  my $tab     = $args->{current_tab};
+  my $save    = $args->{save_changes};
+  my $handled = $args->{handled};
 
-    return unless $tab eq 'my_tab';
+  return unless $tab eq 'my_tab';
 
-    my $value = Bugzilla->input_params->{'example_pref'};
-    if ($save) {
-        # Validate your data and update the DB accordingly.
-        $value =~ s/\s+/:/g;
-    }
-    $args->{'vars'}->{example_pref} = $value;
+  my $value = Bugzilla->input_params->{'example_pref'};
+  if ($save) {
+
+    # Validate your data and update the DB accordingly.
+    $value =~ s/\s+/:/g;
+  }
+  $args->{'vars'}->{example_pref} = $value;
 
-    # Set the 'handled' scalar reference to true so that the caller
-    # knows the panel name is valid and that an extension took care of it.
-    $$handled = 1;
+  # Set the 'handled' scalar reference to true so that the caller
+  # knows the panel name is valid and that an extension took care of it.
+  $$handled = 1;
 }
 
 sub webservice {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    my $dispatch = $args->{dispatch};
-    $dispatch->{Example} = "Bugzilla::Extension::Example::WebService";
+  my $dispatch = $args->{dispatch};
+  $dispatch->{Example} = "Bugzilla::Extension::Example::WebService";
 }
 
 sub webservice_error_codes {
-    my ($self, $args) = @_;
-    
-    my $error_map = $args->{error_map};
-    $error_map->{'example_my_error'} = 10001;
+  my ($self, $args) = @_;
+
+  my $error_map = $args->{error_map};
+  $error_map->{'example_my_error'} = 10001;
+}
+
+sub webservice_status_code_map {
+  my ($self, $args) = @_;
+
+  my $status_code_map = $args->{status_code_map};
+
+  # Uncomment this line to override the status code for the
+  # error 'object_does_not_exist' to STATUS_BAD_REQUEST
+  #$status_code_map->{51} = STATUS_BAD_REQUEST;
 }
 
 sub webservice_before_call {
-    my ($self, $args) = @_;
+  my ($self, $args) = @_;
 
-    # This code doesn't actually *do* anything, it's just here to show you
-    # how to use this hook.
-    my $method      = $args->{method};
-    my $full_method = $args->{full_method};
+  # This code doesn't actually *do* anything, it's just here to show you
+  # how to use this hook.
+  my $method      = $args->{method};
+  my $full_method = $args->{full_method};
 
-    # Uncomment this line to see a line in your webserver's error log whenever
-    # a webservice call is made
-    #warn "RPC call $full_method made by ",
-    #   Bugzilla->user->login || 'an anonymous user', "\n";
+  # Uncomment this line to see a line in your webserver's error log whenever
+  # a webservice call is made
+  #warn "RPC call $full_method made by ",
+  #   Bugzilla->user->login || 'an anonymous user', "\n";
 }
 
 sub webservice_fix_credentials {
-    my ($self, $args) = @_;
-    my $rpc    = $args->{'rpc'};
-    my $params = $args->{'params'};
-    # Allow user to pass in username=foo&password=bar
-    if (exists $params->{'username'} && exists $params->{'password'}) {
-        $params->{'Bugzilla_login'}    = $params->{'username'};
-        $params->{'Bugzilla_password'} = $params->{'password'};
-    }
+  my ($self, $args) = @_;
+  my $rpc    = $args->{'rpc'};
+  my $params = $args->{'params'};
+
+  # Allow user to pass in username=foo&password=bar
+  if (exists $params->{'username'} && exists $params->{'password'}) {
+    $params->{'Bugzilla_login'}    = $params->{'username'};
+    $params->{'Bugzilla_password'} = $params->{'password'};
+  }
 }
 
 sub webservice_rest_request {
-    my ($self, $args) = @_;
-    my $rpc    = $args->{'rpc'};
-    my $params = $args->{'params'};
-    # Internally we may have a field called 'cf_test_field' but we allow users
-    # to use the shorter 'test_field' name.
-    if (exists $params->{'test_field'}) {
-        $params->{'test_field'} = delete $params->{'cf_test_field'};
-    }
+  my ($self, $args) = @_;
+  my $rpc    = $args->{'rpc'};
+  my $params = $args->{'params'};
+
+  # Internally we may have a field called 'cf_test_field' but we allow users
+  # to use the shorter 'test_field' name.
+  if (exists $params->{'test_field'}) {
+    $params->{'test_field'} = delete $params->{'cf_test_field'};
+  }
 }
 
 sub webservice_rest_resources {
-    my ($self, $args) = @_;
-    my $rpc = $args->{'rpc'};
-    my $resources = $args->{'resources'};
-    # Add a new resource that allows for /rest/example/hello
-    # to call Example.hello
-    $resources->{'Bugzilla::Extension::Example::WebService'} = [
-        qr{^/example/hello$}, {
-            GET => {
-                method => 'hello',
-            }
-        }
-    ];
+  my ($self, $args) = @_;
+  my $rpc       = $args->{'rpc'};
+  my $resources = $args->{'resources'};
+
+  # Add a new resource that allows for /rest/example/hello
+  # to call Example.hello
+  #$resources->{'Bugzilla::Extension::Example::WebService'} = [
+  #    qr{^/example/hello$}, {
+  #        GET => {
+  #            method => 'hello',
+  #        }
+  #    }
+  #];
+}
+
+sub webservice_rest_result {
+  my ($self, $args) = @_;
+  my $result = $args->{'result'};
+
+  # Convert a list of bug hashes to a single bug hash if only one is
+  # being returned.
+  if ( ref $$result eq 'HASH'
+    && exists $$result->{'bugs'}
+    && ref $$result->{'bugs'} eq 'ARRAY'
+    && scalar @{$$result->{'bugs'}} == 1)
+  {
+    $$result = $$result->{'bugs'}->[0];
+  }
 }
 
 sub webservice_rest_response {
-    my ($self, $args) = @_;
-    my $rpc      = $args->{'rpc'};
-    my $result   = $args->{'result'};
-    my $response = $args->{'response'};
-    # Convert a list of bug hashes to a single bug hash if only one is
-    # being returned.
-    if (ref $$result eq 'HASH'
-        && exists $$result->{'bugs'}
-        && scalar @{ $$result->{'bugs'} } == 1)
-    {
-        $$result = $$result->{'bugs'}->[0];
-    }
+  my ($self, $args) = @_;
+  my $response = $args->{'response'};
+  $response->header('X-Example-Header', 'This is an example header');
 }
 
 # This must be the last line of your extension.
diff --git a/extensions/Example/doc/example.rst b/extensions/Example/doc/example.rst
deleted file mode 100644
index 07b355887f..0000000000
--- a/extensions/Example/doc/example.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-Example
-#######
-
-This is a sample documentation file for the Example extension. Like all of
-the Bugzilla docs, it's written in
-`reStructured Text (reST) format <http://sphinx-doc.org/latest/rest.html>`_
-and will be compiled by `Sphinx <http://sphinx-doc.org/>`_.
-
-If you build the docs yourself using :file:`makedocs.pl`, this file will get
-incorporated into the Extensions chapter, as will any documentation
-you write for your extensions which fulfils the following criteria:
-
-* In the :file:`extensions/YourExtension/doc/` directory
-* Has a :file:`.rst` file extension
-
-You are recommended to make the name of your reST doc file the same as the
-name of your extension, so that there is no clash when all the extension
-documentation is copied into the same directory. So, for example, this file
-is called :file:`example.rst`, as it's part of the Example extension. If you
-need multiple documentation files, prefix the filename with the name of your
-extension, e.g. :file:`example-extra.rst`.
- 
diff --git a/extensions/Example/docs/en/rst/api/v1/index.rst b/extensions/Example/docs/en/rst/api/v1/index.rst
new file mode 100644
index 0000000000..02186bb0b8
--- /dev/null
+++ b/extensions/Example/docs/en/rst/api/v1/index.rst
@@ -0,0 +1,4 @@
+Example API v1
+==============
+
+Here is where you place your API docs for the Example extension.
diff --git a/extensions/Example/docs/en/rst/index-admin.rst b/extensions/Example/docs/en/rst/index-admin.rst
new file mode 100644
index 0000000000..220319f991
--- /dev/null
+++ b/extensions/Example/docs/en/rst/index-admin.rst
@@ -0,0 +1,12 @@
+Example
+#######
+
+This is a sample Adminstration documentation file for the Example extension.
+Like all of the Bugzilla docs, it's written in
+`reStructured Text (reST) format <http://sphinx-doc.org/latest/rest.html>`_
+and will be compiled by `Sphinx <http://sphinx-doc.org/>`_.
+
+If you build the docs yourself using :file:`makedocs.pl`, this file will get
+incorporated into the Administration Guide. If you need more than one file's
+worth of admin documentation, include others using the Sphinx `toctree
+directive <http://sphinx-doc.org/markup/toctree.html>`_.
diff --git a/extensions/Example/docs/en/rst/index-user.rst b/extensions/Example/docs/en/rst/index-user.rst
new file mode 100644
index 0000000000..a6cbd8309a
--- /dev/null
+++ b/extensions/Example/docs/en/rst/index-user.rst
@@ -0,0 +1,12 @@
+Example
+#######
+
+This is a sample User documentation file for the Example extension.
+Like all of the Bugzilla docs, it's written in
+`reStructured Text (reST) format <http://sphinx-doc.org/latest/rest.html>`_
+and will be compiled by `Sphinx <http://sphinx-doc.org/>`_.
+
+If you build the docs yourself using :file:`makedocs.pl`, this file will get
+incorporated into the User Guide. If you need more than one file's worth of
+user documentation, include others using the Sphinx `toctree
+directive <http://sphinx-doc.org/markup/toctree.html>`_.
diff --git a/extensions/Example/lib/Auth/Login.pm b/extensions/Example/lib/Auth/Login.pm
index 15c58a881e..3764f2d3d2 100644
--- a/extensions/Example/lib/Auth/Login.pm
+++ b/extensions/Example/lib/Auth/Login.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example::Auth::Login;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,7 +17,7 @@ use Bugzilla::Constants;
 
 # Always returns no data.
 sub get_login_info {
-    return { failure => AUTH_NODATA };
+  return {failure => AUTH_NODATA};
 }
 
 1;
diff --git a/extensions/Example/lib/Auth/Verify.pm b/extensions/Example/lib/Auth/Verify.pm
index 49fd9fbb78..26d5d6e81d 100644
--- a/extensions/Example/lib/Auth/Verify.pm
+++ b/extensions/Example/lib/Auth/Verify.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example::Auth::Verify;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,7 +16,7 @@ use Bugzilla::Constants;
 
 # A verifier that always fails.
 sub check_credentials {
-    return { failure => AUTH_NO_SUCH_USER };
+  return {failure => AUTH_NO_SUCH_USER};
 }
 
 1;
diff --git a/extensions/Example/lib/Config.pm b/extensions/Example/lib/Config.pm
index fac0046af2..79195ba9f1 100644
--- a/extensions/Example/lib/Config.pm
+++ b/extensions/Example/lib/Config.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example::Config;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -16,16 +16,60 @@ use Bugzilla::Config::Common;
 our $sortkey = 5000;
 
 sub get_param_list {
-    my ($class) = @_;
+  my ($class) = @_;
 
-    my @param_list = (
+  my @param_list = (
+    {name => 'example_string', type => 't', default => 'Bugzilla is powerful'},
     {
-        name => 'example_string',
-        type => 't',
-        default => 'EXAMPLE',
+      name    => 'example_constrained_string',
+      type    => 't',
+      default => '12-xfdd-5',
+      checker => sub {
+        $_[0] =~ /^\d{2}\-[a-zA-Z]{4}\-\d$/
+          ? ''
+          : "$_[0] must be of the form NN-XXXX-N";
+      }
     },
-    );
-    return @param_list;
+    {
+      name    => 'example_number',
+      type    => 't',
+      default => '905',
+      checker => \&check_numeric
+    },
+    {name => 'example_password', type => 'p', default => '1234'},
+    {
+      name    => 'example_multi_lines',
+      type    => 'l',
+      default => "This text can be very long.\n\nVery very long!"
+    },
+
+    # Default can only be 0 or 1.
+    {name => 'example_boolean', type => 'b', default => 0},
+    {
+      name    => 'example_single_select',
+      type    => 's',
+      choices => ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'],
+      default => 'Thursday',
+      checker => \&check_multi
+    },
+    {
+      name    => 'example_multi_select',
+      type    => 'm',
+      choices => ['Mercury', 'Venus', 'Mars', 'Jupiter', 'Saturn'],
+      default => ['Venus', 'Saturn'],
+      checker => \&check_multi
+    },
+
+    # This one lets you order selected items.
+    {
+      name    => 'example_multi_ordered',
+      type    => 'o',
+      choices => ['Perl', 'Python', 'PHP', 'C++', 'Java'],
+      default => 'Perl,C++',
+      checker => \&check_multi
+    },
+  );
+  return @param_list;
 }
 
 1;
diff --git a/extensions/Example/lib/Migrate/ImportBugs.pm b/extensions/Example/lib/Migrate/ImportBugs.pm
new file mode 100644
index 0000000000..af82b238b1
--- /dev/null
+++ b/extensions/Example/lib/Migrate/ImportBugs.pm
@@ -0,0 +1,96 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+
+=head1 NAME
+
+Bugzilla::Extension::Example::Migrate::ImportBugs - Bugzilla example bug importer
+
+=head1 DESCRIPTION
+
+This is not a complete implementation of a Import module.  For a working
+implementation see L<Bugzilla::Migrate::Gnats>.
+
+=cut
+
+package Bugzilla::Extension::Example::Migrate::ImportBugs;
+
+use 5.14.0 use strict;
+use warnings;
+
+use parent qw(Bugzilla::Migrate);
+
+use Bugzilla::Constants;
+use Bugzilla::Install::Util qw(indicate_progress);
+use Bugzilla::Util qw(format_time trim generate_random_password);
+
+use constant REQUIRED_MODULES => [
+  {
+    package => 'Email-Simple-FromHandle',
+    module  => 'Email::Simple::FromHandle',
+    version => 0.050,
+  },
+];
+
+use constant FIELD_MAP => {'Number' => 'bug_id', 'Category' => 'product',};
+
+use constant VALUE_MAP => {
+  bug_severity => {'serious'  => 'major',    'non-critical' => 'normal',},
+  bug_status   => {'feedback' => 'RESOLVED', 'released'     => 'VERIFIED',},
+};
+
+use constant IMPORTBUGS_CONFIG_VARS => (
+  {
+    name    => 'default_email_domain',
+    default => 'example.com',
+    desc    => <<'END',
+# Some users do not have full email addresses, but Bugzilla requires
+# every user to have an email address. What domain should be appended to
+# usernames that don't have emails, to make them into email addresses?
+# (For example, if you leave this at the default, "unknown" would become
+# "unknown@example.com".)
+END
+  },
+);
+
+#########
+# Hooks #
+#########
+
+sub before_insert {
+  my $self = shift;
+}
+
+#########
+# Users #
+#########
+
+sub _read_users {
+  my $self = shift;
+}
+
+############
+# Products #
+############
+
+sub _read_products {
+  my $self = shift;
+}
+
+################
+# Reading Bugs #
+################
+
+sub _read_bugs {
+  my $self = shift;
+}
+
+sub _parse_project {
+  my ($self, $directory) = @_;
+}
+
+1;
diff --git a/extensions/Example/lib/Util.pm b/extensions/Example/lib/Util.pm
index ccc349c9c5..88a9a5a843 100644
--- a/extensions/Example/lib/Util.pm
+++ b/extensions/Example/lib/Util.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example::Util;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
diff --git a/extensions/Example/lib/WebService.pm b/extensions/Example/lib/WebService.pm
index c8c1206166..e9cba24610 100644
--- a/extensions/Example/lib/WebService.pm
+++ b/extensions/Example/lib/WebService.pm
@@ -7,12 +7,17 @@
 
 package Bugzilla::Extension::Example::WebService;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 use parent qw(Bugzilla::WebService);
 use Bugzilla::Error;
 
+use constant PUBLIC_METHODS => qw(
+  hello
+  throw_an_error
+);
+
 # This can be called as Example.hello() from the WebService.
 sub hello { return 'Hello!'; }
 
diff --git a/extensions/Example/template/en/default/admin/params/example.html.tmpl b/extensions/Example/template/en/default/admin/params/example.html.tmpl
index 48143945c6..d399ac161d 100644
--- a/extensions/Example/template/en/default/admin/params/example.html.tmpl
+++ b/extensions/Example/template/en/default/admin/params/example.html.tmpl
@@ -11,6 +11,16 @@
 %]
 
 [% param_descs = {
-  example_string => "Example string",
+  example_string        => "This parameter accepts any text. (type t)",
+  example_constrained_string => "This parameter accepts only a text of the form " _
+                                "NN-XXXX-N, where N is a digit and X a letter.",
+  example_number        => "This parameter accepts only a positive integer.",
+  example_password      => "Text with all characters replaced by asterisks for " _
+                           "security purposes. (type p)",
+  example_multi_lines   => "Text field permitting multiple lines of text. (type l)",
+  example_boolean       => "You have only two choices: On (1) or Off (0). (type b)",
+  example_single_select => "Select a single value from a list. (type s)",
+  example_multi_select  => "Select none, one or several values from a list. (type m)",
+  example_multi_ordered => "Several values can be selected and ordered. (type o)",
 }
 %]
diff --git a/extensions/Example/template/en/default/setup/strings.txt.pl b/extensions/Example/template/en/default/setup/strings.txt.pl
index 98550547e7..e2fc524520 100644
--- a/extensions/Example/template/en/default/setup/strings.txt.pl
+++ b/extensions/Example/template/en/default/setup/strings.txt.pl
@@ -5,8 +5,6 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-%strings = (
-  feature_example_acme => 'Example Extension: Acme Feature',
-);
+%strings = (feature_example_acme => 'Example Extension: Acme Feature',);
 
 1;
diff --git a/extensions/MoreBugUrl/Config.pm b/extensions/MoreBugUrl/Config.pm
index e0eac5f8a8..0fea92c0fe 100644
--- a/extensions/MoreBugUrl/Config.pm
+++ b/extensions/MoreBugUrl/Config.pm
@@ -7,16 +7,14 @@
 
 package Bugzilla::Extension::MoreBugUrl;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use constant NAME => 'MoreBugUrl';
 
-use constant REQUIRED_MODULES => [
-];
+use constant REQUIRED_MODULES => [];
 
-use constant OPTIONAL_MODULES => [
-];
+use constant OPTIONAL_MODULES => [];
 
 __PACKAGE__->NAME;
diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm
index 18507f8d1e..9675e5b4d1 100644
--- a/extensions/MoreBugUrl/Extension.pm
+++ b/extensions/MoreBugUrl/Extension.pm
@@ -7,47 +7,51 @@
 
 package Bugzilla::Extension::MoreBugUrl;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use parent qw(Bugzilla::Extension);
 
 use constant MORE_SUB_CLASSES => qw(
-    Bugzilla::Extension::MoreBugUrl::BitBucket
-    Bugzilla::Extension::MoreBugUrl::ReviewBoard
-    Bugzilla::Extension::MoreBugUrl::Rietveld
-    Bugzilla::Extension::MoreBugUrl::RT
-    Bugzilla::Extension::MoreBugUrl::GetSatisfaction
-    Bugzilla::Extension::MoreBugUrl::PHP
-    Bugzilla::Extension::MoreBugUrl::Redmine
-    Bugzilla::Extension::MoreBugUrl::Savane
+  Bugzilla::Extension::MoreBugUrl::BitBucket
+  Bugzilla::Extension::MoreBugUrl::ReviewBoard
+  Bugzilla::Extension::MoreBugUrl::Rietveld
+  Bugzilla::Extension::MoreBugUrl::RT
+  Bugzilla::Extension::MoreBugUrl::GetSatisfaction
+  Bugzilla::Extension::MoreBugUrl::PHP
+  Bugzilla::Extension::MoreBugUrl::Redmine
+  Bugzilla::Extension::MoreBugUrl::Savane
+  Bugzilla::Extension::MoreBugUrl::Phabricator
 );
 
 # We need to update bug_see_also table because both
 # Rietveld and ReviewBoard were originally under Bugzilla/BugUrl/.
 sub install_update_db {
-    my $dbh = Bugzilla->dbh;
+  my $dbh = Bugzilla->dbh;
 
-    my $should_rename = $dbh->selectrow_array(
-        q{SELECT 1 FROM bug_see_also
+  my $should_rename = $dbh->selectrow_array(
+    q{SELECT 1 FROM bug_see_also
           WHERE class IN ('Bugzilla::BugUrl::Rietveld', 
-                          'Bugzilla::BugUrl::ReviewBoard')});
-
-    if ($should_rename) {
-        my $sth = $dbh->prepare('UPDATE bug_see_also SET class = ?
-                                 WHERE class = ?');
-        $sth->execute('Bugzilla::Extension::MoreBugUrl::ReviewBoard',
-                      'Bugzilla::BugUrl::ReviewBoard');
-
-        $sth->execute('Bugzilla::Extension::MoreBugUrl::Rietveld',
-                      'Bugzilla::BugUrl::Rietveld');
-    }
+                          'Bugzilla::BugUrl::ReviewBoard')}
+  );
+
+  if ($should_rename) {
+    my $sth = $dbh->prepare(
+      'UPDATE bug_see_also SET class = ?
+                                 WHERE class = ?'
+    );
+    $sth->execute('Bugzilla::Extension::MoreBugUrl::ReviewBoard',
+      'Bugzilla::BugUrl::ReviewBoard');
+
+    $sth->execute('Bugzilla::Extension::MoreBugUrl::Rietveld',
+      'Bugzilla::BugUrl::Rietveld');
+  }
 }
 
 sub bug_url_sub_classes {
-    my ($self, $args) = @_;
-    push @{ $args->{sub_classes} }, MORE_SUB_CLASSES;
+  my ($self, $args) = @_;
+  push @{$args->{sub_classes}}, MORE_SUB_CLASSES;
 }
 
 __PACKAGE__->NAME;
diff --git a/extensions/MoreBugUrl/lib/BitBucket.pm b/extensions/MoreBugUrl/lib/BitBucket.pm
index dcc85992d6..a0bf48a906 100644
--- a/extensions/MoreBugUrl/lib/BitBucket.pm
+++ b/extensions/MoreBugUrl/lib/BitBucket.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::BitBucket;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,23 +18,23 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # BitBucket issues have the form of
-    # bitbucket.org/user/project/issue/1234
-    return (lc($uri->authority) eq "bitbucket.org"
-            && $uri->path =~ m|[^/]+/[^/]+/issue/\d+|i) ? 1 : 0;
+  # BitBucket issues have the form of
+  # bitbucket.org/user/project/issue/1234
+  return (lc($uri->authority) eq "bitbucket.org"
+      && $uri->path =~ m|[^/]+/[^/]+/issue/\d+|i) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    my ($path) = $uri->path =~ m|([^/]+/[^/]+/issue/\d+)|i;
-    $uri = new URI("https://bitbucket.org/$path");
+  my ($path) = $uri->path =~ m|([^/]+/[^/]+/issue/\d+)|i;
+  $uri = new URI("https://bitbucket.org/$path");
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
index 74951735bf..c474836776 100644
--- a/extensions/MoreBugUrl/lib/GetSatisfaction.pm
+++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::GetSatisfaction;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,24 +18,24 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # GetSatisfaction URLs only have one form:
-    #   http(s)://getsatisfaction.com/PROJECT_NAME/topics/TOPIC_NAME
-    return (lc($uri->authority) eq 'getsatisfaction.com'
-            and $uri->path =~ m|^/[^/]+/topics/[^/]+$|) ? 1 : 0;
+  # GetSatisfaction URLs only have one form:
+  #   http(s)://getsatisfaction.com/PROJECT_NAME/topics/TOPIC_NAME
+  return (lc($uri->authority) eq 'getsatisfaction.com'
+      and $uri->path =~ m|^/[^/]+/topics/[^/]+$|) ? 1 : 0;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    $uri = $class->SUPER::_check_value($uri);
+  $uri = $class->SUPER::_check_value($uri);
 
-    # GetSatisfaction HTTP URLs redirect to HTTPS, so just use the HTTPS
-    # scheme.
-    $uri->scheme('https');
+  # GetSatisfaction HTTP URLs redirect to HTTPS, so just use the HTTPS
+  # scheme.
+  $uri->scheme('https');
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/PHP.pm b/extensions/MoreBugUrl/lib/PHP.pm
index 6f201d7b1f..04f1b0bcb6 100644
--- a/extensions/MoreBugUrl/lib/PHP.pm
+++ b/extensions/MoreBugUrl/lib/PHP.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::PHP;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,27 +18,27 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
+  my ($class, $uri) = @_;
 
-    # PHP Bug URLs have only one form:
-    #   https://bugs.php.net/bug.php?id=1234
-    return (lc($uri->authority) eq 'bugs.php.net'
-            and $uri->path =~ m|/bug\.php$|
-            and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
+  # PHP Bug URLs have only one form:
+  #   https://bugs.php.net/bug.php?id=1234
+  return (lc($uri->authority) eq 'bugs.php.net'
+      and $uri->path =~ m|/bug\.php$|
+      and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # PHP Bug URLs redirect to HTTPS, so just use the HTTPS scheme.
-    $uri->scheme('https');
+  # PHP Bug URLs redirect to HTTPS, so just use the HTTPS scheme.
+  $uri->scheme('https');
 
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/Phabricator.pm b/extensions/MoreBugUrl/lib/Phabricator.pm
new file mode 100644
index 0000000000..dbcae5aa18
--- /dev/null
+++ b/extensions/MoreBugUrl/lib/Phabricator.pm
@@ -0,0 +1,42 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Extension::MoreBugUrl::Phabricator;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use parent qw(Bugzilla::BugUrl);
+
+###############################
+####        Methods        ####
+###############################
+
+sub should_handle {
+  my ($class, $uri) = @_;
+  return ($uri->path =~ m|^/T\d+$|) ? 1 : 0;
+}
+
+sub _check_value {
+  my $class = shift;
+
+  my $uri = $class->SUPER::_check_value(@_);
+
+  # Phabricator URLs have only one form:
+  #   http://example.com/T111
+
+  # Make sure there are no query parameters.
+  $uri->query(undef);
+
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
+
+  return $uri;
+}
+
+1;
diff --git a/extensions/MoreBugUrl/lib/RT.pm b/extensions/MoreBugUrl/lib/RT.pm
index acb90cf396..514ded137c 100644
--- a/extensions/MoreBugUrl/lib/RT.pm
+++ b/extensions/MoreBugUrl/lib/RT.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::RT;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,24 +18,25 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-
-    # RT URLs can look like various things:
-    #   http://example.com/rt/Ticket/Display.html?id=1234
-    #   https://example.com/Public/Bug/Display.html?id=1234
-    return ($uri->path =~ m|/Display\.html$|
-            and $uri->query_param('id') =~ /^\d+$/) ? 1 : 0;
+  my ($class, $uri) = @_;
+
+  # RT URLs can look like various things:
+  #   http://example.com/rt/Ticket/Display.html?id=1234
+  #   https://example.com/Public/Bug/Display.html?id=1234
+  return ($uri->path =~ m|/Display\.html$| and $uri->query_param('id') =~ /^\d+$/)
+    ? 1
+    : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
 
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/Redmine.pm b/extensions/MoreBugUrl/lib/Redmine.pm
index 57a0712394..600856f221 100644
--- a/extensions/MoreBugUrl/lib/Redmine.pm
+++ b/extensions/MoreBugUrl/lib/Redmine.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::Redmine;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,24 +18,25 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-    return ($uri->path =~ m|/issues/\d+$|) ? 1 : 0;
+  my ($class, $uri) = @_;
+  return ($uri->path =~ m|/issues/\d+$|) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Redmine URLs have only one form:
-    #   http://demo.redmine.com/issues/111
+  # Redmine URLs have only one form:
+  #   http://demo.redmine.com/issues/111
 
-    # Make sure there are no query parameters.
-    $uri->query(undef);
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
+  # Make sure there are no query parameters.
+  $uri->query(undef);
 
-    return $uri;
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
+
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/ReviewBoard.pm b/extensions/MoreBugUrl/lib/ReviewBoard.pm
index af5ff06841..c50277a72b 100644
--- a/extensions/MoreBugUrl/lib/ReviewBoard.pm
+++ b/extensions/MoreBugUrl/lib/ReviewBoard.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::ReviewBoard;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,29 +18,30 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-    return ($uri->path =~ m|/r/\d+/?$|) ? 1 : 0;
+  my ($class, $uri) = @_;
+  return ($uri->path =~ m|/r/\d+/?$|) ? 1 : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Review Board URLs have only one form (the trailing slash is optional):
-    #   http://reviews.reviewboard.org/r/111/
+  # Review Board URLs have only one form (the trailing slash is optional):
+  #   http://reviews.reviewboard.org/r/111/
 
-    # Make sure there are no query parameters.
-    $uri->query(undef);
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
+  # Make sure there are no query parameters.
+  $uri->query(undef);
 
-    # make sure the trailing slash is present
-    if ($uri->path !~ m|/$|) {
-        $uri->path($uri->path . '/');
-    }
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
 
-    return $uri;
+  # make sure the trailing slash is present
+  if ($uri->path !~ m|/$|) {
+    $uri->path($uri->path . '/');
+  }
+
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/Rietveld.pm b/extensions/MoreBugUrl/lib/Rietveld.pm
index a4bf08492f..d8cacea61d 100644
--- a/extensions/MoreBugUrl/lib/Rietveld.pm
+++ b/extensions/MoreBugUrl/lib/Rietveld.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::Rietveld;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,32 +18,34 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-    return ($uri->authority =~ /\.appspot\.com$/i
-            and $uri->path =~ m#^/\d+(?:/|/show)?$#) ? 1 : 0;
+  my ($class, $uri) = @_;
+  return ($uri->authority =~ /\.appspot\.com$/i
+      and $uri->path =~ m#^/\d+(?:/|/show)?$#) ? 1 : 0;
 }
 
 sub _check_value {
-    my ($class, $uri) = @_;
-
-    $uri = $class->SUPER::_check_value($uri);
-
-    # Rietveld URLs have three forms:
-    #   http(s)://example.appspot.com/1234
-    #   http(s)://example.appspot.com/1234/
-    #   http(s)://example.appspot.com/1234/show
-    if ($uri->path =~ m#^/(\d+)(?:/|/show)$#) {
-        # This is the shortest standard URL form for Rietveld issues,
-        # and so we reduce all URLs to this.
-        $uri->path('/' . $1);
-    }
-
-    # Make sure there are no query parameters.
-    $uri->query(undef);
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
-
-    return $uri;
+  my ($class, $uri) = @_;
+
+  $uri = $class->SUPER::_check_value($uri);
+
+  # Rietveld URLs have three forms:
+  #   http(s)://example.appspot.com/1234
+  #   http(s)://example.appspot.com/1234/
+  #   http(s)://example.appspot.com/1234/show
+  if ($uri->path =~ m#^/(\d+)(?:/|/show)$#) {
+
+    # This is the shortest standard URL form for Rietveld issues,
+    # and so we reduce all URLs to this.
+    $uri->path('/' . $1);
+  }
+
+  # Make sure there are no query parameters.
+  $uri->query(undef);
+
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
+
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/lib/Savane.pm b/extensions/MoreBugUrl/lib/Savane.pm
index efda1fa4f5..8f7966fbc0 100644
--- a/extensions/MoreBugUrl/lib/Savane.pm
+++ b/extensions/MoreBugUrl/lib/Savane.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::Savane;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -18,23 +18,27 @@ use parent qw(Bugzilla::BugUrl);
 ###############################
 
 sub should_handle {
-    my ($class, $uri) = @_;
-    return ($uri->as_string =~ m|/bugs/(index\.php)?\?\d+$|) ? 1 : 0;
+  my ($class, $uri) = @_;
+
+  # Savane URLs look like the following (the index.php is optional):
+  #   https://savannah.gnu.org/bugs/index.php?107657
+  #   https://savannah.gnu.org/patch/index.php?107657
+  #   https://savannah.gnu.org/support/index.php?107657
+  #   https://savannah.gnu.org/task/index.php?107657
+  return ($uri->as_string =~ m|/(bugs\|patch\|support\|task)/(index\.php)?\?\d+$|)
+    ? 1
+    : 0;
 }
 
 sub _check_value {
-    my $class = shift;
+  my $class = shift;
 
-    my $uri = $class->SUPER::_check_value(@_);
+  my $uri = $class->SUPER::_check_value(@_);
 
-    # Savane URLs have only two forms:
-    #   http://gna.org/bugs/index.php?12345
-    #   http://gna.org/bugs/?12345
+  # And remove any # part if there is one.
+  $uri->fragment(undef);
 
-    # And remove any # part if there is one.
-    $uri->fragment(undef);
-
-    return $uri;
+  return $uri;
 }
 
 1;
diff --git a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
index 7e544ef210..2ac6f89a57 100644
--- a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
+++ b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl
@@ -14,3 +14,4 @@
 <li>A b[% %]ug on b[% %]ugs.php.net.</li>
 <li>An issue in a Redmine installation.</li>
 <li>A b[% %]ug in a Savane installation.</li>
+<li>A task in a Phabricator installation.</li>
diff --git a/extensions/OldBugMove/Extension.pm b/extensions/OldBugMove/Extension.pm
deleted file mode 100644
index 375707fd22..0000000000
--- a/extensions/OldBugMove/Extension.pm
+++ /dev/null
@@ -1,200 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::Extension::OldBugMove;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use parent qw(Bugzilla::Extension);
-use Bugzilla::Constants;
-use Bugzilla::Error;
-use Bugzilla::Field::Choice;
-use Bugzilla::Mailer;
-use Bugzilla::User;
-use Bugzilla::Util qw(trim);
-
-use Scalar::Util qw(blessed);
-use Storable qw(dclone);
-
-use constant VERSION => BUGZILLA_VERSION;
-
-# This is 4 because that's what it originally was when this code was
-# a part of Bugzilla.
-use constant CMT_MOVED_TO => 4;
-
-sub install_update_db {
-    my $reso_type = Bugzilla::Field::Choice->type('resolution');
-    my $moved_reso = $reso_type->new({ name => 'MOVED' });
-    # We make the MOVED resolution inactive, so that it doesn't show up
-    # as a valid drop-down option.
-    if ($moved_reso) {
-        $moved_reso->set_is_active(0);
-        $moved_reso->update();
-    }
-    else {
-        print "Creating the MOVED resolution...\n";
-        $reso_type->create(
-           { value   => 'MOVED', sortkey => '30000', isactive => 0 });
-    }
-}
-
-sub config_add_panels {
-    my ($self, $args) = @_;
-    my $modules = $args->{'panel_modules'};
-    $modules->{'OldBugMove'} = 'Bugzilla::Extension::OldBugMove::Params';
-}
-
-sub template_before_create {
-    my ($self, $args) = @_;
-    my $config = $args->{config};
-
-    my $constants = $config->{CONSTANTS};
-    $constants->{CMT_MOVED_TO} = CMT_MOVED_TO;
-
-    my $vars = $config->{VARIABLES};
-    $vars->{oldbugmove_user_is_mover} = \&_user_is_mover;
-}
-
-sub object_before_delete {
-    my ($self, $args) = @_;
-    my $object = $args->{'object'};
-    if ($object->isa('Bugzilla::Field::Choice::resolution')) {
-        if ($object->name eq 'MOVED') {
-            ThrowUserError('oldbugmove_no_delete_moved');
-        }
-    }
-}
-
-sub object_before_set {
-    my ($self, $args) = @_;
-    my ($object, $field) = @$args{qw(object field)};
-    if ($field eq 'resolution' and $object->isa('Bugzilla::Bug')) {
-        # Store the old value so that end_of_set can check it.
-        $object->{'_oldbugmove_old_resolution'} = $object->resolution;
-    }
-}
-
-sub object_end_of_set {
-    my ($self, $args) = @_;
-    my ($object, $field) = @$args{qw(object field)};
-    if ($field eq 'resolution' and $object->isa('Bugzilla::Bug')) {
-        my $old_value = delete $object->{'_oldbugmove_old_resolution'};
-        return if $old_value eq $object->resolution;
-        if ($object->resolution eq 'MOVED') {
-            $object->add_comment('', { type => CMT_MOVED_TO,
-                                       extra_data => Bugzilla->user->login });
-        }
-    }
-}
-
-sub object_end_of_set_all {
-    my ($self, $args) = @_;
-    my $object = $args->{'object'};
-
-    if ($object->isa('Bugzilla::Bug') and Bugzilla->input_params->{'oldbugmove'}) {
-        my $new_status = Bugzilla->params->{'duplicate_or_move_bug_status'};
-        $object->set_bug_status($new_status, { resolution => 'MOVED' });
-    }
-}
-
-sub object_validators {
-    my ($self, $args) = @_;
-    my ($class, $validators) = @$args{qw(class validators)};
-    if ($class->isa('Bugzilla::Comment')) {
-        my $extra_data_validator = $validators->{extra_data};
-        $validators->{extra_data} = 
-            sub { _check_comment_extra_data($extra_data_validator, @_) };
-    }
-    elsif ($class->isa('Bugzilla::Bug')) {
-        my $reso_validator = $validators->{resolution};
-        $validators->{resolution} =
-            sub { _check_bug_resolution($reso_validator, @_) };
-    }
-}
-
-sub _check_bug_resolution {
-    my $original_validator = shift;
-    my ($invocant, $resolution) = @_;
-
-    if ($resolution eq 'MOVED' && $invocant->resolution ne 'MOVED'
-        && !Bugzilla->input_params->{'oldbugmove'})
-    {
-        # MOVED has a special meaning and can only be used when
-        # really moving bugs to another installation.
-        ThrowUserError('oldbugmove_no_manual_move');
-    }
-
-    return $original_validator->(@_);
-}
-
-sub _check_comment_extra_data {
-    my $original_validator = shift;
-    my ($invocant, $extra_data, undef, $params) = @_;
-    my $type = blessed($invocant) ? $invocant->type : $params->{type};
-
-    if ($type == CMT_MOVED_TO) {
-        return Bugzilla::User->check($extra_data)->login;
-    }
-    return $original_validator->(@_);
-}
-
-sub bug_end_of_update {
-    my ($self, $args) = @_;
-    my ($bug, $old_bug, $changes) = @$args{qw(bug old_bug changes)};
-    if (defined $changes->{'resolution'}
-        and $changes->{'resolution'}->[1] eq 'MOVED')
-    {
-        $self->_move_bug($bug, $old_bug);
-    }
-}
-
-sub _move_bug {
-    my ($self, $bug, $old_bug) = @_;
-
-    my $dbh = Bugzilla->dbh;
-    my $template = Bugzilla->template;
-
-    _user_is_mover(Bugzilla->user) 
-        or ThrowUserError("auth_failure", { action => 'move',
-                                            object => 'bugs' });
-
-    # Don't export the new status and resolution. We want the current
-    # ones.
-    local $Storable::forgive_me = 1;
-    my $export_me = dclone($bug);
-    $export_me->{bug_status} = $old_bug->bug_status;
-    delete $export_me->{status};
-    $export_me->{resolution} = $old_bug->resolution;
-
-    # Prepare and send all data about these bugs to the new database
-    my $to = Bugzilla->params->{'move-to-address'};
-    $to =~ s/@/\@/;
-    my $from = Bugzilla->params->{'mailfrom'};
-    $from =~ s/@/\@/;
-    my $msg = "To: $to\n";
-    $msg .= "From: Bugzilla <" . $from . ">\n";
-    $msg .= "Subject: Moving bug " . $bug->id . "\n\n";
-    my @fieldlist = (Bugzilla::Bug->fields, 'group', 'long_desc',
-                     'attachment', 'attachmentdata');
-    my %displayfields = map { $_ => 1 } @fieldlist;
-    my $vars = { bugs => [$export_me], displayfields => \%displayfields };
-    $template->process("bug/show.xml.tmpl", $vars, \$msg)
-      || ThrowTemplateError($template->error());
-    $msg .= "\n";
-    MessageToMTA($msg);
-}
-
-sub _user_is_mover {
-    my $user = shift;
-
-    my @movers = map { trim($_) } split(',', Bugzilla->params->{'movers'});
-    return ($user->id and grep($_ eq $user->login, @movers)) ? 1 : 0;
-}
-
-__PACKAGE__->NAME;
diff --git a/extensions/OldBugMove/disabled b/extensions/OldBugMove/disabled
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/extensions/OldBugMove/lib/Params.pm b/extensions/OldBugMove/lib/Params.pm
deleted file mode 100644
index 05e3ed2773..0000000000
--- a/extensions/OldBugMove/lib/Params.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-package Bugzilla::Extension::OldBugMove::Params;
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use Bugzilla::Config::Common;
-
-our $sortkey = 700;
-
-use constant get_param_list => (
-  {
-   name => 'move-to-url',
-   type => 't',
-   default => ''
-  },
-
-  {
-   name => 'move-to-address',
-   type => 't',
-   default => 'bugzilla-import'
-  },
-
-  {
-   name => 'movers',
-   type => 't',
-   default => ''
-  },
-);
-
-1;
diff --git a/extensions/OldBugMove/template/en/default/admin/params/oldbugmove.html.tmpl b/extensions/OldBugMove/template/en/default/admin/params/oldbugmove.html.tmpl
deleted file mode 100644
index 0a54c4640e..0000000000
--- a/extensions/OldBugMove/template/en/default/admin/params/oldbugmove.html.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-[%
-   title = "$terms.Bug Moving"
-   desc = "Set up parameters to move $terms.bugs to/from another installation"
-%]
-
-[% param_descs = {
-
-  "move-to-url" => 
-    "The URL of the database we allow some of our $terms.bugs to"
-    _ " be moved to.",
-
-  "move-to-address" => 
-    "To move ${terms.bugs}, an email is sent to the target database."
-    _ " This is the email address that that database uses to listen"
-    _ " for incoming ${terms.bugs}.",
-
-  movers => 
-    "A list of people with permission to move $terms.bugs ",
-
-} %]
diff --git a/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl b/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl
deleted file mode 100644
index afe03af659..0000000000
--- a/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[% IF comment.type == constants.CMT_MOVED_TO %]
-[% comment.body %]
-
-[%+ terms.Bug %] moved to [% Param("move-to-url") %].
-If the move succeeded, [% comment.extra_data FILTER email %] will receive a mail
-containing the number of the new [% terms.bug %] in the other database.
-If all went well, please paste in a link to the new [% terms.bug %]. 
-Otherwise, reopen this [% terms.bug %].
-[% END %]
diff --git a/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl
deleted file mode 100644
index d45026b417..0000000000
--- a/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[% IF error == "oldbugmove_no_delete_moved" %]
-    As long as the OldBugMove extension is active, you cannot
-    delete the [%+ display_value("resolution", "MOVED") FILTER html %]
-    resolution.
-[% ELSIF error == "oldbugmove_no_manual_move" %]
-    You cannot set the resolution of [% terms.abug %] to 
-    [%+ display_value("resolution", "MOVED") FILTER html %] without
-    moving the [% terms.bug %].
-[% END %]
diff --git a/extensions/Voting/Config.pm b/extensions/Voting/Config.pm
index 97c44933e2..81625f85c6 100644
--- a/extensions/Voting/Config.pm
+++ b/extensions/Voting/Config.pm
@@ -7,16 +7,14 @@
 
 package Bugzilla::Extension::Voting;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use constant NAME => 'Voting';
 
-use constant REQUIRED_MODULES => [
-];
+use constant REQUIRED_MODULES => [];
 
-use constant OPTIONAL_MODULES => [
-];
+use constant OPTIONAL_MODULES => [];
 
 __PACKAGE__->NAME;
diff --git a/extensions/Voting/Extension.pm b/extensions/Voting/Extension.pm
index 8009f16bbc..194c8f0f46 100644
--- a/extensions/Voting/Extension.pm
+++ b/extensions/Voting/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Voting;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -25,82 +25,84 @@ use Bugzilla::Token;
 
 use List::Util qw(min sum);
 
-use constant VERSION => BUGZILLA_VERSION;
+use constant VERSION               => BUGZILLA_VERSION;
 use constant DEFAULT_VOTES_PER_BUG => 1;
+
 # These came from Bugzilla itself, so they maintain the old numbers
 # they had before.
 use constant CMT_POPULAR_VOTES => 3;
-use constant REL_VOTER => 4;
+use constant REL_VOTER         => 4;
 
 ################
 # Installation #
 ################
 
 BEGIN {
-    *Bugzilla::Bug::votes = \&votes;
+  *Bugzilla::Bug::votes = \&votes;
 }
 
 sub votes {
-    my $self = shift;
-    my $dbh = Bugzilla->dbh;
+  my $self = shift;
+  my $dbh  = Bugzilla->dbh;
 
-    return $self->{votes} if exists $self->{votes};
+  return $self->{votes} if exists $self->{votes};
 
-    $self->{votes} = $dbh->selectrow_array('SELECT votes FROM bugs WHERE bug_id = ?',
-                                           undef, $self->id);
-    return $self->{votes};
+  $self->{votes}
+    = $dbh->selectrow_array('SELECT votes FROM bugs WHERE bug_id = ?',
+    undef, $self->id);
+  return $self->{votes};
 }
 
 sub db_schema_abstract_schema {
-    my ($self, $args) = @_;
-    $args->{'schema'}->{'votes'} = {
-        FIELDS => [
-            who        => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES => {TABLE  => 'profiles',
-                                          COLUMN => 'userid',
-                                          DELETE => 'CASCADE'}},
-            bug_id     => {TYPE => 'INT3', NOTNULL => 1,
-                           REFERENCES  => {TABLE  =>  'bugs',
-                                           COLUMN =>  'bug_id',
-                                           DELETE => 'CASCADE'}},
-            vote_count => {TYPE => 'INT2', NOTNULL => 1},
-        ],
-        INDEXES => [
-            votes_who_idx    => ['who'],
-            votes_bug_id_idx => ['bug_id'],
-        ],
-    };
+  my ($self, $args) = @_;
+  $args->{'schema'}->{'votes'} = {
+    FIELDS => [
+      who => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'profiles', COLUMN => 'userid', DELETE => 'CASCADE'}
+      },
+      bug_id => {
+        TYPE       => 'INT3',
+        NOTNULL    => 1,
+        REFERENCES => {TABLE => 'bugs', COLUMN => 'bug_id', DELETE => 'CASCADE'}
+      },
+      vote_count => {TYPE => 'INT2', NOTNULL => 1},
+    ],
+    INDEXES => [votes_who_idx => ['who'], votes_bug_id_idx => ['bug_id'],],
+  };
 }
 
 sub install_update_db {
-    my $dbh = Bugzilla->dbh;
-    # Note that before Bugzilla 4.0, voting was a built-in part of Bugzilla,
-    # so updates to the columns for old versions of Bugzilla happen in
-    # Bugzilla::Install::DB, and can't safely be moved to this extension.
-
-    my $field = new Bugzilla::Field({ name => 'votes' });
-    if (!$field) {
-        Bugzilla::Field->create(
-            { name => 'votes', description => 'Votes', buglist => 1 });
-    }
-
-    $dbh->bz_add_column('products', 'votesperuser',
-        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-    $dbh->bz_add_column('products', 'maxvotesperbug', 
-        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => DEFAULT_VOTES_PER_BUG});
-    $dbh->bz_add_column('products', 'votestoconfirm',
-        {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
-
-    $dbh->bz_add_column('bugs', 'votes',
-        {TYPE => 'INT3', NOTNULL => 1, DEFAULT => 0});
-    $dbh->bz_add_index('bugs', 'bugs_votes_idx', ['votes']);
-
-    # maxvotesperbug used to default to 10,000, which isn't very sensible.
-    my $per_bug = $dbh->bz_column_info('products', 'maxvotesperbug');
-    if ($per_bug->{DEFAULT} != DEFAULT_VOTES_PER_BUG) {
-        $dbh->bz_alter_column('products', 'maxvotesperbug',
-            {TYPE => 'INT2', NOTNULL => 1, DEFAULT => DEFAULT_VOTES_PER_BUG});
-    }
+  my $dbh = Bugzilla->dbh;
+
+  # Note that before Bugzilla 4.0, voting was a built-in part of Bugzilla,
+  # so updates to the columns for old versions of Bugzilla happen in
+  # Bugzilla::Install::DB, and can't safely be moved to this extension.
+
+  my $field = new Bugzilla::Field({name => 'votes'});
+  if (!$field) {
+    Bugzilla::Field->create(
+      {name => 'votes', description => 'Votes', buglist => 1});
+  }
+
+  $dbh->bz_add_column('products', 'votesperuser',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+  $dbh->bz_add_column('products', 'maxvotesperbug',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => DEFAULT_VOTES_PER_BUG});
+  $dbh->bz_add_column('products', 'votestoconfirm',
+    {TYPE => 'INT2', NOTNULL => 1, DEFAULT => 0});
+
+  $dbh->bz_add_column('bugs', 'votes',
+    {TYPE => 'INT3', NOTNULL => 1, DEFAULT => 0});
+  $dbh->bz_add_index('bugs', 'bugs_votes_idx', ['votes']);
+
+  # maxvotesperbug used to default to 10,000, which isn't very sensible.
+  my $per_bug = $dbh->bz_column_info('products', 'maxvotesperbug');
+  if ($per_bug->{DEFAULT} != DEFAULT_VOTES_PER_BUG) {
+    $dbh->bz_alter_column('products', 'maxvotesperbug',
+      {TYPE => 'INT2', NOTNULL => 1, DEFAULT => DEFAULT_VOTES_PER_BUG});
+  }
 }
 
 ###########
@@ -108,93 +110,98 @@ sub install_update_db {
 ###########
 
 sub object_columns {
-    my ($self, $args) = @_;
-    my ($class, $columns) = @$args{qw(class columns)};
-    if ($class->isa('Bugzilla::Bug')) {
-        push(@$columns, 'votes');
-    }
-    elsif ($class->isa('Bugzilla::Product')) {
-        push(@$columns, qw(votesperuser maxvotesperbug votestoconfirm));
-    }
+  my ($self,  $args)    = @_;
+  my ($class, $columns) = @$args{qw(class columns)};
+  if ($class->isa('Bugzilla::Bug')) {
+    push(@$columns, 'votes');
+  }
+  elsif ($class->isa('Bugzilla::Product')) {
+    push(@$columns, qw(votesperuser maxvotesperbug votestoconfirm));
+  }
 }
 
 sub bug_fields {
-    my ($self, $args) = @_;
-    my $fields = $args->{fields};
-    push(@$fields, 'votes');
+  my ($self, $args) = @_;
+  my $fields = $args->{fields};
+  push(@$fields, 'votes');
 }
 
 sub object_update_columns {
-    my ($self, $args) = @_;
-    my ($object, $columns) = @$args{qw(object columns)};
-    if ($object->isa('Bugzilla::Product')) {
-        push(@$columns, qw(votesperuser maxvotesperbug votestoconfirm));
-    }
+  my ($self,   $args)    = @_;
+  my ($object, $columns) = @$args{qw(object columns)};
+  if ($object->isa('Bugzilla::Product')) {
+    push(@$columns, qw(votesperuser maxvotesperbug votestoconfirm));
+  }
 }
 
 sub object_validators {
-    my ($self, $args) = @_;
-    my ($class, $validators) = @$args{qw(class validators)};
-    if ($class->isa('Bugzilla::Product')) {
-        $validators->{'votesperuser'}   = \&_check_votesperuser;
-        $validators->{'maxvotesperbug'} = \&_check_maxvotesperbug;
-        $validators->{'votestoconfirm'} = \&_check_votestoconfirm;
-    }
+  my ($self,  $args)       = @_;
+  my ($class, $validators) = @$args{qw(class validators)};
+  if ($class->isa('Bugzilla::Product')) {
+    $validators->{'votesperuser'}   = \&_check_votesperuser;
+    $validators->{'maxvotesperbug'} = \&_check_maxvotesperbug;
+    $validators->{'votestoconfirm'} = \&_check_votestoconfirm;
+  }
 }
 
 sub object_before_create {
-    my ($self, $args) = @_;
-    my ($class, $params) = @$args{qw(class params)};
-    if ($class->isa('Bugzilla::Bug')) {
-        # Don't ever allow people to directly specify "votes" into the bugs
-        # table.
-        delete $params->{votes};
-    }
-    elsif ($class->isa('Bugzilla::Product')) {
-        my $input = Bugzilla->input_params;
-        $params->{votesperuser}   = $input->{'votesperuser'};
-        $params->{maxvotesperbug} = $input->{'maxvotesperbug'};
-        $params->{votestoconfirm} = $input->{'votestoconfirm'};
-    }
+  my ($self,  $args)   = @_;
+  my ($class, $params) = @$args{qw(class params)};
+  if ($class->isa('Bugzilla::Bug')) {
+
+    # Don't ever allow people to directly specify "votes" into the bugs
+    # table.
+    delete $params->{votes};
+  }
+  elsif ($class->isa('Bugzilla::Product')) {
+    my $input = Bugzilla->input_params;
+    $params->{votesperuser}   = $input->{'votesperuser'};
+    $params->{maxvotesperbug} = $input->{'maxvotesperbug'};
+    $params->{votestoconfirm} = $input->{'votestoconfirm'};
+  }
 }
 
 sub object_end_of_set_all {
-    my ($self, $args) = @_;
-    my ($object) = $args->{object};
-    if ($object->isa('Bugzilla::Product')) {
-        my $input = Bugzilla->input_params;
-        $object->set('votesperuser',   $input->{'votesperuser'});
-        $object->set('maxvotesperbug', $input->{'maxvotesperbug'});
-        $object->set('votestoconfirm', $input->{'votestoconfirm'});
-    }
+  my ($self, $args) = @_;
+  my ($object) = $args->{object};
+  if ($object->isa('Bugzilla::Product')) {
+    my $input = Bugzilla->input_params;
+    $object->set('votesperuser',   $input->{'votesperuser'});
+    $object->set('maxvotesperbug', $input->{'maxvotesperbug'});
+    $object->set('votestoconfirm', $input->{'votestoconfirm'});
+  }
 }
 
 sub object_end_of_update {
-    my ($self, $args) = @_;
-    my ($object, $changes) = @$args{qw(object changes)};
-    if ( $object->isa('Bugzilla::Product')
-         and ($changes->{maxvotesperbug} or $changes->{votesperuser} 
-              or $changes->{votestoconfirm}) ) 
-    {
-        _modify_bug_votes($object, $changes);
-    }
+  my ($self,   $args)    = @_;
+  my ($object, $changes) = @$args{qw(object changes)};
+  if (
+    $object->isa('Bugzilla::Product')
+    and ($changes->{maxvotesperbug}
+      or $changes->{votesperuser}
+      or $changes->{votestoconfirm})
+    )
+  {
+    _modify_bug_votes($object, $changes);
+  }
 }
 
 sub bug_end_of_update {
-    my ($self, $args) = @_;
-    my ($bug, $changes) = @$args{qw(bug changes)};
-
-    if ($changes->{'product'}) {
-        my @msgs;
-        # If some votes have been removed, RemoveVotes() returns
-        # a list of messages to send to voters.
-        @msgs = _remove_votes($bug->id, 0, 'votes_bug_moved');
-        _confirm_if_vote_confirmed($bug);
-
-        foreach my $msg (@msgs) {
-            MessageToMTA($msg);
-        }
+  my ($self, $args)    = @_;
+  my ($bug,  $changes) = @$args{qw(bug changes)};
+
+  if ($changes->{'product'}) {
+    my @msgs;
+
+    # If some votes have been removed, RemoveVotes() returns
+    # a list of messages to send to voters.
+    @msgs = _remove_votes($bug->id, 0, 'votes_bug_moved');
+    _confirm_if_vote_confirmed($bug);
+
+    foreach my $msg (@msgs) {
+      MessageToMTA($msg);
     }
+  }
 }
 
 #############
@@ -202,27 +209,28 @@ sub bug_end_of_update {
 #############
 
 sub template_before_create {
-    my ($self, $args) = @_;
-    my $config = $args->{config};
-    my $constants = $config->{CONSTANTS};
-    $constants->{REL_VOTER} = REL_VOTER;
-    $constants->{CMT_POPULAR_VOTES} = CMT_POPULAR_VOTES;
-    $constants->{DEFAULT_VOTES_PER_BUG} = DEFAULT_VOTES_PER_BUG;
+  my ($self, $args) = @_;
+  my $config    = $args->{config};
+  my $constants = $config->{CONSTANTS};
+  $constants->{REL_VOTER}             = REL_VOTER;
+  $constants->{CMT_POPULAR_VOTES}     = CMT_POPULAR_VOTES;
+  $constants->{DEFAULT_VOTES_PER_BUG} = DEFAULT_VOTES_PER_BUG;
 }
 
 
 sub template_before_process {
-    my ($self, $args) = @_;
-    my ($vars, $file) = @$args{qw(vars file)};
-    if ($file eq 'admin/users/confirm-delete.html.tmpl') {
-        my $who = $vars->{otheruser};
-        my $votes = Bugzilla->dbh->selectrow_array(
-            'SELECT COUNT(*) FROM votes WHERE who = ?', undef, $who->id);
-        if ($votes) {
-            $vars->{other_safe} = 1;
-            $vars->{votes} = $votes;
-        }
-    }
+  my ($self, $args) = @_;
+  my ($vars, $file) = @$args{qw(vars file)};
+  if ($file eq 'admin/users/confirm-delete.html.tmpl') {
+    my $who = $vars->{otheruser};
+    my $votes
+      = Bugzilla->dbh->selectrow_array('SELECT COUNT(*) FROM votes WHERE who = ?',
+      undef, $who->id);
+    if ($votes) {
+      $vars->{other_safe} = 1;
+      $vars->{votes}      = $votes;
+    }
+  }
 }
 
 ###########
@@ -230,19 +238,19 @@ sub template_before_process {
 ###########
 
 sub bugmail_recipients {
-    my ($self, $args) = @_;
-    my ($bug, $recipients) = @$args{qw(bug recipients)};
-    my $dbh = Bugzilla->dbh;
+  my ($self, $args)       = @_;
+  my ($bug,  $recipients) = @$args{qw(bug recipients)};
+  my $dbh = Bugzilla->dbh;
 
-    my $voters = $dbh->selectcol_arrayref(
-        "SELECT who FROM votes WHERE bug_id = ?", undef, $bug->id);
-    $recipients->{$_}->{+REL_VOTER} = 1 foreach (@$voters);
+  my $voters = $dbh->selectcol_arrayref("SELECT who FROM votes WHERE bug_id = ?",
+    undef, $bug->id);
+  $recipients->{$_}->{+REL_VOTER} = 1 foreach (@$voters);
 }
 
 sub bugmail_relationships {
-    my ($self, $args) = @_;
-    my $relationships = $args->{relationships};
-    $relationships->{+REL_VOTER} = 'Voter';
+  my ($self, $args) = @_;
+  my $relationships = $args->{relationships};
+  $relationships->{+REL_VOTER} = 'Voter';
 }
 
 ###############
@@ -250,59 +258,59 @@ sub bugmail_relationships {
 ###############
 
 sub sanitycheck_check {
-    my ($self, $args) = @_;
-    my $status = $args->{status};
-
-    # Vote Cache
-    $status->('voting_count_start');
-    my $dbh = Bugzilla->dbh;
-    my %cached_counts = @{ $dbh->selectcol_arrayref(
-        'SELECT bug_id, votes FROM bugs', {Columns=>[1,2]}) };
-
-    my %real_counts = @{ $dbh->selectcol_arrayref(
-        'SELECT bug_id, SUM(vote_count) FROM votes '
-        . $dbh->sql_group_by('bug_id'), {Columns=>[1,2]}) };
-
-    my $needs_rebuild;
-    foreach my $id (keys %cached_counts) {
-        my $cached_count = $cached_counts{$id};
-        my $real_count = $real_counts{$id} || 0;
-        if ($cached_count < 0) {
-            $status->('voting_count_alert', { id => $id }, 'alert');
-        }
-        elsif ($cached_count != $real_count) {
-            $status->('voting_cache_alert', { id => $id }, 'alert');
-            $needs_rebuild = 1;
-        }
-    }
-
-    $status->('voting_cache_rebuild_fix') if $needs_rebuild;
+  my ($self, $args) = @_;
+  my $status = $args->{status};
+
+  # Vote Cache
+  $status->('voting_count_start');
+  my $dbh           = Bugzilla->dbh;
+  my %cached_counts = @{$dbh->selectcol_arrayref('SELECT bug_id, votes FROM bugs',
+      {Columns => [1, 2]})};
+
+  my %real_counts = @{
+    $dbh->selectcol_arrayref(
+      'SELECT bug_id, SUM(vote_count) FROM votes ' . $dbh->sql_group_by('bug_id'),
+      {Columns => [1, 2]})
+  };
+
+  my $needs_rebuild;
+  foreach my $id (keys %cached_counts) {
+    my $cached_count = $cached_counts{$id};
+    my $real_count = $real_counts{$id} || 0;
+    if ($cached_count < 0) {
+      $status->('voting_count_alert', {id => $id}, 'alert');
+    }
+    elsif ($cached_count != $real_count) {
+      $status->('voting_cache_alert', {id => $id}, 'alert');
+      $needs_rebuild = 1;
+    }
+  }
+
+  $status->('voting_cache_rebuild_fix') if $needs_rebuild;
 }
 
 sub sanitycheck_repair {
-    my ($self, $args) = @_;
-    my $status = $args->{status};
-    my $input = Bugzilla->input_params;
-    my $dbh = Bugzilla->dbh;
-
-    return if !$input->{rebuild_vote_cache};
-
-    $status->('voting_cache_rebuild_start');
-    $dbh->bz_start_transaction();
-    $dbh->do('UPDATE bugs SET votes = 0');
-
-    my $sth = $dbh->prepare(
-        'SELECT bug_id, SUM(vote_count) FROM votes '
-        . $dbh->sql_group_by('bug_id'));
-    $sth->execute();
-
-    my $sth_update = $dbh->prepare(
-        'UPDATE bugs SET votes = ? WHERE bug_id = ?');
-    while (my ($id, $count) = $sth->fetchrow_array) {
-        $sth_update->execute($count, $id);
-    }
-    $dbh->bz_commit_transaction();
-    $status->('voting_cache_rebuild_end');
+  my ($self, $args) = @_;
+  my $status = $args->{status};
+  my $input  = Bugzilla->input_params;
+  my $dbh    = Bugzilla->dbh;
+
+  return if !$input->{rebuild_vote_cache};
+
+  $status->('voting_cache_rebuild_start');
+  $dbh->bz_start_transaction();
+  $dbh->do('UPDATE bugs SET votes = 0');
+
+  my $sth = $dbh->prepare(
+    'SELECT bug_id, SUM(vote_count) FROM votes ' . $dbh->sql_group_by('bug_id'));
+  $sth->execute();
+
+  my $sth_update = $dbh->prepare('UPDATE bugs SET votes = ? WHERE bug_id = ?');
+  while (my ($id, $count) = $sth->fetchrow_array) {
+    $sth_update->execute($count, $id);
+  }
+  $dbh->bz_commit_transaction();
+  $status->('voting_cache_rebuild_end');
 }
 
 
@@ -311,35 +319,36 @@ sub sanitycheck_repair {
 ##############
 
 sub _check_votesperuser {
-    return _check_votes(0, @_);
+  return _check_votes(0, @_);
 }
 
 sub _check_maxvotesperbug {
-    return _check_votes(DEFAULT_VOTES_PER_BUG, @_);
+  return _check_votes(DEFAULT_VOTES_PER_BUG, @_);
 }
 
 sub _check_votestoconfirm {
-    return _check_votes(0, @_);
+  return _check_votes(0, @_);
 }
 
 # This subroutine is only used internally by other _check_votes_* validators.
 sub _check_votes {
-    my ($default, $invocant, $votes, $field) = @_;
-
-    detaint_natural($votes) if defined $votes;
-    # On product creation, if the number of votes is not a valid integer,
-    # we silently fall back to the given default value.
-    # If the product already exists and the change is illegal, we complain.
-    if (!defined $votes) {
-        if (ref $invocant) {
-            ThrowUserError('voting_product_illegal_votes',
-                           { field => $field, votes => $_[2] });
-        }
-        else {
-            $votes = $default;
-        }
+  my ($default, $invocant, $votes, $field) = @_;
+
+  detaint_natural($votes) if defined $votes;
+
+  # On product creation, if the number of votes is not a valid integer,
+  # we silently fall back to the given default value.
+  # If the product already exists and the change is illegal, we complain.
+  if (!defined $votes) {
+    if (ref $invocant) {
+      ThrowUserError('voting_product_illegal_votes',
+        {field => $field, votes => $_[2]});
+    }
+    else {
+      $votes = $default;
     }
-    return $votes;
+  }
+  return $votes;
 }
 
 #########
@@ -347,290 +356,321 @@ sub _check_votes {
 #########
 
 sub page_before_template {
-    my ($self, $args) = @_;
-    my $page = $args->{page_id};
-    my $vars = $args->{vars};
-
-    if ($page =~ m{^voting/bug\.}) {
-        _page_bug($vars);
-    }
-    elsif ($page =~ m{^voting/user\.}) {
-        _page_user($vars);
-    }
+  my ($self, $args) = @_;
+  my $page = $args->{page_id};
+  my $vars = $args->{vars};
+
+  if ($page =~ m{^voting/bug\.}) {
+    _page_bug($vars);
+  }
+  elsif ($page =~ m{^voting/user\.}) {
+    _page_user($vars);
+  }
 }
 
 sub _page_bug {
-    my ($vars) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $input = Bugzilla->input_params;
+  my ($vars) = @_;
+  my $dbh    = Bugzilla->dbh;
+  my $input  = Bugzilla->input_params;
 
-    my $bug_id = $input->{bug_id};
-    my $bug = Bugzilla::Bug->check($bug_id);
+  my $bug_id = $input->{bug_id};
+  my $bug    = Bugzilla::Bug->check($bug_id);
 
-    $vars->{'bug'} = $bug;
-    $vars->{'users'} =
-        $dbh->selectall_arrayref('SELECT profiles.login_name,
+  $vars->{'bug'}   = $bug;
+  $vars->{'users'} = $dbh->selectall_arrayref(
+    'SELECT profiles.login_name,
                                          profiles.userid AS id,
                                          votes.vote_count
                                     FROM votes
                               INNER JOIN profiles
                                       ON profiles.userid = votes.who
-                                   WHERE votes.bug_id = ?',
-                                  {Slice=>{}}, $bug->id);
+                                   WHERE votes.bug_id = ?', {Slice => {}}, $bug->id
+  );
 }
 
 sub _page_user {
-    my ($vars) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    my $input = Bugzilla->input_params;
+  my ($vars) = @_;
+  my $dbh    = Bugzilla->dbh;
+  my $user   = Bugzilla->user;
+  my $input  = Bugzilla->input_params;
 
-    my $action = $input->{action};
-    if ($action and $action eq 'vote') {
-        _update_votes($vars);
-    }
+  my $action = $input->{action};
+  if ($action and $action eq 'vote') {
+    _update_votes($vars);
+  }
 
-    # If a bug_id is given, and we're editing, we'll add it to the votes list.
-    
-    my $bug_id = $input->{bug_id};
-    my $bug = Bugzilla::Bug->check({ id => $bug_id, cache => 1 }) if $bug_id;
-    my $who_id = $input->{user_id} || $user->id;
+  # If a bug_id is given, and we're editing, we'll add it to the votes list.
 
-    # Logged-out users must specify a user_id.
-    Bugzilla->login(LOGIN_REQUIRED) if !$who_id;
+  my $bug_id = $input->{bug_id};
+  my $bug    = Bugzilla::Bug->check({id => $bug_id, cache => 1}) if $bug_id;
+  my $who_id = $input->{user_id} || $user->id;
 
-    my $who = Bugzilla::User->check({ id => $who_id });
+  # Logged-out users must specify a user_id.
+  Bugzilla->login(LOGIN_REQUIRED) if !$who_id;
 
-    my $canedit = $user->id == $who->id;
+  my $who = Bugzilla::User->check({id => $who_id});
 
-    $dbh->bz_start_transaction();
+  my $canedit = $user->id == $who->id;
 
-    if ($canedit && $bug) {
-        # Make sure there is an entry for this bug
-        # in the vote table, just so that things display right.
-        my $has_votes = $dbh->selectrow_array('SELECT vote_count FROM votes 
-                                               WHERE bug_id = ? AND who = ?',
-                                               undef, ($bug->id, $who->id));
-        if (!$has_votes) {
-            $dbh->do('INSERT INTO votes (who, bug_id, vote_count) 
-                      VALUES (?, ?, 0)', undef, ($who->id, $bug->id));
-        }
+  $dbh->bz_start_transaction();
+
+  if ($canedit && $bug) {
+
+    # Make sure there is an entry for this bug
+    # in the vote table, just so that things display right.
+    my $has_votes = $dbh->selectrow_array(
+      'SELECT vote_count FROM votes 
+                                               WHERE bug_id = ? AND who = ?', undef,
+      ($bug->id, $who->id)
+    );
+    if (!$has_votes) {
+      $dbh->do(
+        'INSERT INTO votes (who, bug_id, vote_count) 
+                      VALUES (?, ?, 0)', undef, ($who->id, $bug->id)
+      );
     }
+  }
 
-    my (@products, @all_bug_ids);
-    # Read the votes data for this user for each product.
-    foreach my $product (@{ $user->get_selectable_products }) {
-        next unless ($product->{votesperuser} > 0);
+  my (@products, @all_bug_ids);
 
-        my $vote_list =
-          $dbh->selectall_arrayref('SELECT votes.bug_id, votes.vote_count
+  # Read the votes data for this user for each product.
+  foreach my $product (@{$user->get_selectable_products}) {
+    next unless ($product->{votesperuser} > 0);
+
+    my $vote_list = $dbh->selectall_arrayref(
+      'SELECT votes.bug_id, votes.vote_count
                                       FROM votes
                                 INNER JOIN bugs
                                         ON votes.bug_id = bugs.bug_id
                                      WHERE votes.who = ?
-                                       AND bugs.product_id = ?',
-                                     undef, ($who->id, $product->id));
-
-        my %votes = map { $_->[0] => $_->[1] } @$vote_list;
-        my @bug_ids = sort keys %votes;
-        # Exclude bugs that the user can no longer see.
-        @bug_ids = @{ $user->visible_bugs(\@bug_ids) };
-        next unless scalar @bug_ids;
-
-        push(@all_bug_ids, @bug_ids);
-        my @bugs = @{ Bugzilla::Bug->new_from_list(\@bug_ids) };
-        $_->{count} = $votes{$_->id} foreach @bugs;
-        # We include votes from bugs that the user can no longer see.
-        my $total = sum(values %votes) || 0;
-
-        my $onevoteonly = 0;
-        $onevoteonly = 1 if (min($product->{votesperuser},
-                                 $product->{maxvotesperbug}) == 1);
-
-        push(@products, { name => $product->name,
-                          bugs => \@bugs,
-                          bug_ids => \@bug_ids,
-                          onevoteonly => $onevoteonly,
-                          total => $total,
-                          maxvotes => $product->{votesperuser},
-                          maxperbug => $product->{maxvotesperbug} });
-    }
-
-    if ($canedit && $bug) {
-        $dbh->do('DELETE FROM votes WHERE vote_count = 0 AND who = ?',
-                 undef, $who->id);
-    }
-    $dbh->bz_commit_transaction();
-
-    $vars->{'canedit'} = $canedit;
-    $vars->{'voting_user'} = { "login" => $who->name };
-    $vars->{'products'} = \@products;
-    $vars->{'this_bug'} = $bug;
-    $vars->{'all_bug_ids'} = \@all_bug_ids;
+                                       AND bugs.product_id = ?', undef,
+      ($who->id, $product->id)
+    );
+
+    my %votes = map { $_->[0] => $_->[1] } @$vote_list;
+    my @bug_ids = sort keys %votes;
+
+    # Exclude bugs that the user can no longer see.
+    @bug_ids = @{$user->visible_bugs(\@bug_ids)};
+    next unless scalar @bug_ids;
+
+    push(@all_bug_ids, @bug_ids);
+    my @bugs = @{Bugzilla::Bug->new_from_list(\@bug_ids)};
+    $_->{count} = $votes{$_->id} foreach @bugs;
+
+    # We include votes from bugs that the user can no longer see.
+    my $total = sum(values %votes) || 0;
+
+    my $onevoteonly = 0;
+    $onevoteonly = 1
+      if (min($product->{votesperuser}, $product->{maxvotesperbug}) == 1);
+
+    push(
+      @products,
+      {
+        name        => $product->name,
+        bugs        => \@bugs,
+        bug_ids     => \@bug_ids,
+        onevoteonly => $onevoteonly,
+        total       => $total,
+        maxvotes    => $product->{votesperuser},
+        maxperbug   => $product->{maxvotesperbug}
+      }
+    );
+  }
+
+  if ($canedit && $bug) {
+    $dbh->do('DELETE FROM votes WHERE vote_count = 0 AND who = ?', undef, $who->id);
+  }
+  $dbh->bz_commit_transaction();
+
+  $vars->{'canedit'}     = $canedit;
+  $vars->{'voting_user'} = {"login" => $who->name};
+  $vars->{'products'}    = \@products;
+  $vars->{'this_bug'}    = $bug;
+  $vars->{'all_bug_ids'} = \@all_bug_ids;
 }
 
 sub _update_votes {
-    my ($vars) = @_;
-
-    ############################################################################
-    # Begin Data/Security Validation
-    ############################################################################
-
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    my $template = Bugzilla->template;
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    my $input = Bugzilla->input_params;
-
-    # Build a list of bug IDs for which votes have been submitted.  Votes
-    # are submitted in form fields in which the field names are the bug 
-    # IDs and the field values are the number of votes.
-
-    my @buglist = grep {/^\d+$/} keys %$input;
-    my (%bugs, %votes);
-
-    # If no bugs are in the buglist, let's make sure the user gets notified
-    # that their votes will get nuked if they continue.
-    if (scalar(@buglist) == 0) {
-        if (!defined $cgi->param('delete_all_votes')) {
-            print $cgi->header();
-            $template->process("voting/delete-all.html.tmpl", $vars)
-              || ThrowTemplateError($template->error());
-            exit;
-        }
-        elsif ($cgi->param('delete_all_votes') == 0) {
-            print $cgi->redirect("page.cgi?id=voting/user.html");
-            exit;
+  my ($vars) = @_;
+
+  ############################################################################
+  # Begin Data/Security Validation
+  ############################################################################
+
+  my $cgi      = Bugzilla->cgi;
+  my $dbh      = Bugzilla->dbh;
+  my $template = Bugzilla->template;
+  my $user     = Bugzilla->login(LOGIN_REQUIRED);
+  my $input    = Bugzilla->input_params;
+
+  # Build a list of bug IDs for which votes have been submitted.  Votes
+  # are submitted in form fields in which the field names are the bug
+  # IDs and the field values are the number of votes.
+
+  my @buglist = grep {/^\d+$/} keys %$input;
+  my (%bugs, %votes);
+
+  # If no bugs are in the buglist, let's make sure the user gets notified
+  # that their votes will get nuked if they continue.
+  if (scalar(@buglist) == 0) {
+    if (!defined $cgi->param('delete_all_votes')) {
+      print $cgi->header();
+      $template->process("voting/delete-all.html.tmpl", $vars)
+        || ThrowTemplateError($template->error());
+      exit;
+    }
+    elsif ($cgi->param('delete_all_votes') == 0) {
+      print $cgi->redirect("page.cgi?id=voting/user.html");
+      exit;
+    }
+  }
+  else {
+    $user->visible_bugs(\@buglist);
+    my $bugs_obj = Bugzilla::Bug->new_from_list(\@buglist);
+    $bugs{$_->id} = $_ foreach @$bugs_obj;
+  }
+
+  # Call check_is_visible() on each bug to make sure it is an existing bug
+  # that the user is authorized to access, and make sure the number of votes
+  # submitted is also an integer.
+  foreach my $id (@buglist) {
+    my $bug = $bugs{$id}
+      or ThrowUserError('bug_id_does_not_exist', {bug_id => $id});
+    $bug->check_is_visible;
+    $id = $bug->id;
+    $votes{$id} = $input->{$id};
+    detaint_natural($votes{$id}) || ThrowUserError("voting_must_be_nonnegative");
+  }
+
+  my $token = $cgi->param('token');
+  check_hash_token($token, ['vote']);
+
+  ############################################################################
+  # End Data/Security Validation
+  ############################################################################
+  my $who = $user->id;
+
+  # If the user is voting for bugs, make sure they aren't overstuffing
+  # the ballot box.
+  if (scalar @buglist) {
+    my (%prodcount, %products);
+    foreach my $bug_id (keys %bugs) {
+      my $bug  = $bugs{$bug_id};
+      my $prod = $bug->product;
+      $products{$prod}  ||= $bug->product_obj;
+      $prodcount{$prod} ||= 0;
+      $prodcount{$prod} += $votes{$bug_id};
+
+      # Make sure we haven't broken the votes-per-bug limit
+      ($votes{$bug_id} <= $products{$prod}->{maxvotesperbug}) || ThrowUserError(
+        "voting_too_many_votes_for_bug",
+        {
+          max     => $products{$prod}->{maxvotesperbug},
+          product => $prod,
+          votes   => $votes{$bug_id}
         }
+      );
     }
-    else {
-        $user->visible_bugs(\@buglist);
-        my $bugs_obj = Bugzilla::Bug->new_from_list(\@buglist);
-        $bugs{$_->id} = $_ foreach @$bugs_obj;
-    }
-
-    # Call check_is_visible() on each bug to make sure it is an existing bug
-    # that the user is authorized to access, and make sure the number of votes
-    # submitted is also an integer.
-    foreach my $id (@buglist) {
-        my $bug = $bugs{$id}
-          or ThrowUserError('bug_id_does_not_exist', { bug_id => $id });
-        $bug->check_is_visible;
-        $id = $bug->id;
-        $votes{$id} = $input->{$id};
-        detaint_natural($votes{$id})
-          || ThrowUserError("voting_must_be_nonnegative");
-    }
-
-    my $token = $cgi->param('token');
-    check_hash_token($token, ['vote']);
-
-    ############################################################################
-    # End Data/Security Validation
-    ############################################################################
-    my $who = $user->id;
-
-    # If the user is voting for bugs, make sure they aren't overstuffing
-    # the ballot box.
-    if (scalar @buglist) {
-        my (%prodcount, %products);
-        foreach my $bug_id (keys %bugs) {
-            my $bug = $bugs{$bug_id};
-            my $prod = $bug->product;
-            $products{$prod} ||= $bug->product_obj;
-            $prodcount{$prod} ||= 0;
-            $prodcount{$prod} += $votes{$bug_id};
-
-            # Make sure we haven't broken the votes-per-bug limit
-            ($votes{$bug_id} <= $products{$prod}->{maxvotesperbug})
-              || ThrowUserError("voting_too_many_votes_for_bug",
-                                {max => $products{$prod}->{maxvotesperbug},
-                                 product => $prod,
-                                 votes => $votes{$bug_id}});
-        }
 
-        # Make sure we haven't broken the votes-per-product limit
-        foreach my $prod (keys(%prodcount)) {
-            ($prodcount{$prod} <= $products{$prod}->{votesperuser})
-              || ThrowUserError("voting_too_many_votes_for_product",
-                                {max => $products{$prod}->{votesperuser},
-                                 product => $prod,
-                                 votes => $prodcount{$prod}});
+    # Make sure we haven't broken the votes-per-product limit
+    foreach my $prod (keys(%prodcount)) {
+      ($prodcount{$prod} <= $products{$prod}->{votesperuser}) || ThrowUserError(
+        "voting_too_many_votes_for_product",
+        {
+          max     => $products{$prod}->{votesperuser},
+          product => $prod,
+          votes   => $prodcount{$prod}
         }
+      );
     }
+  }
 
-    # Update the user's votes in the database.
-    $dbh->bz_start_transaction();
+  # Update the user's votes in the database.
+  $dbh->bz_start_transaction();
 
-    my $old_list = $dbh->selectall_arrayref('SELECT bug_id, vote_count FROM votes
-                                             WHERE who = ?', undef, $who);
+  my $old_list = $dbh->selectall_arrayref(
+    'SELECT bug_id, vote_count FROM votes
+                                             WHERE who = ?', undef, $who
+  );
 
-    my %old_votes = map { $_->[0] => $_->[1] } @$old_list;
+  my %old_votes = map { $_->[0] => $_->[1] } @$old_list;
 
-    my $sth_insertVotes = $dbh->prepare('INSERT INTO votes (who, bug_id, vote_count)
-                                         VALUES (?, ?, ?)');
-    my $sth_updateVotes = $dbh->prepare('UPDATE votes SET vote_count = ?
-                                         WHERE bug_id = ? AND who = ?');
+  my $sth_insertVotes = $dbh->prepare(
+    'INSERT INTO votes (who, bug_id, vote_count)
+                                         VALUES (?, ?, ?)'
+  );
+  my $sth_updateVotes = $dbh->prepare(
+    'UPDATE votes SET vote_count = ?
+                                         WHERE bug_id = ? AND who = ?'
+  );
 
-    my %affected = map { $_ => 1 } (@buglist, keys %old_votes);
-    my @deleted_votes;
+  my %affected = map { $_ => 1 } (@buglist, keys %old_votes);
+  my @deleted_votes;
 
-    foreach my $id (keys %affected) {
-        if (!$votes{$id}) {
-            push(@deleted_votes, $id);
-            next;
-        }
-        if ($votes{$id} == ($old_votes{$id} || 0)) {
-            delete $affected{$id};
-            next;
-        }
-        # We use 'defined' in case 0 was accidentally stored in the DB.
-        if (defined $old_votes{$id}) {
-            $sth_updateVotes->execute($votes{$id}, $id, $who);
-        }
-        else {
-            $sth_insertVotes->execute($who, $id, $votes{$id});
-        }
+  foreach my $id (keys %affected) {
+    if (!$votes{$id}) {
+      push(@deleted_votes, $id);
+      next;
     }
-
-    if (@deleted_votes) {
-        $dbh->do('DELETE FROM votes WHERE who = ? AND ' .
-                 $dbh->sql_in('bug_id', \@deleted_votes), undef, $who);
-    }
-
-    # Update the cached values in the bugs table
-    my @updated_bugs = ();
-
-    my $sth_getVotes = $dbh->prepare("SELECT SUM(vote_count) FROM votes
-                                      WHERE bug_id = ?");
-
-    $sth_updateVotes = $dbh->prepare('UPDATE bugs SET votes = ? WHERE bug_id = ?');
-
-    foreach my $id (keys %affected) {
-        $sth_getVotes->execute($id);
-        my $v = $sth_getVotes->fetchrow_array || 0;
-        $sth_updateVotes->execute($v, $id);
-
-        my $confirmed = _confirm_if_vote_confirmed($bugs{$id} || $id);
-        push (@updated_bugs, $id) if $confirmed;
+    if ($votes{$id} == ($old_votes{$id} || 0)) {
+      delete $affected{$id};
+      next;
     }
 
-    $dbh->bz_commit_transaction();
-
-    print $cgi->header() if scalar @updated_bugs;
-    $vars->{'type'} = "votes";
-    $vars->{'title_tag'} = 'change_votes';
-    foreach my $bug_id (@updated_bugs) {
-        $vars->{'id'} = $bug_id;
-        $vars->{'sent_bugmail'} = 
-            Bugzilla::BugMail::Send($bug_id, { 'changer' => $user });
-        
-        $template->process("bug/process/results.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-        # Set header_done to 1 only after the first bug.
-        $vars->{'header_done'} = 1;
+    # We use 'defined' in case 0 was accidentally stored in the DB.
+    if (defined $old_votes{$id}) {
+      $sth_updateVotes->execute($votes{$id}, $id, $who);
     }
-    $vars->{'message'} = 'votes_recorded';
+    else {
+      $sth_insertVotes->execute($who, $id, $votes{$id});
+    }
+  }
+
+  if (@deleted_votes) {
+    $dbh->do(
+      'DELETE FROM votes WHERE who = ? AND '
+        . $dbh->sql_in('bug_id', \@deleted_votes),
+      undef, $who
+    );
+  }
+
+  # Update the cached values in the bugs table
+  my @updated_bugs = ();
+
+  my $sth_getVotes = $dbh->prepare(
+    "SELECT SUM(vote_count) FROM votes
+                                      WHERE bug_id = ?"
+  );
+
+  $sth_updateVotes = $dbh->prepare('UPDATE bugs SET votes = ? WHERE bug_id = ?');
+
+  foreach my $id (keys %affected) {
+    $sth_getVotes->execute($id);
+    my $v = $sth_getVotes->fetchrow_array || 0;
+    $sth_updateVotes->execute($v, $id);
+    $bugs{$id}->{votes} = $v if $bugs{$id};
+    my $confirmed = _confirm_if_vote_confirmed($bugs{$id} || $id);
+    push(@updated_bugs, $id) if $confirmed;
+  }
+
+  $dbh->bz_commit_transaction();
+
+  print $cgi->header() if scalar @updated_bugs;
+  $vars->{'type'}      = "votes";
+  $vars->{'title_tag'} = 'change_votes';
+  foreach my $bug_id (@updated_bugs) {
+    $vars->{'id'} = $bug_id;
+    $vars->{'sent_bugmail'}
+      = Bugzilla::BugMail::Send($bug_id, {'changer' => $user});
+
+    $template->process("bug/process/results.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+
+    # Set header_done to 1 only after the first bug.
+    $vars->{'header_done'} = 1;
+  }
+  $vars->{'message'} = 'votes_recorded';
 }
 
 ######################
@@ -638,233 +678,245 @@ sub _update_votes {
 ######################
 
 sub _modify_bug_votes {
-    my ($product, $changes) = @_;
-    my $dbh = Bugzilla->dbh;
-    my @msgs;
+  my ($product, $changes) = @_;
+  my $dbh = Bugzilla->dbh;
+  my @msgs;
 
-    # 1. too many votes for a single user on a single bug.
-    my @toomanyvotes_list;
-    if ($product->{maxvotesperbug} < $product->{votesperuser}) {
-        my $votes = $dbh->selectall_arrayref(
-            'SELECT votes.who, votes.bug_id
+  # 1. too many votes for a single user on a single bug.
+  my @toomanyvotes_list;
+  if ($product->{maxvotesperbug} < $product->{votesperuser}) {
+    my $votes = $dbh->selectall_arrayref(
+      'SELECT votes.who, votes.bug_id
                FROM votes
                     INNER JOIN bugs ON bugs.bug_id = votes.bug_id
               WHERE bugs.product_id = ?
-                    AND votes.vote_count > ?',
-            undef, ($product->id, $product->{maxvotesperbug}));
-
-        foreach my $vote (@$votes) {
-            my ($who, $id) = (@$vote);
-            # If some votes are removed, _remove_votes() returns a list
-            # of messages to send to voters.
-            push(@msgs, _remove_votes($id, $who, 'votes_too_many_per_bug'));
-            my $name = Bugzilla::User->new($who)->login;
-            
-            push(@toomanyvotes_list, {id => $id, name => $name});
-        }
+                    AND votes.vote_count > ?', undef,
+      ($product->id, $product->{maxvotesperbug})
+    );
+
+    foreach my $vote (@$votes) {
+      my ($who, $id) = (@$vote);
+
+      # If some votes are removed, _remove_votes() returns a list
+      # of messages to send to voters.
+      push(@msgs, _remove_votes($id, $who, 'votes_too_many_per_bug'));
+      my $name = Bugzilla::User->new($who)->login;
+
+      push(@toomanyvotes_list, {id => $id, name => $name});
     }
+  }
 
-    $changes->{'_too_many_votes'} = \@toomanyvotes_list;
+  $changes->{'_too_many_votes'} = \@toomanyvotes_list;
 
-    # 2. too many total votes for a single user.
-    # This part doesn't work in the general case because _remove_votes
-    # doesn't enforce votesperuser (except per-bug when it's less
-    # than maxvotesperbug).  See _remove_votes().
+  # 2. too many total votes for a single user.
+  # This part doesn't work in the general case because _remove_votes
+  # doesn't enforce votesperuser (except per-bug when it's less
+  # than maxvotesperbug).  See _remove_votes().
 
-    my $votes = $dbh->selectall_arrayref(
-        'SELECT votes.who, votes.vote_count
+  my $votes = $dbh->selectall_arrayref(
+    'SELECT votes.who, votes.vote_count
            FROM votes
                 INNER JOIN bugs ON bugs.bug_id = votes.bug_id
-          WHERE bugs.product_id = ?',
-         undef, $product->id);
+          WHERE bugs.product_id = ?', undef, $product->id
+  );
 
-    my %counts;
-    foreach my $vote (@$votes) {
-        my ($who, $count) = @$vote;
-        if (!defined $counts{$who}) {
-            $counts{$who} = $count;
-        } else {
-            $counts{$who} += $count;
-        }
+  my %counts;
+  foreach my $vote (@$votes) {
+    my ($who, $count) = @$vote;
+    if (!defined $counts{$who}) {
+      $counts{$who} = $count;
+    }
+    else {
+      $counts{$who} += $count;
     }
+  }
 
-    my @toomanytotalvotes_list;
-    foreach my $who (keys(%counts)) {
-        if ($counts{$who} > $product->{votesperuser}) {
-            my $bug_ids = $dbh->selectcol_arrayref(
-                'SELECT votes.bug_id
+  my @toomanytotalvotes_list;
+  foreach my $who (keys(%counts)) {
+    if ($counts{$who} > $product->{votesperuser}) {
+      my $bug_ids = $dbh->selectcol_arrayref(
+        'SELECT votes.bug_id
                    FROM votes
                         INNER JOIN bugs ON bugs.bug_id = votes.bug_id
                   WHERE bugs.product_id = ?
-                        AND votes.who = ?',
-                undef, $product->id, $who);
-
-            my $name = Bugzilla::User->new($who)->login;
-            foreach my $bug_id (@$bug_ids) {
-                # _remove_votes returns a list of messages to send
-                # in case some voters had too many votes.
-                push(@msgs, _remove_votes($bug_id, $who, 
-                                          'votes_too_many_per_user'));
-
-                push(@toomanytotalvotes_list, {id => $bug_id, name => $name});
-            }
-        }
-    }
-
-    $changes->{'_too_many_total_votes'} = \@toomanytotalvotes_list;
-
-    # 3. enough votes to confirm
-    my $bug_list = $dbh->selectcol_arrayref(
-        'SELECT bug_id FROM bugs 
-          WHERE product_id = ? AND bug_status = ? AND votes >= ?',
-        undef, ($product->id, 'UNCONFIRMED', $product->{votestoconfirm}));
-
-    my @updated_bugs;
-    foreach my $bug_id (@$bug_list) {
-        my $confirmed = _confirm_if_vote_confirmed($bug_id);
-        push (@updated_bugs, $bug_id) if $confirmed;
-    }
-    $changes->{'_confirmed_bugs'} = \@updated_bugs;
-
-    # Now that changes are done, we can send emails to voters.
-    foreach my $msg (@msgs) {
-        MessageToMTA($msg);
-    }
-    # And send out emails about changed bugs
-    foreach my $bug_id (@updated_bugs) {
-        my $sent_bugmail = Bugzilla::BugMail::Send(
-            $bug_id, { changer => Bugzilla->user });
-        $changes->{'_confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail;
-    }
+                        AND votes.who = ?', undef, $product->id, $who
+      );
+
+      my $name = Bugzilla::User->new($who)->login;
+      foreach my $bug_id (@$bug_ids) {
+
+        # _remove_votes returns a list of messages to send
+        # in case some voters had too many votes.
+        push(@msgs, _remove_votes($bug_id, $who, 'votes_too_many_per_user'));
+
+        push(@toomanytotalvotes_list, {id => $bug_id, name => $name});
+      }
+    }
+  }
+
+  $changes->{'_too_many_total_votes'} = \@toomanytotalvotes_list;
+
+  # 3. enough votes to confirm
+  my $bug_list = $dbh->selectcol_arrayref(
+    'SELECT bug_id FROM bugs 
+          WHERE product_id = ? AND bug_status = ? AND votes >= ?', undef,
+    ($product->id, 'UNCONFIRMED', $product->{votestoconfirm})
+  );
+
+  my @updated_bugs;
+  foreach my $bug_id (@$bug_list) {
+    my $confirmed = _confirm_if_vote_confirmed($bug_id);
+    push(@updated_bugs, $bug_id) if $confirmed;
+  }
+  $changes->{'_confirmed_bugs'} = \@updated_bugs;
+
+  # Now that changes are done, we can send emails to voters.
+  foreach my $msg (@msgs) {
+    MessageToMTA($msg);
+  }
+
+  # And send out emails about changed bugs
+  foreach my $bug_id (@updated_bugs) {
+    my $sent_bugmail
+      = Bugzilla::BugMail::Send($bug_id, {changer => Bugzilla->user});
+    $changes->{'_confirmed_bugs_sent_bugmail'}->{$bug_id} = $sent_bugmail;
+  }
 }
 
 # If a bug is moved to a product which allows less votes per bug
 # compared to the previous product, extra votes need to be removed.
 sub _remove_votes {
-    my ($id, $who, $reason) = (@_);
-    my $dbh = Bugzilla->dbh;
-
-    my $whopart = ($who) ? " AND votes.who = $who" : "";
-
-    my $sth = $dbh->prepare("SELECT profiles.login_name, " .
-                            "profiles.userid, votes.vote_count, " .
-                            "products.votesperuser, products.maxvotesperbug " .
-                            "FROM profiles " .
-                            "LEFT JOIN votes ON profiles.userid = votes.who " .
-                            "LEFT JOIN bugs ON votes.bug_id = bugs.bug_id " .
-                            "LEFT JOIN products ON products.id = bugs.product_id " .
-                            "WHERE votes.bug_id = ? " . $whopart);
-    $sth->execute($id);
-    my @list;
-    while (my ($name, $userid, $oldvotes, $votesperuser, $maxvotesperbug) = $sth->fetchrow_array()) {
-        push(@list, [$name, $userid, $oldvotes, $votesperuser, $maxvotesperbug]);
-    }
-
-    # @messages stores all emails which have to be sent, if any.
-    # This array is passed to the caller which will send these emails itself.
-    my @messages = ();
-
-    if (scalar(@list)) {
-        foreach my $ref (@list) {
-            my ($name, $userid, $oldvotes, $votesperuser, $maxvotesperbug) = (@$ref);
-
-            $maxvotesperbug = min($votesperuser, $maxvotesperbug);
-
-            # If this product allows voting and the user's votes are in
-            # the acceptable range, then don't do anything.
-            next if $votesperuser && $oldvotes <= $maxvotesperbug;
-
-            # If the user has more votes on this bug than this product
-            # allows, then reduce the number of votes so it fits
-            my $newvotes = $maxvotesperbug;
-
-            my $removedvotes = $oldvotes - $newvotes;
-
-            if ($newvotes) {
-                $dbh->do("UPDATE votes SET vote_count = ? " .
-                         "WHERE bug_id = ? AND who = ?",
-                         undef, ($newvotes, $id, $userid));
-            } else {
-                $dbh->do("DELETE FROM votes WHERE bug_id = ? AND who = ?",
-                         undef, ($id, $userid));
-            }
-
-            # Notice that we did not make sure that the user fit within the $votesperuser
-            # range.  This is considered to be an acceptable alternative to losing votes
-            # during product moves.  Then next time the user attempts to change their votes,
-            # they will be forced to fit within the $votesperuser limit.
-
-            # Now lets send the e-mail to alert the user to the fact that their votes have
-            # been reduced or removed.
-            my $vars = {
-                'to' => $name . Bugzilla->params->{'emailsuffix'},
-                'bugid' => $id,
-                'reason' => $reason,
-
-                'votesremoved' => $removedvotes,
-                'votesold' => $oldvotes,
-                'votesnew' => $newvotes,
-            };
-
-            my $voter = new Bugzilla::User($userid);
-            my $template = Bugzilla->template_inner($voter->setting('lang'));
-
-            my $msg;
-            $template->process("voting/votes-removed.txt.tmpl", $vars, \$msg);
-            push(@messages, $msg);
-        }
-
-        my $votes = $dbh->selectrow_array("SELECT SUM(vote_count) " .
-                                          "FROM votes WHERE bug_id = ?",
-                                          undef, $id) || 0;
-        $dbh->do("UPDATE bugs SET votes = ? WHERE bug_id = ?",
-                 undef, ($votes, $id));
-    }
-    # Now return the array containing emails to be sent.
-    return @messages;
+  my ($id, $who, $reason) = (@_);
+  my $dbh = Bugzilla->dbh;
+
+  my $whopart = ($who) ? " AND votes.who = $who" : "";
+
+  my $sth
+    = $dbh->prepare("SELECT profiles.email, "
+      . "profiles.userid, votes.vote_count, "
+      . "products.votesperuser, products.maxvotesperbug "
+      . "FROM profiles "
+      . "LEFT JOIN votes ON profiles.userid = votes.who "
+      . "LEFT JOIN bugs ON votes.bug_id = bugs.bug_id "
+      . "LEFT JOIN products ON products.id = bugs.product_id "
+      . "WHERE votes.bug_id = ? "
+      . $whopart);
+  $sth->execute($id);
+  my @list;
+  while (my ($email, $userid, $oldvotes, $votesperuser, $maxvotesperbug)
+    = $sth->fetchrow_array())
+  {
+    push(@list, [$email, $userid, $oldvotes, $votesperuser, $maxvotesperbug]);
+  }
+
+  # @messages stores all emails which have to be sent, if any.
+  # This array is passed to the caller which will send these emails itself.
+  my @messages = ();
+
+  if (scalar(@list)) {
+    foreach my $ref (@list) {
+      my ($email, $userid, $oldvotes, $votesperuser, $maxvotesperbug) = (@$ref);
+
+      $maxvotesperbug = min($votesperuser, $maxvotesperbug);
+
+      # If this product allows voting and the user's votes are in
+      # the acceptable range, then don't do anything.
+      next if $votesperuser && $oldvotes <= $maxvotesperbug;
+
+      # If the user has more votes on this bug than this product
+      # allows, then reduce the number of votes so it fits
+      my $newvotes = $maxvotesperbug;
+
+      my $removedvotes = $oldvotes - $newvotes;
+
+      if ($newvotes) {
+        $dbh->do("UPDATE votes SET vote_count = ? " . "WHERE bug_id = ? AND who = ?",
+          undef, ($newvotes, $id, $userid));
+      }
+      else {
+        $dbh->do("DELETE FROM votes WHERE bug_id = ? AND who = ?",
+          undef, ($id, $userid));
+      }
+
+      # Notice that we did not make sure that the user fit within the $votesperuser
+      # range.  This is considered to be an acceptable alternative to losing votes
+      # during product moves.  Then next time the user attempts to change their votes,
+      # they will be forced to fit within the $votesperuser limit.
+
+      # Now lets send the e-mail to alert the user to the fact that their votes have
+      # been reduced or removed.
+      my $vars = {
+        'to'     => $email,
+        'bugid'  => $id,
+        'reason' => $reason,
+
+        'votesremoved' => $removedvotes,
+        'votesold'     => $oldvotes,
+        'votesnew'     => $newvotes,
+      };
+
+      my $voter    = new Bugzilla::User($userid);
+      my $template = Bugzilla->template_inner($voter->setting('lang'));
+
+      my $msg;
+      $template->process("voting/votes-removed.txt.tmpl", $vars, \$msg);
+      push(@messages, $msg);
+    }
+
+    my $votes
+      = $dbh->selectrow_array(
+      "SELECT SUM(vote_count) " . "FROM votes WHERE bug_id = ?",
+      undef, $id)
+      || 0;
+    $dbh->do("UPDATE bugs SET votes = ? WHERE bug_id = ?", undef, ($votes, $id));
+  }
+
+  # Now return the array containing emails to be sent.
+  return @messages;
 }
 
 # If a user votes for a bug, or the number of votes required to
 # confirm a bug has been reduced, check if the bug is now confirmed.
 sub _confirm_if_vote_confirmed {
-    my $id = shift;
-    my $bug = ref $id ? $id : new Bugzilla::Bug({ id => $id, cache => 1 });
-
-    my $ret = 0;
-    if (!$bug->everconfirmed
-        and $bug->product_obj->{votestoconfirm}
-        and $bug->votes >= $bug->product_obj->{votestoconfirm})
-    {
-        $bug->add_comment('', { type => CMT_POPULAR_VOTES });
-
-        if ($bug->bug_status eq 'UNCONFIRMED') {
-            # Get a valid open state.
-            my $new_status;
-            foreach my $state (@{$bug->status->can_change_to}) {
-                if ($state->is_open && $state->name ne 'UNCONFIRMED') {
-                    $new_status = $state->name;
-                    last;
-                }
-            }
-            ThrowCodeError('voting_no_open_bug_status') unless $new_status;
-
-            # We cannot call $bug->set_bug_status() here, because a user without
-            # canconfirm privs should still be able to confirm a bug by
-            # popular vote. We already know the new status is valid, so it's safe.
-            $bug->{bug_status} = $new_status;
-            $bug->{everconfirmed} = 1;
-            delete $bug->{'status'}; # Contains the status object.
-        }
-        else {
-            # If the bug is in a closed state, only set everconfirmed to 1.
-            # Do not call $bug->_set_everconfirmed(), for the same reason as above.
-            $bug->{everconfirmed} = 1;
+  my $id = shift;
+  my $bug = ref $id ? $id : new Bugzilla::Bug({id => $id, cache => 1});
+
+  my $ret = 0;
+  if ( !$bug->everconfirmed
+    and $bug->product_obj->{votestoconfirm}
+    and $bug->votes >= $bug->product_obj->{votestoconfirm})
+  {
+    $bug->add_comment('', {type => CMT_POPULAR_VOTES});
+
+    if ($bug->bug_status eq 'UNCONFIRMED') {
+
+      # Get a valid open state.
+      my $new_status;
+      foreach my $state (@{$bug->status->can_change_to}) {
+        if ($state->is_open && $state->name ne 'UNCONFIRMED') {
+          $new_status = $state->name;
+          last;
         }
-        $bug->update();
+      }
+      ThrowCodeError('voting_no_open_bug_status') unless $new_status;
 
-        $ret = 1;
+      # We cannot call $bug->set_bug_status() here, because a user without
+      # canconfirm privs should still be able to confirm a bug by
+      # popular vote. We already know the new status is valid, so it's safe.
+      $bug->{bug_status}    = $new_status;
+      $bug->{everconfirmed} = 1;
+      delete $bug->{'status'};    # Contains the status object.
     }
-    return $ret;
+    else {
+      # If the bug is in a closed state, only set everconfirmed to 1.
+      # Do not call $bug->_set_everconfirmed(), for the same reason as above.
+      $bug->{everconfirmed} = 1;
+    }
+    $bug->update();
+
+    $ret = 1;
+  }
+  return $ret;
 }
 
 
diff --git a/extensions/Voting/doc/voting.rst b/extensions/Voting/doc/voting.rst
new file mode 100644
index 0000000000..497eb2898c
--- /dev/null
+++ b/extensions/Voting/doc/voting.rst
@@ -0,0 +1,34 @@
+.. _voting:
+
+Voting
+######
+
+To enable the Voting extension, you must remove the :file:`disabled`
+file from the directory :file:`extensions/Voting/`, and run
+:file:`checksetup.pl`.
+
+Voting allows users to be given a pot of votes which they can allocate
+to bugs, to indicate that they'd like them fixed.
+This allows developers to gauge
+user need for a particular enhancement or bugfix. By allowing bugs with
+a certain number of votes to automatically move from "UNCONFIRMED" to
+"CONFIRMED", users of the bug system can help high-priority bugs garner
+attention so they don't sit for a long time awaiting triage.
+
+To modify Voting settings, navigate to the "Edit product" screen for the
+Product you wish to modify. The following settings are available:
+
+*Maximum votes per person:*
+    Setting this field to "0" disables voting.
+
+*Maximum votes a person can put on a single bug:*
+    It should probably be some number lower than the
+    "Maximum votes per person". Don't set this field to "0" if
+    "Maximum votes per person" is non-zero; that doesn't make
+    any sense.
+
+*Number of votes a bug in this product needs to automatically get out of the UNCONFIRMED state:*
+    Setting this field to "0" disables the automatic move of
+    bugs from UNCONFIRMED to CONFIRMED.
+
+Once you have adjusted the values to your preference, click "Update".
diff --git a/extensions/create.pl b/extensions/create.pl
index d4256694bc..7419c90e63 100755
--- a/extensions/create.pl
+++ b/extensions/create.pl
@@ -6,11 +6,14 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use File::Basename;
+BEGIN { chdir dirname($0); }
+
+use lib qw(.. ../lib ../local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -24,40 +27,41 @@
 my $name = $ARGV[0] or ThrowUserError('extension_create_no_name');
 $name = ucfirst($name);
 if ($name !~ /^[A-Z]/) {
-    ThrowUserError('extension_first_letter_caps', { name => $name });
+  ThrowUserError('extension_first_letter_caps', {name => $name});
 }
 
-my $extension_dir = "$base_dir/$name"; 
-mkpath($extension_dir) 
+my $extension_dir = "$base_dir/$name";
+mkpath($extension_dir)
   || die "$extension_dir already exists or cannot be created.\n";
 
 my $lcname = lc($name);
-foreach my $path (qw(lib doc web template/en/default/hook), 
-                  "template/en/default/$lcname")
+foreach my $path (qw(lib docs/en/rst web template/en/default/hook),
+  "template/en/default/$lcname")
 {
-    mkpath("$extension_dir/$path") || die "$extension_dir/$path: $!";
+  mkpath("$extension_dir/$path") || die "$extension_dir/$path: $!";
 }
 
-my $template = Bugzilla->template;
-my $vars = { name => $name, path => $extension_dir };
+my $template     = Bugzilla->template;
+my $vars         = {name => $name, path => $extension_dir};
 my %create_files = (
-    'config.pm.tmpl'       => 'Config.pm',
-    'extension.pm.tmpl'    => 'Extension.pm',
-    'util.pm.tmpl'         => 'lib/Util.pm',
-    'web-readme.txt.tmpl'  => 'web/README',
-    'hook-readme.txt.tmpl' => 'template/en/default/hook/README',
-    'name-readme.txt.tmpl' => "template/en/default/$lcname/README",
-    'name.rst.tmpl'        => "doc/$lcname.rst",
+  'config.pm.tmpl'       => 'Config.pm',
+  'extension.pm.tmpl'    => 'Extension.pm',
+  'util.pm.tmpl'         => 'lib/Util.pm',
+  'web-readme.txt.tmpl'  => 'web/README',
+  'hook-readme.txt.tmpl' => 'template/en/default/hook/README',
+  'name-readme.txt.tmpl' => "template/en/default/$lcname/README",
+  'index-admin.rst.tmpl' => "docs/en/rst/index-admin.rst",
+  'index-user.rst.tmpl'  => "docs/en/rst/index-user.rst",
 );
 
 foreach my $template_file (keys %create_files) {
-    my $target = $create_files{$template_file};
-    my $output;
-    $template->process("extensions/$template_file", $vars, \$output)
-      or ThrowTemplateError($template->error());
-   open(my $fh, '>', "$extension_dir/$target");
-   print $fh $output;
-   close($fh);
+  my $target = $create_files{$template_file};
+  my $output;
+  $template->process("extensions/$template_file", $vars, \$output)
+    or ThrowTemplateError($template->error());
+  open(my $fh, '>', "$extension_dir/$target") or die "extension_dir/$target: $!";
+  print $fh $output;
+  close($fh);
 }
 
 say get_text('extension_created', $vars);
diff --git a/gen-cpanfile.pl b/gen-cpanfile.pl
new file mode 100755
index 0000000000..a57735b0c7
--- /dev/null
+++ b/gen-cpanfile.pl
@@ -0,0 +1,70 @@
+#!/usr/bin/perl
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# This file has detailed POD docs, do "perldoc checksetup.pl" to see them.
+
+######################################################################
+# Initialization
+######################################################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5);
+
+use Getopt::Long qw(:config gnu_getopt);
+
+if (-f "MYMETA.json") {
+  eval {
+    require CPAN::Meta;
+    require Module::CPANfile;
+
+    my (@with_feature, @without_feature);
+    my $with_all_features = 0;
+    GetOptions(
+      'with-all-features|A!' => \$with_all_features,
+      'with-feature|D=s@'    => \@with_feature,
+      'without-feature|U=s@' => \@without_feature
+    );
+
+
+    my $meta = CPAN::Meta->load_file("MYMETA.json");
+
+    my @phases = qw(configure build test develop runtime);
+    my @types  = qw(requires recommends suggests conflicts);
+
+    my %features;
+    if ($with_all_features) {
+      $features{$_->identifier} = 1 foreach ($meta->features);
+    }
+    $features{$_} = 1 foreach @with_feature;
+    $features{$_} = 0 foreach @without_feature;
+    my @features = grep { $features{$_} } keys %features;
+
+    my $prereqs  = $meta->effective_prereqs(\@features)->as_string_hash;
+    my $filtered = {};
+
+    while (my ($phase, $types) = each %$prereqs) {
+      while (my ($type, $reqs) = each %$types) {
+        $filtered->{$phase}{$type} = $reqs;
+      }
+    }
+
+    my $cpanfile = Module::CPANfile->from_prereqs($filtered);
+    open my $cpanfile_fh, '>', 'cpanfile' or die "cannot write to cpanfile: $!";
+    print $cpanfile_fh $cpanfile->to_string();
+    close $cpanfile_fh;
+  };
+  die "Unable generate cpanfile: $@\n" if $@;
+}
+else {
+  die "MYMETA.yml is missing, cannot generate cpanfile\n";
+}
+
+
diff --git a/importxml.pl b/importxml.pl
index 8750c63a11..d2c0c935cd 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -10,7 +10,7 @@
 # a new bug into bugzilla. Everything before the beginning <?xml line
 # is removed so you can pipe in email messages.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -38,17 +38,21 @@
 #####################################################################
 
 use File::Basename qw(dirname);
+
 # MTAs may call this script from any directory, but it should always
 # run from this one so that it can find its modules.
 BEGIN {
-    require File::Basename;
-    my $dir = $0; $dir =~ /(.*)/; $dir = $1; # trick taint
-    chdir(File::Basename::dirname($dir));
+  require File::Basename;
+  my $dir = $0;
+  $dir =~ /(.*)/;
+  $dir = $1;    # trick taint
+  chdir(File::Basename::dirname($dir));
 }
 
-use lib qw(. lib);
-# Data dumber is used for debugging, I got tired of copying it back in 
-# and then removing it. 
+use lib qw(. lib local/lib/perl5);
+
+# Data dumber is used for debugging, I got tired of copying it back in
+# and then removing it.
 #use Data::Dumper;
 
 
@@ -76,22 +80,22 @@ BEGIN
 use Pod::Usage;
 use XML::Twig;
 
-my $debug = 0;
-my $mail  = '';
-my $attach_path = '';
-my $help  = 0;
-my $bug_page = 'show_bug.cgi?id=';
-my $default_product_name = '';
+my $debug                  = 0;
+my $mail                   = '';
+my $attach_path            = '';
+my $help                   = 0;
+my $bug_page               = 'show_bug.cgi?id=';
+my $default_product_name   = '';
 my $default_component_name = '';
 
 my $result = GetOptions(
-    "verbose|debug+" => \$debug,
-    "mail|sendmail!" => \$mail,
-    "attach_path=s"  => \$attach_path,
-    "help|?"         => \$help,
-    "bug_page=s"     => \$bug_page,
-    "product=s"      => \$default_product_name,
-    "component=s"    => \$default_component_name,
+  "verbose|debug+" => \$debug,
+  "mail|sendmail!" => \$mail,
+  "attach_path=s"  => \$attach_path,
+  "help|?"         => \$help,
+  "bug_page=s"     => \$bug_page,
+  "product=s"      => \$default_product_name,
+  "component=s"    => \$default_component_name,
 );
 
 pod2usage(0) if $help;
@@ -104,8 +108,8 @@ BEGIN
 our @attachments;
 our $bugtotal;
 my $xml;
-my $dbh = Bugzilla->dbh;
-my $params = Bugzilla->params;
+my $dbh         = Bugzilla->dbh;
+my $params      = Bugzilla->params;
 my ($timestamp) = $dbh->selectrow_array("SELECT NOW()");
 
 ###############################################################################
@@ -113,166 +117,168 @@ BEGIN
 ###############################################################################
 
 sub MailMessage {
-    return unless ($mail);
-    my $subject    = shift;
-    my $message    = shift;
-    my @recipients = @_;
-    my $from   = $params->{"mailfrom"};
-    $from =~ s/@/\@/g;
-
-    foreach my $to (@recipients){
-        my $header = "To: $to\n";
-        $header .= "From: Bugzilla <$from>\n";
-        $header .= "Subject: $subject\n\n";
-        my $sendmessage = $header . $message . "\n";
-        MessageToMTA($sendmessage);
-    }
+  return unless ($mail);
+  my $subject    = shift;
+  my $message    = shift;
+  my @recipients = @_;
+  my $from       = $params->{"mailfrom"};
+  $from =~ s/@/\@/g;
+
+  foreach my $to (@recipients) {
+    my $header = "To: $to\n";
+    $header .= "From: Bugzilla <$from>\n";
+    $header .= "Subject: $subject\n\n";
+    my $sendmessage = $header . $message . "\n";
+    MessageToMTA($sendmessage);
+  }
 
 }
 
 sub Debug {
-    return unless ($debug);
-    my ( $message, $level ) = (@_);
-    print STDERR "OK: $message \n" if ( $level == OK_LEVEL );
-    print STDERR "ERR: $message \n" if ( $level == ERR_LEVEL );
-    print STDERR "$message\n"
-      if ( ( $debug == $level ) && ( $level == DEBUG_LEVEL ) );
+  return unless ($debug);
+  my ($message, $level) = (@_);
+  print STDERR "OK: $message \n"  if ($level == OK_LEVEL);
+  print STDERR "ERR: $message \n" if ($level == ERR_LEVEL);
+  print STDERR "$message\n" if (($debug == $level) && ($level == DEBUG_LEVEL));
 }
 
 sub Error {
-    my ( $reason, $errtype, $exporter ) = @_;
-    my $subject = "Bug import error: $reason";
-    my $message = "Cannot import these bugs because $reason ";
-    $message .= "\n\nPlease re-open the original bug.\n" if ($errtype);
-    $message .= "For more info, contact " . $params->{"maintainer"} . ".\n";
-    my @to = ( $params->{"maintainer"}, $exporter);
-    Debug( $message, ERR_LEVEL );
-    MailMessage( $subject, $message, @to );
-    exit;
+  my ($reason, $errtype, $exporter) = @_;
+  my $subject = "Bug import error: $reason";
+  my $message = "Cannot import these bugs because $reason ";
+  $message .= "\n\nPlease re-open the original bug.\n" if ($errtype);
+  $message .= "For more info, contact " . $params->{"maintainer"} . ".\n";
+  my @to = ($params->{"maintainer"}, $exporter);
+  Debug($message, ERR_LEVEL);
+  MailMessage($subject, $message, @to);
+  exit;
 }
 
 # This subroutine handles flags for process_bug. It is generic in that
 # it can handle both attachment flags and bug flags.
 sub flag_handler {
-    my (
-        $name,            $status,      $setter_login,
-        $requestee_login, $exporterid,  $bugid,
-        $componentid,     $productid,   $attachid
-      )
-      = @_;
-
-    my $type         = ($attachid) ? "attachment" : "bug";
-    my $err          = '';
-    my $setter       = new Bugzilla::User({ name => $setter_login });
-    my $requestee;
-    my $requestee_id;
-
-    unless ($setter) {
-        $err = "Invalid setter $setter_login on $type flag $name\n";
-        $err .= "   Dropping flag $name\n";
-        return $err;
-    }
-    if ( !$setter->can_see_bug($bugid) ) {
-        $err .= "Setter is not a member of bug group\n";
-        $err .= "   Dropping flag $name\n";
-        return $err;
-    }
-    my $setter_id = $setter->id;
-    if ( defined($requestee_login) ) {
-        $requestee = new Bugzilla::User({ name => $requestee_login });
-        if ( $requestee ) {
-            if ( !$requestee->can_see_bug($bugid) ) {
-                $err .= "Requestee is not a member of bug group\n";
-                $err .= "   Requesting from the wind\n";
-            }    
-            else{
-                $requestee_id = $requestee->id;
-            }
-        }
-        else {
-            $err = "Invalid requestee $requestee_login on $type flag $name\n";
-            $err .= "   Requesting from the wind.\n";
-        }
-        
-    }
-    my $flag_types;
-
-    # If this is an attachment flag we need to do some dirty work to look
-    # up the flagtype ID
-    if ($attachid) {
-        $flag_types = Bugzilla::FlagType::match(
-            {
-                'target_type'  => 'attachment',
-                'product_id'   => $productid,
-                'component_id' => $componentid
-            } );
+  my (
+    $name,            $status,     $setter_login,
+    $requestee_login, $exporterid, $bugid,
+    $componentid,     $productid,  $attachid
+  ) = @_;
+
+  my $type   = ($attachid) ? "attachment" : "bug";
+  my $err    = '';
+  my $setter = new Bugzilla::User({name => $setter_login});
+  my $requestee;
+  my $requestee_id;
+
+  unless ($setter) {
+    $err = "Invalid setter $setter_login on $type flag $name\n";
+    $err .= "   Dropping flag $name\n";
+    return $err;
+  }
+  if (!$setter->can_see_bug($bugid)) {
+    $err .= "Setter is not a member of bug group\n";
+    $err .= "   Dropping flag $name\n";
+    return $err;
+  }
+  my $setter_id = $setter->id;
+  if (defined($requestee_login)) {
+    $requestee = new Bugzilla::User({name => $requestee_login});
+    if ($requestee) {
+      if (!$requestee->can_see_bug($bugid)) {
+        $err .= "Requestee is not a member of bug group\n";
+        $err .= "   Requesting from the wind\n";
+      }
+      else {
+        $requestee_id = $requestee->id;
+      }
     }
     else {
-        my $bug = new Bugzilla::Bug($bugid);
-        $flag_types = $bug->flag_types;
-    }
-    unless ($flag_types){
-        $err  = "No flag types defined for this bug\n";
-        $err .= "   Dropping flag $name\n";
-        return $err;
+      $err = "Invalid requestee $requestee_login on $type flag $name\n";
+      $err .= "   Requesting from the wind.\n";
     }
 
-    # We need to see if the imported flag is in the list of known flags
-    # It is possible for two flags on the same bug have the same name
-    # If this is the case, we will only match the first one.
-    my $ftype;
-    foreach my $f ( @{$flag_types} ) {
-        if ( $f->name eq $name) {
-            $ftype = $f;
-            last;
-        }
+  }
+  my $flag_types;
+
+  # If this is an attachment flag we need to do some dirty work to look
+  # up the flagtype ID
+  if ($attachid) {
+    $flag_types = Bugzilla::FlagType::match({
+      'target_type'  => 'attachment',
+      'product_id'   => $productid,
+      'component_id' => $componentid
+    });
+  }
+  else {
+    my $bug = new Bugzilla::Bug($bugid);
+    $flag_types = $bug->flag_types;
+  }
+  unless ($flag_types) {
+    $err = "No flag types defined for this bug\n";
+    $err .= "   Dropping flag $name\n";
+    return $err;
+  }
+
+  # We need to see if the imported flag is in the list of known flags
+  # It is possible for two flags on the same bug have the same name
+  # If this is the case, we will only match the first one.
+  my $ftype;
+  foreach my $f (@{$flag_types}) {
+    if ($f->name eq $name) {
+      $ftype = $f;
+      last;
     }
+  }
 
-    if ($ftype) {    # We found the flag in the list
-        my $grant_group = $ftype->grant_group;
-        if (( $status eq '+' || $status eq '-' ) 
-            && $grant_group && !$setter->in_group_id($grant_group->id)) {
-            $err = "Setter $setter_login on $type flag $name ";
-            $err .= "is not in the Grant Group\n";
-            $err .= "   Dropping flag $name\n";
-            return $err;
-        }
-        my $request_group = $ftype->request_group;
-        if ($request_group
-            && $status eq '?' && !$setter->in_group_id($request_group->id)) {
-            $err = "Setter $setter_login on $type flag $name ";
-            $err .= "is not in the Request Group\n";
-            $err .= "   Dropping flag $name\n";
-            return $err;
-        }
+  if ($ftype) {    # We found the flag in the list
+    my $grant_group = $ftype->grant_group;
+    if ( ($status eq '+' || $status eq '-')
+      && $grant_group
+      && !$setter->in_group_id($grant_group->id))
+    {
+      $err = "Setter $setter_login on $type flag $name ";
+      $err .= "is not in the Grant Group\n";
+      $err .= "   Dropping flag $name\n";
+      return $err;
+    }
+    my $request_group = $ftype->request_group;
+    if ( $request_group
+      && $status eq '?'
+      && !$setter->in_group_id($request_group->id))
+    {
+      $err = "Setter $setter_login on $type flag $name ";
+      $err .= "is not in the Request Group\n";
+      $err .= "   Dropping flag $name\n";
+      return $err;
+    }
 
-        # Take the first flag_type that matches
-        unless ($ftype->is_active) {
-            $err = "Flag $name is not active in this database\n";
-            $err .= "   Dropping flag $name\n";
-            return $err;
-        }
+    # Take the first flag_type that matches
+    unless ($ftype->is_active) {
+      $err = "Flag $name is not active in this database\n";
+      $err .= "   Dropping flag $name\n";
+      return $err;
+    }
 
-        $dbh->do("INSERT INTO flags 
+    $dbh->do(
+      "INSERT INTO flags 
                  (type_id, status, bug_id, attach_id, creation_date, 
                   setter_id, requestee_id)
                   VALUES (?, ?, ?, ?, ?, ?, ?)", undef,
-            ($ftype->id, $status, $bugid, $attachid, $timestamp,
-            $setter_id, $requestee_id));
-    }
-    else {
-        $err = "Dropping unknown $type flag: $name\n";
-        return $err;
-    }
+      ($ftype->id, $status, $bugid, $attachid, $timestamp, $setter_id, $requestee_id)
+    );
+  }
+  else {
+    $err = "Dropping unknown $type flag: $name\n";
     return $err;
+  }
+  return $err;
 }
 
 # Converts and returns the input data as an array.
 sub _to_array {
-    my $value = shift;
+  my $value = shift;
 
-    $value = [$value] if !ref($value);
-    return @$value;
+  $value = [$value] if !ref($value);
+  return @$value;
 }
 
 ###############################################################################
@@ -290,27 +296,28 @@ sub _to_array {
 #                bugs are being moved from
 #
 sub init() {
-    my ( $twig, $bugzilla ) = @_;
-    my $root       = $twig->root;
-    my $maintainer = $root->{'att'}->{'maintainer'};
-    my $exporter   = $root->{'att'}->{'exporter'};
-    my $urlbase    = $root->{'att'}->{'urlbase'};
-    my $xmlversion = $root->{'att'}->{'version'};
-
-    if ($xmlversion ne BUGZILLA_VERSION) {
-            my $log = "Possible version conflict!\n";
-            $log .= "   XML was exported from Bugzilla version $xmlversion\n";
-            $log .= "   But this installation uses ";
-            $log .= BUGZILLA_VERSION . "\n";
-            Debug($log, OK_LEVEL);
-            push(@logs, $log);
-    }
-    Error( "no maintainer", "REOPEN", $exporter ) unless ($maintainer);
-    Error( "no exporter",   "REOPEN", $exporter ) unless ($exporter);
-    Error( "invalid exporter: $exporter", "REOPEN", $exporter ) if ( !login_to_id($exporter) );
-    Error( "no urlbase set", "REOPEN", $exporter ) unless ($urlbase);
+  my ($twig, $bugzilla) = @_;
+  my $root       = $twig->root;
+  my $maintainer = $root->{'att'}->{'maintainer'};
+  my $exporter   = $root->{'att'}->{'exporter'};
+  my $urlbase    = $root->{'att'}->{'urlbase'};
+  my $xmlversion = $root->{'att'}->{'version'};
+
+  if ($xmlversion ne BUGZILLA_VERSION) {
+    my $log = "Possible version conflict!\n";
+    $log .= "   XML was exported from Bugzilla version $xmlversion\n";
+    $log .= "   But this installation uses ";
+    $log .= BUGZILLA_VERSION . "\n";
+    Debug($log, OK_LEVEL);
+    push(@logs, $log);
+  }
+  Error("no maintainer", "REOPEN", $exporter) unless ($maintainer);
+  Error("no exporter",   "REOPEN", $exporter) unless ($exporter);
+  Error("invalid exporter: $exporter", "REOPEN", $exporter)
+    if (!login_to_id($exporter));
+  Error("no urlbase set", "REOPEN", $exporter) unless ($urlbase);
 }
-    
+
 
 # Parse attachments.
 #
@@ -327,69 +334,74 @@ ()
 # The submitter_id gets filled in with $exporterid.
 
 sub process_attachment() {
-    my ( $twig, $attach ) = @_;
-    Debug( "Parsing attachments", DEBUG_LEVEL );
-    my %attachment;
-
-    $attachment{'date'} =
-        format_time( $attach->field('date'), "%Y-%m-%d %R" ) || $timestamp;
-    $attachment{'desc'}       = $attach->field('desc');
-    $attachment{'ctype'}      = $attach->field('type') || "unknown/unknown";
-    $attachment{'attachid'}   = $attach->field('attachid');
-    $attachment{'ispatch'}    = $attach->{'att'}->{'ispatch'} || 0;
-    $attachment{'isobsolete'} = $attach->{'att'}->{'isobsolete'} || 0;
-    $attachment{'isprivate'}  = $attach->{'att'}->{'isprivate'} || 0;
-    $attachment{'filename'}   = $attach->field('filename') || "file";
-    $attachment{'attacher'}   = $attach->field('attacher');
-    # Attachment data is not exported in versions 2.20 and older.
-    if (defined $attach->first_child('data') &&
-            defined $attach->first_child('data')->{'att'}->{'encoding'}) {
-        my $encoding = $attach->first_child('data')->{'att'}->{'encoding'};
-        if ($encoding =~ /base64/) {
-            # decode the base64
-            my $data   = $attach->field('data');
-            my $output = decode_base64($data);
-            $attachment{'data'} = $output;
-        }
-        elsif ($encoding =~ /filename/) {
-            # read the attachment file
-            Error("attach_path is required", undef) unless ($attach_path);
-            
-            my $filename = $attach->field('data');
-            # Remove any leading path data from the filename
-            $filename =~ s/(.*\/|.*\\)//gs;
-            
-            my $attach_filename = $attach_path . "/" . $filename;
-            open(ATTACH_FH, "<", $attach_filename) or
-                Error("cannot open $attach_filename", undef);
-            $attachment{'data'} = do { local $/; <ATTACH_FH> };
-            close ATTACH_FH;
-        }
-    }
-    else {
-        $attachment{'data'} = $attach->field('data');
+  my ($twig, $attach) = @_;
+  Debug("Parsing attachments", DEBUG_LEVEL);
+  my %attachment;
+
+  $attachment{'date'}
+    = format_time($attach->field('date'), "%Y-%m-%d %R") || $timestamp;
+  $attachment{'desc'}       = $attach->field('desc');
+  $attachment{'ctype'}      = $attach->field('type') || "unknown/unknown";
+  $attachment{'attachid'}   = $attach->field('attachid');
+  $attachment{'ispatch'}    = $attach->{'att'}->{'ispatch'} || 0;
+  $attachment{'isobsolete'} = $attach->{'att'}->{'isobsolete'} || 0;
+  $attachment{'isprivate'}  = $attach->{'att'}->{'isprivate'} || 0;
+  $attachment{'filename'}   = $attach->field('filename') || "file";
+  $attachment{'attacher'}   = $attach->field('attacher');
+
+  # Attachment data is not exported in versions 2.20 and older.
+  if ( defined $attach->first_child('data')
+    && defined $attach->first_child('data')->{'att'}->{'encoding'})
+  {
+    my $encoding = $attach->first_child('data')->{'att'}->{'encoding'};
+    if ($encoding =~ /base64/) {
+
+      # decode the base64
+      my $data   = $attach->field('data');
+      my $output = decode_base64($data);
+      $attachment{'data'} = $output;
     }
+    elsif ($encoding =~ /filename/) {
 
-    # attachment flags
-    my @aflags;
-    foreach my $aflag ( $attach->children('flag') ) {
-        my %aflag;
-        $aflag{'name'}      = $aflag->{'att'}->{'name'};
-        $aflag{'status'}    = $aflag->{'att'}->{'status'};
-        $aflag{'setter'}    = $aflag->{'att'}->{'setter'};
-        $aflag{'requestee'} = $aflag->{'att'}->{'requestee'};
-        push @aflags, \%aflag;
-    }
-    $attachment{'flags'} = \@aflags if (@aflags);
+      # read the attachment file
+      Error("attach_path is required", undef) unless ($attach_path);
 
-    # free up the memory for use by the rest of the script
-    $attach->delete;
-    if ($attachment{'attachid'}) {
-        push @attachments, \%attachment;
-    }
-    else {
-        push @attachments, "err";
+      my $filename = $attach->field('data');
+
+      # Remove any leading path data from the filename
+      $filename =~ s/(.*\/|.*\\)//gs;
+
+      my $attach_filename = $attach_path . "/" . $filename;
+      open(ATTACH_FH, "<", $attach_filename)
+        or Error("cannot open $attach_filename", undef);
+      $attachment{'data'} = do { local $/; <ATTACH_FH> };
+      close ATTACH_FH;
     }
+  }
+  else {
+    $attachment{'data'} = $attach->field('data');
+  }
+
+  # attachment flags
+  my @aflags;
+  foreach my $aflag ($attach->children('flag')) {
+    my %aflag;
+    $aflag{'name'}      = $aflag->{'att'}->{'name'};
+    $aflag{'status'}    = $aflag->{'att'}->{'status'};
+    $aflag{'setter'}    = $aflag->{'att'}->{'setter'};
+    $aflag{'requestee'} = $aflag->{'att'}->{'requestee'};
+    push @aflags, \%aflag;
+  }
+  $attachment{'flags'} = \@aflags if (@aflags);
+
+  # free up the memory for use by the rest of the script
+  $attach->delete;
+  if ($attachment{'attachid'}) {
+    push @attachments, \%attachment;
+  }
+  else {
+    push @attachments, "err";
+  }
 }
 
 # This subroutine will be called once for each <bug> in the xml file.
@@ -401,849 +413,871 @@ ()
 # purged from memory to free it up for later bugs.
 
 sub process_bug {
-    my ( $twig, $bug ) = @_;
-    my $root             = $twig->root;
-    my $maintainer       = $root->{'att'}->{'maintainer'};
-    my $exporter_login   = $root->{'att'}->{'exporter'};
-    my $exporter         = new Bugzilla::User({ name => $exporter_login });
-    my $urlbase          = $root->{'att'}->{'urlbase'};
-    my $url              = $urlbase . $bug_page;
-    trick_taint($url);
-
-    # We will store output information in this variable.
-    my $log = "";
-    if ( defined $bug->{'att'}->{'error'} ) {
-        $log .= "\nError in bug " . $bug->field('bug_id') . "\@$urlbase: ";
-        $log .= $bug->{'att'}->{'error'} . "\n";
-        if ( $bug->{'att'}->{'error'} =~ /NotFound/ ) {
-            $log .= "$exporter_login tried to move bug " . $bug->field('bug_id');
-            $log .= " here, but $urlbase reports that this bug";
-            $log .= " does not exist.\n";
-        }
-        elsif ( $bug->{'att'}->{'error'} =~ /NotPermitted/ ) {
-            $log .= "$exporter_login tried to move bug " . $bug->field('bug_id');
-            $log .= " here, but $urlbase reports that $exporter_login does ";
-            $log .= " not have access to that bug.\n";
-        }
-        return;
+  my ($twig, $bug) = @_;
+  my $root           = $twig->root;
+  my $maintainer     = $root->{'att'}->{'maintainer'};
+  my $exporter_login = $root->{'att'}->{'exporter'};
+  my $exporter       = new Bugzilla::User({name => $exporter_login});
+  my $urlbase        = $root->{'att'}->{'urlbase'};
+  my $url            = $urlbase . $bug_page;
+  trick_taint($url);
+
+  # We will store output information in this variable.
+  my $log = "";
+  if (defined $bug->{'att'}->{'error'}) {
+    $log .= "\nError in bug " . $bug->field('bug_id') . "\@$urlbase: ";
+    $log .= $bug->{'att'}->{'error'} . "\n";
+    if ($bug->{'att'}->{'error'} =~ /NotFound/) {
+      $log .= "$exporter_login tried to move bug " . $bug->field('bug_id');
+      $log .= " here, but $urlbase reports that this bug";
+      $log .= " does not exist.\n";
     }
-    $bugtotal++;
-
-    # This list contains all other bug fields that we want to process.
-    # If it is not in this list it will not be included.
-    my %all_fields;
-    foreach my $field ( 
-        qw(long_desc attachment flag group), Bugzilla::Bug::fields() )
-    {
-        $all_fields{$field} = 1;
+    elsif ($bug->{'att'}->{'error'} =~ /NotPermitted/) {
+      $log .= "$exporter_login tried to move bug " . $bug->field('bug_id');
+      $log .= " here, but $urlbase reports that $exporter_login does ";
+      $log .= " not have access to that bug.\n";
     }
-    
-    my %bug_fields;
-    my $err = "";
-
-   # Loop through all the xml tags inside a <bug> and compare them to the
-   # lists of fields. If they match throw them into the hash. Otherwise
-   # append it to the log, which will go into the comments when we are done.
-    foreach my $bugchild ( $bug->children() ) {
-        Debug( "Parsing field: " . $bugchild->name, DEBUG_LEVEL );
-
-        # Skip the token if one is included. We don't want it included in
-        # the comments, and it is not used by the importer.
-        next if $bugchild->name eq 'token';
-
-        if ( defined $all_fields{ $bugchild->name } ) {
-            my @values = $bug->children_text($bugchild->name);
-            if (scalar @values > 1) {
-                $bug_fields{$bugchild->name} = \@values;
-            }
-            else {
-                $bug_fields{$bugchild->name} = $values[0];
-            }
-        }
-        else {
-            $err .= "Unknown bug field \"" . $bugchild->name . "\"";
-            $err .= " encountered while moving bug\n";
-            $err .= "   <" . $bugchild->name . ">";
-            if ( $bugchild->children_count > 1 ) {
-                $err .= "\n";
-                foreach my $subchild ( $bugchild->children() ) {
-                    $err .= "     <" . $subchild->name . ">";
-                    $err .= $subchild->field;
-                    $err .= "</" . $subchild->name . ">\n";
-                }
-            }
-            else {
-                $err .= $bugchild->field;
-            }
-            $err .= "</" . $bugchild->name . ">\n";
-        }
+    return;
+  }
+  $bugtotal++;
+
+  # This list contains all other bug fields that we want to process.
+  # If it is not in this list it will not be included.
+  my %all_fields;
+  foreach my $field (qw(long_desc attachment flag group), Bugzilla::Bug::fields())
+  {
+    $all_fields{$field} = 1;
+  }
+
+  my %bug_fields;
+  my $err = "";
+
+  # Loop through all the xml tags inside a <bug> and compare them to the
+  # lists of fields. If they match throw them into the hash. Otherwise
+  # append it to the log, which will go into the comments when we are done.
+  foreach my $bugchild ($bug->children()) {
+    Debug("Parsing field: " . $bugchild->name, DEBUG_LEVEL);
+
+    # Skip the token if one is included. We don't want it included in
+    # the comments, and it is not used by the importer.
+    next if $bugchild->name eq 'token';
+
+    if (defined $all_fields{$bugchild->name}) {
+      my @values = $bug->children_text($bugchild->name);
+      if (scalar @values > 1) {
+        $bug_fields{$bugchild->name} = \@values;
+      }
+      else {
+        $bug_fields{$bugchild->name} = $values[0];
+      }
     }
-
-    # Parse long descriptions
-    my @long_descs;
-    foreach my $comment ( $bug->children('long_desc') ) {
-        Debug( "Parsing Long Description", DEBUG_LEVEL );
-        my %long_desc = ( who       => $comment->field('who'),
-                          bug_when  => format_time($comment->field('bug_when'), '%Y-%m-%d %T'),
-                          isprivate => $comment->{'att'}->{'isprivate'} || 0 );
-
-        # If the exporter is not in the insidergroup, keep the comment public.
-        $long_desc{isprivate} = 0 unless $exporter->is_insider;
-
-        my $data = $comment->field('thetext');
-        if ( defined $comment->first_child('thetext')->{'att'}->{'encoding'}
-            && $comment->first_child('thetext')->{'att'}->{'encoding'} =~
-            /base64/ )
-        {
-            $data = decode_base64($data);
-        }
-
-        # For backwards-compatibility with Bugzillas before 3.6:
-        #
-        # If we leave the attachment ID in the comment it will be made a link
-        # to the wrong attachment. Since the new attachment ID is unknown yet
-        # let's strip it out for now. We will make a comment with the right ID
-        # later
-        $data =~ s/Created an attachment \(id=\d+\)/Created an attachment/g;
-
-        # Same goes for bug #'s Since we don't know if the referenced bug
-        # is also being moved, lets make sure they know it means a different
-        # bugzilla.
-        $data =~ s/([Bb]ugs?\s*\#?\s*(\d+))/$url$2/g;
-
-        # Keep the original commenter if possible, else we will fall back
-        # to the exporter account.
-        $long_desc{whoid} = login_to_id($long_desc{who});
-
-        if (!$long_desc{whoid}) {
-            $data = "The original author of this comment is $long_desc{who}.\n\n" . $data;
+    else {
+      $err .= "Unknown bug field \"" . $bugchild->name . "\"";
+      $err .= " encountered while moving bug\n";
+      $err .= "   <" . $bugchild->name . ">";
+      if ($bugchild->children_count > 1) {
+        $err .= "\n";
+        foreach my $subchild ($bugchild->children()) {
+          $err .= "     <" . $subchild->name . ">";
+          $err .= $subchild->field;
+          $err .= "</" . $subchild->name . ">\n";
         }
-
-        $long_desc{'thetext'} = $data;
-        push @long_descs, \%long_desc;
+      }
+      else {
+        $err .= $bugchild->field;
+      }
+      $err .= "</" . $bugchild->name . ">\n";
     }
-
-    my @sorted_descs = sort { $a->{'bug_when'} cmp $b->{'bug_when'} } @long_descs;
-
-    my $comments = "\n\n--- Bug imported by $exporter_login ";
-    $comments .= format_time(scalar localtime(time()), '%Y-%m-%d %R %Z') . " ";
-    $comments .= " ---\n\n";
-    $comments .= "This bug was previously known as _bug_ $bug_fields{'bug_id'} at ";
-    $comments .= $url . $bug_fields{'bug_id'} . "\n";
-    if ( defined $bug_fields{'dependson'} ) {
-        $comments .= "This bug depended on bug(s) " .
-                     join(' ', _to_array($bug_fields{'dependson'})) . ".\n";
+  }
+
+  # Parse long descriptions
+  my @long_descs;
+  foreach my $comment ($bug->children('long_desc')) {
+    Debug("Parsing Long Description", DEBUG_LEVEL);
+    my %long_desc = (
+      who       => $comment->field('who'),
+      bug_when  => format_time($comment->field('bug_when'), '%Y-%m-%d %T'),
+      isprivate => $comment->{'att'}->{'isprivate'} || 0
+    );
+
+    # If the exporter is not in the insidergroup, keep the comment public.
+    $long_desc{isprivate} = 0 unless $exporter->is_insider;
+
+    my $data = $comment->field('thetext');
+    if (defined $comment->first_child('thetext')->{'att'}->{'encoding'}
+      && $comment->first_child('thetext')->{'att'}->{'encoding'} =~ /base64/)
+    {
+      $data = decode_base64($data);
     }
-    if ( defined $bug_fields{'blocked'} ) {
-        $comments .= "This bug blocked bug(s) " .
-                     join(' ', _to_array($bug_fields{'blocked'})) . ".\n";
+
+    # For backwards-compatibility with Bugzillas before 3.6:
+    #
+    # If we leave the attachment ID in the comment it will be made a link
+    # to the wrong attachment. Since the new attachment ID is unknown yet
+    # let's strip it out for now. We will make a comment with the right ID
+    # later
+    $data =~ s/Created an attachment \(id=\d+\)/Created an attachment/g;
+
+    # Same goes for bug #'s Since we don't know if the referenced bug
+    # is also being moved, lets make sure they know it means a different
+    # bugzilla.
+    $data =~ s/([Bb]ugs?\s*\#?\s*(\d+))/$url$2/g;
+
+    # Keep the original commenter if possible, else we will fall back
+    # to the exporter account.
+    $long_desc{whoid} = login_to_id($long_desc{who});
+
+    if (!$long_desc{whoid}) {
+      $data = "The original author of this comment is $long_desc{who}.\n\n" . $data;
     }
 
-    # Now we process each of the fields in turn and make sure they contain
-    # valid data. We will create two parallel arrays, one for the query
-    # and one for the values. For every field we need to push an entry onto
-    # each array.
-    my @query  = ();
-    my @values = ();
-
-    # Each of these fields we will check for newlines and shove onto the array
-    foreach my $field (qw(status_whiteboard bug_file_loc short_desc)) {
-        if ($bug_fields{$field}) {
-            $bug_fields{$field} = clean_text( $bug_fields{$field} );
-            push( @query,  $field );
-            push( @values, $bug_fields{$field} );
-        }
+    $long_desc{'thetext'} = $data;
+    push @long_descs, \%long_desc;
+  }
+
+  my @sorted_descs = sort { $a->{'bug_when'} cmp $b->{'bug_when'} } @long_descs;
+
+  my $comments = "\n\n--- Bug imported by $exporter_login ";
+  $comments .= format_time(scalar localtime(time()), '%Y-%m-%d %R %Z') . " ";
+  $comments .= " ---\n\n";
+  $comments .= "This bug was previously known as _bug_ $bug_fields{'bug_id'} at ";
+  $comments .= $url . $bug_fields{'bug_id'} . "\n";
+  if (defined $bug_fields{'dependson'}) {
+    $comments .= "This bug depended on bug(s) "
+      . join(' ', _to_array($bug_fields{'dependson'})) . ".\n";
+  }
+  if (defined $bug_fields{'blocked'}) {
+    $comments .= "This bug blocked bug(s) "
+      . join(' ', _to_array($bug_fields{'blocked'})) . ".\n";
+  }
+
+  # Now we process each of the fields in turn and make sure they contain
+  # valid data. We will create two parallel arrays, one for the query
+  # and one for the values. For every field we need to push an entry onto
+  # each array.
+  my @query  = ();
+  my @values = ();
+
+  # Each of these fields we will check for newlines and shove onto the array
+  foreach my $field (qw(status_whiteboard bug_file_loc short_desc)) {
+    if ($bug_fields{$field}) {
+      $bug_fields{$field} = clean_text($bug_fields{$field});
+      push(@query,  $field);
+      push(@values, $bug_fields{$field});
     }
+  }
 
-    # Alias
-    if ( $bug_fields{'alias'} ) {
-        my ($alias) = $dbh->selectrow_array("SELECT COUNT(*) FROM bugs 
+  # Alias
+  if ($bug_fields{'alias'}) {
+    my ($alias) = $dbh->selectrow_array(
+      "SELECT COUNT(*) FROM bugs 
                                                 WHERE alias = ?", undef,
-                                                $bug_fields{'alias'} );
-        if ($alias) {
-            $err .= "Dropping conflicting bug alias ";
-            $err .= $bug_fields{'alias'} . "\n";
-        }
-        else {
-            $alias = $bug_fields{'alias'};
-            push @query,  'alias';
-            push @values, $alias;
-        }
+      $bug_fields{'alias'}
+    );
+    if ($alias) {
+      $err .= "Dropping conflicting bug alias ";
+      $err .= $bug_fields{'alias'} . "\n";
     }
-
-    # Timestamps
-    push( @query, "creation_ts" );
-    push( @values,
-        format_time( $bug_fields{'creation_ts'}, "%Y-%m-%d %T" )
-          || $timestamp );
-
-    push( @query, "delta_ts" );
-    push( @values,
-        format_time( $bug_fields{'delta_ts'}, "%Y-%m-%d %T" )
-          || $timestamp );
-
-    # Bug Access
-    push( @query,  "cclist_accessible" );
-    push( @values, $bug_fields{'cclist_accessible'} ? 1 : 0 );
-
-    push( @query,  "reporter_accessible" );
-    push( @values, $bug_fields{'reporter_accessible'} ? 1 : 0 );
-
-    my $product = new Bugzilla::Product(
-        { name => $bug_fields{'product'} || '' });
-    if (!$product) {
-        $err .= "Unknown Product " . $bug_fields{'product'} . "\n";
-        $err .= "   Using default product set at the command line.\n";
-        $product = new Bugzilla::Product({ name => $default_product_name })
-            or Error("an invalid default product was defined for the target"
-                     . " DB. " . $params->{"maintainer"} . " needs to specify "
-                     . "--product when calling importxml.pl", "REOPEN", 
-                     $exporter);
+    else {
+      $alias = $bug_fields{'alias'};
+      push @query,  'alias';
+      push @values, $alias;
     }
-    my $component = new Bugzilla::Component({
-        product => $product, name => $bug_fields{'component'} || '' });
+  }
+
+  # Timestamps
+  push(@query, "creation_ts");
+  push(@values,
+    format_time($bug_fields{'creation_ts'}, "%Y-%m-%d %T") || $timestamp);
+
+  push(@query, "delta_ts");
+  push(@values,
+    format_time($bug_fields{'delta_ts'}, "%Y-%m-%d %T") || $timestamp);
+
+  # Bug Access
+  push(@query, "cclist_accessible");
+  push(@values, $bug_fields{'cclist_accessible'} ? 1 : 0);
+
+  push(@query, "reporter_accessible");
+  push(@values, $bug_fields{'reporter_accessible'} ? 1 : 0);
+
+  my $product = new Bugzilla::Product({name => $bug_fields{'product'} || ''});
+  if (!$product) {
+    $err .= "Unknown Product " . $bug_fields{'product'} . "\n";
+    $err .= "   Using default product set at the command line.\n";
+    $product = new Bugzilla::Product({name => $default_product_name})
+      or Error(
+      "an invalid default product was defined for the target" . " DB. "
+        . $params->{"maintainer"}
+        . " needs to specify "
+        . "--product when calling importxml.pl",
+      "REOPEN", $exporter
+      );
+  }
+  my $component
+    = new Bugzilla::Component({
+    product => $product, name => $bug_fields{'component'} || ''
+    });
+  if (!$component) {
+    $err .= "Unknown Component " . $bug_fields{'component'} . "\n";
+    $err .= "   Using default product and component set ";
+    $err .= "at the command line.\n";
+
+    $product = new Bugzilla::Product({name => $default_product_name});
+    $component = new Bugzilla::Component(
+      {name => $default_component_name, product => $product});
     if (!$component) {
-        $err .= "Unknown Component " . $bug_fields{'component'} . "\n";
-        $err .= "   Using default product and component set ";
-        $err .= "at the command line.\n";
-
-        $product = new Bugzilla::Product({ name => $default_product_name });
-        $component = new Bugzilla::Component({
-           name => $default_component_name, product => $product });
-        if (!$component) {
-            Error("an invalid default component was defined for the target" 
-                  . " DB. ".  $params->{"maintainer"} . " needs to specify " 
-                  . "--component when calling importxml.pl", "REOPEN", 
-                  $exporter);
-        }
+      Error(
+        "an invalid default component was defined for the target" . " DB. "
+          . $params->{"maintainer"}
+          . " needs to specify "
+          . "--component when calling importxml.pl",
+        "REOPEN", $exporter
+      );
     }
+  }
+
+  my $prod_id = $product->id;
+  my $comp_id = $component->id;
+
+  push(@query,  "product_id");
+  push(@values, $prod_id);
+  push(@query,  "component_id");
+  push(@values, $comp_id);
+
+  # Since there is no default version for a product, we check that the one
+  # coming over is valid. If not we will use the first one in @versions
+  # and warn them.
+  my $version = new Bugzilla::Version(
+    {product => $product, name => $bug_fields{'version'}});
+
+  push(@query, "version");
+  if ($version) {
+    push(@values, $version->name);
+  }
+  else {
+    my @versions = @{$product->versions};
+    my $v        = $versions[0];
+    push(@values, $v->name);
+    $err .= "Unknown version \"";
+    $err .= (defined $bug_fields{'version'}) ? $bug_fields{'version'} : "unknown";
+    $err .= " in product " . $product->name . ". \n";
+    $err .= "   Setting version to \"" . $v->name . "\".\n";
+  }
+
+  # Milestone
+  if ($params->{"usetargetmilestone"}) {
+    my $milestone;
+    if (defined $bug_fields{'target_milestone'}
+      && $bug_fields{'target_milestone'} ne "")
+    {
 
-    my $prod_id = $product->id;
-    my $comp_id = $component->id;
-
-    push( @query,  "product_id" );
-    push( @values, $prod_id );
-    push( @query,  "component_id" );
-    push( @values, $comp_id );
-
-    # Since there is no default version for a product, we check that the one
-    # coming over is valid. If not we will use the first one in @versions
-    # and warn them.
-    my $version = new Bugzilla::Version(
-          { product => $product, name => $bug_fields{'version'} });
-
-    push( @query, "version" );
-    if ($version) {
-        push( @values, $version->name );
+      $milestone = new Bugzilla::Milestone(
+        {product => $product, name => $bug_fields{'target_milestone'}});
+    }
+    if ($milestone) {
+      push(@values, $milestone->name);
     }
     else {
-        my @versions = @{ $product->versions };
-        my $v        = $versions[0];
-        push( @values, $v->name );
-        $err .= "Unknown version \"";
-        $err .= ( defined $bug_fields{'version'} )
-            ? $bug_fields{'version'}
-            : "unknown";
-        $err .= " in product " . $product->name . ". \n";
-        $err .= "   Setting version to \"" . $v->name . "\".\n";
+      push(@values, $product->default_milestone);
+      $err .= "Unknown milestone \"";
+      $err
+        .= (defined $bug_fields{'target_milestone'})
+        ? $bug_fields{'target_milestone'}
+        : "unknown";
+      $err .= " in product " . $product->name . ". \n";
+      $err .= "   Setting to default milestone for this product, ";
+      $err .= "\"" . $product->default_milestone . "\".\n";
     }
-
-    # Milestone
-    if ( $params->{"usetargetmilestone"} ) {
-        my $milestone;
-        if (defined $bug_fields{'target_milestone'}
-            && $bug_fields{'target_milestone'} ne "") {
-
-            $milestone = new Bugzilla::Milestone(
-                { product => $product, name => $bug_fields{'target_milestone'} });
-        }
-        if ($milestone) {
-            push( @values, $milestone->name );
-        }
-        else {
-            push( @values, $product->default_milestone );
-            $err .= "Unknown milestone \"";
-            $err .= ( defined $bug_fields{'target_milestone'} )
-                ? $bug_fields{'target_milestone'}
-                : "unknown";
-            $err .= " in product " . $product->name . ". \n";
-            $err .= "   Setting to default milestone for this product, ";
-            $err .= "\"" . $product->default_milestone . "\".\n";
-        }
-        push( @query, "target_milestone" );
+    push(@query, "target_milestone");
+  }
+
+  # For priority, severity, opsys and platform we check that the one being
+  # imported is valid. If it is not we use the defaults set in the parameters.
+  if (
+    defined($bug_fields{'bug_severity'})
+    && check_field(
+      'bug_severity', scalar $bug_fields{'bug_severity'},
+      undef, ERR_LEVEL
+    )
+    )
+  {
+    push(@values, $bug_fields{'bug_severity'});
+  }
+  else {
+    push(@values, $params->{'defaultseverity'});
+    $err .= "Unknown severity ";
+    $err
+      .= (defined $bug_fields{'bug_severity'})
+      ? $bug_fields{'bug_severity'}
+      : "unknown";
+    $err .= ". Setting to default severity \"";
+    $err .= $params->{'defaultseverity'} . "\".\n";
+  }
+  push(@query, "bug_severity");
+
+  if (defined($bug_fields{'priority'})
+    && check_field('priority', scalar $bug_fields{'priority'}, undef, ERR_LEVEL))
+  {
+    push(@values, $bug_fields{'priority'});
+  }
+  else {
+    push(@values, $params->{'defaultpriority'});
+    $err .= "Unknown priority ";
+    $err .= (defined $bug_fields{'priority'}) ? $bug_fields{'priority'} : "unknown";
+    $err .= ". Setting to default priority \"";
+    $err .= $params->{'defaultpriority'} . "\".\n";
+  }
+  push(@query, "priority");
+
+  if (
+    defined($bug_fields{'rep_platform'})
+    && check_field(
+      'rep_platform', scalar $bug_fields{'rep_platform'},
+      undef, ERR_LEVEL
+    )
+    )
+  {
+    push(@values, $bug_fields{'rep_platform'});
+  }
+  else {
+    push(@values, $params->{'defaultplatform'});
+    $err .= "Unknown platform ";
+    $err
+      .= (defined $bug_fields{'rep_platform'})
+      ? $bug_fields{'rep_platform'}
+      : "unknown";
+    $err .= ". Setting to default platform \"";
+    $err .= $params->{'defaultplatform'} . "\".\n";
+  }
+  push(@query, "rep_platform");
+
+  if (defined($bug_fields{'op_sys'})
+    && check_field('op_sys', scalar $bug_fields{'op_sys'}, undef, ERR_LEVEL))
+  {
+    push(@values, $bug_fields{'op_sys'});
+  }
+  else {
+    push(@values, $params->{'defaultopsys'});
+    $err .= "Unknown operating system ";
+    $err .= (defined $bug_fields{'op_sys'}) ? $bug_fields{'op_sys'} : "unknown";
+    $err .= ". Setting to default OS \"" . $params->{'defaultopsys'} . "\".\n";
+  }
+  push(@query, "op_sys");
+
+  # Process time fields
+  if ($params->{"timetrackinggroup"}) {
+    my $date
+      = validate_date($bug_fields{'deadline'}) ? $bug_fields{'deadline'} : undef;
+    push(@values, $date);
+    push(@query,  "deadline");
+    if (defined $bug_fields{'estimated_time'}) {
+      eval { Bugzilla::Object::_validate_time($bug_fields{'estimated_time'}, "e"); };
+      if (!$@) {
+        push(@values, $bug_fields{'estimated_time'});
+        push(@query,  "estimated_time");
+      }
     }
-
-    # For priority, severity, opsys and platform we check that the one being
-    # imported is valid. If it is not we use the defaults set in the parameters.
-    if (defined( $bug_fields{'bug_severity'} )
-        && check_field('bug_severity', scalar $bug_fields{'bug_severity'},
-                       undef, ERR_LEVEL) )
-    {
-        push( @values, $bug_fields{'bug_severity'} );
+    if (defined $bug_fields{'remaining_time'}) {
+      eval { Bugzilla::Object::_validate_time($bug_fields{'remaining_time'}, "r"); };
+      if (!$@) {
+        push(@values, $bug_fields{'remaining_time'});
+        push(@query,  "remaining_time");
+      }
+    }
+    if (defined $bug_fields{'actual_time'}) {
+      eval { Bugzilla::Object::_validate_time($bug_fields{'actual_time'}, "a"); };
+      if ($@) {
+        $bug_fields{'actual_time'} = 0.0;
+        $err .= "Invalid Actual Time. Setting to 0.0\n";
+      }
     }
     else {
-        push( @values, $params->{'defaultseverity'} );
-        $err .= "Unknown severity ";
-        $err .= ( defined $bug_fields{'bug_severity'} )
-          ? $bug_fields{'bug_severity'}
-          : "unknown";
-        $err .= ". Setting to default severity \"";
-        $err .= $params->{'defaultseverity'} . "\".\n";
+      $bug_fields{'actual_time'} = 0.0;
+      $err .= "Actual time not defined. Setting to 0.0\n";
     }
-    push( @query, "bug_severity" );
-
-    if (defined( $bug_fields{'priority'} )
-        && check_field('priority', scalar $bug_fields{'priority'},
-                       undef, ERR_LEVEL ) )
-    {
-        push( @values, $bug_fields{'priority'} );
+  }
+
+  # Reporter Assignee QA Contact
+  my $exporterid = $exporter->id;
+  my $reporterid = login_to_id($bug_fields{'reporter'})
+    if $bug_fields{'reporter'};
+  push(@query, "reporter");
+  if (($bug_fields{'reporter'}) && ($reporterid)) {
+    push(@values, $reporterid);
+  }
+  else {
+    push(@values, $exporterid);
+    $err .= "The original reporter of this bug does not have\n";
+    $err .= "   an account here. Reassigning to the person who moved\n";
+    $err .= "   it here: $exporter_login.\n";
+    if ($bug_fields{'reporter'}) {
+      $err .= "   Previous reporter was $bug_fields{'reporter'}.\n";
     }
     else {
-        push( @values, $params->{'defaultpriority'} );
-        $err .= "Unknown priority ";
-        $err .= ( defined $bug_fields{'priority'} )
-          ? $bug_fields{'priority'}
-          : "unknown";
-        $err .= ". Setting to default priority \"";
-        $err .= $params->{'defaultpriority'} . "\".\n";
+      $err .= "   Previous reporter is unknown.\n";
     }
-    push( @query, "priority" );
-
-    if (defined( $bug_fields{'rep_platform'} )
-        && check_field('rep_platform', scalar $bug_fields{'rep_platform'},
-                       undef, ERR_LEVEL ) )
-    {
-        push( @values, $bug_fields{'rep_platform'} );
+  }
+
+  my $changed_owner = 0;
+  my $owner;
+  push(@query, "assigned_to");
+  if ( ($bug_fields{'assigned_to'})
+    && ($owner = login_to_id($bug_fields{'assigned_to'})))
+  {
+    push(@values, $owner);
+  }
+  else {
+    push(@values, $component->default_assignee->id);
+    $changed_owner = 1;
+    $err .= "The original assignee of this bug does not have\n";
+    $err .= "   an account here. Reassigning to the default assignee\n";
+    $err .= "   for the component, " . $component->default_assignee->login . ".\n";
+    if ($bug_fields{'assigned_to'}) {
+      $err .= "   Previous assignee was $bug_fields{'assigned_to'}.\n";
     }
     else {
-        push( @values, $params->{'defaultplatform'} );
-        $err .= "Unknown platform ";
-        $err .= ( defined $bug_fields{'rep_platform'} )
-          ? $bug_fields{'rep_platform'}
-          : "unknown";
-        $err .=". Setting to default platform \"";
-        $err .= $params->{'defaultplatform'} . "\".\n";
+      $err .= "   Previous assignee is unknown.\n";
     }
-    push( @query, "rep_platform" );
+  }
 
-    if (defined( $bug_fields{'op_sys'} )
-        && check_field('op_sys',  scalar $bug_fields{'op_sys'},
-                       undef, ERR_LEVEL ) )
+  if ($params->{"useqacontact"}) {
+    my $qa_contact;
+    push(@query, "qa_contact");
+    if ( (defined $bug_fields{'qa_contact'})
+      && ($qa_contact = login_to_id($bug_fields{'qa_contact'})))
     {
-        push( @values, $bug_fields{'op_sys'} );
+      push(@values, $qa_contact);
     }
     else {
-        push( @values, $params->{'defaultopsys'} );
-        $err .= "Unknown operating system ";
-        $err .= ( defined $bug_fields{'op_sys'} )
-          ? $bug_fields{'op_sys'}
-          : "unknown";
-        $err .= ". Setting to default OS \"" . $params->{'defaultopsys'} . "\".\n";
-    }
-    push( @query, "op_sys" );
-
-    # Process time fields
-    if ( $params->{"timetrackinggroup"} ) {
-        my $date = validate_date( $bug_fields{'deadline'} ) ? $bug_fields{'deadline'} : undef;
-        push( @values, $date );
-        push( @query,  "deadline" );
-        if ( defined $bug_fields{'estimated_time'} ) {
-            eval {
-                Bugzilla::Object::_validate_time($bug_fields{'estimated_time'}, "e");
-            };
-            if (!$@){
-                push( @values, $bug_fields{'estimated_time'} );
-                push( @query,  "estimated_time" );
-            }
-        }
-        if ( defined $bug_fields{'remaining_time'} ) {
-            eval {
-                Bugzilla::Object::_validate_time($bug_fields{'remaining_time'}, "r");
-            };
-            if (!$@){
-                push( @values, $bug_fields{'remaining_time'} );
-                push( @query,  "remaining_time" );
-            }
-        }
-        if ( defined $bug_fields{'actual_time'} ) {
-            eval {
-                Bugzilla::Object::_validate_time($bug_fields{'actual_time'}, "a");
-            };
-            if ($@){
-                $bug_fields{'actual_time'} = 0.0;
-                $err .= "Invalid Actual Time. Setting to 0.0\n";
-            }
-        }
-        else {
-            $bug_fields{'actual_time'} = 0.0;
-            $err .= "Actual time not defined. Setting to 0.0\n";
-        }
-    }
+      push(@values,
+        $component->default_qa_contact ? $component->default_qa_contact->id : undef);
 
-    # Reporter Assignee QA Contact
-    my $exporterid = $exporter->id;
-    my $reporterid = login_to_id( $bug_fields{'reporter'} )
-      if $bug_fields{'reporter'};
-    push( @query, "reporter" );
-    if ( ( $bug_fields{'reporter'} ) && ($reporterid) ) {
-        push( @values, $reporterid );
+      if ($component->default_qa_contact) {
+        $err .= "Setting qa contact to the default for this product.\n";
+        $err .= "   This bug either had no qa contact or an invalid one.\n";
+      }
+    }
+  }
+
+  # Status & Resolution
+  my $valid_res
+    = check_field('resolution', scalar $bug_fields{'resolution'}, undef,
+    ERR_LEVEL);
+  my $valid_status
+    = check_field('bug_status', scalar $bug_fields{'bug_status'}, undef,
+    ERR_LEVEL);
+  my $status     = $bug_fields{'bug_status'} || undef;
+  my $resolution = $bug_fields{'resolution'} || undef;
+
+  # Check everconfirmed
+  my $everconfirmed;
+  if ($product->allows_unconfirmed) {
+    $everconfirmed = $bug_fields{'everconfirmed'} || 0;
+  }
+  else {
+    $everconfirmed = 1;
+  }
+  push(@query,  "everconfirmed");
+  push(@values, $everconfirmed);
+
+  # Sanity check will complain about having bugs marked duplicate but no
+  # entry in the dup table. Since we can't tell the bug ID of bugs
+  # that might not yet be in the database we have no way of populating
+  # this table. Change the resolution instead.
+  if ($valid_res && ($bug_fields{'resolution'} eq "DUPLICATE")) {
+    $resolution = "INVALID";
+    $err .= "This bug was marked DUPLICATE in the database ";
+    $err .= "it was moved from.\n    Changing resolution to \"INVALID\"\n";
+  }
+
+  # If there is at least 1 initial bug status different from UNCO, use it,
+  # else use the open bug status with the lowest sortkey (different from UNCO).
+  my @bug_statuses = @{Bugzilla::Status->can_change_to()};
+  @bug_statuses = grep { $_->name ne 'UNCONFIRMED' } @bug_statuses;
+
+  my $initial_status;
+  if (scalar(@bug_statuses)) {
+    $initial_status = $bug_statuses[0]->name;
+  }
+  else {
+    @bug_statuses = Bugzilla::Status->get_all();
+
+    # Exclude UNCO and inactive bug statuses.
+    @bug_statuses
+      = grep { $_->is_active && $_->name ne 'UNCONFIRMED' } @bug_statuses;
+    my @open_statuses = grep { $_->is_open } @bug_statuses;
+    if (scalar(@open_statuses)) {
+      $initial_status = $open_statuses[0]->name;
     }
     else {
-        push( @values, $exporterid );
-        $err .= "The original reporter of this bug does not have\n";
-        $err .= "   an account here. Reassigning to the person who moved\n";
-        $err .= "   it here: $exporter_login.\n";
-        if ( $bug_fields{'reporter'} ) {
-            $err .= "   Previous reporter was $bug_fields{'reporter'}.\n";
+      # There is NO other open bug statuses outside UNCO???
+      Error("no open bug statuses available.");
+    }
+  }
+
+  if ($status) {
+    if ($valid_status) {
+      if (is_open_state($status)) {
+        if ($resolution) {
+          $err .= "Resolution set on an open status.\n";
+          $err .= "   Dropping resolution $resolution\n";
+          $resolution = undef;
         }
-        else {
-            $err .= "   Previous reporter is unknown.\n";
+        if ($changed_owner) {
+          if ($everconfirmed) {
+            $status = $initial_status;
+          }
+          else {
+            $status = "UNCONFIRMED";
+          }
+          if ($status ne $bug_fields{'bug_status'}) {
+            $err .= "Bug reassigned, setting status to \"$status\".\n";
+            $err .= "   Previous status was \"";
+            $err .= $bug_fields{'bug_status'} . "\".\n";
+          }
         }
-    }
-
-    my $changed_owner = 0;
-    my $owner;
-    push( @query, "assigned_to" );
-    if ( ( $bug_fields{'assigned_to'} )
-        && ( $owner = login_to_id( $bug_fields{'assigned_to'} )) ) {
-        push( @values, $owner );
-    }
-    else {
-        push( @values, $component->default_assignee->id );
-        $changed_owner = 1;
-        $err .= "The original assignee of this bug does not have\n";
-        $err .= "   an account here. Reassigning to the default assignee\n";
-        $err .= "   for the component, ". $component->default_assignee->login .".\n";
-        if ( $bug_fields{'assigned_to'} ) {
-            $err .= "   Previous assignee was $bug_fields{'assigned_to'}.\n";
+        if ($everconfirmed) {
+          if ($status eq "UNCONFIRMED") {
+            $err .= "Bug Status was UNCONFIRMED but everconfirmed was true\n";
+            $err .= "   Setting status to $initial_status\n";
+            $status = $initial_status;
+          }
         }
-        else {
-            $err .= "   Previous assignee is unknown.\n";
+        else {    # $everconfirmed is false
+          if ($status ne "UNCONFIRMED") {
+            $err .= "Bug Status was $status but everconfirmed was false\n";
+            $err .= "   Setting status to UNCONFIRMED\n";
+            $status = "UNCONFIRMED";
+          }
         }
-    }
-
-    if ( $params->{"useqacontact"} ) {
-        my $qa_contact;
-        push( @query, "qa_contact" );
-        if ( ( defined $bug_fields{'qa_contact'})
-            && ( $qa_contact = login_to_id( $bug_fields{'qa_contact'} ) ) ) {
-            push( @values, $qa_contact );
+      }
+      else {
+        if (!$resolution) {
+          $err .= "Missing Resolution. Setting status to ";
+          if ($everconfirmed) {
+            $status = $initial_status;
+            $err .= "$initial_status\n";
+          }
+          else {
+            $status = "UNCONFIRMED";
+            $err .= "UNCONFIRMED\n";
+          }
         }
-        else {
-            push(@values, $component->default_qa_contact ?
-                          $component->default_qa_contact->id : undef);
-
-            if ($component->default_qa_contact) {
-                $err .= "Setting qa contact to the default for this product.\n";
-                $err .= "   This bug either had no qa contact or an invalid one.\n";
-            }
+        elsif (!$valid_res) {
+          $err .= "Unknown resolution \"$resolution\".\n";
+          $err .= "   Setting resolution to INVALID\n";
+          $resolution = "INVALID";
         }
+      }
     }
-
-    # Status & Resolution
-    my $valid_res = check_field('resolution',  
-                                  scalar $bug_fields{'resolution'}, 
-                                  undef, ERR_LEVEL );
-    my $valid_status = check_field('bug_status',  
-                                  scalar $bug_fields{'bug_status'}, 
-                                  undef, ERR_LEVEL );
-    my $status = $bug_fields{'bug_status'} || undef;
-    my $resolution = $bug_fields{'resolution'} || undef;
-    
-    # Check everconfirmed 
-    my $everconfirmed;
-    if ($product->allows_unconfirmed) {
-        $everconfirmed = $bug_fields{'everconfirmed'} || 0;
+    else {    # $valid_status is false
+      if ($everconfirmed) {
+        $status = $initial_status;
+      }
+      else {
+        $status = "UNCONFIRMED";
+      }
+      $err .= "Bug has invalid status, setting status to \"$status\".\n";
+      $err .= "   Previous status was \"";
+      $err .= $bug_fields{'bug_status'} . "\".\n";
+      $resolution = undef;
+    }
+  }
+  else {
+    if ($everconfirmed) {
+      $status = $initial_status;
     }
     else {
-        $everconfirmed = 1;
+      $status = "UNCONFIRMED";
     }
-    push (@query,  "everconfirmed");
-    push (@values, $everconfirmed);
-
-    # Sanity check will complain about having bugs marked duplicate but no
-    # entry in the dup table. Since we can't tell the bug ID of bugs
-    # that might not yet be in the database we have no way of populating
-    # this table. Change the resolution instead.
-    if ( $valid_res  && ( $bug_fields{'resolution'} eq "DUPLICATE" ) ) {
-        $resolution = "INVALID";
-        $err .= "This bug was marked DUPLICATE in the database ";
-        $err .= "it was moved from.\n    Changing resolution to \"INVALID\"\n";
-    } 
-
-    # If there is at least 1 initial bug status different from UNCO, use it,
-    # else use the open bug status with the lowest sortkey (different from UNCO).
-    my @bug_statuses = @{Bugzilla::Status->can_change_to()};
-    @bug_statuses = grep { $_->name ne 'UNCONFIRMED' } @bug_statuses;
-
-    my $initial_status;
-    if (scalar(@bug_statuses)) {
-        $initial_status = $bug_statuses[0]->name;
+    $err .= "Bug has no status, setting status to \"$status\".\n";
+    $err .= "   Previous status was unknown\n";
+    $resolution = undef;
+  }
+
+  if ($resolution) {
+    push(@query,  "resolution");
+    push(@values, $resolution);
+  }
+
+  # Bug status
+  push(@query,  "bug_status");
+  push(@values, $status);
+
+  # Custom fields - Multi-select fields have their own table.
+  my %multi_select_fields;
+  foreach my $field (Bugzilla->active_custom_fields) {
+    my $custom_field = $field->name;
+    my $value        = $bug_fields{$custom_field};
+    next unless defined $value;
+    if ($field->type == FIELD_TYPE_FREETEXT) {
+      push(@query,  $custom_field);
+      push(@values, clean_text($value));
     }
-    else {
-        @bug_statuses = Bugzilla::Status->get_all();
-        # Exclude UNCO and inactive bug statuses.
-        @bug_statuses = grep { $_->is_active && $_->name ne 'UNCONFIRMED'} @bug_statuses;
-        my @open_statuses = grep { $_->is_open } @bug_statuses;
-        if (scalar(@open_statuses)) {
-            $initial_status = $open_statuses[0]->name;
+    elsif ($field->type == FIELD_TYPE_TEXTAREA) {
+      push(@query,  $custom_field);
+      push(@values, $value);
+    }
+    elsif ($field->type == FIELD_TYPE_SINGLE_SELECT) {
+      my $is_well_formed = check_field($custom_field, $value, undef, ERR_LEVEL);
+      if ($is_well_formed) {
+        push(@query,  $custom_field);
+        push(@values, $value);
+      }
+      else {
+        $err .= "Skipping illegal value \"$value\" in $custom_field.\n";
+      }
+    }
+    elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
+      my @legal_values;
+      foreach my $item (_to_array($value)) {
+        my $is_well_formed = check_field($custom_field, $item, undef, ERR_LEVEL);
+        if ($is_well_formed) {
+          push(@legal_values, $item);
         }
         else {
-            # There is NO other open bug statuses outside UNCO???
-            Error("no open bug statuses available.");
+          $err .= "Skipping illegal value \"$item\" in $custom_field.\n";
         }
+      }
+      if (scalar @legal_values) {
+        $multi_select_fields{$custom_field} = \@legal_values;
+      }
     }
-
-    if ($status) {
-        if($valid_status){
-            if (is_open_state($status)) {
-                if ($resolution) {
-                    $err .= "Resolution set on an open status.\n";
-                    $err .= "   Dropping resolution $resolution\n";
-                    $resolution = undef;
-                }
-                if($changed_owner){
-                    if($everconfirmed){  
-                        $status = $initial_status;
-                    }
-                    else{
-                        $status = "UNCONFIRMED";
-                    }
-                    if ($status ne $bug_fields{'bug_status'}){
-                        $err .= "Bug reassigned, setting status to \"$status\".\n";
-                        $err .= "   Previous status was \"";
-                        $err .=  $bug_fields{'bug_status'} . "\".\n";
-                    }
-                }
-                if($everconfirmed){
-                    if($status eq "UNCONFIRMED"){
-                        $err .= "Bug Status was UNCONFIRMED but everconfirmed was true\n";
-                        $err .= "   Setting status to $initial_status\n";
-                        $status = $initial_status;
-                    }
-                }
-                else{ # $everconfirmed is false
-                    if($status ne "UNCONFIRMED"){
-                        $err .= "Bug Status was $status but everconfirmed was false\n";
-                        $err .= "   Setting status to UNCONFIRMED\n";
-                        $status = "UNCONFIRMED";
-                    }
-                }
-            }
-            else {
-               if (!$resolution) {
-                   $err .= "Missing Resolution. Setting status to ";
-                   if($everconfirmed){
-                       $status = $initial_status;
-                       $err .= "$initial_status\n";
-                   }
-                   else{
-                       $status = "UNCONFIRMED";
-                       $err .= "UNCONFIRMED\n";
-                   }
-               }
-               elsif (!$valid_res) {
-                   $err .= "Unknown resolution \"$resolution\".\n";
-                   $err .= "   Setting resolution to INVALID\n";
-                   $resolution = "INVALID";
-               }
-            }   
-        }
-        else{ # $valid_status is false
-            if($everconfirmed){  
-                $status = $initial_status;
-            }
-            else{
-                $status = "UNCONFIRMED";
-            }        
-            $err .= "Bug has invalid status, setting status to \"$status\".\n";
-            $err .= "   Previous status was \"";
-            $err .=  $bug_fields{'bug_status'} . "\".\n";
-            $resolution = undef;
-        }
+    elsif ($field->type == FIELD_TYPE_DATETIME) {
+      eval { $value = Bugzilla::Bug->_check_datetime_field($value); };
+      if ($@) {
+        $err .= "Skipping illegal value \"$value\" in $custom_field.\n";
+      }
+      else {
+        push(@query,  $custom_field);
+        push(@values, $value);
+      }
     }
-    else {
-        if($everconfirmed){  
-            $status = $initial_status;
-        }
-        else{
-            $status = "UNCONFIRMED";
-        }        
-        $err .= "Bug has no status, setting status to \"$status\".\n";
-        $err .= "   Previous status was unknown\n";
-        $resolution = undef;
+    elsif ($field->type == FIELD_TYPE_DATE) {
+      eval { $value = Bugzilla::Bug->_check_date_field($value); };
+      if ($@) {
+        $err .= "Skipping illegal value \"$value\" in $custom_field.\n";
+      }
+      else {
+        push(@query,  $custom_field);
+        push(@values, $value);
+      }
     }
-
-    if ($resolution) {
-        push( @query,  "resolution" );
-        push( @values, $resolution );
+    else {
+      $err .= "Type of custom field $custom_field is an unhandled FIELD_TYPE: "
+        . $field->type . "\n";
     }
-    
-    # Bug status
-    push( @query,  "bug_status" );
-    push( @values, $status );
-
-    # Custom fields - Multi-select fields have their own table.
-    my %multi_select_fields;
-    foreach my $field (Bugzilla->active_custom_fields) {
-        my $custom_field = $field->name;
-        my $value = $bug_fields{$custom_field};
-        next unless defined $value;
-        if ($field->type == FIELD_TYPE_FREETEXT) {
-            push(@query, $custom_field);
-            push(@values, clean_text($value));
-        } elsif ($field->type == FIELD_TYPE_TEXTAREA) {
-            push(@query, $custom_field);
-            push(@values, $value);
-        } elsif ($field->type == FIELD_TYPE_SINGLE_SELECT) {
-            my $is_well_formed = check_field($custom_field, $value, undef, ERR_LEVEL);
-            if ($is_well_formed) {
-                push(@query, $custom_field);
-                push(@values, $value);
-            } else {
-                $err .= "Skipping illegal value \"$value\" in $custom_field.\n" ;
-            }
-        } elsif ($field->type == FIELD_TYPE_MULTI_SELECT) {
-            my @legal_values;
-            foreach my $item (_to_array($value)) {
-                my $is_well_formed = check_field($custom_field, $item, undef, ERR_LEVEL);
-                if ($is_well_formed) {
-                    push(@legal_values, $item);
-                } else {
-                    $err .= "Skipping illegal value \"$item\" in $custom_field.\n" ;
-                }
-            }
-            if (scalar @legal_values) {
-                $multi_select_fields{$custom_field} = \@legal_values;
-            }
-        } elsif ($field->type == FIELD_TYPE_DATETIME) {
-            eval { $value = Bugzilla::Bug->_check_datetime_field($value); };
-            if ($@) {
-                $err .= "Skipping illegal value \"$value\" in $custom_field.\n" ;
-            }
-            else {
-                push(@query, $custom_field);
-                push(@values, $value);
-            }
-        } elsif ($field->type == FIELD_TYPE_DATE) {
-            eval { $value = Bugzilla::Bug->_check_date_field($value); };
-            if ($@) {
-                $err .= "Skipping illegal value \"$value\" in $custom_field.\n" ;
-            }
-            else {
-                push(@query, $custom_field);
-                push(@values, $value);
-            }
-        } else {
-            $err .= "Type of custom field $custom_field is an unhandled FIELD_TYPE: " .
-                    $field->type . "\n";
+  }
+
+  # For the sake of sanitycheck.cgi we do this.
+  # Update lastdiffed if you do not want to have mail sent
+  unless ($mail) {
+    push @query,  "lastdiffed";
+    push @values, $timestamp;
+  }
+
+  # INSERT the bug
+  my $query = "INSERT INTO bugs (" . join(", ", @query) . ") VALUES (";
+  $query .= '?,' foreach (@values);
+  chop($query);    # Remove the last comma.
+  $query .= ")";
+
+  $dbh->do($query, undef, @values);
+  my $id = $dbh->bz_last_key('bugs', 'bug_id');
+  my $bug_obj = Bugzilla::Bug->new($id);
+
+  # We are almost certain to get some uninitialized warnings
+  # Since this is just for debugging the query, let's shut them up
+  eval {
+    no warnings 'uninitialized';
+    Debug(
+      "Bug Query: INSERT INTO bugs (\n"
+        . join(",\n", @query)
+        . "\n) VALUES (\n"
+        . join(",\n", @values),
+      DEBUG_LEVEL
+    );
+  };
+
+  # Handle CC's
+  if (defined $bug_fields{'cc'}) {
+    my %ccseen;
+    my $sth_cc = $dbh->prepare("INSERT INTO cc (bug_id, who) VALUES (?,?)");
+    foreach my $person (_to_array($bug_fields{'cc'})) {
+      next unless $person;
+      my $uid;
+      if ($uid = login_to_id($person)) {
+        if (!$ccseen{$uid}) {
+          $sth_cc->execute($id, $uid);
+          $ccseen{$uid} = 1;
         }
+      }
+      else {
+        $err .= "CC member $person does not have an account here\n";
+      }
     }
+  }
 
-    # For the sake of sanitycheck.cgi we do this.
-    # Update lastdiffed if you do not want to have mail sent
-    unless ($mail) {
-        push @query,  "lastdiffed";
-        push @values, $timestamp;
+  # Handle keywords
+  if (defined($bug_fields{'keywords'})) {
+    my %keywordseen;
+    my $key_sth = $dbh->prepare(
+      "INSERT INTO keywords 
+                      (bug_id, keywordid) VALUES (?,?)"
+    );
+    foreach my $keyword (split(/[\s,]+/, $bug_fields{'keywords'})) {
+      next unless $keyword;
+      my $keyword_obj = new Bugzilla::Keyword({name => $keyword});
+      if (!$keyword_obj) {
+        $err .= "Skipping unknown keyword: $keyword.\n";
+        next;
+      }
+      if (!$keywordseen{$keyword_obj->id}) {
+        $key_sth->execute($id, $keyword_obj->id);
+        $keywordseen{$keyword_obj->id} = 1;
+      }
     }
-
-    # INSERT the bug
-    my $query = "INSERT INTO bugs (" . join( ", ", @query ) . ") VALUES (";
-       $query .= '?,' foreach (@values);
-    chop($query);    # Remove the last comma.
-       $query .= ")";
-
-    $dbh->do( $query, undef, @values );
-    my $id = $dbh->bz_last_key( 'bugs', 'bug_id' );
-    my $bug_obj = Bugzilla::Bug->new($id);
-
-    # We are almost certain to get some uninitialized warnings
-    # Since this is just for debugging the query, let's shut them up
-    eval {
-        no warnings 'uninitialized';
-        Debug(
-            "Bug Query: INSERT INTO bugs (\n"
-              . join( ",\n", @query )
-              . "\n) VALUES (\n"
-              . join( ",\n", @values ),
-            DEBUG_LEVEL
-        );
-    };
-
-    # Handle CC's
-    if ( defined $bug_fields{'cc'} ) {
-        my %ccseen;
-        my $sth_cc = $dbh->prepare("INSERT INTO cc (bug_id, who) VALUES (?,?)");
-        foreach my $person (_to_array($bug_fields{'cc'})) {
-            next unless $person;
-            my $uid;
-            if ($uid = login_to_id($person)) {
-                if ( !$ccseen{$uid} ) {
-                    $sth_cc->execute( $id, $uid );
-                    $ccseen{$uid} = 1;
-                }
-            }
-            else {
-                $err .= "CC member $person does not have an account here\n";
-            }
-        }
+  }
+
+  # Insert values of custom multi-select fields. They have already
+  # been validated.
+  foreach my $custom_field (keys %multi_select_fields) {
+    my $sth = $dbh->prepare(
+      "INSERT INTO bug_$custom_field
+                                 (bug_id, value) VALUES (?, ?)"
+    );
+    foreach my $value (@{$multi_select_fields{$custom_field}}) {
+      $sth->execute($id, $value);
     }
-
-    # Handle keywords
-    if ( defined( $bug_fields{'keywords'} ) ) {
-        my %keywordseen;
-        my $key_sth = $dbh->prepare(
-            "INSERT INTO keywords 
-                      (bug_id, keywordid) VALUES (?,?)"
-        );
-        foreach my $keyword ( split( /[\s,]+/, $bug_fields{'keywords'} )) {
-            next unless $keyword;
-            my $keyword_obj = new Bugzilla::Keyword({name => $keyword});
-            if (!$keyword_obj) {
-                $err .= "Skipping unknown keyword: $keyword.\n";
-                next;
-            }
-            if (!$keywordseen{$keyword_obj->id}) {
-                $key_sth->execute($id, $keyword_obj->id);
-                $keywordseen{$keyword_obj->id} = 1;
-            }
-        }
+  }
+
+  # Parse bug flags
+  foreach my $bflag ($bug->children('flag')) {
+    next unless (defined($bflag));
+    $err .= flag_handler(
+      $bflag->{'att'}->{'name'},   $bflag->{'att'}->{'status'},
+      $bflag->{'att'}->{'setter'}, $bflag->{'att'}->{'requestee'},
+      $exporterid,                 $id,
+      $comp_id,                    $prod_id,
+      undef
+    );
+  }
+
+  # Insert Attachments for the bug
+  foreach my $att (@attachments) {
+    if ($att eq "err") {
+      $err .= "No attachment ID specified, dropping attachment\n";
+      next;
     }
 
-    # Insert values of custom multi-select fields. They have already
-    # been validated.
-    foreach my $custom_field (keys %multi_select_fields) {
-        my $sth = $dbh->prepare("INSERT INTO bug_$custom_field
-                                 (bug_id, value) VALUES (?, ?)");
-        foreach my $value (@{$multi_select_fields{$custom_field}}) {
-            $sth->execute($id, $value);
-        }
+    my $attacher;
+    if ($att->{'attacher'}) {
+      $attacher = Bugzilla::User->new({name => $att->{'attacher'}, cache => 1});
     }
+    my $new_attacher = $attacher || $exporter;
 
-    # Parse bug flags
-    foreach my $bflag ( $bug->children('flag')) {
-        next unless ( defined($bflag) );
-        $err .= flag_handler(
-            $bflag->{'att'}->{'name'},   $bflag->{'att'}->{'status'},
-            $bflag->{'att'}->{'setter'}, $bflag->{'att'}->{'requestee'},
-            $exporterid,                 $id,
-            $comp_id,                    $prod_id,
-            undef
-        );
+    if ($att->{'isprivate'} && !$new_attacher->is_insider) {
+      my $who = $new_attacher->login;
+      $err .= "$who not in insidergroup and attachment marked private.\n";
+      $err .= "   Marking attachment public\n";
+      $att->{'isprivate'} = 0;
     }
 
-    # Insert Attachments for the bug
-    foreach my $att (@attachments) {
-        if ($att eq "err"){
-            $err .= "No attachment ID specified, dropping attachment\n";
-            next;
-        }
-
-        my $attacher;
-        if ($att->{'attacher'}) {
-            $attacher = Bugzilla::User->new({name => $att->{'attacher'}, cache => 1});
-        }
-        my $new_attacher = $attacher || $exporter;
-
-        if ($att->{'isprivate'} && !$new_attacher->is_insider) {
-            my $who = $new_attacher->login;
-            $err .= "$who not in insidergroup and attachment marked private.\n";
-            $err .= "   Marking attachment public\n";
-            $att->{'isprivate'} = 0;
-        }
-
-        # We log in the user so that the attachment creator is set correctly.
-        Bugzilla->set_user($new_attacher);
-
-        my $attachment = Bugzilla::Attachment->create(
-            { bug           => $bug_obj,
-              creation_ts   => $att->{date},
-              data          => $att->{data},
-              description   => $att->{desc},
-              filename      => $att->{filename},
-              ispatch       => $att->{ispatch},
-              isprivate     => $att->{isprivate},
-              isobsolete    => $att->{isobsolete},
-              mimetype      => $att->{ctype},
-            });
-        my $att_id = $attachment->id;
-
-        # We log out the attacher as the remaining steps are not on his behalf.
-        Bugzilla->logout_request;
-
-        $comments .= "Imported an attachment (id=$att_id)\n";
-        if (!$attacher) {
-            if ($att->{'attacher'}) {
-                $err .= "The original submitter of attachment $att_id was\n   ";
-                $err .= $att->{'attacher'} . ", but they don't have an account here.\n";
-            }
-            else {
-                $err .= "The original submitter of attachment $att_id is unknown.\n";
-            }
-            $err .= "   Reassigning to the person who moved it here: $exporter_login.\n";
-        }
+    # We log in the user so that the attachment creator is set correctly.
+    Bugzilla->set_user($new_attacher);
+
+    my $attachment = Bugzilla::Attachment->create({
+      bug         => $bug_obj,
+      creation_ts => $att->{date},
+      data        => $att->{data},
+      description => $att->{desc},
+      filename    => $att->{filename},
+      ispatch     => $att->{ispatch},
+      isprivate   => $att->{isprivate},
+      isobsolete  => $att->{isobsolete},
+      mimetype    => $att->{ctype},
+    });
+    my $att_id = $attachment->id;
+
+    # We log out the attacher as the remaining steps are not on his behalf.
+    Bugzilla->logout_request;
+
+    $comments .= "Imported an attachment (id=$att_id)\n";
+    if (!$attacher) {
+      if ($att->{'attacher'}) {
+        $err .= "The original submitter of attachment $att_id was\n   ";
+        $err .= $att->{'attacher'} . ", but they don't have an account here.\n";
+      }
+      else {
+        $err .= "The original submitter of attachment $att_id is unknown.\n";
+      }
+      $err .= "   Reassigning to the person who moved it here: $exporter_login.\n";
+    }
 
-        # Process attachment flags
-        foreach my $aflag (@{ $att->{'flags'} }) {
-            next unless defined($aflag) ;
-            $err .= flag_handler(
-                $aflag->{'name'},   $aflag->{'status'},
-                $aflag->{'setter'}, $aflag->{'requestee'},
-                $exporterid,        $id,
-                $comp_id,           $prod_id,
-                $att_id
-            );
-        }
+    # Process attachment flags
+    foreach my $aflag (@{$att->{'flags'}}) {
+      next unless defined($aflag);
+      $err .= flag_handler(
+        $aflag->{'name'},      $aflag->{'status'}, $aflag->{'setter'},
+        $aflag->{'requestee'}, $exporterid,        $id,
+        $comp_id,              $prod_id,           $att_id
+      );
     }
+  }
 
-    # Clear the attachments array for the next bug
-    @attachments = ();
+  # Clear the attachments array for the next bug
+  @attachments = ();
 
-    # Insert comments and append any errors
-    my $worktime = $bug_fields{'actual_time'} || 0.0;
-    $worktime = 0.0 if (!$exporter->is_timetracker);
-    $comments .= "\n$err\n" if $err;
+  # Insert comments and append any errors
+  my $worktime = $bug_fields{'actual_time'} || 0.0;
+  $worktime = 0.0 if (!$exporter->is_timetracker);
+  $comments .= "\n$err\n" if $err;
 
-    my $sth_comment =
-      $dbh->prepare('INSERT INTO longdescs (bug_id, who, bug_when, isprivate,
+  my $sth_comment = $dbh->prepare(
+    'INSERT INTO longdescs (bug_id, who, bug_when, isprivate,
                                             thetext, work_time)
-                     VALUES (?, ?, ?, ?, ?, ?)');
-
-    foreach my $c (@sorted_descs) {
-        $sth_comment->execute($id, $c->{whoid} || $exporterid, $c->{bug_when},
-                              $c->{isprivate}, $c->{thetext}, 0);
-    }
-    $sth_comment->execute($id, $exporterid, $timestamp, 0, $comments, $worktime);
-    Bugzilla::Bug->new($id)->_sync_fulltext( new_bug => 1);
-
-    # Add this bug to each group of which its product is a member.
-    my $sth_group = $dbh->prepare("INSERT INTO bug_group_map (bug_id, group_id) 
-                         VALUES (?, ?)");
-    foreach my $group_id ( keys %{ $product->group_controls } ) {
-        if ($product->group_controls->{$group_id}->{'membercontrol'} != CONTROLMAPNA
-            && $product->group_controls->{$group_id}->{'othercontrol'} != CONTROLMAPNA){
-            $sth_group->execute( $id, $group_id );
-        }
+                     VALUES (?, ?, ?, ?, ?, ?)'
+  );
+
+  foreach my $c (@sorted_descs) {
+    $sth_comment->execute($id, $c->{whoid} || $exporterid,
+      $c->{bug_when}, $c->{isprivate}, $c->{thetext}, 0);
+  }
+  $sth_comment->execute($id, $exporterid, $timestamp, 0, $comments, $worktime);
+  Bugzilla::Bug->new($id)->_sync_fulltext(new_bug => 1);
+
+  # Add this bug to each group of which its product is a member.
+  my $sth_group = $dbh->prepare(
+    "INSERT INTO bug_group_map (bug_id, group_id) 
+                         VALUES (?, ?)"
+  );
+  foreach my $group_id (keys %{$product->group_controls}) {
+    if ( $product->group_controls->{$group_id}->{'membercontrol'} != CONTROLMAPNA
+      && $product->group_controls->{$group_id}->{'othercontrol'} != CONTROLMAPNA)
+    {
+      $sth_group->execute($id, $group_id);
     }
-
-    $log .= "Bug ${url}$bug_fields{'bug_id'} ";
-    $log .= "imported as bug $id.\n";
-    $log .= $params->{"urlbase"} . "show_bug.cgi?id=$id\n\n";
-    if ($err) {
-        $log .= "The following problems were encountered while creating bug $id.\n";
-        $log .= $err;
-        $log .= "You may have to set certain fields in the new bug by hand.\n\n";
-    }
-    Debug( $log, OK_LEVEL );
-    push(@logs, $log);
-    Bugzilla::BugMail::Send( $id, { 'changer' => $exporter } ) if ($mail);
-
-    # done with the xml data. Lets clear it from memory
-    $twig->purge;
+  }
+
+  $log .= "Bug ${url}$bug_fields{'bug_id'} ";
+  $log .= "imported as bug $id.\n";
+  $log .= $params->{"urlbase"} . "show_bug.cgi?id=$id\n\n";
+  if ($err) {
+    $log .= "The following problems were encountered while creating bug $id.\n";
+    $log .= $err;
+    $log .= "You may have to set certain fields in the new bug by hand.\n\n";
+  }
+  Debug($log, OK_LEVEL);
+  push(@logs, $log);
+  Bugzilla::BugMail::Send($id, {'changer' => $exporter}) if ($mail);
+
+  # done with the xml data. Lets clear it from memory
+  $twig->purge;
 
 }
 
-Debug( "Reading xml", DEBUG_LEVEL );
+Debug("Reading xml", DEBUG_LEVEL);
 
 # Read STDIN in slurp mode. VERY dangerous, but we live on the wild side ;-)
 local ($/);
@@ -1251,30 +1285,31 @@ sub process_bug {
 
 # If there's anything except whitespace before <?xml then we guess it's a mail
 # and MIME::Parser should parse it. Else don't.
-if ($xml =~ m/\S.*<\?xml/s ) {
+if ($xml =~ m/\S.*<\?xml/s) {
 
-    # If the email was encoded (Mailer::MessageToMTA() does it when using UTF-8),
-    # we have to decode it first, else the XML parsing will fail.
-    my $parser = MIME::Parser->new;
-    $parser->output_to_core(1);
-    $parser->tmp_to_core(1);
-    my $entity = $parser->parse_data($xml);
-    my $bodyhandle = $entity->bodyhandle;
-    $xml = $bodyhandle->as_string;
+  # If the email was encoded (Mailer::MessageToMTA() does it when using UTF-8),
+  # we have to decode it first, else the XML parsing will fail.
+  my $parser = MIME::Parser->new;
+  $parser->output_to_core(1);
+  $parser->tmp_to_core(1);
+  my $entity     = $parser->parse_data($xml);
+  my $bodyhandle = $entity->bodyhandle;
+  $xml = $bodyhandle->as_string;
 
 }
 
 # remove everything in file before xml header
 $xml =~ s/^.+(<\?xml version.+)$/$1/s;
 
-Debug( "Parsing tree", DEBUG_LEVEL );
+Debug("Parsing tree", DEBUG_LEVEL);
 my $twig = XML::Twig->new(
-    twig_handlers => {
-        bug        => \&process_bug,
-        attachment => \&process_attachment
-    },
-    start_tag_handlers => { bugzilla => \&init }
+  twig_handlers => {bug => \&process_bug, attachment => \&process_attachment},
+  start_tag_handlers => {bugzilla => \&init}
 );
+
+# Prevent DoS using the billion laughs attack.
+$twig->{NoExpand} = 1;
+
 $twig->parse($xml);
 my $root       = $twig->root;
 my $maintainer = $root->{'att'}->{'maintainer'};
@@ -1283,11 +1318,11 @@ sub process_bug {
 
 # It is time to email the result of the import.
 my $log = join("\n\n", @logs);
-$log .=  "\n\nImported $bugtotal bug(s) from $urlbase,\n  sent by $exporter.\n";
-my $subject =  "$bugtotal Bug(s) successfully moved from $urlbase to " 
-   . $params->{"urlbase"};
+$log .= "\n\nImported $bugtotal bug(s) from $urlbase,\n  sent by $exporter.\n";
+my $subject = "$bugtotal Bug(s) successfully moved from $urlbase to "
+  . $params->{"urlbase"};
 my @to = ($exporter, $maintainer);
-MailMessage( $subject, $log, @to );
+MailMessage($subject, $log, @to);
 
 __END__
 
diff --git a/index.cgi b/index.cgi
index 15d34451d5..26f6923ad9 100755
--- a/index.cgi
+++ b/index.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -18,46 +18,52 @@ use Bugzilla::Error;
 use Bugzilla::Update;
 
 # Check whether or not the user is logged in
-my $user = Bugzilla->login(LOGIN_OPTIONAL);
-my $cgi = Bugzilla->cgi;
+my $user     = Bugzilla->login(LOGIN_OPTIONAL);
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # And log out the user if requested. We do this first so that nothing
 # else accidentally relies on the current login.
 if ($cgi->param('logout')) {
-    Bugzilla->logout();
-    $user = Bugzilla->user;
-    $vars->{'message'} = "logged_out";
-    # Make sure that templates or other code doesn't get confused about this.
-    $cgi->delete('logout');
+  Bugzilla->logout();
+  $user = Bugzilla->user;
+  $vars->{'message'} = "logged_out";
+
+  # Make sure that templates or other code doesn't get confused about this.
+  $cgi->delete('logout');
 }
 
 # Return the appropriate HTTP response headers.
 print $cgi->header();
 
 if ($user->in_group('admin')) {
-    # If 'urlbase' is not set, display the Welcome page.
-    unless (Bugzilla->params->{'urlbase'}) {
-        $template->process('welcome-admin.html.tmpl')
-          || ThrowTemplateError($template->error());
-        exit;
-    }
-    # Inform the administrator about new releases, if any.
-    $vars->{'release'} = Bugzilla::Update::get_notifications();
+
+  # If 'urlbase' is not set, display the Welcome page.
+  unless (Bugzilla->params->{'urlbase'}) {
+    $template->process('welcome-admin.html.tmpl')
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+
+  # Inform the administrator about new releases, if any.
+  $vars->{'release'} = Bugzilla::Update::get_notifications();
 }
 
 if ($user->id) {
-    my $dbh = Bugzilla->dbh;
-    $vars->{assignee_count} =
-      $dbh->selectrow_array("SELECT COUNT(*) FROM bugs WHERE assigned_to = ?
-                             AND resolution = ''", undef, $user->id);
-    $vars->{reporter_count} =
-      $dbh->selectrow_array("SELECT COUNT(*) FROM bugs WHERE reporter = ?
-                             AND resolution = ''", undef, $user->id);
-    $vars->{requestee_count} =
-      $dbh->selectrow_array('SELECT COUNT(DISTINCT bug_id) FROM flags
-                             WHERE requestee_id = ?', undef, $user->id);
+  my $dbh = Bugzilla->dbh;
+  $vars->{assignee_count} = $dbh->selectrow_array(
+    "SELECT COUNT(*) FROM bugs WHERE assigned_to = ?
+                             AND resolution = ''", undef, $user->id
+  );
+  $vars->{reporter_count} = $dbh->selectrow_array(
+    "SELECT COUNT(*) FROM bugs WHERE reporter = ?
+                             AND resolution = ''", undef, $user->id
+  );
+  $vars->{requestee_count} = $dbh->selectrow_array(
+    'SELECT COUNT(DISTINCT bug_id) FROM flags
+                             WHERE requestee_id = ?', undef, $user->id
+  );
 }
 
 # Generate and return the UI (HTML page) from the appropriate template.
diff --git a/install-module.pl b/install-module.pl
deleted file mode 100755
index 365f10bbfa..0000000000
--- a/install-module.pl
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/usr/bin/perl
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-use 5.10.1;
-use strict;
-use warnings;
-
-# Have to abs_path('.') or calls to Bugzilla modules won't work once
-# CPAN has chdir'ed around. We do all of this in this funny order to
-# make sure that we use the lib/ modules instead of the base Perl modules,
-# in case the lib/ modules are newer.
-use Cwd qw(abs_path cwd);
-use lib abs_path('.');
-use Bugzilla::Constants;
-use lib abs_path(bz_locations()->{ext_libpath});
-
-use Bugzilla::Install::CPAN;
-
-use Bugzilla::Constants;
-use Bugzilla::Install::Requirements;
-use Bugzilla::Install::Util qw(bin_loc init_console);
-
-use Data::Dumper;
-use Getopt::Long;
-use Pod::Usage;
-
-init_console();
-
-my @original_args = @ARGV;
-my $original_dir = cwd();
-our %switch;
-GetOptions(\%switch, 'all|a', 'upgrade-all|u', 'show-config|s', 'global|g',
-                     'shell', 'help|h');
-
-pod2usage({ -verbose => 1 }) if $switch{'help'};
-
-if (ON_ACTIVESTATE) {
-    print <<END;
-You cannot run this script when using ActiveState Perl. Please follow
-the instructions given by checksetup.pl to install missing Perl modules.
-
-END
-    exit;
-}
-
-pod2usage({ -verbose => 0 }) if (!%switch && !@ARGV);
-
-set_cpan_config($switch{'global'});
-
-if ($switch{'show-config'}) {
-    print Dumper($CPAN::Config);
-    exit;
-}
-
-check_cpan_requirements($original_dir, \@original_args);
-
-if ($switch{'shell'}) {
-    CPAN::shell();
-    exit;
-}
-
-if ($switch{'all'} || $switch{'upgrade-all'}) {
-    my @modules;
-    if ($switch{'upgrade-all'}) {
-        @modules = (@{REQUIRED_MODULES()}, @{OPTIONAL_MODULES()});
-        push(@modules, DB_MODULE->{$_}->{dbd}) foreach (keys %{DB_MODULE()});
-    }
-    else {
-        # This is the only time we need a Bugzilla-related module, so
-        # we require them down here. Otherwise this script can be run from
-        # any directory, even outside of Bugzilla itself.
-        my $reqs = check_requirements(0);
-        @modules = (@{$reqs->{missing}}, @{$reqs->{optional}});
-        my $dbs = DB_MODULE;
-        foreach my $db (keys %$dbs) {
-            push(@modules, $dbs->{$db}->{dbd})
-                if !have_vers($dbs->{$db}->{dbd}, 0);
-        }
-    }
-    foreach my $module (@modules) {
-        my $cpan_name = $module->{module};
-        # --all shouldn't include mod_perl2, because it can have some complex
-        # configuration, and really should be installed on its own.
-        next if $cpan_name eq 'mod_perl2';
-        next if $cpan_name eq 'DBD::Oracle' and !$ENV{ORACLE_HOME};
-        next if $cpan_name eq 'DBD::Pg' and !bin_loc('pg_config');
-        install_module($cpan_name);
-    }
-}
-
-foreach my $module (@ARGV) {
-    install_module($module);
-}
-
-__END__
-
-=head1 NAME
-
-install-module.pl - Installs or upgrades modules from CPAN.
-This script does not run on Windows.
-
-=head1 SYNOPSIS
-
-  ./install-module.pl Module::Name [--global]
-  ./install-module.pl --all [--global]
-  ./install-module.pl --upgrade-all [--global]
-  ./install-module.pl --show-config
-  ./install-module.pl --shell
-
-  Do "./install-module.pl --help" for more information.
-
-=head1 OPTIONS
-
-=over
-
-=item B<Module::Name>
-
-The name of a module that you want to install from CPAN. This is the
-same thing that you'd give to the C<install> command in the CPAN shell.
-
-You can specify multiple module names separated by a space to install
-multiple modules.
-
-=item B<--global>
-
-This makes install-module install modules globally for all applications,
-instead of just for Bugzilla.
-
-On most systems, you have to be root for C<--global> to work.
-
-=item B<--all>
-
-This will make install-module do its best to install every required
-and optional module that is not installed that Bugzilla can use.
-
-Some modules may fail to install. You can run checksetup.pl to see
-which installed properly.
-
-=item B<--upgrade-all>
-
-This is like C<--all>, except it forcibly installs the very latest
-version of every Bugzilla prerequisite, whether or not you already
-have them installed.
-
-=item B<--show-config>
-
-Prints out the CPAN configuration in raw Perl format. Useful for debugging.
-
-=item B<--shell>
-
-Starts a CPAN shell using the configuration of F<install-module.pl>.
-
-=item B<--help>
-
-Shows this help.
-
-=back
diff --git a/jobqueue.pl b/jobqueue.pl
index f6722467c0..75fdf1f043 100755
--- a/jobqueue.pl
+++ b/jobqueue.pl
@@ -6,19 +6,20 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Cwd qw(abs_path);
 use File::Basename;
+
 BEGIN {
-    # Untaint the abs_path.
-    my ($a) = abs_path($0) =~ /^(.*)$/;
-    chdir dirname($a);
+  # Untaint the abs_path.
+  my ($a) = abs_path($0) =~ /^(.*)$/;
+  chdir dirname($a);
 }
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 use Bugzilla;
 use Bugzilla::JobQueue::Runner;
 
@@ -33,13 +34,14 @@ =head1 SYNOPSIS
  ./jobqueue.pl [OPTIONS] COMMAND
 
    OPTIONS:
-   -f        Run in the foreground (don't detach)
-   -d        Output a lot of debugging information
-   -p file   Specify the file where jobqueue.pl should store its current
-             process id. Defaults to F<data/jobqueue.pl.pid>.
-   -n name   What should this process call itself in the system log?
-             Defaults to the full path you used to invoke the script.
-
+   -f            Run in the foreground (don't detach)
+   -d            Output a lot of debugging information
+   -p file       Specify the file where jobqueue.pl should store its current
+                 process id. Defaults to F<data/jobqueue.pl.pid>.
+   -n name       What should this process call itself in the system log?
+                 Defaults to the full path you used to invoke the script.
+   -j job-name   The name of jobs to process. Can be specified multiple times.
+                 If not specified, all job types will be processed.
    COMMANDS:
    start     Starts a new jobqueue daemon if there isn't one running already
    stop      Stops a running jobqueue daemon
diff --git a/js/bug.js b/js/bug.js
index f0bf68a302..af8255c902 100644
--- a/js/bug.js
+++ b/js/bug.js
@@ -203,14 +203,14 @@ function set_assign_to(use_qa_contact) {
                 params: {
                     Bugzilla_api_token: BUGZILLA.api_token,
                     ids: bug_id
-                },
+                }
             });
             var callbacks = {
                 failure: function(res) {
                     if (console)
                         console.log("failed to update last visited: "
                             + res.responseText);
-                },
+                }
             };
 
             YAHOO.util.Connect.setDefaultPostHeader('application/json', true);
@@ -224,7 +224,7 @@ function set_assign_to(use_qa_contact) {
                 method: 'BugUserLastVisit.get',
                 params: {
                     Bugzilla_api_token: BUGZILLA.api_token
-                },
+                }
             });
             var callbacks = {
                 success: function(res) { done(JSON.parse(res.responseText)) },
@@ -232,12 +232,12 @@ function set_assign_to(use_qa_contact) {
                     if (console)
                         console.log("failed to get last visited: "
                                 + res.responseText);
-                },
+                }
             };
 
             YAHOO.util.Connect.setDefaultPostHeader('application/json', true);
             YAHOO.util.Connect.asyncRequest('POST', 'jsonrpc.cgi', callbacks,
                     args)
-        },
+        }
     };
 })();
diff --git a/js/comment-tagging.js b/js/comment-tagging.js
index b6f02f00ef..f3ec33788a 100644
--- a/js/comment-tagging.js
+++ b/js/comment-tagging.js
@@ -34,40 +34,27 @@ YAHOO.bugzilla.commentTagging = {
         });
         if (!can_edit) return;
 
-        var ds = new YAHOO.util.XHRDataSource("jsonrpc.cgi");
-        ds.connTimeout = 30000;
-        ds.connMethodPost = true;
-        ds.connXhrMode = "cancelStaleRequests";
-        ds.maxCacheEntries = 5;
-        ds.responseSchema = {
-            metaFields : { error: "error", jsonRpcId: "id"},
-            resultsList : "result"
-        };
-
-        var ac = new YAHOO.widget.AutoComplete('bz_ctag_add', 'bz_ctag_autocomp', ds);
-        ac.maxResultsDisplayed = 7;
-        ac.generateRequest = function(query) {
-            query = YAHOO.lang.trim(query);
-            YAHOO.bugzilla.commentTagging.last_query = query;
-            YAHOO.bugzilla.commentTagging.counter = YAHOO.bugzilla.commentTagging.counter + 1;
-            YAHOO.util.Connect.setDefaultPostHeader('application/json', true);
-            return YAHOO.lang.JSON.stringify({
-                version: "1.1",
-                method : "Bug.search_comment_tags",
-                id : YAHOO.bugzilla.commentTagging.counter,
-                params : {
-                    Bugzilla_api_token: BUGZILLA.api_token,
-                    query : query,
-                    limit : 10
-                }
-            });
-        };
-        ac.minQueryLength = this.min_len;
-        ac.autoHighlight = false;
-        ac.typeAhead = true;
-        ac.queryDelay = 0.5;
-        ac.dataReturnEvent.subscribe(function(type, args) {
-            args[0].autoHighlight = args[2].length == 1;
+        $('#bz_ctag_add').devbridgeAutocomplete({
+            serviceUrl: function(query) {
+                return 'rest/bug/comment/tags/' + encodeURIComponent(query);
+            },
+            params: {
+                Bugzilla_api_token: BUGZILLA.api_token
+            },
+            deferRequestBy: 250,
+            minChars: 1,
+            tabDisabled: true,
+            transformResult: function(response) {
+                response = $.parseJSON(response);
+                return {
+                    suggestions: $.map(response, function(dataItem) {
+                        return {
+                            value: dataItem,
+                            data : null
+                        };
+                    })
+                };
+            }
         });
     },
 
@@ -233,8 +220,10 @@ YAHOO.bugzilla.commentTagging = {
 
     buildTagHtml : function(comment_id, comment_no, tag) {
         var el = document.createElement('span');
+        var c_el =Dom.get('c' + comment_no);
         Dom.setAttribute(el, 'id', 'ct_' + comment_no + '_' + tag);
         Dom.addClass(el, 'bz_comment_tag');
+        Dom.addClass(c_el, 'bz_comment_tag_' + tag);
         if (this.can_edit) {
             var a = document.createElement('a');
             Dom.setAttribute(a, 'href', '#');
@@ -282,6 +271,8 @@ YAHOO.bugzilla.commentTagging = {
 
     remove : function(comment_id, comment_no, tag) {
         var el = Dom.get('ct_' + comment_no + '_' + tag);
+        var c_el =Dom.get('c' + comment_no);
+        Dom.removeClass(c_el, 'bz_comment_tag_' + tag);
         if (el) {
             el.parentNode.removeChild(el);
             this.rpcUpdate(comment_id, comment_no, undefined, [ tag ]);
diff --git a/js/comments.js b/js/comments.js
index 43e6fe96ec..30baf53f4b 100644
--- a/js/comments.js
+++ b/js/comments.js
@@ -6,6 +6,69 @@
  * defined by the Mozilla Public License, v. 2.0.
  */
 
+/* Adds the reply text to the 'comment' textarea */
+function replyToComment(id, real_id, replyto_header, text) {
+    var replytext = "";
+    if (replyCommentConfig.quote_replies == 'quoted_reply') {
+        /* pre id="comment_name_N" */
+        if (text == null) {
+            var text_elem = document.getElementById('comment_text_'+id);
+            text = getText(text_elem);
+        }
+        replytext = replyto_header + "\n" + wrapReplyText(text);
+    } else if (replyCommentConfig.quote_replies == 'simple_reply') {
+        replytext = replyto_header + "\n";
+    }
+
+    if (replyCommentConfig.is_insider) {
+        if (document.getElementById('isprivate_' + real_id).checked) {
+            document.getElementById('newcommentprivacy').checked = 'checked';
+            updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment');
+        }
+    }
+
+    /* <textarea id="comment"> */
+    var textarea = document.getElementById('comment');
+    if (textarea.value != replytext) {
+        textarea.value += replytext;
+    }
+
+    textarea.focus();
+}
+
+function replyToMarkdownComment(id, real_id, replyto_header) {
+    var textarea = document.getElementById('comment');
+    var comment = textarea.value;
+    textarea.value += replyCommentConfig.markdown_fetching_comment;
+    YAHOO.util.Connect.setDefaultPostHeader('application/json', true);
+    YAHOO.util.Connect.asyncRequest('POST', 'jsonrpc.cgi',
+        {
+            success: function(res) {
+                var data = YAHOO.lang.JSON.parse(res.responseText);
+                if (!data.error) {
+                    textarea.value = comment;
+                    var text = data.result.comments[real_id].text;
+                    replyToComment(id, real_id, replyto_header, text);
+                } else {
+                    replyToComment(id, real_id, replyto_header);
+                }
+            },
+            failure: function(res) {
+                /* On failure, quote the comment as plain-text */
+                replyToComment(id, real_id, replyto_header);
+            }
+        },
+        YAHOO.lang.JSON.stringify({
+            version: "1.1",
+            method: "Bug.comments",
+            params: {
+                Bugzilla_api_token: BUGZILLA.api_token,
+                comment_ids: [real_id],
+            }
+        })
+    );
+}
+
 function updateCommentPrivacy(checkbox, id) {
     var comment_elem = document.getElementById('comment_text_'+id).parentNode;
     if (checkbox.checked) {
diff --git a/js/custom-search.js b/js/custom-search.js
index 61284c50d1..3cbd246ec5 100644
--- a/js/custom-search.js
+++ b/js/custom-search.js
@@ -41,7 +41,7 @@ function custom_search_new_row() {
     _remove_any_all(clone);
 
     // Always make sure there's only one row with this id.
-    row.id = null;
+    row.removeAttribute('id');
     row.parentNode.appendChild(clone);
     cs_reconfigure(row);
     fix_query_string(row);
diff --git a/js/field.js b/js/field.js
index 1cd58a69ac..5ec7574bc1 100644
--- a/js/field.js
+++ b/js/field.js
@@ -11,7 +11,7 @@
 
 var bz_no_validate_enter_bug = false;
 function validateEnterBug(theform) {
-    // This is for the "bookmarkable templates" button.
+    // This is for the "Make Template" button.
     if (bz_no_validate_enter_bug) {
         // Set it back to false for people who hit the "back" button
         bz_no_validate_enter_bug = false;
@@ -42,7 +42,7 @@ function validateEnterBug(theform) {
 
     // These are checked in the reverse order that they appear on the page,
     // so that the one closest to the top of the form will be focused.
-    if (attach_data.value && YAHOO.lang.trim(attach_desc.value) == '') {
+    if (attach_data && attach_data.value && YAHOO.lang.trim(attach_desc.value) == '') {
         _errorFor(attach_desc, 'attach_desc');
         focus_me = attach_desc;
     }
@@ -87,129 +87,6 @@ function _errorFor(field, name) {
     YAHOO.util.Dom.addClass(field, 'validation_error_field');
 }
 
-/* This function is never to be called directly, but only indirectly
- * using template/en/default/global/calendar.js.tmpl, so that localization
- * works. For the same reason, if you modify this function's parameter list,
- * you need to modify the documentation in said template as well. */
-function createCalendar(name, start_weekday, months_long, weekdays_short) {
-    var cal = new YAHOO.widget.Calendar('calendar_' + name, 
-                                        'con_calendar_' + name,
-                                        { START_WEEKDAY:  start_weekday,
-                                          MONTHS_LONG:    months_long,
-                                          WEEKDAYS_SHORT: weekdays_short
-                                        });
-    YAHOO.bugzilla['calendar_' + name] = cal;
-    var field = document.getElementById(name);
-    cal.selectEvent.subscribe(setFieldFromCalendar, field, false);
-    updateCalendarFromField(field);
-    cal.render();
-}
-
-/* The onclick handlers for the button that shows the calendar. */
-function showCalendar(field_name) {
-    var calendar  = YAHOO.bugzilla["calendar_" + field_name];
-    var field     = document.getElementById(field_name);
-    var button    = document.getElementById('button_calendar_' + field_name);
-
-    bz_overlayBelow(calendar.oDomContainer, field);
-    calendar.show();
-    button.onclick = function() { hideCalendar(field_name); };
-
-    // Because of the way removeListener works, this has to be a function
-    // attached directly to this calendar.
-    calendar.bz_myBodyCloser = function(event) {
-        var container = this.oDomContainer;
-        var target    = YAHOO.util.Event.getTarget(event);
-        if (target != container && target != button
-            && !YAHOO.util.Dom.isAncestor(container, target))
-        {
-            hideCalendar(field_name);
-        }
-    };
-
-    // If somebody clicks outside the calendar, hide it.
-    YAHOO.util.Event.addListener(document.body, 'click', 
-                                 calendar.bz_myBodyCloser, calendar, true);
-
-    // Make Esc close the calendar.
-    calendar.bz_escCal = function (event) {
-        var key = YAHOO.util.Event.getCharCode(event);
-        if (key == 27) {
-            hideCalendar(field_name);
-        }
-    };
-    YAHOO.util.Event.addListener(document.body, 'keydown', calendar.bz_escCal);
-}
-
-function hideCalendar(field_name) {
-    var cal = YAHOO.bugzilla["calendar_" + field_name];
-    cal.hide();
-    var button = document.getElementById('button_calendar_' + field_name);
-    button.onclick = function() { showCalendar(field_name); };
-    YAHOO.util.Event.removeListener(document.body, 'click',
-                                    cal.bz_myBodyCloser);
-    YAHOO.util.Event.removeListener(document.body, 'keydown', cal.bz_escCal);
-}
-
-/* This is the selectEvent for our Calendar objects on our custom 
- * DateTime fields.
- */
-function setFieldFromCalendar(type, args, date_field) {
-    var dates = args[0];
-    var setDate = dates[0];
-
-    // We can't just write the date straight into the field, because there 
-    // might already be a time there.
-    var timeRe = /\b(\d{1,2}):(\d\d)(?::(\d\d))?/;
-    var currentTime = timeRe.exec(date_field.value);
-    var d = new Date(setDate[0], setDate[1] - 1, setDate[2]);
-    if (currentTime) {
-        d.setHours(currentTime[1], currentTime[2]);
-        if (currentTime[3]) {
-            d.setSeconds(currentTime[3]);
-        }
-    }
-
-    var year = d.getFullYear();
-    // JavaScript's "Date" represents January as 0 and December as 11.
-    var month = d.getMonth() + 1;
-    if (month < 10) month = '0' + String(month);
-    var day = d.getDate();
-    if (day < 10) day = '0' + String(day);
-    var dateStr = year + '-' + month  + '-' + day;
-
-    if (currentTime) {
-        var minutes = d.getMinutes();
-        if (minutes < 10) minutes = '0' + String(minutes);
-        var seconds = d.getSeconds();
-        if (seconds > 0 && seconds < 10) {
-            seconds = '0' + String(seconds);
-        }
-
-        dateStr = dateStr + ' ' + d.getHours() + ':' + minutes;
-        if (seconds) dateStr = dateStr + ':' + seconds;
-    }
-
-    date_field.value = dateStr;
-    hideCalendar(date_field.id);
-}
-
-/* Sets the calendar based on the current field value. 
- */ 
-function updateCalendarFromField(date_field) {
-    var dateRe = /(\d\d\d\d)-(\d\d?)-(\d\d?)/;
-    var pieces = dateRe.exec(date_field.value);
-    if (pieces) {
-        var cal = YAHOO.bugzilla["calendar_" + date_field.id];
-        cal.select(new Date(pieces[1], pieces[2] - 1, pieces[3]));
-        var selectedArray = cal.getSelectedDates();
-        var selected = selectedArray[0];
-        cal.cfg.setProperty("pagedate", (selected.getMonth() + 1) + '/' 
-                                        + selected.getFullYear());
-        cal.render();
-    }
-}
-
 function setupEditLink(id) {
     var link_container = 'container_showhide_' + id;
     var input_container = 'container_' + id;
@@ -506,7 +383,8 @@ function handleVisControllerValueChange(e, args) {
     var controller = args[1];
     var values = args[2];
 
-    var label_container = 
+    var field = document.getElementById(controlled_id);
+    var label_container =
         document.getElementById('field_label_' + controlled_id);
     var field_container =
         document.getElementById('field_container_' + controlled_id);
@@ -521,10 +399,45 @@ function handleVisControllerValueChange(e, args) {
     if (selected) {
         YAHOO.util.Dom.removeClass(label_container, 'bz_hidden_field');
         YAHOO.util.Dom.removeClass(field_container, 'bz_hidden_field');
+        /* If a custom field such as a textarea field contains some text, then
+         * its content is visible by default as a readonly field (assuming that
+         * the field is displayed). But if such a custom field contains no text,
+         * then it's not displayed at all and an (edit) link is displayed instead.
+         * This is problematic if the custom field is mandatory, because at least
+         * Firefox complains that you must enter a value, but is unable to point
+         * to the custom field because this one is hidden, and so the user has
+         * to guess what the web browser is talking about, which is confusing.
+         * So in that case, we display the custom field automatically instead of
+         * the (edit) link, so that the user can enter some text in it.
+         */
+        var field_readonly = document.getElementById(controlled_id + '_readonly');
+
+        if (!field_readonly) {
+            var field_input = document.getElementById(controlled_id + '_input');
+            var edit_container =
+                document.getElementById(controlled_id + '_edit_container');
+
+            if (field_input) {
+                YAHOO.util.Dom.removeClass(field_input, 'bz_default_hidden');
+            }
+            if (edit_container) {
+                YAHOO.util.Dom.addClass(edit_container, 'bz_hidden_field');
+            }
+        }
+        // Restore the 'required' attribute for mandatory fields.
+        if (field.getAttribute('data-required') == "true") {
+            field.setAttribute('required', 'true');
+            field.setAttribute('aria-required', 'true');
+        }
     }
     else {
         YAHOO.util.Dom.addClass(label_container, 'bz_hidden_field');
         YAHOO.util.Dom.addClass(field_container, 'bz_hidden_field');
+        // A hidden field must never be required, because the user cannot set it.
+        if (field.getAttribute('data-required') == "true") {
+            field.removeAttribute('required');
+            field.removeAttribute('aria-required');
+        }
     }
 }
 
@@ -805,117 +718,101 @@ function browserCanHideOptions(aSelect) {
 /* (end) option hiding code */
 
 /**
- * The Autoselect
+ * Autocompletion
  */
-YAHOO.bugzilla.userAutocomplete = {
-    counter : 0,
-    dataSource : null,
-    generateRequest : function ( enteredText ){ 
-      YAHOO.bugzilla.userAutocomplete.counter = 
-                                   YAHOO.bugzilla.userAutocomplete.counter + 1;
-      YAHOO.util.Connect.setDefaultPostHeader('application/json', true);
-      var json_object = {
-          method : "User.get",
-          id : YAHOO.bugzilla.userAutocomplete.counter,
-          params : [ { 
+
+$(function() {
+
+    // single user
+
+    function searchComplete() {
+        var that = $(this);
+        that.data('counter', that.data('counter') - 1);
+        if (that.data('counter') === 0)
+            that.removeClass('autocomplete-running');
+        if (document.activeElement != this)
+            that.autocomplete('hide');
+    };
+
+    var options_user = {
+        serviceUrl: 'rest/user',
+        params: {
             Bugzilla_api_token: BUGZILLA.api_token,
-            match : [ decodeURIComponent(enteredText) ],
-            include_fields : [ "name", "real_name" ]
-          } ]
-      };
-      var stringified =  YAHOO.lang.JSON.stringify(json_object);
-      var debug = { msg: "json-rpc obj debug info", "json obj": json_object, 
-                    "param" : stringified}
-      YAHOO.bugzilla.userAutocomplete.debug_helper( debug );
-      return stringified;
-    },
-    resultListFormat : function(oResultData, enteredText, sResultMatch) {
-        return ( YAHOO.lang.escapeHTML(oResultData.real_name) + " ("
-                 + YAHOO.lang.escapeHTML(oResultData.name) + ")");
-    },
-    debug_helper : function ( ){
-        /* used to help debug any errors that might happen */
-        if( typeof(console) !== 'undefined' && console != null && arguments.length > 0 ){
-            console.log("debug helper info:", arguments);
-        }
-        return true;
-    },    
-    init_ds : function(){
-        this.dataSource = new YAHOO.util.XHRDataSource("jsonrpc.cgi");
-        this.dataSource.connTimeout = 30000;
-        this.dataSource.connMethodPost = true;
-        this.dataSource.connXhrMode = "cancelStaleRequests";
-        this.dataSource.maxCacheEntries = 5;
-        this.dataSource.responseSchema = {
-            resultsList : "result.users",
-            metaFields : { error: "error", jsonRpcId: "id"},
-            fields : [
-                { key : "name" },
-                { key : "real_name"}
-            ]
-        };
-    },
-    init : function( field, container, multiple ) {
-        if( this.dataSource == null ){
-            this.init_ds();  
-        }            
-        var userAutoComp = new YAHOO.widget.AutoComplete( field, container, 
-                                this.dataSource );
-        // other stuff we might want to do with the autocomplete goes here
-        userAutoComp.maxResultsDisplayed = BUGZILLA.param.maxusermatches;
-        userAutoComp.generateRequest = this.generateRequest;
-        userAutoComp.formatResult = this.resultListFormat;
-        userAutoComp.doBeforeLoadData = this.debug_helper;
-        userAutoComp.minQueryLength = 3;
-        userAutoComp.autoHighlight = false;
-        // this is a throttle to determine the delay of the query from typing
-        // set this higher to cause fewer calls to the server
-        userAutoComp.queryDelay = 0.05;
-        userAutoComp.useIFrame = true;
-        userAutoComp.resultTypeList = false;
-        if( multiple == true ){
-            userAutoComp.delimChar = [","];
-        }
-        
-    }
-};
+            include_fields: 'name,real_name',
+            limit: 100
+        },
+        paramName: 'match',
+        deferRequestBy: 250,
+        minChars: 3,
+        tabDisabled: true,
+        transformResult: function(response) {
+            response = $.parseJSON(response);
+            return {
+                suggestions: $.map(response.users, function(dataItem) {
+                    return {
+                        value: dataItem.name,
+                        data : { login: dataItem.name, name: dataItem.real_name }
+                    };
+                })
+            };
+        },
+        formatResult: function(suggestion, currentValue) {
+            return (suggestion.data.name === '' ?
+                suggestion.data.login : suggestion.data.name + ' (' + suggestion.data.login + ')')
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;')
+                .replace(/"/g, '&quot;');
+        },
+        onSearchStart: function(params) {
+            var that = $(this);
+            params.match = $.trim(params.match);
+            that.addClass('autocomplete-running');
+            that.data('counter', that.data('counter') + 1);
+        },
+        onSearchComplete: searchComplete,
+        onSearchError: searchComplete
+    };
 
-YAHOO.bugzilla.fieldAutocomplete = {
-    dataSource : [],
-    init_ds : function( field ) {
-        this.dataSource[field] =
-          new YAHOO.util.LocalDataSource( YAHOO.bugzilla.field_array[field] );
-    },
-    init : function( field, container ) {
-        if( this.dataSource[field] == null ) {
-            this.init_ds( field );
-        }
-        var fieldAutoComp =
-          new YAHOO.widget.AutoComplete(field, container, this.dataSource[field]);
-        fieldAutoComp.maxResultsDisplayed = YAHOO.bugzilla.field_array[field].length;
-        fieldAutoComp.formatResult = fieldAutoComp.formatEscapedResult;
-        fieldAutoComp.minQueryLength = 0;
-        fieldAutoComp.useIFrame = true;
-        fieldAutoComp.delimChar = [","," "];
-        fieldAutoComp.resultTypeList = false;
-        fieldAutoComp.queryDelay = 0;
-        /*  Causes all the possibilities in the field to appear when a user
-         *  focuses on the textbox 
-         */
-        fieldAutoComp.textboxFocusEvent.subscribe( function(){
-            var sInputValue = YAHOO.util.Dom.get(field).value;
-            if( sInputValue.length === 0
-                && YAHOO.bugzilla.field_array[field].length > 0 ){
-                this.sendQuery(sInputValue);
-                this.collapseContainer();
-                this.expandContainer();
+    // multiple users (based on single user)
+    var options_users = {
+        delimiter: /,\s*/,
+        onSelect: function() {
+            this.focus();
+        },
+    };
+    $.extend(options_users, options_user);
+
+    // init user autocomplete fields
+    $('.bz_autocomplete_user')
+        .each(function() {
+            var that = $(this);
+            that.data('counter', 0);
+            if (that.data('multiple')) {
+                that.devbridgeAutocomplete(options_users);
             }
+            else {
+                that.devbridgeAutocomplete(options_user);
+            }
+            that.addClass('bz_autocomplete');
         });
-        fieldAutoComp.dataRequestEvent.subscribe( function(type, args) {
-            args[0].autoHighlight = args[1] != '';
+
+    // init autocomplete fields with array of values
+    $('.bz_autocomplete_values')
+        .each(function() {
+            var that = $(this);
+            that.devbridgeAutocomplete({
+                lookup: BUGZILLA.autocomplete_values[that.data('values')],
+                tabDisabled: true,
+                delimiter: /,\s*/,
+                minChars: 0,
+                onSelect: function() {
+                    this.focus();
+                }
+            });
+            that.addClass('bz_autocomplete');
         });
-    }
-};
+});
 
 /**
  * Set the disable email checkbox to true if the user has disabled text
@@ -984,18 +881,32 @@ function initDirtyFieldTracking() {
 
 var last_comment_text = '';
 var last_markdown_cb_value = null;
+var comment_textarea_width = null;
+var comment_textarea_height = null;
+
+function refresh_markdown_preview (bug_id) {
+    if (!YAHOO.util.Dom.hasClass('comment_preview_tab', 'active_comment_tab'))
+        return;
+    show_comment_preview(bug_id, 1);
+}
 
-function show_comment_preview(bug_id) {
+function show_comment_preview(bug_id, refresh) {
     var Dom = YAHOO.util.Dom;
     var comment = document.getElementById('comment');
     var preview = document.getElementById('comment_preview');
     var markdown_cb = document.getElementById('use_markdown');
 
     if (!comment || !preview) return;
-    if (Dom.hasClass('comment_preview_tab', 'active_comment_tab')) return;
+    if (Dom.hasClass('comment_preview_tab', 'active_comment_tab') && !refresh)
+        return;
 
-    preview.style.width = (comment.clientWidth - 4) + 'px';
-    preview.style.height = comment.offsetHeight + 'px';
+    if (!comment_textarea_width) {
+        comment_textarea_width = (comment.clientWidth - 4) + 'px';
+        comment_textarea_height = comment.offsetHeight + 'px';
+    }
+
+    preview.style.width = comment_textarea_width;
+    preview.style.height = comment_textarea_height;
 
     var comment_tab = document.getElementById('comment_tab');
     Dom.addClass(comment, 'bz_default_hidden');
@@ -1029,9 +940,23 @@ function show_comment_preview(bug_id) {
                 document.getElementById('comment_preview_text').innerHTML = data.result.html;
                 Dom.addClass('comment_preview_loading', 'bz_default_hidden');
                 Dom.removeClass('comment_preview_text', 'bz_default_hidden');
+                if (markdown_cb.checked) {
+                    Dom.removeClass('comment_preview_text', 'comment_preview_pre');
+                }
+                else {
+                    Dom.addClass('comment_preview_text', 'comment_preview_pre');
+                }
                 last_comment_text = comment.value;
                 last_markdown_cb_value = markdown_cb.checked;
             }
+            if (markdown_cb.checked) {
+                var pres = document.getElementById('comment_preview_text').getElementsByTagName("pre");
+                for (var i = 0, l = pres.length; i < l; i++) {
+                    if (pres[i].firstChild && pres[i].firstChild.tagName == "CODE") {
+                        hljs.highlightBlock(pres[i].firstChild);
+                    }
+                }
+            }
         },
         failure: function(res) {
             Dom.addClass('comment_preview_loading', 'bz_default_hidden');
diff --git a/js/global.js b/js/global.js
index ea1a11dd3b..dcffc35290 100644
--- a/js/global.js
+++ b/js/global.js
@@ -7,54 +7,35 @@
  */
 
 function show_mini_login_form( suffix ) {
-    var login_link = document.getElementById('login_link' + suffix);
-    var login_form = document.getElementById('mini_login' + suffix);
-    var account_container = document.getElementById('new_account_container'
-                                                    + suffix);
-
-    YAHOO.util.Dom.addClass(login_link, 'bz_default_hidden');
-    YAHOO.util.Dom.removeClass(login_form, 'bz_default_hidden');
-    YAHOO.util.Dom.addClass(account_container, 'bz_default_hidden');
+    $('#login_link' + suffix).addClass('bz_default_hidden');
+    $('#mini_login' + suffix).removeClass('bz_default_hidden');
+    $('#new_account_container' + suffix).addClass('bz_default_hidden');
     return false;
 }
 
 function hide_mini_login_form( suffix ) {
-    var login_link = document.getElementById('login_link' + suffix);
-    var login_form = document.getElementById('mini_login' + suffix);
-    var account_container = document.getElementById('new_account_container'
-                                                    + suffix);
-
-    YAHOO.util.Dom.removeClass(login_link, 'bz_default_hidden');
-    YAHOO.util.Dom.addClass(login_form, 'bz_default_hidden');
-    YAHOO.util.Dom.removeClass(account_container, 'bz_default_hidden');
+    $('#login_link' + suffix).removeClass('bz_default_hidden');
+    $('#mini_login' + suffix).addClass('bz_default_hidden');
+    $('#new_account_container' + suffix).removeClass('bz_default_hidden');
     return false;
 }
 
 function show_forgot_form( suffix ) {
-    var forgot_link = document.getElementById('forgot_link' + suffix);
-    var forgot_form = document.getElementById('forgot_form' + suffix);
-    var login_container = document.getElementById('mini_login_container' 
-                                                  + suffix);
-    YAHOO.util.Dom.addClass(forgot_link, 'bz_default_hidden');
-    YAHOO.util.Dom.removeClass(forgot_form, 'bz_default_hidden');
-    YAHOO.util.Dom.addClass(login_container, 'bz_default_hidden');
+    $('#forgot_link' + suffix).addClass('bz_default_hidden');
+    $('#forgot_form' + suffix).removeClass('bz_default_hidden');
+    $('#login_container' + suffix).addClass('bz_default_hidden');
     return false;
 }
 
 function hide_forgot_form( suffix ) {
-    var forgot_link = document.getElementById('forgot_link' + suffix);
-    var forgot_form = document.getElementById('forgot_form' + suffix);
-    var login_container = document.getElementById('mini_login_container'
-                                                  + suffix);
-    YAHOO.util.Dom.removeClass(forgot_link, 'bz_default_hidden');
-    YAHOO.util.Dom.addClass(forgot_form, 'bz_default_hidden');
-    YAHOO.util.Dom.removeClass(login_container, 'bz_default_hidden');
+    $('#forgot_link' + suffix).removeClass('bz_default_hidden');
+    $('#forgot_form' + suffix).addClass('bz_default_hidden');
+    $('#login_container' + suffix).removeClass('bz_default_hidden');
     return false;
 }
 
 function set_language( value ) {
-    YAHOO.util.Cookie.set('LANG', value,
-    {
+    $.cookie('LANG', value, {
         expires: new Date('January 1, 2038'),
         path: BUGZILLA.param.cookie_path
     });
@@ -70,3 +51,15 @@ function display_value(field, value) {
     if (translated) return translated;
     return value;
 }
+
+// jQuery auto-completion disables browser native autocompletion, however this
+// excludes it from being restored by bfcache. Trick the browser into restoring
+// it by changing the autocomplete attribute when a page is hidden and shown.
+$().ready(function() {
+  $(window).on('pagehide', function() {
+    $('.bz_autocomplete').attr('autocomplete', 'on');
+  });
+  $(window).on('pageshow', function() {
+    $('.bz_autocomplete').attr('autocomplete', 'off');
+  });
+});
diff --git a/js/highlight.js/highlight.pack.js b/js/highlight.js/highlight.pack.js
new file mode 100644
index 0000000000..55d65d70b6
--- /dev/null
+++ b/js/highlight.js/highlight.pack.js
@@ -0,0 +1,2 @@
+/*! highlight.js v9.4.0 | BSD3 License | git.io/hljslicense */
+!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/gm,"&amp;").replace(/</gm,"&lt;").replace(/>/gm,"&gt;")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0==t.index}function a(e){return/^(no-?highlight|plain|text)$/i.test(e)}function i(e){var n,t,r,i=e.className+" ";if(i+=e.parentNode?e.parentNode.className:"",t=/\blang(?:uage)?-([\w-]+)\b/i.exec(i))return w(t[1])?t[1]:"no-highlight";for(i=i.split(/\s+/),n=0,r=i.length;r>n;n++)if(w(i[n])||a(i[n]))return i[n]}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3==i.nodeType?a+=i.nodeValue.length:1==i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!=r[0].offset?e[0].offset<r[0].offset?e:r:"start"==r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value)+'"'}f+="<"+t(e)+Array.prototype.map.call(e.attributes,r).join("")+">"}function u(e){f+="</"+t(e)+">"}function c(e){("start"==e.event?o:u)(e.node)}for(var s=0,f="",l=[];e.length||r.length;){var g=i();if(f+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g==e){l.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g==e&&g.length&&g[0].offset==s);l.reverse().forEach(o)}else"start"==g[0].event?l.push(g[0].node):l.pop(),c(g.splice(0,1)[0])}return f+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):Object.keys(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),void 0===a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"==e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var f=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=f.length?t(f.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){for(var t=0;t<n.c.length;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":E.classPrefix,i='<span class="'+a,o=t?"":"</span>";return i+=e+'">',i+n+o}function h(){if(!k.k)return n(M);var e="",t=0;k.lR.lastIndex=0;for(var r=k.lR.exec(M);r;){e+=n(M.substr(t,r.index-t));var a=g(k,r);a?(B+=a[1],e+=p(a[0],n(r[0]))):e+=n(r[0]),t=k.lR.lastIndex,r=k.lR.exec(M)}return e+n(M.substr(t))}function d(){var e="string"==typeof k.sL;if(e&&!R[k.sL])return n(M);var t=e?f(k.sL,M,!0,y[k.sL]):l(M,k.sL.length?k.sL:void 0);return k.r>0&&(B+=t.r),e&&(y[k.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=void 0!==k.sL?d():h(),M=""}function v(e,n){L+=e.cN?p(e.cN,"",!0):"",k=Object.create(e,{parent:{value:k}})}function m(e,n){if(M+=e,void 0===n)return b(),0;var t=o(n,k);if(t)return t.skip?M+=n:(t.eB&&(M+=n),b(),t.rB||t.eB||(M=n)),v(t,n),t.rB?0:n.length;var r=u(k,n);if(r){var a=k;a.skip?M+=n:(a.rE||a.eE||(M+=n),b(),a.eE&&(M=n));do k.cN&&(L+="</span>"),k.skip||(B+=k.r),k=k.parent;while(k!=r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,k))throw new Error('Illegal lexeme "'+n+'" for mode "'+(k.cN||"<unnamed>")+'"');return M+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var x,k=i||N,y={},L="";for(x=k;x!=N;x=x.parent)x.cN&&(L=p(x.cN,"",!0)+L);var M="",B=0;try{for(var C,j,I=0;;){if(k.t.lastIndex=I,C=k.t.exec(t),!C)break;j=m(t.substr(I,C.index-I),C[0]),I=C.index+j}for(m(t.substr(I)),x=k;x.parent;x=x.parent)x.cN&&(L+="</span>");return{r:B,value:L,language:e,top:k}}catch(O){if(-1!=O.message.indexOf("Illegal"))return{r:0,value:n(t)};throw O}}function l(e,t){t=t||E.languages||Object.keys(R);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function g(e){return E.tabReplace&&(e=e.replace(/^((<[^>]+>|\t)+)/gm,function(e,n){return n.replace(/\t/g,E.tabReplace)})),E.useBR&&(e=e.replace(/\n/g,"<br>")),e}function p(e,n,t){var r=n?x[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function h(e){var n=i(e);if(!a(n)){var t;E.useBR?(t=document.createElementNS("http://www.w3.org/1999/xhtml","div"),t.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):t=e;var r=t.textContent,o=n?f(n,r,!0):l(r),s=u(t);if(s.length){var h=document.createElementNS("http://www.w3.org/1999/xhtml","div");h.innerHTML=o.value,o.value=c(s,u(h),r)}o.value=g(o.value),e.innerHTML=o.value,e.className=p(e.className,n,o.language),e.result={language:o.language,re:o.r},o.second_best&&(e.second_best={language:o.second_best.language,re:o.second_best.r})}}function d(e){E=o(E,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");Array.prototype.forEach.call(e,h)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=R[n]=t(e);r.aliases&&r.aliases.forEach(function(e){x[e]=n})}function N(){return Object.keys(R)}function w(e){return e=(e||"").toLowerCase(),R[e]||R[x[e]]}var E={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},R={},x={};return e.highlight=f,e.highlightAuto=l,e.fixMarkup=g,e.highlightBlock=h,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("java",function(e){var t=e.UIR+"(<"+e.UIR+"(\\s*,\\s*"+e.UIR+")*>)?",a="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports",r="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",s={cN:"number",b:r,r:0};return{aliases:["jsp"],k:a,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:a,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:a,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},s,{cN:"meta",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-Ăż][a-zA-Z0-9_-Ăż]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|MK|MP|NS|UI|XC)\\w+"},i={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},n=/[a-zA-Z@][a-zA-Z0-9_]*/,o="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:i,l:n,i:"</",c:[t,e.CLCM,e.CBCM,e.CNM,e.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"meta",b:"#",e:"$",c:[{cN:"meta-string",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+o.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:o,l:n,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}});hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/=====/,e:/=====$/},{b:/^\-\-\-/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+\+\+/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},s=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+n},{b:"`",e:"`",eB:!0,eE:!0,sL:"javascript"}];r.c=s;var i=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(s)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:s.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[i,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[i]},i]},{b:n+":",e:":",rB:!0,rE:!0,r:0}])}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("ruby",function(e){var r="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",b={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:b},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:b},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:r}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:r}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:b},{b:"("+e.RSR+")\\s*",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",u="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",w=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+u+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:b,i:/\/\*/,c:s.concat(w).concat(d)}});hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],o=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=o,s.c=o,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:o}});hljs.registerLanguage("python",function(e){var r={cN:"meta",b:/^(>>>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},a={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},l={cN:"params",b:/\(/,e:/\)/,c:["self",r,a,b]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,a,b,e.HCM,{v:[{cN:"function",bK:"def",r:10},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,l,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}|	)",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:"</?",e:">"},{cN:"attribute",b:/\w+/,r:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[t.inherit(t.QSM,{b:'((u8?|U)|L)?"'}),{b:'(u8?|U)?R"',e:'"',c:[t.BE]},{b:"'\\\\?.",e:"'",i:"."}]},s={cN:"number",v:[{b:"\\b(\\d+(\\.\\d*)?|\\.\\d+)(u|U|l|L|ul|UL|f|F)"},{b:t.CNR}],r:0},i={cN:"meta",b:/#[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,r:0},t.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"},t.CLCM,t.CBCM]},a=t.IR+"\\s*\\(",c={keyword:"int float while private char catch export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"},n=[e,t.CLCM,t.CBCM,s,r];return{aliases:["c","cc","h","c++","h++","hpp"],k:c,i:"</",c:n.concat([i,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:c,c:["self",e]},{b:t.IR+"::",k:c},{v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:c,c:n.concat([{b:/\(/,e:/\)/,k:c,c:n.concat(["self"]),r:0}]),r:0},{cN:"function",b:"("+t.IR+"[\\*&\\s]+)+"+a,rB:!0,e:/[{;=]/,eE:!0,k:c,i:/[^\w\s\*&]/,c:[{b:a,rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:c,r:0,c:[t.CLCM,t.CBCM,r,s,e]},t.CLCM,t.CBCM,i]}]),exports:{preprocessor:i,strings:r,k:c}}});hljs.registerLanguage("javascript",function(e){return{aliases:["js","jsx"],k:{keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,{cN:"string",b:"`",e:"`",c:[e.BE,{cN:"subst",b:"\\$\\{",e:"\\}"}]},e.CLCM,e.CBCM,{cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{b:/</,e:/(\/\w+|\w+\/)>/,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:["self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:/[A-Za-z$_][0-9A-Za-z$_]*/}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:[e.CLCM,e.CBCM]}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});hljs.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",r:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}});hljs.registerLanguage("makefile",function(e){var a={cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]};return{aliases:["mk","mak"],c:[e.HCM,{b:/^\w+\s*\W*=/,rB:!0,r:0,starts:{e:/\s*\W*=/,eE:!0,starts:{e:/$/,r:0,c:[a]}}},{cN:"section",b:/^[\w]+:\s*$/},{cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},{b:/^\t+/,e:/$/,r:0,c:[e.QSM,a]}]}});hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],r:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:b}],r:0}],i:"[^\\s\\}]"}});hljs.registerLanguage("cs",function(e){var i={keyword:"abstract as base bool break byte case catch char checked const continue decimal dynamic default delegate do double else enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long when object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async nameof ascending descending from get group into join let orderby partial select set value var where yield",literal:"null false true"},r={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},t=e.inherit(r,{i:/\n/}),n={cN:"subst",b:"{",e:"}",k:i},c=e.inherit(n,{i:/\n/}),a={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,c]},s={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},n]},o=e.inherit(s,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},c]});n.c=[s,a,r,e.ASM,e.QSM,e.CNM,e.CBCM],c.c=[o,a,t,e.ASM,e.QSM,e.CNM,e.inherit(e.CBCM,{i:/\n/})];var l={v:[s,a,r,e.ASM,e.QSM]},b=e.IR+"(<"+e.IR+">)?(\\[\\])?";return{aliases:["csharp"],k:i,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},l,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+b+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:i,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:i,r:0,c:[l,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*#]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t]},e.CBCM,t]}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\.]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});
\ No newline at end of file
diff --git a/js/highlight.js/styles/github.css b/js/highlight.js/styles/github.css
new file mode 100644
index 0000000000..791932b87e
--- /dev/null
+++ b/js/highlight.js/styles/github.css
@@ -0,0 +1,99 @@
+/*
+
+github.com style (c) Vasily Polovnyov <vast@whiteants.net>
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #333;
+  background: #f8f8f8;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #998;
+  font-style: italic;
+}
+
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-subst {
+  color: #333;
+  font-weight: bold;
+}
+
+.hljs-number,
+.hljs-literal,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag .hljs-attr {
+  color: #008080;
+}
+
+.hljs-string,
+.hljs-doctag {
+  color: #d14;
+}
+
+.hljs-title,
+.hljs-section,
+.hljs-selector-id {
+  color: #900;
+  font-weight: bold;
+}
+
+.hljs-subst {
+  font-weight: normal;
+}
+
+.hljs-type,
+.hljs-class .hljs-title {
+  color: #458;
+  font-weight: bold;
+}
+
+.hljs-tag,
+.hljs-name,
+.hljs-attribute {
+  color: #000080;
+  font-weight: normal;
+}
+
+.hljs-regexp,
+.hljs-link {
+  color: #009926;
+}
+
+.hljs-symbol,
+.hljs-bullet {
+  color: #990073;
+}
+
+.hljs-built_in,
+.hljs-builtin-name {
+  color: #0086b3;
+}
+
+.hljs-meta {
+  color: #999;
+  font-weight: bold;
+}
+
+.hljs-deletion {
+  background: #fdd;
+}
+
+.hljs-addition {
+  background: #dfd;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
diff --git a/js/jquery/jquery-min.js b/js/jquery/jquery-min.js
new file mode 100644
index 0000000000..dad4f0affa
--- /dev/null
+++ b/js/jquery/jquery-min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.12.3 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.3",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0;
+}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),"object"!=typeof b&&"function"!=typeof b||(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=n._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}}),function(){var a;l.shrinkWrapBlocks=function(){if(null!=a)return a;a=!1;var b,c,e;return c=d.getElementsByTagName("body")[0],c&&c.style?(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:1px;width:1px;zoom:1",b.appendChild(d.createElement("div")).style.width="5px",a=3!==b.offsetWidth),c.removeChild(e),a):void 0}}();var T=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,U=new RegExp("^(?:([+-])=|)("+T+")([a-z%]*)$","i"),V=["Top","Right","Bottom","Left"],W=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function X(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&U.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var Y=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)Y(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav></:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:l.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/<tbody/i;function ia(a){Z.test(a.type)&&(a.defaultChecked=a.checked)}function ja(a,b,c,d,e){for(var f,g,h,i,j,k,m,o=a.length,p=ca(b),q=[],r=0;o>r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"<table>"!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ma.test(f)?this.mouseHooks:la.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=g.srcElement||d),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,h.filter?h.filter(a,g):a},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button,h=b.fromElement;return null==a.pageX&&null!=b.clientX&&(e=a.target.ownerDocument||d,f=e.documentElement,c=e.body,a.pageX=b.clientX+(f&&f.scrollLeft||c&&c.scrollLeft||0)-(f&&f.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(f&&f.scrollTop||c&&c.scrollTop||0)-(f&&f.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&h&&(a.relatedTarget=h===a.target?b.toElement:h),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==ra()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===ra()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return n.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b),d.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=d.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)}:function(a,b,c){var d="on"+b;a.detachEvent&&("undefined"==typeof a[d]&&(a[d]=null),a.detachEvent(d,c))},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?pa:qa):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:qa,isPropagationStopped:qa,isImmediatePropagationStopped:qa,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=pa,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=pa,a&&!this.isSimulated&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=pa,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),l.submit||(n.event.special.submit={setup:function(){return n.nodeName(this,"form")?!1:void n.event.add(this,"click._submit keypress._submit",function(a){var b=a.target,c=n.nodeName(b,"input")||n.nodeName(b,"button")?n.prop(b,"form"):void 0;c&&!n._data(c,"submit")&&(n.event.add(c,"submit._submit",function(a){a._submitBubble=!0}),n._data(c,"submit",!0))})},postDispatch:function(a){a._submitBubble&&(delete a._submitBubble,this.parentNode&&!a.isTrigger&&n.event.simulate("submit",this.parentNode,a))},teardown:function(){return n.nodeName(this,"form")?!1:void n.event.remove(this,"._submit")}}),l.change||(n.event.special.change={setup:function(){return ka.test(this.nodeName)?("checkbox"!==this.type&&"radio"!==this.type||(n.event.add(this,"propertychange._change",function(a){"checked"===a.originalEvent.propertyName&&(this._justChanged=!0)}),n.event.add(this,"click._change",function(a){this._justChanged&&!a.isTrigger&&(this._justChanged=!1),n.event.simulate("change",this,a)})),!1):void n.event.add(this,"beforeactivate._change",function(a){var b=a.target;ka.test(b.nodeName)&&!n._data(b,"change")&&(n.event.add(b,"change._change",function(a){!this.parentNode||a.isSimulated||a.isTrigger||n.event.simulate("change",this.parentNode,a)}),n._data(b,"change",!0))})},handle:function(a){var b=a.target;return this!==b||a.isSimulated||a.isTrigger||"radio"!==b.type&&"checkbox"!==b.type?a.handleObj.handler.apply(this,arguments):void 0},teardown:function(){return n.event.remove(this,"._change"),!ka.test(this.nodeName)}}),l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=n._data(d,b);e||d.addEventListener(a,c,!0),n._data(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=n._data(d,b)-1;e?n._data(d,b,e):(d.removeEventListener(a,c,!0),n._removeData(d,b))}}}),n.fn.extend({on:function(a,b,c,d){return sa(this,a,b,c,d)},one:function(a,b,c,d){return sa(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=qa),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var ta=/ jQuery\d+="(?:null|\d+)"/g,ua=new RegExp("<(?:"+ba+")[\\s/>]","i"),va=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,wa=/<script|<style|<link/i,xa=/checked\s*(?:[^=]|=\s*.checked.)/i,ya=/^true\/(.*)/,za=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,Aa=ca(d),Ba=Aa.appendChild(d.createElement("div"));function Ca(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Da(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function Ea(a){var b=ya.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Fa(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Ga(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(Da(b).text=a.text,Ea(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&Z.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}}function Ha(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&xa.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),Ha(f,b,c,d)});if(o&&(k=ja(b,a[0].ownerDocument,!1,a,d),e=k.firstChild,1===k.childNodes.length&&(k=e),e||d)){for(i=n.map(ea(k,"script"),Da),h=i.length;o>m;m++)g=k,m!==p&&(g=n.clone(g,!0,!0),h&&n.merge(i,ea(g,"script"))),c.call(a[m],g,m);if(h)for(j=i[i.length-1].ownerDocument,n.map(i,Ea),m=0;h>m;m++)g=i[m],_.test(g.type||"")&&!n._data(g,"globalEval")&&n.contains(j,g)&&(g.src?n._evalUrl&&n._evalUrl(g.src):n.globalEval((g.text||g.textContent||g.innerHTML||"").replace(za,"")));k=e=null}return a}function Ia(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(ea(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&fa(ea(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(va,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!ua.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(Ba.innerHTML=a.outerHTML,Ba.removeChild(f=Ba.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=ea(f),h=ea(a),g=0;null!=(e=h[g]);++g)d[g]&&Ga(e,d[g]);if(b)if(c)for(h=h||ea(a),d=d||ea(f),g=0;null!=(e=h[g]);g++)Fa(e,d[g]);else Fa(a,f);return d=ea(f,"script"),d.length>0&&fa(d,!i&&ea(a,"script")),d=h=e=null,f},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.attributes,m=n.event.special;null!=(d=a[h]);h++)if((b||M(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k||"undefined"==typeof d.removeAttribute?d[i]=void 0:d.removeAttribute(i),c.push(f))}}}),n.fn.extend({domManip:Ha,detach:function(a){return Ia(this,a,!0)},remove:function(a){return Ia(this,a)},text:function(a){return Y(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||d).createTextNode(a))},null,a,arguments.length)},append:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.appendChild(a)}})},prepend:function(){return Ha(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ca(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ha(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(ea(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return Y(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(ta,""):void 0;if("string"==typeof a&&!wa.test(a)&&(l.htmlSerialize||!ua.test(a))&&(l.leadingWhitespace||!aa.test(a))&&!da[($.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ea(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ha(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(ea(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],f=n(a),h=f.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(f[d])[b](c),g.apply(e,c.get());return this.pushStack(e)}});var Ja,Ka={HTML:"block",BODY:"block"};function La(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function Ma(a){var b=d,c=Ka[a];return c||(c=La(a,b),"none"!==c&&c||(Ja=(Ja||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=(Ja[0].contentWindow||Ja[0].contentDocument).document,b.write(),b.close(),c=La(a,b),Ja.detach()),Ka[a]=c),c}var Na=/^margin/,Oa=new RegExp("^("+T+")(?!px)[a-z%]+$","i"),Pa=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Qa=d.documentElement;!function(){var b,c,e,f,g,h,i=d.createElement("div"),j=d.createElement("div");if(j.style){j.style.cssText="float:left;opacity:.5",l.opacity="0.5"===j.style.opacity,l.cssFloat=!!j.style.cssFloat,j.style.backgroundClip="content-box",j.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===j.style.backgroundClip,i=d.createElement("div"),i.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",j.innerHTML="",i.appendChild(j),l.boxSizing=""===j.style.boxSizing||""===j.style.MozBoxSizing||""===j.style.WebkitBoxSizing,n.extend(l,{reliableHiddenOffsets:function(){return null==b&&k(),f},boxSizingReliable:function(){return null==b&&k(),e},pixelMarginRight:function(){return null==b&&k(),c},pixelPosition:function(){return null==b&&k(),b},reliableMarginRight:function(){return null==b&&k(),g},reliableMarginLeft:function(){return null==b&&k(),h}});function k(){var k,l,m=d.documentElement;m.appendChild(i),j.style.cssText="-webkit-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",b=e=h=!1,c=g=!0,a.getComputedStyle&&(l=a.getComputedStyle(j),b="1%"!==(l||{}).top,h="2px"===(l||{}).marginLeft,e="4px"===(l||{width:"4px"}).width,j.style.marginRight="50%",c="4px"===(l||{marginRight:"4px"}).marginRight,k=j.appendChild(d.createElement("div")),k.style.cssText=j.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",k.style.marginRight=k.style.width="0",j.style.width="1px",g=!parseFloat((a.getComputedStyle(k)||{}).marginRight),j.removeChild(k)),j.style.display="none",f=0===j.getClientRects().length,f&&(j.style.display="",j.innerHTML="<table><tr><td></td><td>t</td></tr></table>",k=j.getElementsByTagName("td"),k[0].style.cssText="margin:0;border:0;padding:0;display:none",f=0===k[0].offsetHeight,f&&(k[0].style.display="",k[1].style.display="none",f=0===k[0].offsetHeight)),m.removeChild(i)}}}();var Ra,Sa,Ta=/^(top|right|bottom|left)$/;a.getComputedStyle?(Ra=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Oa.test(g)&&Na.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0===g?g:g+""}):Qa.currentStyle&&(Ra=function(a){return a.currentStyle},Sa=function(a,b,c){var d,e,f,g,h=a.style;return c=c||Ra(a),g=c?c[b]:void 0,null==g&&h&&h[b]&&(g=h[b]),Oa.test(g)&&!Ta.test(b)&&(d=h.left,e=a.runtimeStyle,f=e&&e.left,f&&(e.left=a.currentStyle.left),h.left="fontSize"===b?"1em":g,g=h.pixelLeft+"px",h.left=d,f&&(e.left=f)),void 0===g?g:g+""||"auto"});function Ua(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Va=/alpha\([^)]*\)/i,Wa=/opacity\s*=\s*([^)]*)/i,Xa=/^(none|table(?!-c[ea]).+)/,Ya=new RegExp("^("+T+")(.*)$","i"),Za={position:"absolute",visibility:"hidden",display:"block"},$a={letterSpacing:"0",fontWeight:"400"},_a=["Webkit","O","Moz","ms"],ab=d.createElement("div").style;function bb(a){if(a in ab)return a;var b=a.charAt(0).toUpperCase()+a.slice(1),c=_a.length;while(c--)if(a=_a[c]+b,a in ab)return a}function cb(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=n._data(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&W(d)&&(f[g]=n._data(d,"olddisplay",Ma(d.nodeName)))):(e=W(d),(c&&"none"!==c||!e)&&n._data(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}function db(a,b,c){var d=Ya.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function eb(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+V[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+V[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+V[f]+"Width",!0,e))):(g+=n.css(a,"padding"+V[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+V[f]+"Width",!0,e)));return g}function fb(b,c,e){var f=!0,g="width"===c?b.offsetWidth:b.offsetHeight,h=Ra(b),i=l.boxSizing&&"border-box"===n.css(b,"boxSizing",!1,h);if(d.msFullscreenElement&&a.top!==a&&b.getClientRects().length&&(g=Math.round(100*b.getBoundingClientRect()[c])),0>=g||null==g){if(g=Sa(b,c,h),(0>g||null==g)&&(g=b.style[c]),Oa.test(g))return g;f=i&&(l.boxSizingReliable()||g===b.style[c]),g=parseFloat(g)||0}return g+eb(b,c,e||(i?"border":"content"),f,h)+"px"}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Sa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":l.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;if(b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c)return g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b];if(f=typeof c,"string"===f&&(e=U.exec(c))&&e[1]&&(c=X(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),!(g&&"set"in g&&void 0===(c=g.set(a,c,d)))))try{i[b]=c}catch(j){}}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=bb(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(f=g.get(a,!0,c)),void 0===f&&(f=Sa(a,b,d)),"normal"===f&&b in $a&&(f=$a[b]),""===c||c?(e=parseFloat(f),c===!0||isFinite(e)?e||0:f):f}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Xa.test(n.css(a,"display"))&&0===a.offsetWidth?Pa(a,Za,function(){return fb(a,b,d)}):fb(a,b,d):void 0},set:function(a,c,d){var e=d&&Ra(a);return db(a,c,d?eb(a,b,d,l.boxSizing&&"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),l.opacity||(n.cssHooks.opacity={get:function(a,b){return Wa.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=n.isNumeric(b)?"alpha(opacity="+100*b+")":"",f=d&&d.filter||c.filter||"";c.zoom=1,(b>=1||""===b)&&""===n.trim(f.replace(Va,""))&&c.removeAttribute&&(c.removeAttribute("filter"),""===b||d&&!d.filter)||(c.filter=Va.test(f)?f.replace(Va,e):f+" "+e)}}),n.cssHooks.marginRight=Ua(l.reliableMarginRight,function(a,b){return b?Pa(a,{display:"inline-block"},Sa,[a,"marginRight"]):void 0}),n.cssHooks.marginLeft=Ua(l.reliableMarginLeft,function(a,b){
+return b?(parseFloat(Sa(a,"marginLeft"))||(n.contains(a.ownerDocument,a)?a.getBoundingClientRect().left-Pa(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}):0))+"px":void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+V[d]+b]=f[d]||f[d-2]||f[0];return e}},Na.test(a)||(n.cssHooks[a+b].set=db)}),n.fn.extend({css:function(a,b){return Y(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ra(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return cb(this,!0)},hide:function(){return cb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){W(this)?n(this).show():n(this).hide()})}});function gb(a,b,c,d,e){return new gb.prototype.init(a,b,c,d,e)}n.Tween=gb,gb.prototype={constructor:gb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=gb.propHooks[this.prop];return a&&a.get?a.get(this):gb.propHooks._default.get(this)},run:function(a){var b,c=gb.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):gb.propHooks._default.set(this),this}},gb.prototype.init.prototype=gb.prototype,gb.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},gb.propHooks.scrollTop=gb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=gb.prototype.init,n.fx.step={};var hb,ib,jb=/^(?:toggle|show|hide)$/,kb=/queueHooks$/;function lb(){return a.setTimeout(function(){hb=void 0}),hb=n.now()}function mb(a,b){var c,d={height:a},e=0;for(b=b?1:0;4>e;e+=2-b)c=V[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function nb(a,b,c){for(var d,e=(qb.tweeners[b]||[]).concat(qb.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function ob(a,b,c){var d,e,f,g,h,i,j,k,m=this,o={},p=a.style,q=a.nodeType&&W(a),r=n._data(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,m.always(function(){m.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[p.overflow,p.overflowX,p.overflowY],j=n.css(a,"display"),k="none"===j?n._data(a,"olddisplay")||Ma(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(l.inlineBlockNeedsLayout&&"inline"!==Ma(a.nodeName)?p.zoom=1:p.display="inline-block")),c.overflow&&(p.overflow="hidden",l.shrinkWrapBlocks()||m.always(function(){p.overflow=c.overflow[0],p.overflowX=c.overflow[1],p.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],jb.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(q?"hide":"show")){if("show"!==e||!r||void 0===r[d])continue;q=!0}o[d]=r&&r[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(o))"inline"===("none"===j?Ma(a.nodeName):j)&&(p.display=j);else{r?"hidden"in r&&(q=r.hidden):r=n._data(a,"fxshow",{}),f&&(r.hidden=!q),q?n(a).show():m.done(function(){n(a).hide()}),m.done(function(){var b;n._removeData(a,"fxshow");for(b in o)n.style(a,b,o[b])});for(d in o)g=nb(q?r[d]:0,d,m),d in r||(r[d]=g.start,q&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function pb(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function qb(a,b,c){var d,e,f=0,g=qb.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=hb||lb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:hb||lb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(pb(k,j.opts.specialEasing);g>f;f++)if(d=qb.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,nb,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(qb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return X(c.elem,a,U.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],qb.tweeners[c]=qb.tweeners[c]||[],qb.tweeners[c].unshift(b)},prefilters:[ob],prefilter:function(a,b){b?qb.prefilters.unshift(a):qb.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(W).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=qb(this,n.extend({},a),f);(e||n._data(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=n._data(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&kb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=n._data(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(mb(b,!0),a,d,e)}}),n.each({slideDown:mb("show"),slideUp:mb("hide"),slideToggle:mb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=n.timers,c=0;for(hb=n.now();c<b.length;c++)a=b[c],a()||b[c]!==a||b.splice(c--,1);b.length||n.fx.stop(),hb=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){ib||(ib=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(ib),ib=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a,b=d.createElement("input"),c=d.createElement("div"),e=d.createElement("select"),f=e.appendChild(d.createElement("option"));c=d.createElement("div"),c.setAttribute("className","t"),c.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",a=c.getElementsByTagName("a")[0],b.setAttribute("type","checkbox"),c.appendChild(b),a=c.getElementsByTagName("a")[0],a.style.cssText="top:1px",l.getSetAttribute="t"!==c.className,l.style=/top/.test(a.getAttribute("style")),l.hrefNormalized="/a"===a.getAttribute("href"),l.checkOn=!!b.value,l.optSelected=f.selected,l.enctype=!!d.createElement("form").enctype,e.disabled=!0,l.optDisabled=!f.disabled,b=d.createElement("input"),b.setAttribute("value",""),l.input=""===b.getAttribute("value"),b.value="t",b.setAttribute("type","radio"),l.radioValue="t"===b.value}();var rb=/\r/g,sb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(sb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)if(d=e[g],n.inArray(n.valHooks.option.get(d),f)>-1)try{d.selected=c=!0}catch(h){d.scrollHeight}else d.selected=!1;return c||(a.selectedIndex=-1),e}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var tb,ub,vb=n.expr.attrHandle,wb=/^(?:checked|selected)$/i,xb=l.getSetAttribute,yb=l.input;n.fn.extend({attr:function(a,b){return Y(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ub:tb)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)?yb&&xb||!wb.test(c)?a[d]=!1:a[n.camelCase("default-"+c)]=a[d]=!1:n.attr(a,c,""),a.removeAttribute(xb?c:d)}}),ub={set:function(a,b,c){return b===!1?n.removeAttr(a,c):yb&&xb||!wb.test(c)?a.setAttribute(!xb&&n.propFix[c]||c,c):a[n.camelCase("default-"+c)]=a[c]=!0,c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=vb[b]||n.find.attr;yb&&xb||!wb.test(b)?vb[b]=function(a,b,d){var e,f;return d||(f=vb[b],vb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,vb[b]=f),e}:vb[b]=function(a,b,c){return c?void 0:a[n.camelCase("default-"+b)]?b.toLowerCase():null}}),yb&&xb||(n.attrHooks.value={set:function(a,b,c){return n.nodeName(a,"input")?void(a.defaultValue=b):tb&&tb.set(a,b,c)}}),xb||(tb={set:function(a,b,c){var d=a.getAttributeNode(c);return d||a.setAttributeNode(d=a.ownerDocument.createAttribute(c)),d.value=b+="","value"===c||b===a.getAttribute(c)?b:void 0}},vb.id=vb.name=vb.coords=function(a,b,c){var d;return c?void 0:(d=a.getAttributeNode(b))&&""!==d.value?d.value:null},n.valHooks.button={get:function(a,b){var c=a.getAttributeNode(b);return c&&c.specified?c.value:void 0},set:tb.set},n.attrHooks.contenteditable={set:function(a,b,c){tb.set(a,""===b?!1:b,c)}},n.each(["width","height"],function(a,b){n.attrHooks[b]={set:function(a,c){return""===c?(a.setAttribute(b,"auto"),c):void 0}}})),l.style||(n.attrHooks.style={get:function(a){return a.style.cssText||void 0},set:function(a,b){return a.style.cssText=b+""}});var zb=/^(?:input|select|textarea|button|object)$/i,Ab=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return Y(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return a=n.propFix[a]||a,this.each(function(){try{this[a]=void 0,delete this[a]}catch(b){}})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):zb.test(a.nodeName)||Ab.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.hrefNormalized||n.each(["href","src"],function(a,b){n.propHooks[b]={get:function(a){return a.getAttribute(b,4)}}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this}),l.enctype||(n.propFix.enctype="encoding");var Bb=/[\t\r\n\f]/g;function Cb(a){return n.attr(a,"class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,Cb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,Cb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=Cb(c),d=1===c.nodeType&&(" "+e+" ").replace(Bb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&n.attr(c,"class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,Cb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=Cb(this),b&&n._data(this,"__className__",b),n.attr(this,"class",b||a===!1?"":n._data(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+Cb(c)+" ").replace(Bb," ").indexOf(b)>-1)return!0;return!1}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var Db=a.location,Eb=n.now(),Fb=/\?/,Gb=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;n.parseJSON=function(b){if(a.JSON&&a.JSON.parse)return a.JSON.parse(b+"");var c,d=null,e=n.trim(b+"");return e&&!n.trim(e.replace(Gb,function(a,b,e,f){return c&&b&&(d=0),0===d?a:(c=e||b,d+=!f-!e,"")}))?Function("return "+e)():n.error("Invalid JSON: "+b)},n.parseXML=function(b){var c,d;if(!b||"string"!=typeof b)return null;try{a.DOMParser?(d=new a.DOMParser,c=d.parseFromString(b,"text/xml")):(c=new a.ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b))}catch(e){c=void 0}return c&&c.documentElement&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var Hb=/#.*$/,Ib=/([?&])_=[^&]*/,Jb=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Kb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Lb=/^(?:GET|HEAD)$/,Mb=/^\/\//,Nb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Ob={},Pb={},Qb="*/".concat("*"),Rb=Db.href,Sb=Nb.exec(Rb.toLowerCase())||[];function Tb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d.charAt(0)?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Ub(a,b,c,d){var e={},f=a===Pb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Vb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(d in b)void 0!==b[d]&&((e[d]?a:c||(c={}))[d]=b[d]);return c&&n.extend(!0,a,c),a}function Wb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===e&&(e=a.mimeType||b.getResponseHeader("Content-Type"));if(e)for(g in h)if(h[g]&&h[g].test(e)){i.unshift(g);break}if(i[0]in c)f=i[0];else{for(g in c){if(!i[0]||a.converters[g+" "+i[0]]){f=g;break}d||(d=g)}f=f||d}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Xb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Rb,type:"GET",isLocal:Kb.test(Sb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Qb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Vb(Vb(a,n.ajaxSettings),b):Vb(n.ajaxSettings,a)},ajaxPrefilter:Tb(Ob),ajaxTransport:Tb(Pb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var d,e,f,g,h,i,j,k,l=n.ajaxSetup({},c),m=l.context||l,o=l.context&&(m.nodeType||m.jquery)?n(m):n.event,p=n.Deferred(),q=n.Callbacks("once memory"),r=l.statusCode||{},s={},t={},u=0,v="canceled",w={readyState:0,getResponseHeader:function(a){var b;if(2===u){if(!k){k={};while(b=Jb.exec(g))k[b[1].toLowerCase()]=b[2]}b=k[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===u?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return u||(a=t[c]=t[c]||a,s[a]=b),this},overrideMimeType:function(a){return u||(l.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>u)for(b in a)r[b]=[r[b],a[b]];else w.always(a[w.status]);return this},abort:function(a){var b=a||v;return j&&j.abort(b),y(0,b),this}};if(p.promise(w).complete=q.add,w.success=w.done,w.error=w.fail,l.url=((b||l.url||Rb)+"").replace(Hb,"").replace(Mb,Sb[1]+"//"),l.type=c.method||c.type||l.method||l.type,l.dataTypes=n.trim(l.dataType||"*").toLowerCase().match(G)||[""],null==l.crossDomain&&(d=Nb.exec(l.url.toLowerCase()),l.crossDomain=!(!d||d[1]===Sb[1]&&d[2]===Sb[2]&&(d[3]||("http:"===d[1]?"80":"443"))===(Sb[3]||("http:"===Sb[1]?"80":"443")))),l.data&&l.processData&&"string"!=typeof l.data&&(l.data=n.param(l.data,l.traditional)),Ub(Ob,l,c,w),2===u)return w;i=n.event&&l.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!Lb.test(l.type),f=l.url,l.hasContent||(l.data&&(f=l.url+=(Fb.test(f)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=Ib.test(f)?f.replace(Ib,"$1_="+Eb++):f+(Fb.test(f)?"&":"?")+"_="+Eb++)),l.ifModified&&(n.lastModified[f]&&w.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&w.setRequestHeader("If-None-Match",n.etag[f])),(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&w.setRequestHeader("Content-Type",l.contentType),w.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+("*"!==l.dataTypes[0]?", "+Qb+"; q=0.01":""):l.accepts["*"]);for(e in l.headers)w.setRequestHeader(e,l.headers[e]);if(l.beforeSend&&(l.beforeSend.call(m,w,l)===!1||2===u))return w.abort();v="abort";for(e in{success:1,error:1,complete:1})w[e](l[e]);if(j=Ub(Pb,l,c,w)){if(w.readyState=1,i&&o.trigger("ajaxSend",[w,l]),2===u)return w;l.async&&l.timeout>0&&(h=a.setTimeout(function(){w.abort("timeout")},l.timeout));try{u=1,j.send(s,y)}catch(x){if(!(2>u))throw x;y(-1,x)}}else y(-1,"No Transport");function y(b,c,d,e){var k,s,t,v,x,y=c;2!==u&&(u=2,h&&a.clearTimeout(h),j=void 0,g=e||"",w.readyState=b>0?4:0,k=b>=200&&300>b||304===b,d&&(v=Wb(l,w,d)),v=Xb(l,v,w,k),k?(l.ifModified&&(x=w.getResponseHeader("Last-Modified"),x&&(n.lastModified[f]=x),x=w.getResponseHeader("etag"),x&&(n.etag[f]=x)),204===b||"HEAD"===l.type?y="nocontent":304===b?y="notmodified":(y=v.state,s=v.data,t=v.error,k=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),w.status=b,w.statusText=(c||y)+"",k?p.resolveWith(m,[s,y,w]):p.rejectWith(m,[w,y,t]),w.statusCode(r),r=void 0,i&&o.trigger(k?"ajaxSuccess":"ajaxError",[w,l,k?s:t]),q.fireWith(m,[w,y]),i&&(o.trigger("ajaxComplete",[w,l]),--n.active||n.event.trigger("ajaxStop")))}return w},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){if(n.isFunction(a))return this.each(function(b){n(this).wrapAll(a.call(this,b))});if(this[0]){var b=n(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&1===a.firstChild.nodeType)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}});function Yb(a){return a.style&&a.style.display||n.css(a,"display")}function Zb(a){while(a&&1===a.nodeType){if("none"===Yb(a)||"hidden"===a.type)return!0;a=a.parentNode}return!1}n.expr.filters.hidden=function(a){return l.reliableHiddenOffsets()?a.offsetWidth<=0&&a.offsetHeight<=0&&!a.getClientRects().length:Zb(a)},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var $b=/%20/g,_b=/\[\]$/,ac=/\r?\n/g,bc=/^(?:submit|button|image|reset|file)$/i,cc=/^(?:input|select|textarea|keygen)/i;function dc(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||_b.test(a)?d(a,e):dc(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)dc(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)dc(c,a[c],b,e);return d.join("&").replace($b,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&cc.test(this.nodeName)&&!bc.test(a)&&(this.checked||!Z.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(ac,"\r\n")}}):{name:b.name,value:c.replace(ac,"\r\n")}}).get()}}),n.ajaxSettings.xhr=void 0!==a.ActiveXObject?function(){return this.isLocal?ic():d.documentMode>8?hc():/^(get|post|head|put|delete|options)$/i.test(this.type)&&hc()||ic()}:hc;var ec=0,fc={},gc=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in fc)fc[a](void 0,!0)}),l.cors=!!gc&&"withCredentials"in gc,gc=l.ajax=!!gc,gc&&n.ajaxTransport(function(b){if(!b.crossDomain||l.cors){var c;return{send:function(d,e){var f,g=b.xhr(),h=++ec;if(g.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(f in b.xhrFields)g[f]=b.xhrFields[f];b.mimeType&&g.overrideMimeType&&g.overrideMimeType(b.mimeType),b.crossDomain||d["X-Requested-With"]||(d["X-Requested-With"]="XMLHttpRequest");for(f in d)void 0!==d[f]&&g.setRequestHeader(f,d[f]+"");g.send(b.hasContent&&b.data||null),c=function(a,d){var f,i,j;if(c&&(d||4===g.readyState))if(delete fc[h],c=void 0,g.onreadystatechange=n.noop,d)4!==g.readyState&&g.abort();else{j={},f=g.status,"string"==typeof g.responseText&&(j.text=g.responseText);try{i=g.statusText}catch(k){i=""}f||!b.isLocal||b.crossDomain?1223===f&&(f=204):f=j.text?200:404}j&&e(f,i,j,g.getAllResponseHeaders())},b.async?4===g.readyState?a.setTimeout(c):g.onreadystatechange=fc[h]=c:c()},abort:function(){c&&c(void 0,!0)}}}});function hc(){try{return new a.XMLHttpRequest}catch(b){}}function ic(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c=d.head||n("head")[0]||d.documentElement;return{send:function(e,f){b=d.createElement("script"),b.async=!0,a.scriptCharset&&(b.charset=a.scriptCharset),b.src=a.url,b.onload=b.onreadystatechange=function(a,c){(c||!b.readyState||/loaded|complete/.test(b.readyState))&&(b.onload=b.onreadystatechange=null,b.parentNode&&b.parentNode.removeChild(b),b=null,c||f(200,"success"))},c.insertBefore(b,c.firstChild)},abort:function(){b&&b.onload(void 0,!0)}}}});var jc=[],kc=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=jc.pop()||n.expando+"_"+Eb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(kc.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&kc.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(kc,"$1"+e):b.jsonp!==!1&&(b.url+=(Fb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,jc.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ja([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var lc=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&lc)return lc.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h,a.length)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function mc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=mc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0),c.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=mc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0;
+})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var nc=a.jQuery,oc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=oc),b&&a.jQuery===n&&(a.jQuery=nc),n},b||(a.jQuery=a.$=n),n});
diff --git a/js/jquery/plugins/cookie/cookie-min.js b/js/jquery/plugins/cookie/cookie-min.js
new file mode 100644
index 0000000000..09b492cdb9
--- /dev/null
+++ b/js/jquery/plugins/cookie/cookie-min.js
@@ -0,0 +1,19 @@
+/*!
+ * jQuery Cookie Plugin v1.4.1
+ * https://github.com/carhartl/jquery-cookie
+ *
+ * Copyright 2013 Klaus Hartl
+ * Released under the MIT license
+ */
+(function(factory){if(typeof define==='function'&&define.amd){define(['jquery'],factory);}else if(typeof exports==='object'){factory(require('jquery'));}else{factory(jQuery);}}(function($){var pluses=/\+/g;function encode(s){return config.raw?s:encodeURIComponent(s);}
+function decode(s){return config.raw?s:decodeURIComponent(s);}
+function stringifyCookieValue(value){return encode(config.json?JSON.stringify(value):String(value));}
+function parseCookieValue(s){if(s.indexOf('"')===0){s=s.slice(1,-1).replace(/\\"/g,'"').replace(/\\\\/g,'\\');}
+try{s=decodeURIComponent(s.replace(pluses,' '));return config.json?JSON.parse(s):s;}catch(e){}}
+function read(s,converter){var value=config.raw?s:parseCookieValue(s);return $.isFunction(converter)?converter(value):value;}
+var config=$.cookie=function(key,value,options){if(value!==undefined&&!$.isFunction(value)){options=$.extend({},config.defaults,options);if(typeof options.expires==='number'){var days=options.expires,t=options.expires=new Date();t.setTime(+t+days*864e+5);}
+return(document.cookie=[encode(key),'=',stringifyCookieValue(value),options.expires?'; expires='+options.expires.toUTCString():'',options.path?'; path='+options.path:'',options.domain?'; domain='+options.domain:'',options.secure?'; secure':''].join(''));}
+var result=key?undefined:{};var cookies=document.cookie?document.cookie.split('; '):[];for(var i=0,l=cookies.length;i<l;i++){var parts=cookies[i].split('=');var name=decode(parts.shift());var cookie=parts.join('=');if(key&&key===name){result=read(cookie,value);break;}
+if(!key&&(cookie=read(cookie))!==undefined){result[name]=cookie;}}
+return result;};config.defaults={};$.removeCookie=function(key,options){if($.cookie(key)===undefined){return false;}
+$.cookie(key,'',$.extend({},options,{expires:-1}));return!$.cookie(key);};}));
diff --git a/js/jquery/plugins/datatables/datatables-min.css b/js/jquery/plugins/datatables/datatables-min.css
new file mode 100644
index 0000000000..13b531a386
--- /dev/null
+++ b/js/jquery/plugins/datatables/datatables-min.css
@@ -0,0 +1,15 @@
+/*
+ * This combined file was created by the DataTables downloader builder:
+ *   https://datatables.net/download
+ *
+ * To rebuild or modify this file with the latest versions of the included
+ * software please visit:
+ *   https://datatables.net/download/#ju/dt-1.10.11
+ *
+ * Included libraries:
+ *   DataTables 1.10.11
+ */
+
+table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px}table.dataTable tbody tr{background-color:#ffffff}table.dataTable tbody tr.selected{background-color:#B0BED9}table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}table.dataTable.no-footer{border-bottom:1px solid #111}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}.dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}.dataTables_wrapper .dataTables_length{float:left}.dataTables_wrapper .dataTables_filter{float:right;text-align:right}.dataTables_wrapper .dataTables_filter input{margin-left:0.5em}.dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}.dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}.dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;color:#333 !important;border:1px solid transparent;border-radius:2px}.dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{color:#333 !important;border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}.dataTables_wrapper .dataTables_paginate .paginate_button:hover{color:white !important;border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}.dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}.dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}.dataTables_wrapper .dataTables_scroll{clear:both}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td{vertical-align:middle}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}.dataTables_wrapper.no-footer div.dataTables_scrollHead table,.dataTables_wrapper.no-footer div.dataTables_scrollBody table{border-bottom:none}.dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}.dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}.dataTables_wrapper .dataTables_filter{margin-top:0.5em}}table.dataTable thead th div.DataTables_sort_wrapper{position:relative}table.dataTable thead th div.DataTables_sort_wrapper span{position:absolute;top:50%;margin-top:-8px;right:-18px}table.dataTable thead th.ui-state-default,table.dataTable tfoot th.ui-state-default{border-left-width:0}table.dataTable thead th.ui-state-default:first-child,table.dataTable tfoot th.ui-state-default:first-child{border-left-width:1px}.dataTables_wrapper .dataTables_paginate .fg-button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;border:1px solid transparent}.dataTables_wrapper .dataTables_paginate .fg-button:active{outline:none}.dataTables_wrapper .dataTables_paginate .fg-button:first-child{border-top-left-radius:3px;border-bottom-left-radius:3px}.dataTables_wrapper .dataTables_paginate .fg-button:last-child{border-top-right-radius:3px;border-bottom-right-radius:3px}.dataTables_wrapper .ui-widget-header{font-weight:normal}.dataTables_wrapper .ui-toolbar{padding:8px}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:none}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:inherit}
+
+
diff --git a/js/jquery/plugins/datatables/datatables-min.js b/js/jquery/plugins/datatables/datatables-min.js
new file mode 100644
index 0000000000..f562f099c8
--- /dev/null
+++ b/js/jquery/plugins/datatables/datatables-min.js
@@ -0,0 +1,191 @@
+/*
+ * This combined file was created by the DataTables downloader builder:
+ *   https://datatables.net/download
+ *
+ * To rebuild or modify this file with the latest versions of the included
+ * software please visit:
+ *   https://datatables.net/download/#ju/dt-1.10.11
+ *
+ * Included libraries:
+ *   DataTables 1.10.11
+ */
+
+/*!
+ DataTables 1.10.11
+ ©2008-2015 SpryMedia Ltd - datatables.net/license
+*/
+(function(h){"function"===typeof define&&define.amd?define(["jquery"],function(D){return h(D,window,document)}):"object"===typeof exports?module.exports=function(D,I){D||(D=window);I||(I="undefined"!==typeof window?require("jquery"):require("jquery")(D));return h(I,D,D.document)}:h(jQuery,window,document)})(function(h,D,I,k){function Y(a){var b,c,d={};h.each(a,function(e){if((b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=e.replace(b[0],b[2].toLowerCase()),
+d[c]=e,"o"===b[1]&&Y(a[e])});a._hungarianMap=d}function K(a,b,c){a._hungarianMap||Y(a);var d;h.each(b,function(e){d=a._hungarianMap[e];if(d!==k&&(c||b[d]===k))"o"===d.charAt(0)?(b[d]||(b[d]={}),h.extend(!0,b[d],b[e]),K(a[d],b[d],c)):b[d]=b[e]})}function Fa(a){var b=m.defaults.oLanguage,c=a.sZeroRecords;!a.sEmptyTable&&(c&&"No data available in table"===b.sEmptyTable)&&E(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(c&&"Loading..."===b.sLoadingRecords)&&E(a,a,"sZeroRecords","sLoadingRecords");
+a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&db(a)}function eb(a){A(a,"ordering","bSort");A(a,"orderMulti","bSortMulti");A(a,"orderClasses","bSortClasses");A(a,"orderCellsTop","bSortCellsTop");A(a,"order","aaSorting");A(a,"orderFixed","aaSortingFixed");A(a,"paging","bPaginate");A(a,"pagingType","sPaginationType");A(a,"pageLength","iDisplayLength");A(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":"");"boolean"===typeof a.scrollX&&(a.scrollX=
+a.scrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&K(m.models.oSearch,a[b])}function fb(a){A(a,"orderable","bSortable");A(a,"orderData","aDataSort");A(a,"orderSequence","asSorting");A(a,"orderDataType","sortDataType");var b=a.aDataSort;b&&!h.isArray(b)&&(a.aDataSort=[b])}function gb(a){if(!m.__browser){var b={};m.__browser=b;var c=h("<div/>").css({position:"fixed",top:0,left:0,height:1,width:1,overflow:"hidden"}).append(h("<div/>").css({position:"absolute",top:1,left:1,
+width:100,overflow:"scroll"}).append(h("<div/>").css({width:"100%",height:10}))).appendTo("body"),d=c.children(),e=d.children();b.barWidth=d[0].offsetWidth-d[0].clientWidth;b.bScrollOversize=100===e[0].offsetWidth&&100!==d[0].clientWidth;b.bScrollbarLeft=1!==Math.round(e.offset().left);b.bBounding=c[0].getBoundingClientRect().width?!0:!1;c.remove()}h.extend(a.oBrowser,m.__browser);a.oScroll.iBarWidth=m.__browser.barWidth}function hb(a,b,c,d,e,f){var g,j=!1;c!==k&&(g=c,j=!0);for(;d!==e;)a.hasOwnProperty(d)&&
+(g=j?b(g,a[d],d,a):a[d],j=!0,d+=f);return g}function Ga(a,b){var c=m.defaults.column,d=a.aoColumns.length,c=h.extend({},m.models.oColumn,c,{nTh:b?b:I.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=h.extend({},m.models.oSearch,c[d]);ja(a,d,h(b).data())}function ja(a,b,c){var b=a.aoColumns[b],d=a.oClasses,e=h(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var f=
+(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!==k&&null!==c&&(fb(c),K(m.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),h.extend(b,c),E(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),E(b,c,"aDataSort"));var g=b.mData,j=Q(g),i=b.mRender?Q(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=h.isPlainObject(g)&&
+(c(g.sort)||c(g.type)||c(g.filter));b._setter=null;b.fnGetData=function(a,b,c){var d=j(a,b,k,c);return i&&b?i(d,b,a,c):d};b.fnSetData=function(a,b,c){return R(g)(a,b,c)};"number"!==typeof g&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==h.inArray("asc",b.asSorting);c=-1!==h.inArray("desc",b.asSorting);!b.bSortable||!a&&!c?(b.sSortingClass=d.sSortableNone,b.sSortingClassJUI=""):a&&!c?(b.sSortingClass=d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):
+!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI)}function U(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Ha(a);for(var c=0,d=b.length;c<d;c++)b[c].nTh.style.width=b[c].sWidth}b=a.oScroll;(""!==b.sY||""!==b.sX)&&ka(a);u(a,null,"column-sizing",[a])}function Z(a,b){var c=la(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function $(a,b){var c=la(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}
+function aa(a){return h(F(a.aoColumns,"nTh")).filter(":visible").length}function la(a,b){var c=[];h.map(a.aoColumns,function(a,e){a[b]&&c.push(e)});return c}function Ia(a){var b=a.aoColumns,c=a.aoData,d=m.ext.type.detect,e,f,g,j,i,h,l,q,t;e=0;for(f=b.length;e<f;e++)if(l=b[e],t=[],!l.sType&&l._sManualType)l.sType=l._sManualType;else if(!l.sType){g=0;for(j=d.length;g<j;g++){i=0;for(h=c.length;i<h;i++){t[i]===k&&(t[i]=B(a,i,e,"type"));q=d[g](t[i],a);if(!q&&g!==d.length-1)break;if("html"===q)break}if(q){l.sType=
+q;break}}l.sType||(l.sType="string")}}function ib(a,b,c,d){var e,f,g,j,i,n,l=a.aoColumns;if(b)for(e=b.length-1;0<=e;e--){n=b[e];var q=n.targets!==k?n.targets:n.aTargets;h.isArray(q)||(q=[q]);f=0;for(g=q.length;f<g;f++)if("number"===typeof q[f]&&0<=q[f]){for(;l.length<=q[f];)Ga(a);d(q[f],n)}else if("number"===typeof q[f]&&0>q[f])d(l.length+q[f],n);else if("string"===typeof q[f]){j=0;for(i=l.length;j<i;j++)("_all"==q[f]||h(l[j].nTh).hasClass(q[f]))&&d(j,n)}}if(c){e=0;for(a=c.length;e<a;e++)d(e,c[e])}}
+function N(a,b,c,d){var e=a.aoData.length,f=h.extend(!0,{},m.models.oRow,{src:c?"dom":"data",idx:e});f._aData=b;a.aoData.push(f);for(var g=a.aoColumns,j=0,i=g.length;j<i;j++)g[j].sType=null;a.aiDisplayMaster.push(e);b=a.rowIdFn(b);b!==k&&(a.aIds[b]=f);(c||!a.oFeatures.bDeferRender)&&Ja(a,e,c,d);return e}function ma(a,b){var c;b instanceof h||(b=h(b));return b.map(function(b,e){c=Ka(a,e);return N(a,c.data,e,c.cells)})}function B(a,b,c,d){var e=a.iDraw,f=a.aoColumns[c],g=a.aoData[b]._aData,j=f.sDefaultContent,
+i=f.fnGetData(g,d,{settings:a,row:b,col:c});if(i===k)return a.iDrawError!=e&&null===j&&(L(a,0,"Requested unknown parameter "+("function"==typeof f.mData?"{function}":"'"+f.mData+"'")+" for row "+b+", column "+c,4),a.iDrawError=e),j;if((i===g||null===i)&&null!==j&&d!==k)i=j;else if("function"===typeof i)return i.call(g);return null===i&&"display"==d?"":i}function jb(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d,{settings:a,row:b,col:c})}function La(a){return h.map(a.match(/(\\.|[^\.])+/g)||
+[""],function(a){return a.replace(/\\./g,".")})}function Q(a){if(h.isPlainObject(a)){var b={};h.each(a,function(a,c){c&&(b[a]=Q(c))});return function(a,c,f,g){var j=b[c]||b._;return j!==k?j(a,c,f,g):a}}if(null===a)return function(a){return a};if("function"===typeof a)return function(b,c,f,g){return a(b,c,f,g)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var c=function(a,b,f){var g,j;if(""!==f){j=La(f);for(var i=0,n=j.length;i<n;i++){f=j[i].match(ba);g=
+j[i].match(V);if(f){j[i]=j[i].replace(ba,"");""!==j[i]&&(a=a[j[i]]);g=[];j.splice(0,i+1);j=j.join(".");if(h.isArray(a)){i=0;for(n=a.length;i<n;i++)g.push(c(a[i],b,j))}a=f[0].substring(1,f[0].length-1);a=""===a?g:g.join(a);break}else if(g){j[i]=j[i].replace(V,"");a=a[j[i]]();continue}if(null===a||a[j[i]]===k)return k;a=a[j[i]]}}return a};return function(b,e){return c(b,e,a)}}return function(b){return b[a]}}function R(a){if(h.isPlainObject(a))return R(a._);if(null===a)return function(){};if("function"===
+typeof a)return function(b,d,e){a(b,"set",d,e)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var b=function(a,d,e){var e=La(e),f;f=e[e.length-1];for(var g,j,i=0,n=e.length-1;i<n;i++){g=e[i].match(ba);j=e[i].match(V);if(g){e[i]=e[i].replace(ba,"");a[e[i]]=[];f=e.slice();f.splice(0,i+1);g=f.join(".");if(h.isArray(d)){j=0;for(n=d.length;j<n;j++)f={},b(f,d[j],g),a[e[i]].push(f)}else a[e[i]]=d;return}j&&(e[i]=e[i].replace(V,""),a=a[e[i]](d));if(null===a[e[i]]||
+a[e[i]]===k)a[e[i]]={};a=a[e[i]]}if(f.match(V))a[f.replace(V,"")](d);else a[f.replace(ba,"")]=d};return function(c,d){return b(c,d,a)}}return function(b,d){b[a]=d}}function Ma(a){return F(a.aoData,"_aData")}function na(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0;a.aIds={}}function oa(a,b,c){for(var d=-1,e=0,f=a.length;e<f;e++)a[e]==b?d=e:a[e]>b&&a[e]--; -1!=d&&c===k&&a.splice(d,1)}function ca(a,b,c,d){var e=a.aoData[b],f,g=function(c,d){for(;c.childNodes.length;)c.removeChild(c.firstChild);
+c.innerHTML=B(a,b,d,"display")};if("dom"===c||(!c||"auto"===c)&&"dom"===e.src)e._aData=Ka(a,e,d,d===k?k:e._aData).data;else{var j=e.anCells;if(j)if(d!==k)g(j[d],d);else{c=0;for(f=j.length;c<f;c++)g(j[c],c)}}e._aSortData=null;e._aFilterData=null;g=a.aoColumns;if(d!==k)g[d].sType=null;else{c=0;for(f=g.length;c<f;c++)g[c].sType=null;Na(a,e)}}function Ka(a,b,c,d){var e=[],f=b.firstChild,g,j,i=0,n,l=a.aoColumns,q=a._rowReadObject,d=d!==k?d:q?{}:[],t=function(a,b){if("string"===typeof a){var c=a.indexOf("@");
+-1!==c&&(c=a.substring(c+1),R(a)(d,b.getAttribute(c)))}},S=function(a){if(c===k||c===i)j=l[i],n=h.trim(a.innerHTML),j&&j._bAttrSrc?(R(j.mData._)(d,n),t(j.mData.sort,a),t(j.mData.type,a),t(j.mData.filter,a)):q?(j._setter||(j._setter=R(j.mData)),j._setter(d,n)):d[i]=n;i++};if(f)for(;f;){g=f.nodeName.toUpperCase();if("TD"==g||"TH"==g)S(f),e.push(f);f=f.nextSibling}else{e=b.anCells;f=0;for(g=e.length;f<g;f++)S(e[f])}if(b=b.firstChild?b:b.nTr)(b=b.getAttribute("id"))&&R(a.rowId)(d,b);return{data:d,cells:e}}
+function Ja(a,b,c,d){var e=a.aoData[b],f=e._aData,g=[],j,i,n,l,q;if(null===e.nTr){j=c||I.createElement("tr");e.nTr=j;e.anCells=g;j._DT_RowIndex=b;Na(a,e);l=0;for(q=a.aoColumns.length;l<q;l++){n=a.aoColumns[l];i=c?d[l]:I.createElement(n.sCellType);i._DT_CellIndex={row:b,column:l};g.push(i);if((!c||n.mRender||n.mData!==l)&&(!h.isPlainObject(n.mData)||n.mData._!==l+".display"))i.innerHTML=B(a,b,l,"display");n.sClass&&(i.className+=" "+n.sClass);n.bVisible&&!c?j.appendChild(i):!n.bVisible&&c&&i.parentNode.removeChild(i);
+n.fnCreatedCell&&n.fnCreatedCell.call(a.oInstance,i,B(a,b,l),f,b,l)}u(a,"aoRowCreatedCallback",null,[j,f,b])}e.nTr.setAttribute("role","row")}function Na(a,b){var c=b.nTr,d=b._aData;if(c){var e=a.rowIdFn(d);e&&(c.id=e);d.DT_RowClass&&(e=d.DT_RowClass.split(" "),b.__rowc=b.__rowc?pa(b.__rowc.concat(e)):e,h(c).removeClass(b.__rowc.join(" ")).addClass(d.DT_RowClass));d.DT_RowAttr&&h(c).attr(d.DT_RowAttr);d.DT_RowData&&h(c).data(d.DT_RowData)}}function kb(a){var b,c,d,e,f,g=a.nTHead,j=a.nTFoot,i=0===
+h("th, td",g).length,n=a.oClasses,l=a.aoColumns;i&&(e=h("<tr/>").appendTo(g));b=0;for(c=l.length;b<c;b++)f=l[b],d=h(f.nTh).addClass(f.sClass),i&&d.appendTo(e),a.oFeatures.bSort&&(d.addClass(f.sSortingClass),!1!==f.bSortable&&(d.attr("tabindex",a.iTabIndex).attr("aria-controls",a.sTableId),Oa(a,f.nTh,b))),f.sTitle!=d[0].innerHTML&&d.html(f.sTitle),Pa(a,"header")(a,d,f,n);i&&da(a.aoHeader,g);h(g).find(">tr").attr("role","row");h(g).find(">tr>th, >tr>td").addClass(n.sHeaderTH);h(j).find(">tr>th, >tr>td").addClass(n.sFooterTH);
+if(null!==j){a=a.aoFooter[0];b=0;for(c=a.length;b<c;b++)f=l[b],f.nTf=a[b].cell,f.sClass&&h(f.nTf).addClass(f.sClass)}}function ea(a,b,c){var d,e,f,g=[],j=[],i=a.aoColumns.length,n;if(b){c===k&&(c=!1);d=0;for(e=b.length;d<e;d++){g[d]=b[d].slice();g[d].nTr=b[d].nTr;for(f=i-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&g[d].splice(f,1);j.push([])}d=0;for(e=g.length;d<e;d++){if(a=g[d].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[d].length;f<b;f++)if(n=i=1,j[d][f]===k){a.appendChild(g[d][f].cell);
+for(j[d][f]=1;g[d+i]!==k&&g[d][f].cell==g[d+i][f].cell;)j[d+i][f]=1,i++;for(;g[d][f+n]!==k&&g[d][f].cell==g[d][f+n].cell;){for(c=0;c<i;c++)j[d+c][f+n]=1;n++}h(g[d][f].cell).attr("rowspan",i).attr("colspan",n)}}}}function O(a){var b=u(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))C(a,!1);else{var b=[],c=0,d=a.asStripeClasses,e=d.length,f=a.oLanguage,g=a.iInitDisplayStart,j="ssp"==y(a),i=a.aiDisplay;a.bDrawing=!0;g!==k&&-1!==g&&(a._iDisplayStart=j?g:g>=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=
+-1);var g=a._iDisplayStart,n=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,C(a,!1);else if(j){if(!a.bDestroying&&!lb(a))return}else a.iDraw++;if(0!==i.length){f=j?a.aoData.length:n;for(j=j?0:g;j<f;j++){var l=i[j],q=a.aoData[l];null===q.nTr&&Ja(a,l);l=q.nTr;if(0!==e){var t=d[c%e];q._sRowStripe!=t&&(h(l).removeClass(q._sRowStripe).addClass(t),q._sRowStripe=t)}u(a,"aoRowCallback",null,[l,q._aData,c,j]);b.push(l);c++}}else c=f.sZeroRecords,1==a.iDraw&&"ajax"==y(a)?c=f.sLoadingRecords:
+f.sEmptyTable&&0===a.fnRecordsTotal()&&(c=f.sEmptyTable),b[0]=h("<tr/>",{"class":e?d[0]:""}).append(h("<td />",{valign:"top",colSpan:aa(a),"class":a.oClasses.sRowEmpty}).html(c))[0];u(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],Ma(a),g,n,i]);u(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],Ma(a),g,n,i]);d=h(a.nTBody);d.children().detach();d.append(h(b));u(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function T(a,b){var c=a.oFeatures,d=c.bFilter;
+c.bSort&&mb(a);d?fa(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;O(a);a._drawHold=!1}function nb(a){var b=a.oClasses,c=h(a.nTable),c=h("<div/>").insertBefore(c),d=a.oFeatures,e=h("<div/>",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var f=a.sDom.split(""),g,j,i,n,l,q,t=0;t<f.length;t++){g=null;j=f[t];if("<"==j){i=h("<div/>")[0];
+n=f[t+1];if("'"==n||'"'==n){l="";for(q=2;f[t+q]!=n;)l+=f[t+q],q++;"H"==l?l=b.sJUIHeader:"F"==l&&(l=b.sJUIFooter);-1!=l.indexOf(".")?(n=l.split("."),i.id=n[0].substr(1,n[0].length-1),i.className=n[1]):"#"==l.charAt(0)?i.id=l.substr(1,l.length-1):i.className=l;t+=q}e.append(i);e=h(i)}else if(">"==j)e=e.parent();else if("l"==j&&d.bPaginate&&d.bLengthChange)g=ob(a);else if("f"==j&&d.bFilter)g=pb(a);else if("r"==j&&d.bProcessing)g=qb(a);else if("t"==j)g=rb(a);else if("i"==j&&d.bInfo)g=sb(a);else if("p"==
+j&&d.bPaginate)g=tb(a);else if(0!==m.ext.feature.length){i=m.ext.feature;q=0;for(n=i.length;q<n;q++)if(j==i[q].cFeature){g=i[q].fnInit(a);break}}g&&(i=a.aanFeatures,i[j]||(i[j]=[]),i[j].push(g),e.append(g))}c.replaceWith(e);a.nHolding=null}function da(a,b){var c=h(b).children("tr"),d,e,f,g,j,i,n,l,q,t;a.splice(0,a.length);f=0;for(i=c.length;f<i;f++)a.push([]);f=0;for(i=c.length;f<i;f++){d=c[f];for(e=d.firstChild;e;){if("TD"==e.nodeName.toUpperCase()||"TH"==e.nodeName.toUpperCase()){l=1*e.getAttribute("colspan");
+q=1*e.getAttribute("rowspan");l=!l||0===l||1===l?1:l;q=!q||0===q||1===q?1:q;g=0;for(j=a[f];j[g];)g++;n=g;t=1===l?!0:!1;for(j=0;j<l;j++)for(g=0;g<q;g++)a[f+g][n+j]={cell:e,unique:t},a[f+g].nTr=d}e=e.nextSibling}}}function qa(a,b,c){var d=[];c||(c=a.aoHeader,b&&(c=[],da(c,b)));for(var b=0,e=c.length;b<e;b++)for(var f=0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!d[f]||!a.bSortCellsTop))d[f]=c[b][f].cell;return d}function ra(a,b,c){u(a,"aoServerParams","serverParams",[b]);if(b&&h.isArray(b)){var d={},
+e=/(.*?)\[\]$/;h.each(b,function(a,b){var c=b.name.match(e);c?(c=c[0],d[c]||(d[c]=[]),d[c].push(b.value)):d[b.name]=b.value});b=d}var f,g=a.ajax,j=a.oInstance,i=function(b){u(a,null,"xhr",[a,b,a.jqXHR]);c(b)};if(h.isPlainObject(g)&&g.data){f=g.data;var n=h.isFunction(f)?f(b,a):f,b=h.isFunction(f)&&n?n:h.extend(!0,b,n);delete g.data}n={data:b,success:function(b){var c=b.error||b.sError;c&&L(a,0,c);a.json=b;i(b)},dataType:"json",cache:!1,type:a.sServerMethod,error:function(b,c){var d=u(a,null,"xhr",
+[a,null,a.jqXHR]);-1===h.inArray(!0,d)&&("parsererror"==c?L(a,0,"Invalid JSON response",1):4===b.readyState&&L(a,0,"Ajax error",7));C(a,!1)}};a.oAjaxData=b;u(a,null,"preXhr",[a,b]);a.fnServerData?a.fnServerData.call(j,a.sAjaxSource,h.map(b,function(a,b){return{name:b,value:a}}),i,a):a.sAjaxSource||"string"===typeof g?a.jqXHR=h.ajax(h.extend(n,{url:g||a.sAjaxSource})):h.isFunction(g)?a.jqXHR=g.call(j,b,i,a):(a.jqXHR=h.ajax(h.extend(n,g)),g.data=f)}function lb(a){return a.bAjaxDataGet?(a.iDraw++,C(a,
+!0),ra(a,ub(a),function(b){vb(a,b)}),!1):!0}function ub(a){var b=a.aoColumns,c=b.length,d=a.oFeatures,e=a.oPreviousSearch,f=a.aoPreSearchCols,g,j=[],i,n,l,q=W(a);g=a._iDisplayStart;i=!1!==d.bPaginate?a._iDisplayLength:-1;var k=function(a,b){j.push({name:a,value:b})};k("sEcho",a.iDraw);k("iColumns",c);k("sColumns",F(b,"sName").join(","));k("iDisplayStart",g);k("iDisplayLength",i);var S={draw:a.iDraw,columns:[],order:[],start:g,length:i,search:{value:e.sSearch,regex:e.bRegex}};for(g=0;g<c;g++)n=b[g],
+l=f[g],i="function"==typeof n.mData?"function":n.mData,S.columns.push({data:i,name:n.sName,searchable:n.bSearchable,orderable:n.bSortable,search:{value:l.sSearch,regex:l.bRegex}}),k("mDataProp_"+g,i),d.bFilter&&(k("sSearch_"+g,l.sSearch),k("bRegex_"+g,l.bRegex),k("bSearchable_"+g,n.bSearchable)),d.bSort&&k("bSortable_"+g,n.bSortable);d.bFilter&&(k("sSearch",e.sSearch),k("bRegex",e.bRegex));d.bSort&&(h.each(q,function(a,b){S.order.push({column:b.col,dir:b.dir});k("iSortCol_"+a,b.col);k("sSortDir_"+
+a,b.dir)}),k("iSortingCols",q.length));b=m.ext.legacy.ajax;return null===b?a.sAjaxSource?j:S:b?j:S}function vb(a,b){var c=sa(a,b),d=b.sEcho!==k?b.sEcho:b.draw,e=b.iTotalRecords!==k?b.iTotalRecords:b.recordsTotal,f=b.iTotalDisplayRecords!==k?b.iTotalDisplayRecords:b.recordsFiltered;if(d){if(1*d<a.iDraw)return;a.iDraw=1*d}na(a);a._iRecordsTotal=parseInt(e,10);a._iRecordsDisplay=parseInt(f,10);d=0;for(e=c.length;d<e;d++)N(a,c[d]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;O(a);a._bInitComplete||
+ta(a,b);a.bAjaxDataGet=!0;C(a,!1)}function sa(a,b){var c=h.isPlainObject(a.ajax)&&a.ajax.dataSrc!==k?a.ajax.dataSrc:a.sAjaxDataProp;return"data"===c?b.aaData||b[c]:""!==c?Q(c)(b):b}function pb(a){var b=a.oClasses,c=a.sTableId,d=a.oLanguage,e=a.oPreviousSearch,f=a.aanFeatures,g='<input type="search" class="'+b.sFilterInput+'"/>',j=d.sSearch,j=j.match(/_INPUT_/)?j.replace("_INPUT_",g):j+g,b=h("<div/>",{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(h("<label/>").append(j)),f=function(){var b=!this.value?
+"":this.value;b!=e.sSearch&&(fa(a,{sSearch:b,bRegex:e.bRegex,bSmart:e.bSmart,bCaseInsensitive:e.bCaseInsensitive}),a._iDisplayStart=0,O(a))},g=null!==a.searchDelay?a.searchDelay:"ssp"===y(a)?400:0,i=h("input",b).val(e.sSearch).attr("placeholder",d.sSearchPlaceholder).bind("keyup.DT search.DT input.DT paste.DT cut.DT",g?ua(f,g):f).bind("keypress.DT",function(a){if(13==a.keyCode)return!1}).attr("aria-controls",c);h(a.nTable).on("search.dt.DT",function(b,c){if(a===c)try{i[0]!==I.activeElement&&i.val(e.sSearch)}catch(d){}});
+return b[0]}function fa(a,b,c){var d=a.oPreviousSearch,e=a.aoPreSearchCols,f=function(a){d.sSearch=a.sSearch;d.bRegex=a.bRegex;d.bSmart=a.bSmart;d.bCaseInsensitive=a.bCaseInsensitive};Ia(a);if("ssp"!=y(a)){wb(a,b.sSearch,c,b.bEscapeRegex!==k?!b.bEscapeRegex:b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<e.length;b++)xb(a,e[b].sSearch,b,e[b].bEscapeRegex!==k?!e[b].bEscapeRegex:e[b].bRegex,e[b].bSmart,e[b].bCaseInsensitive);yb(a)}else f(b);a.bFiltered=!0;u(a,null,"search",[a])}function yb(a){for(var b=
+m.ext.search,c=a.aiDisplay,d,e,f=0,g=b.length;f<g;f++){for(var j=[],i=0,n=c.length;i<n;i++)e=c[i],d=a.aoData[e],b[f](a,d._aFilterData,e,d._aData,i)&&j.push(e);c.length=0;h.merge(c,j)}}function xb(a,b,c,d,e,f){if(""!==b)for(var g=a.aiDisplay,d=Qa(b,d,e,f),e=g.length-1;0<=e;e--)b=a.aoData[g[e]]._aFilterData[c],d.test(b)||g.splice(e,1)}function wb(a,b,c,d,e,f){var d=Qa(b,d,e,f),e=a.oPreviousSearch.sSearch,f=a.aiDisplayMaster,g;0!==m.ext.search.length&&(c=!0);g=zb(a);if(0>=b.length)a.aiDisplay=f.slice();
+else{if(g||c||e.length>b.length||0!==b.indexOf(e)||a.bSorted)a.aiDisplay=f.slice();b=a.aiDisplay;for(c=b.length-1;0<=c;c--)d.test(a.aoData[b[c]]._sFilterRow)||b.splice(c,1)}}function Qa(a,b,c,d){a=b?a:va(a);c&&(a="^(?=.*?"+h.map(a.match(/"[^"]+"|[^ ]+/g)||[""],function(a){if('"'===a.charAt(0))var b=a.match(/^"(.*)"$/),a=b?b[1]:a;return a.replace('"',"")}).join(")(?=.*?")+").*$");return RegExp(a,d?"i":"")}function va(a){return a.replace(Zb,"\\$1")}function zb(a){var b=a.aoColumns,c,d,e,f,g,j,i,h,l=
+m.ext.type.search;c=!1;d=0;for(f=a.aoData.length;d<f;d++)if(h=a.aoData[d],!h._aFilterData){j=[];e=0;for(g=b.length;e<g;e++)c=b[e],c.bSearchable?(i=B(a,d,e,"filter"),l[c.sType]&&(i=l[c.sType](i)),null===i&&(i=""),"string"!==typeof i&&i.toString&&(i=i.toString())):i="",i.indexOf&&-1!==i.indexOf("&")&&(wa.innerHTML=i,i=$b?wa.textContent:wa.innerText),i.replace&&(i=i.replace(/[\r\n]/g,"")),j.push(i);h._aFilterData=j;h._sFilterRow=j.join("  ");c=!0}return c}function Ab(a){return{search:a.sSearch,smart:a.bSmart,
+regex:a.bRegex,caseInsensitive:a.bCaseInsensitive}}function Bb(a){return{sSearch:a.search,bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function sb(a){var b=a.sTableId,c=a.aanFeatures.i,d=h("<div/>",{"class":a.oClasses.sInfo,id:!c?b+"_info":null});c||(a.aoDrawCallback.push({fn:Cb,sName:"information"}),d.attr("role","status").attr("aria-live","polite"),h(a.nTable).attr("aria-describedby",b+"_info"));return d[0]}function Cb(a){var b=a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,
+d=a._iDisplayStart+1,e=a.fnDisplayEnd(),f=a.fnRecordsTotal(),g=a.fnRecordsDisplay(),j=g?c.sInfo:c.sInfoEmpty;g!==f&&(j+=" "+c.sInfoFiltered);j+=c.sInfoPostFix;j=Db(a,j);c=c.fnInfoCallback;null!==c&&(j=c.call(a.oInstance,a,d,e,f,g,j));h(b).html(j)}}function Db(a,b){var c=a.fnFormatNumber,d=a._iDisplayStart+1,e=a._iDisplayLength,f=a.fnRecordsDisplay(),g=-1===e;return b.replace(/_START_/g,c.call(a,d)).replace(/_END_/g,c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,
+c.call(a,f)).replace(/_PAGE_/g,c.call(a,g?1:Math.ceil(d/e))).replace(/_PAGES_/g,c.call(a,g?1:Math.ceil(f/e)))}function ga(a){var b,c,d=a.iInitDisplayStart,e=a.aoColumns,f;c=a.oFeatures;var g=a.bDeferLoading;if(a.bInitialised){nb(a);kb(a);ea(a,a.aoHeader);ea(a,a.aoFooter);C(a,!0);c.bAutoWidth&&Ha(a);b=0;for(c=e.length;b<c;b++)f=e[b],f.sWidth&&(f.nTh.style.width=x(f.sWidth));u(a,null,"preInit",[a]);T(a);e=y(a);if("ssp"!=e||g)"ajax"==e?ra(a,[],function(c){var f=sa(a,c);for(b=0;b<f.length;b++)N(a,f[b]);
+a.iInitDisplayStart=d;T(a);C(a,!1);ta(a,c)},a):(C(a,!1),ta(a))}else setTimeout(function(){ga(a)},200)}function ta(a,b){a._bInitComplete=!0;(b||a.oInit.aaData)&&U(a);u(a,null,"plugin-init",[a,b]);u(a,"aoInitComplete","init",[a,b])}function Ra(a,b){var c=parseInt(b,10);a._iDisplayLength=c;Sa(a);u(a,null,"length",[a,c])}function ob(a){for(var b=a.oClasses,c=a.sTableId,d=a.aLengthMenu,e=h.isArray(d[0]),f=e?d[0]:d,d=e?d[1]:d,e=h("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect}),
+g=0,j=f.length;g<j;g++)e[0][g]=new Option(d[g],f[g]);var i=h("<div><label/></div>").addClass(b.sLength);a.aanFeatures.l||(i[0].id=c+"_length");i.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",e[0].outerHTML));h("select",i).val(a._iDisplayLength).bind("change.DT",function(){Ra(a,h(this).val());O(a)});h(a.nTable).bind("length.dt.DT",function(b,c,d){a===c&&h("select",i).val(d)});return i[0]}function tb(a){var b=a.sPaginationType,c=m.ext.pager[b],d="function"===typeof c,e=function(a){O(a)},
+b=h("<div/>").addClass(a.oClasses.sPaging+b)[0],f=a.aanFeatures;d||c.fnInit(a,b,e);f.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(a){if(d){var b=a._iDisplayStart,i=a._iDisplayLength,h=a.fnRecordsDisplay(),l=-1===i,b=l?0:Math.ceil(b/i),i=l?1:Math.ceil(h/i),h=c(b,i),k,l=0;for(k=f.p.length;l<k;l++)Pa(a,"pageButton")(a,f.p[l],l,h,b,i)}else c.fnUpdate(a,e)},sName:"pagination"}));return b}function Ta(a,b,c){var d=a._iDisplayStart,e=a._iDisplayLength,f=a.fnRecordsDisplay();0===f||-1===
+e?d=0:"number"===typeof b?(d=b*e,d>f&&(d=0)):"first"==b?d=0:"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==b?d+e<f&&(d+=e):"last"==b?d=Math.floor((f-1)/e)*e:L(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==d;a._iDisplayStart=d;b&&(u(a,null,"page",[a]),c&&O(a));return b}function qb(a){return h("<div/>",{id:!a.aanFeatures.r?a.sTableId+"_processing":null,"class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function C(a,b){a.oFeatures.bProcessing&&h(a.aanFeatures.r).css("display",
+b?"block":"none");u(a,null,"processing",[a,b])}function rb(a){var b=h(a.nTable);b.attr("role","grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,f=a.oClasses,g=b.children("caption"),j=g.length?g[0]._captionSide:null,i=h(b[0].cloneNode(!1)),n=h(b[0].cloneNode(!1)),l=b.children("tfoot");l.length||(l=null);i=h("<div/>",{"class":f.sScrollWrapper}).append(h("<div/>",{"class":f.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,width:d?!d?null:x(d):"100%"}).append(h("<div/>",
+{"class":f.sScrollHeadInner}).css({"box-sizing":"content-box",width:c.sXInner||"100%"}).append(i.removeAttr("id").css("margin-left",0).append("top"===j?g:null).append(b.children("thead"))))).append(h("<div/>",{"class":f.sScrollBody}).css({position:"relative",overflow:"auto",width:!d?null:x(d)}).append(b));l&&i.append(h("<div/>",{"class":f.sScrollFoot}).css({overflow:"hidden",border:0,width:d?!d?null:x(d):"100%"}).append(h("<div/>",{"class":f.sScrollFootInner}).append(n.removeAttr("id").css("margin-left",
+0).append("bottom"===j?g:null).append(b.children("tfoot")))));var b=i.children(),k=b[0],f=b[1],t=l?b[2]:null;if(d)h(f).on("scroll.DT",function(){var a=this.scrollLeft;k.scrollLeft=a;l&&(t.scrollLeft=a)});h(f).css(e&&c.bCollapse?"max-height":"height",e);a.nScrollHead=k;a.nScrollBody=f;a.nScrollFoot=t;a.aoDrawCallback.push({fn:ka,sName:"scrolling"});return i[0]}function ka(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY,b=b.iBarWidth,f=h(a.nScrollHead),g=f[0].style,j=f.children("div"),i=j[0].style,n=j.children("table"),
+j=a.nScrollBody,l=h(j),q=j.style,t=h(a.nScrollFoot).children("div"),m=t.children("table"),o=h(a.nTHead),G=h(a.nTable),p=G[0],r=p.style,u=a.nTFoot?h(a.nTFoot):null,Eb=a.oBrowser,Ua=Eb.bScrollOversize,s=F(a.aoColumns,"nTh"),P,v,w,y,z=[],A=[],B=[],C=[],D,E=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};v=j.scrollHeight>j.clientHeight;if(a.scrollBarVis!==v&&a.scrollBarVis!==k)a.scrollBarVis=v,U(a);else{a.scrollBarVis=v;G.children("thead, tfoot").remove();
+u&&(w=u.clone().prependTo(G),P=u.find("tr"),w=w.find("tr"));y=o.clone().prependTo(G);o=o.find("tr");v=y.find("tr");y.find("th, td").removeAttr("tabindex");c||(q.width="100%",f[0].style.width="100%");h.each(qa(a,y),function(b,c){D=Z(a,b);c.style.width=a.aoColumns[D].sWidth});u&&J(function(a){a.style.width=""},w);f=G.outerWidth();if(""===c){r.width="100%";if(Ua&&(G.find("tbody").height()>j.offsetHeight||"scroll"==l.css("overflow-y")))r.width=x(G.outerWidth()-b);f=G.outerWidth()}else""!==d&&(r.width=
+x(d),f=G.outerWidth());J(E,v);J(function(a){B.push(a.innerHTML);z.push(x(h(a).css("width")))},v);J(function(a,b){if(h.inArray(a,s)!==-1)a.style.width=z[b]},o);h(v).height(0);u&&(J(E,w),J(function(a){C.push(a.innerHTML);A.push(x(h(a).css("width")))},w),J(function(a,b){a.style.width=A[b]},P),h(w).height(0));J(function(a,b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+B[b]+"</div>";a.style.width=z[b]},v);u&&J(function(a,b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+
+C[b]+"</div>";a.style.width=A[b]},w);if(G.outerWidth()<f){P=j.scrollHeight>j.offsetHeight||"scroll"==l.css("overflow-y")?f+b:f;if(Ua&&(j.scrollHeight>j.offsetHeight||"scroll"==l.css("overflow-y")))r.width=x(P-b);(""===c||""!==d)&&L(a,1,"Possible column misalignment",6)}else P="100%";q.width=x(P);g.width=x(P);u&&(a.nScrollFoot.style.width=x(P));!e&&Ua&&(q.height=x(p.offsetHeight+b));c=G.outerWidth();n[0].style.width=x(c);i.width=x(c);d=G.height()>j.clientHeight||"scroll"==l.css("overflow-y");e="padding"+
+(Eb.bScrollbarLeft?"Left":"Right");i[e]=d?b+"px":"0px";u&&(m[0].style.width=x(c),t[0].style.width=x(c),t[0].style[e]=d?b+"px":"0px");G.children("colgroup").insertBefore(G.children("thead"));l.scroll();if((a.bSorted||a.bFiltered)&&!a._drawHold)j.scrollTop=0}}function J(a,b,c){for(var d=0,e=0,f=b.length,g,j;e<f;){g=b[e].firstChild;for(j=c?c[e].firstChild:null;g;)1===g.nodeType&&(c?a(g,j,d):a(g,d),d++),g=g.nextSibling,j=c?j.nextSibling:null;e++}}function Ha(a){var b=a.nTable,c=a.aoColumns,d=a.oScroll,
+e=d.sY,f=d.sX,g=d.sXInner,j=c.length,i=la(a,"bVisible"),n=h("th",a.nTHead),l=b.getAttribute("width"),k=b.parentNode,t=!1,m,o,p=a.oBrowser,d=p.bScrollOversize;(m=b.style.width)&&-1!==m.indexOf("%")&&(l=m);for(m=0;m<i.length;m++)o=c[i[m]],null!==o.sWidth&&(o.sWidth=Fb(o.sWidthOrig,k),t=!0);if(d||!t&&!f&&!e&&j==aa(a)&&j==n.length)for(m=0;m<j;m++)i=Z(a,m),null!==i&&(c[i].sWidth=x(n.eq(m).width()));else{j=h(b).clone().css("visibility","hidden").removeAttr("id");j.find("tbody tr").remove();var r=h("<tr/>").appendTo(j.find("tbody"));
+j.find("thead, tfoot").remove();j.append(h(a.nTHead).clone()).append(h(a.nTFoot).clone());j.find("tfoot th, tfoot td").css("width","");n=qa(a,j.find("thead")[0]);for(m=0;m<i.length;m++)o=c[i[m]],n[m].style.width=null!==o.sWidthOrig&&""!==o.sWidthOrig?x(o.sWidthOrig):"",o.sWidthOrig&&f&&h(n[m]).append(h("<div/>").css({width:o.sWidthOrig,margin:0,padding:0,border:0,height:1}));if(a.aoData.length)for(m=0;m<i.length;m++)t=i[m],o=c[t],h(Gb(a,t)).clone(!1).append(o.sContentPadding).appendTo(r);h("[name]",
+j).removeAttr("name");o=h("<div/>").css(f||e?{position:"absolute",top:0,left:0,height:1,right:0,overflow:"hidden"}:{}).append(j).appendTo(k);f&&g?j.width(g):f?(j.css("width","auto"),j.removeAttr("width"),j.width()<k.clientWidth&&l&&j.width(k.clientWidth)):e?j.width(k.clientWidth):l&&j.width(l);for(m=e=0;m<i.length;m++)k=h(n[m]),g=k.outerWidth()-k.width(),k=p.bBounding?Math.ceil(n[m].getBoundingClientRect().width):k.outerWidth(),e+=k,c[i[m]].sWidth=x(k-g);b.style.width=x(e);o.remove()}l&&(b.style.width=
+x(l));if((l||f)&&!a._reszEvt)b=function(){h(D).bind("resize.DT-"+a.sInstance,ua(function(){U(a)}))},d?setTimeout(b,1E3):b(),a._reszEvt=!0}function ua(a,b){var c=b!==k?b:200,d,e;return function(){var b=this,g=+new Date,j=arguments;d&&g<d+c?(clearTimeout(e),e=setTimeout(function(){d=k;a.apply(b,j)},c)):(d=g,a.apply(b,j))}}function Fb(a,b){if(!a)return 0;var c=h("<div/>").css("width",x(a)).appendTo(b||I.body),d=c[0].offsetWidth;c.remove();return d}function Gb(a,b){var c=Hb(a,b);if(0>c)return null;var d=
+a.aoData[c];return!d.nTr?h("<td/>").html(B(a,c,b,"display"))[0]:d.anCells[b]}function Hb(a,b){for(var c,d=-1,e=-1,f=0,g=a.aoData.length;f<g;f++)c=B(a,f,b,"display")+"",c=c.replace(ac,""),c=c.replace(/&nbsp;/g," "),c.length>d&&(d=c.length,e=f);return e}function x(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function W(a){var b,c,d=[],e=a.aoColumns,f,g,j,i;b=a.aaSortingFixed;c=h.isPlainObject(b);var n=[];f=function(a){a.length&&!h.isArray(a[0])?n.push(a):h.merge(n,
+a)};h.isArray(b)&&f(b);c&&b.pre&&f(b.pre);f(a.aaSorting);c&&b.post&&f(b.post);for(a=0;a<n.length;a++){i=n[a][0];f=e[i].aDataSort;b=0;for(c=f.length;b<c;b++)g=f[b],j=e[g].sType||"string",n[a]._idx===k&&(n[a]._idx=h.inArray(n[a][1],e[g].asSorting)),d.push({src:i,col:g,dir:n[a][1],index:n[a]._idx,type:j,formatter:m.ext.type.order[j+"-pre"]})}return d}function mb(a){var b,c,d=[],e=m.ext.type.order,f=a.aoData,g=0,j,i=a.aiDisplayMaster,h;Ia(a);h=W(a);b=0;for(c=h.length;b<c;b++)j=h[b],j.formatter&&g++,Ib(a,
+j.col);if("ssp"!=y(a)&&0!==h.length){b=0;for(c=i.length;b<c;b++)d[i[b]]=b;g===h.length?i.sort(function(a,b){var c,e,g,j,i=h.length,k=f[a]._aSortData,m=f[b]._aSortData;for(g=0;g<i;g++)if(j=h[g],c=k[j.col],e=m[j.col],c=c<e?-1:c>e?1:0,0!==c)return"asc"===j.dir?c:-c;c=d[a];e=d[b];return c<e?-1:c>e?1:0}):i.sort(function(a,b){var c,g,j,i,k=h.length,m=f[a]._aSortData,p=f[b]._aSortData;for(j=0;j<k;j++)if(i=h[j],c=m[i.col],g=p[i.col],i=e[i.type+"-"+i.dir]||e["string-"+i.dir],c=i(c,g),0!==c)return c;c=d[a];
+g=d[b];return c<g?-1:c>g?1:0})}a.bSorted=!0}function Jb(a){for(var b,c,d=a.aoColumns,e=W(a),a=a.oLanguage.oAria,f=0,g=d.length;f<g;f++){c=d[f];var j=c.asSorting;b=c.sTitle.replace(/<.*?>/g,"");var i=c.nTh;i.removeAttribute("aria-sort");c.bSortable&&(0<e.length&&e[0].col==f?(i.setAttribute("aria-sort","asc"==e[0].dir?"ascending":"descending"),c=j[e[0].index+1]||j[0]):c=j[0],b+="asc"===c?a.sSortAscending:a.sSortDescending);i.setAttribute("aria-label",b)}}function Va(a,b,c,d){var e=a.aaSorting,f=a.aoColumns[b].asSorting,
+g=function(a,b){var c=a._idx;c===k&&(c=h.inArray(a[1],f));return c+1<f.length?c+1:b?null:0};"number"===typeof e[0]&&(e=a.aaSorting=[e]);c&&a.oFeatures.bSortMulti?(c=h.inArray(b,F(e,"0")),-1!==c?(b=g(e[c],!0),null===b&&1===e.length&&(b=0),null===b?e.splice(c,1):(e[c][1]=f[b],e[c]._idx=b)):(e.push([b,f[0],0]),e[e.length-1]._idx=0)):e.length&&e[0][0]==b?(b=g(e[0]),e.length=1,e[0][1]=f[b],e[0]._idx=b):(e.length=0,e.push([b,f[0]]),e[0]._idx=0);T(a);"function"==typeof d&&d(a)}function Oa(a,b,c,d){var e=
+a.aoColumns[c];Wa(b,{},function(b){!1!==e.bSortable&&(a.oFeatures.bProcessing?(C(a,!0),setTimeout(function(){Va(a,c,b.shiftKey,d);"ssp"!==y(a)&&C(a,!1)},0)):Va(a,c,b.shiftKey,d))})}function xa(a){var b=a.aLastSort,c=a.oClasses.sSortColumn,d=W(a),e=a.oFeatures,f,g;if(e.bSort&&e.bSortClasses){e=0;for(f=b.length;e<f;e++)g=b[e].src,h(F(a.aoData,"anCells",g)).removeClass(c+(2>e?e+1:3));e=0;for(f=d.length;e<f;e++)g=d[e].src,h(F(a.aoData,"anCells",g)).addClass(c+(2>e?e+1:3))}a.aLastSort=d}function Ib(a,
+b){var c=a.aoColumns[b],d=m.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,$(a,b)));for(var f,g=m.ext.type.order[c.sType+"-pre"],j=0,i=a.aoData.length;j<i;j++)if(c=a.aoData[j],c._aSortData||(c._aSortData=[]),!c._aSortData[b]||d)f=d?e[j]:B(a,j,b,"sort"),c._aSortData[b]=g?g(f):f}function ya(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:h.extend(!0,[],a.aaSorting),search:Ab(a.oPreviousSearch),columns:h.map(a.aoColumns,
+function(b,d){return{visible:b.bVisible,search:Ab(a.aoPreSearchCols[d])}})};u(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oSavedState=b;a.fnStateSaveCallback.call(a.oInstance,a,b)}}function Kb(a){var b,c,d=a.aoColumns;if(a.oFeatures.bStateSave){var e=a.fnStateLoadCallback.call(a.oInstance,a);if(e&&e.time&&(b=u(a,"aoStateLoadParams","stateLoadParams",[a,e]),-1===h.inArray(!1,b)&&(b=a.iStateDuration,!(0<b&&e.time<+new Date-1E3*b)&&d.length===e.columns.length))){a.oLoadedState=h.extend(!0,{},e);
+e.start!==k&&(a._iDisplayStart=e.start,a.iInitDisplayStart=e.start);e.length!==k&&(a._iDisplayLength=e.length);e.order!==k&&(a.aaSorting=[],h.each(e.order,function(b,c){a.aaSorting.push(c[0]>=d.length?[0,c[1]]:c)}));e.search!==k&&h.extend(a.oPreviousSearch,Bb(e.search));b=0;for(c=e.columns.length;b<c;b++){var f=e.columns[b];f.visible!==k&&(d[b].bVisible=f.visible);f.search!==k&&h.extend(a.aoPreSearchCols[b],Bb(f.search))}u(a,"aoStateLoaded","stateLoaded",[a,e])}}}function za(a){var b=m.settings,a=
+h.inArray(a,F(b,"nTable"));return-1!==a?b[a]:null}function L(a,b,c,d){c="DataTables warning: "+(a?"table id="+a.sTableId+" - ":"")+c;d&&(c+=". For more information about this error, please see http://datatables.net/tn/"+d);if(b)D.console&&console.log&&console.log(c);else if(b=m.ext,b=b.sErrMode||b.errMode,a&&u(a,null,"error",[a,d,c]),"alert"==b)alert(c);else{if("throw"==b)throw Error(c);"function"==typeof b&&b(a,d,c)}}function E(a,b,c,d){h.isArray(c)?h.each(c,function(c,d){h.isArray(d)?E(a,b,d[0],
+d[1]):E(a,b,d)}):(d===k&&(d=c),b[c]!==k&&(a[d]=b[c]))}function Lb(a,b,c){var d,e;for(e in b)b.hasOwnProperty(e)&&(d=b[e],h.isPlainObject(d)?(h.isPlainObject(a[e])||(a[e]={}),h.extend(!0,a[e],d)):a[e]=c&&"data"!==e&&"aaData"!==e&&h.isArray(d)?d.slice():d);return a}function Wa(a,b,c){h(a).bind("click.DT",b,function(b){a.blur();c(b)}).bind("keypress.DT",b,function(a){13===a.which&&(a.preventDefault(),c(a))}).bind("selectstart.DT",function(){return!1})}function z(a,b,c,d){c&&a[b].push({fn:c,sName:d})}
+function u(a,b,c,d){var e=[];b&&(e=h.map(a[b].slice().reverse(),function(b){return b.fn.apply(a.oInstance,d)}));null!==c&&(b=h.Event(c+".dt"),h(a.nTable).trigger(b,d),e.push(b.result));return e}function Sa(a){var b=a._iDisplayStart,c=a.fnDisplayEnd(),d=a._iDisplayLength;b>=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function Pa(a,b){var c=a.renderer,d=m.ext.renderer[b];return h.isPlainObject(c)&&c[b]?d[c[b]]||d._:"string"===typeof c?d[c]||d._:d._}function y(a){return a.oFeatures.bServerSide?
+"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function Aa(a,b){var c=[],c=Mb.numbers_length,d=Math.floor(c/2);b<=c?c=X(0,b):a<=d?(c=X(0,c-2),c.push("ellipsis"),c.push(b-1)):(a>=b-1-d?c=X(b-(c-2),b):(c=X(a-d+2,a+d-1),c.push("ellipsis"),c.push(b-1)),c.splice(0,0,"ellipsis"),c.splice(0,0,0));c.DT_el="span";return c}function db(a){h.each({num:function(b){return Ba(b,a)},"num-fmt":function(b){return Ba(b,a,Xa)},"html-num":function(b){return Ba(b,a,Ca)},"html-num-fmt":function(b){return Ba(b,a,Ca,Xa)}},function(b,
+c){v.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(v.type.search[b+a]=v.type.search.html)})}function Nb(a){return function(){var b=[za(this[m.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return m.ext.internal[a].apply(this,b)}}var m,v,r,p,s,Ya={},Ob=/[\r\n]/g,Ca=/<.*?>/g,bc=/^[\w\+\-]/,cc=/[\w\+\-]$/,Zb=RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),Xa=/[',$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi,M=function(a){return!a||!0===a||"-"===a?!0:!1},
+Pb=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},Qb=function(a,b){Ya[b]||(Ya[b]=RegExp(va(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,"").replace(Ya[b],"."):a},Za=function(a,b,c){var d="string"===typeof a;if(M(a))return!0;b&&d&&(a=Qb(a,b));c&&d&&(a=a.replace(Xa,""));return!isNaN(parseFloat(a))&&isFinite(a)},Rb=function(a,b,c){return M(a)?!0:!(M(a)||"string"===typeof a)?null:Za(a.replace(Ca,""),b,c)?!0:null},F=function(a,b,c){var d=[],e=0,f=a.length;if(c!==k)for(;e<
+f;e++)a[e]&&a[e][b]&&d.push(a[e][b][c]);else for(;e<f;e++)a[e]&&d.push(a[e][b]);return d},ha=function(a,b,c,d){var e=[],f=0,g=b.length;if(d!==k)for(;f<g;f++)a[b[f]][c]&&e.push(a[b[f]][c][d]);else for(;f<g;f++)e.push(a[b[f]][c]);return e},X=function(a,b){var c=[],d;b===k?(b=0,d=a):(d=b,b=a);for(var e=b;e<d;e++)c.push(e);return c},Sb=function(a){for(var b=[],c=0,d=a.length;c<d;c++)a[c]&&b.push(a[c]);return b},pa=function(a){var b=[],c,d,e=a.length,f,g=0;d=0;a:for(;d<e;d++){c=a[d];for(f=0;f<g;f++)if(b[f]===
+c)continue a;b.push(c);g++}return b},A=function(a,b,c){a[b]!==k&&(a[c]=a[b])},ba=/\[.*?\]$/,V=/\(\)$/,wa=h("<div>")[0],$b=wa.textContent!==k,ac=/<.*?>/g;m=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new r(za(this[v.iApiIndex])):new r(this)};this.fnAddData=function(a,b){var c=this.api(!0),d=h.isArray(a)&&(h.isArray(a[0])||h.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===k||b)&&c.draw();return d.flatten().toArray()};
+this.fnAdjustColumnSizing=function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],d=c.oScroll;a===k||a?b.draw(!1):(""!==d.sX||""!==d.sY)&&ka(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();(a===k||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,b,c){var d=this.api(!0),a=d.rows(a),e=a.settings()[0],h=e.aoData[a[0][0]];a.remove();b&&b.call(this,e,h);(c===k||c)&&d.draw();return h};this.fnDestroy=function(a){this.api(!0).destroy(a)};
+this.fnDraw=function(a){this.api(!0).draw(a)};this.fnFilter=function(a,b,c,d,e,h){e=this.api(!0);null===b||b===k?e.search(a,c,d,h):e.column(b).search(a,c,d,h);e.draw()};this.fnGetData=function(a,b){var c=this.api(!0);if(a!==k){var d=a.nodeName?a.nodeName.toLowerCase():"";return b!==k||"td"==d||"th"==d?c.cell(a,b).data():c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==k?b.row(a).node():b.rows().nodes().flatten().toArray()};this.fnGetPosition=
+function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};this.fnPageChange=function(a,b){var c=this.api(!0).page(a);(b===k||b)&&c.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===k||c)&&a.columns.adjust().draw()};
+this.fnSettings=function(){return za(this[v.iApiIndex])};this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,d,e){var h=this.api(!0);c===k||null===c?h.row(b).data(a):h.cell(b,c).data(a);(e===k||e)&&h.columns.adjust();(d===k||d)&&h.draw();return 0};this.fnVersionCheck=v.fnVersionCheck;var b=this,c=a===k,d=this.length;c&&(a={});this.oApi=this.internal=v.internal;for(var e in m.ext.internal)e&&(this[e]=
+Nb(e));this.each(function(){var e={},e=1<d?Lb(e,a,!0):a,g=0,j,i=this.getAttribute("id"),n=!1,l=m.defaults,q=h(this);if("table"!=this.nodeName.toLowerCase())L(null,0,"Non-table node initialisation ("+this.nodeName+")",2);else{eb(l);fb(l.column);K(l,l,!0);K(l.column,l.column,!0);K(l,h.extend(e,q.data()));var t=m.settings,g=0;for(j=t.length;g<j;g++){var p=t[g];if(p.nTable==this||p.nTHead.parentNode==this||p.nTFoot&&p.nTFoot.parentNode==this){g=e.bRetrieve!==k?e.bRetrieve:l.bRetrieve;if(c||g)return p.oInstance;
+if(e.bDestroy!==k?e.bDestroy:l.bDestroy){p.oInstance.fnDestroy();break}else{L(p,0,"Cannot reinitialise DataTable",3);return}}if(p.sTableId==this.id){t.splice(g,1);break}}if(null===i||""===i)this.id=i="DataTables_Table_"+m.ext._unique++;var o=h.extend(!0,{},m.models.oSettings,{sDestroyWidth:q[0].style.width,sInstance:i,sTableId:i});o.nTable=this;o.oApi=b.internal;o.oInit=e;t.push(o);o.oInstance=1===b.length?b:q.dataTable();eb(e);e.oLanguage&&Fa(e.oLanguage);e.aLengthMenu&&!e.iDisplayLength&&(e.iDisplayLength=
+h.isArray(e.aLengthMenu[0])?e.aLengthMenu[0][0]:e.aLengthMenu[0]);e=Lb(h.extend(!0,{},l),e);E(o.oFeatures,e,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));E(o,e,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop","iTabIndex","fnStateLoadCallback","fnStateSaveCallback",
+"renderer","searchDelay","rowId",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"],["bJQueryUI","bJUI"]]);E(o.oScroll,e,[["sScrollX","sX"],["sScrollXInner","sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);E(o.oLanguage,e,"fnInfoCallback");z(o,"aoDrawCallback",e.fnDrawCallback,"user");z(o,"aoServerParams",e.fnServerParams,"user");z(o,"aoStateSaveParams",e.fnStateSaveParams,"user");z(o,"aoStateLoadParams",
+e.fnStateLoadParams,"user");z(o,"aoStateLoaded",e.fnStateLoaded,"user");z(o,"aoRowCallback",e.fnRowCallback,"user");z(o,"aoRowCreatedCallback",e.fnCreatedRow,"user");z(o,"aoHeaderCallback",e.fnHeaderCallback,"user");z(o,"aoFooterCallback",e.fnFooterCallback,"user");z(o,"aoInitComplete",e.fnInitComplete,"user");z(o,"aoPreDrawCallback",e.fnPreDrawCallback,"user");o.rowIdFn=Q(e.rowId);gb(o);i=o.oClasses;e.bJQueryUI?(h.extend(i,m.ext.oJUIClasses,e.oClasses),e.sDom===l.sDom&&"lfrtip"===l.sDom&&(o.sDom=
+'<"H"lfr>t<"F"ip>'),o.renderer)?h.isPlainObject(o.renderer)&&!o.renderer.header&&(o.renderer.header="jqueryui"):o.renderer="jqueryui":h.extend(i,m.ext.classes,e.oClasses);q.addClass(i.sTable);o.iInitDisplayStart===k&&(o.iInitDisplayStart=e.iDisplayStart,o._iDisplayStart=e.iDisplayStart);null!==e.iDeferLoading&&(o.bDeferLoading=!0,g=h.isArray(e.iDeferLoading),o._iRecordsDisplay=g?e.iDeferLoading[0]:e.iDeferLoading,o._iRecordsTotal=g?e.iDeferLoading[1]:e.iDeferLoading);var r=o.oLanguage;h.extend(!0,
+r,e.oLanguage);""!==r.sUrl&&(h.ajax({dataType:"json",url:r.sUrl,success:function(a){Fa(a);K(l.oLanguage,a);h.extend(true,r,a);ga(o)},error:function(){ga(o)}}),n=!0);null===e.asStripeClasses&&(o.asStripeClasses=[i.sStripeOdd,i.sStripeEven]);var g=o.asStripeClasses,v=q.children("tbody").find("tr").eq(0);-1!==h.inArray(!0,h.map(g,function(a){return v.hasClass(a)}))&&(h("tbody tr",this).removeClass(g.join(" ")),o.asDestroyStripes=g.slice());t=[];g=this.getElementsByTagName("thead");0!==g.length&&(da(o.aoHeader,
+g[0]),t=qa(o));if(null===e.aoColumns){p=[];g=0;for(j=t.length;g<j;g++)p.push(null)}else p=e.aoColumns;g=0;for(j=p.length;g<j;g++)Ga(o,t?t[g]:null);ib(o,e.aoColumnDefs,p,function(a,b){ja(o,a,b)});if(v.length){var s=function(a,b){return a.getAttribute("data-"+b)!==null?b:null};h(v[0]).children("th, td").each(function(a,b){var c=o.aoColumns[a];if(c.mData===a){var d=s(b,"sort")||s(b,"order"),e=s(b,"filter")||s(b,"search");if(d!==null||e!==null){c.mData={_:a+".display",sort:d!==null?a+".@data-"+d:k,type:d!==
+null?a+".@data-"+d:k,filter:e!==null?a+".@data-"+e:k};ja(o,a)}}})}var w=o.oFeatures;e.bStateSave&&(w.bStateSave=!0,Kb(o,e),z(o,"aoDrawCallback",ya,"state_save"));if(e.aaSorting===k){t=o.aaSorting;g=0;for(j=t.length;g<j;g++)t[g][1]=o.aoColumns[g].asSorting[0]}xa(o);w.bSort&&z(o,"aoDrawCallback",function(){if(o.bSorted){var a=W(o),b={};h.each(a,function(a,c){b[c.src]=c.dir});u(o,null,"order",[o,a,b]);Jb(o)}});z(o,"aoDrawCallback",function(){(o.bSorted||y(o)==="ssp"||w.bDeferRender)&&xa(o)},"sc");g=
+q.children("caption").each(function(){this._captionSide=q.css("caption-side")});j=q.children("thead");0===j.length&&(j=h("<thead/>").appendTo(this));o.nTHead=j[0];j=q.children("tbody");0===j.length&&(j=h("<tbody/>").appendTo(this));o.nTBody=j[0];j=q.children("tfoot");if(0===j.length&&0<g.length&&(""!==o.oScroll.sX||""!==o.oScroll.sY))j=h("<tfoot/>").appendTo(this);0===j.length||0===j.children().length?q.addClass(i.sNoFooter):0<j.length&&(o.nTFoot=j[0],da(o.aoFooter,o.nTFoot));if(e.aaData)for(g=0;g<
+e.aaData.length;g++)N(o,e.aaData[g]);else(o.bDeferLoading||"dom"==y(o))&&ma(o,h(o.nTBody).children("tr"));o.aiDisplay=o.aiDisplayMaster.slice();o.bInitialised=!0;!1===n&&ga(o)}});b=null;return this};var Tb=[],w=Array.prototype,dc=function(a){var b,c,d=m.settings,e=h.map(d,function(a){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase())return b=h.inArray(a,e),-1!==b?[d[b]]:null;if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===
+typeof a?c=h(a):a instanceof h&&(c=a)}else return[];if(c)return c.map(function(){b=h.inArray(this,e);return-1!==b?d[b]:null}).toArray()};r=function(a,b){if(!(this instanceof r))return new r(a,b);var c=[],d=function(a){(a=dc(a))&&(c=c.concat(a))};if(h.isArray(a))for(var e=0,f=a.length;e<f;e++)d(a[e]);else d(a);this.context=pa(c);b&&h.merge(this,b);this.selector={rows:null,cols:null,opts:null};r.extend(this,this,Tb)};m.Api=r;h.extend(r.prototype,{any:function(){return 0!==this.count()},concat:w.concat,
+context:[],count:function(){return this.flatten().length},each:function(a){for(var b=0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=this.context;return b.length>a?new r(b[a],this[a]):null},filter:function(a){var b=[];if(w.filter)b=w.filter.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new r(this.context,b)},flatten:function(){var a=[];return new r(this.context,a.concat.apply(a,this.toArray()))},join:w.join,
+indexOf:w.indexOf||function(a,b){for(var c=b||0,d=this.length;c<d;c++)if(this[c]===a)return c;return-1},iterator:function(a,b,c,d){var e=[],f,g,h,i,n,l=this.context,m,t,p=this.selector;"string"===typeof a&&(d=c,c=b,b=a,a=!1);g=0;for(h=l.length;g<h;g++){var o=new r(l[g]);if("table"===b)f=c.call(o,l[g],g),f!==k&&e.push(f);else if("columns"===b||"rows"===b)f=c.call(o,l[g],this[g],g),f!==k&&e.push(f);else if("column"===b||"column-rows"===b||"row"===b||"cell"===b){t=this[g];"column-rows"===b&&(m=Da(l[g],
+p.opts));i=0;for(n=t.length;i<n;i++)f=t[i],f="cell"===b?c.call(o,l[g],f.row,f.column,g,i):c.call(o,l[g],f,g,i,m),f!==k&&e.push(f)}}return e.length||d?(a=new r(l,a?e.concat.apply([],e):e),b=a.selector,b.rows=p.rows,b.cols=p.cols,b.opts=p.opts,a):this},lastIndexOf:w.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(w.map)b=w.map.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)b.push(a.call(this,this[c],c));return new r(this.context,
+b)},pluck:function(a){return this.map(function(b){return b[a]})},pop:w.pop,push:w.push,reduce:w.reduce||function(a,b){return hb(this,a,b,0,this.length,1)},reduceRight:w.reduceRight||function(a,b){return hb(this,a,b,this.length-1,-1,-1)},reverse:w.reverse,selector:null,shift:w.shift,sort:w.sort,splice:w.splice,toArray:function(){return w.slice.call(this)},to$:function(){return h(this)},toJQuery:function(){return h(this)},unique:function(){return new r(this.context,pa(this))},unshift:w.unshift});r.extend=
+function(a,b,c){if(c.length&&b&&(b instanceof r||b.__dt_wrapper)){var d,e,f,g=function(a,b,c){return function(){var d=b.apply(a,arguments);r.extend(d,d,c.methodExt);return d}};d=0;for(e=c.length;d<e;d++)f=c[d],b[f.name]="function"===typeof f.val?g(a,f.val,f):h.isPlainObject(f.val)?{}:f.val,b[f.name].__dt_wrapper=!0,r.extend(a,b[f.name],f.propExt)}};r.register=p=function(a,b){if(h.isArray(a))for(var c=0,d=a.length;c<d;c++)r.register(a[c],b);else for(var e=a.split("."),f=Tb,g,j,c=0,d=e.length;c<d;c++){g=
+(j=-1!==e[c].indexOf("()"))?e[c].replace("()",""):e[c];var i;a:{i=0;for(var n=f.length;i<n;i++)if(f[i].name===g){i=f[i];break a}i=null}i||(i={name:g,val:{},methodExt:[],propExt:[]},f.push(i));c===d-1?i.val=b:f=j?i.methodExt:i.propExt}};r.registerPlural=s=function(a,b,c){r.register(a,c);r.register(b,function(){var a=c.apply(this,arguments);return a===this?this:a instanceof r?a.length?h.isArray(a[0])?new r(a.context,a[0]):a[0]:k:a})};p("tables()",function(a){var b;if(a){b=r;var c=this.context;if("number"===
+typeof a)a=[c[a]];else var d=h.map(c,function(a){return a.nTable}),a=h(d).filter(a).map(function(){var a=h.inArray(this,d);return c[a]}).toArray();b=new b(a)}else b=this;return b});p("table()",function(a){var a=this.tables(a),b=a.context;return b.length?new r(b[0]):a});s("tables().nodes()","table().node()",function(){return this.iterator("table",function(a){return a.nTable},1)});s("tables().body()","table().body()",function(){return this.iterator("table",function(a){return a.nTBody},1)});s("tables().header()",
+"table().header()",function(){return this.iterator("table",function(a){return a.nTHead},1)});s("tables().footer()","table().footer()",function(){return this.iterator("table",function(a){return a.nTFoot},1)});s("tables().containers()","table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper},1)});p("draw()",function(a){return this.iterator("table",function(b){"page"===a?O(b):("string"===typeof a&&(a="full-hold"===a?!1:!0),T(b,!1===a))})});p("page()",function(a){return a===
+k?this.page.info().page:this.iterator("table",function(b){Ta(b,a)})});p("page.info()",function(){if(0===this.context.length)return k;var a=this.context[0],b=a._iDisplayStart,c=a.oFeatures.bPaginate?a._iDisplayLength:-1,d=a.fnRecordsDisplay(),e=-1===c;return{page:e?0:Math.floor(b/c),pages:e?1:Math.ceil(d/c),start:b,end:a.fnDisplayEnd(),length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:d,serverSide:"ssp"===y(a)}});p("page.len()",function(a){return a===k?0!==this.context.length?this.context[0]._iDisplayLength:
+k:this.iterator("table",function(b){Ra(b,a)})});var Ub=function(a,b,c){if(c){var d=new r(a);d.one("draw",function(){c(d.ajax.json())})}if("ssp"==y(a))T(a,b);else{C(a,!0);var e=a.jqXHR;e&&4!==e.readyState&&e.abort();ra(a,[],function(c){na(a);for(var c=sa(a,c),d=0,e=c.length;d<e;d++)N(a,c[d]);T(a,b);C(a,!1)})}};p("ajax.json()",function(){var a=this.context;if(0<a.length)return a[0].json});p("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});p("ajax.reload()",function(a,
+b){return this.iterator("table",function(c){Ub(c,!1===b,a)})});p("ajax.url()",function(a){var b=this.context;if(a===k){if(0===b.length)return k;b=b[0];return b.ajax?h.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(b){h.isPlainObject(b.ajax)?b.ajax.url=a:b.ajax=a})});p("ajax.url().load()",function(a,b){return this.iterator("table",function(c){Ub(c,!1===b,a)})});var $a=function(a,b,c,d,e){var f=[],g,j,i,n,l,m;i=typeof b;if(!b||"string"===i||"function"===
+i||b.length===k)b=[b];i=0;for(n=b.length;i<n;i++){j=b[i]&&b[i].split?b[i].split(","):[b[i]];l=0;for(m=j.length;l<m;l++)(g=c("string"===typeof j[l]?h.trim(j[l]):j[l]))&&g.length&&(f=f.concat(g))}a=v.selector[a];if(a.length){i=0;for(n=a.length;i<n;i++)f=a[i](d,e,f)}return pa(f)},ab=function(a){a||(a={});a.filter&&a.search===k&&(a.search=a.filter);return h.extend({search:"none",order:"current",page:"all"},a)},bb=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=a[b],a[0].length=
+1,a.length=1,a.context=[a.context[b]],a;a.length=0;return a},Da=function(a,b){var c,d,e,f=[],g=a.aiDisplay;c=a.aiDisplayMaster;var j=b.search;d=b.order;e=b.page;if("ssp"==y(a))return"removed"===j?[]:X(0,c.length);if("current"==e){c=a._iDisplayStart;for(d=a.fnDisplayEnd();c<d;c++)f.push(g[c])}else if("current"==d||"applied"==d)f="none"==j?c.slice():"applied"==j?g.slice():h.map(c,function(a){return-1===h.inArray(a,g)?a:null});else if("index"==d||"original"==d){c=0;for(d=a.aoData.length;c<d;c++)"none"==
+j?f.push(c):(e=h.inArray(c,g),(-1===e&&"removed"==j||0<=e&&"applied"==j)&&f.push(c))}return f};p("rows()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=b;return $a("row",a,function(a){var b=Pb(a);if(b!==null&&!e)return[b];var j=Da(c,e);if(b!==null&&h.inArray(b,j)!==-1)return[b];if(!a)return j;if(typeof a==="function")return h.map(j,function(b){var e=c.aoData[b];return a(b,e._aData,e.nTr)?b:null});b=Sb(ha(c.aoData,j,"nTr"));if(a.nodeName){if(a._DT_RowIndex!==
+k)return[a._DT_RowIndex];if(a._DT_CellIndex)return[a._DT_CellIndex.row];b=h(a).closest("*[data-dt-row]");return b.length?[b.data("dt-row")]:[]}if(typeof a==="string"&&a.charAt(0)==="#"){j=c.aIds[a.replace(/^#/,"")];if(j!==k)return[j.idx]}return h(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()},c,e)},1);c.selector.rows=a;c.selector.opts=b;return c});p("rows().nodes()",function(){return this.iterator("row",function(a,b){return a.aoData[b].nTr||k},1)});p("rows().data()",function(){return this.iterator(!0,
+"rows",function(a,b){return ha(a.aoData,b,"_aData")},1)});s("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var d=b.aoData[c];return"search"===a?d._aFilterData:d._aSortData},1)});s("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",function(b,c){ca(b,c,a)})});s("rows().indexes()","row().index()",function(){return this.iterator("row",function(a,b){return b},1)});s("rows().ids()","row().id()",function(a){for(var b=[],c=this.context,
+d=0,e=c.length;d<e;d++)for(var f=0,g=this[d].length;f<g;f++){var h=c[d].rowIdFn(c[d].aoData[this[d][f]]._aData);b.push((!0===a?"#":"")+h)}return new r(c,b)});s("rows().remove()","row().remove()",function(){var a=this;this.iterator("row",function(b,c,d){var e=b.aoData,f=e[c],g,h,i,n,l;e.splice(c,1);g=0;for(h=e.length;g<h;g++)if(i=e[g],l=i.anCells,null!==i.nTr&&(i.nTr._DT_RowIndex=g),null!==l){i=0;for(n=l.length;i<n;i++)l[i]._DT_CellIndex.row=g}oa(b.aiDisplayMaster,c);oa(b.aiDisplay,c);oa(a[d],c,!1);
+Sa(b);c=b.rowIdFn(f._aData);c!==k&&delete b.aIds[c]});this.iterator("table",function(a){for(var c=0,d=a.aoData.length;c<d;c++)a.aoData[c].idx=c});return this});p("rows.add()",function(a){var b=this.iterator("table",function(b){var c,f,g,h=[];f=0;for(g=a.length;f<g;f++)c=a[f],c.nodeName&&"TR"===c.nodeName.toUpperCase()?h.push(ma(b,c)[0]):h.push(N(b,c));return h},1),c=this.rows(-1);c.pop();h.merge(c,b);return c});p("row()",function(a,b){return bb(this.rows(a,b))});p("row().data()",function(a){var b=
+this.context;if(a===k)return b.length&&this.length?b[0].aoData[this[0]]._aData:k;b[0].aoData[this[0]]._aData=a;ca(b[0],this[0],"data");return this});p("row().node()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]].nTr||null:null});p("row.add()",function(a){a instanceof h&&a.length&&(a=a[0]);var b=this.iterator("table",function(b){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?ma(b,a)[0]:N(b,a)});return this.row(b[0])});var cb=function(a,b){var c=a.context;if(c.length&&
+(c=c[0].aoData[b!==k?b:a[0]])&&c._details)c._details.remove(),c._detailsShow=k,c._details=k},Vb=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];if(d._details){(d._detailsShow=b)?d._details.insertAfter(d.nTr):d._details.detach();var e=c[0],f=new r(e),g=e.aoData;f.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0<F(g,"_details").length&&(f.on("draw.dt.DT_details",function(a,b){e===b&&f.rows({page:"current"}).eq(0).each(function(a){a=g[a];
+a._detailsShow&&a._details.insertAfter(a.nTr)})}),f.on("column-visibility.dt.DT_details",function(a,b){if(e===b)for(var c,d=aa(b),f=0,h=g.length;f<h;f++)c=g[f],c._details&&c._details.children("td[colspan]").attr("colspan",d)}),f.on("destroy.dt.DT_details",function(a,b){if(e===b)for(var c=0,d=g.length;c<d;c++)g[c]._details&&cb(f,c)}))}}};p("row().child()",function(a,b){var c=this.context;if(a===k)return c.length&&this.length?c[0].aoData[this[0]]._details:k;if(!0===a)this.child.show();else if(!1===
+a)cb(this);else if(c.length&&this.length){var d=c[0],c=c[0].aoData[this[0]],e=[],f=function(a,b){if(h.isArray(a)||a instanceof h)for(var c=0,k=a.length;c<k;c++)f(a[c],b);else a.nodeName&&"tr"===a.nodeName.toLowerCase()?e.push(a):(c=h("<tr><td/></tr>").addClass(b),h("td",c).addClass(b).html(a)[0].colSpan=aa(d),e.push(c[0]))};f(a,b);c._details&&c._details.remove();c._details=h(e);c._detailsShow&&c._details.insertAfter(c.nTr)}return this});p(["row().child.show()","row().child().show()"],function(){Vb(this,
+!0);return this});p(["row().child.hide()","row().child().hide()"],function(){Vb(this,!1);return this});p(["row().child.remove()","row().child().remove()"],function(){cb(this);return this});p("row().child.isShown()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var ec=/^(.+):(name|visIdx|visible)$/,Wb=function(a,b,c,d,e){for(var c=[],d=0,f=e.length;d<f;d++)c.push(B(a,e[d],b));return c};p("columns()",function(a,b){a===k?a="":h.isPlainObject(a)&&
+(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var e=a,f=b,g=c.aoColumns,j=F(g,"sName"),i=F(g,"nTh");return $a("column",e,function(a){var b=Pb(a);if(a==="")return X(g.length);if(b!==null)return[b>=0?b:g.length+b];if(typeof a==="function"){var e=Da(c,f);return h.map(g,function(b,f){return a(f,Wb(c,f,0,0,e),i[f])?f:null})}var k=typeof a==="string"?a.match(ec):"";if(k)switch(k[2]){case "visIdx":case "visible":b=parseInt(k[1],10);if(b<0){var m=h.map(g,function(a,b){return a.bVisible?b:null});
+return[m[m.length+b]]}return[Z(c,b)];case "name":return h.map(j,function(a,b){return a===k[1]?b:null});default:return[]}if(a.nodeName&&a._DT_CellIndex)return[a._DT_CellIndex.column];b=h(i).filter(a).map(function(){return h.inArray(this,i)}).toArray();if(b.length||!a.nodeName)return b;b=h(a).closest("*[data-dt-column]");return b.length?[b.data("dt-column")]:[]},c,f)},1);c.selector.cols=a;c.selector.opts=b;return c});s("columns().header()","column().header()",function(){return this.iterator("column",
+function(a,b){return a.aoColumns[b].nTh},1)});s("columns().footer()","column().footer()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf},1)});s("columns().data()","column().data()",function(){return this.iterator("column-rows",Wb,1)});s("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});s("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,
+c,d,e,f){return ha(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});s("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return ha(a.aoData,e,"anCells",b)},1)});s("columns().visible()","column().visible()",function(a,b){return this.iterator("column",function(c,d){if(a===k)return c.aoColumns[d].bVisible;var e=c.aoColumns,f=e[d],g=c.aoData,j,i,n;if(a!==k&&f.bVisible!==a){if(a){var l=h.inArray(!0,F(e,"bVisible"),d+1);j=0;for(i=g.length;j<
+i;j++)n=g[j].nTr,e=g[j].anCells,n&&n.insertBefore(e[d],e[l]||null)}else h(F(c.aoData,"anCells",d)).detach();f.bVisible=a;ea(c,c.aoHeader);ea(c,c.aoFooter);(b===k||b)&&U(c);u(c,null,"column-visibility",[c,d,a,b]);ya(c)}})});s("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?$(b,c):c},1)});p("columns.adjust()",function(){return this.iterator("table",function(a){U(a)},1)});p("column.index()",function(a,b){if(0!==this.context.length){var c=
+this.context[0];if("fromVisible"===a||"toData"===a)return Z(c,b);if("fromData"===a||"toVisible"===a)return $(c,b)}});p("column()",function(a,b){return bb(this.columns(a,b))});p("cells()",function(a,b,c){h.isPlainObject(a)&&(a.row===k?(c=a,a=null):(c=b,b=null));h.isPlainObject(b)&&(c=b,b=null);if(null===b||b===k)return this.iterator("table",function(b){var d=a,e=ab(c),f=b.aoData,g=Da(b,e),j=Sb(ha(f,g,"anCells")),i=h([].concat.apply([],j)),l,n=b.aoColumns.length,m,p,r,u,v,s;return $a("cell",d,function(a){var c=
+typeof a==="function";if(a===null||a===k||c){m=[];p=0;for(r=g.length;p<r;p++){l=g[p];for(u=0;u<n;u++){v={row:l,column:u};if(c){s=f[l];a(v,B(b,l,u),s.anCells?s.anCells[u]:null)&&m.push(v)}else m.push(v)}}return m}if(h.isPlainObject(a))return[a];c=i.filter(a).map(function(a,b){return{row:b._DT_CellIndex.row,column:b._DT_CellIndex.column}}).toArray();if(c.length||!a.nodeName)return c;s=h(a).closest("*[data-dt-row]");return s.length?[{row:s.data("dt-row"),column:s.data("dt-column")}]:[]},b,e)});var d=
+this.columns(b,c),e=this.rows(a,c),f,g,j,i,n,l=this.iterator("table",function(a,b){f=[];g=0;for(j=e[b].length;g<j;g++){i=0;for(n=d[b].length;i<n;i++)f.push({row:e[b][g],column:d[b][i]})}return f},1);h.extend(l.selector,{cols:b,rows:a,opts:c});return l});s("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b])&&a.anCells?a.anCells[c]:k},1)});p("cells().data()",function(){return this.iterator("cell",function(a,b,c){return B(a,b,c)},1)});s("cells().cache()",
+"cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,d){return b.aoData[c][a][d]},1)});s("cells().render()","cell().render()",function(a){return this.iterator("cell",function(b,c,d){return B(b,c,d,a)},1)});s("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:$(a,c)}},1)});s("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,
+c,d){ca(b,c,a,d)})});p("cell()",function(a,b,c){return bb(this.cells(a,b,c))});p("cell().data()",function(a){var b=this.context,c=this[0];if(a===k)return b.length&&c.length?B(b[0],c[0].row,c[0].column):k;jb(b[0],c[0].row,c[0].column,a);ca(b[0],c[0].row,"data",c[0].column);return this});p("order()",function(a,b){var c=this.context;if(a===k)return 0!==c.length?c[0].aaSorting:k;"number"===typeof a?a=[[a,b]]:h.isArray(a[0])||(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=
+a.slice()})});p("order.listener()",function(a,b,c){return this.iterator("table",function(d){Oa(d,a,b,c)})});p("order.fixed()",function(a){if(!a){var b=this.context,b=b.length?b[0].aaSortingFixed:k;return h.isArray(b)?{pre:b}:b}return this.iterator("table",function(b){b.aaSortingFixed=h.extend(!0,{},a)})});p(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];h.each(b[d],function(b,c){e.push([c,a])});c.aaSorting=e})});p("search()",function(a,
+b,c,d){var e=this.context;return a===k?0!==e.length?e[0].oPreviousSearch.sSearch:k:this.iterator("table",function(e){e.oFeatures.bFilter&&fa(e,h.extend({},e.oPreviousSearch,{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),1)})});s("columns().search()","column().search()",function(a,b,c,d){return this.iterator("column",function(e,f){var g=e.aoPreSearchCols;if(a===k)return g[f].sSearch;e.oFeatures.bFilter&&(h.extend(g[f],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===
+c?!0:c,bCaseInsensitive:null===d?!0:d}),fa(e,e.oPreviousSearch,1))})});p("state()",function(){return this.context.length?this.context[0].oSavedState:null});p("state.clear()",function(){return this.iterator("table",function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});p("state.loaded()",function(){return this.context.length?this.context[0].oLoadedState:null});p("state.save()",function(){return this.iterator("table",function(a){ya(a)})});m.versionCheck=m.fnVersionCheck=function(a){for(var b=
+m.version.split("."),a=a.split("."),c,d,e=0,f=a.length;e<f;e++)if(c=parseInt(b[e],10)||0,d=parseInt(a[e],10)||0,c!==d)return c>d;return!0};m.isDataTable=m.fnIsDataTable=function(a){var b=h(a).get(0),c=!1;h.each(m.settings,function(a,e){var f=e.nScrollHead?h("table",e.nScrollHead)[0]:null,g=e.nScrollFoot?h("table",e.nScrollFoot)[0]:null;if(e.nTable===b||f===b||g===b)c=!0});return c};m.tables=m.fnTables=function(a){var b=!1;h.isPlainObject(a)&&(b=a.api,a=a.visible);var c=h.map(m.settings,function(b){if(!a||
+a&&h(b.nTable).is(":visible"))return b.nTable});return b?new r(c):c};m.util={throttle:ua,escapeRegex:va};m.camelToHungarian=K;p("$()",function(a,b){var c=this.rows(b).nodes(),c=h(c);return h([].concat(c.filter(a).toArray(),c.find(a).toArray()))});h.each(["on","one","off"],function(a,b){p(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0].match(/\.dt\b/)||(a[0]+=".dt");var d=h(this.tables().nodes());d[b].apply(d,a);return this})});p("clear()",function(){return this.iterator("table",
+function(a){na(a)})});p("settings()",function(){return new r(this.context,this.context)});p("init()",function(){var a=this.context;return a.length?a[0].oInit:null});p("data()",function(){return this.iterator("table",function(a){return F(a.aoData,"_aData")}).flatten()});p("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,d=b.oClasses,e=b.nTable,f=b.nTBody,g=b.nTHead,j=b.nTFoot,i=h(e),f=h(f),k=h(b.nTableWrapper),l=h.map(b.aoData,function(a){return a.nTr}),
+p;b.bDestroying=!0;u(b,"aoDestroyCallback","destroy",[b]);a||(new r(b)).columns().visible(!0);k.unbind(".DT").find(":not(tbody *)").unbind(".DT");h(D).unbind(".DT-"+b.sInstance);e!=g.parentNode&&(i.children("thead").detach(),i.append(g));j&&e!=j.parentNode&&(i.children("tfoot").detach(),i.append(j));b.aaSorting=[];b.aaSortingFixed=[];xa(b);h(l).removeClass(b.asStripeClasses.join(" "));h("th, td",g).removeClass(d.sSortable+" "+d.sSortableAsc+" "+d.sSortableDesc+" "+d.sSortableNone);b.bJUI&&(h("th span."+
+d.sSortIcon+", td span."+d.sSortIcon,g).detach(),h("th, td",g).each(function(){var a=h("div."+d.sSortJUIWrapper,this);h(this).append(a.contents());a.detach()}));f.children().detach();f.append(l);g=a?"remove":"detach";i[g]();k[g]();!a&&c&&(c.insertBefore(e,b.nTableReinsertBefore),i.css("width",b.sDestroyWidth).removeClass(d.sTable),(p=b.asDestroyStripes.length)&&f.children().each(function(a){h(this).addClass(b.asDestroyStripes[a%p])}));c=h.inArray(b,m.settings);-1!==c&&m.settings.splice(c,1)})});h.each(["column",
+"row","cell"],function(a,b){p(b+"s().every()",function(a){var d=this.selector.opts,e=this;return this.iterator(b,function(f,g,h,i,n){a.call(e[b](g,"cell"===b?h:d,"cell"===b?d:k),g,h,i,n)})})});p("i18n()",function(a,b,c){var d=this.context[0],a=Q(a)(d.oLanguage);a===k&&(a=b);c!==k&&h.isPlainObject(a)&&(a=a[c]!==k?a[c]:a._);return a.replace("%d",c)});m.version="1.10.11";m.settings=[];m.models={};m.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};m.models.oRow={nTr:null,anCells:null,
+_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null,idx:-1};m.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};m.defaults=
+{aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,
+this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){}},fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+
+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",
+sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},m.models.oSearch),sAjaxDataProp:"data",sAjaxSource:null,sDom:"lfrtip",searchDelay:null,sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null,rowId:"DT_RowId"};
+Y(m.defaults);m.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};Y(m.defaults.column);m.models.oSettings={oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,
+bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1,bBounding:!1,barWidth:0},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aIds:{},aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],
+aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",iStateDuration:0,aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,bAjaxDataGet:!0,jqXHR:null,json:k,oAjaxData:k,fnServerData:null,
+aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==y(this)?1*this._iRecordsTotal:this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==y(this)?1*this._iRecordsDisplay:this.aiDisplay.length},fnDisplayEnd:function(){var a=
+this._iDisplayLength,b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,f=e.bPaginate;return e.bServerSide?!1===f||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!f||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{},rowIdFn:null,rowId:null};m.ext=v={buttons:{},classes:{},build:"ju/dt-1.10.11",errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},
+header:{}},order:{},type:{detect:[],search:{},order:{}},_unique:0,fnVersionCheck:m.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:m.version};h.extend(v,{afnFiltering:v.search,aTypes:v.type.detect,ofnSearch:v.type.search,oSort:v.type.order,afnSortData:v.order,aoFeatures:v.feature,oApi:v.internal,oStdClasses:v.classes,oPagination:v.pager});h.extend(m.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",
+sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",
+sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sJUIHeader:"",sJUIFooter:""});var Ea="",Ea="",H=Ea+"ui-state-default",ia=Ea+"css_right ui-icon ui-icon-",Xb=Ea+"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix";h.extend(m.ext.oJUIClasses,
+m.ext.classes,{sPageButton:"fg-button ui-button "+H,sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:H+" sorting_asc",sSortDesc:H+" sorting_desc",sSortable:H+" sorting",sSortableAsc:H+" sorting_asc_disabled",sSortableDesc:H+" sorting_desc_disabled",sSortableNone:H+" sorting_disabled",sSortJUIAsc:ia+"triangle-1-n",sSortJUIDesc:ia+"triangle-1-s",sSortJUI:ia+"carat-2-n-s",
+sSortJUIAscAllowed:ia+"carat-1-n",sSortJUIDescAllowed:ia+"carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead "+H,sScrollFoot:"dataTables_scrollFoot "+H,sHeaderTH:H,sFooterTH:H,sJUIHeader:Xb+" ui-corner-tl ui-corner-tr",sJUIFooter:Xb+" ui-corner-bl ui-corner-br"});var Mb=m.ext.pager;h.extend(Mb,{simple:function(){return["previous","next"]},full:function(){return["first","previous","next","last"]},numbers:function(a,b){return[Aa(a,
+b)]},simple_numbers:function(a,b){return["previous",Aa(a,b),"next"]},full_numbers:function(a,b){return["first","previous",Aa(a,b),"next","last"]},_numbers:Aa,numbers_length:7});h.extend(!0,m.ext.renderer,{pageButton:{_:function(a,b,c,d,e,f){var g=a.oClasses,j=a.oLanguage.oPaginate,i=a.oLanguage.oAria.paginate||{},k,l,m=0,p=function(b,d){var o,r,u,s,v=function(b){Ta(a,b.data.action,true)};o=0;for(r=d.length;o<r;o++){s=d[o];if(h.isArray(s)){u=h("<"+(s.DT_el||"div")+"/>").appendTo(b);p(u,s)}else{k=null;
+l="";switch(s){case "ellipsis":b.append('<span class="ellipsis">&#x2026;</span>');break;case "first":k=j.sFirst;l=s+(e>0?"":" "+g.sPageButtonDisabled);break;case "previous":k=j.sPrevious;l=s+(e>0?"":" "+g.sPageButtonDisabled);break;case "next":k=j.sNext;l=s+(e<f-1?"":" "+g.sPageButtonDisabled);break;case "last":k=j.sLast;l=s+(e<f-1?"":" "+g.sPageButtonDisabled);break;default:k=s+1;l=e===s?g.sPageButtonActive:""}if(k!==null){u=h("<a>",{"class":g.sPageButton+" "+l,"aria-controls":a.sTableId,"aria-label":i[s],
+"data-dt-idx":m,tabindex:a.iTabIndex,id:c===0&&typeof s==="string"?a.sTableId+"_"+s:null}).html(k).appendTo(b);Wa(u,{action:s},v);m++}}}},r;try{r=h(b).find(I.activeElement).data("dt-idx")}catch(o){}p(h(b).empty(),d);r&&h(b).find("[data-dt-idx="+r+"]").focus()}}});h.extend(m.ext.type.detect,[function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c)?"num"+c:null},function(a){if(a&&!(a instanceof Date)&&(!bc.test(a)||!cc.test(a)))return null;var b=Date.parse(a);return null!==b&&!isNaN(b)||M(a)?"date":
+null},function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c,!0)?"num-fmt"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Rb(a,c)?"html-num"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Rb(a,c,!0)?"html-num-fmt"+c:null},function(a){return M(a)||"string"===typeof a&&-1!==a.indexOf("<")?"html":null}]);h.extend(m.ext.type.search,{html:function(a){return M(a)?a:"string"===typeof a?a.replace(Ob," ").replace(Ca,""):""},string:function(a){return M(a)?a:"string"===typeof a?a.replace(Ob,
+" "):a}});var Ba=function(a,b,c,d){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=Qb(a,b));a.replace&&(c&&(a=a.replace(c,"")),d&&(a=a.replace(d,"")));return 1*a};h.extend(v.type.order,{"date-pre":function(a){return Date.parse(a)||0},"html-pre":function(a){return M(a)?"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return M(a)?"":"string"===typeof a?a.toLowerCase():!a.toString?"":a.toString()},"string-asc":function(a,b){return a<b?-1:a>b?1:0},"string-desc":function(a,
+b){return a<b?1:a>b?-1:0}});db("");h.extend(!0,m.ext.renderer,{header:{_:function(a,b,c,d){h(a.nTable).on("order.dt.DT",function(e,f,g,h){if(a===f){e=c.idx;b.removeClass(c.sSortingClass+" "+d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?d.sSortAsc:h[e]=="desc"?d.sSortDesc:c.sSortingClass)}})},jqueryui:function(a,b,c,d){h("<div/>").addClass(d.sSortJUIWrapper).append(b.contents()).append(h("<span/>").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);h(a.nTable).on("order.dt.DT",function(e,
+f,g,h){if(a===f){e=c.idx;b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass(h[e]=="asc"?d.sSortAsc:h[e]=="desc"?d.sSortDesc:c.sSortingClass);b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+" "+d.sSortJUIDescAllowed).addClass(h[e]=="asc"?d.sSortJUIAsc:h[e]=="desc"?d.sSortJUIDesc:c.sSortingClassJUI)}})}}});var Yb=function(a){return"string"===typeof a?a.replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;"):a};m.render={number:function(a,
+b,c,d,e){return{display:function(f){if("number"!==typeof f&&"string"!==typeof f)return f;var g=0>f?"-":"",h=parseFloat(f);if(isNaN(h))return Yb(f);f=Math.abs(h);h=parseInt(f,10);f=c?b+(f-h).toFixed(c).substring(2):"";return g+(d||"")+h.toString().replace(/\B(?=(\d{3})+(?!\d))/g,a)+f+(e||"")}}},text:function(){return{display:Yb}}};h.extend(m.ext.internal,{_fnExternApiFunc:Nb,_fnBuildAjax:ra,_fnAjaxUpdate:lb,_fnAjaxParameters:ub,_fnAjaxUpdateDraw:vb,_fnAjaxDataSrc:sa,_fnAddColumn:Ga,_fnColumnOptions:ja,
+_fnAdjustColumnSizing:U,_fnVisibleToColumnIndex:Z,_fnColumnIndexToVisible:$,_fnVisbleColumns:aa,_fnGetColumns:la,_fnColumnTypes:Ia,_fnApplyColumnDefs:ib,_fnHungarianMap:Y,_fnCamelToHungarian:K,_fnLanguageCompat:Fa,_fnBrowserDetect:gb,_fnAddData:N,_fnAddTr:ma,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==k?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return h.inArray(c,a.aoData[b].anCells)},_fnGetCellData:B,_fnSetCellData:jb,_fnSplitObjNotation:La,_fnGetObjectDataFn:Q,_fnSetObjectDataFn:R,
+_fnGetDataMaster:Ma,_fnClearTable:na,_fnDeleteIndex:oa,_fnInvalidate:ca,_fnGetRowElements:Ka,_fnCreateTr:Ja,_fnBuildHead:kb,_fnDrawHead:ea,_fnDraw:O,_fnReDraw:T,_fnAddOptionsHtml:nb,_fnDetectHeader:da,_fnGetUniqueThs:qa,_fnFeatureHtmlFilter:pb,_fnFilterComplete:fa,_fnFilterCustom:yb,_fnFilterColumn:xb,_fnFilter:wb,_fnFilterCreateSearch:Qa,_fnEscapeRegex:va,_fnFilterData:zb,_fnFeatureHtmlInfo:sb,_fnUpdateInfo:Cb,_fnInfoMacros:Db,_fnInitialise:ga,_fnInitComplete:ta,_fnLengthChange:Ra,_fnFeatureHtmlLength:ob,
+_fnFeatureHtmlPaginate:tb,_fnPageChange:Ta,_fnFeatureHtmlProcessing:qb,_fnProcessingDisplay:C,_fnFeatureHtmlTable:rb,_fnScrollDraw:ka,_fnApplyToChildren:J,_fnCalculateColumnWidths:Ha,_fnThrottle:ua,_fnConvertToWidth:Fb,_fnGetWidestNode:Gb,_fnGetMaxLenString:Hb,_fnStringToCss:x,_fnSortFlatten:W,_fnSort:mb,_fnSortAria:Jb,_fnSortListener:Va,_fnSortAttachListener:Oa,_fnSortingClasses:xa,_fnSortData:Ib,_fnSaveState:ya,_fnLoadState:Kb,_fnSettingsFromNode:za,_fnLog:L,_fnMap:E,_fnBindAction:Wa,_fnCallbackReg:z,
+_fnCallbackFire:u,_fnLengthOverflow:Sa,_fnRenderer:Pa,_fnDataSource:y,_fnRowAttributes:Na,_fnCalculateEnd:function(){}});h.fn.dataTable=m;m.$=h;h.fn.dataTableSettings=m.settings;h.fn.dataTableExt=m.ext;h.fn.DataTable=function(a){return h(this).dataTable(a).api()};h.each(m,function(a,b){h.fn.DataTable[a]=b});return h.fn.dataTable});
+
+
+/*!
+ DataTables jQuery UI integration
+ ©2011-2014 SpryMedia Ltd - datatables.net/license
+*/
+(function(a){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(b){return a(b,window,document)}):"object"===typeof exports?module.exports=function(b,d){b||(b=window);if(!d||!d.fn.dataTable)d=require("datatables.net")(b,d).$;return a(d,b,b.document)}:a(jQuery,window,document)})(function(a){var b=a.fn.dataTable;a.extend(!0,b.defaults,{dom:'<"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-tl ui-corner-tr"lfr>t<"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix ui-corner-bl ui-corner-br"ip>',
+renderer:"jqueryui"});a.extend(b.ext.classes,{sWrapper:"dataTables_wrapper dt-jqueryui",sPageButton:"fg-button ui-button ui-state-default",sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:"ui-state-default sorting_asc",sSortDesc:"ui-state-default sorting_desc",sSortable:"ui-state-default sorting",sSortableAsc:"ui-state-default sorting_asc_disabled",sSortableDesc:"ui-state-default sorting_desc_disabled",
+sSortableNone:"ui-state-default sorting_disabled",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead ui-state-default",sScrollFoot:"dataTables_scrollFoot ui-state-default",sHeaderTH:"ui-state-default",sFooterTH:"ui-state-default"});b.ext.renderer.header.jqueryui=function(b,h,e,c){var f="css_right ui-icon ui-icon-carat-2-n-s",g=-1!==a.inArray("asc",e.asSorting),i=-1!==a.inArray("desc",e.asSorting);!e.bSortable||!g&&!i?f="":g&&!i?f="css_right ui-icon ui-icon-carat-1-n":!g&&i&&(f="css_right ui-icon ui-icon-carat-1-s");
+a("<div/>").addClass("DataTables_sort_wrapper").append(h.contents()).append(a("<span/>").addClass(c.sSortIcon+" "+f)).appendTo(h);a(b.nTable).on("order.dt",function(a,g,i,j){b===g&&(a=e.idx,h.removeClass(c.sSortAsc+" "+c.sSortDesc).addClass("asc"==j[a]?c.sSortAsc:"desc"==j[a]?c.sSortDesc:e.sSortingClass),h.find("span."+c.sSortIcon).removeClass("css_right ui-icon ui-icon-triangle-1-n css_right ui-icon ui-icon-triangle-1-s css_right ui-icon ui-icon-carat-2-n-s css_right ui-icon ui-icon-carat-1-n css_right ui-icon ui-icon-carat-1-s").addClass("asc"==
+j[a]?"css_right ui-icon ui-icon-triangle-1-n":"desc"==j[a]?"css_right ui-icon ui-icon-triangle-1-s":f))})};b.TableTools&&a.extend(!0,b.TableTools.classes,{container:"DTTT_container ui-buttonset ui-buttonset-multi",buttons:{normal:"DTTT_button ui-button ui-state-default"},collection:{container:"DTTT_collection ui-buttonset ui-buttonset-multi"}});return b});
+
+
diff --git a/js/jquery/plugins/devbridgeAutocomplete/devbridgeAutocomplete-min.js b/js/jquery/plugins/devbridgeAutocomplete/devbridgeAutocomplete-min.js
new file mode 100644
index 0000000000..21dc41bd8c
--- /dev/null
+++ b/js/jquery/plugins/devbridgeAutocomplete/devbridgeAutocomplete-min.js
@@ -0,0 +1,8 @@
+/**
+*  Ajax Autocomplete for jQuery, version 1.2.24
+*  (c) 2014 Tomas Kirda
+*
+*  Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
+*  For details, see the web site: https://github.com/devbridge/jQuery-Autocomplete
+*/
+!function(a){"use strict";"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports&&"function"==typeof require?require("jquery"):jQuery)}(function(a){"use strict";function b(c,d){var e=function(){},f=this,g={ajaxSettings:{},autoSelectFirst:!1,appendTo:document.body,serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:b.formatResult,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:e,onSearchComplete:e,onSearchError:e,preserveInput:!1,containerClass:"autocomplete-suggestions",tabDisabled:!1,dataType:"text",currentRequest:null,triggerSelectOnValidInput:!0,preventBadQueries:!0,lookupFilter:function(a,b,c){return-1!==a.value.toLowerCase().indexOf(c)},paramName:"query",transformResult:function(b){return"string"==typeof b?a.parseJSON(b):b},showNoSuggestionNotice:!1,noSuggestionNotice:"No results",orientation:"bottom",forceFixPosition:!1};f.element=c,f.el=a(c),f.suggestions=[],f.badQueries=[],f.selectedIndex=-1,f.currentValue=f.element.value,f.intervalId=0,f.cachedResponse={},f.onChangeInterval=null,f.onChange=null,f.isLocal=!1,f.suggestionsContainer=null,f.noSuggestionsContainer=null,f.options=a.extend({},g,d),f.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"},f.hint=null,f.hintValue="",f.selection=null,f.initialize(),f.setOptions(d)}var c=function(){return{escapeRegExChars:function(a){return a.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},createNode:function(a){var b=document.createElement("div");return b.className=a,b.style.position="absolute",b.style.display="none",b}}}(),d={ESC:27,TAB:9,RETURN:13,LEFT:37,UP:38,RIGHT:39,DOWN:40};b.utils=c,a.Autocomplete=b,b.formatResult=function(a,b){var d="("+c.escapeRegExChars(b)+")";return a.value.replace(new RegExp(d,"gi"),"<strong>$1</strong>").replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/&lt;(\/?strong)&gt;/g,"<$1>")},b.prototype={killerFn:null,initialize:function(){var c,d=this,e="."+d.classes.suggestion,f=d.classes.selected,g=d.options;d.element.setAttribute("autocomplete","off"),d.killerFn=function(b){0===a(b.target).closest("."+d.options.containerClass).length&&(d.killSuggestions(),d.disableKillerFn())},d.noSuggestionsContainer=a('<div class="autocomplete-no-suggestion"></div>').html(this.options.noSuggestionNotice).get(0),d.suggestionsContainer=b.utils.createNode(g.containerClass),c=a(d.suggestionsContainer),c.appendTo(g.appendTo),"auto"!==g.width&&c.width(g.width),c.on("mouseover.autocomplete",e,function(){d.activate(a(this).data("index"))}),c.on("mouseout.autocomplete",function(){d.selectedIndex=-1,c.children("."+f).removeClass(f)}),c.on("click.autocomplete",e,function(){d.select(a(this).data("index"))}),d.fixPositionCapture=function(){d.visible&&d.fixPosition()},a(window).on("resize.autocomplete",d.fixPositionCapture),d.el.on("keydown.autocomplete",function(a){d.onKeyPress(a)}),d.el.on("keyup.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("blur.autocomplete",function(){d.onBlur()}),d.el.on("focus.autocomplete",function(){d.onFocus()}),d.el.on("change.autocomplete",function(a){d.onKeyUp(a)}),d.el.on("input.autocomplete",function(a){d.onKeyUp(a)})},onFocus:function(){var a=this;a.fixPosition(),0===a.options.minChars&&0===a.el.val().length&&a.onValueChange()},onBlur:function(){this.enableKillerFn()},abortAjax:function(){var a=this;a.currentRequest&&(a.currentRequest.abort(),a.currentRequest=null)},setOptions:function(b){var c=this,d=c.options;a.extend(d,b),c.isLocal=a.isArray(d.lookup),c.isLocal&&(d.lookup=c.verifySuggestionsFormat(d.lookup)),d.orientation=c.validateOrientation(d.orientation,"bottom"),a(c.suggestionsContainer).css({"max-height":d.maxHeight+"px",width:d.width+"px","z-index":d.zIndex})},clearCache:function(){this.cachedResponse={},this.badQueries=[]},clear:function(){this.clearCache(),this.currentValue="",this.suggestions=[]},disable:function(){var a=this;a.disabled=!0,clearInterval(a.onChangeInterval),a.abortAjax()},enable:function(){this.disabled=!1},fixPosition:function(){var b=this,c=a(b.suggestionsContainer),d=c.parent().get(0);if(d===document.body||b.options.forceFixPosition){var e=b.options.orientation,f=c.outerHeight(),g=b.el.outerHeight(),h=b.el.offset(),i={top:h.top,left:h.left};if("auto"===e){var j=a(window).height(),k=a(window).scrollTop(),l=-k+h.top-f,m=k+j-(h.top+g+f);e=Math.max(l,m)===l?"top":"bottom"}if("top"===e?i.top+=-f:i.top+=g,d!==document.body){var n,o=c.css("opacity");b.visible||c.css("opacity",0).show(),n=c.offsetParent().offset(),i.top-=n.top,i.left-=n.left,b.visible||c.css("opacity",o).hide()}"auto"===b.options.width&&(i.width=b.el.outerWidth()-2+"px"),c.css(i)}},enableKillerFn:function(){var b=this;a(document).on("click.autocomplete",b.killerFn)},disableKillerFn:function(){var b=this;a(document).off("click.autocomplete",b.killerFn)},killSuggestions:function(){var a=this;a.stopKillSuggestions(),a.intervalId=window.setInterval(function(){a.visible&&(a.el.val(a.currentValue),a.hide()),a.stopKillSuggestions()},50)},stopKillSuggestions:function(){window.clearInterval(this.intervalId)},isCursorAtEnd:function(){var a,b=this,c=b.el.val().length,d=b.element.selectionStart;return"number"==typeof d?d===c:document.selection?(a=document.selection.createRange(),a.moveStart("character",-c),c===a.text.length):!0},onKeyPress:function(a){var b=this;if(!b.disabled&&!b.visible&&a.which===d.DOWN&&b.currentValue)return void b.suggest();if(!b.disabled&&b.visible){switch(a.which){case d.ESC:b.el.val(b.currentValue),b.hide();break;case d.RIGHT:if(b.hint&&b.options.onHint&&b.isCursorAtEnd()){b.selectHint();break}return;case d.TAB:if(b.hint&&b.options.onHint)return void b.selectHint();if(-1===b.selectedIndex)return void b.hide();if(b.select(b.selectedIndex),b.options.tabDisabled===!1)return;break;case d.RETURN:if(-1===b.selectedIndex)return void b.hide();b.select(b.selectedIndex);break;case d.UP:b.moveUp();break;case d.DOWN:b.moveDown();break;default:return}a.stopImmediatePropagation(),a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.which){case d.UP:case d.DOWN:return}clearInterval(b.onChangeInterval),b.currentValue!==b.el.val()&&(b.findBestHint(),b.options.deferRequestBy>0?b.onChangeInterval=setInterval(function(){b.onValueChange()},b.options.deferRequestBy):b.onValueChange())}},onValueChange:function(){var b=this,c=b.options,d=b.el.val(),e=b.getQuery(d);return b.selection&&b.currentValue!==e&&(b.selection=null,(c.onInvalidateSelection||a.noop).call(b.element)),clearInterval(b.onChangeInterval),b.currentValue=d,b.selectedIndex=-1,c.triggerSelectOnValidInput&&b.isExactMatch(e)?void b.select(0):void(e.length<c.minChars?b.hide():b.getSuggestions(e))},isExactMatch:function(a){var b=this.suggestions;return 1===b.length&&b[0].value.toLowerCase()===a.toLowerCase()},getQuery:function(b){var c,d=this.options.delimiter;return d?(c=b.split(d),a.trim(c[c.length-1])):b},getSuggestionsLocal:function(b){var c,d=this,e=d.options,f=b.toLowerCase(),g=e.lookupFilter,h=parseInt(e.lookupLimit,10);return c={suggestions:a.grep(e.lookup,function(a){return g(a,b,f)})},h&&c.suggestions.length>h&&(c.suggestions=c.suggestions.slice(0,h)),c},getSuggestions:function(b){var c,d,e,f,g=this,h=g.options,i=h.serviceUrl;if(h.params[h.paramName]=b,d=h.ignoreParams?null:h.params,h.onSearchStart.call(g.element,h.params)!==!1){if(a.isFunction(h.lookup))return void h.lookup(b,function(a){g.suggestions=a.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,a.suggestions)});g.isLocal?c=g.getSuggestionsLocal(b):(a.isFunction(i)&&(i=i.call(g.element,b)),e=i+"?"+a.param(d||{}),c=g.cachedResponse[e]),c&&a.isArray(c.suggestions)?(g.suggestions=c.suggestions,g.suggest(),h.onSearchComplete.call(g.element,b,c.suggestions)):g.isBadQuery(b)?h.onSearchComplete.call(g.element,b,[]):(g.abortAjax(),f={url:i,data:d,type:h.type,dataType:h.dataType},a.extend(f,h.ajaxSettings),g.currentRequest=a.ajax(f).done(function(a){var c;g.currentRequest=null,c=h.transformResult(a,b),g.processResponse(c,b,e),h.onSearchComplete.call(g.element,b,c.suggestions)}).fail(function(a,c,d){h.onSearchError.call(g.element,b,a,c,d)}))}},isBadQuery:function(a){if(!this.options.preventBadQueries)return!1;for(var b=this.badQueries,c=b.length;c--;)if(0===a.indexOf(b[c]))return!0;return!1},hide:function(){var b=this,c=a(b.suggestionsContainer);a.isFunction(b.options.onHide)&&b.visible&&b.options.onHide.call(b.element,c),b.visible=!1,b.selectedIndex=-1,clearInterval(b.onChangeInterval),a(b.suggestionsContainer).hide(),b.signalHint(null)},suggest:function(){if(0===this.suggestions.length)return void(this.options.showNoSuggestionNotice?this.noSuggestions():this.hide());var b,c=this,d=c.options,e=d.groupBy,f=d.formatResult,g=c.getQuery(c.currentValue),h=c.classes.suggestion,i=c.classes.selected,j=a(c.suggestionsContainer),k=a(c.noSuggestionsContainer),l=d.beforeRender,m="",n=function(a,c){var d=a.data[e];return b===d?"":(b=d,'<div class="autocomplete-group"><strong>'+b+"</strong></div>")};return d.triggerSelectOnValidInput&&c.isExactMatch(g)?void c.select(0):(a.each(c.suggestions,function(a,b){e&&(m+=n(b,g,a)),m+='<div class="'+h+'" data-index="'+a+'">'+f(b,g)+"</div>"}),this.adjustContainerWidth(),k.detach(),j.html(m),a.isFunction(l)&&l.call(c.element,j),c.fixPosition(),j.show(),d.autoSelectFirst&&(c.selectedIndex=0,j.scrollTop(0),j.children("."+h).first().addClass(i)),c.visible=!0,void c.findBestHint())},noSuggestions:function(){var b=this,c=a(b.suggestionsContainer),d=a(b.noSuggestionsContainer);this.adjustContainerWidth(),d.detach(),c.empty(),c.append(d),b.fixPosition(),c.show(),b.visible=!0},adjustContainerWidth:function(){var b,c=this,d=c.options,e=a(c.suggestionsContainer);"auto"===d.width&&(b=c.el.outerWidth()-2,e.width(b>0?b:300))},findBestHint:function(){var b=this,c=b.el.val().toLowerCase(),d=null;c&&(a.each(b.suggestions,function(a,b){var e=0===b.value.toLowerCase().indexOf(c);return e&&(d=b),!e}),b.signalHint(d))},signalHint:function(b){var c="",d=this;b&&(c=d.currentValue+b.value.substr(d.currentValue.length)),d.hintValue!==c&&(d.hintValue=c,d.hint=b,(this.options.onHint||a.noop)(c))},verifySuggestionsFormat:function(b){return b.length&&"string"==typeof b[0]?a.map(b,function(a){return{value:a,data:null}}):b},validateOrientation:function(b,c){return b=a.trim(b||"").toLowerCase(),-1===a.inArray(b,["auto","bottom","top"])&&(b=c),b},processResponse:function(a,b,c){var d=this,e=d.options;a.suggestions=d.verifySuggestionsFormat(a.suggestions),e.noCache||(d.cachedResponse[c]=a,e.preventBadQueries&&0===a.suggestions.length&&d.badQueries.push(b)),b===d.getQuery(d.currentValue)&&(d.suggestions=a.suggestions,d.suggest())},activate:function(b){var c,d=this,e=d.classes.selected,f=a(d.suggestionsContainer),g=f.find("."+d.classes.suggestion);return f.find("."+e).removeClass(e),d.selectedIndex=b,-1!==d.selectedIndex&&g.length>d.selectedIndex?(c=g.get(d.selectedIndex),a(c).addClass(e),c):null},selectHint:function(){var b=this,c=a.inArray(b.hint,b.suggestions);b.select(c)},select:function(a){var b=this;b.hide(),b.onSelect(a)},moveUp:function(){var b=this;if(-1!==b.selectedIndex)return 0===b.selectedIndex?(a(b.suggestionsContainer).children().first().removeClass(b.classes.selected),b.selectedIndex=-1,b.el.val(b.currentValue),void b.findBestHint()):void b.adjustScroll(b.selectedIndex-1)},moveDown:function(){var a=this;a.selectedIndex!==a.suggestions.length-1&&a.adjustScroll(a.selectedIndex+1)},adjustScroll:function(b){var c=this,d=c.activate(b);if(d){var e,f,g,h=a(d).outerHeight();e=d.offsetTop,f=a(c.suggestionsContainer).scrollTop(),g=f+c.options.maxHeight-h,f>e?a(c.suggestionsContainer).scrollTop(e):e>g&&a(c.suggestionsContainer).scrollTop(e-c.options.maxHeight+h),c.options.preserveInput||c.el.val(c.getValue(c.suggestions[b].value)),c.signalHint(null)}},onSelect:function(b){var c=this,d=c.options.onSelect,e=c.suggestions[b];c.currentValue=c.getValue(e.value),c.currentValue===c.el.val()||c.options.preserveInput||c.el.val(c.currentValue),c.signalHint(null),c.suggestions=[],c.selection=e,a.isFunction(d)&&d.call(c.element,e)},getValue:function(a){var b,c,d=this,e=d.options.delimiter;return e?(b=d.currentValue,c=b.split(e),1===c.length?a:b.substr(0,b.length-c[c.length-1].length)+a):a},dispose:function(){var b=this;b.el.off(".autocomplete").removeData("autocomplete"),b.disableKillerFn(),a(window).off("resize.autocomplete",b.fixPositionCapture),a(b.suggestionsContainer).remove()}},a.fn.autocomplete=a.fn.devbridgeAutocomplete=function(c,d){var e="autocomplete";return 0===arguments.length?this.first().data(e):this.each(function(){var f=a(this),g=f.data(e);"string"==typeof c?g&&"function"==typeof g[c]&&g[c](d):(g&&g.dispose&&g.dispose(),g=new b(this,c),f.data(e,g))})}});
\ No newline at end of file
diff --git a/js/jquery/plugins/devbridgeAutocomplete/license.txt b/js/jquery/plugins/devbridgeAutocomplete/license.txt
new file mode 100644
index 0000000000..11b3ff11a7
--- /dev/null
+++ b/js/jquery/plugins/devbridgeAutocomplete/license.txt
@@ -0,0 +1,21 @@
+Copyright 2012 DevBridge and other contributors
+http://www.devbridge.com/projects/autocomplete/jquery/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/js/jquery/ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/js/jquery/ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 0000000000..3b6948452f
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ
diff --git a/js/jquery/ui/images/ui-bg_diagonals-thick_20_666666_40x40.png b/js/jquery/ui/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 0000000000..9b21f7ebd6
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_diagonals-thick_20_666666_40x40.png differ
diff --git a/js/jquery/ui/images/ui-bg_flat_10_000000_40x100.png b/js/jquery/ui/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 0000000000..3633456037
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_flat_10_000000_40x100.png differ
diff --git a/js/jquery/ui/images/ui-bg_glass_100_f6f6f6_1x400.png b/js/jquery/ui/images/ui-bg_glass_100_f6f6f6_1x400.png
new file mode 100644
index 0000000000..a0ef1e66a9
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_glass_100_f6f6f6_1x400.png differ
diff --git a/js/jquery/ui/images/ui-bg_glass_100_fdf5ce_1x400.png b/js/jquery/ui/images/ui-bg_glass_100_fdf5ce_1x400.png
new file mode 100644
index 0000000000..9be7fcb847
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_glass_100_fdf5ce_1x400.png differ
diff --git a/js/jquery/ui/images/ui-bg_glass_65_ffffff_1x400.png b/js/jquery/ui/images/ui-bg_glass_65_ffffff_1x400.png
new file mode 100644
index 0000000000..1a77e4493d
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_glass_65_ffffff_1x400.png differ
diff --git a/js/jquery/ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/js/jquery/ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png
new file mode 100644
index 0000000000..420d9e2224
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ
diff --git a/js/jquery/ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/js/jquery/ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000..34e2c51b45
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ
diff --git a/js/jquery/ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/js/jquery/ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
new file mode 100644
index 0000000000..fa34f67347
Binary files /dev/null and b/js/jquery/ui/images/ui-bg_highlight-soft_75_ffe45c_1x100.png differ
diff --git a/js/jquery/ui/images/ui-icons_222222_256x240.png b/js/jquery/ui/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000..c1cb1170c8
Binary files /dev/null and b/js/jquery/ui/images/ui-icons_222222_256x240.png differ
diff --git a/js/jquery/ui/images/ui-icons_228ef1_256x240.png b/js/jquery/ui/images/ui-icons_228ef1_256x240.png
new file mode 100644
index 0000000000..3a0140cff6
Binary files /dev/null and b/js/jquery/ui/images/ui-icons_228ef1_256x240.png differ
diff --git a/js/jquery/ui/images/ui-icons_ef8c08_256x240.png b/js/jquery/ui/images/ui-icons_ef8c08_256x240.png
new file mode 100644
index 0000000000..036ee072d4
Binary files /dev/null and b/js/jquery/ui/images/ui-icons_ef8c08_256x240.png differ
diff --git a/js/jquery/ui/images/ui-icons_ffd27a_256x240.png b/js/jquery/ui/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 0000000000..8b6c05868b
Binary files /dev/null and b/js/jquery/ui/images/ui-icons_ffd27a_256x240.png differ
diff --git a/js/jquery/ui/images/ui-icons_ffffff_256x240.png b/js/jquery/ui/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000..4f624bb2b1
Binary files /dev/null and b/js/jquery/ui/images/ui-icons_ffffff_256x240.png differ
diff --git a/js/jquery/ui/jquery-ui-min.css b/js/jquery/ui/jquery-ui-min.css
new file mode 100644
index 0000000000..70c1920a1d
--- /dev/null
+++ b/js/jquery/ui/jquery-ui-min.css
@@ -0,0 +1,7 @@
+/*! jQuery UI - v1.11.2 - 2014-11-11
+* http://jqueryui.com
+* Includes: core.css, draggable.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, button.css, datepicker.css, dialog.css, menu.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=gloss_wave&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=highlight_soft&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=glass&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=glass&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=highlight_soft&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=diagonals_thick&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=diagonals_thick&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=flat&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;min-height:0;font-size:100%}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none;cursor:pointer}.ui-selectmenu-button span.ui-icon{right:0.5em;left:auto;margin-top:-8px;position:absolute;top:50%}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:0.4em 2.1em 0.4em 1em;display:block;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#eee url("images/ui-bg_highlight-soft_100_eeeeee_1x100.png") 50% top repeat-x;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #e78f08;background:#f6a828 url("images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x;color:#fff;font-weight:bold}.ui-widget-header a{color:#fff}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #ccc;background:#f6f6f6 url("images/ui-bg_glass_100_f6f6f6_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#1c94c4}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#1c94c4;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #fbcb09;background:#fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#c77405}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#c77405;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #fbd850;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#eb8f00}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#eb8f00;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fed22f;background:#ffe45c url("images/ui-bg_highlight-soft_75_ffe45c_1x100.png") 50% top repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#b81900 url("images/ui-bg_diagonals-thick_18_b81900_40x40.png") 50% 50% repeat;color:#fff}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#fff}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#fff}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_228ef1_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_ffd27a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#666 url("images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;opacity:.5;filter:Alpha(Opacity=50)}.ui-widget-shadow{margin:-5px 0 0 -5px;padding:5px;background:#000 url("images/ui-bg_flat_10_000000_40x100.png") 50% 50% repeat-x;opacity:.2;filter:Alpha(Opacity=20);border-radius:5px}
\ No newline at end of file
diff --git a/js/jquery/ui/jquery-ui-min.js b/js/jquery/ui/jquery-ui-min.js
new file mode 100644
index 0000000000..5ae527d589
--- /dev/null
+++ b/js/jquery/ui/jquery-ui-min.js
@@ -0,0 +1,13 @@
+/*! jQuery UI - v1.11.2 - 2014-11-09
+* http://jqueryui.com
+* Includes: core.js, widget.js, mouse.js, position.js, draggable.js, droppable.js, resizable.js, selectable.js, sortable.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, menu.js, progressbar.js, selectmenu.js, slider.js, spinner.js, tabs.js, tooltip.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+(function(e){"function"==typeof define&&define.amd?define(["jquery"],e):e(jQuery)})(function(e){function t(t,s){var n,a,o,r=t.nodeName.toLowerCase();return"area"===r?(n=t.parentNode,a=n.name,t.href&&a&&"map"===n.nodeName.toLowerCase()?(o=e("img[usemap='#"+a+"']")[0],!!o&&i(o)):!1):(/input|select|textarea|button|object/.test(r)?!t.disabled:"a"===r?t.href||s:s)&&i(t)}function i(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}function s(e){for(var t,i;e.length&&e[0]!==document;){if(t=e.css("position"),("absolute"===t||"relative"===t||"fixed"===t)&&(i=parseInt(e.css("zIndex"),10),!isNaN(i)&&0!==i))return i;e=e.parent()}return 0}function n(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},e.extend(this._defaults,this.regional[""]),this.regional.en=e.extend(!0,{},this.regional[""]),this.regional["en-US"]=e.extend(!0,{},this.regional.en),this.dpDiv=a(e("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function a(t){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.delegate(i,"mouseout",function(){e(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",o)}function o(){e.datepicker._isDisabledDatepicker(v.inline?v.dpDiv.parent()[0]:v.input[0])||(e(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),e(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&e(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&e(this).addClass("ui-datepicker-next-hover"))}function r(t,i){e.extend(t,i);for(var s in i)null==i[s]&&(t[s]=i[s]);return t}function h(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}e.ui=e.ui||{},e.extend(e.ui,{version:"1.11.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({scrollParent:function(t){var i=this.css("position"),s="absolute"===i,n=t?/(auto|scroll|hidden)/:/(auto|scroll)/,a=this.parents().filter(function(){var t=e(this);return s&&"static"===t.css("position")?!1:n.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==i&&a.length?a:e(this[0].ownerDocument||document)},uniqueId:function(){var e=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++e)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(i){return t(i,!isNaN(e.attr(i,"tabindex")))},tabbable:function(i){var s=e.attr(i,"tabindex"),n=isNaN(s);return(n||s>=0)&&t(i,!n)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(t,i){function s(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],a=i.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+i]=function(t){return void 0===t?o["inner"+i].call(this):this.each(function(){e(this).css(a,s(this,t)+"px")})},e.fn["outer"+i]=function(t,n){return"number"!=typeof t?o["outer"+i].call(this,t):this.each(function(){e(this).css(a,s(this,t,!0,n)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),disableSelection:function(){var e="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.bind(e+".ui-disableSelection",function(e){e.preventDefault()})}}(),enableSelection:function(){return this.unbind(".ui-disableSelection")},zIndex:function(t){if(void 0!==t)return this.css("zIndex",t);if(this.length)for(var i,s,n=e(this[0]);n.length&&n[0]!==document;){if(i=n.css("position"),("absolute"===i||"relative"===i||"fixed"===i)&&(s=parseInt(n.css("zIndex"),10),!isNaN(s)&&0!==s))return s;n=n.parent()}return 0}}),e.ui.plugin={add:function(t,i,s){var n,a=e.ui[t].prototype;for(n in s)a.plugins[n]=a.plugins[n]||[],a.plugins[n].push([i,s[n]])},call:function(e,t,i,s){var n,a=e.plugins[t];if(a&&(s||e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType))for(n=0;a.length>n;n++)e.options[a[n][0]]&&a[n][1].apply(e.element,i)}};var l=0,u=Array.prototype.slice;e.cleanData=function(t){return function(i){var s,n,a;for(a=0;null!=(n=i[a]);a++)try{s=e._data(n,"events"),s&&s.remove&&e(n).triggerHandler("remove")}catch(o){}t(i)}}(e.cleanData),e.widget=function(t,i,s){var n,a,o,r,h={},l=t.split(".")[0];return t=t.split(".")[1],n=l+"-"+t,s||(s=i,i=e.Widget),e.expr[":"][n.toLowerCase()]=function(t){return!!e.data(t,n)},e[l]=e[l]||{},a=e[l][t],o=e[l][t]=function(e,t){return this._createWidget?(arguments.length&&this._createWidget(e,t),void 0):new o(e,t)},e.extend(o,a,{version:s.version,_proto:e.extend({},s),_childConstructors:[]}),r=new i,r.options=e.widget.extend({},r.options),e.each(s,function(t,s){return e.isFunction(s)?(h[t]=function(){var e=function(){return i.prototype[t].apply(this,arguments)},n=function(e){return i.prototype[t].apply(this,e)};return function(){var t,i=this._super,a=this._superApply;return this._super=e,this._superApply=n,t=s.apply(this,arguments),this._super=i,this._superApply=a,t}}(),void 0):(h[t]=s,void 0)}),o.prototype=e.widget.extend(r,{widgetEventPrefix:a?r.widgetEventPrefix||t:t},h,{constructor:o,namespace:l,widgetName:t,widgetFullName:n}),a?(e.each(a._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete a._childConstructors):i._childConstructors.push(o),e.widget.bridge(t,o),o},e.widget.extend=function(t){for(var i,s,n=u.call(arguments,1),a=0,o=n.length;o>a;a++)for(i in n[a])s=n[a][i],n[a].hasOwnProperty(i)&&void 0!==s&&(t[i]=e.isPlainObject(s)?e.isPlainObject(t[i])?e.widget.extend({},t[i],s):e.widget.extend({},s):s);return t},e.widget.bridge=function(t,i){var s=i.prototype.widgetFullName||t;e.fn[t]=function(n){var a="string"==typeof n,o=u.call(arguments,1),r=this;return n=!a&&o.length?e.widget.extend.apply(null,[n].concat(o)):n,a?this.each(function(){var i,a=e.data(this,s);return"instance"===n?(r=a,!1):a?e.isFunction(a[n])&&"_"!==n.charAt(0)?(i=a[n].apply(a,o),i!==a&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):e.error("no such method '"+n+"' for "+t+" widget instance"):e.error("cannot call methods on "+t+" prior to initialization; "+"attempted to call method '"+n+"'")}):this.each(function(){var t=e.data(this,s);t?(t.option(n||{}),t._init&&t._init()):e.data(this,s,new i(n,this))}),r}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,i){i=e(i||this.defaultElement||this)[0],this.element=e(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=e(),this.hoverable=e(),this.focusable=e(),i!==this&&(e.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===i&&this.destroy()}}),this.document=e(i.style?i.ownerDocument:i.document||i),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(t,i){var s,n,a,o=t;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof t)if(o={},s=t.split("."),t=s.shift(),s.length){for(n=o[t]=e.widget.extend({},this.options[t]),a=0;s.length-1>a;a++)n[s[a]]=n[s[a]]||{},n=n[s[a]];if(t=s.pop(),1===arguments.length)return void 0===n[t]?null:n[t];n[t]=i}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=i}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled",!!t),t&&(this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus"))),this},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_on:function(t,i,s){var n,a=this;"boolean"!=typeof t&&(s=i,i=t,t=!1),s?(i=n=e(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),e.each(s,function(s,o){function r(){return t||a.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?a[o]:o).apply(a,arguments):void 0}"string"!=typeof o&&(r.guid=o.guid=o.guid||r.guid||e.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+a.eventNamespace,u=h[2];u?n.delegate(u,l,r):i.bind(l,r)})},_off:function(t,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(i).undelegate(i),this.bindings=e(this.bindings.not(t).get()),this.focusable=e(this.focusable.not(t).get()),this.hoverable=e(this.hoverable.not(t).get())},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,o=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(o)&&o.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var o,r=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),o=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),o&&e.effects&&e.effects.effect[r]?s[t](n):r!==t&&s[r]?s[r](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}}),e.widget;var d=!1;e(document).mouseup(function(){d=!1}),e.widget("ui.mouse",{version:"1.11.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!d){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var i=this,s=1===t.which,n="string"==typeof this.options.cancel&&t.target.nodeName?e(t.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(t)!==!1,!this._mouseStarted)?(t.preventDefault(),!0):(!0===e.data(t.target,this.widgetName+".preventClickEvent")&&e.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return i._mouseMove(e)},this._mouseUpDelegate=function(e){return i._mouseUp(e)},this.document.bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),d=!0,!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button)return this._mouseUp(t);if(!t.which)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return this.document.unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),d=!1,!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),function(){function t(e,t,i){return[parseFloat(e[0])*(p.test(e[0])?t/100:1),parseFloat(e[1])*(p.test(e[1])?i/100:1)]}function i(t,i){return parseInt(e.css(t,i),10)||0}function s(t){var i=t[0];return 9===i.nodeType?{width:t.width(),height:t.height(),offset:{top:0,left:0}}:e.isWindow(i)?{width:t.width(),height:t.height(),offset:{top:t.scrollTop(),left:t.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:t.outerWidth(),height:t.outerHeight(),offset:t.offset()}}e.ui=e.ui||{};var n,a,o=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,u=/top|center|bottom/,d=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,p=/%$/,f=e.fn.position;e.position={scrollbarWidth:function(){if(void 0!==n)return n;var t,i,s=e("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=s.children()[0];return e("body").append(s),t=a.offsetWidth,s.css("overflow","scroll"),i=a.offsetWidth,t===i&&(i=s[0].clientWidth),s.remove(),n=t-i},getScrollInfo:function(t){var i=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),s=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),n="scroll"===i||"auto"===i&&t.width<t.element[0].scrollWidth,a="scroll"===s||"auto"===s&&t.height<t.element[0].scrollHeight;return{width:a?e.position.scrollbarWidth():0,height:n?e.position.scrollbarWidth():0}},getWithinInfo:function(t){var i=e(t||window),s=e.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType;return{element:i,isWindow:s,isDocument:n,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s||n?i.width():i.outerWidth(),height:s||n?i.height():i.outerHeight()}}},e.fn.position=function(n){if(!n||!n.of)return f.apply(this,arguments);n=e.extend({},n);var p,m,g,v,y,b,_=e(n.of),x=e.position.getWithinInfo(n.within),w=e.position.getScrollInfo(x),k=(n.collision||"flip").split(" "),T={};return b=s(_),_[0].preventDefault&&(n.at="left top"),m=b.width,g=b.height,v=b.offset,y=e.extend({},v),e.each(["my","at"],function(){var e,t,i=(n[this]||"").split(" ");1===i.length&&(i=l.test(i[0])?i.concat(["center"]):u.test(i[0])?["center"].concat(i):["center","center"]),i[0]=l.test(i[0])?i[0]:"center",i[1]=u.test(i[1])?i[1]:"center",e=d.exec(i[0]),t=d.exec(i[1]),T[this]=[e?e[0]:0,t?t[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===n.at[0]?y.left+=m:"center"===n.at[0]&&(y.left+=m/2),"bottom"===n.at[1]?y.top+=g:"center"===n.at[1]&&(y.top+=g/2),p=t(T.at,m,g),y.left+=p[0],y.top+=p[1],this.each(function(){var s,l,u=e(this),d=u.outerWidth(),c=u.outerHeight(),f=i(this,"marginLeft"),b=i(this,"marginTop"),D=d+f+i(this,"marginRight")+w.width,S=c+b+i(this,"marginBottom")+w.height,M=e.extend({},y),C=t(T.my,u.outerWidth(),u.outerHeight());"right"===n.my[0]?M.left-=d:"center"===n.my[0]&&(M.left-=d/2),"bottom"===n.my[1]?M.top-=c:"center"===n.my[1]&&(M.top-=c/2),M.left+=C[0],M.top+=C[1],a||(M.left=h(M.left),M.top=h(M.top)),s={marginLeft:f,marginTop:b},e.each(["left","top"],function(t,i){e.ui.position[k[t]]&&e.ui.position[k[t]][i](M,{targetWidth:m,targetHeight:g,elemWidth:d,elemHeight:c,collisionPosition:s,collisionWidth:D,collisionHeight:S,offset:[p[0]+C[0],p[1]+C[1]],my:n.my,at:n.at,within:x,elem:u})}),n.using&&(l=function(e){var t=v.left-M.left,i=t+m-d,s=v.top-M.top,a=s+g-c,h={target:{element:_,left:v.left,top:v.top,width:m,height:g},element:{element:u,left:M.left,top:M.top,width:d,height:c},horizontal:0>i?"left":t>0?"right":"center",vertical:0>a?"top":s>0?"bottom":"middle"};d>m&&m>r(t+i)&&(h.horizontal="center"),c>g&&g>r(s+a)&&(h.vertical="middle"),h.important=o(r(t),r(i))>o(r(s),r(a))?"horizontal":"vertical",n.using.call(this,e,h)}),u.offset(e.extend(M,{using:l}))})},e.ui.position={fit:{left:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=e.left-t.collisionPosition.marginLeft,h=n-r,l=r+t.collisionWidth-a-n;t.collisionWidth>a?h>0&&0>=l?(i=e.left+h+t.collisionWidth-a-n,e.left+=h-i):e.left=l>0&&0>=h?n:h>l?n+a-t.collisionWidth:n:h>0?e.left+=h:l>0?e.left-=l:e.left=o(e.left-r,e.left)},top:function(e,t){var i,s=t.within,n=s.isWindow?s.scrollTop:s.offset.top,a=t.within.height,r=e.top-t.collisionPosition.marginTop,h=n-r,l=r+t.collisionHeight-a-n;t.collisionHeight>a?h>0&&0>=l?(i=e.top+h+t.collisionHeight-a-n,e.top+=h-i):e.top=l>0&&0>=h?n:h>l?n+a-t.collisionHeight:n:h>0?e.top+=h:l>0?e.top-=l:e.top=o(e.top-r,e.top)}},flip:{left:function(e,t){var i,s,n=t.within,a=n.offset.left+n.scrollLeft,o=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=e.left-t.collisionPosition.marginLeft,u=l-h,d=l+t.collisionWidth-o-h,c="left"===t.my[0]?-t.elemWidth:"right"===t.my[0]?t.elemWidth:0,p="left"===t.at[0]?t.targetWidth:"right"===t.at[0]?-t.targetWidth:0,f=-2*t.offset[0];0>u?(i=e.left+c+p+f+t.collisionWidth-o-a,(0>i||r(u)>i)&&(e.left+=c+p+f)):d>0&&(s=e.left-t.collisionPosition.marginLeft+c+p+f-h,(s>0||d>r(s))&&(e.left+=c+p+f))},top:function(e,t){var i,s,n=t.within,a=n.offset.top+n.scrollTop,o=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=e.top-t.collisionPosition.marginTop,u=l-h,d=l+t.collisionHeight-o-h,c="top"===t.my[1],p=c?-t.elemHeight:"bottom"===t.my[1]?t.elemHeight:0,f="top"===t.at[1]?t.targetHeight:"bottom"===t.at[1]?-t.targetHeight:0,m=-2*t.offset[1];0>u?(s=e.top+p+f+m+t.collisionHeight-o-a,e.top+p+f+m>u&&(0>s||r(u)>s)&&(e.top+=p+f+m)):d>0&&(i=e.top-t.collisionPosition.marginTop+p+f+m-h,e.top+p+f+m>d&&(i>0||d>r(i))&&(e.top+=p+f+m))}},flipfit:{left:function(){e.ui.position.flip.left.apply(this,arguments),e.ui.position.fit.left.apply(this,arguments)},top:function(){e.ui.position.flip.top.apply(this,arguments),e.ui.position.fit.top.apply(this,arguments)}}},function(){var t,i,s,n,o,r=document.getElementsByTagName("body")[0],h=document.createElement("div");t=document.createElement(r?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},r&&e.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)t.style[o]=s[o];t.appendChild(h),i=r||document.documentElement,i.insertBefore(t,i.firstChild),h.style.cssText="position: absolute; left: 10.7432222px;",n=e(h).offset().left,a=n>10&&11>n,t.innerHTML="",i.removeChild(t)}()}(),e.ui.position,e.widget("ui.draggable",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._setHandleClassName(),this._mouseInit()},_setOption:function(e,t){this._super(e,t),"handle"===e&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(t){var i=this.options;return this._blurActiveElement(t),this.helper||i.disabled||e(t.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(t),this.handle?(this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=e(this);return e("<div>").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var i=this.document[0];if(this.handleElement.is(t.target))try{i.activeElement&&"body"!==i.activeElement.nodeName.toLowerCase()&&e(i.activeElement).blur()}catch(s){}},_mouseStart:function(t){var i=this.options;return this.helper=this._createHelper(t),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),e.ui.ddmanager&&(e.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===e(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",t)===!1?(this._clear(),!1):(this._cacheHelperProportions(),e.ui.ddmanager&&!i.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this._normalizeRightBottom(),this._mouseDrag(t,!0),e.ui.ddmanager&&e.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(e){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:e.pageX-this.offset.left,top:e.pageY-this.offset.top}},_mouseDrag:function(t,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",t,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var i=this,s=!1;return e.ui.ddmanager&&!this.options.dropBehaviour&&(s=e.ui.ddmanager.drop(this,t)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||e.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?e(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",t)!==!1&&i._clear()}):this._trigger("stop",t)!==!1&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),e.ui.ddmanager&&e.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.focus(),e.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(t){return this.options.handle?!!e(t.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this.handleElement.addClass("ui-draggable-handle")},_removeHandleClassName:function(){this.handleElement.removeClass("ui-draggable-handle")},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper),n=s?e(i.helper.apply(this.element[0],[t])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(e){return/(html|body)/i.test(e.tagName)||e===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var e=this.element.position(),t=this._isRootNode(this.scrollParent[0]);return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+(t?0:this.scrollParent.scrollTop()),left:e.left-(parseInt(this.helper.css("left"),10)||0)+(t?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options,a=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[e(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,e(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,e(window).scrollLeft()+e(window).width()-this.helperProportions.width-this.margins.left,e(window).scrollTop()+(e(window).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,e(a).width()-this.helperProportions.width-this.margins.left,(e(a).height()||a.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=e(n.containment),s=i[0],s&&(t=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(t?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(e,t){t||(t=this.position);var i="absolute"===e?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:t.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:t.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(e,t){var i,s,n,a,o=this.options,r=this._isRootNode(this.scrollParent[0]),h=e.pageX,l=e.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),t&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),o.grid&&(n=o.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/o.grid[1])*o.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-o.grid[1]:n+o.grid[1]:n,a=o.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/o.grid[0])*o.grid[0]:this.originalPageX,h=i?a-this.offset.click.left>=i[0]||a-this.offset.click.left>i[2]?a:a-this.offset.click.left>=i[0]?a-o.grid[0]:a+o.grid[0]:a),"y"===o.axis&&(h=this.originalPageX),"x"===o.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}
+},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_normalizeRightBottom:function(){"y"!==this.options.axis&&"auto"!==this.helper.css("right")&&(this.helper.width(this.helper.width()),this.helper.css("right","auto")),"x"!==this.options.axis&&"auto"!==this.helper.css("bottom")&&(this.helper.height(this.helper.height()),this.helper.css("bottom","auto"))},_trigger:function(t,i,s){return s=s||this._uiHash(),e.ui.plugin.call(this,t,[i,s,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),e.Widget.prototype._trigger.call(this,t,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),e.ui.plugin.add("draggable","connectToSortable",{start:function(t,i,s){var n=e.extend({},i,{item:s.element});s.sortables=[],e(s.options.connectToSortable).each(function(){var i=e(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",t,n))})},stop:function(t,i,s){var n=e.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,e.each(s.sortables,function(){var e=this;e.isOver?(e.isOver=0,s.cancelHelperRemoval=!0,e.cancelHelperRemoval=!1,e._storedCSS={position:e.placeholder.css("position"),top:e.placeholder.css("top"),left:e.placeholder.css("left")},e._mouseStop(t),e.options.helper=e.options._helper):(e.cancelHelperRemoval=!0,e._trigger("deactivate",t,n))})},drag:function(t,i,s){e.each(s.sortables,function(){var n=!1,a=this;a.positionAbs=s.positionAbs,a.helperProportions=s.helperProportions,a.offset.click=s.offset.click,a._intersectsWith(a.containerCache)&&(n=!0,e.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==a&&this._intersectsWith(this.containerCache)&&e.contains(a.element[0],this.element[0])&&(n=!1),n})),n?(a.isOver||(a.isOver=1,a.currentItem=i.helper.appendTo(a.element).data("ui-sortable-item",!0),a.options._helper=a.options.helper,a.options.helper=function(){return i.helper[0]},t.target=a.currentItem[0],a._mouseCapture(t,!0),a._mouseStart(t,!0,!0),a.offset.click.top=s.offset.click.top,a.offset.click.left=s.offset.click.left,a.offset.parent.left-=s.offset.parent.left-a.offset.parent.left,a.offset.parent.top-=s.offset.parent.top-a.offset.parent.top,s._trigger("toSortable",t),s.dropped=a.element,e.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,a.fromOutside=s),a.currentItem&&(a._mouseDrag(t),i.position=a.position)):a.isOver&&(a.isOver=0,a.cancelHelperRemoval=!0,a.options._revert=a.options.revert,a.options.revert=!1,a._trigger("out",t,a._uiHash(a)),a._mouseStop(t,!0),a.options.revert=a.options._revert,a.options.helper=a.options._helper,a.placeholder&&a.placeholder.remove(),s._refreshOffsets(t),i.position=s._generatePosition(t,!0),s._trigger("fromSortable",t),s.dropped=!1,e.each(s.sortables,function(){this.refreshPositions()}))})}}),e.ui.plugin.add("draggable","cursor",{start:function(t,i,s){var n=e("body"),a=s.options;n.css("cursor")&&(a._cursor=n.css("cursor")),n.css("cursor",a.cursor)},stop:function(t,i,s){var n=s.options;n._cursor&&e("body").css("cursor",n._cursor)}}),e.ui.plugin.add("draggable","opacity",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("opacity")&&(a._opacity=n.css("opacity")),n.css("opacity",a.opacity)},stop:function(t,i,s){var n=s.options;n._opacity&&e(i.helper).css("opacity",n._opacity)}}),e.ui.plugin.add("draggable","scroll",{start:function(e,t,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,i,s){var n=s.options,a=!1,o=s.scrollParentNotHidden[0],r=s.document[0];o!==r&&"HTML"!==o.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+o.offsetHeight-t.pageY<n.scrollSensitivity?o.scrollTop=a=o.scrollTop+n.scrollSpeed:t.pageY-s.overflowOffset.top<n.scrollSensitivity&&(o.scrollTop=a=o.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+o.offsetWidth-t.pageX<n.scrollSensitivity?o.scrollLeft=a=o.scrollLeft+n.scrollSpeed:t.pageX-s.overflowOffset.left<n.scrollSensitivity&&(o.scrollLeft=a=o.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(t.pageY-e(r).scrollTop()<n.scrollSensitivity?a=e(r).scrollTop(e(r).scrollTop()-n.scrollSpeed):e(window).height()-(t.pageY-e(r).scrollTop())<n.scrollSensitivity&&(a=e(r).scrollTop(e(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(t.pageX-e(r).scrollLeft()<n.scrollSensitivity?a=e(r).scrollLeft(e(r).scrollLeft()-n.scrollSpeed):e(window).width()-(t.pageX-e(r).scrollLeft())<n.scrollSensitivity&&(a=e(r).scrollLeft(e(r).scrollLeft()+n.scrollSpeed)))),a!==!1&&e.ui.ddmanager&&!n.dropBehaviour&&e.ui.ddmanager.prepareOffsets(s,t)}}),e.ui.plugin.add("draggable","snap",{start:function(t,i,s){var n=s.options;s.snapElements=[],e(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var t=e(this),i=t.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:i.top,left:i.left})})},drag:function(t,i,s){var n,a,o,r,h,l,u,d,c,p,f=s.options,m=f.snapTolerance,g=i.offset.left,v=g+s.helperProportions.width,y=i.offset.top,b=y+s.helperProportions.height;for(c=s.snapElements.length-1;c>=0;c--)h=s.snapElements[c].left-s.margins.left,l=h+s.snapElements[c].width,u=s.snapElements[c].top-s.margins.top,d=u+s.snapElements[c].height,h-m>v||g>l+m||u-m>b||y>d+m||!e.contains(s.snapElements[c].item.ownerDocument,s.snapElements[c].item)?(s.snapElements[c].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=!1):("inner"!==f.snapMode&&(n=m>=Math.abs(u-b),a=m>=Math.abs(d-y),o=m>=Math.abs(h-v),r=m>=Math.abs(l-g),n&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||a||o||r,"outer"!==f.snapMode&&(n=m>=Math.abs(u-y),a=m>=Math.abs(d-b),o=m>=Math.abs(h-g),r=m>=Math.abs(l-v),n&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.top=s._convertPositionTo("relative",{top:d-s.helperProportions.height,left:0}).top),o&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[c].snapping&&(n||a||o||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,t,e.extend(s._uiHash(),{snapItem:s.snapElements[c].item})),s.snapElements[c].snapping=n||a||o||r||p)}}),e.ui.plugin.add("draggable","stack",{start:function(t,i,s){var n,a=s.options,o=e.makeArray(e(a.stack)).sort(function(t,i){return(parseInt(e(t).css("zIndex"),10)||0)-(parseInt(e(i).css("zIndex"),10)||0)});o.length&&(n=parseInt(e(o[0]).css("zIndex"),10)||0,e(o).each(function(t){e(this).css("zIndex",n+t)}),this.css("zIndex",n+o.length))}}),e.ui.plugin.add("draggable","zIndex",{start:function(t,i,s){var n=e(i.helper),a=s.options;n.css("zIndex")&&(a._zIndex=n.css("zIndex")),n.css("zIndex",a.zIndex)},stop:function(t,i,s){var n=s.options;n._zIndex&&e(i.helper).css("zIndex",n._zIndex)}}),e.ui.draggable,e.widget("ui.droppable",{version:"1.11.2",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=e.isFunction(s)?s:function(e){return e.is(s)},this.proportions=function(){return arguments.length?(t=arguments[0],void 0):t?t:t={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this.element.addClass("ui-droppable")},_addToManager:function(t){e.ui.ddmanager.droppables[t]=e.ui.ddmanager.droppables[t]||[],e.ui.ddmanager.droppables[t].push(this)},_splice:function(e){for(var t=0;e.length>t;t++)e[t]===this&&e.splice(t,1)},_destroy:function(){var t=e.ui.ddmanager.droppables[this.options.scope];this._splice(t),this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(t,i){if("accept"===t)this.accept=e.isFunction(i)?i:function(e){return e.is(i)};else if("scope"===t){var s=e.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(t,i)},_activate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",t,this.ui(i))},_deactivate:function(t){var i=e.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",t,this.ui(i))},_over:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",t,this.ui(i)))},_out:function(t){var i=e.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",t,this.ui(i)))},_drop:function(t,i){var s=i||e.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=e(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&e.ui.intersect(s,e.extend(i,{offset:i.element.offset()}),i.options.tolerance,t)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",t,this.ui(s)),this.element):!1):!1},ui:function(e){return{draggable:e.currentItem||e.element,helper:e.helper,position:e.position,offset:e.positionAbs}}}),e.ui.intersect=function(){function e(e,t,i){return e>=t&&t+i>e}return function(t,i,s,n){if(!i.offset)return!1;var a=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,r=a+t.helperProportions.width,h=o+t.helperProportions.height,l=i.offset.left,u=i.offset.top,d=l+i.proportions().width,c=u+i.proportions().height;switch(s){case"fit":return a>=l&&d>=r&&o>=u&&c>=h;case"intersect":return a+t.helperProportions.width/2>l&&d>r-t.helperProportions.width/2&&o+t.helperProportions.height/2>u&&c>h-t.helperProportions.height/2;case"pointer":return e(n.pageY,u,i.proportions().height)&&e(n.pageX,l,i.proportions().width);case"touch":return(o>=u&&c>=o||h>=u&&c>=h||u>o&&h>c)&&(a>=l&&d>=a||r>=l&&d>=r||l>a&&r>d);default:return!1}}}(),e.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(t,i){var s,n,a=e.ui.ddmanager.droppables[t.options.scope]||[],o=i?i.type:null,r=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();e:for(s=0;a.length>s;s++)if(!(a[s].options.disabled||t&&!a[s].accept.call(a[s].element[0],t.currentItem||t.element))){for(n=0;r.length>n;n++)if(r[n]===a[s].element[0]){a[s].proportions().height=0;continue e}a[s].visible="none"!==a[s].element.css("display"),a[s].visible&&("mousedown"===o&&a[s]._activate.call(a[s],i),a[s].offset=a[s].element.offset(),a[s].proportions({width:a[s].element[0].offsetWidth,height:a[s].element[0].offsetHeight}))}},drop:function(t,i){var s=!1;return e.each((e.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&e.ui.intersect(t,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(t,i){t.element.parentsUntil("body").bind("scroll.droppable",function(){t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)})},drag:function(t,i){t.options.refreshPositions&&e.ui.ddmanager.prepareOffsets(t,i),e.each(e.ui.ddmanager.droppables[t.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,a,o=e.ui.intersect(t,this,this.options.tolerance,i),r=!o&&this.isover?"isout":o&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,a=this.element.parents(":data(ui-droppable)").filter(function(){return e(this).droppable("instance").options.scope===n}),a.length&&(s=e(a[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(t,i){t.element.parentsUntil("body").unbind("scroll.droppable"),t.options.refreshPositions||e.ui.ddmanager.prepareOffsets(t,i)}},e.ui.droppable,e.widget("ui.resizable",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(e){return parseInt(e,10)||0},_isNumber:function(e){return!isNaN(parseInt(e,10))},_hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return t[s]>0?!0:(t[s]=1,n=t[s]>0,t[s]=0,n)},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=this.element.children(this.handles[i]).first().show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),e(this.handles[i]).length},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(t){var i,s,n,a=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),a.containment&&(i+=e(a.containment).scrollLeft()||0,s+=e(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:o.width(),height:o.height()},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:o.width(),height:o.height()},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===n?this.axis+"-resize":n),o.addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var i,s,n=this.originalMousePosition,a=this.axis,o=t.pageX-n.left||0,r=t.pageY-n.top||0,h=this._change[a];return this._updatePrevProperties(),h?(i=h.apply(this,[t,o,r]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var e={};return this.position.top!==this.prevPosition.top&&(e.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(e.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(e.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(e.height=this.size.height+"px"),this.helper.css(e),e},_updateVirtualBoundaries:function(e){var t,i,s,n,a,o=this.options;a={minWidth:this._isNumber(o.minWidth)?o.minWidth:0,maxWidth:this._isNumber(o.maxWidth)?o.maxWidth:1/0,minHeight:this._isNumber(o.minHeight)?o.minHeight:0,maxHeight:this._isNumber(o.maxHeight)?o.maxHeight:1/0},(this._aspectRatio||e)&&(t=a.minHeight*this.aspectRatio,s=a.minWidth/this.aspectRatio,i=a.maxHeight*this.aspectRatio,n=a.maxWidth/this.aspectRatio,t>a.minWidth&&(a.minWidth=t),s>a.minHeight&&(a.minHeight=s),a.maxWidth>i&&(a.maxWidth=i),a.maxHeight>n&&(a.maxHeight=n)),this._vBoundaries=a},_updateCache:function(e){this.offset=this.helper.offset(),this._isNumber(e.left)&&(this.position.left=e.left),this._isNumber(e.top)&&(this.position.top=e.top),this._isNumber(e.height)&&(this.size.height=e.height),this._isNumber(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,i=this.size,s=this.axis;return this._isNumber(e.height)?e.width=e.height*this.aspectRatio:this._isNumber(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===s&&(e.left=t.left+(i.width-e.width),e.top=null),"nw"===s&&(e.top=t.top+(i.height-e.height),e.left=t.left+(i.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,i=this.axis,s=this._isNumber(e.width)&&t.maxWidth&&t.maxWidth<e.width,n=this._isNumber(e.height)&&t.maxHeight&&t.maxHeight<e.height,a=this._isNumber(e.width)&&t.minWidth&&t.minWidth>e.width,o=this._isNumber(e.height)&&t.minHeight&&t.minHeight>e.height,r=this.originalPosition.left+this.originalSize.width,h=this.position.top+this.size.height,l=/sw|nw|w/.test(i),u=/nw|ne|n/.test(i);return a&&(e.width=t.minWidth),o&&(e.height=t.minHeight),s&&(e.width=t.maxWidth),n&&(e.height=t.maxHeight),a&&l&&(e.left=r-t.minWidth),s&&l&&(e.left=r-t.maxWidth),o&&u&&(e.top=h-t.minHeight),n&&u&&(e.top=h-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_getPaddingPlusBorderDimensions:function(e){for(var t=0,i=[],s=[e.css("borderTopWidth"),e.css("borderRightWidth"),e.css("borderBottomWidth"),e.css("borderLeftWidth")],n=[e.css("paddingTop"),e.css("paddingRight"),e.css("paddingBottom"),e.css("paddingLeft")];4>t;t++)i[t]=parseInt(s[t],10)||0,i[t]+=parseInt(n[t],10)||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e,t=0,i=this.helper||this.element;this._proportionallyResizeElements.length>t;t++)e=this._proportionallyResizeElements[t],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(e)),e.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var t,i,s,n,a,o,r,h=e(this).resizable("instance"),l=h.options,u=h.element,d=l.containment,c=d instanceof e?d.get(0):/parent/.test(d)?u.parent().get(0):d;c&&(h.containerElement=e(c),/document/.test(d)||d===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(t=e(c),i=[],e(["Top","Right","Left","Bottom"]).each(function(e,s){i[e]=h._num(t.css("padding"+s))}),h.containerOffset=t.offset(),h.containerPosition=t.position(),h.containerSize={height:t.innerHeight()-i[3],width:t.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,a=h.containerSize.width,o=h._hasScroll(c,"left")?c.scrollWidth:a,r=h._hasScroll(c)?c.scrollHeight:n,h.parentData={element:c,left:s.left,top:s.top,width:o,height:r}))},resize:function(t){var i,s,n,a,o=e(this).resizable("instance"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,d={top:0,left:0},c=o.containerElement,p=!0;c[0]!==document&&/static/.test(c.css("position"))&&(d=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-d.left),u&&(o.size.height=o.size.width/o.aspectRatio,p=!1),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio,p=!1),o.position.top=o._helper?h.top:0),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a?(o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top):(o.offset.left=o.element.offset().left,o.offset.top=o.element.offset().top),i=Math.abs(o.sizeDiff.width+(o._helper?o.offset.left-d.left:o.offset.left-h.left)),s=Math.abs(o.sizeDiff.height+(o._helper?o.offset.top-d.top:o.offset.top-h.top)),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio,p=!1)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio,p=!1)),p||(o.position.left=o.prevPosition.left,o.position.top=o.prevPosition.top,o.size.width=o.prevSize.width,o.size.height=o.prevSize.height)},stop:function(){var t=e(this).resizable("instance"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)})},resize:function(t,i){var s=e(this).resizable("instance"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0},h=function(t,s){e(t).each(function(){var t=e(this),n=e(this).data("ui-resizable-alsoresize"),a={},o=s&&s.length?s:t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var i=(n[t]||0)+(r[t]||0);i&&i>=0&&(a[t]=i||null)}),t.css(a)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):e.each(n.alsoResize,function(e,t){h(e,t)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).resizable("instance"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t,i=e(this).resizable("instance"),s=i.options,n=i.size,a=i.originalSize,o=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,u=h[1]||1,d=Math.round((n.width-a.width)/l)*l,c=Math.round((n.height-a.height)/u)*u,p=a.width+d,f=a.height+c,m=s.maxWidth&&p>s.maxWidth,g=s.maxHeight&&f>s.maxHeight,v=s.minWidth&&s.minWidth>p,y=s.minHeight&&s.minHeight>f;s.grid=h,v&&(p+=l),y&&(f+=u),m&&(p-=l),g&&(f-=u),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=o.top-c):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=o.left-d):((0>=f-u||0>=p-l)&&(t=i._getPaddingPlusBorderDimensions(this)),f-u>0?(i.size.height=f,i.position.top=o.top-c):(f=u-t.height,i.size.height=f,i.position.top=o.top+a.height-f),p-l>0?(i.size.width=p,i.position.left=o.left-d):(p=u-t.height,i.size.width=p,i.position.left=o.left+a.width-p))}}),e.ui.resizable,e.widget("ui.selectable",e.ui.mouse,{version:"1.11.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var t,i=this;
+this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){t=e(i.options.filter,i.element[0]),t.addClass("ui-selectee"),t.each(function(){var t=e(this),i=t.offset();e.data(this,"selectable-item",{element:this,$element:t,left:i.left,top:i.top,right:i.left+t.outerWidth(),bottom:i.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=t.addClass("ui-selectee"),this._mouseInit(),this.helper=e("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(t){var i=this,s=this.options;this.opos=[t.pageX,t.pageY],this.options.disabled||(this.selectees=e(s.filter,this.element[0]),this._trigger("start",t),e(s.appendTo).append(this.helper),this.helper.css({left:t.pageX,top:t.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=e.data(this,"selectable-item");s.startselected=!0,t.metaKey||t.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",t,{unselecting:s.element}))}),e(t.target).parents().addBack().each(function(){var s,n=e.data(this,"selectable-item");return n?(s=!t.metaKey&&!t.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",t,{selecting:n.element}):i._trigger("unselecting",t,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(t){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,a=this.opos[0],o=this.opos[1],r=t.pageX,h=t.pageY;return a>r&&(i=r,r=a,a=i),o>h&&(i=h,h=o,o=i),this.helper.css({left:a,top:o,width:r-a,height:h-o}),this.selectees.each(function(){var i=e.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||a>i.right||i.top>h||o>i.bottom):"fit"===n.tolerance&&(l=i.left>a&&r>i.right&&i.top>o&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",t,{selecting:i.element}))):(i.selecting&&((t.metaKey||t.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",t,{unselecting:i.element}))),i.selected&&(t.metaKey||t.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",t,{unselecting:i.element})))))}),!1}},_mouseStop:function(t){var i=this;return this.dragged=!1,e(".ui-unselecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",t,{unselected:s.element})}),e(".ui-selecting",this.element[0]).each(function(){var s=e.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",t,{selected:s.element})}),this._trigger("stop",t),this.helper.remove(),!1}}),e.widget("ui.sortable",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(e,t,i){return e>=t&&t+i>e},_isFloating:function(e){return/left|right/.test(e.css("float"))||/inline|table-cell/.test(e.css("display"))},_create:function(){var e=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===e.axis||this._isFloating(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(e,t){this._super(e,t),"handle"===e&&this._setHandleClassName()},_setHandleClassName:function(){this.element.find(".ui-sortable-handle").removeClass("ui-sortable-handle"),e.each(this.items,function(){(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item).addClass("ui-sortable-handle")})},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").find(".ui-sortable-handle").removeClass("ui-sortable-handle"),this._mouseDestroy();for(var e=this.items.length-1;e>=0;e--)this.items[e].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,i){var s=null,n=!1,a=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(t),e(t.target).parents().each(function(){return e.data(this,a.widgetName+"-item")===a?(s=e(this),!1):void 0}),e.data(t.target,a.widgetName+"-item")===a&&(s=e(t.target)),s?!this.options.handle||i||(e(this.options.handle,s).find("*").addBack().each(function(){this===t.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(t,i,s){var n,a,o=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},e.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(a=this.document.find("body"),this.storedCursor=a.css("cursor"),a.css("cursor",o.cursor),this.storedStylesheet=e("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(a)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",t,this._uiHash(this));return e.ui.ddmanager&&(e.ui.ddmanager.current=this),e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(t),!0},_mouseDrag:function(t){var i,s,n,a,o=this.options,r=!1;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<o.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+o.scrollSpeed:t.pageY-this.overflowOffset.top<o.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-o.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<o.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+o.scrollSpeed:t.pageX-this.overflowOffset.left<o.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-o.scrollSpeed)):(t.pageY-e(document).scrollTop()<o.scrollSensitivity?r=e(document).scrollTop(e(document).scrollTop()-o.scrollSpeed):e(window).height()-(t.pageY-e(document).scrollTop())<o.scrollSensitivity&&(r=e(document).scrollTop(e(document).scrollTop()+o.scrollSpeed)),t.pageX-e(document).scrollLeft()<o.scrollSensitivity?r=e(document).scrollLeft(e(document).scrollLeft()-o.scrollSpeed):e(window).width()-(t.pageX-e(document).scrollLeft())<o.scrollSensitivity&&(r=e(document).scrollLeft(e(document).scrollLeft()+o.scrollSpeed))),r!==!1&&e.ui.ddmanager&&!o.dropBehaviour&&e.ui.ddmanager.prepareOffsets(this,t)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],a=this._intersectsWithPointer(s),a&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===a?"next":"prev"]()[0]!==n&&!e.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!e.contains(this.element[0],n):!0)){if(this.direction=1===a?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(t,s),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),e.ui.ddmanager&&e.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,i){if(t){if(e.ui.ddmanager&&!this.options.dropBehaviour&&e.ui.ddmanager.drop(this,t),this.options.revert){var s=this,n=this.placeholder.offset(),a=this.options.axis,o={};a&&"x"!==a||(o.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),a&&"y"!==a||(o.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,e(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){s._clear(t)})}else this._clear(t,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var t=this.containers.length-1;t>=0;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),e.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?e(this.domPosition.prev).after(this.currentItem):e(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},e(i).each(function(){var i=(e(t.item||this).attr(t.attribute||"id")||"").match(t.expression||/(.+)[\-=_](.+)/);i&&s.push((t.key||i[1]+"[]")+"="+(t.key&&t.expression?i[1]:i[2]))}),!s.length&&t.key&&s.push(t.key+"="),s.join("&")},toArray:function(t){var i=this._getItemsAsjQuery(t&&t.connected),s=[];return t=t||{},i.each(function(){s.push(e(t.item||this).attr(t.attribute||"id")||"")}),s},_intersectsWith:function(e){var t=this.positionAbs.left,i=t+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,a=e.left,o=a+e.width,r=e.top,h=r+e.height,l=this.offset.click.top,u=this.offset.click.left,d="x"===this.options.axis||s+l>r&&h>s+l,c="y"===this.options.axis||t+u>a&&o>t+u,p=d&&c;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>e[this.floating?"width":"height"]?p:t+this.helperProportions.width/2>a&&o>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(e){var t="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top,e.height),i="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left,e.width),s=t&&i,n=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return s?this.floating?a&&"right"===a||"down"===n?2:1:n&&("down"===n?2:1):!1},_intersectsWithSides:function(e){var t=this._isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+e.height/2,e.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+e.width/2,e.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&t||"up"===s&&!t)},_getDragVerticalDirection:function(){var e=this.positionAbs.top-this.lastPositionAbs.top;return 0!==e&&(e>0?"down":"up")},_getDragHorizontalDirection:function(){var e=this.positionAbs.left-this.lastPositionAbs.left;return 0!==e&&(e>0?"right":"left")},refresh:function(e){return this._refreshItems(e),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var e=this.options;return e.connectWith.constructor===String?[e.connectWith]:e.connectWith},_getItemsAsjQuery:function(t){function i(){r.push(this)}var s,n,a,o,r=[],h=[],l=this._connectWith();if(l&&t)for(s=l.length-1;s>=0;s--)for(a=e(l[s]),n=a.length-1;n>=0;n--)o=e.data(a[n],this.widgetFullName),o&&o!==this&&!o.options.disabled&&h.push([e.isFunction(o.options.items)?o.options.items.call(o.element):e(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(h.push([e.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):e(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return e(r)},_removeCurrentsFromItems:function(){var t=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=e.grep(this.items,function(e){for(var i=0;t.length>i;i++)if(t[i]===e.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var i,s,n,a,o,r,h,l,u=this.items,d=[[e.isFunction(this.options.items)?this.options.items.call(this.element[0],t,{item:this.currentItem}):e(this.options.items,this.element),this]],c=this._connectWith();if(c&&this.ready)for(i=c.length-1;i>=0;i--)for(n=e(c[i]),s=n.length-1;s>=0;s--)a=e.data(n[s],this.widgetFullName),a&&a!==this&&!a.options.disabled&&(d.push([e.isFunction(a.options.items)?a.options.items.call(a.element[0],t,{item:this.currentItem}):e(a.options.items,a.element),a]),this.containers.push(a));for(i=d.length-1;i>=0;i--)for(o=d[i][1],r=d[i][0],s=0,l=r.length;l>s;s++)h=e(r[s]),h.data(this.widgetName+"-item",o),u.push({item:h,instance:o,width:0,height:0,left:0,top:0})},refreshPositions:function(t){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,a;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?e(this.options.toleranceElement,s.item):s.item,t||(s.width=n.outerWidth(),s.height=n.outerHeight()),a=n.offset(),s.left=a.left,s.top=a.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)a=this.containers[i].element.offset(),this.containers[i].containerCache.left=a.left,this.containers[i].containerCache.top=a.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(t){t=t||this;var i,s=t.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=t.currentItem[0].nodeName.toLowerCase(),n=e("<"+s+">",t.document[0]).addClass(i||t.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?t.currentItem.children().each(function(){e("<td>&#160;</td>",t.document[0]).attr("colspan",e(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",t.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(e,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(t.currentItem.innerHeight()-parseInt(t.currentItem.css("paddingTop")||0,10)-parseInt(t.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(t.currentItem.innerWidth()-parseInt(t.currentItem.css("paddingLeft")||0,10)-parseInt(t.currentItem.css("paddingRight")||0,10)))}}),t.placeholder=e(s.placeholder.element.call(t.element,t.currentItem)),t.currentItem.after(t.placeholder),s.placeholder.update(t,t.placeholder)},_contactContainers:function(t){var i,s,n,a,o,r,h,l,u,d,c=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!e.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(c&&e.contains(this.containers[i].element[0],c.element[0]))continue;c=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",t,this._uiHash(this)),this.containers[i].containerCache.over=0);if(c)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,a=null,u=c.floating||this._isFloating(this.currentItem),o=u?"left":"top",r=u?"width":"height",d=u?"clientX":"clientY",s=this.items.length-1;s>=0;s--)e.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[o],l=!1,t[d]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(t[d]-h)&&(n=Math.abs(t[d]-h),a=this.items[s],this.direction=l?"up":"down"));if(!a&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;a?this._rearrange(t,a,null,!0):this._rearrange(t,null,this.containers[p].element,!0),this._trigger("change",t,this._uiHash()),this.containers[p]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",t,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(t){var i=this.options,s=e.isFunction(i.helper)?e(i.helper.apply(this.element[0],[t,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||e("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),e.isArray(t)&&(t={left:+t[0],top:+t[1]||0}),"left"in t&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&e.ui.ie)&&(t={top:0,left:0}),{top:t.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var e=this.currentItem.position();return{top:e.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:e.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,e("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(e("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(t=e(n.containment)[0],i=e(n.containment).offset(),s="hidden"!==e(t).css("overflow"),this.containment=[i.left+(parseInt(e(t).css("borderLeftWidth"),10)||0)+(parseInt(e(t).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(e(t).css("borderTopWidth"),10)||0)+(parseInt(e(t).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(e(t).css("borderLeftWidth"),10)||0)-(parseInt(e(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(e(t).css("borderTopWidth"),10)||0)-(parseInt(e(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,i){i||(i=this.position);var s="absolute"===t?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,a=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():a?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():a?0:n.scrollLeft())*s}},_generatePosition:function(t){var i,s,n=this.options,a=t.pageX,o=t.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&e.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(a=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(o=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(a=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(o=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((o-this.originalPageY)/n.grid[1])*n.grid[1],o=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((a-this.originalPageX)/n.grid[0])*n.grid[0],a=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:o-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:a-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(e,t,i,s){i?i[0].appendChild(this.placeholder[0]):t.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?t.item[0]:t.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(e,t){function i(e,t,i){return function(s){i._trigger(e,s,t._uiHash(t))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!t&&n.push(function(e){this._trigger("receive",e,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||t||n.push(function(e){this._trigger("update",e,this._uiHash())}),this!==this.currentContainer&&(t||(n.push(function(e){this._trigger("remove",e,this._uiHash())}),n.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)t||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,t||this._trigger("beforeStop",e,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!t){for(s=0;n.length>s;s++)n[s].call(this,e);this._trigger("stop",e,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){e.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(t){var i=t||this;return{helper:i.helper,placeholder:i.placeholder||e([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:t?t.element:null}}}),e.widget("ui.accordion",{version:"1.11.2",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=e(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),t.collapsible||t.active!==!1&&null!=t.active||(t.active=0),this._processPanels(),0>t.active&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():e()}},_createIcons:function(){var t=this.options.icons;t&&(e("<span>").addClass("ui-accordion-header-icon ui-icon "+t.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(t.header).addClass(t.activeHeader),this.headers.addClass("ui-accordion-icons"))},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var e;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").removeUniqueId(),this._destroyIcons(),e=this.headers.next().removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").css("display","").removeAttr("role").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&e.css("height","")},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):("event"===e&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(t)),this._super(e,t),"collapsible"!==e||t||this.options.active!==!1||this._activate(0),"icons"===e&&(this._destroyIcons(),t&&this._createIcons()),"disabled"===e&&(this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!t)),void 0)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var i=e.ui.keyCode,s=this.headers.length,n=this.headers.index(t.target),a=!1;switch(t.keyCode){case i.RIGHT:case i.DOWN:a=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:a=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(t);break;case i.HOME:a=this.headers[0];break;case i.END:a=this.headers[s-1]}a&&(e(t.target).attr("tabIndex",-1),e(a).attr("tabIndex",0),a.focus(),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===e.ui.keyCode.UP&&t.ctrlKey&&e(t.currentTarget).prev().focus()},refresh:function(){var t=this.options;this._processPanels(),t.active===!1&&t.collapsible===!0||!this.headers.length?(t.active=!1,this.active=e()):t.active===!1?this._activate(0):this.active.length&&!e.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=e()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var e=this.headers,t=this.panels;this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-state-default ui-corner-all"),this.panels=this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide(),t&&(this._off(e.not(this.headers)),this._off(t.not(this.panels)))},_refresh:function(){var t,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(){var t=e(this),i=t.uniqueId().attr("id"),s=t.next(),n=s.uniqueId().attr("id");
+t.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(t=n.height(),this.element.siblings(":visible").each(function(){var i=e(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(t-=i.outerHeight(!0))}),this.headers.each(function(){t-=e(this).outerHeight(!0)}),this.headers.next().each(function(){e(this).height(Math.max(0,t-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===s&&(t=0,this.headers.next().each(function(){t=Math.max(t,e(this).css("height","").height())}).height(t))},_activate:function(t){var i=this._findActive(t)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):e()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n[0]===s[0],o=a&&i.collapsible,r=o?e():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:o?e():n,newPanel:r};t.preventDefault(),a&&!i.collapsible||this._trigger("beforeActivate",t,l)===!1||(i.active=o?!1:this.headers.index(n),this.active=a?e():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),a||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(t){var i=t.newPanel,s=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,t):(s.hide(),i.show(),this._toggleComplete(t)),s.attr({"aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true",tabIndex:0,"aria-expanded":"true"})},_animate:function(e,t,i){var s,n,a,o=this,r=0,h=e.length&&(!t.length||e.index()<t.index()),l=this.options.animate||{},u=h&&l.down||l,d=function(){o._toggleComplete(i)};return"number"==typeof u&&(a=u),"string"==typeof u&&(n=u),n=n||u.easing||l.easing,a=a||u.duration||l.duration,t.length?e.length?(s=e.show().outerHeight(),t.animate(this.hideProps,{duration:a,easing:n,step:function(e,t){t.now=Math.round(e)}}),e.hide().animate(this.showProps,{duration:a,easing:n,complete:d,step:function(e,i){i.now=Math.round(e),"height"!==i.prop?r+=i.now:"content"!==o.options.heightStyle&&(i.now=Math.round(s-t.outerHeight()-r),r=0)}}),void 0):t.animate(this.hideProps,a,n,d):e.animate(this.showProps,a,n,d)},_toggleComplete:function(e){var t=e.oldPanel;t.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),t.length&&(t.parent()[0].className=t.parent()[0].className),this._trigger("activate",null,e)}}),e.widget("ui.menu",{version:"1.11.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},items:"> *",menus:"ul",position:{my:"left-1 top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item":function(e){e.preventDefault()},"click .ui-menu-item":function(t){var i=e(t.target);!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&e(this.document[0].activeElement).closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(t){if(!this.previousFilter){var i=e(t.currentTarget);i.siblings(".ui-state-active").removeClass("ui-state-active"),this.focus(t,i)}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(e,t){var i=this.active||this.element.find(this.options.items).eq(0);t||this.focus(e,i)},blur:function(t){this._delay(function(){e.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){this._closeOnDocumentClick(e)&&this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-menu-icons ui-front").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").removeUniqueId().removeClass("ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var t=e(this);t.data("ui-menu-submenu-carat")&&t.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(t){var i,s,n,a,o=!0;switch(t.keyCode){case e.ui.keyCode.PAGE_UP:this.previousPage(t);break;case e.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case e.ui.keyCode.HOME:this._move("first","first",t);break;case e.ui.keyCode.END:this._move("last","last",t);break;case e.ui.keyCode.UP:this.previous(t);break;case e.ui.keyCode.DOWN:this.next(t);break;case e.ui.keyCode.LEFT:this.collapse(t);break;case e.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case e.ui.keyCode.ENTER:case e.ui.keyCode.SPACE:this._activate(t);break;case e.ui.keyCode.ESCAPE:this.collapse(t);break;default:o=!1,s=this.previousFilter||"",n=String.fromCharCode(t.keyCode),a=!1,clearTimeout(this.filterTimer),n===s?a=!0:n=s+n,i=this._filterMenuItems(n),i=a&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(t.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(t,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}o&&t.preventDefault()},_activate:function(e){this.active.is(".ui-state-disabled")||(this.active.is("[aria-haspopup='true']")?this.expand(e):this.select(e))},refresh:function(){var t,i,s=this,n=this.options.icons.submenu,a=this.element.find(this.options.menus);this.element.toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length),a.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-front").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=e(this),i=t.parent(),s=e("<span>").addClass("ui-menu-icon ui-icon "+n).data("ui-menu-submenu-carat",!0);i.attr("aria-haspopup","true").prepend(s),t.attr("aria-labelledby",i.attr("id"))}),t=a.add(this.element),i=t.find(this.options.items),i.not(".ui-menu-item").each(function(){var t=e(this);s._isDivider(t)&&t.addClass("ui-widget-content ui-menu-divider")}),i.not(".ui-menu-item, .ui-menu-divider").addClass("ui-menu-item").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!e.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(e,t){"icons"===e&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(t.submenu),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},focus:function(e,t){var i,s;this.blur(e,e&&"focus"===e.type),this._scrollIntoView(t),this.active=t.first(),s=this.active.addClass("ui-state-focus").removeClass("ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").addClass("ui-state-active"),e&&"keydown"===e.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=t.children(".ui-menu"),i.length&&e&&/^mouse/.test(e.type)&&this._startOpening(i),this.activeMenu=t.parent(),this._trigger("focus",e,{item:t})},_scrollIntoView:function(t){var i,s,n,a,o,r;this._hasScroll()&&(i=parseFloat(e.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(e.css(this.activeMenu[0],"paddingTop"))||0,n=t.offset().top-this.activeMenu.offset().top-i-s,a=this.activeMenu.scrollTop(),o=this.activeMenu.height(),r=t.outerHeight(),0>n?this.activeMenu.scrollTop(a+n):n+r>o&&this.activeMenu.scrollTop(a+n-o+r))},blur:function(e,t){t||clearTimeout(this.timer),this.active&&(this.active.removeClass("ui-state-focus"),this.active=null,this._trigger("blur",e,{item:this.active}))},_startOpening:function(e){clearTimeout(this.timer),"true"===e.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(e)},this.delay))},_open:function(t){var i=e.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(t,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:e(t&&t.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(t),this.activeMenu=s},this.delay)},_close:function(e){e||(e=this.active?this.active.parent():this.element),e.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find(".ui-state-active").not(".ui-state-focus").removeClass("ui-state-active")},_closeOnDocumentClick:function(t){return!e(t.target).closest(".ui-menu").length},_isDivider:function(e){return!/[^\-\u2014\u2013\s]/.test(e.text())},collapse:function(e){var t=this.active&&this.active.parent().closest(".ui-menu-item",this.element);t&&t.length&&(this._close(),this.focus(e,t))},expand:function(e){var t=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();t&&t.length&&(this._open(t.parent()),this._delay(function(){this.focus(e,t)}))},next:function(e){this._move("next","first",e)},previous:function(e){this._move("prev","last",e)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(e,t,i){var s;this.active&&(s="first"===e||"last"===e?this.active["first"===e?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[e+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[t]()),this.focus(i,s)},nextPage:function(t){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=e(this),0>i.offset().top-s-n}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(t),void 0)},previousPage:function(t){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=e(this),i.offset().top-s+n>0}),this.focus(t,i)):this.focus(t,this.activeMenu.find(this.options.items).first())),void 0):(this.next(t),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||e(t.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,i)},_filterMenuItems:function(t){var i=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(e.trim(e(this).text()))})}}),e.widget("ui.autocomplete",{version:"1.11.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var t,i,s,n=this.element[0].nodeName.toLowerCase(),a="textarea"===n,o="input"===n;this.isMultiLine=a?!0:o?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[a||o?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return t=!0,s=!0,i=!0,void 0;t=!1,s=!1,i=!1;var a=e.ui.keyCode;switch(n.keyCode){case a.PAGE_UP:t=!0,this._move("previousPage",n);break;case a.PAGE_DOWN:t=!0,this._move("nextPage",n);break;case a.UP:t=!0,this._keyEvent("previous",n);break;case a.DOWN:t=!0,this._keyEvent("next",n);break;case a.ENTER:this.menu.active&&(t=!0,n.preventDefault(),this.menu.select(n));break;case a.TAB:this.menu.active&&this.menu.select(n);break;case a.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(t)return t=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=e.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(e){return s?(s=!1,e.preventDefault(),void 0):(this._searchTimeout(e),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(e),this._change(e),void 0)}}),this._initSource(),this.menu=e("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];e(t.target).closest(".ui-menu-item").length||this._delay(function(){var t=this;this.document.one("mousedown",function(s){s.target===t.element[0]||s.target===i||e.contains(i,s.target)||t.close()})})},menufocus:function(t,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){e(t.target).trigger(t.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:n})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&e.trim(s).length&&(this.liveRegion.children().hide(),e("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,t){var i=t.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",e,{item:i})&&this._value(i.value),this.term=this._value(),this.close(e),this.selectedItem=i}}),this.liveRegion=e("<span>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(e,t){this._super(e,t),"source"===e&&this._initSource(),"appendTo"===e&&this.menu.element.appendTo(this._appendTo()),"disabled"===e&&t&&this.xhr&&this.xhr.abort()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_initSource:function(){var t,i,s=this;e.isArray(this.options.source)?(t=this.options.source,this.source=function(i,s){s(e.ui.autocomplete.filter(t,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(t,n){s.xhr&&s.xhr.abort(),s.xhr=e.ajax({url:i,data:t,dataType:"json",success:function(e){n(e)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(e){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),i=this.menu.element.is(":visible"),s=e.altKey||e.ctrlKey||e.metaKey||e.shiftKey;(!t||t&&!i&&!s)&&(this.selectedItem=null,this.search(null,e))},this.options.delay)},search:function(e,t){return e=null!=e?e:this._value(),this.term=this._value(),e.length<this.options.minLength?this.close(t):this._trigger("search",t)!==!1?this._search(e):void 0},_search:function(e){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:e},this._response())},_response:function(){var t=++this.requestIndex;return e.proxy(function(e){t===this.requestIndex&&this.__response(e),this.pending--,this.pending||this.element.removeClass("ui-autocomplete-loading")},this)},__response:function(e){e&&(e=this._normalize(e)),this._trigger("response",null,{content:e}),!this.options.disabled&&e&&e.length&&!this.cancelSearch?(this._suggest(e),this._trigger("open")):this._close()},close:function(e){this.cancelSearch=!0,this._close(e)},_close:function(e){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",e))},_change:function(e){this.previous!==this._value()&&this._trigger("change",e,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:e.map(t,function(t){return"string"==typeof t?{label:t,value:t}:e.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var i=this.menu.element.empty();this._renderMenu(i,t),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(e.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var e=this.menu.element;e.outerWidth(Math.max(e.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(t,i){var s=this;e.each(i,function(e,i){s._renderItemData(t,i)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-autocomplete-item",t)},_renderItem:function(t,i){return e("<li>").text(i.label).appendTo(t)},_move:function(e,t){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(e)||this.menu.isLastItem()&&/^next/.test(e)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[e](t),void 0):(this.search(null,t),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(e,t){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(e,t),t.preventDefault())}}),e.extend(e.ui.autocomplete,{escapeRegex:function(e){return e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,i){var s=RegExp(e.ui.autocomplete.escapeRegex(i),"i");return e.grep(t,function(e){return s.test(e.label||e.value||e)})}}),e.widget("ui.autocomplete",e.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(e){return e+(e>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.children().hide(),e("<div>").text(i).appendTo(this.liveRegion))}}),e.ui.autocomplete;var c,p="ui-button ui-widget ui-state-default ui-corner-all",f="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",m=function(){var t=e(this);setTimeout(function(){t.find(":ui-button").button("refresh")},1)},g=function(t){var i=t.name,s=t.form,n=e([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?e(s).find("[name='"+i+"'][type=radio]"):e("[name='"+i+"'][type=radio]",t.ownerDocument).filter(function(){return!this.form})),n};e.widget("ui.button",{version:"1.11.2",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,m),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var t=this,i=this.options,s="checkbox"===this.type||"radio"===this.type,n=s?"":"ui-state-active";null===i.label&&(i.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(p).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){i.disabled||this===c&&e(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){i.disabled||e(this).removeClass(n)}).bind("click"+this.eventNamespace,function(e){i.disabled&&(e.preventDefault(),e.stopImmediatePropagation())}),this._on({focus:function(){this.buttonElement.addClass("ui-state-focus")},blur:function(){this.buttonElement.removeClass("ui-state-focus")}}),s&&this.element.bind("change"+this.eventNamespace,function(){t.refresh()}),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return i.disabled?!1:void 0}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(i.disabled)return!1;e(this).addClass("ui-state-active"),t.buttonElement.attr("aria-pressed","true");var s=t.element[0];g(s).not(s).map(function(){return e(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return i.disabled?!1:(e(this).addClass("ui-state-active"),c=this,t.document.one("mouseup",function(){c=null}),void 0)}).bind("mouseup"+this.eventNamespace,function(){return i.disabled?!1:(e(this).removeClass("ui-state-active"),void 0)}).bind("keydown"+this.eventNamespace,function(t){return i.disabled?!1:((t.keyCode===e.ui.keyCode.SPACE||t.keyCode===e.ui.keyCode.ENTER)&&e(this).addClass("ui-state-active"),void 0)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){e(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(t){t.keyCode===e.ui.keyCode.SPACE&&e(this).click()})),this._setOption("disabled",i.disabled),this._resetButton()},_determineButtonType:function(){var e,t,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(e=this.element.parents().last(),t="label[for='"+this.element.attr("id")+"']",this.buttonElement=e.find(t),this.buttonElement.length||(e=e.length?e.siblings():this.element.siblings(),this.buttonElement=e.filter(t),this.buttonElement.length||(this.buttonElement=e.find(t))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(p+" ui-state-active "+f).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(e,t){return this._super(e,t),"disabled"===e?(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),t&&("checkbox"===this.type||"radio"===this.type?this.buttonElement.removeClass("ui-state-focus"):this.buttonElement.removeClass("ui-state-focus ui-state-active")),void 0):(this._resetButton(),void 0)},refresh:function(){var t=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOption("disabled",t),"radio"===this.type?g(this.element[0]).each(function(){e(this).is(":checked")?e(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):e(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),void 0;var t=this.buttonElement.removeClass(f),i=e("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(t.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,a=[];s.primary||s.secondary?(this.options.text&&a.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&t.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&t.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(a.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||t.attr("title",e.trim(i)))):a.push("ui-button-text-only"),t.addClass(a.join(" "))}}),e.widget("ui.buttonset",{version:"1.11.2",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(e,t){"disabled"===e&&this.buttons.button("option",e,t),this._super(e,t)},refresh:function(){var t="rtl"===this.element.css("direction"),i=this.element.find(this.options.items),s=i.filter(":ui-button");i.not(":ui-button").button(),s.button("refresh"),this.buttons=i.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(t?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(t?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return e(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}}),e.ui.button,e.extend(e.ui,{datepicker:{version:"1.11.2"}});var v;e.extend(n.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(e){return r(this._defaults,e||{}),this},_attachDatepicker:function(t,i){var s,n,a;s=t.nodeName.toLowerCase(),n="div"===s||"span"===s,t.id||(this.uuid+=1,t.id="dp"+this.uuid),a=this._newInst(e(t),n),a.settings=e.extend({},i||{}),"input"===s?this._connectDatepicker(t,a):n&&this._inlineDatepicker(t,a)},_newInst:function(t,i){var s=t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?a(e("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,i){var s=e(t);i.append=e([]),i.trigger=e([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),e.data(t,"datepicker",i),i.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,i){var s,n,a,o=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),o&&(i.append=e("<span class='"+this._appendClass+"'>"+o+"</span>"),t[r?"before":"after"](i.append)),t.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&t.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),a=this._get(i,"buttonImage"),i.trigger=e(this._get(i,"buttonImageOnly")?e("<img/>").addClass(this._triggerClass).attr({src:a,alt:n,title:n}):e("<button type='button'></button>").addClass(this._triggerClass).html(a?e("<img/>").attr({src:a,alt:n,title:n}):n)),t[r?"before":"after"](i.trigger),i.trigger.click(function(){return e.datepicker._datepickerShowing&&e.datepicker._lastInput===t[0]?e.datepicker._hideDatepicker():e.datepicker._datepickerShowing&&e.datepicker._lastInput!==t[0]?(e.datepicker._hideDatepicker(),e.datepicker._showDatepicker(t[0])):e.datepicker._showDatepicker(t[0]),!1}))},_autoSize:function(e){if(this._get(e,"autoSize")&&!e.inline){var t,i,s,n,a=new Date(2009,11,20),o=this._get(e,"dateFormat");o.match(/[DM]/)&&(t=function(e){for(i=0,s=0,n=0;e.length>n;n++)e[n].length>i&&(i=e[n].length,s=n);return s},a.setMonth(t(this._get(e,o.match(/MM/)?"monthNames":"monthNamesShort"))),a.setDate(t(this._get(e,o.match(/DD/)?"dayNames":"dayNamesShort"))+20-a.getDay())),e.input.attr("size",this._formatDate(e,a).length)}},_inlineDatepicker:function(t,i){var s=e(t);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),e.data(t,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(t),i.dpDiv.css("display","block"))},_dialogDatepicker:function(t,i,s,n,a){var o,h,l,u,d,c=this._dialogInst;return c||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=e("<input type='text' id='"+o+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),e("body").append(this._dialogInput),c=this._dialogInst=this._newInst(this._dialogInput,!1),c.settings={},e.data(this._dialogInput[0],"datepicker",c)),r(c.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(c,i):i,this._dialogInput.val(i),this._pos=a?a.length?a:[a.pageX,a.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+u,l/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),c.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),e.blockUI&&e.blockUI(this.dpDiv),e.data(this._dialogInput[0],"datepicker",c),this},_destroyDatepicker:function(t){var i,s=e(t),n=e.data(t,"datepicker");s.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),e.removeData(t,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())
+},_enableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!1,a.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}))},_disableDatepicker:function(t){var i,s,n=e(t),a=e.data(t,"datepicker");n.hasClass(this.markerClassName)&&(i=t.nodeName.toLowerCase(),"input"===i?(t.disabled=!0,a.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=e.map(this._disabledInputs,function(e){return e===t?null:e}),this._disabledInputs[this._disabledInputs.length]=t)},_isDisabledDatepicker:function(e){if(!e)return!1;for(var t=0;this._disabledInputs.length>t;t++)if(this._disabledInputs[t]===e)return!0;return!1},_getInst:function(t){try{return e.data(t,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,i,s){var n,a,o,h,l=this._getInst(t);return 2===arguments.length&&"string"==typeof i?"defaults"===i?e.extend({},e.datepicker._defaults):l?"all"===i?e.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),a=this._getDateDatepicker(t,!0),o=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),r(l.settings,n),null!==o&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,o)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(e(t),l),this._autoSize(l),this._setDate(l,a),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(e,t,i){this._optionDatepicker(e,t,i)},_refreshDatepicker:function(e){var t=this._getInst(e);t&&this._updateDatepicker(t)},_setDateDatepicker:function(e,t){var i=this._getInst(e);i&&(this._setDate(i,t),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(e,t){var i=this._getInst(e);return i&&!i.inline&&this._setDateFromField(i,t),i?this._getDate(i):null},_doKeyDown:function(t){var i,s,n,a=e.datepicker._getInst(t.target),o=!0,r=a.dpDiv.is(".ui-datepicker-rtl");if(a._keyEvent=!0,e.datepicker._datepickerShowing)switch(t.keyCode){case 9:e.datepicker._hideDatepicker(),o=!1;break;case 13:return n=e("td."+e.datepicker._dayOverClass+":not(."+e.datepicker._currentClass+")",a.dpDiv),n[0]&&e.datepicker._selectDay(t.target,a.selectedMonth,a.selectedYear,n[0]),i=e.datepicker._get(a,"onSelect"),i?(s=e.datepicker._formatDate(a),i.apply(a.input?a.input[0]:null,[s,a])):e.datepicker._hideDatepicker(),!1;case 27:e.datepicker._hideDatepicker();break;case 33:e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 34:e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&e.datepicker._clearDate(t.target),o=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&e.datepicker._gotoToday(t.target),o=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?1:-1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?-e.datepicker._get(a,"stepBigMonths"):-e.datepicker._get(a,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,-7,"D"),o=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,r?-1:1,"D"),o=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&e.datepicker._adjustDate(t.target,t.ctrlKey?+e.datepicker._get(a,"stepBigMonths"):+e.datepicker._get(a,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&e.datepicker._adjustDate(t.target,7,"D"),o=t.ctrlKey||t.metaKey;break;default:o=!1}else 36===t.keyCode&&t.ctrlKey?e.datepicker._showDatepicker(this):o=!1;o&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var i,s,n=e.datepicker._getInst(t.target);return e.datepicker._get(n,"constrainInput")?(i=e.datepicker._possibleChars(e.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(t){var i,s=e.datepicker._getInst(t.target);if(s.input.val()!==s.lastVal)try{i=e.datepicker.parseDate(e.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,e.datepicker._getFormatConfig(s)),i&&(e.datepicker._setDateFromField(s),e.datepicker._updateAlternate(s),e.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(t){if(t=t.target||t,"input"!==t.nodeName.toLowerCase()&&(t=e("input",t.parentNode)[0]),!e.datepicker._isDisabledDatepicker(t)&&e.datepicker._lastInput!==t){var i,n,a,o,h,l,u;i=e.datepicker._getInst(t),e.datepicker._curInst&&e.datepicker._curInst!==i&&(e.datepicker._curInst.dpDiv.stop(!0,!0),i&&e.datepicker._datepickerShowing&&e.datepicker._hideDatepicker(e.datepicker._curInst.input[0])),n=e.datepicker._get(i,"beforeShow"),a=n?n.apply(t,[t,i]):{},a!==!1&&(r(i.settings,a),i.lastVal=null,e.datepicker._lastInput=t,e.datepicker._setDateFromField(i),e.datepicker._inDialog&&(t.value=""),e.datepicker._pos||(e.datepicker._pos=e.datepicker._findPos(t),e.datepicker._pos[1]+=t.offsetHeight),o=!1,e(t).parents().each(function(){return o|="fixed"===e(this).css("position"),!o}),h={left:e.datepicker._pos[0],top:e.datepicker._pos[1]},e.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),e.datepicker._updateDatepicker(i),h=e.datepicker._checkOffset(i,h,o),i.dpDiv.css({position:e.datepicker._inDialog&&e.blockUI?"static":o?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),i.inline||(l=e.datepicker._get(i,"showAnim"),u=e.datepicker._get(i,"duration"),i.dpDiv.css("z-index",s(e(t))+1),e.datepicker._datepickerShowing=!0,e.effects&&e.effects.effect[l]?i.dpDiv.show(l,e.datepicker._get(i,"showOptions"),u):i.dpDiv[l||"show"](l?u:null),e.datepicker._shouldFocusInput(i)&&i.input.focus(),e.datepicker._curInst=i))}},_updateDatepicker:function(t){this.maxRows=4,v=t,t.dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var i,s=this._getNumberOfMonths(t),n=s[1],a=17,r=t.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&t.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),t.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===e.datepicker._curInst&&e.datepicker._datepickerShowing&&e.datepicker._shouldFocusInput(t)&&t.input.focus(),t.yearshtml&&(i=t.yearshtml,setTimeout(function(){i===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year:first").replaceWith(t.yearshtml),i=t.yearshtml=null},0))},_shouldFocusInput:function(e){return e.input&&e.input.is(":visible")&&!e.input.is(":disabled")&&!e.input.is(":focus")},_checkOffset:function(t,i,s){var n=t.dpDiv.outerWidth(),a=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,r=t.input?t.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:e(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:e(document).scrollTop());return i.left-=this._get(t,"isRTL")?n-o:0,i.left-=s&&i.left===t.input.offset().left?e(document).scrollLeft():0,i.top-=s&&i.top===t.input.offset().top+r?e(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+a>l&&l>a?Math.abs(a+r):0),i},_findPos:function(t){for(var i,s=this._getInst(t),n=this._get(s,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||e.expr.filters.hidden(t));)t=t[n?"previousSibling":"nextSibling"];return i=e(t).offset(),[i.left,i.top]},_hideDatepicker:function(t){var i,s,n,a,o=this._curInst;!o||t&&o!==e.data(t,"datepicker")||this._datepickerShowing&&(i=this._get(o,"showAnim"),s=this._get(o,"duration"),n=function(){e.datepicker._tidyDialog(o)},e.effects&&(e.effects.effect[i]||e.effects[i])?o.dpDiv.hide(i,e.datepicker._get(o,"showOptions"),s,n):o.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,a=this._get(o,"onClose"),a&&a.apply(o.input?o.input[0]:null,[o.input?o.input.val():"",o]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),e.blockUI&&(e.unblockUI(),e("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(e){e.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(t){if(e.datepicker._curInst){var i=e(t.target),s=e.datepicker._getInst(i[0]);(i[0].id!==e.datepicker._mainDivId&&0===i.parents("#"+e.datepicker._mainDivId).length&&!i.hasClass(e.datepicker.markerClassName)&&!i.closest("."+e.datepicker._triggerClass).length&&e.datepicker._datepickerShowing&&(!e.datepicker._inDialog||!e.blockUI)||i.hasClass(e.datepicker.markerClassName)&&e.datepicker._curInst!==s)&&e.datepicker._hideDatepicker()}},_adjustDate:function(t,i,s){var n=e(t),a=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(a,i+("M"===s?this._get(a,"showCurrentAtPos"):0),s),this._updateDatepicker(a))},_gotoToday:function(t){var i,s=e(t),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(t,i,s){var n=e(t),a=this._getInst(n[0]);a["selected"+("M"===s?"Month":"Year")]=a["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(a),this._adjustDate(n)},_selectDay:function(t,i,s,n){var a,o=e(t);e(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0])||(a=this._getInst(o[0]),a.selectedDay=a.currentDay=e("a",n).html(),a.selectedMonth=a.currentMonth=i,a.selectedYear=a.currentYear=s,this._selectDate(t,this._formatDate(a,a.currentDay,a.currentMonth,a.currentYear)))},_clearDate:function(t){var i=e(t);this._selectDate(i,"")},_selectDate:function(t,i){var s,n=e(t),a=this._getInst(n[0]);i=null!=i?i:this._formatDate(a),a.input&&a.input.val(i),this._updateAlternate(a),s=this._get(a,"onSelect"),s?s.apply(a.input?a.input[0]:null,[i,a]):a.input&&a.input.trigger("change"),a.inline?this._updateDatepicker(a):(this._hideDatepicker(),this._lastInput=a.input[0],"object"!=typeof a.input[0]&&a.input.focus(),this._lastInput=null)},_updateAlternate:function(t){var i,s,n,a=this._get(t,"altField");a&&(i=this._get(t,"altFormat")||this._get(t,"dateFormat"),s=this._getDate(t),n=this.formatDate(i,s,this._getFormatConfig(t)),e(a).each(function(){e(this).val(n)}))},noWeekends:function(e){var t=e.getDay();return[t>0&&6>t,""]},iso8601Week:function(e){var t,i=new Date(e.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),t=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((t-i)/864e5)/7)+1},parseDate:function(t,i,s){if(null==t||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,a,o,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),d=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,c=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,m=-1,g=-1,v=-1,y=-1,b=!1,_=function(e){var i=t.length>n+1&&t.charAt(n+1)===e;return i&&n++,i},x=function(e){var t=_(e),s="@"===e?14:"!"===e?20:"y"===e&&t?4:"o"===e?3:2,n="y"===e?s:1,a=RegExp("^\\d{"+n+","+s+"}"),o=i.substring(h).match(a);if(!o)throw"Missing number at position "+h;return h+=o[0].length,parseInt(o[0],10)},w=function(t,s,n){var a=-1,o=e.map(_(t)?n:s,function(e,t){return[[t,e]]}).sort(function(e,t){return-(e[1].length-t[1].length)});if(e.each(o,function(e,t){var s=t[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(a=t[0],h+=s.length,!1):void 0}),-1!==a)return a+1;throw"Unknown name at position "+h},k=function(){if(i.charAt(h)!==t.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;t.length>n;n++)if(b)"'"!==t.charAt(n)||_("'")?k():b=!1;else switch(t.charAt(n)){case"d":v=x("d");break;case"D":w("D",d,c);break;case"o":y=x("o");break;case"m":g=x("m");break;case"M":g=w("M",p,f);break;case"y":m=x("y");break;case"@":r=new Date(x("@")),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"!":r=new Date((x("!")-this._ticksTo1970)/1e4),m=r.getFullYear(),g=r.getMonth()+1,v=r.getDate();break;case"'":_("'")?k():b=!0;break;default:k()}if(i.length>h&&(o=i.substr(h),!/^\s+/.test(o)))throw"Extra/unparsed characters found in date: "+o;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),y>-1)for(g=1,v=y;;){if(a=this._getDaysInMonth(m,g-1),a>=v)break;g++,v-=a}if(r=this._daylightSavingAdjust(new Date(m,g-1,v)),r.getFullYear()!==m||r.getMonth()+1!==g||r.getDate()!==v)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(e,t,i){if(!t)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,a=(i?i.dayNames:null)||this._defaults.dayNames,o=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(t){var i=e.length>s+1&&e.charAt(s+1)===t;return i&&s++,i},l=function(e,t,i){var s=""+t;if(h(e))for(;i>s.length;)s="0"+s;return s},u=function(e,t,i,s){return h(e)?s[t]:i[t]},d="",c=!1;if(t)for(s=0;e.length>s;s++)if(c)"'"!==e.charAt(s)||h("'")?d+=e.charAt(s):c=!1;else switch(e.charAt(s)){case"d":d+=l("d",t.getDate(),2);break;case"D":d+=u("D",t.getDay(),n,a);break;case"o":d+=l("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":d+=l("m",t.getMonth()+1,2);break;case"M":d+=u("M",t.getMonth(),o,r);break;case"y":d+=h("y")?t.getFullYear():(10>t.getYear()%100?"0":"")+t.getYear()%100;break;case"@":d+=t.getTime();break;case"!":d+=1e4*t.getTime()+this._ticksTo1970;break;case"'":h("'")?d+="'":c=!0;break;default:d+=e.charAt(s)}return d},_possibleChars:function(e){var t,i="",s=!1,n=function(i){var s=e.length>t+1&&e.charAt(t+1)===i;return s&&t++,s};for(t=0;e.length>t;t++)if(s)"'"!==e.charAt(t)||n("'")?i+=e.charAt(t):s=!1;else switch(e.charAt(t)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=e.charAt(t)}return i},_get:function(e,t){return void 0!==e.settings[t]?e.settings[t]:this._defaults[t]},_setDateFromField:function(e,t){if(e.input.val()!==e.lastVal){var i=this._get(e,"dateFormat"),s=e.lastVal=e.input?e.input.val():null,n=this._getDefaultDate(e),a=n,o=this._getFormatConfig(e);try{a=this.parseDate(i,s,o)||n}catch(r){s=t?"":s}e.selectedDay=a.getDate(),e.drawMonth=e.selectedMonth=a.getMonth(),e.drawYear=e.selectedYear=a.getFullYear(),e.currentDay=s?a.getDate():0,e.currentMonth=s?a.getMonth():0,e.currentYear=s?a.getFullYear():0,this._adjustInstDate(e)}},_getDefaultDate:function(e){return this._restrictMinMax(e,this._determineDate(e,this._get(e,"defaultDate"),new Date))},_determineDate:function(t,i,s){var n=function(e){var t=new Date;return t.setDate(t.getDate()+e),t},a=function(i){try{return e.datepicker.parseDate(e.datepicker._get(t,"dateFormat"),i,e.datepicker._getFormatConfig(t))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?e.datepicker._getDate(t):null)||new Date,a=n.getFullYear(),o=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":o+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o));break;case"y":case"Y":a+=parseInt(l[1],10),r=Math.min(r,e.datepicker._getDaysInMonth(a,o))}l=h.exec(i)}return new Date(a,o,r)},o=null==i||""===i?s:"string"==typeof i?a(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return o=o&&"Invalid Date"==""+o?s:o,o&&(o.setHours(0),o.setMinutes(0),o.setSeconds(0),o.setMilliseconds(0)),this._daylightSavingAdjust(o)},_daylightSavingAdjust:function(e){return e?(e.setHours(e.getHours()>12?e.getHours()+2:0),e):null},_setDate:function(e,t,i){var s=!t,n=e.selectedMonth,a=e.selectedYear,o=this._restrictMinMax(e,this._determineDate(e,t,new Date));e.selectedDay=e.currentDay=o.getDate(),e.drawMonth=e.selectedMonth=e.currentMonth=o.getMonth(),e.drawYear=e.selectedYear=e.currentYear=o.getFullYear(),n===e.selectedMonth&&a===e.selectedYear||i||this._notifyChange(e),this._adjustInstDate(e),e.input&&e.input.val(s?"":this._formatDate(e))},_getDate:function(e){var t=!e.currentYear||e.input&&""===e.input.val()?null:this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return t},_attachHandlers:function(t){var i=this._get(t,"stepMonths"),s="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){e.datepicker._adjustDate(s,-i,"M")},next:function(){e.datepicker._adjustDate(s,+i,"M")},hide:function(){e.datepicker._hideDatepicker()},today:function(){e.datepicker._gotoToday(s)},selectDay:function(){return e.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return e.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return e.datepicker._selectMonthYear(s,this,"Y"),!1}};e(this).bind(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(e){var t,i,s,n,a,o,r,h,l,u,d,c,p,f,m,g,v,y,b,_,x,w,k,T,D,S,M,C,N,A,P,I,z,H,F,E,O,j,W,L=new Date,R=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(e,"isRTL"),B=this._get(e,"showButtonPanel"),J=this._get(e,"hideIfNoPrevNext"),q=this._get(e,"navigationAsDateFormat"),K=this._getNumberOfMonths(e),V=this._get(e,"showCurrentAtPos"),U=this._get(e,"stepMonths"),Q=1!==K[0]||1!==K[1],G=this._daylightSavingAdjust(e.currentDay?new Date(e.currentYear,e.currentMonth,e.currentDay):new Date(9999,9,9)),X=this._getMinMaxDate(e,"min"),$=this._getMinMaxDate(e,"max"),Z=e.drawMonth-V,et=e.drawYear;if(0>Z&&(Z+=12,et--),$)for(t=this._daylightSavingAdjust(new Date($.getFullYear(),$.getMonth()-K[0]*K[1]+1,$.getDate())),t=X&&X>t?X:t;this._daylightSavingAdjust(new Date(et,Z,1))>t;)Z--,0>Z&&(Z=11,et--);for(e.drawMonth=Z,e.drawYear=et,i=this._get(e,"prevText"),i=q?this.formatDate(i,this._daylightSavingAdjust(new Date(et,Z-U,1)),this._getFormatConfig(e)):i,s=this._canAdjustMonth(e,-1,et,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":J?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(e,"nextText"),n=q?this.formatDate(n,this._daylightSavingAdjust(new Date(et,Z+U,1)),this._getFormatConfig(e)):n,a=this._canAdjustMonth(e,1,et,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":J?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",o=this._get(e,"currentText"),r=this._get(e,"gotoCurrent")&&e.currentDay?G:R,o=q?this.formatDate(o,r,this._getFormatConfig(e)):o,h=e.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(e,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(e,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+o+"</button>":"")+(Y?"":h)+"</div>":"",u=parseInt(this._get(e,"firstDay"),10),u=isNaN(u)?0:u,d=this._get(e,"showWeek"),c=this._get(e,"dayNames"),p=this._get(e,"dayNamesMin"),f=this._get(e,"monthNames"),m=this._get(e,"monthNamesShort"),g=this._get(e,"beforeShowDay"),v=this._get(e,"showOtherMonths"),y=this._get(e,"selectOtherMonths"),b=this._getDefaultDate(e),_="",w=0;K[0]>w;w++){for(k="",this.maxRows=4,T=0;K[1]>T;T++){if(D=this._daylightSavingAdjust(new Date(et,Z,e.selectedDay)),S=" ui-corner-all",M="",Q){if(M+="<div class='ui-datepicker-group",K[1]>1)switch(T){case 0:M+=" ui-datepicker-group-first",S=" ui-corner-"+(Y?"right":"left");break;case K[1]-1:M+=" ui-datepicker-group-last",S=" ui-corner-"+(Y?"left":"right");break;default:M+=" ui-datepicker-group-middle",S=""}M+="'>"}for(M+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+S+"'>"+(/all|left/.test(S)&&0===w?Y?a:s:"")+(/all|right/.test(S)&&0===w?Y?s:a:"")+this._generateMonthYearHeader(e,Z,et,X,$,w>0||T>0,f,m)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",C=d?"<th class='ui-datepicker-week-col'>"+this._get(e,"weekHeader")+"</th>":"",x=0;7>x;x++)N=(x+u)%7,C+="<th scope='col'"+((x+u+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+c[N]+"'>"+p[N]+"</span></th>";for(M+=C+"</tr></thead><tbody>",A=this._getDaysInMonth(et,Z),et===e.selectedYear&&Z===e.selectedMonth&&(e.selectedDay=Math.min(e.selectedDay,A)),P=(this._getFirstDayOfMonth(et,Z)-u+7)%7,I=Math.ceil((P+A)/7),z=Q?this.maxRows>I?this.maxRows:I:I,this.maxRows=z,H=this._daylightSavingAdjust(new Date(et,Z,1-P)),F=0;z>F;F++){for(M+="<tr>",E=d?"<td class='ui-datepicker-week-col'>"+this._get(e,"calculateWeek")(H)+"</td>":"",x=0;7>x;x++)O=g?g.apply(e.input?e.input[0]:null,[H]):[!0,""],j=H.getMonth()!==Z,W=j&&!y||!O[0]||X&&X>H||$&&H>$,E+="<td class='"+((x+u+6)%7>=5?" ui-datepicker-week-end":"")+(j?" ui-datepicker-other-month":"")+(H.getTime()===D.getTime()&&Z===e.selectedMonth&&e._keyEvent||b.getTime()===H.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(W?" "+this._unselectableClass+" ui-state-disabled":"")+(j&&!v?"":" "+O[1]+(H.getTime()===G.getTime()?" "+this._currentClass:"")+(H.getTime()===R.getTime()?" ui-datepicker-today":""))+"'"+(j&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(W?"":" data-handler='selectDay' data-event='click' data-month='"+H.getMonth()+"' data-year='"+H.getFullYear()+"'")+">"+(j&&!v?"&#xa0;":W?"<span class='ui-state-default'>"+H.getDate()+"</span>":"<a class='ui-state-default"+(H.getTime()===R.getTime()?" ui-state-highlight":"")+(H.getTime()===G.getTime()?" ui-state-active":"")+(j?" ui-priority-secondary":"")+"' href='#'>"+H.getDate()+"</a>")+"</td>",H.setDate(H.getDate()+1),H=this._daylightSavingAdjust(H);M+=E+"</tr>"}Z++,Z>11&&(Z=0,et++),M+="</tbody></table>"+(Q?"</div>"+(K[0]>0&&T===K[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),k+=M}_+=k}return _+=l,e._keyEvent=!1,_},_generateMonthYearHeader:function(e,t,i,s,n,a,o,r){var h,l,u,d,c,p,f,m,g=this._get(e,"changeMonth"),v=this._get(e,"changeYear"),y=this._get(e,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",_="";if(a||!g)_+="<span class='ui-datepicker-month'>"+o[t]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,_+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",u=0;12>u;u++)(!h||u>=s.getMonth())&&(!l||n.getMonth()>=u)&&(_+="<option value='"+u+"'"+(u===t?" selected='selected'":"")+">"+r[u]+"</option>");_+="</select>"}if(y||(b+=_+(!a&&g&&v?"":"&#xa0;")),!e.yearshtml)if(e.yearshtml="",a||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(d=this._get(e,"yearRange").split(":"),c=(new Date).getFullYear(),p=function(e){var t=e.match(/c[+\-].*/)?i+parseInt(e.substring(1),10):e.match(/[+\-].*/)?c+parseInt(e,10):parseInt(e,10);return isNaN(t)?c:t},f=p(d[0]),m=Math.max(f,p(d[1]||"")),f=s?Math.max(f,s.getFullYear()):f,m=n?Math.min(m,n.getFullYear()):m,e.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";m>=f;f++)e.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";e.yearshtml+="</select>",b+=e.yearshtml,e.yearshtml=null}return b+=this._get(e,"yearSuffix"),y&&(b+=(!a&&g&&v?"":"&#xa0;")+_),b+="</div>"},_adjustInstDate:function(e,t,i){var s=e.drawYear+("Y"===i?t:0),n=e.drawMonth+("M"===i?t:0),a=Math.min(e.selectedDay,this._getDaysInMonth(s,n))+("D"===i?t:0),o=this._restrictMinMax(e,this._daylightSavingAdjust(new Date(s,n,a)));e.selectedDay=o.getDate(),e.drawMonth=e.selectedMonth=o.getMonth(),e.drawYear=e.selectedYear=o.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(e)},_restrictMinMax:function(e,t){var i=this._getMinMaxDate(e,"min"),s=this._getMinMaxDate(e,"max"),n=i&&i>t?i:t;return s&&n>s?s:n},_notifyChange:function(e){var t=this._get(e,"onChangeMonthYear");t&&t.apply(e.input?e.input[0]:null,[e.selectedYear,e.selectedMonth+1,e])},_getNumberOfMonths:function(e){var t=this._get(e,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(e,t){return this._determineDate(e,this._get(e,t+"Date"),null)},_getDaysInMonth:function(e,t){return 32-this._daylightSavingAdjust(new Date(e,t,32)).getDate()},_getFirstDayOfMonth:function(e,t){return new Date(e,t,1).getDay()},_canAdjustMonth:function(e,t,i,s){var n=this._getNumberOfMonths(e),a=this._daylightSavingAdjust(new Date(i,s+(0>t?t:n[0]*n[1]),1));return 0>t&&a.setDate(this._getDaysInMonth(a.getFullYear(),a.getMonth())),this._isInRange(e,a)},_isInRange:function(e,t){var i,s,n=this._getMinMaxDate(e,"min"),a=this._getMinMaxDate(e,"max"),o=null,r=null,h=this._get(e,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),o=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(o+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||t.getTime()>=n.getTime())&&(!a||t.getTime()<=a.getTime())&&(!o||t.getFullYear()>=o)&&(!r||r>=t.getFullYear())},_getFormatConfig:function(e){var t=this._get(e,"shortYearCutoff");return t="string"!=typeof t?t:(new Date).getFullYear()%100+parseInt(t,10),{shortYearCutoff:t,dayNamesShort:this._get(e,"dayNamesShort"),dayNames:this._get(e,"dayNames"),monthNamesShort:this._get(e,"monthNamesShort"),monthNames:this._get(e,"monthNames")}},_formatDate:function(e,t,i,s){t||(e.currentDay=e.selectedDay,e.currentMonth=e.selectedMonth,e.currentYear=e.selectedYear);var n=t?"object"==typeof t?t:this._daylightSavingAdjust(new Date(s,i,t)):this._daylightSavingAdjust(new Date(e.currentYear,e.currentMonth,e.currentDay));return this.formatDate(this._get(e,"dateFormat"),n,this._getFormatConfig(e))}}),e.fn.datepicker=function(t){if(!this.length)return this;e.datepicker.initialized||(e(document).mousedown(e.datepicker._checkExternalClick),e.datepicker.initialized=!0),0===e("#"+e.datepicker._mainDivId).length&&e("body").append(e.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof t||"isDisabled"!==t&&"getDate"!==t&&"widget"!==t?"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof t?e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this].concat(i)):e.datepicker._attachDatepicker(this,t)}):e.datepicker["_"+t+"Datepicker"].apply(e.datepicker,[this[0]].concat(i))},e.datepicker=new n,e.datepicker.initialized=!1,e.datepicker.uuid=(new Date).getTime(),e.datepicker.version="1.11.2",e.datepicker,e.widget("ui.dialog",{version:"1.11.2",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"Close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var i=e(this).css(t).offset().top;0>i&&e(this).css("top",t.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&e.fn.draggable&&this._makeDraggable(),this.options.resizable&&e.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?e(t):this.document.find(t||"body").eq(0)},_destroy:function(){var e,t=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),e=t.parent.children().eq(t.index),e.length&&e[0]!==this.element[0]?e.before(this.element):t.parent.append(this.element)},widget:function(){return this.uiDialog},disable:e.noop,enable:e.noop,close:function(t){var i,s=this;if(this._isOpen&&this._trigger("beforeClose",t)!==!1){if(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),!this.opener.filter(":focusable").focus().length)try{i=this.document[0].activeElement,i&&"body"!==i.nodeName.toLowerCase()&&e(i).blur()}catch(n){}this._hide(this.uiDialog,this.options.hide,function(){s._trigger("close",t)})}},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+e(this).css("z-index")}).get(),a=Math.max.apply(null,n);return a>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",a+1),s=!0),s&&!i&&this._trigger("focus",t),s},open:function(){var t=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=e(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var e=this._focusedElement;
+e||(e=this.element.find("[autofocus]")),e.length||(e=this.element.find(":tabbable")),e.length||(e=this.uiDialogButtonPane.find(":tabbable")),e.length||(e=this.uiDialogTitlebarClose.filter(":tabbable")),e.length||(e=this.uiDialog),e.eq(0).focus()},_keepFocus:function(t){function i(){var t=this.document[0].activeElement,i=this.uiDialog[0]===t||e.contains(this.uiDialog[0],t);i||this._focusTabbable()}t.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=e("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===e.ui.keyCode.ESCAPE)return t.preventDefault(),this.close(t),void 0;if(t.keyCode===e.ui.keyCode.TAB&&!t.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");t.target!==n[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==s[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){n.focus()}),t.preventDefault()):(this._delay(function(){s.focus()}),t.preventDefault())}},mousedown:function(e){this._moveToTop(e)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=e("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(t){e(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=e("<button type='button'></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(e){e.preventDefault(),this.close(e)}}),t=e("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(t),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(e){this.options.title||e.html("&#160;"),e.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=e("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=e("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var t=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),e.isEmptyObject(i)||e.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),void 0):(e.each(i,function(i,s){var n,a;s=e.isFunction(s)?{click:s,text:i}:s,s=e.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(t.element[0],arguments)},a={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,e("<button></button>",s).button(a).appendTo(t.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function t(e){return{position:e.position,offset:e.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){e(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,t(n))},drag:function(e,s){i._trigger("drag",e,t(s))},stop:function(n,a){var o=a.offset.left-i.document.scrollLeft(),r=a.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(o>=0?"+":"")+o+" "+"top"+(r>=0?"+":"")+r,of:i.window},e(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,t(a))}})},_makeResizable:function(){function t(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}var i=this,s=this.options,n=s.resizable,a=this.uiDialog.css("position"),o="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:o,start:function(s,n){e(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,t(n))},resize:function(e,s){i._trigger("resize",e,t(s))},stop:function(n,a){var o=i.uiDialog.offset(),r=o.left-i.document.scrollLeft(),h=o.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},e(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,t(a))}}).css("position",a)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=e(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),i=e.inArray(this,t);-1!==i&&t.splice(i,1)},_trackingInstances:function(){var e=this.document.data("ui-dialog-instances");return e||(e=[],this.document.data("ui-dialog-instances",e)),e},_minHeight:function(){var e=this.options;return"auto"===e.height?e.minHeight:Math.min(e.minHeight,e.height)},_position:function(){var e=this.uiDialog.is(":visible");e||this.uiDialog.show(),this.uiDialog.position(this.options.position),e||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};e.each(t,function(e,t){i._setOption(e,t),e in i.sizeRelatedOptions&&(s=!0),e in i.resizableRelatedOptions&&(n[e]=t)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,t){var i,s,n=this.uiDialog;"dialogClass"===e&&n.removeClass(this.options.dialogClass).addClass(t),"disabled"!==e&&(this._super(e,t),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:""+t}),"draggable"===e&&(i=n.is(":data(ui-draggable)"),i&&!t&&n.draggable("destroy"),!i&&t&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(s=n.is(":data(ui-resizable)"),s&&!t&&n.resizable("destroy"),s&&"string"==typeof t&&n.resizable("option","handles",t),s||t===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var e,t,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),e=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),t=Math.max(0,s.minHeight-e),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-e):"none","auto"===s.height?this.element.css({minHeight:t,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-e)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=e(this);return e("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return e(t.target).closest(".ui-dialog").length?!0:!!e(t.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var t=!0;this._delay(function(){t=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(e){t||this._allowInteraction(e)||(e.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=e("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var e=this.document.data("ui-dialog-overlays")-1;e?this.document.data("ui-dialog-overlays",e):this.document.unbind("focusin").removeData("ui-dialog-overlays"),this.overlay.remove(),this.overlay=null}}}),e.widget("ui.progressbar",{version:"1.11.2",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=e("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()},value:function(e){return void 0===e?this.options.value:(this.options.value=this._constrainedValue(e),this._refreshValue(),void 0)},_constrainedValue:function(e){return void 0===e&&(e=this.options.value),this.indeterminate=e===!1,"number"!=typeof e&&(e=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,e))},_setOptions:function(e){var t=e.value;delete e.value,this._super(e),this.options.value=this._constrainedValue(t),this._refreshValue()},_setOption:function(e,t){"max"===e&&(t=Math.max(this.min,t)),"disabled"===e&&this.element.toggleClass("ui-state-disabled",!!t).attr("aria-disabled",t),this._super(e,t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).toggleClass("ui-corner-right",t===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=e("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),e.widget("ui.selectmenu",{version:"1.11.2",defaultElement:"<select>",options:{appendTo:null,disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:null,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this.options.disabled&&this.disable()},_drawButton:function(){var t=this,i=this.element.attr("tabindex");this.label=e("label[for='"+this.ids.element+"']").attr("for",this.ids.button),this._on(this.label,{click:function(e){this.button.focus(),e.preventDefault()}}),this.element.hide(),this.button=e("<span>",{"class":"ui-selectmenu-button ui-widget ui-state-default ui-corner-all",tabindex:i||this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true"}).insertAfter(this.element),e("<span>",{"class":"ui-icon "+this.options.icons.button}).prependTo(this.button),this.buttonText=e("<span>",{"class":"ui-selectmenu-text"}).appendTo(this.button),this._setText(this.buttonText,this.element.find("option:selected").text()),this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){t.menuItems||t._refreshMenu()}),this._hoverable(this.button),this._focusable(this.button)},_drawMenu:function(){var t=this;this.menu=e("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=e("<div>",{"class":"ui-selectmenu-menu ui-front"}).append(this.menu).appendTo(this._appendTo()),this.menuInstance=this.menu.menu({role:"listbox",select:function(e,i){e.preventDefault(),t._setSelection(),t._select(i.item.data("ui-selectmenu-item"),e)},focus:function(e,i){var s=i.item.data("ui-selectmenu-item");null!=t.focusIndex&&s.index!==t.focusIndex&&(t._trigger("focus",e,{item:s}),t.isOpen||t._select(s,e)),t.focusIndex=s.index,t.button.attr("aria-activedescendant",t.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menu.addClass("ui-corner-bottom").removeClass("ui-corner-all"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this._setText(this.buttonText,this._getSelectedItem().text()),this.options.width||this._resizeButton()},_refreshMenu:function(){this.menu.empty();var e,t=this.element.find("option");t.length&&(this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup"),e=this._getSelectedItem(),this.menuInstance.focus(null,e),this._setAria(e.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(e){this.options.disabled||(this.menuItems?(this.menu.find(".ui-state-focus").removeClass("ui-state-focus"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",e))},_position:function(){this.menuWrap.position(e.extend({of:this.button},this.options.position))},close:function(e){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",e))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderMenu:function(t,i){var s=this,n="";e.each(i,function(i,a){a.optgroup!==n&&(e("<li>",{"class":"ui-selectmenu-optgroup ui-menu-divider"+(a.element.parent("optgroup").prop("disabled")?" ui-state-disabled":""),text:a.optgroup}).appendTo(t),n=a.optgroup),s._renderItemData(t,a)})},_renderItemData:function(e,t){return this._renderItem(e,t).data("ui-selectmenu-item",t)},_renderItem:function(t,i){var s=e("<li>");return i.disabled&&s.addClass("ui-state-disabled"),this._setText(s,i.label),s.appendTo(t)},_setText:function(e,t){t?e.text(t):e.html("&#160;")},_move:function(e,t){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex):(i=this.menuItems.eq(this.element[0].selectedIndex),n+=":not(.ui-state-disabled)"),s="first"===e||"last"===e?i["first"===e?"prevAll":"nextAll"](n).eq(-1):i[e+"All"](n).eq(0),s.length&&this.menuInstance.focus(t,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex)},_toggle:function(e){this[this.isOpen?"close":"open"](e)},_setSelection:function(){var e;this.range&&(window.getSelection?(e=window.getSelection(),e.removeAllRanges(),e.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(t){this.isOpen&&(e(t.target).closest(".ui-selectmenu-menu, #"+this.ids.button).length||this.close(t))}},_buttonEvents:{mousedown:function(){var e;window.getSelection?(e=window.getSelection(),e.rangeCount&&(this.range=e.getRangeAt(0))):this.range=document.selection.createRange()},click:function(e){this._setSelection(),this._toggle(e)},keydown:function(t){var i=!0;switch(t.keyCode){case e.ui.keyCode.TAB:case e.ui.keyCode.ESCAPE:this.close(t),i=!1;break;case e.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case e.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case e.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case e.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case e.ui.keyCode.LEFT:this._move("prev",t);break;case e.ui.keyCode.RIGHT:this._move("next",t);break;case e.ui.keyCode.HOME:case e.ui.keyCode.PAGE_UP:this._move("first",t);break;case e.ui.keyCode.END:case e.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),i=!1}i&&t.preventDefault()}},_selectFocusedItem:function(e){var t=this.menuItems.eq(this.focusIndex);t.hasClass("ui-state-disabled")||this._select(t.data("ui-selectmenu-item"),e)},_select:function(e,t){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=e.index,this._setText(this.buttonText,e.label),this._setAria(e),this._trigger("select",t,{item:e}),e.index!==i&&this._trigger("change",t,{item:e}),this.close(t)},_setAria:function(e){var t=this.menuItems.eq(e.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(e,t){"icons"===e&&this.button.find("span.ui-icon").removeClass(this.options.icons.button).addClass(t.button),this._super(e,t),"appendTo"===e&&this.menuWrap.appendTo(this._appendTo()),"disabled"===e&&(this.menuInstance.option("disabled",t),this.button.toggleClass("ui-state-disabled",t).attr("aria-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)),"width"===e&&this._resizeButton()},_appendTo:function(){var t=this.options.appendTo;return t&&(t=t.jquery||t.nodeType?e(t):this.document.find(t).eq(0)),t&&t[0]||(t=this.element.closest(".ui-front")),t.length||(t=this.document[0].body),t},_toggleAttr:function(){this.button.toggleClass("ui-corner-top",this.isOpen).toggleClass("ui-corner-all",!this.isOpen).attr("aria-expanded",this.isOpen),this.menuWrap.toggleClass("ui-selectmenu-open",this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var e=this.options.width;e||(e=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(e)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){return{disabled:this.element.prop("disabled")}},_parseOptions:function(t){var i=[];t.each(function(t,s){var n=e(s),a=n.parent("optgroup");i.push({element:n,index:t,value:n.attr("value"),label:n.text(),optgroup:a.attr("label")||"",disabled:a.prop("disabled")||n.prop("disabled")})}),this.items=i},_destroy:function(){this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.label.attr("for",this.ids.element)}}),e.widget("ui.slider",e.ui.mouse,{version:"1.11.2",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),a="<span class='ui-slider-handle ui-state-default ui-corner-all' tabindex='0'></span>",o=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),t=n.length;i>t;t++)o.push(a);this.handles=n.add(e(o.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(t){e(this).data("ui-slider-handle-index",t)})},_createRange:function(){var t=this.options,i="";t.range?(t.range===!0&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:e.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=e("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===t.range||"max"===t.range?" ui-slider-range-"+t.range:""))):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,a,o,r,h,l,u=this,d=this.options;return d.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:t.pageX,y:t.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var i=Math.abs(s-u.values(t));(n>i||n===i&&(t===u._lastChangedValue||u.values(t)===d.min))&&(n=i,a=e(this),o=t)}),r=this._start(t,o),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=o,a.addClass("ui-state-active").focus(),h=a.offset(),l=!e(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:t.pageX-h.left-a.width()/2,top:t.pageY-h.top-a.height()/2-(parseInt(a.css("borderTopWidth"),10)||0)-(parseInt(a.css("borderBottomWidth"),10)||0)+(parseInt(a.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(e){var t={x:e.pageX,y:e.pageY},i=this._normValueFromMouse(t);return this._slide(e,this._handleIndex,i),!1},_mouseStop:function(e){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(e,this._handleIndex),this._change(e,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(e){var t,i,s,n,a;return"horizontal"===this.orientation?(t=this.elementSize.width,i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(t=this.elementSize.height,i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/t,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),a=this._valueMin()+s*n,this._trimAlignValue(a)},_start:function(e,t){var i={handle:this.handles[t],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("start",e,i)},_slide:function(e,t,i){var s,n,a;this.options.values&&this.options.values.length?(s=this.values(t?0:1),2===this.options.values.length&&this.options.range===!0&&(0===t&&i>s||1===t&&s>i)&&(i=s),i!==this.values(t)&&(n=this.values(),n[t]=i,a=this._trigger("slide",e,{handle:this.handles[t],value:i,values:n}),s=this.values(t?0:1),a!==!1&&this.values(t,i))):i!==this.value()&&(a=this._trigger("slide",e,{handle:this.handles[t],value:i}),a!==!1&&this.value(i))},_stop:function(e,t){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._trigger("stop",e,i)},_change:function(e,t){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[t],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(t),i.values=this.values()),this._lastChangedValue=t,this._trigger("change",e,i)}},value:function(e){return arguments.length?(this.options.value=this._trimAlignValue(e),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(t,i){var s,n,a;if(arguments.length>1)return this.options.values[t]=this._trimAlignValue(i),this._refreshValue(),this._change(null,t),void 0;if(!arguments.length)return this._values();if(!e.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(t):this.value();for(s=this.options.values,n=arguments[0],a=0;s.length>a;a+=1)s[a]=this._trimAlignValue(n[a]),this._change(null,a);this._refreshValue()},_setOption:function(t,i){var s,n=0;switch("range"===t&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),e.isArray(this.options.values)&&(n=this.options.values.length),"disabled"===t&&this.element.toggleClass("ui-state-disabled",!!i),this._super(t,i),t){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue(),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var e=this.options.value;return e=this._trimAlignValue(e)},_values:function(e){var t,i,s;if(arguments.length)return t=this.options.values[e],t=this._trimAlignValue(t);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(e){if(this._valueMin()>=e)return this._valueMin();if(e>=this._valueMax())return this._valueMax();var t=this.options.step>0?this.options.step:1,i=(e-this._valueMin())%t,s=e-i;return 2*Math.abs(i)>=t&&(s+=i>0?t:-t),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var e=(this.options.max-this._valueMin())%this.options.step;this.max=this.options.max-e},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshValue:function(){var t,i,s,n,a,o=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,u={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),u["horizontal"===h.orientation?"left":"bottom"]=i+"%",e(this).stop(1,1)[l?"animate":"css"](u,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-t+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-t+"%"},{queue:!1,duration:r.animate}))),t=i}):(s=this.value(),n=this._valueMin(),a=this._valueMax(),i=a!==n?100*((s-n)/(a-n)):0,u["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](u,r.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===o&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===o&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(t){var i,s,n,a,o=e(t.target).data("ui-slider-handle-index");switch(t.keyCode){case e.ui.keyCode.HOME:case e.ui.keyCode.END:case e.ui.keyCode.PAGE_UP:case e.ui.keyCode.PAGE_DOWN:case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,e(t.target).addClass("ui-state-active"),i=this._start(t,o),i===!1))return}switch(a=this.options.step,s=n=this.options.values&&this.options.values.length?this.values(o):this.value(),t.keyCode){case e.ui.keyCode.HOME:n=this._valueMin();break;case e.ui.keyCode.END:n=this._valueMax();break;case e.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case e.ui.keyCode.UP:case e.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+a);break;case e.ui.keyCode.DOWN:case e.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-a)}this._slide(t,o,n)},keyup:function(t){var i=e(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,i),this._change(t,i),e(t.target).removeClass("ui-state-active"))}}}),e.widget("ui.spinner",{version:"1.11.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var t={},i=this.element;return e.each(["min","max","step"],function(e,s){var n=i.attr(s);void 0!==n&&n.length&&(t[s]=n)}),t},_events:{keydown:function(e){this._start(e)&&this._keydown(e)&&e.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(e){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",e),void 0)},mousewheel:function(e,t){if(t){if(!this.spinning&&!this._start(e))return!1;this._spin((t>0?1:-1)*this.options.step,e),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(e)},100),e.preventDefault()}},"mousedown .ui-spinner-button":function(t){function i(){var e=this.element[0]===this.document[0].activeElement;e||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(t)!==!1&&this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){return e(t.currentTarget).hasClass("ui-state-active")?this._start(t)===!1?!1:(this._repeat(null,e(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var e=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=e.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*e.height())&&e.height()>0&&e.height(e.height()),this.options.disabled&&this.disable()},_keydown:function(t){var i=this.options,s=e.ui.keyCode;switch(t.keyCode){case s.UP:return this._repeat(null,1,t),!0;case s.DOWN:return this._repeat(null,-1,t),!0;case s.PAGE_UP:return this._repeat(null,i.page,t),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,t),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"
+},_start:function(e){return this.spinning||this._trigger("start",e)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(e,t,i){e=e||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,t,i)},e),this._spin(t*this.options.step,i)},_spin:function(e,t){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+e*this._increment(this.counter)),this.spinning&&this._trigger("spin",t,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(t){var i=this.options.incremental;return i?e.isFunction(i)?i(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var e=this._precisionOf(this.options.step);return null!==this.options.min&&(e=Math.max(e,this._precisionOf(this.options.min))),e},_precisionOf:function(e){var t=""+e,i=t.indexOf(".");return-1===i?0:t.length-i-1},_adjustValue:function(e){var t,i,s=this.options;return t=null!==s.min?s.min:0,i=e-t,i=Math.round(i/s.step)*s.step,e=t+i,e=parseFloat(e.toFixed(this._precision())),null!==s.max&&e>s.max?s.max:null!==s.min&&s.min>e?s.min:e},_stop:function(e){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",e))},_setOption:function(e,t){if("culture"===e||"numberFormat"===e){var i=this._parse(this.element.val());return this.options[e]=t,this.element.val(this._format(i)),void 0}("max"===e||"min"===e||"step"===e)&&"string"==typeof t&&(t=this._parse(t)),"icons"===e&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(t.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(t.down)),this._super(e,t),"disabled"===e&&(this.widget().toggleClass("ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable"))},_setOptions:h(function(e){this._super(e)}),_parse:function(e){return"string"==typeof e&&""!==e&&(e=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(e,10,this.options.culture):+e),""===e||isNaN(e)?null:e},_format:function(e){return""===e?"":window.Globalize&&this.options.numberFormat?Globalize.format(e,this.options.numberFormat,this.options.culture):e},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var e=this.value();return null===e?!1:e===this._adjustValue(e)},_value:function(e,t){var i;""!==e&&(i=this._parse(e),null!==i&&(t||(i=this._adjustValue(i)),e=this._format(i))),this.element.val(e),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:h(function(e){this._stepUp(e)}),_stepUp:function(e){this._start()&&(this._spin((e||1)*this.options.step),this._stop())},stepDown:h(function(e){this._stepDown(e)}),_stepDown:function(e){this._start()&&(this._spin((e||1)*-this.options.step),this._stop())},pageUp:h(function(e){this._stepUp((e||1)*this.options.page)}),pageDown:h(function(e){this._stepDown((e||1)*this.options.page)}),value:function(e){return arguments.length?(h(this._value).call(this,e),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),e.widget("ui.tabs",{version:"1.11.2",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var e=/#.*$/;return function(t){var i,s;t=t.cloneNode(!1),i=t.href.replace(e,""),s=location.href.replace(e,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return t.hash.length>1&&i===s}}(),_create:function(){var t=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible),this._processTabs(),i.active=this._initialActive(),e.isArray(i.disabled)&&(i.disabled=e.unique(i.disabled.concat(e.map(this.tabs.filter(".ui-state-disabled"),function(e){return t.tabs.index(e)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):e(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var t=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===t&&(s&&this.tabs.each(function(i,n){return e(n).attr("aria-controls")===s?(t=i,!1):void 0}),null===t&&(t=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===t||-1===t)&&(t=this.tabs.length?0:!1)),t!==!1&&(t=this.tabs.index(this.tabs.eq(t)),-1===t&&(t=i?!1:0)),!i&&t===!1&&this.anchors.length&&(t=0),t},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):e()}},_tabKeydown:function(t){var i=e(this.document[0].activeElement).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case e.ui.keyCode.RIGHT:case e.ui.keyCode.DOWN:s++;break;case e.ui.keyCode.UP:case e.ui.keyCode.LEFT:n=!1,s--;break;case e.ui.keyCode.END:s=this.anchors.length-1;break;case e.ui.keyCode.HOME:s=0;break;case e.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case e.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}t.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),t.ctrlKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===e.ui.keyCode.UP&&(t.preventDefault(),this.active.focus())},_handlePageNav:function(t){return t.altKey&&t.keyCode===e.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===e.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,i){function s(){return t>n&&(t=0),0>t&&(t=n),t}for(var n=this.tabs.length-1;-1!==e.inArray(s(),this.options.disabled);)t=i?t+1:t-1;return t},_focusNextTab:function(e,t){return e=this._findNextTab(e,t),this.tabs.eq(e).focus(),e},_setOption:function(e,t){return"active"===e?(this._activate(t),void 0):"disabled"===e?(this._setupDisabled(t),void 0):(this._super(e,t),"collapsible"===e&&(this.element.toggleClass("ui-tabs-collapsible",t),t||this.options.active!==!1||this._activate(0)),"event"===e&&this._setupEvents(t),"heightStyle"===e&&this._setupHeightStyle(t),void 0)},_sanitizeSelector:function(e){return e?e.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,i=this.tablist.children(":has(a[href])");t.disabled=e.map(i.filter(".ui-state-disabled"),function(e){return i.index(e)}),this._processTabs(),t.active!==!1&&this.anchors.length?this.active.length&&!e.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=e()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=e()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var t=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist").delegate("> li","mousedown"+this.eventNamespace,function(t){e(this).is(".ui-state-disabled")&&t.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){e(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return e("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=e(),this.anchors.each(function(i,s){var n,a,o,r=e(s).uniqueId().attr("id"),h=e(s).closest("li"),l=h.attr("aria-controls");t._isLocal(s)?(n=s.hash,o=n.substring(1),a=t.element.find(t._sanitizeSelector(n))):(o=h.attr("aria-controls")||e({}).uniqueId()[0].id,n="#"+o,a=t.element.find(n),a.length||(a=t._createPanel(o),a.insertAfter(t.panels[i-1]||t.tablist)),a.attr("aria-live","polite")),a.length&&(t.panels=t.panels.add(a)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":o,"aria-labelledby":r}),a.attr("aria-labelledby",r)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol,ul").eq(0)},_createPanel:function(t){return e("<div>").attr("id",t).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(t){e.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1);for(var i,s=0;i=this.tabs[s];s++)t===!0||-1!==e.inArray(s,t)?e(i).addClass("ui-state-disabled").attr("aria-disabled","true"):e(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=t},_setupEvents:function(t){var i={};t&&e.each(t.split(" "),function(e,t){i[t]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(e){e.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,s=this.element.parent();"fill"===t?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=e(this),s=t.css("position");"absolute"!==s&&"fixed"!==s&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=e(this).outerHeight(!0)}),this.panels.each(function(){e(this).height(Math.max(0,i-e(this).innerHeight()+e(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,e(this).height("").height())}).height(i))},_eventHandler:function(t){var i=this.options,s=this.active,n=e(t.currentTarget),a=n.closest("li"),o=a[0]===s[0],r=o&&i.collapsible,h=r?e():this._getPanelForTab(a),l=s.length?this._getPanelForTab(s):e(),u={oldTab:s,oldPanel:l,newTab:r?e():a,newPanel:h};t.preventDefault(),a.hasClass("ui-state-disabled")||a.hasClass("ui-tabs-loading")||this.running||o&&!i.collapsible||this._trigger("beforeActivate",t,u)===!1||(i.active=r?!1:this.tabs.index(a),this.active=o?e():a,this.xhr&&this.xhr.abort(),l.length||h.length||e.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(a),t),this._toggle(t,u))},_toggle:function(t,i){function s(){a.running=!1,a._trigger("activate",t,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),o.length&&a.options.show?a._show(o,a.options.show,s):(o.show(),s())}var a=this,o=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),o.length&&r.length?i.oldTab.attr("tabIndex",-1):o.length&&this.tabs.filter(function(){return 0===e(this).attr("tabIndex")}).attr("tabIndex",-1),o.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var i,s=this._findActive(t);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:e.noop}))},_findActive:function(t){return t===!1?e():this.tabs.eq(t)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+e+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tablist.unbind(this.eventNamespace),this.tabs.add(this.panels).each(function(){e.data(this,"ui-tabs-destroy")?e(this).remove():e(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var t=e(this),i=t.data("ui-tabs-aria-controls");i?t.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(t){var i=this.options.disabled;i!==!1&&(void 0===t?i=!1:(t=this._getIndex(t),i=e.isArray(i)?e.map(i,function(e){return e!==t?e:null}):e.map(this.tabs,function(e,i){return i!==t?i:null})),this._setupDisabled(i))},disable:function(t){var i=this.options.disabled;if(i!==!0){if(void 0===t)i=!0;else{if(t=this._getIndex(t),-1!==e.inArray(t,i))return;i=e.isArray(i)?e.merge([t],i).sort():[t]}this._setupDisabled(i)}},load:function(t,i){t=this._getIndex(t);var s=this,n=this.tabs.eq(t),a=n.find(".ui-tabs-anchor"),o=this._getPanelForTab(n),r={tab:n,panel:o};this._isLocal(a[0])||(this.xhr=e.ajax(this._ajaxSettings(a,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(n.addClass("ui-tabs-loading"),o.attr("aria-busy","true"),this.xhr.success(function(e){setTimeout(function(){o.html(e),s._trigger("load",i,r)},1)}).complete(function(e,t){setTimeout(function(){"abort"===t&&s.panels.stop(!1,!0),n.removeClass("ui-tabs-loading"),o.removeAttr("aria-busy"),e===s.xhr&&delete s.xhr},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href"),beforeSend:function(t,a){return n._trigger("beforeLoad",i,e.extend({jqXHR:t,ajaxSettings:a},s))}}},_getPanelForTab:function(t){var i=e(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),e.widget("ui.tooltip",{version:"1.11.2",options:{content:function(){var t=e(this).attr("title")||"";return e("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_addDescribedBy:function(t,i){var s=(t.attr("aria-describedby")||"").split(/\s+/);s.push(i),t.data("ui-tooltip-id",i).attr("aria-describedby",e.trim(s.join(" ")))},_removeDescribedBy:function(t){var i=t.data("ui-tooltip-id"),s=(t.attr("aria-describedby")||"").split(/\s+/),n=e.inArray(i,s);-1!==n&&s.splice(n,1),t.removeData("ui-tooltip-id"),s=e.trim(s.join(" ")),s?t.attr("aria-describedby",s):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable(),this.liveRegion=e("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).addClass("ui-helper-hidden-accessible").appendTo(this.document[0].body)},_setOption:function(t,i){var s=this;return"disabled"===t?(this[i?"_disable":"_enable"](),this.options[t]=i,void 0):(this._super(t,i),"content"===t&&e.each(this.tooltips,function(e,t){s._updateContent(t.element)}),void 0)},_disable:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur");n.target=n.currentTarget=s.element[0],t.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.is("[title]")&&t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var t=e(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))})},open:function(t){var i=this,s=e(t?t.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&s.parents().each(function(){var t,s=e(this);s.data("ui-tooltip-open")&&(t=e.Event("blur"),t.target=t.currentTarget=this,i.close(t,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,t))},_updateContent:function(e,t){var i,s=this.options.content,n=this,a=t?t.type:null;return"string"==typeof s?this._open(t,e,s):(i=s.call(e[0],function(i){e.data("ui-tooltip-open")&&n._delay(function(){t&&(t.type=a),this._open(t,e,i)})}),i&&this._open(t,e,i),void 0)},_open:function(t,i,s){function n(e){u.of=e,o.is(":hidden")||o.position(u)}var a,o,r,h,l,u=e.extend({},this.options.position);if(s){if(a=this._find(i))return a.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(t&&"mouseover"===t.type?i.attr("title",""):i.removeAttr("title")),a=this._tooltip(i),o=a.tooltip,this._addDescribedBy(i,o.attr("id")),o.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),s.clone?(l=s.clone(),l.removeAttr("id").find("[id]").removeAttr("id")):l=s,e("<div>").html(l).appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:n}),n(t)):o.position(e.extend({of:i},this.options.position)),o.hide(),this._show(o,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){o.is(":visible")&&(n(u.of),clearInterval(h))},e.fx.interval)),this._trigger("open",t,{tooltip:o}),r={keyup:function(t){if(t.keyCode===e.ui.keyCode.ESCAPE){var s=e.Event(t);s.currentTarget=i[0],this.close(s,!0)}}},i[0]!==this.element[0]&&(r.remove=function(){this._removeTooltip(o)}),t&&"mouseover"!==t.type||(r.mouseleave="close"),t&&"focusin"!==t.type||(r.focusout="close"),this._on(!0,i,r)}},close:function(t){var i,s=this,n=e(t?t.currentTarget:this.element),a=this._find(n);a&&(i=a.tooltip,a.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),a.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(e(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&e.each(this.parents,function(t,i){e(i.element).attr("title",i.title),delete s.parents[t]}),a.closing=!0,this._trigger("close",t,{tooltip:i}),a.hiding||(a.closing=!1)))},_tooltip:function(t){var i=e("<div>").attr("role","tooltip").addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||"")),s=i.uniqueId().attr("id");return e("<div>").addClass("ui-tooltip-content").appendTo(i),i.appendTo(this.document[0].body),this.tooltips[s]={element:t,tooltip:i}},_find:function(e){var t=e.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(e){e.remove(),delete this.tooltips[e.attr("id")]},_destroy:function(){var t=this;e.each(this.tooltips,function(i,s){var n=e.Event("blur"),a=s.element;n.target=n.currentTarget=a[0],t.close(n,!0),e("#"+i).remove(),a.data("ui-tooltip-title")&&(a.attr("title")||a.attr("title",a.data("ui-tooltip-title")),a.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}});var y="ui-effects-",b=e;e.effects={effect:{}},function(e,t){function i(e,t,i){var s=d[t.type]||{};return null==e?i||!t.def?null:t.def:(e=s.floor?~~e:parseFloat(e),isNaN(e)?t.def:s.mod?(e+s.mod)%s.mod:0>e?0:e>s.max?s.max:e)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(e,a){var o,r=a.re.exec(i),h=r&&a.parse(r),l=a.space||"rgba";return h?(o=s[l](h),s[u[l].cache]=o[u[l].cache],n=s._rgba=o._rgba,!1):t}),n.length?("0,0,0,0"===n.join()&&e.extend(n,a.transparent),s):a[i]}function n(e,t,i){return i=(i+1)%1,1>6*i?e+6*(t-e)*i:1>2*i?t:2>3*i?e+6*(t-e)*(2/3-i):e}var a,o="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[e[1],e[2],e[3],e[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(e){return[2.55*e[1],2.55*e[2],2.55*e[3],e[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(e){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(e){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(e){return[e[1],e[2]/100,e[3]/100,e[4]]}}],l=e.Color=function(t,i,s,n){return new e.Color.fn.parse(t,i,s,n)},u={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},d={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},c=l.support={},p=e("<p>")[0],f=e.each;p.style.cssText="background-color:rgba(1,1,1,.5)",c.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(u,function(e,t){t.cache="_"+e,t.props.alpha={idx:3,type:"percent",def:1}}),l.fn=e.extend(l.prototype,{parse:function(n,o,r,h){if(n===t)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=e(n).css(o),o=t);var d=this,c=e.type(n),p=this._rgba=[];return o!==t&&(n=[n,o,r,h],c="array"),"string"===c?this.parse(s(n)||a._default):"array"===c?(f(u.rgba.props,function(e,t){p[t.idx]=i(n[t.idx],t)}),this):"object"===c?(n instanceof l?f(u,function(e,t){n[t.cache]&&(d[t.cache]=n[t.cache].slice())}):f(u,function(t,s){var a=s.cache;f(s.props,function(e,t){if(!d[a]&&s.to){if("alpha"===e||null==n[e])return;d[a]=s.to(d._rgba)}d[a][t.idx]=i(n[e],t,!0)}),d[a]&&0>e.inArray(null,d[a].slice(0,3))&&(d[a][3]=1,s.from&&(d._rgba=s.from(d[a])))}),this):t},is:function(e){var i=l(e),s=!0,n=this;return f(u,function(e,a){var o,r=i[a.cache];return r&&(o=n[a.cache]||a.to&&a.to(n._rgba)||[],f(a.props,function(e,i){return null!=r[i.idx]?s=r[i.idx]===o[i.idx]:t})),s}),s},_space:function(){var e=[],t=this;return f(u,function(i,s){t[s.cache]&&e.push(i)}),e.pop()},transition:function(e,t){var s=l(e),n=s._space(),a=u[n],o=0===this.alpha()?l("transparent"):this,r=o[a.cache]||a.to(o._rgba),h=r.slice();return s=s[a.cache],f(a.props,function(e,n){var a=n.idx,o=r[a],l=s[a],u=d[n.type]||{};null!==l&&(null===o?h[a]=l:(u.mod&&(l-o>u.mod/2?o+=u.mod:o-l>u.mod/2&&(o-=u.mod)),h[a]=i((l-o)*t+o,n)))}),this[n](h)},blend:function(t){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(t)._rgba;return l(e.map(i,function(e,t){return(1-s)*n[t]+s*e}))},toRgbaString:function(){var t="rgba(",i=e.map(this._rgba,function(e,t){return null==e?t>2?1:0:e});return 1===i[3]&&(i.pop(),t="rgb("),t+i.join()+")"},toHslaString:function(){var t="hsla(",i=e.map(this.hsla(),function(e,t){return null==e&&(e=t>2?1:0),t&&3>t&&(e=Math.round(100*e)+"%"),e});return 1===i[3]&&(i.pop(),t="hsl("),t+i.join()+")"},toHexString:function(t){var i=this._rgba.slice(),s=i.pop();return t&&i.push(~~(255*s)),"#"+e.map(i,function(e){return e=(e||0).toString(16),1===e.length?"0"+e:e}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,u.hsla.to=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t,i,s=e[0]/255,n=e[1]/255,a=e[2]/255,o=e[3],r=Math.max(s,n,a),h=Math.min(s,n,a),l=r-h,u=r+h,d=.5*u;return t=h===r?0:s===r?60*(n-a)/l+360:n===r?60*(a-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=d?l/u:l/(2-u),[Math.round(t)%360,i,d,null==o?1:o]},u.hsla.from=function(e){if(null==e[0]||null==e[1]||null==e[2])return[null,null,null,e[3]];var t=e[0]/360,i=e[1],s=e[2],a=e[3],o=.5>=s?s*(1+i):s+i-s*i,r=2*s-o;return[Math.round(255*n(r,o,t+1/3)),Math.round(255*n(r,o,t)),Math.round(255*n(r,o,t-1/3)),a]},f(u,function(s,n){var a=n.props,o=n.cache,h=n.to,u=n.from;l.fn[s]=function(s){if(h&&!this[o]&&(this[o]=h(this._rgba)),s===t)return this[o].slice();var n,r=e.type(s),d="array"===r||"object"===r?s:arguments,c=this[o].slice();return f(a,function(e,t){var s=d["object"===r?e:t.idx];null==s&&(s=c[t.idx]),c[t.idx]=i(s,t)}),u?(n=l(u(c)),n[o]=c,n):l(c)},f(a,function(t,i){l.fn[t]||(l.fn[t]=function(n){var a,o=e.type(n),h="alpha"===t?this._hsla?"hsla":"rgba":s,l=this[h](),u=l[i.idx];return"undefined"===o?u:("function"===o&&(n=n.call(this,u),o=e.type(n)),null==n&&i.empty?this:("string"===o&&(a=r.exec(n),a&&(n=u+parseFloat(a[2])*("+"===a[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(t){var i=t.split(" ");f(i,function(t,i){e.cssHooks[i]={set:function(t,n){var a,o,r="";if("transparent"!==n&&("string"!==e.type(n)||(a=s(n)))){if(n=l(a||n),!c.rgba&&1!==n._rgba[3]){for(o="backgroundColor"===i?t.parentNode:t;(""===r||"transparent"===r)&&o&&o.style;)try{r=e.css(o,"backgroundColor"),o=o.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{t.style[i]=n}catch(h){}}},e.fx.step[i]=function(t){t.colorInit||(t.start=l(t.elem,i),t.end=l(t.end),t.colorInit=!0),e.cssHooks[i].set(t.elem,t.start.transition(t.end,t.pos))}})},l.hook(o),e.cssHooks.borderColor={expand:function(e){var t={};return f(["Top","Right","Bottom","Left"],function(i,s){t["border"+s+"Color"]=e}),t}},a=e.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(b),function(){function t(t){var i,s,n=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,a={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(a[e.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(a[i]=n[i]);return a}function i(t,i){var s,a,o={};for(s in i)a=i[s],t[s]!==a&&(n[s]||(e.fx.step[s]||!isNaN(parseFloat(a)))&&(o[s]=a));return o}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};e.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,i){e.fx.step[i]=function(e){("none"!==e.end&&!e.setAttr||1===e.pos&&!e.setAttr)&&(b.style(e.elem,i,e.end),e.setAttr=!0)}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e.effects.animateClass=function(n,a,o,r){var h=e.speed(a,o,r);return this.queue(function(){var a,o=e(this),r=o.attr("class")||"",l=h.children?o.find("*").addBack():o;l=l.map(function(){var i=e(this);return{el:i,start:t(this)}}),a=function(){e.each(s,function(e,t){n[t]&&o[t+"Class"](n[t])})},a(),l=l.map(function(){return this.end=t(this.el[0]),this.diff=i(this.start,this.end),this}),o.attr("class",r),l=l.map(function(){var t=this,i=e.Deferred(),s=e.extend({},h,{queue:!1,complete:function(){i.resolve(t)}});return this.el.animate(this.diff,s),i.promise()}),e.when.apply(e,l.get()).done(function(){a(),e.each(arguments,function(){var t=this.el;e.each(this.diff,function(e){t.css(e,"")})}),h.complete.call(o[0])})})},e.fn.extend({addClass:function(t){return function(i,s,n,a){return s?e.effects.animateClass.call(this,{add:i},s,n,a):t.apply(this,arguments)}}(e.fn.addClass),removeClass:function(t){return function(i,s,n,a){return arguments.length>1?e.effects.animateClass.call(this,{remove:i},s,n,a):t.apply(this,arguments)}}(e.fn.removeClass),toggleClass:function(t){return function(i,s,n,a,o){return"boolean"==typeof s||void 0===s?n?e.effects.animateClass.call(this,s?{add:i}:{remove:i},n,a,o):t.apply(this,arguments):e.effects.animateClass.call(this,{toggle:i},s,n,a)}}(e.fn.toggleClass),switchClass:function(t,i,s,n,a){return e.effects.animateClass.call(this,{add:i,remove:t},s,n,a)}})}(),function(){function t(t,i,s,n){return e.isPlainObject(t)&&(i=t,t=t.effect),t={effect:t},null==i&&(i={}),e.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||e.fx.speeds[i])&&(n=s,s=i,i={}),e.isFunction(s)&&(n=s,s=null),i&&e.extend(t,i),s=s||i.duration,t.duration=e.fx.off?0:"number"==typeof s?s:s in e.fx.speeds?e.fx.speeds[s]:e.fx.speeds._default,t.complete=n||i.complete,t}function i(t){return!t||"number"==typeof t||e.fx.speeds[t]?!0:"string"!=typeof t||e.effects.effect[t]?e.isFunction(t)?!0:"object"!=typeof t||t.effect?!1:!0:!0}e.extend(e.effects,{version:"1.11.2",save:function(e,t){for(var i=0;t.length>i;i++)null!==t[i]&&e.data(y+t[i],e[0].style[t[i]])},restore:function(e,t){var i,s;for(s=0;t.length>s;s++)null!==t[s]&&(i=e.data(y+t[s]),void 0===i&&(i=""),e.css(t[s],i))},setMode:function(e,t){return"toggle"===t&&(t=e.is(":hidden")?"show":"hide"),t},getBaseline:function(e,t){var i,s;switch(e[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=e[0]/t.height}switch(e[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=e[1]/t.width}return{x:s,y:i}},createWrapper:function(t){if(t.parent().is(".ui-effects-wrapper"))return t.parent();var i={width:t.outerWidth(!0),height:t.outerHeight(!0),"float":t.css("float")},s=e("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:t.width(),height:t.height()},a=document.activeElement;try{a.id}catch(o){a=document.body}return t.wrap(s),(t[0]===a||e.contains(t[0],a))&&e(a).focus(),s=t.parent(),"static"===t.css("position")?(s.css({position:"relative"}),t.css({position:"relative"})):(e.extend(i,{position:t.css("position"),zIndex:t.css("z-index")}),e.each(["top","left","bottom","right"],function(e,s){i[s]=t.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),t.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),t.css(n),s.css(i).show()},removeWrapper:function(t){var i=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),(t[0]===i||e.contains(t[0],i))&&e(i).focus()),t},setTransition:function(t,i,s,n){return n=n||{},e.each(i,function(e,i){var a=t.cssUnit(i);a[0]>0&&(n[i]=a[0]*s+a[1])}),n}}),e.fn.extend({effect:function(){function i(t){function i(){e.isFunction(a)&&a.call(n[0]),e.isFunction(t)&&t()}var n=e(this),a=s.complete,r=s.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),i()):o.call(n[0],s,i)}var s=t.apply(this,arguments),n=s.mode,a=s.queue,o=e.effects.effect[s.effect];return e.fx.off||!o?n?this[n](s.duration,s.complete):this.each(function(){s.complete&&s.complete.call(this)}):a===!1?this.each(i):this.queue(a||"fx",i)},show:function(e){return function(s){if(i(s))return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(e.fn.show),hide:function(e){return function(s){if(i(s))return e.apply(this,arguments);
+var n=t.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(e.fn.hide),toggle:function(e){return function(s){if(i(s)||"boolean"==typeof s)return e.apply(this,arguments);var n=t.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(e.fn.toggle),cssUnit:function(t){var i=this.css(t),s=[];return e.each(["em","px","%","pt"],function(e,t){i.indexOf(t)>0&&(s=[parseFloat(i),t])}),s}})}(),function(){var t={};e.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,i){t[i]=function(t){return Math.pow(t,e+2)}}),e.extend(t,{Sine:function(e){return 1-Math.cos(e*Math.PI/2)},Circ:function(e){return 1-Math.sqrt(1-e*e)},Elastic:function(e){return 0===e||1===e?e:-Math.pow(2,8*(e-1))*Math.sin((80*(e-1)-7.5)*Math.PI/15)},Back:function(e){return e*e*(3*e-2)},Bounce:function(e){for(var t,i=4;((t=Math.pow(2,--i))-1)/11>e;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*t-2)/22-e,2)}}),e.each(t,function(t,i){e.easing["easeIn"+t]=i,e.easing["easeOut"+t]=function(e){return 1-i(1-e)},e.easing["easeInOut"+t]=function(e){return.5>e?i(2*e)/2:1-i(-2*e+2)/2}})}(),e.effects,e.effects.effect.blind=function(t,i){var s,n,a,o=e(this),r=/up|down|vertical/,h=/up|left|vertical|horizontal/,l=["position","top","bottom","left","right","height","width"],u=e.effects.setMode(o,t.mode||"hide"),d=t.direction||"up",c=r.test(d),p=c?"height":"width",f=c?"top":"left",m=h.test(d),g={},v="show"===u;o.parent().is(".ui-effects-wrapper")?e.effects.save(o.parent(),l):e.effects.save(o,l),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n=s[p](),a=parseFloat(s.css(f))||0,g[p]=v?n:0,m||(o.css(c?"bottom":"right",0).css(c?"top":"left","auto").css({position:"absolute"}),g[f]=v?a:n+a),v&&(s.css(p,0),m||s.css(f,a+n)),s.animate(g,{duration:t.duration,easing:t.easing,queue:!1,complete:function(){"hide"===u&&o.hide(),e.effects.restore(o,l),e.effects.removeWrapper(o),i()}})},e.effects.effect.bounce=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"effect"),l="hide"===h,u="show"===h,d=t.direction||"up",c=t.distance,p=t.times||5,f=2*p+(u||l?1:0),m=t.duration/f,g=t.easing,v="up"===d||"down"===d?"top":"left",y="up"===d||"left"===d,b=o.queue(),_=b.length;for((u||l)&&r.push("opacity"),e.effects.save(o,r),o.show(),e.effects.createWrapper(o),c||(c=o["top"===v?"outerHeight":"outerWidth"]()/3),u&&(a={opacity:1},a[v]=0,o.css("opacity",0).css(v,y?2*-c:2*c).animate(a,m,g)),l&&(c/=Math.pow(2,p-1)),a={},a[v]=0,s=0;p>s;s++)n={},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g).animate(a,m,g),c=l?2*c:c/2;l&&(n={opacity:0},n[v]=(y?"-=":"+=")+c,o.animate(n,m,g)),o.queue(function(){l&&o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}),_>1&&b.splice.apply(b,[1,0].concat(b.splice(_,f+1))),o.dequeue()},e.effects.effect.clip=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","height","width"],h=e.effects.setMode(o,t.mode||"hide"),l="show"===h,u=t.direction||"vertical",d="vertical"===u,c=d?"height":"width",p=d?"top":"left",f={};e.effects.save(o,r),o.show(),s=e.effects.createWrapper(o).css({overflow:"hidden"}),n="IMG"===o[0].tagName?s:o,a=n[c](),l&&(n.css(c,0),n.css(p,a/2)),f[c]=l?a:0,f[p]=l?0:a/2,n.animate(f,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){l||o.hide(),e.effects.restore(o,r),e.effects.removeWrapper(o),i()}})},e.effects.effect.drop=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","opacity","height","width"],o=e.effects.setMode(n,t.mode||"hide"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h?"pos":"neg",d={opacity:r?1:0};e.effects.save(n,a),n.show(),e.effects.createWrapper(n),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===u?-s:s),d[l]=(r?"pos"===u?"+=":"-=":"pos"===u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.explode=function(t,i){function s(){b.push(this),b.length===d*c&&n()}function n(){p.css({visibility:"visible"}),e(b).remove(),m||p.hide(),i()}var a,o,r,h,l,u,d=t.pieces?Math.round(Math.sqrt(t.pieces)):3,c=d,p=e(this),f=e.effects.setMode(p,t.mode||"hide"),m="show"===f,g=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/c),y=Math.ceil(p.outerHeight()/d),b=[];for(a=0;d>a;a++)for(h=g.top+a*y,u=a-(d-1)/2,o=0;c>o;o++)r=g.left+o*v,l=o-(c-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-o*v,top:-a*y}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:y,left:r+(m?l*v:0),top:h+(m?u*y:0),opacity:m?0:1}).animate({left:r+(m?0:l*v),top:h+(m?0:u*y),opacity:m?1:0},t.duration||500,t.easing,s)},e.effects.effect.fade=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:t.duration,easing:t.easing,complete:i})},e.effects.effect.fold=function(t,i){var s,n,a=e(this),o=["position","top","bottom","left","right","height","width"],r=e.effects.setMode(a,t.mode||"hide"),h="show"===r,l="hide"===r,u=t.size||15,d=/([0-9]+)%/.exec(u),c=!!t.horizFirst,p=h!==c,f=p?["width","height"]:["height","width"],m=t.duration/2,g={},v={};e.effects.save(a,o),a.show(),s=e.effects.createWrapper(a).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],d&&(u=parseInt(d[1],10)/100*n[l?0:1]),h&&s.css(c?{height:0,width:u}:{height:u,width:0}),g[f[0]]=h?n[0]:u,v[f[1]]=h?n[1]:0,s.animate(g,m,t.easing).animate(v,m,t.easing,function(){l&&a.hide(),e.effects.restore(a,o),e.effects.removeWrapper(a),i()})},e.effects.effect.highlight=function(t,i){var s=e(this),n=["backgroundImage","backgroundColor","opacity"],a=e.effects.setMode(s,t.mode||"show"),o={backgroundColor:s.css("backgroundColor")};"hide"===a&&(o.opacity=0),e.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(o,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===a&&s.hide(),e.effects.restore(s,n),i()}})},e.effects.effect.size=function(t,i){var s,n,a,o=e(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],u=["fontSize"],d=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],c=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=e.effects.setMode(o,t.mode||"effect"),f=t.restore||"effect"!==p,m=t.scale||"both",g=t.origin||["middle","center"],v=o.css("position"),y=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&o.show(),s={height:o.height(),width:o.width(),outerHeight:o.outerHeight(),outerWidth:o.outerWidth()},"toggle"===t.mode&&"show"===p?(o.from=t.to||b,o.to=t.from||s):(o.from=t.from||("show"===p?b:s),o.to=t.to||("hide"===p?b:s)),a={from:{y:o.from.height/s.height,x:o.from.width/s.width},to:{y:o.to.height/s.height,x:o.to.width/s.width}},("box"===m||"both"===m)&&(a.from.y!==a.to.y&&(y=y.concat(d),o.from=e.effects.setTransition(o,d,a.from.y,o.from),o.to=e.effects.setTransition(o,d,a.to.y,o.to)),a.from.x!==a.to.x&&(y=y.concat(c),o.from=e.effects.setTransition(o,c,a.from.x,o.from),o.to=e.effects.setTransition(o,c,a.to.x,o.to))),("content"===m||"both"===m)&&a.from.y!==a.to.y&&(y=y.concat(u).concat(l),o.from=e.effects.setTransition(o,u,a.from.y,o.from),o.to=e.effects.setTransition(o,u,a.to.y,o.to)),e.effects.save(o,y),o.show(),e.effects.createWrapper(o),o.css("overflow","hidden").css(o.from),g&&(n=e.effects.getBaseline(g,s),o.from.top=(s.outerHeight-o.outerHeight())*n.y,o.from.left=(s.outerWidth-o.outerWidth())*n.x,o.to.top=(s.outerHeight-o.to.outerHeight)*n.y,o.to.left=(s.outerWidth-o.to.outerWidth)*n.x),o.css(o.from),("content"===m||"both"===m)&&(d=d.concat(["marginTop","marginBottom"]).concat(u),c=c.concat(["marginLeft","marginRight"]),l=r.concat(d).concat(c),o.find("*[width]").each(function(){var i=e(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&e.effects.save(i,l),i.from={height:s.height*a.from.y,width:s.width*a.from.x,outerHeight:s.outerHeight*a.from.y,outerWidth:s.outerWidth*a.from.x},i.to={height:s.height*a.to.y,width:s.width*a.to.x,outerHeight:s.height*a.to.y,outerWidth:s.width*a.to.x},a.from.y!==a.to.y&&(i.from=e.effects.setTransition(i,d,a.from.y,i.from),i.to=e.effects.setTransition(i,d,a.to.y,i.to)),a.from.x!==a.to.x&&(i.from=e.effects.setTransition(i,c,a.from.x,i.from),i.to=e.effects.setTransition(i,c,a.to.x,i.to)),i.css(i.from),i.animate(i.to,t.duration,t.easing,function(){f&&e.effects.restore(i,l)})})),o.animate(o.to,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){0===o.to.opacity&&o.css("opacity",o.from.opacity),"hide"===p&&o.hide(),e.effects.restore(o,y),f||("static"===v?o.css({position:"relative",top:o.to.top,left:o.to.left}):e.each(["top","left"],function(e,t){o.css(t,function(t,i){var s=parseInt(i,10),n=e?o.to.left:o.to.top;return"auto"===i?n+"px":s+n+"px"})})),e.effects.removeWrapper(o),i()}})},e.effects.effect.scale=function(t,i){var s=e(this),n=e.extend(!0,{},t),a=e.effects.setMode(s,t.mode||"effect"),o=parseInt(t.percent,10)||(0===parseInt(t.percent,10)?0:"hide"===a?0:100),r=t.direction||"both",h=t.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},u={y:"horizontal"!==r?o/100:1,x:"vertical"!==r?o/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==a&&(n.origin=h||["middle","center"],n.restore=!0),n.from=t.from||("show"===a?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*u.y,width:l.width*u.x,outerHeight:l.outerHeight*u.y,outerWidth:l.outerWidth*u.x},n.fade&&("show"===a&&(n.from.opacity=0,n.to.opacity=1),"hide"===a&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},e.effects.effect.puff=function(t,i){var s=e(this),n=e.effects.setMode(s,t.mode||"hide"),a="hide"===n,o=parseInt(t.percent,10)||150,r=o/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};e.extend(t,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:a?o:100,from:a?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(t)},e.effects.effect.pulsate=function(t,i){var s,n=e(this),a=e.effects.setMode(n,t.mode||"show"),o="show"===a,r="hide"===a,h=o||"hide"===a,l=2*(t.times||5)+(h?1:0),u=t.duration/l,d=0,c=n.queue(),p=c.length;for((o||!n.is(":visible"))&&(n.css("opacity",0).show(),d=1),s=1;l>s;s++)n.animate({opacity:d},u,t.easing),d=1-d;n.animate({opacity:d},u,t.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&c.splice.apply(c,[1,0].concat(c.splice(p,l+1))),n.dequeue()},e.effects.effect.shake=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","height","width"],o=e.effects.setMode(n,t.mode||"effect"),r=t.direction||"left",h=t.distance||20,l=t.times||3,u=2*l+1,d=Math.round(t.duration/u),c="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},m={},g={},v=n.queue(),y=v.length;for(e.effects.save(n,a),n.show(),e.effects.createWrapper(n),f[c]=(p?"-=":"+=")+h,m[c]=(p?"+=":"-=")+2*h,g[c]=(p?"-=":"+=")+2*h,n.animate(f,d,t.easing),s=1;l>s;s++)n.animate(m,d,t.easing).animate(g,d,t.easing);n.animate(m,d,t.easing).animate(f,d/2,t.easing).queue(function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}),y>1&&v.splice.apply(v,[1,0].concat(v.splice(y,u+1))),n.dequeue()},e.effects.effect.slide=function(t,i){var s,n=e(this),a=["position","top","bottom","left","right","width","height"],o=e.effects.setMode(n,t.mode||"show"),r="show"===o,h=t.direction||"left",l="up"===h||"down"===h?"top":"left",u="up"===h||"left"===h,d={};e.effects.save(n,a),n.show(),s=t.distance||n["top"===l?"outerHeight":"outerWidth"](!0),e.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,u?isNaN(s)?"-"+s:-s:s),d[l]=(r?u?"+=":"-=":u?"-=":"+=")+s,n.animate(d,{queue:!1,duration:t.duration,easing:t.easing,complete:function(){"hide"===o&&n.hide(),e.effects.restore(n,a),e.effects.removeWrapper(n),i()}})},e.effects.effect.transfer=function(t,i){var s=e(this),n=e(t.to),a="fixed"===n.css("position"),o=e("body"),r=a?o.scrollTop():0,h=a?o.scrollLeft():0,l=n.offset(),u={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},d=s.offset(),c=e("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(t.className).css({top:d.top-r,left:d.left-h,height:s.innerHeight(),width:s.innerWidth(),position:a?"fixed":"absolute"}).animate(u,t.duration,t.easing,function(){c.remove(),i()})}});
\ No newline at end of file
diff --git a/js/jquery/ui/jquery-ui-structure-min.css b/js/jquery/ui/jquery-ui-structure-min.css
new file mode 100644
index 0000000000..76291b37b2
--- /dev/null
+++ b/js/jquery/ui/jquery-ui-structure-min.css
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.11.2 - 2014-11-09
+* http://jqueryui.com
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;min-height:0;font-size:100%}.ui-accordion .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-icons .ui-accordion-icons{padding-left:2.2em}.ui-accordion .ui-accordion-header .ui-accordion-header-icon{position:absolute;left:.5em;top:50%;margin-top:-8px}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-button{display:inline-block;position:relative;padding:0;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2.2em}button.ui-button-icon-only{width:2.4em}.ui-button-icons-only{width:3.4em}button.ui-button-icons-only{width:3.7em}.ui-button .ui-button-text{display:block;line-height:normal}.ui-button-text-only .ui-button-text{padding:.4em 1em}.ui-button-icon-only .ui-button-text,.ui-button-icons-only .ui-button-text{padding:.4em;text-indent:-9999999px}.ui-button-text-icon-primary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 1em .4em 2.1em}.ui-button-text-icon-secondary .ui-button-text,.ui-button-text-icons .ui-button-text{padding:.4em 2.1em .4em 1em}.ui-button-text-icons .ui-button-text{padding-left:2.1em;padding-right:2.1em}input.ui-button{padding:.4em 1em}.ui-button-icon-only .ui-icon,.ui-button-text-icon-primary .ui-icon,.ui-button-text-icon-secondary .ui-icon,.ui-button-text-icons .ui-icon,.ui-button-icons-only .ui-icon{position:absolute;top:50%;margin-top:-8px}.ui-button-icon-only .ui-icon{left:50%;margin-left:-8px}.ui-button-text-icon-primary .ui-button-icon-primary,.ui-button-text-icons .ui-button-icon-primary,.ui-button-icons-only .ui-button-icon-primary{left:.5em}.ui-button-text-icon-secondary .ui-button-icon-secondary,.ui-button-text-icons .ui-button-icon-secondary,.ui-button-icons-only .ui-button-icon-secondary{right:.5em}.ui-buttonset{margin-right:7px}.ui-buttonset .ui-button{margin-left:0;margin-right:-.3em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-dialog{overflow:hidden;position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:none}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{position:relative;margin:0;padding:3px 1em 3px .4em;cursor:pointer;min-height:0;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-button{display:inline-block;overflow:hidden;position:relative;text-decoration:none;cursor:pointer}.ui-selectmenu-button span.ui-icon{right:0.5em;left:auto;margin-top:-8px;position:absolute;top:50%}.ui-selectmenu-button span.ui-selectmenu-text{text-align:left;padding:0.4em 2.1em 0.4em 1em;display:block;line-height:1.4;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:22px}.ui-spinner-button{width:16px;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top:none;border-bottom:none;border-right:none}.ui-spinner .ui-icon{position:absolute;margin-top:-8px;top:50%;left:0}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-spinner .ui-icon-triangle-1-s{background-position:-65px -16px}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px;-webkit-box-shadow:0 0 5px #aaa;box-shadow:0 0 5px #aaa}body .ui-tooltip{border-width:2px}
\ No newline at end of file
diff --git a/js/jquery/ui/jquery-ui-theme-min.css b/js/jquery/ui/jquery-ui-theme-min.css
new file mode 100644
index 0000000000..bd705fb71b
--- /dev/null
+++ b/js/jquery/ui/jquery-ui-theme-min.css
@@ -0,0 +1,5 @@
+/*! jQuery UI - v1.11.2 - 2014-11-11
+* http://jqueryui.com
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
+
+.ui-widget{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1.1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Trebuchet MS,Tahoma,Verdana,Arial,sans-serif;font-size:1em}.ui-widget-content{border:1px solid #ddd;background:#eee url("images/ui-bg_highlight-soft_100_eeeeee_1x100.png") 50% top repeat-x;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #e78f08;background:#f6a828 url("images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x;color:#fff;font-weight:bold}.ui-widget-header a{color:#fff}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default{border:1px solid #ccc;background:#f6f6f6 url("images/ui-bg_glass_100_f6f6f6_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#1c94c4}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited{color:#1c94c4;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus{border:1px solid #fbcb09;background:#fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#c77405}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited{color:#c77405;text-decoration:none}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active{border:1px solid #fbd850;background:#fff url("images/ui-bg_glass_65_ffffff_1x400.png") 50% 50% repeat-x;font-weight:bold;color:#eb8f00}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#eb8f00;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #fed22f;background:#ffe45c url("images/ui-bg_highlight-soft_75_ffe45c_1x100.png") 50% top repeat-x;color:#363636}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#363636}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #cd0a0a;background:#b81900 url("images/ui-bg_diagonals-thick_18_b81900_40x40.png") 50% 50% repeat;color:#fff}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#fff}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#fff}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_222222_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-default .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-active .ui-icon{background-image:url("images/ui-icons_ef8c08_256x240.png")}.ui-state-highlight .ui-icon{background-image:url("images/ui-icons_228ef1_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_ffd27a_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-carat-1-n{background-position:0 0}.ui-icon-carat-1-ne{background-position:-16px 0}.ui-icon-carat-1-e{background-position:-32px 0}.ui-icon-carat-1-se{background-position:-48px 0}.ui-icon-carat-1-s{background-position:-64px 0}.ui-icon-carat-1-sw{background-position:-80px 0}.ui-icon-carat-1-w{background-position:-96px 0}.ui-icon-carat-1-nw{background-position:-112px 0}.ui-icon-carat-2-n-s{background-position:-128px 0}.ui-icon-carat-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-64px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-64px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:0 -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:4px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:4px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:4px}.ui-widget-overlay{background:#666 url("images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;opacity:.5;filter:Alpha(Opacity=50)}.ui-widget-shadow{margin:-5px 0 0 -5px;padding:5px;background:#000 url("images/ui-bg_flat_10_000000_40x100.png") 50% 50% repeat-x;opacity:.2;filter:Alpha(Opacity=20);border-radius:5px}
\ No newline at end of file
diff --git a/js/productform.js b/js/productform.js
index d5e24d306c..0f669aa26c 100644
--- a/js/productform.js
+++ b/js/productform.js
@@ -10,16 +10,10 @@
 // collection of javascript arrays containing strings.
 
 /**
- * Reads the selected products and updates component, version and milestone
- * lists accordingly.
+ * Reads the selected products and updates the component list accordingly.
  *
  * @param  product    Select element that contains products.
- * @param  component  Select element that contains components. Can be null if
- *                    there is no such element to update.
- * @param  version    Select element that contains versions. Can be null if
- *                    there is no such element to update.
- * @param  milestone  Select element that contains milestones. Can be null if
- *                    there is no such element to update.
+ * @param  component  Select element that contains components.
  * @param  anyval     Value to use for a special "Any" list item. Can be null
  *                    to not use any. If used must and will be first item in
  *                    the select element.
@@ -27,21 +21,15 @@
  * @global cpts       Array of arrays, indexed by product name. The subarrays
  *                    contain a list of components to be fed to the respective
  *                    select element.
- * @global vers       Array of arrays, indexed by product name. The subarrays
- *                    contain a list of versions to be fed to the respective
- *                    select element.
- * @global tms        Array of arrays, indexed by product name. The subarrays
- *                    contain a list of milestones to be fed to the respective
- *                    select element.
  * @global first_load Boolean; true if this is the first time this page loads
  *                    or false if not.
  * @global last_sel   Array that contains last list of products so we know what
  *                    has changed, and optimize for additions.
  */
-function selectProduct(product, component, version, milestone, anyval) {
+function selectProduct(product, component, anyval) {
     // This is to avoid handling events that occur before the form
     // itself is ready, which could happen in buggy browsers.
-    if (!product)
+    if (!product || !component)
         return;
 
     // Do nothing if no products are defined. This is to avoid the
@@ -78,15 +66,8 @@ function selectProduct(product, component, version, milestone, anyval) {
     var findall = (product.selectedIndex == -1
                    || (anyval != null && product.options[0].selected));
 
-    if (useclassification) {
-        // Update index based on the complete product array.
-        sel = get_selection(product, findall, true, anyval);
-        for (var i=0; i<sel.length; i++)
-           sel[i] = prods[sel[i]];
-    }
-    else {
-        sel = get_selection(product, findall, false, anyval);
-    }
+    sel = get_selection(product, findall, false, anyval);
+
     if (!findall) {
         // Save sel for the next invocation of selectProduct().
         var tmp = sel;
@@ -103,23 +84,9 @@ function selectProduct(product, component, version, milestone, anyval) {
     }
 
     // Do the actual fill/update.
-    if (component) {
-        var saved_cpts = get_selection(component, false, true, null);
-        updateSelect(cpts, sel, component, merging, anyval);
-        restoreSelection(component, saved_cpts);
-    }
-
-    if (version) {
-        var saved_vers = get_selection(version, false, true, null);
-        updateSelect(vers, sel, version, merging, anyval);
-        restoreSelection(version, saved_vers);
-    }
-
-    if (milestone) {
-        var saved_tms = get_selection(milestone, false, true, null);
-        updateSelect(tms, sel, milestone, merging, anyval);
-        restoreSelection(milestone, saved_tms);
-    }
+    var saved_cpts = get_selection(component, false, true, null);
+    updateSelect(cpts, sel, component, merging, anyval);
+    restoreSelection(component, saved_cpts);
 }
 
 /**
diff --git a/jsonrpc.cgi b/jsonrpc.cgi
index 2c93585b09..3d5ac67a23 100755
--- a/jsonrpc.cgi
+++ b/jsonrpc.cgi
@@ -6,20 +6,21 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::WebService::Constants;
+
 BEGIN {
-    if (!Bugzilla->feature('jsonrpc')) {
-        ThrowUserError('feature_disabled', { feature => 'jsonrpc' });
-    }
+  if (!Bugzilla->feature('jsonrpc')) {
+    ThrowUserError('feature_disabled', {feature => 'jsonrpc'});
+  }
 }
 use Bugzilla::WebService::Server::JSONRPC;
 
diff --git a/migrate.pl b/migrate.pl
index eb2a84b59b..a89409e157 100755
--- a/migrate.pl
+++ b/migrate.pl
@@ -6,13 +6,13 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use File::Basename;
 BEGIN { chdir dirname($0); }
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 use Bugzilla;
 use Bugzilla::Migrate;
 
@@ -25,7 +25,7 @@
 # Print the help message if that switch was selected or if --from
 # wasn't specified.
 if (!$switch{'from'} or $switch{'help'}) {
-    pod2usage({-exitval => 1});
+  pod2usage({-exitval => 1});
 }
 
 my $migrator = Bugzilla::Migrate->load($switch{'from'});
@@ -37,13 +37,13 @@
 # Even if there's an error, we want to be sure that the serial values
 # get reset properly.
 END {
-    if ($migrator and $migrator->dry_run) {
-        my $dbh = Bugzilla->dbh;
-        if ($dbh->bz_in_transaction) {
-            $dbh->bz_rollback_transaction();
-        }
-        $migrator->reset_serial_values();
+  if ($migrator and $migrator->dry_run) {
+    my $dbh = Bugzilla->dbh;
+    if ($dbh->bz_in_transaction) {
+      $dbh->bz_rollback_transaction();
     }
+    $migrator->reset_serial_values();
+  }
 }
 
 __END__
@@ -95,5 +95,5 @@ =head1 DESCRIPTION
 
 You may also need to increase the number of file handles a process is allowed
 to hold open (as the migrator will create a file handle for each attachment
-in your database). On Linux and simliar systems, you can do this as root
+in your database). On Linux and similar systems, you can do this as root
 by typing C<ulimit -n 65535> before running your script.
diff --git a/mod_perl.pl b/mod_perl.pl
index bdce744ca1..6f843028ea 100644
--- a/mod_perl.pl
+++ b/mod_perl.pl
@@ -8,16 +8,26 @@
 
 package Bugzilla::ModPerl;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 # This sets up our libpath without having to specify it in the mod_perl
 # configuration.
 use File::Basename;
-use lib dirname(__FILE__);
+use File::Spec;
+
+BEGIN {
+  require lib;
+  my $dir = dirname(__FILE__);
+  lib->import(
+    $dir,
+    File::Spec->catdir($dir, "lib"),
+    File::Spec->catdir($dir, qw(local lib perl5))
+  );
+}
+
 use Bugzilla::Constants ();
-use lib Bugzilla::Constants::bz_locations()->{'ext_libpath'};
 
 # If you have an Apache2::Status handler in your Apache configuration,
 # you need to load Apache2::Status *here*, so that any later-loaded modules
@@ -31,18 +41,19 @@ package Bugzilla::ModPerl;
 use Apache2::Log ();
 use Apache2::ServerUtil;
 use ModPerl::RegistryLoader ();
-use File::Basename ();
-use DateTime ();
+use File::Basename          ();
+use DateTime                ();
 
 # This loads most of our modules.
 use Bugzilla ();
+
 # Loading Bugzilla.pm doesn't load this, though, and we want it preloaded.
-use Bugzilla::BugMail ();
-use Bugzilla::CGI ();
-use Bugzilla::Extension ();
+use Bugzilla::BugMail               ();
+use Bugzilla::CGI                   ();
+use Bugzilla::Extension             ();
 use Bugzilla::Install::Requirements ();
-use Bugzilla::Util ();
-use Bugzilla::RNG ();
+use Bugzilla::Util                  ();
+use Bugzilla::RNG                   ();
 
 # Make warnings go to the virtual host's log and not the main
 # server log.
@@ -52,16 +63,18 @@ package Bugzilla::ModPerl;
 Bugzilla::CGI->compile(qw(:cgi :push));
 
 use Apache2::SizeLimit;
+
 # This means that every httpd child will die after processing
 # a CGI if it is taking up more than 45MB of RAM all by itself,
 # not counting RAM it is sharing with the other httpd processes.
-Apache2::SizeLimit->set_max_unshared_size(45_000);
+Apache2::SizeLimit->set_max_unshared_size(
+  Bugzilla->localconfig->{apache_size_limit});
 
 my $cgi_path = Bugzilla::Constants::bz_locations()->{'cgi_path'};
 
 # Set up the configuration for the web server
 my $server = Apache2::ServerUtil->server;
-my $conf = <<EOT;
+my $conf   = <<EOT;
 # Make sure each httpd child receives a different random seed (bug 476622).
 # Bugzilla::RNG has one srand that needs to be called for
 # every process, and Perl has another. (Various Perl modules still use
@@ -75,7 +88,7 @@ package Bugzilla::ModPerl;
     PerlCleanupHandler  Apache2::SizeLimit Bugzilla::ModPerl::CleanupHandler
     PerlOptions +ParseHeaders
     Options +ExecCGI
-    AllowOverride Limit FileInfo Indexes Options
+    AllowOverride All
     DirectoryIndex index.cgi index.html
 </Directory>
 EOT
@@ -87,7 +100,8 @@ package Bugzilla::ModPerl;
 
 # Have ModPerl::RegistryLoader pre-compile all CGI scripts.
 my $rl = new ModPerl::RegistryLoader();
-# If we try to do this in "new" it fails because it looks for a 
+
+# If we try to do this in "new" it fails because it looks for a
 # Bugzilla/ModPerl/ResponseHandler.pm
 $rl->{package} = 'Bugzilla::ModPerl::ResponseHandler';
 my $feature_files = Bugzilla::Install::Requirements::map_files_to_features();
@@ -96,21 +110,21 @@ package Bugzilla::ModPerl;
 # This is important to prevent the current directory from getting into
 # @INC and messing things up. (See bug 630750.)
 no warnings 'redefine';
-local *lib::import = sub {};
+local *lib::import = sub { };
 use warnings;
 
 foreach my $file (glob "$cgi_path/*.cgi") {
-    my $base_filename = File::Basename::basename($file);
-    if (my $feature = $feature_files->{$base_filename}) {
-        next if !Bugzilla->feature($feature);
-    }
-    Bugzilla::Util::trick_taint($file);
-    $rl->handler($file, $file);
+  my $base_filename = File::Basename::basename($file);
+  if (my $feature = $feature_files->{$base_filename}) {
+    next if !Bugzilla->feature($feature);
+  }
+  Bugzilla::Util::trick_taint($file);
+  $rl->handler($file, $file);
 }
 
 package Bugzilla::ModPerl::ResponseHandler;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -119,51 +133,51 @@ package Bugzilla::ModPerl::ResponseHandler;
 use Bugzilla::Constants qw(USAGE_MODE_REST);
 
 sub handler : method {
-    my $class = shift;
-
-    # $0 is broken under mod_perl before 2.0.2, so we have to set it
-    # here explicitly or init_page's shutdownhtml code won't work right.
-    $0 = $ENV{'SCRIPT_FILENAME'};
-
-    # Prevent "use lib" from modifying @INC in the case where a .cgi file
-    # is being automatically recompiled by mod_perl when Apache is
-    # running. (This happens if a file changes while Apache is already
-    # running.)
-    no warnings 'redefine';
-    local *lib::import = sub {};
-    use warnings;
-
-    Bugzilla::init_page();
-    my $result = $class->SUPER::handler(@_);
-
-    # When returning data from the REST api we must only return 200 or 304,
-    # which tells Apache not to append its error html documents to the
-    # response.
-    return Bugzilla->usage_mode == USAGE_MODE_REST && $result != 304
-           ? Apache2::Const::OK
-           : $result;
+  my $class = shift;
+
+  # $0 is broken under mod_perl before 2.0.2, so we have to set it
+  # here explicitly or init_page's shutdownhtml code won't work right.
+  $0 = $ENV{'SCRIPT_FILENAME'};
+
+  # Prevent "use lib" from modifying @INC in the case where a .cgi file
+  # is being automatically recompiled by mod_perl when Apache is
+  # running. (This happens if a file changes while Apache is already
+  # running.)
+  no warnings 'redefine';
+  local *lib::import = sub { };
+  use warnings;
+
+  Bugzilla::init_page();
+  my $result = $class->SUPER::handler(@_);
+
+  # When returning data from the REST api we must only return 200 or 304,
+  # which tells Apache not to append its error html documents to the
+  # response.
+  return Bugzilla->usage_mode == USAGE_MODE_REST
+    && $result != 304 ? Apache2::Const::OK : $result;
 }
 
 
 package Bugzilla::ModPerl::CleanupHandler;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use Apache2::Const -compile => qw(OK);
 
 sub handler {
-    my $r = shift;
+  my $r = shift;
+
+  Bugzilla::_cleanup();
 
-    Bugzilla::_cleanup();
-    # Sometimes mod_perl doesn't properly call DESTROY on all
-    # the objects in pnotes()
-    foreach my $key (keys %{$r->pnotes}) {
-        delete $r->pnotes->{$key};
-    }
+  # Sometimes mod_perl doesn't properly call DESTROY on all
+  # the objects in pnotes()
+  foreach my $key (keys %{$r->pnotes}) {
+    delete $r->pnotes->{$key};
+  }
 
-    return Apache2::Const::OK;
+  return Apache2::Const::OK;
 }
 
 1;
diff --git a/page.cgi b/page.cgi
index b60ce8bdee..67b67f99df 100755
--- a/page.cgi
+++ b/page.cgi
@@ -13,11 +13,11 @@
 # a content-type, e.g. html.
 ###############################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Error;
@@ -30,16 +30,17 @@ use Bugzilla::Search::Quicksearch;
 
 # For quicksearch.html.
 sub quicksearch_field_names {
-    my $fields = Bugzilla::Search::Quicksearch->FIELD_MAP;
-    my %fields_reverse;
-    # Put longer names before shorter names.
-    my @nicknames = sort { length($b) <=> length($a) } (keys %$fields);
-    foreach my $nickname (@nicknames) {
-        my $db_field = $fields->{$nickname};
-        $fields_reverse{$db_field} ||= [];
-        push(@{ $fields_reverse{$db_field} }, $nickname);
-    }
-    return \%fields_reverse;
+  my $fields = Bugzilla::Search::Quicksearch->FIELD_MAP;
+  my %fields_reverse;
+
+  # Put longer names before shorter names.
+  my @nicknames = sort { length($b) <=> length($a) } (keys %$fields);
+  foreach my $nickname (@nicknames) {
+    my $db_field = $fields->{$nickname};
+    $fields_reverse{$db_field} ||= [];
+    push(@{$fields_reverse{$db_field}}, $nickname);
+  }
+  return \%fields_reverse;
 }
 
 ###############
@@ -48,38 +49,40 @@ sub quicksearch_field_names {
 
 Bugzilla->login();
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
 
 my $id = $cgi->param('id');
 if ($id) {
-    # Be careful not to allow directory traversal.
-    if ($id =~ /\.\./) {
-        # two dots in a row is bad
-        ThrowUserError("bad_page_cgi_id", { "page_id" => $id });
-    }
-    # Split into name and ctype.
-    $id =~ /^([\w\-\/\.]+)\.(\w+)$/;
-    if (!$2) {
-        # if this regexp fails to match completely, something bad came in
-        ThrowUserError("bad_page_cgi_id", { "page_id" => $id });
-    }
-
-    my %vars = ( 
-      quicksearch_field_names => \&quicksearch_field_names,
-    );
-    Bugzilla::Hook::process('page_before_template', 
-                            { page_id => $id, vars => \%vars });
-
-    my $format = $template->get_format("pages/$1", undef, $2);
-    
-    $cgi->param('id', $id);
-
-    print $cgi->header($format->{'ctype'});
-
-    $template->process("$format->{'template'}", \%vars)
-      || ThrowTemplateError($template->error());
+
+  # Be careful not to allow directory traversal.
+  if ($id =~ /\.\./) {
+
+    # two dots in a row is bad
+    ThrowUserError("bad_page_cgi_id", {"page_id" => $id});
+  }
+
+  # Split into name and ctype.
+  $id =~ /^([\w\-\/\.]+)\.(\w+)$/;
+  if (!$2) {
+
+    # if this regexp fails to match completely, something bad came in
+    ThrowUserError("bad_page_cgi_id", {"page_id" => $id});
+  }
+
+  my %vars = (quicksearch_field_names => \&quicksearch_field_names,);
+  Bugzilla::Hook::process('page_before_template',
+    {page_id => $id, vars => \%vars});
+
+  my $format = $template->get_format("pages/$1", undef, $2);
+
+  $cgi->param('id', $id);
+
+  print $cgi->header($format->{'ctype'});
+
+  $template->process("$format->{'template'}", \%vars)
+    || ThrowTemplateError($template->error());
 }
 else {
-    ThrowUserError("no_page_specified");
+  ThrowUserError("no_page_specified");
 }
diff --git a/post_bug.cgi b/post_bug.cgi
index 9da8faec15..e2771f0edb 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Attachment;
@@ -28,10 +28,10 @@ use List::MoreUtils qw(uniq);
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 ######################################################################
 # Main Script
@@ -39,51 +39,51 @@ my $vars = {};
 
 # redirect to enter_bug if no field is passed.
 unless ($cgi->param()) {
-    print $cgi->redirect(correct_urlbase() . 'enter_bug.cgi');
-    exit;
+  print $cgi->redirect(correct_urlbase() . 'enter_bug.cgi');
+  exit;
 }
 
 # Detect if the user already used the same form to submit a bug
-my $token = trim($cgi->param('token'));
+my $token = trim(scalar $cgi->param('token'));
 check_token_data($token, 'create_bug', 'index.cgi');
 
 # do a match on the fields if applicable
-Bugzilla::User::match_field ({
-    'cc'            => { 'type' => 'multi'  },
-    'assigned_to'   => { 'type' => 'single' },
-    'qa_contact'    => { 'type' => 'single' },
+Bugzilla::User::match_field({
+  'cc'          => {'type' => 'multi'},
+  'assigned_to' => {'type' => 'single'},
+  'qa_contact'  => {'type' => 'single'},
 });
 
 if (defined $cgi->param('maketemplate')) {
-    $vars->{'url'} = $cgi->canonicalise_query('token');
-    $vars->{'short_desc'} = $cgi->param('short_desc');
-    
-    print $cgi->header();
-    $template->process("bug/create/make-template.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
-}
+  $vars->{'url'} = $cgi->canonicalise_query('token');
 
-umask 0;
+  print $cgi->header();
+  $template->process("bug/create/make-template.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
+}
 
 # The format of the initial comment can be structured by adding fields to the
 # enter_bug template and then referencing them in the comment template.
 my $comment;
-my $format = $template->get_format("bug/create/comment",
-                                   scalar($cgi->param('format')), "txt");
+my $format
+  = $template->get_format("bug/create/comment", scalar($cgi->param('format')),
+  "txt");
 $template->process($format->{'template'}, $vars, \$comment)
-    || ThrowTemplateError($template->error());
+  || ThrowTemplateError($template->error());
 
 # Include custom fields editable on bug creation.
-my @custom_bug_fields = grep {$_->type != FIELD_TYPE_MULTI_SELECT && $_->enter_bug}
-                             Bugzilla->active_custom_fields;
+my @custom_bug_fields
+  = grep { $_->type != FIELD_TYPE_MULTI_SELECT && $_->enter_bug }
+  Bugzilla->active_custom_fields;
 
 # Undefined custom fields are ignored to ensure they will get their default
 # value (e.g. "---" for custom single select fields).
 my @bug_fields = grep { defined $cgi->param($_->name) } @custom_bug_fields;
 @bug_fields = map { $_->name } @bug_fields;
 
-push(@bug_fields, qw(
+push(
+  @bug_fields, qw(
     product
     component
 
@@ -108,26 +108,41 @@ push(@bug_fields, qw(
     see_also
     estimated_time
     deadline
-));
+    )
+);
 my %bug_params;
 foreach my $field (@bug_fields) {
-    $bug_params{$field} = $cgi->param($field);
+  $bug_params{$field} = $cgi->param($field);
 }
 foreach my $field (qw(cc groups)) {
-    next if !$cgi->should_set($field);
-    $bug_params{$field} = [$cgi->param($field)];
+  next if !$cgi->should_set($field);
+  $bug_params{$field} = [$cgi->multi_param($field)];
 }
-$bug_params{'comment'} = $comment;
+$bug_params{'comment'}     = $comment;
 $bug_params{'is_markdown'} = $cgi->param('use_markdown');
 
-my @multi_selects = grep {$_->type == FIELD_TYPE_MULTI_SELECT && $_->enter_bug}
-                         Bugzilla->active_custom_fields;
+my @multi_selects
+  = grep { $_->type == FIELD_TYPE_MULTI_SELECT && $_->enter_bug }
+  Bugzilla->active_custom_fields;
 
 foreach my $field (@multi_selects) {
-    next if !$cgi->should_set($field->name);
-    $bug_params{$field->name} = [$cgi->param($field->name)];
+  next if !$cgi->should_set($field->name);
+  $bug_params{$field->name} = [$cgi->multi_param($field->name)];
 }
 
+
+my $product = Bugzilla::Product->check($bug_params{'product'});
+my $component_id
+  = Bugzilla::Component->check({
+  product => $product, name => $bug_params{'component'}
+  })->id;
+
+# Set bug flags.
+my (undef, $flag_data)
+  = Bugzilla::Flag->extract_flags_from_cgi($vars, SKIP_REQUESTEE_ON_ERROR,
+  {product_id => $product->id, component_id => $component_id});
+$bug_params{flags} = $flag_data;
+
 my $bug = Bugzilla::Bug->create(\%bug_params);
 
 # Get the bug ID back and delete the token used to create this bug.
@@ -136,15 +151,18 @@ delete_token($token);
 
 # We do this directly from the DB because $bug->creation_ts has the seconds
 # formatted out of it (which should be fixed some day).
-my $timestamp = $dbh->selectrow_array(
-    'SELECT creation_ts FROM bugs WHERE bug_id = ?', undef, $id);
+my $timestamp
+  = $dbh->selectrow_array('SELECT creation_ts FROM bugs WHERE bug_id = ?',
+  undef, $id);
 
 # Set Version cookie, but only if the user actually selected
 # a version on the page.
 if (defined $cgi->param('version')) {
-    $cgi->send_cookie(-name => "VERSION-" . $bug->product,
-                      -value => $bug->version,
-                      -expires => "Fri, 01-Jan-2038 00:00:00 GMT");
+  $cgi->send_cookie(
+    -name    => "VERSION-" . $bug->product,
+    -value   => $bug->version,
+    -expires => "Fri, 01-Jan-2038 00:00:00 GMT"
+  );
 }
 
 # We don't have to check if the user can see the bug, because a user filing
@@ -152,88 +170,84 @@ if (defined $cgi->param('version')) {
 # after the bug is filed.
 
 # Add an attachment if requested.
-my $data_fh = $cgi->upload('data');
+my $data_fh     = $cgi->upload('data');
 my $attach_text = $cgi->param('attach_text');
 
 if ($data_fh || $attach_text) {
-    $cgi->param('isprivate', $cgi->param('comment_is_private'));
-
-    # Must be called before create() as it may alter $cgi->param('ispatch').
-    my $content_type = Bugzilla::Attachment::get_content_type();
-    my $attachment;
-
-    # If the attachment cannot be successfully added to the bug,
-    # we notify the user, but we don't interrupt the bug creation process.
-    my $error_mode_cache = Bugzilla->error_mode;
-    Bugzilla->error_mode(ERROR_MODE_DIE);
-    eval {
-        $attachment = Bugzilla::Attachment->create(
-            {bug           => $bug,
-             creation_ts   => $timestamp,
-             data          => $attach_text || $data_fh,
-             description   => scalar $cgi->param('description'),
-             filename      => $attach_text ? "file_$id.txt" : $data_fh,
-             ispatch       => scalar $cgi->param('ispatch'),
-             isprivate     => scalar $cgi->param('isprivate'),
-             mimetype      => $content_type,
-            });
-    };
-    Bugzilla->error_mode($error_mode_cache);
-
-    if ($attachment) {
-        # Set attachment flags.
-        my ($flags, $new_flags) = Bugzilla::Flag->extract_flags_from_cgi(
-                                      $bug, $attachment, $vars, SKIP_REQUESTEE_ON_ERROR);
-        $attachment->set_flags($flags, $new_flags);
-        $attachment->update($timestamp);
-        my $comment = $bug->comments->[0];
-        $comment->set_all({ type => CMT_ATTACHMENT_CREATED, 
-                            extra_data => $attachment->id });
-        $comment->update();
-    }
-    else {
-        $vars->{'message'} = 'attachment_creation_failed';
-    }
+  $cgi->param('isprivate', scalar $cgi->param('comment_is_private'));
+
+  # Must be called before create() as it may alter $cgi->param('ispatch').
+  my $content_type = Bugzilla::Attachment::get_content_type();
+  my $attachment;
+
+  # If the attachment cannot be successfully added to the bug,
+  # we notify the user, but we don't interrupt the bug creation process.
+  my $error_mode_cache = Bugzilla->error_mode;
+  Bugzilla->error_mode(ERROR_MODE_DIE);
+  eval {
+    $attachment = Bugzilla::Attachment->create({
+      bug         => $bug,
+      creation_ts => $timestamp,
+      data        => $attach_text || $data_fh,
+      description => scalar $cgi->param('description'),
+      filename    => $attach_text ? "file_$id.txt" : $data_fh,
+      ispatch     => scalar $cgi->param('ispatch'),
+      isprivate   => scalar $cgi->param('isprivate'),
+      mimetype    => $content_type,
+    });
+  };
+  Bugzilla->error_mode($error_mode_cache);
+
+  if ($attachment) {
+
+    # Set attachment flags.
+    my ($flags, $new_flags)
+      = Bugzilla::Flag->extract_flags_from_cgi($vars, SKIP_REQUESTEE_ON_ERROR,
+      {bug => $bug, attachment => $attachment});
+    $attachment->set_flags($flags, $new_flags);
+    $attachment->update($timestamp);
+    my $comment = $bug->comments->[0];
+    $comment->set_all(
+      {type => CMT_ATTACHMENT_CREATED, extra_data => $attachment->id});
+    $comment->update();
+  }
+  else {
+    $vars->{'message'} = 'attachment_creation_failed';
+  }
 }
 
-# Set bug flags.
-my ($flags, $new_flags) = Bugzilla::Flag->extract_flags_from_cgi($bug, undef, $vars,
-                                                             SKIP_REQUESTEE_ON_ERROR);
-$bug->set_flags($flags, $new_flags);
-$bug->update($timestamp);
 
-$vars->{'id'} = $id;
+$vars->{'id'}  = $id;
 $vars->{'bug'} = $bug;
 
-Bugzilla::Hook::process('post_bug_after_creation', { vars => $vars });
+Bugzilla::Hook::process('post_bug_after_creation', {vars => $vars});
 
-my $recipients = { changer => $user };
+my $recipients = {changer => $user};
 my $bug_sent = Bugzilla::BugMail::Send($id, $recipients);
 $bug_sent->{type} = 'created';
 $bug_sent->{id}   = $id;
 my @all_mail_results = ($bug_sent);
 
 foreach my $dep (@{$bug->dependson || []}, @{$bug->blocked || []}) {
-    my $dep_sent = Bugzilla::BugMail::Send($dep, $recipients);
-    $dep_sent->{type} = 'dep';
-    $dep_sent->{id}   = $dep;
-    push(@all_mail_results, $dep_sent);
+  my $dep_sent = Bugzilla::BugMail::Send($dep, $recipients);
+  $dep_sent->{type} = 'dep';
+  $dep_sent->{id}   = $dep;
+  push(@all_mail_results, $dep_sent);
 }
 
 # Sending emails for any referenced bugs.
-foreach my $ref_bug_id (uniq @{ $bug->{see_also_changes} || [] }) {
-    my $ref_sent = Bugzilla::BugMail::Send($ref_bug_id, $recipients);
-    $ref_sent->{id} = $ref_bug_id;
-    push(@all_mail_results, $ref_sent);
+foreach my $ref_bug_id (uniq @{$bug->{see_also_changes} || []}) {
+  my $ref_sent = Bugzilla::BugMail::Send($ref_bug_id, $recipients);
+  $ref_sent->{id} = $ref_bug_id;
+  push(@all_mail_results, $ref_sent);
 }
 
 $vars->{sentmail} = \@all_mail_results;
 
 $format = $template->get_format("bug/create/created",
-                                 scalar($cgi->param('created-format')),
-                                 "html");
+  scalar($cgi->param('created-format')), "html");
 print $cgi->header();
 $template->process($format->{'template'}, $vars)
-    || ThrowTemplateError($template->error());
+  || ThrowTemplateError($template->error());
 
 1;
diff --git a/process_bug.cgi b/process_bug.cgi
index b47a3b1cfc..330ec2d79c 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -27,10 +27,10 @@ use Storable qw(dclone);
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 ######################################################################
 # Subroutines
@@ -38,18 +38,19 @@ my $vars = {};
 
 # Tells us whether or not a field should be changed by process_bug.
 sub should_set {
-    # check_defined is used for fields where there's another field
-    # whose name starts with "defined_" and then the field name--it's used
-    # to know when we did things like empty a multi-select or deselect
-    # a checkbox.
-    my ($field, $check_defined) = @_;
-    my $cgi = Bugzilla->cgi;
-    if ( defined $cgi->param($field) 
-         || ($check_defined && defined $cgi->param("defined_$field")) )
-    {
-        return 1;
-    }
-    return 0;
+
+  # check_defined is used for fields where there's another field
+  # whose name starts with "defined_" and then the field name--it's used
+  # to know when we did things like empty a multi-select or deselect
+  # a checkbox.
+  my ($field, $check_defined) = @_;
+  my $cgi = Bugzilla->cgi;
+  if (defined $cgi->param($field)
+    || ($check_defined && defined $cgi->param("defined_$field")))
+  {
+    return 1;
+  }
+  return 0;
 }
 
 ######################################################################
@@ -62,39 +63,40 @@ if (defined $cgi->param('id')) {
   my $bug = Bugzilla::Bug->check_for_edit(scalar $cgi->param('id'));
   $cgi->param('id', $bug->id);
   push(@bug_objects, $bug);
-} else {
-    foreach my $i ($cgi->param()) {
-        if ($i =~ /^id_([1-9][0-9]*)/) {
-            my $id = $1;
-            push(@bug_objects, Bugzilla::Bug->check_for_edit($id));
-        }
+}
+else {
+  foreach my $i ($cgi->multi_param()) {
+    if ($i =~ /^id_([1-9][0-9]*)/) {
+      my $id = $1;
+      push(@bug_objects, Bugzilla::Bug->check_for_edit($id));
     }
+  }
 }
 
 # Make sure there are bugs to process.
 scalar(@bug_objects) || ThrowUserError("no_bugs_chosen", {action => 'modify'});
 
-my $first_bug = $bug_objects[0]; # Used when we're only updating a single bug.
+my $first_bug = $bug_objects[0];   # Used when we're only updating a single bug.
 
 # Delete any parameter set to 'dontchange'.
 if (defined $cgi->param('dontchange')) {
-    foreach my $name ($cgi->param) {
-        next if $name eq 'dontchange'; # But don't delete dontchange itself!
-        # Skip ones we've already deleted (such as "defined_$name").
-        next if !defined $cgi->param($name);
-        if ($cgi->param($name) eq $cgi->param('dontchange')) {
-            $cgi->delete($name);
-            $cgi->delete("defined_$name");
-        }
+  foreach my $name ($cgi->multi_param()) {
+    next if $name eq 'dontchange';    # But don't delete dontchange itself!
+         # Skip ones we've already deleted (such as "defined_$name").
+    next if !defined $cgi->param($name);
+    if ($cgi->param($name) eq $cgi->param('dontchange')) {
+      $cgi->delete($name);
+      $cgi->delete("defined_$name");
     }
+  }
 }
 
 # do a match on the fields if applicable
 Bugzilla::User::match_field({
-    'qa_contact'                => { 'type' => 'single' },
-    'newcc'                     => { 'type' => 'multi'  },
-    'masscc'                    => { 'type' => 'multi'  },
-    'assigned_to'               => { 'type' => 'single' },
+  'qa_contact'  => {'type' => 'single'},
+  'newcc'       => {'type' => 'multi'},
+  'masscc'      => {'type' => 'multi'},
+  'assigned_to' => {'type' => 'single'},
 });
 
 print $cgi->header() unless Bugzilla->usage_mode == USAGE_MODE_EMAIL;
@@ -104,48 +106,49 @@ print $cgi->header() unless Bugzilla->usage_mode == USAGE_MODE_EMAIL;
 my $delta_ts = $cgi->param('delta_ts') || '';
 
 if ($delta_ts) {
-    my $delta_ts_z = datetime_from($delta_ts)
-      or ThrowCodeError('invalid_timestamp', { timestamp => $delta_ts });
-
-    my $first_delta_tz_z =  datetime_from($first_bug->delta_ts);
-
-    if ($first_delta_tz_z ne $delta_ts_z) {
-        ($vars->{'operations'}) = $first_bug->get_activity(undef, $delta_ts);
-
-        # Always sort midair collision comments oldest to newest,
-        # regardless of the user's personal preference.
-        my $comments = $first_bug->comments({ order => 'oldest_to_newest',
-                                              after => $delta_ts });
-
-        # Show midair if previous changes made other than CC
-        # and/or one or more comments were made
-        my $do_midair = scalar @$comments ? 1 : 0;
-
-        if (!$do_midair) {
-            foreach my $operation (@{ $vars->{'operations'} }) {
-                foreach my $change (@{ $operation->{'changes'} }) {
-                    if ($change->{'fieldname'} ne 'cc') {
-                        $do_midair = 1;
-                        last;
-                    }
-                }
-                last if $do_midair;
-            }
+  my $delta_ts_z = datetime_from($delta_ts)
+    or ThrowCodeError('invalid_timestamp', {timestamp => $delta_ts});
+
+  my $first_delta_tz_z = datetime_from($first_bug->delta_ts);
+
+  if ($first_delta_tz_z ne $delta_ts_z) {
+    ($vars->{'operations'}) = $first_bug->get_activity(undef, $delta_ts);
+
+    # Always sort midair collision comments oldest to newest,
+    # regardless of the user's personal preference.
+    my $comments
+      = $first_bug->comments({order => 'oldest_to_newest', after => $delta_ts});
+
+    # Show midair if previous changes made other than CC
+    # and/or one or more comments were made
+    my $do_midair = scalar @$comments ? 1 : 0;
+
+    if (!$do_midair) {
+      foreach my $operation (@{$vars->{'operations'}}) {
+        foreach my $change (@{$operation->{'changes'}}) {
+          if ($change->{'fieldname'} ne 'cc') {
+            $do_midair = 1;
+            last;
+          }
         }
+        last if $do_midair;
+      }
+    }
 
-        if ($do_midair) {
-            $vars->{'title_tag'} = "mid_air";
-            $vars->{'comments'} = $comments;
-            $vars->{'bug'} = $first_bug;
-            # The token contains the old delta_ts. We need a new one.
-            $cgi->param('token', issue_hash_token([$first_bug->id, $first_bug->delta_ts]));
-
-            # Warn the user about the mid-air collision and ask them what to do.
-            $template->process("bug/process/midair.html.tmpl", $vars)
-                || ThrowTemplateError($template->error());
-            exit;
-        }
+    if ($do_midair) {
+      $vars->{'title_tag'} = "mid_air";
+      $vars->{'comments'}  = $comments;
+      $vars->{'bug'}       = $first_bug;
+
+      # The token contains the old delta_ts. We need a new one.
+      $cgi->param('token', issue_hash_token([$first_bug->id, $first_bug->delta_ts]));
+
+      # Warn the user about the mid-air collision and ask them what to do.
+      $template->process("bug/process/midair.html.tmpl", $vars)
+        || ThrowTemplateError($template->error());
+      exit;
     }
+  }
 }
 
 # We couldn't do this check earlier as we first had to validate bug IDs
@@ -154,10 +157,10 @@ if ($delta_ts) {
 my $token = $cgi->param('token');
 
 if ($cgi->param('id')) {
-    check_hash_token($token, [$first_bug->id, $delta_ts || $first_bug->delta_ts]);
+  check_hash_token($token, [$first_bug->id, $delta_ts || $first_bug->delta_ts]);
 }
 else {
-    check_token_data($token, 'buglist_mass_change', 'query.cgi');
+  check_token_data($token, 'buglist_mass_change', 'query.cgi');
 }
 
 ######################################################################
@@ -168,262 +171,281 @@ $vars->{'title_tag'} = "bug_processed";
 
 my $action;
 if (defined $cgi->param('id')) {
-    $action = $user->setting('post_bug_submit_action');
-
-    if ($action eq 'next_bug') {
-        my $bug_list_obj = $user->recent_search_for($first_bug);
-        my @bug_list = $bug_list_obj ? @{$bug_list_obj->bug_list} : ();
-        my $cur = firstidx { $_ eq $cgi->param('id') } @bug_list;
-        if ($cur >= 0 && $cur < $#bug_list) {
-            my $next_bug_id = $bug_list[$cur + 1];
-            detaint_natural($next_bug_id);
-            if ($next_bug_id and $user->can_see_bug($next_bug_id)) {
-                # We create an object here so that $bug->send_changes can use it
-                # when displaying the header.
-                $vars->{'bug'} = new Bugzilla::Bug($next_bug_id);
-            }
-        }
-    }
-    # Include both action = 'same_bug' and 'nothing'.
-    else {
-        $vars->{'bug'} = $first_bug;
+  $action = $user->setting('post_bug_submit_action');
+
+  if ($action eq 'next_bug') {
+    my $bug_list_obj = $user->recent_search_for($first_bug);
+    my @bug_list     = $bug_list_obj ? @{$bug_list_obj->bug_list} : ();
+    my $cur          = firstidx { $_ eq $cgi->param('id') } @bug_list;
+    if ($cur >= 0 && $cur < $#bug_list) {
+      my $next_bug_id = $bug_list[$cur + 1];
+      detaint_natural($next_bug_id);
+      if ($next_bug_id and $user->can_see_bug($next_bug_id)) {
+
+        # We create an object here so that $bug->send_changes can use it
+        # when displaying the header.
+        $vars->{'bug'} = new Bugzilla::Bug($next_bug_id);
+      }
     }
+  }
+
+  # Include both action = 'same_bug' and 'nothing'.
+  else {
+    $vars->{'bug'} = $first_bug;
+  }
 }
 else {
-    # param('id') is not defined when changing multiple bugs at once.
-    $action = 'nothing';
+  # param('id') is not defined when changing multiple bugs at once.
+  $action = 'nothing';
 }
 
 # Component, target_milestone, and version are in here just in case
 # the 'product' field wasn't defined in the CGI. It doesn't hurt to set
 # them twice.
 my @set_fields = qw(op_sys rep_platform priority bug_severity
-                    component target_milestone version
-                    bug_file_loc status_whiteboard short_desc
-                    deadline remaining_time estimated_time
-                    work_time set_default_assignee set_default_qa_contact
-                    cclist_accessible reporter_accessible
-                    product confirm_product_change
-                    bug_status resolution dup_id bug_ignored);
+  component target_milestone version
+  bug_file_loc status_whiteboard short_desc
+  deadline remaining_time estimated_time
+  work_time set_default_assignee set_default_qa_contact
+  cclist_accessible reporter_accessible
+  product confirm_product_change
+  bug_status resolution dup_id bug_ignored);
 push(@set_fields, 'assigned_to') if !$cgi->param('set_default_assignee');
 push(@set_fields, 'qa_contact')  if !$cgi->param('set_default_qa_contact');
 my %field_translation = (
-    bug_severity => 'severity',
-    rep_platform => 'platform',
-    short_desc   => 'summary',
-    bug_file_loc => 'url',
-    set_default_assignee   => 'reset_assigned_to',
-    set_default_qa_contact => 'reset_qa_contact',
-    confirm_product_change => 'product_change_confirmed',
+  bug_severity           => 'severity',
+  rep_platform           => 'platform',
+  short_desc             => 'summary',
+  bug_file_loc           => 'url',
+  set_default_assignee   => 'reset_assigned_to',
+  set_default_qa_contact => 'reset_qa_contact',
+  confirm_product_change => 'product_change_confirmed',
 );
 
-my %set_all_fields = ( other_bugs => \@bug_objects );
+my %set_all_fields = (other_bugs => \@bug_objects);
 foreach my $field_name (@set_fields) {
-    if (should_set($field_name, 1)) {
-        my $param_name = $field_translation{$field_name} || $field_name;
-        $set_all_fields{$param_name} = $cgi->param($field_name);
-    }
+  if (should_set($field_name, 1)) {
+    my $param_name = $field_translation{$field_name} || $field_name;
+    $set_all_fields{$param_name} = $cgi->param($field_name);
+  }
 }
 
 if (should_set('keywords')) {
-    my $action = $cgi->param('keywordaction') || '';
-    # Backward-compatibility for Bugzilla 3.x and older.
-    $action = 'remove' if $action eq 'delete';
-    $action = 'set'    if $action eq 'makeexact';
-    $set_all_fields{keywords}->{$action} = $cgi->param('keywords');
+  my $action = $cgi->param('keywordaction') || '';
+
+  # Backward-compatibility for Bugzilla 3.x and older.
+  $action = 'remove' if $action eq 'delete';
+  $action = 'set'    if $action eq 'makeexact';
+  $set_all_fields{keywords}->{$action} = $cgi->param('keywords');
 }
 if (should_set('comment')) {
-    my $is_markdown = ($user->settings->{use_markdown}->{is_enabled} &&
-                            $cgi->param('use_markdown')) ? 1 : 0;
-
-    $set_all_fields{comment} = {
-        body        => scalar $cgi->param('comment'),
-        is_private  => scalar $cgi->param('comment_is_private'),
-        is_markdown => $is_markdown,
-    };
+  my $is_markdown = ($user->use_markdown && $cgi->param('use_markdown')) ? 1 : 0;
+
+  $set_all_fields{comment} = {
+    body        => scalar $cgi->param('comment'),
+    is_private  => scalar $cgi->param('comment_is_private'),
+    is_markdown => $is_markdown,
+  };
 }
 if (should_set('see_also')) {
-    $set_all_fields{'see_also'}->{add} = 
-        [split(/[\s]+/, $cgi->param('see_also'))];
+  $set_all_fields{'see_also'}->{add} = [split(/[\s]+/, $cgi->param('see_also'))];
 }
 if (should_set('remove_see_also')) {
-    $set_all_fields{'see_also'}->{remove} = [$cgi->param('remove_see_also')];
+  $set_all_fields{'see_also'}->{remove} = [$cgi->multi_param('remove_see_also')];
 }
 foreach my $dep_field (qw(dependson blocked)) {
-    if (should_set($dep_field)) {
-        if (my $dep_action = $cgi->param("${dep_field}_action")) {
-            $set_all_fields{$dep_field}->{$dep_action} =
-                [split(/[\s,]+/, $cgi->param($dep_field))];
-        }
-        else {
-            $set_all_fields{$dep_field}->{set} = $cgi->param($dep_field);
-        }
+  if (should_set($dep_field)) {
+    if (my $dep_action = $cgi->param("${dep_field}_action")) {
+      $set_all_fields{$dep_field}->{$dep_action}
+        = [split(/[\s,]+/, $cgi->param($dep_field))];
+    }
+    else {
+      $set_all_fields{$dep_field}->{set} = $cgi->param($dep_field);
     }
+  }
 }
+
 # Formulate the CC data into two arrays of users involved in this CC change.
-if (defined $cgi->param('newcc')
-    or defined $cgi->param('addselfcc')
-    or defined $cgi->param('removecc')
-    or defined $cgi->param('masscc')) 
+if ( defined $cgi->param('newcc')
+  or defined $cgi->param('addselfcc')
+  or defined $cgi->param('removecc')
+  or defined $cgi->param('masscc'))
 {
-    my (@cc_add, @cc_remove);
-    # If masscc is defined, then we came from buglist and need to either add or
-    # remove cc's... otherwise, we came from show_bug and may need to do both.
-    if (defined $cgi->param('masscc')) {
-        if ($cgi->param('ccaction') eq 'add') {
-            @cc_add = $cgi->param('masscc');
-        } elsif ($cgi->param('ccaction') eq 'remove') {
-            @cc_remove = $cgi->param('masscc');
-        }
-    } else {
-        @cc_add = $cgi->param('newcc');
-        push(@cc_add, $user) if $cgi->param('addselfcc');
-
-        # We came from show_bug which uses a select box to determine what cc's
-        # need to be removed...
-        if ($cgi->param('removecc') && $cgi->param('cc')) {
-            @cc_remove = $cgi->param('cc');
-        }
+  my (@cc_add, @cc_remove);
+
+  # If masscc is defined, then we came from buglist and need to either add or
+  # remove cc's... otherwise, we came from show_bug and may need to do both.
+  if (defined $cgi->param('masscc')) {
+    if ($cgi->param('ccaction') eq 'add') {
+      @cc_add = $cgi->multi_param('masscc');
+    }
+    elsif ($cgi->param('ccaction') eq 'remove') {
+      @cc_remove = $cgi->multi_param('masscc');
+    }
+  }
+  else {
+    @cc_add = $cgi->multi_param('newcc');
+    push(@cc_add, $user) if $cgi->param('addselfcc');
+
+    # We came from show_bug which uses a select box to determine what cc's
+    # need to be removed...
+    if ($cgi->param('removecc') && $cgi->param('cc')) {
+      @cc_remove = $cgi->multi_param('cc');
     }
+  }
 
-    $set_all_fields{cc} = { add => \@cc_add, remove => \@cc_remove };
+  $set_all_fields{cc} = {add => \@cc_add, remove => \@cc_remove};
 }
 
 # Fields that can only be set on one bug at a time.
 if (defined $cgi->param('id')) {
-    # Since aliases are unique (like bug numbers), they can only be changed
-    # for one bug at a time.
-    if (defined $cgi->param('newalias') || defined $cgi->param('removealias')) {
-        my @alias_add = split /[, ]+/, $cgi->param('newalias');
-
-        # We came from bug_form which uses a select box to determine what
-        # aliases need to be removed...
-        my @alias_remove = ();
-        if ($cgi->param('removealias') && $cgi->param('alias')) {
-            @alias_remove = $cgi->param('alias');
-        }
 
-        $set_all_fields{alias} = { add => \@alias_add, remove => \@alias_remove };
+  # Since aliases are unique (like bug numbers), they can only be changed
+  # for one bug at a time.
+  if (defined $cgi->param('newalias') || defined $cgi->param('removealias')) {
+    my @alias_add = split /[, ]+/, $cgi->param('newalias');
+
+    # We came from bug_form which uses a select box to determine what
+    # aliases need to be removed...
+    my @alias_remove = ();
+    if ($cgi->param('removealias') && $cgi->param('alias')) {
+      @alias_remove = $cgi->multi_param('alias');
     }
+
+    $set_all_fields{alias} = {add => \@alias_add, remove => \@alias_remove};
+  }
 }
 
 my %is_private;
-foreach my $field (grep(/^defined_isprivate/, $cgi->param())) {
-    $field =~ /(\d+)$/;
+foreach my $field (grep(/^defined_isprivate/, $cgi->multi_param())) {
+  if ($field =~ /(\d+)$/a) {
     my $comment_id = $1;
     $is_private{$comment_id} = $cgi->param("isprivate_$comment_id");
+  }
 }
 $set_all_fields{comment_is_private} = \%is_private;
 
-my @check_groups = $cgi->param('defined_groups');
-my @set_groups = $cgi->param('groups');
+my @check_groups = $cgi->multi_param('defined_groups');
+my @set_groups   = $cgi->multi_param('groups');
 my ($removed_groups) = diff_arrays(\@check_groups, \@set_groups);
-$set_all_fields{groups} = { add => \@set_groups, remove => $removed_groups };
+$set_all_fields{groups} = {add => \@set_groups, remove => $removed_groups};
 
 my @custom_fields = Bugzilla->active_custom_fields;
 foreach my $field (@custom_fields) {
-    my $fname = $field->name;
-    if (should_set($fname, 1)) {
-        $set_all_fields{$fname} = [$cgi->param($fname)];
-    }
+  my $fname = $field->name;
+  if (should_set($fname, 1)) {
+    $set_all_fields{$fname} = [$cgi->multi_param($fname)];
+  }
 }
 
 # We are going to alter the list of removed groups, so we keep a copy here.
 my @unchecked_groups = @$removed_groups;
 foreach my $b (@bug_objects) {
-    # Don't blindly ask to remove unchecked groups available in the UI.
-    # A group can be already unchecked, and the user didn't try to remove it.
-    # In this case, we don't want remove_group() to complain.
-    my @remove_groups;
-    foreach my $g (@{$b->groups_in}) {
-        push(@remove_groups, $g->name) if grep { $_ eq $g->name } @unchecked_groups;
-    }
-    local $set_all_fields{groups}->{remove} = \@remove_groups;
-    $b->set_all(\%set_all_fields);
+
+  # Don't blindly ask to remove unchecked groups available in the UI.
+  # A group can be already unchecked, and the user didn't try to remove it.
+  # In this case, we don't want remove_group() to complain.
+  my @remove_groups;
+  foreach my $g (@{$b->groups_in}) {
+    push(@remove_groups, $g->name) if grep { $_ eq $g->name } @unchecked_groups;
+  }
+  local $set_all_fields{groups}->{remove} = \@remove_groups;
+  $b->set_all(\%set_all_fields);
 }
 
 if (defined $cgi->param('id')) {
-    # Flags should be set AFTER the bug has been moved into another
-    # product/component. The structure of flags code doesn't currently
-    # allow them to be set using set_all.
-    my ($flags, $new_flags) = Bugzilla::Flag->extract_flags_from_cgi(
-        $first_bug, undef, $vars);
-    $first_bug->set_flags($flags, $new_flags);
-
-    # Tags can only be set to one bug at once.
-    if (should_set('tag')) {
-        my @new_tags = split(/[\s,]+/, $cgi->param('tag'));
-        my ($tags_removed, $tags_added) = diff_arrays($first_bug->tags, \@new_tags);
-        $first_bug->remove_tag($_) foreach @$tags_removed;
-        $first_bug->add_tag($_) foreach @$tags_added;
-    }
+
+  # Flags should be set AFTER the bug has been moved into another
+  # product/component. The structure of flags code doesn't currently
+  # allow them to be set using set_all.
+  my ($flags, $new_flags)
+    = Bugzilla::Flag->extract_flags_from_cgi($vars, undef, {bug => $first_bug});
+  $first_bug->set_flags($flags, $new_flags);
+
+  # Tags can only be set to one bug at once.
+  if (should_set('tag')) {
+    my @new_tags = grep { trim($_) } split(/,/, $cgi->param('tag'));
+    my ($tags_removed, $tags_added) = diff_arrays($first_bug->tags, \@new_tags);
+    $first_bug->remove_tag($_) foreach @$tags_removed;
+    $first_bug->add_tag($_)    foreach @$tags_added;
+  }
 }
 else {
-    # Update flags on multiple bugs. The cgi params are slightly different
-    # than on a single bug, so we need to call a different sub. We also
-    # need to call this per bug, since we might be updating a flag in one
-    # bug, but adding it to a second bug
-    foreach my $b (@bug_objects) {
-        my ($flags, $new_flags)
-            = Bugzilla::Flag->multi_extract_flags_from_cgi($b, $vars);
-        $b->set_flags($flags, $new_flags);
-    }
+  # Update flags on multiple bugs. The cgi params are slightly different
+  # than on a single bug, so we need to call a different sub. We also
+  # need to call this per bug, since we might be updating a flag in one
+  # bug, but adding it to a second bug
+  foreach my $b (@bug_objects) {
+    my ($flags, $new_flags)
+      = Bugzilla::Flag->multi_extract_flags_from_cgi($b, $vars);
+    $b->set_flags($flags, $new_flags);
+  }
 }
 
 ##############################
 # Do Actual Database Updates #
 ##############################
+my $req_minor_update = $cgi->param('minor_update') ? 1 : 0;
 foreach my $bug (@bug_objects) {
-    my $changes = $bug->update();
-
-    if ($changes->{'bug_status'}) {
-        my $new_status = $changes->{'bug_status'}->[1];
-        # We may have zeroed the remaining time, if we moved into a closed
-        # status, so we should inform the user about that.
-        if (!is_open_state($new_status) && $changes->{'remaining_time'}) {
-            $vars->{'message'} = "remaining_time_zeroed"
-              if $user->is_timetracker;
-        }
+  my $minor_update = $bug->has_unsent_changes ? 0 : $req_minor_update;
+  my $changes = $bug->update();
+
+  if ($changes->{'bug_status'}) {
+    my $new_status = $changes->{'bug_status'}->[1];
+
+    # We may have zeroed the remaining time, if we moved into a closed
+    # status, so we should inform the user about that.
+    if (!is_open_state($new_status) && $changes->{'remaining_time'}) {
+      $vars->{'message'} = "remaining_time_zeroed" if $user->is_timetracker;
     }
+  }
 
-    $bug->send_changes($changes, $vars);
+  $bug->send_changes($changes, $vars, $minor_update);
 }
 
 # Delete the session token used for the mass-change.
 delete_token($token) unless $cgi->param('id');
 
 if (Bugzilla->usage_mode == USAGE_MODE_EMAIL) {
-    # Do nothing.
+
+  # Do nothing.
 }
 elsif ($action eq 'next_bug' or $action eq 'same_bug') {
-    my $bug = $vars->{'bug'};
-    if ($bug and $user->can_see_bug($bug)) {
-        if ($action eq 'same_bug') {
-            # $bug->update() does not update the internal structure of
-            # the bug sufficiently to display the bug with the new values.
-            # (That is, if we just passed in the old Bug object, we'd get
-            # a lot of old values displayed.)
-            $bug = new Bugzilla::Bug($bug->id);
-            $vars->{'bug'} = $bug;
-        }
-        $vars->{'bugs'} = [$bug];
-        if ($action eq 'next_bug') {
-            $vars->{'nextbug'} = $bug->id;
-        }
-        $template->process("bug/show.html.tmpl", $vars)
-          || ThrowTemplateError($template->error());
-        exit;
+  my $bug = $vars->{'bug'};
+  if ($bug and $user->can_see_bug($bug)) {
+    if ($action eq 'same_bug') {
+
+      # $bug->update() does not update the internal structure of
+      # the bug sufficiently to display the bug with the new values.
+      # (That is, if we just passed in the old Bug object, we'd get
+      # a lot of old values displayed.)
+      $bug = new Bugzilla::Bug($bug->id);
+      $vars->{'bug'} = $bug;
     }
-} elsif ($action ne 'nothing') {
-    ThrowCodeError("invalid_post_bug_submit_action");
+    $vars->{'bugs'} = [$bug];
+    if ($action eq 'next_bug') {
+      $vars->{'nextbug'} = $bug->id;
+    }
+
+    # For performance reasons, preload visibility of dependencies
+    # and duplicates related to this bug.
+    Bugzilla::Bug->preload([$bug]);
+
+    $template->process("bug/show.html.tmpl", $vars)
+      || ThrowTemplateError($template->error());
+    exit;
+  }
+}
+elsif ($action ne 'nothing') {
+  ThrowCodeError("invalid_post_bug_submit_action");
 }
 
 # End the response page.
 unless (Bugzilla->usage_mode == USAGE_MODE_EMAIL) {
-    $template->process("bug/navigate.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
-    $template->process("global/footer.html.tmpl", $vars)
-        || ThrowTemplateError($template->error());
+  $template->process("bug/navigate.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  $template->process("global/footer.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 1;
diff --git a/query.cgi b/query.cgi
index faf670d231..1ac50c242a 100755
--- a/query.cgi
+++ b/query.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Bug;
@@ -31,61 +31,62 @@ use Bugzilla::Token;
 ###############
 
 sub get_product_values {
-    my ($products, $field, $vars) = @_;
-    my @all_values = map { @{ $_->$field } } @$products;
-
-    my (@unique, %duplicates, %duplicate_count, %seen);
-    foreach my $value (@all_values) {
-        my $lc_name = lc($value->name);
-        if ($seen{$lc_name}) {
-            $duplicate_count{$seen{$lc_name}->id}++;
-            $duplicates{$value->id} = $seen{$lc_name};
-            next;
-        }
-        push(@unique, $value);
-        $seen{$lc_name} = $value;
+  my ($products, $field, $vars) = @_;
+  my @all_values = map { @{$_->$field} } @$products;
+
+  my (@unique, %duplicates, %duplicate_count, %seen);
+  foreach my $value (@all_values) {
+    my $lc_name = lc($value->name);
+    if ($seen{$lc_name}) {
+      $duplicate_count{$seen{$lc_name}->id}++;
+      $duplicates{$value->id} = $seen{$lc_name};
+      next;
     }
-
-    $field =~ s/s$//;
-    if ($field eq 'version') {
-        @unique = sort { vers_cmp(lc($a->name), lc($b->name)) } @unique;
-    }
-    else {
-        @unique = sort { lc($a->name) cmp lc($b->name) } @unique;
-    }
-
-    $field = 'target_milestone' if $field eq 'milestone';
-    $vars->{duplicates}->{$field} = \%duplicates;
-    $vars->{duplicate_count}->{$field} = \%duplicate_count;
-    # "component" is a reserved word in Template Toolkit.
-    $field = 'component_' if $field eq 'component';
-    $vars->{$field} = \@unique;
+    push(@unique, $value);
+    $seen{$lc_name} = $value;
+  }
+
+  $field =~ s/s$//;
+  if ($field eq 'version') {
+    @unique = sort { vers_cmp(lc($a->name), lc($b->name)) } @unique;
+  }
+  else {
+    @unique = sort { lc($a->name) cmp lc($b->name) } @unique;
+  }
+
+  $field = 'target_milestone' if $field eq 'milestone';
+  $vars->{duplicates}->{$field}      = \%duplicates;
+  $vars->{duplicate_count}->{$field} = \%duplicate_count;
+
+  # "component" is a reserved word in Template Toolkit.
+  $field = 'component_' if $field eq 'component';
+  $vars->{$field} = \@unique;
 }
 
 ###############
 # Main Script #
 ###############
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
-my $buffer = $cgi->query_string();
+my $vars     = {};
+my $buffer   = $cgi->query_string();
 
-my $user = Bugzilla->login();
+my $user   = Bugzilla->login();
 my $userid = $user->id;
 
 if ($cgi->param('nukedefaultquery')) {
-    if ($userid) {
-        my $token = $cgi->param('token');
-        check_hash_token($token, ['nukedefaultquery']);
-        my $named_queries = Bugzilla::Search::Saved->match(
-            { userid => $userid, name => DEFAULT_QUERY_NAME });
-        if (@$named_queries) {
-            $named_queries->[0]->remove_from_db();
-        }
+  if ($userid) {
+    my $token = $cgi->param('token');
+    check_hash_token($token, ['nukedefaultquery']);
+    my $named_queries = Bugzilla::Search::Saved->match(
+      {userid => $userid, name => DEFAULT_QUERY_NAME});
+    if (@$named_queries) {
+      $named_queries->[0]->remove_from_db();
     }
-    $buffer = "";
+  }
+  $buffer = "";
 }
 
 # We are done with changes committed to the DB.
@@ -93,10 +94,10 @@ $dbh = Bugzilla->switch_to_shadow_db;
 
 my $userdefaultquery;
 if ($userid) {
-    $userdefaultquery = $dbh->selectrow_array(
-        "SELECT query FROM namedqueries " .
-         "WHERE userid = ? AND name = ?", 
-         undef, ($userid, DEFAULT_QUERY_NAME));
+  $userdefaultquery
+    = $dbh->selectrow_array(
+    "SELECT query FROM namedqueries " . "WHERE userid = ? AND name = ?",
+    undef, ($userid, DEFAULT_QUERY_NAME));
 }
 
 local our %default;
@@ -105,74 +106,77 @@ local our %default;
 # Items which are single-valued, the template should only reference [0]
 # and ignore any multiple values.
 sub PrefillForm {
-    my ($buf) = @_;
-    my $cgi = Bugzilla->cgi;
-    $buf = new Bugzilla::CGI($buf);
-    my $foundone = 0;
-
-    # If there are old-style boolean charts in the URL (from an old saved
-    # search or from an old link on the web somewhere) then convert them
-    # to the new "custom search" format so that the form is populated
-    # properly.
-    my $any_boolean_charts = grep { /^field-?\d+/ } $buf->param();
-    if ($any_boolean_charts) {
-        my $search = new Bugzilla::Search(params => scalar $buf->Vars);
-        $search->boolean_charts_to_custom_search($buf);
+  my ($buf) = @_;
+  my $cgi = Bugzilla->cgi;
+  $buf = new Bugzilla::CGI($buf);
+  my $foundone = 0;
+
+  # If there are old-style boolean charts in the URL (from an old saved
+  # search or from an old link on the web somewhere) then convert them
+  # to the new "custom search" format so that the form is populated
+  # properly.
+  my $any_boolean_charts = grep {/^field-?\d+/} $buf->multi_param();
+  if ($any_boolean_charts) {
+    my $search = new Bugzilla::Search(params => scalar $buf->Vars);
+    $search->boolean_charts_to_custom_search($buf);
+  }
+
+  # Query parameters that don't represent form fields on this page.
+  my @skip = qw(format query_format list_id columnlist);
+
+  # Iterate over the URL parameters
+  foreach my $name ($buf->multi_param()) {
+    next if grep { $_ eq $name } @skip;
+    $foundone = 1;
+    my @values = $buf->multi_param($name);
+
+    # If the name is a single letter followed by numbers, it's part
+    # of Custom Search. We store these as an array of hashes.
+    if ($name =~ /^([[:lower:]])(\d+)$/) {
+      $default{'custom_search'}->[$2]->{$1} = $values[0];
     }
 
-    # Query parameters that don't represent form fields on this page.
-    my @skip = qw(format query_format list_id columnlist);
-
-    # Iterate over the URL parameters
-    foreach my $name ($buf->param()) {
-        next if grep { $_ eq $name } @skip;
-        $foundone = 1;
-        my @values = $buf->param($name);
-        
-        # If the name is a single letter followed by numbers, it's part
-        # of Custom Search. We store these as an array of hashes.
-        if ($name =~ /^([[:lower:]])(\d+)$/) {
-            $default{'custom_search'}->[$2]->{$1} = $values[0];
-        }
-        # If the name ends in a number (which it does for the fields which
-        # are part of the email searching), we use the array
-        # positions to show the defaults for that number field.
-        elsif ($name =~ /^(\w+)(\d)$/) {
-            $default{$1}->[$2] = $values[0];
-        }
-        else {
-            push (@{ $default{$name} }, @values);
-        }
+    # If the name ends in a number (which it does for the fields which
+    # are part of the email searching), we use the array
+    # positions to show the defaults for that number field.
+    elsif ($name =~ /^(\w+)(\d)$/) {
+      $default{$1}->[$2] = $values[0];
+    }
+    else {
+      push(@{$default{$name}}, @values);
     }
+  }
 
-    return $foundone;
+  return $foundone;
 }
 
 if (!PrefillForm($buffer)) {
-    # Ah-hah, there was no form stuff specified.  Do it again with the
-    # default query.
-    if ($userdefaultquery) {
-        PrefillForm($userdefaultquery);
-    } else {
-        PrefillForm(Bugzilla->params->{"defaultquery"});
-    }
+
+  # Ah-hah, there was no form stuff specified.  Do it again with the
+  # default query.
+  if ($userdefaultquery) {
+    PrefillForm($userdefaultquery);
+  }
+  else {
+    PrefillForm(Bugzilla->params->{"defaultquery"});
+  }
 }
 
-# if using groups for entry, then we don't want people to see products they 
+# if using groups for entry, then we don't want people to see products they
 # don't have access to. Remove them from the list.
-my @selectable_products = sort {lc($a->name) cmp lc($b->name)} 
-                               @{$user->get_selectable_products};
+my @selectable_products
+  = sort { lc($a->name) cmp lc($b->name) } @{$user->get_selectable_products};
 Bugzilla::Product::preload(\@selectable_products);
 $vars->{'product'} = \@selectable_products;
 
 # Create the component, version and milestone lists.
 foreach my $field (qw(components versions milestones)) {
-    get_product_values(\@selectable_products, $field, $vars);
+  get_product_values(\@selectable_products, $field, $vars);
 }
 
 # Create data structures representing each classification
 if (Bugzilla->params->{'useclassification'}) {
-    $vars->{'classification'} = $user->get_selectable_classifications;
+  $vars->{'classification'} = $user->get_selectable_classifications;
 }
 
 my @chfields;
@@ -182,67 +186,89 @@ push @chfields, "[Bug creation]";
 # This is what happens when you have variables whose definition depends
 # on the DB schema, and then the underlying schema changes...
 foreach my $val (editable_bug_fields()) {
-    if ($val eq 'classification_id') {
-        $val = 'classification';
-    } elsif ($val eq 'product_id') {
-        $val = 'product';
-    } elsif ($val eq 'component_id') {
-        $val = 'component';
-    }
-    push @chfields, $val;
+  if ($val eq 'classification_id') {
+    $val = 'classification';
+  }
+  elsif ($val eq 'product_id') {
+    $val = 'product';
+  }
+  elsif ($val eq 'component_id') {
+    $val = 'component';
+  }
+  push @chfields, $val;
 }
 
 if ($user->is_timetracker) {
-    push @chfields, "work_time";
-} else {
-    foreach my $tt_field (TIMETRACKING_FIELDS) {
-        @chfields = grep($_ ne $tt_field, @chfields);
-    }
+  push @chfields, "work_time";
+}
+else {
+  foreach my $tt_field (TIMETRACKING_FIELDS) {
+    @chfields = grep($_ ne $tt_field, @chfields);
+  }
 }
 @chfields = (sort(@chfields));
 $vars->{'chfield'} = \@chfields;
-$vars->{'bug_status'} = Bugzilla::Field->new({name => 'bug_status'})->legal_values;
-$vars->{'rep_platform'} = Bugzilla::Field->new({name => 'rep_platform'})->legal_values;
-$vars->{'op_sys'} = Bugzilla::Field->new({name => 'op_sys'})->legal_values;
+$vars->{'bug_status'}
+  = Bugzilla::Field->new({name => 'bug_status'})->legal_values;
+$vars->{'rep_platform'}
+  = Bugzilla::Field->new({name => 'rep_platform'})->legal_values;
+$vars->{'op_sys'}   = Bugzilla::Field->new({name => 'op_sys'})->legal_values;
 $vars->{'priority'} = Bugzilla::Field->new({name => 'priority'})->legal_values;
-$vars->{'bug_severity'} = Bugzilla::Field->new({name => 'bug_severity'})->legal_values;
-$vars->{'resolution'} = Bugzilla::Field->new({name => 'resolution'})->legal_values;
+$vars->{'bug_severity'}
+  = Bugzilla::Field->new({name => 'bug_severity'})->legal_values;
+$vars->{'resolution'}
+  = Bugzilla::Field->new({name => 'resolution'})->legal_values;
+
+# grab custom fields
+my @custom_fields = Bugzilla->active_custom_fields;
+$vars->{'custom_fields'} = \@custom_fields;
+foreach my $cf (@custom_fields) {
+  if ( $cf->type == FIELD_TYPE_SINGLE_SELECT
+    || $cf->type == FIELD_TYPE_MULTI_SELECT)
+  {
+    $vars->{$cf->name} = $cf->legal_values;
+  }
+}
 
 # Boolean charts
-my @fields = @{ Bugzilla->fields({ obsolete => 0 }) };
+my @fields = @{Bugzilla->fields({obsolete => 0})};
 
 my %exclude_fields = ();
 
 # If we're not in the time-tracking group, exclude time-tracking fields.
 if (!$user->is_timetracker) {
-    foreach my $tt_field (TIMETRACKING_FIELDS) {
-        $exclude_fields{$tt_field} = 1;
-    }
+  foreach my $tt_field (TIMETRACKING_FIELDS) {
+    $exclude_fields{$tt_field} = 1;
+  }
 }
 
 # Exclude fields turned off by params
-my %param_controlled_fields = ('useqacontact'        => 'qa_contact',
-                               'usetargetmilestone'  => 'target_milestone',
-                               'useclassification'   => 'classification',
-                               'usestatuswhiteboard' => 'status_whiteboard');
+my %param_controlled_fields = (
+  'useqacontact'        => 'qa_contact',
+  'usetargetmilestone'  => 'target_milestone',
+  'useclassification'   => 'classification',
+  'usestatuswhiteboard' => 'status_whiteboard'
+);
 
 while (my ($param, $field) = each %param_controlled_fields) {
-    $exclude_fields{$field} = 1 unless Bugzilla->params->{$param};
+  $exclude_fields{$field} = 1 unless Bugzilla->params->{$param};
 }
 
 @fields = grep(!$exclude_fields{$_->name}, @fields);
 
-@fields = sort {lc($a->description) cmp lc($b->description)} @fields;
-unshift(@fields, { name => "noop", description => "---" });
+@fields = sort { lc($a->description) cmp lc($b->description) } @fields;
+unshift(@fields, {name => "noop", description => "---"});
 $vars->{'fields'} = \@fields;
 
 # Named queries
 if ($userid) {
-     $vars->{'namedqueries'} = $dbh->selectcol_arrayref(
-           "SELECT name FROM namedqueries " .
-            "WHERE userid = ? AND name != ? " .
-         "ORDER BY name",
-         undef, ($userid, DEFAULT_QUERY_NAME));
+  $vars->{'namedqueries'} = $dbh->selectcol_arrayref(
+    "SELECT name FROM namedqueries "
+      . "WHERE userid = ? AND name != ? "
+      . "ORDER BY name",
+    undef,
+    ($userid, DEFAULT_QUERY_NAME)
+  );
 }
 
 # Sort order
@@ -250,20 +276,21 @@ my $deforder;
 my @orders = ('Bug Number', 'Importance', 'Assignee', 'Last Changed');
 
 if ($cgi->cookie('LASTORDER')) {
-    $deforder = "Reuse same sort as last time";
-    unshift(@orders, $deforder);
+  $deforder = "Reuse same sort as last time";
+  unshift(@orders, $deforder);
 }
 
 if ($cgi->param('order')) { $deforder = $cgi->param('order') }
 
 $vars->{'userdefaultquery'} = $userdefaultquery;
-$vars->{'orders'} = \@orders;
+$vars->{'orders'}           = \@orders;
 $default{'order'} = [$deforder || 'Importance'];
 
-if (($cgi->param('query_format') || $cgi->param('format') || "")
-    eq "create-series") {
-    require Bugzilla::Chart;
-    $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
+if (
+  ($cgi->param('query_format') || $cgi->param('format') || "") eq "create-series")
+{
+  require Bugzilla::Chart;
+  $vars->{'category'} = Bugzilla::Chart::getVisibleSeries();
 }
 
 $vars->{'known_name'} = $cgi->param('known_name');
@@ -273,33 +300,40 @@ $vars->{'columnlist'} = $cgi->param('columnlist');
 # Add in the defaults.
 $vars->{'default'} = \%default;
 
-$vars->{'format'} = $cgi->param('format');
+$vars->{'format'}       = $cgi->param('format');
 $vars->{'query_format'} = $cgi->param('query_format');
 
 # Set default page to "specific" if none provided
 if (!($cgi->param('query_format') || $cgi->param('format'))) {
-    if (defined $cgi->cookie('DEFAULTFORMAT')) {
-        $vars->{'format'} = $cgi->cookie('DEFAULTFORMAT');
-    } else {
-        $vars->{'format'} = 'specific';
-    }
+  if (defined $cgi->cookie('DEFAULTFORMAT')) {
+    $vars->{'format'} = $cgi->cookie('DEFAULTFORMAT');
+  }
+  else {
+    $vars->{'format'} = 'specific';
+  }
 }
 
 # Set cookie to current format as default, but only if the format
 # one that we should remember.
 if (defined($vars->{'format'}) && IsValidQueryType($vars->{'format'})) {
-    $cgi->send_cookie(-name => 'DEFAULTFORMAT',
-                      -value => $vars->{'format'},
-                      -expires => "Fri, 01-Jan-2038 00:00:00 GMT");
+  $cgi->send_cookie(
+    -name    => 'DEFAULTFORMAT',
+    -value   => $vars->{'format'},
+    -expires => "Fri, 01-Jan-2038 00:00:00 GMT"
+  );
 }
 
 # Generate and return the UI (HTML page) from the appropriate template.
 # If we submit back to ourselves (for e.g. boolean charts), we need to
 # preserve format information; hence query_format taking priority over
 # format.
-my $format = $template->get_format("search/search", 
-                                   $vars->{'query_format'} || $vars->{'format'}, 
-                                   scalar $cgi->param('ctype'));
+my $format = $template->get_format(
+  "search/search",
+  $vars->{'query_format'} || $vars->{'format'},
+  scalar $cgi->param('ctype')
+);
+
+Bugzilla::Hook::process("query_format", {'vars' => $vars, 'format' => $format});
 
 print $cgi->header($format->{'ctype'});
 
diff --git a/quips.cgi b/quips.cgi
index b2790be548..9300c07403 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -21,120 +21,127 @@ use Bugzilla::Token;
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
-my $cgi = Bugzilla->cgi;
-my $dbh = Bugzilla->dbh;
+my $cgi      = Bugzilla->cgi;
+my $dbh      = Bugzilla->dbh;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 my $action = $cgi->param('action') || "";
 my $token = $cgi->param('token');
 
 if ($action eq "show") {
-    # Read in the entire quip list
-    my $quipsref = $dbh->selectall_arrayref(
-                       "SELECT quipid, userid, quip, approved FROM quips ORDER BY quipid");
-
-    my $quips;
-    my @quipids;
-    foreach my $quipref (@$quipsref) {
-        my ($quipid, $userid, $quip, $approved) = @$quipref;
-        $quips->{$quipid} = {'userid' => $userid, 'quip' => $quip, 
-                             'approved' => $approved};
-        push(@quipids, $quipid);
-    }
 
-    my $users;
-    my $sth = $dbh->prepare("SELECT login_name FROM profiles WHERE userid = ?");
-    foreach my $quipid (@quipids) {
-        my $userid = $quips->{$quipid}{'userid'};
-        if ($userid && not defined $users->{$userid}) {
-            ($users->{$userid}) = $dbh->selectrow_array($sth, undef, $userid);
-        }
+  # Read in the entire quip list
+  my $quipsref = $dbh->selectall_arrayref(
+    "SELECT quipid, userid, quip, approved FROM quips ORDER BY quipid");
+
+  my $quips;
+  my @quipids;
+  foreach my $quipref (@$quipsref) {
+    my ($quipid, $userid, $quip, $approved) = @$quipref;
+    $quips->{$quipid}
+      = {'userid' => $userid, 'quip' => $quip, 'approved' => $approved};
+    push(@quipids, $quipid);
+  }
+
+  my $users;
+  my $sth = $dbh->prepare("SELECT login_name FROM profiles WHERE userid = ?");
+  foreach my $quipid (@quipids) {
+    my $userid = $quips->{$quipid}{'userid'};
+    if ($userid && not defined $users->{$userid}) {
+      ($users->{$userid}) = $dbh->selectrow_array($sth, undef, $userid);
     }
-    $vars->{'quipids'} = \@quipids;
-    $vars->{'quips'} = $quips;
-    $vars->{'users'} = $users;
-    $vars->{'show_quips'} = 1;
+  }
+  $vars->{'quipids'}    = \@quipids;
+  $vars->{'quips'}      = $quips;
+  $vars->{'users'}      = $users;
+  $vars->{'show_quips'} = 1;
 }
 
 if ($action eq "add") {
-    (Bugzilla->params->{'quip_list_entry_control'} eq "closed") &&
-      ThrowUserError("no_new_quips");
-
-    check_hash_token($token, ['create-quips']);
-    # Add the quip 
-    my $approved = (Bugzilla->params->{'quip_list_entry_control'} eq "open")
-                   || $user->in_group('bz_quip_moderators') || 0;
-    my $comment = $cgi->param("quip");
-    $comment || ThrowUserError("need_quip");
-    
-    ThrowUserError("quip_too_long", { length => length($comment) }) 
-        if length($comment) > MAX_QUIP_LENGTH;
-
-    trick_taint($comment); # Used in a placeholder below
-
-    $dbh->do("INSERT INTO quips (userid, quip, approved) VALUES (?, ?, ?)",
-             undef, ($user->id, $comment, $approved));
-
-    $vars->{'added_quip'} = $comment;
-    $vars->{'message'} = 'quips_added';
+  (Bugzilla->params->{'quip_list_entry_control'} eq "closed")
+    && ThrowUserError("no_new_quips");
+
+  check_hash_token($token, ['create-quips']);
+
+  # Add the quip
+  my $approved
+    = (Bugzilla->params->{'quip_list_entry_control'} eq "open")
+    || $user->in_group('bz_quip_moderators')
+    || 0;
+  my $comment = $cgi->param("quip");
+  $comment || ThrowUserError("need_quip");
+
+  ThrowUserError("quip_too_long", {length => length($comment)})
+    if length($comment) > MAX_QUIP_LENGTH;
+
+  trick_taint($comment);    # Used in a placeholder below
+
+  $dbh->do("INSERT INTO quips (userid, quip, approved) VALUES (?, ?, ?)",
+    undef, ($user->id, $comment, $approved));
+
+  $vars->{'added_quip'} = $comment;
+  $vars->{'message'}    = 'quips_added';
 }
 
 if ($action eq 'approve') {
-    $user->in_group('bz_quip_moderators')
-      || ThrowUserError("auth_failure", {group  => "bz_quip_moderators",
-                                         action => "approve",
-                                         object => "quips"});
-
-    check_hash_token($token, ['approve-quips']);
-    # Read in the entire quip list
-    my $quipsref = $dbh->selectall_arrayref("SELECT quipid, approved FROM quips");
-    
-    my %quips;
-    foreach my $quipref (@$quipsref) {
-        my ($quipid, $approved) = @$quipref;
-        $quips{$quipid} = $approved;
-    }
-
-    my @approved;
-    my @unapproved;
-    foreach my $quipid (keys %quips) {
-        # Must check for each quipid being defined for concurrency and
-        # automated usage where only one quipid might be defined.
-        my $quip = $cgi->param("quipid_$quipid") ? 1 : 0;
-        if(defined($cgi->param("defined_quipid_$quipid"))) {
-            if($quips{$quipid} != $quip) {
-                if($quip) { 
-                    push(@approved, $quipid); 
-                } else { 
-                    push(@unapproved, $quipid); 
-                }
-            }
+  $user->in_group('bz_quip_moderators')
+    || ThrowUserError("auth_failure",
+    {group => "bz_quip_moderators", action => "approve", object => "quips"});
+
+  check_hash_token($token, ['approve-quips']);
+
+  # Read in the entire quip list
+  my $quipsref = $dbh->selectall_arrayref("SELECT quipid, approved FROM quips");
+
+  my %quips;
+  foreach my $quipref (@$quipsref) {
+    my ($quipid, $approved) = @$quipref;
+    $quips{$quipid} = $approved;
+  }
+
+  my @approved;
+  my @unapproved;
+  foreach my $quipid (keys %quips) {
+
+    # Must check for each quipid being defined for concurrency and
+    # automated usage where only one quipid might be defined.
+    my $quip = $cgi->param("quipid_$quipid") ? 1 : 0;
+    if (defined($cgi->param("defined_quipid_$quipid"))) {
+      if ($quips{$quipid} != $quip) {
+        if ($quip) {
+          push(@approved, $quipid);
+        }
+        else {
+          push(@unapproved, $quipid);
         }
+      }
     }
-    $dbh->do("UPDATE quips SET approved = 1 WHERE quipid IN (" .
-            join(",", @approved) . ")") if($#approved > -1);
-    $dbh->do("UPDATE quips SET approved = 0 WHERE quipid IN (" .
-            join(",", @unapproved) . ")") if($#unapproved > -1);
-    $vars->{ 'approved' }   = \@approved;
-    $vars->{ 'unapproved' } = \@unapproved;
-    $vars->{'message'} = 'quips_approved_unapproved';
+  }
+  $dbh->do(
+    "UPDATE quips SET approved = 1 WHERE quipid IN (" . join(",", @approved) . ")")
+    if ($#approved > -1);
+  $dbh->do("UPDATE quips SET approved = 0 WHERE quipid IN ("
+      . join(",", @unapproved) . ")")
+    if ($#unapproved > -1);
+  $vars->{'approved'}   = \@approved;
+  $vars->{'unapproved'} = \@unapproved;
+  $vars->{'message'}    = 'quips_approved_unapproved';
 }
 
 if ($action eq "delete") {
-    $user->in_group('bz_quip_moderators')
-      || ThrowUserError("auth_failure", {group  => "bz_quip_moderators",
-                                         action => "delete",
-                                         object => "quips"});
-    my $quipid = $cgi->param("quipid");
-    detaint_natural($quipid) || ThrowUserError("need_quipid");
-    check_hash_token($token, ['quips', $quipid]);
-
-    ($vars->{'deleted_quip'}) = $dbh->selectrow_array(
-                                    "SELECT quip FROM quips WHERE quipid = ?",
-                                    undef, $quipid);
-    $dbh->do("DELETE FROM quips WHERE quipid = ?", undef, $quipid);
-    $vars->{'message'} = 'quips_deleted';
+  $user->in_group('bz_quip_moderators')
+    || ThrowUserError("auth_failure",
+    {group => "bz_quip_moderators", action => "delete", object => "quips"});
+  my $quipid = $cgi->param("quipid");
+  detaint_natural($quipid) || ThrowUserError("need_quipid");
+  check_hash_token($token, ['quips', $quipid]);
+
+  ($vars->{'deleted_quip'})
+    = $dbh->selectrow_array("SELECT quip FROM quips WHERE quipid = ?",
+    undef, $quipid);
+  $dbh->do("DELETE FROM quips WHERE quipid = ?", undef, $quipid);
+  $vars->{'message'} = 'quips_deleted';
 }
 
 print $cgi->header();
diff --git a/relogin.cgi b/relogin.cgi
index 6f0c970f1f..b0a91bd265 100755
--- a/relogin.cgi
+++ b/relogin.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Mailer;
@@ -22,7 +22,7 @@ use Bugzilla::Util;
 use Date::Format;
 
 my $template = Bugzilla->template;
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 
 my $action = $cgi->param('action') || '';
 
@@ -30,179 +30,158 @@ my $vars = {};
 my $target;
 
 if (!$action) {
-    # redirect to index.cgi if no action is defined.
-    print $cgi->redirect(correct_urlbase() . 'index.cgi');
-    exit;
+
+  # redirect to index.cgi if no action is defined.
+  print $cgi->redirect(correct_urlbase() . 'index.cgi');
+  exit;
 }
+
 # prepare-sudo: Display the sudo information & login page
 elsif ($action eq 'prepare-sudo') {
-    # We must have a logged-in user to do this
-    # That user must be in the 'bz_sudoers' group
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    unless ($user->in_group('bz_sudoers')) {
-        ThrowUserError('auth_failure', {  group => 'bz_sudoers',
-                                         action => 'begin',
-                                         object => 'sudo_session' }
-        );
-    }
-    
-    # Do not try to start a new session if one is already in progress!
-    if (defined(Bugzilla->sudoer)) {
-        ThrowUserError('sudo_in_progress', { target => $user->login });
-    }
-
-    # Keep a temporary record of the user visiting this page
-    $vars->{'token'} = issue_session_token('sudo_prepared');
-
-    if ($user->authorizer->can_login) {
-        my $value = generate_random_password();
-        my %args;
-        $args{'-secure'} = 1 if Bugzilla->params->{ssl_redirect};
-
-        $cgi->send_cookie(-name => 'Bugzilla_login_request_cookie',
-                          -value => $value,
-                          -httponly => 1,
-                          %args);
-
-        $vars->{'login_request_token'} = issue_hash_token(['login_request', $value]);
-    }
-
-    # Show the sudo page
-    $vars->{'target_login_default'} = $cgi->param('target_login');
-    $vars->{'reason_default'} = $cgi->param('reason');
-    $target = 'admin/sudo.html.tmpl';
+
+  # We must have a logged-in user to do this
+  # That user must be in the 'bz_sudoers' group
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  unless ($user->in_group('bz_sudoers')) {
+    ThrowUserError('auth_failure',
+      {group => 'bz_sudoers', action => 'begin', object => 'sudo_session'});
+  }
+
+  # Do not try to start a new session if one is already in progress!
+  if (defined(Bugzilla->sudoer)) {
+    ThrowUserError('sudo_in_progress', {target => $user->login});
+  }
+
+  # Keep a temporary record of the user visiting this page
+  $vars->{'token'} = issue_session_token('sudo_prepared');
+
+  # Show the sudo page
+  $vars->{'target_login_default'} = $cgi->param('target_login');
+  $vars->{'reason_default'}       = $cgi->param('reason');
+  $target                         = 'admin/sudo.html.tmpl';
 }
+
 # begin-sudo: Confirm login and start sudo session
 elsif ($action eq 'begin-sudo') {
-    # We must be sure that the user is authenticating by providing a login
-    # and password.
-    # We only need to do this for authentication methods that involve Bugzilla 
-    # directly obtaining a login (i.e. normal CGI login), as opposed to other 
-    # methods (like Environment vars login). 
-
-    # First, record if Bugzilla_login and Bugzilla_password were provided
-    my $credentials_provided;
-    if (defined($cgi->param('Bugzilla_login'))
-        && defined($cgi->param('Bugzilla_password')))
-    {
-        $credentials_provided = 1;
-    }
-
-    # Next, log in the user
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-
-    my $target_login = $cgi->param('target_login');
-    my $reason = $cgi->param('reason') || '';
-
-    # At this point, the user is logged in.  However, if they used a method
-    # where they could have provided a username/password (i.e. CGI), but they 
-    # did not provide a username/password, then throw an error.
-    if ($user->authorizer->can_login && !$credentials_provided) {
-        ThrowUserError('sudo_password_required',
-                       { target_login => $target_login, reason => $reason });
-    }
-
-    # The user must be in the 'bz_sudoers' group
-    unless ($user->in_group('bz_sudoers')) {
-        ThrowUserError('auth_failure', {  group => 'bz_sudoers',
-                                         action => 'begin',
-                                         object => 'sudo_session' }
-        );
-    }
-    
-    # Do not try to start a new session if one is already in progress!
-    if (defined(Bugzilla->sudoer)) {
-        ThrowUserError('sudo_in_progress', { target => $user->login });
-    }
-
-    # Did the user actually go trough the 'sudo-prepare' action?  Do some 
-    # checks on the token the action should have left.
-    my ($token_user, $token_timestamp, $token_data) =
-        Bugzilla::Token::GetTokenData($cgi->param('token'));
-    unless (defined($token_user)
-            && defined($token_data)
-            && ($token_user == $user->id)
-            && ($token_data eq 'sudo_prepared'))
-    {
-        ThrowUserError('sudo_preparation_required', 
-                       { target_login => $target_login, reason => $reason });
-    }
-    delete_token($cgi->param('token'));
-
-    # Get & verify the target user (the user who we will be impersonating)
-    my $target_user = new Bugzilla::User({ name => $target_login });
-    unless (defined($target_user)
-            && $target_user->id
-            && $user->can_see_user($target_user))
-    {
-        ThrowUserError('user_match_failed', { name => $target_login });
-    }
-    if ($target_user->in_group('bz_sudo_protect')) {
-        ThrowUserError('sudo_protected', { login => $target_user->login });
-    }
-
-    # Calculate the session expiry time (T + 6 hours)
-    my $time_string = time2str('%a, %d-%b-%Y %T %Z', time + MAX_SUDO_TOKEN_AGE, 'GMT');
-
-    # For future sessions, store the unique ID of the target user
-    my $token = Bugzilla::Token::_create_token($user->id, 'sudo', $target_user->id);
-
-    my %args;
-    if (Bugzilla->params->{ssl_redirect}) {
-        $args{'-secure'} = 1;
-    }
-
-    $cgi->send_cookie('-name'    => 'sudo',
-                      '-expires' => $time_string,
-                      '-value'   => $token,
-                      '-httponly' => 1,
-                      %args);
-
-    # For the present, change the values of Bugzilla::user & Bugzilla::sudoer
-    Bugzilla->sudo_request($target_user, $user);
-
-    # NOTE: If you want to log the start of an sudo session, do it here.
-
-    # If we have a reason passed in, keep it under 200 characters
-    $reason = substr($reason, 0, 200);
-
-    # Go ahead and send out the message now
-    my $message;
-    my $mail_template = Bugzilla->template_inner($target_user->setting('lang'));
-    $mail_template->process('email/sudo.txt.tmpl', { reason => $reason }, \$message);
-    MessageToMTA($message);
-
-    $vars->{'message'} = 'sudo_started';
-    $vars->{'target'} = $target_user->login;
-    $target = 'global/message.html.tmpl';
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+
+  my $target_login = $cgi->param('target_login');
+  my $reason = $cgi->param('reason') || '';
+
+  if ($user->authorizer->can_login) {
+    my $password = $cgi->param('password')
+      or ThrowUserError('sudo_password_required',
+      {target_login => $target_login, reason => $reason});
+    $user->check_current_password($password);
+  }
+
+  # The user must be in the 'bz_sudoers' group
+  unless ($user->in_group('bz_sudoers')) {
+    ThrowUserError('auth_failure',
+      {group => 'bz_sudoers', action => 'begin', object => 'sudo_session'});
+  }
+
+  # Do not try to start a new session if one is already in progress!
+  if (defined(Bugzilla->sudoer)) {
+    ThrowUserError('sudo_in_progress', {target => $user->login});
+  }
+
+  # Get & verify the target user (the user who we will be impersonating)
+  my $target_user = new Bugzilla::User({name => $target_login});
+  unless (defined($target_user)
+    && $target_user->id
+    && $user->can_see_user($target_user))
+  {
+    ThrowUserError('user_match_failed', {name => $target_login});
+  }
+
+  if ($target_user->in_group('bz_sudo_protect')) {
+    ThrowUserError('sudo_protected', {login => $target_user->login});
+  }
+
+  # Did the user actually go trough the 'sudo-prepare' action?  Do some
+  # checks on the token the action should have left.
+  my $token = $cgi->param('token');
+  my ($token_user, $token_timestamp, $token_data)
+    = Bugzilla::Token::GetTokenData($token);
+  unless (defined($token_user)
+    && defined($token_data)
+    && ($token_user == $user->id)
+    && ($token_data eq 'sudo_prepared'))
+  {
+    ThrowUserError('sudo_preparation_required',
+      {target_login => $target_login, reason => $reason});
+  }
+  delete_token($token);
+
+  # Calculate the session expiry time (T + 6 hours)
+  my $time_string
+    = time2str('%a, %d-%b-%Y %T %Z', time + MAX_SUDO_TOKEN_AGE, 'GMT');
+
+  # For future sessions, store the unique ID of the target user
+  $token = Bugzilla::Token::_create_token($user->id, 'sudo', $target_user->id);
+
+  my %args;
+  if (Bugzilla->params->{ssl_redirect}) {
+    $args{'-secure'} = 1;
+  }
+
+  $cgi->send_cookie(
+    '-name'     => 'sudo',
+    '-expires'  => $time_string,
+    '-value'    => $token,
+    '-httponly' => 1,
+    %args
+  );
+
+  # For the present, change the values of Bugzilla::user & Bugzilla::sudoer
+  Bugzilla->sudo_request($target_user, $user);
+
+  # NOTE: If you want to log the start of an sudo session, do it here.
+
+  # If we have a reason passed in, keep it under 200 characters
+  $reason = substr($reason, 0, 200);
+
+  # Go ahead and send out the message now
+  my $message;
+  my $mail_template = Bugzilla->template_inner($target_user->setting('lang'));
+  $mail_template->process('email/sudo.txt.tmpl', {reason => $reason}, \$message);
+  MessageToMTA($message);
+
+  $vars->{'message'} = 'sudo_started';
+  $vars->{'target'}  = $target_user->login;
+  $target            = 'global/message.html.tmpl';
 }
+
 # end-sudo: End the current sudo session (if one is in progress)
 elsif ($action eq 'end-sudo') {
-    # Regardless of our state, delete the sudo cookie if it exists
-    my $token = $cgi->cookie('sudo');
-    $cgi->remove_cookie('sudo');
-
-    # Are we in an sudo session?
-    Bugzilla->login(LOGIN_OPTIONAL);
-    my $sudoer = Bugzilla->sudoer;
-    if (defined($sudoer)) {
-        Bugzilla->sudo_request($sudoer, undef);
-    }
-    # Now that the session is over, remove the token from the DB.
-    delete_token($token);
-
-    # NOTE: If you want to log the end of an sudo session, so it here.
-    
-    $vars->{'message'} = 'sudo_ended';
-    $target = 'global/message.html.tmpl';
+
+  # Regardless of our state, delete the sudo cookie if it exists
+  my $token = $cgi->cookie('sudo');
+  $cgi->remove_cookie('sudo');
+
+  # Are we in an sudo session?
+  Bugzilla->login(LOGIN_OPTIONAL);
+  my $sudoer = Bugzilla->sudoer;
+  if (defined($sudoer)) {
+    Bugzilla->sudo_request($sudoer, undef);
+  }
+
+  # Now that the session is over, remove the token from the DB.
+  delete_token($token);
+
+  # NOTE: If you want to log the end of an sudo session, so it here.
+
+  $vars->{'message'} = 'sudo_ended';
+  $target = 'global/message.html.tmpl';
 }
+
 # No valid action found
 else {
-    Bugzilla->login(LOGIN_OPTIONAL);
-    ThrowUserError('unknown_action', {action => $action});
+  Bugzilla->login(LOGIN_OPTIONAL);
+  ThrowUserError('unknown_action', {action => $action});
 }
 
 # Display the template
 print $cgi->header();
-$template->process($target, $vars)
-      || ThrowTemplateError($template->error());
+$template->process($target, $vars) || ThrowTemplateError($template->error());
diff --git a/report.cgi b/report.cgi
index a4d26f4d75..58a41f3d4e 100755
--- a/report.cgi
+++ b/report.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -23,76 +23,80 @@ use Bugzilla::Token;
 
 use List::MoreUtils qw(uniq);
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # Go straight back to query.cgi if we are adding a boolean chart.
-if (grep(/^cmd-/, $cgi->param())) {
-    my $params = $cgi->canonicalise_query("format", "ctype");
-    my $location = "query.cgi?format=" . $cgi->param('query_format') . 
-      ($params ? "&$params" : "");
-
-    print $cgi->redirect($location);
-    exit;
+if (grep(/^cmd-/, $cgi->multi_param())) {
+  my $params = $cgi->canonicalise_query("format", "ctype");
+  my $location
+    = "query.cgi?format="
+    . $cgi->param('query_format')
+    . ($params ? "&$params" : "");
+
+  print $cgi->redirect($location);
+  exit;
 }
 
 Bugzilla->login();
 my $action = $cgi->param('action') || 'menu';
-my $token  = $cgi->param('token');
+my $token = $cgi->param('token');
 
 if ($action eq "menu") {
-    # No need to do any searching in this case, so bail out early.
-    print $cgi->header();
-    $template->process("reports/menu.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+
+  # No need to do any searching in this case, so bail out early.
+  print $cgi->header();
+  $template->process("reports/menu.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 
 }
 elsif ($action eq 'add') {
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    check_hash_token($token, ['save_report']);
-
-    my $name = clean_text($cgi->param('name'));
-    my $query = $cgi->param('query');
-
-    if (my ($report) = grep{ lc($_->name) eq lc($name) } @{$user->reports}) {
-        $report->set_query($query);
-        $report->update;
-        $vars->{'message'} = "report_updated";
-    } else {
-        my $report = Bugzilla::Report->create({name => $name, query => $query});
-        $vars->{'message'} = "report_created";
-    }
+  my $user = Bugzilla->login(LOGIN_REQUIRED);
+  check_hash_token($token, ['save_report']);
+
+  my $name  = clean_text(scalar $cgi->param('name'));
+  my $query = $cgi->param('query');
+
+  if (my ($report) = grep { lc($_->name) eq lc($name) } @{$user->reports}) {
+    $report->set_query($query);
+    $report->update;
+    $vars->{'message'} = "report_updated";
+  }
+  else {
+    my $report = Bugzilla::Report->create({name => $name, query => $query});
+    $vars->{'message'} = "report_created";
+  }
 
-    $user->flush_reports_cache;
+  $user->flush_reports_cache;
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $vars->{'reportname'} = $name;
+  $vars->{'reportname'} = $name;
 
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 elsif ($action eq 'del') {
-    my $user = Bugzilla->login(LOGIN_REQUIRED);
-    my $report_id = $cgi->param('saved_report_id');
-    check_hash_token($token, ['delete_report', $report_id]);
+  my $user      = Bugzilla->login(LOGIN_REQUIRED);
+  my $report_id = $cgi->param('saved_report_id');
+  check_hash_token($token, ['delete_report', $report_id]);
 
-    my $report = Bugzilla::Report->check({id => $report_id});
-    $report->remove_from_db();
+  my $report = Bugzilla::Report->check({id => $report_id});
+  $report->remove_from_db();
 
-    $user->flush_reports_cache;
+  $user->flush_reports_cache;
 
-    print $cgi->header();
+  print $cgi->header();
 
-    $vars->{'message'} = 'report_deleted';
-    $vars->{'reportname'} = $report->name;
+  $vars->{'message'}    = 'report_deleted';
+  $vars->{'reportname'} = $report->name;
 
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
-    exit;
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 # Sanitize the URL, to make URLs shorter.
@@ -103,16 +107,15 @@ my $row_field = $cgi->param('y_axis_field') || '';
 my $tbl_field = $cgi->param('z_axis_field') || '';
 
 if (!($col_field || $row_field || $tbl_field)) {
-    ThrowUserError("no_axes_defined");
+  ThrowUserError("no_axes_defined");
 }
 
 # There is no UI for these parameters anymore,
 # but they are still here just in case.
-my $width = $cgi->param('width') || 1024;
+my $width  = $cgi->param('width')  || 1024;
 my $height = $cgi->param('height') || 600;
 
-(detaint_natural($width) && $width > 0)
-  || ThrowUserError("invalid_dimensions");
+(detaint_natural($width) && $width > 0) || ThrowUserError("invalid_dimensions");
 $width <= 2000 || ThrowUserError("chart_too_large");
 
 (detaint_natural($height) && $height > 0)
@@ -121,50 +124,52 @@ $height <= 2000 || ThrowUserError("chart_too_large");
 
 my $formatparam = $cgi->param('format') || '';
 
-# These shenanigans are necessary to make sure that both vertical and 
+# These shenanigans are necessary to make sure that both vertical and
 # horizontal 1D tables convert to the correct dimension when you ask to
 # display them as some sort of chart.
 if ($formatparam eq "table") {
-    if ($col_field && !$row_field) {    
-        # 1D *tables* should be displayed vertically (with a row_field only)
-        $row_field = $col_field;
-        $col_field = '';
-    }
+  if ($col_field && !$row_field) {
+
+    # 1D *tables* should be displayed vertically (with a row_field only)
+    $row_field = $col_field;
+    $col_field = '';
+  }
 }
 else {
-    if (!Bugzilla->feature('graphical_reports')) {
-        ThrowUserError('feature_disabled', { feature => 'graphical_reports' });
-    }
+  if (!Bugzilla->feature('graphical_reports')) {
+    ThrowUserError('feature_disabled', {feature => 'graphical_reports'});
+  }
 
-    if ($row_field && !$col_field) {
-        # 1D *charts* should be displayed horizontally (with an col_field only)
-        $col_field = $row_field;
-        $row_field = '';
-    }
+  if ($row_field && !$col_field) {
+
+    # 1D *charts* should be displayed horizontally (with an col_field only)
+    $col_field = $row_field;
+    $row_field = '';
+  }
 }
 
 # Valid bug fields that can be reported on.
 my $valid_columns = Bugzilla::Search::REPORT_COLUMNS;
 
 # Validate the values in the axis fields or throw an error.
-!$row_field 
+!$row_field
   || ($valid_columns->{$row_field} && trick_taint($row_field))
   || ThrowUserError("report_axis_invalid", {fld => "x", val => $row_field});
-!$col_field 
+!$col_field
   || ($valid_columns->{$col_field} && trick_taint($col_field))
   || ThrowUserError("report_axis_invalid", {fld => "y", val => $col_field});
-!$tbl_field 
+!$tbl_field
   || ($valid_columns->{$tbl_field} && trick_taint($tbl_field))
   || ThrowUserError("report_axis_invalid", {fld => "z", val => $tbl_field});
 
-my @axis_fields = grep { $_ } ($row_field, $col_field, $tbl_field);
+my @axis_fields = grep {$_} ($row_field, $col_field, $tbl_field);
 
 # Clone the params, so that Bugzilla::Search can modify them
 my $params = new Bugzilla::CGI($cgi);
 my $search = new Bugzilla::Search(
-    fields => \@axis_fields, 
-    params => scalar $params->Vars,
-    allow_unlimited => 1,
+  fields          => \@axis_fields,
+  params          => scalar $params->Vars,
+  allow_unlimited => 1,
 );
 
 $::SIG{TERM} = 'DEFAULT';
@@ -173,7 +178,7 @@ $::SIG{PIPE} = 'DEFAULT';
 Bugzilla->switch_to_shadow_db();
 my ($results, $extra_data) = $search->data;
 
-# We have a hash of hashes for the data itself, and a hash to hold the 
+# We have a hash of hashes for the data itself, and a hash to hold the
 # row/col/table names.
 my %data;
 my %names;
@@ -188,63 +193,63 @@ my $row_isnumeric = 1;
 my $tbl_isnumeric = 1;
 
 # define which fields are multiselect
-my @multi_selects = map { $_->name } @{Bugzilla->fields(
-    {
-        obsolete => 0,
-        type => [FIELD_TYPE_MULTI_SELECT, FIELD_TYPE_KEYWORDS]
-    }
-)};
-my $col_ismultiselect = scalar grep {$col_field eq $_} @multi_selects;
-my $row_ismultiselect = scalar grep {$row_field eq $_} @multi_selects;
-my $tbl_ismultiselect = scalar grep {$tbl_field eq $_} @multi_selects;
+my @multi_selects
+  = map { $_->name }
+  @{Bugzilla->fields({
+    obsolete => 0, type => [FIELD_TYPE_MULTI_SELECT, FIELD_TYPE_KEYWORDS]
+  })};
+my $col_ismultiselect = scalar grep { $col_field eq $_ } @multi_selects;
+my $row_ismultiselect = scalar grep { $row_field eq $_ } @multi_selects;
+my $tbl_ismultiselect = scalar grep { $tbl_field eq $_ } @multi_selects;
 
 
 foreach my $result (@$results) {
-    # handle empty dimension member names
-    
-    my @rows = check_value($row_field, $result, $row_ismultiselect);
-    my @cols = check_value($col_field, $result, $col_ismultiselect);
-    my @tbls = check_value($tbl_field, $result, $tbl_ismultiselect);
-
-    my %in_total_row;
-    my %in_total_col;
-    for my $tbl (@tbls) {
-        my %in_row_total;
-        for my $col (@cols) {
-            for my $row (@rows) {
-                $data{$tbl}{$col}{$row}++;
-                $names{"row"}{$row}++;
-                $row_isnumeric &&= ($row =~ /^-?\d+(\.\d+)?$/o);
-                if ($formatparam eq "table") {
-                    if (!$in_row_total{$row}) {
-                        $data{$tbl}{'-total-'}{$row}++;
-                        $in_row_total{$row} = 1;
-                    }
-                    if (!$in_total_row{$row}) {
-                        $data{'-total-'}{'-total-'}{$row}++;
-                        $in_total_row{$row} = 1;
-                    }
-                }
-            }
-            if ($formatparam eq "table") {
-                $data{$tbl}{$col}{'-total-'}++;
-                if (!$in_total_col{$col}) {
-                    $data{'-total-'}{$col}{'-total-'}++;
-                    $in_total_col{$col} = 1;
-                }
-            }
-            $names{"col"}{$col}++;
-            $col_isnumeric &&= ($col =~ /^-?\d+(\.\d+)?$/o);
-        }
-        $names{"tbl"}{$tbl}++;
-        $tbl_isnumeric &&= ($tbl =~ /^-?\d+(\.\d+)?$/o);
+
+  # handle empty dimension member names
+
+  my @rows = check_value($row_field, $result, $row_ismultiselect);
+  my @cols = check_value($col_field, $result, $col_ismultiselect);
+  my @tbls = check_value($tbl_field, $result, $tbl_ismultiselect);
+
+  my %in_total_row;
+  my %in_total_col;
+  for my $tbl (@tbls) {
+    my %in_row_total;
+    for my $col (@cols) {
+      for my $row (@rows) {
+        $data{$tbl}{$col}{$row}++;
+        $names{"row"}{$row}++;
+        $row_isnumeric &&= ($row =~ /^-?\d+(\.\d+)?$/o);
         if ($formatparam eq "table") {
-            $data{$tbl}{'-total-'}{'-total-'}++;
+          if (!$in_row_total{$row}) {
+            $data{$tbl}{'-total-'}{$row}++;
+            $in_row_total{$row} = 1;
+          }
+          if (!$in_total_row{$row}) {
+            $data{'-total-'}{'-total-'}{$row}++;
+            $in_total_row{$row} = 1;
+          }
+        }
+      }
+      if ($formatparam eq "table") {
+        $data{$tbl}{$col}{'-total-'}++;
+        if (!$in_total_col{$col}) {
+          $data{'-total-'}{$col}{'-total-'}++;
+          $in_total_col{$col} = 1;
         }
+      }
+      $names{"col"}{$col}++;
+      $col_isnumeric &&= ($col =~ /^-?\d+(\.\d+)?$/o);
     }
+    $names{"tbl"}{$tbl}++;
+    $tbl_isnumeric &&= ($tbl =~ /^-?\d+(\.\d+)?$/o);
     if ($formatparam eq "table") {
-        $data{'-total-'}{'-total-'}{'-total-'}++;
+      $data{$tbl}{'-total-'}{'-total-'}++;
     }
+  }
+  if ($formatparam eq "table") {
+    $data{'-total-'}{'-total-'}{'-total-'}++;
+  }
 }
 
 my @col_names = get_names($names{"col"}, $col_isnumeric, $col_field);
@@ -255,127 +260,111 @@ my @tbl_names = get_names($names{"tbl"}, $tbl_isnumeric, $tbl_field);
 # gathered everything into the hashes and made sure we know the size of the
 # data, we reformat it into an array of arrays of arrays of data.
 push(@tbl_names, "-total-") if (scalar(@tbl_names) > 1);
-    
+
 my @image_data;
 foreach my $tbl (@tbl_names) {
-    my @tbl_data;
-    push(@tbl_data, \@col_names);
-    foreach my $row (@row_names) {
-        my @col_data;
-        foreach my $col (@col_names) {
-            $data{$tbl}{$col}{$row} = $data{$tbl}{$col}{$row} || 0;
-            push(@col_data, $data{$tbl}{$col}{$row});
-            if ($tbl ne "-total-") {
-                # This is a bit sneaky. We spend every loop except the last
-                # building up the -total- data, and then last time round,
-                # we process it as another tbl, and push() the total values 
-                # into the image_data array.
-                $data{"-total-"}{$col}{$row} += $data{$tbl}{$col}{$row};
-            }
-        }
-
-        push(@tbl_data, \@col_data);
+  my @tbl_data;
+  push(@tbl_data, \@col_names);
+  foreach my $row (@row_names) {
+    my @col_data;
+    foreach my $col (@col_names) {
+      $data{$tbl}{$col}{$row} = $data{$tbl}{$col}{$row} || 0;
+      push(@col_data, $data{$tbl}{$col}{$row});
+      if ($tbl ne "-total-") {
+
+        # This is a bit sneaky. We spend every loop except the last
+        # building up the -total- data, and then last time round,
+        # we process it as another tbl, and push() the total values
+        # into the image_data array.
+        $data{"-total-"}{$col}{$row} += $data{$tbl}{$col}{$row};
+      }
     }
-    
-    unshift(@image_data, \@tbl_data);
+
+    push(@tbl_data, \@col_data);
+  }
+
+  unshift(@image_data, \@tbl_data);
 }
 
 $vars->{'col_field'} = $col_field;
 $vars->{'row_field'} = $row_field;
 $vars->{'tbl_field'} = $tbl_field;
-$vars->{'time'} = localtime(time());
+$vars->{'time'}      = localtime(time());
 
-$vars->{'col_names'} = \@col_names;
-$vars->{'row_names'} = \@row_names;
-$vars->{'tbl_names'} = \@tbl_names;
+$vars->{'col_names'}         = \@col_names;
+$vars->{'row_names'}         = \@row_names;
+$vars->{'tbl_names'}         = \@tbl_names;
 $vars->{'note_multi_select'} = $row_ismultiselect || $col_ismultiselect;
 
 # Below a certain width, we don't see any bars, so there needs to be a minimum.
 if ($formatparam eq "bar") {
-    my $min_width = (scalar(@col_names) || 1) * 20;
+  my $min_width = (scalar(@col_names) || 1) * 20;
 
-    if (!$cgi->param('cumulate')) {
-        $min_width *= (scalar(@row_names) || 1);
-    }
+  if (!$cgi->param('cumulate')) {
+    $min_width *= (scalar(@row_names) || 1);
+  }
 
-    $vars->{'min_width'} = $min_width;
+  $vars->{'min_width'} = $min_width;
 }
 
-$vars->{'width'} = $width;
-$vars->{'height'} = $height;
-$vars->{'queries'} = $extra_data;
+$vars->{'width'}           = $width;
+$vars->{'height'}          = $height;
+$vars->{'queries'}         = $extra_data;
 $vars->{'saved_report_id'} = $cgi->param('saved_report_id');
 
-if ($cgi->param('debug')
-    && Bugzilla->params->{debug_group}
-    && Bugzilla->user->in_group(Bugzilla->params->{debug_group})
-) {
-    $vars->{'debug'} = 1;
-}
-
 if ($action eq "wrap") {
-    # So which template are we using? If action is "wrap", we will be using
-    # no format (it gets passed through to be the format of the actual data),
-    # and either report.csv.tmpl (CSV), or report.html.tmpl (everything else).
-    # report.html.tmpl produces an HTML framework for either tables of HTML
-    # data, or images generated by calling report.cgi again with action as
-    # "plot".
-    $formatparam =~ s/[^a-zA-Z\-]//g;
-    $vars->{'format'} = $formatparam;
-    $formatparam = '';
-
-    # We need to keep track of the defined restrictions on each of the 
-    # axes, because buglistbase, below, throws them away. Without this, we
-    # get buglistlinks wrong if there is a restriction on an axis field.
-    $vars->{'col_vals'} = get_field_restrictions($col_field);
-    $vars->{'row_vals'} = get_field_restrictions($row_field);
-    $vars->{'tbl_vals'} = get_field_restrictions($tbl_field);
-
-    # We need a number of different variants of the base URL for different
-    # URLs in the HTML.
-    $vars->{'buglistbase'} = $cgi->canonicalise_query(
-                                 "x_axis_field", "y_axis_field", "z_axis_field",
-                               "ctype", "format", "query_format", @axis_fields);
-    $vars->{'imagebase'}   = $cgi->canonicalise_query( 
-                    $tbl_field, "action", "ctype", "format", "width", "height");
-    $vars->{'switchbase'}  = $cgi->canonicalise_query( 
-                "query_format", "action", "ctype", "format", "width", "height");
-    $vars->{'data'} = \%data;
+
+  # So which template are we using? If action is "wrap", we will be using
+  # no format (it gets passed through to be the format of the actual data),
+  # and either report.csv.tmpl (CSV), or report.html.tmpl (everything else).
+  # report.html.tmpl produces an HTML framework for either tables of HTML
+  # data, or images generated by calling report.cgi again with action as
+  # "plot".
+  $formatparam =~ s/[^a-zA-Z\-]//g;
+  $vars->{'format'} = $formatparam;
+  $formatparam = '';
+
+  # We need to keep track of the defined restrictions on each of the
+  # axes, because buglistbase, below, throws them away. Without this, we
+  # get buglistlinks wrong if there is a restriction on an axis field.
+  $vars->{'col_vals'} = get_field_restrictions($col_field);
+  $vars->{'row_vals'} = get_field_restrictions($row_field);
+  $vars->{'tbl_vals'} = get_field_restrictions($tbl_field);
+
+  # We need a number of different variants of the base URL for different
+  # URLs in the HTML.
+  $vars->{'buglistbase'} = $cgi->canonicalise_query(
+    "x_axis_field", "y_axis_field", "z_axis_field", "ctype",
+    "format",       "query_format", @axis_fields
+  );
+  $vars->{'imagebase'}
+    = $cgi->canonicalise_query($tbl_field, "action", "ctype", "format", "width",
+    "height");
+  $vars->{'switchbase'}
+    = $cgi->canonicalise_query("query_format", "action", "ctype", "format",
+    "width", "height");
+  $vars->{'data'} = \%data;
 }
 elsif ($action eq "plot") {
-    # If action is "plot", we will be using a format as normal (pie, bar etc.)
-    # and a ctype as normal (currently only png.)
-    $vars->{'cumulate'} = $cgi->param('cumulate') ? 1 : 0;
-    $vars->{'x_labels_vertical'} = $cgi->param('x_labels_vertical') ? 1 : 0;
-    $vars->{'data'} = \@image_data;
+
+  # If action is "plot", we will be using a format as normal (pie, bar etc.)
+  # and a ctype as normal (currently only png.)
+  $vars->{'cumulate'}          = $cgi->param('cumulate')          ? 1 : 0;
+  $vars->{'x_labels_vertical'} = $cgi->param('x_labels_vertical') ? 1 : 0;
+  $vars->{'data'}              = \@image_data;
 }
 else {
-    ThrowUserError('unknown_action', {action => $action});
+  ThrowUserError('unknown_action', {action => $action});
 }
 
 my $format = $template->get_format("reports/report", $formatparam,
-                                   scalar($cgi->param('ctype')));
-
-# If we get a template or CGI error, it comes out as HTML, which isn't valid
-# PNG data, and the browser just displays a "corrupt PNG" message. So, you can
-# set debug=1 to always get an HTML content-type, and view the error.
-$format->{'ctype'} = "text/html" if $cgi->param('debug');
+  scalar($cgi->param('ctype')));
 
 $cgi->set_dated_content_disp("inline", "report", $format->{extension});
 print $cgi->header($format->{'ctype'});
 
-# Problems with this CGI are often due to malformed data. Setting debug=1
-# prints out both data structures.
-if ($cgi->param('debug')) {
-    require Data::Dumper;
-    say "<pre>data hash:";
-    say html_quote(Data::Dumper::Dumper(%data));
-    say "\ndata array:";
-    say html_quote(Data::Dumper::Dumper(@image_data)) . "\n\n</pre>";
-}
-
 # All formats point to the same section of the documentation.
-$vars->{'doc_section'} = 'using.html#reports-and-charts';
+$vars->{'doc_section'} = 'using/reports-and-charts.html#reports';
 
 disable_utf8() if ($format->{'ctype'} =~ /^image\//);
 
@@ -384,65 +373,69 @@ $template->process("$format->{'template'}", $vars)
 
 
 sub get_names {
-    my ($names, $isnumeric, $field_name) = @_;
-    my ($field, @sorted);
-    # XXX - This is a hack to handle the actual_time/work_time field,
-    # because it's named 'actual_time' in Search.pm but 'work_time' in Field.pm.
-    $_[2] = $field_name = 'work_time' if $field_name eq 'actual_time';
-
-    # _realname fields aren't real Bugzilla::Field objects, but they are a
-    # valid axis, so we don't vailidate them as Bugzilla::Field objects.
-    $field = Bugzilla::Field->check($field_name) 
-        if ($field_name && $field_name !~ /_realname$/);
-    
-    if ($field && $field->is_select) {
-        foreach my $value (@{$field->legal_values}) {
-            push(@sorted, $value->name) if $names->{$value->name};
-        }
-        unshift(@sorted, '---') if ($field_name eq 'resolution'
-                                    || $field->type == FIELD_TYPE_MULTI_SELECT);
-        @sorted = uniq @sorted;
-    }  
-    elsif ($isnumeric) {
-        # It's not a field we are preserving the order of, so sort it 
-        # numerically...
-        @sorted = sort { $a <=> $b } keys %$names;
-    }
-    else {
-        # ...or alphabetically, as appropriate.
-        @sorted = sort keys %$names;
+  my ($names, $isnumeric, $field_name) = @_;
+  my ($field, @sorted);
+
+  # XXX - This is a hack to handle the actual_time/work_time field,
+  # because it's named 'actual_time' in Search.pm but 'work_time' in Field.pm.
+  $_[2] = $field_name = 'work_time' if $field_name eq 'actual_time';
+
+  # _realname fields aren't real Bugzilla::Field objects, but they are a
+  # valid axis, so we don't vailidate them as Bugzilla::Field objects.
+  $field = Bugzilla::Field->check($field_name)
+    if ($field_name && $field_name !~ /_realname$/);
+
+  if ($field && $field->is_select) {
+    foreach my $value (@{$field->legal_values}) {
+      push(@sorted, $value->name) if $names->{$value->name};
     }
-    
-    return @sorted;
+    unshift(@sorted, '---')
+      if ($field_name eq 'resolution' || $field->type == FIELD_TYPE_MULTI_SELECT);
+    @sorted = uniq @sorted;
+  }
+  elsif ($isnumeric) {
+
+    # It's not a field we are preserving the order of, so sort it
+    # numerically...
+    @sorted = sort { $a <=> $b } keys %$names;
+  }
+  else {
+    # ...or alphabetically, as appropriate.
+    @sorted = sort keys %$names;
+  }
+
+  return @sorted;
 }
 
 sub check_value {
-    my ($field, $result, $ismultiselect) = @_;
-
-    my $value;
-    if (!defined $field) {
-        $value = '';
-    }
-    elsif ($field eq '') {
-        $value = ' ';
-    }
-    else {
-        $value = shift @$result;
-        $value = ' ' if (!defined $value || $value eq '');
-        $value = '---' if (($field eq 'resolution' || $ismultiselect ) &&
-                           $value eq ' ');
-    }
-    if ($ismultiselect) {
-        # Some DB servers have a space after the comma, some others don't.
-        return split(/, ?/, $value);
-    } else {
-        return ($value);
-    }
+  my ($field, $result, $ismultiselect) = @_;
+
+  my $value;
+  if (!defined $field) {
+    $value = '';
+  }
+  elsif ($field eq '') {
+    $value = ' ';
+  }
+  else {
+    $value = shift @$result;
+    $value = ' ' if (!defined $value || $value eq '');
+    $value = '---' if (($field eq 'resolution' || $ismultiselect) && $value eq ' ');
+  }
+  if ($ismultiselect) {
+
+    # Some DB servers have a space after the comma, some others don't.
+    return split(/, ?/, $value);
+  }
+  else {
+    return ($value);
+  }
 }
 
 sub get_field_restrictions {
-    my $field = shift;
-    my $cgi = Bugzilla->cgi;
+  my $field = shift;
+  my $cgi   = Bugzilla->cgi;
 
-    return join('&amp;', map {url_quote($field) . '=' . url_quote($_)} $cgi->param($field));
+  return join('&amp;',
+    map { url_quote($field) . '=' . url_quote($_) } $cgi->multi_param($field));
 }
diff --git a/reports.cgi b/reports.cgi
index cdc9d4a87d..be9f7a9aba 100755
--- a/reports.cgi
+++ b/reports.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -23,91 +23,93 @@ use Digest::SHA qw(hmac_sha256_base64);
 
 # If we're using bug groups for products, we should apply those restrictions
 # to viewing reports, as well.  Time to check the login in that case.
-my $user = Bugzilla->login();
-my $cgi = Bugzilla->cgi;
+my $user     = Bugzilla->login();
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # We use a dummy product instance with ID 0, representing all products
 my $product_all = {id => 0};
 bless($product_all, 'Bugzilla::Product');
 
 if (!Bugzilla->feature('old_charts')) {
-    ThrowUserError('feature_disabled', { feature => 'old_charts' });
+  ThrowUserError('feature_disabled', {feature => 'old_charts'});
 }
 
-my $dir       = bz_locations()->{'datadir'} . "/mining";
-my $graph_dir = bz_locations()->{'graphsdir'};
-my $graph_url = basename($graph_dir);
+my $dir        = bz_locations()->{'datadir'} . "/mining";
+my $graph_dir  = bz_locations()->{'graphsdir'};
+my $graph_url  = basename($graph_dir);
 my $product_id = $cgi->param('product_id');
 
 Bugzilla->switch_to_shadow_db();
 
-if (! defined($product_id)) {
-    # Can we do bug charts?
-    (-d $dir && -d $graph_dir) 
-      || ThrowCodeError('chart_dir_nonexistent',
-                        {dir => $dir, graph_dir => $graph_dir});
+if (!defined($product_id)) {
 
-    my %default_sel = map { $_ => 1 } BUG_STATE_OPEN;
+  # Can we do bug charts?
+  (-d $dir && -d $graph_dir)
+    || ThrowCodeError('chart_dir_nonexistent',
+    {dir => $dir, graph_dir => $graph_dir});
 
-    my @datasets;
-    my @data = get_data($dir);
+  my %default_sel = map { $_ => 1 } BUG_STATE_OPEN;
 
-    foreach my $dataset (@data) {
-        my $datasets = {};
-        $datasets->{'value'} = $dataset;
-        $datasets->{'selected'} = $default_sel{$dataset} ? 1 : 0;
-        push(@datasets, $datasets);
-    }
+  my @datasets;
+  my @data = get_data($dir);
+
+  foreach my $dataset (@data) {
+    my $datasets = {};
+    $datasets->{'value'} = $dataset;
+    $datasets->{'selected'} = $default_sel{$dataset} ? 1 : 0;
+    push(@datasets, $datasets);
+  }
 
-    $vars->{'datasets'} = \@datasets;
+  $vars->{'datasets'} = \@datasets;
 
-    print $cgi->header();
+  print $cgi->header();
 }
 else {
-    my $product;
-    # For security and correctness, validate the value of the "product_id" form
-    # variable. Valid values are IDs of those products for which the user has
-    # permissions which appear in the "product_id" drop-down menu on the report
-    # generation form. The product_id 0 is a special case, meaning "All
-    # Products".
-    if ($product_id) {
-        $product = Bugzilla::Product->new($product_id);
-        $product && $user->can_see_product($product->name)
-            || ThrowUserError('product_access_denied',
-                              {id => $product_id});
-    }
-    else {
-        $product = $product_all;
-    }
-
-    # Make sure there is something to plot.
-    my @datasets = $cgi->param('datasets');
-    scalar(@datasets) || ThrowUserError('missing_datasets');
-
-    if (grep { $_ !~ /^[A-Za-z0-9:_-]+$/ } @datasets) {
-        ThrowUserError('invalid_datasets', {'datasets' => \@datasets});
-    }
-
-    # Filenames must not be guessable as they can point to products
-    # you are not allowed to see. Also, different projects can have
-    # the same product IDs.
-    my $project = bz_locations()->{'project'} || '';
-    my $image_file =  join(':', ($project, $product->id, @datasets));
-    my $key = Bugzilla->localconfig->{'site_wide_secret'};
-    $image_file = hmac_sha256_base64($image_file, $key) . '.png';
-    $image_file =~ s/\+/-/g;
-    $image_file =~ s/\//_/g;
-    trick_taint($image_file);
-
-    if (! -e "$graph_dir/$image_file") {
-        generate_chart($dir, "$graph_dir/$image_file", $product, \@datasets);
-    }
-
-    $vars->{'url_image'} = "$graph_url/$image_file";
-
-    print $cgi->header(-Content_Disposition=>'inline; filename=bugzilla_report.html');
+  my $product;
+
+  # For security and correctness, validate the value of the "product_id" form
+  # variable. Valid values are IDs of those products for which the user has
+  # permissions which appear in the "product_id" drop-down menu on the report
+  # generation form. The product_id 0 is a special case, meaning "All
+  # Products".
+  if ($product_id) {
+    $product = Bugzilla::Product->new($product_id);
+    $product && $user->can_see_product($product->name)
+      || ThrowUserError('product_access_denied', {id => $product_id});
+  }
+  else {
+    $product = $product_all;
+  }
+
+  # Make sure there is something to plot.
+  my @datasets = $cgi->multi_param('datasets');
+  scalar(@datasets) || ThrowUserError('missing_datasets');
+
+  if (grep { $_ !~ /^[A-Za-z0-9:_-]+$/ } @datasets) {
+    ThrowUserError('invalid_datasets', {'datasets' => \@datasets});
+  }
+
+  # Filenames must not be guessable as they can point to products
+  # you are not allowed to see. Also, different projects can have
+  # the same product IDs.
+  my $project = bz_locations()->{'project'} || '';
+  my $image_file = join(':', ($project, $product->id, @datasets));
+  my $key = Bugzilla->localconfig->{'site_wide_secret'};
+  $image_file = hmac_sha256_base64($image_file, $key) . '.png';
+  $image_file =~ s/\+/-/g;
+  $image_file =~ s/\//_/g;
+  trick_taint($image_file);
+
+  if (!-e "$graph_dir/$image_file") {
+    generate_chart($dir, "$graph_dir/$image_file", $product, \@datasets);
+  }
+
+  $vars->{'url_image'} = "$graph_url/$image_file";
+
+  print $cgi->header(
+    -Content_Disposition => 'inline; filename=bugzilla_report.html');
 }
 
 $template->process('reports/old-charts.html.tmpl', $vars)
@@ -118,106 +120,107 @@ $template->process('reports/old-charts.html.tmpl', $vars)
 #####################
 
 sub get_data {
-    my $dir = shift;
+  my $dir = shift;
 
-    my @datasets;
-    open(DATA, '<', "$dir/0")
-      || ThrowCodeError('chart_file_open_fail', {filename => "$dir/0"});
+  my @datasets;
+  open(DATA, '<', "$dir/0")
+    || ThrowCodeError('chart_file_open_fail', {filename => "$dir/0"});
 
-    while (<DATA>) {
-        if (/^# fields?: (.+)\s*$/) {
-            @datasets = grep ! /date/i, (split /\|/, $1);
-            last;
-        }
+  while (<DATA>) {
+    if (/^# fields?: (.+)\s*$/) {
+      @datasets = grep !/date/i, (split /\|/, $1);
+      last;
     }
-    close(DATA);
-    return @datasets;
+  }
+  close(DATA);
+  return @datasets;
 }
 
 sub generate_chart {
-    my ($dir, $image_file, $product, $datasets) = @_;
-    my $data_file = $dir . '/' . $product->id;
-
-    if (! open FILE, $data_file) {
-        ThrowCodeError('chart_data_not_generated', {'product' => $product});
-    }
-
-    my $product_in_title = $product->id ? $product->name : 'All Products';
-    my @fields;
-    my @labels = qw(DATE);
-    my %datasets = map { $_ => 1 } @$datasets;
-
-    my %data = ();
-    while (<FILE>) {
-        chomp;
-        next unless $_;
-        if (/^#/) {
-            if (/^# fields?: (.*)\s*$/) {
-                @fields = split /\||\r/, $1;
-                $data{$_} ||= [] foreach @fields;
-                unless ($fields[0] =~ /date/i) {
-                    ThrowCodeError('chart_datafile_corrupt', {'file' => $data_file});
-                }
-                push @labels, grep($datasets{$_}, @fields);
-            }
-            next;
-        }
-
-        unless (@fields) {
-            ThrowCodeError('chart_datafile_corrupt', {'file' => $data_file});
-        }
-
-        my @line = split /\|/;
-        my $date = $line[0];
-        my ($yy, $mm, $dd) = $date =~ /^\d{2}(\d{2})(\d{2})(\d{2})$/;
-        push @{$data{DATE}}, "$mm/$dd/$yy";
-        
-        for my $i (1 .. $#fields) {
-            my $field = $fields[$i];
-            if (! defined $line[$i] or $line[$i] eq '') {
-                # no data point given, don't plot (this will probably
-                # generate loads of Chart::Base warnings, but that's not
-                # our fault.)
-                push @{$data{$field}}, undef;
-            }
-            else {
-                push @{$data{$field}}, $line[$i];
-            }
+  my ($dir, $image_file, $product, $datasets) = @_;
+  my $data_file = $dir . '/' . $product->id;
+
+  if (!open(FILE, '<', $data_file)) {
+    ThrowCodeError('chart_data_not_generated', {'product' => $product});
+  }
+
+  my $product_in_title = $product->id ? $product->name : 'All Products';
+  my @fields;
+  my @labels = qw(DATE);
+  my %datasets = map { $_ => 1 } @$datasets;
+
+  my %data = ();
+  while (<FILE>) {
+    chomp;
+    next unless $_;
+    if (/^#/) {
+      if (/^# fields?: (.*)\s*$/) {
+        @fields = split /\||\r/, $1;
+        $data{$_} ||= [] foreach @fields;
+        unless ($fields[0] =~ /date/i) {
+          ThrowCodeError('chart_datafile_corrupt', {'file' => $data_file});
         }
+        push @labels, grep($datasets{$_}, @fields);
+      }
+      next;
     }
-    
-    shift @labels;
-
-    close FILE;
 
-    if (! @{$data{DATE}}) {
-        ThrowUserError('insufficient_data_points');
+    unless (@fields) {
+      ThrowCodeError('chart_datafile_corrupt', {'file' => $data_file});
     }
 
-    my $img = Chart::Lines->new (800, 600);
-    my $i = 0;
-
-    my $MAXTICKS = 20;      # Try not to show any more x ticks than this.
-    my $skip = 1;
-    if (@{$data{DATE}} > $MAXTICKS) {
-        $skip = int((@{$data{DATE}} + $MAXTICKS - 1) / $MAXTICKS);
+    my @line = split /\|/;
+    my $date = $line[0];
+    my ($yy, $mm, $dd) = $date =~ /^\d{2}(\d{2})(\d{2})(\d{2})$/;
+    push @{$data{DATE}}, "$mm/$dd/$yy";
+
+    for my $i (1 .. $#fields) {
+      my $field = $fields[$i];
+      if (!defined $line[$i] or $line[$i] eq '') {
+
+        # no data point given, don't plot (this will probably
+        # generate loads of Chart::Base warnings, but that's not
+        # our fault.)
+        push @{$data{$field}}, undef;
+      }
+      else {
+        push @{$data{$field}}, $line[$i];
+      }
     }
-
-    my %settings =
-        (
-         "title" => "Status Counts for $product_in_title",
-         "x_label" => "Dates",
-         "y_label" => "Bug Counts",
-         "legend_labels" => \@labels,
-         "skip_x_ticks" => $skip,
-         "y_grid_lines" => "true",
-         "grey_background" => "false",
-         "colors" => {
-                      # default dataset colours are too alike
-                      dataset4 => [0, 0, 0], # black
-                     },
-        );
-    
-    $img->set (%settings);
-    $img->png($image_file, [ @data{('DATE', @labels)} ]);
+  }
+
+  shift @labels;
+
+  close FILE;
+
+  if (!@{$data{DATE}}) {
+    ThrowUserError('insufficient_data_points');
+  }
+
+  my $img = Chart::Lines->new(800, 600);
+  my $i = 0;
+
+  my $MAXTICKS = 20;    # Try not to show any more x ticks than this.
+  my $skip     = 1;
+  if (@{$data{DATE}} > $MAXTICKS) {
+    $skip = int((@{$data{DATE}} + $MAXTICKS - 1) / $MAXTICKS);
+  }
+
+  my %settings = (
+    "title"           => "Status Counts for $product_in_title",
+    "x_label"         => "Dates",
+    "y_label"         => "Bug Counts",
+    "legend_labels"   => \@labels,
+    "skip_x_ticks"    => $skip,
+    "y_grid_lines"    => "true",
+    "grey_background" => "false",
+    "colors"          => {
+
+      # default dataset colours are too alike
+      dataset4 => [0, 0, 0],    # black
+    },
+  );
+
+  $img->set(%settings);
+  $img->png($image_file, [@data{('DATE', @labels)}]);
 }
diff --git a/request.cgi b/request.cgi
index 566781a0c0..e0c9e52fe8 100755
--- a/request.cgi
+++ b/request.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Util;
@@ -23,51 +23,53 @@ use Bugzilla::Component;
 
 # Make sure the user is logged in.
 my $user = Bugzilla->login();
-my $cgi = Bugzilla->cgi;
+my $cgi  = Bugzilla->cgi;
+
 # Force the script to run against the shadow DB. We already validated credentials.
 Bugzilla->switch_to_shadow_db;
 my $template = Bugzilla->template;
-my $action = $cgi->param('action') || '';
-my $format = $template->get_format('request/queue', 
-                                   scalar($cgi->param('format')),
-                                   scalar($cgi->param('ctype')));
+my $action   = $cgi->param('action') || '';
+my $format   = $template->get_format(
+  'request/queue',
+  scalar($cgi->param('format')),
+  scalar($cgi->param('ctype'))
+);
 
 $cgi->set_dated_content_disp("inline", "requests", $format->{extension});
 print $cgi->header($format->{'ctype'});
 
 my $fields;
 $fields->{'requester'}->{'type'} = 'single';
+
 # If the user doesn't restrict their search to requests from the wind
 # (requestee ne '-'), include the requestee for completion.
-unless (defined $cgi->param('requestee')
-        && $cgi->param('requestee') eq '-')
-{
-    $fields->{'requestee'}->{'type'} = 'single';
+unless (defined $cgi->param('requestee') && $cgi->param('requestee') eq '-') {
+  $fields->{'requestee'}->{'type'} = 'single';
 }
 
 Bugzilla::User::match_field($fields);
 
 if ($action eq 'queue') {
-    queue($format);
+  queue($format);
 }
 else {
-    my $flagtypes = get_flag_types();
-    my @types = ('all', @$flagtypes);
-
-    my $vars = {};
-    $vars->{'types'} = \@types;
-    $vars->{'requests'} = {};
-
-    my %components;
-    foreach my $prod (@{$user->get_selectable_products}) {
-        foreach my $comp (@{$prod->components}) {
-            $components{$comp->name} = 1;
-        }
+  my $flagtypes = get_flag_types();
+  my @types = ('all', @$flagtypes);
+
+  my $vars = {};
+  $vars->{'types'}    = \@types;
+  $vars->{'requests'} = {};
+
+  my %components;
+  foreach my $prod (@{$user->get_selectable_products}) {
+    foreach my $comp (@{$prod->components}) {
+      $components{$comp->name} = 1;
     }
-    $vars->{'components'} = [ sort { $a cmp $b } keys %components ];
+  }
+  $vars->{'components'} = [sort { $a cmp $b } keys %components];
 
-    $template->process($format->{'template'}, $vars)
-      || ThrowTemplateError($template->error());
+  $template->process($format->{'template'}, $vars)
+    || ThrowTemplateError($template->error());
 }
 exit;
 
@@ -76,18 +78,19 @@ exit;
 ################################################################################
 
 sub queue {
-    my $format = shift;
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    my $template = Bugzilla->template;
-    my $user = Bugzilla->user;
-    my $userid = $user->id;
-    my $vars = {};
-
-    my $status = validateStatus($cgi->param('status'));
-    my $form_group = validateGroup($cgi->param('group'));
-
-    my $query = 
+  my $format   = shift;
+  my $cgi      = Bugzilla->cgi;
+  my $dbh      = Bugzilla->dbh;
+  my $template = Bugzilla->template;
+  my $user     = Bugzilla->user;
+  my $userid   = $user->id;
+  my $vars     = {};
+
+  my $status     = validateStatus(scalar $cgi->param('status'));
+  my $form_group = validateGroup(scalar $cgi->param('group'));
+
+  my $query =
+
     # Select columns describing each flag, the bug/attachment on which
     # it has been set, who set it, and of whom they are requesting it.
     " SELECT    flags.id, flagtypes.name,
@@ -98,6 +101,7 @@ sub queue {
                 requesters.realname, requesters.login_name,
                 requestees.realname, requestees.login_name, COUNT(privs.group_id),
     " . $dbh->sql_date_format('flags.modification_date', '%Y.%m.%d %H:%i') .
+
     # Use the flags and flagtypes tables for information about the flags,
     # the bugs and attachments tables for target info, the profiles tables
     # for setter and requestee info, the products/components tables
@@ -129,195 +133,209 @@ sub queue {
                   ON bgmap.bug_id = bugs.bug_id
     ";
 
-    if (Bugzilla->params->{or_groups}) {
-        $query .= " AND bgmap.group_id IN (" . $user->groups_as_string . ")";
-        $query .= " WHERE     (privs.group_id IS NULL OR bgmap.group_id IS NOT NULL OR";
-    }
-    else {
-        $query .= " AND bgmap.group_id NOT IN (" . $user->groups_as_string . ")";
-        $query .= " WHERE     (bgmap.group_id IS NULL OR";
-    }
-
-    # Weed out bug the user does not have access to
-    $query .=
-    "            (ccmap.who IS NOT NULL AND cclist_accessible = 1) OR
+  if (Bugzilla->params->{or_groups}) {
+    $query .= " AND bgmap.group_id IN (" . $user->groups_as_string . ")";
+    $query .= " WHERE     (privs.group_id IS NULL OR bgmap.group_id IS NOT NULL OR";
+  }
+  else {
+    $query .= " AND bgmap.group_id NOT IN (" . $user->groups_as_string . ")";
+    $query .= " WHERE     (bgmap.group_id IS NULL OR";
+  }
+
+  # Weed out bug the user does not have access to
+  $query .= "            (ccmap.who IS NOT NULL AND cclist_accessible = 1) OR
                  (bugs.reporter = $userid AND bugs.reporter_accessible = 1) OR
-                 (bugs.assigned_to = $userid) " .
-                 (Bugzilla->params->{'useqacontact'} ? "OR
-                 (bugs.qa_contact = $userid))" : ")");
-
-    unless ($user->is_insider) {
-        $query .= " AND (attachments.attach_id IS NULL
+                 (bugs.assigned_to = $userid) " . (
+    Bugzilla->params->{'useqacontact'}
+    ? "OR
+                 (bugs.qa_contact = $userid))"
+    : ")"
+  );
+
+  unless ($user->is_insider) {
+    $query .= " AND (attachments.attach_id IS NULL
                          OR attachments.isprivate = 0
                          OR attachments.submitter_id = $userid)";
+  }
+
+  # Limit query to pending requests.
+  $query .= " AND flags.status = '?' " unless $status;
+
+  # The set of criteria by which we filter records to display in the queue.
+  my @criteria = ();
+
+  # A list of columns to exclude from the report because the report conditions
+  # limit the data being displayed to exact matches for those columns.
+  # In other words, if we are only displaying "pending" , we don't
+  # need to display a "status" column in the report because the value for that
+  # column will always be the same.
+  my @excluded_columns = ();
+  my $do_union         = $cgi->param('do_union');
+
+  # Filter results by exact email address of requester or requestee.
+  if (my $requester = $cgi->param('requester')) {
+    $requester = $dbh->quote($requester);
+    trick_taint($requester);    # Quoted above
+    push(@criteria, $dbh->sql_istrcmp('requesters.login_name', $requester));
+    push(@excluded_columns, 'requester') unless $do_union;
+  }
+  if (my $requestee = $cgi->param('requestee')) {
+    if ($requestee ne '-') {
+      $requestee = $dbh->quote($requestee);
+      trick_taint($requestee);    # Quoted above
+      push(@criteria, $dbh->sql_istrcmp('requestees.login_name', $requestee));
     }
-
-    # Limit query to pending requests.
-    $query .= " AND flags.status = '?' " unless $status;
-
-    # The set of criteria by which we filter records to display in the queue.
-    my @criteria = ();
-
-    # A list of columns to exclude from the report because the report conditions
-    # limit the data being displayed to exact matches for those columns.
-    # In other words, if we are only displaying "pending" , we don't
-    # need to display a "status" column in the report because the value for that
-    # column will always be the same.
-    my @excluded_columns = ();
-    my $do_union = $cgi->param('do_union');
-
-    # Filter results by exact email address of requester or requestee.
-    if (defined $cgi->param('requester') && $cgi->param('requester') ne "") {
-        my $requester = $dbh->quote($cgi->param('requester'));
-        trick_taint($requester); # Quoted above
-        push(@criteria, $dbh->sql_istrcmp('requesters.login_name', $requester));
-        push(@excluded_columns, 'requester') unless $do_union;
+    else {
+      push(@criteria, "flags.requestee_id IS NULL");
     }
-    if (defined $cgi->param('requestee') && $cgi->param('requestee') ne "") {
-        if ($cgi->param('requestee') ne "-") {
-            my $requestee = $dbh->quote($cgi->param('requestee'));
-            trick_taint($requestee); # Quoted above
-            push(@criteria, $dbh->sql_istrcmp('requestees.login_name', $requestee));
-        }
-        else {
-            push(@criteria, "flags.requestee_id IS NULL");
-        }
-        push(@excluded_columns, 'requestee') unless $do_union;
+    push(@excluded_columns, 'requestee') unless $do_union;
+  }
+
+  # If the user wants requester = foo OR requestee = bar, we have to join
+  # these criteria separately as all other criteria use AND.
+  if (@criteria == 2 && $do_union) {
+    my $union = join(' OR ', @criteria);
+    @criteria = ("($union)");
+  }
+
+  # Filter requests by status: "pending", "granted", "denied", "all"
+  # (which means any), or "fulfilled" (which means "granted" or "denied").
+  if ($status) {
+    if ($status eq "+-") {
+      push(@criteria,         "flags.status IN ('+', '-')");
+      push(@excluded_columns, 'status');
     }
-
-    # If the user wants requester = foo OR requestee = bar, we have to join
-    # these criteria separately as all other criteria use AND.
-    if (@criteria == 2 && $do_union) {
-        my $union = join(' OR ', @criteria);
-        @criteria = ("($union)");
+    elsif ($status ne "all") {
+      push(@criteria,         "flags.status = '$status'");
+      push(@excluded_columns, 'status');
     }
-
-    # Filter requests by status: "pending", "granted", "denied", "all"
-    # (which means any), or "fulfilled" (which means "granted" or "denied").
-    if ($status) {
-        if ($status eq "+-") {
-            push(@criteria, "flags.status IN ('+', '-')");
-            push(@excluded_columns, 'status');
-        }
-        elsif ($status ne "all") {
-            push(@criteria, "flags.status = '$status'");
-            push(@excluded_columns, 'status');
-        }
+  }
+
+  # Filter results by exact product or component.
+  if (defined $cgi->param('product') && $cgi->param('product') ne "") {
+    my $product = Bugzilla::Product->check(scalar $cgi->param('product'));
+    push(@criteria,         "bugs.product_id = " . $product->id);
+    push(@excluded_columns, 'product');
+    if (defined $cgi->param('component') && $cgi->param('component') ne "") {
+      my $component
+        = Bugzilla::Component->check({
+        product => $product, name => scalar $cgi->param('component')
+        });
+      push(@criteria,         "bugs.component_id = " . $component->id);
+      push(@excluded_columns, 'component');
     }
+  }
 
-    # Filter results by exact product or component.
-    if (defined $cgi->param('product') && $cgi->param('product') ne "") {
-        my $product = Bugzilla::Product->check(scalar $cgi->param('product'));
-        push(@criteria, "bugs.product_id = " . $product->id);
-        push(@excluded_columns, 'product');
-        if (defined $cgi->param('component') && $cgi->param('component') ne "") {
-            my $component = Bugzilla::Component->check({ product => $product,
-                                                         name => scalar $cgi->param('component') });
-            push(@criteria, "bugs.component_id = " . $component->id);
-            push(@excluded_columns, 'component');
-        }
-    }
+  # Filter results by flag types.
+  my $form_type = $cgi->param('type');
+  if (defined $form_type && !grep($form_type eq $_, ("", "all"))) {
 
-    # Filter results by flag types.
-    my $form_type = $cgi->param('type');
-    if (defined $form_type && !grep($form_type eq $_, ("", "all"))) {
-        # Check if any matching types are for attachments.  If not, don't show
-        # the attachment column in the report.
-        my $has_attachment_type =
-            Bugzilla::FlagType::count({ 'name' => $form_type,
-                                        'target_type' => 'attachment' });
-
-        if (!$has_attachment_type) { push(@excluded_columns, 'attachment') }
-
-        my $quoted_form_type = $dbh->quote($form_type);
-        trick_taint($quoted_form_type); # Already SQL quoted
-        push(@criteria, "flagtypes.name = " . $quoted_form_type);
-        push(@excluded_columns, 'type');
-    }
+    # Check if any matching types are for attachments.  If not, don't show
+    # the attachment column in the report.
+    my $has_attachment_type = Bugzilla::FlagType::count(
+      {'name' => $form_type, 'target_type' => 'attachment'});
+
+    if (!$has_attachment_type) { push(@excluded_columns, 'attachment') }
 
-    $query .= ' AND ' . join(' AND ', @criteria) if scalar(@criteria);
+    my $quoted_form_type = $dbh->quote($form_type);
+    trick_taint($quoted_form_type);    # Already SQL quoted
+    push(@criteria,         "flagtypes.name = " . $quoted_form_type);
+    push(@excluded_columns, 'type');
+  }
 
-    # Group the records by flag ID so we don't get multiple rows of data
-    # for each flag.  This is only necessary because of the code that
-    # removes flags on bugs the user is unauthorized to access.
-    $query .= ' ' . $dbh->sql_group_by('flags.id',
-               'flagtypes.name, flags.status, flags.bug_id, bugs.short_desc,
+  $query .= ' AND ' . join(' AND ', @criteria) if scalar(@criteria);
+
+  # Group the records by flag ID so we don't get multiple rows of data
+  # for each flag.  This is only necessary because of the code that
+  # removes flags on bugs the user is unauthorized to access.
+  $query .= ' ' . $dbh->sql_group_by(
+    'flags.id', 'flagtypes.name, flags.status, flags.bug_id, bugs.short_desc,
                 products.name, components.name, flags.attach_id,
                 attachments.description, requesters.realname,
                 requesters.login_name, requestees.realname,
                 requestees.login_name, flags.modification_date,
                 cclist_accessible, bugs.reporter, bugs.reporter_accessible,
-                bugs.assigned_to');
-
-    # Group the records, in other words order them by the group column
-    # so the loop in the display template can break them up into separate
-    # tables every time the value in the group column changes.
-
-    $form_group ||= "requestee";
-    if ($form_group eq "requester") {
-        $query .= " ORDER BY requesters.realname, requesters.login_name";
-    }
-    elsif ($form_group eq "requestee") {
-        $query .= " ORDER BY requestees.realname, requestees.login_name";
+                bugs.assigned_to'
+  );
+
+  # Group the records, in other words order them by the group column
+  # so the loop in the display template can break them up into separate
+  # tables every time the value in the group column changes.
+
+  $form_group ||= "requestee";
+  if ($form_group eq "requester") {
+    $query .= " ORDER BY requesters.realname, requesters.login_name";
+  }
+  elsif ($form_group eq "requestee") {
+    $query .= " ORDER BY requestees.realname, requestees.login_name";
+  }
+  elsif ($form_group eq "category") {
+    $query .= " ORDER BY products.name, components.name";
+  }
+  elsif ($form_group eq "type") {
+    $query .= " ORDER BY flagtypes.name";
+  }
+
+  # Order the records (within each group).
+  $query .= " , flags.modification_date";
+
+  # Pass the query to the template for use when debugging this script.
+  $vars->{'query'} = $query;
+  $vars->{'debug'} = $cgi->param('debug') ? 1 : 0;
+
+  my $results  = $dbh->selectall_arrayref($query);
+  my @requests = ();
+  foreach my $result (@$results) {
+    my @data    = @$result;
+    my $request = {
+      'id'             => $data[0],
+      'type'           => $data[1],
+      'status'         => $data[2],
+      'bug_id'         => $data[3],
+      'bug_summary'    => $data[4],
+      'category'       => "$data[5]: $data[6]",
+      'attach_id'      => $data[7],
+      'attach_summary' => $data[8],
+      'requester'      => ($data[9] ? "$data[9] <$data[10]>" : $data[10]),
+      'requestee'      => ($data[11] ? "$data[11] <$data[12]>" : $data[12]),
+      'restricted'     => $data[13] ? 1 : 0,
+      'created'        => $data[14]
+    };
+    push(@requests, $request);
+  }
+
+  # Get a list of request type names to use in the filter form.
+  my @types     = ("all");
+  my $flagtypes = get_flag_types();
+  push(@types, @$flagtypes);
+
+  $vars->{'excluded_columns'} = \@excluded_columns;
+  $vars->{'group_field'}      = $form_group;
+  $vars->{'requests'}         = \@requests;
+  $vars->{'types'}            = \@types;
+
+  # This code is needed to populate the Product and Component select fields.
+  my ($products, %components);
+  if (Bugzilla->params->{useclassification}) {
+    foreach my $class (@{$user->get_selectable_classifications}) {
+      push @$products, @{$user->get_selectable_products($class->id)};
     }
-    elsif ($form_group eq "category") {
-        $query .= " ORDER BY products.name, components.name";
-    }
-    elsif ($form_group eq "type") {
-        $query .= " ORDER BY flagtypes.name";
-    }
-
-    # Order the records (within each group).
-    $query .= " , flags.modification_date";
-
-    # Pass the query to the template for use when debugging this script.
-    $vars->{'query'} = $query;
-    $vars->{'debug'} = $cgi->param('debug') ? 1 : 0;
-
-    my $results = $dbh->selectall_arrayref($query);
-    my @requests = ();
-    foreach my $result (@$results) {
-        my @data = @$result;
-        my $request = {
-          'id'              => $data[0] , 
-          'type'            => $data[1] , 
-          'status'          => $data[2] , 
-          'bug_id'          => $data[3] , 
-          'bug_summary'     => $data[4] , 
-          'category'        => "$data[5]: $data[6]" , 
-          'attach_id'       => $data[7] , 
-          'attach_summary'  => $data[8] ,
-          'requester'       => ($data[9] ? "$data[9] <$data[10]>" : $data[10]) , 
-          'requestee'       => ($data[11] ? "$data[11] <$data[12]>" : $data[12]) , 
-          'restricted'      => $data[13] ? 1 : 0,
-          'created'         => $data[14]
-        };
-        push(@requests, $request);
-    }
-
-    # Get a list of request type names to use in the filter form.
-    my @types = ("all");
-    my $flagtypes = get_flag_types();
-    push(@types, @$flagtypes);
-
-    $vars->{'excluded_columns'} = \@excluded_columns;
-    $vars->{'group_field'} = $form_group;
-    $vars->{'requests'} = \@requests;
-    $vars->{'types'} = \@types;
-
-    my %components;
-    foreach my $prod (@{$user->get_selectable_products}) {
-        foreach my $comp (@{$prod->components}) {
-            $components{$comp->name} = 1;
-        }
-    }
-    $vars->{'components'} = [ sort { $a cmp $b } keys %components ];
-
-    $vars->{'urlquerypart'} = $cgi->canonicalise_query('ctype');
-
-    # Generate and return the UI (HTML page) from the appropriate template.
-    $template->process($format->{'template'}, $vars)
-      || ThrowTemplateError($template->error());
+  }
+  else {
+    $products = $user->get_selectable_products;
+  }
+
+  foreach my $product (@$products) {
+    $components{$_->name} = 1 foreach @{$product->components};
+  }
+  $vars->{'products'}   = $products;
+  $vars->{'components'} = [sort keys %components];
+
+  $vars->{'urlquerypart'} = $cgi->canonicalise_query('ctype');
+
+  # Generate and return the UI (HTML page) from the appropriate template.
+  $template->process($format->{'template'}, $vars)
+    || ThrowTemplateError($template->error());
 }
 
 ################################################################################
@@ -325,33 +343,35 @@ sub queue {
 ################################################################################
 
 sub validateStatus {
-    my $status = shift;
-    return if !defined $status;
+  my $status = shift;
+  return if !defined $status;
 
-    grep($status eq $_, qw(? +- + - all))
-      || ThrowUserError("flag_status_invalid", { status => $status });
-    trick_taint($status);
-    return $status;
+  grep($status eq $_, qw(? +- + - all))
+    || ThrowUserError("flag_status_invalid", {status => $status});
+  trick_taint($status);
+  return $status;
 }
 
 sub validateGroup {
-    my $group = shift;
-    return if !defined $group;
+  my $group = shift;
+  return if !defined $group;
 
-    grep($group eq $_, qw(requester requestee category type))
-      || ThrowUserError("request_queue_group_invalid", { group => $group });
-    trick_taint($group);
-    return $group;
+  grep($group eq $_, qw(requester requestee category type))
+    || ThrowUserError("request_queue_group_invalid", {group => $group});
+  trick_taint($group);
+  return $group;
 }
 
 # Returns all flag types which have at least one flag of this type.
 # If a flag type is inactive but still has flags, we want it.
 sub get_flag_types {
-    my $dbh = Bugzilla->dbh;
-    my $flag_types = $dbh->selectcol_arrayref('SELECT DISTINCT name
+  my $dbh        = Bugzilla->dbh;
+  my $flag_types = $dbh->selectcol_arrayref(
+    'SELECT DISTINCT name
                                                  FROM flagtypes
                                                 WHERE flagtypes.id IN
                                                       (SELECT DISTINCT type_id FROM flags)
-                                             ORDER BY name');
-    return $flag_types;
+                                             ORDER BY name'
+  );
+  return $flag_types;
 }
diff --git a/rest.cgi b/rest.cgi
index f12fb64c44..9681849b21 100755
--- a/rest.cgi
+++ b/rest.cgi
@@ -6,26 +6,14 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::Error;
-use Bugzilla::WebService::Constants;
-BEGIN {
-    if (!Bugzilla->feature('rest')
-        || !Bugzilla->feature('jsonrpc'))
-    {
-        ThrowUserError('feature_disabled', { feature => 'rest' });
-    }
-}
-use Bugzilla::WebService::Server::REST;
+
 Bugzilla->usage_mode(USAGE_MODE_REST);
-local @INC = (bz_locations()->{extensionsdir}, @INC);
-my $server = new Bugzilla::WebService::Server::REST;
-$server->version('1.1');
-$server->handle();
+Bugzilla->api_server->handle();
diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index 889d7f3e6e..26ed6e34b1 100755
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Bug;
@@ -26,26 +26,29 @@ use Bugzilla::Token;
 ###########################################################################
 
 sub get_string {
-    my ($san_tag, $vars) = @_;
-    $vars->{'san_tag'} = $san_tag;
-    return get_text('sanitycheck', $vars);
+  my ($san_tag, $vars) = @_;
+  $vars->{'san_tag'} = $san_tag;
+  return get_text('sanitycheck', $vars);
 }
 
 sub Status {
-    my ($san_tag, $vars, $alert) = @_;
-    my $cgi = Bugzilla->cgi;
-    return if (!$alert && Bugzilla->usage_mode == USAGE_MODE_CMDLINE && !$cgi->param('verbose'));
-
-    if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-        my $output = $cgi->param('output') || '';
-        my $linebreak = $alert ? "\nALERT: " : "\n";
-        $cgi->param('error_found', 1) if $alert;
-        $cgi->param('output', $output . $linebreak . get_string($san_tag, $vars));
-    }
-    else {
-        my $start_tag = $alert ? '<p class="alert">' : '<p>';
-        say $start_tag . get_string($san_tag, $vars) . "</p>";
-    }
+  my ($san_tag, $vars, $alert) = @_;
+  my $cgi = Bugzilla->cgi;
+  return
+    if (!$alert
+    && Bugzilla->usage_mode == USAGE_MODE_CMDLINE
+    && !$cgi->param('verbose'));
+
+  if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+    my $output = $cgi->param('output') || '';
+    my $linebreak = $alert ? "\nALERT: " : "\n";
+    $cgi->param('error_found', 1) if $alert;
+    $cgi->param('output', $output . $linebreak . get_string($san_tag, $vars));
+  }
+  else {
+    my $start_tag = $alert ? '<p class="alert">' : '<p>';
+    say $start_tag . get_string($san_tag, $vars) . "</p>";
+  }
 }
 
 ###########################################################################
@@ -56,25 +59,26 @@ my $user = Bugzilla->login(LOGIN_REQUIRED);
 
 my $cgi = Bugzilla->cgi;
 my $dbh = Bugzilla->dbh;
+
 # If the result of the sanity check is sent per email, then we have to
 # take the user prefs into account rather than querying the web browser.
 my $template;
 if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-    $template = Bugzilla->template_inner($user->setting('lang'));
+  $template = Bugzilla->template_inner($user->setting('lang'));
 }
 else {
-    $template = Bugzilla->template;
-
-    # Only check the token if we are running this script from the
-    # web browser and a parameter is passed to the script.
-    # XXX - Maybe these two parameters should be deleted once logged in?
-    $cgi->delete('GoAheadAndLogIn', 'Bugzilla_restrictlogin');
-    if (scalar($cgi->param())) {
-        my $token = $cgi->param('token');
-        check_hash_token($token, ['sanitycheck']);
-    }
+  $template = Bugzilla->template;
+
+  # Only check the token if we are running this script from the
+  # web browser and a parameter is passed to the script.
+  # XXX - Maybe these two parameters should be deleted once logged in?
+  $cgi->delete('GoAheadAndLogIn', 'Bugzilla_restrictlogin');
+  if (scalar $cgi->multi_param()) {
+    my $token = $cgi->param('token');
+    check_hash_token($token, ['sanitycheck']);
+  }
 }
-my $vars = {};
+my $vars            = {};
 my $clear_memcached = 0;
 
 print $cgi->header() unless Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
@@ -83,13 +87,12 @@ print $cgi->header() unless Bugzilla->usage_mode == USAGE_MODE_CMDLINE;
 # As this script can now alter the group_control_map table, we no longer
 # let users with editbugs privs run it anymore.
 $user->in_group("editcomponents")
-  || ThrowUserError("auth_failure", {group  => "editcomponents",
-                                     action => "run",
-                                     object => "sanity_check"});
+  || ThrowUserError("auth_failure",
+  {group => "editcomponents", action => "run", object => "sanity_check"});
 
 unless (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-    $template->process('admin/sanitycheck/list.html.tmpl', $vars)
-      || ThrowTemplateError($template->error());
+  $template->process('admin/sanitycheck/list.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 
 ###########################################################################
@@ -97,25 +100,28 @@ unless (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
 ###########################################################################
 
 if ($cgi->param('createmissinggroupcontrolmapentries')) {
-    Status('group_control_map_entries_creation');
+  Status('group_control_map_entries_creation');
 
-    my $na    = CONTROLMAPNA;
-    my $shown = CONTROLMAPSHOWN;
-    my $insertsth = $dbh->prepare(
-        qq{INSERT INTO group_control_map
+  my $na        = CONTROLMAPNA;
+  my $shown     = CONTROLMAPSHOWN;
+  my $insertsth = $dbh->prepare(
+    qq{INSERT INTO group_control_map
                        (group_id, product_id, membercontrol, othercontrol)
-                VALUES (?, ?, $shown, $na)});
+                VALUES (?, ?, $shown, $na)}
+  );
 
-    my $updatesth = $dbh->prepare(qq{UPDATE group_control_map
+  my $updatesth = $dbh->prepare(
+    qq{UPDATE group_control_map
                                         SET membercontrol = $shown
                                       WHERE group_id   = ?
-                                        AND product_id = ?});
-    my $counter = 0;
-
-    # Find all group/product combinations used for bugs but not set up
-    # correctly in group_control_map
-    my $invalid_combinations = $dbh->selectall_arrayref(
-        qq{    SELECT bugs.product_id,
+                                        AND product_id = ?}
+  );
+  my $counter = 0;
+
+  # Find all group/product combinations used for bugs but not set up
+  # correctly in group_control_map
+  my $invalid_combinations = $dbh->selectall_arrayref(
+    qq{    SELECT bugs.product_id,
                       bgm.group_id,
                       gcm.membercontrol,
                       groups.name,
@@ -131,28 +137,32 @@ if ($cgi->param('createmissinggroupcontrolmapentries')) {
                    ON bugs.product_id = gcm.product_id
                   AND    bgm.group_id = gcm.group_id
                 WHERE COALESCE(gcm.membercontrol, $na) = $na
-          } . $dbh->sql_group_by('bugs.product_id, bgm.group_id',
-                                 'gcm.membercontrol, groups.name, products.name'));
-
-    foreach (@$invalid_combinations) {
-        my ($product_id, $group_id, $currentmembercontrol,
-            $group_name, $product_name) = @$_;
-
-        $counter++;
-        if (defined($currentmembercontrol)) {
-            Status('group_control_map_entries_update',
-                   {group_name => $group_name, product_name => $product_name});
-            $updatesth->execute($group_id, $product_id);
-        }
-        else {
-            Status('group_control_map_entries_generation',
-                   {group_name => $group_name, product_name => $product_name});
-            $insertsth->execute($group_id, $product_id);
-        }
+          }
+      . $dbh->sql_group_by(
+      'bugs.product_id, bgm.group_id',
+      'gcm.membercontrol, groups.name, products.name'
+      )
+  );
+
+  foreach (@$invalid_combinations) {
+    my ($product_id, $group_id, $currentmembercontrol, $group_name, $product_name)
+      = @$_;
+
+    $counter++;
+    if (defined($currentmembercontrol)) {
+      Status('group_control_map_entries_update',
+        {group_name => $group_name, product_name => $product_name});
+      $updatesth->execute($group_id, $product_id);
     }
+    else {
+      Status('group_control_map_entries_generation',
+        {group_name => $group_name, product_name => $product_name});
+      $insertsth->execute($group_id, $product_id);
+    }
+  }
 
-    Status('group_control_map_entries_repaired', {counter => $counter});
-    $clear_memcached = 1 if $counter;
+  Status('group_control_map_entries_repaired', {counter => $counter});
+  $clear_memcached = 1 if $counter;
 }
 
 ###########################################################################
@@ -160,26 +170,32 @@ if ($cgi->param('createmissinggroupcontrolmapentries')) {
 ###########################################################################
 
 if ($cgi->param('repair_creation_date')) {
-    Status('bug_creation_date_start');
-
-    my $bug_ids = $dbh->selectcol_arrayref('SELECT bug_id FROM bugs
-                                            WHERE creation_ts IS NULL');
-
-    my $sth_UpdateDate = $dbh->prepare('UPDATE bugs SET creation_ts = ?
-                                        WHERE bug_id = ?');
-
-    # All bugs have an entry in the 'longdescs' table when they are created,
-    # even if no comment is required.
-    my $sth_getDate = $dbh->prepare('SELECT MIN(bug_when) FROM longdescs
-                                     WHERE bug_id = ?');
-
-    foreach my $bugid (@$bug_ids) {
-        $sth_getDate->execute($bugid);
-        my $date = $sth_getDate->fetchrow_array;
-        $sth_UpdateDate->execute($date, $bugid);
-    }
-    Status('bug_creation_date_fixed', {bug_count => scalar(@$bug_ids)});
-    $clear_memcached = 1 if @$bug_ids;
+  Status('bug_creation_date_start');
+
+  my $bug_ids = $dbh->selectcol_arrayref(
+    'SELECT bug_id FROM bugs
+                                            WHERE creation_ts IS NULL'
+  );
+
+  my $sth_UpdateDate = $dbh->prepare(
+    'UPDATE bugs SET creation_ts = ?
+                                        WHERE bug_id = ?'
+  );
+
+  # All bugs have an entry in the 'longdescs' table when they are created,
+  # even if no comment is required.
+  my $sth_getDate = $dbh->prepare(
+    'SELECT MIN(bug_when) FROM longdescs
+                                     WHERE bug_id = ?'
+  );
+
+  foreach my $bugid (@$bug_ids) {
+    $sth_getDate->execute($bugid);
+    my $date = $sth_getDate->fetchrow_array;
+    $sth_UpdateDate->execute($date, $bugid);
+  }
+  Status('bug_creation_date_fixed', {bug_count => scalar(@$bug_ids)});
+  $clear_memcached = 1 if @$bug_ids;
 }
 
 ###########################################################################
@@ -187,16 +203,19 @@ if ($cgi->param('repair_creation_date')) {
 ###########################################################################
 
 if ($cgi->param('repair_everconfirmed')) {
-    Status('everconfirmed_start');
+  Status('everconfirmed_start');
 
-    my @confirmed_open_states = grep {$_ ne 'UNCONFIRMED'} BUG_STATE_OPEN;
-    my $confirmed_open_states = join(', ', map {$dbh->quote($_)} @confirmed_open_states);
+  my @confirmed_open_states = grep { $_ ne 'UNCONFIRMED' } BUG_STATE_OPEN;
+  my $confirmed_open_states
+    = join(', ', map { $dbh->quote($_) } @confirmed_open_states);
 
-    $dbh->do("UPDATE bugs SET everconfirmed = 0 WHERE bug_status = 'UNCONFIRMED'");
-    $dbh->do("UPDATE bugs SET everconfirmed = 1 WHERE bug_status IN ($confirmed_open_states)");
+  $dbh->do("UPDATE bugs SET everconfirmed = 0 WHERE bug_status = 'UNCONFIRMED'");
+  $dbh->do(
+    "UPDATE bugs SET everconfirmed = 1 WHERE bug_status IN ($confirmed_open_states)"
+  );
 
-    Status('everconfirmed_end');
-    $clear_memcached = 1;
+  Status('everconfirmed_end');
+  $clear_memcached = 1;
 }
 
 ###########################################################################
@@ -204,20 +223,22 @@ if ($cgi->param('repair_everconfirmed')) {
 ###########################################################################
 
 if ($cgi->param('repair_bugs_fulltext')) {
-    Status('bugs_fulltext_start');
+  Status('bugs_fulltext_start');
 
-    my $bug_ids = $dbh->selectcol_arrayref('SELECT bugs.bug_id
+  my $bug_ids = $dbh->selectcol_arrayref(
+    'SELECT bugs.bug_id
                                             FROM bugs
                                             LEFT JOIN bugs_fulltext
                                             ON bugs_fulltext.bug_id = bugs.bug_id
-                                            WHERE bugs_fulltext.bug_id IS NULL');
+                                            WHERE bugs_fulltext.bug_id IS NULL'
+  );
 
-    foreach my $bugid (@$bug_ids) {
-        Bugzilla::Bug->new($bugid)->_sync_fulltext( new_bug => 1 );
-    }
+  foreach my $bugid (@$bug_ids) {
+    Bugzilla::Bug->new($bugid)->_sync_fulltext(new_bug => 1);
+  }
 
-    Status('bugs_fulltext_fixed', {bug_count => scalar(@$bug_ids)});
-    $clear_memcached = 1 if @$bug_ids;
+  Status('bugs_fulltext_fixed', {bug_count => scalar(@$bug_ids)});
+  $clear_memcached = 1 if @$bug_ids;
 }
 
 ###########################################################################
@@ -225,44 +246,46 @@ if ($cgi->param('repair_bugs_fulltext')) {
 ###########################################################################
 
 if ($cgi->param('rescanallBugMail')) {
-    require Bugzilla::BugMail;
+  require Bugzilla::BugMail;
 
-    Status('send_bugmail_start');
-    my $time = $dbh->sql_date_math('NOW()', '-', 30, 'MINUTE');
+  Status('send_bugmail_start');
+  my $time = $dbh->sql_date_math('NOW()', '-', 30, 'MINUTE');
 
-    my $list = $dbh->selectcol_arrayref(qq{
+  my $list = $dbh->selectcol_arrayref(
+    qq{
                                         SELECT bug_id
                                           FROM bugs 
                                          WHERE (lastdiffed IS NULL
                                                 OR lastdiffed < delta_ts)
                                            AND delta_ts < $time
-                                      ORDER BY bug_id});
-
-    Status('send_bugmail_status', {bug_count => scalar(@$list)});
-
-    # We cannot simply look at the bugs_activity table to find who did the
-    # last change in a given bug, as e.g. adding a comment doesn't add any
-    # entry to this table. And some other changes may be private
-    # (such as time-related changes or private attachments or comments)
-    # and so choosing this user as being the last one having done a change
-    # for the bug may be problematic. So the best we can do at this point
-    # is to choose the currently logged in user for email notification.
-    $vars->{'changer'} = $user;
-
-    foreach my $bugid (@$list) {
-        Bugzilla::BugMail::Send($bugid, $vars);
-    }
-
-    if (@$list) {
-        Status('send_bugmail_end');
-        Bugzilla->memcached->clear_all();
-    }
-
-    unless (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-        $template->process('global/footer.html.tmpl', $vars)
-          || ThrowTemplateError($template->error());
-    }
-    exit;
+                                      ORDER BY bug_id}
+  );
+
+  Status('send_bugmail_status', {bug_count => scalar(@$list)});
+
+  # We cannot simply look at the bugs_activity table to find who did the
+  # last change in a given bug, as e.g. adding a comment doesn't add any
+  # entry to this table. And some other changes may be private
+  # (such as time-related changes or private attachments or comments)
+  # and so choosing this user as being the last one having done a change
+  # for the bug may be problematic. So the best we can do at this point
+  # is to choose the currently logged in user for email notification.
+  $vars->{'changer'} = $user;
+
+  foreach my $bugid (@$list) {
+    Bugzilla::BugMail::Send($bugid, $vars);
+  }
+
+  if (@$list) {
+    Status('send_bugmail_end');
+    Bugzilla->memcached->clear_all();
+  }
+
+  unless (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
+    $template->process('global/footer.html.tmpl', $vars)
+      || ThrowTemplateError($template->error());
+  }
+  exit;
 }
 
 ###########################################################################
@@ -270,32 +293,37 @@ if ($cgi->param('rescanallBugMail')) {
 ###########################################################################
 
 if ($cgi->param('remove_invalid_bug_references')) {
-    Status('bug_reference_deletion_start');
+  Status('bug_reference_deletion_start');
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    foreach my $pair ('attachments/', 'bug_group_map/', 'bugs_activity/',
-                      'bugs_fulltext/', 'cc/',
-                      'dependencies/blocked', 'dependencies/dependson',
-                      'duplicates/dupe', 'duplicates/dupe_of',
-                      'flags/', 'keywords/', 'longdescs/') {
+  foreach my $pair (
+    'attachments/',           'bug_group_map/',
+    'bugs_activity/',         'bugs_fulltext/',
+    'cc/',                    'dependencies/blocked',
+    'dependencies/dependson', 'duplicates/dupe',
+    'duplicates/dupe_of',     'flags/',
+    'keywords/',              'longdescs/'
+    )
+  {
 
-        my ($table, $field) = split('/', $pair);
-        $field ||= "bug_id";
+    my ($table, $field) = split('/', $pair);
+    $field ||= "bug_id";
 
-        my $bug_ids =
-          $dbh->selectcol_arrayref("SELECT $table.$field FROM $table
+    my $bug_ids = $dbh->selectcol_arrayref(
+      "SELECT $table.$field FROM $table
                                     LEFT JOIN bugs ON $table.$field = bugs.bug_id
-                                    WHERE bugs.bug_id IS NULL");
+                                    WHERE bugs.bug_id IS NULL"
+    );
 
-        if (scalar(@$bug_ids)) {
-            $dbh->do("DELETE FROM $table WHERE $field IN (" . join(',', @$bug_ids) . ")");
-            $clear_memcached = 1;
-        }
+    if (scalar(@$bug_ids)) {
+      $dbh->do("DELETE FROM $table WHERE $field IN (" . join(',', @$bug_ids) . ")");
+      $clear_memcached = 1;
     }
+  }
 
-    $dbh->bz_commit_transaction();
-    Status('bug_reference_deletion_end');
+  $dbh->bz_commit_transaction();
+  Status('bug_reference_deletion_end');
 }
 
 ###########################################################################
@@ -303,25 +331,26 @@ if ($cgi->param('remove_invalid_bug_references')) {
 ###########################################################################
 
 if ($cgi->param('remove_invalid_attach_references')) {
-    Status('attachment_reference_deletion_start');
+  Status('attachment_reference_deletion_start');
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    my $attach_ids =
-        $dbh->selectcol_arrayref('SELECT attach_data.id
+  my $attach_ids = $dbh->selectcol_arrayref(
+    'SELECT attach_data.id
                                     FROM attach_data
                                LEFT JOIN attachments
                                       ON attachments.attach_id = attach_data.id
-                                   WHERE attachments.attach_id IS NULL');
+                                   WHERE attachments.attach_id IS NULL'
+  );
 
-    if (scalar(@$attach_ids)) {
-        $dbh->do('DELETE FROM attach_data WHERE id IN (' .
-                 join(',', @$attach_ids) . ')');
-    }
+  if (scalar(@$attach_ids)) {
+    $dbh->do(
+      'DELETE FROM attach_data WHERE id IN (' . join(',', @$attach_ids) . ')');
+  }
 
-    $dbh->bz_commit_transaction();
-    Status('attachment_reference_deletion_end');
-    $clear_memcached = 1 if @$attach_ids;
+  $dbh->bz_commit_transaction();
+  Status('attachment_reference_deletion_end');
+  $clear_memcached = 1 if @$attach_ids;
 }
 
 ###########################################################################
@@ -329,30 +358,33 @@ if ($cgi->param('remove_invalid_attach_references')) {
 ###########################################################################
 
 if ($cgi->param('remove_old_whine_targets')) {
-    Status('whines_obsolete_target_deletion_start');
+  Status('whines_obsolete_target_deletion_start');
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    foreach my $target (['groups', 'id', MAILTO_GROUP],
-                        ['profiles', 'userid', MAILTO_USER])
-    {
-        my ($table, $col, $type) = @$target;
-        my $old_ids =
-          $dbh->selectcol_arrayref("SELECT DISTINCT mailto
+  foreach my $target (['groups', 'id', MAILTO_GROUP],
+    ['profiles', 'userid', MAILTO_USER])
+  {
+    my ($table, $col, $type) = @$target;
+    my $old_ids = $dbh->selectcol_arrayref(
+      "SELECT DISTINCT mailto
                                       FROM whine_schedules
                                  LEFT JOIN $table
                                         ON $table.$col = whine_schedules.mailto
-                                     WHERE mailto_type = $type AND $table.$col IS NULL");
-
-        if (scalar(@$old_ids)) {
-            $dbh->do("DELETE FROM whine_schedules
-                       WHERE mailto_type = $type AND mailto IN (" .
-                       join(',', @$old_ids) . ")");
-            $clear_memcached = 1;
-        }
+                                     WHERE mailto_type = $type AND $table.$col IS NULL"
+    );
+
+    if (scalar(@$old_ids)) {
+      $dbh->do(
+        "DELETE FROM whine_schedules
+                       WHERE mailto_type = $type AND mailto IN ("
+          . join(',', @$old_ids) . ")"
+      );
+      $clear_memcached = 1;
     }
-    $dbh->bz_commit_transaction();
-    Status('whines_obsolete_target_deletion_end');
+  }
+  $dbh->bz_commit_transaction();
+  Status('whines_obsolete_target_deletion_end');
 }
 
 # If any repairs were attempted or made, we need to clear memcached to ensure
@@ -363,7 +395,7 @@ Bugzilla->memcached->clear_all() if $clear_memcached;
 # Repair hook
 ###########################################################################
 
-Bugzilla::Hook::process('sanitycheck_repair', { status => \&Status });
+Bugzilla::Hook::process('sanitycheck_repair', {status => \&Status});
 
 ###########################################################################
 # Checks
@@ -393,182 +425,211 @@ Status('checks_start');
 #        The same goes for series; no bug for that yet.
 
 sub CrossCheck {
-    my $table = shift @_;
-    my $field = shift @_;
-    my $dbh = Bugzilla->dbh;
+  my $table = shift @_;
+  my $field = shift @_;
+  my $dbh   = Bugzilla->dbh;
 
-    Status('cross_check_to', {table => $table, field => $field});
+  Status('cross_check_to', {table => $table, field => $field});
 
-    while (@_) {
-        my $ref = shift @_;
-        my ($refertable, $referfield, $keyname, $exceptions) = @$ref;
+  while (@_) {
+    my $ref = shift @_;
+    my ($refertable, $referfield, $keyname, $exceptions) = @$ref;
 
-        $exceptions ||= [];
-        my %exceptions = map { $_ => 1 } @$exceptions;
+    $exceptions ||= [];
+    my %exceptions = map { $_ => 1 } @$exceptions;
 
-        Status('cross_check_from', {table => $refertable, field => $referfield});
+    Status('cross_check_from', {table => $refertable, field => $referfield});
 
-        my $query = qq{SELECT DISTINCT $refertable.$referfield} .
-            ($keyname ? qq{, $refertable.$keyname } : q{}) .
-                     qq{ FROM $refertable
+    my $query
+      = qq{SELECT DISTINCT $refertable.$referfield}
+      . ($keyname ? qq{, $refertable.$keyname } : q{})
+      . qq{ FROM $refertable
                     LEFT JOIN $table
                            ON $refertable.$referfield = $table.$field
                         WHERE $table.$field IS NULL
                           AND $refertable.$referfield IS NOT NULL};
 
-        my $sth = $dbh->prepare($query);
-        $sth->execute;
-
-        my $has_bad_references = 0;
-
-        while (my ($value, $key) = $sth->fetchrow_array) {
-            next if $exceptions{$value};
-            Status('cross_check_alert', {value => $value, table => $refertable,
-                                         field => $referfield, keyname => $keyname,
-                                         key => $key}, 'alert');
-            $has_bad_references = 1;
-        }
-        # References to non existent bugs can be safely removed, bug 288461
-        if ($table eq 'bugs' && $has_bad_references) {
-            Status('cross_check_bug_has_references');
-        }
-        # References to non existent attachments can be safely removed.
-        if ($table eq 'attachments' && $has_bad_references) {
-            Status('cross_check_attachment_has_references');
-        }
+    my $sth = $dbh->prepare($query);
+    $sth->execute;
+
+    my $has_bad_references = 0;
+
+    while (my ($value, $key) = $sth->fetchrow_array) {
+      next if $exceptions{$value};
+      Status(
+        'cross_check_alert',
+        {
+          value   => $value,
+          table   => $refertable,
+          field   => $referfield,
+          keyname => $keyname,
+          key     => $key
+        },
+        'alert'
+      );
+      $has_bad_references = 1;
+    }
+
+    # References to non existent bugs can be safely removed, bug 288461
+    if ($table eq 'bugs' && $has_bad_references) {
+      Status('cross_check_bug_has_references');
+    }
+
+    # References to non existent attachments can be safely removed.
+    if ($table eq 'attachments' && $has_bad_references) {
+      Status('cross_check_attachment_has_references');
     }
+  }
 }
 
-CrossCheck('classifications', 'id',
-           ['products', 'classification_id']);
-
-CrossCheck("keyworddefs", "id",
-           ["keywords", "keywordid"]);
-
-CrossCheck("fielddefs", "id",
-           ["bugs_activity", "fieldid"],
-           ['profiles_activity', 'fieldid']);
-
-CrossCheck("flagtypes", "id",
-           ["flags", "type_id"],
-           ["flagexclusions", "type_id"],
-           ["flaginclusions", "type_id"]);
-
-CrossCheck("bugs", "bug_id",
-           ["bugs_activity", "bug_id"],
-           ["bug_group_map", "bug_id"],
-           ["bugs_fulltext", "bug_id"],
-           ["attachments", "bug_id"],
-           ["cc", "bug_id"],
-           ["longdescs", "bug_id"],
-           ["dependencies", "blocked"],
-           ["dependencies", "dependson"],
-           ['flags', 'bug_id'],
-           ["keywords", "bug_id"],
-           ["duplicates", "dupe_of", "dupe"],
-           ["duplicates", "dupe", "dupe_of"]);
-
-CrossCheck("groups", "id",
-           ["bug_group_map", "group_id"],
-           ['category_group_map', 'group_id'],
-           ["group_group_map", "grantor_id"],
-           ["group_group_map", "member_id"],
-           ["group_control_map", "group_id"],
-           ["namedquery_group_map", "group_id"],
-           ["user_group_map", "group_id"],
-           ["flagtypes", "grant_group_id"],
-           ["flagtypes", "request_group_id"]);
-
-CrossCheck("namedqueries", "id",
-           ["namedqueries_link_in_footer", "namedquery_id"],
-           ["namedquery_group_map", "namedquery_id"],
-          );
-
-CrossCheck("profiles", "userid",
-           ['profiles_activity', 'userid'],
-           ['profiles_activity', 'who'],
-           ['email_setting', 'user_id'],
-           ['profile_setting', 'user_id'],
-           ["bugs", "reporter", "bug_id"],
-           ["bugs", "assigned_to", "bug_id"],
-           ["bugs", "qa_contact", "bug_id"],
-           ["attachments", "submitter_id", "bug_id"],
-           ['flags', 'setter_id', 'bug_id'],
-           ['flags', 'requestee_id', 'bug_id'],
-           ["bugs_activity", "who", "bug_id"],
-           ["cc", "who", "bug_id"],
-           ['quips', 'userid'],
-           ["longdescs", "who", "bug_id"],
-           ["logincookies", "userid"],
-           ["namedqueries", "userid"],
-           ["namedqueries_link_in_footer", "user_id"],
-           ['series', 'creator', 'series_id'],
-           ["watch", "watcher"],
-           ["watch", "watched"],
-           ['whine_events', 'owner_userid'],
-           ["tokens", "userid"],
-           ["user_group_map", "user_id"],
-           ["components", "initialowner", "name"],
-           ["components", "initialqacontact", "name"],
-           ["component_cc", "user_id"]);
-
-CrossCheck("products", "id",
-           ["bugs", "product_id", "bug_id"],
-           ["components", "product_id", "name"],
-           ["milestones", "product_id", "value"],
-           ["versions", "product_id", "value"],
-           ["group_control_map", "product_id"],
-           ["flaginclusions", "product_id", "type_id"],
-           ["flagexclusions", "product_id", "type_id"]);
-
-CrossCheck("components", "id",
-           ["component_cc", "component_id"],
-           ["flagexclusions", "component_id", "type_id"],
-           ["flaginclusions", "component_id", "type_id"]);
+CrossCheck('classifications', 'id', ['products', 'classification_id']);
+
+CrossCheck("keyworddefs", "id", ["keywords", "keywordid"]);
+
+CrossCheck(
+  "fielddefs", "id",
+  ["bugs_activity",     "fieldid"],
+  ['profiles_activity', 'fieldid']
+);
+
+CrossCheck(
+  "flagtypes", "id",
+  ["flags",          "type_id"],
+  ["flagexclusions", "type_id"],
+  ["flaginclusions", "type_id"]
+);
+
+CrossCheck(
+  "bugs",
+  "bug_id",
+  ["bugs_activity", "bug_id"],
+  ["bug_group_map", "bug_id"],
+  ["bugs_fulltext", "bug_id"],
+  ["attachments",   "bug_id"],
+  ["cc",            "bug_id"],
+  ["longdescs",     "bug_id"],
+  ["dependencies",  "blocked"],
+  ["dependencies",  "dependson"],
+  ['flags',         'bug_id'],
+  ["keywords",      "bug_id"],
+  ["duplicates", "dupe_of", "dupe"],
+  ["duplicates", "dupe",    "dupe_of"]
+);
+
+CrossCheck(
+  "groups",
+  "id",
+  ["bug_group_map",        "group_id"],
+  ['category_group_map',   'group_id'],
+  ["group_group_map",      "grantor_id"],
+  ["group_group_map",      "member_id"],
+  ["group_control_map",    "group_id"],
+  ["namedquery_group_map", "group_id"],
+  ["user_group_map",       "group_id"],
+  ["flagtypes",            "grant_group_id"],
+  ["flagtypes",            "request_group_id"]
+);
+
+CrossCheck(
+  "namedqueries", "id",
+  ["namedqueries_link_in_footer", "namedquery_id"],
+  ["namedquery_group_map",        "namedquery_id"],
+);
+
+CrossCheck(
+  "profiles",
+  "userid",
+  ['profiles_activity', 'userid'],
+  ['profiles_activity', 'who'],
+  ['email_setting',     'user_id'],
+  ['profile_setting',   'user_id'],
+  ["bugs",                        "reporter",         "bug_id"],
+  ["bugs",                        "assigned_to",      "bug_id"],
+  ["bugs",                        "qa_contact",       "bug_id"],
+  ["attachments",                 "submitter_id",     "bug_id"],
+  ['flags',                       'setter_id',        'bug_id'],
+  ['flags',                       'requestee_id',     'bug_id'],
+  ["bugs_activity",               "who",              "bug_id"],
+  ["cc",                          "who",              "bug_id"],
+  ['quips',                       'userid'],
+  ["longdescs",                   "who",              "bug_id"],
+  ["logincookies",                "userid"],
+  ["namedqueries",                "userid"],
+  ["namedqueries_link_in_footer", "user_id"],
+  ['series',                      'creator',          'series_id'],
+  ["watch",                       "watcher"],
+  ["watch",                       "watched"],
+  ['whine_events',                'owner_userid'],
+  ["tokens",                      "userid"],
+  ["user_group_map",              "user_id"],
+  ["components",                  "initialowner",     "name"],
+  ["components",                  "initialqacontact", "name"],
+  ["component_cc",                "user_id"]
+);
+
+CrossCheck(
+  "products",
+  "id",
+  ["bugs",              "product_id", "bug_id"],
+  ["components",        "product_id", "name"],
+  ["milestones",        "product_id", "value"],
+  ["versions",          "product_id", "value"],
+  ["group_control_map", "product_id"],
+  ["flaginclusions",    "product_id", "type_id"],
+  ["flagexclusions",    "product_id", "type_id"]
+);
+
+CrossCheck(
+  "components", "id",
+  ["component_cc", "component_id"],
+  ["flagexclusions", "component_id", "type_id"],
+  ["flaginclusions", "component_id", "type_id"]
+);
 
 # Check the former enum types -mkanat@bugzilla.org
-CrossCheck("bug_status", "value",
-            ["bugs", "bug_status", "bug_id"]);
+CrossCheck("bug_status", "value", ["bugs", "bug_status", "bug_id"]);
 
-CrossCheck("resolution", "value",
-            ["bugs", "resolution", "bug_id"]);
+CrossCheck("resolution", "value", ["bugs", "resolution", "bug_id"]);
 
-CrossCheck("bug_severity", "value",
-            ["bugs", "bug_severity", "bug_id"]);
+CrossCheck("bug_severity", "value", ["bugs", "bug_severity", "bug_id"]);
 
-CrossCheck("op_sys", "value",
-            ["bugs", "op_sys", "bug_id"]);
+CrossCheck("op_sys", "value", ["bugs", "op_sys", "bug_id"]);
 
-CrossCheck("priority", "value",
-            ["bugs", "priority", "bug_id"]);
+CrossCheck("priority", "value", ["bugs", "priority", "bug_id"]);
 
-CrossCheck("rep_platform", "value",
-            ["bugs", "rep_platform", "bug_id"]);
+CrossCheck("rep_platform", "value", ["bugs", "rep_platform", "bug_id"]);
 
-CrossCheck('series', 'series_id',
-           ['series_data', 'series_id']);
+CrossCheck('series', 'series_id', ['series_data', 'series_id']);
 
-CrossCheck('series_categories', 'id',
-           ['series', 'category'],
-           ["category_group_map", "category_id"],
-           ["series", "subcategory"]);
+CrossCheck(
+  'series_categories', 'id',
+  ['series',             'category'],
+  ["category_group_map", "category_id"],
+  ["series",             "subcategory"]
+);
 
-CrossCheck('whine_events', 'id',
-           ['whine_queries', 'eventid'],
-           ['whine_schedules', 'eventid']);
+CrossCheck(
+  'whine_events', 'id',
+  ['whine_queries',   'eventid'],
+  ['whine_schedules', 'eventid']
+);
 
-CrossCheck('attachments', 'attach_id',
-           ['attach_data', 'id'],
-           ['bugs_activity', 'attach_id']);
+CrossCheck(
+  'attachments', 'attach_id',
+  ['attach_data',   'id'],
+  ['bugs_activity', 'attach_id']
+);
 
-CrossCheck('bug_status', 'id',
-           ['status_workflow', 'old_status'],
-           ['status_workflow', 'new_status']);
+CrossCheck(
+  'bug_status', 'id',
+  ['status_workflow', 'old_status'],
+  ['status_workflow', 'new_status']
+);
 
 ###########################################################################
 # Perform double field referential (cross) checks
 ###########################################################################
- 
+
 # This checks that a compound two-field foreign key has a valid primary key
 # value.  NULL references are acceptable and cause no problem.
 #
@@ -584,60 +645,77 @@ CrossCheck('bug_status', 'id',
 #     table to display when the check fails
 
 sub DoubleCrossCheck {
-    my $table = shift @_;
-    my $field1 = shift @_;
-    my $field2 = shift @_;
-    my $dbh = Bugzilla->dbh;
+  my $table  = shift @_;
+  my $field1 = shift @_;
+  my $field2 = shift @_;
+  my $dbh    = Bugzilla->dbh;
 
-    Status('double_cross_check_to',
-           {table => $table, field1 => $field1, field2 => $field2});
+  Status('double_cross_check_to',
+    {table => $table, field1 => $field1, field2 => $field2});
 
-    while (@_) {
-        my $ref = shift @_;
-        my ($refertable, $referfield1, $referfield2, $keyname) = @$ref;
+  while (@_) {
+    my $ref = shift @_;
+    my ($refertable, $referfield1, $referfield2, $keyname) = @$ref;
 
-        Status('double_cross_check_from',
-               {table => $refertable, field1 => $referfield1, field2 =>$referfield2});
+    Status('double_cross_check_from',
+      {table => $refertable, field1 => $referfield1, field2 => $referfield2});
 
-        my $d_cross_check = $dbh->selectall_arrayref(qq{
+    my $d_cross_check = $dbh->selectall_arrayref(
+      qq{
                         SELECT DISTINCT $refertable.$referfield1, 
-                                        $refertable.$referfield2 } .
-                       ($keyname ? qq{, $refertable.$keyname } : q{}) .
-                      qq{ FROM $refertable
+                                        $refertable.$referfield2 }
+        . ($keyname ? qq{, $refertable.$keyname } : q{}) . qq{ FROM $refertable
                      LEFT JOIN $table
                             ON $refertable.$referfield1 = $table.$field1
                            AND $refertable.$referfield2 = $table.$field2 
                          WHERE $table.$field1 IS NULL 
                            AND $table.$field2 IS NULL 
                            AND $refertable.$referfield1 IS NOT NULL 
-                           AND $refertable.$referfield2 IS NOT NULL});
-
-        foreach my $check (@$d_cross_check) {
-            my ($value1, $value2, $key) = @$check;
-            Status('double_cross_check_alert',
-                   {value1 => $value1, value2 => $value2,
-                    table => $refertable,
-                    field1 => $referfield1, field2 => $referfield2,
-                    keyname => $keyname, key => $key}, 'alert');
-        }
+                           AND $refertable.$referfield2 IS NOT NULL}
+    );
+
+    foreach my $check (@$d_cross_check) {
+      my ($value1, $value2, $key) = @$check;
+      Status(
+        'double_cross_check_alert',
+        {
+          value1  => $value1,
+          value2  => $value2,
+          table   => $refertable,
+          field1  => $referfield1,
+          field2  => $referfield2,
+          keyname => $keyname,
+          key     => $key
+        },
+        'alert'
+      );
     }
+  }
 }
 
-DoubleCrossCheck('attachments', 'bug_id', 'attach_id',
-                 ['flags', 'bug_id', 'attach_id'],
-                 ['bugs_activity', 'bug_id', 'attach_id']);
-
-DoubleCrossCheck("components", "product_id", "id",
-                 ["bugs", "product_id", "component_id", "bug_id"],
-                 ['flagexclusions', 'product_id', 'component_id'],
-                 ['flaginclusions', 'product_id', 'component_id']);
+DoubleCrossCheck(
+  'attachments', 'bug_id', 'attach_id',
+  ['flags',         'bug_id', 'attach_id'],
+  ['bugs_activity', 'bug_id', 'attach_id']
+);
+
+DoubleCrossCheck(
+  "components",
+  "product_id",
+  "id",
+  ["bugs",           "product_id", "component_id", "bug_id"],
+  ['flagexclusions', 'product_id', 'component_id'],
+  ['flaginclusions', 'product_id', 'component_id']
+);
 
 DoubleCrossCheck("versions", "product_id", "value",
-                 ["bugs", "product_id", "version", "bug_id"]);
- 
-DoubleCrossCheck("milestones", "product_id", "value",
-                 ["bugs", "product_id", "target_milestone", "bug_id"],
-                 ["products", "id", "defaultmilestone", "name"]);
+  ["bugs", "product_id", "version", "bug_id"]);
+
+DoubleCrossCheck(
+  "milestones", "product_id", "value",
+  ["bugs",     "product_id", "target_milestone", "bug_id"],
+  ["products", "id",         "defaultmilestone", "name"]
+);
 
 ###########################################################################
 # Perform login checks
@@ -645,12 +723,12 @@ DoubleCrossCheck("milestones", "product_id", "value",
 
 Status('profile_login_start');
 
-my $sth = $dbh->prepare(q{SELECT userid, login_name FROM profiles});
+my $sth = $dbh->prepare(q{SELECT userid, email FROM profiles});
 $sth->execute;
 
 while (my ($id, $email) = $sth->fetchrow_array) {
-    validate_email_syntax($email)
-      || Status('profile_login_alert', {id => $id, email => $email}, 'alert');
+  validate_email_syntax($email)
+    || Status('profile_login_alert', {id => $id, email => $email}, 'alert');
 }
 
 ###########################################################################
@@ -658,42 +736,46 @@ while (my ($id, $email) = $sth->fetchrow_array) {
 ###########################################################################
 
 sub check_keywords {
-    my $dbh = Bugzilla->dbh;
-    my $cgi = Bugzilla->cgi;
-
-    Status('keyword_check_start');
-
-    my %keywordids;
-    my $keywords = $dbh->selectall_arrayref(q{SELECT id, name
-                                                FROM keyworddefs});
-
-    foreach (@$keywords) {
-        my ($id, $name) = @$_;
-        if ($keywordids{$id}) {
-            Status('keyword_check_alert', {id => $id}, 'alert');
-        }
-        $keywordids{$id} = 1;
-        if ($name =~ /[\s,]/) {
-            Status('keyword_check_invalid_name', {id => $id}, 'alert');
-        }
+  my $dbh = Bugzilla->dbh;
+  my $cgi = Bugzilla->cgi;
+
+  Status('keyword_check_start');
+
+  my %keywordids;
+  my $keywords = $dbh->selectall_arrayref(
+    q{SELECT id, name
+                                                FROM keyworddefs}
+  );
+
+  foreach (@$keywords) {
+    my ($id, $name) = @$_;
+    if ($keywordids{$id}) {
+      Status('keyword_check_alert', {id => $id}, 'alert');
     }
+    $keywordids{$id} = 1;
+    if ($name =~ /[\s,]/) {
+      Status('keyword_check_invalid_name', {id => $id}, 'alert');
+    }
+  }
 
-    my $sth = $dbh->prepare(q{SELECT bug_id, keywordid
+  my $sth = $dbh->prepare(
+    q{SELECT bug_id, keywordid
                                 FROM keywords
-                            ORDER BY bug_id, keywordid});
-    $sth->execute;
-    my $lastid;
-    my $lastk;
-    while (my ($id, $k) = $sth->fetchrow_array) {
-        if (!$keywordids{$k}) {
-            Status('keyword_check_invalid_id', {id => $k}, 'alert');
-        }
-        if (defined $lastid && $id eq $lastid && $k eq $lastk) {
-            Status('keyword_check_duplicated_ids', {id => $id}, 'alert');
-        }
-        $lastid = $id;
-        $lastk = $k;
+                            ORDER BY bug_id, keywordid}
+  );
+  $sth->execute;
+  my $lastid;
+  my $lastk;
+  while (my ($id, $k) = $sth->fetchrow_array) {
+    if (!$keywordids{$k}) {
+      Status('keyword_check_invalid_id', {id => $k}, 'alert');
     }
+    if (defined $lastid && $id eq $lastid && $k eq $lastk) {
+      Status('keyword_check_duplicated_ids', {id => $id}, 'alert');
+    }
+    $lastid = $id;
+    $lastk  = $k;
+  }
 }
 
 ###########################################################################
@@ -703,7 +785,7 @@ sub check_keywords {
 Status('flag_check_start');
 
 my $invalid_flags = $dbh->selectall_arrayref(
-       'SELECT DISTINCT flags.id, flags.bug_id, flags.attach_id
+  'SELECT DISTINCT flags.id, flags.bug_id, flags.attach_id
           FROM flags
     INNER JOIN bugs
             ON flags.bug_id = bugs.bug_id
@@ -711,40 +793,42 @@ my $invalid_flags = $dbh->selectall_arrayref(
             ON flags.type_id = i.type_id
            AND (bugs.product_id = i.product_id OR i.product_id IS NULL)
            AND (bugs.component_id = i.component_id OR i.component_id IS NULL)
-         WHERE i.type_id IS NULL');
+         WHERE i.type_id IS NULL'
+);
 
 my @invalid_flags = @$invalid_flags;
 
 $invalid_flags = $dbh->selectall_arrayref(
-       'SELECT DISTINCT flags.id, flags.bug_id, flags.attach_id
+  'SELECT DISTINCT flags.id, flags.bug_id, flags.attach_id
           FROM flags
     INNER JOIN bugs
             ON flags.bug_id = bugs.bug_id
     INNER JOIN flagexclusions AS e
             ON flags.type_id = e.type_id
          WHERE (bugs.product_id = e.product_id OR e.product_id IS NULL)
-           AND (bugs.component_id = e.component_id OR e.component_id IS NULL)');
+           AND (bugs.component_id = e.component_id OR e.component_id IS NULL)'
+);
 
 push(@invalid_flags, @$invalid_flags);
 
 if (scalar(@invalid_flags)) {
-    if ($cgi->param('remove_invalid_flags')) {
-        Status('flag_deletion_start');
-        my @flag_ids = map {$_->[0]} @invalid_flags;
-        # Silently delete these flags, with no notification to requesters/setters.
-        $dbh->do('DELETE FROM flags WHERE id IN (' . join(',', @flag_ids) .')');
-        Status('flag_deletion_end');
-        Bugzilla->memcached->clear_all();
-    }
-    else {
-        foreach my $flag (@$invalid_flags) {
-            my ($flag_id, $bug_id, $attach_id) = @$flag;
-            Status('flag_alert',
-                   {flag_id => $flag_id, attach_id => $attach_id, bug_id => $bug_id},
-                   'alert');
-        }
-        Status('flag_fix');
+  if ($cgi->param('remove_invalid_flags')) {
+    Status('flag_deletion_start');
+    my @flag_ids = map { $_->[0] } @invalid_flags;
+
+    # Silently delete these flags, with no notification to requesters/setters.
+    $dbh->do('DELETE FROM flags WHERE id IN (' . join(',', @flag_ids) . ')');
+    Status('flag_deletion_end');
+    Bugzilla->memcached->clear_all();
+  }
+  else {
+    foreach my $flag (@$invalid_flags) {
+      my ($flag_id, $bug_id, $attach_id) = @$flag;
+      Status('flag_alert',
+        {flag_id => $flag_id, attach_id => $attach_id, bug_id => $bug_id}, 'alert');
     }
+    Status('flag_fix');
+  }
 }
 
 ###########################################################################
@@ -754,17 +838,18 @@ if (scalar(@invalid_flags)) {
 Status('product_check_start');
 
 my $products_missing_data = $dbh->selectcol_arrayref(
-      'SELECT DISTINCT products.name
+  'SELECT DISTINCT products.name
          FROM products
     LEFT JOIN components
            ON components.product_id = products.id
     LEFT JOIN versions
            ON versions.product_id = products.id
         WHERE components.id IS NULL
-           OR versions.id IS NULL');
+           OR versions.id IS NULL'
+);
 
 if (scalar(@$products_missing_data)) {
-    Status('product_alert', { name => $_ }, 'alert') foreach @$products_missing_data;
+  Status('product_alert', {name => $_}, 'alert') foreach @$products_missing_data;
 }
 
 ###########################################################################
@@ -772,45 +857,58 @@ if (scalar(@$products_missing_data)) {
 ###########################################################################
 
 sub BugCheck {
-    my ($middlesql, $errortext, $repairparam, $repairtext) = @_;
-    my $dbh = Bugzilla->dbh;
- 
-    my $badbugs = $dbh->selectcol_arrayref(qq{SELECT DISTINCT bugs.bug_id
+  my ($middlesql, $errortext, $repairparam, $repairtext) = @_;
+  my $dbh = Bugzilla->dbh;
+
+  my $badbugs = $dbh->selectcol_arrayref(
+    qq{SELECT DISTINCT bugs.bug_id
                                                 FROM $middlesql 
-                                            ORDER BY bugs.bug_id});
-
-    if (scalar(@$badbugs)) {
-        Status('bug_check_alert',
-               {errortext => get_string($errortext), badbugs => $badbugs},
-               'alert');
-
-        if ($repairparam) {
-            $repairtext ||= 'repair_bugs';
-            Status('bug_check_repair',
-                   {param => $repairparam, text => get_string($repairtext)});
-        }
+                                            ORDER BY bugs.bug_id}
+  );
+
+  if (scalar(@$badbugs)) {
+    Status('bug_check_alert',
+      {errortext => get_string($errortext), badbugs => $badbugs}, 'alert');
+
+    if ($repairparam) {
+      $repairtext ||= 'repair_bugs';
+      Status('bug_check_repair',
+        {param => $repairparam, text => get_string($repairtext)});
     }
+  }
 }
 
 Status('bug_check_creation_date');
 
-BugCheck("bugs WHERE creation_ts IS NULL", 'bug_check_creation_date_error_text',
-         'repair_creation_date', 'bug_check_creation_date_repair_text');
+BugCheck(
+  "bugs WHERE creation_ts IS NULL", 'bug_check_creation_date_error_text',
+  'repair_creation_date',           'bug_check_creation_date_repair_text'
+);
 
 Status('bug_check_bugs_fulltext');
 
-BugCheck("bugs LEFT JOIN bugs_fulltext ON bugs_fulltext.bug_id = bugs.bug_id " .
-         "WHERE bugs_fulltext.bug_id IS NULL", 'bug_check_bugs_fulltext_error_text',
-         'repair_bugs_fulltext', 'bug_check_bugs_fulltext_repair_text');
+BugCheck(
+  "bugs LEFT JOIN bugs_fulltext ON bugs_fulltext.bug_id = bugs.bug_id "
+    . "WHERE bugs_fulltext.bug_id IS NULL",
+  'bug_check_bugs_fulltext_error_text',
+  'repair_bugs_fulltext',
+  'bug_check_bugs_fulltext_repair_text'
+);
 
 Status('bug_check_res_dupl');
 
-BugCheck("bugs INNER JOIN duplicates ON bugs.bug_id = duplicates.dupe " .
-         "WHERE bugs.resolution != 'DUPLICATE'", 'bug_check_res_dupl_error_text');
+BugCheck(
+  "bugs INNER JOIN duplicates ON bugs.bug_id = duplicates.dupe "
+    . "WHERE bugs.resolution != 'DUPLICATE'",
+  'bug_check_res_dupl_error_text'
+);
 
-BugCheck("bugs LEFT JOIN duplicates ON bugs.bug_id = duplicates.dupe WHERE " .
-         "bugs.resolution = 'DUPLICATE' AND " .
-         "duplicates.dupe IS NULL", 'bug_check_res_dupl_error_text2');
+BugCheck(
+  "bugs LEFT JOIN duplicates ON bugs.bug_id = duplicates.dupe WHERE "
+    . "bugs.resolution = 'DUPLICATE' AND "
+    . "duplicates.dupe IS NULL",
+  'bug_check_res_dupl_error_text2'
+);
 
 Status('bug_check_status_res');
 
@@ -818,20 +916,27 @@ my @open_states = map($dbh->quote($_), BUG_STATE_OPEN);
 my $open_states = join(', ', @open_states);
 
 BugCheck("bugs WHERE bug_status IN ($open_states) AND resolution != ''",
-         'bug_check_status_res_error_text');
+  'bug_check_status_res_error_text');
 BugCheck("bugs WHERE bug_status NOT IN ($open_states) AND resolution = ''",
-         'bug_check_status_res_error_text2');
+  'bug_check_status_res_error_text2');
 
 Status('bug_check_status_everconfirmed');
 
-BugCheck("bugs WHERE bug_status = 'UNCONFIRMED' AND everconfirmed = 1",
-         'bug_check_status_everconfirmed_error_text', 'repair_everconfirmed');
+BugCheck(
+  "bugs WHERE bug_status = 'UNCONFIRMED' AND everconfirmed = 1",
+  'bug_check_status_everconfirmed_error_text',
+  'repair_everconfirmed'
+);
 
-my @confirmed_open_states = grep {$_ ne 'UNCONFIRMED'} BUG_STATE_OPEN;
-my $confirmed_open_states = join(', ', map {$dbh->quote($_)} @confirmed_open_states);
+my @confirmed_open_states = grep { $_ ne 'UNCONFIRMED' } BUG_STATE_OPEN;
+my $confirmed_open_states
+  = join(', ', map { $dbh->quote($_) } @confirmed_open_states);
 
-BugCheck("bugs WHERE bug_status IN ($confirmed_open_states) AND everconfirmed = 0",
-         'bug_check_status_everconfirmed_error_text2', 'repair_everconfirmed');
+BugCheck(
+  "bugs WHERE bug_status IN ($confirmed_open_states) AND everconfirmed = 0",
+  'bug_check_status_everconfirmed_error_text2',
+  'repair_everconfirmed'
+);
 
 ###########################################################################
 # Control Values
@@ -840,8 +945,8 @@ BugCheck("bugs WHERE bug_status IN ($confirmed_open_states) AND everconfirmed =
 # Checks for values that are invalid OR
 # not among the 9 valid combinations
 Status('bug_check_control_values');
-my $groups = join(", ", (CONTROLMAPNA, CONTROLMAPSHOWN, CONTROLMAPDEFAULT,
-CONTROLMAPMANDATORY));
+my $groups = join(", ",
+  (CONTROLMAPNA, CONTROLMAPSHOWN, CONTROLMAPDEFAULT, CONTROLMAPMANDATORY));
 my $query = qq{
      SELECT COUNT(product_id) 
        FROM group_control_map 
@@ -853,10 +958,12 @@ my $query = qq{
                   OR (othercontrol = } . CONTROLMAPSHOWN . q{)))};
 
 my $entries = $dbh->selectrow_array($query);
-Status('bug_check_control_values_alert', {entries => $entries}, 'alert') if $entries;
+Status('bug_check_control_values_alert', {entries => $entries}, 'alert')
+  if $entries;
 
 Status('bug_check_control_values_violation');
-BugCheck("bugs
+BugCheck(
+  "bugs
          INNER JOIN bug_group_map
             ON bugs.bug_id = bug_group_map.bug_id
           LEFT JOIN group_control_map
@@ -864,11 +971,12 @@ BugCheck("bugs
            AND bug_group_map.group_id = group_control_map.group_id
          WHERE ((group_control_map.membercontrol = " . CONTROLMAPNA . ")
          OR (group_control_map.membercontrol IS NULL))",
-         'bug_check_control_values_error_text',
-         'createmissinggroupcontrolmapentries',
-         'bug_check_control_values_repair_text');
+  'bug_check_control_values_error_text', 'createmissinggroupcontrolmapentries',
+  'bug_check_control_values_repair_text'
+);
 
-BugCheck("bugs
+BugCheck(
+  "bugs
          INNER JOIN group_control_map
             ON bugs.product_id = group_control_map.product_id
          INNER JOIN groups
@@ -878,8 +986,8 @@ BugCheck("bugs
            AND group_control_map.group_id = bug_group_map.group_id
          WHERE group_control_map.membercontrol = " . CONTROLMAPMANDATORY . "
            AND bug_group_map.group_id IS NULL
-           AND groups.isactive != 0",
-         'bug_check_control_values_error_text2');
+           AND groups.isactive != 0", 'bug_check_control_values_error_text2'
+);
 
 ###########################################################################
 # Unsent mail
@@ -888,17 +996,19 @@ BugCheck("bugs
 Status('unsent_bugmail_check');
 
 my $time = $dbh->sql_date_math('NOW()', '-', 30, 'MINUTE');
-my $badbugs = $dbh->selectcol_arrayref(qq{
+my $badbugs = $dbh->selectcol_arrayref(
+  qq{
                     SELECT bug_id 
                       FROM bugs 
                      WHERE (lastdiffed IS NULL OR lastdiffed < delta_ts)
                        AND delta_ts < $time
-                  ORDER BY bug_id});
+                  ORDER BY bug_id}
+);
 
 
 if (scalar(@$badbugs > 0)) {
-    Status('unsent_bugmail_alert', {badbugs => $badbugs}, 'alert');
-    Status('unsent_bugmail_fix');
+  Status('unsent_bugmail_alert', {badbugs => $badbugs}, 'alert');
+  Status('unsent_bugmail_fix');
 }
 
 ###########################################################################
@@ -909,19 +1019,22 @@ Status('whines_obsolete_target_start');
 
 my $display_repair_whines_link = 0;
 foreach my $target (['groups', 'id', MAILTO_GROUP],
-                    ['profiles', 'userid', MAILTO_USER])
+  ['profiles', 'userid', MAILTO_USER])
 {
-    my ($table, $col, $type) = @$target;
-    my $old = $dbh->selectall_arrayref("SELECT whine_schedules.id, mailto
+  my ($table, $col, $type) = @$target;
+  my $old = $dbh->selectall_arrayref(
+    "SELECT whine_schedules.id, mailto
                                           FROM whine_schedules
                                      LEFT JOIN $table
                                             ON $table.$col = whine_schedules.mailto
-                                         WHERE mailto_type = $type AND $table.$col IS NULL");
-
-    if (scalar(@$old)) {
-        Status('whines_obsolete_target_alert', {schedules => $old, type => $type}, 'alert');
-        $display_repair_whines_link = 1;
-    }
+                                         WHERE mailto_type = $type AND $table.$col IS NULL"
+  );
+
+  if (scalar(@$old)) {
+    Status('whines_obsolete_target_alert',
+      {schedules => $old, type => $type}, 'alert');
+    $display_repair_whines_link = 1;
+  }
 }
 Status('whines_obsolete_target_fix') if $display_repair_whines_link;
 
@@ -929,7 +1042,7 @@ Status('whines_obsolete_target_fix') if $display_repair_whines_link;
 # Check hook
 ###########################################################################
 
-Bugzilla::Hook::process('sanitycheck_check', { status => \&Status });
+Bugzilla::Hook::process('sanitycheck_check', {status => \&Status});
 
 ###########################################################################
 # End
@@ -938,6 +1051,6 @@ Bugzilla::Hook::process('sanitycheck_check', { status => \&Status });
 Status('checks_completed');
 
 unless (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
-    $template->process('global/footer.html.tmpl', $vars)
-      || ThrowTemplateError($template->error());
+  $template->process('global/footer.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
diff --git a/sanitycheck.pl b/sanitycheck.pl
index 7fd12b1766..5e098ccac8 100755
--- a/sanitycheck.pl
+++ b/sanitycheck.pl
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -21,23 +21,25 @@
 use Getopt::Long;
 use Pod::Usage;
 
-my $verbose = 0; # Return all comments if true, else errors only.
+my $verbose = 0;    # Return all comments if true, else errors only.
 my $login = '';  # Login name of the user which is used to call sanitycheck.cgi.
-my $help = 0;    # Has user asked for help on this script?
+my $help  = 0;   # Has user asked for help on this script?
 
-my $result = GetOptions('verbose'  => \$verbose,
-                        'login=s'  => \$login,
-                        'help|h|?' => \$help);
+my $result = GetOptions(
+  'verbose'  => \$verbose,
+  'login=s'  => \$login,
+  'help|h|?' => \$help
+);
 
 pod2usage({-verbose => 1, -exitval => 1}) if $help;
 
 # Be sure a login name if given.
 $login || ThrowUserError('invalid_username');
 
-my $user = new Bugzilla::User({ name => $login })
-  || ThrowUserError('invalid_username', { name => $login });
+my $user = new Bugzilla::User({name => $login})
+  || ThrowUserError('invalid_username', {name => $login});
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
 
 # Authenticate using this user account.
@@ -50,16 +52,16 @@
 
 # Now it's time to send an email to the user if there is something to notify.
 if ($cgi->param('output')) {
-    my $message;
-    my $vars = {};
-    $vars->{'addressee'} = $user->email;
-    $vars->{'output'} = $cgi->param('output');
-    $vars->{'error_found'} = $cgi->param('error_found') ? 1 : 0;
+  my $message;
+  my $vars = {};
+  $vars->{'addressee'}   = $user->email;
+  $vars->{'output'}      = $cgi->param('output');
+  $vars->{'error_found'} = $cgi->param('error_found') ? 1 : 0;
 
-    $template->process('email/sanitycheck.txt.tmpl', $vars, \$message)
-      || ThrowTemplateError($template->error());
+  $template->process('email/sanitycheck.txt.tmpl', $vars, \$message)
+    || ThrowTemplateError($template->error());
 
-    MessageToMTA($message);
+  MessageToMTA($message);
 }
 
 
diff --git a/search_plugin.cgi b/search_plugin.cgi
index 7de8bed5f7..9ee87b86d3 100755
--- a/search_plugin.cgi
+++ b/search_plugin.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Error;
@@ -18,20 +18,20 @@ use Bugzilla::Constants;
 
 Bugzilla->login();
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 # Return the appropriate HTTP response headers.
 print $cgi->header('application/xml');
 
 # Get the contents of favicon.ico
 my $filename = bz_locations()->{'libpath'} . "/images/favicon.ico";
-if (open(IN, $filename)) {
-    local $/;
-    binmode IN;
-    $vars->{'favicon'} = <IN>;
-    close IN;
+if (open(IN, '<', $filename)) {
+  local $/;
+  binmode IN;
+  $vars->{'favicon'} = <IN>;
+  close IN;
 }
 $template->process("search/search-plugin.xml.tmpl", $vars)
   || ThrowTemplateError($template->error());
diff --git a/show_activity.cgi b/show_activity.cgi
index 7df10fcb84..b7aaf453ed 100755
--- a/show_activity.cgi
+++ b/show_activity.cgi
@@ -6,30 +6,30 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Error;
 use Bugzilla::Bug;
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 ###############################################################################
 # Begin Data/Security Validation
 ###############################################################################
 
-# Check whether or not the user is currently logged in. 
+# Check whether or not the user is currently logged in.
 Bugzilla->login();
 
 # Make sure the bug ID is a positive integer representing an existing
 # bug that the user is authorized to access.
-my $id = $cgi->param('id');
+my $id  = $cgi->param('id');
 my $bug = Bugzilla::Bug->check($id);
 
 ###############################################################################
@@ -40,7 +40,8 @@ my $bug = Bugzilla::Bug->check($id);
 # visible immediately due to replication lag.
 Bugzilla->switch_to_shadow_db;
 
-($vars->{'operations'}, $vars->{'incomplete_data'}) = $bug->get_activity(undef, undef, 1);
+($vars->{'operations'}, $vars->{'incomplete_data'})
+  = $bug->get_activity(undef, undef, 1);
 
 $vars->{'bug'} = $bug;
 
diff --git a/show_bug.cgi b/show_bug.cgi
index f69cae7408..80c517fdeb 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -18,24 +18,27 @@ use Bugzilla::Error;
 use Bugzilla::Util;
 use Bugzilla::Bug;
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 my $user = Bugzilla->login();
 
-my $format = $template->get_format("bug/show", scalar $cgi->param('format'),
-                                   scalar $cgi->param('ctype'));
+my $format = $template->get_format(
+  "bug/show",
+  scalar $cgi->param('format'),
+  scalar $cgi->param('ctype')
+);
 
 # Editable, 'single' HTML bugs are treated slightly specially in a few places
 my $single = !$format->{format} && $format->{extension} eq 'html';
 
 # If we don't have an ID, _AND_ we're only doing a single bug, then prompt
 if (!$cgi->param('id') && $single) {
-    print $cgi->header();
-    $template->process("bug/choose.html.tmpl", $vars) ||
-      ThrowTemplateError($template->error());
-    exit;
+  print $cgi->header();
+  $template->process("bug/choose.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
+  exit;
 }
 
 my (@bugs, @illegal_bugs);
@@ -47,48 +50,51 @@ my %marks;
 Bugzilla->switch_to_shadow_db unless $user->id;
 
 if ($single) {
-    my $id = $cgi->param('id');
-    push @bugs, Bugzilla::Bug->check({ id => $id, cache => 1 });
-    if (defined $cgi->param('mark')) {
-        foreach my $range (split ',', $cgi->param('mark')) {
-            if ($range =~ /^(\d+)-(\d+)$/) {
-               foreach my $i ($1..$2) {
-                   $marks{$i} = 1;
-               }
-            } elsif ($range =~ /^(\d+)$/) {
-               $marks{$1} = 1;
-            }
+  my $id = $cgi->param('id');
+  push @bugs, Bugzilla::Bug->check({id => $id, cache => 1});
+  if (defined $cgi->param('mark')) {
+    foreach my $range (split ',', $cgi->param('mark')) {
+      if ($range =~ /^(\d+)-(\d+)$/a) {
+        foreach my $i ($1 .. $2) {
+          $marks{$i} = 1;
         }
+      }
+      elsif ($range =~ /^(\d+)$/a) {
+        $marks{$1} = 1;
+      }
+    }
+  }
+}
+else {
+  foreach my $id ($cgi->multi_param('id')) {
+
+    # Be kind enough and accept URLs of the form: id=1,2,3.
+    my @ids = split(/,/, $id);
+    my @check_bugs;
+
+    foreach my $bug_id (@ids) {
+      next unless $bug_id;
+      my $bug = new Bugzilla::Bug({id => $bug_id, cache => 1});
+      if (!$bug->{error}) {
+        push(@check_bugs, $bug);
+      }
+      else {
+        push(@illegal_bugs, {bug_id => trim($bug_id), error => $bug->{error}});
+      }
     }
-} else {
-    foreach my $id ($cgi->param('id')) {
-        # Be kind enough and accept URLs of the form: id=1,2,3.
-        my @ids = split(/,/, $id);
-        my @check_bugs;
-
-        foreach my $bug_id (@ids) {
-            next unless $bug_id;
-            my $bug = new Bugzilla::Bug({ id => $bug_id, cache => 1 });
-            if (!$bug->{error}) {
-                push(@check_bugs, $bug);
-            }
-            else {
-                push(@illegal_bugs, { bug_id => trim($bug_id), error => $bug->{error} });
-            }
-        }
 
-        $user->visible_bugs(\@check_bugs);
+    $user->visible_bugs(\@check_bugs);
 
-        foreach my $bug (@check_bugs) {
-            if ($user->can_see_bug($bug->id)) {
-                push(@bugs, $bug);
-            }
-            else {
-                my $error = 'NotPermitted'; # Trick to make 012throwables.t happy.
-                push(@illegal_bugs, { bug_id => $bug->id, error => $error });
-            }
-        }
+    foreach my $bug (@check_bugs) {
+      if ($user->can_see_bug($bug->id)) {
+        push(@bugs, $bug);
+      }
+      else {
+        my $error = 'NotPermitted';    # Trick to make 012throwables.t happy.
+        push(@illegal_bugs, {bug_id => $bug->id, error => $error});
+      }
     }
+  }
 }
 
 Bugzilla::Bug->preload(\@bugs);
@@ -96,31 +102,35 @@ Bugzilla::Bug->preload(\@bugs);
 $vars->{'bugs'} = [@bugs, @illegal_bugs];
 $vars->{'marks'} = \%marks;
 
-my @bugids = map {$_->bug_id} grep {!$_->error} @bugs;
+my @bugids = map { $_->bug_id } grep { !$_->error } @bugs;
 $vars->{'bugids'} = join(", ", @bugids);
 
 # Work out which fields we are displaying (currently XML only.)
 # If no explicit list is defined, we show all fields. We then exclude any
-# on the exclusion list. This is so you can say e.g. "Everything except 
+# on the exclusion list. This is so you can say e.g. "Everything except
 # attachments" without listing almost all the fields.
-my @fieldlist = (Bugzilla::Bug->fields, 'flag', 'group', 'long_desc',
-                 'attachment', 'attachmentdata', 'token');
+my @fieldlist = (
+  Bugzilla::Bug->fields, 'flag',
+  'group',               'long_desc',
+  'attachment',          'attachmentdata',
+  'token'
+);
 my %displayfields;
 
 if ($cgi->param("field")) {
-    @fieldlist = $cgi->param("field");
+  @fieldlist = $cgi->multi_param("field");
 }
 
 unless ($user->is_timetracker) {
-    @fieldlist = grep($_ !~ /_time$/, @fieldlist);
+  @fieldlist = grep($_ !~ /_time$/, @fieldlist);
 }
 
 foreach (@fieldlist) {
-    $displayfields{$_} = 1;
+  $displayfields{$_} = 1;
 }
 
-foreach ($cgi->param("excludefield")) {
-    $displayfields{$_} = undef;    
+foreach ($cgi->multi_param("excludefield")) {
+  $displayfields{$_} = undef;
 }
 
 $vars->{'displayfields'} = \%displayfields;
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 02c8fd94f7..9f1cab10e0 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use File::Temp;
 
@@ -24,9 +24,10 @@ use Bugzilla::Status;
 
 my $user = Bugzilla->login();
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
+
 # Connect to the shadow database if this installation is using one to improve
 # performance.
 my $dbh = Bugzilla->switch_to_shadow_db();
@@ -34,7 +35,7 @@ my $dbh = Bugzilla->switch_to_shadow_db();
 our (%seen, %edgesdone, %bugtitles);
 our $bug_count = 0;
 
-# CreateImagemap: This sub grabs a local filename as a parameter, reads the 
+# CreateImagemap: This sub grabs a local filename as a parameter, reads the
 # dot-generated image map datafile residing in that file and turns it into
 # an HTML map element. THIS SUB IS ONLY USED FOR LOCAL DOT INSTALLATIONS.
 # The map datafile won't necessarily contain the bug summaries, so we'll
@@ -45,44 +46,53 @@ our $bug_count = 0;
 # rectangle (LEFTX,TOPY) (RIGHTX,BOTTOMY) URLBASE/show_bug.cgi?id=BUGNUM BUGNUM[\nSUMMARY]
 
 sub CreateImagemap {
-    my $mapfilename = shift;
-    my $map = "<map name=\"imagemap\">\n";
-    my $default = "";
-
-    open MAP, "<$mapfilename";
-    while(my $line = <MAP>) {
-        if($line =~ /^default ([^ ]*)(.*)$/) {
-            $default = qq{<area alt="" shape="default" href="$1">\n};
-        }
-
-        if ($line =~ /^rectangle \((.*),(.*)\) \((.*),(.*)\) (http[^ ]*) (\d+)(\\n.*)?$/) {
-            my ($leftx, $rightx, $topy, $bottomy, $url, $bugid) = ($1, $3, $2, $4, $5, $6);
-
-            # Pick up bugid from the mapdata label field. Getting the title from
-            # bugtitle hash instead of mapdata allows us to get the summary even
-            # when showsummary is off, and also gives us status and resolution.
-            my $bugtitle = html_quote(clean_text($bugtitles{$bugid}));
-            $map .= qq{<area alt="bug $bugid" name="bug$bugid" shape="rect" } .
-                    qq{title="$bugtitle" href="$url" } .
-                    qq{coords="$leftx,$topy,$rightx,$bottomy">\n};
-        }
+  my $mapfilename = shift;
+  my $map         = "<map name=\"imagemap\">\n";
+  my $default     = "";
+
+  open MAP, "<", $mapfilename;
+  while (my $line = <MAP>) {
+    if ($line =~ /^default ([^ ]*)(.*)$/) {
+      $default = qq{<area alt="" shape="default" href="$1">\n};
+    }
+
+    if ($line
+      =~ /^rectangle \((\d+),(\d+)\) \((\d+),(\d+)\) (http[^ ]*) (\d+)(?:\\n.*)?$/)
+    {
+      my ($leftx, $rightx, $topy, $bottomy, $url, $bugid) = ($1, $3, $2, $4, $5, $6);
+
+      # Pick up bugid from the mapdata label field. Getting the title from
+      # bugtitle hash instead of mapdata allows us to get the summary even
+      # when showsummary is off, and also gives us status and resolution.
+      # This text is safe; it has already been escaped.
+      my $bugtitle = $bugtitles{$bugid};
+
+      # The URL is supposed to be safe, because it's built manually.
+      # But in case someone manages to inject code, it's safer to escape it.
+      $url = html_quote($url);
+
+      $map
+        .= qq{<area alt="bug $bugid" name="bug$bugid" shape="rect" }
+        . qq{title="$bugtitle" href="$url" }
+        . qq{coords="$leftx,$topy,$rightx,$bottomy">\n};
     }
-    close MAP;
+  }
+  close MAP;
 
-    $map .= "$default</map>";
-    return $map;
+  $map .= "$default</map>";
+  return $map;
 }
 
 sub AddLink {
-    my ($blocked, $dependson, $fh) = (@_);
-    my $key = "$blocked,$dependson";
-    if (!exists $edgesdone{$key}) {
-        $edgesdone{$key} = 1;
-        print $fh "$dependson -> $blocked\n";
-        $bug_count++;
-        $seen{$blocked} = 1;
-        $seen{$dependson} = 1;
-    }
+  my ($blocked, $dependson, $fh) = (@_);
+  my $key = "$blocked,$dependson";
+  if (!exists $edgesdone{$key}) {
+    $edgesdone{$key} = 1;
+    print $fh "$dependson -> $blocked\n";
+    $bug_count++;
+    $seen{$blocked}   = 1;
+    $seen{$dependson} = 1;
+  }
 }
 
 ThrowUserError("missing_bug_id") unless $cgi->param('id');
@@ -92,22 +102,24 @@ ThrowUserError("missing_bug_id") unless $cgi->param('id');
 my @valid_rankdirs = ('LR', 'RL', 'TB', 'BT');
 
 my $rankdir = $cgi->param('rankdir') || 'TB';
+
 # Make sure the submitted 'rankdir' value is valid.
 if (!grep { $_ eq $rankdir } @valid_rankdirs) {
-    $rankdir = 'TB';
+  $rankdir = 'TB';
 }
 
 my $display = $cgi->param('display') || 'tree';
 my $webdotdir = bz_locations()->{'webdotdir'};
 
-my ($fh, $filename) = File::Temp::tempfile("XXXXXXXXXX",
-                                           SUFFIX => '.dot',
-                                           DIR => $webdotdir,
-                                           UNLINK => 1);
+my ($fh, $filename) = File::Temp::tempfile(
+  "XXXXXXXXXX",
+  SUFFIX => '.dot',
+  DIR    => $webdotdir,
+  UNLINK => 1
+);
 
 chmod Bugzilla::Install::Filesystem::CGI_WRITE, $filename
-    or warn install_string('chmod_failed', { path => $filename,
-                                             error => $! });
+  or warn install_string('chmod_failed', {path => $filename, error => $!});
 
 my $urlbase = correct_urlbase();
 
@@ -120,209 +132,226 @@ node [URL="${urlbase}show_bug.cgi?id=\\N", style=filled, color=lightgrey]
 my %baselist;
 
 foreach my $i (split('[\s,]+', $cgi->param('id'))) {
-    my $bug = Bugzilla::Bug->check($i);
-    $baselist{$bug->id} = 1;
+  my $bug = Bugzilla::Bug->check($i);
+  $baselist{$bug->id} = 1;
 }
 
 my @stack = keys(%baselist);
 
 if ($display eq 'web') {
-    my $sth = $dbh->prepare(q{SELECT blocked, dependson
+  my $sth = $dbh->prepare(
+    q{SELECT blocked, dependson
                                 FROM dependencies
-                               WHERE blocked = ? OR dependson = ?});
-
-    foreach my $id (@stack) {
-        my $dependencies = $dbh->selectall_arrayref($sth, undef, ($id, $id));
-        foreach my $dependency (@$dependencies) {
-            my ($blocked, $dependson) = @$dependency;
-            if ($blocked != $id && !exists $seen{$blocked}) {
-                push @stack, $blocked;
-            }
-            if ($dependson != $id && !exists $seen{$dependson}) {
-                push @stack, $dependson;
-            }
-            AddLink($blocked, $dependson, $fh);
-        }
+                               WHERE blocked = ? OR dependson = ?}
+  );
+
+  foreach my $id (@stack) {
+    my $dependencies = $dbh->selectall_arrayref($sth, undef, ($id, $id));
+    foreach my $dependency (@$dependencies) {
+      my ($blocked, $dependson) = @$dependency;
+      if ($blocked != $id && !exists $seen{$blocked}) {
+        push @stack, $blocked;
+      }
+      if ($dependson != $id && !exists $seen{$dependson}) {
+        push @stack, $dependson;
+      }
+      AddLink($blocked, $dependson, $fh);
     }
+  }
 }
+
 # This is the default: a tree instead of a spider web.
 else {
-    my @blocker_stack = @stack;
-    foreach my $id (@blocker_stack) {
-        my $blocker_ids = Bugzilla::Bug::EmitDependList('blocked', 'dependson', $id);
-        foreach my $blocker_id (@$blocker_ids) {
-            push(@blocker_stack, $blocker_id) unless $seen{$blocker_id};
-            AddLink($id, $blocker_id, $fh);
-        }
+  my @blocker_stack = @stack;
+  my $hide_resolved = $cgi->param('hide_resolved');
+
+  foreach my $id (@blocker_stack) {
+    my $blocker_ids
+      = Bugzilla::Bug::EmitDependList('blocked', 'dependson', $id, $hide_resolved);
+    foreach my $blocker_id (@$blocker_ids) {
+      push(@blocker_stack, $blocker_id) unless $seen{$blocker_id};
+      AddLink($id, $blocker_id, $fh);
     }
-    my @dependent_stack = @stack;
-    foreach my $id (@dependent_stack) {
-        my $dep_bug_ids = Bugzilla::Bug::EmitDependList('dependson', 'blocked', $id);
-        foreach my $dep_bug_id (@$dep_bug_ids) {
-            push(@dependent_stack, $dep_bug_id) unless $seen{$dep_bug_id};
-            AddLink($dep_bug_id, $id, $fh);
-        }
+  }
+  my @dependent_stack = @stack;
+  foreach my $id (@dependent_stack) {
+    my $dep_bug_ids
+      = Bugzilla::Bug::EmitDependList('dependson', 'blocked', $id, $hide_resolved);
+    foreach my $dep_bug_id (@$dep_bug_ids) {
+      push(@dependent_stack, $dep_bug_id) unless $seen{$dep_bug_id};
+      AddLink($dep_bug_id, $id, $fh);
     }
+  }
 }
 
 foreach my $k (keys(%baselist)) {
-    $seen{$k} = 1;
+  $seen{$k} = 1;
 }
 
 my $sth = $dbh->prepare(
-              q{SELECT bug_status, resolution, short_desc
+  q{SELECT bug_status, resolution, short_desc
                   FROM bugs
-                 WHERE bugs.bug_id = ?});
+                 WHERE bugs.bug_id = ?}
+);
 
 my @bug_ids = keys %seen;
 $user->visible_bugs(\@bug_ids);
 foreach my $k (@bug_ids) {
-    # Retrieve bug information from the database
-    my ($stat, $resolution, $summary) = $dbh->selectrow_array($sth, undef, $k);
-
-    # Resolution and summary are shown only if user can see the bug
-    if (!$user->can_see_bug($k)) {
-        $summary = '';
-    }
 
-    $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id'));
+  # Retrieve bug information from the database
+  my ($stat, $resolution, $summary) = $dbh->selectrow_array($sth, undef, $k);
+
+  $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id'));
+
+  # The bug summary is shown only if the user can see the bug.
+  if ($user->can_see_bug($k)) {
+    $summary = html_quote(clean_text($summary));
+  }
+  else {
+    $summary = '';
+  }
+
+  my @params;
+
+  if ($summary ne "" && $cgi->param('showsummary')) {
+
+    # Wide characters cause GraphViz to die.
+    utf8::encode($summary) if utf8::is_utf8($summary);
+    $summary = wrap_comment($summary);
+    $summary =~ s/([\\\"])/\\$1/g;
+
+    # Newlines must be escaped too, to not break the .map file
+    # and to prevent code injection.
+    $summary =~ s/\n/\\n/g;
+    push(@params, qq{label="$k\\n$summary"});
+  }
+
+  if (exists $baselist{$k}) {
+    push(@params, "shape=box");
+  }
+
+  if (is_open_state($stat)) {
+    push(@params, "color=green");
+  }
+
+  if (@params) {
+    print $fh "$k [" . join(',', @params) . "]\n";
+  }
+  else {
+    print $fh "$k\n";
+  }
+
+  # Push the bug tooltip texts into a global hash so that
+  # CreateImagemap sub (used with local dot installations) can
+  # use them later on.
+  my $stat_display       = display_value('bug_status', $stat);
+  my $resolution_display = display_value('resolution', $resolution);
+  $bugtitles{$k} = trim("$stat_display $resolution_display");
+
+  # Show the bug summary in tooltips only if not shown on
+  # the graph and it is non-empty (the user can see the bug)
+  if (!$cgi->param('showsummary') && $summary ne "") {
+    $bugtitles{$k} .= " - $summary";
+  }
+}
 
-    my @params;
 
-    if ($summary ne "" && $cgi->param('showsummary')) {
-        # Wide characters cause GraphViz to die.
-        if (Bugzilla->params->{'utf8'}) {
-            utf8::encode($summary) if utf8::is_utf8($summary);
-        }
-        $summary =~ s/([\\\"])/\\$1/g;
-        push(@params, qq{label="$k\\n$summary"});
-    }
+print $fh "}\n";
+close $fh;
 
-    if (exists $baselist{$k}) {
-        push(@params, "shape=box");
-    }
+if ($bug_count > MAX_WEBDOT_BUGS) {
+  unlink($filename);
+  ThrowUserError("webdot_too_large");
+}
 
-    if (is_open_state($stat)) {
-        push(@params, "color=green");
-    }
+my $webdotbase = Bugzilla->localconfig->{'webdotbase'};
 
-    if (@params) {
-        print $fh "$k [" . join(',', @params) . "]\n";
-    } else {
-        print $fh "$k\n";
-    }
+if ($webdotbase =~ /^https?:/) {
 
-    # Push the bug tooltip texts into a global hash so that 
-    # CreateImagemap sub (used with local dot installations) can
-    # use them later on.
-    my $stat_display       = display_value('bug_status', $stat);
-    my $resolution_display = display_value('resolution', $resolution);
-    $bugtitles{$k} = trim("$stat_display $resolution_display");
-
-    # Show the bug summary in tooltips only if not shown on 
-    # the graph and it is non-empty (the user can see the bug)
-    if (!$cgi->param('showsummary') && $summary ne "") {
-        $bugtitles{$k} .= " - $summary";
-    }
+  # Remote dot server. We don't hardcode 'urlbase' here in case
+  # 'sslbase' is in use.
+  $webdotbase =~ s/%([a-z]*)%/Bugzilla->params->{$1}/eg;
+  my $url = $webdotbase . $filename;
+  $vars->{'image_url'} = $url . ".gif";
+  $vars->{'map_url'}   = $url . ".map";
 }
+else {
+  # Local dot installation
 
+  # First, generate the png image file from the .dot source
 
-print $fh "}\n";
-close $fh;
+  my ($pngfh, $pngfilename)
+    = File::Temp::tempfile("XXXXXXXXXX", SUFFIX => '.png', DIR => $webdotdir);
 
-if ($bug_count > MAX_WEBDOT_BUGS) {
-    unlink($filename);
-    ThrowUserError("webdot_too_large");
-}
+  chmod Bugzilla::Install::Filesystem::WS_SERVE, $pngfilename
+    or warn install_string('chmod_failed', {path => $pngfilename, error => $!});
 
-my $webdotbase = Bugzilla->params->{'webdotbase'};
+  binmode $pngfh;
+  open(DOT, '-|', "\"$webdotbase\" -Tpng $filename");
+  binmode DOT;
+  print $pngfh $_ while <DOT>;
+  close DOT;
+  close $pngfh;
 
-if ($webdotbase =~ /^https?:/) {
-     # Remote dot server. We don't hardcode 'urlbase' here in case
-     # 'sslbase' is in use.
-     $webdotbase =~ s/%([a-z]*)%/Bugzilla->params->{$1}/eg;
-     my $url = $webdotbase . $filename;
-     $vars->{'image_url'} = $url . ".gif";
-     $vars->{'map_url'} = $url . ".map";
-} else {
-    # Local dot installation
-
-    # First, generate the png image file from the .dot source
-
-    my ($pngfh, $pngfilename) = File::Temp::tempfile("XXXXXXXXXX",
-                                                     SUFFIX => '.png',
-                                                     DIR => $webdotdir);
-
-    chmod Bugzilla::Install::Filesystem::WS_SERVE, $pngfilename
-        or warn install_string('chmod_failed', { path => $pngfilename,
-                                                 error => $! });
-
-    binmode $pngfh;
-    open(DOT, "\"$webdotbase\" -Tpng $filename|");
-    binmode DOT;
-    print $pngfh $_ while <DOT>;
-    close DOT;
-    close $pngfh;
-
-    # On Windows $pngfilename will contain \ instead of /
-    $pngfilename =~ s|\\|/|g if ON_WINDOWS;
-
-    # Under mod_perl, pngfilename will have an absolute path, and we
-    # need to make that into a relative path.
-    my $cgi_root = bz_locations()->{cgi_path};
-    $pngfilename =~ s#^\Q$cgi_root\E/?##;
-    
-    $vars->{'image_url'} = $pngfilename;
-
-    # Then, generate a imagemap datafile that contains the corner data
-    # for drawn bug objects. Pass it on to CreateImagemap that
-    # turns this monster into html.
-
-    my ($mapfh, $mapfilename) = File::Temp::tempfile("XXXXXXXXXX",
-                                                     SUFFIX => '.map',
-                                                     DIR => $webdotdir);
-
-    chmod Bugzilla::Install::Filesystem::WS_SERVE, $mapfilename
-        or warn install_string('chmod_failed', { path => $mapfilename,
-                                                 error => $! });
-
-    binmode $mapfh;
-    open(DOT, "\"$webdotbase\" -Tismap $filename|");
-    binmode DOT;
-    print $mapfh $_ while <DOT>;
-    close DOT;
-    close $mapfh;
-
-    $vars->{'image_map'} = CreateImagemap($mapfilename);
+  # On Windows $pngfilename will contain \ instead of /
+  $pngfilename =~ s|\\|/|g if ON_WINDOWS;
+
+  # Under mod_perl, pngfilename will have an absolute path, and we
+  # need to make that into a relative path.
+  my $cgi_root = bz_locations()->{cgi_path};
+  $pngfilename =~ s#^\Q$cgi_root\E/?##;
+
+  $vars->{'image_url'} = $pngfilename;
+
+  # Then, generate a imagemap datafile that contains the corner data
+  # for drawn bug objects. Pass it on to CreateImagemap that
+  # turns this monster into html.
+
+  my ($mapfh, $mapfilename)
+    = File::Temp::tempfile("XXXXXXXXXX", SUFFIX => '.map', DIR => $webdotdir);
+
+  chmod Bugzilla::Install::Filesystem::WS_SERVE, $mapfilename
+    or warn install_string('chmod_failed', {path => $mapfilename, error => $!});
+
+  binmode $mapfh;
+  open(DOT, '-|', "\"$webdotbase\" -Tismap $filename");
+  binmode DOT;
+  print $mapfh $_ while <DOT>;
+  close DOT;
+  close $mapfh;
+
+  $vars->{'image_map'} = CreateImagemap($mapfilename);
 }
 
 # Cleanup any old .dot files created from previous runs.
 my $since = time() - 24 * 60 * 60;
+
 # Can't use glob, since even calling that fails taint checks for perl < 5.6
 opendir(DIR, $webdotdir);
 my @files = grep { /\.dot$|\.png$|\.map$/ && -f "$webdotdir/$_" } readdir(DIR);
 closedir DIR;
-foreach my $f (@files)
-{
-    $f = "$webdotdir/$f";
-    # Here we are deleting all old files. All entries are from the
-    # $webdot directory. Since we're deleting the file (not following
-    # symlinks), this can't escape to delete anything it shouldn't
-    # (unless someone moves the location of $webdotdir, of course)
-    trick_taint($f);
-    my $mtime = (stat($f))[9];
-    if ($mtime && $mtime < $since) {
-        unlink $f;
-    }
+foreach my $f (@files) {
+  $f = "$webdotdir/$f";
+
+  # Here we are deleting all old files. All entries are from the
+  # $webdot directory. Since we're deleting the file (not following
+  # symlinks), this can't escape to delete anything it shouldn't
+  # (unless someone moves the location of $webdotdir, of course)
+  trick_taint($f);
+  my $mtime = (stat($f))[9];
+  if ($mtime && $mtime < $since) {
+    unlink $f;
+  }
 }
 
 # Make sure we only include valid integers (protects us from XSS attacks).
 my @bugs = grep(detaint_natural($_), split(/[\s,]+/, $cgi->param('id')));
-$vars->{'bug_id'} = join(', ', @bugs);
+$vars->{'bug_id'}        = join(', ', @bugs);
 $vars->{'multiple_bugs'} = ($cgi->param('id') =~ /[ ,]/);
-$vars->{'display'} = $display;
-$vars->{'rankdir'} = $rankdir;
-$vars->{'showsummary'} = $cgi->param('showsummary');
+$vars->{'display'}       = $display;
+$vars->{'rankdir'}       = $rankdir;
+$vars->{'showsummary'}   = $cgi->param('showsummary');
+$vars->{'hide_resolved'} = $cgi->param('hide_resolved');
 
 # Generate and return the UI (HTML page) from the appropriate template.
 print $cgi->header();
diff --git a/showdependencytree.cgi b/showdependencytree.cgi
index 9e193df021..7e5569f470 100755
--- a/showdependencytree.cgi
+++ b/showdependencytree.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Error;
@@ -20,9 +20,10 @@ use List::Util qw(max);
 
 my $user = Bugzilla->login();
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
+
 # Connect to the shadow database if this installation is using one to improve
 # performance.
 my $dbh = Bugzilla->switch_to_shadow_db();
@@ -34,12 +35,12 @@ my $dbh = Bugzilla->switch_to_shadow_db();
 # Make sure the bug ID is a positive integer representing an existing
 # bug that the user is authorized to access.
 my $bug = Bugzilla::Bug->check(scalar $cgi->param('id'));
-my $id = $bug->id;
+my $id  = $bug->id;
 
 local our $hide_resolved = $cgi->param('hide_resolved') ? 1 : 0;
 local our $maxdepth = $cgi->param('maxdepth') || 0;
 if ($maxdepth !~ /^\d+$/) {
-    $maxdepth = 0;
+  $maxdepth = 0;
 }
 
 ################################################################################
@@ -51,7 +52,7 @@ local our $realdepth = 0;
 
 # Generate the tree of bugs that this bug depends on and a list of IDs
 # appearing in the tree.
-my $dependson_tree = { $id => $bug };
+my $dependson_tree = {$id => $bug};
 my $dependson_ids = {};
 GenerateTree($id, "dependson", 1, $dependson_tree, $dependson_ids);
 $vars->{'dependson_tree'} = $dependson_tree;
@@ -59,7 +60,7 @@ $vars->{'dependson_ids'}  = [keys(%$dependson_ids)];
 
 # Generate the tree of bugs that this bug blocks and a list of IDs
 # appearing in the tree.
-my $blocked_tree = { $id => $bug };
+my $blocked_tree = {$id => $bug};
 my $blocked_ids = {};
 GenerateTree($id, "blocked", 1, $blocked_tree, $blocked_ids);
 $vars->{'blocked_tree'} = $blocked_tree;
@@ -77,70 +78,73 @@ $template->process("bug/dependency-tree.html.tmpl", $vars)
 # Tree Generation Functions
 
 sub GenerateTree {
-    my ($bug_id, $relationship, $depth, $bugs, $ids) = @_;
-
-    # determine just the list of bug ids
-    _generate_bug_ids($bug_id, $relationship, $depth, $ids);
-    my $bug_ids = [ keys %$ids ];
-    return unless @$bug_ids;
-
-    # load all the bugs at once
-    foreach my $bug (@{ Bugzilla::Bug->new_from_list($bug_ids) }) {
-        if (!$bug->{error}) {
-            $bugs->{$bug->id} = $bug;
-        }
+  my ($bug_id, $relationship, $depth, $bugs, $ids) = @_;
+
+  # determine just the list of bug ids
+  _generate_bug_ids($bug_id, $relationship, $depth, $ids);
+  my $bug_ids = [keys %$ids];
+  return unless @$bug_ids;
+
+  # load all the bugs at once
+  foreach my $bug (@{Bugzilla::Bug->new_from_list($bug_ids)}) {
+    if (!$bug->{error}) {
+      $bugs->{$bug->id} = $bug;
     }
+  }
 
-    # preload bug visibility
-    Bugzilla->user->visible_bugs($bug_ids);
+  # preload bug visibility
+  Bugzilla->user->visible_bugs($bug_ids);
 
-    # and generate the tree
-    _generate_tree($bug_id, $relationship, $depth, $bugs, $ids);
+  # and generate the tree
+  _generate_tree($bug_id, $relationship, $depth, $bugs, $ids);
 }
 
 sub _generate_bug_ids {
-    my ($bug_id, $relationship, $depth, $ids) = @_;
-
-    # Record this depth in the global $realdepth variable if it's farther
-    # than we've gone before.
-    $realdepth = max($realdepth, $depth);
-
-    my $dependencies = _get_dependencies($bug_id, $relationship);
-    foreach my $dep_id (@$dependencies) {
-        if (!$maxdepth || $depth <= $maxdepth) {
-            $ids->{$dep_id} = 1;
-            _generate_bug_ids($dep_id, $relationship, $depth + 1, $ids);
-        }
+  my ($bug_id, $relationship, $depth, $ids) = @_;
+
+  # Record this depth in the global $realdepth variable if it's farther
+  # than we've gone before.
+  $realdepth = max($realdepth, $depth);
+
+  my $dependencies = _get_dependencies($bug_id, $relationship);
+  foreach my $dep_id (@$dependencies) {
+    if (!$maxdepth || $depth <= $maxdepth) {
+      $ids->{$dep_id} = 1;
+      _generate_bug_ids($dep_id, $relationship, $depth + 1, $ids);
     }
+  }
 }
 
 sub _generate_tree {
-    my ($bug_id, $relationship, $depth, $bugs, $ids) = @_;
-
-    my $dependencies = _get_dependencies($bug_id, $relationship);
-
-    foreach my $dep_id (@$dependencies) {
-        # recurse
-        if (!$maxdepth || $depth < $maxdepth) {
-            _generate_tree($dep_id, $relationship, $depth + 1, $bugs, $ids);
-        }
-
-        # remove bugs according to visiblity
-        if (!Bugzilla->user->can_see_bug($dep_id)) {
-            delete $ids->{$dep_id};
-        }
-        elsif (!grep { $_ == $dep_id } @{ $bugs->{dependencies}->{$bug_id} }) {
-            push @{ $bugs->{dependencies}->{$bug_id} }, $dep_id;
-        }
+  my ($bug_id, $relationship, $depth, $bugs, $ids) = @_;
+
+  my $dependencies = _get_dependencies($bug_id, $relationship);
+
+  foreach my $dep_id (@$dependencies) {
+
+    # recurse
+    if (!$maxdepth || $depth < $maxdepth) {
+      _generate_tree($dep_id, $relationship, $depth + 1, $bugs, $ids);
+    }
+
+    # remove bugs according to visiblity
+    if (!Bugzilla->user->can_see_bug($dep_id)) {
+      delete $ids->{$dep_id};
+    }
+    elsif (!grep { $_ == $dep_id } @{$bugs->{dependencies}->{$bug_id}}) {
+      push @{$bugs->{dependencies}->{$bug_id}}, $dep_id;
     }
+  }
 }
 
 sub _get_dependencies {
-    my ($bug_id, $relationship) = @_;
-    my $cache = Bugzilla->request_cache->{dependency_cache} ||= {};
-    return $cache->{$bug_id}->{$relationship} ||=
-        $relationship eq 'dependson'
-        ? Bugzilla::Bug::EmitDependList('blocked',   'dependson', $bug_id, $hide_resolved)
-        : Bugzilla::Bug::EmitDependList('dependson', 'blocked',   $bug_id, $hide_resolved);
+  my ($bug_id, $relationship) = @_;
+  my $cache = Bugzilla->request_cache->{dependency_cache} ||= {};
+  return $cache->{$bug_id}->{$relationship}
+    ||= $relationship eq 'dependson'
+    ? Bugzilla::Bug::EmitDependList('blocked', 'dependson', $bug_id,
+    $hide_resolved)
+    : Bugzilla::Bug::EmitDependList('dependson', 'blocked', $bug_id,
+    $hide_resolved);
 }
 
diff --git a/extensions/OldBugMove/Config.pm b/shutdown.cgi
old mode 100644
new mode 100755
similarity index 76%
rename from extensions/OldBugMove/Config.pm
rename to shutdown.cgi
index 681cbae2df..4e04b15854
--- a/extensions/OldBugMove/Config.pm
+++ b/shutdown.cgi
@@ -1,3 +1,4 @@
+#!/usr/bin/perl -T
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -5,11 +6,12 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-package Bugzilla::Extension::OldBugMove;
-
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use constant NAME => 'OldBugMove';
-__PACKAGE__->NAME;
+use lib qw(. lib local/lib/perl5);
+
+use Bugzilla;
+
+Bugzilla::_shutdown();
diff --git a/skins/contrib/Dusk/global.css b/skins/contrib/Dusk/global.css
index 7ffb910144..e0a18bbef8 100644
--- a/skins/contrib/Dusk/global.css
+++ b/skins/contrib/Dusk/global.css
@@ -16,8 +16,20 @@ body {
 /* page title */
 
 #titles {
+    width: 100%;
+    background-color: #404D6C;
+    color: #fff;
     border-top-left-radius: 5px;
     border-top-right-radius: 5px;
+    padding: 0px;
+}
+
+#header .links {
+    border-left: 1px solid #747E93;
+    border-right: 1px solid #747E93;
+    border-bottom: 1px solid #747E93;
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
 }
 
 #header .links, #footer {
@@ -36,8 +48,13 @@ body {
     text-decoration: none;
 }
 #header a:hover, #footer a:hover {
+    color: white;
     text-decoration: underline;
 }
+#header a:visited, #footer a:visited {
+    color: white;
+    text-decoration: none;
+}
 
 /* body */
 
@@ -53,6 +70,7 @@ body {
 a {
     color: #6070cf;
 }
+
 a:hover {
     color: #8090ef;
 }
@@ -70,6 +88,10 @@ hr {
     padding-top: 2px;
 }
 
+.field_label a, .field_label b {
+    color: #6070cf;
+}
+
 /* attachments */
 
 #attachment-list {
@@ -140,6 +162,10 @@ hr {
     margin-left: 0;
 }
 
+.bz_comment_user a {
+    color: #6070cf;
+}
+
 .bz_comment.bz_private {
     background-color: #f0e8e8;
     border-color: #f8c8ba;
@@ -174,6 +200,9 @@ hr {
 }
 
 /* tabs */
+table.tabs {
+    border-collapse: collapse;
+}
 
 .tabbed .tabbody {
     background: #f8f8f8;
@@ -189,9 +218,15 @@ hr {
     border-collapse: collapse;
 }
 
+.tabs a {
+    color: #6070cf;
+}
+
 .tabs td {
     background: #c8c8c8;
+    border-style: solid;
     border-width: 1px;
+    text-transform: none;
 }
 
 .tabs td.selected {
@@ -216,6 +251,15 @@ hr {
     clear:both;
 }
 
+.column_header {
+    background-color: #66f;
+}
+
+#enter_bug      { background: url(../../standard/index/file-a-bug.png) no-repeat; }
+#query          { background: url(../../standard/index/search.png) no-repeat; }
+#account        { background: url(../../standard/index/new-account.png) no-repeat; }
+#help           { background: url(../../standard/index/help.png) no-repeat; }
+
 /* Rules specific for printing */
 @media print {
     #header,
diff --git a/skins/standard/admin.css b/skins/standard/admin.css
index cdf75ac2c0..232076846c 100644
--- a/skins/standard/admin.css
+++ b/skins/standard/admin.css
@@ -303,3 +303,38 @@ table.schedule_list th, table.search_list th {
     padding: .5em;
     font-size: small;
 }
+
+#report {
+    border: 1px solid #888888;
+}
+
+#report td, #report th {
+    padding: 3px 10px 3px 3px;
+    border: 0px;
+}
+
+#report th {
+    text-align: left;
+}
+
+#report-header {
+    background-color: #cccccc;
+}
+
+.report_row_odd {
+    background-color: #eeeeee;
+    color: #000000;
+}
+
+.report_row_even {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#report.hover tr:hover {
+    background-color: #ccccff;
+}
+
+.report_information {
+    font-style: italic;
+}
diff --git a/skins/standard/bug.css b/skins/standard/bug.css
index 851b1bdbab..4f78e2a91a 100644
--- a/skins/standard/bug.css
+++ b/skins/standard/bug.css
@@ -117,7 +117,6 @@ table#attachment_flags th, table#attachment_flags td {
 .bz_short_desc_container {
     margin: 8px 0;
     padding: 0.3em;
-    background-color: rgb(208, 208, 208);
     border-radius: 0.5em;
     font-size: 125%;
     font-weight: bold;
@@ -134,6 +133,23 @@ table#attachment_flags th, table#attachment_flags td {
     width: 10em;
 }
 
+.bz_alias_short_desc_container {
+    background: none;
+    font-size: 20px;
+    font-weight: normal;
+    line-height: 30px;
+    padding: 5px 0;
+    text-shadow: 0 1px rgba(255, 255, 255, 0.2);
+}
+
+.bz_alias_short_desc_container b {
+    font-weight: normal;
+}
+
+ .bz_alias_short_desc_container .editme {
+     font-weight: normal;
+}
+
 table#flags {
     width: auto;
 }
@@ -143,12 +159,13 @@ table#flags {
 }
 
 .related_actions {
+    line-height: 19px;
+    padding: 5px 10px;
     font-size: 0.85em;
     float: right;
     list-style-type: none;
     white-space: nowrap;
     margin: 0;
-    padding: 0;
 }
 
 .related_actions li {
@@ -226,6 +243,9 @@ table#flags {
 
 .knob-buttons {
     float: right;
+    text-align: right;
+    font-size: small;
+    font-weight: normal;
 }
 
 .text_input, .bz_userfield, #keywords_container, #tag_container {
@@ -236,16 +256,24 @@ table#flags {
 }
 
 .bz_comment_tags {
+    background: #eee;
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    padding: 5px;
     margin-top: 3px;
 }
 
 .bz_comment_tag {
-    border: 1px solid #c8c8ba;
-    padding: 1px 3px;
+    background: #fff;
+    color: #444;
+    border: none;
+    padding: 2px 6px;
     margin-right: 2px;
     border-radius: 0.5em;
     background-color: #eee;
-    color: #000;
+}
+
+.bz_comment_tag a {
+    color: #0095DD;
 }
 
 #bz_ctag_div {
@@ -253,13 +281,19 @@ table#flags {
 }
 
 #bz_ctag_error {
-    border: 1px solid #ff6666;
-    padding: 0px 2px;
+    border: none;
+    background-color: #faa;
+    color: #444;
+    padding: 2px 6px;
     border-radius: 0.5em;
     margin: 2px;
     display: inline-block;
 }
 
+#bz_ctag_error a {
+    color: #0095DD;
+}
+
 #comment_tags_collapse_expand_container {
     padding-top: 1em;
 }
@@ -414,6 +448,13 @@ table.file_table {
     border-bottom: 1px solid black;
 }
 
+body[class*=bz_group_] {
+    background-color: inherit;
+    background-image: url(index/noise.png), -moz-linear-gradient(#d7d7ff, #f0f0ff 400px);
+    background-image: url(index/noise.png), -webkit-linear-gradient(#d7d7ff, #f0f0ff 400px);
+    background-image: url(index/noise.png), linear-gradient(#d7d7ff, #f0f0ff 400px);
+}
+
 tbody.file pre {
     display: inline;
     font-size: 0.9em;
@@ -452,6 +493,40 @@ table.attachment_info td {
     vertical-align: top;
 }
 
+table.edit_form {
+    background: #fff;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin-bottom: 20px;
+    padding: 10px 10px 80px;
+    position: relative;
+}
+
+table.edit_form tbody {
+    width: 100%;
+}
+
+table.edit_form hr {
+    display: none;
+}
+
+.cc_list_display {
+    background: #fff;
+    float: none;
+    font-size: 11px;
+    margin-top: 3px;
+    max-width: none;
+    padding: 5px;
+}
+
+#project-flags, #custom-flags {
+    border-collapse: collapse;
+}
+
+#project-flags label, #custom-flags label {
+    margin-right: 10px;
+}
+
 /* Text displayed when the attachment is not viewable by the web browser */
 #noview {
     text-align: left;
@@ -558,7 +633,12 @@ div#update_container {
 #editFrame, #viewDiffFrame, #viewFrame {
     height: 400px;
     width: 95%;
-    margin-left: 2%;
+    margin-left: 0;
+}
+
+#viewFrame {
+    border: 2px solid #222;
+    margin-bottom: 10px;
 }
 
 .viewall_frame_container {
@@ -594,4 +674,8 @@ div#update_container {
    font-weight: bold;
 }
 
+.bz-comment {
+   resize: both;
+}
+
 /* attachment.cgi (end) */
diff --git a/skins/standard/buglist.css b/skins/standard/buglist.css
index d614da9ea8..8f6359191d 100644
--- a/skins/standard/buglist.css
+++ b/skins/standard/buglist.css
@@ -58,6 +58,7 @@
 
 .bz_query_links a img {
     vertical-align: bottom;
+    border: 0;
 }
 
 .bz_query_links a {
@@ -215,6 +216,10 @@ table.requests th {
     white-space: nowrap;
 }
 
+#summary_field.search_field_row input {
+    padding-bottom: 6px;
+}
+
 #bug_id_container {
     display: inline-block;
     vertical-align: middle;
@@ -382,44 +387,18 @@ div.bz_section_title span {
 
 /* Series & reports (start) */
 
-.t1 {
-    background-color: #ffffff; /* white */
-}
-
-.t2 {
-    background-color: #dfefff;  /* light blue */
-}
-
-.t3 {
-    background-color: #dddddd;  /* grey */
-}
-
-.t4 {
-    background-color: #c3d3ed; /* darker blue */
-}
-
 .ttotal, .ttotal td {
-    background-color: #cfffdf; /* light green */
+    /* !important overrides jQuery DataTables default color */
+    background-color: #cfffdf !important; /* light green */
 }
 
-.tabular_report_container {
+.tabular_report {
   /* Force tables to be horizontally centered */
     margin-left: auto;
     margin-right: auto;
     text-align: center;
 }
 
-.tabular_report {
-    border: 1px dotted black;
-    border-collapse: collapse;
-    text-align: center;
-}
-
-.tabular_report th, .tabular_report td {
-    border: 1px dotted;
-    padding: 0.2em;
-}
-
 #graphical_report {
     max-width: 100%;
     height: auto;
@@ -584,4 +563,4 @@ table.owner, table.number, table.zeroitems {
     padding-right: 3em;
 }
 
-/* summarize_time.cgi (end) */
\ No newline at end of file
+/* summarize_time.cgi (end) */
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 28c406b1d1..20a555c581 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -7,21 +7,68 @@
  */
 
 /* global (begin) */
+    @font-face {
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 400;
+        src: local('Open Sans'), local('OpenSans'), url(global/opensans.woff) format('woff');
+    }
+
+    @font-face {
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 600;
+        src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(global/opensans-semibold.woff) format('woff');
+    }
+
+    @font-face {
+        font-family: 'Open Sans';
+        font-style: normal;
+        font-weight: 700;
+        src: local('Open Sans Bold'), local('OpenSans-Bold'), url(global/opensans-bold.woff) format('woff');
+    }
+
     body {
         font-family: sans-serif;
-        color: #000;
-        background: #fff url("global/body-back.gif") repeat-x;
+        color: #404040;
+        background: #f6f4ec;
+        background-image: url(global/noise.png);
+        background-image: url(global/noise.png), -moz-linear-gradient(#d7d3c8, #f6f4ec 400px);
+        background-image: url(global/noise.png), -webkit-linear-gradient(#d7d3c8, #f6f4ec 400px);
+        background-image: url(global/noise.png), linear-gradient(#d7d3c8, #f6f4ec 400px);
+        background-repeat: repeat, repeat-x;
+        padding: 15px 15px 2px 15px;
+        margin: 0;
     }
+
     body, td, th, input, dt, #titles {
         font-family: Verdana, sans-serif;
         font-size: small;
     }
+
+    body, td, th, input, select, option, optgroup, .text_input {
+        font-family: "Open Sans", "Helvetica Neue", Arial, Helvetica, sans-serif;
+    }
+
+    /* header and footer are required for IE8. IE9+ support them natively.
+     * main is required for all IE versions and KHTML-based browsers.
+     * Other browsers support them natively already. */
+    header, main, footer {
+        display: block;
+    }
+
     /* monospace is much smaller than Verdana by default, so we make it a bit bigger. */
     pre, code, kbd {
         font-size: medium;
     }
 
     #bugzilla-body {
+        background: none;
+        border: none;
+        color: #404040;
+        margin: 10px auto 15px;
+        padding: 0;
+        width: 99%
         clear: both;
     }
 
@@ -34,7 +81,49 @@
 
 /* header (begin) */
     #header {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        background: #e5e3dc;
+        background: -moz-linear-gradient(#e5e3dc, #ecebe5);
+        background: -webkit-linear-gradient(#e5e3dc, #ecebe5);
+        background: linear-gradient(#e5e3dc, #ecebe5);
+        border-radius: 0;
+        border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+        border-top: 2px solid rgb(255, 255, 255);
+        box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+        margin: -15px -15px 0 -15px;
         margin-bottom: 1em;
+        color: transparent;
+    }
+
+    #header .subheader {
+        text-align: left;
+        padding-left: 10px;
+    }
+
+    #header .wrapper {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        margin: -1px auto 0px;
+        width: 99%;
+    }
+
+    #header .wrapper:after {
+        clear: both;
+        content: ".";
+        display: block;
+        height: 0;
+        visibility: hidden;
+    }
+
+    #header a, #header a:visited, #footer a, #footer a:visited {
+        color: #0095dd;
+        text-decoration: none;
+    }
+
+    #header a:hover, #footer a:hover {
+        color: #00539f;
     }
 
     #header form, #header form input,
@@ -44,21 +133,23 @@
         display: inline;
     }
 
-    #header .links {
-        border-left: 1px solid #747E93;
-        border-right: 1px solid #747E93;
-        border-bottom: 1px solid #747E93;
-        border-bottom-left-radius: 5px;
-        border-bottom-right-radius: 5px;
-        padding: 0.5em;
+    #header .form a {
+        margin: 0;
     }
 
-    #common_links {
-        clear: both;
+    #header .links {
+        background: transparent;
+        border: none;
+        border-radius: 0;
+        color: #404040;
+        position: relative;
+        padding: 0.5em;
+        width: auto;
     }
 
     #lang_links_container {
         float: right;
+        white-space: nowrap;
     }
 
     #lang_links_container .links {
@@ -71,12 +162,18 @@
     }
 
     #message {
-        border: 1px solid red;
+        border: 1px solid green;
         margin: 0.3em 0em;
-        padding: 0.3em;
+        padding: 0.3em 0.5em;
         color: green;
     }
 
+    #bugzilla_version {
+        float: right;
+        color: #888;
+        padding 5px 20px;
+    }
+
     form.mini_login input.bz_login  {
         width: 10em;
     }
@@ -97,9 +194,10 @@
 
 /* titles (begin) */
     #titles {
-        width: 100%;
-        background-color: #404D6C;
-        color: #fff;
+        width: 95%;
+        background-color: transparent;
+        color: #000;
+        padding: 10px 10px 0px 10px;
         border-top-left-radius: 5px;
         border-top-right-radius: 5px;
         margin: 0;
@@ -123,6 +221,12 @@
         display: table-cell;
     }
 
+    #title {
+        width: 150px;
+        font-size: 120%;
+        padding: 0px 0px 0px 5px;
+    }
+
     #titles #subtitle {
         font-weight: normal;
         text-align: center;
@@ -139,6 +243,16 @@
         display: table-cell;
     }
 
+    #information {
+        text-align: left;
+    }
+
+    #information p {
+        float: right;
+        color: #888;
+        padding: 5px 20px;
+    }
+
 /* titles (end) */
 
 /* footer (begin)
@@ -146,10 +260,11 @@
  * to both the header and footer. 
  */
     #footer {
+        background: #fff;
+        color: #bbb;
+        width: auto;
         clear: both;
         margin-top: 1em;
-        width: 100%;
-        background: #edf2f2;
         border-top: 1px solid #ddd;
         border-bottom: 1px solid #ddd;
     }
@@ -177,6 +292,10 @@
     #footer .links {
         vertical-align: top;
     }
+
+    #footer .links .quicksearch_form {
+        display: none;
+    }
 /* footer (end) */
 
 /* link lists (begin) */
@@ -194,6 +313,8 @@
 
 /* tabs (begin) */
     table.tabs {
+        border-collapse: separate;
+        border-spacing: 1em 0;
         width: 100%;
     }
 
@@ -202,34 +323,48 @@
     }
 
     .tabs td {
-        background: #eee;
+        background: rgba(255,255,255,0.5);
+        padding: 1em;
         text-align: center;
-        border-style: solid;
+        border-style: none;
+        font-size: 12px;
+        text-transform: uppercase;
         border-color: black;
         border-width: 0px 0px 2px 0px;
     }
 
     .tabs td.selected {
         background: white;
+        font-weight: 700;
         border-width: 2px 2px 0px 2px;
     }
 
     .tabs td.spacer {
+        background: transparent;
+    }
+
+    .tabs a {
+        color: #333;
+    }
+
+    .tabbody {
         background: white;
+        padding: 1em 2em;
     }
 /* tabs (end) */
 
 /* generic (begin) */
     a {
-        color: #039;
+        color: #0095dd;
+        text-decoration: none;
     }
 
     a:visited {
         color: #636;
     }
 
-    a:hover {
-        color: #333;
+    a:hover, #header a:hover, #footer a:hover {
+        color: #00539f;
     }
 
     a:active {
@@ -244,16 +379,36 @@
         font-family: monospace;
     }
 
-    blockquote {
-        border-left: 0.2em solid #CCC;
-        color: #65379C;
-        padding: 0;
-        margin-left: 0.5em;
-        margin-bottom: -1em;
-        white-space: pre;
+    hr {
+        border: none
+        height: 1px;
+        color: #ccc;
+        background-color: #ccc;
+        margin: 1em 0;
+    }
+
+    #changeform hr {
+        display: none;
     }
 /* generic (end) */
 
+#login_form {
+    border: solid;
+    margin: 2em auto;
+    padding: 1em;
+    width: 35em;
+}
+
+#login_form #Bugzilla_login, #login_form #Bugzilla_password,
+#forgot_password #loginname {
+    width: 25em;
+}
+
+#login_form .links {
+    text-align: center;
+    padding: 1em;
+}
+
 /* Links that control whether or not something is visible. */
 a.controller {
     font-size: 115%;
@@ -279,6 +434,17 @@ div#docslinks {
 /**************************/
 /* Bug links and statuses */
 /**************************/
+.links a {
+    margin: 0 10px 0 10px;
+}
+
+.links .home {
+    font-weight: bold;
+}
+
+.links .separator {
+    display: none;
+}
 
 .bz_bug_link {
     /* Catch-all if you want common styles for all bug links */
@@ -314,18 +480,51 @@ div#docslinks {
     vertical-align: top;
 }
 
+.bz_comment_table .bz_comment {
+    width: 65em !important;
+}
+
+.bz_comment pre, #comment {
+    font: 13px/1.2 "Droid Sans Mono", Menlo, Monaco, "Courier New", Courier, monospace;
+}
+
 .bz_comment {
+    width: 65em;
+    margin: 0 0 20px;
     margin-bottom: 2em;
 }
 
 /* tbody.file pre is for the Diff view of attachments. */
-.bz_comment_text, .uneditable_textarea, tbody.file pre {
+pre.bz_comment_text, .uneditable_textarea, tbody.file pre {
      font-family: monospace;
      white-space: pre-wrap;
 }
 
 .bz_comment_text {
-     width: 50em;
+    background: #fff;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin: 1px 0 0 0;
+    overflow: auto;
+    padding: 10px;
+    position: relative;
+    width: auto;
+}
+
+.bz_comment_text:after, .bz_comment_text:before {
+    bottom: 100%;
+    border: solid transparent;
+    content: " ";
+    height: 0;
+    width: 0;
+    position: absolute;
+    pointer-events: none;
+}
+
+.bz_comment_text:after {
+    border-bottom-color: #fff;
+    border-width: 8px;
+    left: 16px;
 }
 
 .bz_comment_text span.quote {
@@ -334,7 +533,30 @@ div#docslinks {
     white-space: pre;
     overflow: auto;
     display: block;
-    margin-bottom: -1em;
+}
+
+.bz_comment_text span.quote, .bz_comment_text span.quote_wrapped {
+    background: #eee !important;
+    color: #444 !important;
+    display: block !important;
+    margin-top: 5px !important;
+    margin-bottom: -10px !important;
+    overflow: auto;
+    padding: 5px !important;
+}
+
+.bz_comment_text table {
+    border-collapse:collapse;
+}
+
+.bz_comment_text table, .bz_comment_text th, .bz_comment_text td {
+    border: 1px solid #969696;
+    padding: 2px;
+}
+
+.bz_comment_text thead, .bz_comment_text tbody {
+     border-top: 2px solid black;
+     border-bottom: 2px solid black;
 }
 
 .bz_comment_user, .bz_comment_time, .bz_comment_number, 
@@ -347,6 +569,14 @@ div#docslinks {
     float: right;
 }
 
+.bz_comment_actions {
+    margin: 0px 0px;
+}
+
+.new_user {
+    margin-left: 10px;
+}
+
 .bz_collapse_expand_comments {
     padding: 0;
     margin: 0 0 0 1em;
@@ -354,25 +584,70 @@ div#docslinks {
 }
 .bz_collapse_expand_comments li {
     margin-bottom: .5em;
+    white-space: nowrap;
 }
 .bz_collapse_comment {
     text-decoration: none;
 }
 
+#add_comment {
+    border: 1px solid #ccc;
+    border-width: 1px 0;
+    margin-bottom: 20px;
+    padding: 10px 0;
+}
+
+#add_comment > table {
+    border-collapse: collapse;
+    width: 661px;
+}
+
 .bz_private_checkbox input { 
     margin: 0;
     vertical-align: middle;
 }
 
 .bz_comment_head, .bz_first_comment_head {
+    font-weight: normal;
+    line-height: 32px;
+    padding-bottom: 2px;
+    padding-left: 0px;
+    margin-left: -5px;
+    white-space: nowrap;
+    background-color: transparent;
     padding-top: .1em;
-    padding-bottom: .1em;
-    padding-left: .5em;
     background-color: #e0e0e0;
 }
 
+.bz_comment_head img, .bz_first_comment_head img {
+    vertical-align: middle;
+}
+
+.bz_comment_user a {
+    -moz-transition: all 0.25s linear 0s;
+    -webkit-transition: all 0.25s linear 0s;
+    transition: all 0.25s linear 0s;
+    transition: all 0.25s linear 0s;
+    color: #0095dd;
+    padding: 0px;
+    margin: 0px;
+}
+
+.bz_comment_user a:hover {
+    -moz-transition: all 0.25s linear 0s;
+    -webkit-transition: all 0.25s linear 0s;
+    transition: all 0.25s linear 0s;
+    background: #fff;
+    border: none;
+    text-decoration: none;
+}
+
+.bz_comment_user .vcard {
+    font-weight: bold;
+}
+
 .bz_comment_user_images img {
-    vertical-align: bottom;
+    vertical-align: middle;
 }
 
 .bz_comment_hilite pre {
@@ -388,6 +663,17 @@ div#docslinks {
 
 /** End Comments **/
 
+/** Markdown **/
+blockquote.markdown {
+    border-left: 0.2em solid #CCC;
+    color: #65379C;
+    padding: 0 1em;
+    margin-left: 0.5em;
+    margin-bottom: 0em;
+    white-space: normal;
+}
+/** End Markdown **/
+
 .bz_default_hidden, .bz_tui_hidden, .bz_hidden_field, .bz_hidden_option {
     /* We have !important because we want elements with these classes to always
      * be hidden, even if there is some CSS that overrides it (we use these
@@ -401,6 +687,10 @@ table#flags td {
     text-align: left;
 }
 
+#flags label {
+    font-weight: normal;
+}
+
 #email_prefs, #saved_search_prefs, #shared_search_prefs,
 #bug_activity {
     border: 1px solid black;
@@ -453,7 +743,7 @@ table#flags td {
 }
 
 .column_header {
-    background-color: #66f;
+    background-color: transparent;
 }
 
 .column_header th {
@@ -472,6 +762,19 @@ input.requestee {
     font-size: x-large;
 }
 
+#error_msg a {
+    color: #6070cf;
+    text-decoration: underline;
+}
+
+#error_msg a:visited {
+    color: #636;
+}
+
+#error_msg a:hover {
+    color: #8090ef;
+}
+
 #post_err_msg, form#check {
     clear: both;
 }
@@ -493,6 +796,24 @@ input.requestee {
     font-weight: bold;
 }
 
+form.table_layout div {
+    margin-bottom: 0.4em;
+}
+
+form.table_layout label {
+    font-weight: bold;
+    width: 8em;
+    display: inline-block;
+    float: left;
+    text-align: right;
+    padding-right: 0.5em;
+}
+
+.flex {
+    display: flex;
+    flex-wrap: wrap;
+}
+
 .throw_error a:visited {
     color: darkblue ;
 }
@@ -515,8 +836,17 @@ dl dl > dt {
 
 /* Style of the attachment table and time tracking table */
 #attachment_table {
+    background: #fff;
     border-collapse: collapse;
-    border: 1px solid #333333;
+    border: none;
+    border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
+    margin-bottom: 40px;
+}
+
+#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th {
+    background: #eee;
+    color: #404040;
 }
 
 #attachment_table th, .bz_attach_footer, .bz_time_tracking_table th,
@@ -525,6 +855,14 @@ dl dl > dt {
     color: black;
 }
 
+#attachment_table .bz_attach_actions {
+    white-space: nowrap;
+}
+
+#attachment_table td {
+    border: none;
+}
+
 #attachment_table td, .bz_time_tracking_table th, .bz_time_tracking_table td {
     border: 1px solid #333333;
 }
@@ -533,6 +871,10 @@ dl dl > dt {
     padding: 0.3em;
 }
 
+.file_table, .file-table {
+    background: #ffffff;
+}
+
 .bz_attach_extra_info, .bz_info {
     font-size: smaller;
 }
@@ -606,15 +948,112 @@ div.user_match {
     }
 }
 
+/* Smaller than standard 990 (devices and browsers) */
+@media only screen and (max-width: 989px) {
+    #header .links {
+        float: none;
+    }
+}
+
+/* Tablet Portrait size to standard 990 */
+@media only screen and (min-width: 768px) and (max-width: 989px) {
+    body {
+        min-width: 768px;
+    }
+
+    #header .wrapper, #bugzilla-body {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        min-width: 768px;
+    }
+
+    #footer > * {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        min-width: 768px;
+    }
+}
+
+/* All Mobile Sizes */
+@media only screen and (max-width: 767px) {
+    table.edit_form, table.edit_form > tbody > tr > td {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        display: block;
+        width: 100% !important;
+    }
+
+    .bz_column_spacer {
+        width: auto;
+        height: 20px;
+    }
+}
+
+/* Mobile Landscape Size to Tablet Portrait */
+@media only screen and (min-width: 480px) and (max-width: 767px) {
+    body {
+        min-width: 480px;
+    }
+
+    #header .wrapper, #bugzilla-body, #attachment_table,
+    .bz_comment, #add_comment > table, #comment {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        width: 480px !important;
+    }
+
+    #footer > * {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        width: 480px;
+    }
+}
+
+/* Mobile Portrait Size to Mobile Landscape Size */
+@media only screen and (max-width: 479px) {
+    body {
+        min-width: 100%;
+    }
+
+    #header .wrapper, #bugzilla-body, #attachment_table,
+    .bz_comment, #add_comment > table, #comment {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        width: 100% !important;
+    }
+
+    #footer > * {
+        -moz-box-sizing: border-box;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        width: 100%;
+    }
+}
+
 /**************/
 /* Bug Fields */
 /**************/
 
 .field_label {
     text-align: right;
-    vertical-align: top;
+    vertical-align: baseline;
+    font-weight: bold !important;
+    padding-right: 10px;
+    white-space: nowrap;
+
+}
+
+.field_label a, .field_label b {
+    color: #404040;
     font-weight: bold;
 }
+
 .field_help_link {
     cursor: help;
 }
@@ -628,7 +1067,7 @@ div.user_match {
 
 .field_value .text_input {
     width: 100%;
-    min-width: 25em;
+    min-width: 0;
 }
 
 .uneditable_textarea {
@@ -647,13 +1086,34 @@ input.required, select.required, span.required_explanation {
     color: #000;
 }
 
-.calendar_button {
-    background: transparent url("global/calendar.png") no-repeat;
-    width: 20px;
-    height: 20px;
-    vertical-align: middle;
+select[multiple], textarea, input[type=text], input[type=password], input:not([type]), .text_input, .yui-ac-input {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    border: 1px solid #b2b2b2;
+    border-radius: .25em;
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.1);
+    background: white;
+    padding: 4px 3px 5px;
+    color: #404040;
+    vertical-align: top;
+}
+
+select[multiple], .text_input, .yui-ac-input, input {
+    font-size: 1em;
+}
+
+select[multiple]:focus, textarea:focus, .text-input:focus, -yui-ac-input:focus, input:focus {
+    border-color: #42a4e0;
+    -webkit-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
+    -moz-box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
+    box-shadow: 0 0 0 2px rgba(73,173,227,0.4);
+}
+
+select, select[multiple] {
+    font-size: 12px;
 }
-.calendar_button span { display: none }
+
 /* These classes are set by YUI. */
 .yui-calcontainer {
     display: none;
@@ -668,7 +1128,7 @@ input.required, select.required, span.required_explanation {
     list-style-type: none;
 }
 
-.field_textarea_readonly {
+pre.field_textarea_readonly {
     margin: 2px;
     padding: 4px;
     overflow: auto;
@@ -676,9 +1136,6 @@ input.required, select.required, span.required_explanation {
     max-width: 30em;
     max-height: 7em;
     border: 1px solid #CCC;
-}
-
-.field_textarea_readonly pre {
     font-family: monospace;
     white-space: pre-wrap;
 }
@@ -704,6 +1161,7 @@ input.required, select.required, span.required_explanation {
 }
 
 #comment_tabs {
+    margin-top: 2px;
     border-spacing: 0;
 }
 
@@ -721,6 +1179,9 @@ input.required, select.required, span.required_explanation {
 }
 
 #comment_preview {
+    background: white;
+    display: block;
+    clear: both;
     border: 1px solid silver;
     padding: 1px;
     overflow: auto;
@@ -728,15 +1189,26 @@ input.required, select.required, span.required_explanation {
 }
 
 #comment_preview_text {
+    background: transparent;
+    border: none;
+    box-shadow: none;
+    padding: 2px 2px 2px 1px;
     margin: 0px;
     width: auto;
 }
 
+.comment_preview_pre {
+    white-space: pre;
+}
+
 #comment_preview_loading {
     font-style: italic;
 }
 
 #comment {
+    -moz-box-sizing: content-box;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
     margin: 0;
 }
 
@@ -794,7 +1266,7 @@ tr.shared_search {
 
 #page-index {
     padding: 0.2em 0.2em 0.15em 0.2em;
-    max-width: 1000px;
+    max-width: none;
 }
 
 /* By default these contain nothing, but these CSS rules make things
@@ -852,11 +1324,6 @@ tr.shared_search {
     text-decoration: none;
 }
 
-#enter_bug { background: url(index/file-a-bug.png)  no-repeat; }
-#query     { background: url(index/search.png)      no-repeat; }
-#account   { background: url(index/new-account.png) no-repeat; }
-#help      { background: url(index/help.png)        no-repeat; }
-
 #quicksearchForm {
     clear: both;
     text-align: center;
@@ -872,11 +1339,32 @@ tr.shared_search {
     padding: 0;
 }
 
+#quicksearch_top, #quicksearch_main {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    background: url(global/search.png) 5px center no-repeat, #fafafa;
+    background: url(global/search.png) 5px center no-repeat, -moz-linear-gradient(#fafafa, #fff);
+    background: url(global/search.png) 5px center no-repeat, -webkit-linear-gradient(#fafafa, #fff);
+    background: url(global/search.png) 5px center no-repeat, linear-gradient(#fafafa, #fff);
+    padding: .4em 1em .45em 26px;
+    width: 200px;
+}
+
+#enter_bug      { background: url(index/bugzilla-papericon.png) no-repeat; }
+#query          { background: url(index/bugzilla-magnifier.png) no-repeat; }
+#account        { background: url(index/bugzilla-person-alternate.png) no-repeat; }
+#help           { background: url(index/bugzilla-questionmark2.png) no-repeat; }
+
 #page-index table {
     border-collapse: collapse;
     margin: auto;
 }
 
+#page-index td:first-child {
+    text-align: center;
+}
+
 #welcome {
     font-size: x-large;
     font-weight: bold;
@@ -894,6 +1382,20 @@ tr.shared_search {
     text-decoration: none;
 }
 
+#quicksearch_links {
+    margin-top: 10px;
+}
+
+.navigation {
+    background: rgba(255, 255, 255, 0.3);
+    padding: 5px 10px;
+}
+
+u {
+    border-bottom: 1px solid #aaa;
+    text-decoration: none;
+}
+
 ul#quicksearch_links {
     margin-bottom: 1em;
 }
@@ -914,6 +1416,63 @@ ul.additional_links li.bz_default_hidden {
 
 /* index.cgi (end) */
 
+/* buttons (begin) */
+button, input[type=submit], input[type=button], #commit, #commit_top, #header .btn, #header input[type=submit] {
+    background-color: #43a6e2;
+    background-image: -moz-linear-gradient(#43a6e2,#277ac1);
+    background-image: -webkit-linear-gradient(#43a6e2,#277ac1);
+    background-image: linear-gradient(#43a6e2,#277ac1);
+    -moz-transition: all linear 0.25s;
+    -webkit-transition: all linear 0.25s;
+    transition: all linear 0.25s;
+    border-radius: .25em;
+    border: 0px none;
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
+    color: rgb(255, 255, 255);
+    cursor: pointer;
+    display: inline-block;
+    font-size: 12px;
+    font-weight: 600;
+    text-align: center;
+    text-decoration: none;
+    text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.25);
+    padding: .425em 1em .5em;
+}
+
+button:hover, input[type=submit]:hover, input[type=button]:hover, #commit:hover, #commit_top:hover, #header .btn:hover, #header input[type=submit]:hover {
+    -webkit-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    -moz-box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3),inset 0 12px 24px 2px #38a9ed;
+    -moz-transition: all linear 0.25s;
+    -webkit-transition: all linear 0.25s;
+     transition: all linear 0.25s;
+}
+
+button:active, input[type=submit]:active, input[type=button]:active, #commit:active, #commit_top:active, #header .btn:active, #header input[type=submit]:active  {
+    -webkit-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
+    -moz-box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
+    box-shadow: inset 0 2px 0 0 rgba(0,0,0,0.2),inset 0 12px 24px 6px rgba(0,0,0,0.2),inset 0 0 2px 2px rgba(0,0,0,0.2);
+    -moz-transition: all linear 0.25s;
+    -webkit-transition: all linear 0.25s;
+    transition: all linear 0.25s;
+}
+
+button[disabled], input[type=submit][disabled], input[type=button][disabled], button[disabled]:hover, input[type=submit][disabled]:hover, input[type=button][disabled]:hover, button[disabled]:active, input[type=submit][disabled]:active, input[type=button][disabled]:active {
+    background-color: #bfc7cd;
+    background-image: -moz-linear-gradient(#bfc7cd,#9ca3aa);
+    background-image: -webkit-linear-gradient(#bfc7cd,#9ca3aa);
+    background-image: linear-gradient(#bfc7cd,#9ca3aa);
+    box-shadow: 0 1px 0 0 rgba(0,0,0,0.2),inset 0 -1px 0 0 rgba(0,0,0,0.3);
+    cursor: pointer;
+}
+
+.calendar_button, .calendar_button:hover {
+    box-shadow: none;
+    padding: 0;
+}
+
+/* buttons (end) */
+
 /* page.cgi (begin) */
 
 body.narrow_page #bugzilla-body > * {
@@ -1028,3 +1587,31 @@ table.field_value_explanation {
 }
 
 /* duplicates.cgi (end) */
+
+
+/* autocomplete */
+
+.autocomplete-suggestions {
+    border: 1px solid #999;
+    background: #fff;
+    color: #000;
+    overflow: auto;
+    cursor: pointer;
+}
+
+.autocomplete-suggestion {
+    padding: 2px 5px;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.autocomplete-selected {
+    background: #426fd9;
+    color: #FFF
+}
+
+.autocomplete-running {
+    background-image: url("throbber.gif") !important;
+    background-repeat: no-repeat !important;
+    background-position: right 8px center !important;
+}
diff --git a/skins/standard/global/noise.png b/skins/standard/global/noise.png
new file mode 100644
index 0000000000..97407ffd2d
Binary files /dev/null and b/skins/standard/global/noise.png differ
diff --git a/skins/standard/global/opensans-bold.woff b/skins/standard/global/opensans-bold.woff
new file mode 100644
index 0000000000..27619e7cea
Binary files /dev/null and b/skins/standard/global/opensans-bold.woff differ
diff --git a/skins/standard/global/opensans-semibold.woff b/skins/standard/global/opensans-semibold.woff
new file mode 100644
index 0000000000..e83bb333d2
Binary files /dev/null and b/skins/standard/global/opensans-semibold.woff differ
diff --git a/skins/standard/global/opensans.woff b/skins/standard/global/opensans.woff
new file mode 100644
index 0000000000..55b25f8670
Binary files /dev/null and b/skins/standard/global/opensans.woff differ
diff --git a/skins/standard/global/search.png b/skins/standard/global/search.png
new file mode 100644
index 0000000000..a56b5e2cd6
Binary files /dev/null and b/skins/standard/global/search.png differ
diff --git a/skins/standard/index/bugzilla-magnifier.png b/skins/standard/index/bugzilla-magnifier.png
new file mode 100644
index 0000000000..b859b16685
Binary files /dev/null and b/skins/standard/index/bugzilla-magnifier.png differ
diff --git a/skins/standard/index/bugzilla-papericon.png b/skins/standard/index/bugzilla-papericon.png
new file mode 100644
index 0000000000..6775679291
Binary files /dev/null and b/skins/standard/index/bugzilla-papericon.png differ
diff --git a/skins/standard/index/bugzilla-person-alternate.png b/skins/standard/index/bugzilla-person-alternate.png
new file mode 100644
index 0000000000..a9e9ff2138
Binary files /dev/null and b/skins/standard/index/bugzilla-person-alternate.png differ
diff --git a/skins/standard/index/bugzilla-questionmark2.png b/skins/standard/index/bugzilla-questionmark2.png
new file mode 100644
index 0000000000..441d07f938
Binary files /dev/null and b/skins/standard/index/bugzilla-questionmark2.png differ
diff --git a/skins/standard/throbber.gif b/skins/standard/throbber.gif
new file mode 100644
index 0000000000..bc4fa65619
Binary files /dev/null and b/skins/standard/throbber.gif differ
diff --git a/summarize_time.cgi b/summarize_time.cgi
index 3bdf8ee52f..0854c9f62d 100755
--- a/summarize_time.cgi
+++ b/summarize_time.cgi
@@ -6,18 +6,18 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
-use Date::Parse;         # strptime
+use Date::Parse;    # strptime
 
 use Bugzilla;
-use Bugzilla::Constants; # LOGIN_*
-use Bugzilla::Bug;       # EmitDependList
-use Bugzilla::Util;      # trim
+use Bugzilla::Constants;    # LOGIN_*
+use Bugzilla::Bug;          # EmitDependList
+use Bugzilla::Util;         # trim
 use Bugzilla::Error;
 
 #
@@ -25,152 +25,159 @@ use Bugzilla::Error;
 #
 
 sub date_adjust_down {
-   
-    my ($year, $month, $day) = @_;
-
-    if ($day == 0) {
-        $month -= 1;
-        $day = 31;
-        # Proper day adjustment is done later.
-
-        if ($month == 0) {
-            $year -= 1;
-            $month = 12;
-        }
-    }
 
-    if (($month == 2) && ($day > 28)) {
-        if ($year % 4 == 0 && $year % 100 != 0) {
-            $day = 29;
-        } else {
-            $day = 28;
-        }
+  my ($year, $month, $day) = @_;
+
+  if ($day == 0) {
+    $month -= 1;
+    $day = 31;
+
+    # Proper day adjustment is done later.
+
+    if ($month == 0) {
+      $year -= 1;
+      $month = 12;
     }
+  }
 
-    if (($month == 4 || $month == 6 || $month == 9 || $month == 11) &&
-        ($day == 31) ) 
-    {
-        $day = 30;
+  if (($month == 2) && ($day > 28)) {
+    if ($year % 4 == 0 && $year % 100 != 0) {
+      $day = 29;
+    }
+    else {
+      $day = 28;
     }
-    return ($year, $month, $day);
+  }
+
+  if (($month == 4 || $month == 6 || $month == 9 || $month == 11) && ($day == 31))
+  {
+    $day = 30;
+  }
+  return ($year, $month, $day);
 }
 
 sub date_adjust_up {
-    my ($year, $month, $day) = @_;
+  my ($year, $month, $day) = @_;
 
-    if ($day > 31) {
-        $month += 1;
-        $day    = 1;
+  if ($day > 31) {
+    $month += 1;
+    $day = 1;
 
-        if ($month == 13) {
-            $month = 1;
-            $year += 1;
-        }
+    if ($month == 13) {
+      $month = 1;
+      $year += 1;
     }
+  }
 
-    if ($month == 2 && $day > 28) {
-        if ($year % 4 != 0 || $year % 100 == 0 || $day > 29) {
-            $month = 3;
-            $day = 1;
-        }
+  if ($month == 2 && $day > 28) {
+    if ($year % 4 != 0 || $year % 100 == 0 || $day > 29) {
+      $month = 3;
+      $day   = 1;
     }
+  }
 
-    if (($month == 4 || $month == 6 || $month == 9 || $month == 11) &&
-        ($day == 31) )
-    {
-        $month += 1; 
-        $day    = 1;
-    }
+  if (($month == 4 || $month == 6 || $month == 9 || $month == 11) && ($day == 31))
+  {
+    $month += 1;
+    $day = 1;
+  }
 
-    return ($year, $month, $day);
+  return ($year, $month, $day);
 }
 
 sub split_by_month {
-    # Takes start and end dates and splits them into a list of
-    # monthly-spaced 2-lists of dates.
-    my ($start_date, $end_date) = @_;
 
-    # We assume at this point that the dates are provided and sane
-    my (undef, undef, undef, $sd, $sm, $sy, undef) = strptime($start_date);
-    my (undef, undef, undef, $ed, $em, $ey, undef) = strptime($end_date);
+  # Takes start and end dates and splits them into a list of
+  # monthly-spaced 2-lists of dates.
+  my ($start_date, $end_date) = @_;
 
-    # Find out how many months fit between the two dates so we know
-    # how many times we loop.
-    my $yd = $ey - $sy;
-    my $md = 12 * $yd + $em - $sm;
-    # If the end day is smaller than the start day, last interval is not a whole month.
-    if ($sd > $ed) {
-        $md -= 1;
-    }
+  # We assume at this point that the dates are provided and sane
+  my (undef, undef, undef, $sd, $sm, $sy, undef) = strptime($start_date);
+  my (undef, undef, undef, $ed, $em, $ey, undef) = strptime($end_date);
 
-    my (@months, $sub_start, $sub_end);
-    # This +1 and +1900 are a result of strptime's bizarre semantics
-    my $year = $sy + 1900;
-    my $month = $sm + 1;
-
-    # Keep the original date, when the date will be changed in the adjust_date.
-    my $sd_tmp = $sd;
-    my $month_tmp = $month;
-    my $year_tmp = $year;
-
-    # This section handles only the whole months.
-    for (my $i=0; $i < $md; $i++) {
-        # Start of interval is adjusted up: 31.2. -> 1.3.
-        ($year_tmp, $month_tmp, $sd_tmp) = date_adjust_up($year, $month, $sd);
-        $sub_start = sprintf("%04d-%02d-%02d", $year_tmp, $month_tmp, $sd_tmp); 
-        $month += 1;
-        if ($month == 13) {
-            $month = 1;
-            $year += 1;
-        }
-        # End of interval is adjusted down: 31.2 -> 28.2.
-        ($year_tmp, $month_tmp, $sd_tmp) = date_adjust_down($year, $month, $sd - 1);
-        $sub_end = sprintf("%04d-%02d-%02d", $year_tmp, $month_tmp, $sd_tmp);
-        push @months, [$sub_start, $sub_end];
-    }
-    
-    # This section handles the last (unfinished) month. 
-    $sub_end = sprintf("%04d-%02d-%02d", $ey + 1900, $em + 1, $ed);
+  # Find out how many months fit between the two dates so we know
+  # how many times we loop.
+  my $yd = $ey - $sy;
+  my $md = 12 * $yd + $em - $sm;
+
+# If the end day is smaller than the start day, last interval is not a whole month.
+  if ($sd > $ed) {
+    $md -= 1;
+  }
+
+  my (@months, $sub_start, $sub_end);
+
+  # This +1 and +1900 are a result of strptime's bizarre semantics
+  my $year  = $sy + 1900;
+  my $month = $sm + 1;
+
+  # Keep the original date, when the date will be changed in the adjust_date.
+  my $sd_tmp    = $sd;
+  my $month_tmp = $month;
+  my $year_tmp  = $year;
+
+  # This section handles only the whole months.
+  for (my $i = 0; $i < $md; $i++) {
+
+    # Start of interval is adjusted up: 31.2. -> 1.3.
     ($year_tmp, $month_tmp, $sd_tmp) = date_adjust_up($year, $month, $sd);
     $sub_start = sprintf("%04d-%02d-%02d", $year_tmp, $month_tmp, $sd_tmp);
+    $month += 1;
+    if ($month == 13) {
+      $month = 1;
+      $year += 1;
+    }
+
+    # End of interval is adjusted down: 31.2 -> 28.2.
+    ($year_tmp, $month_tmp, $sd_tmp) = date_adjust_down($year, $month, $sd - 1);
+    $sub_end = sprintf("%04d-%02d-%02d", $year_tmp, $month_tmp, $sd_tmp);
     push @months, [$sub_start, $sub_end];
+  }
+
+  # This section handles the last (unfinished) month.
+  $sub_end = sprintf("%04d-%02d-%02d", $ey + 1900, $em + 1, $ed);
+  ($year_tmp, $month_tmp, $sd_tmp) = date_adjust_up($year, $month, $sd);
+  $sub_start = sprintf("%04d-%02d-%02d", $year_tmp, $month_tmp, $sd_tmp);
+  push @months, [$sub_start, $sub_end];
 
-    return @months;
+  return @months;
 }
 
 sub sqlize_dates {
-    my ($start_date, $end_date) = @_;
-    my $date_bits = "";
-    my @date_values;
-    if ($start_date) {
-        # we've checked, trick_taint is fine
-        trick_taint($start_date);
-        $date_bits = " AND longdescs.bug_when > ?";
-        push @date_values, $start_date;
-    } 
-    if ($end_date) {
-        # we need to add one day to end_date to catch stuff done today
-        # do not forget to adjust date if it was the last day of month
-        my (undef, undef, undef, $ed, $em, $ey, undef) = strptime($end_date);
-        ($ey, $em, $ed) = date_adjust_up($ey+1900, $em+1, $ed+1);
-        $end_date = sprintf("%04d-%02d-%02d", $ey, $em, $ed);
-
-        $date_bits .= " AND longdescs.bug_when < ?"; 
-        push @date_values, $end_date;
-    }
-    return ($date_bits, \@date_values);
+  my ($start_date, $end_date) = @_;
+  my $date_bits = "";
+  my @date_values;
+  if ($start_date) {
+
+    # we've checked, trick_taint is fine
+    trick_taint($start_date);
+    $date_bits = " AND longdescs.bug_when > ?";
+    push @date_values, $start_date;
+  }
+  if ($end_date) {
+
+    # we need to add one day to end_date to catch stuff done today
+    # do not forget to adjust date if it was the last day of month
+    my (undef, undef, undef, $ed, $em, $ey, undef) = strptime($end_date);
+    ($ey, $em, $ed) = date_adjust_up($ey + 1900, $em + 1, $ed + 1);
+    $end_date = sprintf("%04d-%02d-%02d", $ey, $em, $ed);
+
+    $date_bits .= " AND longdescs.bug_when < ?";
+    push @date_values, $end_date;
+  }
+  return ($date_bits, \@date_values);
 }
 
 # Return all blockers of the current bug, recursively.
 sub get_blocker_ids {
-    my ($bug_id, $unique) = @_;
-    $unique ||= {$bug_id => 1};
-    my $deps = Bugzilla::Bug::EmitDependList("blocked", "dependson", $bug_id);
-    my @unseen = grep { !$unique->{$_}++ } @$deps;
-    foreach $bug_id (@unseen) {
-        get_blocker_ids($bug_id, $unique);
-    }
-    return keys %$unique;
+  my ($bug_id, $unique) = @_;
+  $unique ||= {$bug_id => 1};
+  my $deps = Bugzilla::Bug::EmitDependList("blocked", "dependson", $bug_id);
+  my @unseen = grep { !$unique->{$_}++ } @$deps;
+  foreach $bug_id (@unseen) {
+    get_blocker_ids($bug_id, $unique);
+  }
+  return keys %$unique;
 }
 
 # Return a hashref whose key is chosen by the user (bug ID or commenter)
@@ -178,63 +185,66 @@ sub get_blocker_ids {
 # So you can either view it as the time spent by commenters on each bug
 # or the time spent in bugs by each commenter.
 sub get_list {
-    my ($bugids, $start_date, $end_date, $keyname) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($bugids, $start_date, $end_date, $keyname) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my ($date_bits, $date_values) = sqlize_dates($start_date, $end_date);
-    my $buglist = join(", ", @$bugids);
+  my ($date_bits, $date_values) = sqlize_dates($start_date, $end_date);
+  my $buglist = join(", ", @$bugids);
 
-    # Returns the total time worked on each bug *per developer*.
-    my $data = $dbh->selectall_arrayref(
-            qq{SELECT SUM(work_time) AS total_time, login_name, longdescs.bug_id
+  # Returns the total time worked on each bug *per developer*.
+  my $data = $dbh->selectall_arrayref(
+    qq{SELECT SUM(work_time) AS total_time, login_name, longdescs.bug_id
                  FROM longdescs
            INNER JOIN profiles
                    ON longdescs.who = profiles.userid
            INNER JOIN bugs
                    ON bugs.bug_id = longdescs.bug_id
-                WHERE longdescs.bug_id IN ($buglist) $date_bits } .
-            $dbh->sql_group_by('longdescs.bug_id, login_name', 'longdescs.bug_when') .
-           qq{ HAVING SUM(work_time) > 0}, {Slice => {}}, @$date_values);
-
-    my %list;
-    # What this loop does is to push data having the same key in an array.
-    push(@{$list{ $_->{$keyname} }}, $_) foreach @$data;
-    return \%list;
+                WHERE longdescs.bug_id IN ($buglist) $date_bits }
+      . $dbh->sql_group_by('longdescs.bug_id, login_name', 'longdescs.bug_when')
+      . qq{ HAVING SUM(work_time) > 0}, {Slice => {}}, @$date_values
+  );
+
+  my %list;
+
+  # What this loop does is to push data having the same key in an array.
+  push(@{$list{$_->{$keyname}}}, $_) foreach @$data;
+  return \%list;
 }
 
 # Return bugs which had no activity (a.k.a work_time = 0) during the given time range.
 sub get_inactive_bugs {
-    my ($bugids, $start_date, $end_date) = @_;
-    my $dbh = Bugzilla->dbh;
-    my ($date_bits, $date_values) = sqlize_dates($start_date, $end_date);
-    my $buglist = join(", ", @$bugids);
+  my ($bugids, $start_date, $end_date) = @_;
+  my $dbh = Bugzilla->dbh;
+  my ($date_bits, $date_values) = sqlize_dates($start_date, $end_date);
+  my $buglist = join(", ", @$bugids);
 
-    my $bugs = $dbh->selectcol_arrayref(
-        "SELECT bug_id
+  my $bugs = $dbh->selectcol_arrayref(
+    "SELECT bug_id
            FROM bugs
           WHERE bugs.bug_id IN ($buglist)
             AND NOT EXISTS (
                 SELECT 1
                   FROM longdescs
                  WHERE bugs.bug_id = longdescs.bug_id
-                   AND work_time > 0 $date_bits)",
-         undef, @$date_values);
+                   AND work_time > 0 $date_bits)", undef, @$date_values
+  );
 
-    return $bugs;
+  return $bugs;
 }
 
 # Return 1st day of the month of the earliest activity date for a given list of bugs.
 sub get_earliest_activity_date {
-    my ($bugids) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($bugids) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my ($date) = $dbh->selectrow_array(
-        'SELECT ' . $dbh->sql_date_format('MIN(bug_when)', '%Y-%m-01')
-       . ' FROM longdescs
-          WHERE ' . $dbh->sql_in('bug_id', $bugids)
-                  . ' AND work_time > 0');
+  my ($date) = $dbh->selectrow_array(
+        'SELECT '
+      . $dbh->sql_date_format('MIN(bug_when)', '%Y-%m-01')
+      . ' FROM longdescs
+          WHERE ' . $dbh->sql_in('bug_id', $bugids) . ' AND work_time > 0'
+  );
 
-    return $date;
+  return $date;
 }
 
 #
@@ -243,122 +253,133 @@ sub get_earliest_activity_date {
 
 my $user = Bugzilla->login(LOGIN_REQUIRED);
 
-my $cgi = Bugzilla->cgi;
+my $cgi      = Bugzilla->cgi;
 my $template = Bugzilla->template;
-my $vars = {};
+my $vars     = {};
 
 Bugzilla->switch_to_shadow_db();
 
-$user->is_timetracker
-    || ThrowUserError("auth_failure", {group  => "time-tracking",
-                                       action => "access",
-                                       object => "timetracking_summaries"});
+$user->is_timetracker || ThrowUserError(
+  "auth_failure",
+  {
+    group  => "time-tracking",
+    action => "access",
+    object => "timetracking_summaries"
+  }
+);
 
 my @ids = split(",", $cgi->param('id') || '');
 @ids = map { Bugzilla::Bug->check($_)->id } @ids;
 scalar(@ids) || ThrowUserError('no_bugs_chosen', {action => 'summarize'});
 
-my $group_by = $cgi->param('group_by') || "number";
-my $monthly = $cgi->param('monthly');
-my $detailed = $cgi->param('detailed');
-my $do_report = $cgi->param('do_report');
-my $inactive = $cgi->param('inactive');
+my $group_by   = $cgi->param('group_by') || "number";
+my $monthly    = $cgi->param('monthly');
+my $detailed   = $cgi->param('detailed');
+my $do_report  = $cgi->param('do_report');
+my $inactive   = $cgi->param('inactive');
 my $do_depends = $cgi->param('do_depends');
-my $ctype = scalar($cgi->param("ctype"));
+my $ctype      = $cgi->param('ctype');
 
 my ($start_date, $end_date);
 if ($do_report) {
-    my @bugs = @ids;
-
-    # Dependency mode requires a single bug and grabs dependents.
-    if ($do_depends) {
-        if (scalar(@bugs) != 1) {
-            ThrowCodeError("bad_arg", { argument=>"id",
-                                        function=>"summarize_time"});
-        }
-        @bugs = get_blocker_ids($bugs[0]);
-        @bugs = @{ $user->visible_bugs(\@bugs) };
-    }
+  my @bugs = @ids;
 
-    $start_date = trim $cgi->param('start_date');
-    $end_date = trim $cgi->param('end_date');
-
-    foreach my $date ($start_date, $end_date) {
-        next unless $date;
-        validate_date($date)
-          || ThrowUserError('illegal_date', {date => $date, format => 'YYYY-MM-DD'});
-    }
-    # Swap dates in case the user put an end_date before the start_date
-    if ($start_date && $end_date && 
-        str2time($start_date) > str2time($end_date)) {
-        $vars->{'warn_swap_dates'} = 1;
-        ($start_date, $end_date) = ($end_date, $start_date);
-    }
-
-    # Store dates in a session cookie so re-visiting the page
-    # for other bugs keeps them around.
-    $cgi->send_cookie(-name => 'time-summary-dates',
-                      -value => join ";", ($start_date, $end_date));
-
-    my (@parts, $part_data, @part_list);
-
-    # Break dates apart into months if necessary; if not, we use the
-    # same @parts list to allow us to use a common codepath.
-    if ($monthly) {
-        # Calculate the earliest activity date if the user doesn't
-        # specify a start date.
-        if (!$start_date) {
-            $start_date = get_earliest_activity_date(\@bugs);
-        }
-        # Provide a default end date. Note that this differs in semantics
-        # from the open-ended queries we use when start/end_date aren't
-        # provided -- and clock skews will make this evident!
-        @parts = split_by_month($start_date, 
-                                $end_date || format_time(scalar localtime(time()), '%Y-%m-%d'));
-    } else {
-        @parts = ([$start_date, $end_date]);
+  # Dependency mode requires a single bug and grabs dependents.
+  if ($do_depends) {
+    if (scalar(@bugs) != 1) {
+      ThrowCodeError("bad_arg", {argument => "id", function => "summarize_time"});
     }
-
-    # For each of the separate divisions, grab the relevant data.
-    my $keyname = ($group_by eq 'owner') ? 'login_name' : 'bug_id';
-    foreach my $part (@parts) {
-        my ($sub_start, $sub_end) = @$part;
-        $part_data = get_list(\@bugs, $sub_start, $sub_end, $keyname);
-        push(@part_list, $part_data);
-    }
-
-    # Do we want to see inactive bugs?
-    if ($inactive) {
-        $vars->{'null'} = get_inactive_bugs(\@bugs, $start_date, $end_date);
-    } else {
-        $vars->{'null'} = {};
+    @bugs = get_blocker_ids($bugs[0]);
+    @bugs = @{$user->visible_bugs(\@bugs)};
+  }
+
+  $start_date = trim(scalar $cgi->param('start_date'));
+  $end_date   = trim(scalar $cgi->param('end_date'));
+
+  foreach my $date ($start_date, $end_date) {
+    next unless $date;
+    validate_date($date)
+      || ThrowUserError('illegal_date', {date => $date, format => 'YYYY-MM-DD'});
+  }
+
+  # Swap dates in case the user put an end_date before the start_date
+  if ($start_date && $end_date && str2time($start_date) > str2time($end_date)) {
+    $vars->{'warn_swap_dates'} = 1;
+    ($start_date, $end_date) = ($end_date, $start_date);
+  }
+
+  # Store dates in a session cookie so re-visiting the page
+  # for other bugs keeps them around.
+  $cgi->send_cookie(
+    -name  => 'time-summary-dates',
+    -value => join ";",
+    ($start_date, $end_date)
+  );
+
+  my (@parts, $part_data, @part_list);
+
+  # Break dates apart into months if necessary; if not, we use the
+  # same @parts list to allow us to use a common codepath.
+  if ($monthly) {
+
+    # Calculate the earliest activity date if the user doesn't
+    # specify a start date.
+    if (!$start_date) {
+      $start_date = get_earliest_activity_date(\@bugs);
     }
 
-    # Convert bug IDs to bug objects.
-    @bugs = map {new Bugzilla::Bug($_)} @bugs;
-
-    $vars->{'part_list'} = \@part_list;
-    $vars->{'parts'} = \@parts;
-    # We pass the list of bugs as a hashref.
-    $vars->{'bugs'} = {map { $_->id => $_ } @bugs};
+    # Provide a default end date. Note that this differs in semantics
+    # from the open-ended queries we use when start/end_date aren't
+    # provided -- and clock skews will make this evident!
+    @parts = split_by_month($start_date,
+      $end_date || format_time(scalar localtime(time()), '%Y-%m-%d'));
+  }
+  else {
+    @parts = ([$start_date, $end_date]);
+  }
+
+  # For each of the separate divisions, grab the relevant data.
+  my $keyname = ($group_by eq 'owner') ? 'login_name' : 'bug_id';
+  foreach my $part (@parts) {
+    my ($sub_start, $sub_end) = @$part;
+    $part_data = get_list(\@bugs, $sub_start, $sub_end, $keyname);
+    push(@part_list, $part_data);
+  }
+
+  # Do we want to see inactive bugs?
+  if ($inactive) {
+    $vars->{'null'} = get_inactive_bugs(\@bugs, $start_date, $end_date);
+  }
+  else {
+    $vars->{'null'} = {};
+  }
+
+  # Convert bug IDs to bug objects.
+  @bugs = map { new Bugzilla::Bug($_) } @bugs;
+
+  $vars->{'part_list'} = \@part_list;
+  $vars->{'parts'}     = \@parts;
+
+  # We pass the list of bugs as a hashref.
+  $vars->{'bugs'} = {map { $_->id => $_ } @bugs};
 }
 elsif ($cgi->cookie("time-summary-dates")) {
-    ($start_date, $end_date) = split ";", $cgi->cookie('time-summary-dates');
+  ($start_date, $end_date) = split ";", $cgi->cookie('time-summary-dates');
 }
 
-$vars->{'ids'} = \@ids;
+$vars->{'ids'}        = \@ids;
 $vars->{'start_date'} = $start_date;
-$vars->{'end_date'} = $end_date;
-$vars->{'group_by'} = $group_by;
-$vars->{'monthly'} = $monthly;
-$vars->{'detailed'} = $detailed;
-$vars->{'inactive'} = $inactive;
-$vars->{'do_report'} = $do_report;
+$vars->{'end_date'}   = $end_date;
+$vars->{'group_by'}   = $group_by;
+$vars->{'monthly'}    = $monthly;
+$vars->{'detailed'}   = $detailed;
+$vars->{'inactive'}   = $inactive;
+$vars->{'do_report'}  = $do_report;
 $vars->{'do_depends'} = $do_depends;
 
 my $format = $template->get_format("bug/summarize-time", undef, $ctype);
 
 # Get the proper content-type
-print $cgi->header(-type=> $format->{'ctype'});
+print $cgi->header(-type => $format->{'ctype'});
 $template->process("$format->{'template'}", $vars)
   || ThrowTemplateError($template->error());
diff --git a/t/001compile.t b/t/001compile.t
index 7097ad3611..037ecd364f 100644
--- a/t/001compile.t
+++ b/t/001compile.t
@@ -10,56 +10,57 @@
 #Bugzilla Test 1#
 ###Compilation###
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 use Config;
 use Support::Files;
 use Test::More tests => scalar(@Support::Files::testitems)
-                        + scalar(@Support::Files::test_files);
+  + scalar(@Support::Files::test_files);
 
-BEGIN { 
-    use_ok('Bugzilla::Constants');
-    use_ok('Bugzilla::Install::Requirements');
-    use_ok('Bugzilla');
+BEGIN {
+  use_ok('Bugzilla::Constants');
+  use_ok('Bugzilla::Install::Requirements');
+  use_ok('Bugzilla');
 }
+Bugzilla->usage_mode(USAGE_MODE_TEST);
 
 sub compile_file {
-    my ($file) = @_;
+  my ($file) = @_;
 
-    # Don't allow CPAN.pm to modify the global @INC, which the version
-    # shipped with Perl 5.8.8 does. (It gets loaded by 
-    # Bugzilla::Install::CPAN.)
-    local @INC = @INC;
+  # Don't allow CPAN.pm to modify the global @INC, which the version
+  # shipped with Perl 5.8.8 does. (It gets loaded by
+  # Bugzilla::Install::CPAN.)
+  local @INC = @INC;
 
-    if ($file =~ s/\.pm$//) {
-        $file =~ s{/}{::}g;
-        use_ok($file);
-        return;
-    }
+  if ($file =~ s/\.pm$//) {
+    $file =~ s{/}{::}g;
+    use_ok($file);
+    return;
+  }
 
-    open(my $fh, $file);
-    my $bang = <$fh>;
-    close $fh;
+  open(my $fh, $file);
+  my $bang = <$fh>;
+  close $fh;
 
-    my $T = "";
-    if ($bang =~ m/#!\S*perl\s+-.*T/) {
-        $T = "T";
-    }
+  my $T = "";
+  if ($bang =~ m/#!\S*perl\s+-.*T/) {
+    $T = "T";
+  }
 
-    my $libs = '';
-    if ($ENV{PERL5LIB}) {
-       $libs = join " ", map { "-I\"$_\"" } split /$Config{path_sep}/, $ENV{PERL5LIB};
-    }
-    my $perl = qq{"$^X"};
-    my $output = `$perl $libs -c$T $file 2>&1`;
-    chomp($output);
-    my $return_val = $?;
-    $output =~ s/^\Q$file\E syntax OK$//ms;
-    diag($output) if $output;
-    ok(!$return_val, $file) or diag('--ERROR');
+  my $libs = '-It ';
+  if ($ENV{PERL5LIB}) {
+    $libs .= join " ", map {"-I\"$_\""} split /$Config{path_sep}/, $ENV{PERL5LIB};
+  }
+  my $perl   = qq{"$^X"};
+  my $output = `$perl $libs -c$T -MSupport::Systemexec $file 2>&1`;
+  chomp($output);
+  my $return_val = $?;
+  $output =~ s/^\Q$file\E syntax OK$//ms;
+  diag($output) if $output;
+  ok(!$return_val, $file) or diag('--ERROR');
 }
 
 my @testitems = (@Support::Files::testitems, @Support::Files::test_files);
@@ -67,29 +68,28 @@ my $file_features = map_files_to_features();
 
 # Test the scripts by compiling them
 foreach my $file (@testitems) {
-    # These were already compiled, above.
-    next if ($file eq 'Bugzilla.pm' 
-             or $file eq 'Bugzilla/Constants.pm'
-             or $file eq 'Bugzilla/Install/Requirements.pm');
-    SKIP: {
-        if ($file eq 'mod_perl.pl') {
-            skip 'mod_perl.pl cannot be compiled from the command line', 1;
-        }
-        my $feature = $file_features->{$file};
-        if ($feature and !Bugzilla->feature($feature)) {
-            skip "$file: $feature not enabled", 1;
-        }
-
-        # Check that we have a DBI module to support the DB, if this 
-        # is a database module (but not Schema)
-        if ($file =~ m{Bugzilla/DB/([^/]+)\.pm$}
-            and $file ne "Bugzilla/DB/Schema.pm") 
-        {
-            my $module = lc($1);
-            my $dbd = DB_MODULE->{$module}->{dbd}->{module};
-            eval("use $dbd; 1") or skip "$file: $dbd not installed", 1;
-        }
-
-        compile_file($file);
+
+  # These were already compiled, above.
+  next
+    if ($file eq 'Bugzilla.pm'
+    or $file eq 'Bugzilla/Constants.pm'
+    or $file eq 'Bugzilla/Install/Requirements.pm');
+SKIP: {
+    if ($file eq 'mod_perl.pl') {
+      skip 'mod_perl.pl cannot be compiled from the command line', 1;
+    }
+    my $feature = $file_features->{$file};
+    if ($feature and !Bugzilla->feature($feature)) {
+      skip "$file: $feature not enabled", 1;
     }
-}      
+
+    # Check that we have a DBI module to support the DB, if this
+    # is a database module (but not Schema)
+    if ($file =~ m{Bugzilla/DB/([^/]+)\.pm$} and $file ne "Bugzilla/DB/Schema.pm") {
+      my $module = lc($1);
+      Bugzilla->feature($module) or skip "$file: Driver for $module not installed", 1;
+    }
+
+    compile_file($file);
+  }
+}
diff --git a/t/002goodperl.t b/t/002goodperl.t
index d1858361f7..a81dfb1bb8 100644
--- a/t/002goodperl.t
+++ b/t/002goodperl.t
@@ -10,164 +10,179 @@
 #Bugzilla Test 2#
 ####GoodPerl#####
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 
-use Test::More tests => (scalar(@Support::Files::testitems)
-                         + scalar(@Support::Files::test_files)) * 6;
+use Test::More tests =>
+  (scalar(@Support::Files::testitems) + scalar(@Support::Files::test_files))
+  * 6;
 
 my @testitems = (@Support::Files::test_files, @Support::Files::testitems);
 my @require_taint = qw(email_in.pl importxml.pl mod_perl.pl whine.pl);
 
 foreach my $file (@testitems) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    if (! open (FILE, $file)) {
-        ok(0,"could not open $file --WARNING");
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next if (!$file);      # skip null entries
+  if (!open(FILE, $file)) {
+    ok(0, "could not open $file --WARNING");
+  }
+  my $file_line1 = <FILE>;
+  close(FILE);
+
+  $file =~ m/.*\.(.*)/;
+  my $ext = $1;
+
+  if ($file_line1 !~ m/^#\!/) {
+    ok(1, "$file does not have a shebang");
+  }
+  else {
+    my $flags;
+    if (!defined $ext || $ext eq 'pl' || $ext eq 'psgi') {
+
+      # standalone programs aren't taint checked yet
+      if (grep { $file eq $_ } @require_taint) {
+        $flags = 'T';
+      }
+      else {
+        $flags = '';
+      }
     }
-    my $file_line1 = <FILE>;
-    close (FILE);
-
-    $file =~ m/.*\.(.*)/;
-    my $ext = $1;
-
-    if ($file_line1 !~ m/^#\!/) {
-        ok(1,"$file does not have a shebang");
-    } else {
-        my $flags;
-        if (!defined $ext || $ext eq "pl") {
-            # standalone programs aren't taint checked yet
-            if (grep { $file eq $_ } @require_taint) {
-                $flags = 'T';
-            }
-            else {
-                $flags = '';
-            }
-        } elsif ($ext eq "pm") {
-            ok(0, "$file is a module, but has a shebang");
-            next;
-        } elsif ($ext eq "cgi") {
-            # cgi files must be taint checked
-            $flags = 'T';
-        } else {
-            ok(0, "$file has shebang but unknown extension");
-            next;
-        }
-
-        if ($file_line1 =~ m#^\#\!/usr/bin/perl(?:\s-(\w+))?$#) {
-            my $file_flags = $1 || '';
-            if ($flags eq $file_flags) {
-                ok(1, "$file uses standard perl location" . ($flags ? " and -$flags flag" : ""));
-            }
-            elsif ($flags) {
-                ok(0, "$file is MISSING -$flags flag --WARNING");
-            }
-            else {
-                ok(0, "$file has unexpected -$file_flags flag --WARNING");
-            }
-        } else {
-            ok(0,"$file uses non-standard perl location");
-        }
+    elsif ($ext eq "pm") {
+      ok(0, "$file is a module, but has a shebang");
+      next;
     }
-}
+    elsif ($ext eq "cgi") {
 
-foreach my $file (@testitems) {
-    my $found_use_perl = 0;
-    my $found_use_strict = 0;
-    my $found_use_warnings = 0;
-
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    if (! open (FILE, $file)) {
-        ok(0,"could not open $file --WARNING");
-        next;
-    }
-    while (my $file_line = <FILE>) {
-        $found_use_perl = 1 if $file_line =~ m/^\s*use 5.10.1/;
-        $found_use_strict = 1 if $file_line =~ m/^\s*use strict/;
-        $found_use_warnings = 1 if $file_line =~ m/^\s*use warnings/;
-        last if ($found_use_perl && $found_use_strict && $found_use_warnings);
+      # cgi files must be taint checked
+      $flags = 'T';
     }
-    close (FILE);
-    if ($found_use_perl) {
-        ok(1,"$file requires Perl 5.10.1");
-    } else {
-        ok(0,"$file DOES NOT require Perl 5.10.1 --WARNING");
+    else {
+      ok(0, "$file has shebang but unknown extension");
+      next;
     }
 
-    if ($found_use_strict) {
-        ok(1,"$file uses strict");
-    } else {
-        ok(0,"$file DOES NOT use strict --WARNING");
+    if ($file_line1 =~ m#^\#\!/usr/bin/perl(?:\s-(\w+))?$#) {
+      my $file_flags = $1 || '';
+      if ($flags eq $file_flags) {
+        ok(1,
+          "$file uses standard perl location" . ($flags ? " and -$flags flag" : ""));
+      }
+      elsif ($flags) {
+        ok(0, "$file is MISSING -$flags flag --WARNING");
+      }
+      else {
+        ok(0, "$file has unexpected -$file_flags flag --WARNING");
+      }
     }
-
-    if ($found_use_warnings) {
-        ok(1,"$file uses warnings");
-    } else {
-        ok(0,"$file DOES NOT use warnings --WARNING");
+    else {
+      ok(0, "$file uses non-standard perl location");
     }
+  }
+}
+
+foreach my $file (@testitems) {
+  my $found_use_perl     = 0;
+  my $found_use_strict   = 0;
+  my $found_use_warnings = 0;
+
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next if (!$file);      # skip null entries
+  if (!open(FILE, $file)) {
+    ok(0, "could not open $file --WARNING");
+    next;
+  }
+  while (my $file_line = <FILE>) {
+    $found_use_perl     = 1 if $file_line =~ m/^\s*use 5\.14\.0/;
+    $found_use_strict   = 1 if $file_line =~ m/^\s*use strict/;
+    $found_use_warnings = 1 if $file_line =~ m/^\s*use warnings/;
+    last if ($found_use_perl && $found_use_strict && $found_use_warnings);
+  }
+  close(FILE);
+  if ($found_use_perl) {
+    ok(1, "$file requires Perl 5.14.0");
+  }
+  else {
+    ok(0, "$file DOES NOT require Perl 5.14.0 --WARNING");
+  }
+
+  if ($found_use_strict) {
+    ok(1, "$file uses strict");
+  }
+  else {
+    ok(0, "$file DOES NOT use strict --WARNING");
+  }
+
+  if ($found_use_warnings) {
+    ok(1, "$file uses warnings");
+  }
+  else {
+    ok(0, "$file DOES NOT use warnings --WARNING");
+  }
 }
 
 # Check to see that all error messages use tags (for l10n reasons.)
 foreach my $file (@testitems) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    if (! open (FILE, $file)) {
-        ok(0,"could not open $file --WARNING");
-        next;
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next if (!$file);      # skip null entries
+  if (!open(FILE, $file)) {
+    ok(0, "could not open $file --WARNING");
+    next;
+  }
+  my $lineno = 0;
+  my $error  = 0;
+
+  while (!$error && (my $file_line = <FILE>)) {
+    $lineno++;
+    if ($file_line =~ /Throw.*Error\("(.*?)"/) {
+      if ($1 =~ /\s/) {
+        ok(
+          0, "$file has a Throw*Error call on line $lineno 
+                      which doesn't use a tag --ERROR"
+        );
+        $error = 1;
+      }
     }
-    my $lineno = 0;
-    my $error = 0;
-    
-    while (!$error && (my $file_line = <FILE>)) {
-        $lineno++;
-        if ($file_line =~ /Throw.*Error\("(.*?)"/) {
-            if ($1 =~ /\s/) {
-                ok(0,"$file has a Throw*Error call on line $lineno 
-                      which doesn't use a tag --ERROR");
-                $error = 1;       
-            }
-        }
-    }
-    
-    ok(1,"$file uses Throw*Error calls correctly") if !$error;
-    
-    close(FILE);
+  }
+
+  ok(1, "$file uses Throw*Error calls correctly") if !$error;
+
+  close(FILE);
 }
 
 # Forbird the { foo => $cgi->param() } syntax, for security reasons.
 foreach my $file (@testitems) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next unless $file; # skip null entries
-    if (!open(FILE, $file)) {
-        ok(0, "could not open $file --WARNING");
-        next;
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next unless $file;     # skip null entries
+  if (!open(FILE, $file)) {
+    ok(0, "could not open $file --WARNING");
+    next;
+  }
+  my $lineno = 0;
+  my @unsafe_args;
+
+  while (my $file_line = <FILE>) {
+    $lineno++;
+    $file_line =~ s/^\s*(.+)\s*$/$1/;    # Remove leading and trailing whitespaces.
+    if ($file_line =~ /^[^#]+=> \$cgi\->param/) {
+      push(@unsafe_args, "$file_line on line $lineno");
     }
-    my $lineno = 0;
-    my @unsafe_args;
-
-    while (my $file_line = <FILE>) {
-        $lineno++;
-        $file_line =~ s/^\s*(.+)\s*$/$1/; # Remove leading and trailing whitespaces.
-        if ($file_line =~ /^[^#]+=> \$cgi\->param/) {
-            push(@unsafe_args, "$file_line on line $lineno");
-        }
-    }
-
-    if (@unsafe_args) {
-        ok(0, "$file incorrectly passes a CGI argument to a hash --ERROR\n" .
-              join("\n", @unsafe_args));
-    }
-    else {
-        ok(1, "$file has no vulnerable hash syntax");
-    }
-
-    close(FILE);
+  }
+
+  if (@unsafe_args) {
+    ok(0,
+      "$file incorrectly passes a CGI argument to a hash --ERROR\n"
+        . join("\n", @unsafe_args));
+  }
+  else {
+    ok(1, "$file has no vulnerable hash syntax");
+  }
+
+  close(FILE);
 }
 
 exit 0;
diff --git a/t/003safesys.t b/t/003safesys.t
deleted file mode 100644
index 2a257ffb9a..0000000000
--- a/t/003safesys.t
+++ /dev/null
@@ -1,53 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-
-#################
-#Bugzilla Test 3#
-###Safesystem####
-
-use 5.10.1;
-use strict;
-use warnings;
-
-use lib 't';
-
-use Support::Files;
-
-use Test::More tests => scalar(@Support::Files::testitems);
-
-# Capture the TESTOUT from Test::More or Test::Builder for printing errors.
-# This will handle verbosity for us automatically.
-my $fh;
-{
-    no warnings qw(unopened);  # Don't complain about non-existent filehandles
-    if (-e \*Test::More::TESTOUT) {
-        $fh = \*Test::More::TESTOUT;
-    } elsif (-e \*Test::Builder::TESTOUT) {
-        $fh = \*Test::Builder::TESTOUT;
-    } else {
-        $fh = \*STDOUT;
-    }
-}
-
-my @testitems = @Support::Files::testitems; 
-my $perlapp = "\"$^X\"";
-
-foreach my $file (@testitems) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    my $command = "$perlapp -c -It -MSupport::Systemexec $file 2>&1";
-    my $loginfo=`$command`;
-    if ($loginfo =~ /arguments for Support::Systemexec::(system|exec)/im) {
-        ok(0,"$file DOES NOT use proper system or exec calls");
-        print $fh $loginfo;
-    } else {
-        ok(1,"$file uses proper system and exec calls");
-    }
-}
-
-exit 0;
diff --git a/t/004template.t b/t/004template.t
index b0ca5a629b..a0307ab1b0 100644
--- a/t/004template.t
+++ b/t/004template.t
@@ -9,11 +9,11 @@
 #Bugzilla Test 4#
 ####Templates####
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Templates;
 
@@ -22,20 +22,22 @@ use CGI qw(-no_debug);
 
 use File::Spec;
 use Template;
-use Test::More tests => ( scalar(@referenced_files) + 2 * $num_actual_files );
+use Test::More tests => (scalar(@referenced_files) + 3 * $num_actual_files);
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.
 # This will handle verbosity for us automatically.
 my $fh;
 {
-    no warnings qw(unopened);  # Don't complain about non-existent filehandles
-    if (-e \*Test::More::TESTOUT) {
-        $fh = \*Test::More::TESTOUT;
-    } elsif (-e \*Test::Builder::TESTOUT) {
-        $fh = \*Test::Builder::TESTOUT;
-    } else {
-        $fh = \*STDOUT;
-    }
+  no warnings qw(unopened);    # Don't complain about non-existent filehandles
+  if (-e \*Test::More::TESTOUT) {
+    $fh = \*Test::More::TESTOUT;
+  }
+  elsif (-e \*Test::Builder::TESTOUT) {
+    $fh = \*Test::Builder::TESTOUT;
+  }
+  else {
+    $fh = \*STDOUT;
+  }
 }
 
 # Check to make sure all templates that are referenced in Bugzilla
@@ -44,84 +46,97 @@ my $fh;
 # fall back to English if necessary.
 
 foreach my $file (@referenced_files) {
-    my $found = 0;
-    foreach my $path (@english_default_include_paths) {
-        my $pathfile = File::Spec->catfile($path, $file);
-        if (-e $pathfile) {
-            $found = 1;
-            last;
-        }
+  my $found = 0;
+  foreach my $path (@english_default_include_paths) {
+    my $pathfile = File::Spec->catfile($path, $file);
+    if (-e $pathfile) {
+      $found = 1;
+      last;
     }
+  }
 
-    ok($found, "$file found");
+  ok($found, "$file found");
 }
 
 foreach my $include_path (@include_paths) {
-    # Processes all the templates to make sure they have good syntax
-    my $provider = Template::Provider->new(
-    {
-        INCLUDE_PATH => $include_path ,
-        # Need to define filters used in the codebase, they don't
-        # actually have to function in this test, just be defined.
-        # See Template.pm for the actual codebase definitions.
-
-        # Initialize templates (f.e. by loading plugins like Hook).
-        PRE_PROCESS => "global/variables.none.tmpl",
-
-        FILTERS =>
-        {
-            html_linebreak => sub { return $_; },
-            no_break => sub { return $_; } ,
-            js        => sub { return $_ } ,
-            base64   => sub { return $_ } ,
-            inactive => [ sub { return sub { return $_; } }, 1] ,
-            closed => [ sub { return sub { return $_; } }, 1] ,
-            obsolete => [ sub { return sub { return $_; } }, 1] ,
-            url_quote => sub { return $_ } ,
-            css_class_quote => sub { return $_ } ,
-            xml       => sub { return $_ } ,
-            quoteUrls => sub { return $_ } ,
-            bug_link => [ sub { return sub { return $_; } }, 1] ,
-            csv       => sub { return $_ } ,
-            unitconvert => sub { return $_ },
-            time      => sub { return $_ } ,
-            wrap_comment => sub { return $_ },
-            none      => sub { return $_ } ,
-            ics       => [ sub { return sub { return $_; } }, 1] ,
-            markdown => sub { return $_ } ,
+
+  # Processes all the templates to make sure they have good syntax
+  my $provider = Template::Provider->new({
+    INCLUDE_PATH => $include_path,
+
+    # Need to define filters used in the codebase, they don't
+    # actually have to function in this test, just be defined.
+    # See Template.pm for the actual codebase definitions.
+
+    # Initialize templates (f.e. by loading plugins like Hook).
+    PRE_PROCESS => "global/variables.none.tmpl",
+
+    FILTERS => {
+      html_linebreak  => sub { return $_; },
+      js              => sub { return $_ },
+      base64          => sub { return $_ },
+      url_quote       => sub { return $_ },
+      css_class_quote => sub { return $_ },
+      xml             => sub { return $_ },
+      quoteUrls       => sub { return $_ },
+      bug_link        => [
+        sub {
+          return sub { return $_; }
         },
+        1
+      ],
+      csv          => sub { return $_ },
+      unitconvert  => sub { return $_ },
+      time         => sub { return $_ },
+      wrap_comment => sub { return $_ },
+      none         => sub { return $_ },
+      ics          => [
+        sub {
+          return sub { return $_; }
+        },
+        1
+      ],
+      markdown => sub { return $_ },
+    },
+  });
+
+  foreach my $file (@{$actual_files{$include_path}}) {
+    my $path = File::Spec->catfile($include_path, $file);
+
+    # These are actual files, so there's no need to check for existence.
+
+    my ($data, $err) = $provider->fetch($file);
+
+    if (!$err) {
+      ok(1, "$path syntax ok");
+    }
+    else {
+      ok(0, "$path has bad syntax --ERROR");
+      print $fh $data . "\n";
+    }
+
+    # Make sure no forbidden constructs are present.
+    local $/;
+    open(FILE, '<', $path) or die "Can't open $file: $!\n";
+    $data = <FILE>;
+    close(FILE);
+
+    # Forbid single quotes to delimit URLs, see bug 926085.
+    if ($data =~ /href=\\?'/) {
+      ok(0, "$path contains blocklisted constructs: href='...'");
+    }
+    else {
+      ok(1, "$path contains no blocklisted constructs");
+    }
+
+    # Forbid cgi.param(). cgi_param() must be used instead.
+    if ($data =~ /cgi\.param/) {
+      ok(0, "$path calls cgi.param() instead of cgi_param()");
     }
-    );
-
-    foreach my $file (@{$actual_files{$include_path}}) {
-        my $path = File::Spec->catfile($include_path, $file);
-
-        # These are actual files, so there's no need to check for existence.
-
-        my ($data, $err) = $provider->fetch($file);
-
-        if (!$err) {
-            ok(1, "$path syntax ok");
-        }
-        else {
-            ok(0, "$path has bad syntax --ERROR");
-            print $fh $data . "\n";
-        }
-
-        # Make sure no forbidden constructs are present.
-        local $/;
-        open(FILE, '<', $path) or die "Can't open $file: $!\n";
-        $data = <FILE>;
-        close (FILE);
-
-        # Forbid single quotes to delimit URLs, see bug 926085.
-        if ($data =~ /href=\\?'/) {
-            ok(0, "$path contains blacklisted constructs: href='...'");
-        }
-        else {
-            ok(1, "$path contains no blacklisted constructs");
-        }
+    else {
+      ok(1, "$path correctly calls CGI parameters");
     }
+  }
 }
 
 exit 0;
diff --git a/t/005whitespace.t b/t/005whitespace.t
index b6de8cee39..8008bf5e09 100644
--- a/t/005whitespace.t
+++ b/t/005whitespace.t
@@ -9,59 +9,67 @@
 #Bugzilla Test 5#
 #####no_tabs#####
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Support::Templates;
 
 use File::Spec;
-use Test::More tests => (scalar(@Support::Files::testitems)
-                         + scalar(@Support::Files::test_files)
-                         + $Support::Templates::num_actual_files) * 3;
+use Test::More tests => (
+      scalar(@Support::Files::testitems)
+    + scalar(@Support::Files::test_files)
+    + $Support::Templates::num_actual_files)
+  * 3;
 
 my @testitems = (@Support::Files::testitems, @Support::Files::test_files);
 for my $path (@Support::Templates::include_paths) {
-   push(@testitems, map(File::Spec->catfile($path, $_),
-                        Support::Templates::find_actual_files($path)));
+  push(
+    @testitems,
+    map(File::Spec->catfile($path, $_),
+      Support::Templates::find_actual_files($path))
+  );
 }
 
 my %results;
 
 foreach my $file (@testitems) {
-    open (FILE, "$file");
-    my @contents = <FILE>;
-    if (grep /\t/, @contents) {
-        ok(0, "$file contains tabs --WARNING");
-    } else {
-        ok(1, "$file has no tabs");
-    }
-    close (FILE);
+  open(FILE, "$file");
+  my @contents = <FILE>;
+  if (grep /\t/, @contents) {
+    ok(0, "$file contains tabs --WARNING");
+  }
+  else {
+    ok(1, "$file has no tabs");
+  }
+  close(FILE);
 }
 
 foreach my $file (@testitems) {
-    open (FILE, "$file");
-    my @contents = <FILE>;
-    if (grep /\r/, @contents) {
-        ok(0, "$file contains non-OS-conformant line endings --WARNING");
-    } else {
-        ok(1, "All line endings of $file are OS conformant");
-    }
-    close (FILE);
+  open(FILE, "$file");
+  my @contents = <FILE>;
+  if (grep /\r/, @contents) {
+    ok(0, "$file contains non-OS-conformant line endings --WARNING");
+  }
+  else {
+    ok(1, "All line endings of $file are OS conformant");
+  }
+  close(FILE);
 }
 
 foreach my $file (@testitems) {
-    open (FILE, "$file");
-    my $first_line = <FILE>;
-    if ($first_line =~ /\xef\xbb\xbf/) {
-        ok(0, "$file contains Byte Order Mark --WARNING");
-    } else {
-        ok(1, "$file is free of a Byte Order Mark");
-    }
-    close (FILE);
+  open(FILE, "$file");
+  my $first_line = <FILE>;
+  if ($first_line =~ /\xef\xbb\xbf/) {
+    ok(0, "$file contains Byte Order Mark --WARNING");
+  }
+  else {
+    ok(1, "$file is free of a Byte Order Mark");
+  }
+  close(FILE);
 }
 
 exit 0;
diff --git a/t/006spellcheck.t b/t/006spellcheck.t
index 24e00242d9..a5eaf72435 100644
--- a/t/006spellcheck.t
+++ b/t/006spellcheck.t
@@ -10,81 +10,85 @@
 #Bugzilla Test 6#
 ####Spelling#####
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 use Support::Files;
 
 # -1 because 006spellcheck.t must not be checked.
 use Test::More tests => scalar(@Support::Files::testitems)
-                        + scalar(@Support::Files::test_files) - 1;
+  + scalar(@Support::Files::test_files) - 1;
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.
 # This will handle verbosity for us automatically.
 my $fh;
 {
-    no warnings qw(unopened);  # Don't complain about non-existent filehandles
-    if (-e \*Test::More::TESTOUT) {
-        $fh = \*Test::More::TESTOUT;
-    } elsif (-e \*Test::Builder::TESTOUT) {
-        $fh = \*Test::Builder::TESTOUT;
-    } else {
-        $fh = \*STDOUT;
-    }
+  no warnings qw(unopened);    # Don't complain about non-existent filehandles
+  if (-e \*Test::More::TESTOUT) {
+    $fh = \*Test::More::TESTOUT;
+  }
+  elsif (-e \*Test::Builder::TESTOUT) {
+    $fh = \*Test::Builder::TESTOUT;
+  }
+  else {
+    $fh = \*STDOUT;
+  }
 }
 
 my @testitems = (@Support::Files::testitems, @Support::Files::test_files);
 
 #add the words to check here:
 my @evilwords = qw(
-    anyways
-    appearence
-    arbitary
-    cancelled
-    critera
-    databasa
-    dependan
-    existance
-    existant
-    paramater
-    refered
-    repsentation
-    suported
-    varsion
+  anyways
+  appearence
+  arbitary
+  cancelled
+  critera
+  databasa
+  dependan
+  existance
+  existant
+  paramater
+  refered
+  repsentation
+  suported
+  varsion
 );
 
 my $evilwordsregexp = join('|', @evilwords);
 
 foreach my $file (@testitems) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    # Do not try to validate this file as it obviously contains a list
-    # of wrongly spelled words.
-    next if ($file eq 't/006spellcheck.t');
-
-    if (open (FILE, $file)) { # open the file for reading
-
-        my $found_word = '';
-
-        while (my $file_line = <FILE>) { # and go through the file line by line
-            if ($file_line =~ /($evilwordsregexp)/i) { # found an evil word
-                $found_word = $1;
-                last;
-            }
-        }
-            
-        close (FILE);
-            
-        if ($found_word) {
-            ok(0,"$file: found SPELLING ERROR $found_word --WARNING");
-        } else {
-            ok(1,"$file does not contain registered spelling errors");
-        }
-    } else {
-        ok(0,"could not open $file for spellcheck --WARNING");
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next if (!$file);      # skip null entries
+       # Do not try to validate this file as it obviously contains a list
+       # of wrongly spelled words.
+  next if ($file eq 't/006spellcheck.t');
+
+  if (open(FILE, $file)) {    # open the file for reading
+
+    my $found_word = '';
+
+    while (my $file_line = <FILE>) {    # and go through the file line by line
+      if ($file_line =~ /($evilwordsregexp)/i) {    # found an evil word
+        $found_word = $1;
+        last;
+      }
     }
-} 
+
+    close(FILE);
+
+    if ($found_word) {
+      ok(0, "$file: found SPELLING ERROR $found_word --WARNING");
+    }
+    else {
+      ok(1, "$file does not contain registered spelling errors");
+    }
+  }
+  else {
+    ok(0, "could not open $file for spellcheck --WARNING");
+  }
+}
 
 exit 0;
diff --git a/t/007util.t b/t/007util.t
index 66c2df032f..6c1abf526b 100644
--- a/t/007util.t
+++ b/t/007util.t
@@ -9,18 +9,18 @@
 #Bugzilla Test 7#
 #####Util.pm#####
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 use Support::Files;
 use Test::More tests => 17;
 use DateTime;
 
-BEGIN { 
-    use_ok('Bugzilla');
-    use_ok('Bugzilla::Util');
+BEGIN {
+  use_ok('Bugzilla');
+  use_ok('Bugzilla::Util');
 }
 
 # We need to override user preferences so we can get an expected value when
@@ -29,53 +29,75 @@ Bugzilla->user->{'settings'}->{'timezone'}->{'value'} = "local";
 
 # We need to know the local timezone for the date chosen in our tests.
 # Below, tests are run against Nov. 24, 2002.
-my $tz = Bugzilla->local_timezone->short_name_for_datetime(DateTime->new(year => 2002, month => 11, day => 24));
+my $tz = Bugzilla->local_timezone->short_name_for_datetime(
+  DateTime->new(year => 2002, month => 11, day => 24));
 
 # we don't test the taint functions since that's going to take some more work.
 # XXX: test taint functions
 
 #html_quote():
-is(html_quote("<lala&@>"),"&lt;lala&amp;&#64;&gt;",'html_quote');
+is(html_quote("<lala&@>"), "&lt;lala&amp;&#64;&gt;", 'html_quote');
 
 #url_quote():
-is(url_quote("<lala&>gaa\"'[]{\\"),"%3Clala%26%3Egaa%22%27%5B%5D%7B%5C",'url_quote');
+is(url_quote("<lala&>gaa\"'[]{\\"),
+  "%3Clala%26%3Egaa%22%27%5B%5D%7B%5C", 'url_quote');
 
 #trim():
-is(trim(" fg<*\$%>+=~~ "),'fg<*$%>+=~~','trim()');
+is(trim(" fg<*\$%>+=~~ "), 'fg<*$%>+=~~', 'trim()');
 
 #format_time();
-is(format_time("2002.11.24 00:05"), "2002-11-24 00:05 $tz",'format_time("2002.11.24 00:05") is ' . format_time("2002.11.24 00:05"));
-is(format_time("2002.11.24 00:05:56"), "2002-11-24 00:05:56 $tz",'format_time("2002.11.24 00:05:56")');
-is(format_time("2002.11.24 00:05:56", "%Y-%m-%d %R"), '2002-11-24 00:05', 'format_time("2002.11.24 00:05:56", "%Y-%m-%d %R") (with no timezone)');
-is(format_time("2002.11.24 00:05:56", "%Y-%m-%d %R %Z"), "2002-11-24 00:05 $tz", 'format_time("2002.11.24 00:05:56", "%Y-%m-%d %R %Z") (with timezone)');
+is(
+  format_time("2002.11.24 00:05"),
+  "2002-11-24 00:05 $tz",
+  'format_time("2002.11.24 00:05") is ' . format_time("2002.11.24 00:05")
+);
+is(
+  format_time("2002.11.24 00:05:56"),
+  "2002-11-24 00:05:56 $tz",
+  'format_time("2002.11.24 00:05:56")'
+);
+is(
+  format_time("2002.11.24 00:05:56", "%Y-%m-%d %R"),
+  '2002-11-24 00:05',
+  'format_time("2002.11.24 00:05:56", "%Y-%m-%d %R") (with no timezone)'
+);
+is(
+  format_time("2002.11.24 00:05:56", "%Y-%m-%d %R %Z"),
+  "2002-11-24 00:05 $tz",
+  'format_time("2002.11.24 00:05:56", "%Y-%m-%d %R %Z") (with timezone)'
+);
 
 # email_filter
 my %email_strings = (
-    'somebody@somewhere.com' => 'somebody',
-    'Somebody <somebody@somewhere.com>' => 'Somebody <somebody>',
-    'One Person <one@person.com>, Two Person <two@person.com>' 
-        => 'One Person <one>, Two Person <two>',
-    'This string contains somebody@somewhere.com and also this@that.com'
-        => 'This string contains somebody and also this',
+  'somebody@somewhere.com'            => 'somebody',
+  'Somebody <somebody@somewhere.com>' => 'Somebody <somebody>',
+  'One Person <one@person.com>, Two Person <two@person.com>' =>
+    'One Person <one>, Two Person <two>',
+  'This string contains somebody@somewhere.com and also this@that.com' =>
+    'This string contains somebody and also this',
 );
+
 foreach my $input (keys %email_strings) {
-    is(Bugzilla::Util::email_filter($input), $email_strings{$input}, 
-       "email_filter('$input')");
+  is(Bugzilla::Util::email_filter($input),
+    $email_strings{$input}, "email_filter('$input')");
 }
 
 # validate_email_syntax. We need to override some parameters.
 my $params = Bugzilla->params;
 $params->{emailregexp} = '.*';
-$params->{emailsuffix} = '';
 my $ascii_email = 'admin@company.com';
+
 # U+0430 returns the Cyrillic "Đ°", which looks similar to the ASCII "a".
 my $utf8_email = "\N{U+0430}dmin\@company.com";
-ok(validate_email_syntax($ascii_email), 'correctly formatted ASCII-only email address is valid');
-ok(!validate_email_syntax($utf8_email), 'correctly formatted email address with non-ASCII characters is rejected');
+ok(validate_email_syntax($ascii_email),
+  'correctly formatted ASCII-only email address is valid');
+ok(!validate_email_syntax($utf8_email),
+  'correctly formatted email address with non-ASCII characters is rejected');
 
 # diff_arrays():
 my @old_array = qw(alpha beta alpha gamma gamma beta alpha delta epsilon gamma);
 my @new_array = qw(alpha alpha beta gamma epsilon delta beta delta);
+
 # The order is not relevant when comparing both arrays for matching items,
 # i.e. (foo bar) and (bar foo) are the same arrays (same items).
 # But when returning data, we try to respect the initial order.
@@ -83,5 +105,6 @@ my @new_array = qw(alpha alpha beta gamma epsilon delta beta delta);
 # Removed (in this order): gamma alpha gamma.
 # Added (in this order): delta
 my ($removed, $added) = diff_arrays(\@old_array, \@new_array);
-is_deeply($removed, [qw(gamma alpha gamma)], 'diff_array(\@old, \@new) (check removal)');
+is_deeply($removed, [qw(gamma alpha gamma)],
+  'diff_array(\@old, \@new) (check removal)');
 is_deeply($added, [qw(delta)], 'diff_array(\@old, \@new) (check addition)');
diff --git a/t/008filter.t b/t/008filter.t
index 204bbdc43d..c48aab30ba 100644
--- a/t/008filter.t
+++ b/t/008filter.t
@@ -11,15 +11,15 @@
 
 # This test scans all our templates for every directive. Having eliminated
 # those which cannot possibly cause XSS problems, it then checks the rest
-# against the safe list stored in the filterexceptions.pl file. 
+# against the safe list stored in the filterexceptions.pl file.
 
 # Sample exploit code: '>"><script>alert('Oh dear...')</script>
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 
 use Bugzilla::Constants;
 use Support::Templates;
@@ -29,192 +29,196 @@ use Cwd;
 
 # Undefine the record separator so we can read in whole files at once
 my $oldrecsep = $/;
-my $topdir = cwd;
+my $topdir    = cwd;
 $/ = undef;
 our %safe;
 
 foreach my $path (@Support::Templates::include_paths) {
-    $path =~ s|\\|/|g if ON_WINDOWS;  # convert \ to / in path if on windows
-    $path =~ m|template/([^/]+)/([^/]+)|;
-    my $lang = $1;
-    my $flavor = $2;
-
-    chdir $topdir; # absolute path
-    my @testitems = Support::Templates::find_actual_files($path);
-    chdir $topdir; # absolute path
-    
-    next unless @testitems;
-    
-    # Some people require this, others don't. No-one knows why.
-    chdir $path; # relative path
-    
-    # We load a %safe list of acceptable exceptions.
-    if (-r "filterexceptions.pl") {
-        do "filterexceptions.pl";
-        if (ON_WINDOWS) {
-          # filterexceptions.pl uses / separated paths, while 
-          # find_actual_files returns \ separated ones on Windows.
-          # Here, we convert the filter exception hash to use \.
-          foreach my $file (keys %safe) {
-            my $orig_file = $file;
-            $file =~ s|/|\\|g;
-            if ($file ne $orig_file) {
-              $safe{$file} = $safe{$orig_file};
-              delete $safe{$orig_file};
-            }
-          }
+  $path =~ s|\\|/|g if ON_WINDOWS;    # convert \ to / in path if on windows
+  $path =~ m|template/([^/]+)/([^/]+)|;
+  my $lang   = $1;
+  my $flavor = $2;
+
+  chdir $topdir;                      # absolute path
+  my @testitems = Support::Templates::find_actual_files($path);
+  chdir $topdir;                      # absolute path
+
+  next unless @testitems;
+
+  # Some people require this, others don't. No-one knows why.
+  chdir $path;                        # relative path
+
+  # We load a %safe list of acceptable exceptions.
+  if (-r "filterexceptions.pl") {
+    do "filterexceptions.pl";
+    if (ON_WINDOWS) {
+
+      # filterexceptions.pl uses / separated paths, while
+      # find_actual_files returns \ separated ones on Windows.
+      # Here, we convert the filter exception hash to use \.
+      foreach my $file (keys %safe) {
+        my $orig_file = $file;
+        $file =~ s|/|\\|g;
+        if ($file ne $orig_file) {
+          $safe{$file} = $safe{$orig_file};
+          delete $safe{$orig_file};
         }
+      }
     }
-    
-    # We preprocess the %safe hash of lists into a hash of hashes. This allows
-    # us to flag which members were not found, and report that as a warning, 
-    # thereby keeping the lists clean.
-    foreach my $file (keys %safe) {
-        if (ref $safe{$file} eq 'ARRAY') {
-            my $list = $safe{$file};
-            $safe{$file} = {};
-            foreach my $directive (@$list) {
-                $safe{$file}{$directive} = 0;    
-            }
-        }
+  }
+
+  # We preprocess the %safe hash of lists into a hash of hashes. This allows
+  # us to flag which members were not found, and report that as a warning,
+  # thereby keeping the lists clean.
+  foreach my $file (keys %safe) {
+    if (ref $safe{$file} eq 'ARRAY') {
+      my $list = $safe{$file};
+      $safe{$file} = {};
+      foreach my $directive (@$list) {
+        $safe{$file}{$directive} = 0;
+      }
     }
+  }
 
-    foreach my $file (@testitems) {
-        # There are some files we don't check, because there is no need to
-        # filter their contents due to their content-type.
-        if ($file =~ /\.(pm|txt|rst|png)\.tmpl$/) {
-            ok(1, "($lang/$flavor) $file is filter-safe");
-            next;
-        }
+  foreach my $file (@testitems) {
 
-        # Read the entire file into a string
-        open (FILE, "<$file") || die "Can't open $file: $!\n";
-        my $slurp = <FILE>;
-        close (FILE);
+    # There are some files we don't check, because there is no need to
+    # filter their contents due to their content-type.
+    if ($file =~ /\.(pm|txt|rst|png)\.tmpl$/) {
+      ok(1, "($lang/$flavor) $file is filter-safe");
+      next;
+    }
 
-        my @unfiltered;
+    # Read the entire file into a string
+    open(FILE, "<$file") || die "Can't open $file: $!\n";
+    my $slurp = <FILE>;
+    close(FILE);
 
-        # /g means we execute this loop for every match
-        # /s means we ignore linefeeds in the regexp matches
-        while ($slurp =~ /\[%(?:-|\+|~|=)?(.*?)(?:-|\+|~|=)?%\]/gs) {
-            my $directive = $1;
+    my @unfiltered;
 
-            my @lineno = ($` =~ m/\n/gs);
-            my $lineno = scalar(@lineno) + 1;
+    # /g means we execute this loop for every match
+    # /s means we ignore linefeeds in the regexp matches
+    while ($slurp =~ /\[%(?:-|\+|~|=)?(.*?)(?:-|\+|~|=)?%\]/gs) {
+      my $directive = $1;
 
-            if (!directive_ok($file, $directive)) {
+      my @lineno = ($` =~ m/\n/gs);
+      my $lineno = scalar(@lineno) + 1;
 
-              # This intentionally makes no effort to eliminate duplicates; to do
-              # so would merely make it more likely that the user would not 
-              # escape all instances when attempting to correct an error.
-              push(@unfiltered, "$lineno:$directive");
-            }
-        }  
+      if (!directive_ok($file, $directive)) {
 
-        my $fullpath = File::Spec->catfile($path, $file);
-        
-        if (@unfiltered) {
-            my $uflist = join("\n  ", @unfiltered);
-            ok(0, "($lang/$flavor) $fullpath has unfiltered directives:\n  $uflist\n--ERROR");
-        }
-        else {
-            # Find any members of the exclusion list which were not found
-            my @notfound;
-            foreach my $directive (keys %{$safe{$file}}) {
-                push(@notfound, $directive) if ($safe{$file}{$directive} == 0);    
-            }
-
-            if (@notfound) {
-                my $nflist = join("\n  ", @notfound);
-                ok(0, "($lang/$flavor) $fullpath - filterexceptions.pl has extra members:\n  $nflist\n" . 
-                                                                  "--WARNING");
-            }
-            else {
-                # Don't use the full path here - it's too long and unwieldy.
-                ok(1, "($lang/$flavor) $file is filter-safe");
-            }
-        }
+        # This intentionally makes no effort to eliminate duplicates; to do
+        # so would merely make it more likely that the user would not
+        # escape all instances when attempting to correct an error.
+        push(@unfiltered, "$lineno:$directive");
+      }
     }
+
+    my $fullpath = File::Spec->catfile($path, $file);
+
+    if (@unfiltered) {
+      my $uflist = join("\n  ", @unfiltered);
+      ok(0,
+        "($lang/$flavor) $fullpath has unfiltered directives:\n  $uflist\n--ERROR");
+    }
+    else {
+      # Find any members of the exclusion list which were not found
+      my @notfound;
+      foreach my $directive (keys %{$safe{$file}}) {
+        push(@notfound, $directive) if ($safe{$file}{$directive} == 0);
+      }
+
+      if (@notfound) {
+        my $nflist = join("\n  ", @notfound);
+        ok(0,
+          "($lang/$flavor) $fullpath - filterexceptions.pl has extra members:\n  $nflist\n"
+            . "--WARNING");
+      }
+      else {
+        # Don't use the full path here - it's too long and unwieldy.
+        ok(1, "($lang/$flavor) $file is filter-safe");
+      }
+    }
+  }
 }
 
 sub directive_ok {
-    my ($file, $directive) = @_;
+  my ($file, $directive) = @_;
 
-    # Comments
-    return 1 if $directive =~ /^#/;        
+  # Comments
+  return 1 if $directive =~ /^#/;
 
-    # Remove any leading/trailing whitespace.
-    $directive =~ s/^\s*//;
-    $directive =~ s/\s*$//;
+  # Remove any leading/trailing whitespace.
+  $directive =~ s/^\s*//;
+  $directive =~ s/\s*$//;
 
-    # Empty directives are ok; they are usually line break helpers
-    return 1 if $directive eq '';
+  # Empty directives are ok; they are usually line break helpers
+  return 1 if $directive eq '';
 
-    # Make sure we're not looking for ./ in the $safe hash
-    $file =~ s#^\./##;
+  # Make sure we're not looking for ./ in the $safe hash
+  $file =~ s#^\./##;
 
-    # Exclude those on the nofilter list
-    if (defined($safe{$file}{$directive})) {
-        $safe{$file}{$directive}++;
-        return 1;
-    };
+  # Exclude those on the nofilter list
+  if (defined($safe{$file}{$directive})) {
+    $safe{$file}{$directive}++;
+    return 1;
+  }
 
-    # Directives
-    return 1 if $directive =~ /^(IF|END|UNLESS|FOREACH|PROCESS|INCLUDE|
-                                 BLOCK|USE|ELSE|NEXT|LAST|DEFAULT|
+  # Directives
+  return 1 if $directive =~ /^(IF|END|UNLESS|FOREACH|PROCESS|INCLUDE|
+                                 BLOCK|USE|ELSE|NEXT|LAST|DEFAULT|CALL|
                                  ELSIF|SET|SWITCH|CASE|WHILE|RETURN|STOP|
                                  TRY|CATCH|FINAL|THROW|CLEAR|MACRO|FILTER)/x;
 
-    # ? :
-    if ($directive =~ /.+\?(.+):(.+)/) {
-        return 1 if directive_ok($file, $1) && directive_ok($file, $2);
-    }
+  # ? :
+  if ($directive =~ /.+\?(.+):(.+)/) {
+    return 1 if directive_ok($file, $1) && directive_ok($file, $2);
+  }
+
+  # + - * /
+  return 1 if $directive =~ /[+\-*\/]/;
+
+  # Numbers
+  return 1 if $directive =~ /^[0-9]+$/;
+
+  # Simple assignments
+  return 1 if $directive =~ /^[\w\.\$\{\}]+\s+=\s+/;
+
+  # Conditional literals with either sort of quotes
+  # There must be no $ in the string for it to be a literal
+  return 1 if $directive =~ /^(["'])[^\$]*[^\\]\1/;
+  return 1 if $directive =~ /^(["'])\1/;
+
+  # Special values always used for numbers
+  return 1 if $directive =~ /^[ijkn]$/;
+  return 1 if $directive =~ /^count$/;
+
+  # Params
+  return 1 if $directive =~ /^Param\(/;
+
+  # Hooks
+  return 1 if $directive =~ /^Hook.process\(/;
+
+  # Other functions guaranteed to return OK output
+  return 1 if $directive =~ /^(time2str|url)\(/;
+
+  # Safe Template Toolkit virtual methods
+  return 1 if $directive =~ /\.(length$|size$|push\(|unshift\(|delete\()/;
+
+  # Special Template Toolkit loop variable
+  return 1 if $directive =~ /^loop\.(index|count)$/;
+
+  # Branding terms
+  return 1 if $directive =~ /^terms\./;
+
+  # Things which are already filtered
+  # Note: If a single directive prints two things, and only one is
+  # filtered, we may not catch that case.
+  return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics|
+                                        quoteUrls|time|uri|xml|html_light|
+                                        unitconvert|txt|html_linebreak|markdown|
+                                        none|null)\b/x;
 
-    # + - * /
-    return 1 if $directive =~ /[+\-*\/]/;
-
-    # Numbers
-    return 1 if $directive =~ /^[0-9]+$/;
-
-    # Simple assignments
-    return 1 if $directive =~ /^[\w\.\$\{\}]+\s+=\s+/;
-
-    # Conditional literals with either sort of quotes 
-    # There must be no $ in the string for it to be a literal
-    return 1 if $directive =~ /^(["'])[^\$]*[^\\]\1/;
-    return 1 if $directive =~ /^(["'])\1/;
-
-    # Special values always used for numbers
-    return 1 if $directive =~ /^[ijkn]$/;
-    return 1 if $directive =~ /^count$/;
-    
-    # Params
-    return 1 if $directive =~ /^Param\(/;
-    
-    # Hooks
-    return 1 if $directive =~ /^Hook.process\(/;
-
-    # Other functions guaranteed to return OK output
-    return 1 if $directive =~ /^(time2str|url)\(/;
-
-    # Safe Template Toolkit virtual methods
-    return 1 if $directive =~ /\.(length$|size$|push\(|unshift\(|delete\()/;
-
-    # Special Template Toolkit loop variable
-    return 1 if $directive =~ /^loop\.(index|count)$/;
-    
-    # Branding terms
-    return 1 if $directive =~ /^terms\./;
-            
-    # Things which are already filtered
-    # Note: If a single directive prints two things, and only one is 
-    # filtered, we may not catch that case.
-    return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics|
-                                        quoteUrls|time|uri|xml|lower|html_light|
-                                        obsolete|inactive|closed|unitconvert|
-                                        txt|html_linebreak|markdown|none)\b/x;
-
-    return 0;
+  return 0;
 }
 
 $/ = $oldrecsep;
diff --git a/t/009bugwords.t b/t/009bugwords.t
index e36651edb2..40db00fe29 100644
--- a/t/009bugwords.t
+++ b/t/009bugwords.t
@@ -9,17 +9,17 @@
 #Bugzilla Test 9#
 ####bugwords#####
 
-# Bugzilla has a mechanism for taking various words, including "bug", "bugs", 
+# Bugzilla has a mechanism for taking various words, including "bug", "bugs",
 # and "a bug" and automatically replacing them in the templates with the local
-# terminology. It does this by using the 'terms' hash, so "bug" becomes 
+# terminology. It does this by using the 'terms' hash, so "bug" becomes
 # "[% terms.bug %]". This test makes sure the relevant words aren't used
 # bare.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Support::Templates;
@@ -27,53 +27,57 @@ use Bugzilla::Util;
 
 use File::Spec;
 
-use Test::More tests => ($Support::Templates::num_actual_files); 
+use Test::More tests => ($Support::Templates::num_actual_files);
 
 # Find all the templates
 my @testitems;
 for my $path (@Support::Templates::include_paths) {
-    push(@testitems, map(File::Spec->catfile($path, $_),
-                         Support::Templates::find_actual_files($path)));
+  push(
+    @testitems,
+    map(File::Spec->catfile($path, $_),
+      Support::Templates::find_actual_files($path))
+  );
 }
 
 foreach my $file (@testitems) {
-    my @errors;
-    
-    # Read the entire file into a string
-    local $/;
-    open (FILE, "<$file") || die "Can't open $file: $!\n";    
-    my $slurp = <FILE>;
-    close (FILE);
-
-    # /g means we execute this loop for every match
-    # /s means we ignore linefeeds in the regexp matches
-    # This extracts everything which is _not_ a directive.
-    while ($slurp =~ /%\](.*?)(\[%|$)/gs) {
-        my $text = $1;
-
-        my @lineno = ($` =~ m/\n/gs);
-        my $lineno = scalar(@lineno) + 1;
-    
-        # "a bug", "bug", "bugs"
-        if (grep /(a?[\s>]bugs?[\s.:;,<])/i, $text) {
-            # Exclude variable assignment.
-            unless (grep /bugs =/, $text) {
-                push(@errors, [$lineno, $text]);
-                next;
-            }
-        }
-    }
-        
-    if (scalar(@errors)) {
-      ok(0, "$file contains invalid bare words (e.g. 'bug') --WARNING");
-      
-      foreach my $error (@errors) {
-        print "$error->[0]: $error->[1]\n";
+  my @errors;
+
+  # Read the entire file into a string
+  local $/;
+  open(FILE, "<$file") || die "Can't open $file: $!\n";
+  my $slurp = <FILE>;
+  close(FILE);
+
+  # /g means we execute this loop for every match
+  # /s means we ignore linefeeds in the regexp matches
+  # This extracts everything which is _not_ a directive.
+  while ($slurp =~ /%\](.*?)(\[%|$)/gs) {
+    my $text = $1;
+
+    my @lineno = ($` =~ m/\n/gs);
+    my $lineno = scalar(@lineno) + 1;
+
+    # "a bug", "bug", "bugs"
+    if (grep /(a?[\s>]bugs?[\s.:;,<])/i, $text) {
+
+      # Exclude variable assignment.
+      unless (grep /bugs =/, $text) {
+        push(@errors, [$lineno, $text]);
+        next;
       }
-    } 
-    else {
-      ok(1, "$file has no invalid barewords");
     }
+  }
+
+  if (scalar(@errors)) {
+    ok(0, "$file contains invalid bare words (e.g. 'bug') --WARNING");
+
+    foreach my $error (@errors) {
+      print "$error->[0]: $error->[1]\n";
+    }
+  }
+  else {
+    ok(1, "$file has no invalid barewords");
+  }
 }
 
 exit 0;
diff --git a/t/010dependencies.t b/t/010dependencies.t
index afd29a652b..6af24ce2b0 100644
--- a/t/010dependencies.t
+++ b/t/010dependencies.t
@@ -10,11 +10,11 @@
 #Bugzilla Test 10#
 ## dependencies ##
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Test::More qw(no_plan);
@@ -30,7 +30,8 @@ use constant MODULE_REGEX => qr/
     ['"]?
     ([\w:\.\\]+)
 /x;
-use constant BASE_REGEX => qr/^use (?:base|parent) (?:-norequire, )?qw\(([^\)]+)/;
+use constant BASE_REGEX =>
+  qr/^use (?:base|parent) (?:-norequire, )?qw\(([^\)]+)/;
 
 # Extract all Perl modules.
 foreach my $file (@Support::Files::testitems) {
@@ -42,46 +43,47 @@ foreach my $file (@Support::Files::testitems) {
 }
 
 foreach my $module (keys %mods) {
-    my $reading = 1;
-    my @use;
-
-    open(SOURCE, $mods{$module});
-    while (my $line = <SOURCE>) {
-      last if ($line =~ /^__END__/);
-      if ($line =~ /^=cut/) {
-        $reading = 1;
-        next;
-      }
-      next unless $reading;
-      if ($line =~ /^=(head|over|item|back|pod|begin|end|for)/) {
-        $reading = 0;
-        next;
-      }
-      if ($line =~ /^package\s+([^;]);/) {
-        $module = $1;
-      }
-      elsif ($line =~ BASE_REGEX or $line =~ MODULE_REGEX) {
-        my $used_string = $1;
-        # "use base"/"use parent" can have multiple modules
-        my @used_array = split(/\s+/, $used_string);
-        foreach my $used (@used_array) {
-            next if $used !~ /^Bugzilla/;
-            $used =~ s#/#::#g;
-            $used =~ s#\.pm$##;
-            $used =~ s#\$module#[^:]+#;
-            $used =~ s#\${[^}]+}#[^:]+#;
-            $used =~ s#[" ]##g;
-            push(@use, grep(/^\Q$used\E$/, keys %mods));
-        }
-      }
+  my $reading = 1;
+  my @use;
+
+  open(SOURCE, $mods{$module});
+  while (my $line = <SOURCE>) {
+    last if ($line =~ /^__END__/);
+    if ($line =~ /^=cut/) {
+      $reading = 1;
+      next;
+    }
+    next unless $reading;
+    if ($line =~ /^=(head|over|item|back|pod|begin|end|for)/) {
+      $reading = 0;
+      next;
     }
-    close (SOURCE);
+    if ($line =~ /^package\s+([^;]);/) {
+      $module = $1;
+    }
+    elsif ($line =~ BASE_REGEX or $line =~ MODULE_REGEX) {
+      my $used_string = $1;
 
-    foreach my $u (@use) {
-      if (!grep {$_ eq $u} @{$deps{$module}}) {
-        push(@{$deps{$module}}, $u);
+      # "use base"/"use parent" can have multiple modules
+      my @used_array = split(/\s+/, $used_string);
+      foreach my $used (@used_array) {
+        next if $used !~ /^Bugzilla/;
+        $used =~ s#/#::#g;
+        $used =~ s#\.pm$##;
+        $used =~ s#\$module#[^:]+#;
+        $used =~ s#\$\{[^}]+}#[^:]+#;
+        $used =~ s#[" ]##g;
+        push(@use, grep(/^\Q$used\E$/, keys %mods));
       }
     }
+  }
+  close(SOURCE);
+
+  foreach my $u (@use) {
+    if (!grep { $_ eq $u } @{$deps{$module}}) {
+      push(@{$deps{$module}}, $u);
+    }
+  }
 }
 
 sub creates_loop {
diff --git a/t/011pod.t b/t/011pod.t
index 8620b94d59..db6e16ad41 100644
--- a/t/011pod.t
+++ b/t/011pod.t
@@ -10,120 +10,134 @@
 #Bugzilla Test 11#
 ##POD validation##
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib 't';
+use lib qw(. lib local/lib/perl5 t);
 
 use Support::Files;
 use Pod::Checker;
 use Pod::Coverage;
 
 use Test::More tests => scalar(@Support::Files::testitems)
-                        + scalar(@Support::Files::module_files);
+  + scalar(@Support::Files::module_files);
 
 # These methods do not need to be documented by default.
-use constant DEFAULT_WHITELIST => qr/^(?:new|new_from_list|check|run_create_validators)$/;
+use constant DEFAULT_WHITELIST =>
+  qr/^(?:new|new_from_list|check|run_create_validators|[A-Z_]+)$/;
 
 # These subroutines do not need to be documented, generally because
 # you shouldn't call them yourself. No need to include subroutines
 # of the form _foo(); they are already treated as private.
 use constant SUB_WHITELIST => (
-    'Bugzilla::Flag'     => qr/^(?:(force_)?retarget|force_cleanup)$/,
-    'Bugzilla::FlagType' => qr/^sqlify_criteria$/,
-    'Bugzilla::JobQueue' => qr/(?:^work_once|work_until_done|subprocess_worker)$/,
-    'Bugzilla::Search'   => qr/^SPECIAL_PARSING$/,
-    'Bugzilla::Template' => qr/^field_name$/,
+  'Bugzilla::Flag'     => qr/^(?:(force_)?retarget|force_cleanup)$/,
+  'Bugzilla::FlagType' => qr/^sqlify_criteria$/,
+  'Bugzilla::JobQueue' => qr/(?:^work_once|work_until_done|subprocess_worker)$/,
+  'Bugzilla::Search'   => qr/^SPECIAL_PARSING$/,
+  'Bugzilla::Template' => qr/^field_name$/,
+  'Bugzilla::MIME'     => qr/^as_string$/,
 );
 
 # These modules do not need to be documented, generally because they
 # are subclasses of another module which already has all the relevant
 # documentation. Partial names are allowed.
 use constant MODULE_WHITELIST => qw(
-    Bugzilla::Auth::Login::
-    Bugzilla::Auth::Persist::
-    Bugzilla::Auth::Verify::
-    Bugzilla::BugUrl::
-    Bugzilla::Config::
-    Bugzilla::Extension::
-    Bugzilla::Job::
-    Bugzilla::Migrate::
+  Bugzilla::Auth::Login::
+  Bugzilla::Auth::Persist::
+  Bugzilla::Auth::Verify::
+  Bugzilla::BugUrl::
+  Bugzilla::Config::
+  Bugzilla::Extension::
+  Bugzilla::Job::
+  Bugzilla::Migrate::
+  docs::lib::Pod::Simple::
 );
 
 # Capture the TESTOUT from Test::More or Test::Builder for printing errors.
 # This will handle verbosity for us automatically.
 my $fh;
 {
-    no warnings qw(unopened);  # Don't complain about non-existent filehandles
-    if (-e \*Test::More::TESTOUT) {
-        $fh = \*Test::More::TESTOUT;
-    } elsif (-e \*Test::Builder::TESTOUT) {
-        $fh = \*Test::Builder::TESTOUT;
-    } else {
-        $fh = \*STDOUT;
-    }
+  no warnings qw(unopened);    # Don't complain about non-existent filehandles
+  if (-e \*Test::More::TESTOUT) {
+    $fh = \*Test::More::TESTOUT;
+  }
+  elsif (-e \*Test::Builder::TESTOUT) {
+    $fh = \*Test::Builder::TESTOUT;
+  }
+  else {
+    $fh = \*STDOUT;
+  }
 }
 
 my @testitems = @Support::Files::testitems;
 
 foreach my $file (@testitems) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    my $error_count = podchecker($file, $fh);
-    if ($error_count < 0) {
-        ok(1,"$file does not contain any POD");
-    } elsif ($error_count == 0) {
-        ok(1,"$file has correct POD syntax");
-    } else {
-        ok(0,"$file has incorrect POD syntax --ERROR");
-    }
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next if (!$file);      # skip null entries
+  my $error_count = podchecker($file, $fh);
+  if ($error_count < 0) {
+    ok(1, "$file does not contain any POD");
+  }
+  elsif ($error_count == 0) {
+    ok(1, "$file has correct POD syntax");
+  }
+  else {
+    ok(0, "$file has incorrect POD syntax --ERROR");
+  }
 }
 
 my %sub_whitelist = SUB_WHITELIST;
-my @module_files = sort @Support::Files::module_files;
+my @module_files  = sort @Support::Files::module_files;
 
 foreach my $file (@module_files) {
-    my $module = $file;
-    $module =~ s/\.pm$//;
-    $module =~ s#/#::#g;
-    $module =~ s/^extensions/Bugzilla::Extension/;
-
-    my @whitelist = (DEFAULT_WHITELIST);
-    push(@whitelist, $sub_whitelist{$module}) if $sub_whitelist{$module};
-
-    # XXX Once all methods are correctly documented, nonwhitespace should
-    # be set to 1.
-    my $cover = Pod::Coverage->new(package => $module, nonwhitespace => 0,
-                                   trustme => \@whitelist);
-    my $coverage = $cover->coverage;
-    my $reason = $cover->why_unrated;
-
-    if (defined $coverage) {
-        if ($coverage == 1) {
-            ok(1, "$file has POD for all methods");
-        }
-        else {
-            ok(0, "$file POD coverage is " . sprintf("%u%%", 100 * $coverage) .
-                  ". Undocumented methods: " . join(', ', $cover->uncovered));
-        }
+  my $module = $file;
+  $module =~ s/\.pm$//;
+  $module =~ s#/#::#g;
+  $module =~ s/^extensions/Bugzilla::Extension/;
+
+  my @whitelist = (DEFAULT_WHITELIST);
+  push(@whitelist, $sub_whitelist{$module}) if $sub_whitelist{$module};
+
+  # XXX Once all methods are correctly documented, nonwhitespace should
+  # be set to 1.
+  my $cover = Pod::Coverage->new(
+    package       => $module,
+    nonwhitespace => 0,
+    trustme       => \@whitelist
+  );
+  my $coverage = $cover->coverage;
+  my $reason   = $cover->why_unrated;
+
+  if (defined $coverage) {
+    if ($coverage == 1) {
+      ok(1, "$file has POD for all methods");
     }
-    # These errors are thrown when the module couldn't be loaded due to
-    # a missing dependency.
-    elsif ($reason =~ /^(?:no public symbols defined|requiring '[^']+' failed)$/) {
-        ok(1, "$file cannot be loaded");
+    else {
+      ok(0,
+            "$file POD coverage is "
+          . sprintf("%u%%", 100 * $coverage)
+          . ". Undocumented methods: "
+          . join(', ', $cover->uncovered));
     }
-    elsif ($reason eq "couldn't find pod") {
-        if (grep { $module =~ /^\Q$_\E/ } MODULE_WHITELIST) {
-            ok(1, "$file does not contain any POD (whitelisted)");
-        }
-        else {
-            ok(0, "$file POD coverage is 0%");
-        }
+  }
+
+  # These errors are thrown when the module couldn't be loaded due to
+  # a missing dependency.
+  elsif ($reason =~ /^(?:no public symbols defined|requiring '[^']+' failed)$/) {
+    ok(1, "$file cannot be loaded");
+  }
+  elsif ($reason eq "couldn't find pod") {
+    if (grep { $module =~ /^\Q$_\E/ } MODULE_WHITELIST) {
+      ok(1, "$file does not contain any POD (whitelisted)");
     }
     else {
-        ok(0, "$file: $reason");
+      ok(0, "$file POD coverage is 0%");
     }
+  }
+  else {
+    ok(0, "$file: $reason");
+  }
 }
 
 exit 0;
diff --git a/t/012throwables.t b/t/012throwables.t
index 0ef043fa5f..6471e1da35 100644
--- a/t/012throwables.t
+++ b/t/012throwables.t
@@ -6,16 +6,15 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 
-
 ##################
 #Bugzilla Test 12#
 ######Errors######
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib t);
+use lib qw(. lib local/lib/perl5 t);
 
 use Bugzilla::Constants;
 use Bugzilla::WebService::Constants;
@@ -32,11 +31,11 @@ push @{$Errors{code}{template_error}{used_in}{'Bugzilla/Error.pm'}}, 0;
 
 # Define files to test. Each file would have a list of error messages, if any.
 my %test_templates = ();
-my %test_modules = ();
+my %test_modules   = ();
 
 # Find all modules
 foreach my $module (@Support::Files::testitems) {
-    $test_modules{$module} = ();
+  $test_modules{$module} = ();
 }
 
 # Find all error templates
@@ -44,20 +43,19 @@ foreach my $module (@Support::Files::testitems) {
 # hairy. But let us do it only once.
 
 foreach my $include_path (@include_paths) {
-    foreach my $path (@{$actual_files{$include_path}}) {
-        my $file = File::Spec->catfile($include_path, $path);
-        $file =~ s/\s.*$//; # nuke everything after the first space
-        $file =~ s|\\|/|g if ON_WINDOWS;  # convert \ to / in path if on windows
-        $test_templates{$file} = () 
-            if $file =~ m#global/(code|user)-error\.html\.tmpl#;
-
-        # Make sure the extension is not disabled
-        if ($file =~ m#^(extensions/[^/]+/)#) {
-            $test_templates{$file} = ()
-                if ! -e "${1}disabled"
-                && $file =~ m#global/(code|user)-error-errors\.html\.tmpl#;
-        }
+  foreach my $path (@{$actual_files{$include_path}}) {
+    my $file = File::Spec->catfile($include_path, $path);
+    $file =~ s/\s.*$//;    # nuke everything after the first space
+    $file =~ s|\\|/|g if ON_WINDOWS;    # convert \ to / in path if on windows
+    $test_templates{$file} = () if $file =~ m#global/(code|user)-error\.html\.tmpl#;
+
+    # Make sure the extension is not disabled
+    if ($file =~ m#^(extensions/[^/]+/)#) {
+      $test_templates{$file} = ()
+        if !-e "${1}disabled"
+        && $file =~ m#global/(code|user)-error-errors\.html\.tmpl#;
     }
+  }
 }
 
 # Count the tests. The +1 is for checking the WS_ERROR_CODE errors.
@@ -69,112 +67,115 @@ plan tests => $tests;
 
 # Collect all errors defined in templates
 foreach my $file (keys %test_templates) {
-    $file =~ m|template/([^/]+).*/global/([^/]+)-error(?:-errors)?\.html\.tmpl|;
-    my $lang = $1;
-    my $errtype = $2;
-
-    if (! open (TMPL, $file)) {
-        Register(\%test_templates, $file, "could not open file --WARNING");
-        next;
+  $file =~ m|template/([^/]+).*/global/([^/]+)-error(?:-errors)?\.html\.tmpl|;
+  my $lang    = $1;
+  my $errtype = $2;
+
+  if (!open(TMPL, $file)) {
+    Register(\%test_templates, $file, "could not open file --WARNING");
+    next;
+  }
+
+  my $lineno = 0;
+  while (my $line = <TMPL>) {
+    $lineno++;
+    if ($line =~ /\[%\s[A-Z]+\s*error\s*==\s*"(.+)"\s*%\]/) {
+      my $errtag = $1;
+      if ($errtag =~ /\s/) {
+        Register(\%test_templates, $file,
+              "has an error definition \"$errtag\" at line $lineno with "
+            . "space(s) embedded --ERROR");
+      }
+      else {
+        push @{$Errors{$errtype}{$errtag}{defined_in}{$lang}{$file}}, $lineno;
+      }
     }
-    
-    my $lineno=0;
-    while (my $line = <TMPL>) {
-        $lineno++;
-        if ($line =~ /\[%\s[A-Z]+\s*error\s*==\s*"(.+)"\s*%\]/) {
-            my $errtag = $1;
-            if ($errtag =~ /\s/) {
-                Register(\%test_templates, $file, 
-                "has an error definition \"$errtag\" at line $lineno with "
-                . "space(s) embedded --ERROR");
-            }
-            else {
-                push @{$Errors{$errtype}{$errtag}{defined_in}{$lang}{$file}}, $lineno;
-            }
-        }
-    }
-    close(TMPL);
+  }
+  close(TMPL);
 }
 
 # Collect all used errors from cgi/pm files
 foreach my $file (keys %test_modules) {
-    $file =~ s/\s.*$//; # nuke everything after the first space (#comment)
-    next if (!$file); # skip null entries
-    if (! open (TMPL, $file)) {
-        Register(\%test_modules, $file, "could not open file --WARNING");
-        next;
+  $file =~ s/\s.*$//;    # nuke everything after the first space (#comment)
+  next if (!$file);      # skip null entries
+  if (!open(TMPL, $file)) {
+    Register(\%test_modules, $file, "could not open file --WARNING");
+    next;
+  }
+
+  my $lineno = 0;
+  while (my $line = <TMPL>) {
+    last if $line =~ /^__END__/;    # skip the POD (at least in
+                                    # Bugzilla/Error.pm)
+    $lineno++;
+    if ($line
+      =~ /^[^#]*\b(Throw(Code|User)Error|(user_)?error\s+=>)\s*\(?\s*["'](.*?)['"]/)
+    {
+      my $errtype;
+
+      # If it's a normal ThrowCode/UserError
+      if ($2) {
+        $errtype = lc($2);
+      }
+
+      # If it's an AUTH_ERROR tag
+      else {
+        $errtype = $3 ? 'user' : 'code';
+      }
+      my $errtag = $4;
+      push @{$Errors{$errtype}{$errtag}{used_in}{$file}}, $lineno;
     }
+  }
 
-    my $lineno = 0;
-    while (my $line = <TMPL>) {
-        last if $line =~ /^__END__/; # skip the POD (at least in
-                                        # Bugzilla/Error.pm)
-        $lineno++;
-        if ($line =~
-/^[^#]*\b(Throw(Code|User)Error|(user_)?error\s+=>)\s*\(?\s*["'](.*?)['"]/) {
-            my $errtype;
-            # If it's a normal ThrowCode/UserError
-            if ($2) {
-                $errtype = lc($2);
-            }
-            # If it's an AUTH_ERROR tag
-            else {
-                $errtype = $3 ? 'user' : 'code';
-            }
-            my $errtag = $4;
-            push @{$Errors{$errtype}{$errtag}{used_in}{$file}}, $lineno;
-        }
-    }
-    
-    close(TMPL);
+  close(TMPL);
 }
 
 # Now let us start the checks
 
 foreach my $errtype (keys %Errors) {
-    foreach my $errtag (keys %{$Errors{$errtype}}) {
-        # Check for undefined tags
-        if (!defined $Errors{$errtype}{$errtag}{defined_in}) {
-            UsedIn($errtype, $errtag, "any");
+  foreach my $errtag (keys %{$Errors{$errtype}}) {
+
+    # Check for undefined tags
+    if (!defined $Errors{$errtype}{$errtag}{defined_in}) {
+      UsedIn($errtype, $errtag, "any");
+    }
+    else {
+      # Check for all languages!!!
+      my @langs = ();
+      foreach my $lang (@languages) {
+        if (!defined $Errors{$errtype}{$errtag}{defined_in}{$lang}) {
+          push @langs, $lang;
         }
-        else {
-            # Check for all languages!!!
-            my @langs = ();
-            foreach my $lang (@languages) {
-                if (!defined $Errors{$errtype}{$errtag}{defined_in}{$lang}) {
-                    push @langs, $lang;
-                }
-            }
-            if (scalar @langs) {
-                UsedIn($errtype, $errtag, join(', ',@langs));
-            }
-            
-            # Now check for tag usage in all DEFINED languages
-            foreach my $lang (keys %{$Errors{$errtype}{$errtag}{defined_in}}) {
-                if (!defined $Errors{$errtype}{$errtag}{used_in}) {
-                    DefinedIn($errtype, $errtag, $lang);
-                }
-            }
+      }
+      if (scalar @langs) {
+        UsedIn($errtype, $errtag, join(', ', @langs));
+      }
+
+      # Now check for tag usage in all DEFINED languages
+      foreach my $lang (keys %{$Errors{$errtype}{$errtag}{defined_in}}) {
+        if (!defined $Errors{$errtype}{$errtag}{used_in}) {
+          DefinedIn($errtype, $errtag, $lang);
         }
+      }
     }
+  }
 }
 
 # And make sure that everything defined in WS_ERROR_CODE
 # is actually a valid error.
 foreach my $err_name (keys %{WS_ERROR_CODE()}) {
-    if (!defined $Errors{'code'}{$err_name} 
-        && !defined $Errors{'user'}{$err_name})
-    {
-        Register(\%test_modules, 'WS_ERROR_CODE',
-            "Error tag '$err_name' is used in WS_ERROR_CODE in"
-            . " Bugzilla/WebService/Constants.pm"
-            . " but not defined in any template, and not used in any code.");
-    }
+  if (!defined $Errors{'code'}{$err_name} && !defined $Errors{'user'}{$err_name})
+  {
+    Register(\%test_modules, 'WS_ERROR_CODE',
+          "Error tag '$err_name' is used in WS_ERROR_CODE in"
+        . " Bugzilla/WebService/Constants.pm"
+        . " but not defined in any template, and not used in any code.");
+  }
 }
 
 # Now report modules results
 foreach my $file (sort keys %test_modules) {
-    Report($file, @{$test_modules{$file}});
+  Report($file, @{$test_modules{$file}});
 }
 
 # And report WS_ERROR_CODE results
@@ -182,56 +183,67 @@ Report('WS_ERROR_CODE', @{$test_modules{'WS_ERROR_CODE'}});
 
 # Now report templates results
 foreach my $file (sort keys %test_templates) {
-    Report($file, @{$test_templates{$file}});
+  Report($file, @{$test_templates{$file}});
 }
 
 sub Register {
-    my ($hash, $file, $message, $warning) = @_;
-    # If set to 1, $warning will avoid the test to fail.
-    $warning ||= 0;
-    push(@{$hash->{$file}}, {'message' => $message, 'warning' => $warning});
+  my ($hash, $file, $message, $warning) = @_;
+
+  # If set to 1, $warning will avoid the test to fail.
+  $warning ||= 0;
+  push(@{$hash->{$file}}, {'message' => $message, 'warning' => $warning});
 }
 
 sub Report {
-    my ($file, @errors) = @_;
-    if (scalar @errors) {
-        # Do we only have warnings to report or also real errors?
-        my @real_errors = grep {$_->{'warning'} == 0} @errors;
-        # Extract error messages.
-        @errors = map {$_->{'message'}} @errors;
-        if (scalar(@real_errors)) {
-            ok(0, "$file has ". scalar(@errors) ." error(s):\n" . join("\n", @errors));
-        }
-        else {
-            ok(1, "--WARNING $file has " . scalar(@errors) .
-                  " unused error tag(s):\n" . join("\n", @errors));
-        }
+  my ($file, @errors) = @_;
+  if (scalar @errors) {
+
+    # Do we only have warnings to report or also real errors?
+    my @real_errors = grep { $_->{'warning'} == 0 } @errors;
+
+    # Extract error messages.
+    @errors = map { $_->{'message'} } @errors;
+    if (scalar(@real_errors)) {
+      ok(0, "$file has " . scalar(@errors) . " error(s):\n" . join("\n", @errors));
     }
     else {
-        # This is used for both code and template files, so let's use
-        # file-independent phrase
-        ok(1, "$file uses error tags correctly");
+      ok(1,
+            "--WARNING $file has "
+          . scalar(@errors)
+          . " unused error tag(s):\n"
+          . join("\n", @errors));
     }
+  }
+  else {
+    # This is used for both code and template files, so let's use
+    # file-independent phrase
+    ok(1, "$file uses error tags correctly");
+  }
 }
 
 sub UsedIn {
-    my ($errtype, $errtag, $lang) = @_;
-    $lang = $lang || "any";
-    foreach my $file (keys %{$Errors{$errtype}{$errtag}{used_in}}) {
-        Register(\%test_modules, $file, 
-            "$errtype error tag '$errtag' is used at line(s) (" 
-            . join (',', @{$Errors{$errtype}{$errtag}{used_in}{$file}}) 
-            . ") but not defined for language(s): $lang");
-    }
+  my ($errtype, $errtag, $lang) = @_;
+  $lang = $lang || "any";
+  foreach my $file (keys %{$Errors{$errtype}{$errtag}{used_in}}) {
+    Register(\%test_modules, $file,
+          "$errtype error tag '$errtag' is used at line(s) ("
+        . join(',', @{$Errors{$errtype}{$errtag}{used_in}{$file}})
+        . ") but not defined for language(s): $lang");
+  }
 }
+
 sub DefinedIn {
-    my ($errtype, $errtag, $lang) = @_;
-    foreach my $file (keys %{$Errors{$errtype}{$errtag}{defined_in}{$lang}}) {
-        Register(\%test_templates, $file, 
-            "$errtype error tag '$errtag' is defined at line(s) ("
-            . join (',', @{$Errors{$errtype}{$errtag}{defined_in}{$lang}{$file}}) 
-            . ") but is not used anywhere", 1);
-    }
+  my ($errtype, $errtag, $lang) = @_;
+  foreach my $file (keys %{$Errors{$errtype}{$errtag}{defined_in}{$lang}}) {
+    Register(
+      \%test_templates,
+      $file,
+      "$errtype error tag '$errtag' is defined at line(s) ("
+        . join(',', @{$Errors{$errtype}{$errtag}{defined_in}{$lang}{$file}})
+        . ") but is not used anywhere",
+      1
+    );
+  }
 }
 
 exit 0;
diff --git a/t/013dbschema.t b/t/013dbschema.t
index 217176ff20..4e18b749b0 100644
--- a/t/013dbschema.t
+++ b/t/013dbschema.t
@@ -12,41 +12,41 @@
 # Check the Bugzilla database schema to ensure no field names conflict
 # with SQL reserved words.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. t lib);
+use lib qw(. lib local/lib/perl5 t);
 use Bugzilla;
 use Bugzilla::DB::Schema;
 
 
 # SQL reserved words
 use constant RESERVED_WORDS => qw(
-    ABSOLUTE ACTION ACTOR ADD AFTER ALL ALLOCATE ALTER ANY AND ARE AS ASC ASSERTION ASYNC AT
-    ATTRIBUTES BEFORE BEGIN BETWEEN BIT BIT_LENGTH BOOLEAN BOTH BREADTH BY CALL CASCADE
-    CASCADED CASE CAST CATALOG CHAR CHARACTER_LENGTH CHAR_LENGTH COLLATE
-    COLLATION COLUMN COMPLETION CONNECT CONNECTION CONSTRAINT CONSTRAINTS
-    CONVERT CORRESPONDING CREATE CROSS CURRENT_DATE CURRENT_PATH CURRENT_TIME
-    CURRENT_TIMESTAMP CURRENT_USER CYCLE DATA DATE DAY DEALLOCATE DECLARE DEFAULT DEFERRABLE
-    DEFERRED DELETE DEPTH DESC DESCRIBE DESCRIPTOR DESTROY DIAGNOSTICS DICTIONARY
-    DISCONNECT DISTINCT DO DOMAIN DROP EACH ELEMENT ELSE ELSEIF END END-EXEC EQUALS EXCEPT
-    EXCEPTION EXECUTE EXTERNAL EXTRACT FACTOR FALSE FIRST FOR FROM FULL GENERAL GET
-    GLOBAL GRANT GROUP HAVING HOLD HOUR IDENTITY IF IGNORE IMMEDIATE IN INITIALLY INNER INPUT
-    INSENSITIVE INSERT INSTEAD INTERSECT INTERVAL IS ISOLATION JOIN LAST LEADING LEAVE
-    LEFT LESS LEVEL LIMIT LIST LOCAL LOOP LOWER MATCH MINUTE MODIFY MONTH NAMES
-    NATIONAL NATURAL NCHAR NEW NEW_TABLE NEXT NO NONE NOT NULL NULLIF OBJECT
-    OCTET_LENGTH OFF OID OLD OLD_TABLE ONLY OPERATION OPERATOR OPERATORS OR ORDER OTHERS
-    OUTER OUTPUT OVERLAPS PAD PARAMETERS PARTIAL PATH PENDANT POSITION POSTFIX
-    PREFIX PREORDER PREPARE PRESERVE PRIOR PRIVATE PROTECTED READ RECURSIVE REF
-    REFERENCING RELATIVE REPLACE RESIGNAL RESTRICT RETURN RETURNS REVOKE RIGHT
-    ROLE ROUTINE ROW ROWS SAVEPOINT SCROLL SEARCH SECOND SELECT SENSITIVE SEQUENCE
-    SESSION SESSION_USER SIGNAL SIMILAR SIZE SPACE SQLEXCEPTION SQLSTATE
-    SQLWARNING START STATE STRUCTURE SUBSTRING SYMBOL SYSTEM_USER TABLE TEMPORARY
-    TERM TEST THEN THERE TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TRAILING
-    TRANSACTION TRANSLATE TRANSLATION TRIGGER TRIM TRUE TUPLE UNDER
-    UNKNOWN UNION UNIQUE UPDATE UPPER USAGE USING VARCHAR VARIABLE VARYING VIEW VIRTUAL VISIBLE
-    WAIT WHEN WHERE WHILE WITH WITHOUT WRITE YEAR ZONE
+  ABSOLUTE ACTION ACTOR ADD AFTER ALL ALLOCATE ALTER ANY AND ARE AS ASC ASSERTION ASYNC AT
+  ATTRIBUTES BEFORE BEGIN BETWEEN BIT BIT_LENGTH BOOLEAN BOTH BREADTH BY CALL CASCADE
+  CASCADED CASE CAST CATALOG CHAR CHARACTER_LENGTH CHAR_LENGTH COLLATE
+  COLLATION COLUMN COMPLETION CONNECT CONNECTION CONSTRAINT CONSTRAINTS
+  CONVERT CORRESPONDING CREATE CROSS CURRENT_DATE CURRENT_PATH CURRENT_TIME
+  CURRENT_TIMESTAMP CURRENT_USER CYCLE DATA DATE DAY DEALLOCATE DECLARE DEFAULT DEFERRABLE
+  DEFERRED DELETE DEPTH DESC DESCRIBE DESCRIPTOR DESTROY DIAGNOSTICS DICTIONARY
+  DISCONNECT DISTINCT DO DOMAIN DROP EACH ELEMENT ELSE ELSEIF END END-EXEC EQUALS EXCEPT
+  EXCEPTION EXECUTE EXTERNAL EXTRACT FACTOR FALSE FIRST FOR FROM FULL GENERAL GET
+  GLOBAL GRANT GROUP HAVING HOLD HOUR IDENTITY IF IGNORE IMMEDIATE IN INITIALLY INNER INPUT
+  INSENSITIVE INSERT INSTEAD INTERSECT INTERVAL IS ISOLATION JOIN LAST LEADING LEAVE
+  LEFT LESS LEVEL LIMIT LIST LOCAL LOOP LOWER MATCH MINUTE MODIFY MONTH NAMES
+  NATIONAL NATURAL NCHAR NEW NEW_TABLE NEXT NO NONE NOT NULL NULLIF OBJECT
+  OCTET_LENGTH OFF OID OLD OLD_TABLE ONLY OPERATION OPERATOR OPERATORS OR ORDER OTHERS
+  OUTER OUTPUT OVERLAPS PAD PARAMETERS PARTIAL PATH PENDANT POSITION POSTFIX
+  PREFIX PREORDER PREPARE PRESERVE PRIOR PRIVATE PROTECTED READ RECURSIVE REF
+  REFERENCING RELATIVE REPLACE RESIGNAL RESTRICT RETURN RETURNS REVOKE RIGHT
+  ROLE ROUTINE ROW ROWS SAVEPOINT SCROLL SEARCH SECOND SELECT SENSITIVE SEQUENCE
+  SESSION SESSION_USER SIGNAL SIMILAR SIZE SPACE SQLEXCEPTION SQLSTATE
+  SQLWARNING START STATE STRUCTURE SUBSTRING SYMBOL SYSTEM_USER TABLE TEMPORARY
+  TERM TEST THEN THERE TIME TIMESTAMP TIMEZONE_HOUR TIMEZONE_MINUTE TRAILING
+  TRANSACTION TRANSLATE TRANSLATION TRIGGER TRIM TRUE TUPLE UNDER
+  UNKNOWN UNION UNIQUE UPDATE UPPER USAGE USING VARCHAR VARIABLE VARYING VIEW VIRTUAL VISIBLE
+  WAIT WHEN WHERE WHILE WITH WITHOUT WRITE YEAR ZONE
 );
 
 # Few Exceptions are removed from the above list
@@ -57,31 +57,31 @@ our $schema;
 our @tables;
 
 BEGIN {
-    $schema = Bugzilla::DB::Schema->new("Mysql");
-    @tables = $schema->get_table_list();
+  $schema = Bugzilla::DB::Schema->new("Mysql");
+  @tables = $schema->get_table_list();
 }
 
 use Test::More tests => scalar(@tables);
 
 foreach my $table (@tables) {
-    my @reserved;
+  my @reserved;
 
-    if (grep { uc($table) eq $_ } RESERVED_WORDS) {
-        push(@reserved, $table);
-    }
+  if (grep { uc($table) eq $_ } RESERVED_WORDS) {
+    push(@reserved, $table);
+  }
 
-    foreach my $column ($schema->get_table_columns($table)) {
-        if (grep { uc($column) eq $_ } RESERVED_WORDS) {
-            push(@reserved, $column);
-        }
+  foreach my $column ($schema->get_table_columns($table)) {
+    if (grep { uc($column) eq $_ } RESERVED_WORDS) {
+      push(@reserved, $column);
     }
+  }
 
-    if (scalar @reserved) {
-        ok(0, "Table $table use reserved words: " . join(", ", @reserved));
-    }
-    else {
-        ok(1, "Table $table does not use reserved words");
-    }
+  if (scalar @reserved) {
+    ok(0, "Table $table use reserved words: " . join(", ", @reserved));
+  }
+  else {
+    ok(1, "Table $table does not use reserved words");
+  }
 }
 
 exit 0;
diff --git a/t/014critic-core.t b/t/014critic-core.t
new file mode 100644
index 0000000000..da97772c4a
--- /dev/null
+++ b/t/014critic-core.t
@@ -0,0 +1,31 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# Enforce high standards against code that will be installed
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5 t);
+
+use Test::More;
+use File::Spec::Functions ':ALL';
+
+BEGIN {
+  # Don't run tests for installs or automated tests
+  unless ($ENV{RELEASE_TESTING}) {
+    plan(skip_all => "Author tests not required for installation");
+  }
+  my $config = catfile('t', 'critic-core.ini');
+  unless (eval "use Test::Perl::Critic -profile => '$config'; 1") {
+    plan skip_all => 'Test::Perl::Critic required to criticise code';
+  }
+}
+
+# need to skip t/
+all_critic_ok('Bugzilla.pm', 'Bugzilla/', glob("*.cgi"), glob("*.pl"),);
diff --git a/t/015remote_ip.t b/t/015remote_ip.t
new file mode 100644
index 0000000000..6650258aeb
--- /dev/null
+++ b/t/015remote_ip.t
@@ -0,0 +1,84 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib t local/lib/perl5);
+
+use Test::More qw(no_plan);
+use Bugzilla;
+use Bugzilla::Util qw(remote_ip);
+
+my $params = Bugzilla->params;
+
+{
+  local $params->{inbound_proxies} = '10.0.0.1,10.0.0.2';
+  local $ENV{REMOTE_ADDR}          = '10.0.0.2';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '10.42.42.42';
+
+  is(remote_ip(), '10.42.42.42', "from proxy 2");
+}
+
+{
+  local $params->{inbound_proxies} = '10.0.0.1,10.0.0.2';
+  local $ENV{REMOTE_ADDR}          = '10.0.0.1';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '10.42.42.42';
+
+  is(remote_ip(), '10.42.42.42', "from proxy 1");
+}
+
+{
+  local $params->{inbound_proxies} = '10.0.0.1,10.0.0.2';
+  local $ENV{REMOTE_ADDR}          = '10.0.0.3';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '10.42.42.42';
+
+  is(remote_ip(), '10.0.0.3', "not a proxy");
+}
+
+{
+  local $params->{inbound_proxies} = '*';
+  local $ENV{REMOTE_ADDR}          = '10.0.0.3';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '10.42.42.42,1.4.9.2';
+
+  is(remote_ip(), '10.42.42.42', "always proxy");
+}
+
+{
+  local $params->{inbound_proxies} = '';
+  local $ENV{REMOTE_ADDR}          = '10.9.8.7';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '10.42.42.42,1.4.9.2';
+
+  is(remote_ip(), '10.9.8.7', "never proxy");
+}
+
+
+{
+  local $params->{inbound_proxies} = '10.0.0.1,2600:cafe::cafe:ffff:bf42:4998';
+  local $ENV{REMOTE_ADDR}          = '2600:cafe::cafe:ffff:bf42:4998';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '2600:cafe::cafe:ffff:bf42:BEEF';
+
+  is(remote_ip(), '2600:cafe::cafe:ffff:bf42:BEEF', "from proxy ipv6");
+}
+
+{
+  local $params->{inbound_proxies} = '10.0.0.1,2600:cafe::cafe:ffff:bf42:4998';
+  local $ENV{REMOTE_ADDR}          = '2600:cafe::cafe:ffff:bf42:DEAD';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '2600:cafe::cafe:ffff:bf42:BEEF';
+
+  is(remote_ip(), '2600:cafe::cafe:ffff:bf42:DEAD', "invalid proxy ipv6");
+}
+
+
+{
+  local $params->{inbound_proxies} = '*';
+  local $ENV{REMOTE_ADDR}          = '2600:cafe::cafe:ffff:bf42:DEAD';
+  local $ENV{HTTP_X_FORWARDED_FOR} = '';
+
+  is(remote_ip(), '2600:cafe::cafe:ffff:bf42:DEAD', "always proxy ipv6");
+}
diff --git a/t/016csp.t b/t/016csp.t
new file mode 100644
index 0000000000..11bb890f43
--- /dev/null
+++ b/t/016csp.t
@@ -0,0 +1,130 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#################
+#Bugzilla Test 4#
+####Templates####
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5 t);
+
+use Test::More;
+use File::Find;
+use Support::Templates;
+use List::MoreUtils qw(any);
+use Text::Balanced qw(gen_extract_tagged extract_multiple);
+
+unless ($ENV{CSP_TESTING}) {
+  plan(skip_all => "CSP tests not yet default");
+  exit;
+}
+
+my @event_attrs = qw(
+  onabort onafterprint onbeforeprint onbeforeunload onblur oncanplay oncanplaythrough onchange onclick oncontextmenu
+  oncopy oncuechange oncut ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop
+  ondurationchange onemptied onended onerror onfocus onhashchange oninput oninvalid onkeydown onkeypress onkeyup onload
+  onloadeddata onloadedmetadata onloadstart onmessage onmousedown onmousemove onmouseout onmouseover onmouseup
+  onmousewheel onoffline ononline onpagehide onpageshow onpaste onpause onplay onplaying onpopstate onprogress
+  onratechange onreset onresize onscroll onsearch onseeked onseeking onselect onshow onstalled onstorage onsubmit
+  onsuspend ontimeupdate ontoggle onunload onvolumechange onwaiting onwheel
+);
+
+my %score;
+
+sub wanted {
+  my $name = $File::Find::name;
+
+  return unless /\.html\.tmpl$/;
+  return unless -f $name;
+  open my $fh, '<', $name or return;
+  my $data = do { local $/ = undef; scalar <$fh> };
+  close $fh;
+
+  my $tt_parser = gen_extract_tagged("\\[%", "%\\]", undef, {bad => ["\\[%"]});
+  my @tt_matches = extract_multiple($data, [$tt_parser]);
+
+  my $found_tt_javascript  = 0;
+  my $found_tt_onload      = 0;
+  my $found_script_content = 0;
+  my @found_event_attr;
+  foreach my $match (@tt_matches) {
+    if ($match =~ /^\[%/) {
+      if ($match =~ /javascript\s+=\s+/) {
+        $found_tt_javascript = 1;
+        $score{$name}++;
+      }
+      elsif ($match =~ /onload\s*=/) {
+        $found_tt_onload = 1;
+        $score{$name}++;
+      }
+    }
+    else {
+      foreach my $event_attr (@event_attrs) {
+        if ($match =~ /\Q$event_attr\E\s*=\s*['"]/s) {
+          push @found_event_attr, $event_attr;
+          $score{$name}++;
+        }
+      }
+      my $tag_parser = gen_extract_tagged();
+      while (my @tag = $tag_parser->($match)) {
+        last unless defined $tag[0];
+
+        if ($tag[3] && $tag[3] =~ /<script/) {
+          if ($tag[4]) {
+            $score{$name}++;
+            $found_script_content = 1;
+          }
+        }
+
+      }
+    }
+  }
+
+  my $found_javascript_link = $data =~ /javascript:\S/;
+  $score{$name}++ if $found_javascript_link;
+
+  my $found_problems
+    = $found_tt_javascript
+    || $found_tt_onload
+    || @found_event_attr
+    || $found_script_content
+    || $found_javascript_link;
+  ok(!$found_problems, "checking $name");
+  if ($found_problems) {
+    my $msg = "problems:\n";
+    $msg .= "  found javascript tt var\n" if $found_tt_javascript;
+    $msg .= "  found onload tt var\n"     if $found_tt_onload;
+    $msg .= "  found event attributes: " . join(", ", @found_event_attr) . "\n"
+      if @found_event_attr;
+    $msg .= "  found script content\n"   if $found_script_content;
+    $msg .= "  found javascript: link\n" if $found_javascript_link;
+    diag $msg;
+  }
+}
+
+sub check_for_javascript {
+  my ($block) = @_;
+  diag $block;
+  return '';
+}
+
+diag @include_paths;
+find({no_chdir => 1, wanted => \&wanted}, @include_paths);
+
+# print out a json file so we can see how bad we're doing.
+if (my $score_file = $ENV{CSP_SCORE_FILE}) {
+  require JSON::XS;
+  diag "writing scores to $score_file";
+  open my $score_fh, '>', $score_file;
+  print $score_fh JSON::XS->new->pretty->canonical(1)->encode(\%score);
+  close $score_fh;
+}
+
+done_testing();
diff --git a/t/100markdown.t b/t/100markdown.t
new file mode 100644
index 0000000000..8fd6c92603
--- /dev/null
+++ b/t/100markdown.t
@@ -0,0 +1,96 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# Enforce high standards against code that will be installed
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5 t);
+use Test2::Tools::Mock;
+use Test::More;
+use Bugzilla::Util;
+
+BEGIN {
+  my $terms = {
+    "bug"               => "bug",
+    "Bug"               => "Bug",
+    "abug"              => "a bug",
+    "Abug"              => "A bug",
+    "aBug"              => "a Bug",
+    "ABug"              => "A Bug",
+    "bugs"              => "bugs",
+    "Bugs"              => "Bugs",
+    "comment"           => "comment",
+    "comments"          => "comments",
+    "zeroSearchResults" => "Zarro Boogs found",
+    "Bugzilla"          => "Bugzilla"
+  };
+  no warnings 'redefine', 'once';
+  *Bugzilla::Util::template_var = sub {
+    my $name = shift;
+    if ($name eq 'terms') {
+      return $terms;
+    }
+    else {
+      die "sorry!";
+    }
+  };
+}
+use Bugzilla;
+use Bugzilla::Constants;
+use Bugzilla::Bug;
+use Bugzilla::Comment;
+use Bugzilla::User;
+use Bugzilla::Markdown;
+use Bugzilla::Util;
+use File::Basename;
+
+Bugzilla->usage_mode(USAGE_MODE_TEST);
+Bugzilla->error_mode(ERROR_MODE_DIE);
+
+my $user_mock
+  = mock 'Bugzilla::User' => (override_constructor => ['new', 'hash'],);
+
+my $comment_mock
+  = mock 'Bugzilla::Comment' => (add_constructor => ['new', 'hash'],);
+
+my $bug_mock
+  = mock 'Bugzilla::Bug' => (override_constructor => ['new', 'hash'],);
+
+# mocked objects just take all constructor args and put them into the hash.
+my $user = Bugzilla::User->new(
+  userid   => 33,
+  settings => {use_markdown => {is_enabled => 1, value => 'on'}},
+);
+my $bug = Bugzilla::Bug->new(bug_id => 666);
+my $comment = Bugzilla::Comment->new(already_wrapped => 0);
+
+Bugzilla->set_user($user);
+
+my @testfiles = glob("t/markdown/*.md");
+
+plan(tests => scalar(@testfiles) + 1);
+
+my $markdown = Bugzilla::Markdown->new();
+ok($markdown, "got a new markdown object");
+
+foreach my $testfile (@testfiles) {
+  my $data = read_text($testfile);
+
+  my ($markdown_text, $expected_html) = split(/---/, $data);
+  $markdown_text = trim($markdown_text);
+  $expected_html = trim($expected_html);
+
+  my $actual_html = $markdown->markdown($markdown_text, $bug, $comment);
+  $actual_html = trim($actual_html);
+
+  is($actual_html, $expected_html, basename($testfile));
+}
+
+done_testing();
diff --git a/t/Support/Files.pm b/t/Support/Files.pm
index 85fa9f5839..2c7f78e0f5 100644
--- a/t/Support/Files.pm
+++ b/t/Support/Files.pm
@@ -8,7 +8,7 @@
 
 package Support::Files;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
@@ -17,40 +17,40 @@ use File::Find;
 our @additional_files = ();
 
 our @files = glob('*');
-find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, 'Bugzilla');
-push(@files, 'extensions/create.pl');
+find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/; },
+  qw(Bugzilla docs));
+push(@files, 'extensions/create.pl', 'docs/makedocs.pl', 'cpanfile');
 
-our @extensions =
-    grep { $_ ne 'extensions/create.pl' && ! -e "$_/disabled" }
-    glob('extensions/*');
+our @extensions = grep { $_ ne 'extensions/create.pl' && !-e "$_/disabled" }
+  glob('extensions/*');
 
 foreach my $extension (@extensions) {
-    find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/;}, $extension);
+  find(sub { push(@files, $File::Find::name) if $_ =~ /\.pm$/; }, $extension);
 }
 
-our @test_files = glob('t/*.t');
+our @test_files = glob('t/*.t xt/*/*.t');
 
 sub isTestingFile {
-    my ($file) = @_;
-    my $exclude;
-
-    if ($file =~ /\.cgi$|\.pl$|\.pm$/) {
-        return 1;
-    }
-    my $additional;
-    foreach $additional (@additional_files) {
-        if ($file eq $additional) { return 1; }
-    }
-    return undef;
+  my ($file) = @_;
+  my $exclude;
+
+  if ($file =~ /\.psgi$|\.cgi$|\.pl$|\.pm$/) {
+    return 1;
+  }
+  my $additional;
+  foreach $additional (@additional_files) {
+    if ($file eq $additional) { return 1; }
+  }
+  return undef;
 }
 
 our (@testitems, @module_files);
 
 foreach my $currentfile (@files) {
-    if (isTestingFile($currentfile)) {
-        push(@testitems, $currentfile);
-    }
-    push(@module_files, $currentfile) if $currentfile =~ /\.pm$/;
+  if (isTestingFile($currentfile)) {
+    push(@testitems, $currentfile);
+  }
+  push(@module_files, $currentfile) if $currentfile =~ /\.pm$/;
 }
 
 
diff --git a/t/Support/Systemexec.pm b/t/Support/Systemexec.pm
index 65be229e3c..c3cf5a21b1 100644
--- a/t/Support/Systemexec.pm
+++ b/t/Support/Systemexec.pm
@@ -7,18 +7,19 @@
 
 package Support::Systemexec;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(system exec);
-@EXPORT_OK = qw();
+use parent qw(Exporter);
+@Support::Systemexec::EXPORT = qw(system exec);
+
 sub system($$@) {
   1;
 }
+
 sub exec($$@) {
   1;
 }
+
 1;
diff --git a/t/Support/Templates.pm b/t/Support/Templates.pm
index d17c7334b7..ca5b62040b 100644
--- a/t/Support/Templates.pm
+++ b/t/Support/Templates.pm
@@ -7,15 +7,15 @@
 
 package Support::Templates;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 use lib 't';
 use parent qw(Exporter);
-@Support::Templates::EXPORT =
-    qw(@languages @include_paths @english_default_include_paths
-       @referenced_files %actual_files $num_actual_files);
+@Support::Templates::EXPORT
+  = qw(@languages @include_paths @english_default_include_paths
+  @referenced_files %actual_files $num_actual_files);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -26,15 +26,15 @@ use File::Find;
 use File::Spec;
 
 # English default include paths
-our @english_default_include_paths =
-    (File::Spec->catdir(bz_locations()->{'templatedir'}, 'en', 'default'));
+our @english_default_include_paths
+  = (File::Spec->catdir(bz_locations()->{'templatedir'}, 'en', 'default'));
 
 # And the extensions too
 foreach my $extension (@Support::Files::extensions) {
-    my $dir = File::Spec->catdir($extension, 'template', 'en', 'default');
-    if (-e $dir) {
-        push @english_default_include_paths, $dir;
-    }
+  my $dir = File::Spec->catdir($extension, 'template', 'en', 'default');
+  if (-e $dir) {
+    push @english_default_include_paths, $dir;
+  }
 }
 
 # Files which are referenced in the cgi files
@@ -47,37 +47,39 @@ our %actual_files = ();
 our $num_actual_files = 0;
 
 # Set the template available languages and include paths
-our @languages = @{ Bugzilla->languages };
-our @include_paths = @{ template_include_path({ language => Bugzilla->languages }) };
+our @languages = @{Bugzilla->languages};
+our @include_paths
+  = @{template_include_path({language => Bugzilla->languages})};
 
 our @files;
 
 # Local subroutine used with File::Find
 sub find_templates {
-    # Prune CVS directories
-    if (-d $_ && $_ eq 'CVS') {
-        $File::Find::prune = 1;
-        return;
-    }
 
-    # Only include files ending in '.tmpl'
-    if (-f $_ && $_ =~ m/\.tmpl$/i) {
-        my $filename;
-        my $local_dir = File::Spec->abs2rel($File::Find::dir,
-                                            $File::Find::topdir);
+  # Prune CVS directories
+  if (-d $_ && $_ eq 'CVS') {
+    $File::Find::prune = 1;
+    return;
+  }
 
-        # File::Spec 3.13 and newer return "." instead of "" if both
-        # arguments of abs2rel() are identical.
-        $local_dir = "" if ($local_dir eq ".");
+  # Only include files ending in '.tmpl'
+  if (-f $_ && $_ =~ m/\.tmpl$/i) {
+    my $filename;
+    my $local_dir = File::Spec->abs2rel($File::Find::dir, $File::Find::topdir);
 
-        if ($local_dir) {
-            $filename = File::Spec->catfile($local_dir, $_);
-        } else {
-            $filename = $_;
-        }
+    # File::Spec 3.13 and newer return "." instead of "" if both
+    # arguments of abs2rel() are identical.
+    $local_dir = "" if ($local_dir eq ".");
 
-        push(@files, $filename);
+    if ($local_dir) {
+      $filename = File::Spec->catfile($local_dir, $_);
     }
+    else {
+      $filename = $_;
+    }
+
+    push(@files, $filename);
+  }
 }
 
 # Scan the given template include path for templates
@@ -90,7 +92,7 @@ sub find_actual_files {
 
 
 foreach my $include_path (@include_paths) {
-  $actual_files{$include_path} = [ find_actual_files($include_path) ];
+  $actual_files{$include_path} = [find_actual_files($include_path)];
   $num_actual_files += scalar(@{$actual_files{$include_path}});
 }
 
@@ -99,20 +101,21 @@ foreach my $include_path (@include_paths) {
 my %seen;
 
 foreach my $file (@Support::Files::testitems) {
-    open (FILE, $file);
-    my @lines = <FILE>;
-    close (FILE);
-    foreach my $line (@lines) {
-        if ($line =~ m/template->process\(\"(.+?)\", .+?\)/) {
-            my $template = $1;
-            # Ignore templates with $ in the name, since they're
-            # probably vars, not real files
-            next if $template =~ m/\$/;
-            next if $seen{$template};
-            push (@referenced_files, $template);
-            $seen{$template} = 1;
-        }
+  open(FILE, $file);
+  my @lines = <FILE>;
+  close(FILE);
+  foreach my $line (@lines) {
+    if ($line =~ m/template->process\(\"(.+?)\", .+?\)/) {
+      my $template = $1;
+
+      # Ignore templates with $ in the name, since they're
+      # probably vars, not real files
+      next if $template =~ m/\$/;
+      next if $seen{$template};
+      push(@referenced_files, $template);
+      $seen{$template} = 1;
     }
+  }
 }
 
 1;
diff --git a/t/critic-core.ini b/t/critic-core.ini
new file mode 100644
index 0000000000..308af6c698
--- /dev/null
+++ b/t/critic-core.ini
@@ -0,0 +1,86 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# This is the Perl::Critic policy file for Bugzilla.
+#
+# The general rule here is to only add one rule at a time to this file,
+# and generally only in situations where we will not generate many false
+# positives (requiring spammy # no critic entries) and where we will not
+# generate cargo cult behaviour in contributors.
+
+# start with very low requirements, should me moved to 4 soon
+severity = 5
+
+# Policies that are currently not implemented in the code
+# these should be fixed and removed from here one by one
+[-Subroutines::ProhibitExplicitReturnUndef]
+[-ValuesAndExpressions::ProhibitLeadingZeros]
+[-InputOutput::ProhibitTwoArgOpen]
+[-InputOutput::ProhibitBarewordFileHandles]
+[Variables::RequireLexicalLoopIterators]
+[-BuiltinFunctions::RequireGlobFunction]
+[-Variables::ProhibitConditionalDeclarations]
+[-Subroutines::ProhibitReturnSort]
+[-TestingAndDebugging::ProhibitNoStrict]
+
+# we can deal with this later.
+[-Subroutines::ProhibitSubroutinePrototypes]
+
+[-Subroutines::ProhibitNestedSubs]
+[-ControlStructures::ProhibitMutatingListFunctions]
+[-InputOutput::ProhibitInteractiveTest]
+[BuiltinFunctions::ProhibitBooleanGrep]
+severity = 5
+
+[InputOutput::RequireEncodingWithUTF8Layer]
+severity = 3
+
+
+######################################################################
+# Disabling critic sucks, configure a better policy
+
+[Miscellanea::ProhibitUnrestrictedNoCritic]
+severity = 5
+
+[Miscellanea::ProhibitUselessNoCritic]
+severity = 5
+
+
+
+
+
+######################################################################
+# Temporarily downgraded as the noise obscures more important tests
+[Subroutines::RequireFinalReturn]
+severity = 3
+
+[Subroutines::RequireArgUnpacking]
+severity = 3
+
+[Subroutines::ProhibitBuiltinHomonyms]
+severity = 3
+
+[Modules::ProhibitAutomaticExportation]
+severity = 3
+
+
+
+
+
+######################################################################
+# Policies that Bugzilla disagrees with or tolerates as worth the risk
+
+[-BuiltinFunctions::ProhibitStringyEval]
+#[-ClassHierarchies::ProhibitExplicitISA]
+[-CodeLayout::ProhibitHardTabs]
+#[-ControlStructures::ProhibitUnlessBlocks]
+#[-Subroutines::ProhibitExplicitReturnUndef]
+#[-TestingAndDebugging::ProhibitNoStrict]
+#[-TestingAndDebugging::ProhibitNoWarnings]
+#[-ValuesAndExpressions::ProhibitConstantPragma]
+#[-ValuesAndExpressions::ProhibitMixedBooleanOperators]
+#[-Variables::ProhibitPunctuationVars]
diff --git a/t/markdown/embedded-blockquote.md b/t/markdown/embedded-blockquote.md
new file mode 100644
index 0000000000..6c34434e98
--- /dev/null
+++ b/t/markdown/embedded-blockquote.md
@@ -0,0 +1,9 @@
+```
+this is a block
+> with an embedded blockquote
+```
+
+---
+
+<pre><code>this is a block
+&gt; with an embedded blockquote</code></pre>
diff --git a/t/markdown/embedded-underscore.md b/t/markdown/embedded-underscore.md
new file mode 100644
index 0000000000..15093cccf1
--- /dev/null
+++ b/t/markdown/embedded-underscore.md
@@ -0,0 +1,19 @@
+<lib>_foo_bar.c
+<lib>_foo_bar_baz.c
+<prefix>_bar.c and <prefix>_bif.c
+hello_bar.c and there_bif.c
+
+var this__is_a_variable__ = "";
+
+__this is not__
+
+---
+
+<p>&lt;lib&gt;_foo_bar.c<br>
+&lt;lib&gt;_foo_bar_baz.c<br>
+&lt;prefix&gt;_bar.c and &lt;prefix&gt;_bif.c<br>
+hello_bar.c and there_bif.c</p>
+
+<p>var this__is_a_variable__ = &quot;&quot;;</p>
+
+<p><strong>this is not</strong></p>
diff --git a/taskgraph.json b/taskgraph.json
new file mode 100644
index 0000000000..287a11d990
--- /dev/null
+++ b/taskgraph.json
@@ -0,0 +1,355 @@
+{
+  "metadata": {
+    "name": "Bugzilla Task Graph",
+    "description": "A suite of tests to check the quality of the Bugzilla codebase.",
+    "owner": "dlawrence@mozilla.com",
+    "source": "https://raw.githubusercontent.com/bugzilla/bugzilla/master/taskgraph.json"
+  },
+  "tasks": [
+    {
+      "reruns": 3,
+      "maxRunTime": 3000,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "Basic Sanity Tests"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "TEST_SUITE": "sanity"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "San",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 3000,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "Documentation Build Test"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "TEST_SUITE": "docs"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "Doc",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 7200,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "WebService API Tests (MySQL)"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "TEST_SUITE": "webservices"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/httpd_error_log": {
+              "type": "file",
+              "path": "/var/log/httpd/error_log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "API",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 7200,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "Selenium Tests (MySQL)"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "TEST_SUITE": "selenium"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/httpd_error_log": {
+              "type": "file",
+              "path": "/var/log/httpd/error_log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/selenium_log": {
+              "type": "file",
+              "path": "/tmp/selenium.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "Sel",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 7200,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "WebService API Tests (Pg)"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "BUGS_DB_DRIVER": "pg",
+            "TEST_SUITE": "webservices"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/httpd_error_log": {
+              "type": "file",
+              "path": "/var/log/httpd/error_log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "API-Pg",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 7200,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "Selenium Tests (Pg)"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "BUGS_DB_DRIVER": "pg",
+            "TEST_SUITE": "selenium"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/httpd_error_log": {
+              "type": "file",
+              "path": "/var/log/httpd/error_log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/selenium_log": {
+              "type": "file",
+              "path": "/tmp/selenium.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "Sel-Pg",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 7200,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "WebService API Tests (Sqlite)"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "BUGS_DB_DRIVER": "sqlite",
+            "TEST_SUITE": "webservices"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/httpd_error_log": {
+              "type": "file",
+              "path": "/var/log/httpd/error_log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "API-Sqlite",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    },
+    {
+      "reruns": 3,
+      "maxRunTime": 7200,
+      "task": {
+        "expires": "2018-02-18T17:33:38.806Z",
+        "metadata": {
+          "name": "Selenium Tests (Sqlite)"
+        },
+        "provisionerId": "aws-provisioner-v1",
+        "workerType": "b2gtest",
+        "payload": {
+          "image": "bugzilla/bugzilla-ci",
+          "command": ["runtests.sh"],
+          "env": {
+            "BUGS_DB_DRIVER": "sqlite",
+            "TEST_SUITE": "selenium"
+          },
+          "artifacts": {
+            "public/runtests_log": {
+              "type": "file",
+              "path": "/tmp/runtests.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/httpd_error_log": {
+              "type": "file",
+              "path": "/var/log/httpd/error_log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            },
+            "public/selenium_log": {
+              "type": "file",
+              "path": "/tmp/selenium.log",
+              "expires": "2018-02-17T17:33:38.806Z"
+            }
+          }
+        },
+        "extra": {
+          "treeherder": {
+            "symbol": "Sel-Sqlite",
+            "machine": {
+                "platform": "linux64"
+            },
+            "build": {
+                "platform": "linux64"
+            }
+          }
+        }
+      }
+    }
+  ]
+}
diff --git a/template/en/default/account/auth/delegation.html.tmpl b/template/en/default/account/auth/delegation.html.tmpl
new file mode 100644
index 0000000000..2afdf1dc78
--- /dev/null
+++ b/template/en/default/account/auth/delegation.html.tmpl
@@ -0,0 +1,37 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% PROCESS global/header.html.tmpl
+   title = "Auth Delegation Request" %]
+
+<h1>[% title FILTER html %] </h1>
+<p>
+  A third-party website (<a href="[% callback_base FILTER html %]">[% callback_base FILTER html %]</a>)
+    would like to have <strong>complete</strong> access to your [% terms.Bugzilla %] account.
+</p>
+
+<p>The description of the site reads:
+  <blockquote>
+    [% description FILTER html %]
+  </blockquote>
+</p>
+
+<p>Do you want this website to have <strong>complete</strong> access to your [% terms.Bugzilla %]
+  account?</p>
+
+<div>
+  <form action="auth.cgi" method="post">
+    <input type="hidden" name="confirm"     value="1">
+    <input type="hidden" name="callback"    value="[% callback FILTER html %]">
+    <input type="hidden" name="description" value="[% description FILTER html %]">
+    <input type="hidden" name="token"       value="[% token FILTER html %]">
+    <input type="submit" name="submit"      value="Accept">
+  </form>
+</div>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl
index 790c135bfa..5536d306a3 100644
--- a/template/en/default/account/auth/login-small.html.tmpl
+++ b/template/en/default/account/auth/login-small.html.tmpl
@@ -20,21 +20,19 @@
 <li id="mini_login_container[% qs_suffix %]">
   <span class="separator">| </span>
   [% connector = "?" %]
-  [% IF cgi.request_method == "GET" AND cgi.query_string %]
+  [% IF cgi.query_string %]
     [% connector = "&" %]
   [% END %]
   [% script_url = login_target _ connector _ "GoAheadAndLogIn=1" %]
   <a id="login_link[% qs_suffix %]" href="[% script_url FILTER html %]"
      onclick="return show_mini_login_form('[% qs_suffix %]')">Log In</a>
 
-  [% Hook.process('additional_methods') %]
-
   <form action="[% login_target FILTER html %]" method="POST"
         class="mini_login bz_default_hidden"
         id="mini_login[% qs_suffix FILTER html %]">
     <input id="Bugzilla_login[% qs_suffix FILTER html %]" required
            name="Bugzilla_login" class="bz_login"
-      [% IF Param('emailsuffix') %]
+      [% IF login_not_email %]
         placeholder="Login"
       [% ELSE %]
         type="email" placeholder="Email Address"
@@ -56,24 +54,25 @@
     <a href="#" onclick="return hide_mini_login_form('[% qs_suffix %]')">[x]</a>
   </form>
 </li>
-<li id="forgot_container[% qs_suffix %]">
-  <span class="separator">| </span>
-  <a id="forgot_link[% qs_suffix %]" href="[% script_url FILTER html %]#forgot"
-     onclick="return show_forgot_form('[% qs_suffix %]')">Forgot Password</a>
-  <form action="token.cgi" method="post" id="forgot_form[% qs_suffix %]"
-        class="mini_forgot bz_default_hidden">
-    <label for="login[% qs_suffix FILTER html %]">Login:</label>
-    <input name="loginname" size="20" id="login[% qs_suffix FILTER html %]" required
-      [% IF Param('emailsuffix') %]
-        placeholder="Your Login"
-      [% ELSE %]
-        type="email" placeholder="Your Email Address"
-      [% END %]>
-    <input id="forgot_button[% qs_suffix %]" value="Reset Password" 
-           type="submit">
-    <input type="hidden" name="a" value="reqpw">
-    <input type="hidden" id="token[% qs_suffix FILTER html %]" name="token"
-           value="[% issue_hash_token(['reqpw']) FILTER html %]">
-    <a href="#" onclick="return hide_forgot_form('[% qs_suffix %]')">[x]</a>
-  </form>
-</li>
+
+[% Hook.process('additional_methods') %]
+
+[% IF user.authorizer.can_change_password %]
+  <li id="forgot_container[% qs_suffix %]">
+    <span class="separator">| </span>
+    <a id="forgot_link[% qs_suffix %]" href="createaccount.cgi?request_new_password=1"
+       onclick="return show_forgot_form('[% qs_suffix %]')">Forgot Password</a>
+    <form action="token.cgi" method="post" id="forgot_form[% qs_suffix %]"
+          class="mini_forgot bz_default_hidden">
+      <label for="login[% qs_suffix FILTER html %]">Login:</label>
+      <input name="email" size="20" id="login[% qs_suffix FILTER html %]" required
+             type="email" placeholder="Your Email Address">
+      <input id="forgot_button[% qs_suffix %]" value="Reset Password"
+             type="submit">
+      <input type="hidden" name="a" value="reqpw">
+      <input type="hidden" id="token[% qs_suffix FILTER html %]" name="token"
+             value="[% issue_hash_token(['reqpw']) FILTER html %]">
+      <a href="#" onclick="return hide_forgot_form('[% qs_suffix %]')">[x]</a>
+    </form>
+  </li>
+[% END %]
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl
index 0af84542d3..ac0fbcb995 100644
--- a/template/en/default/account/auth/login.html.tmpl
+++ b/template/en/default/account/auth/login.html.tmpl
@@ -20,57 +20,66 @@
 
 [% USE Bugzilla %]
 
-<p>
-  [% terms.Bugzilla %] needs a legitimate login and password to continue.
-</p>
+<h2 class="center">
+  [% terms.Bugzilla %] needs a legitimate login and password to continue
+</h2>
 
-<form name="login" action="[% urlbase FILTER html %][% target FILTER html %]" method="POST"
-[%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]>
+<form id="login_form" name="login" action="[% urlbase FILTER html %][% target FILTER html %]"
+      method="POST" [% IF cgi_param("data") %] enctype="multipart/form-data"[% END %]>
   <table>
     <tr>
       <th>
         <label for="Bugzilla_login">
-          [% IF Param('emailsuffix') %]
+          [% IF login_not_email %]
             Login:
           [% ELSE %]
-            Your Email Address:
+            Email&nbsp;Address:
           [% END %]
         </label>
       </th>
       <td>
-        <input size="35" id="Bugzilla_login" name="Bugzilla_login"
-               [%- ' type="email"' UNLESS Param('emailsuffix') %] autofocus required>
-        [% Param('emailsuffix') FILTER html %]
+        <input id="Bugzilla_login" name="Bugzilla_login"
+               [%- ' type="email"' UNLESS login_not_email %] autofocus required>
       </td>
     </tr>
+
     <tr>
       <th><label for="Bugzilla_password">Password:</label></th>
       <td>
-        <input type="password" size="35" id="Bugzilla_password" name="Bugzilla_password" required>
+        <input type="password" id="Bugzilla_password" name="Bugzilla_password" required>
       </td>
     </tr>
 
     [% IF Param('rememberlogin') == 'defaulton' || 
           Param('rememberlogin') == 'defaultoff' %]
       <tr>
-        <th>&nbsp;</th>
-        <td>
+        <th>
           <input type="checkbox" id="Bugzilla_remember" name="Bugzilla_remember" value="on"
                  [%+ "checked" IF Param('rememberlogin') == "defaulton" %]>
-          <label for="Bugzilla_remember">Remember my Login</label>
+        </th>
+        <td>
+          <label for="Bugzilla_remember">Remember my login</label>
         </td>
       </tr>
     [% END %]
 
     <tr>
-      <th>&nbsp;</th>
-      <td>
+      <th>
         <input type="checkbox" id="Bugzilla_restrictlogin" name="Bugzilla_restrictlogin"
                checked="checked">
+      </th>
+      <td>
         <label for="Bugzilla_restrictlogin">Restrict this session to this IP address
         (using this option improves security)</label>
       </td>
     </tr>
+
+    <tr>
+      <th>&nbsp;</th>
+      <td>
+        <input type="submit" name="GoAheadAndLogIn" value="Log In" id="log_in">
+      </td>
+    </tr>
   </table>
 
   [% PROCESS "global/hidden-fields.html.tmpl"
@@ -78,49 +87,42 @@
 
   <input type="hidden" name="Bugzilla_login_token"
          value="[% get_login_request_token() FILTER html %]">
-  <input type="submit" name="GoAheadAndLogIn" value="Log in" id="log_in">
 
-  <p>
-    (Note: you should make sure cookies are enabled for this site. 
-    Otherwise, you will be required to log in frequently.)
-  </p>
-</form>
-
-[% Hook.process('additional_methods') %]
+  [% Hook.process('additional_methods') %]
 
-[%# Allow the user to create a new account, or request a token to change
-  # their password, assuming that our auth method allows that.
-  #%]
+  <div class="links">
+    [% can_create_account = 0 %]
+    [% IF Param("createemailregexp") && user.authorizer.user_can_create_account %]
+      <span><a href="createaccount.cgi">Create a New Account</a></span>
+      [% can_create_account = 1 %]
+    [% END %]
 
-  [% IF Param("createemailregexp") && user.authorizer.user_can_create_account %]
-    <hr>
+    [% IF user.authorizer.can_change_password %]
+      [% "|" IF can_create_account %]
+      <span><a href="createaccount.cgi?request_new_password=1">Forgot Password</a></span>
+    [% END %]
+  </div>
 
+  <hr>
+  <div class="info">
     <p>
-      If you don't have a [% terms.Bugzilla %] account, you can
-      <a href="createaccount.cgi">create a new account</a>.
-      [% IF Param("requirelogin") %]
-        A user account is required because this Bugzilla
-        installation is only accessible to authenticated users.
-      [% ELSIF target.match("_bug\.cgi$") %]
-        A user account is required to file a new [% terms.bug %] or to comment
-        into existing ones so that you can be contacted if more information is
-        needed.
-      [% END %]
+      Note: you should make sure cookies are enabled for this site. 
+      Otherwise, you will be required to log in frequently.
     </p>
-  [% END %]
-
-  [% IF user.authorizer.can_change_password %]
-    <hr>
-
-    <form id="forgot" method="get" action="token.cgi">
-      <input type="hidden" name="a" value="reqpw">
-      If you have an account, but have forgotten your password,
-      enter your login name below and submit a request
-      to change your password.<br>
-      <input size="35" name="loginname" required>
-      <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]">
-      <input type="submit" id="request" value="Reset Password">
-    </form>
-  [% END %]
+
+    [% IF can_create_account %]
+      <p>
+        [% IF Param("requirelogin") %]
+          A user account is required because this Bugzilla
+          installation is only accessible to authenticated users.
+        [% ELSIF target.match("_bug\.cgi$") %]
+          A user account is required to file a new [% terms.bug %] or to comment
+          into existing ones so that you can be contacted if more information is
+          needed.
+        [% END %]
+      </p>
+    [% END %]
+  </div>
+</form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/account/cancel-token.txt.tmpl b/template/en/default/account/cancel-token.txt.tmpl
index 384f2cfe09..46e0584351 100644
--- a/template/en/default/account/cancel-token.txt.tmpl
+++ b/template/en/default/account/cancel-token.txt.tmpl
@@ -21,7 +21,7 @@ to [% Param('maintainer') %] if you suspect foul play.
 
             Token: [% token %]
        Token Type: [% tokentype %]
-             User: [% emailaddress %]
+             User: [% login %]
        Issue Date: [% issuedate FILTER time("%Y-%m-%d %H:%M:%S %Z", timezone) %]
        Event Data: [% eventdata %]
 Canceled Because: [% PROCESS cancelactionmessage %]
diff --git a/template/en/default/account/create.html.tmpl b/template/en/default/account/create.html.tmpl
index 5711a726f3..e67848beb9 100644
--- a/template/en/default/account/create.html.tmpl
+++ b/template/en/default/account/create.html.tmpl
@@ -6,25 +6,16 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[%# INTERFACE
-  # none
-  # 
-  # Param("maintainer") is used to display the maintainer's email.
-  # Param("emailsuffix") is used to pre-fill the email field.
-  #%]
-
 [% PROCESS global/header.html.tmpl
            title = "Create a new $terms.Bugzilla account"
 %]
 
 <p>
   To create a [% terms.Bugzilla %] account, all you need to do is to enter
-[% IF Param('emailsuffix') == '' %]
+  [% IF !Param('use_email_as_login') %]
+    a login name of your choice and
+  [% END %]
   a legitimate email address.
-[% ELSE %]
-  an account name which when combined with [% Param('emailsuffix') %]
-  corresponds to an address where you receive email.
-[% END %]
   You will receive an email at this address to confirm the creation of your
   account. <b>You will not be able to log in until you receive the email.</b>
   If it doesn't arrive within a reasonable amount of time, you may contact
@@ -32,50 +23,66 @@
   at <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>.
 </p>
 
-[% IF Param('allowemailchange') %]
 <p>
   If you already have an account and want to change your
-  [% IF Param('emailsuffix') == '' %]
-    email address,
-  [% ELSE %]
-    login name,
+  [% IF Param('allowemailchange') %]
+    email address or
   [% END %]
-  you can change it from the Preferences page after logging in.
+  login name, you can change it from the Preferences page after logging in.
 </p>
-[% END %]
 
 <p>
   A user account is required to report new [% terms.bugs %] or to comment into
   existing ones, as you may be contacted for more information if needed.
   This also lets other users clearly identify who is the author of comments
   or changes made into [% terms.bugs %]. <b>Note that your email address will
-  <em>never</em> be displayed to logged out users. Only registered users will be
-  able to see it.</b>
+  <em>never</em> be displayed to
+  [% IF Param('use_email_as_login') %]
+    logged out users. Only registered users will be able to see it.</b>
+  [% ELSE %]
+    other users, unless you decide to use your email address as login. Only
+    your login is visible to other users.</b>
+  [% END %]
 </p>
 
-[% IF Param('createemailregexp') == '.*' && Param('emailsuffix') == '' %]
+[% IF Param('createemailregexp') == '.*' %]
 <p>
   <b>PRIVACY NOTICE:</b> [% terms.Bugzilla %] is an open [% terms.bug %]
-  tracking system. Activity on most [% terms.bugs %], including email
-  addresses, will be visible to registered users. We <b>recommend</b> using a
-  secondary account or free web email service (such as Gmail, Yahoo,
-  Hotmail, or similar) to avoid receiving spam at your primary email address.
+  tracking system. Activity on most [% terms.bugs %] will be visible to
+  registered users.
+  [% IF Param('use_email_as_login') %]
+    That includes email addresses. We <b>recommend</b> using a
+    secondary account or free web email service (such as Gmail, Yahoo,
+    Hotmail, or similar) to avoid receiving spam at your primary email address.
+  [% END %]
 </p>
 [% END %]
 
-<form id="account_creation_form" method="get" action="createaccount.cgi">
-  <span class="label">
-    [% IF Param('emailsuffix') %]
-      Login:
-    [% ELSE %]
-      Email address:
-    [% END %]
-  </span>
-  <input size="35" id="login" name="login" autofocus
-         [%- ' type="email"' UNLESS Param('emailsuffix') %] required>
-  [% Param('emailsuffix') FILTER html %]
-  <input type="hidden" id="token" name="token" value="[% issue_hash_token(['create_account']) FILTER html %]">
-  <input type="submit" id="send" value="Send">
+<form id="account_creation_form" action="createaccount.cgi" class="table_layout">
+  [% IF !Param('use_email_as_login') %]
+    <div>
+      <label for="login">Login</label>
+      <div class="flex">
+        <input size="35" id="login" name="login" autofocus required>
+        <span class="bz_info">
+          (no whitespaces and no @ character, unless it matches your email address)
+        </span>
+      </div>
+    </div>
+  [% END %]
+
+  <div>
+    <label for="email">Email Address</label>
+    <input size="35" id="email" name="email" type="email"
+           [%~ " autofocus" IF Param('use_email_as_login') %] required>
+  </div>
+
+  <div>
+    <label>&nbsp;</label>
+    <input type="hidden" id="token" name="token"
+           value="[% issue_hash_token(['create_account']) FILTER html %]">
+    <input type="submit" id="send" value="Send">
+  </div>
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/account/created.html.tmpl b/template/en/default/account/created.html.tmpl
index f35deca831..f87571936b 100644
--- a/template/en/default/account/created.html.tmpl
+++ b/template/en/default/account/created.html.tmpl
@@ -7,7 +7,8 @@
   #%]
 
 [%# INTERFACE:
-  # login: string. The user's Bugzilla login email address.
+  # login: string. The user's Bugzilla login.
+  # email: string. The user's Bugzilla email address.
   #%]
 
 [% title = BLOCK %]
@@ -17,9 +18,9 @@
 [% PROCESS global/header.html.tmpl title = title %]
 
 <p>
-  A confirmation email has been sent containing a link to continue
-  creating an account. The link will expire if an account is not
-  created within [% constants.MAX_TOKEN_AGE FILTER html %] days.
+  A confirmation email has been sent to <em>[% email FILTER html %]</em> containing
+  a link to continue creating an account. The link will expire if an account is
+  not created within [% constants.MAX_TOKEN_AGE FILTER html %] days.
 </p>
 
 [% PROCESS global/footer.html.tmpl %] 
diff --git a/template/en/default/account/email/change-new.txt.tmpl b/template/en/default/account/email/change-new.txt.tmpl
index a6c54a7731..f32abd80d4 100644
--- a/template/en/default/account/email/change-new.txt.tmpl
+++ b/template/en/default/account/email/change-new.txt.tmpl
@@ -7,12 +7,12 @@
   #%]
 
 From: [% Param('mailfrom') %]
-To: [% emailaddress %]
+To: [% newemailaddress %]
 Subject: [% terms.Bugzilla %] Change Email Address Request
 X-Bugzilla-Type: admin
 
 [%+ terms.Bugzilla %] has received a request to change the email address
-for the account [% oldemailaddress %] to your address.
+for the account [% user.email %] to your address.
 
 To confirm the change, visit the following link:
 
diff --git a/template/en/default/account/email/change-old.txt.tmpl b/template/en/default/account/email/change-old.txt.tmpl
index 24b90a2b0d..400004c5ac 100644
--- a/template/en/default/account/email/change-old.txt.tmpl
+++ b/template/en/default/account/email/change-old.txt.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 From: [% Param('mailfrom') %]
-To: [% emailaddress %]
+To: [% user.email %]
 Subject: [% terms.Bugzilla %] Change Email Address Request
 Importance: High
 X-MSMail-Priority: High
diff --git a/template/en/default/account/email/confirm-new.html.tmpl b/template/en/default/account/email/confirm-new.html.tmpl
index 3b98660040..87a1c6440d 100644
--- a/template/en/default/account/email/confirm-new.html.tmpl
+++ b/template/en/default/account/email/confirm-new.html.tmpl
@@ -9,26 +9,40 @@
 [%# INTERFACE:
   # token: string. The token to be used in the user account creation.
   # email: email address of the user account.
+  # login: login of the user account.
   # expiration_ts: expiration date of the token.
   #%]
 
-[% title = BLOCK %]Create a new user account for '[% email FILTER html %]'[% END %]
-[% PROCESS "global/header.html.tmpl"
-           title = title
-%]
+[% title = BLOCK %]Create a new user account for '[% login FILTER html %]'[% END %]
+[% PROCESS "global/header.html.tmpl" title = title %]
 
 [% password_complexity = Param('password_complexity') %]
 
 <p>
   To create your account, you must enter a password in the form below.
-  Your email address and Real Name (if provided) will be shown with
-  changes you make.
+  Your real name is optional, but recommended.
 </p>
 
 <form id="confirm_account_form" method="post" action="token.cgi">
   <input type="hidden" name="t" value="[% token FILTER html %]">
   <input type="hidden" name="a" value="confirm_new_account">
   <table>
+    [% IF !Param('use_email_as_login') %]
+      <tr>
+        <th>Login:</th>
+        <td>
+          [% IF login_already_in_use %]
+            <input id="login" name="login" required value="[% login FILTER html %]">
+            <span class="warning">
+              The login '[% login FILTER html %]' has been taken by another
+              user since you requested your account. Please choose another login.
+            </span>
+          [% ELSE %]
+            [% login FILTER html %]
+          [% END %]
+        </td>
+      </tr>
+    [% END %]
     <tr>
       <th>Email Address:</th>
       <td>[% email FILTER html %]</td>
diff --git a/template/en/default/account/email/request-new.txt.tmpl b/template/en/default/account/email/request-new.txt.tmpl
index 8ca0ff1222..b56bf4f79f 100644
--- a/template/en/default/account/email/request-new.txt.tmpl
+++ b/template/en/default/account/email/request-new.txt.tmpl
@@ -10,6 +10,7 @@
   # token: random string used to authenticate the transaction.
   # expiration_ts: expiration date of the token.
   # email: email address of the new account.
+  # login: login name of the new account.
   #%]
 
 From: [% Param('mailfrom') %]
@@ -18,7 +19,7 @@ Subject: [% terms.Bugzilla %]: confirm account creation
 X-Bugzilla-Type: admin
 
 [%+ terms.Bugzilla %] has received a request to create a user account
-using your email address ([% email %]).
+[%+ "($login)" IF !Param('use_email_as_login') %] using your email address ([% email %]).
 
 To continue creating an account using this email address, visit the 
 following link by [% expiration_ts FILTER time("%B %e, %Y at %H:%M %Z") %]:
@@ -31,11 +32,14 @@ again by going to:
 
 [%+ urlbase %]createaccount.cgi
 
-[% IF Param('createemailregexp') == '.*' && Param('emailsuffix') == '' %]
-PRIVACY NOTICE: [% terms.Bugzilla %] is an open [% terms.bug %] tracking system. Activity on most
-[%+ terms.bugs %], including email addresses, will be visible to the public. We recommend
-using a secondary account or free web email service (such as Gmail, Yahoo,
-Hotmail, or similar) to avoid receiving spam at your primary email address.
+[% IF Param('createemailregexp') == '.*' %]
+PRIVACY NOTICE: [% terms.Bugzilla %] is an open [% terms.bug %] tracking
+system. Activity on most [%+ terms.bugs %] will be visible to the public.
+[% IF Param('use_email_as_login') %]
+This includes email addresses. We recommend using a secondary account or free
+web email service (such as Gmail, Yahoo, Hotmail, or similar) to avoid
+receiving spam at your primary email address.
+[% END %]
 [% END %]
 
 If you do not wish to create an account, or if this request was made in
diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index af1df315ea..fcb3e0a008 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -7,92 +7,116 @@
   #%]
 
 [%# INTERFACE:
-  # realname: string. The user's real name, if any.
-  # login_change_date: string. The date the email change will be complete. (optional)
-  # new_login_name:    string. The user's new Bugzilla login whilst not confirmed. (optional)
+  # email_change_date: string. The date the email change will be complete. (optional)
+  # new_email:         string. The user's new email address whilst not confirmed. (optional)
   #%]
 
 <table>
   [% IF user.authorizer.can_change_password
-        || (user.authorizer.can_change_email && Param('allowemailchange')) %]
+        || (user.authorizer.can_change_email && Param('allowemailchange'))
+        ||  user.authorizer.can_change_login %]
     <tr>
-      <td colspan="3">
-        Please enter your existing password to confirm account changes.
+      <td colspan="2">
+        Please enter your current password to confirm any changes in this section.
       </td>
     </tr>
     <tr>
-      <th>Password:</th>
+      <th><label for="old_password">Password:</label></th>
       <td>
         <input type="hidden" name="old_login" value="[% user.login FILTER html %]">
-        <input type="password" name="old_password">
+        <input type="password" name="old_password" id="old_password">
       </td>
     </tr>
-    <tr>
-      <td colspan="2"><hr></td>
-    </tr>
   [% END %]
 
   [% IF user.authorizer.can_change_password %]
     <tr>
-      <th>New password:</th>
+      <th><label for="new_password1">New password:</label></th>
       <td>
-        <input type="password" name="new_password1">
+        <input type="password" name="new_password1" id="new_password1">
+        <span class="bz_info">
+          (Leave empty to keep current password)
+        </span>
       </td>
     </tr>
 
     <tr>
-      <th>Confirm new password:</th>
+      <th><label for="new_password2">Confirm new password:</label></th>
       <td>
-        <input type="password" name="new_password2">
+        <input type="password" name="new_password2" id="new_password2">
       </td>
     </tr>
   [% END %]
 
-  <tr>
-    <th>Your real name (optional, but encouraged):</th>
-    <td>
-      <input size="35" name="realname" value="[% realname FILTER html %]">
-    </td>
-  </tr>  
+  [% UNLESS Param('use_email_as_login') %]
+    <tr>
+      <th><label for="new_login">Your login name:</label></th>
+      <td>
+        [% IF user.authorizer.can_change_login %]
+          <input size="35" name="new_login" id="new_login"
+                 value="[% user.login FILTER html %]">
+        [% ELSE %]
+          [% user.login FILTER html %]
+        [% END %]
+      </td>
+    </tr>
+  [% END %]
 
-  [% IF user.authorizer.can_change_email && Param('allowemailchange') %]
-    [% IF login_change_date %]
-      [% IF new_login_name %]
-        <tr>
-          <th>Pending email address:</th>
-          <td>[% new_login_name FILTER html %]</td>
-        </tr>
-        <tr>
-          <th>Change request expires:</th>
-          <td>[% login_change_date FILTER time %]</td>
-        </tr>
-      [% ELSE %]
-        <tr>
-          <th>Confirmed email address:</th>
-          <td>[% user.login FILTER html %]</td>
-        </tr>
-        <tr>
-          <th>Completion date:</th>
-          <td>[% login_change_date FILTER time %]</td>
-        </tr>
-      [% END %]
+  [% IF user.authorizer.can_change_email
+        && Param('allowemailchange')
+        && email_change_date %]
+    [% IF new_email %]
+      <tr>
+        <th><label>Pending email address:</label></th>
+        <td>[% new_email FILTER html %]</td>
+      </tr>
+      <tr>
+        <th><label>Change request expires:</label></th>
+        <td>[% email_change_date FILTER time %]</td>
+      </tr>
     [% ELSE %]
       <tr>
-        <th>
-          [% IF Param('emailsuffix') %]
-            New login:
-          [% ELSE %]
-            New email address:
-          [% END %]
-        </th>
-        <td>
-          <input size="35" id="new_login_name" name="new_login_name"
-                 [%- ' type="email"' UNLESS Param('emailsuffix') %]>
-        </td>
+        <th><label>Confirmed email address:</label></th>
+        <td>[% user.email FILTER html %]</td>
+      </tr>
+      <tr>
+        <th><label>Completion date:</label></th>
+        <td>[% email_change_date FILTER time %]. You will not be able to change your e-mail address again until after this date.</td>
       </tr>
     [% END %]
+  [% ELSE %]
+    <tr>
+      <th>
+        <label for="new_email">
+          Your email address[% "/login" IF Param('use_email_as_login') %]:
+        </label>
+      </th>
+      <td>
+        [% IF user.authorizer.can_change_email && Param('allowemailchange') %]
+          <input size="35" name="new_email" id="new_email"
+                 value="[% user.email FILTER html %]"
+                 [%~ ' type="email"' IF Param('use_email_as_login') %]>
+        [% ELSE %]
+          [% user.email FILTER html %]
+        [% END %]
+      </td>
+    </tr>
   [% END %]
 
+  <tr>
+    <td colspan="2"><hr></td>
+  </tr>
+
+  <tr>
+    <th>
+      <label for="realname">Your real name (optional, but encouraged):</label>
+    </th>
+    <td>
+      <input size="35" name="realname" id="realname"
+             value="[% user.name FILTER html %]">
+    </td>
+  </tr>
+
   [% Hook.process('field') %]
 
 </table>
diff --git a/template/en/default/account/prefs/apikey.html.tmpl b/template/en/default/account/prefs/apikey.html.tmpl
index bed3f38098..890c71694d 100644
--- a/template/en/default/account/prefs/apikey.html.tmpl
+++ b/template/en/default/account/prefs/apikey.html.tmpl
@@ -16,7 +16,7 @@
   one API key if required. Each API key has an optional description which can help
   you record what each key is used for. Documentation on how to log in is
   available from
-  <a href="[% docs_urlbase FILTER html %]api/Bugzilla/WebService.html#LOGGING_IN">here</a>.
+  <a href="[% docs_urlbase FILTER html %]api/core/v1/general.html#authentication">here</a>.
 </p>
 
 <h3>Existing API keys</h3>
@@ -78,7 +78,8 @@ generated for you.</p>
 
 <p>
   <input type="checkbox" name="new_key" id="new_key">
-  Generate a new API key with optional description
+  <label for="new_key">Generate a new API key</label> with
+  <label for="new_description">optional description</label>
   <input name="new_description" id="new_description">
 </p>
 
diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 0524841743..f228f96e7a 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -29,14 +29,14 @@
 [% END %]
 
 [% IF user.authorizer.can_change_email && Param('allowemailchange') %]
-  <p>
+  <p id="change_email">
     If you want to change your e-mail address
     <b>[% user.email FILTER html %]</b> to which [% terms.Bugzilla %] sends
     notifications, click the "Account Information" tab above.
   </p>
 [% END %]
 
-<p>
+<p id="trivial_email">
   If you don't like getting a notification for "trivial"
   changes to [% terms.bugs %], you can use the settings below to
   filter some or all notifications.
@@ -68,6 +68,7 @@ function SetCheckboxes(setting) {
 
 <hr>
 
+<div id="global_options">
 <h3>Global options</h3>
 
 [% prefname = "email-$constants.REL_ANY-$constants.EVT_FLAG_REQUESTED" %]
@@ -88,7 +89,9 @@ function SetCheckboxes(setting) {
 [% END %]
 
 <hr>
+</div>
 
+<div id="field_recipient_options">
 <h3>Field/recipient specific options</h3>
 
 [% events = [
@@ -123,6 +126,8 @@ function SetCheckboxes(setting) {
       description = "The $terms.bug is in the UNCONFIRMED state" },
     { id = constants.EVT_CHANGED_BY_ME,
       description = "The change was made by me" },
+    { id = constants.EVT_MINOR_UPDATE,
+      description = "The change was marked as a minor update" },
 ] %]
 
 [% relationships = [
@@ -135,7 +140,7 @@ function SetCheckboxes(setting) {
 ] %]
 
 [% IF Param('useqacontact') %]
-  [% relationships.push({ id = constants.REL_QA, 
+  [% relationships.push({ id = constants.REL_QA,
                           description = "QA Contact" }) %]
 [% END %]
 
@@ -161,7 +166,7 @@ function SetCheckboxes(setting) {
     [% END %]
   </tr>
 
-  [% FOREACH event = events %]  
+  [% FOREACH event = events %]
     [% count = loop.count() %]
     <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]">
       [% FOREACH relationship = relationships %]
@@ -188,7 +193,7 @@ function SetCheckboxes(setting) {
     <th>but not when (overrides above):</th>
   </tr>
 
-  [% FOREACH event = neg_events %]  
+  [% FOREACH event = neg_events %]
     [% count = loop.count() %]
     <tr class="bz_row_[% count % 2 == 1 ? "odd" : "even" %]">
       [% FOREACH relationship = relationships %]
@@ -204,18 +209,22 @@ function SetCheckboxes(setting) {
 </table>
 
 <hr>
+</div>
 
+<div id="user_watching">
 <h3>User Watching</h3>
 
 <p>
-If you watch a user, it is as if you are standing in their shoes for the 
+If you watch a user, it is as if you are standing in their shoes for the
 purposes of getting email. Email is sent or not according to <em>your</em>
 preferences for <em>their</em> relationship to the [% terms.bug %]
 (e.g. Assignee).
 </p>
 
 [% IF watchedusers.size %]
-  <p>You are watching everyone in the following list:</p>
+  <p>
+    <label for="watched_by_you">You are watching everyone in the following list:</label>
+  </p>
   <p>
     <select id="watched_by_you" name="watched_by_you" multiple="multiple" size="5">
         [% FOREACH w = watchedusers %]
@@ -231,7 +240,8 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
 [% END %]
 
 
-<p id="new_watched_by_you">Add users to my watch list (comma separated list):
+<p id="new_watched_by_you">
+  <label for="new_watchedusers">Add users to my watch list (comma separated list):</label>
   [% INCLUDE global/userselect.html.tmpl
      id => "new_watchedusers"
      name => "new_watchedusers"
@@ -252,13 +262,15 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
 </p>
 
 <hr>
+</div>
 
+<div id="ignore_bugs">
 <h3>Ignore [% terms.Bugs %]</h3>
 
 <p>
   You can specify a list of [% terms.bugs %] from which you never want to get
   any email notification of any kind by adding their ID(s) as a comma-separated
-  list. Removing [% terms.abug %] by selecting it from the current ignored list 
+  list. Removing [% terms.abug %] by selecting it from the current ignored list
   will re-enable email notifications for the [% terms.bug %].
 </p>
 [% IF user.bugs_ignored.size %]
@@ -270,7 +282,8 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
         <td>
           <input type="checkbox" name="remove_ignored_bug_[% bug.id FILTER html %]" value="1">
         </td>
-        <td><a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER uri %]">
+        <td>
+          <a href="[% urlbase FILTER html %]show_bug.cgi?id=[% bug.id FILTER uri %]">
           [% bug.id FILTER html %]</a>
         </td>
         <td>[% bug.status FILTER html %]</td>
@@ -288,7 +301,8 @@ preferences for <em>their</em> relationship to the [% terms.bug %]
 [% END %]
 
 <p>
-  Add [% terms.bugs %]:<br>
-  <input type="text" id="add_ignored_bugs" 
+  <label for="add_ignored_bugs">Add [% terms.bugs %]:</label>
+  <input type="text" id="add_ignored_bugs"
          name="add_ignored_bugs" size="60">
 </p>
+</div>
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl
index 8f11d0a6ff..ea47b7663a 100644
--- a/template/en/default/account/prefs/prefs.html.tmpl
+++ b/template/en/default/account/prefs/prefs.html.tmpl
@@ -26,22 +26,22 @@
 
 [% tabs = [{ name => "settings", label => "General Preferences",
               link => "userprefs.cgi?tab=settings", saveable => "1",
-              doc_section => "using.html#general-preferences" },
-            { name => "email", label => "Email Preferences",
+              doc_section => "using/preferences.html#general-preferences" },
+            { name => "email", label => "Email Notifications",
               link => "userprefs.cgi?tab=email", saveable => "1",
-              doc_section => "using.html#email-preferences" },
+              doc_section => "using/preferences.html#email-preferences" },
             { name => "saved-searches", label => "Saved Searches",
               link => "userprefs.cgi?tab=saved-searches", saveable => "1",
-              doc_section => "using.html#saved-searches" },
+              doc_section => "using/preferences.html#saved-searches" },
             { name => "account", label => "Account Information",
               link => "userprefs.cgi?tab=account", saveable => "1",
-              doc_section => "using.html#account-information" },
+              doc_section => "using/preferences.html#account-information" },
             { name => "apikey", label => "API Keys",
               link => "userprefs.cgi?tab=apikey", saveable => "1",
-              doc_section => "using.html#apikey" },
+              doc_section => "using/preferences.html#api-keys" },
             { name => "permissions", label => "Permissions",
               link => "userprefs.cgi?tab=permissions", saveable => "0",
-              doc_section => "using.html#permissions" } ] %]
+              doc_section => "using/preferences.html#permissions" } ] %]
 
 [% Hook.process('tabs') %]
 
@@ -55,10 +55,10 @@
 [% PROCESS global/header.html.tmpl
    title = current_tab.label
    subheader = filtered_login
+   generate_api_token = 1
    style_urls = ['skins/standard/admin.css']
    javascript_urls = ['js/util.js', 'js/field.js', 'js/TUI.js']
    doc_section = current_tab.doc_section
-   yui = ['autocomplete']
  %]
 
 [% WRAPPER global/tabs.html.tmpl
@@ -68,13 +68,17 @@
 
 [% IF changes_saved %]
   <div id="message">
-    The changes to your [% current_tab.label FILTER lower %] have been saved.
+    The changes to your [% current_tab.label FILTER lower FILTER html %] have been saved.
 
     [% IF email_changes_saved %]
       <p>
         In order to confirm your request, we have sent an email to your
         new email address. As a precaution, an email has also been sent
         to your old address allowing you to cancel this change if needed.
+        If you don't receive the email, you can
+        <a href="token.cgi?t=[% email_token FILTER uri %]&amp;a=cxlem">
+        cancel the email address change</a> from here if you wish (especially
+        if you mistyped the new email address).
       </p>
     [% END %]
   </div>
diff --git a/template/en/default/account/prefs/settings.html.tmpl b/template/en/default/account/prefs/settings.html.tmpl
index a7055c67f3..a3c44095ac 100644
--- a/template/en/default/account/prefs/settings.html.tmpl
+++ b/template/en/default/account/prefs/settings.html.tmpl
@@ -35,7 +35,9 @@
       [% default_val = settings.${name}.default_value %]
       <tr>
         <td class="right">
-          [% setting_descs.$name OR name FILTER html %]
+          <label for="[% name FILTER html %]">
+            [% setting_descs.$name OR name FILTER html %]
+          </label>
         </td>
         <td>
           [% IF settings.${name}.is_enabled %]
diff --git a/template/en/default/account/request-new-password.html.tmpl b/template/en/default/account/request-new-password.html.tmpl
new file mode 100644
index 0000000000..73caa6dcbe
--- /dev/null
+++ b/template/en/default/account/request-new-password.html.tmpl
@@ -0,0 +1,29 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% PROCESS global/header.html.tmpl title = "Reset Password" %]
+
+[% IF user.authorizer.can_change_password %]
+  <p>
+    If you have an account, but have forgotten your password, enter your email
+    address below and submit a request to change your password. An email with
+    details on how to reset your password will be sent.
+  </p>
+
+  <form id="forgot_password" method="get" action="token.cgi">
+    <input type="hidden" name="a" value="reqpw">
+    <input id="email" type="email" name="email" autofocus required>
+    <input type="hidden" id="token" name="token"
+           value="[% issue_hash_token(['reqpw']) FILTER html %]">
+    <input type="submit" id="request" value="Reset Password">
+  </form>
+[% ELSE %]
+  <p>Sorry, but you cannot reset your password.</p>
+[% END %]
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/admin.html.tmpl b/template/en/default/admin/admin.html.tmpl
index 9f60eb6625..7e3e5a1579 100644
--- a/template/en/default/admin/admin.html.tmpl
+++ b/template/en/default/admin/admin.html.tmpl
@@ -13,7 +13,7 @@
 
 [% PROCESS global/header.html.tmpl title = title
                                    style_urls = ['skins/standard/admin.css']
-                                   doc_section = "administration.html"
+                                   doc_section = "administering/index.html"
 %]
 
 <div>
@@ -118,6 +118,16 @@
         and time, and get the result of these queries directly per email. This is a
         good way to create reminders and to keep track of the activity in your installation.</dd>
 
+        [% IF Param('use_mailer_queue') %]
+          [% class = user.in_group('admin') ? "" : "forbidden" %]
+          <dt id="view_job_queue" class="[% class %]"><a href="view_job_queue.cgi">Job Queue</a></dt>
+          <dd class="[% class %]">View the queue of undelivered/deferred jobs/emails.</dd>
+        [% END %]
+
+        <dt id="release_notes">
+          <a href="page.cgi?id=release-notes.html">Release Notes</a></dt>
+        <dd>Detailed information related to this release of Bugzilla.</dd>
+
         [% Hook.process('end_links_right') %]
       </dl>
     </td>
diff --git a/template/en/default/admin/components/create.html.tmpl b/template/en/default/admin/components/create.html.tmpl
index 4db4a489c5..858df7102e 100644
--- a/template/en/default/admin/components/create.html.tmpl
+++ b/template/en/default/admin/components/create.html.tmpl
@@ -14,8 +14,8 @@
 [% title = BLOCK %]Add component to the [% product.name FILTER html %] product[% END %]
 [% PROCESS global/header.html.tmpl
   title = title
+  generate_api_token = 1
   style_urls = ['skins/standard/admin.css']
-  yui = [ 'autocomplete' ]
   javascript_urls = [ "js/field.js" ]
 %]
 
diff --git a/template/en/default/admin/components/edit.html.tmpl b/template/en/default/admin/components/edit.html.tmpl
index 9998845e21..1e93542a58 100644
--- a/template/en/default/admin/components/edit.html.tmpl
+++ b/template/en/default/admin/components/edit.html.tmpl
@@ -18,8 +18,8 @@
 [% END %]
 [% PROCESS global/header.html.tmpl
   title = title
+  generate_api_token = 1
   style_urls = ['skins/standard/admin.css']
-  yui = [ 'autocomplete' ]
   javascript_urls = [ "js/field.js" ]
 %]
 
diff --git a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
index 43f33512af..1d2348a0f2 100644
--- a/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
+++ b/template/en/default/admin/custom_fields/confirm-delete.html.tmpl
@@ -20,7 +20,7 @@
 [% PROCESS global/header.html.tmpl
            title = title
            style_urls = ['skins/standard/admin.css']
-           doc_section = "administration.html#deleting-custom-fields"
+           doc_section = "administering/custom-fields.html#deleting-custom-fields"
 %]
 
 <table id="admin_table">
diff --git a/template/en/default/admin/custom_fields/create.html.tmpl b/template/en/default/admin/custom_fields/create.html.tmpl
index 1f6f713600..71ba08f465 100644
--- a/template/en/default/admin/custom_fields/create.html.tmpl
+++ b/template/en/default/admin/custom_fields/create.html.tmpl
@@ -18,7 +18,7 @@
            title = "Add a new Custom Field"
            onload = "document.getElementById('new_bugmail').disabled = true;"
            javascript_urls = [ 'js/util.js' ]
-           doc_section = "administration.html#adding-custom-fields"
+           doc_section = "administering/custom-fields.html#adding-custom-fields"
            style_urls = ['skins/standard/admin.css']
 %]
 
diff --git a/template/en/default/admin/custom_fields/edit.html.tmpl b/template/en/default/admin/custom_fields/edit.html.tmpl
index b8365b300f..6f7389d057 100644
--- a/template/en/default/admin/custom_fields/edit.html.tmpl
+++ b/template/en/default/admin/custom_fields/edit.html.tmpl
@@ -22,7 +22,7 @@
            title = title
            onload = "toggleCheckbox(document.getElementById('enter_bug'), 'new_bugmail');"
            javascript_urls = [ 'js/util.js' ]
-           doc_section = "administration.html#editing-custom-fields"
+           doc_section = "administering/custom-fields.html#editing-custom-fields"
            style_urls = ['skins/standard/admin.css']
 %]
 
diff --git a/template/en/default/admin/custom_fields/list.html.tmpl b/template/en/default/admin/custom_fields/list.html.tmpl
index 918b440ad0..5e9183e564 100644
--- a/template/en/default/admin/custom_fields/list.html.tmpl
+++ b/template/en/default/admin/custom_fields/list.html.tmpl
@@ -15,7 +15,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Custom Fields"
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#custom-fields"
+  doc_section = "administering/custom-fields.html"
 %]
 
 [% delete_contentlink = BLOCK %]editfields.cgi?action=del&amp;name=%%name%%[% END %]
diff --git a/template/en/default/admin/fieldvalues/create.html.tmpl b/template/en/default/admin/fieldvalues/create.html.tmpl
index 8d1dbc8b97..8bb28e8b1a 100644
--- a/template/en/default/admin/fieldvalues/create.html.tmpl
+++ b/template/en/default/admin/fieldvalues/create.html.tmpl
@@ -26,7 +26,7 @@
 <form method="post" action="editvalues.cgi">
   <table id="admin_table_edit">
     <tr>
-      <th><label for="value">Value:</label></th>
+      <th><label for="value">Field Value:</label></th>
       <td>
         <input id="value" name="value" size="30"
                maxlength="[% constants.MAX_FIELD_VALUE_SIZE FILTER none %]" required>
@@ -82,7 +82,7 @@
   </table>
   <input type="submit" id="create" value="Add">
   <input type="hidden" name="action" value="new">
-  <input type="hidden" name='field' value="[% field.name FILTER html %]">
+  <input type="hidden" name="field" value="[% field.name FILTER html %]">
   <input type="hidden" name="token" value="[% token FILTER html %]">
 </form>
 
diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index 2630fee924..9d956e8cb3 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -30,7 +30,7 @@
                  value="[% value.name FILTER html %]">
             [%- value.name FILTER html %]
         [% ELSE %]
-          <input id="value_new" name="value_new" size="20"
+          <input id="value_new" name="value_new" size="30"
                  maxlength="[% constants.MAX_FIELD_VALUE_SIZE FILTER none %]"
                  value="[% value.name FILTER html %]" required>
         [% END %]
diff --git a/template/en/default/admin/flag-type/confirm-delete.html.tmpl b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
index 4cc5890ede..a05e857d2c 100644
--- a/template/en/default/admin/flag-type/confirm-delete.html.tmpl
+++ b/template/en/default/admin/flag-type/confirm-delete.html.tmpl
@@ -11,7 +11,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#deleting-a-flag"
+  doc_section = "administering/flags.html#deleting-a-flag"
 %]
 
 <p>
diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index 5f45b6b768..1fccea4a59 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -23,9 +23,9 @@
   title = title
   style_urls = ['skins/standard/admin.css']
   onload="var f = document.forms['flagtype_properties'];
-          selectProduct(f.product, f.component, null, null, '__Any__');"
+          selectProduct(f.product, f.component, '__Any__');"
   javascript_urls=["js/productform.js"]
-  doc_section = "administration.html#administering-flags"
+  doc_section = "administering/flags.html"
 %]
 
 <form id="flagtype_properties" method="post" action="editflagtypes.cgi">
@@ -92,7 +92,7 @@
                 id       => "product"
                 name     => "product"
                 add      => "__Any__"
-                onchange => "selectProduct(this, this.form.component, null, null, '__Any__');"
+                onchange => "selectProduct(this, this.form.component, '__Any__');"
                 products => products
               %]<br>
               <select name="component">
@@ -161,11 +161,7 @@
         if requestable, who should get carbon copied on email notification of requests.
         This is a comma-separated list of full e-mail addresses which do not
         need to be [% terms.Bugzilla %] logins.
-        [% IF Param('emailsuffix') %]
-          Note that the configured emailsuffix
-          <kbd>[% Param('emailsuffix') %]</kbd> will <em>not</em> be appended
-          to these addresses, so you should add it explicitly if so desired.
-        [% END %]<br>
+        <br>
         <input type="text" name="cc_list" value="[% type.cc_list FILTER html %]" size="80"
                maxlength="200" [%- ' disabled="disabled"' UNLESS can_fully_edit %]>
       </td>
diff --git a/template/en/default/admin/flag-type/list.html.tmpl b/template/en/default/admin/flag-type/list.html.tmpl
index 25b2e3390c..b1665c3b0f 100644
--- a/template/en/default/admin/flag-type/list.html.tmpl
+++ b/template/en/default/admin/flag-type/list.html.tmpl
@@ -11,9 +11,9 @@
 [% PROCESS global/header.html.tmpl
   title = 'Administer Flag Types'
   style_urls = ['skins/standard/admin.css']
-  onload="var f = document.flagtype_form; selectProduct(f.product, f.component, null, null, '__All__');"
+  onload="var f = document.flagtype_form; selectProduct(f.product, f.component, '__All__');"
   javascript_urls=["js/productform.js"]
-  doc_section = "administration.html#two-types-of-flags"
+  doc_section = "administering/flags.html"
 %]
 
 <p>
@@ -43,7 +43,7 @@
       id       => "product"
       name     => "product"
       add      => "__Any__"
-      onchange => "selectProduct(this, this.form.component, null, null, '__Any__');"
+      onchange => "selectProduct(this, this.form.component, '__Any__');"
       products => products
     %]
   </div>
@@ -109,7 +109,9 @@
     [% FOREACH type = types %]
 
       <tr class="[% IF type.is_active %]active[% ELSE %]inactive[% END %]">
-        <td><a href="editflagtypes.cgi?action=edit&amp;id=[% type.id %]">[% type.name FILTER html FILTER no_break %]</a></td>
+        <td class="nowrap">
+          <a href="editflagtypes.cgi?action=edit&amp;id=[% type.id %]">[% type.name FILTER html %]</a>
+        </td>
         <td>[% type.description FILTER html %]</td>
         <td class="right">[% type.sortkey FILTER html %]</td>
         <td>
diff --git a/template/en/default/admin/groups/confirm-remove.html.tmpl b/template/en/default/admin/groups/confirm-remove.html.tmpl
index d626ca2bab..ef3e44a91e 100644
--- a/template/en/default/admin/groups/confirm-remove.html.tmpl
+++ b/template/en/default/admin/groups/confirm-remove.html.tmpl
@@ -12,22 +12,22 @@
   #%]
 
 [% IF regexp %]
-  [% title = "Confirm: Remove Explicit Members in the Regular Expression?" %]
+  [% title = "Confirm: Remove Explicit Members Using A Regular Expression?" %]
 [% ELSE %]
   [% title = "Confirm: Remove All Explicit Members?" %]
 [% END %]
 
 [% PROCESS global/header.html.tmpl
   title = title
-  doc_section = "administration.html#groups-and-group-security"
+  doc_section = "administering/groups.html"
 %]
 
 [% IF regexp %]
   <p>This option will remove all users from '[% group.name FILTER html %]'
-    whose login names match the regular expression:
+    whose email addresses match the regular expression:
     '[% regexp FILTER html %]'</p>
 [% ELSE %]
-  <p>This option will remove all explicitly defined users
+  <p>This option will remove all explicitly-added users
     from '[% group.name FILTER html %].'</p>
 [% END %]
   
diff --git a/template/en/default/admin/groups/create.html.tmpl b/template/en/default/admin/groups/create.html.tmpl
index 8f9be1c7a3..6f280d68d9 100644
--- a/template/en/default/admin/groups/create.html.tmpl
+++ b/template/en/default/admin/groups/create.html.tmpl
@@ -14,7 +14,7 @@
   title = "Add group"
   subheader = "This page allows you to define a new user group."
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#creating-groups"
+  doc_section = "administering/groups.html#creating-groups"
 %]
 
 <form method="post" action="editgroups.cgi">
@@ -42,8 +42,7 @@
     [% Hook.process('field') %]
   </table>
 
-  <input type="checkbox" id="insertnew" name="insertnew" value="1"
-    [% IF Param("makeproductgroups") %] checked[% END %]>
+  <input type="checkbox" id="insertnew" name="insertnew" value="1">
   <label for="insertnew">Insert new group into all existing products.</label>
   <p>
   <input type="submit" id="create" value="Add">
@@ -82,17 +81,10 @@ than deleting the group would be. <b>Note: If you are creating
 a group, you probably want it to be usable for [% terms.bugs %], in which
 case you should leave this checked.</b></p>
 
-[% IF Param("makeproductgroups") %]
-  <p>By default, the new group will be associated with existing products.
-  Unchecking the "Insert new group into all existing products" option will
-  prevent this and make the group become visible only when its controls have
-  been added to a product.</p>
-[% ELSE %]
-  <p>Checking the "Insert new group into all existing products" option will
-  make the new group be associated with existing products. Leaving it unchecked
-  will make the group become visible only when its controls have been added to
-  a product.</p>
-[% END %]
+<p>Checking the "Insert new group into all existing products" option will
+make the new group available to be set on [% terms.bugs %] in all existing
+products. Leaving it unchecked means you need to specifically add the group to
+any product where you want it to be available for use.</p>
 
 <p>Back to the <a href="editgroups.cgi">group list</a>.</p>
 
diff --git a/template/en/default/admin/groups/delete.html.tmpl b/template/en/default/admin/groups/delete.html.tmpl
index 78a1352d32..4658607619 100644
--- a/template/en/default/admin/groups/delete.html.tmpl
+++ b/template/en/default/admin/groups/delete.html.tmpl
@@ -17,7 +17,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#groups-and-group-security"
+  doc_section = "administering/groups.html"
 %]
 
 <table id="admin_table">
diff --git a/template/en/default/admin/groups/edit.html.tmpl b/template/en/default/admin/groups/edit.html.tmpl
index 1cc948ea24..5a20ef36e3 100644
--- a/template/en/default/admin/groups/edit.html.tmpl
+++ b/template/en/default/admin/groups/edit.html.tmpl
@@ -19,7 +19,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#editing-groups-and-assigning-group-permissions"
+  doc_section = "administering/groups.html#editing-groups-and-assigning-group-permissions"
 %]
 
 <form method="post" action="editgroups.cgi">
@@ -165,7 +165,7 @@
 
 <form method="post" action="editgroups.cgi">
   <fieldset id="mass-remove">
-    <legend>Remove all explicit memberships from users whose login names
+    <legend>Remove all explicit memberships from users whose email addresses
       match the following regular expression:</legend>
     <input type="text" size="20" name="regexp">
     <input type="submit" id="remove-membership" value="Remove Memberships">
diff --git a/template/en/default/admin/groups/list.html.tmpl b/template/en/default/admin/groups/list.html.tmpl
index 29e39f65fc..ed664fe06c 100644
--- a/template/en/default/admin/groups/list.html.tmpl
+++ b/template/en/default/admin/groups/list.html.tmpl
@@ -20,7 +20,7 @@
   title = "Edit Groups"
   subheader = "This lets you edit the groups available to put users in."
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#groups-and-group-security"
+  doc_section = "administering/groups.html"
 %]
 
 [% edit_contentlink = "editgroups.cgi?action=changeform&amp;group=%%id%%" %]
@@ -40,11 +40,11 @@
    }
    {name               => 'is_active_bug_group'
     heading            => "Use For $terms.Bugs"
-    align              => 'center'
+    class              => 'center'
    }
    {name               => 'type'
     heading            => 'Type'
-    align              => 'center'
+    class              => 'center'
    }
    {name               => 'action'
     heading            => 'Action'
@@ -76,7 +76,8 @@
 %]
 
 [% FOREACH group IN ["chartgroup", "comment_taggers_group", "debug_group",
-                     "insidergroup", "querysharegroup", "timetrackinggroup"] %]
+                     "insidergroup", "minor_update_group", "querysharegroup",
+                     "timetrackinggroup"] %]
   [% special_group = Param(group) %]
 
   [% IF special_group %]
diff --git a/template/en/default/admin/keywords/edit.html.tmpl b/template/en/default/admin/keywords/edit.html.tmpl
index 23158d36fc..4151b2e465 100644
--- a/template/en/default/admin/keywords/edit.html.tmpl
+++ b/template/en/default/admin/keywords/edit.html.tmpl
@@ -18,14 +18,19 @@
 <form method="post" action="editkeywords.cgi">
   <table id="admin_table_edit">
     <tr>
-      <th>Name:</th>
-      <td><input size="64" maxlength="64" name="name" 
+      <th><label for="name">Name:</label></th>
+      <td><input size="64" maxlength="64" name="name" id="name"
                  value="[% keyword.name FILTER html %]" required></td>
     </tr>
     <tr>
-      <th>Description:</th>
+      <th><label for="is_active">Enabled For [% terms.Bugs %]</label></th>
+      <td><input id="is_active" name="is_active" type="checkbox" [% "checked" IF keyword.is_active %]></td>
+    </tr>
+    <tr>
+      <th><label for="description">Description:</label></th>
       <td>
         [% INCLUDE global/textarea.html.tmpl
+          id             = 'description'
           name           = 'description'
           minrows        = 4
           cols           = 64
diff --git a/template/en/default/admin/keywords/list.html.tmpl b/template/en/default/admin/keywords/list.html.tmpl
index c3f4a52920..9d920036eb 100644
--- a/template/en/default/admin/keywords/list.html.tmpl
+++ b/template/en/default/admin/keywords/list.html.tmpl
@@ -10,6 +10,7 @@
   # keywords: array keyword objects having the properties:
   #   - id: number. The ID of the keyword.
   #   - name: string. The name of the keyword.
+  #   - is_active: boolean. true if the keyword can be used.
   #   - description: string. The description of the keyword.
   #   - bug_count: number. The number of bugs with the keyword.
   #%]
@@ -20,34 +21,39 @@
 %]
 
 [% columns = [
-     { 
-       name => "name"
-       heading => "Edit keyword..."
-       contentlink => "editkeywords.cgi?action=edit&amp;id=%%id%%" 
-     },
-     { 
-       name => "description"
-       heading => "Description"
-       allow_html_content => 1
-     },
-     { 
-       name => "bug_count"
-       heading => "$terms.Bugs"
-       class => "right"
-       contentlink => "buglist.cgi?keywords=%%name%%"
-     },
-     { 
-       heading => "Action" 
-       content => "Delete"
-       contentlink => "editkeywords.cgi?action=del&amp;id=%%id%%"
-     }
-   ]
+    {
+        name        => "name"
+        heading     => "Edit keyword..."
+        contentlink => "editkeywords.cgi?action=edit&amp;id=%%id%%"
+    },
+    {
+        name        => "description"
+        heading     => "Description"
+        allow_html_content => 1
+    },
+    {
+        name        => "is_active",
+        heading     => "Active",
+        yesno_field => 1
+    },
+    {
+        name         => "bug_count"
+        heading      => "$terms.Bugs"
+        class        => "right"
+        contentlink  => "buglist.cgi?keywords=%%name%%"
+    },
+    {
+        heading     => "Action"
+        content     => "Delete"
+        contentlink => "editkeywords.cgi?action=del&amp;id=%%id%%"
+    }
+]
 %]
 
 [% PROCESS admin/table.html.tmpl
-     columns = columns
-     data = keywords
-     footer = footer_row
+    columns = columns
+    data    = keywords
+    footer  = footer_row
 %]
 
 <p><a href="editkeywords.cgi?action=add">Add a new keyword</a></p>
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 1f24c7d06e..70171bd539 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -41,20 +41,15 @@
 [% END %]
 
 [% param_descs = {
-  cookiedomain => 
-    "If your website is at 'www.foo.com', setting this to"
-    _ " '.foo.com' will also allow 'bar.foo.com' to access"
-    _ " Bugzilla cookies. This is useful if you have more than"
-    _ " one hostname pointing at the same web server, and you"
-    _ " want them to share the Bugzilla cookie.",
-
   inbound_proxies =>
     "When inbound traffic to Bugzilla goes through a proxy,"
     _ " Bugzilla thinks that the IP address of every single"
     _ " user is the IP address of the proxy. If you enter a comma-separated"
     _ " list of IPs in this parameter, then Bugzilla will trust any"
     _ " <code>X-Forwarded-For</code> header sent from those IPs,"
-    _ " and use the value of that header as the end user's IP address.",
+    _ " and use the value of that header as the end user's IP address."
+    _ " If set to a *, $terms.Bugzilla will trust the first value in the "
+    _ " X-Forwarded-For header.",
 
   proxy_url => 
     "Bugzilla may have to access the web to get notifications about"
diff --git a/template/en/default/admin/params/attachment.html.tmpl b/template/en/default/admin/params/attachment.html.tmpl
index 5efcc11067..1e65f0ca4c 100644
--- a/template/en/default/admin/params/attachment.html.tmpl
+++ b/template/en/default/admin/params/attachment.html.tmpl
@@ -31,11 +31,6 @@
     _ " that is not the same as <var>urlbase</var> or <var>sslbase</var>."
     _ " That is, a different domain name that resolves to this exact"
     _ " same Bugzilla installation.</p>"
-    _ "<p>Note that if you have set the"
-    _ " <a href=\"editparams.cgi?section=advanced#cookiedomain_desc\"><var>cookiedomain</var>"
-    _" parameter</a>, you should set <var>attachment_base</var> to use a"
-    _ " domain that would <em>not</em> be matched by"
-    _ " <var>cookiedomain</var>.</p>"
     _ "<p>For added security, you can insert <var>%bugid%</var> into the URL,"
     _ " which will be replaced with the ID of the current $terms.bug that"
     _ " the attachment is on, when you access an attachment. This will limit"
@@ -58,5 +53,31 @@
   maxlocalattachment => "The maximum size (in megabytes) of attachments to be stored " _
                         "locally on the web server. If set to a value lower than the " _
                         "<a href=\"#maxattachmentsize\"><var>maxattachmentsize</var> parameter</a>, " _
-                        "attachments will never be kept on the local filesystem." }
+                        "attachments will never be kept on the local filesystem. " _
+                        "If you want to store all attachments on disk rather than in the " _
+                        "database, then set <a href=\"#maxattachmentsize\">" _
+                        "<var>maxattachmentsize</var> parameter</a> to 0. ",
+
+
+  xsendfile_header =>
+    "By default, attachments are served by the CGI script. " _
+    "If you enable filesystem file storage for large files using the " _
+    "<a href=\"#maxlocalattachment\"><var>maxlocalattachment</var> parameter</a> " _
+    "then you can have those files served directly by the webserver, which " _
+    "avoids copying them entirely into memory, and this may result in a " _
+    "performance improvement. To do this, configure your webserver appropriately " _
+    "and then set the correct header, as follows:" _
+    "<ul>" _
+    "<li>Apache: <code>X-Sendfile</code> header; see " _
+    "<code><a href=\"https://tn123.org/mod_xsendfile/\">mod_xsendfile</a></code> module</li>" _
+    "<li>nginx: <code>X-Accel-Redirect</code> header; see "_
+    "<a href=\"http://wiki.nginx.org/X-accel\">webserver documentation</a> for additional configuration</li>" _
+    "<li>lighttpd: <code>X-LIGHTTPD-send-file</code> header; see " _
+    "<a href=\"http://redmine.lighttpd.net/projects/1/wiki/X-LIGHTTPD-send-file\">webserver documentation</a> for additional configuration</li>" _
+    "</ul><br>" _
+    "Please note that attachments stored in the database cannot be offloaded " _
+    "to apache/nginx/lighttpd and are always handled by the CGI script."
+
+  }
+
 %]
diff --git a/template/en/default/admin/params/auth.html.tmpl b/template/en/default/admin/params/auth.html.tmpl
index 902d2fc826..5f8de90087 100644
--- a/template/en/default/admin/params/auth.html.tmpl
+++ b/template/en/default/admin/params/auth.html.tmpl
@@ -93,29 +93,16 @@
                   "front page will require a login. No anonymous users will " _
                   "be permitted.",
 
-  webservice_email_filter =>
-    "Filter email addresses returned by the WebService API depending on " _
-    "if the user is logged in or not. This works similarly to how the " _
-    "web UI currently filters email addresses. If <var>requirelogin</var> " _
-    "is enabled, then this parameter has no effect as users must be logged " _
-    "in to use Bugzilla.",
-
   emailregexp =>
     "This defines the regular expression to use for legal email addresses. " _
     "The default tries to match fully qualified email addresses. " _
     "Use <kbd>.*</kbd> to accept any email address following the " _
     "<a href=\"http://tools.ietf.org/html/rfc2822#section-3.4.1\">RFC 2822</a> " _
-    "specification. Another popular value to put here is <kbd>^[^@]+$</kbd>, " _
-    "which means 'local usernames, no @ allowed.'",
+    "specification.",
 
   emailregexpdesc => "This description explains valid addresses that " _
                      "are allowed by the <var>emailregexp</var> param.",
 
-  emailsuffix => "This is a string to append to any email addresses when actually " _
-                 "sending mail to that address. It is useful if you have changed " _
-                 "the <var>emailregexp</var> param to only allow local usernames, " _
-                 "but you want the mail to be delivered to username@my.local.hostname.",
-
   createemailregexp => "This defines the (case-insensitive) regexp to use for email addresses that are " _
                        "permitted to self-register using a 'New Account' feature. The " _
                        "default (.*) permits any account matching the emailregexp " _
@@ -123,6 +110,13 @@
                        "will be permitted to create their own accounts and all accounts " _
                        "will have to be created by an administrator.",
 
+  use_email_as_login => "If switched on, users will log in with the email " _
+                        "address of the account. If switched off, they will " _
+                        "log in with a separate identifier.<br>" _
+                        "<strong>Switching this from off to on results in " _
+                        "the destructive act of the login name for all users " _
+                        "being set to their email address!</strong>",
+
   password_complexity =>
     "Set the complexity required for passwords. In all cases must the passwords " _
     "be at least ${constants.USER_PASSWORD_MIN_LENGTH} characters long." _
@@ -132,12 +126,17 @@
     "<li>letters_numbers - Passwords must contain at least one UPPER and one " _
     "lower case letter and a number.</li>" _
     "<li>letters_numbers_specialchars - Passwords must contain at least one " _
-    "letter, a number and a special character.</li></ul>"
+    "letter, a number and a special character.</li></ul>",
 
   password_check_on_login =>
     "If set, $terms.Bugzilla will check that the password meets the current " _
     "complexity rules and minimum length requirements  when the user logs " _
     "into the $terms.Bugzilla web interface. If it doesn't, the user would " _
-    "not be able to log in, and recieve a message to reset their password."
+    "not be able to log in, and receive a message to reset their password.",
+
+   auth_delegation =>
+    "If set, $terms.Bugzilla will allow third party applications " _
+    "to request API keys for users."
   }
+
 %]
diff --git a/template/en/default/admin/params/bugchange.html.tmpl b/template/en/default/admin/params/bugchange.html.tmpl
index f442c59533..d60210b272 100644
--- a/template/en/default/admin/params/bugchange.html.tmpl
+++ b/template/en/default/admin/params/bugchange.html.tmpl
@@ -19,24 +19,25 @@
   letsubmitterchoosepriority => "If this is on, then people submitting $terms.bugs can " _
                                 "choose an initial priority for that ${terms.bug}. " _
                                 "If off, then all $terms.bugs initially have the default " _
-                                "priority selected below.",
+                                "priority defined by the " _
+                                "<a href=\"editparams.cgi?section=bugfields#defaultpriority_desc\">defaultpriority</a> " _
+                                "parameter.",
 
   letsubmitterchoosemilestone => "If this is on, then people submitting $terms.bugs can " _
                                  "choose the Target Milestone for that ${terms.bug}. " _
                                  "If off, then all $terms.bugs initially have the default " _
                                  "milestone for the product being filed in.",
 
-  musthavemilestoneonaccept => 
-    "If you are using ${field_descs.target_milestone}, do you want to require"
-    _ " that the milestone be set in order for a user to set"
-    _ "  ${terms.abug}'s status to ${accept_status}?",
-
   commentonchange_resolution => "If this option is on, the user needs to enter a short " _
                                 "comment if the resolution of the $terms.bug changes.",
 
   commentonduplicate => "If this option is on, the user needs to enter a short comment " _
                         "if the $terms.bug is marked as duplicate.",
 
-  noresolveonopenblockers => "Don\'t allow $terms.bugs to be resolved as fixed " _
-                             "if they have unresolved dependencies." }
+  resolution_forbidden_with_open_blockers =>
+    "Set this parameter to a particular resolution, to prevent $terms.bugs " _
+    "from being resolved with this resolution if they have unresolved " _
+    "dependencies. FIXED, or its equivalent, is the most usual choice. " _
+    "Leaving this parameter empty disables this feature.",
+  }
 %]
diff --git a/template/en/default/admin/params/common.html.tmpl b/template/en/default/admin/params/common.html.tmpl
index db3bde7770..fd9fd3ed12 100644
--- a/template/en/default/admin/params/common.html.tmpl
+++ b/template/en/default/admin/params/common.html.tmpl
@@ -32,7 +32,7 @@
         <label for="[% param.name FILTER html %]-off">Off</label>
       [% ELSIF param.type == "m" %]
         [% boxSize = 5 %]
-        [% boxSize = param.choices.size IF param.choices.size < 5 %]
+        [% SET boxSize = param.choices.size IF param.choices.size < 5 %]
 
         <select multiple="multiple" size="[% boxSize FILTER html %]"
                 name="[% param.name FILTER html %]" id="[% param.name FILTER html %]">
@@ -48,7 +48,7 @@
                name="[% param.name FILTER html %]"
                value="[% Param(param.name) FILTER html %]"><br>
         [% boxSize = 7 %]
-        [% boxSize = 3 + param.choices.size IF param.choices.size < 7 %]
+        [% SET boxSize = 3 + param.choices.size IF param.choices.size < 7 %]
         [% plist = Param(param.name).split(',') %]
 
         <table id="table_[% param.name FILTER html %]" class="bz_default_hidden">
diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index d7703b5b84..decd8895a7 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -24,12 +24,4 @@
     _ " using the <var>sslbase</var> parameter. Also, when this is enabled,"
     _ " Bugzilla will send out links using <var>sslbase</var> in emails"
     _ " instead of <var>urlbase</var>.",
-
-  cookiepath => "Path, relative to your web document root, to which to restrict " _
-                "Bugzilla cookies. Normally this is the URI portion of your URL " _
-                "base. Begin with a / (single slash mark). For instance, if " _
-                "Bugzilla serves from 'http://www.somedomain.com/bugzilla/', set " _
-                "this parameter to /bugzilla/. Setting it to / will allow " _
-                "all sites served by this web server or virtual host to read " _
-                "Bugzilla cookies.",
 } %]
diff --git a/template/en/default/admin/params/dependencygraph.html.tmpl b/template/en/default/admin/params/dependencygraph.html.tmpl
deleted file mode 100644
index 64a334a202..0000000000
--- a/template/en/default/admin/params/dependencygraph.html.tmpl
+++ /dev/null
@@ -1,46 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-[%
-   title = "Graphs"
-   desc = "Optional setup to generate graphs"
-%]
-
-[% param_descs = {
-  webdotbase => "It is possible to show graphs of dependent ${terms.bugs}. You may set
-                 this parameter to any of the following:
-                 <ul>
-                   <li>
-                     A complete file path to 'dot' (part of
-                     <a href=\"http://www.graphviz.org\">GraphViz</a>) will
-                     generate the graphs locally.
-                   </li>
-                   <li>
-                     A URL prefix pointing to an installation of the
-                     <a href=\"http://www.research.att.com/~north/cgi-bin/webdot.cgi\">webdot
-                     package</a> will generate the graphs remotely.
-                   </li>
-                   <li>
-                     A blank value will disable dependency graphing.
-                   </li>
-                 </ul>
-                 The default value is a publicly-accessible webdot server. If you change
-                 this value, make certain that the webdot server can read files from your
-                 webdot directory. On Apache you do this by editing the .htaccess file,
-                 for other systems the needed measures may vary. You can run <kbd>checksetup.pl</kbd>
-                 to recreate the .htaccess file if it has been lost.",
-
-  font_file => "You can specify the full path to a TrueType font file which will be used " _
-               "to display text (labels, legends, ...) in charts and graphical reports. " _
-               "To support as many languages as possible, we recommend to specify a TrueType " _
-               "font such as <a href=\"http://unifoundry.com/unifont.html\">Unifont</a> " _
-               "which supports all printable characters in the Basic Multilingual Plane. " _
-               "If you leave this parameter empty, a default font will be used, but " _
-               "its support is limited to English characters only and so other characters " _
-               "will be displayed incorrectly.",
-  }
-%]
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index 6a9248fcc1..a8b2720391 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -37,7 +37,7 @@
    message = message
    style_urls = ['skins/standard/admin.css']
    javascript_urls = ['js/params.js', 'js/util.js']
-   doc_section = "administration.html#bugzilla-configuration"
+   doc_section = "administering/parameters.html"
 %]
 
 <div class="table">
@@ -93,6 +93,9 @@
           <input type="hidden" name="action" value="save">
           <input type="hidden" name="token" value="[% token FILTER html %]">
           <input type="submit" id="save-params" value="Save Changes">
+          [% IF panel.name == "mta" %]
+            <input type="submit" id="save-and-test-mta-params" name="save-and-test-mta-params" value="Save Changes And Send Test Email">
+          [% END %]
         </form>
     [% END %]
   </div>
diff --git a/template/en/default/admin/params/general.html.tmpl b/template/en/default/admin/params/general.html.tmpl
index 4c94bc747b..016a5d1bd3 100644
--- a/template/en/default/admin/params/general.html.tmpl
+++ b/template/en/default/admin/params/general.html.tmpl
@@ -16,25 +16,6 @@
     "The email address of the person who maintains this installation "
     _ " of Bugzilla.",
 
-  docs_urlbase => 
-    "The URL that is the common initial leading part of all"
-    _ " $terms.Bugzilla documentation URLs. It may be an absolute URL,"
-    _ " or a URL relative to the <var>urlbase</var> parameter. Leave this"
-    _ " empty to suppress links to the documentation."
-    _ "'%lang%' will be replaced by user's preferred language (if"
-    _ " documentation is available in that language).",
-
-  utf8 => 
-    "Use UTF-8 (Unicode) encoding for all text in ${terms.Bugzilla}. New"
-    _ " installations should set this to true to avoid character encoding"
-    _ " problems. <strong>Existing databases should set this to true"
-    _ " only after the data has been converted from existing legacy"
-    _ " character encodings to UTF-8, using the <kbd>contrib/recode.pl</kbd>"
-    _ " script</strong>."
-    _ " <p>Note that if you turn this parameter from &quot;off&quot; to"
-    _ " &quot;on&quot;, you must re-run <kbd>checksetup.pl</kbd> immediately"
-    _ " afterward.</p>",
-
   shutdownhtml => 
     "If this field is non-empty, then Bugzilla will be completely"
     _ " disabled and this text will be displayed instead of all the"
diff --git a/template/en/default/admin/params/groupsecurity.html.tmpl b/template/en/default/admin/params/groupsecurity.html.tmpl
index 590f4da029..426dbd8f70 100644
--- a/template/en/default/admin/params/groupsecurity.html.tmpl
+++ b/template/en/default/admin/params/groupsecurity.html.tmpl
@@ -11,9 +11,6 @@
 %]
 
 [% param_descs = {
-  makeproductgroups => "If this is on, Bugzilla will associate $terms.abug group " _
-                       "with each product in the database, and use it for querying ${terms.bugs}.",
-
   chartgroup => "The name of the group of users who can use the 'New Charts' " _
                 "feature. Administrators should ensure that the public categories " _
                 "and series definitions do not divulge confidential information " _
@@ -51,6 +48,11 @@
               "view it. If it is off, a user needs to be a member of all " _
               "the $terms.bug's groups. Note that in either case, if the " _
               "user has a role on the $terms.bug (e.g. reporter) that may " _
-              "also affect their permissions."
+              "also affect their permissions.",
+
+  minor_update_group => "The name of the group of users who are allowed to " _
+                        "use the 'minor update'-option on $terms.bug changes " _
+                        "to limit mail sending. " _
+                        "Setting this to empty disables the feature.",
  }
 %]
diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl
index ab3521f27e..d31aad825e 100644
--- a/template/en/default/admin/params/ldap.html.tmpl
+++ b/template/en/default/admin/params/ldap.html.tmpl
@@ -35,10 +35,7 @@
 
   LDAPmailattribute => "The name of the attribute of a user in your " _
                        "directory that contains the email address, to be " _
-                       "used as Bugzilla username. If this parameter " _
-                       "is empty, Bugzilla will use the LDAP username"_
-                       " as the Bugzilla username. You may also want" _
-                       " to set the \"emailsuffix\" parameter, in this case.",
+                       "used to send the user email.",
 
   LDAPfilter => "LDAP filter to AND with the <var>LDAPuidattribute</var> for " _
                 "filtering the list of valid users." }
diff --git a/template/en/default/admin/params/memcached.html.tmpl b/template/en/default/admin/params/memcached.html.tmpl
index 997376b491..50ec435fb7 100644
--- a/template/en/default/admin/params/memcached.html.tmpl
+++ b/template/en/default/admin/params/memcached.html.tmpl
@@ -13,7 +13,7 @@
 [% param_descs = {
     memcached_servers =>
       "If this option is set, Bugzilla will integrate with Memcached. " _
-      "Specify one of more server, separated by spaces, using hostname:port " _
+      "Specify one or more servers, separated by spaces, using hostname:port " _
       "notation (for example: 127.0.0.1:11211).",
 
     memcached_namespace =>
diff --git a/template/en/default/admin/products/create.html.tmpl b/template/en/default/admin/products/create.html.tmpl
index b34f67b629..0b116f480d 100644
--- a/template/en/default/admin/products/create.html.tmpl
+++ b/template/en/default/admin/products/create.html.tmpl
@@ -17,9 +17,9 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
+  generate_api_token = 1
   style_urls = ['skins/standard/admin.css']
   javascript_urls = ['js/util.js', 'js/field.js']
-  yui = [ 'autocomplete' ]
 %]
 
 [% DEFAULT
diff --git a/template/en/default/admin/reports/job_queue.html.tmpl b/template/en/default/admin/reports/job_queue.html.tmpl
new file mode 100644
index 0000000000..6057eac7f3
--- /dev/null
+++ b/template/en/default/admin/reports/job_queue.html.tmpl
@@ -0,0 +1,74 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% INCLUDE global/header.html.tmpl
+  title = "Job Queue Status"
+  style_urls = [ "skins/standard/admin.css" ]
+%]
+
+[% IF jobs.size %]
+
+  <p class="report_information">
+    [% IF too_many_jobs %]
+      [% job_count FILTER html %] jobs found,
+      limiting results to [% constants.JOB_QUEUE_VIEW_MAX_JOBS FILTER html %] jobs.
+    [% ELSE %]
+      [% jobs.size FILTER none %] jobs(s) in the queue.
+    [% END %]
+  </p>
+
+  <table id="report" class="hover" cellspacing="0" border="0" width="100%">
+  <tr id="report-header">
+    <th>Next Attempt After</th>
+    <th>Error Count</th>
+    <th>Error Time</th>
+    <th>Error Message</th>
+    <th>Job</th>
+  </tr>
+  [% FOREACH job IN jobs %]
+    <tr class="report item [% loop.count % 2 == 1 ? "report_row_odd" : "report_row_even" %]">
+      <td nowrap>
+        [% IF job.grabbed_until %]
+          [% time2str("%Y-%m-%d %H:%M:%S %Z", job.grabbed_until) FILTER html %]
+        [% ELSE %]
+          [% time2str("%Y-%m-%d %H:%M:%S %Z", job.run_time) FILTER html %]
+        [% END %]
+      </td>
+      <td>
+        [% job.error_count || "-" FILTER html %]
+      </td>
+      <td nowrap>
+        [% IF job.error_count %]
+          [% time2str("%Y-%m-%d %H:%M:%S %Z", job.error_time) FILTER html %]
+        [% ELSE %]
+          -
+        [% END %]
+      </td>
+      <td>
+        [% IF job.grabbed_until %]
+          Deferred
+        [% ELSIF job.error_count %]
+          [% job.error_message FILTER html %]
+        [% ELSE %]
+          -
+        [% END %]
+      </td>
+      <td>[% job.subject || '-' FILTER html %]</td>
+    </tr>
+  [% END %]
+  </table>
+
+[% ELSE %]
+
+  <p class="report_information">
+    The job queue is empty.
+  </p>
+
+[% END %]
+
+[% INCLUDE global/footer.html.tmpl %]
diff --git a/template/en/default/admin/settings/edit.html.tmpl b/template/en/default/admin/settings/edit.html.tmpl
index 86fb79e7bb..75766fcc2e 100644
--- a/template/en/default/admin/settings/edit.html.tmpl
+++ b/template/en/default/admin/settings/edit.html.tmpl
@@ -44,7 +44,7 @@
           <th>Enabled</th>
         </tr>
 
-        [% FOREACH name = settings.keys %]
+        [% FOREACH name = settings.keys.sort %]
           [% checkbox_name = name _ '-enabled' %]
           <tr>
             <td>
diff --git a/template/en/default/admin/sudo.html.tmpl b/template/en/default/admin/sudo.html.tmpl
index bf0cd7b6f5..8f7e3fcea6 100644
--- a/template/en/default/admin/sudo.html.tmpl
+++ b/template/en/default/admin/sudo.html.tmpl
@@ -8,17 +8,18 @@
 
 [% PROCESS global/header.html.tmpl
    title = "Begin sudo session"
+   generate_api_token = 1
    style_urls = ['skins/standard/admin.css']
-   doc_section = "administration.html#impersonating-users"
+   doc_section = "administering/users.html#impersonating-users"
  %]
  
 [% DEFAULT target_login = "" %]
 
 <p>
   The <b>sudo</b> feature of Bugzilla allows you to impersonate a
-  user for a short time  While an sudo session is in progress, every action you 
-  perform will be taking place as if you had logged in as the user whom will be 
-  impersonating.
+  user for a short time. While a sudo session is in progress, every action you
+  perform will be taking place as if you had logged in as the user who will be
+  impersonated.
 </p>
 
 <p class="areyoureallyreallysure">
@@ -66,12 +67,8 @@
   
   [% IF user.authorizer.can_login %]
     <p>
-      Finally, enter <label for="Bugzilla_password">your [% terms.Bugzilla %]
-      password</label>:
-      <input type="hidden" name="Bugzilla_login" value="[% user.login FILTER html %]">
-      <input type="password" id="Bugzilla_password" name="Bugzilla_password" size="20" required>
-      <input type="hidden" name="Bugzilla_login_token"
-             value="[% login_request_token FILTER html %]">
+      Finally, enter <label for="password">your [% terms.Bugzilla %] password</label>:
+      <input type="password" id="password" name="password" size="20" required>
       <br>
       This is done for two reasons.  First of all, it is done to reduce 
       the chances of someone doing large amounts of damage using your 
@@ -79,9 +76,8 @@
       time to consider if you really need to use this feature.
     </p>
   [% END %]
-  
+
   <p>
-    Click the button to begin the session:
     <input type="submit" id="begin_sudo" value="Begin Session">
     <input type="hidden" name="action" value="begin-sudo">
     <input type="hidden" name="token" value="[% token FILTER html %]">
diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl
index 993181c7f4..2c8eb5fe08 100644
--- a/template/en/default/admin/table.html.tmpl
+++ b/template/en/default/admin/table.html.tmpl
@@ -69,7 +69,7 @@
   <tr class="column_header">
     [% FOREACH c = columns %]
       [%# Default to align left for headers %]
-      <th class="[% (c.align || 'left') FILTER css_class_quote %]">
+      <th class="[% (c.class || 'left') FILTER css_class_quote %]">
         [% c.heading FILTER html %]
       </th>
     [% END %]
diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index 28fc50a2c6..07b6ccb25e 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -39,7 +39,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#deleting-users"
+  doc_section = "administering/users.html#deleting-users"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
@@ -51,9 +51,15 @@
     <th>Field</th>
     <th>Value</th>
   </tr>
+  [% IF !Param('use_email_as_login') %]
+    <tr>
+      <th>Login:</th>
+      <td>[% otheruser.login FILTER html %]</td>
+    </tr>
+  [% END %]
   <tr>
-    <th>Login name:</th>
-    <td>[% otheruser.login FILTER html %]</td>
+    <th>Email address:</th>
+    <td>[% otheruser.email FILTER html %]</td>
   </tr>
   <tr>
     <th>Real name:</th>
@@ -429,7 +435,7 @@
             The user has performed audited administrative tasks
             that are logged in the database.
             If you delete this user account, the audit log entries
-            will no longer be indentifiable.
+            will no longer be identifiable.
           </li>
         [% END %]
         [% Hook.process('warn_safe') %]
diff --git a/template/en/default/admin/users/create.html.tmpl b/template/en/default/admin/users/create.html.tmpl
index f85f416f41..6fbd1dc2f6 100644
--- a/template/en/default/admin/users/create.html.tmpl
+++ b/template/en/default/admin/users/create.html.tmpl
@@ -15,7 +15,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Add user"
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#creating-new-users"
+  doc_section = "administering/users.html#creating-new-users"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
diff --git a/template/en/default/admin/users/edit.html.tmpl b/template/en/default/admin/users/edit.html.tmpl
index b67e9ae76d..41a0131312 100644
--- a/template/en/default/admin/users/edit.html.tmpl
+++ b/template/en/default/admin/users/edit.html.tmpl
@@ -23,7 +23,7 @@
   title = title
   message = message
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#modifying-users"
+  doc_section = "administering/users.html#modifying-users"
   javascript_urls = [ 'js/field.js' ]
 %]
 
@@ -159,7 +159,7 @@
     [% IF listselectionvalues %],
     [% END %]
   [% END %]
-  [% IF listselectionvalues.matchtype != 'exact' %]
+  [% IF listselectionvalues && listselectionvalues.matchtype != 'exact' %]
     go
     <a href="editusers.cgi?action=list[% INCLUDE listselectionurlparams %]">back
     to the user list</a>,
diff --git a/template/en/default/admin/users/list.html.tmpl b/template/en/default/admin/users/list.html.tmpl
index bfe1be1398..168e6dd90c 100644
--- a/template/en/default/admin/users/list.html.tmpl
+++ b/template/en/default/admin/users/list.html.tmpl
@@ -17,7 +17,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Select user"
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#user-administration"
+  doc_section = "administering/users.html"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
@@ -27,35 +27,44 @@
 [% listselectionurlparams = INCLUDE listselectionurlparams %]
 
 [% columns =
-  [{name               => 'login_name'
-    heading            => 'Edit user...'
-    contentlink        => 'editusers.cgi?action=edit&amp;userid=%%userid%%' _
-                          listselectionurlparams
-   }
-   {name               => 'realname'
-    heading            => 'Real name'
-   }
-   {name               => 'last_seen_date'
-    heading            => 'Last Login'
-   }
-   {heading            => 'Account History'
-    content            => 'View'
-    contentlink        => 'editusers.cgi?action=activity' _
-                                  '&amp;userid=%%userid%%' _
-                                  listselectionurlparams
+  [{name        => 'login_name'
+    heading     => 'Edit user...'
+    contentlink => 'editusers.cgi?action=edit&amp;userid=%%userid%%' _
+                   listselectionurlparams
+   },
+   {name        => 'email'
+    heading     => 'Email address'
+   },
+   {name        => 'realname'
+    heading     => 'Real name'
+   },
+   {name        => 'last_seen_date'
+    heading     => 'Last Login'
+   },
+   {name        => 'view_history_link',
+    heading     => 'Account History'
+    content     => 'View'
+    contentlink => 'editusers.cgi?action=activity' _
+                    '&amp;userid=%%userid%%' _
+                    listselectionurlparams
+   },
+   {name        => 'action_link',
+    heading     => 'Action'
+    content     => 'Delete'
+    contentlink => 'editusers.cgi?action=del' _
+                      '&amp;userid=%%userid%%' _
+                      listselectionurlparams
    }
   ]
-%]
+ %]
+
+[%# Eliminate inappropriate columns, starting at the end %]
+[% IF NOT (Param('allowuserdeletion') && editusers) %]
+  [% CALL columns.splice(5, 1) %]
+[% END %]
 
-[% IF Param('allowuserdeletion') && editusers %]
-  [% columns.push({heading     => 'Action'
-                   content     => 'Delete'
-                   contentlink => 'editusers.cgi?action=del' _
-                                  '&amp;userid=%%userid%%' _
-                                  listselectionurlparams
-                  }
-                 )
-  %]
+[% IF Param('use_email_as_login') %]
+  [% CALL columns.splice(1, 1) %]
 [% END %]
 
 [%# Disabled users are crossed out. Missing realnames are noticed in red. %]
diff --git a/template/en/default/admin/users/responsibilities.html.tmpl b/template/en/default/admin/users/responsibilities.html.tmpl
index 23eb9587b5..defe471738 100644
--- a/template/en/default/admin/users/responsibilities.html.tmpl
+++ b/template/en/default/admin/users/responsibilities.html.tmpl
@@ -15,7 +15,7 @@
     [% END %]
     <tbody>
     <tr>
-      <th colspan="3" class="product">Product: [% item.product.name FILTER html %]</th>
+      <th colspan="4" class="product">Product: [% item.product.name FILTER html %]</th>
     </tr>
     <tr>
       <th>Component</th>
diff --git a/template/en/default/admin/users/search.html.tmpl b/template/en/default/admin/users/search.html.tmpl
index a23796cd63..73392631a9 100644
--- a/template/en/default/admin/users/search.html.tmpl
+++ b/template/en/default/admin/users/search.html.tmpl
@@ -18,7 +18,7 @@
 [% PROCESS global/header.html.tmpl
   title = "Search users"
   style_urls = ['skins/standard/admin.css']
-  doc_section = "administration.html#managing-other-users"
+  doc_section = "administering/users.html"
 %]
 
 [% PROCESS admin/users/listselectvars.html.tmpl
@@ -30,8 +30,10 @@
 <p><label for="matchvalue">List users with</label>
 <select id="matchvalue" name="matchvalue">
   <option value="login_name">login name</option>
+  <option value="email">email address</option>
   <option value="realname">real name</option>
   <option value="userid">user id</option>
+  <option value="extern_id">external id</option>
 </select>
 <label for="matchstr">matching</label>
 <input size="32" name="matchstr" id="matchstr" autofocus>
diff --git a/template/en/default/admin/users/userdata.html.tmpl b/template/en/default/admin/users/userdata.html.tmpl
index c08cd00180..8f925e69aa 100644
--- a/template/en/default/admin/users/userdata.html.tmpl
+++ b/template/en/default/admin/users/userdata.html.tmpl
@@ -17,13 +17,31 @@
   var disable_mail_manually_set = [% (otheruser.email_disabled ? 1 : 0) FILTER js %];
 </script>
 
+[% IF NOT Param('use_email_as_login') %]
+  <tr>
+    <th><label for="login">Login:</label></th>
+    <td>
+      [% IF editusers %]
+        <input size="64" maxlength="255" id="login" name="login"
+               value="[% otheruser.login FILTER html %]"
+               [%- " autofocus" UNLESS editform %] required>
+      [% ELSE %]
+        [% otheruser.login FILTER html %]
+      [% END %]
+    </td>
+  </tr>
+[% END %]
 <tr>
-  <th><label for="login">Login name:</label></th>
+  <th>
+    <label for="email">
+      Email address [% ' (login)' IF Param('use_email_as_login') %]:
+    </label>
+  </th>
   <td>
     [% IF editusers %]
-      <input size="64" maxlength="255" id="login" name="login"
-             value="[% otheruser.login FILTER html %]"
-             [%- " autofocus" UNLESS editform %] required>
+      <input size="64" maxlength="255" id="email" name="email"
+             value="[% otheruser.email FILTER html %]"
+             [%- " autofocus" IF Param('use_email_as_login') AND NOT editform %] required>
       [% IF editform %]
         [% IF !otheruser.in_group('bz_sudo_protect') %]
           <br>
@@ -32,7 +50,7 @@
         [% END %]
       [% END %]
     [% ELSE %]
-      [% otheruser.login FILTER html %]
+      [% otheruser.email FILTER html %]
     [% END %]
   </td>
 </tr>
diff --git a/template/en/default/admin/versions/create.html.tmpl b/template/en/default/admin/versions/create.html.tmpl
index 648adcebd7..cb7ae84464 100644
--- a/template/en/default/admin/versions/create.html.tmpl
+++ b/template/en/default/admin/versions/create.html.tmpl
@@ -25,7 +25,7 @@
     <tr>
       <th><label for="version">Version:</label></th>
       <td><input id="version" size="64" maxlength="64" name="version"
-                 value="" required></td>
+                 value="" required autofocus></td>
     </tr>
   </table>
   <input type="submit" id="create" value="Add">
diff --git a/template/en/default/admin/versions/edit.html.tmpl b/template/en/default/admin/versions/edit.html.tmpl
index 1ef0b2f66e..215a0c9c27 100644
--- a/template/en/default/admin/versions/edit.html.tmpl
+++ b/template/en/default/admin/versions/edit.html.tmpl
@@ -26,7 +26,7 @@
       <th><label for="version">Version:</label></th>
       <td>
         <input id="version" size="64" maxlength="64" name="version"
-               value="[% version.name FILTER html %]" required>
+               value="[% version.name FILTER html %]" required autofocus>
       </td>
     </tr>
     <tr>
diff --git a/template/en/default/admin/workflow/edit.html.tmpl b/template/en/default/admin/workflow/edit.html.tmpl
index a85db2339d..51943196fe 100644
--- a/template/en/default/admin/workflow/edit.html.tmpl
+++ b/template/en/default/admin/workflow/edit.html.tmpl
@@ -62,7 +62,7 @@
           [% checked = workflow.${status.id}.${new_status.id}.defined ? 1 : 0 %]
           [% mandatory = (status.id && new_status.name == Param("duplicate_or_move_bug_status")) ? 1 : 0 %]
           <td class="[% "checked" IF checked || mandatory %]"
-              title="From [% status.name FILTER html %] to [% new_status.name FILTER html %]">
+              title="From [% display_value("bug_status", status.name) FILTER html %] to [% display_value("bug_status", new_status.name) FILTER html %]">
             <input type="checkbox" name="w_[% status.id %]_[% new_status.id %]"
                    id="w_[% status.id %]_[% new_status.id %]" onclick="toggle_cell(this)"
                    [%+ "checked='checked'" IF checked || mandatory %]
@@ -83,7 +83,7 @@
   this [% terms.bug %] status must then be valid (this is the reason why you cannot edit
   them above).<br>
   Note: you can change this setting by visiting the
-  <a href="editparams.cgi?section=bugchange#duplicate_or_move_bug_status">Parameters</a>
+  <a href="editparams.cgi?section=bugchange#duplicate_or_move_bug_status_desc">Parameters</a>
   page and editing the <i>duplicate_or_move_bug_status</i> parameter.
 </p>
 
diff --git a/template/en/default/attachment/confirm-delete.html.tmpl b/template/en/default/attachment/confirm-delete.html.tmpl
index dfc95c8f83..5108692a86 100644
--- a/template/en/default/attachment/confirm-delete.html.tmpl
+++ b/template/en/default/attachment/confirm-delete.html.tmpl
@@ -18,7 +18,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "using.html#attachments"
+  doc_section = "using/editing.html#attachments"
 %]
 
 <table id="admin_table">
diff --git a/template/en/default/attachment/create.html.tmpl b/template/en/default/attachment/create.html.tmpl
index 18cc126405..9b31393090 100644
--- a/template/en/default/attachment/create.html.tmpl
+++ b/template/en/default/attachment/create.html.tmpl
@@ -16,10 +16,11 @@
   title = title
   header = header
   subheader = subheader
+  generate_api_token = 1
+  yui = ['json', 'connection']
   style_urls = ['skins/standard/bug.css']
-  yui = [ 'autocomplete' ]
   javascript_urls = [ "js/attachment.js", 'js/field.js', "js/util.js", "js/TUI.js" ]
-  doc_section = "using.html#attachments"
+  doc_section = "using/editing.html#attachments"
 %]
 
 <script type="text/javascript">
@@ -118,6 +119,17 @@ TUI_hide_default('attachment_text_field');
 
     [% Hook.process('form_before_submit') %]
 
+    [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+      <tr>
+        <th>&nbsp;</th>
+        <td>
+          <input type="checkbox" name="minor_update" value="1">
+          <label class="" for="minor_update">
+            This is a minor update (do not send email)
+          </label>
+        </td>
+      </tr>
+    [% END %]
     <tr>
       <th>&nbsp;</th>
       <td><input type="submit" id="create" value="Submit"></td>
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 48e4f4af0a..e6ca90c2d7 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -11,7 +11,7 @@
 <tr class="attachment_data">
   <th><label for="data">File</label>:</th>
   <td>
-    <em>Enter the path to the file on your computer</em> (or
+    (or
     <a id="attachment_data_controller" href="javascript:TUI_toggle_class('attachment_text_field');
                                              javascript:TUI_toggle_class('attachment_data')"
     >paste text as attachment</a>).<br>
@@ -31,9 +31,8 @@
   </td>
 </tr>
 <tr>
-  <th class="required"><label for="description">Description</label>:</th>
+  <th class="required"><label for="description">Brief Description</label>:</th>
   <td>
-    <em>Describe the attachment briefly.</em><br>
     <input type="text" id="description" name="description" class="required"
            size="60" maxlength="200">
   </td>
@@ -68,6 +67,9 @@
       <label for="manual">enter manually</label>:
       <input type="text" name="contenttypeentry" id="contenttypeentry"
              size="30" maxlength="200"
+             pattern="([% constants.LEGAL_CONTENT_TYPES.join('|') FILTER html %])/.+"
+             title="The content type must be of the form 'type/subtype', where 'type'
+                    is one of: [% constants.LEGAL_CONTENT_TYPES.join(', ') FILTER html %]"
              onchange="if (this.value) this.form.contenttypemethod[2].checked = true;">
   </td>
 </tr>
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 2a32de974b..2b3e0d75d8 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -37,8 +37,7 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
   [% subheader = BLOCK %]
     [% bugsummary FILTER html %]
   [% END %]
-  [% PROCESS global/header.html.tmpl doc_section = "using.html#patch-viewer"
-                                     javascript_urls = [ "js/attachment.js" ]
+  [% PROCESS global/header.html.tmpl javascript_urls = [ "js/attachment.js" ]
                                      style_urls = ['skins/standard/bug.css'] %]
 [% ELSE %]
   <!DOCTYPE html>
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 77e3e571cb..767c2296bc 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -21,10 +21,11 @@
   title = title
   header = header
   subheader = subheader
-  doc_section = "using.html#attachments"
+  generate_api_token = 1
+  doc_section = "using/editing.html#attachments"
+  yui = ['json', 'connection']
   javascript_urls = ['js/attachment.js', 'js/field.js']
   style_urls = ['skins/standard/bug.css']
-  yui = [ 'autocomplete' ]
   bodyclasses = "no_javascript"
 %]
 
@@ -46,9 +47,9 @@
     <div id="attachment_attributes">
       <div id="attachment_information_read_only" class="[% "bz_private" IF attachment.isprivate %]">
         <div class="title">
-          [% "[patch]" IF attachment.ispatch%] 
-          <span class="[% "bz_obsolete" IF attachment.isobsolete %]" title="[% "obsolete" IF attachment.isobsolete %]">              
-            [% attachment.description FILTER html %]
+          [% IF attachment.ispatch %][patch][% END %]
+          <span [% IF attachment.isobsolete %]class="bz_obsolete" title="obsolete"[% END %]>
+            [%~ attachment.description FILTER html ~%]
           </span>
           [% IF can_edit %]
             <span class="bz_edit">(<a href="javascript:toggle_attachment_details_visibility()">edit details</a>)</span>
@@ -94,9 +95,12 @@
             <label for="contenttypeentry">MIME Type:</label>
             <input type="text" size="20" class="text block[% editable_or_hide %]"
                    id="contenttypeentry" name="contenttypeentry"
-                   value="[% attachment.contenttype FILTER html %]">                   
+                   pattern="([% constants.LEGAL_CONTENT_TYPES.join('|') FILTER html %])/.+"
+                   title="The content type must be of the form 'type/subtype', where 'type'
+                          is one of: [% constants.LEGAL_CONTENT_TYPES.join(', ') FILTER html %]"
+                   value="[% attachment.contenttype FILTER html %]">
           </div>
-          
+
           <div id="attachment_creator">
             <span class="label">Creator:</span>
             [%+ INCLUDE global/user.html.tmpl who = attachment.attacher %]
@@ -187,9 +191,12 @@
                   [% END %]
                 </a>
               </p>
-            [% ELSIF attachment.contenttype == "text/html" %]
+            [% ELSIF attachment.contenttype.match('^text/') %]
               [%# For security reasons (clickjacking, embedded scripts), we never
-                # render HTML pages from here. The source code is displayed instead. %]
+                # render HTML, XML or SVG pages directly. The source code for all
+                # text/* MIME types is displayed instead. If someone tries to abuse
+                # Bugzilla by manually editing the MIME type, it will be caught
+                # by the iframe below, thanks to its 'sandbox' attribute. %]
               [% INCLUDE global/textarea.html.tmpl
                  id      = 'viewFrame'
                  minrows = 10
@@ -198,6 +205,8 @@
                  readonly = 'readonly'
               %]
             [% ELSE %]
+              [%# The 'sandbox' attribute causes all scripts and form submissions
+                # embedded in the attachment to be disabled, for security reasons. %]
               <iframe id="viewFrame" src="attachment.cgi?id=[% attachment.id %]" sandbox>
                 <b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
                 <a href="attachment.cgi?id=[% attachment.id %]">View the attachment on a separate page</a>.</b>
@@ -282,27 +291,35 @@
 
         [% IF user.id %]       
           <div id="update_container">
+            [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+              <input type="checkbox" name="minor_update" value="1">
+              <label class="" for="minor_update">
+                This is a minor update (do not send email)
+              </label><br>
+            [% END %]
             <input type="submit" value="Submit" id="update">
           </div>
-        [% END %]        
-      </div>        
+        [% END %]
+      </div>
     </div>
   </div>
 </form>
 
-<div id="attachment_actions">
-  <span class="label">Actions:</span>
-  <a href="attachment.cgi?id=[% attachment.id %]">View</a>
-  [% IF use_patchviewer %]
-    | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=diff">Diff</a>
-  [% END %]
-  [% IF Param("allow_attachment_deletion")
-        && user.in_group('admin')
-        && attachment.datasize > 0 %]
-    | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=delete">Delete</a>
-  [% END %]
-  [% Hook.process('action') %]
-</div>
+[% IF attachment.datasize %]
+  <div id="attachment_actions">
+    <span class="label">Actions:</span>
+    <a href="attachment.cgi?id=[% attachment.id %]">
+      [% IF attachment.is_viewable %]View[% ELSE %]Download[% END %]
+    </a>
+    [% IF use_patchviewer %]
+      | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=diff">Diff</a>
+    [% END %]
+    [% IF Param("allow_attachment_deletion") && user.in_group('admin') %]
+      | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=delete">Delete</a>
+    [% END %]
+    [% Hook.process('action') %]
+  </div>
+[% END %]
 
 <div id="attachment_list">
   Attachments on [% "$terms.bug ${attachment.bug_id}" FILTER bug_link(attachment.bug_id) FILTER none %]:
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 4599f38ed6..97fd2dc951 100644
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -70,7 +70,15 @@ function toggle_display(link) {
             <a href="attachment.cgi?id=[% attachment.id %]"
                title="View the content of the attachment">
           [% END %]
-          <b>[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</b>
+          <b>
+            [% IF attachment.isobsolete %]
+              <span class="bz_obsolete">
+            [% END %]
+            [% attachment.description FILTER html %]
+            [% IF attachment.isobsolete %]
+              </span>
+            [% END %]
+          </b>
           [% "</a>" IF attachment.datasize %]
 
           <span class="bz_attach_extra_info">
@@ -114,7 +122,7 @@ function toggle_display(link) {
                 [% ELSE %]
                   [% flag.setter.nick FILTER html %]:
                 [% END %]
-                [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
+                [%+ flag.type.name FILTER html %][% flag.status %]
                 [%+ IF flag.status == "?" && flag.requestee %]
                   [% IF user.id %]
                     (<span title="[% flag.requestee.identity FILTER html %]">[% flag.requestee.nick FILTER html %]</span>)
diff --git a/template/en/default/attachment/midair.html.tmpl b/template/en/default/attachment/midair.html.tmpl
index 68db5d974b..4dd44ef4de 100644
--- a/template/en/default/attachment/midair.html.tmpl
+++ b/template/en/default/attachment/midair.html.tmpl
@@ -14,10 +14,6 @@
   # attachment: object; the attachment being changed.
   #%]
 
-[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
 [% PROCESS global/header.html.tmpl title = "Mid-air collision!" %]
 
 <h1>Mid-air collision detected!</h1>
@@ -33,11 +29,11 @@
   [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
 </p>
 
-[% IF cgi.param("comment") %]
+[% IF cgi_param("comment") %]
 <p>
   Your comment was:<br>
   <blockquote><pre class="bz_comment_text">
-    [% cgi.param("comment") FILTER html %]
+    [% cgi_param("comment") FILTER html %]
   </pre></blockquote>
 </p>
 [% END %]
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index e2c95cb80e..16d0933724 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -34,7 +34,15 @@
       <th colspan="6" class="bz_attach_footer">Attachment #[% a.id %]</th>
     </tr>
     <tr>
-      <td>[% a.description FILTER html FILTER obsolete(a.isobsolete) %]</td>
+      <td>
+        [% IF a.isobsolete %]
+          <span class="bz_obsolete">
+        [% END %]
+        [% a.description FILTER html %]
+        [% IF a.isobsolete %]
+          </span>
+        [% END %]
+      </td>
 
       <td>
         [% IF a.ispatch %]
diff --git a/template/en/default/bug/comment.html.tmpl b/template/en/default/bug/comment.html.tmpl
index b748b71fd1..76054f92ab 100644
--- a/template/en/default/bug/comment.html.tmpl
+++ b/template/en/default/bug/comment.html.tmpl
@@ -32,14 +32,15 @@
   <div id="comment_preview" class="bz_default_hidden bz_comment">
     <div id="comment_preview_loading" class="bz_default_hidden">Generating Preview...</div>
     <div id="comment_preview_error" class="bz_default_hidden"></div>
-    <pre id="comment_preview_text" class="bz_comment_text"></pre>
+    <div id="comment_preview_text" class="bz_comment_text"></div>
   </div>
 [% END %]
 
-[% IF feature_enabled('markdown') AND  user.settings.use_markdown.value == 'on' %]
+[% IF user.use_markdown %]
   <div id="comment_markdown">
-    <input type="checkbox" name="use_markdown" id="use_markdown" value="1"
-    [% "checked=\"checked\"" IF user.settings.use_markdown.value == 'on' %] >
+    <input type="checkbox" name="use_markdown"
+           id="use_markdown" value="1" checked="checked"
+           onchange="refresh_markdown_preview([% bug.id FILTER none %])">
     <label id="use_markdown_label" for="use_markdown">Use Markdown for this [% terms.comment %]</label>
     (<a href="page.cgi?id=markdown.html" target="_blank" title="View Markdown Syntax Guide">help</a>)
   </div>
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 617f494713..3074bf8e94 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -8,80 +8,24 @@
 
 [% PROCESS bug/time.html.tmpl %]
 
-<script src="[% 'js/comments.js' FILTER mtime %]" type="text/javascript">
-</script>
-
 <script type="text/javascript">
-<!--
-  /* Adds the reply text to the 'comment' textarea */
-  function replyToComment(id, real_id, name, text) {
-      var prefix = "(In reply to " + name + " from comment #" + id + ")\n";
-      var replytext = "";
-      [% IF user.settings.quote_replies.value == 'quoted_reply' %]
-        /* pre id="comment_name_N" */
-
-        if (text == null) {
-            var text_elem = document.getElementById('comment_text_'+id);
-            text = getText(text_elem);
-        }
-        replytext = prefix + wrapReplyText(text);
-      [% ELSIF user.settings.quote_replies.value == 'simple_reply' %]
-        replytext = prefix;
-      [% END %]
-
-      [% IF user.is_insider %]
-        if (document.getElementById('isprivate_' + real_id).checked) {
-            document.getElementById('newcommentprivacy').checked = 'checked';
-            updateCommentTagControl(document.getElementById('newcommentprivacy'), 'comment'); 
-        }
-      [% END %]
-
-      /* <textarea id="comment"> */
-      var textarea = document.getElementById('comment');
-      if (textarea.value != replytext) {
-          textarea.value += replytext;
-      }
-
-      textarea.focus();
-  } 
-
-  function replyToMarkdownComment(id, real_id, name) {
-      var textarea = document.getElementById('comment');
-      var comment = textarea.value;
-      textarea.value += "Fetching comment...";
-      YAHOO.util.Connect.setDefaultPostHeader('application/json', true);
-      YAHOO.util.Connect.asyncRequest('POST', 'jsonrpc.cgi',
-      {
-          success: function(res) {
-              var data = YAHOO.lang.JSON.parse(res.responseText);
-              if (!data.error) {
-                  textarea.value = comment;
-                  var text = data.result.comments[real_id].text;
-                  replyToComment(id, real_id, name, text);
-              } else {
-                  replyToComment(id, real_id, name, null);
-              }
-          },
-          failure: function(res) {
-              /* On failure, quote the comment as plain-text */
-              replyToComment(id, real_id, name, null);
-          }
-      },
-      YAHOO.lang.JSON.stringify({
-          version: "1.1",
-          method: "Bug.comments",
-          params: {
-              Bugzilla_api_token: BUGZILLA.api_token,
-              comment_ids: [real_id],
-          }
-      })
-      );
-  }
-//-->
+  var replyCommentConfig = {
+      quote_replies : "[% user.settings.quote_replies.value FILTER js %]",
+      is_insider : [% user.is_insider ? 1 : 0 %],
+      markdown_fetching_comment : "Fetching comment..."
+  };
 </script>
 
 [% DEFAULT mode = "show" %]
 [% user_cache = template_cache.users %]
+[% markdown_enabled = feature_enabled('jsonrpc') AND user.settings.use_markdown.value == "on" %]
+[% can_edit_comments = bug.check_can_change_field('longdesc', 0, 1) %]
+[% can_tag_comments = feature_enabled('jsonrpc') AND user.can_tag_comments %]
+
+[% markdown_enabled = feature_enabled('jsonrpc') AND user.settings.use_markdown.value == "on" %]
+[% IF markdown_enabled %]
+  <script>hljs.initHighlightingOnLoad();</script>
+[% END %]
 
 <!-- This auto-sizes the comments and positions the collapse/expand links 
      to the right. -->
@@ -89,9 +33,7 @@
 <tr>
 <td>
 
-[% FOREACH comment = comments %]
-  [% PROCESS a_comment %]
-[% END %]
+[% PROCESS display_comments %]
 
 [% IF mode == "edit" && user.id
       && user.settings.comment_box_position.value == "before_comments" %]
@@ -132,10 +74,11 @@
 [%# Block for individual comments                                            #%]
 [%############################################################################%]
 
-[% BLOCK a_comment %]
-  [% RETURN IF comment.is_private AND NOT (user.is_insider || user.id == comment.author.id) %]
-  [% comment_text = comment.body_full %]
-  [% RETURN IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
+[% BLOCK display_comments %]
+  [% FOREACH comment = comments %]
+    [% NEXT IF comment.is_private AND NOT (user.is_insider || user.id == comment.author.id) %]
+    [% comment_text = comment.body_full %]
+    [% NEXT IF comment_text == '' AND (comment.work_time - 0) != 0 AND !user.is_timetracker %]
 
     <div id="c[% comment.count %]" class="bz_comment[% " bz_private" IF comment.is_private %]
                 [% " bz_default_collapsed" IF comment.collapsed %]
@@ -155,19 +98,20 @@
             [% IF comment.collapsed %]
               <span class="bz_collapsed_actions">
             [% END %]
-            [% IF bug.check_can_change_field('longdesc', 0, 1) %]
-              [% IF user.can_tag_comments %]
+            [% IF can_edit_comments %]
+              [% IF can_tag_comments %]
                 [<a href="#"
                     onclick="YAHOO.bugzilla.commentTagging.toggle([% comment.id %], [% comment.count %]);return false">tag</a>]
               [% END %]
+              [% replyto_author = comment.author.name || comment.author.nick FILTER html %]
+              [% replyto_header = "(In reply to $replyto_author from comment #$comment.count)" %]
               [<a class="bz_reply_link" href="#add_comment"
                 [% IF user.settings.quote_replies.value != 'off' %]
                   onclick="
-                  [% IF feature_enabled('jsonrpc') && comment.is_markdown %]
-                    replyToMarkdownComment('[% comment.count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]'); return false;"
+                  [% IF markdown_enabled AND comment.is_markdown %]
+                    replyToMarkdownComment('[% comment.count %]', '[% comment.id %]', '[% replyto_header FILTER js %]'); return false;"
                   [% ELSE %]
-                    replyToComment('[% comment.count %]', '[% comment.id %]', '[% comment.author.name || comment.author.nick FILTER html FILTER js %]', null); return false;"
-
+                    replyToComment('[% comment.count %]', '[% comment.id %]', '[% replyto_header FILTER js %]', null); return false;"
                   [% END %]
                 [% END %]
               >reply</a>]
@@ -187,7 +131,7 @@
           </span>
         [% END %]
 
-        [% IF mode == "edit" && user.is_insider && bug.check_can_change_field('longdesc', 0, 1) %]
+        [% IF mode == "edit" && can_edit_comments && user.is_insider %]
           <div class="bz_private_checkbox">
             <input type="hidden" value="1"
                    name="defined_isprivate_[% comment.id %]">
@@ -207,6 +151,7 @@
         </span>
 
         <span class="bz_comment_user">
+          [% Hook.process('user-start', 'bug/comments.html.tmpl') %]
           [%# No need to recreate the exact same template if we already have it. %]
           [% commenter_id = comment.author.id %]
           [% UNLESS user_cache.$commenter_id %]
@@ -267,12 +212,13 @@
 [%# Don't indent the <pre> block, since then the spaces are displayed in the
   # generated HTML
   #%]
-<pre class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
+<[% user.use_markdown(comment) ? "div" : "pre" %] class="bz_comment_text[% " collapsed" IF comment.collapsed %]"
   [% IF mode == "edit" || comment.collapsed %]
     id="comment_text_[% comment.count FILTER none %]"
   [% END %]>
   [%- comment_text FILTER markdown(bug, comment) -%]
-</pre>
+</[% user.use_markdown(comment) ? "div" : "pre" %]>
     [% Hook.process('a_comment-end', 'bug/comments.html.tmpl') %]
     </div>
+  [% END %]
 [% END %]
diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl
index e85a36469e..0a7b5223a0 100644
--- a/template/en/default/bug/create/comment-guided.txt.tmpl
+++ b/template/en/default/bug/create/comment-guided.txt.tmpl
@@ -8,27 +8,27 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 User-Agent:       [%+ cgi.user_agent() %]
-Build Identifier: [%+ cgi.param("buildid") %]
+Build Identifier: [%+ cgi_param("buildid") %]
 
-[%+ cgi.param("comment") IF cgi.param("comment") %]
+[%+ cgi_param("comment") IF cgi_param("comment") %]
 
-[%+ IF cgi.param("reproducible") != "Choose one..." -%]
-Reproducible: [%+ cgi.param("reproducible") %]
+[%+ IF cgi_param("reproducible") != "Choose one..." -%]
+Reproducible: [%+ cgi_param("reproducible") %]
 [% END %]
 
-[% IF !(cgi.param("reproduce_steps").match('^1\.\s*2\.\s*3\.\s*$') || cgi.param("reproduce_steps").match('^\s*$')) %]
+[% IF !(cgi_param("reproduce_steps").match('^1\.\s*2\.\s*3\.\s*$') || cgi_param("reproduce_steps").match('^\s*$')) %]
 Steps to Reproduce:
-[%+ cgi.param("reproduce_steps") %]
+[%+ cgi_param("reproduce_steps") %]
 [% END %]
 
-[% IF cgi.param("actual_results") -%]
+[% IF cgi_param("actual_results") -%]
 Actual Results:  
-[%+ cgi.param("actual_results") %]
+[%+ cgi_param("actual_results") %]
 [% END %]
 
-[% IF cgi.param("expected_results") %]
+[% IF cgi_param("expected_results") %]
 Expected Results:  
-[%+ cgi.param("expected_results") %]
+[%+ cgi_param("expected_results") %]
 [% END %]
 
-[%+ cgi.param("additional_info") %]
+[%+ cgi_param("additional_info") %]
diff --git a/template/en/default/bug/create/comment.txt.tmpl b/template/en/default/bug/create/comment.txt.tmpl
index 4cd78ddd1b..8eb6bfaf09 100644
--- a/template/en/default/bug/create/comment.txt.tmpl
+++ b/template/en/default/bug/create/comment.txt.tmpl
@@ -5,8 +5,7 @@
   # This Source Code Form is "Incompatible With Secondary Licenses", as
   # defined by the Mozilla Public License, v. 2.0.
   #%]
-[% USE Bugzilla %]
-[% Hook.process("form") %]
 
+[% Hook.process("form") %]
 
-[% Bugzilla.cgi.param("comment") %]
+[% cgi_param("comment") %]
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 1adae45882..0169d9e6b2 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -10,9 +10,6 @@
   # This template has the same interface as create.html.tmpl
   #%]
 
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
 [% PROCESS global/header.html.tmpl
    title = "Enter $terms.ABug"
    onload = "PutDescription()"
@@ -165,8 +162,8 @@ function PutDescription() {
   </tr>
 
   [%# Accept URL parameter build ID for non-browser products %]
-  [% IF cgi.param("buildid") %]
-    [% buildid = cgi.param("buildid") %]
+  [% IF cgi_param("buildid") %]
+    [% buildid = cgi_param("buildid") %]
   [% END %]
 
   <tr class="guided_form_field">
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 0815f36009..bea4befba1 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -9,12 +9,19 @@
 [% title = BLOCK %]Enter [% terms.Bug %]: [% product.name FILTER html %][% END %]
 [% use_qa_contact = Param("useqacontact") %]
 
+[% style_urls = ['skins/standard/bug.css'] %]
+[% javascript_urls = [ "js/attachment.js", "js/util.js", "js/field.js", "js/TUI.js", "js/bug.js" ] %]
+
+[% markdown_enabled = feature_enabled('jsonrpc') AND user.settings.use_markdown.value == "on" %]
+[% IF markdown_enabled %]
+  [% javascript_urls.push("js/highlight.js/highlight.pack.js") %]
+  [% style_urls.push("js/highlight.js/styles/github.css") %]
+[% END %]
+
 [% PROCESS global/header.html.tmpl
   title = title
-  yui = [ 'autocomplete', 'calendar', 'datatable', 'button' ]
-  style_urls = ['skins/standard/bug.css']
-  javascript_urls = [ "js/attachment.js", "js/util.js",
-                      "js/field.js", "js/TUI.js", "js/bug.js" ]
+  generate_api_token = 1
+  yui = ['datatable', 'button']
   onload = "set_assign_to($use_qa_contact); hideElementById('attachment_true');
             showElementById('attachment_false'); showElementById('btn_no_attachment');"
 %]
@@ -268,8 +275,9 @@ TUI_hide_default('attachment_text_field');
 
     <td>&nbsp;</td>
     [%# Calculate the number of rows we can use for flags %]
-    [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) +
-                      (user.is_timetracker ? 3 : 0)
+    [% num_rows = 5 + (Param("useqacontact") ? 1 : 0) +
+                      (user.is_timetracker ? 3 : 0) +
+                      (user.in_group('editbugs', product.id) ? 1 : 0)
     %]
 
     <td rowspan="[% num_rows FILTER html %]">
@@ -379,6 +387,7 @@ TUI_hide_default('attachment_text_field');
   </tr>
 [% END %]
 
+[% IF user.in_group('editbugs', product.id) %]
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.alias editable = 1
@@ -387,6 +396,7 @@ TUI_hide_default('attachment_text_field');
       <input name="alias" size="20" value="[% alias FILTER html %]">
     </td>
   </tr>
+[% END %]
 
   <tr>
     [% INCLUDE "bug/field-label.html.tmpl"
@@ -536,7 +546,7 @@ TUI_hide_default('attachment_text_field');
     <tr>
       [% INCLUDE bug/field.html.tmpl
         bug = default, field = bug_fields.keywords, editable = 1,
-        value = keywords, possible_values = all_keywords,
+        value = keywords, possible_values = active_keywords,
         desc_url = "describekeywords.cgi", value_span = 3
       %]
     </tr>
@@ -615,8 +625,11 @@ TUI_hide_default('attachment_text_field');
       <input type="submit" id="commit" value="Submit [% terms.Bug %]">
       &nbsp;&nbsp;&nbsp;&nbsp;
       <input type="submit" name="maketemplate" id="maketemplate"
-             value="Remember values as bookmarkable template"
+             value="Make Template"
              onclick="bz_no_validate_enter_bug=true" class="expert_fields">
+      <span class="expert_fields">
+        (useful for filing several similar bugs)
+      </span>
     </td>
   </tr>
 </tbody>
diff --git a/template/en/default/bug/create/make-template.html.tmpl b/template/en/default/bug/create/make-template.html.tmpl
index 31f255f81f..b3b95531db 100644
--- a/template/en/default/bug/create/make-template.html.tmpl
+++ b/template/en/default/bug/create/make-template.html.tmpl
@@ -8,24 +8,19 @@
 
 [%# INTERFACE:
   # url: URL to a pre-filled bug entry form.
-  # short_desc: Bug summary as entered in the form.
   #%]
 
 [% PROCESS global/header.html.tmpl
-  title = "Bookmark For $terms.Bug Entry"
+  title = "Template For $terms.Bug Entry"
   header = "Template constructed"
 %]
 
 <p>
-  You can bookmark this link:
-  &ldquo;<a href="enter_bug.cgi?[% url FILTER html %]">
-  [% IF short_desc %]
-    [% short_desc FILTER html %]
-  [% ELSE %]
-    [% terms.Bug %] entry template
-  [% END %]</a>&rdquo;.
-  This bookmark will bring up the <em>Enter [% terms.Bug %]</em> page with the
-  fields initialized as you've requested.
+  If you bookmark or right-click <a href="enter_bug.cgi?[% url FILTER html %]">
+  this link to the [% terms.Bug %] entry form</a>, and open it repeatedly
+  in a new window, you can bring up multiple copies of the <em>Enter
+  [%+ terms.Bug %]</em> page with the fields initialized in the way you just had
+  them completed. You can then customize each one as necessary.
 </p>
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/bug/dependency-graph.html.tmpl b/template/en/default/bug/dependency-graph.html.tmpl
index 69afa2ddf7..355adb6b65 100644
--- a/template/en/default/bug/dependency-graph.html.tmpl
+++ b/template/en/default/bug/dependency-graph.html.tmpl
@@ -56,6 +56,8 @@
       <td>
         <input type="checkbox" id="showsummary" name="showsummary" [% " checked" IF showsummary %]>
         <label for="showsummary">Show the summaries of all displayed [% terms.bugs %]</label>
+        <input type="checkbox" id="hide_resolved" name="hide_resolved" [% " checked" IF hide_resolved %]>
+        <label for="hide_resolved">Hide resolved</label>
       </td>
     </tr>
 
diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 16299c121c..a21403c87c 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -14,7 +14,7 @@
    javascript_urls = ["js/expanding-tree.js"]
    style_urls      = ['skins/standard/bug.css']
    subheader       = filtered_desc
-   doc_section     = "using.html#dependency-tree"
+   doc_section     = "using/understanding.html"
 %]
 
 [% PROCESS depthControlToolbar %]
@@ -136,25 +136,32 @@
 
 [% BLOCK buglink %]
   [% isclosed = !bug.isopened %]
-  [% FILTER closed(isclosed) -%]
+  [% IF isclosed %]
+    <span class="bz_closed">
+  [% END %]
     <a title="[% INCLUDE buginfo bug=bug %]"
        href="show_bug.cgi?id=[% bugid %]">
       <b>[%- bugid %]:</b>
       <span class="summ_text">[%+ bug.short_desc FILTER html %]</span>
       <span class="summ_info">[[% INCLUDE buginfo %]]</span>
     </a>
-    <a href="showdependencytree.cgi?id=[% bugid FILTER uri %]"
+    <a href="showdependencytree.cgi?id=[% bugid FILTER uri %]&amp;hide_resolved=[% hide_resolved ? 1 : 0 %]"
        class="tree_link">
       <img src="skins/standard/dependency-tree/tree.png"
            title="See dependency tree for [% terms.bug %] [%+ bugid FILTER html %]">
     </a>
+  [% IF isclosed %]
+    </span>
   [% END %]
 [% END %]
 
 [% BLOCK buginfo %]
-  [% display_value("bug_status", bug.bug_status) FILTER html -%] [%+ display_value("resolution", bug.resolution) FILTER html %];
+  [% display_value("bug_status", bug.bug_status) FILTER html -%]
+  [%- IF bug.resolution %] [%+ display_value("resolution", bug.resolution) FILTER html %][% END %];
   [%-%] assigned to [% bug.assigned_to.login FILTER email FILTER html %]
-  [%-%][% "; Target: " _ bug.target_milestone IF bug.target_milestone %]
+  [% IF Param("usetargetmilestone") AND bug.target_milestone %]
+    [%-%]; target: [% bug.target_milestone FILTER html %]
+  [% END %]
 [% END %]
 
 [%###########################################################################%]
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index ca0e771e06..d10053702e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -6,17 +6,18 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
+[% USE Bugzilla %]
 [% PROCESS bug/time.html.tmpl %]
 
 [% IF Param('comment_taggers_group') %]
   [% IF user.can_tag_comments %]
     <div id="bz_ctag_div" class="bz_default_hidden">
       <a href="javascript:void(0)" onclick="YAHOO.bugzilla.commentTagging.hideInput()">x</a>
-      <div>
+      <span>
         <input id="bz_ctag_add" size="10" placeholder="add tag"
               maxlength="[% constants.MAX_COMMENT_TAG_LENGTH FILTER html %]">
         <span id="bz_ctag_autocomp"></span>
-      </div>
+      </span>
       &nbsp;
     </div>
     <div id="bz_ctag_error" class="bz_default_hidden">
@@ -193,7 +194,8 @@
         (<span id="alias_nonedit_display">[% bug.alias.join(', ') FILTER html %]</span>)
       [% END %]
       - <span id="short_desc_nonedit_display">[% bug.short_desc FILTER quoteUrls(bug) %]</span>
-      [% IF bug.check_can_change_field('short_desc', 0, 1) %]
+      [% can_edit_short_desc = bug.check_can_change_field('short_desc', 0, 1) %]
+      [% IF can_edit_short_desc %]
         <small>(<a href="#" id="summary_edit_action">edit</a>)</small>
       [% END %]
      </span>
@@ -201,11 +203,11 @@
     <div id="summary_input">
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.short_desc
-        editable = 1
+        editable = can_edit_short_desc
         accesskey = "s"
         tag_name = 'span'
       %]
-      [% PROCESS input inputname => "short_desc" size => "80"
+      [% INCLUDE input inputname => "short_desc" size => "80"
                        maxlength => 255 spellcheck => "true" no_td => 1 %]
     </div>
   </div>
@@ -227,21 +229,13 @@
     [%#############%]
     [%#  PRODUCT  #%]
     [%#############%]
-    <tr>
-      [% INCLUDE "bug/field-label.html.tmpl"
-         field = bug_fields.product
-         desc_url = 'describecomponents.cgi'
-         value = bug.product
-        %]
-      <td class="field_value" id="field_container_product">
-        [% INCLUDE "global/product-select.html.tmpl"
-           id    => "product"
-           name  => "product"
-           value => bug.product
-           products => bug.choices.product
-           isselect => bug.check_can_change_field('product', 0, 1)
-         %]
-       </td>
+    <tr id="field_tablerow_product">
+      [% INCLUDE bug/field.html.tmpl
+          bug = bug, field = bug_fields.product, value = bug.product
+          override_legal_values = bug.choices.product
+          desc_url = "describecomponents.cgi"
+          editable = bug.check_can_change_field('product', 0, 1)
+      %]
     </tr>
 
     [%# Classification is here so that it can be used in value controllers
@@ -249,7 +243,7 @@
       # it uses some javascript that depends on the existence of the
       # product field.
       #%]
-    <tr class="bz_default_hidden">
+    <tr id="field_tablerow_classification" class="bz_default_hidden">
        [% INCLUDE bug/field.html.tmpl
             bug = bug field = bug_fields.classification
             override_legal_values = bug.choices.classification
@@ -259,7 +253,7 @@
     [%###############%]    
     [%#  Component  #%]
     [%###############%]
-    <tr>
+    <tr id="field_tablerow_component">
       [% INCLUDE bug/field.html.tmpl
           bug = bug, field = bug_fields.component, value = bug.component
           override_legal_values = bug.choices.component
@@ -267,24 +261,28 @@
           editable = bug.check_can_change_field('component', 0, 1)
       %]
     </tr>
-    <tr>
+    <tr id="field_tablerow_version">
       [% INCLUDE "bug/field-label.html.tmpl"
-        field = bug_fields.version editable = 1 %]
-        
+          field = bug_fields.version
+          editable = bug.check_can_change_field('version', 0, 1) %]
+
       [% PROCESS select selname => "version" %]
     </tr>
     [%############%]    
     [%# PLATFORM #%]
     [%############%]    
-    <tr>
+    <tr id="field_tablerow_rep_platform">
+      [% can_edit_rep_platform = bug.check_can_change_field('rep_platform', 0, 1) %]
       [% INCLUDE "bug/field-label.html.tmpl"
-           field = bug_fields.rep_platform, editable = 1, accesskey = "h" %]
+           field = bug_fields.rep_platform,
+           editable = can_edit_rep_platform,
+           accesskey = "h" %]
       <td class="field_value">
-       [% INCLUDE bug/field.html.tmpl
+        [% INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.rep_platform,
             no_tds = 1, value = bug.rep_platform
-            editable = bug.check_can_change_field('rep_platform', 0, 1) %]
-       [%+ INCLUDE bug/field.html.tmpl 
+            editable = can_edit_rep_platform %]
+        [%+ INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.op_sys, 
             no_tds = 1, value = bug.op_sys
             editable = bug.check_can_change_field('op_sys', 0, 1) %]
@@ -300,7 +298,7 @@
 [%############################################################################%]
 
 [% BLOCK section_status %]
-  <tr>
+  <tr id="field_tablerow_status">
     <th class="field_label">
       <a href="page.cgi?id=fields.html#bug_status">Status</a>:
     </th>
@@ -331,16 +329,17 @@
  [%###############################################################%]
  [%# Importance (priority and severity) #%]
  [%###############################################################%]
-    <tr>
+    <tr id="field_tablerow_importance">
       <th class="field_label">
-        <label for="priority" accesskey="i">
+        [% can_edit_priority = bug.check_can_change_field('priority', 0, 1) %]
+        <label [% IF can_edit_priority %]for="priority"[% END %] accesskey="i">
           <a href="page.cgi?id=fields.html#importance"><u>I</u>mportance</a></label>:
       </th>
       <td>
        [% INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.priority,
             no_tds = 1, value = bug.priority
-            editable = bug.check_can_change_field('priority', 0, 1) %]
+            editable = can_edit_priority %]
        [%+ INCLUDE bug/field.html.tmpl
             bug = bug, field = bug_fields.bug_severity,
             no_tds = 1, value = bug.bug_severity
@@ -350,17 +349,22 @@
     </tr>
 
     [% IF Param("usetargetmilestone") && bug.target_milestone %]
-      <tr>
+      <tr id="field_tablerow_target_milestone">
         [% INCLUDE "bug/field-label.html.tmpl"
           field = bug_fields.target_milestone
-          editable = 1
+          editable = bug.check_can_change_field('target_milestone', 0, 1)
         %]
         [% PROCESS select selname = "target_milestone" %]
       </tr>
     [% END %]
 
     [% IF Param("timetrackinggroup") && bug.deadline %]
-      [% INCLUDE bug/field.html.tmpl field = bug_fields.deadline, value = bug.deadline, editable = 0 %]
+      <tr>
+        <th class="field_label">
+          <a href="page.cgi?id=fields.html#deadline">Deadline</a>:
+        </th>
+        <td>[% bug.deadline FILTER html %]</td>
+      </tr>
     [% END %]
 [% END %]
 
@@ -370,12 +374,14 @@
 
 [% BLOCK section_people %]
 
-    <tr>
-      <th class="field_label">
-        <a href="page.cgi?id=fields.html#assigned_to">Assigned To</a>:
-      </th>
+    <tr id="field_tablerow_assigned_to">
+      [% can_edit_assigned_to = bug.check_can_change_field("assigned_to", 0, 1) %]
+      [% INCLUDE "bug/field-label.html.tmpl"
+          field = bug_fields.assigned_to
+          editable = can_edit_assigned_to
+      %]
       <td>
-        [% IF bug.check_can_change_field("assigned_to", 0, 1) %]
+        [% IF can_edit_assigned_to %]
           <div id="bz_assignee_edit_container" class="bz_default_hidden">
             <span>
               [% INCLUDE global/user.html.tmpl who = bug.assigned_to %]
@@ -419,14 +425,15 @@
     </tr>
 
     [% IF Param('useqacontact') %]
-    <tr>
+    <tr id="field_tablerow_qa_contact">
+      [% can_edit_qa_contact = bug.check_can_change_field("qa_contact", 0, 1) %]
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.qa_contact
-        editable = 1
+        editable = can_edit_qa_contact
         accesskey = "q"
       %]
       <td>
-        [% IF bug.check_can_change_field("qa_contact", 0, 1) %]
+        [% IF can_edit_qa_contact %]
           <div id="bz_qa_contact_edit_container" class="bz_default_hidden">
             <span>
               [% INCLUDE global/user.html.tmpl who = bug.qa_contact %]
@@ -481,18 +488,19 @@
 [%# Block for URL Keyword and Whiteboard                                     #%]
 [%############################################################################%]
 [% BLOCK section_url_keyword_whiteboard %]
-  <tr>
+  <tr id="field_tablerow_bug_file_loc">
+    [% can_edit_bug_file_loc = bug.check_can_change_field("bug_file_loc", 0, 1) %]
     [% INCLUDE "bug/field-label.html.tmpl"
       field = bug_fields.bug_file_loc
-      editable = 1
+      editable = can_edit_bug_file_loc
       accesskey = "u"
     %]
     <td>
-      [% IF bug.check_can_change_field("bug_file_loc", 0, 1) %]
+      [% IF can_edit_bug_file_loc %]
         <span id="bz_url_edit_container" class="bz_default_hidden"> 
         [% IF is_safe_url(bug.bug_file_loc) %]
            <a href="[% bug.bug_file_loc FILTER html %]" target="_blank"
-              title="[% bug.bug_file_loc FILTER html %]">
+              rel="noreferrer" title="[% bug.bug_file_loc FILTER html %]">
              [% bug.bug_file_loc FILTER truncate(40) FILTER html %]</a>
         [% ELSE %]
           [% bug.bug_file_loc FILTER html %]
@@ -500,10 +508,11 @@
         (<a href="#" id="bz_url_edit_action">edit</a>)</span>
       [% END %]
       <span id="bz_url_input_area">
-        [% url_output =  PROCESS input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
+        [% url_output = INCLUDE input no_td = 1 inputname = "bug_file_loc" size = 40 %]
         [% IF NOT bug.check_can_change_field("bug_file_loc", 0, 1)
               AND is_safe_url(bug.bug_file_loc) %]
-          <a href="[% bug.bug_file_loc FILTER html %]">[% url_output FILTER none %]</a>
+          <a href="[% bug.bug_file_loc FILTER html %]"
+             rel="noreferrer">[% url_output FILTER none %]</a>
         [% ELSE %]
           [% url_output FILTER none %]
         [% END %]
@@ -519,30 +528,30 @@
       [% END %]
     </td>
   </tr>
-  
+
   [% IF Param('usestatuswhiteboard') %]
-    <tr>
+    <tr id="field_tablerow_status_whiteboard">
       [% INCLUDE "bug/field-label.html.tmpl"
         field = bug_fields.status_whiteboard
-        editable = 1
+        editable = bug.check_can_change_field("status_whiteboard", 0, 1)
         accesskey = "w"
       %]
-      [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %]
+      [% INCLUDE input inputname = "status_whiteboard" size = 40 %]
     </tr>
   [% END %]
-  
+
   [% IF use_keywords %]
-    <tr>
+    <tr id="field_tablerow_keywords">
         [% INCLUDE bug/field.html.tmpl
           bug = bug, field = bug_fields.keywords, value = bug.keywords
           editable = bug.check_can_change_field("keywords", 0, 1),
-          desc_url = "describekeywords.cgi", possible_values = all_keywords
+          desc_url = "describekeywords.cgi", possible_values = active_keywords
         %]
     </tr>
   [% END %]
 
   [% IF user.id %]
-    <tr>
+    <tr id="field_tablerow_tag">
       [% INCLUDE bug/field.html.tmpl
          bug = bug, field = bug_fields.tag, value = bug.tags.join(", "),
          editable = 1, possible_values = user.tags.keys
@@ -557,14 +566,14 @@
 
 [% BLOCK section_duplicates %]
   [% RETURN UNLESS bug.duplicates.size %]
-  <tr>
+  <tr id="field_tablerow_duplicates">
     <th class="field_label">
-      <label for="duplicates">Duplicates ([% bug.duplicates.size %])</label>:
+      <label>Duplicates ([% bug.duplicates.size %])</label>:
     </th>
-    <td class="field_value" colspan="2">
+    <td class="field_value">
       <span id="duplicates">
         [% FOREACH dupe = bug.duplicates %]
-          [% dupe.id FILTER bug_link(dupe, use_alias => 1) FILTER none %][% " " %]
+          [% INCLUDE bug/link.html.tmpl bug = dupe, link_text = dupe.id, use_alias = 1 %][% " " %]
         [% END %]
       </span>
       (<a href="buglist.cgi?bug_id=[% bug.duplicate_ids.join(",") FILTER html %]">
@@ -578,7 +587,7 @@
 [%############################################################################%]
 
 [% BLOCK section_dependson_blocks %]
-  <tr>
+  <tr id="field_tablerow_dependson">
     [% INCLUDE dependencies 
          field = bug_fields.dependson deps = bug.depends_on_obj %]
   </tr>
@@ -589,13 +598,13 @@
   </tr>
 
   [% IF bug.dependson.size || bug.blocked.size %]
-    <tr>
+    <tr id="field_tablerow_blocked">
       <th>&nbsp;</th>
 
-      <td colspan="2" id="show_dependency_tree_or_graph">
+      <td id="show_dependency_tree_or_graph">
         Show dependency <a href="showdependencytree.cgi?id=[% bug.bug_id %]&amp;hide_resolved=1">tree</a>
 
-        [% IF Param('webdotbase') %]
+        [% IF Bugzilla.localconfig.webdotbase %]
           /&nbsp;<a href="showdependencygraph.cgi?id=[% bug.bug_id %]">graph</a>
         [% END %]
       </td>
@@ -706,7 +715,7 @@
 [%############################################################################%]
 
 [% BLOCK section_dates %]
-  <tr>
+  <tr id="field_tablerow_reported">
     <th class="field_label">
       Reported:
     </th>
@@ -715,7 +724,7 @@
     </td>
   </tr>
   
-  <tr>
+  <tr id="field_tablerow_modified">
     <th class="field_label">
       Modified:
     </th>
@@ -731,9 +740,11 @@
 [%# Block for CC LIST                                                        #%]
 [%############################################################################%]
 [% BLOCK section_cclist %]
-    <tr>
+    <tr id="field_tablerow_cclist">
       <th class="field_label">
-        <label for="newcc" accesskey="a">CC List:</label>
+        <label [% IF user.id %]for="newcc"[% END %] accesskey="a">
+          CC List:
+        </label>
       </th>
       <td>
         [% IF user.id %]
@@ -754,7 +765,7 @@
           users
         [% END %]
         [% IF user.id %]
-          [% IF bug.cc.contains( user.email ) %]
+          [% IF bug.cc.contains( user.login ) %]
             including you
           [% END %]
         [% END %]
@@ -779,8 +790,7 @@
             </div>
           [% END %]
           [% IF bug.cc.size %]
-            <select id="cc" multiple="multiple" size="5"
-              [% IF bug.user.canedit %]name="cc"[% END %]>
+            <select id="cc" multiple="multiple" size="5" [% 'name="cc"' IF bug.user.canedit %]>
               [% FOREACH c = bug.cc %]
                 <option value="[% c FILTER email FILTER html %]">
                   [% c FILTER email FILTER html %]</option>
@@ -821,7 +831,7 @@
 [%############################################################################%]
 [% BLOCK section_bug_ignored %]
   [% IF user.id %]
-    <tr>
+    <tr id="field_tablerow_bug_ignored">
       <th class="field_label">
         <label for="bug_ignored" title="Ignore all email for this [% terms.bug %]">
           Ignore [% terms.Bug %] Mail:
@@ -844,7 +854,7 @@
 [%############################################################################%]
 [% BLOCK section_see_also %]
   [% IF Param('use_see_also') || bug.see_also.size %]
-    <tr>
+    <tr id="field_tablerow_see_also">
       [% INCLUDE bug/field.html.tmpl 
            field    = bug_fields.see_also
            value    = bug.see_also
@@ -855,10 +865,8 @@
 [% END %]
 
 [% BLOCK section_aliases %]
-  <tr>
-    [% INCLUDE "bug/field-label.html.tmpl"
-       field = bug_fields.alias, editable = 1
-    %]
+  <tr id="field_tablerow_alias">
+    [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.alias %]
     <td>
       [% IF bug.alias.size %]
         [% bug.alias.join(', ') FILTER html %]
@@ -872,12 +880,9 @@
         <br>
         <div id="alias_edit_area">
           <div>
-            <div>
-              <label for="aliases">
-                <b>Add</b>
-              </label>
-            </div>
-              <input name="newalias" id="newalias" size="20">
+            <label for="newalias" class="field_label">Add</label>
+            <br>
+            <input name="newalias" id="newalias" size="20">
           </div>
           [% IF bug.alias.size %]
             <select id="alias" name="alias" multiple="multiple" size="5">
@@ -889,7 +894,6 @@
 
             <input type="checkbox" id="removealias" name="removealias">
             <label for="removealias">Remove selected aliases</label>
-
           [% END %]
         </div>
         <script type="text/javascript">
@@ -926,7 +930,7 @@
     [% LAST IF show_bug_flags && show_more_flags && bug_flags_set %]
   [% END %]
   [% IF show_bug_flags %]
-    <tr>
+    <tr id="field_tablerow_flags">
       <th class="field_label">
         <label>Flags:</label>
       </th>
@@ -968,12 +972,12 @@
 
 [% BLOCK section_customfields %]
 [%# *** Custom Fields *** %]
-  [% USE Bugzilla %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
+      [%# Use PROCESS instead of INCLUDE, because extra_field_item is defined
+        # in the template and must be returned back. INCLUDE cannot do that. %]
       [% PROCESS bug/field.html.tmpl value = bug.${field.name}
-                                     editable = bug.check_can_change_field(field.name, 0, 1)
-                                     value_span = 2 %]
+                                     editable = bug.check_can_change_field(field.name, 0, 1) %]
     </tr>
     [% IF extra_field_item %]
       <tr>
@@ -1013,10 +1017,9 @@
                value="[% bug.${field.name}.join(', ') FILTER html %]">
       [% END %]
     </span>
-    
+
     [% FOREACH dep_bug = deps %]
-      [% dep_bug.id FILTER bug_link(dep_bug, use_alias => 1)
-                    FILTER none %][% " " %]
+      [% INCLUDE bug/link.html.tmpl bug = dep_bug, link_text = dep_bug.id, use_alias = 1 %][% " " %]
     [% END %]
     [% IF bug.check_can_change_field(field.name, 0, 1) %]
       <span id="[% field.name FILTER html %]_edit_container" 
@@ -1055,7 +1058,7 @@
          field = bug_fields.remaining_time, editable = 1
       %]
       [% INCLUDE "bug/field-label.html.tmpl"
-         field = bug_fields.percentage_complete, editable = 1
+         field = bug_fields.percentage_complete
       %]
       <th>
         Gain:
@@ -1194,7 +1197,6 @@
       <input type="hidden" id="[% selname %]_dirty">
       <select id="[% selname %]" name="[% selname %]">
         [% FOREACH x = bug.choices.${selname} %]
-          [% NEXT IF NOT x.is_active AND x.name != bug.${selname} %]
           <option value="[% x.name FILTER html %]"
             [% " selected" IF x.name == bug.${selname} %]>
             [%- x.name FILTER html %]
@@ -1215,7 +1217,7 @@
   [% IF no_td != 1 %]
   <td[% " colspan=\"$colspan\"" IF colspan %]>
   [% END %]
-    [% val = value ? value : bug.$inputname %]
+    [% val = bug.$inputname %]
     [% IF bug.check_can_change_field(inputname, 0, 1) %]
        <input id="[% inputname %]" name="[% inputname %]" class="text_input"
               value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
@@ -1233,18 +1235,20 @@
   [% IF no_td != 1 %]  
   </td>
   [% END %]
-  [% no_td = 0 %]
-  [% maxlength = 0 %]
-  [% colspan = 0 %]
-  [% size = 0 %]
-  [% value = undef %]
-  [% spellcheck = undef %]
 [% END %]
+
 [% BLOCK commit_button %]
   [% IF user.id %]
     <div class="knob-buttons">
       <input type="submit" value="Save Changes" 
              id="commit[% id FILTER css_class_quote %]">
+      [% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+        <br>
+        <label class="" for="minor_update">
+          This is a minor update (do not send email)
+        </label>
+        <input type="checkbox" name="minor_update" value="1">
+      [% END %]
     </div>
   [% END %]
 [% END %]
diff --git a/template/en/default/bug/field-label.html.tmpl b/template/en/default/bug/field-label.html.tmpl
index 95ac28acbd..94e2728fcd 100644
--- a/template/en/default/bug/field-label.html.tmpl
+++ b/template/en/default/bug/field-label.html.tmpl
@@ -8,6 +8,7 @@
 
 [%# INTERFACE:
   #   field: a Bugzilla::Field object
+  #   editable: if true, a label pointing to the editable field will be added.
   #   desc_url: An alternate link to help for the field.
   #   hidden: True if the field label should start hidden.
   #   rowspan: a "rowspan" value for the label's <th>.
diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 59dd140db4..fe649d50d2 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -9,6 +9,7 @@
 [%# INTERFACE:
   #   field: a Bugzilla::Field object
   #   value: The value of the field for this bug.
+  #   field_hidden (optional): boolean; if true, the field is hidden by default.
   #   override_legal_values (optional): The list of legal values, for select fields.
   #   editable: Whether the field should be displayed as an editable
   #             <input> or as just the plain text of its value.
@@ -41,33 +42,32 @@
                name="[% field.name FILTER html %]"
                value="[% value FILTER html %]" size="40"
                maxlength="[% constants.MAX_FREETEXT_LENGTH FILTER none %]"
-               [% IF field.type == constants.FIELD_TYPE_INTEGER %] pattern="\d+[% IF dontchange %]|[% dontchange FILTER html %][% END %]" [% END %]
-               [% ' aria-required="true" required' IF field.is_mandatory %]>
+               [% IF field.type == constants.FIELD_TYPE_INTEGER %]
+                 pattern="-?\d+[% IF dontchange %]|[% dontchange FILTER html %][% END %]"
+                 title="The value must be a valid positive or negative integer"
+               [% END %]
+               [% IF field.is_mandatory %]
+                 data-required="true" [% 'aria-required="true" required' UNLESS field_hidden %]
+               [% END %]>
     [% CASE [constants.FIELD_TYPE_DATETIME, constants.FIELD_TYPE_DATE] %]
       [% size = (field.type == constants.FIELD_TYPE_DATE) ? 10 : 20 %]
       <input name="[% field.name FILTER html %]" size="[% size FILTER none %]"
-             id="[% field.name FILTER html %]"
-             value="[% value FILTER html %]"
-             [% ' aria-required="true" required' IF field.is_mandatory %]
-             onchange="updateCalendarFromField(this)">
-      <button type="button" class="calendar_button"
-              id="button_calendar_[% field.name FILTER html %]"
-              onclick="showCalendar('[% field.name FILTER js %]')">
-        <span>Calendar</span>
-      </button>
-
-      <div id="con_calendar_[% field.name FILTER html %]"></div>
-
+             id="[% field.name FILTER html %]" value="[% value FILTER html %]"
+             [% IF field.is_mandatory %]
+               data-required="true" [% 'aria-required="true" required' UNLESS field_hidden %]
+             [% END %]>
       <script type="text/javascript">
-        <!--
-          [%+ PROCESS "global/calendar.js.tmpl" id = field.name %]
-        //--></script>
+        $(function() {
+          $("#[% field.name FILTER html FILTER js %]").datepicker([% "{constrainInput: false}" IF field.type == constants.FIELD_TYPE_DATETIME %]);
+        });
+      </script>
     [% CASE constants.FIELD_TYPE_BUG_ID %]
         <span id="[% field.name FILTER html %]_input_area">
           <input name="[% field.name FILTER html %]" id="[% field.name FILTER html %]"
                  value="[% value FILTER html %]" size="7"
-                 [% ' aria-required="true" required' IF field.is_mandatory %]>
-
+                 [% IF field.is_mandatory %]
+                   data-required="true" [% 'aria-required="true" required' UNLESS field_hidden %]
+                 [% END %]>
         </span>
 
         [% IF value %]  
@@ -85,18 +85,25 @@
         </script>
     [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT 
               constants.FIELD_TYPE_MULTI_SELECT ] %]
+      [%# The 'product' field needs its own template if classifications are enabled. %]
+      [% IF field.name == "product" AND Param('useclassification') %]
+        [% INCLUDE "global/product-select.html.tmpl"
+                   id = "product", name = "product", value = value
+                   products = override_legal_values %]
+      [% ELSE %]
         <input type="hidden" id="[% field.name FILTER html %]_dirty">
         <select id="[% field.name FILTER html %]" 
                 name="[% field.name FILTER html %]" 
                 [% IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]
-                    [% SET field_size = 5 %]
-                    [% IF field.legal_values.size < 5 %]
-                        [% SET field_size = field.legal_values.size %]
-                    [% END %]
-                    size="[% field_size FILTER html %]" multiple="multiple"
-                    [% ' aria-required="true" required' IF field.is_mandatory %]
-                [% END %]
-                >
+                  [% SET field_size = 5 %]
+                  [% IF field.legal_values.size < 5 %]
+                    [% SET field_size = field.legal_values.size %]
+                  [% END %]
+                  size="[% field_size FILTER html %]" multiple="multiple"
+                  [% IF field.is_mandatory %]
+                    data-required="true" [% 'aria-required="true" required' UNLESS field_hidden %]
+                  [% END %]
+                [% END %]>
           [% IF allow_dont_change %]
             <option value="[% dontchange FILTER html %]"
                    [% ' selected="selected"' IF value == dontchange %]>
@@ -134,22 +141,24 @@
         [% IF field.type == constants.FIELD_TYPE_MULTI_SELECT %]
           <input type="hidden" name="defined_[% field.name FILTER html %]">
         [% END %]
+      [% END %]
 
-        <script type="text/javascript">
+      <script type="text/javascript">
         <!--
           initHidingOptionsForIE('[% field.name FILTER js %]');
           [%+ INCLUDE "bug/field-events.js.tmpl"
                       field = field, product = bug.product_obj %]
         //-->
-        </script>
+      </script>
 
-     [% CASE constants.FIELD_TYPE_TEXTAREA %]
+    [% CASE constants.FIELD_TYPE_TEXTAREA %]
        <div id="[% field.name FILTER html %]_edit_container" class="bz_default_hidden">
          <div>
              (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>)
          </div>
          [% IF value %]
-           <pre class="field_textarea_readonly">[% value FILTER html %]</pre>
+           <pre id="[% field.name FILTER html %]_readonly"
+                class="field_textarea_readonly">[% value FILTER html %]</pre>
          [% END %]
        </div>
        <div id="[% field.name FILTER html %]_input">
@@ -166,7 +175,7 @@
                            '',
                            true);
        </script>
-     [% CASE constants.FIELD_TYPE_BUG_URLS %]
+    [% CASE constants.FIELD_TYPE_BUG_URLS %]
        [% IF bug.id && value.size %]
          <ul class="bug_urls">
          [% FOREACH bug_url = value %]
@@ -195,23 +204,20 @@
            </script>
          [% END %]
        [% END %]
-     [% CASE constants.FIELD_TYPE_KEYWORDS %]
-       <div id="[% field.name FILTER html %]_container">
-         <input type="text" id="[% field.name FILTER html %]" size="40"
-                class="text_input" name="[% field.name FILTER html %]"
-                value="[% value FILTER html %]">
-         <div id="[% field.name FILTER html %]_autocomplete"></div>
-       </div>
-       <script type="text/javascript" defer="defer">
-         if (typeof YAHOO.bugzilla.field_array === "undefined")
-           YAHOO.bugzilla.field_array = [];
-         YAHOO.bugzilla.field_array["[% field.name FILTER js %]"] = [
-           [%- FOREACH val = possible_values %]
-             [%-# %]"[% val FILTER js %]"
-             [%- "," IF NOT loop.last %][% END %]];
-         YAHOO.bugzilla.fieldAutocomplete.init('[% field.name FILTER js %]',
-                                               '[% field.name FILTER js %]_autocomplete');
-       </script>
+    [% CASE constants.FIELD_TYPE_KEYWORDS %]
+      <input type="text" id="[% field.name FILTER html %]" size="40"
+             class="text_input bz_autocomplete_values"
+             name="[% field.name FILTER html %]"
+             data-values="[% field.name FILTER html %]"
+             value="[% value FILTER html %]">
+      <script type="text/javascript">
+        if (typeof BUGZILLA.autocomplete_values === 'undefined')
+          BUGZILLA.autocomplete_values = [];
+        BUGZILLA.autocomplete_values['[% field.name FILTER js %]'] = [
+          [%- FOREACH val = possible_values %]
+            [%- %]"[% val FILTER js %]"
+            [%- "," IF NOT loop.last %][% END %]];
+      </script>
   [% END %]
 [% ELSE %]
   [% SWITCH field.type %]
diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index b63093302c..f1e8d041ae 100644
--- a/template/en/default/bug/link.html.tmpl
+++ b/template/en/default/bug/link.html.tmpl
@@ -8,6 +8,8 @@
 
 [%# INTERFACE:
   #   bug: a Bugzilla::Bug object
+  #   user: the Bugzilla::User object to which this template is addressed.
+  #         If not set, the currently logged in user object is used.
   #   link_text: the text that we're highlighting.
   #   use_alias: boolean; If true, we display the bug's alias as the link
   #              text instead of link_text.
diff --git a/template/en/default/bug/process/header.html.tmpl b/template/en/default/bug/process/header.html.tmpl
index 55de0c324a..b95e1dcd3a 100644
--- a/template/en/default/bug/process/header.html.tmpl
+++ b/template/en/default/bug/process/header.html.tmpl
@@ -10,13 +10,11 @@
   # As global/header.html.tmpl.
   #%]
 
-[% USE Bugzilla %]
-
 [% PROCESS "bug/show-header.html.tmpl" %]
 
-[% IF    title_tag == "bug_processed" %]
+[% IF title_tag == "bug_processed" %]
   [% title = BLOCK %]
-    [% IF Bugzilla.cgi.param('id') %]
+    [% IF cgi_param('id') %]
       [%+ id FILTER html %]
     [% ELSE %]
       [% terms.Bugs %]
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index f89590df2d..ca7e095c1a 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -15,10 +15,6 @@
   # bug: Bugzilla::Bug; the bug being changed.
   #%]
 
-[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-
 [% UNLESS header_done %]
   [% PROCESS bug/process/header.html.tmpl %]
 [% END %]
@@ -45,11 +41,11 @@
 </p>
 [% END %]
 
-[% IF cgi.param("comment") %]
+[% IF cgi_param("comment") %]
 <p>
   Your comment was:<br>
   <blockquote><pre class="bz_comment_text">
-    [% cgi.param("comment") FILTER html %]
+    [% cgi_param("comment") FILTER html %]
   </pre></blockquote>
 </p>
 [% END %]
@@ -70,16 +66,16 @@ You have the following choices:
         [% ", except for the added comment(s)" IF comments.size %].
     </form>
   </li>
-  [% IF cgi.param("comment") %]
+  [% IF cgi_param("comment") %]
     <li>
       <form method="post" action="process_bug.cgi">
-        <input type="hidden" name="id" value="[% cgi.param("id") FILTER html %]">
+        <input type="hidden" name="id" value="[% cgi_param("id") FILTER html %]">
         <input type="hidden" name="delta_ts" value="[% bug.delta_ts FILTER html %]">
-        <input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]">
-        <input type="hidden" name="use_markdown" value="[% cgi.param("use_markdown") FILTER html %]">
+        <input type="hidden" name="comment" value="[% cgi_param("comment") FILTER html %]">
+        <input type="hidden" name="use_markdown" value="[% cgi_param("use_markdown") FILTER html %]">
         <input type="hidden" name="comment_is_private"
-               value="[% cgi.param("comment_is_private") FILTER html %]">
-        <input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]">
+               value="[% cgi_param("comment_is_private") FILTER html %]">
+        <input type="hidden" name="token" value="[% cgi_param("token") FILTER html %]">
         <input type="submit" id="process_comment" value="Submit only my new comment">
       </form>
     </li>
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index c562bf54dc..837a9836fa 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -17,6 +17,9 @@
   # verify_bug_groups: If groups need to be confirmed in addition to fields.
   #%]
 
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
 [% PROCESS global/header.html.tmpl
   title = 'Verify New Product Details...'
   style_urls = ['skins/standard/buglist.css']
@@ -165,14 +168,14 @@
             <input type="checkbox" name="defined_groups"
                    id="defined_group_[% group.group.id FILTER html %]"
                    value="[% group.group.name FILTER html %]"
-                   [% IF cgi.param("defined_groups").contains(group.group.name) %] checked="checked"[% END %]
+                   [% IF cgi.multi_param("defined_groups").contains(group.group.name) %] checked="checked"[% END %]
                    onchange="turn_off(this, 'group_[% group.group.id FILTER html %]')">
           </td>
           <td class="center">
             <input type="checkbox" name="groups"
                    id="group_[% group.group.id FILTER html %]"
                    value="[% group.group.name FILTER html %]"
-                   [% IF cgi.param("groups").contains(group.group.name) %] checked="checked"[% END %]
+                   [% IF cgi.multi_param("groups").contains(group.group.name) %] checked="checked"[% END %]
                    onchange="turn_off(this, 'defined_group_[% group.group.id FILTER html %]')">
           </td>
           <td>
@@ -189,7 +192,7 @@
                name="groups"
                [% ' checked="checked"' IF ((group.membercontrol == constants.CONTROLMAPDEFAULT && user.in_group(group.group.name))
                    || (group.othercontrol == constants.CONTROLMAPDEFAULT && !user.in_group(group.group.name))
-                   || cgi.param("groups").contains(group.group.name)) %]
+                   || cgi.multi_param("groups").contains(group.group.name)) %]
                value="[% group.group.name FILTER html %]">
         <label for="group_[% group.group.id FILTER html %]">
           [% group.group.name FILTER html %]: [% group.group.description FILTER html %]
@@ -224,8 +227,8 @@
 [%# If 'id' is defined, then we are editing a single bug.
   # Else we are editing several bugs at once. %]
 
-[% IF cgi.param('id') AND cgi.param('id').match('^\d+$') %]
-  [% id = cgi.param('id') %]
+[% IF cgi_param('id') AND cgi_param('id').match('^\d+$') %]
+  [% id = cgi_param('id') %]
   Cancel and Return to [% "$terms.bug $id" FILTER bug_link(id) FILTER none %]
 [% ELSE %]
   Cancel and Return to <a href="buglist.cgi?regetlastlist=1">the last search results</a>
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 6e1244fa0c..bce881420a 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -23,9 +23,10 @@
   [% title = title _ "($filtered_alias) " %]
 [% END %]
 [% title = title _ filtered_desc %]
-[% yui = ['autocomplete', 'calendar'] %]
-[% yui.push('container') IF user.can_tag_comments %]
-[% javascript_urls = [ "js/util.js", "js/field.js" ] %]
+[% generate_api_token = 1 %]
+[% DEFAULT yui = [] %]
+[% yui.push('json', 'connection', 'container') %]
+[% javascript_urls = [ "js/util.js", "js/field.js", "js/comments.js" ] %]
 [% javascript_urls.push("js/bug.js") IF user.id  %]
 [% javascript_urls.push('js/comment-tagging.js')
      IF user.id && Param('comment_taggers_group') %]
@@ -62,13 +63,19 @@
   [% END %]
 [% END %]
 [% style_urls = ['skins/standard/bug.css'] %]
-[% doc_section = "using.html#anatomy-of-a-bug" %]
+[% doc_section = "using/understanding.html" %]
 [% bodyclasses = ['bz_bug',
                   "bz_status_$bug.bug_status",
                   "bz_product_$bug.product",
                   "bz_component_$bug.component",
                   "bz_bug_$bug.bug_id",
                   ] %]
+[% markdown_enabled = feature_enabled('jsonrpc') AND user.settings.use_markdown.value == "on" %]
+[% IF markdown_enabled %]
+  [% javascript_urls.push("js/highlight.js/highlight.pack.js") %]
+  [% style_urls.push("js/highlight.js/styles/github.css") %]
+[% END %]
+
 [% FOREACH group = bug.groups_in %]
   [% bodyclasses.push("bz_group_$group.name") %]
 [% END %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 960746d404..8babdf04ac 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -10,7 +10,7 @@
   title = "Full Text $terms.Bug Listing"
   h1 = ""
   style_urls = ['skins/standard/buglist.css']
-  doc_section = "using.html#anatomy-of-a-bug"
+  doc_section = "using/understanding.html"
 %]
 
 [% USE Bugzilla %]
@@ -48,7 +48,7 @@
   <h1>
     [% terms.Bug %] 
     <a href="show_bug.cgi?id=[% bug.bug_id FILTER html %]">[% bug.bug_id FILTER html %]</a>
-    [% IF bug.alias AND NOT bug.error %] (
+    [% IF bug.alias.size AND NOT bug.error %] (
       [%- FOREACH alias IN bug.alias %]<a href="show_bug.cgi?id=[% alias FILTER uri %]">
         [% alias FILTER html %]</a>[% UNLESS loop.last %], [% END %]
       [%- END %])
@@ -148,7 +148,7 @@
         <th>[% field_descs.bug_file_loc FILTER html %]:</th>
         <td colspan="3">
           [% IF is_safe_url(bug.bug_file_loc) %]
-            <a href="[% bug.bug_file_loc FILTER html %]">
+            <a href="[% bug.bug_file_loc FILTER html %]" rel="noreferrer">
                      [% bug.bug_file_loc FILTER html %]</a>
           [% ELSE %]
             [% bug.bug_file_loc FILTER html %]
@@ -263,7 +263,7 @@
                     [% ELSE %]
                       [% FOREACH flag = attachment.flags %]
                         [% flag.setter.nick FILTER html %]:
-                        [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
+                        <span class="nowrap">[%+ flag.type.name FILTER html %][% flag.status %]</span>
                         [% IF flag.status == "?" && flag.requestee %]
                           ([% flag.requestee.nick FILTER html %])
                         [% END %][% ", " IF not loop.last() %]
@@ -352,7 +352,7 @@
           [% FOREACH type = bug.flag_types %]
             [% FOREACH flag = type.flags %]
                 [% flag.setter.nick FILTER html %]:
-                [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
+                <span class="nowrap">[%+ flag.type.name FILTER html %][% flag.status %]</span>
                 [%+ IF flag.status == "?" && flag.requestee %]
                   ([% flag.requestee.nick FILTER html %])
                 [% END %]<br>
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 1d376f874c..fe5f4f6f45 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -6,10 +6,9 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 [% PROCESS bug/time.html.tmpl %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
-<?xml version="1.0" [% IF Param('utf8') %]encoding="UTF-8" [% END %]standalone="yes" ?>
-<!DOCTYPE bugzilla [% IF cgi.param('dtd') %][[% PROCESS pages/bugzilla.dtd.tmpl %]][% ELSE %]SYSTEM "[% urlbase FILTER xml %]page.cgi?id=bugzilla.dtd"[% END %]>
+
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<!DOCTYPE bugzilla [% IF cgi_param('dtd') %][[% PROCESS pages/bugzilla.dtd.tmpl %]][% ELSE %]SYSTEM "[% urlbase FILTER xml %]page.cgi?id=bugzilla.dtd"[% END %]>
 
 <bugzilla version="[% constants.BUGZILLA_VERSION %]"
           urlbase="[% urlbase FILTER xml %]"
@@ -19,7 +18,7 @@
           %]
           maintainer="[% Param('maintainer') FILTER xml %]"
 [% IF user.id %]
-          exporter="[% user.email FILTER email FILTER xml %]"
+          exporter="[% user.login FILTER email FILTER xml %]"
 [% END %]
 >
 
@@ -77,7 +76,7 @@
             <type>[% a.contenttype FILTER xml %]</type>
             <size>[% a.datasize FILTER xml %]</size>
             <attacher[% IF a.attacher.name != '' %] name="[% a.attacher.name FILTER xml %]"[% END -%]>
-            [% a.attacher.email FILTER email FILTER xml %]</attacher>
+            [% a.attacher.login FILTER email FILTER xml %]</attacher>
             [%# This is here so automated clients can still use attachment.cgi %]
             [% IF displayfields.token && user.id %]
               <token>[% issue_hash_token([a.id, a.modification_time]) FILTER xml %]</token>
@@ -114,7 +113,7 @@
     [% IF field == 'reporter' OR field == 'assigned_to' OR
           field == 'qa_contact' %]
       [% name = val.name %]
-      [% val = val.email FILTER email %]
+      [% val = val.login FILTER email %]
     [% ELSIF field == 'cc' %]
         [% val = val FILTER email %]
     [% ELSIF field == 'creation_ts' OR field == 'delta_ts' %]
@@ -135,9 +134,9 @@
           id="[% flag.id FILTER xml %]"
           type_id="[% flag.type_id FILTER xml %]"
           status="[% flag.status FILTER xml %]"
-          setter="[% flag.setter.email FILTER email FILTER xml %]"
+          setter="[% flag.setter.login FILTER email FILTER xml %]"
       [% IF flag.status == "?" && flag.requestee %]
-          requestee="[% flag.requestee.email FILTER email FILTER xml %]"
+          requestee="[% flag.requestee.login FILTER email FILTER xml %]"
       [% END %]
     />
   [% END %]
@@ -151,7 +150,7 @@
     [% IF c.is_about_attachment %]
       <attachid>[% c.extra_data FILTER xml %]</attachid>
     [% END %]
-    <who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER email FILTER xml %]</who>
+    <who name="[% c.author.name FILTER xml %]">[% c.author.login FILTER email FILTER xml %]</who>
     <bug_when>[% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when>
     [% IF user.is_timetracker && (c.work_time - 0 != 0) %]
       <work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
diff --git a/template/en/default/bug/summarize-time.html.tmpl b/template/en/default/bug/summarize-time.html.tmpl
index faf05684af..84eb75615d 100644
--- a/template/en/default/bug/summarize-time.html.tmpl
+++ b/template/en/default/bug/summarize-time.html.tmpl
@@ -21,10 +21,8 @@
     title = title
     header = header
     style_urls = ['skins/standard/buglist.css']
-    doc_section = "using.html#time-tracking-information"
-    yui = ['calendar']
-    javascript_urls = [ "js/util.js", "js/field.js" ]
-    %]
+    doc_section = "using/editing.html#time-tracking"
+%]
 
 [% INCLUDE query_form %]
 
@@ -261,21 +259,19 @@
       <label accesskey="s" for="start_date">Period <u>s</u>tarting</label>:
     </th>
     <td>
-      <input id="start_date" name="start_date" size="10" autofocus
-             value="[% start_date FILTER html %]" maxlength="10"
-             onchange="updateCalendarFromField(this)">
-      <button type="button" class="calendar_button" id="button_calendar_start_date"
-              onclick="showCalendar('start_date')"><span>Calendar</span>
-      </button>
+      <input id="start_date" name="start_date" size="10"
+             value="[% start_date FILTER html %]" maxlength="10">
       <span class="label">
         and <label accesskey="e" for="end_date"><u>e</u>nding</label>:
       </span>
-      <input type="text" name="end_date" size="10" id="end_date"
-             value ="[% end_date FILTER html %]" maxlength="10"
-             onchange="updateCalendarFromField(this)">
-      <button type="button" class="calendar_button" id="button_calendar_end_date"
-              onclick="showCalendar('end_date')"><span>Calendar</span>
-      </button>
+      <input id="end_date" name="end_date" size="10"
+             value ="[% end_date FILTER html %]" maxlength="10">
+      <script type="text/javascript">
+        $(function() {
+          $("#start_date").datepicker();
+          $("#end_date").datepicker();
+        });
+      </script>
       <br>
       <span class="bz_info">(Dates are optional, and in YYYY-MM-DD format)</span>
     </td>
@@ -319,11 +315,5 @@
 </table>
 
 </form>
-<script type="text/javascript">
-  <!--
-    [%+ PROCESS "global/calendar.js.tmpl" id = 'start_date' %]
-    [% PROCESS "global/calendar.js.tmpl" id = 'end_date' %]
-  //-->
-</script>
 <hr>
 [% END %]
diff --git a/template/en/default/config.js.tmpl b/template/en/default/config.js.tmpl
index 0399f8b286..0e924d8016 100644
--- a/template/en/default/config.js.tmpl
+++ b/template/en/default/config.js.tmpl
@@ -64,7 +64,7 @@ var [% cf.name FILTER js %] = [ [% FOREACH x = cf.legal_values %]'[% x.name FILT
 // =======================
 //
 // It is not necessary to list all products and components here.
-// Instead, you can define a "blacklist" for some commonly used words
+// Instead, you can define a "blocklist" for some commonly used words
 // or word fragments that occur in a product or component name
 // but should _not_ trigger product/component search.
 
@@ -84,7 +84,7 @@ var target_milestone = new Object();
 // Product and Component Exceptions
 // ================================
 //
-// A blacklist for some commonly used words or word fragments 
+// A blocklist for some commonly used words or word fragments
 // that occur in a product or component name but should *not*
 // trigger product/component search in QuickSearch.
 
diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index 0d183cf567..814b5a1d93 100644
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -10,7 +10,7 @@
   # So we cache it here for better performance.
  %]
 [% escaped_urlbase = BLOCK %][% urlbase FILTER xml %][% END %]
-<?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- Note: this interface is experimental and under development.
    - We may and probably will make breaking changes to it in the future. -->
 
@@ -130,10 +130,11 @@
   <bz:products>
     <Seq>
       [% FOREACH product = products %]
+        [% uri_product_name = product.name FILTER uri %]
         <li>
-          <bz:product rdf:about="[% escaped_urlbase %]product.cgi?name=[% product.name FILTER uri %]">
+          <bz:product rdf:about="[% escaped_urlbase %]product.cgi?name=[% uri_product_name %]">
             <bz:name>[% product.name FILTER html %]</bz:name>
-            <bz:allows_unconfirmed>[% product.allows_unconfirmed FILTER html %]</bz:allows_unconfirmed>
+            <bz:allows_unconfirmed>[% product.allows_unconfirmed FILTER none %]</bz:allows_unconfirmed>
             [% IF Param('useclassification') %]
               <bz:classification>[% class_names.${product.classification_id}.name FILTER html %]</bz:classification>
             [% END %]
@@ -141,7 +142,7 @@
               <Seq>
                 [% FOREACH comp = product.components %]
                   <li resource="[% escaped_urlbase %]component.cgi?name=[% comp.name FILTER uri
-                      %]&amp;product=[% product.name FILTER uri %]"/>
+                      %]&amp;product=[% uri_product_name %]"/>
                 [% END %]
               </Seq>
             </bz:components>
@@ -150,7 +151,7 @@
               <Seq>
                 [% FOREACH version = product.versions %]
                   <li resource="[% escaped_urlbase %]version.cgi?name=[% version.name FILTER uri
-                      %]&amp;product=[% product.name FILTER uri %]"/>
+                      %]&amp;product=[% uri_product_name %]"/>
                 [% END %]
               </Seq>
             </bz:versions>
@@ -160,12 +161,11 @@
                 <Seq>
                   [% FOREACH milestone = product.milestones %]
                     <li resource="[% escaped_urlbase %]milestone.cgi?name=[% milestone.name FILTER uri
-                        %]&amp;product=[% product.name FILTER uri %]"/>
+                        %]&amp;product=[% uri_product_name %]"/>
                   [% END %]
                 </Seq>
               </bz:target_milestones>
             [% END %]
-
           </bz:product>
         </li>
       [% END %]
@@ -176,12 +176,13 @@
   <bz:components>
     <Seq>
       [% FOREACH product = products %]
+        [% uri_product_name = product.name FILTER uri %]
         [% FOREACH comp = product.components %]
           <li>
             <bz:component rdf:about="[% escaped_urlbase %]component.cgi?name=[% comp.name FILTER uri
-                          %]&amp;product=[% product.name FILTER uri %]">
+                          %]&amp;product=[% uri_product_name %]">
               <bz:name>[% comp.name FILTER html %]</bz:name>
-              <bz:is_active>[% comp.is_active FILTER html %]</bz:is_active>
+              <bz:is_active>[% comp.is_active FILTER none %]</bz:is_active>
               [% IF show_flags %]
                 <bz:flag_types>
                   <Seq>
@@ -189,7 +190,7 @@
                     [% FOREACH flag_type = flag_types %]
                       [% NEXT UNLESS flag_type.is_active %]
                       [% all_visible_flag_types.${flag_type.id} = flag_type %]
-                      <li resource="[% escaped_urlbase %]flag.cgi?id=[% flag_type.id FILTER uri
+                      <li resource="[% escaped_urlbase %]flag.cgi?id=[% flag_type.id
                           %]&amp;name=[% flag_type.name FILTER uri %]" />
                     [% END %]
                   </Seq>
@@ -205,12 +206,13 @@
   <bz:versions>
     <Seq>
       [% FOREACH product = products %]
+        [% uri_product_name = product.name FILTER uri %]
         [% FOREACH version = product.versions %]
           <li>
             <bz:version rdf:about="[% escaped_urlbase %]version.cgi?name=[% version.name FILTER uri
-                        %]&amp;product=[% product.name FILTER uri %]">
+                        %]&amp;product=[% uri_product_name %]">
               <bz:name>[% version.name FILTER html %]</bz:name>
-              <bz:is_active>[% version.is_active FILTER html %]</bz:is_active>
+              <bz:is_active>[% version.is_active FILTER none %]</bz:is_active>
             </bz:version>
           </li>
         [% END %]
@@ -222,12 +224,13 @@
     <bz:target_milestones>
       <Seq>
         [% FOREACH product = products %]
+          [% uri_product_name = product.name FILTER uri %]
           [% FOREACH milestone = product.milestones %]
             <li>
               <bz:target_milestone rdf:about="[% escaped_urlbase %]milestone.cgi?name=[% milestone.name FILTER uri
-                                   %]&amp;product=[% product.name FILTER uri %]">
+                                   %]&amp;product=[% uri_product_name %]">
                 <bz:name>[% milestone.name FILTER html %]</bz:name>
-                <bz:is_active>[% milestone.is_active FILTER html %]</bz:is_active>
+                <bz:is_active>[% milestone.is_active FILTER none %]</bz:is_active>
               </bz:target_milestone>
             </li>
           [% END %]
@@ -241,15 +244,15 @@
       <Seq>
         [% FOREACH flag_type = all_visible_flag_types.values.sort('name') %]
           <li>
-            <bz:flag_type rdf:about="[% escaped_urlbase %]flag.cgi?id=[% flag_type.id FILTER uri
+            <bz:flag_type rdf:about="[% escaped_urlbase %]flag.cgi?id=[% flag_type.id
                           %]&amp;name=[% flag_type.name FILTER uri %]">
-              <bz:id>[% flag_type.id FILTER html %]</bz:id>
+              <bz:id>[% flag_type.id %]</bz:id>
               <bz:name>[% flag_type.name FILTER html %]</bz:name>
               <bz:description>[% flag_type.description FILTER html %]</bz:description>
               <bz:type>[% flag_type.target_type FILTER html %]</bz:type>
-              <bz:requestable>[% flag_type.is_requestable FILTER html %]</bz:requestable>
-              <bz:specifically_requestable>[% flag_type.is_requesteeble FILTER html %]</bz:specifically_requestable>
-              <bz:multiplicable>[% flag_type.is_multiplicable FILTER html %]</bz:multiplicable>
+              <bz:requestable>[% flag_type.is_requestable FILTER none %]</bz:requestable>
+              <bz:specifically_requestable>[% flag_type.is_requesteeble FILTER none %]</bz:specifically_requestable>
+              <bz:multiplicable>[% flag_type.is_multiplicable FILTER none %]</bz:multiplicable>
               [% IF user.in_group("editcomponents") %]
                 <bz:grant_group>[% flag_type.grant_group.name FILTER html %]</bz:grant_group>
                 <bz:request_group>[% flag_type.request_group.name FILTER html %]</bz:request_group>
@@ -271,12 +274,12 @@
             <bz:description>[% (field_descs.${item.name} OR item.description) FILTER html %]</bz:description>
             [%-# These values are meaningful for custom fields only. %]
             [% IF item.custom %]
-              <bz:type>[% item.type FILTER html %]</bz:type>
+              <bz:type>[% item.type FILTER none %]</bz:type>
               <bz:type_desc>[% field_types.${item.type} FILTER html %]</bz:type_desc>
-              <bz:enter_bug>[% item.enter_bug FILTER html %]</bz:enter_bug>
+              <bz:enter_bug>[% item.enter_bug FILTER none %]</bz:enter_bug>
             [% END %]
             [% IF item.is_active.defined %]
-              <bz:is_active>[% item.is_active FILTER html %]</bz:is_active>
+              <bz:is_active>[% item.is_active FILTER none %]</bz:is_active>
             [% END %]
           </bz:field>
         </li>
diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index b0f4efb45c..abdae8cf88 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -17,15 +17,38 @@
       [% Hook.process('start') %]
       [% PROCESS generate_diffs %]
       <p>
+      [% SET comment_anchor = '' %]
       [% FOREACH comment = new_comments.reverse %]
-        <div>
+        <div class="bz_comment_block">
           [% IF comment.count %]
-            <b>[% "Comment # ${comment.count}" FILTER bug_link(bug,
-              {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %]
-              on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
-              from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
+            [% comment_anchor = "#c$comment.count" %]
+            <b class="bz_comment_head">
+              [% INCLUDE bug/link.html.tmpl
+                  bug = bug,
+                  link_text = "Comment # ${comment.count}",
+                  comment_num = comment.count,
+                  full_url = 1,
+                  user = to_user
+              %]
+              on
+              [%= INCLUDE bug/link.html.tmpl
+                  bug = bug,
+                  link_text = "$terms.bug $bug.id",
+                  full_url = 1,
+                  user = to_user
+              %]
+              from
+              [%= INCLUDE global/user.html.tmpl
+                  user = to_user,
+                  who = comment.author
+              %]
+            </b>
           [% END %]
-        <pre>[% comment.body_full({ wrap => 1 }) FILTER markdown(bug, comment, to_user) %]</pre>
+          [% comment_div = comment.is_markdown ? "div" : "pre" %]
+          [% wrap = comment.is_markdown ? 0 : 1 %]
+          <[% comment_div FILTER none %] class="bz_comment_text">
+            [% comment.body_full({ wrap => wrap }) FILTER markdown(bug, comment, to_user) %]
+          </[% comment_div FILTER none %]>
         </div>
       [% END %]
       </p>
@@ -61,11 +84,20 @@
         [% END %]
       [% END %]
       </ul>
+      <div itemscope itemtype="http://schema.org/EmailMessage">
+        <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
+          [%# Filtering of the URL param is not required & would break the URL when the comment anchor is set %]
+          <link itemprop="url" href="[% urlbase FILTER html %]show_bug.cgi?id=[% "$bug.id$comment_anchor" FILTER none %]">
+          <meta itemprop="name" content="View [% terms.bug %]">
+        </div>
+        <meta itemprop="description" content="[% terms.Bugzilla %] [%+ terms.bug %] update notification">
+      </div>
     </body>
 </html>
 
 [% BLOCK generate_diffs %]
   [% SET in_table = 0 %]
+  [% class_name = isnew ? "bz_new_table" : "bz_diff_table" %]
   [% last_changer = 0 %]
     [% FOREACH change = diffs %]
       [% IF !isnew && change.who.id != last_changer %]
@@ -75,18 +107,18 @@
           [% SET in_table = 0 %]
         [% END %]
         [% IF change.blocker %]
-              [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
-              depends on
-              [%+ "${terms.bug} ${change.blocker.id}"
-                  FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %],
-              which changed state.
+          [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]
+          depends on
+          [%+ INCLUDE bug/link.html.tmpl bug = change.blocker, link_text = "$terms.bug $change.blocker.id",
+                                         full_url = 1, user = to_user %],
+          which changed state.
         [% ELSE %]
-              [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
-              [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
+          [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
+          [%+ INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", full_url = 1, user = to_user %]
         [% END %]
           <br>
           [% IF in_table == 0 %]
-             <table border="1" cellspacing="0" cellpadding="8">
+             <table border="1" cellspacing="0" cellpadding="8" class="[% class_name FILTER none %]">
              [% SET in_table = 1 %]
           [% END %]
           <tr>
@@ -98,7 +130,7 @@
 
       [% PROCESS "email/bugmail-common.txt.tmpl" %]
       [% IF in_table == 0 %]
-         <table border="1" cellspacing="0" cellpadding="8">
+         <table border="1" cellspacing="0" cellpadding="8" class="[% class_name FILTER none %]">
          [% SET in_table = 1 %]
       [% END %]
       [% IF isnew %]
@@ -106,7 +138,7 @@
           <th>[% field_label FILTER html %]</th>
           <td>
             [% IF change.field_name == "bug_id" %]
-              [% new_value FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
+              [% INCLUDE bug/link.html.tmpl bug = bug, link_text = new_value, full_url = 1, user = to_user %]
             [% ELSE %]
               [% new_value FILTER html %]
             [% END %]
diff --git a/template/en/default/email/flagmail-header.txt.tmpl b/template/en/default/email/flagmail-header.txt.tmpl
new file mode 100644
index 0000000000..8aa3955f7e
--- /dev/null
+++ b/template/en/default/email/flagmail-header.txt.tmpl
@@ -0,0 +1,28 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
+                '?' => "asked" } %]
+
+[% action = flag.status || 'X' %]
+
+[% IF flag && flag.status == '?' %]
+  [% subject_status = "requested" %]
+[% ELSE %]
+  [% subject_status = statuses.$action %]
+[% END %]
+From: [% Param('mailfrom') %]
+To: [% to %]
+Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
+[%- IF attachment %] :
+  [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
+Date: [% date %]
+X-Bugzilla-Type: request
+[%+ INCLUDE "email/header-common.txt.tmpl" %]
+[%+ threadingmarker %]
diff --git a/template/en/default/email/flagmail.html.tmpl b/template/en/default/email/flagmail.html.tmpl
new file mode 100644
index 0000000000..1522ca46dc
--- /dev/null
+++ b/template/en/default/email/flagmail.html.tmpl
@@ -0,0 +1,93 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% flagtype_name = flag ? flag.type.name : old_flag.type.name %]
+[% statuses = { '+' => "granted" , '-' => 'denied' , 'X' => "canceled" ,
+                '?' => "asked" } %]
+
+[% action = flag.status || 'X' %]
+
+[% pending_request = (flag && flag.status == '?') %]
+[% reassigned = (pending_request && flag.setter_id != user.id) %]
+[% was_pending_request = (old_flag && old_flag.status == '?') %]
+
+<html>
+  <head>
+    <base href="[% urlbase FILTER html %]">
+  </head>
+  <body>
+    <p>
+      [% INCLUDE global/user.html.tmpl user = to_user, who = user %] has
+      [% IF reassigned =%]
+        reassigned [% INCLUDE global/user.html.tmpl user = to_user, who = flag.setter %]'s request for
+        [% IF old_flag.requestee.defined %]
+          [%= INCLUDE global/user.html.tmpl user = to_user, who = old_flag.requestee %]'s
+        [% END %]
+        [%= flagtype_name FILTER html %]
+        [% IF flag.requestee.defined =%]
+          to [% INCLUDE global/user.html.tmpl user = to_user, who = flag.requestee %]
+        [% END %]
+      [% ELSE %]
+        [%= statuses.$action FILTER html %]
+        [% IF pending_request %]
+          [%= INCLUDE global/user.html.tmpl user = to_user, who = flag.requestee %] for
+        [% ELSIF was_pending_request %]
+          [%= INCLUDE global/user.html.tmpl user = to_user, who = old_flag.setter %]'s request for
+          [% IF old_flag.requestee.defined %]
+            [%= INCLUDE global/user.html.tmpl user = to_user, who = old_flag.requestee %]'s
+          [% END %]
+        [% END %]
+        <b>[% flagtype_name FILTER html %]</b>
+      [% END %]:
+    </p>
+
+    <p>
+      [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]:
+      [%= bug.short_desc FILTER html %]
+    </p>
+
+    [% IF attachment %]
+      <p>
+        <a href="[% urlbase FILTER html %]attachment.cgi?id=[% attachment.id FILTER html ~%]
+                 &action=edit">Attachment [% attachment.id FILTER html %]</a>:
+        [%= attachment.description FILTER html %]
+      </p>
+    [% END %]
+
+    [% Hook.process('after_summary') %]
+
+    <p>
+      [% comment_anchor = '' %]
+      [% FOREACH comment = new_comments.reverse %]
+        <div>
+          [% IF comment.count %]
+            [% comment_anchor = "#c$comment.count" %]
+            <b>[% "Comment # ${comment.count}" FILTER bug_link(bug,
+                {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none =%]
+            on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none =%]
+            from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
+          [% ELSE %]
+            <b>Description:</b>
+          [% END %]
+          [% comment_div = comment.is_markdown ? "div" : "pre" %]
+          [% wrap = comment.is_markdown ? 0 : 1 %]
+          <[% comment_div FILTER none %] class="bz_comment_text">[% comment.body_full({ wrap => wrap }) FILTER markdown(bug, comment, to_user) %]</[% comment_div FILTER none %]>
+        </div>
+      [% END %]
+    </p>
+
+    <div itemscope itemtype="http://schema.org/EmailMessage">
+      <div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
+        [%# Filtering of the URL param is not required & would break the URL when the comment anchor is set %]
+        <link itemprop="url" href="[% urlbase FILTER html %]show_bug.cgi?id=[% "$bug.id$comment_anchor" FILTER none %]">
+        <meta itemprop="name" content="View [% terms.bug %]">
+      </div>
+      <meta itemprop="description" content="[% terms.Bugzilla %] [%+ terms.bug %] update notification">
+    </div>
+  </body>
+</html>
diff --git a/template/en/default/email/flagmail.txt.tmpl b/template/en/default/email/flagmail.txt.tmpl
index cf64d96613..9b80a493d6 100644
--- a/template/en/default/email/flagmail.txt.tmpl
+++ b/template/en/default/email/flagmail.txt.tmpl
@@ -17,7 +17,6 @@
 [% action = flag.status || 'X' %]
 
 [% IF flag && flag.status == '?' %]
-  [% subject_status = "requested" %]
   [% IF flag.setter_id == user.id %]
     [% to_identity = flag.requestee.identity _ " for" %]
   [% ELSE %]
@@ -31,17 +30,7 @@
         [% requestee_identity = old_flag.requestee.identity _ "'s" %]
     [% END %]
   [% END %]
-  [% subject_status = statuses.$action %]
 [% END %]
-From: [% Param('mailfrom') %]
-To: [% to %]
-Subject: [% flagtype_name %] [%+ subject_status %]: [[% terms.Bug %] [%+ bug.bug_id %]] [% bug.short_desc %]
-[%- IF attachment %] :
-  [Attachment [% attachment.id %]] [% attachment.description FILTER clean_text %][% END %]
-Date: [% date %]
-X-Bugzilla-Type: request
-[%+ INCLUDE "email/header-common.txt.tmpl" %]
-[%+ threadingmarker %]
 
 [%+ USE wrap -%]
 [%- FILTER bullet = wrap(80) -%]
diff --git a/template/en/default/email/header-common.txt.tmpl b/template/en/default/email/header-common.txt.tmpl
index 02bd38e133..101237ee7c 100644
--- a/template/en/default/email/header-common.txt.tmpl
+++ b/template/en/default/email/header-common.txt.tmpl
@@ -13,7 +13,7 @@ X-Bugzilla-Component: [% bug.component %]
 X-Bugzilla-Version: [% bug.version %]
 X-Bugzilla-Keywords: [% bug.keywords %]
 X-Bugzilla-Severity: [% bug.bug_severity %]
-X-Bugzilla-Who: [% changer.login %]
+X-Bugzilla-Who: [% changer.login || user.login %]
 X-Bugzilla-Status: [% bug.bug_status %]
 X-Bugzilla-Resolution: [% bug.resolution %]
 X-Bugzilla-Priority: [% bug.priority %]
diff --git a/template/en/default/email/mta-test.txt.tmpl b/template/en/default/email/mta-test.txt.tmpl
new file mode 100644
index 0000000000..9add094b13
--- /dev/null
+++ b/template/en/default/email/mta-test.txt.tmpl
@@ -0,0 +1,18 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+Content-Type: text/plain
+From: [% Param('mailfrom') %]
+To: [% user.email %]
+Subject: [% terms.Bugzilla %] Email System Test Message
+X-Bugzilla-Type: admin
+
+Dear [% terms.Bugzilla %] administrator,
+
+This is a test email from your [% terms.Bugzilla %] system. If you can
+read this, your [% terms.Bugzilla %] can send email.
diff --git a/template/en/default/email/whine.txt.tmpl b/template/en/default/email/whine.txt.tmpl
index 106a94a5e6..5844c92f33 100644
--- a/template/en/default/email/whine.txt.tmpl
+++ b/template/en/default/email/whine.txt.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 From: [% Param("mailfrom") %]
-To: [% email %][% Param("emailsuffix") %]
+To: [% email %]
 Subject: Your [% terms.Bugzilla %] [%+ terms.bug %] list needs attention.
 X-Bugzilla-Type: whine
 
diff --git a/template/en/default/extensions/config.pm.tmpl b/template/en/default/extensions/config.pm.tmpl
index 68ed260c1f..599f9ea598 100644
--- a/template/en/default/extensions/config.pm.tmpl
+++ b/template/en/default/extensions/config.pm.tmpl
@@ -14,7 +14,7 @@
 
 package Bugzilla::Extension::[% name %];
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
diff --git a/template/en/default/extensions/extension.pm.tmpl b/template/en/default/extensions/extension.pm.tmpl
index 823440421e..985d28ccc0 100644
--- a/template/en/default/extensions/extension.pm.tmpl
+++ b/template/en/default/extensions/extension.pm.tmpl
@@ -14,7 +14,7 @@
 
 package Bugzilla::Extension::[% name %];
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
diff --git a/template/en/default/extensions/index-admin.rst.tmpl b/template/en/default/extensions/index-admin.rst.tmpl
new file mode 100644
index 0000000000..5089377104
--- /dev/null
+++ b/template/en/default/extensions/index-admin.rst.tmpl
@@ -0,0 +1,23 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[%# INTERFACE:
+  # name: string; the name of the extension.
+  #%]
+
+[% USE String('#') %]
+[% name %]
+[%+ String.repeat(name.length) %]
+
+This is a sample Adminstrator documentation file for the [% name %] extension.
+Like all of the Bugzilla docs, it's written in
+`reStructured Text (reST) format <http://sphinx-doc.org/latest/rest.html>`_
+and will be compiled by `Sphinx <http://sphinx-doc.org/>`_.
+
+If you build the docs yourself using :file:`makedocs.pl`, this file will get
+incorporated into the Installed Extensions chapter of the Administration Guide.
diff --git a/template/en/default/extensions/name.rst.tmpl b/template/en/default/extensions/index-user.rst.tmpl
similarity index 78%
rename from template/en/default/extensions/name.rst.tmpl
rename to template/en/default/extensions/index-user.rst.tmpl
index c2e1b5a80b..b09fc1cd13 100644
--- a/template/en/default/extensions/name.rst.tmpl
+++ b/template/en/default/extensions/index-user.rst.tmpl
@@ -14,10 +14,10 @@
 [% name %]
 [%+ String.repeat(name.length) %]
 
-This is a sample documentation file for the [% name %] extension. Like all of
-the Bugzilla docs, it's written in
+This is a sample User documentation file for the [% name %] extension.
+Like all of the Bugzilla docs, it's written in
 `reStructured Text (reST) format <http://sphinx-doc.org/latest/rest.html>`_
 and will be compiled by `Sphinx <http://sphinx-doc.org/>`_.
 
 If you build the docs yourself using :file:`makedocs.pl`, this file will get
-incorporated into the Extensions chapter.
+incorporated into the Installed Extensions chapter of the User Guide.
diff --git a/template/en/default/extensions/util.pm.tmpl b/template/en/default/extensions/util.pm.tmpl
index 3baab57fd0..6e14428a66 100644
--- a/template/en/default/extensions/util.pm.tmpl
+++ b/template/en/default/extensions/util.pm.tmpl
@@ -14,7 +14,7 @@
 
 package Bugzilla::Extension::[% name %]::Util;
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index f5f1bd7836..67eea4cca3 100644
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -24,431 +24,233 @@
 
 %::safe = (
 
-'whine/schedule.html.tmpl' => [
-  'event.key',
-  'query.id',
-  'query.sort',
-  'schedule.id',
-  'option.0',
-  'option.1',
-],
-
-'whine/mail.html.tmpl' => [
-  'bug.bug_id',
-],
-
-'flag/list.html.tmpl' => [
-  'flag.status', 
-  'type.id', 
-],
-
-'search/form.html.tmpl' => [
-  'qv.name',
-  'qv.description',
-],
-
-'search/search-specific.html.tmpl' => [
-  'status.name',
-],
-
-'search/tabs.html.tmpl' => [
-  'content',
-],
-
-'request/queue.html.tmpl' => [
-  'column_headers.$group_field', 
-  'column_headers.$column', 
-  'request.status', 
-  'request.bug_id', 
-  'request.attach_id', 
-],
-
-'reports/keywords.html.tmpl' => [
-  'keyword.bug_count', 
-],
-
-'reports/report-table.csv.tmpl' => [
-  'data.$tbl.$col.$row',
-  'colsepchar',
-],
-
-'reports/report-table.html.tmpl' => [
-  '"&amp;$col_vals" IF col_vals', 
-  '"&amp;$row_vals" IF row_vals', 
-  'classes.$row_idx.$col_idx', 
-  'urlbase', 
-  'data.$tbl.$col.$row', 
-],
-
-'reports/report.html.tmpl' => [
-  'width', 
-  'height', 
-  'imageurl', 
-  'formaturl', 
-  'other_format.name', 
-  'switchbase',
-  'cumulate',
-],
-
-'reports/chart.html.tmpl' => [
-  'width', 
-  'height', 
-  'imageurl', 
-  'sizeurl', 
-  'height + 100', 
-  'height - 100', 
-  'width + 100', 
-  'width - 100', 
-],
-
-'reports/series-common.html.tmpl' => [
-  'sel.name', 
-  '"onchange=\"$sel.onchange\"" IF sel.onchange', 
-],
-
-'reports/chart.csv.tmpl' => [
-  'data.$j.$i', 
-  'colsepchar',
-],
-
-'reports/create-chart.html.tmpl' => [
-  'series.series_id', 
-  'newidx',
-],
-
-'reports/edit-series.html.tmpl' => [
-  'default.series_id', 
-],
-
-'list/edit-multiple.html.tmpl' => [
-  'group.id', 
-  'menuname',
-],
-
-'list/list.rdf.tmpl' => [
-  'template_version', 
-  'bug.bug_id', 
-  'column', 
-],
-
-'list/table.html.tmpl' => [
-  'tableheader',
-  'bug.bug_id', 
-],
-
-'list/list.csv.tmpl' => [
-  'bug.bug_id', 
-  'colsepchar',
-],
-
-'list/list.js.tmpl' => [
-  'bug.bug_id', 
-],
-
-'global/choose-product.html.tmpl' => [
-  'target',
-],
-
-# You are not permitted to add any values here. Everything in this file should 
+  'whine/schedule.html.tmpl' => [
+    'event.key', 'query.id', 'query.sort', 'schedule.id', 'option.0', 'option.1',
+  ],
+
+  'whine/mail.html.tmpl' => ['bug.bug_id',],
+
+  'flag/list.html.tmpl' => ['flag.status', 'type.id',],
+
+  'search/form.html.tmpl' => ['qv.name', 'qv.description',],
+
+  'search/search-specific.html.tmpl' => ['status.name',],
+
+  'search/tabs.html.tmpl' => ['content',],
+
+  'request/queue.html.tmpl' => [
+    'column_headers.$group_field', 'column_headers.$column',
+    'request.status',              'request.bug_id',
+    'request.attach_id',
+  ],
+
+  'reports/keywords.html.tmpl' => ['keyword.bug_count',],
+
+  'reports/report-table.csv.tmpl' => ['data.$tbl.$col.$row', 'colsepchar',],
+
+  'reports/report-table.html.tmpl' => [
+    '"&amp;$col_vals" IF col_vals', '"&amp;$row_vals" IF row_vals',
+    'urlbase',                      'data.$tbl.$col.$row',
+  ],
+
+  'reports/report.html.tmpl' => [
+    'width',             'height',     'imageurl', 'formaturl',
+    'other_format.name', 'switchbase', 'cumulate',
+  ],
+
+  'reports/chart.html.tmpl' => [
+    'width',        'height',       'imageurl',    'sizeurl',
+    'height + 100', 'height - 100', 'width + 100', 'width - 100',
+  ],
+
+  'reports/series-common.html.tmpl' =>
+    ['sel.name', '"onchange=\"$sel.onchange\"" IF sel.onchange',],
+
+  'reports/chart.csv.tmpl' => ['data.$j.$i', 'colsepchar',],
+
+  'reports/create-chart.html.tmpl' => ['series.series_id', 'newidx',],
+
+  'reports/edit-series.html.tmpl' => ['default.series_id',],
+
+  'list/edit-multiple.html.tmpl' => ['group.id', 'menuname',],
+
+  'list/list.rdf.tmpl' => ['template_version', 'bug.bug_id', 'column',],
+
+  'list/table.html.tmpl' => ['tableheader', 'bug.bug_id',],
+
+  'list/list.csv.tmpl' => ['bug.bug_id', 'colsepchar',],
+
+  'list/list.js.tmpl' => ['bug.bug_id',],
+
+  'global/choose-product.html.tmpl' => ['target',],
+
+# You are not permitted to add any values here. Everything in this file should
 # be filtered unless there's an extremely good reason why not, in which case,
 # use the "none" dummy filter.
-'global/code-error.html.tmpl' => [
-],
- 
-'global/header.html.tmpl' => [
-  'javascript', 
-  'style', 
-  'onload',
-  'title',
-  '" &ndash; $header" IF header',
-  'subheader',
-  'header_addl_info', 
-  'message', 
-],
-
-'global/messages.html.tmpl' => [
-  'series.frequency * 2',
-],
-
-'global/select-menu.html.tmpl' => [
-  'options', 
-  'size', 
-],
-
-'global/tabs.html.tmpl' => [
-  'content', 
-],
-
-# You are not permitted to add any values here. Everything in this file should 
+  'global/code-error.html.tmpl' => [],
+
+  'global/header.html.tmpl' => [
+    'javascript',                   'style',
+    'onload',                       'title',
+    '" &ndash; $header" IF header', 'subheader',
+    'header_addl_info',             'message',
+  ],
+
+  'global/messages.html.tmpl' => ['series.frequency * 2',],
+
+  'global/select-menu.html.tmpl' => ['options', 'size',],
+
+  'global/tabs.html.tmpl' => ['content',],
+
+# You are not permitted to add any values here. Everything in this file should
 # be filtered unless there's an extremely good reason why not, in which case,
 # use the "none" dummy filter.
-'global/user-error.html.tmpl' => [
-],
-
-'global/confirm-user-match.html.tmpl' => [
-  'script',
-],
-
-'bug/comments.html.tmpl' => [
-  'comment.id',
-  'comment.count',
-  'bug.bug_id',
-],
-
-'bug/dependency-graph.html.tmpl' => [
-  'image_map', # We need to continue to make sure this is safe in the CGI
-  'image_url', 
-  'map_url', 
-  'bug_id', 
-],
-
-'bug/dependency-tree.html.tmpl' => [
-  'bugid', 
-  'maxdepth', 
-  'hide_resolved', 
-  'ids.join(",")',
-  'maxdepth + 1', 
-  'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""',
-  'maxdepth == 1 ? 1
+  'global/user-error.html.tmpl' => [],
+
+  'global/confirm-user-match.html.tmpl' => ['script',],
+
+  'bug/comments.html.tmpl' => ['comment.id', 'comment.count', 'bug.bug_id',],
+
+  'bug/dependency-graph.html.tmpl' => [
+    'image_map',    # We need to continue to make sure this is safe in the CGI
+    'image_url', 'map_url', 'bug_id',
+  ],
+
+  'bug/dependency-tree.html.tmpl' => [
+    'bugid', 'maxdepth', 'hide_resolved', 'ids.join(",")', 'maxdepth + 1',
+    'maxdepth > 0 && maxdepth <= realdepth ? maxdepth : ""', 'maxdepth == 1 ? 1
                        : ( maxdepth ? maxdepth - 1 : realdepth - 1 )',
-],
-
-'bug/edit.html.tmpl' => [
-  'bug.remaining_time', 
-  'bug.delta_ts', 
-  'bug.bug_id', 
-  'group.bit', 
-  'selname',
-  'inputname',
-  '" colspan=\"$colspan\"" IF colspan',
-  '" size=\"$size\"" IF size',
-  '" maxlength=\"$maxlength\"" IF maxlength',
-  '" spellcheck=\"$spellcheck\"" IF spellcheck',
-],
-
-'bug/show-multiple.html.tmpl' => [
-  'attachment.id', 
-  'flag.status',
-],
-
-'bug/show.html.tmpl' => [
-  'bug.bug_id',
-],
-
-'bug/show.xml.tmpl' => [
-  'constants.BUGZILLA_VERSION', 
-  'a.id', 
-  'field', 
-],
-
-'bug/summarize-time.html.tmpl' => [
-  'global.grand_total FILTER format("%.2f")',
-  'subtotal FILTER format("%.2f")',
-  'work_time FILTER format("%.2f")',
-  'global.total FILTER format("%.2f")',
-  'global.remaining FILTER format("%.2f")',
-  'global.estimated FILTER format("%.2f")',
-  'bugs.$id.remaining_time FILTER format("%.2f")',
-  'bugs.$id.estimated_time FILTER format("%.2f")',
-],
-
-
-'bug/time.html.tmpl' => [
-  "time_unit.replace('0\\Z', '')",
-  '(act / (act + rem)) * 100 
-       FILTER format("%d")', 
-],
-
-'bug/process/results.html.tmpl' => [
-  'title.$type.ucfirst',
-],
-
-'bug/create/create.html.tmpl' => [
-  'cloned_bug_id',
-],
-
-'bug/create/create-guided.html.tmpl' => [
-  'sel',
-],
-
-'bug/activity/table.html.tmpl' => [
-  'change.attachid', 
-],
-
-'attachment/create.html.tmpl' => [
-  'bug.bug_id',
-  'attachment.id', 
-],
-
-'attachment/created.html.tmpl' => [
-  'attachment.id',
-  'attachment.bug_id',
-],
-
-'attachment/edit.html.tmpl' => [
-  'attachment.id', 
-  'attachment.bug_id', 
-  'editable_or_hide',
-  'use_patchviewer',
-],
-
-'attachment/list.html.tmpl' => [
-  'attachment.id', 
-  'flag.status',
-  'bugid',
-  'obsolete_attachments',
-],
-
-'attachment/midair.html.tmpl' => [
-  'attachment.id',
-],
-
-'attachment/show-multiple.html.tmpl' => [
-  'a.id',
-  'flag.status'
-],
-
-'attachment/updated.html.tmpl' => [
-  'attachment.id',
-],
-
-'attachment/diff-header.html.tmpl' => [
-  'attachid',
-  'id',
-  'bugid',
-  'oldid',
-  'newid',
-  'patch.id',
-],
-
-'attachment/diff-file.html.tmpl' => [
-  'file.minus_lines',
-  'file.plus_lines',
-  'section.old_start',
-  'section_num',
-  'current_line_old',
-  'current_line_new',
-],
-
-'admin/admin.html.tmpl' => [
-  'class'
-],
-
-'admin/table.html.tmpl' => [
-  'contentlink'
-],
-
-'admin/custom_fields/cf-js.js.tmpl' => [
-  'constants.FIELD_TYPE_SINGLE_SELECT',
-  'constants.FIELD_TYPE_MULTI_SELECT',
-  'constants.FIELD_TYPE_BUG_ID',
-],
-
-'admin/params/common.html.tmpl' => [
-  'sortlist_separator', 
-],
-
-'admin/products/groupcontrol/confirm-edit.html.tmpl' => [
-  'group.count', 
-],
-
-'admin/products/groupcontrol/edit.html.tmpl' => [
-  'group.id',
-  'constants.CONTROLMAPNA', 
-  'constants.CONTROLMAPSHOWN',
-  'constants.CONTROLMAPDEFAULT',
-  'constants.CONTROLMAPMANDATORY',
-],
-
-'admin/products/list.html.tmpl' => [
-  'classification_url_part', 
-],
-
-'admin/products/footer.html.tmpl' => [
-  'classification_url_part', 
-  'classification_text', 
-],
-
-'admin/flag-type/confirm-delete.html.tmpl' => [
-  'flag_type.flag_count',
-  'flag_type.id', 
-],
-
-'admin/flag-type/edit.html.tmpl' => [
-  'selname',
-],
-
-'admin/flag-type/list.html.tmpl' => [
-  'type.id', 
-],
-
-
-'admin/components/confirm-delete.html.tmpl' => [
-  'comp.bug_count'
-],
-
-'admin/groups/delete.html.tmpl' => [
-  'shared_queries'
-],
-
-'admin/users/confirm-delete.html.tmpl' => [
-  'attachments',
-  'reporter',
-  'assignee_or_qa',
-  'cc',
-  'component_cc',
-  'flags.requestee',
-  'flags.setter',
-  'longdescs',
-  'quips',
-  'series',
-  'watch.watched',
-  'watch.watcher',
-  'whine_events',
-  'whine_schedules',
-  'otheruser.id'
-],
-
-'admin/users/edit.html.tmpl' => [
-  'otheruser.id',
-  'group.id',
-],
-
-'admin/components/edit.html.tmpl' => [
-  'comp.bug_count'
-],
-
-'admin/workflow/edit.html.tmpl' => [
-  'status.id',
-  'new_status.id',
-],
-
-'admin/workflow/comment.html.tmpl' => [
-  'status.id',
-  'new_status.id',
-],
-
-'account/auth/login-small.html.tmpl' => [
-  'qs_suffix',
-],
-
-'account/prefs/email.html.tmpl' => [
-  'relationship.id',
-  'event.id',
-  'prefname',
-],
-
-'account/prefs/prefs.html.tmpl' => [
-  'current_tab.label',
-  'current_tab.name',
-],
-
-'account/prefs/saved-searches.html.tmpl' => [
-  'group.id',
-],
-
-'config.rdf.tmpl' => [
-  'escaped_urlbase',
-],
+  ],
+
+  'bug/edit.html.tmpl' => [
+    'bug.remaining_time',
+    'bug.delta_ts',
+    'bug.bug_id',
+    'group.bit',
+    'selname',
+    'inputname',
+    '" colspan=\"$colspan\"" IF colspan',
+    '" size=\"$size\"" IF size',
+    '" maxlength=\"$maxlength\"" IF maxlength',
+    '" spellcheck=\"$spellcheck\"" IF spellcheck',
+  ],
+
+  'bug/show-multiple.html.tmpl' => ['attachment.id', 'flag.status',],
+
+  'bug/show.html.tmpl' => ['bug.bug_id',],
+
+  'bug/show.xml.tmpl' => ['constants.BUGZILLA_VERSION', 'a.id', 'field',],
+
+  'bug/summarize-time.html.tmpl' => [
+    'global.grand_total FILTER format("%.2f")',
+    'subtotal FILTER format("%.2f")',
+    'work_time FILTER format("%.2f")',
+    'global.total FILTER format("%.2f")',
+    'global.remaining FILTER format("%.2f")',
+    'global.estimated FILTER format("%.2f")',
+    'bugs.$id.remaining_time FILTER format("%.2f")',
+    'bugs.$id.estimated_time FILTER format("%.2f")',
+  ],
+
+
+  'bug/time.html.tmpl' => [
+    "time_unit.replace('0\\Z', '')", '(act / (act + rem)) * 100 
+       FILTER format("%d")',
+  ],
+
+  'bug/process/results.html.tmpl' => ['title.$type.ucfirst',],
+
+  'bug/create/create.html.tmpl' => ['cloned_bug_id',],
+
+  'bug/create/create-guided.html.tmpl' => ['sel',],
+
+  'bug/activity/table.html.tmpl' => ['change.attachid',],
+
+  'attachment/create.html.tmpl' => ['bug.bug_id', 'attachment.id',],
+
+  'attachment/created.html.tmpl' => ['attachment.id', 'attachment.bug_id',],
+
+  'attachment/edit.html.tmpl' => [
+    'attachment.id', 'attachment.bug_id', 'editable_or_hide', 'use_patchviewer',
+  ],
+
+  'attachment/list.html.tmpl' =>
+    ['attachment.id', 'flag.status', 'bugid', 'obsolete_attachments',],
+
+  'attachment/midair.html.tmpl' => ['attachment.id',],
+
+  'attachment/show-multiple.html.tmpl' => ['a.id', 'flag.status'],
+
+  'attachment/updated.html.tmpl' => ['attachment.id',],
+
+  'attachment/diff-header.html.tmpl' =>
+    ['attachid', 'id', 'bugid', 'oldid', 'newid', 'patch.id',],
+
+  'attachment/diff-file.html.tmpl' => [
+    'file.minus_lines',  'file.plus_lines',
+    'section.old_start', 'section_num',
+    'current_line_old',  'current_line_new',
+  ],
+
+  'admin/admin.html.tmpl' => ['class'],
+
+  'admin/table.html.tmpl' => ['contentlink'],
+
+  'admin/custom_fields/cf-js.js.tmpl' => [
+    'constants.FIELD_TYPE_SINGLE_SELECT', 'constants.FIELD_TYPE_MULTI_SELECT',
+    'constants.FIELD_TYPE_BUG_ID',
+  ],
+
+  'admin/params/common.html.tmpl' => ['sortlist_separator',],
+
+  'admin/products/groupcontrol/confirm-edit.html.tmpl' => ['group.count',],
+
+  'admin/products/groupcontrol/edit.html.tmpl' => [
+    'group.id',                  'constants.CONTROLMAPNA',
+    'constants.CONTROLMAPSHOWN', 'constants.CONTROLMAPDEFAULT',
+    'constants.CONTROLMAPMANDATORY',
+  ],
+
+  'admin/products/list.html.tmpl' => ['classification_url_part',],
+
+  'admin/products/footer.html.tmpl' =>
+    ['classification_url_part', 'classification_text',],
+
+  'admin/flag-type/confirm-delete.html.tmpl' =>
+    ['flag_type.flag_count', 'flag_type.id',],
+
+  'admin/flag-type/edit.html.tmpl' => ['selname',],
+
+  'admin/flag-type/list.html.tmpl' => ['type.id',],
+
+
+  'admin/components/confirm-delete.html.tmpl' => ['comp.bug_count'],
+
+  'admin/groups/delete.html.tmpl' => ['shared_queries'],
+
+  'admin/users/confirm-delete.html.tmpl' => [
+    'attachments',  'reporter',        'assignee_or_qa', 'cc',
+    'component_cc', 'flags.requestee', 'flags.setter',   'longdescs',
+    'quips',        'series',          'watch.watched',  'watch.watcher',
+    'whine_events', 'whine_schedules', 'otheruser.id'
+  ],
+
+  'admin/users/edit.html.tmpl' => ['otheruser.id', 'group.id',],
+
+  'admin/components/edit.html.tmpl' => ['comp.bug_count'],
+
+  'admin/workflow/edit.html.tmpl' => ['status.id', 'new_status.id',],
+
+  'admin/workflow/comment.html.tmpl' => ['status.id', 'new_status.id',],
+
+  'account/auth/login-small.html.tmpl' => ['qs_suffix',],
+
+  'account/prefs/email.html.tmpl' => ['relationship.id', 'event.id', 'prefname',],
+
+  'account/prefs/prefs.html.tmpl' => ['current_tab.label', 'current_tab.name',],
+
+  'account/prefs/saved-searches.html.tmpl' => ['group.id',],
+
+  'config.rdf.tmpl' => ['escaped_urlbase', 'uri_product_name', 'flag_type.id'],
 
 );
diff --git a/template/en/default/flag/list.html.tmpl b/template/en/default/flag/list.html.tmpl
index 7547e5687c..57f68db038 100644
--- a/template/en/default/flag/list.html.tmpl
+++ b/template/en/default/flag/list.html.tmpl
@@ -23,13 +23,12 @@
 <table id="[% flag_table_id FILTER html %]">
   [% UNLESS flag_no_header %]
     <tr>
-      <th colspan="3">
-        Flags:
-      </th>
+      <th colspan="3">Flags:</th>
       [% IF any_flags_requesteeble %]
-        <th>
-          Requestee:
-        </th>
+        <th>Requestee:</th>
+      [% END %]
+      [% IF edit_multiple_bugs %]
+        <th>&nbsp;</th>
       [% END %]
     </tr>
   [% END %]
@@ -57,7 +56,10 @@
       [% NEXT UNLESS type.flags && type.flags.size > 0 && type.is_multiplicable && type.is_active %]
       [% IF !separator_displayed %]
         <tbody class="bz_flag_type">
-          <tr><td colspan="3"><hr></td></tr>
+          [% sep_length = 3 + (any_flags_requesteeble ? 1 : 0) + (edit_multiple_bugs ? 1 : 0) %]
+          <tr>
+            <td colspan="[% sep_length FILTER html %]"><hr></td>
+          </tr>
         </tbody>
         [% separator_displayed = 1 %]
       [% END %]
@@ -80,7 +82,7 @@
       [% ELSE %]
         [% flag.setter.nick FILTER html %]:
       [% END %]
-      [%+ type.name FILTER html FILTER no_break %][% flag.status %]
+      <span class="nowrap">[%+ type.name FILTER html %][% flag.status %]</span>
       [% IF flag.requestee %]
         [% IF flag.requestee.name %]
           (<span title="[% flag.requestee.name FILTER html %]">[% flag.requestee.nick FILTER html %]</span>)
@@ -107,9 +109,9 @@
           [% addl_text FILTER html %]
         [% END %]
       </td>
-      <td>
+      <td class="nowrap">
         <label title="[% type.description FILTER html %]" for="[% fid FILTER html %]">
-          [%- type.name FILTER html FILTER no_break -%]</label>
+          [%- type.name FILTER html %]</label>
       </td>
       <td>
         <input type="hidden" id="[% fid FILTER html %]_dirty">
@@ -119,11 +121,11 @@
                 class="flag_select flag_type-[% type.id %]"
                 [% IF !can_edit_flag %] disabled="disabled"[% END %]>
         [%# Only display statuses the user is allowed to set. %]
-        [% IF edit_multiple_bugs %]
-          <option value="--do_not_change--">--do_not_change--</option>
+        [% IF edit_multiple_bugs && dontchange %]
+          <option value="[% dontchange FILTER html %]">[% dontchange FILTER html %]</option>
         [% END %]
         [% IF !flag || (can_edit_flag && user.can_request_flag(type)) || flag.setter_id == user.id %]
-          <option value="X"></option>
+          <option value="X" label=" "></option>
         [% END %]
         [% IF type.is_active && can_edit_flag %]
           [% IF (type.is_requestable && user.can_request_flag(type)) || (flag && flag.status == "?") %]
@@ -171,16 +173,19 @@
           [% END %]
         </td>
       [% END %]
-      <td>
-        [% IF type.is_multiplicable && edit_multiple_bugs %]
+      [% IF edit_multiple_bugs %]
+        <td>
+        [% IF type.is_multiplicable %]
           <input type="checkbox" name="flags_add-[% type.id %]"
                  id="flags_add-[% type.id %]" value="1">
           <label for="flags_add-[% type.id %]"
-                 title="If ticked, always create a new flag. Leaving it unchecked will update existing flag(s) and add a new flag if it does not exist">
+                 title="If ticked, always create a new flag. Leaving it unchecked will
+                        update existing flag(s) and add a new flag if it does not exist">
             Always add
           </label>
         [% END %]
-      </td>
+        </td>
+      [% END %]
     </tr>
   </tbody>
 [% END %]
diff --git a/template/en/default/global/calendar.js.tmpl b/template/en/default/global/calendar.js.tmpl
deleted file mode 100644
index 26f3fa0239..0000000000
--- a/template/en/default/global/calendar.js.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-[%# INTERFACE:
-  # id: The id of the input field the calendar widget is to be assigned to.
-  #%]
-
-[%# This template exists because createCalendar accepts additional parameters
-  # which allow for localization. Please see the YUI documentation at
-  # http://developer.yahoo.com/yui/calendar/#internationalization for details.
-  # As an example, here's what you'd specify as additional parameters to
-  # localize for German calendars; replace the ellipsis ("...") by the original
-  # parameter (we cannot put it into the example because it'd break this
-  # template comment):
-  #
-  #   createCalendar(...
-  #                  /* The weekday the week begins on; 0 is Sunday,
-  #                   * 1 is Monday and so on: */
-  #                  1,
-  #                  /* Months, full names; first must be January: */
-  #                  ['Januar',    'Februar',   'März',      'April',
-  #                   'Mai',       'Juni',      'Juli',      'August',
-  #                   'September', 'Oktober',   'November',  'Dezember'],
-  #                  /* Weekdays, two-letter abbreviations; first must be
-  #                   * Sunday: */
-  #                  ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa']);
-  #%]
-createCalendar('[% id FILTER js %]');
diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl
index 815e625a61..8433380ea3 100644
--- a/template/en/default/global/choose-classification.html.tmpl
+++ b/template/en/default/global/choose-classification.html.tmpl
@@ -19,7 +19,9 @@
 [% DEFAULT title = "Choose the classification" %]
 [% PROCESS global/header.html.tmpl %]
 
-[% previous_params = cgi.canonicalise_query('classification') %]
+[% USE Bugzilla %]
+[% previous_params = Bugzilla.cgi.canonicalise_query('classification') %]
+
 <h2>First, you must pick a classification on which to enter [% terms.abug %]:</h2>
 <table id="choose_classification">
   <tr>
diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl
index 5dc619087d..a1582532ac 100644
--- a/template/en/default/global/choose-product.html.tmpl
+++ b/template/en/default/global/choose-product.html.tmpl
@@ -28,7 +28,9 @@
 [% DEFAULT title = "Choose a Product" %]
 [% PROCESS global/header.html.tmpl %]
 
-[% previous_params = cgi.canonicalise_query('classification', 'product') %]
+[% USE Bugzilla %]
+[% previous_params = Bugzilla.cgi.canonicalise_query('classification', 'product') %]
+
 <h2>[% h2 FILTER html %]</h2>
 
 <table id="choose_product">
@@ -43,10 +45,10 @@
 
   [% FOREACH p = c.products %]
     <tr>
-      <th class="right">
+      <th class="right nowrap">
         <a href="[% target %]?product=[% p.name FILTER uri -%]
               [%- IF previous_params %]&amp;[% previous_params FILTER none %][% END -%]">
-        [% p.name FILTER html FILTER no_break %]</a>:&nbsp;
+        [% p.name FILTER html %]</a>:
       </th>
 
       <td>[% p.description FILTER html_light %]</td>
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 1c3422fa8a..3f83dbb687 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -49,7 +49,7 @@
     the error [% bug.error FILTER html %].
     
   [% ELSIF error == "chart_data_not_generated" %]
-    [% admindocslinks = {'extraconfig.html' => 'Setting up Charting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Setting up Charting'} %]
     [% IF product.id %]
       Charts for the <em>[% product.name FILTER html %]</em> product are not
       available yet because no charting data has been collected for it since it
@@ -104,13 +104,18 @@
   [% ELSIF error == "comment_type_invalid" %]
     '[% type FILTER html %]' is not a valid comment type.
 
+  [% ELSIF error == "db_error" %]
+    An error occurred while performing a database operation:
+    <pre>[% err_message FILTER html %]</pre>
+
   [% ELSIF error == "db_rename_conflict" %]
     Name conflict: Cannot rename [% old FILTER html %] to
     [%+ new FILTER html %] because [% new FILTER html %] already exists.
 
   [% ELSIF error == "cookies_need_value" %]
     Every cookie must have a value.
-
+  [% ELSIF error == "cpan_meta_missing" %]
+    META.json/MYMETA.json file is missing.
   [% ELSIF error == "env_no_email" %]
     Bugzilla did not receive an email address from the
     environment.
@@ -219,7 +224,8 @@
     but rather <em>[% target_type FILTER html %]</em>.
   
   [% ELSIF error == "invalid_field_name" %]
-    Can't use [% field FILTER html %] as a field name.
+    [% title = "Invalid Field Name" %]
+    Can't use "[% field.truncate(30, "...") FILTER html %]" as a field name.
 
   [% ELSIF error == "jobqueue_insert_failed" %]
    [% title = "Job Queue Failure" %]
@@ -289,6 +295,14 @@
     a <code>[% param FILTER html %]</code> argument, and that
     argument was not set.
 
+  [% ELSIF error == "param_integer_required" %]
+    The function <code>[% function FILTER html %]</code> requires
+    that <code>[% param FILTER html %]</code> be an integer.
+
+  [% ELSIF error == "param_scalar_array_required" %]
+    The <code>[% param FILTER html %]</code> parameter must be an array of scalars
+    (integers and/or strings).
+
   [% ELSIF error == "params_required" %]
     [% title = "Missing Parameter" %]
     The function <code>[% function FILTER html %]</code> requires
@@ -384,8 +398,9 @@
     Invalid setting for post_bug_submit_action
 
   [% ELSIF error == "search_field_operator_unsupported" %]
+    [% title = "Invalid Search Type" %]
     Bugzilla does not support the search type
-    "[% operator FILTER html %]".
+    "[% operator.truncate(30, "...") FILTER html %]".
 
   [% ELSE %]
     [%# Try to find hooked error messages %]
diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl
index ec23f551ee..78b4eb80a9 100644
--- a/template/en/default/global/common-links.html.tmpl
+++ b/template/en/default/global/common-links.html.tmpl
@@ -100,7 +100,7 @@
 
 [% Hook.process("link-row") %]
 [% BLOCK link_to_documentation %]
-    [% IF doc_section && Param('docs_urlbase') %]
+    [% IF doc_section %]
       <li>
         <span class="separator">| </span>
         <a href="[% docs_urlbase _ doc_section FILTER html %]" target="_blank">Help</a>
diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index a3534b72a0..b497256a3c 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -41,13 +41,11 @@
 [% IF matchsuccess == 1 %]
   [% PROCESS global/header.html.tmpl title="Confirm Match" %]
 
-  [% USE Bugzilla %]
-
   <form method="post" 
   [% IF script -%]
     action="[% script %]"
   [%- END -%]
-  [% IF Bugzilla.cgi.param("data") %]
+  [% IF cgi_param("data") %]
     enctype="multipart/form-data"
   [% END %]
   >
@@ -147,7 +145,7 @@
 
   [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %]
   [% FOREACH key IN matches.keys %]
-    [% exclude_these.push(key) IF cgi.param(key) == '' %]
+    [% exclude_these.push(key) IF cgi_param(key) == '' %]
   [% END %]
   [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
   [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
diff --git a/template/en/default/global/docslinks.html.tmpl b/template/en/default/global/docslinks.html.tmpl
index c2cc830fa8..94502aa1f9 100644
--- a/template/en/default/global/docslinks.html.tmpl
+++ b/template/en/default/global/docslinks.html.tmpl
@@ -7,30 +7,29 @@
   #%]
 
 [%# INTERFACE:
-  # docslinks: hash. Hash keys will be used as text of the documentation links,
-  #            hash values will be used as links to the document, relative to
+  # docslinks: hash. Hash values will be used as text of the documentation links,
+  #            hash keys will be used as links to the document, relative to
   #            the main Bugzilla documentation directory.
   #            Example: If you want a 'FAQ' link to point to, the "faq-general"
   #            named anchor on faq.html, assign
-  #               { 'FAQ' => "faq.html#faq-general" }
+  #               { "faq.html#faq-general" => 'FAQ' }
   #            to docslinks.
   #            You may only link to sections by their given ID; it is not allowed
   #            to link to a section which is not given an ID (thus getting
   #            assigned an automatically generated ID). Otherwise, the link
   #            would break on a recompilation of the documentation.
   # admindocslinks: hash. Same as docslinks, but will only be displayed to
-  #                 members of the admin group.
+  #                 members of the 'editcomponents' group.
   #%]
 
-[% IF Param('docs_urlbase') &&
-      docslinks.keys.size || (admindocslinks.keys.size && user.in_group('admin')) %]
+[% IF docslinks.keys.size || (admindocslinks.keys.size && user.in_group('editcomponents')) %]
   <div id="docslinks">
     <h2>Related documentation</h2>
     <ul>
-      [% IF user.in_group('admin') %]
-        [% PROCESS docslinkslist docstype = admindocslinks %]
+      [% IF user.in_group('editcomponents') %]
+        [% PROCESS docslinkslist docstype = admindocslinks admin = 1 %]
       [% END %]
-      [% PROCESS docslinkslist docstype = docslinks %]
+      [% PROCESS docslinkslist docstype = docslinks admin = 0 %]
     </ul>
   </div>
 [% END %]
@@ -38,7 +37,7 @@
 [% BLOCK docslinkslist %]
   [% FOREACH docslink = docstype.keys %]
     <li>
-      <a href="[% docs_urlbase FILTER html %]
+      <a href="[% docs_urlbase FILTER html %][% "administering/" IF admin %]
                [% docslink FILTER none %]">[% docstype.$docslink FILTER html %]</a>
     </li>
   [% END %]
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index f4e17c3f88..e6c947104c 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -37,6 +37,8 @@
   "notmatches"     => "does not match",
   "isempty"        => "is empty",
   "isnotempty"     => "is not empty",
+  "isactive"       => "is active",
+  "isnotactive"    => "is not active",
 } %]
 
 [% field_types = { ${constants.FIELD_TYPE_UNKNOWN}       => "Unknown Type",
diff --git a/template/en/default/global/footer.html.tmpl b/template/en/default/global/footer.html.tmpl
index 7cc5e1b44a..7390a6d994 100644
--- a/template/en/default/global/footer.html.tmpl
+++ b/template/en/default/global/footer.html.tmpl
@@ -12,15 +12,17 @@
   #%]
 
       [% Hook.process('main-end') %]
-    </div>
+    </main>
 
-    <div id="footer">
+    <footer id="footer">
       <div class="intro">[% Hook.process('intro') %]</div>
 
-      [% PROCESS "global/useful-links.html.tmpl" %]
+      <nav>
+        [% PROCESS "global/useful-links.html.tmpl" %]
+      </nav>
 
       <div class="outro">[% Hook.process('outro') %]</div>
-    </div>
+    </footer>
 
     [% Hook.process("end") %]
   </body>
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 852d2c85e5..bc4a424fa5 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -20,6 +20,7 @@
   # style_urls: list. List of URLs to CSS style sheets.
   # message: string. A message to display to the user. May contain HTML.
   # atomlink: Atom link URL, May contain HTML
+  # generate_api_token: generate a token which can be used to make authenticated webservice calls
   #%]
 
 [% IF message %]
@@ -31,40 +32,65 @@
   header_addl_info = ""
   onload = ""
   style_urls = []
+  javascript_urls = []
   yui = []
+  yui_css = {}
+  yui_deps = {}
+  no_yui = 0
+  jquery = []
+  jquery_css = []
+  generate_api_token = 0
+  favicon_url = "images/favicon.ico"
 %]
 
-[% SET yui_css = {
-  autocomplete => 1,
-  calendar     => 1,
-  datatable    => 1,
-  button       => 1,
-} %]
-
-[%# Note: This is simple dependency resolution--you can't have dependencies
-  # that depend on each other. You have to specify all of a module's deps,
-  # if that module is going to be specified in "yui".
-  #%]
-[% SET yui_deps = {
-  autocomplete => ['json', 'connection', 'datasource'],
-  datatable    => ['json', 'connection', 'datasource', 'element'],
-} %]
-
-[%# When using certain YUI modules, we need to process certain
-  # extra JS templates.
-  #%]
-[% SET yui_templates = {
-  datatable => ['global/value-descs.js.tmpl'],
-} %]
+[% IF NOT no_yui %]
+  [% SET yui_css = {
+    datatable    => 1,
+    button       => 1,
+  } %]
+
+  [%# Note: This is simple dependency resolution--you can't have dependencies
+    # that depend on each other. You have to specify all of a module's deps,
+    # if that module is going to be specified in "yui".
+    #%]
+  [% SET yui_deps = {
+    datatable => ['json', 'connection', 'datasource', 'element'],
+  } %]
+
+  [%# When using certain YUI modules, we need to process certain
+    # extra JS templates.
+    #%]
+  [% SET yui_templates = {
+    datatable => ['global/value-descs.js.tmpl'],
+  } %]
+[% END %]
 
 [%# These are JS URLs that are *always* on the page and come before
   # every other JS URL.
   #%]
 [% SET starting_js_urls = [
-    "js/yui/yahoo-dom-event/yahoo-dom-event.js",
-    "js/yui/cookie/cookie-min.js",
+  "js/jquery/jquery-min.js",
+  "js/jquery/ui/jquery-ui-min.js"
 ] %]
 
+[% IF NOT no_yui %]
+  [% starting_js_urls.push("js/yui/yahoo-dom-event/yahoo-dom-event.js",
+                           "js/yui/cookie/cookie-min.js") %]
+[% END %]
+
+[% SET jq_css_urls = [
+  "js/jquery/ui/jquery-ui-min.css",
+  "js/jquery/ui/jquery-ui-structure-min.css",
+  "js/jquery/ui/jquery-ui-theme-min.css",
+] %]
+
+[% FOREACH jq_name = jquery_css %]
+  [% style_urls.push("js/jquery/plugins/$jq_name/${jq_name}-min.css") %]
+[% END %]
+[% style_urls.import(jq_css_urls) FILTER null %]
+
+[%# Add our required jQuery plugins %]
+[% jquery.push("cookie", "devbridgeAutocomplete") %]
 
 [%# We should be able to set the default value of the header variable
   # to the value of the title variable using the DEFAULT directive,
@@ -80,16 +106,15 @@
   <head>
     [% Hook.process("start") %]
     <title>[% title %]</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
-    [% IF Param('utf8') %]
-      <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    [% IF NOT no_yui %]
+      [% SET yui = yui_resolve_deps(yui, yui_deps) %]
     [% END %]
 
-    [% SET yui = yui_resolve_deps(yui, yui_deps) %]
-
     [% SET css_sets = css_files(style_urls, yui, yui_css) %]
-    [% IF constants.CONCATENATE_ASSETS %]
-      [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %]
+    [% IF css_sets.concatenated_standard_skin %]
+      [% PROCESS format_css_link asset_url = css_sets.concatenated_standard_skin %]
     [% ELSE %]
       [% FOREACH asset_url = css_sets.standard %]
         [% PROCESS format_css_link %]
@@ -105,19 +130,24 @@
       </style>
     [% END %]
 
-    [% IF css_sets.unified_custom %]
-      [% IF constants.CONCATENATE_ASSETS %]
-        [% PROCESS format_css_link asset_url = css_sets.unified_custom %]
-      [% ELSE %]
-        [% FOREACH asset_rul = css_sets.custom %]
+    [% IF css_sets.concatenated_custom %]
+        [% PROCESS format_css_link asset_url = css_sets.concatenated_custom %]
+    [% ELSE %]
+        [% FOREACH asset_url = css_sets.custom %]
           [% PROCESS format_css_link %]
         [% END %]
+    [% END %]
+
+    [% IF NOT no_yui %]
+      [%# YUI Scripts %]
+      [% FOREACH yui_name = yui %]
+        [% starting_js_urls.push("js/yui/$yui_name/${yui_name}-min.js") %]
       [% END %]
     [% END %]
 
-    [%# YUI Scripts %]
-    [% FOREACH yui_name = yui %]
-      [% starting_js_urls.push("js/yui/$yui_name/${yui_name}-min.js") %]
+    [%# jQuery Plugins %]
+    [% FOREACH jq_name = jquery %]
+      [% starting_js_urls.push("js/jquery/plugins/$jq_name/${jq_name}-min.js") %]
     [% END %]
     [% starting_js_urls.push('js/global.js') %]
 
@@ -127,27 +157,38 @@
 
     <script type="text/javascript">
     <!--
-        YAHOO.namespace('bugzilla');
-        YAHOO.util.Event.addListener = function (el, sType, fn, obj, overrideContext) {
-               if ( ("onpagehide" in window || YAHOO.env.ua.gecko) && sType === "unload") { sType = "pagehide"; };
-               var capture = ((sType == "focusin" || sType == "focusout") && !YAHOO.env.ua.ie) ? true : false;
-               return this._addListener(el, this._getType(sType), fn, obj, overrideContext, capture);
-         };
-        if ( "onpagehide" in window || YAHOO.env.ua.gecko) {
-            YAHOO.util.Event._simpleRemove(window, "unload", 
-                                           YAHOO.util.Event._unload);
-        }
+        [% IF NOT no_yui %]
+          YAHOO.namespace('bugzilla');
+          YAHOO.util.Event.addListener = function (el, sType, fn, obj, overrideContext) {
+              if ( ("onpagehide" in window || YAHOO.env.ua.gecko) && sType === "unload") { sType = "pagehide"; };
+              var capture = ((sType == "focusin" || sType == "focusout") && !YAHOO.env.ua.ie) ? true : false;
+              return this._addListener(el, this._getType(sType), fn, obj, overrideContext, capture);
+          };
+          if ( "onpagehide" in window || YAHOO.env.ua.gecko) {
+              YAHOO.util.Event._simpleRemove(window, "unload",
+                                             YAHOO.util.Event._unload);
+          }
+        [% END %]
+
         [%# The language selector needs javascript to set its cookie,
           # so it is hidden in HTML/CSS by the "bz_default_hidden" class.
           # If the browser can run javascript, it will then "unhide"
           # the language selector using the following code.
           #%]
-        function unhide_language_selector() { 
-            YAHOO.util.Dom.removeClass(
-                'lang_links_container', 'bz_default_hidden'
-            ); 
+        function unhide_language_selector() {
+            $('#lang_links_container').removeClass('bz_default_hidden');
         } 
-        YAHOO.util.Event.onDOMReady(unhide_language_selector);
+        $(document).ready(unhide_language_selector);
+
+        // This sets the default parameters for all calendar fields.
+        $.datepicker.setDefaults({
+            dateFormat: "yy-mm-dd", // this is the YYYY-MM-DD format
+            showButtonPanel: true,  // permits to easily select "Today"
+            // These 3 parameters are useful for localization.
+            firstDay: 0,            // 0 = Sunday, 1 = Monday, etc...
+            dayNamesMin: [ "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" ],
+            monthNames: [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ]
+        });
 
         [%# Make some Bugzilla information available to all scripts. 
           # We don't import every parameter and constant because we
@@ -155,7 +196,6 @@
           #%]
         var BUGZILLA = {
             param: {
-                cookiepath: '[% Param('cookiepath') FILTER js %]',
                 maxusermatches: [% Param('maxusermatches') FILTER js %]
             },
             constant: {
@@ -175,16 +215,19 @@
                 version_required:
                     "You must select a Version for this [% terms.bug %]."
             }
-            [% IF javascript_urls.containsany(['js/bug.js', 'js/field.js', 'js/comment-tagging.js']) %]
+            [% IF generate_api_token %]
               , api_token: '[% get_api_token FILTER js FILTER html %]'
             [% END %]
         };
 
-        [% FOREACH yui_name = yui %]
-          [% FOREACH yui_template = yui_templates.$yui_name %]
-            [% INCLUDE $yui_template %]
+        [% IF NOT no_yui %]
+          [% FOREACH yui_name = yui %]
+            [% FOREACH yui_template = yui_templates.$yui_name %]
+              [% INCLUDE $yui_template %]
+            [% END %]
           [% END %]
         [% END %]
+
         [% IF javascript %]
           [% javascript %]
         [% END %]
@@ -195,6 +238,16 @@
       [% PROCESS format_js_link %]
     [% END %]
 
+    [%# IE8 doesn't understand these HTML5 elements. So we have to declare them here. %]
+    <!--[if lt IE 9]>
+      <script>
+        document.createElement('header');
+        document.createElement('nav');
+        document.createElement('main');
+        document.createElement('footer');
+      </script>
+    <![endif]-->
+
     [%# this puts the live bookmark up on firefox for the Atom feed %]
     [% IF atomlink %]
        <link rel="alternate" 
@@ -205,7 +258,7 @@
     [%# Required for the 'Autodiscovery' feature in Firefox 2 and IE 7. %]
     <link rel="search" type="application/opensearchdescription+xml"
                        title="[% terms.Bugzilla %]" href="./search_plugin.cgi">
-    <link rel="shortcut icon" href="images/favicon.ico" >
+    <link rel="shortcut icon" href="[% favicon_url FILTER html %]">
     [% Hook.process("additional_header") %]
   </head>
 
@@ -215,7 +268,7 @@
                  [%+ class FILTER css_class_quote %]
                [% END %] yui-skin-sam">
 
-  <div id="header">
+  <header id="header">
     [% INCLUDE global/banner.html.tmpl %]
 
     <div id="titles">
@@ -230,10 +283,7 @@
       [% END %]
     </div>
 
-    <div id="common_links">
-      [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
-    </div>
-
+    [% USE Bugzilla %]
     [% IF Bugzilla.languages.size > 1 %]
       <div id="lang_links_container" class="bz_default_hidden">
         <ul class="links">
@@ -251,9 +301,13 @@
         </ul>
       </div>
     [% END %]
-  </div>
 
-  <div id="bugzilla-body">
+    <nav id="common_links">
+      [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
+    </nav>
+  </header>
+
+  <main role="main" id="bugzilla-body">
     [% IF Param('announcehtml') %]
       [% Param('announcehtml') FILTER none %]
     [% END %]
diff --git a/template/en/default/global/hidden-fields.html.tmpl b/template/en/default/global/hidden-fields.html.tmpl
index 88d2673549..f8f353233a 100644
--- a/template/en/default/global/hidden-fields.html.tmpl
+++ b/template/en/default/global/hidden-fields.html.tmpl
@@ -16,12 +16,9 @@
 [% cgi = Bugzilla.cgi %]
 
 [%# Generate hidden form fields for non-excluded fields. %]
-[% FOREACH field = cgi.param() %]
+[% FOREACH field = cgi.multi_param() %]
   [% NEXT IF exclude && field.search(exclude) %]
-  [%# The '.slice(0)' bit is here to force the 'param(field)' to be evaluated
-      in a list context, so we can avoid extra code checking for single valued or
-      empty fields %]
-  [% IF field == "data" && cgi.param("data") %]
+  [% IF field == "data" && cgi_param("data") %]
     <div class="box">
       <p>
         We were unable to store the file you uploaded because of incomplete information
@@ -30,7 +27,7 @@
         remaining missing information above.
       </p>
       <p>
-        Please re-attach the file <b>[% cgi.param(field) FILTER html %]</b> in
+        Please re-attach the file <b>[% cgi_param(field) FILTER html %]</b> in
         the field below:
       </p>
       <p>
@@ -38,7 +35,7 @@
       </p>
     </div>
   [% ELSE %]
-    [% FOREACH mvalue = cgi.param(field).slice(0) %]
+    [% FOREACH mvalue = cgi.multi_param(field) %]
       <input type="hidden" name="[% field FILTER html %]"
              value="[% mvalue FILTER html_linebreak %]">
     [% END %]
diff --git a/template/en/default/global/js-products.html.tmpl b/template/en/default/global/js-products.html.tmpl
index e40a3e3aef..940a5e64d0 100644
--- a/template/en/default/global/js-products.html.tmpl
+++ b/template/en/default/global/js-products.html.tmpl
@@ -8,14 +8,13 @@
 
 [%# The javascript block gets used in header.html.tmpl. %]
 [% javascript = BLOCK %]
-  var useclassification = false; // No classification level in use
   var first_load = true; // Is this the first time we load the page?
   var last_sel = []; // Caches last selection
   var cpts = new Array();
+
   [% n = 1 %]
   [% FOREACH prod = products %]
-    cpts['[% n %]'] = [
-      [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%] ];
+    cpts['[% n %]'] = [[% FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%]];
     [% n = n+1 %]
   [% END %]
 [% END %]
diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 3a8aa1ada7..13b31e3e68 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -22,7 +22,7 @@
 
   [% ELSIF message_tag == "account_creation_canceled" %]
     [% title = "User Account Creation Canceled" %]
-    The creation of the user account [% account FILTER html %] has been
+    The creation of the user account '[% login FILTER html %]' has been
     canceled.
 
   [% ELSIF message_tag == "account_updated" %]
@@ -35,6 +35,8 @@
           <li>
             [% IF    field == 'login_name' %]
               The login is now [% otheruser.login FILTER html %].
+            [% ELSIF field == 'email' %]
+              The email is now [% otheruser.email FILTER html %].
             [% ELSIF field == 'realname' %]
               The real name has been updated.
             [% ELSIF field == 'cryptpassword' %]
@@ -89,8 +91,8 @@
     successfully.
 
   [% ELSIF message_tag == "account_disabled" %]
-    Logging in with this user account [% account FILTER html %] is disabled, so
-    you cannot change its password.
+    Logging in with the user account with email address [% email FILTER html %]
+    is disabled, so you cannot change its password.
 
   [% ELSIF message_tag == "attachment_creation_failed" %]
     The [% terms.bug %] was created successfully, but attachment creation
@@ -324,7 +326,7 @@
 
   [% ELSIF message_tag == "flag_creation_failed" %]
     [% title = "Flag Creation Failure" %]
-    An error occured while validating flags:
+    An error occurred while validating flags:
     [%+ flag_creation_error FILTER none %]
 
   [% ELSIF message_tag == "get_field_desc" %]
@@ -496,7 +498,7 @@
     [%+ terms.Bugzilla %]...
 
   [% ELSIF message_tag == "migrate_user_created" %]
-    User created: [% created.email FILTER html %]
+    User created: [% created.login FILTER html %]
     [% IF password %] Password: [% password FILTER html %][% END %]
 
   [% ELSIF message_tag == "migrate_value_created" %]
@@ -506,6 +508,10 @@
     [%+ field_descs.${field.name} FILTER html %] value
     created: [% value FILTER html %]
 
+  [% ELSIF message_tag == "email_changed" %]
+    [% title = "Email Changed" %]
+    Your email address has been updated.
+
   [% ELSIF message_tag == "milestone_created" %]
     [% title = "Milestone Created" %]
     The milestone <em>[% milestone.name FILTER html %]</em> has been created.
@@ -514,7 +520,7 @@
     [% title = "Milestone Deleted" %]
     The milestone <em>[% milestone.name FILTER html %]</em> has been deleted.
     [% IF milestone.bug_count %]
-      [%+ terms.Bugs %] targetted to this milestone have been retargetted to
+      [%+ terms.Bugs %] targeted to this milestone have been retargetted to
       the default milestone <em>[% product.default_milestone FILTER html %]</em>.
     [% END %]
 
@@ -538,14 +544,21 @@
       No changes made to milestone <em>[% milestone.name FILTER html %]</em>.
     [% END %]
 
+  [% ELSIF message_tag == "mta_param_tests_run" %]
+    [% title = "Parameters Updated And Test Email Sent" %]
+    [% IF param_changed.size > 0 %]
+      [% FOREACH param = param_changed %]
+        Changed <em>[% param FILTER html %]</em>.<br>
+      [% END %]
+      <br>
+    [% END %]
+    Test mail sent to [% user.email FILTER html %].
+
   [% ELSIF message_tag == "parameters_updated" %]
     [% title = "Parameters Updated" %]
     [% IF param_changed.size > 0 %]
       [% FOREACH param = param_changed %]
         Changed <em>[% param FILTER html %]</em><br>
-        [% IF param == 'utf8' && Param('utf8') %]
-          <strong>You must now re-run <kbd>checksetup.pl</kbd>.</strong><br>
-        [% END %]
       [% END %]
     [% ELSE %]
       No changes made.
@@ -564,7 +577,7 @@
   [% ELSIF message_tag == "password_change_request" %]
     [% title = "Request to Change Password" %]
     A token for changing your password has been emailed to
-    <em>[% login_name FILTER html %]</em>.
+    <em>[% email FILTER html %]</em>.
     Follow the instructions in that email to change your password.
 
   [% ELSIF message_tag == "password_changed" %]
@@ -642,6 +655,9 @@
     [% title = BLOCK %]Flag Type '[% flag_type.name FILTER html %]' Deactivated[% END %]
     The flag type <em>[% flag_type.name FILTER html %]</em> has been deactivated.
 
+  [% ELSIF message_tag == "install_admin_get_login" %]
+    Enter the login name the administrator will log in with:
+
   [% ELSIF message_tag == "install_admin_get_email" %]
     Enter the e-mail address of the administrator:
 
@@ -879,9 +895,16 @@
     [% title = "$terms.Bugzilla is Down" %]
     [% Param("shutdownhtml") %]
     [% IF userid %]
-      <p>For security reasons, you have been logged out automatically.
-      The cookie that was remembering your login is now gone.
+      <p>
+        For security reasons, you have been logged out automatically.
+        The cookie that was remembering your login is now gone.
+      </p>
     [% END %]
+    <p>
+      If you are an administrator, you can
+      <a href="editparams.cgi?section=general">reactivate [% terms.Bugzilla %]</a>
+      by clearing the <kbd>shutdownhtml</kbd> parameter.
+    </p>
 
   [% ELSIF message_tag == "term" %]
     [% terms.$term FILTER html %]
diff --git a/template/en/default/global/product-select.html.tmpl b/template/en/default/global/product-select.html.tmpl
index 23a7b3d589..f9e5670adf 100644
--- a/template/en/default/global/product-select.html.tmpl
+++ b/template/en/default/global/product-select.html.tmpl
@@ -69,7 +69,7 @@
         <optgroup label="[% c FILTER html %]">
           [% FOREACH p = classifications.$c %]
             <option value="[% p.$valueattribute FILTER html %]"
-              [% " selected" IF (cgi.param(name) == p.name) || (value.contains(p.name)) %]>
+              [% " selected" IF cgi_param(name) == p.name || value.contains(p.name) %]>
               [% p.name FILTER html %]
             </option>
           [% END %]
@@ -81,7 +81,7 @@
       [% END %]
       [% FOREACH p = products %]
         <option value="[% p.$valueattribute FILTER html %]"
-          [% " selected" IF (cgi.param(name) == p.name) || (value.contains(p.name)) %]>
+          [% " selected" IF cgi_param(name) == p.name || value.contains(p.name) %]>
           [% p.name FILTER html %]
         </option>
       [% END %]
diff --git a/template/en/default/global/tabs.html.tmpl b/template/en/default/global/tabs.html.tmpl
index 9cf5a897ba..5116404775 100644
--- a/template/en/default/global/tabs.html.tmpl
+++ b/template/en/default/global/tabs.html.tmpl
@@ -25,7 +25,7 @@
             [% tab.label FILTER html %]</td>
         [% ELSE %]
           <td id="tab_[% tab.name FILTER html %]" class="clickable_area"
-              onClick="document.location='[% tab.link FILTER html %]'">
+              onClick="document.location='[% tab.link FILTER js FILTER html %]'">
             <a href="[% tab.link FILTER html %]">[% tab.label FILTER html %]</a>
           </td>
         [% END %]
diff --git a/template/en/default/global/textarea.html.tmpl b/template/en/default/global/textarea.html.tmpl
index f3e23dd3f1..3133295796 100644
--- a/template/en/default/global/textarea.html.tmpl
+++ b/template/en/default/global/textarea.html.tmpl
@@ -27,6 +27,8 @@
   # defaultcontent: (optional) Default content for the textarea.
   # mandatory:      (optional) Boolean specifying whether or not the textarea
   #                 is mandatory.
+  # field_hidden:   (optional) True if the field is hidden. Only useful if
+  #                 the field is mandatory.
   #%]
 
 <textarea [% IF name %]name="[% name FILTER html %]"[% END %]
@@ -46,7 +48,7 @@
             onFocus="this.rows=[% maxrows FILTER html %]"
           [% END %]
           [% IF mandatory %]
-            aria-required="true" required
+            data-required="true" [% 'aria-required="true" required' UNLESS field_hidden %]
           [% END %]
           [% IF onchange %]
             onchange="[% onchange FILTER html %]"
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 97c7f709c7..5c5bfc3169 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -46,7 +46,7 @@
             <a href="buglist.cgi?cmdtype=dorem&amp;remaction=run&amp;namedcmd=
                      [%- q.name FILTER uri %]&amp;sharer_id=[% q.user.id FILTER uri %]"
                class="shared" title="Shared by [% q.user.identity FILTER html %]">
-              [%- q.name FILTER html FILTER no_break %]</a>
+              [%- q.name FILTER html %]</a>
           </li>
         [% END %]
       </ul>
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index ed07487608..2bbc07bc90 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -55,10 +55,12 @@
   [% ELSIF error == "account_exists" %]
     [% title = "Account Already Exists" %]
     There is already an account with
-    [% IF email %]
-      the login name [% email FILTER html %].
+    [% IF login %]
+      the login name [% login FILTER html %].
+    [% ELSIF email %]
+      the email address [% email FILTER html %].
     [% ELSE %]
-      that login name.
+      that login name or email address.
     [% END %]
 
   [% ELSIF error == "account_locked" %]
@@ -77,13 +79,14 @@
 
   [% ELSIF error == "alias_in_use" %]
     [% title = "Alias In Use" %]
-    [% IF user.can_see_bug(bug_id) %]
-      [% terms.Bug %] [%+ bug_id FILTER bug_link(bug_id) FILTER none %]
+    [% IF user.can_see_bug(other_bug.id) %]
+      [% terms.Bug %] [%+ other_bug.id FILTER bug_link(other_bug.bug_id) FILTER none %]
+      is currently using the alias <em>[% alias FILTER html %]</em>.
+      Please choose another alias[% IF other_bug.check_can_change_field('alias', 0, 1) %] or visit that [% terms.bug %] and change its alias[% END %].
     [% ELSE %]
-      Another [% terms.bug %]
+      The alias <em>[% alias FILTER html %]</em> is already used by another
+      [% terms.bug %] you are not allowed to see. Please choose another alias.
     [% END %]
-    has already taken the alias <em>[% alias FILTER html %]</em>.
-    Please choose another alias.
 
   [% ELSIF error == "alias_is_numeric" %]
     [% title = "Alias Is Numeric" %]
@@ -94,7 +97,7 @@
 
   [% ELSIF error == "alias_too_long" %]
     [% title = "Alias Too Long" %]
-    [% terms.Bug %] aliases cannot be longer than 20 characters.
+    [% terms.Bug %] aliases cannot be longer than 40 characters.
     Please choose a shorter alias.
 
   [% ELSIF error == "api_key_not_valid" %]
@@ -117,9 +120,46 @@
     account creation. Please contact an administrator to get a new account
     created.
 
+  [% ELSIF error == "auth_delegation_disabled" %]
+    [% title = "Can't use auth delegation" %]
+    This site does not have auth delegation enabled.
+    Please contact an administrator if you require this functionality.
+
+  [% ELSIF error == "auth_delegation_illegal_protocol" %]
+    [% title = "Invalid Protocol" %]
+    The callback URI uses an illegal protocol: <em>[% protocol FILTER html %]</em>.
+    Only <em>http</em> and <em>https</em> are allowed.
+
+  [% ELSIF error == "auth_delegation_missing_callback" %]
+    [% title = "Auth delegation impossible without callback URI" %]
+    It looks like auth delegation was attempted, but no callback URI was passed.
+    You were sent here by some other site; please contact them for support.
+
+  [% ELSIF error == "auth_delegation_missing_description" %]
+    [% title = "Auth delegation impossible without description" %]
+    It looks like auth delegation was attempted, but no description was passed.
+    You were sent here by some other site; please contact them for support.
+
+  [% ELSIF error == "auth_delegation_missing_token" %]
+    [% title = "Auth delegation can't be confirmed" %]
+    Auth delegation cannot be confirmed due to missing or invalid token.
+
+  [% ELSIF error == "auth_delegation_invalid_token" %]
+    [% title = "Auth delegation can't be confirmed" %]
+    Auth delegation cannot be confirmed due to missing or invalid token.
+
+  [% ELSIF error == "auth_delegation_json_error" %]
+    [% title = "Auth delegation received invalid JSON" %]
+    Auth delegation received an invalid JSON response from auth consumer:
+    <pre>[% json_text FILTER html %]</pre>
+
+  [% ELSIF error == "auth_delegation_post_error" %]
+    [% title = "Auth delegation received invalid status code" %]
+    Auth delegation received an HTTP response other than 200 OK from auth consumer. Code: [% code FILTER html %]
+
   [% ELSIF error == "auth_failure" %]
     [% title = "Authorization Required" %]
-    [% admindocslinks = {'groups.html' => 'Group Security'} %]
+    [% admindocslinks = {'groups.html#groups' => 'Group Security'} %]
     Sorry,
     [% IF group %]
       you aren't a member of the '[% group FILTER html %]' group,
@@ -191,6 +231,8 @@
       group access
     [% ELSIF object == "groups" %]
       groups
+    [% ELSIF object == "job_queue" %]
+      the job queue
     [% ELSIF object == "keywords" %]
       keywords
     [% ELSIF object == "milestones" %]
@@ -257,12 +299,12 @@
 
   [% ELSIF error == "bug_access_denied" %]
     [% title = "$terms.Bug Access Denied" %]
-    [% admindocslinks = {'groups.html' => 'Group Security'} %]
+    [% admindocslinks = {'groups.html#groups' => 'Group Security'} %]
     You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %].
 
   [% ELSIF error == "bug_access_query" %]
     [% title = "$terms.Bug Access Denied" %]
-    [% docslinks = {'myaccount.html' => 'Creating an account'} %]
+    [% docslinks = {'administering/users.html#creating-new-users' => 'Creating an account'} %]
     You are not authorized to access [% terms.bug %] #[% bug_id FILTER html %].
     To see this [% terms.bug %], you must
     first <a href="show_bug.cgi?id=
@@ -283,14 +325,14 @@
       <ul>
         <li><code>show_bug.cgi</code> in a Bugzilla
           installation.</li>
-        <li>A b[% %]ug on launchpad.net</li>
+        <li>A b[% %]ug on launchpad.net.</li>
         <li>An issue on code.google.com.</li>
-        <li>A b[% %]ug on b[% %]ugs.debian.org.</li>
+        <li>A b[% %]ug on b[% %]ugs.debian.org or deb[% %]ugs.gnu.org.</li>
         <li>An issue in a JIRA installation.</li>
         <li>A ticket in a Trac installation.</li>
         <li>A b[% %]ug in a MantisBT installation.</li>
-        <li>A b[% %]ug on sourceforge.net.</li>
-        <li>An issue on github.com.</li>
+        <li>A b[% %]ug or ticket on sourceforge.net.</li>
+        <li>An issue/pull request on github.com.</li>
         [% Hook.process('bug_url_invalid_tracker') %]
       </ul>
     [% END %]
@@ -303,8 +345,8 @@
 
   [% ELSIF error == "buglist_parameters_required" %]
     [% title = "Parameters Required" %]
-    [% docslinks = {'query.html' => "Searching for $terms.bugs",
-                    'query.html#list' => "$terms.Bug lists"} %]
+    [% docslinks = {'using/finding.html' => "Searching for $terms.bugs",
+                    'using/finding.html#bug-lists' => "$terms.Bug lists"} %]
     You may not search, or create saved searches, without any search terms.
 
   [% ELSIF error == "cc_remove_denied" %]
@@ -484,9 +526,18 @@
     [% title = "Email Change Already In Progress" %]
     Email change already in progress; please check your email.
 
+  [% ELSIF error == "email_needed_for_password_change" %]
+    [% title = "Email Address Required" %]
+    You must enter an email address when requesting to change your password.
+
   [% ELSIF error == "email_no_body" %]
     Your message did not contain any text, as far as we could tell.
 
+  [% ELSIF error == "email_required" %]
+    [% title = "Email Address Required" %]
+    [% admindocslinks = {'useradmin.html' => 'User administration'} %]
+    You must enter an email address for the new user.
+
   [% ELSIF error == "empty_group_description" %]
     [% title = "The group description cannot be empty" %]
     You must enter a description for the group.
@@ -497,7 +548,7 @@
   
   [% ELSIF error == "entry_access_denied" %]
     [% title = "Permission Denied" %]
-    [% admindocslinks = {'groups.html' => 'Group Security'} %]
+    [% admindocslinks = {'categorization.html#product-group-controls' => 'Group Security'} %]
     Sorry, either the product <em>[% product FILTER html %]</em>
     does not exist or you aren't authorized to
     enter [% terms.abug %] into it.
@@ -515,12 +566,10 @@
     (You specified '[% name FILTER html %]'.)
 
   [% ELSIF error == "feature_disabled" %]
-    The [% install_string("feature_$feature") FILTER html %] feature is not
-    available in this Bugzilla.
-    [% IF user.in_group('admin') %]
+    The [% feature_description(feature) FILTER html %] feature is not available in this Bugzilla.
+    [% IF user.in_group('admin') || Bugzilla.usage_mode != constants.USAGE_MODE_BROWSER %]
       If you would like to enable this feature, please run
-      <kbd>checksetup.pl</kbd> to see how to install the necessary
-      requirements for this feature.
+      <kbd>cpanm -l local --installdeps --with-feature [% feature FILTER html %] "."</kbd>
     [% END %]
 
   [% ELSIF error == "field_already_exists" %]
@@ -695,10 +744,9 @@
 
   [% ELSIF error == "flag_requestee_unauthorized" %]
     [% title = "Flag Requestee Not Authorized" %]
-    [% admindocslinks = {'flags-overview.html#flags-admin'  => 'Administering Flags',
-                         'groups.html' => 'Group Security'} %]
-    [% docslinks = {'flags-overview.html' => 'An overview on Flags',
-                    'flags.html' => 'Using Flags'} %]
+    [% admindocslinks = {'flags.html' => 'Administering Flags',
+                         'categorization.html#assigning-group-controls-to-products' => 'Group Security'} %]
+    [% docslinks = {'using/understanding.html#flags' => 'Using Flags'} %]
 
     You asked [% requestee.identity FILTER html %]
     for <code>[% flag_type.name FILTER html %]</code> on [% terms.bug %] 
@@ -712,10 +760,9 @@
 
   [% ELSIF error == "flag_requestee_unauthorized_attachment" %]
     [% title = "Flag Requestee Not Authorized" %]
-    [% admindocslinks = {'flags-overview.html#flags-admin'  => 'Administering Flags',
-                         'groups.html' => 'Group Security'} %]
-    [% docslinks = {'flags-overview.html' => 'An overview on Flags',
-                    'flags.html' => 'Using Flags'} %]
+    [% admindocslinks = {'flags.html' => 'Administering Flags',
+                         'categorization.html#assigning-group-controls-to-products' => 'Group Security'} %]
+    [% docslinks = {'using/understanding.html#flags' => 'Using Flags'} %]
 
     You asked [% requestee.identity FILTER html %]
     for <code>[% flag_type.name FILTER html %]</code> on 
@@ -745,7 +792,7 @@
 
   [% ELSIF error == "flag_type_cc_list_invalid" %]
     [% title = "Flag Type CC List Invalid" %]
-    [% admindocslinks = {'flags-overview.html#flags-admin'  => 'Administering Flags'} %]
+    [% admindocslinks = {'flags.html' => 'Administering Flags'} %]
     The CC list [% cc_list FILTER html %] must be less than 200 characters long.
 
   [% ELSIF error == "flag_type_component_without_product" %]
@@ -754,12 +801,12 @@
 
   [% ELSIF error == "flag_type_description_invalid" %]
     [% title = "Flag Type Description Invalid" %]
-    [% admindocslinks = {'flags-overview.html#flags-admin'  => 'Administering Flags'} %]
+    [% admindocslinks = {'flags.html' => 'Administering Flags'} %]
     You must enter a description for this flag type.
 
   [% ELSIF error == "flag_type_name_invalid" %]
     [% title = "Flag Type Name Invalid" %]
-    [% admindocslinks = {'flags-overview.html#flags-admin'  => 'Administering Flags'} %]
+    [% admindocslinks = {'flags.html' => 'Administering Flags'} %]
     The name <em>[% name FILTER html %]</em> must be 1-50 characters long
     and must not contain any spaces or commas.
 
@@ -779,17 +826,15 @@
     You must specify the type id value to update or add a flag.
 
   [% ELSIF error == "flag_type_not_multiplicable" %]
-    [% docslinks = {'flags-overview.html' => 'An overview on Flags',
-                    'flags.html' => 'Using Flags'} %]
+    [% docslinks = {'using/understanding.html#flags' => 'Using Flags'} %]
     You cannot have several <em>[% type.name FILTER html %]</em> flags
     for this [% IF attachment %] attachment [% ELSE %] [%+ terms.bug %] [% END %].
 
   [% ELSIF error == "flag_update_denied" %]
     [% title = "Flag Modification Denied" %]
-    [% admindocslinks = {'flags-overview.html#flags-admin'  => 'Administering Flags',
-                         'groups.html' => 'Group Security'} %]
-    [% docslinks = {'flags-overview.html' => 'An overview on Flags',
-                    'flags.html' => 'Using Flags'} %]
+    [% admindocslinks = {'flags.html' => 'Administering Flags',
+                         'categorization.html#assigning-group-controls-to-products' => 'Group Security'} %]
+    [% docslinks = {'using/understanding.html#flags' => 'Using Flags'} %]
     You tried to [% IF status == "+" %] grant [% ELSIF status == "-" %] deny
     [% ELSIF status == "X" %] clear [% ELSE %] request [% END %]
     <code>[% name FILTER html %]
@@ -856,6 +901,13 @@
     or you are not allowed to remove [% terms.bugs %] from this group in the
     '[% product FILTER html %]' product.
 
+  [% ELSIF error == "group_regexp_too_long" %]
+    [% title = "Group Regular Expression Too Long" %]
+    The text you entered in the regular expression
+    field is too long ([% text.length FILTER html %] characters,
+    above the maximum length allowed of
+    [%+ max_length FILTER none %] characters).
+
   [% ELSIF error == "group_restriction_not_allowed" %]
     [% title = "Group Restriction Not Allowed" %]
     You tried to restrict [% bug_id ? "$terms.bug $bug_id" : terms.abug FILTER html %]
@@ -898,8 +950,15 @@
 
   [% ELSIF error == "illegal_change" %]
     [% title = "Not allowed" %]
-    You tried to change the
-    <strong>[% field_descs.$field FILTER html %]</strong> field 
+    You tried to
+    [% IF action == "set" %]
+      set
+    [% ELSIF action == "unset" %]
+      unset
+    [% ELSE %]
+      change
+    [% END %]
+    the <strong>[% field_descs.$field FILTER html %]</strong> field
     [% IF oldvalue.defined AND oldvalue != "" %]
       from <em>[% oldvalue.join(', ') FILTER html %]</em>
     [% END %]
@@ -927,10 +986,10 @@
     [% IF format %]
       Please use the format '<code>[% format FILTER html %]</code>'.
     [% END %]
-    
+
   [% ELSIF error == "illegal_email_address" %]
     [% title = "Invalid Email Address" %]
-    The e-mail address you entered (<b>[% addr FILTER html %]</b>) 
+    The e-mail address you entered (<b>[% email FILTER html %]</b>)
     didn't pass our syntax checking for a legal email address.
     [% IF default %]
       A legal address must contain exactly one '@',
@@ -947,7 +1006,7 @@
     
   [% ELSIF error == "illegal_group_control_combination" %]
     [% title = "Your Group Control Combination Is Illegal" %]
-    [% admindocslinks = {'groups.html' => 'Assigning Group Controls to Products'} %]
+    [% admindocslinks = {'categorization.html#assigning-group-controls-to-products' => 'Assigning Group Controls to Products'} %]
     Your group control combination for group &quot;
     [% groupname FILTER html %]&quot; is illegal.
 
@@ -964,13 +1023,13 @@
     &lt;, &gt;, &amp;.
 
   [% ELSIF error == "illegal_series_creation" %]
-    [% admindocslinks = {'groups.html' => 'Group security'} %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% admindocslinks = {'categorization.html#assigning-group-controls-to-products' => 'Group security'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     You are not authorized to create series.
         
   [% ELSIF error == "illegal_series_edit" %]
-    [% admindocslinks = {'groups.html' => 'Group security'} %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% admindocslinks = {'categorization.html#assigning-group-controls-to-products' => 'Group security'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     You are not authorized to edit this series. To do this, you must either
     be its creator, or an administrator.
 
@@ -987,7 +1046,7 @@
     The error was: [% dberror FILTER html %].
         
   [% ELSIF error == "insufficient_data_points" %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     We don't have enough data points to make a graph (yet).
         
   [% ELSIF error == "invalid_attach_id" %]
@@ -1025,11 +1084,6 @@
     is one of <em>[% constants.LEGAL_CONTENT_TYPES.join(', ') FILTER html %]</em>
     and <em>bar</em> must not contain any special characters (such as "=", "?", ...).
 
-  [% ELSIF error == "invalid_context" %]
-    [% title = "Invalid Context" %]
-    The context [% context FILTER html %] is invalid (must be a number,
-    "file" or "patch").
-
   [% ELSIF error == "invalid_datasets" %]
     [% title = "Invalid Datasets" %]
     Invalid datasets <em>[% datasets.join(":") FILTER html %]</em>. Only digits,
@@ -1039,6 +1093,12 @@
     [% title = "Invalid Dimensions" %]
     The width or height specified is not a positive integer.
 
+  [% ELSIF error == "invalid_email" %]
+    [% title = "Invalid Email Address" %]
+    The address <tt>[% email FILTER html %]</tt> is not a valid email address.
+    Either you misspelled it, or the person has not
+    registered for a [% terms.Bugzilla %] account.
+
   [% ELSIF error == "invalid_format" %]
     [% title = "Invalid Format" %]
     The format "[% format FILTER html %]" is invalid (must be one of
@@ -1153,6 +1213,13 @@
   [% ELSIF error == "rest_invalid_resource" %]
     A REST API resource was not found for '[% method FILTER html +%] [%+ path FILTER html %]'.
 
+  [% ELSIF error == "unknown_api_version" %]
+    A REST API version was not found for '[% api_version FILTER html +%]'
+    [%- IF api_namespace %] in namespace '[% api_namespace FILTER html %]'[% END %].
+
+  [% ELSIF error == "unknown_api_namespace" %]
+    A REST API namespace was not found for '[% api_namespace FILTER html +%]'.
+
   [% ELSIF error == "get_products_invalid_type" %]
     The product type '[% type FILTER html %]' is invalid. Valid choices
     are 'accessible', 'selectable', and 'enterable'.
@@ -1164,18 +1231,28 @@
   [% ELSIF error == "keyword_blank_description" %]
     [% title = "Blank Keyword Description Not Allowed" %]
     You must enter a non-blank description for the keyword.
-     
+
   [% ELSIF error == "keyword_blank_name" %]
     [% title = "Blank Keyword Name Not Allowed" %]
     You must enter a non-blank name for the keyword.
-     
+
   [% ELSIF error == "keyword_invalid_name" %]
     [% title = "Invalid Keyword Name" %]
     You may not use commas or whitespace in a keyword name.
-     
-  [% ELSIF error == "login_needed_for_password_change" %]
-    [% title = "Login Name Required" %]
-    You must enter a login name when requesting to change your password.
+
+  [% ELSIF error == "login_at_sign_disallowed" %]
+    [% title = "Illegal Character in Login" %]
+    Login names may not contain the "@" sign unless you are setting your
+    login name to be identical to your email address.
+
+  [% ELSIF error == "login_change_during_email_change" %]
+    [% title = "Login Change Not Permitted" %]
+    You may not change your login name while you are in the middle of the
+    process of changing your email address.
+
+  [% ELSIF error == "login_illegal_character" %]
+    [% title = "Illegal Character In Login" %]
+    Login names are not allowed to contain space characters.
 
   [% ELSIF error == "login_required_for_pronoun" %]
     [% title = "Login Name Required" %]
@@ -1186,6 +1263,10 @@
     [%# Used for non-web-based LOGIN_REQUIRED situations. %]
     You must log in before using this part of [% terms.Bugzilla %].
 
+  [% ELSIF error == "login_too_long" %]
+    [% title = "Login Too Long" %]
+    Your login name is too long. It cannot exceed 127 characters.
+
   [% ELSIF error == "markdown_disabled" %]
     Markdown feature is not enabled.
 
@@ -1200,8 +1281,8 @@
 
   [% ELSIF error == "milestone_already_exists" %]
     [% title = "Milestone Already Exists" %]
-    [% admindocslinks = {'products.html' => 'Administering products',
-                         'milestones.html' => 'About Milestones'} %]
+    [% admindocslinks = {'categorization.html#products'   => 'Administering products',
+                         'categorization.html#milestones' => 'About Milestones'} %]
     The milestone '[% name FILTER html %]' already exists for product '
     [%- product FILTER html %]'.
 
@@ -1211,8 +1292,8 @@
 
   [% ELSIF error == "milestone_is_default" %]
     [% title = "Default milestone not deletable" %]
-    [% admindocslinks = {'products.html' => 'Administering products',
-                         'milestones.html' => 'About Milestones'} %]
+    [% admindocslinks = {'categorization.html#products'   => 'Administering products',
+                         'categorization.html#milestones' => 'About Milestones'} %]
     Sorry, but [% milestone.name FILTER html %] is the default milestone
     for the '[% milestone.product.name FILTER html %]' product, and so
     it cannot be deleted.
@@ -1222,13 +1303,6 @@
     The name of a milestone is limited to [% constants.MAX_MILESTONE_SIZE FILTER html %]
     characters. '[% name FILTER html %]' is too long ([% name.length %] characters).
 
-  [% ELSIF error == "milestone_required" %]
-    [% title = "Milestone Required" %]
-    You must select a target milestone for [% terms.bug %]
-    [%+ bug.id FILTER html %]
-    if you are going to accept it.  Part of accepting 
-    [%+ terms.abug %] is giving an estimate of when it will be fixed.
-
   [% ELSIF error == "milestone_sortkey_invalid" %]
     [% title = "Invalid Milestone Sortkey" %]
     The sortkey '[% sortkey FILTER html %]' is not in the range
@@ -1259,8 +1333,8 @@
 
   [% ELSIF error == "missing_component" %]
     [% title = "Missing Component" %]
-    [% admindocslinks = {'products.html'   => 'Administering products',
-                         'components.html' => 'Creating a component'} %]
+    [% admindocslinks = {'categorization.html#products'   => 'Administering products',
+                         'categorization.html#milestones' => 'Creating a component'} %]
     Sorry, the product <em>[% product.name FILTER html %]</em>
     has to have at least one active component in order for you to
     enter [% terms.abug %] into it.<br>
@@ -1283,26 +1357,30 @@
     Sorry, I seem to have lost the cookie that recorded
     the results of your last search. I'm afraid you will have to start
     again from the <a href="query.cgi">search page</a>.
-          
+
+  [% ELSIF error == "missing_database_url" %]
+    [% title = "Missing \$DATABASE_URL" %]
+    $DATABASE_URL must be defined when localconfig "db_from_env" option is enabled.
+
   [% ELSIF error == "missing_datasets" %]
     [% title = "No Datasets Selected" %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     You must specify one or more datasets to plot.
-    
+
   [% ELSIF error == "missing_frequency" %]
     [% title = "Missing Frequency" %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     You did not specify a valid frequency for this series.
-                
+
   [% ELSIF error == "missing_name" %]
     [% title = "Missing Name" %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     You did not specify a name for this series.
-                
+
   [% ELSIF error == "missing_query" %]
     [% title = "Missing Search" %]
-    [% docslinks = {'query.html' => "Searching for $terms.bugs",
-                    'query.html#list' => "$terms.Bug lists"} %]
+    [% docslinks = {'using/finding.html' => "Searching for $terms.bugs",
+                    'using/finding.html#bug-lists' => "$terms.Bug lists"} %]
     The search named <em>[% name FILTER html %]</em>
     [% IF sharer_id && sharer_id != user.id %]
       has not been made visible to you.
@@ -1325,7 +1403,7 @@
                 
   [% ELSIF error == "missing_version" %]
     [% title = "Missing Version" %]
-    [% admindocslinks = {'versions.html' => 'Defining versions'} %]
+    [% admindocslinks = {'categorization.html#versions' => 'Defining versions'} %]
     Sorry, the product <em>[% product.name FILTER html %]</em>
     has to have at least one active version in order for you to
     enter [% terms.abug %] into it.<br>
@@ -1341,9 +1419,14 @@
     You cannot set aliases when modifying multiple [% terms.bugs %]
     at once.
 
+  [% ELSIF error == "multiple_components_update_not_allowed" %]
+    [% title = "Multiple Components Update Not allowed" %]
+    You can not update the name for multiple components of the
+    same product.
+
   [% ELSIF error == "need_quip" %]
     [% title = "Quip Required" %]
-    [% docslinks = {'quips.html' => 'About quips'} %]
+    [% docslinks = {'administering/quips.html' => 'About quips'} %]
     Please enter a quip in the text field.
 
   [% ELSIF error == "new_password_missing" %]
@@ -1352,7 +1435,7 @@
 
   [% ELSIF error == "no_axes_defined" %]
     [% title = "No Axes Defined" %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
     You didn't define any axes to plot.
 
   [% ELSIF error == "no_bugs_chosen" %]
@@ -1391,9 +1474,11 @@
 
   [% ELSIF error == "no_products" %]
     [% title = "No Products" %]
-    [% admindocslinks = {'products.html'   => 'Setting up a product',
-                         'components.html' => 'Adding components to products',
-                         'groups.html'     => 'Groups security'} %]
+    [% admindocslinks = {
+      'categorization.html#creating-new-products'  => 'Setting up a product',
+      'categorization.html#components'             => 'Adding components to products',
+      'categorization.html#product-group-controls' => 'Groups security'
+    } %]
     Either no products have been defined to enter [% terms.bugs %] against or you have not
     been given access to any.
 
@@ -1443,16 +1528,16 @@
       Either you mis-typed the name or that user has not yet registered
       for a [% terms.Bugzilla %] account.
     [% ELSIF class == "Bugzilla::Keyword" %]
-      See the list of available <a href="describekeywords.cgi">keywords</a>.
+      See the list of available <a href="describekeywords.cgi?show_inactive_keywords=1">keywords</a>.
     [% END %]
 
-  [% ELSIF error == "old_password_incorrect" %]
+  [% ELSIF error == "current_password_incorrect" %]
     [% title = "Incorrect Password" %]
     You did not enter your current password correctly.
 
-  [% ELSIF error == "old_password_required" %]
-    [% title = "Old Password Required" %]
-    You must enter your old password to change your email address.
+  [% ELSIF error == "current_password_required" %]
+    [% title = "Current Password Required" %]
+    You must enter your current password to edit your account.
 
   [% ELSIF error == "password_change_requests_not_allowed" %]
     [% title = "Password Change Requests Not Allowed" %]
@@ -1467,7 +1552,7 @@
     The password must be at least
     [%+ constants.USER_PASSWORD_MIN_LENGTH FILTER html %] characters long.
     [% IF locked_user %]
-      You must <a href="token.cgi?a=reqpw&amp;loginname=[% locked_user.email FILTER uri %]&amp;token=[% issue_hash_token(['reqpw']) FILTER uri %]">
+      You must <a href="token.cgi?a=reqpw&amp;email=[% locked_user.email FILTER uri %]&amp;token=[% issue_hash_token(['reqpw']) FILTER uri %]">
       request a new password</a> in order to log in again.
     [% END %]
 
@@ -1488,7 +1573,7 @@
       [% END %]
     </ul>
     [% IF locked_user %]
-      You must <a href="token.cgi?a=reqpw&amp;loginname=[% locked_user.email FILTER uri %]&amp;token=[% issue_hash_token(['reqpw']) FILTER uri %]">
+      You must <a href="token.cgi?a=reqpw&amp;email=[% locked_user.email FILTER uri %]&amp;token=[% issue_hash_token(['reqpw']) FILTER uri %]">
       request a new password</a> in order to log in again.
     [% END %]
 
@@ -1509,12 +1594,12 @@
 
   [% ELSIF error == "product_name_already_in_use" %]
     [% title = "Product name already exists" %]
-    [% admindocslinks = {'products.html' => 'Administering products'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products'} %]
     The product name '[% product FILTER html %]' already exists.
   
   [% ELSIF error == "product_name_diff_in_case" %]
     [% title = "Product name differs only in case" %]
-    [% admindocslinks = {'products.html' => 'Administering products'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products'} %]
     The product name '[% product FILTER html %]' differs from existing 
     product '[% existing_product FILTER html %]' only in case.
 
@@ -1525,8 +1610,8 @@
 
   [% ELSIF error == "product_must_define_defaultmilestone" %]
     [% title = "Must define new default milestone" %]
-    [% admindocslinks = {'products.html' => 'Administering products',
-                         'milestones.html' => 'About Milestones'} %]
+    [% admindocslinks = {'categorization.html#products'   => 'Administering products',
+                         'categorization.html#milestones' => 'About Milestones'} %]
     You must <a href="editmilestones.cgi?action=add&amp;product=[% product FILTER uri %]">
     create the milestone '[% milestone FILTER html %]'</a> before
     it can be made the default milestone for product '[% product FILTER html %]'.
@@ -1537,38 +1622,38 @@
 
   [% ELSIF error == "product_blank_name" %]
     [% title = "Blank Product Name Not Allowed" %]
-    [% admindocslinks = {'products.html' => 'Administering products'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products'} %]
     You must enter a name for the product.
   
   [% ELSIF error == "product_disabled" %]
     [% title = BLOCK %]Product closed for [% terms.Bug %] Entry[% END %]
-    [% admindocslinks = {'products.html' => 'Administering products'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products'} %]
     Sorry, entering [% terms.abug %] into the
     product <em>[% product.name FILTER html %]</em> has been disabled.
 
   [% ELSIF error == "product_edit_denied" %]
     [% title = "Product Edit Access Denied" %]
-    [% admindocslinks = {'products.html' => 'Administering products',
-                         'groups.html'   => 'Group security'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products',
+                         'categorization.html#assigning-group-controls-to-products' => 'Group security'} %]
     You are not permitted to edit [% terms.bugs %] in product 
     [%+ product FILTER html %].
 
   [% ELSIF error == "product_has_bugs" %]
     [% title = BLOCK %]Product has [% terms.Bugs %][% END %]
-    [% admindocslinks = {'products.html' => 'Administering products'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products'} %]
     There are [% nb FILTER html %] [%+ terms.bugs %] entered for this product!
     You must move those [% terms.bugs %] to another product before you
     can delete this one.
 
   [% ELSIF error == "product_must_have_description" %]
     [% title = "Product needs Description" %]
-    [% admindocslinks = {'products.html' => 'Administering products'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products'} %]
     You must enter a description for this product.
 
   [% ELSIF error == "product_must_have_version" %]
     [% title = "Product needs Version" %]
-    [% admindocslinks = {'products.html' => 'Administering products',
-                         'versions.html' => 'Administering versions'} %]
+    [% admindocslinks = {'categorization.html#products' => 'Administering products',
+                         'categorization.html#versions' => 'Administering versions'} %]
     You must enter a valid version to create a new product.
 
   [% ELSIF error == "product_unknown_component" %]
@@ -1582,7 +1667,7 @@
 
   [% ELSIF error == "query_name_missing" %]
     [% title = "No Search Name Specified" %]
-    [% docslinks = {'query.html#list' => "$terms.Bug lists"} %]
+    [% docslinks = {'using/finding.html#bug-lists' => "$terms.Bug lists"} %]
     You must enter a name for your search.
 
   [% ELSIF error == "query_name_too_long" %]
@@ -1691,7 +1776,7 @@
 
   [% ELSIF error == "saved_search_used_by_whines" %]
     [% title = "Saved Search In Use" %]
-    [% docslinks = {'whining.html' => 'About Whining'} %]
+    [% docslinks = {'administering/whining.html' => 'About Whining'} %]
     The saved search <em>[% search_name FILTER html %]</em> is being used 
     by <a href="editwhines.cgi">Whining events</a> with the following subjects:
     [%+ subjects FILTER html %]
@@ -1725,7 +1810,7 @@
 
   [% ELSIF error == "series_already_exists" %]
     [% title = "Series Already Exists" %]
-    [% docslinks = {'reporting.html' => 'Reporting'} %]
+    [% docslinks = {'using/reports-and-charts.html' => 'Reporting'} %]
       A series named <em>[% series.category FILTER html %] /
       [%+ series.subcategory FILTER html %] / 
       [%+ series.name FILTER html %]</em>
@@ -1746,7 +1831,8 @@
     [% END %].
     They must either be resolved or removed from the
     "[% field_descs.dependson FILTER html %]" field before you can resolve
-    this [% terms.bug %] as [% display_value("resolution", "FIXED") FILTER html %].
+    this [% terms.bug %] as [% display_value("resolution",
+              Param('resolution_forbidden_with_open_blockers')) FILTER html %].
 
   [% ELSIF error == "sudo_invalid_cookie" %]
     [% title = "Invalid Sudo Cookie" %]
@@ -1828,7 +1914,7 @@
 
   [% ELSIF error == "version_already_exists" %]
     [% title = "Version Already Exists" %]
-    [% admindocslinks = {'versions.html' => 'Administering versions'} %]
+    [% admindocslinks = {'categorization.html#versions' => 'Administering versions'} %]
     The version '[% name FILTER html %]' already exists for product '
     [%- product FILTER html %]'.
 
@@ -1849,12 +1935,12 @@
 
   [% ELSIF error == "users_deletion_disabled" %]
     [% title = "Deletion not activated" %]
-    [% admindocslinks = {'useradmin.html' => 'User administration'} %]
+    [% admindocslinks = {'users.html#deleting-users' => 'User administration'} %]
     Sorry, the deletion of user accounts is not allowed.
 
   [% ELSIF error == "user_has_responsibility" %]
     [% title = "Can't Delete User Account" %]
-    [% admindocslinks = {'useradmin.html' => 'User administration'} %]
+    [% admindocslinks = {'users.html#deleting-users' => 'User administration'} %]
     The user you want to delete is set up as the default [% terms.bug %]
     assignee
     [% IF Param('useqacontact') %]
@@ -1875,7 +1961,7 @@
 
   [% ELSIF error == "user_login_required" %]
     [% title = "Login Name Required" %]
-    [% admindocslinks = {'useradmin.html' => 'User administration'} %]
+    [% admindocslinks = {'users.html' => 'User administration'} %]
     You must enter a login name for the new user.
 
   [% ELSIF error == "user_match_failed" %]
@@ -1991,29 +2077,28 @@
   Please press <b>Back</b> and try again.
 </p>
 
-[%# If a saved search fails, people want the ability to edit or delete it. 
+[%# If a saved search fails, people want the ability to edit or delete it.
   # This is the best way of getting information about that possible saved
   # search from any error call location. %]
 
-[% namedcmd = Bugzilla.cgi.param("namedcmd") %]
-[% sharer_id = Bugzilla.cgi.param("sharer_id") %]
+[% namedcmd = cgi_param("namedcmd") %]
 [% IF namedcmd AND error != "missing_query" 
                AND error != "saved_search_used_by_whines"
-               AND !sharer_id %]
-  <p>  
-    Alternatively, you can    
+               AND !cgi_param("sharer_id") %]
+  <p>
+    Alternatively, you can
     <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
                   [% namedcmd FILTER uri %]">forget</a>
-                  
+
     [% FOREACH q = Bugzilla.user.queries %]
       [% IF q.name == namedcmd %]
         or <a href="query.cgi?[% q.url FILTER html %]">edit</a>
       [% END %]
     [% END %]
-    
+
     the saved search '[% namedcmd FILTER html %]'.
   </p>
-[% END %]            
+[% END %]
 
 [% PROCESS global/footer.html.tmpl %]
 
diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl
index 7050c6d378..0ee303fe90 100644
--- a/template/en/default/global/user.html.tmpl
+++ b/template/en/default/global/user.html.tmpl
@@ -12,15 +12,19 @@
 
 <span class="vcard">
   [% FILTER collapse %]
-    [% IF user.id %]
-      <a class="email" href="mailto:[% who.email FILTER html %]"
-         title="[% who.identity FILTER html %]">
-    [%- END -%]
-    [% IF who.name %]
-       <span class="fn">[% who.name FILTER html %]</span>
+    [% IF Param("use_email_as_login") %]
+      [% IF user.id %]
+        <a class="email" href="mailto:[% who.email FILTER html %]"
+           title="[% who.identity FILTER html %]">
+      [%- END -%]
+      [% IF who.name %]
+         <span class="fn">[% who.name FILTER html %]</span>
+      [% ELSE %]
+        [% who.login FILTER email FILTER html %]
+      [% END %]
+      [% '</a>' IF user.id %]
     [% ELSE %]
-      [% who.login FILTER email FILTER html %]
+      [% who.identity FILTER html %]
     [% END %]
-    [% '</a>' IF user.id %]
   [% END %]
 </span>
diff --git a/template/en/default/global/userselect.html.tmpl b/template/en/default/global/userselect.html.tmpl
index e2210c6f2d..67d9f8d481 100644
--- a/template/en/default/global/userselect.html.tmpl
+++ b/template/en/default/global/userselect.html.tmpl
@@ -71,10 +71,14 @@
   [% END %]
 </select>
 [% ELSE %]
-  [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') && id %]
-    <div id="[% id FILTER html %]_autocomplete" 
-         [% IF classes %] class="[% classes.join(' ') FILTER html %]" [% END %]>
-  [% END %]  
+  [%
+    IF id && feature_enabled('jsonrpc') && Param('ajax_user_autocompletion');
+      IF !classes.defined;
+        classes = [];
+      END;
+      classes.push("bz_autocomplete_user");
+    END;
+  %]
   <input
     name="[% name FILTER html %]"
     value="[% value FILTER html %]"
@@ -86,17 +90,6 @@
     [% IF size %] size="[% size FILTER html %]" [% END %]
     [% IF id %] id="[% id FILTER html %]" [% END %]
     [% IF mandatory %] required [% END %]
+    [% IF multiple %] data-multiple="1" [% END %]
   >
-  [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') && id %]
-    <div id="[% id FILTER html %]_autocomplete_container"></div>
-    </div>  
-    <script type="text/javascript">
-      if( typeof(YAHOO.bugzilla.userAutocomplete) !== 'undefined' 
-          && YAHOO.bugzilla.userAutocomplete != null){
-        YAHOO.bugzilla.userAutocomplete.init( "[% id FILTER js %]", 
-                    "[% id FILTER js %]_autocomplete_container"
-                    [% IF multiple %], true[% END%]);        
-      }
-    </script>
-  [% END %]
 [% END %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index aa50a60e99..84a5b7d5cd 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -83,11 +83,9 @@
             href="?GoAheadAndLogIn=1"><span>Log In</span></a>
           [% END %]
       </li>
-      [% IF Param("docs_urlbase") %]
-        <li>
-          <a id="help" href="[% docs_urlbase FILTER html %]using.html"><span>Documentation</span></a>
-        </li>
-      [% END %]
+      <li>
+        <a id="help" href="[% docs_urlbase FILTER html %]using/index.html"><span>Documentation</span></a>
+      </li>
     </ul>
   </div>
 
diff --git a/template/en/default/list/change-columns.html.tmpl b/template/en/default/list/change-columns.html.tmpl
index c0279803cc..aef352d0fc 100644
--- a/template/en/default/list/change-columns.html.tmpl
+++ b/template/en/default/list/change-columns.html.tmpl
@@ -31,7 +31,7 @@
 [% FOREACH column = columns.keys %]
   [% NEXT IF collist.contains(column) %]
   [%# We lowecase the keys so that the sort happens case-insensitively. %]
-  [% SET column_desc = field_descs.$column || column FILTER lower %]
+  [% SET column_desc = field_descs.$column || column FILTER lower FILTER html %]
   [% available_columns.$column_desc = column %]
 [% END %]
 
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index e581f0892d..4ef067201e 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -371,7 +371,13 @@
 
       <td>
         [% SET inactive = !group.is_active %]
-        [% group.description FILTER html_light FILTER inactive(inactive) %]
+        [% IF inactive %]
+          <span class="bz_inactive">
+        [% END %]
+        [% group.description FILTER html_light %]
+        [% IF inactive %]
+          </span>
+        [% END %]
       </td>
 
     </tr>
@@ -380,8 +386,8 @@
   </table>
 
   [% IF foundinactive %]
-    <p class="bz_info">(Note: [% terms.Bugs %] may not be added to [% FILTER inactive %]inactive
-    groups[% END %], only removed.)</p>
+    <p class="bz_info">(Note: [% terms.Bugs %] may not be added to inactive
+    groups, only removed.)</p>
   [% END %]
 
 [% END %]
@@ -389,6 +395,13 @@
 [%+ Hook.process('after_groups') %]
 
 <input type="submit" id="commit" value="Commit">
+[% IF Param('minor_update_group') && user.in_group(Param('minor_update_group')) %]
+  <br>
+  <input type="checkbox" name="minor_update" value="1">
+  <label for="minor_update">
+    This is a minor update (do not send email)
+  </label>
+[% END %]
 
 [%############################################################################%]
 [%# Select Menu Block                                                        #%]
diff --git a/template/en/default/list/list.atom.tmpl b/template/en/default/list/list.atom.tmpl
index fddbbd7a30..8399369874 100644
--- a/template/en/default/list/list.atom.tmpl
+++ b/template/en/default/list/list.atom.tmpl
@@ -8,7 +8,7 @@
 
 [% DEFAULT title = "$terms.Bugzilla $terms.Bugs" %]
 
-<?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?>
+<?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title>[% title FILTER xml %]</title>
   <link rel="alternate" type="text/html"
@@ -69,10 +69,10 @@
       [% END %]
       </tr><tr class="bz_feed_creation_date">
         <td>[% columns.opendate.title FILTER html %]</td>
-        <td>[% bug.opendate FILTER html %]</td>
+        <td>[% bug.opentime FILTER time("%Y-%m-%dT%H:%M:%SZ", "UTC") %]</td>
       </tr><tr class="bz_feed_changed_date">
         <td>[% columns.changeddate.title FILTER html %]</td>
-        <td>[% bug.changeddate FILTER html -%]</td>
+        <td>[% bug.changedtime FILTER time("%Y-%m-%dT%H:%M:%SZ", "UTC") -%]</td>
       </tr>
       </table>
       [% END %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 41fe93b930..a4d516e6c2 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -24,6 +24,8 @@
 [% unfiltered_title = "$terms.Bug List" %]
 [% IF searchname || defaultsavename %]
   [% unfiltered_title = unfiltered_title _ ": " _ (searchname OR defaultsavename) %]
+[% ELSIF quicksearch %]
+  [% unfiltered_title = unfiltered_title _ ": " _ quicksearch %]
 [% END %]
 [% title = unfiltered_title FILTER html %]
 
@@ -33,11 +35,11 @@
   [% IF quicksearch %]
     [% new_param = BLOCK ~%]
       quicksearch=[% quicksearch FILTER uri %]
-      [%~ IF cgi.param('list_id') ~%]
-        &list_id=[% cgi.param('list_id') FILTER uri %]
+      [%~ IF cgi_param('list_id') ~%]
+        &list_id=[% cgi_param('list_id') FILTER uri %]
       [%~ END %]
     [% END %]
-  [% ELSIF cgi.param('token') != '' %]
+  [% ELSIF cgi_param('token') != '' %]
     [% new_param = cgi.canonicalise_query('token', 'cmdtype', 'remtype') %]
   [% ELSE %]
     [% new_param = cgi.canonicalise_query %]
@@ -59,11 +61,11 @@
 
 [% PROCESS global/header.html.tmpl
   title = title
+  generate_api_token = dotweak
   atomlink = "buglist.cgi?$urlquerypart&title=$title&ctype=atom" 
-  yui = [ 'autocomplete', 'calendar' ]
   javascript_urls = [ "js/util.js", "js/field.js", "js/TUI.js" ]
   style_urls = [ "skins/standard/buglist.css" ]
-  doc_section = "using.html#bug-lists"
+  doc_section = "using/finding.html"
 %]
 
 <div class="bz_query_head">
@@ -104,7 +106,8 @@
   'notequals', 'regexp', 'notregexp', 'lessthan', 'lessthaneq', 
   'greaterthan', 'greaterthaneq', 'changedbefore', 'changedafter', 
   'changedfrom', 'changedto', 'changedby', 'notsubstring', 'nowords',
-  'nowordssubstr', 'notmatches', 'isempty', 'isnotempty'
+  'nowordssubstr', 'notmatches', 'isempty', 'isnotempty', 'isactive',
+  'isnotactive'
 ] %]
 <a id="search_description_controller" class="bz_default_hidden"
    href="javascript:TUI_toggle_class('search_description')">Hide Search Description</a>
@@ -234,19 +237,23 @@
         ><img title="Feed Format" alt="Feed" src="images/rss.png" height="24" width="24"></a>
         <a href="buglist.cgi?[% urlquerypart FILTER html %]&amp;ctype=ics"
         ><img title="iCal Format" alt="iCal" src="images/ical.png" height="24" width="24"></a>
-        <a href="colchange.cgi?[% urlquerypart FILTER html %]&amp;query_based_on=
-           [% defaultsavename OR searchname FILTER uri %]"
-        ><button>Change Columns</button></a>
+        <button type="button" id="change_columns"
+                onclick="document.location='colchange.cgi?[% urlquerypart FILTER html %]&amp;query_based_on=
+                         [%~ defaultsavename OR searchname FILTER uri FILTER js %]'">
+            Change Columns</button>
+
 
         [% IF bugs.size > 1 && caneditbugs && !dotweak %]
-          <a href="buglist.cgi?[% urlquerypart FILTER html %]
-            [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1"
-          ><button>Change Several [% terms.Bugs %] at Once</button></a>
+          <button type="button" id="mass_change"
+                  onclick="document.location='buglist.cgi?[% urlquerypart FILTER html %]
+                           [%- "&order=$qorder" FILTER html IF order %]&amp;tweak=1'">
+            Change Several [% terms.Bugs %] at Once</button>
         [% END %]
 
         [% IF bugowners && user.id %]
-          <a href="mailto:[% bugowners FILTER html %]"
-          ><button>Send Mail to [% terms.Bug %] Assignees</button></a>
+          <button type="button" id="email_assignees"
+                  onclick="document.location='mailto:[% bugowners FILTER html %]'">
+            Send Mail to [% terms.Bug %] Assignees</button>
         [% END %]
 
         [%# Links to more things users can do with this bug list. %]
@@ -255,15 +262,18 @@
       <br>
     [% END %]
     <div class="bz_query_edit">
-        <a href="[% PROCESS edit_search_url %]"><button>Edit Search</button></a>
+      <button type="button" id="edit_search"
+              onclick="document.location='[% PROCESS edit_search_url FILTER js %]'">
+          Edit Search</button>
     </div>
 
     [% IF searchtype == "saved" %]
       <div class="bz_query_forget">
-         <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
-              [% searchname FILTER uri %]&amp;token=
-              [% issue_hash_token([search_id, searchname]) FILTER uri %]"
-         ><button>Forget Search '[% searchname FILTER html %]'</button></a>
+        <button type="button" id="forget_search"
+                onclick="document.location='buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
+                         [%- searchname FILTER uri FILTER js %]&amp;token=
+                         [%- issue_hash_token([search_id, searchname]) FILTER uri %]'">
+          Forget Search '[% searchname FILTER html %]'</button>
       </div>
     [% ELSE %]
       <div class="bz_query_remember">
diff --git a/template/en/default/list/list.rdf.tmpl b/template/en/default/list/list.rdf.tmpl
index 00eca0e0b9..a64b0bd465 100644
--- a/template/en/default/list/list.rdf.tmpl
+++ b/template/en/default/list/list.rdf.tmpl
@@ -6,7 +6,7 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-<?xml version="1.0"[% IF Param('utf8') %] encoding="UTF-8"[% END %]?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- [% template_version %] -->
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -15,7 +15,7 @@
 
 <bz:result rdf:about="[% urlbase FILTER xml %]buglist.cgi?[% urlquerypart FILTER html %]">
   <bz:installation rdf:resource="[% urlbase FILTER xml %]" />
-  <bz:query_timestamp>[% currenttime FILTER time('%Y-%m-%d %T %Z') FILTER html %]</bz:query_timestamp>
+  <bz:query_timestamp>[% currenttime FILTER time('%Y-%m-%d %T %z') FILTER html %]</bz:query_timestamp>
   <bz:bugs>
     <Seq>
     [% FOREACH bug = bugs %]
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index e928cf0c50..751b48e6ad 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -21,8 +21,8 @@
  %]
 
 <p>
-  Bugzilla will pick a random quip for the headline on each
-  [% terms.bug %] list.
+  Bugzilla will pick a random quip for the headline on each [% terms.bug %]
+  list.
 </p>
 
 [% IF Param("quip_list_entry_control") != "closed" %]
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index fe7678b021..d3abc9b211 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -213,7 +213,7 @@
         [%- bug.$column.truncate(256, '...') FILTER html -%]
       [% ELSIF column == 'bug_file_loc' && is_safe_url(bug.bug_file_loc) %]
         <a href="[% bug.bug_file_loc FILTER html %]" target="_blank"
-           title="[% bug.bug_file_loc FILTER html %]">
+           rel="noreferrer" title="[% bug.bug_file_loc FILTER html %]">
           [%- display_value(column, bug.$column).truncate(col_abbrev.maxlength, col_abbrev.ellipsis) FILTER html -%]
         </a>
       [% ELSE %]
diff --git a/template/en/default/pages/bugzilla.dtd.tmpl b/template/en/default/pages/bugzilla.dtd.tmpl
index ee4492c614..56e7773e38 100644
--- a/template/en/default/pages/bugzilla.dtd.tmpl
+++ b/template/en/default/pages/bugzilla.dtd.tmpl
@@ -6,15 +6,15 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 [% USE Bugzilla %]
-<!ELEMENT [% "bugzilla" %] (bug+)>
-<!ATTLIST [% "bugzilla" %] 
+<!ELEMENT bugzilla (bug+)>
+<!ATTLIST bugzilla
           version CDATA #REQUIRED
           urlbase CDATA #REQUIRED
           maintainer CDATA #REQUIRED
           exporter CDATA #IMPLIED
 >
 <!ELEMENT [% "bug" %] (bug_id, 
-               (alias?, 
+               (alias*,
                 creation_ts, 
                 short_desc, 
                 delta_ts, 
diff --git a/template/en/default/pages/linked.html.tmpl b/template/en/default/pages/linked.html.tmpl
index ab74470c25..e7e55fa8a2 100644
--- a/template/en/default/pages/linked.html.tmpl
+++ b/template/en/default/pages/linked.html.tmpl
@@ -7,8 +7,6 @@
   #%]
 
 [% INCLUDE global/header.html.tmpl title = "Your Linkified Text" %]
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
 
 <p>
   Copy and paste the text below:
@@ -18,7 +16,7 @@
 
 <p>
 <pre class="bz_comment_text">
-[%- cgi.param("text") FILTER markdown FILTER html -%]
+[%- cgi_param("text") FILTER markdown FILTER html -%]
 </pre>
 </p>
 
@@ -33,7 +31,7 @@
 
 <p>
 <pre class="bz_comment_text">
-[%- cgi.param("text") FILTER markdown -%]
+[%- cgi_param("text") FILTER markdown -%]
 </pre>
 </p>
 
diff --git a/template/en/default/pages/markdown.html.tmpl b/template/en/default/pages/markdown.html.tmpl
index 8b43f5f178..04d81711a6 100644
--- a/template/en/default/pages/markdown.html.tmpl
+++ b/template/en/default/pages/markdown.html.tmpl
@@ -25,6 +25,8 @@
     <li><a href="#code">Code</a></li>
     <li><a href="#strikethroughs">Strikethroughs</a></li>
     <li><a href="#links">Links</a></li>
+    <li><a href="#tables">Tables</a></li>
+    <li><a href="#definitions">Definitions</a></li>
   </ul>
 
 <h2 id="headers">Headers</h2>
@@ -222,7 +224,7 @@
   you can define links with link texts and titles. You may define your links
   either as inline or as a reference. To define a link as inline, put your link
   text in square bracket immediately followed by a pair of parentheses which
-  containts the URL that you want your link to point to and an <em>optional</em>
+  contains the URL that you want your link to point to and an <em>optional</em>
   link title surrounded by quotes.
 
   <p>
@@ -262,4 +264,125 @@
     </pre>
   </p>
 
+<h2 id="tables">Tables</h2>
+
+Tables can be defined using these special syntax:
+
+<pre><code>
+        |             |          Grouping           ||
+        First Header  | Second Header | Third Header |
+         ------------ | :-----------: | -----------: |
+        Content       |          *Long Cell*        ||
+        Content       |   **Cell**    |         Cell |
+
+        New section   |     More      |         Data |
+        And more      |     More      |     **Data** |
+</code></pre>
+
+<p>which gets converted into:</p>
+
+<div class="bz_comment_text">
+  <table style="margin-left: 5em">
+    <colgroup>
+      <col style="text-align:left;"/>
+      <col style="text-align:center;"/>
+      <col style="text-align:right;"/>
+    </colgroup>
+
+    <thead>
+      <tr>
+       <th style="text-align:left;"></th>
+       <th style="text-align:center;" colspan="2">Grouping</th>
+      </tr>
+      <tr>
+       <th style="text-align:left;">First Header</th>
+       <th style="text-align:center;">Second Header</th>
+       <th style="text-align:right;">Third Header</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+       <td style="text-align:left;">Content</td>
+       <td style="text-align:center;" colspan="2"><em>Long Cell</em></td>
+      </tr>
+      <tr>
+       <td style="text-align:left;">Content</td>
+       <td style="text-align:center;"><strong>Cell</strong></td>
+       <td style="text-align:right;">Cell</td>
+      </tr>
+    </tbody>
+    <tbody>
+      <tr>
+       <td style="text-align:left;">New section</td>
+       <td style="text-align:center;">More</td>
+       <td style="text-align:right;">Data</td>
+      </tr>
+      <tr>
+       <td style="text-align:left;">And more</td>
+       <td style="text-align:center;">More</td>
+       <td style="text-align:right;"><strong>Data</strong></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+
+<p>The table rules are:</p>
+
+<ul>
+  <li>There must be at least one <code>|</code> per line</li>
+  <li>The &#8220;separator&#8221; line between headers and table content must contain only <code>|</code>,<code>-</code>, <code>=</code>, <code>:</code>,<code>.</code>, <code>+</code>, or spaces</li>
+  <li>Cell content must be on one line only</li>
+  <li>Columns are separated by <code>|</code></li>
+  <li>The first line of the table, and the alignment/divider line, must start at
+    the beginning of the line</li>
+</ul>
+
+<p>Other notes:</p>
+
+<ul>
+  <li>It is optional whether you have <code>|</code> characters at the beginning and end of lines.</li>
+  <li>The &#8220;separator&#8221; line uses <code>----</code> or <code>====</code> to indicate the line between a header and cell. The length of the line doesn&#8217;t matter, but must have at least one character per cell.</li>
+  <li>To set alignment, you can use a colon to designate left or right alignment, or a colon at each end to designate center alignment, as above. If no colon is present, the default alignment of your system is selected (left in most cases). </li>
+  <li>To indicate that a cell should span multiple columns, then simply add additional pipes (<code>|</code>) at the end of the cell, as shown in the example. If the cell in question is at the end of the row, then of course that means that pipes are not optional at the end of that row&#8230;. The number of pipes equals the number of columns the cell should span.</li>
+  <li>You can use Markdown markup within the table cells.</li>
+  <li>Cells can be empty.</li>
+</ul>
+
+<h2 id="definitions">Definition Lists</h2>
+
+Definition lists uses this syntax:
+
+<pre><code>
+        Apple
+        :   Pomaceous fruit of plants of the genus Malus in
+            the family Rosaceae.
+        :   An american computer company.
+
+        Orange
+        :   The fruit of an evergreen tree of the genus Citrus.
+</code></pre>
+
+<p>becomes:</p>
+
+<div class="bz_comment_text">
+  <dl style="margin-left: 5em">
+    <dt>Apple</dt>
+    <dd>Pomaceous fruit of plants of the genus Malus in
+      the family Rosaceae.</dd>
+
+    <dd>An american computer company.</dd>
+
+    <dt>Orange</dt>
+    <dd>The fruit of an evergreen tree of the genus Citrus.</dd>
+  </dl>
+</div>
+
+<p>You can have more than one term per definition by placing each term on a
+  separate line. Each definition starts with a colon, and you can have more than
+  one definition per term. You may optionally have a blank line between the last
+  term and the first definition.</p>
+
+<p>Definitions may contain other block level elements, such as lists,
+  blockquotes, or other definition lists.</p>
+
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 62f4880571..05150d2377 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -6,8 +6,8 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% SET title = "Bugzilla 4.4 Release Notes" %]
-[% INCLUDE global/header.html.tmpl 
+[% SET title = "Bugzilla 5.0 Release Notes" %]
+[% INCLUDE global/header.html.tmpl
   title = title
   bodyclasses = ['narrow_page']
 %]
@@ -15,216 +15,188 @@
 <h1>[% title FILTER html %]</h1>
 
 <ul class="bz_toc">
-  <li><a href="#v44_introduction">Introduction</a></li>
-  <li><a href="#v44_point">Updates in this 4.4.x Release</a></li>
-  <li><a href="#v44_req">Minimum Requirements</a></li>
-  <li><a href="#v44_feat">New Features and Improvements</a></li>
-  <li><a href="#v44_issues">Outstanding Issues</a></li>
-  <li><a href="#v44_upgrading">Notes On Upgrading From a Previous Version</a></li>
-  <li><a href="#v44_code_changes">Code Changes Which May Affect
+  <li><a href="#introduction">Introduction</a></li>
+  <li><a href="#point">Updates in this 5.0.x Release</a></li>
+  <li><a href="#req">Minimum Requirements</a></li>
+  <li><a href="#feat">New Features and Improvements</a></li>
+  <li><a href="#issues">Outstanding Issues</a></li>
+  <li><a href="#code_changes">Code Changes Which May Affect
     Customizations and Extensions</a></li>
+  <li><a href="https://bugzilla.readthedocs.org/en/latest/installing/upgrading.html">
+    Notes On Upgrading From a Previous Version</a></li>
   <li><a href="http://www.bugzilla.org/releases/">Release Notes for Previous Versions</a></li>
 </ul>
 
-<h2 id="v44_introduction">Introduction</h2>
+<h2 id="introduction">Introduction</h2>
 
-<p>Welcome to Bugzilla 4.4! It has been over a year since we
-  released Bugzilla 4.2 on February 2012, and this new major
-  release comes with several new features and improvements. This release
-  contains major improvements to WebServices, which were our main target in
-  this release, a rewritten tagging system, a real MIME type auto-detection for
-  attachments, improved support for Oracle, performance improvements and lots
-  of other enhancements.</p>
+<p>Welcome to Bugzilla 5.0! It has been slightly over two years since we released
+  Bugzilla 4.4 in May of 2013. This new major release comes with many new features
+  and improvements to WebServices and performance.</p>
 
-<p>If you're upgrading, make sure to read <a href="#v44_upgrading">Notes On
-  Upgrading From a Previous Version</a>. If you are upgrading from a release
-  before 4.2, make sure to read the release notes for all the
+<p>If you're upgrading, make sure to read
+  <a href="https://bugzilla.readthedocs.org/en/latest/installing/upgrading.html">
+  Notes On Upgrading From a Previous Version</a>. If you are upgrading from a
+  release before 4.4, make sure to read the release notes for all the
   <a href="http://www.bugzilla.org/releases/">previous versions</a> in between
   your version and this one, <strong>particularly the Upgrading section of each
   version's release notes</strong>.</p>
 
-<h2 id="v44_point">Updates in this 4.4.x Release</h2>
+<h2 id="point">Updates in this 5.0.x Release</h2>
 
-<h3>4.4.4</h3>
+<h3>5.0.3</h3>
 
-<p>This release fixes one regression introduced in Bugzilla 4.4.3 by
-  <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=968576">security [% terms.bug %] 968576</a>:
-  URLs in [% terms.bug %] comments are displayed correctly again.
-  (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=998323">[% terms.Bug %] 998323</a>)</p>
-
-<h3>4.4.3</h3>
-
-<p>This release fixes two security issues. See the
-  <a href="http://www.bugzilla.org/security/4.0.11/">Security Advisory</a>
+<p>This release fixes one security issue. See the
+  <a href="https://www.bugzilla.org/security/4.4.11/">Security Advisory</a>
   for details.</p>
 
-<p>In addition, the following important fixes/changes have been made in this release:</p>
+<p>This release also contains the following [% terms.bug %] fixes:</p>
 
 <ul>
-  <li>The <kbd>User.login</kbd> WebService method now also returns a
-    <kbd>token</kbd> argument containing a login token which you can use in
-    subsequent calls to authenticate. For security reasons, this method
-    no longer generates login cookies.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=893195">[% terms.Bug %] 893195</a>)</li>
-  <li>The <kbd>User.get</kbd> WebService method now correctly takes the
-    <kbd>maxusermatches</kbd> parameter into account when the <kbd>match</kbd>
-    argument is passed. Previously, it was returning all matching accounts.
-    To further limit the number of accounts returned by <kbd>User.get</kbd>,
-    you can now pass the <kbd>limit</kbd> argument.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=962060">[% terms.Bug %] 962060</a>)</li>
-  <li>The sudo cookie is no longer accessible from JavaScript.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=966676">[% terms.Bug %] 966676</a>)</li>
-  <li>Large dependency trees with lots of resolved [% terms.bugs %] now load
-    much faster.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=961789">[% terms.Bug %] 961789</a>)</li>
+  <li>A regression in Bugzilla 5.0.2 caused <kbd>whine.pl</kbd> to be unable
+    to send emails due to a missing subroutine.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1235395">[% terms.Bug %] 1235395</a>)</li>
+  <li>The <kbd>Encode</kbd> module changed the way it encodes strings, causing
+    email addresses in emails sent by [%terms.Bugzilla %] to be encoded,
+    preventing emails from being correctly delivered to recipients.
+    We now encode email headers correctly.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1246228">[% terms.Bug %] 1246228</a>)</li>
+  <li>Fix additional taint issues with Strawberry Perl.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=987742">[% terms.Bug %] 987742</a> and
+    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1089448">[% terms.bug %] 1089448</a>)</li>
+  <li>When exporting a buglist as a CSV file, fields starting with either
+    "=", "+", "-" or "@" are preceded by a space to not trigger formula
+    execution in Excel.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1259881">[% terms.Bug %] 1259881</a>)</li>
+  <li>An extension which allows user-controlled data to be used as a link in
+    tabs could trigger XSS if the data is not correctly sanitized.
+    [%+ terms.Bugzilla %] no longer relies on the extension to do the sanity
+    check. A vanilla installation is not affected as no tab is user-controlled.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1250114">[% terms.Bug %] 1250114</a>)</li>
+  <li>Extensions can now easily override the favicon used for the
+    [%+ terms.Bugzilla %] website.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1250264">[% terms.Bug %] 1250264</a>)</li>
 </ul>
 
-<h3>4.4.2</h3>
+<h3>5.0.2</h3>
+
+<p>This release fixes two security issues. See the
+  <a href="https://www.bugzilla.org/security/4.2.15/">Security Advisory</a>
+  for details.</p>
 
-<p>The following [% terms.bugs %] have been fixed in this release:</p>
+<p>This release also contains the following [% terms.bug %] fixes:</p>
 
 <ul>
-  <li><kbd>checksetup.pl</kbd> was incorrectly reporting DBI 1.630 (1.63) as
-    being older than 1.614, preventing the upgrade to complete.
-    If you still use Perl 5.10.0 or older, make sure you have the
-    <a href="http://search.cpan.org/~jpeacock/version/lib/version.pod">version</a>
-    module installed before running <kbd>checksetup.pl</kbd>.
-    If you use Perl 5.10.1 or newer, this module is already available and
-    no special action is required.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=938300">[% terms.Bug %] 938300</a>)</li>
-  <li>An error about <kbd>longdescs.comment_id</kbd> was thrown by MySQL 5.0
-    and 5.1 when upgrading to Bugzilla 4.4 or 4.4.1.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=870369">[% terms.Bug %] 870369</a>)</li>
-  <li>Saved searches containing Unicode characters in their name could not
-    be run if Digest::SHA 5.82 or newer is installed.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=964113">[% terms.Bug %] 964113</a>)</li>
-  <li>A regression in Bugzilla 4.4.1 caused <kbd>email_in.pl</kbd> to fail
-    with an "invalid token" error message.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=928331">[% terms.Bug %] 928331</a> and
-    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=930013">[% terms.bug %] 930013</a>)</li>
-  <li>The PROJECT environment variable is now correctly taken into account
-    when mod_perl is enabled (this variable allows several installations to
-    share the same codebase).
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=843457">[% terms.Bug %] 843457</a>)</li>
-  <li>Mandatory custom fields whose visibility depends on a component are now
-    correctly required on [% terms.bug %] creation.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=895813">[% terms.Bug %] 895813</a>)</li>
-  <li>Windows 8.1 is now recognized when reporting new [% terms.bugs %].
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=928092">[% terms.Bug %] 928092</a>)</li>
-  <li>Bugzilla no longer crashes when the <kbd>shutdownhtml</kbd> parameter
-    is set and using a non-cookie based authentication method.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=748095">[% terms.Bug %] 748095</a>)</li>
-  <li><kbd>importxml.pl</kbd> no longer ignores the <kbd>maxattachmentsize</kbd>
-    and <kbd>maxlocalattachment</kbd> parameters when importing [% terms.bugs %].
-    This means that large attachments are now stored locally in
-    <kbd>data/attachments/</kbd> if parameters are configured this way.
-    The script must now be run as the webserver user (e.g. apache) to make these
-    attachments readable from web browsers.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=360231">[% terms.Bug %] 360231</a>)</li>
-  <li>The default date and time format used for SQLite has been fixed.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=938161">[% terms.Bug %] 938161</a>)</li>
+  <li>mod_perl now works correctly with mod_access_compat turned off on
+    Apache 2.4. To regenerate the <kbd>.htaccess</kbd> files, you must first
+    delete all existing ones in subdirectories:
+    <pre>find . -mindepth 2 -name .htaccess -exec rm -f {} \;</pre>
+    You must then run <kbd>checksetup.pl</kbd> again to recreate them with
+    the correct syntax.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1223790">[% terms.Bug %] 1223790</a>)</li>
+  <li>Emails sent by [% terms.Bugzilla %] are now correctly encoded as UTF-8.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=714724">[% terms.Bug %] 714724</a>)</li>
+  <li>Strawberry Perl is now fully supported on Windows.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1089448">[% terms.Bug %] 1089448</a>
+    and <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=987742">[% terms.bug %] 987742</a>)</li>
+  <li>The XML-RPC API now works with IIS on Windows.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=708252">[% terms.Bug %] 708252</a>)</li>
+  <li>Some queries should now be faster on PostgreSQL.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1184431">[% terms.Bug %] 1184431</a>)</li>
 </ul>
 
-<h3>4.4.1</h3>
+<h3>5.0.1</h3>
 
-<p>This release fixes several security issues. See the
-  <a href="http://www.bugzilla.org/security/4.0.10/">Security Advisory</a>
+<p>This release fixes one security issue. See the
+  <a href="https://www.bugzilla.org/security/4.2.14/">Security Advisory</a>
   for details.</p>
 
-<p>In addition, the following [% terms.bugs %] have been fixed in this release:</p>
+<p>This release also contains the following [% terms.bug %] fixes:</p>
 
 <ul>
-  <li><kbd>checksetup.pl</kbd> no longer fails with "Invalid version format (non-numeric data)"
-    when a Perl module contains an invalid version number.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=781672">[% terms.Bug %] 781672</a>)</li>
-  <li>Internet Explorer 11 and KHTML-based browsers such as Konqueror can now
-    display buglists correctly.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=902515">[% terms.Bug %] 902515</a> and
-    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=914262">[% terms.bug %] 914262</a>)</li>
-  <li>When editing several [% terms.bugs %] at once and moving them into a new
-    product, [% terms.bugs %] restricted to a group in the old product could
-    loose these group restrictions in the new product.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=769134">[% terms.Bug %] 769134</a>)</li>
-  <li>When the <kbd>password_complexity</kbd> parameter was set to
-    'letters_numbers_specialchars', passwords containing numbers and special
-    characters only were accepted. Now it makes sure that a letter is also present.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=897264">[% terms.Bug %] 897264</a>)</li>
-  <li>Large dependency trees are now displayed much faster.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=917370">[% terms.Bug %] 917370</a>)</li>
-  <li>When a user has set many votes, the "Votes" page is now displayed much faster.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=851267">[% terms.Bug %] 851267</a>)</li>
-  <li>The "My Requests" page now correctly uses the AND/OR operator for the
-    requester and requestee fields only instead of using it for all fields.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=891311">[% terms.Bug %] 891311</a>)</li>
-  <li>With DB servers doing case-insensitive comparisons, such as MySQL, tokens
-    and login cookies were not correctly validated as the case was ignored.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=906745">[% terms.Bug %] 906745</a> and
-    <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=907438">[% terms.bug %] 907438</a>)</li>
-  <li>All security headers (such as X-Frame-Options) are now returned when using XML-RPC.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=787328">[% terms.Bug %] 787328</a>)</li>
-  <li>Oracle crashed when reporting a new [% terms.bug %] if a custom free-text field
-    was non-mandatory and left empty.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=919475">[% terms.Bug %] 919475</a>)</li>
-  <li>It was not possible to import [% terms.bugs %] using <kbd>importxml.pl</kbd> with Oracle.
-    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=848063">[% terms.Bug %] 848063</a>)</li>
+  <li>Users whose login name is not an email address could not log in on
+    installations which use LDAP to authenticate users.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1179160">[% terms.Bug %] 1179160</a>)</li>
+  <li>If a mandatory custom field was hidden, it was not possible to create
+    a new [% terms.bug %] or to edit existing ones.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1183398">[% terms.Bug %] 1183398</a>
+    and <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1196969">[% terms.bug %] 1196969</a>)</li>
+  <li>A user editing his login name to point to a non-existent email address
+    could cause Bugzilla to stop working, causing a denial of service.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1194987">[% terms.Bug %] 1194987</a>)</li>
+  <li>Emails generated during a transaction made PostgreSQL stop working.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1186700">[% terms.Bug %] 1186700</a>)</li>
+  <li>[% terms.Bugs %] containing a comment with a reference to a [% terms.bug %]
+    ID larger than 2^31 could not be displayed anymore using PostgreSQL.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1191937">[% terms.Bug %] 1191937</a>)</li>
+  <li>The date picker in the "Time Summary" page was broken.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1181649">[% terms.Bug %] 1181649</a>)</li>
+  <li>If <kbd>Test::Taint</kbd> or any other Perl module required to use the
+    JSON-RPC API was not installed or was too old, the UI to tag comments was
+    displayed anyway, you could tag comments, but tags were not persistent
+    (they were lost on page reload). Now the UI to tag comments is not displayed
+    at all until the missing Perl modules are installed and up-to-date.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1183227">[% terms.Bug %] 1183227</a>)</li>
+  <li>Custom fields of type <kbd>INTEGER</kbd> now accept negative integers.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1198659">[% terms.Bug %] 1198659</a>)</li>
+  <li>On Windows, the <kbd>checksetup.pl</kbd> installation script no longer
+    asks for a SMTP server. It can be set after the installation is complete.
+    (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1191255">[% terms.Bug %] 1191255</a>)</li>
 </ul>
 
-<h2 id="v44_req">Minimum Requirements</h2>
+<h2 id="req">Minimum Requirements</h2>
 
-<p>Any requirements that are new since 4.2 will look like
+<p>Any requirements that are new since 4.4 will look like
   <span class="req_new">this</span>.</p>
 
 <ul>
-  <li><a href="#v44_req_perl">Perl</a></li>
-  <li><a href="#v44_req_mysql">For MySQL Users</a></li>
-  <li><a href="#v44_req_pg">For PostgreSQL Users</a></li>
-  <li><a href="#v44_req_oracle">For Oracle Users</a></li>
-  <li><a href="#v44_req_sqlite">For SQLite Users</a></li>
-  <li><a href="#v44_req_modules">Required Perl Modules</a></li>
-  <li><a href="#v44_req_optional_mod">Optional Perl Modules</a></li>
-  <li><a href="#v44_req_apache">Optional Apache Modules</a></li>
+  <li><a href="#req_perl">Perl</a></li>
+  <li><a href="#req_mysql">For MySQL Users</a></li>
+  <li><a href="#req_pg">For PostgreSQL Users</a></li>
+  <li><a href="#req_oracle">For Oracle Users</a></li>
+  <li><a href="#req_sqlite">For SQLite Users</a></li>
+  <li><a href="#req_modules">Required Perl Modules</a></li>
+  <li><a href="#req_optional_mod">Optional Perl Modules</a></li>
+  <li><a href="#req_apache">Optional Apache Modules</a></li>
 </ul>
 
-<h3 id="v44_req_perl">Perl</h3>
-
-<p>Perl v5.8.1</p>
+<h3 id="req_perl">Perl</h3>
 
-<p><strong>IMPORTANT:</strong> This is the last major release to support
-  Perl 5.8.x! The next major release, Bugzilla 5.0, will require
-  Perl 5.10.1 as a minimum.</p>
+<p>Perl <span class="req_new">v5.14.1</span></p>
 
-[% INCLUDE db_req db='mysql' %]
+[% INCLUDE db_req db = 'mysql'
+                  module = 'DBD::mysql' %]
 
-[% INCLUDE db_req db='pg' dbd_new => 1 %]
+[% INCLUDE db_req db = 'pg'
+                  module = 'DBD::Pg' %]
 
-[% INCLUDE db_req db='oracle' %]
+[% INCLUDE db_req db ='oracle'
+                  module = 'DBD::Oracle' %]
 
-[% INCLUDE db_req db='sqlite' %]
+[% INCLUDE db_req db = 'sqlite'
+                  module = 'DBD::SQLite' %]
 
-<h3 id="v44_req_modules">Required Perl Modules</h3>
+<h3 id="req_modules">Required Perl Modules</h3>
 
 [% INCLUDE req_table reqs = REQUIRED_MODULES
-                     updated = ['TimeDate', 'DBI', 'Email-Send', 'List-MoreUtils'] %]
+                     new = ['File::Slurp','JSON::XS', 'Email::Sender']
+                     updated = ['DateTime', 'DateTime::TimeZone',
+                                'Template', 'URI'] %]
 
-<h3 id="v44_req_optional_mod">Optional Perl Modules</h3>
+<h3 id="req_optional_mod">Optional Perl Modules</h3>
 
 <p>The following perl modules, if installed, enable various
   features of Bugzilla:</p>
 
 [% INCLUDE req_table reqs = OPTIONAL_MODULES
-                     new  = ['Net-SMTP-SSL', 'HTML-FormatText-WithLinks',
-                             'File-MimeInfo', 'IO-stringy']
-                     updated = ['TheSchwartz']
+                     new  = ['Cache::Memcached::Fast','File::Copy::Recursive']
+                     updated = ['Chart::Lines', 'Test::Taint']
                      include_feature = 1 %]
 
-<h3 id="v44_req_apache">Optional Apache Modules</h3>
+<h3 id="req_apache">Optional Apache Modules</h3>
 
 <p>If you are using Apache as your webserver, Bugzilla can
   take advantage of some Apache features if you have the below Apache
-  modules installed and enabled. Currently,
-  <a href="#v40_feat_js_css_update">certain Bugzilla features</a>
-  are enabled only if you have all of the following modules installed
-  and enabled:</p>
+  modules installed and enabled.</p>
 
 <ul>
   <li>mod_headers</li>
@@ -237,442 +209,248 @@
   you.</p>
 
 
-<h2 id="v44_feat">New Features and Improvements</h2>
+<a name="v50_feat"></a>
+<h2 id="feat">New Features and Improvements</h2>
 
 <ul>
-  <li><a href="#v44_feat_search">Allow Multiple Search Criteria to Match one Field</a></li>
-  <li><a href="#v44_feat_search_perf">Improved Performance for Searches</a></li>
-  <li><a href="#v44_feat_bug_tags">Overhaul of the Tagging System</a></li>
-  <li><a href="#v44_feat_mimetype_autodetect">Auto-Detection of the Attachment MIME Type</a></li>
-  <li><a href="#v44_feat_saved_reports">Saving Tabular and Graphical Reports</a></li>
-  <li><a href="#v44_feat_whining">Custom Columns in Whine Emails</a></li>
-  <li><a href="#v44_feat_webservices">Improved WebServices</a></li>
-  <li><a href="#v44_feat_apache_config">New Apache Configuration</a></li>
-  <li><a href="#v44_feat_other">Other Enhancements and Changes</a></li>
+  <li><a href="#feat_webservices">Improved WebServices</a></li>
+  <li><a href="#feat_caching_performance">Improved Caching using Memcached</a></li>
+  <li><a href="#feat_comment_tags">Abililty to Tag [% terms.Bug %] Comments</a></li>
+  <li><a href="#feat_bug_groups">Improved [% terms.Bug %] Group Membership Checking</a></li>
+  <li><a href="#feat_documentation">Improved Documentation for Users and Administrators</a></li>
+  <li><a href="#feat_other">Other Enhancements and Changes</a></li>
 </ul>
 
-<h3 id="v44_feat_search">Allow Multiple Search Criteria to Match one Field</h3>
+<h3 id="feat_webservices">Improved WebServices</h3>
 
 <p>
-  In the "Advanced Search" page, it is now possible to build queries using
-  multiple custom search criteria against the same field. In Bugzilla
-  4.2 and older, queries of the form
-  <br><br>
-  <kbd>"Status changed to VERIFIED" AND "Status changed by foo@bar.com"</kbd>
-  <br><br>
-  were returning all [% terms.bugs %] which had their status changed to VERIFIED
-  by some user and which were edited by foo@bar.com once, but both actions could
-  be independent. In Bugzilla 4.4, you can now decide if both
-  criteria must match the exact same action or not, i.e. if you want
-  [%+ terms.bugs %] whose status has been set to VERIFIED by foo@bar.com himself.
-  In the same way, queries of the form
-  <br><br>
-  <kbd>"Flags changed to approval+" AND "Flags changed by foo@bar.com"</kbd>
-  <br><br>
-  can now return [% terms.bugs %] for which the approval flag has been set to
-  "+" by foo@bar.com himself. In previous versions, both actions were treated
-  independently and [% terms.bugs %] for which foo@bar.com set the approval flag
-  to "?" and which is then set to "+" by someone else were also returned.
+  This release has major improvements in the WebServices interface. One big
+  addition is a new REST-like endpoint alongside the existing XML-RPC and JSON-RPC
+  endpoints. This will allow clients to access Bugzilla data using standard HTTP
+  calls for easy development. <strong>Note:</strong> XML-RPC and JSON-RPC are
+  deprecated in favor of REST and will likely be removed in the Bugzilla 7.0 release.
 </p>
 <p>
-  This new feature gives you the ability to build more accurate queries and to
-  get more relevant results.
+  Also API key support has been added so that API calls will no longer need to use
+  cookies or a user's login and password. Users can create a different API key for
+  each application and revoke API keys that have been compromised or are no longer
+  needed. The API key will simply be passed to each call as credentials.
 </p>
-
-<h3 id="v44_feat_search_perf">Improved Performance for Searches</h3>
-
 <p>
-  The search system got a performance boost which in some cases decreases the
-  time spent to run queries from several minutes to a few seconds only.
-  The more complex your queries are, the more visible the performance win
-  should be.
+  Several methods have been added and existing ones improved to allow returning
+  data that was not available before such as <kbd>Group.get</kbd>. <kbd>B[%%]ug.search</kbd>
+  is now as full featured as the Advanced Query UI allowing for the same searches
+  to be executed. Attachment data such as flags and other metadata can now be
+  updated through the API. Other WebService changes are detailed
+  <a href="#feat_webservices_other">below</a>.
 </p>
 
-<h3 id="v44_feat_bug_tags">Overhaul of the Tagging System</h3>
+<h3 id="feat_caching_performance">Improved Caching using Memcached</h3>
 
 <p>
-  The old tagging system which was in the footer of all pages had severe design
-  and usability limitations and has been replaced by a shiny new one which lets
-  you tag [% terms.bugs %] from the [% terms.bug %] report directly. Tags now
-  mostly work like keywords, but with two major differences. First of all, they
-  are personal, meaning that tags you set on [% terms.bugs %] are only visible
-  by you, and nobody else is notified nor can see which tags you set. This
-  behavior is the same as the old tagging system and so this feature didn't
-  change. The second major difference is that the list of available tags is
-  unlimited and is in no way hardcoded by administrators. You can type either
-  a new tag of your choice, or you can select one from an auto-generated list
-  of tags which you already used in other [% terms.bugs %]. Again, this feature
-  was already present in the old tagging system, but its usability has been
-  greatly improved. In particular, this means that tags are now displayed in
-  [%+ terms.bug %] reports directly, so that you immediately know which tags
-  you already set for that [% terms.bug %]. This feature is new in this release.
-</p>
-<p>
-  Another new feature is that your personal tags can now be listed in buglists.
-  They can also be used as search criteria in your queries. If you decide to
-  share a saved search which uses tags as criteria, this will work too! Note
-  that when you add a new tag, no saved search based on this tag is created
-  anymore, as you can easily create it yourself if you really need it.
-</p>
-<p>
-  The tags set with the old tagging system are automatically migrated to the
-  new system.
-</p>
-
-<h3 id="v44_feat_mimetype_autodetect">Auto-Detection of the Attachment MIME Type</h3>
-
-<p>
-  When a user uploads a new attachment and lets the "Content Type" field set to
-  "auto-detect", Bugzilla now does its own MIME type detection
-  if the web browser tells them that the attachment is of type
-  "application/octet-stream", in an attempt to make a better guess than the web
-  browser. In all other cases, Bugzilla still trusts what the browser
-  tells them.
-</p>
-<p>
-  Check the <a href="#v44_req_optional_mod">list of optional Perl modules</a> to
-  know which modules to install in order to enable MIME type sniffing.
+  Bugzilla now has the ability to connect to a Memcached server running either
+  locally or on the network to allow fast access to different types of data.
+  This cuts down on the amount of database hits and can improve performance. Other
+  areas have been improved as well to take advantage of caching in memory for
+  objects that are retrieved multiple times during a request such as user data, etc.
 </p>
 
-<h3 id="v44_feat_saved_reports">Saving Tabular and Graphical Reports</h3>
+<h3 id="feat_comment_tags">Ability to Tag [% terms.Bug %] Comments</h3>
 
 <p>
-  It is now possible to save tabular and graphical reports in the same way as
-  you save searches. Saved reports will appear in the footer of pages, below
-  saved searches.
-</p>
-<p>
-  Unlike saved searches, it is not yet possible to share saved reports with
-  other users.
+  Users can add tags, visible to other users, to [% terms.bug %] comments. This
+  gives the users the ability to thread conversations, mark comments as spam,
+  identify important comments, etc. Users can hide comments that contain specific
+  tags if desired. The tag input field also supports autocompletion so commonly
+  used tags can be selected. Administrators can make specifically tagged comments
+  be automatically hidden from view.
 </p>
 
-<h3 id="v44_feat_whining">Custom Columns in Whine Emails</h3>
+<h3 id="feat_bug_groups">Improved [% terms.Bug %] Group Membership Checking</h3>
 
 <p>
-  The list of columns to display in buglists contained in emails sent by the
-  whining system on a regular basis is no longer hardcoded. If the saved
-  search used for whining emails contains a list of columns, these columns are
-  used to be displayed in the emails. If no custom list is found, the default
-  column list is used instead.
+  In the past, Bugzilla restricted who can view [% terms.abug %] to everyone
+  who was a member of ALL the groups the [% terms.bug %] was in. That is, the
+  groups were ANDed together. This made some access control scenarios rather
+  difficult to achieve. So now, Bugzilla defaults to (and can be switched to,
+  in existing installations) a mode where the [% terms.bug %] can be viewed by
+  everyone who is a member of ANY group the [% terms.bug %] is in. That is, the
+  groups are ORed together. This give more flexibility in the way [% terms.bugs %]
+  are made private to specific groups of users.
 </p>
 <p>
-  This means that depending on the kind of email notifications you want, you
-  can fully customize data to return, on a per saved search basis!
-</p>
-
-<h3 id="v44_feat_webservices">Improved WebServices</h3>
-
-<p>
-  This release got major improvements in its WebServices interface. Many new
-  methods have been implemented to let third-party applications interact with
-  Bugzilla even more closely. For instance, it is now possible to
-  know what parameters are set to using <kbd>B[%%]ugzilla.parameters</kbd>.
-  It is now also possible to update tags, products, groups or user accounts
-  using our API.
-<p>
-<p>
-  Several existing methods have also been improved to return data which
-  weren't available till now, such as [% terms.bug %] and attachment flags
-  using <kbd>B[%%]ug.get</kbd>, <kbd>B[%%]ug.attachments</kbd> or
-  <kbd>Product.get</kbd>. Users can also get their saved searches and reports
-  using <kbd>User.get</kbd>; and much more, see the
-  <a href="#v44_feat_webservices_details">detailed list</a> below.
+  <strong>Note:</strong> Group memberships for [% terms.bugs %] and users are
+  not changed at all when this setting is switched. When switching from AND to
+  OR, this means that [% terms.bugs %] may be more widely viewable than previously.
+  It is the responsibility of the administrator to make sure that no [% terms.bugs %]
+  are accidentally revealed to the wrong people when changing this setting.
 </p>
 
-<h3 id="v44_feat_apache_config">New Apache Configuration</h3>
+<h3 id="feat_documentation">Improved Documentation for Users and Administrators</h3>
 
 <p>
-  For improved security, Bugzilla now prevents directory browsing
-  by default. If you run Bugzilla under Apache (as most people do),
-  you most likely require a <strong>new Apache configuration</strong> for this
-  version of Bugzilla. See the
-  <a href="#v44_upgrading">Notes On Upgrading From a Previous Version</a>
-  section for details.
+  The standard documentation that is shipped along with the Bugzilla code has been
+  rewritten and improved using the reStructuredText format. This allows the
+  documentation to be easily hosted at sites such as ReadTheDocs.org and can
+  also be more easily converted into different formats such as HTML and PDF.
+  A new section dedicated to the new REST WebService API has also been added,
+  significantly improving on the old WebService documentation.
 </p>
 
-<h3 id="v44_feat_other">Other Enhancements and Changes</h3>
+<h3 id="feat_other">Other Enhancements and Changes</h3>
 
 <h4>Enhancements for Users</h4>
 
 <ul>
-  <li><strong>[% terms.Bugs %]:</strong> It is now possible to add yourself to
-    the CC list when uploading an attachment and when editing an existing one.</li>
-  <li><strong>[% terms.Bugs %]:</strong> There is a new user preference to be
-    automatically added to the CC list of [% terms.bugs %] for which a flag
-    request is addressed to you (the flag has you as the requestee).</li>
-  <li><strong>[% terms.Bugs %]:</strong> Changes to the CC list no longer
-    causes midair collisions.</li>
-  <li><strong>[% terms.Bugs %]:</strong> There is now a <em>(take)</em> link
-    besides the QA Contact field to easily set yourself as QA contact.</li>
-  <li><strong>[% terms.Bugs %]:</strong> [% terms.Bugs %] are no longer
-    reassigned to the default assignee when moving the [% terms.bug %] into
-    another product or component if the current assignee is not the default
-    one. Same goes for the QA contact.</li>
-  <li><strong>[% terms.Bugs %]:</strong> When reporting a new [% terms.bug %],
-    flags which are not available for the selected component and those which
-    the reporter cannot edit are now hidden instead of being disabled. For
-    existing [% terms.bugs %], unset flags are also hidden by default. Clicking
-    the <em>(set flags)</em> or <em>(more flags)</em> link will make them
-    appear.</li>
-  <li><strong>[% terms.Bugs %]:</strong> When viewing [% terms.abug %], the list
-    of duplicated [% terms.bugs %] is now listed near the top of the page.</li>
-  <li><strong>[% terms.Bugs %]:</strong> Private comments now always remain
-    visible to their author. Previously, the author of a comment couldn't see
-    it anymore if the comment was marked private and the author isn't in the
-    insider group.</li>
-  <li><strong>[% terms.Bugs %]:</strong> The See Also field now supports URLs
-    pointing to GitHub by default. If the new MoreBugUrl extension included in
-    this release is enabled, then you can also add URLs pointing to:
-    b[%%]ugs.php.net, RT, appspot.com (Rietveld), Review Board, and
-    getsatisfaction.com.</li>
-  <li><strong>Searches:</strong> The alias of [% terms.bugs %] you cannot see
-    are no longer resolved to their [% terms.bug %] ID, meaning that it is no
-    longer possible to connect an alias with its ID unless you can see the
-    [%+ terms.bug %].</li>
-  <li><strong>Searches:</strong> Custom multi-select fields are now available
-    in the "Search By Change History" section of the query page.</li>
-  <li><strong>Searches:</strong> The <em>changed by</em> operator in boolean
-    charts now accepts pronouns.</li>
-  <li><strong>Searches:</strong> The requester and requestee fields in boolean
-    charts now accept pronouns.</li>
-  <li><strong>Searches:</strong> It is now possible to hide the description of
-    queries appearing at the top of buglists.</li>
-  <li><strong>Requests:</strong> The "My Requests" page now displays an AND/OR
-    radio button to define the interaction between the requester and requestee
-    fields.</li>
-  <li><strong>Email Notifications:</strong> There is a new user preference to
-    not prepend "New:" to the subject of [% terms.bug %]mails when reporting
-    a new [% terms.bug %]. Some email clients couldn't thread emails correctly
-    due to this.</li>
-  <li><strong>Email Notifications:</strong> There is a new email event to get
-    notifications when the product or component of [% terms.abug %] changes.</li>
-  <li><strong>Email Notifications:</strong> All [% terms.bug %]mails now have
-    a <em>X-Bugzilla-Flags</em> email header, listing currently set flags.</li>
-  <li><strong>Email Notifications:</strong> All [% terms.bug %]mails now have
-    a <em>X-Bugzilla-Version</em> email header with the current product
-    version.</li>
-  <li><strong>Whining:</strong> The sort order of the saved search is used to
-    sort [% terms.bugs %] in the emails.</li>
-  <li><strong>User Accounts:</strong> To confirm an email address change, the
-    password is now requested instead of the old email address.</li>
-  <li><strong>Graphical Reports:</strong> The size of graphical reports is now
-    set dynamically to fit within the window of the web browser.
-    The Taller/Thinner/Fatter/Shorter links are now gone.</li>
-  <li><strong>Incoming Emails:</strong> <kbd>email_in.pl</kbd> now accepts
-    HTML-only emails to create and edit [% terms.bugs %] by email.</li>
-  <li><strong>Incoming Emails:</strong> When creating a new [% terms.bug %],
-    <kbd>email_in.pl</kbd> will look at the <em>Importance</em> and
-    <em>X-Priority</em> email headers to increase or decrease the initial
-    priority of the [% terms.bug %], unless the priority is already explicitly
-    set in the email itself.</li>
-  <li><strong>Skins:</strong> Bugzilla no longer fetches all skins
-    available when viewing a page. It only loads the skin selected by the user
-    in their preferences, which results in less requests to the server.</li>
+  <li><strong>[% terms.Bugs %]:</strong> The deadline field is now visible to users
+    not in the the <kbd>timetracking</kbd> group.</li>
+  <li><strong>[% terms.Bugs %]:</strong> There is now a "Preview" mode when
+    creating a new comment that allows you to see how the comment will look
+    before committing to the database.</li>
+  <li><strong>[% terms.Bugs %]:</strong> The reporter is now allowed to enter
+    keywords at time of [% terms.bug %] creation.</li>
+  <li><strong>[% terms.Bugs %]:</strong> "See Also" now allows spaces as well as
+    commas to delimit multiple values.</li>
+  <li><strong>[% terms.Bugs %]:</strong> Auto linkification in comments of [% terms.bug %]
+    IDs and comment IDs has been improved.</li>
+  <li><strong>[% terms.Bugs %]:</strong> [% terms.Bugs %] can now have multiple
+    aliases assigned to them. Before each [% terms.bug %] could only have a single
+    value. Also, aliases are now visible in the browser's title bar.</li>
+  <li><strong>[% terms.Bugs %]:</strong> Users can now change the flags of multiple
+    [%+ terms.bugs %] at once using the mass-edit form.</li>
+  <li><strong>Charts and Reports:</strong> UTF-8 characters are now correctly
+    displayed in "New Charts" and graphical reports.</li>
+  <li><strong>Charts and Reports:</strong> Custom multi-select fields are now
+    available as report axis options. This makes them usable for categorizing
+    [%+ terms.bugs %] in reports.</li>
+  <li><strong>Email:</strong> You can now choose to not receive any mail at all
+    about a particular [% terms.bug %], even if you continue to have a role on
+    that [% terms.bug %] (e.g. reporter).</li>
+  <li><strong>Email:</strong> When adding or removing [% terms.abug %] as a
+    dependency, the summary of the [% terms.bug %] is included in the email
+    notification.</li>
+  <li><strong>Requests:</strong> <kbd>request.cgi</kbd> can now output results in
+    CSV format.</li>
+  <li><strong>Requests:</strong><kbd> X-Bugzilla-*</kbd> headers are now included
+    in flag notification emails.</li>
+  <li><strong>Searches:</strong> Some useful searches have been added to the
+    Bugzilla home page.</li>
+  <li><strong>Searches:</strong> Quicksearch now allows for use of comparison
+    operators such as !=, >=, >, &lt;, etc., in addition to substring searches.</li>
+  <li><strong>Searches:</strong> The "Blocks" and "Depends On" values can now be
+    displayed as columns in [% terms.abug %] list.</li>
+  <li><strong>Searches:</strong> The "is empty" and "is not empty" search operators
+    have been added to the Advanced Search UI. This allows searching for null
+    and not null values for certain fields.</li>
 </ul>
 
 <h4>Enhancements for Administrators and Developers</h4>
 
 <ul>
-  <li><strong>License:</strong> The Bugzilla code is now released
-    under the MPL 2.0 license (previously was MPL 1.1).</li>
-  <li><strong>Installation:</strong> On mod_perl, templates now remain in
-    memory for one hour, which can cause an increase in memory requirements.
-    This also means that it can take up to one hour before changes in templates
-    become active (unless you restart Apache).</li>
-  <li><strong>Installation:</strong> Running
-    <kbd>checksetup.pl --make-admin=foo@bar.com</kbd> now automatically
-    re-enables the user account if it was disabled.</li>
-  <li><strong>Configuration:</strong> A new parameter <em>smtp_ssl</em> can be
-    turned on to enable SSL connections to the SMTP server to send email
-    notifications.</li>
-  <li><strong>Administration:</strong> Custom fields now have a new <em>Long
-    description</em> attribute to better describe what the custom field is
-    about. This description then appears as a tooltip when hovering the custom
-    field in [% terms.bug %] reports.</li>
-  <li><strong>Administration:</strong> When creating a new product, the form
-    lets you add a component at the same time.</li>
-  <li><strong>Administration:</strong> When viewing a user account in
-    <kbd>editusers.cgi</kbd>, the date of the last login is displayed. Users
-    who did not log in since you upgraded to 4.4 will have this field empty.</li>
-  <li><strong>Administration:</strong> It is now possible to exclude disabled
-    user accounts when running a query in <kbd>editusers.cgi</kbd>.</li>
-  <li><strong>Administration:</strong> The default CC list is now also displayed
-    when listing components in <kbd>editcomponents.cgi</kbd>.</li>
-  <li><strong>Administration:</strong> Target milestones can now be 64 characters
-    long, for consistency with versions (previously was limited to 20 characters
-    only).</li>
-  <li><strong>Administration:</strong> The result code returned by
-    <kbd>contrib/bugzilla-queue.rhel</kbd> when it's not running is now 2
-    instead of 0.</li>
-  <li><strong>Database:</strong> Support for MySQL 5.6 has been added.</li>
-  <li><strong>Database:</strong> Support for Oracle has been greatly improved.</li>
-  <li><strong>Security:</strong> For improved security, the
-    "X-Content-Type-Options:&nbsp;nosniff" and "X-XSS-Protection:&nbsp;block"
-    headers are now sent with every response.</li>
-  <li><strong>Security:</strong> Tokens are now generated using HMAC SHA-256
-    instead of MD5.</li>
-  <li><strong>Documentation:</strong> The documentation is now generated with
-    <kbd>xmlto</kbd> and <kbd>dblatex</kbd> instead of <kbd>jade</kbd>.</li>
+  <li><strong>Administration:</strong> There are now <kbd>INTEGER</kbd> and
+    <kbd>DATE</kbd> custom field types.</li>
+  <li><strong>Administration:</strong> Filenames used to store product data for
+    "Old Charts" are now based on product IDs to avoid data loss when changing
+    product names.</li>
+  <li><strong>Administration:</strong> JavaScript and CSS files are now minified
+    and concatenated to improve page load performance. When changes are made,
+    <kbd>checksetup.pl</kbd> should be run to regenerate the combined files.</li>
+  <li><strong>[% terms.Bugs %]:</strong> Bugzilla now keeps track of the last
+    time each user visited (that is, loaded the show_bug page in a web browser)
+    each [% terms.bug %]. This could be useful for dashboards or API clients.</li>
+  <li><strong>Database:</strong> Text that contained unicode
+    supplementary characters (outside BMP) was cut off when using MySQL as backend.
+    This has been fixed to prevent data loss.</li>
+  <li><strong>Database:</strong> SSL connections are now possible when using
+    MySQL as backend.</li>
+  <li><strong>Database:</strong> For version 8.x of PostgreSQL, <kbd>plpgsql</kbd>
+    was not always installed by default and <kbd>checksetup.pl</kbd> would
+    generate an error. This has been fixed.</li>
+  <li><strong>Development:</strong> Bugzilla is now HTML5 compliant. As a
+    consequence, Internet Explorer 6 and 7 are no longer supported.</li>
+  <li><strong>Email:</strong> Email generation originally was done before the
+    jobqueue job was inserted. This is now delayed and done by
+    <kbd>jobqueue.pl</kbd> right before sending the email which can improve
+    responsiveness when processing [% terms.bug %] changes.</li>
+  <li><strong>Email:</strong> When a site administrator creates a new user, an
+    email is sent to the user.</li>
+  <li><strong>Email:</strong> For dependency email notifications, the header
+    <kbd>X-B[%%]ugzilla-Type: dep_changed</kbd> is set.</li>
+  <li><strong>Email:</strong> <kbd>whine.pl</kbd> emails now use
+    <kbd>DEFAULT_COLUMN_LIST</kbd> (the same default columns seen in the buglist
+    page) instead of hard coded column list.</li>
+  <li><strong>Security:</strong> Support for increased values for
+    <kbd>PASSWORD_SALT_LENGTH</kbd> without breaking compatibility with old
+    hashes.</li>
 </ul>
 
-<h4 id="v44_feat_webservices_details">WebService Changes</h4>
+<h4 id="feat_webservices_other">WebService Changes</h4>
 
 <ul>
-  <li>Several new methods have been added: <kbd>B[%%]ug.update_tags</kbd>,
-    <kbd>B[%%]ugzilla.parameters</kbd>, <kbd>B[%%]ugzilla.last_audit_time</kbd>,
-    <kbd>Classification.get</kbd>, <kbd>Group.update</kbd>,
-    <kbd>Product.update</kbd>, <kbd>User.update</kbd>.</li>
-  <li><kbd>B[%%]ug.add_attachment</kbd> now only returns the ID of the newly
-    created attachments instead of all the attachment data.</li>
-  <li><kbd>B[%%]ug.attachments</kbd> now also returns the <kbd>size</kbd> field
-    containing the size of the attachment.</li>
-  <li><kbd>B[%%]ug.attachments</kbd> and <kbd>B[%%]ug.get</kbd> now return
-    data about flags.</li>
-  <li><kbd>B[%%]ug.comments</kbd> now also returns <kbd>creation_time</kbd>
-    which is exactly the same as <kbd>time</kbd>, but is provided for
-    consistency with <kbd>B[%%]ug.get</kbd> and <kbd>B[%%]ug.attachments</kbd>.
-    The <kbd>time</kbd> field may be deprecated and removed in a future release,
-    so you should use <kbd>creation_time</kbd> instead.</li>
-  <li><kbd>B[%%]ug.comments</kbd> now also returns the <kbd>count</kbd> field
-    containing the comment ID relative to the [% terms.bug %] it belongs to.
-    This is the same comment ID as the one you can see in [% terms.bug %]
-    reports.</li>
-  <li>It is now possible to create new [% terms.bugs %] with a closed status with
-    <kbd>B[%%]ug.create</kbd>.</li>
-  <li>The <kbd>bug_status</kbd> field returned by <kbd>B[%%]ug.fields</kbd> now
-    also includes [% terms.bug %] statuses available on [% terms.bug %] creation.</li>
-  <li><kbd>B[%%]ug.fields</kbd> now also returns keyword descriptions, not only
-    their names.</li>
-  <li><kbd>B[%%]ug.fields</kbd> now also returns the <kbd>is_active</kbd> field
-    for product-specific fields.</li>
-  <li>For users in the timetracking group, <kbd>B[%%]ug.get</kbd> now also
-    returns the <kbd>actual_time</kbd> field with the total number of hours
-    spent in the [% terms.bug %].</li>
-  <li>Field names returned in the <kbd>field_name</kbd> field of the
-    <kbd>B[%%]ug.history</kbd> method have changed to be consistent with other
-    methods.</li>
-  <li>The <kbd>B[%%]ug.search</kbd> method was returning all visible [% terms.bugs %]
-    when called with no arguments, ignoring the <kbd>max_search_results</kbd>
-    and <kbd>search_allow_no_criteria</kbd> parameters. This has been fixed.</li>
-  <li><kbd>Product.get</kbd> now also returns the <kbd>flag_types</kbd> field
-    containing all the relevant data for attachment and [% terms.bug %] flag types.</li>
-  <li><kbd>Product.get</kbd> now throws an error if neither <kbd>ids</kbd> nor
-    <kbd>names</kbd> is passed to the method.</li>
-  <li>When requesting data for your own account using <kbd>User.get</kbd>,
-    this method now returns two additional fields: <kbd>saved_searches</kbd>
-    and <kbd>saved_reports</kbd> containing all your saved searches and
-    graphical and tabular reports.</li>
-  <li><kbd>User.get</kbd> now also returns the <kbd>groups</kbd> field
-    containing the list of groups the user belongs to. The list is filtered
-    based on your privileges.</li>
+  <li><kbd>B[%%]ug.search</kbd> now allows for full search functionality
+    similar to what is possible using the Advanced Query UI.</li>
+  <li>Basic support for eTag headers has been added to all WebServices
+    to allow for better network performance.</li>
+  <li>Administrators can now change a parameter that filters all email
+    addresses returned in WebService calls similar to filtering that
+    happens in the web UI.</li>
+  <li>WebService calls now support use of API keys for authentication.
+    Usernames and passwords remain supported.</li>
+  <li>Invalid or expired authentication cookies and tokens now throw
+    errors instead of being silently ignored. <kbd>User.valid_login</kbd>
+    can be used to determine if they are still valid or not.</li>
+  <li>WebService calls that are used to create and update [% terms.bugs %]
+    and attachments now support setting and updating of flags.</li>
+  <li><kbd>B[%%]ug.update_attachment</kbd> can update an attachment's
+    metadata as well as its flags.</li>
+  <li>The <kbd>product</kbd> parameter for <kbd>B[%%]ug.possible_duplicates</kbd>
+    has been renamed to <kbd>products</kbd>.</li>
+  <li>Some compatibility fields included in returned data that were marked
+    to be removed in this release are now gone.</li>
+  <li><kbd>Group.get</kbd> has been added to get information about a group and
+    its members.</li>
+  <li><kbd>FlagType.get</kbd> has been added to get information about valid
+    flag types for a given product and component.</li>
+  <li>The deprecated <kbd>B[%%]ug.get_bugs</kbd>, <kbd>B[%%]ug.get_history</kbd>
+    and <kbd>Product.get_products</kbd> methods are no longer supported.
+    They have been renamed to <kbd>B[%%]ug.get</kbd>, <kbd>B[%%]ug.history</kbd>
+    and <kbd>Product.get</kbd> respectively.</li>
 </ul>
 
-
-<h2 id="v44_issues">Outstanding Issues</h2>
-
-<ul>
-  <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=89822">
-    [%- terms.Bug %] 89822</a>: When changing multiple [% terms.bugs %] at
-    the same time, there is no "mid-air collision" protection.</li>
-  <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=276230">
-    [%- terms.Bug %] 276230</a>: The support for restricting access to
-    particular Categories of New Charts is not complete. You should treat the
-    <em>chartgroup</em> parameter as the only access mechanism available.</li>
-  <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=584742">
-    [%- terms.Bug %] 584742</a>: When viewing [% terms.abug %], WebKit-based
-    browsers can automatically reset a field's selected value when the field
-    has disabled values.</li>
-</ul>
-
-
-<h2 id="v44_upgrading">Notes On Upgrading From a Previous Version</h2>
-
-<h3>IMPORTANT: Apache Configuration Change</h3>
-
-<p>
-  For improved security, Bugzilla now prevents directory browsing
-  by default. In order to do that, the root <kbd>bugzilla/.htaccess</kbd> file
-  now contains the <kbd>Options -Indexes</kbd> directive. By default, this
-  directive is not allowed in <kbd>.htaccess</kbd> and so you must configure
-  Apache to allow it. To do that, add <kbd>Options</kbd> to the
-  <kbd>AllowOverride</kbd> directive in <kbd>httpd.conf</kbd>. This means you
-  should now have something like this:
-  <p>
-    <kbd>AllowOverride Limit FileInfo Indexes Options</kbd>
-  </p>
-  Check the
-  <a href="http://www.bugzilla.org/docs/4.4/en/html/configuration.html#http-apache">documentation</a>
-  for more information about how to configure Apache.
-</p>
-
-<h2 id="v44_code_changes">Code Changes Which May Affect Customizations and Extensions</h2>
+<h2 id="code_changes">Code Changes Which May Affect Customizations and Extensions</h2>
 
 <ul>
-  <li>The <em>usebugaliases</em> parameter has been removed. Aliases are now
-    always available.</li>
-  <li>There is a new code hook <kbd>admin_editusers_action</kbd> to alter the
-    way <kbd>editusers.cgi</kbd> works.</li>
-  <li>There is a new code hook <kbd>buglist_column_joins</kbd> to alter the way
-    tables and columns are joined in queries. In combination with the
-    <kbd>buglist_columns</kbd> hook, this permits to customize the list of
-    columns to display in buglists.</li>
-  <li>There is a new code hook <kbd>bug_start_of_update</kbd> which is called
-    after <kbd>object_end_of_update</kbd> but before <kbd>bug_end_of_update</kbd>
-    for a better control on how to update [% terms.bugs %].</li>
-  <li>There is a new code hook <kbd>bug_url_sub_classes</kbd> to support
-    additional URLs in the See Also field.</li>
-  <li>There is a new code hook <kbd>error_catch</kbd> to catch errors thrown
-    by Bugzilla and to take the appropriate actions.</li>
-  <li>There is a new code hook <kbd>path_info_whitelist</kbd> to whitelist
-    scripts which should still get the Path-Info information from URLs. By
-    default, Path-Info is now removed before being passed to CGI scripts.</li>
-  <li>It is now illegal to have a product with no components and no versions.
-    Trying to delete the last component or version of a product is now
-    rejected.</li>
-  <li>Trying to set the component, target milestone or version of [% terms.abug %]
-    to a disabled value is no longer accepted. The change will be rejected.</li>
-  <li>The comment box now checks the returned value of check_can_change_field()
-    to determine if it should be displayed or not. This means its visibility
-    can now be controlled by the <kbd>bug_check_can_change_field</kbd> hook.</li>
-  <li>Flags now checks the returned value of check_can_change_field() to
-    determine if they should appear as editable or not. This means their
-    visibility can now be controlled by the <kbd>bug_check_can_change_field</kbd>
-    hook.</li>
-  <li>Quips can no longer exceed 512 characters. Existing quips longer than
-    that are automatically truncated when upgrading.</li>
-  <li>The static <kbd>bugzilla.dtd</kbd> file has been replaced by a dynamic
-    one to take custom fields into account. The old
-    <em>&lt;urlbase&gt;/bugzilla.dtd</em> URL is now
-    <em>&lt;urlbase&gt;/page.cgi?id=bugzilla.dtd</em>.</li>
-  <li>There is a new extension located at <kbd>extensions/MoreBugUrl/</kbd>
-    which permits to add new classes of URLs in the See Also field. It uses
-    the <kbd>bug_url_sub_classes</kbd> hook mentioned above.</li>
-  <li>There is a new <kbd>B[%%]ugzilla->process_cache</kbd> method to store
-    data which should remain available for the lifetime of the worker process,
-    on mod_perl. On mod_cgi, it behaves the same way as
-    <kbd>B[%%]ugzilla->request_cache</kbd>.</li>
-  <li>In the RDF output of <kbd>config.cgi</kbd>, URIs used to identify
-    versions and target milestones have been changed to be unique across
-    products.</li>
-  <li>The RDF output of <kbd>config.cgi</kbd> now also returns data about
-    classifications.</li>
-  <li>It is now legal to call <kbd>B[%%]ugzilla::Version->check({ id => $id })</kbd>
-    and <kbd>B[%%]ugzilla::Milestone->check({ id => $id })</kbd> to validate
-    and get an object using its ID.</li>
-  <li>Rows in the <kbd>dependencies</kbd>, <kbd>flaginclusions</kbd> and
-    <kbd>flagexclusions</kbd> DB tables are now enforced to be unique.</li>
-  <li>The <kbd>b[%%]ugs_activity</kbd> and <kbd>profiles_activity</kbd> DB
-    tables now have an auto-incremented primary key named <kbd>id</kbd>.</li>
-  <li>A custom <kbd>B[%%]ugzilla.pm</kbd> module has been added into
-    <kbd>contrib/</kbd> to help packagers to package B[%%]ugzilla in their
-    Linux distros.</li>
+  <li>Support for CVS, Bonsai and LXR has been removed entirely when viewing
+    attachments. This means that the <kbd>cvsroot</kbd>, <kbd>cvsroot_get</kbd>,
+    <kbd>bonsai_url</kbd>, <kbd>lxr_url</kbd> and <kbd>lxr_root</kbd> parameters
+    are all gone, as well as <kbd>cvsbin</kbd> from the <kbd>localconfig</kbd>
+    file.</li>
+  <li>The <kbd>docs_urlbase</kbd> parameter has been removed. If documentation
+    has not been compiled locally, the "Help" links and other documentation links
+    will redirect to <a href="https://bugzilla.readthedocs.org">bugzilla.readthedocs.org</a>
+    automatically.</li>
+  <li>The <kbd>mostfreqthreshold</kbd> parameter has also been removed.</li>
+  <li>All extensions which define new public WebService methods must list them
+    in a <kbd>PUBLIC_METHODS</kbd> constant. Methods which are not listed there
+    will not be accessible remotely.</li>
+  <li><kbd>JSON::XS</kbd> is now used instead of <kbd>Data::Dumper</kbd> for
+    storage on configuration values in <kbd>data/params</kbd>. This should
+    improve performance when loading the file.</li>
+  <li>A new test has been added to check for reserved words in SQL schema.</li>
+  <li><kbd>Pod::Coverage</kbd> is now used to ensure subroutines are documented.</li>
+  <li>Bugzilla code now uses <kbd>use parent</kbd> instead of <kbd>use base</kbd>
+    in all places applicable.</li>
+  <li>A new hook called <kbd>cgi_headers</kbd> has been added to allow
+    customization of the HTTP headers returned.</li>
+  <li>A new hook called <kbd>user_check_account_creation</kbd> has been added
+    to add extra checks before accepting the creation of a new user account.</li>
 </ul>
 
 [% INCLUDE global/footer.html.tmpl %]
 
 [% BLOCK db_req %]
   [% SET m = DB_MODULE.$db %]
-  <h3 id="v40_req_[% db FILTER html %]">For [% m.name FILTER html %] Users</h3>
+  <h3 id="req_[% db FILTER html %]">For [% m.name FILTER html %] Users</h3>
 
   <ul>
     <li>[% m.name FILTER html %]
@@ -680,8 +458,8 @@
        [% '</span>' IF db_new %]
        </li>
     <li><strong>perl module:</strong>
-      [%+ m.dbd.module FILTER html %] 
-      [% '<span class="req_new">' IF dbd_new %]v[% m.dbd.version FILTER html %]
+      [%+ m.dbd.module FILTER html %]
+      [%+ '<span class="req_new">' IF dbd_new %]v[% OPTIONAL_MODULES.$module.version FILTER html %]
       [% '</span>' IF dbd_new %]</li>
   </ul>
 [% END %]
@@ -695,20 +473,22 @@
         <th>Enables Feature</th>
       [% END %]
     </tr>
-    [% FOREACH req = reqs %]
+    [% FOREACH module = reqs.keys.sort %]
+      [% NEXT IF module.match('^DBD') %]
+      [% version = reqs.$module.version %]
       <tr>
-        <td [% ' class="req_new"' IF new.contains(req.package) %]>
-          [%- req.module FILTER html %]</td> 
-        <td [% ' class="req_new"' IF updated.contains(req.package) 
-                                     OR new.contains(req.package) %]>
-          [%- IF req.version == 0 %]
+        <td [% ' class="req_new"' IF new.contains(module) %]>
+          [%- module FILTER html %]</td>
+        <td [% ' class="req_new"' IF updated.contains(module)
+                                     OR new.contains(module) %]>
+          [%- IF version == 0 %]
             (Any)
           [% ELSE %]
-            [%- req.version FILTER html %]
+            [%- version FILTER html %]
           [% END %]
         </td>
-        [% IF include_feature %] 
-          <td>[% req.feature.join(', ') FILTER html %]</td>
+        [% IF include_feature %]
+          <td>[% reqs.$module.features.join(', ') FILTER html %]</td>
         [% END %]
       </tr>
     [% END %]
diff --git a/template/en/default/reports/chart.png.tmpl b/template/en/default/reports/chart.png.tmpl
index 91944fee52..336efda2ac 100644
--- a/template/en/default/reports/chart.png.tmpl
+++ b/template/en/default/reports/chart.png.tmpl
@@ -34,12 +34,13 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_x_axis_font(Param("font_file"), 9);
-     graph.set_x_label_font(Param("font_file"), 10);
-     graph.set_y_axis_font(Param("font_file"), 9);
-     graph.set_y_label_font(Param("font_file"), 10);
-     graph.set_legend_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_x_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_x_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_y_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_y_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_legend_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/create-chart.html.tmpl b/template/en/default/reports/create-chart.html.tmpl
index eb2530aef3..533c631ed2 100644
--- a/template/en/default/reports/create-chart.html.tmpl
+++ b/template/en/default/reports/create-chart.html.tmpl
@@ -215,10 +215,10 @@ function subcatSelected() {
         <td></td>
         <td>
           <label for="datefrom"><b>Date Range</b></label>:
-          <input type="text" size="12" name="datefrom" id="datefrom"
-            value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom%]">
+          <input size="12" name="datefrom" id="datefrom" placeholder="YYYY-MM-DD"
+            value="[% time2str("%Y-%m-%d", chart.datefrom) IF chart.datefrom %]">
           <label for="dateto"><b>to</b></label>
-          <input type="text" size="12" name="dateto" id="dateto"
+          <input size="12" name="dateto" id="dateto" placeholder="YYYY-MM-DD"
             value="[% time2str("%Y-%m-%d", chart.dateto) IF chart.dateto %]">
         </td>
 
@@ -228,6 +228,12 @@ function subcatSelected() {
         </td>
       </tr>
     </table>
+    <script type="text/javascript">
+      $(function() {
+        $("#datefrom").datepicker();
+        $("#dateto").datepicker();
+      });
+    </script>
   [% ELSE %]
   <p><i>None</i></p>
   [% END %]  
diff --git a/template/en/default/reports/delete-series.html.tmpl b/template/en/default/reports/delete-series.html.tmpl
index d19178ce32..bb440c2b4a 100644
--- a/template/en/default/reports/delete-series.html.tmpl
+++ b/template/en/default/reports/delete-series.html.tmpl
@@ -21,8 +21,7 @@
 </p>
 <p>
   [% IF series.creator %]
-    This series has been created by <a href="mailto:[% series.creator.email FILTER html %]">
-    [% series.creator.email FILTER html %]</a>
+    This series has been created by [% series.creator.login FILTER html %]
   [% ELSE %]
     This series has been automatically created by Bugzilla
   [% END %]
diff --git a/template/en/default/reports/edit-series.html.tmpl b/template/en/default/reports/edit-series.html.tmpl
index ad6bb32f40..8cf1616c02 100644
--- a/template/en/default/reports/edit-series.html.tmpl
+++ b/template/en/default/reports/edit-series.html.tmpl
@@ -33,8 +33,7 @@
 <p>
   <b>Creator</b>: 
   [% IF default.creator %]
-    <a href="mailto:[% default.creator.email FILTER html %]">
-    [% default.creator.email FILTER html %]</a>
+    [% default.creator.login FILTER html %]
   [% ELSE %]
     (automatically created by Bugzilla)
   [% END %]
diff --git a/template/en/default/reports/keywords.html.tmpl b/template/en/default/reports/keywords.html.tmpl
index 598979d339..9c172ab060 100644
--- a/template/en/default/reports/keywords.html.tmpl
+++ b/template/en/default/reports/keywords.html.tmpl
@@ -19,35 +19,66 @@
   style_urls = ['skins/standard/admin.css']
 %]
 
-<table id="admin_table">
+[% show_inactive_keywords = cgi_param("show_inactive_keywords") %]
+
+<script>
+ $(document).ready(function () {
+     var show_inactive_keywords = [% show_inactive_keywords ? "true" : "false" FILTER none %];
+         link = $("#keywords_show_hide"),
+         rows = $("tr.keyword_inactive");
+
+     link.click(function (event) {
+         if (show_inactive_keywords) {
+             show_inactive_keywords = false;
+             rows.show();
+             link.html("Hide inactive keywords");
+         }
+         else {
+             show_inactive_keywords = true;
+             rows.hide();
+             link.html("Show inactive keywords");
+         }
+         event.preventDefault();
+     }).click();
+ });
+</script>
+
+<p>
+  <a href="[% urlbase FILTER html %]?show_inactive_keywords=[% show_inactive_keywords ? "1" : "0" FILTER none %]"
+     id="keywords_show_hide">[% show_inactive_keywords ? "Show" : "Hide" FILTER html %] inactive keywords</a>
+</p>
+
+<table id="admin_table" class="describe_keywords">
   <tr class="column_header">
     <th>Name</th>
     <th>Description</th>
+    <th>Active</th>
     <th>Open [% terms.Bugs %]</th>
     <th>Total [% terms.Bugs %]</th>
   </tr>
 
   [% FOREACH keyword = keywords %]
-  <tr id="[% keyword.name FILTER html %]">
-    <td>[% keyword.name FILTER html %]</td>
-    <td>[% keyword.description FILTER html_light %]</td>
-    <td class="center">
-      [% IF keyword.bug_count > 0 %]
-        <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]&amp;resolution=---">
-          Search</a>
-      [% ELSE %]
-        none
-      [% END %]
-    </td>
-    <td class="right">
-      [% IF keyword.bug_count > 0 %]
-        <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]">
-          [% keyword.bug_count %]</a>
-      [% ELSE %]
-        none
-      [% END %]
-    </td>
-  </tr>
+    <tr id="[% keyword.name FILTER html %]" class="[% keyword.is_active ? "keyword_active" : "keyword_inactive" FILTER html %]">
+      <td>[% keyword.name FILTER html %]</td>
+      <td>[% keyword.description FILTER html_light %]</td>
+      <td>[% keyword.is_active ? "Yes" : "No" FILTER html %]</td>
+      <td class="center">
+        [% IF keyword.bug_count > 0 %]
+          <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]&amp;resolution=---">
+            Search</a>
+        [% ELSE %]
+          none
+        [% END %]
+      </td>
+      <td class="right">
+        [% IF keyword.bug_count > 0 %]
+          <a href="buglist.cgi?keywords=[% keyword.name FILTER uri %]">
+            [% keyword.bug_count %]</a>
+        [% ELSE %]
+          none
+        [% END %]
+      </td>
+    </tr>
   [% END %]
 </table>
 
diff --git a/template/en/default/reports/menu.html.tmpl b/template/en/default/reports/menu.html.tmpl
index 2804dda70a..526776bbb3 100644
--- a/template/en/default/reports/menu.html.tmpl
+++ b/template/en/default/reports/menu.html.tmpl
@@ -13,7 +13,7 @@
 
 [% PROCESS global/header.html.tmpl
   title = "Reporting and Charting Kitchen"
-  doc_section = "using.html#reports-and-charts"
+  doc_section = "using/reports-and-charts.html"
   style_urls = ['skins/standard/buglist.css']
 %]
 
diff --git a/template/en/default/reports/old-charts.html.tmpl b/template/en/default/reports/old-charts.html.tmpl
index acebca74d3..a958911f46 100644
--- a/template/en/default/reports/old-charts.html.tmpl
+++ b/template/en/default/reports/old-charts.html.tmpl
@@ -15,7 +15,7 @@
   title = "$terms.Bug Charts"
   h1 = "Welcome to the $terms.Bugzilla Charting Kitchen"
   style_urls = ['skins/standard/buglist.css']
-  doc_section = "using.html#charts"
+  doc_section = "using/reports-and-charts.html#charts"
 %]
 
 [% IF url_image %]
diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl
index d879f6dd17..3f0faa5d92 100644
--- a/template/en/default/reports/report-bar.png.tmpl
+++ b/template/en/default/reports/report-bar.png.tmpl
@@ -36,12 +36,13 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_x_axis_font(Param("font_file"), 9);
-     graph.set_x_label_font(Param("font_file"), 10);
-     graph.set_y_axis_font(Param("font_file"), 9);
-     graph.set_y_label_font(Param("font_file"), 10);
-     graph.set_legend_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_x_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_x_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_y_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_y_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_legend_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl
index 585133afd4..a4baff641c 100644
--- a/template/en/default/reports/report-line.png.tmpl
+++ b/template/en/default/reports/report-line.png.tmpl
@@ -38,12 +38,13 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_x_axis_font(Param("font_file"), 9);
-     graph.set_x_label_font(Param("font_file"), 10);
-     graph.set_y_axis_font(Param("font_file"), 9);
-     graph.set_y_label_font(Param("font_file"), 10);
-     graph.set_legend_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_x_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_x_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_y_axis_font(Bugzilla.localconfig.font_file, 9);
+     graph.set_y_label_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_legend_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl
index cc2a1325ae..6808cfb772 100644
--- a/template/en/default/reports/report-pie.png.tmpl
+++ b/template/en/default/reports/report-pie.png.tmpl
@@ -20,9 +20,10 @@
   END;
 -%]
 
-[% IF Param("font_file") %]
-  [% graph.set_title_font(Param("font_file"), 10);
-     graph.set_value_font(Param("font_file"), 9);
+[% USE Bugzilla %]
+[% IF Bugzilla.localconfig.font_file %]
+  [% graph.set_title_font(Bugzilla.localconfig.font_file, 10);
+     graph.set_value_font(Bugzilla.localconfig.font_file, 9);
   %]
 [% END %]
 
diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 57e998b1d4..9027efa73a 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -15,6 +15,7 @@
   # row_names: array. List of values for the field being plotted as rows.
   # data: <depends on format>. Data to plot. Only data.$tbl is accessed. 
   # tbl: Name of a hash in data which is the table to be plotted.
+  # table_id: the incremented number of the table being displayed.
   #%]
 
 [% col_field_disp = field_descs.$col_field || col_field %]
@@ -29,177 +30,47 @@
   [% urlbase = BLOCK %][% urlbase %]&amp;[% tbl_field FILTER uri %]=[% tbl FILTER uri %][% END %]
 [% END %]
 
-<script type="text/javascript">
-function bz_encode (str, decode) {
-  // First decode HTML entities, if requested.
-  if (decode)
-    str = str.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"')
-             .replace(/&nbsp;/g, " ").replace(/&amp;/g, "&").replace(/\s+$/,"");
-
-  // encodeURIComponent() doesn't escape single quotes.
-  return encodeURIComponent(str).replace(/'/g, escape);
-};
-
-YAHOO.util.Event.addListener(window, "load", function() {
-  this.Linkify = function(elLiner, oRecord, oColumn, oData) {
-    if (oData == 0)
-      elLiner.innerHTML = ".";
-    else if (oRecord.getData("row_title") == "Total")
-      elLiner.innerHTML = '<a href="[% urlbase FILTER js %]&amp;[% col_field FILTER uri FILTER js %]='
-                          + bz_encode(oColumn.field)
-                          + '[% "&amp;" _ row_vals IF row_vals %]">' + oData + '</a>';
-    else
-      elLiner.innerHTML = '<a href="[% urlbase FILTER js %]&amp;[% row_field FILTER uri FILTER js %]='
-                          + bz_encode(oRecord.getData("row_title"), 1)
-                          + '&amp;[% col_field FILTER uri FILTER js %]='
-                          + bz_encode(oColumn.field) + '">' + oData + '</a>';
-  };
-
-  this.LinkifyTotal = function(elLiner, oRecord, oColumn, oData) {
-    if (oData == 0)
-      elLiner.innerHTML = ".";
-    else if (oRecord.getData("row_title") == "Total")
-      elLiner.innerHTML = '<a href="[% urlbase FILTER js %][% "&amp;" _ row_vals IF row_vals %]
-                          [%~ "&amp;" _ col_vals IF col_vals %]">'
-                          + oData + '</a>';
-    else
-      elLiner.innerHTML = '<a href="[% urlbase FILTER js %]&amp;[% row_field FILTER uri FILTER js %]='
-                          + bz_encode(oRecord.getData("row_title"), 1)
-                          + '[% "&amp;" _ col_vals IF col_vals %]">' + oData + '</a>';
-
-    YAHOO.util.Dom.addClass(elLiner.parentNode, "ttotal");
-  };
-
-  var totalRowFormatter = function( elTr, oRecord ) {
-      if ( oRecord.getData('row_title') == "Total" ) {
-          YAHOO.util.Dom.addClass( elTr, 'ttotal' );
-      }
-      return true;
-  };
-
-  var totalNumberSorter = function( a, b, desc, field ){
-    var a_value = a.getData(field);
-    var b_value = b.getData(field);
-    var a_total_test = a.getData("row_title");
-    var b_total_test = b.getData("row_title");
-    var comp_result = YAHOO.util.Sort.compare(a_value, b_value, desc);
-    if( a_total_test == "Total" ){
-      comp_result = 1;
-    }else if( b_total_test == "Total" ){
-      comp_result = -1;
-    }
-    return comp_result;
-  };
-
-
-  var myColumnDefs = [
-        {key:"row_title", label:"", sortable:true, sortOptions: { sortFunction:totalNumberSorter }},
-        [% FOREACH col = col_names %]
-          {key:"[% col FILTER js %]", label:"[% display_value(col_field, col) FILTER html FILTER js %]", sortable:true,
-           formatter:this.Linkify, sortOptions: { defaultDir: YAHOO.widget.DataTable.CLASS_DESC, sortFunction:totalNumberSorter }},
-        [% END %]
-        {key:"total", label:"Total", sortable:true, formatter:this.LinkifyTotal,
-         sortOptions: { defaultDir: YAHOO.widget.DataTable.CLASS_DESC, sortFunction:totalNumberSorter }}
-      ];
-  this.parseString = function(str) {
-    return YAHOO.lang.trim(str);
-  };
-
-  this.parseNumber = function(str) {
-    if (str.match(/^\s*\.\s*$/m))
-      return 0;
-
-    // Do not use <\/a>$. For some reason, IE6 doesn't understand it.
-    // We use [^\d]+$ instead.
-    var res = str.match(/>(\d+)[^\d]+$/m);
-    if (res && res[1])
-      return parseFloat(res[1]);
-  };
-
-  this.myDataSource = new YAHOO.util.DataSource(YAHOO.util.Dom.get("tabular_report_[% tbl FILTER html FILTER js %]"));
-  this.myDataSource.responseType = YAHOO.util.DataSource.TYPE_HTMLTABLE;
-  this.myDataSource.responseSchema = {
-    fields: [
-      {key:"row_title", parser:this.parseString},
-      [% FOREACH col = col_names %]
-        {key:"[% col FILTER js %]", parser:this.parseNumber},
-      [% END %]
-      {key:"total", parser:this.parseNumber}
-    ]
-  };
-  this.myDataTable = new YAHOO.widget.DataTable("tabular_report_container_
-                         [% tbl FILTER js %]", myColumnDefs, this.myDataSource, 
-                         {formatRow: totalRowFormatter});
-});
-</script>
-
 [% IF tbl_field %]
   <h2>[% tbl_disp FILTER email FILTER html %]</h2>
 [% END %]
 
-<table class="tabular_report_container">
-  <tr>
-    <td>
-    </td>
-    <td class="center">
-      <strong>[% col_field_disp FILTER html %]</strong>
-    </td>
-  </tr>
-
-  <tr>
-    <td class="middle">
-      <strong>[% row_field_disp FILTER html %]</strong>
-    </td>
-    <td>
-
-
-[% classes = [ [ "t1", "t2" ] , [ "t3", "t4" ] ] %]
-[% col_idx = 0 %]
-[% row_idx = 0 %]
 [% total_key = '-total-' %]
-<div id="tabular_report_container_[% tbl FILTER html %]">
-<table id="tabular_report_[% tbl FILTER html %]" class="tabular_report">
-  [% IF col_field %]
-    <thead>
+[%# Most of these classes are defined in the DataTables plugin itself. %]
+<table id="tabular_report_[% table_id FILTER html %]" class="tabular_report display cell-border compact">
+  <thead>
     <tr>
-      <th class="[% classes.$row_idx.$col_idx %]">
+      <th>
+        [% IF col_field %]
+          &darr;&nbsp;[% row_field_disp FILTER html %] \ [% col_field_disp FILTER html %]&nbsp;&rarr;
+        [% ELSE %]
+          [% row_field_disp FILTER html %]
+        [% END %]
       </th>
       [% FOREACH col = col_names %]
-        [% NEXT IF col == "" %]
-        
-        [% col_idx = 1 - col_idx %]
-        <th class="[% classes.$row_idx.$col_idx %]">
-          [% PROCESS value_display value = col field = col_field %]
-        </th>
+        <th>[% PROCESS value_display value = col field = col_field %]</th>
       [% END %]
-      <th class="ttotal">
-        Total
-      </th>
+      <th class="ttotal">Total</th>
     </tr>
-    </thead>
-  [% END %]
+  </thead>
   <tbody>
   [% FOREACH row = row_names %]
-    [% row_idx = 1 - row_idx %]
     <tr>
-      <td class="[% classes.$row_idx.$col_idx %] right">
+      <td class="right">
         [% PROCESS value_display value = row field = row_field %]
       </td>
       [% FOREACH col = col_names %]
         [% NEXT IF col == "" %]
-        
-        [% col_idx = 1 - col_idx %]
-        <td class="[% classes.$row_idx.$col_idx %]">
+        <td>
           [% IF data.$tbl.$col.$row AND data.$tbl.$col.$row > 0 %]
             <a href="[% urlbase %]&amp;
               [% row_field FILTER uri %]=[% row FILTER uri %]&amp;
               [% col_field FILTER uri %]=[% col FILTER uri %]">
               [% data.$tbl.$col.$row %]</a>
           [% ELSE %]
-            .
+            <span class="bz_default_hidden">0</span>
           [% END %]
         </td>
-      [% END %] 
+      [% END %]
       <td class="ttotal right">
         <a href="[% urlbase %]&amp;
           [% row_field FILTER uri %]=[% row FILTER uri %]
@@ -208,14 +79,12 @@ YAHOO.util.Event.addListener(window, "load", function() {
       </td>
     </tr>
   [% END %]
+  </tbody>
+  <tfoot>
     <tr>
-      [% row_idx = 1 - row_idx %]
-      <td class="ttotal">
-        Total
-      </td>
+      <td class="ttotal">Total</td>
       [% FOREACH col = col_names %]
         [% NEXT IF col == "" %]
-
         <td class="ttotal">
           <a href="[% urlbase %]&amp;
             [% col_field FILTER uri %]=[% col FILTER uri %]
@@ -231,13 +100,19 @@ YAHOO.util.Event.addListener(window, "load", function() {
         </strong>
       </td>
     </tr>
-  </tbody>
+  </tfoot>
 </table>
-</div>
 
-    </td>
-  </tr>
-</table>
+<script type="text/javascript">
+  $(document).ready(function() {
+    $("#tabular_report_[% table_id FILTER html %]").DataTable({
+      order: [],
+      paging: false,
+      scrollY: 600,
+      scrollCollapse: true
+    });
+  });
+</script>
 
 [% IF note_multi_select %]
   <p class="extra_info">
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index a9cd965511..9c13351e14 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -57,7 +57,8 @@
 [% PROCESS global/header.html.tmpl 
   header_addl_info = time
   style_urls = ['skins/standard/buglist.css']
-  yui = ['datatable']
+  jquery = ['datatables']
+  jquery_css = ['datatables']
 %]
 
 [% IF debug %]
@@ -75,7 +76,7 @@
     [% END %]
 
     [% IF format == "table" %]
-      [% PROCESS "reports/report-table.html.tmpl" %]
+      [% PROCESS "reports/report-table.html.tmpl" table_id = loop.count %]
     [% ELSE %]
       [% IF tbl %]
         <h2>[% tbl_disp FILTER email FILTER html %]</h2>
diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index b2b76ba0bb..fe26c53b60 100644
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -6,42 +6,16 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% USE Bugzilla %]
-[% cgi = Bugzilla.cgi %]
+[% PROCESS "global/js-products.html.tmpl" %]
 
 [% PROCESS global/header.html.tmpl
   title="Request Queue"
-  onload="var f = document.request_form; selectProduct(f.product, f.component, null, null, 'Any');"
+  generate_api_token = 1
+  onload="var f = document.request_form; selectProduct(f.product, f.component, 'Any');"
   javascript_urls=["js/productform.js", "js/field.js"]
   style_urls = ['skins/standard/buglist.css']
-  yui = ['autocomplete']
 %]
 
-<script type="text/javascript">
-  var useclassification = false; // No classification level in use
-  var first_load = true; // Is this the first time we load the page?
-  var last_sel = []; // Caches last selection
-  var cpts = new Array();
-  [% n = 1 %]
-  [% IF Param('useclassification') %]
-    [% FOREACH clas = user.get_selectable_classifications %]
-      [% FOREACH prod = user.get_selectable_products(clas.id) %]
-        [%+ PROCESS js_comp %]
-      [% END %]
-    [% END %]
-  [% ELSE %]
-    [% FOREACH prod = user.get_selectable_products %]
-      [%+ PROCESS js_comp %]
-    [% END %]
-  [% END %]
-</script>
-
-[% BLOCK js_comp %]
-  cpts['[% n %]'] = [
-    [%- FOREACH comp = prod.components %]'[% comp.name FILTER js %]'[% ", " UNLESS loop.last %] [%- END -%]];
-  [% n = n+1 %]
-[% END %]
-
 <p>
 When you are logged in, only requests made by you or addressed to you
 are shown by default.  You can change the criteria using the form below.
@@ -59,7 +33,7 @@ to some group are shown by default.
         [% INCLUDE global/userselect.html.tmpl
            id => "requester"
            name => "requester"
-           value => cgi.param('requester')
+           value => cgi_param('requester')
            size => 20
            emptyok => 1
            field_title => "Requester's email address"
@@ -71,7 +45,7 @@ to some group are shown by default.
            id       => "product"
            name     => "product"
            add      => "Any"
-           onchange => "selectProduct(this, this.form.component, null, null, 'Any');"
+           onchange => "selectProduct(this, this.form.component, 'Any');"
         %]
       </td>
       <th>Flag:</th>
@@ -79,7 +53,7 @@ to some group are shown by default.
         [% PROCESS "global/select-menu.html.tmpl"
                     name="type"
                     options=types
-                    default=cgi.param('type') %]
+                    default=cgi_param('type') %]
       </td>
 
       [%# We could let people see a "queue" of non-pending requests. %]
@@ -89,7 +63,7 @@ to some group are shown by default.
         [%# PROCESS "global/select-menu.html.tmpl"
                     name="status"
                     options=["all", "?", "+-", "+", "-"]
-                    default=cgi.param('status') %]
+                    default=cgi_param('status') %]
       </td>
       -->
 
@@ -100,7 +74,7 @@ to some group are shown by default.
         [% INCLUDE global/userselect.html.tmpl
            id => "requestee"
            name => "requestee"
-           value => cgi.param('requestee')
+           value => cgi_param('requestee')
            size => 20
            emptyok => 1
            hyphenok => 1
@@ -112,7 +86,7 @@ to some group are shown by default.
         <select name="component">
           <option value="">Any</option>
           [% FOREACH comp = components %]
-            <option value="[% comp FILTER html %]" [% "selected" IF cgi.param('component') == comp %]>
+            <option value="[% comp FILTER html %]" [% "selected" IF cgi_param('component') == comp %]>
               [% comp FILTER html %]</option>
           [% END %]
         </select>
@@ -125,7 +99,8 @@ to some group are shown by default.
             "Flag" => 'type' ,
             "Product/Component" => 'category'
           } %]
-        [% PROCESS "global/select-menu.html.tmpl" name="group" options=groups default=cgi.param('group') %]
+        [% PROCESS "global/select-menu.html.tmpl"
+                   name = "group", options = groups, default = cgi_param('group') %]
       </td>
     </tr>
     <tr>
@@ -133,7 +108,7 @@ to some group are shown by default.
       <td>
         <select id="do_union" name="do_union">
           <option value="0">Match the requester AND requestee</option>
-          <option value="1" [% 'selected="selected"' IF cgi.param('do_union') %]>
+          <option value="1" [% 'selected="selected"' IF cgi_param('do_union') %]>
             Match the requester OR requestee</option>
         </select>
       </td>
@@ -221,8 +196,9 @@ to some group are shown by default.
 
 [% BLOCK display_attachment %]
   [% IF request.attach_id %]
-    <a href="attachment.cgi?id=[% request.attach_id %]&amp;action=edit">
+    <a href="attachment.cgi?id=[% request.attach_id %]">
       [% request.attach_id %]: [%+ request.attach_summary FILTER html %]</a>
+    [<a href="attachment.cgi?id=[% request.attach_id %]&amp;action=edit">details</a>]
   [% ELSE %]
     N/A
   [% END %]
diff --git a/template/en/default/rest.html.tmpl b/template/en/default/rest.html.tmpl
index 2afd50a408..f118e5da0d 100644
--- a/template/en/default/rest.html.tmpl
+++ b/template/en/default/rest.html.tmpl
@@ -10,7 +10,7 @@
 <html>
   <head>
     <title>Bugzilla::REST::API</title>
-    <link href="[% urlbase FILTER none %][% 'skins/standard/global.css' FILTER mtime %]"
+    <link href="[% urlbase FILTER html %][% 'skins/standard/global.css' FILTER mtime %]"
           rel="stylesheet" type="text/css">
   </head>
   <body>
diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl
index bfb4e7bf1b..5e1742a5cf 100644
--- a/template/en/default/search/boolean-charts.html.tmpl
+++ b/template/en/default/search/boolean-charts.html.tmpl
@@ -35,6 +35,8 @@
   "notmatches",
   "isempty",
   "isnotempty",
+  "isactive",
+  "isnotactive",
 ] %]
 
 <div class="bz_section_title" id="custom_search_filter">
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl
index 90156238de..765ede557d 100644
--- a/template/en/default/search/field.html.tmpl
+++ b/template/en/default/search/field.html.tmpl
@@ -35,22 +35,19 @@
        types = types, 
        selected = type_selected
     %]
-    <div id="[% field.name FILTER html %]_container">
-       <input name="[% field.name FILTER html %]" 
-              id="[% field.name FILTER html %]" size="40"
-              [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
-              value="[% value FILTER html %]" [% 'autofocus' IF focus %]>
-       <div id="[% field.name FILTER html %]_autocomplete"></div>
-    </div>
-    <script type="text/javascript" defer="defer">
-      if (typeof YAHOO.bugzilla.field_array === "undefined")
-        YAHOO.bugzilla.field_array = [];
-      YAHOO.bugzilla.field_array["[% field.name FILTER js %]"] = [
+    <input name="[% field.name FILTER html %]"
+           id="[% field.name FILTER html %]" size="40"
+           class="bz_autocomplete_values"
+           [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %]
+           value="[% value FILTER html %]" [% 'autofocus' IF focus %]
+           data-values="[% field.name FILTER html %]">
+    <script type="text/javascript">
+      if (typeof BUGZILLA.autocomplete_values === 'undefined')
+        BUGZILLA.autocomplete_values = [];
+      BUGZILLA.autocomplete_values['[% field.name FILTER js %]'] = [
         [%- FOREACH val = possible_values %]
-          [%-# %]"[% val FILTER js %]"
+          [%- %]"[% val FILTER js %]"
           [%- "," IF NOT loop.last %][% END %]];
-      YAHOO.bugzilla.fieldAutocomplete.init('[% field.name FILTER js %]',
-                                            '[% field.name FILTER js %]_autocomplete');
     </script>
   [% CASE [constants.FIELD_TYPE_DATETIME, constants.FIELD_TYPE_DATE] %]
     [% INCLUDE "bug/field-label.html.tmpl"
@@ -58,34 +55,21 @@
       tag_name = "span"
       editable = 1
     %]
-    from <input name="[% field.name FILTER html %]from" 
-                id="[% field.name FILTER html %]" 
-                size="10" maxlength="10"
-                value="[% value.0 FILTER html %]" 
-                onchange="updateCalendarFromField(this);[% onchange FILTER html %]">
-         <button type="button" class="calendar_button"
-                        id="button_calendar_[% field.name FILTER html %]"
-                        onclick="showCalendar('[% field.name FILTER js %]')">
-           <span>Calendar</span>
-         </button>
-         <span id="con_calendar_[% field.name FILTER html %]"></span>               
-    to <input name="[% field.name FILTER html %]to" 
+    from <input name="[% field.name FILTER html %]from"
+                id="[% field.name FILTER html %]"
+                size="10" maxlength="10" value="[% value.0 FILTER html %]">
+    to <input name="[% field.name FILTER html %]to"
               id="[% field.name FILTER html %]to" size="10" maxlength="10"
-              value="[% value.1 FILTER html %]" 
-              onchange="updateCalendarFromField(this);[% onchange FILTER html %]">
-       <button type="button" class="calendar_button"
-                      id="button_calendar_[% field.name FILTER html %]to"
-                      onclick="showCalendar('[% field.name FILTER js %]to')">
-         <span>Calendar</span>
-       </button>
+              value="[% value.1 FILTER html %]">
     <small>(YYYY-MM-DD or relative dates)</small>
-    
-    <span id="con_calendar_[% field.name FILTER html %]to"></span>
+
     <script type="text/javascript">
-      <!--
-        [%+ PROCESS "global/calendar.js.tmpl" id = field.name %]
-        [% PROCESS "global/calendar.js.tmpl" id = field.name _ 'to' %]
-      //--></script>
+      $(function() {
+        // do not check user input as relative dates are allowed
+        $("#[% field.name FILTER html FILTER js %]").datepicker({constrainInput: false});
+        $("#[% field.name FILTER html FILTER js %]to").datepicker({constrainInput: false});
+      });
+    </script>
   [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT, 
             constants.FIELD_TYPE_MULTI_SELECT ] %]
     <div id="container_[% field.name FILTER html %]" class="search_field_grid">      
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 0420811eeb..0cddd98aea 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -74,7 +74,7 @@ TUI_hide_default('information_query');
 [% IF Param('useclassification') %]
   [% INCLUDE "search/field.html.tmpl"
         field => bug_fields.classification
-        accesskey => "c"
+        accesskey => "f"
         value => default.classification
   %]
 [% END %]
@@ -127,6 +127,10 @@ TUI_hide_default('information_query');
     { field => bug_fields.keywords, accesskey => 'k', 
       qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] }   
   ] %]
+  [% FOREACH field = custom_fields %]
+    [% freetext_fields.push({ field => field }) IF field.type == constants.FIELD_TYPE_FREETEXT or field.type == constants.FIELD_TYPE_TEXTAREA %]
+  [% END %]
+
   [% Hook.process('before_freetext_fields') %]
   
   [%# loop through a bunch of free text fields and print out their text stuff %]
@@ -215,6 +219,15 @@ TUI_hide_default('information_query');
         accesskey =>"o"
         value => default.op_sys
     %]               
+    [% FOREACH field = custom_fields %]
+      [% IF field.type == constants.FIELD_TYPE_SINGLE_SELECT or
+         field.type == constants.FIELD_TYPE_MULTI_SELECT %]
+        [% INCLUDE "search/field.html.tmpl"
+           field => field
+           value => default.${field.name}
+        %]
+      [% END %]
+    [% END %]
     [% Hook.process('after_selects_bottom') %]
   </div>
 </div>
@@ -247,7 +260,7 @@ TUI_hide_default('information_query');
       [% FOREACH qv = [
         { name => "substring", description => "contains" },
         { name => "notsubstring", description => "doesn't contain" },
-        { name => "exact", description => "is" },
+        { name => "equals", description => "is" },
         { name => "notequals", description => "is not" },
         { name => "regexp", description => "matches regexp" },
         { name => "notregexp", description => "doesn't match regexp" } ] %]
@@ -255,19 +268,11 @@ TUI_hide_default('information_query');
           [% " selected" IF default.emailtype.$n == qv.name %]>[% qv.description %]</option>
       [% END %]
       </select>
-      [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') %]
-        <div id="email[% n %]_autocomplete">
-      [% END %]
-      <input name="email[% n %]" class="email" id="email[% n %]" 
-             value="[% default.email.$n FILTER html %]">
-      [% IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') %]
-        <div id="email[% n %]_autocomplete_container"></div>
-        </div>
-        <script type="text/javascript">
-          YAHOO.bugzilla.userAutocomplete.init( "email[% n %]", 
-                    "email[% n %]_autocomplete_container");
-        </script>
-      [% END %]
+      <input
+        name="email[% n %]"
+        class="email [% "bz_autocomplete_user" IF feature_enabled('jsonrpc') && Param('ajax_user_autocompletion') %]"
+        id="email[% n %]"
+        value="[% default.email.$n FILTER html %]">
     </div>
   [% END %]
    [% Hook.process('email_numbering_end') %]
@@ -302,26 +307,18 @@ TUI_hide_default('information_query');
   <li>
     <label for="chfieldfrom">between:</label>
     <input name="chfieldfrom" id="chfieldfrom" size="10" 
-           value="[% default.chfieldfrom.0 FILTER html %]" onchange="updateCalendarFromField(this)"> 
-           <button type="button" class="calendar_button"
-                          id="button_calendar_chfieldfrom"
-                          onclick="showCalendar('chfieldfrom')"><span>Calendar</span></button>
-           and 
-           <div id="con_calendar_chfieldfrom"></div>
-          <input name="chfieldto" size="10" id="chfieldto" 
-                 value="[% default.chfieldto.0 || "Now" FILTER html %]" 
-                 onchange="updateCalendarFromField(this)">
-          <button type="button" class="calendar_button"
-                         id="button_calendar_chfieldto"
-                         onclick="showCalendar('chfieldto')"><span>Calendar</span></button>
-          <div id="con_calendar_chfieldto"></div>
+           value="[% default.chfieldfrom.0 FILTER html %]">
+    and
+    <input name="chfieldto" size="10" id="chfieldto"
+           value="[% default.chfieldto.0 || "Now" FILTER html %]">
     (YYYY-MM-DD or relative dates)
     <script type="text/javascript">
-      <!--
-        [%+ PROCESS "global/calendar.js.tmpl" id = 'chfieldfrom' %]
-        [% PROCESS "global/calendar.js.tmpl" id = 'chfieldto' %]
-      //--></script>
-  </li>    
+      $(function() {
+        $("#chfieldfrom").datepicker();
+        $("#chfieldto").datepicker();
+      });
+    </script>
+  </li>
 </ul>
 
 [%############################################################################%]
diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl
index e9e3daaf12..62332075b2 100644
--- a/template/en/default/search/knob.html.tmpl
+++ b/template/en/default/search/knob.html.tmpl
@@ -36,6 +36,8 @@
          [% ordersdesc.$order FILTER html %]</option>
   [% END %]
   </select>
+  <input type="checkbox" id="descending" name="descending" [% IF default.descending %]checked[% END %]>
+  <label for="descending">Descending</label>
 </p>
 
 <p>  
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index 7c1ca6e0aa..31385cec6d 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -26,11 +26,12 @@ function remove_token() {
 
 [% PROCESS global/header.html.tmpl
   title = "Search for $terms.bugs"
-  yui = [ 'autocomplete', 'calendar' ]
+  generate_api_token = 1
   javascript = javascript
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js"]
   style_urls = ['skins/standard/buglist.css']
-  doc_section = "using.html#searching-for-bugs"
+  doc_section = "using/finding.html"
+  yui = ['connection']
 %]
 
 [% WRAPPER search/tabs.html.tmpl %]
diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl
index 9f89000da8..87be44f8cb 100644
--- a/template/en/default/search/search-create-series.html.tmpl
+++ b/template/en/default/search/search-create-series.html.tmpl
@@ -19,11 +19,10 @@
 [% PROCESS global/header.html.tmpl 
   title = "Create New Data Set"
   onload = "doOnSelectProduct(0);"
-  yui = [ 'autocomplete', 'calendar' ]
   javascript = js_data 
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
   style_urls = ['skins/standard/buglist.css']
-  doc_section = "using.html#creating-new-data-sets"
+  doc_section = "using/reports-and-charts.html#creating-charts"
 %]
 
 <form method="get" action="chart.cgi" name="chartform">
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index f1b77985d7..4f882ea0e5 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -18,11 +18,10 @@ var queryform = "reportform"
 [% PROCESS global/header.html.tmpl
   title = "Generate Graphical Report"
   onload = "doOnSelectProduct(0); chartTypeChanged()"
-  yui = [ 'autocomplete', 'calendar' ]
   javascript = js_data
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
   style_urls = ['skins/standard/buglist.css']
-  doc_section = "using.html#reports"
+  doc_section = "using/reports-and-charts.html#reports"
 %]
 
 [% PROCESS "search/search-report-select.html.tmpl" %]
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index 0db9871f96..09a8b18b8e 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -18,11 +18,10 @@ var queryform = "reportform"
 [% PROCESS global/header.html.tmpl
   title = "Generate Tabular Report"
   onload = "doOnSelectProduct(0)"
-  yui = [ 'autocomplete', 'calendar' ]
   javascript = js_data
   javascript_urls = [ "js/util.js", "js/TUI.js", "js/field.js" ]
   style_urls = ['skins/standard/buglist.css']
-  doc_section = "using.html#reports"
+  doc_section = "using/reports-and-charts.html#reports"
 %]
 
 [% PROCESS "search/search-report-select.html.tmpl" %]
diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 701925e5e1..af61ce52f8 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -9,6 +9,7 @@
 [% PROCESS global/header.html.tmpl 
   title = "Simple Search"
   style_urls = ['skins/standard/buglist.css']
+  doc_section = "using/finding.html"
 %]
 
 [% WRAPPER search/tabs.html.tmpl %]
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index 6de588e6d0..0a19f47888 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -16,15 +16,24 @@
 # Please keep the strings in alphabetical order by their name.
 
 %strings = (
-    any  => 'any',
-    apachectl_failed => <<END,
+  all_optional_features_require =>
+    'All optional features above require the following modules to be found:',
+  any              => 'any',
+  apachectl_failed => <<END,
 WARNING: We could not check the configuration of Apache. This sometimes
 happens when you are not running checksetup.pl as ##root##. To see the
 problem we ran into, run: ##command##
 END
-    bad_executable => 'not a valid executable: ##bin##',
-    blacklisted => '(blacklisted)',
-    bz_schema_exists_before_220 => <<'END',
+  bad_executable => 'not a valid executable: ##bin##',
+  bad_font_file  => <<'END',
+The file ##file## cannot be found. Make sure you typed the full path to the file
+END
+  bad_font_file_name => <<'END',
+The file ##file## must point to a TrueType or OpenType font file
+(its extension must be .ttf or .otf).
+END
+  blocklisted                 => '(blocklisted)',
+  bz_schema_exists_before_220 => <<'END',
 You are upgrading from a version before 2.20, but the bz_schema table
 already exists. This means that you restored a mysqldump into the Bugzilla
 database without first dropping the already-existing Bugzilla database,
@@ -36,34 +45,31 @@ END
 can connect to your MySQL database and drop the bz_schema table, as a last
 resort.
 END
-    checking_for => 'Checking for',
-    checking_dbd      => 'Checking available perl DBD modules...',
-    checking_optional => 'The following Perl modules are optional:',
-    checking_modules  => 'Checking perl modules...',
-    chmod_failed      => '##path##: Failed to change permissions: ##error##',
-    chown_failed      => '##path##: Failed to change ownership: ##error##',
-    commands_dbd      => <<EOT,
+  checking_for => 'Checking for',
+  chmod_failed => '##path##: Failed to change permissions: ##error##',
+  chown_failed => '##path##: Failed to change ownership: ##error##',
+  commands_dbd => <<EOT,
 YOU MUST RUN ONE OF THE FOLLOWING COMMANDS (depending on which database
 you use):
 EOT
-    commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:',
-    commands_required => <<EOT,
+  commands_optional => 'COMMANDS TO INSTALL OPTIONAL MODULES:',
+  commands_required => <<EOT,
 COMMANDS TO INSTALL REQUIRED MODULES (You *must* run all these commands
 and then re-run checksetup.pl):
 EOT
-    continue_without_answers => <<'END',
+  continue_without_answers => <<'END',
 Re-run checksetup.pl in interactive mode (without an 'answers' file)
 to continue.
 END
-    cpan_bugzilla_home => 
-        "WARNING: Using the Bugzilla directory as the CPAN home.",
-    db_enum_setup  => "Setting up choices for standard drop-down fields:",
-    db_schema_init => "Initializing bz_schema...",
-    db_table_new   => "Adding new table ##table##...",
-    db_table_setup => "Creating tables...",
-    done => 'done.',
-    enter_or_ctrl_c => "Press Enter to continue or Ctrl-C to exit...",
-    error_localconfig_read => <<'END',
+  cpanfile_created   => "##file## created",
+  cpan_bugzilla_home => "WARNING: Using the Bugzilla directory as the CPAN home.",
+  db_enum_setup      => "Setting up choices for standard drop-down fields:",
+  db_schema_init     => "Initializing bz_schema...",
+  db_table_new       => "Adding new table ##table##...",
+  db_table_setup     => "Creating tables...",
+  done               => 'done.',
+  enter_or_ctrl_c    => "Press Enter to continue or Ctrl-C to exit...",
+  error_localconfig_read => <<'END',
 An error has occurred while reading the ##localconfig## file.  The text of
 the error message is:
 
@@ -76,62 +82,24 @@ END
   $ mv -f localconfig localconfig.old
   $ ./checksetup.pl
 END
-    extension_must_return_name => <<END,
+  extension_must_return_name => <<END,
 ##file## returned ##returned##, which is not a valid name for an extension.
 Extensions must return their name, not <code>1</code> or a number. See
 the documentation of Bugzilla::Extension for details.
 END
-    feature_auth_ldap         => 'LDAP Authentication',
-    feature_auth_radius       => 'RADIUS Authentication',
-    feature_graphical_reports => 'Graphical Reports',
-    feature_html_desc         => 'More HTML in Product/Group Descriptions',
-    feature_inbound_email     => 'Inbound Email',
-    feature_jobqueue          => 'Mail Queueing',
-    feature_jsonrpc           => 'JSON-RPC Interface',
-    feature_new_charts        => 'New Charts',
-    feature_old_charts        => 'Old Charts',
-    feature_memcached         => 'Memcached Support',
-    feature_mod_perl          => 'mod_perl',
-    feature_moving            => 'Move Bugs Between Installations',
-    feature_patch_viewer      => 'Patch Viewer',
-    feature_rest              => 'REST Interface',
-    feature_smtp_auth         => 'SMTP Authentication',
-    feature_smtp_ssl          => 'SSL Support for SMTP',
-    feature_updates           => 'Automatic Update Notifications',
-    feature_xmlrpc            => 'XML-RPC Interface',
-    feature_detect_charset    => 'Automatic charset detection for text attachments',
-    feature_typesniffer       => 'Sniff MIME type of attachments',
-    feature_markdown          => 'Markdown syntax support for comments',
-
-    file_remove => 'Removing ##name##...',
-    file_rename => 'Renaming ##from## to ##to##...',
-    header => "* This is Bugzilla ##bz_ver## on perl ##perl_ver##\n"
-            . "* Running on ##os_name## ##os_ver##",
-    install_all => <<EOT,
-
-To attempt an automatic install of every required and optional module
-with one command, do:
-
-  ##perl## install-module.pl --all
-
-EOT
-    install_data_too_long => <<EOT,
+  file_remove => 'Removing ##name##...',
+  file_rename => 'Renaming ##from## to ##to##...',
+  header      => "* This is Bugzilla ##bz_ver## on perl ##perl_ver##\n"
+    . "* Running on ##os_name## ##os_ver##",
+  installation_failed => '*** Installation aborted. Read the messages above. ***',
+  install_data_too_long => <<EOT,
 WARNING: Some of the data in the ##table##.##column## column is longer than
 its new length limit of ##max_length## characters. The data that needs to be
 fixed is printed below with the value of the ##id_column## column first and
 then the value of the ##column## column that needs to be fixed:
 
 EOT
-    install_module => 'Installing ##module## version ##version##...',
-    installation_failed => '*** Installation aborted. Read the messages above. ***',
-    install_no_compiler => <<END,
-ERROR: Using install-module.pl requires that you install a compiler, such as
-gcc.
-END
-    install_no_make => <<END,
-ERROR: Using install-module.pl requires that you install "make".
-END
-    lc_new_vars => <<'END',
+  lc_new_vars => <<'END',
 This version of Bugzilla contains some variables that you may want to
 change and adapt to your local settings. The following variables are
 new to ##localconfig## since you last ran checksetup.pl:
@@ -141,11 +109,11 @@ END
 Please edit the file ##localconfig## and then re-run checksetup.pl
 to complete your installation.
 END
-    lc_old_vars => <<'END',
+  lc_old_vars => <<'END',
 The following variables are no longer used in ##localconfig##, and
 have been moved to ##old_file##: ##vars##
 END
-    localconfig_create_htaccess => <<'END',
+  localconfig_create_htaccess => <<'END',
 If you are using Apache as your web server, Bugzilla can create .htaccess
 files for you, which will keep this file (localconfig) and other
 confidential files from being read over the web.
@@ -155,66 +123,81 @@ END
 
 If this is set to 0, checksetup.pl will not create .htaccess files.
 END
-    localconfig_db_check => <<'END',
+  localconfig_db_check => <<'END',
 Should checksetup.pl try to verify that your database setup is correct?
 With some combinations of database servers/Perl modules/moonphase this
 doesn't work, and so you can try setting this to 0 to make checksetup.pl
 run.
 END
-    localconfig_db_driver => <<'END',
+  localconfig_db_from_env => <<'END',
+If this is set, the other db_* values will be ignored and instead the $DATABASE_URL
+will be used to provide the database connection information.
+Note this requires the 'db_from_env' feature to be enabled.
+END
+  localconfig_db_driver => <<'END',
 What SQL database to use. Default is mysql. List of supported databases
 can be obtained by listing Bugzilla/DB directory - every module corresponds
 to one supported database and the name of the module (before ".pm")
 corresponds to a valid value for this variable.
 END
-    localconfig_db_host => <<'END',
+  localconfig_db_host => <<'END',
 The DNS name or IP address of the host that the database server runs on.
 END
-    localconfig_db_name => <<'END',
+  localconfig_db_name => <<'END',
 The name of the database. For Oracle, this is the database's SID. For
 SQLite, this is a name (or path) for the DB file.
+For postgres, this database must already exist and be writable by $db_user.
 END
-    localconfig_db_pass => <<'END',
+  localconfig_db_pass => <<'END',
 Enter your database password here. It's normally advisable to specify
 a password for your bugzilla database user.
 If you use apostrophe (') or a backslash (\) in your password, you'll
 need to escape it by preceding it with a '\' character. (\') or (\)
 (It is far simpler to just not use those characters.)
 END
-    localconfig_db_port => <<'END',
+  localconfig_db_port => <<'END',
 Sometimes the database server is running on a non-standard port. If that's
 the case for your database server, set this to the port number that your
 database server is running on. Setting this to 0 means "use the default
 port for my database server."
 END
-    localconfig_db_sock => <<'END',
+  localconfig_db_sock => <<'END',
 MySQL Only: Enter a path to the unix socket for MySQL. If this is
 blank, then MySQL's compiled-in default will be used. You probably
 want that.
 END
-    localconfig_db_user => "Who we connect to the database as.",
-    localconfig_db_mysql_ssl_ca_file => <<'END',
+  localconfig_db_user              => "Who we connect to the database as.",
+  localconfig_db_mysql_ssl_ca_file => <<'END',
 Path to a PEM file with a list of trusted SSL CA certificates.
 The file must be readable by web server user.
 END
-    localconfig_db_mysql_ssl_ca_path => <<'END',
+  localconfig_db_mysql_ssl_ca_path => <<'END',
 Path to a directory containing trusted SSL CA certificates in PEM format.
 Directory and files inside must be readable by the web server user.
 END
-    localconfig_db_mysql_ssl_client_cert => <<'END',
+  localconfig_db_mysql_ssl_client_cert => <<'END',
 Full path to the client SSL certificate in PEM format we will present to the DB server.
 The file must be readable by web server user.
 END
-    localconfig_db_mysql_ssl_client_key => <<'END',
+  localconfig_db_mysql_ssl_client_key => <<'END',
 Full path to the private key corresponding to the client SSL certificate.
 The file must not be password-protected and must be readable by web server user.
 END
-    localconfig_diffpath => <<'END',
+  localconfig_diffpath => <<'END',
 For the "Difference Between Two Patches" feature to work, we need to know
 what directory the "diff" bin is in. (You only need to set this if you
 are using that feature of the Patch Viewer.)
 END
-    localconfig_index_html => <<'END',
+  localconfig_font_file => <<'END',
+You can specify the full path to a TrueType or OpenType font file, which will
+be used to display text (labels, legends, ...) in charts and graphical reports.
+To support as many languages as possible, we recommend to specify a font such as
+Unifont (http://unifoundry.com/unifont.html), which supports all printable
+characters in the Basic Multilingual Plane. If you leave this parameter empty,
+a default font will be used, but its support is limited to English characters
+only and so other characters will be displayed incorrectly.
+END
+  localconfig_index_html => <<'END',
 Most web servers will allow you to use index.cgi as a directory
 index, and many come preconfigured that way, but if yours doesn't
 then you'll need an index.html file that provides redirection
@@ -224,19 +207,19 @@ END
       wish to have checksetup.pl create one for you, you must
       make sure that index.html doesn't already exist.
 END
-    localconfig_interdiffbin => <<'END',
+  localconfig_interdiffbin => <<'END',
 If you want to use the "Difference Between Two Patches" feature of the
 Patch Viewer, please specify the full path to the "interdiff" executable
 here.
 END
-    localconfig_site_wide_secret => <<'END',
+  localconfig_site_wide_secret => <<'END',
 This secret key is used by your installation for the creation and
 validation of encrypted tokens. These tokens are used to implement
 security features in Bugzilla, to protect against certain types of attacks.
 A random string is generated by default. It's very important that this key
 is kept secret. It also must be very long.
 END
-    localconfig_use_suexec => <<'END',
+  localconfig_use_suexec => <<'END',
 Set this to 1 if Bugzilla runs in an Apache SuexecUserGroup environment.
 
 If your web server runs control panel software (cPanel, Plesk or similar),
@@ -251,7 +234,22 @@ END
 If set to 1, checksetup.pl will set file permissions so that Bugzilla
 works in a SuexecUserGroup environment. 
 END
-    localconfig_webservergroup => <<'END',
+  localconfig_webdotbase => <<'END',
+It is possible to show graphs of dependent bugs. You may set this parameter to
+any of the following:
+
+- A complete file path to 'dot' (part of GraphViz (http://www.graphviz.org/))
+  will generate the graphs locally.
+- A URL prefix pointing to an installation of the webdot package will generate
+  the graphs remotely. (append "/%urlbase%" to the URL prefix)
+- A blank value will disable dependency graphing.
+
+If you use a webdot URL prefix, make certain that the webdot server can read
+files from your webdot directory. On Apache you do this by editing the
+.htaccess file, for other systems the needed measures may vary. You can run
+checksetup.pl to recreate the .htaccess file if it has been lost.
+END
+  localconfig_webservergroup => <<'END',
 The name of the group that your web server runs as. On Red Hat
 distributions, this is usually "apache". On Debian/Ubuntu, it is 
 usually "www-data".
@@ -271,30 +269,37 @@ END
 If you set this to anything other than "", you will need to run checksetup.pl
 as ##root## or as a user who is a member of the specified group.
 END
-    max_allowed_packet => <<EOT,
+  localconfig_apache_size_limit => <<EOT,
+This is the max amount of unshared memory the apache process is allowed to use
+before Apache::SizeLimit kills it. This is only applicable when run under mod_perl.
+EOT
+  max_allowed_packet => <<EOT,
 WARNING: You need to set the max_allowed_packet parameter in your MySQL
 configuration to at least ##needed##. Currently it is set to ##current##.
 You can set this parameter in the [mysqld] section of your MySQL
 configuration file.
 EOT
-    min_version_required => "Minimum version required: ",
+  min_version_required => "Minimum version required: ",
 
 # Note: When translating these "modules" messages, don't change the formatting
-# if possible, because there is hardcoded formatting in 
+# if possible, because there is hardcoded formatting in
 # Bugzilla::Install::Requirements to match the box formatting.
-    modules_message_apache => <<END,
+  modules_message_apache => <<END,
 ***********************************************************************
 * APACHE MODULES                                                      *
 ***********************************************************************
-* Normally, when Bugzilla is upgraded, all Bugzilla users have to     *
-* clear their browser cache or Bugzilla will break. If you enable     *
-* certain modules in your Apache configuration (usually called        *
-* httpd.conf or apache2.conf) then your users will not have to clear  *
-* their caches when you upgrade Bugzilla. The modules you need to     *
-* enable are:                                                         *
+* Some Apache modules allow to extend Bugzilla functionalities.       *
+* These modules can be enabled in the Apache configuration file       *
+* (usually called httpd.conf or apache2.conf).                        *
+* - mod_headers, mod_env and mod_expires permit to automatically      *
+*   refresh the browser cache of your users when upgrading Bugzilla.  *
+* - mod_rewrite permits to write shorter URLs used by the REST API.   *
+* - mod_version permits to write rules in .htaccess specific to       *
+*   Apache 2.2 or 2.4.                                                *
+* The modules you need to enable are:                                 *
 *                                                                     *
 END
-    modules_message_db => <<EOT,
+  modules_message_db => <<EOT,
 ***********************************************************************
 * DATABASE ACCESS                                                     *
 ***********************************************************************
@@ -303,7 +308,7 @@ END
 * running. See below for the correct command to run to install the    *
 * appropriate module for your database.                               *
 EOT
-    modules_message_optional => <<EOT,
+  modules_message_optional => <<EOT,
 ***********************************************************************
 * OPTIONAL MODULES                                                    *
 ***********************************************************************
@@ -315,7 +320,7 @@ END
 * with the name of the feature they enable. Below that table are the  *
 * commands to install each module.                                    *
 EOT
-    modules_message_required => <<EOT,
+  modules_message_required => <<EOT,
 ***********************************************************************
 * REQUIRED MODULES                                                    *
 ***********************************************************************
@@ -324,23 +329,23 @@ END
 * See below for commands to install these modules.                    *
 EOT
 
-    module_found => "found v##ver##",
-    module_not_found => "not found",
-    module_ok => 'ok',
-    module_unknown_version => "found unknown version",
-    no_such_module => "There is no Perl module on CPAN named ##module##.",
-    mysql_innodb_disabled => <<'END',
+  module_found           => "found v##ver##",
+  module_not_found       => "not found",
+  module_ok              => 'ok',
+  module_unknown_version => "found unknown version",
+  no_such_module         => "There is no Perl module on CPAN named ##module##.",
+  mysql_innodb_disabled  => <<'END',
 InnoDB is disabled in your MySQL installation.
 Bugzilla requires InnoDB to be enabled.
 Please enable it and then re-run checksetup.pl.
 END
-    mysql_index_renaming => <<'END',
+  mysql_index_renaming => <<'END',
 We are about to rename old indexes. The estimated time to complete
 renaming is ##minutes## minutes. You cannot interrupt this action once
 it has begun. If you would like to cancel, press Ctrl-C now...
 (Waiting 45 seconds...)
 END
-    mysql_utf8_conversion => <<'END',
+  mysql_utf8_conversion => <<'END',
 WARNING: We are about to convert your table storage format to UTF-8. This
          allows Bugzilla to correctly store and sort international characters.
          However, if you have any non-UTF-8 data in your database,
@@ -355,7 +360,7 @@ END
          If you ever used a version of Bugzilla before 2.22, we STRONGLY
          recommend that you stop checksetup.pl NOW and run contrib/recode.pl.
 END
-    no_checksetup_from_cgi => <<END,
+  no_checksetup_from_cgi => <<END,
 <!DOCTYPE html>
 <html>
   <head>
@@ -379,49 +384,49 @@ END
   </body>
 </html>
 END
-    patchutils_missing => <<'END',
+  patchutils_missing => <<'END',
 OPTIONAL NOTE: If you want to be able to use the 'difference between two
 patches' feature of Bugzilla (which requires the PatchReader Perl module
 as well), you should install patchutils from:
 
     http://cyberelk.net/tim/software/patchutils/
 END
-    template_precompile   => "Precompiling templates...",
-    template_removal_failed => <<END,
+  template_precompile     => "Precompiling templates...",
+  template_removal_failed => <<END,
 WARNING: The directory '##template_cache##' could not be removed.
          It has been moved into '##deleteme##', which should be
          deleted manually to conserve disk space.
 END
-    template_removing_dir => "Removing existing compiled templates...",
-    update_cf_invalid_name => 
-        "Removing custom field '##field##', because it has an invalid name...",
-    update_flags_bad_name => <<'END',
+  template_removing_dir => "Removing existing compiled templates...",
+  update_cf_invalid_name =>
+    "Removing custom field '##field##', because it has an invalid name...",
+  update_flags_bad_name => <<'END',
 "##flag##" is not a valid name for a flag. Rename it to not have any spaces
 or commas.
 END
-    update_nomail_bad => <<'END',
+  update_nomail_bad => <<'END',
 WARNING: The following users were listed in ##data##/nomail, but do
 not have an account here. The unmatched entries have been moved to 
 ##data##/nomail.bad:
 END
-    update_summary_truncate_comment => 
-        "The original value of the Summary field was longer than 255"
-        . " characters, and so it was truncated during an upgrade."
-        . " The original summary was:\n\n##summary##",
-    update_summary_truncated => <<'END',
+  update_summary_truncate_comment =>
+    "The original value of the Summary field was longer than 255"
+    . " characters, and so it was truncated during an upgrade."
+    . " The original summary was:\n\n##summary##",
+  update_summary_truncated => <<'END',
 WARNING: Some of your bugs had summaries longer than 255 characters.
 They have had their original summary copied into a comment, and then
 the summary was truncated to 255 characters. The affected bug numbers were:
 END
-    update_quips => <<'END',
+  update_quips => <<'END',
 Quips are now stored in the database, rather than in an external file.
 The quips previously stored in ##data##/comments have been copied into
 the database, and that file has been renamed to ##data##/comments.bak
 You may delete the renamed file once you have confirmed that all your
 quips were moved successfully.
 END
-    update_queries_to_tags => "Populating the new 'tag' table:",
-    webdot_bad_htaccess => <<END,
+  update_queries_to_tags => "Populating the new 'tag' table:",
+  webdot_bad_htaccess    => <<END,
 WARNING: Dependency graph images are not accessible.
 Delete ##dir##/.htaccess and re-run checksetup.pl.
 END
diff --git a/template/en/default/welcome-admin.html.tmpl b/template/en/default/welcome-admin.html.tmpl
index a9b30f68a7..5b586a0157 100644
--- a/template/en/default/welcome-admin.html.tmpl
+++ b/template/en/default/welcome-admin.html.tmpl
@@ -36,9 +36,6 @@
     reason you see this page: as long as this parameter is not set, you will see this
     page again and again).</li>
 
-    <li><a href="editparams.cgi?section=core#cookiepath_desc">cookiepath</a> is important
-    for your browser to manage your cookies correctly.</li>
-
     <li><a href="editparams.cgi?section=general#maintainer_desc">maintainer</a>,
       the person responsible for this installation if something is
       running wrongly.</li>
diff --git a/template/en/default/whine/multipart-mime.txt.tmpl b/template/en/default/whine/header.txt.tmpl
similarity index 52%
rename from template/en/default/whine/multipart-mime.txt.tmpl
rename to template/en/default/whine/header.txt.tmpl
index d28f4cea60..4067964f2a 100644
--- a/template/en/default/whine/multipart-mime.txt.tmpl
+++ b/template/en/default/whine/header.txt.tmpl
@@ -8,10 +8,6 @@
 
 [%# INTERFACE:
   # subject: subject line of message
-  # alternatives: array of hashes containing:
-  #     type: MIME type
-  #     content: verbatim content
-  # boundary: a string that has been generated to be a unique boundary
   # recipient: user object for the intended recipient of the message
   # from: Bugzilla system email address
   #%]
@@ -19,21 +15,5 @@
 From: [% from %]
 To: [% recipient.email %]
 Subject: [[% terms.Bugzilla %]] [% subject %]
-MIME-Version: 1.0
-Content-Type: multipart/alternative; boundary="[% boundary %]"
 X-Bugzilla-Type: whine
 
-
-This is a MIME multipart message.  It is possible that your mail program
-doesn't quite handle these properly.  Some or all of the information in this
-message may be unreadable.
-
-
-[% FOREACH part=alternatives %]
-
---[% boundary %]
-Content-type: [% part.type +%]
-
-[%+ part.content %]
-[%+ END %]
---[% boundary %]--
diff --git a/template/en/default/whine/schedule.html.tmpl b/template/en/default/whine/schedule.html.tmpl
index a421d928f3..a513d9a331 100644
--- a/template/en/default/whine/schedule.html.tmpl
+++ b/template/en/default/whine/schedule.html.tmpl
@@ -23,7 +23,7 @@
 [% PROCESS global/header.html.tmpl
   title = title
   style_urls = ['skins/standard/admin.css']
-  doc_section = "using.html#whining"
+  doc_section = "using/index.html"
 %]
 
 <p>
diff --git a/testagent.cgi b/testagent.cgi
index d9d5afd1a0..c70c907791 100755
--- a/testagent.cgi
+++ b/testagent.cgi
@@ -10,10 +10,11 @@
 # are being run instead of shown. This script does not rely on database access
 # or correct params.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
 say "content-type:text/plain\n";
-say "OK " . ($::ENV{MOD_PERL} || "mod_cgi");
-exit;
+
+print 'OK ';
+say $ENV{BZ_PLACK} || $ENV{MOD_PERL} || 'mod_cgi';
diff --git a/testserver.pl b/testserver.pl
index 2ab48f3751..3f21ebe7a4 100755
--- a/testserver.pl
+++ b/testserver.pl
@@ -10,11 +10,11 @@
 # as its only argument.  It attempts to troubleshoot as many installation
 # issues as possible.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -26,62 +26,62 @@
 
 eval "require LWP; require LWP::UserAgent;";
 my $lwp = $@ ? 0 : 1;
+eval "require LWP::Protocol::https;";
+my $lwpssl = $@ ? 0 : 1;
 
-if ((@ARGV != 1) || ($ARGV[0] !~ /^https?:/i))
-{
-    say "Usage: $0 <URL to this Bugzilla installation>";
-    say "e.g.:  $0 http://www.mycompany.com/bugzilla";
-    exit(1);
+if ((@ARGV != 1) || ($ARGV[0] !~ /^https?:/i)) {
+  say "Usage: $0 <URL to this Bugzilla installation>";
+  say "e.g.:  $0 http://www.mycompany.com/bugzilla";
+  exit(1);
 }
 
 
 # Try to determine the GID used by the web server.
-my @pscmds = ('ps -eo comm,gid', 'ps -acxo command,gid', 'ps -acxo command,rgid');
+my @pscmds
+  = ('ps -eo comm,gid', 'ps -acxo command,gid', 'ps -acxo command,rgid');
 my $sgid = 0;
 if (!ON_WINDOWS) {
-    foreach my $pscmd (@pscmds) {
-        open PH, "$pscmd 2>/dev/null |";
-        while (my $line = <PH>) {
-            if ($line =~ /^(?:\S*\/)?(?:httpd|apache?)2?\s+(\d+)$/) {
-                $sgid = $1 if $1 > $sgid;
-            }
-        }
-        close(PH);
+  foreach my $pscmd (@pscmds) {
+    open PH, '-|', "$pscmd 2>/dev/null";
+    while (my $line = <PH>) {
+      if ($line =~ /^(?:\S*\/)?(?:httpd|apache?)2?\s+(\d+)$/) {
+        $sgid = $1 if $1 > $sgid;
+      }
     }
+    close(PH);
+  }
 }
 
 # Determine the numeric GID of $webservergroup
-my $webgroupnum = 0;
+my $webgroupnum    = 0;
 my $webservergroup = Bugzilla->localconfig->{webservergroup};
 if ($webservergroup =~ /^(\d+)$/) {
-    $webgroupnum = $1;
+  $webgroupnum = $1;
 }
 else {
-    eval { $webgroupnum = (getgrnam $webservergroup) || 0; };
+  eval { $webgroupnum = (getgrnam $webservergroup) || 0; };
 }
 
 # Check $webservergroup against the server's GID
 if ($sgid > 0) {
-    if ($webservergroup eq "") {
-        say 
-"WARNING \$webservergroup is set to an empty string.
+  if ($webservergroup eq "") {
+    say "WARNING \$webservergroup is set to an empty string.
 That is a very insecure practice. Please refer to the
 Bugzilla documentation.";
-    }
-    elsif ($webgroupnum == $sgid || Bugzilla->localconfig->{use_suexec}) {
-        say "TEST-OK Webserver is running under group id in \$webservergroup.";
-    }
-    else {
-        say 
-"TEST-WARNING Webserver is running under group id not matching \$webservergroup.
+  }
+  elsif ($webgroupnum == $sgid || Bugzilla->localconfig->{use_suexec}) {
+    say "TEST-OK Webserver is running under group id in \$webservergroup.";
+  }
+  else {
+    say
+      "TEST-WARNING Webserver is running under group id not matching \$webservergroup.
 This if the tests below fail, this is probably the problem.
 Please refer to the web server configuration section of the Bugzilla guide. 
 If you are using virtual hosts or suexec, this warning may not apply.";
-    }
+  }
 }
 elsif (!ON_WINDOWS) {
-   say
-"TEST-WARNING Failed to find the GID for the 'httpd' process, unable
+  say "TEST-WARNING Failed to find the GID for the 'httpd' process, unable
 to validate webservergroup.";
 }
 
@@ -90,196 +90,209 @@
 $ARGV[0] =~ s/\/$//;
 my $url = $ARGV[0] . "/images/padlock.png";
 if (fetch($url)) {
-    say "TEST-OK Got padlock picture.";
-} else {
-    say 
-"TEST-FAILED Fetch of images/padlock.png failed
+  say "TEST-OK Got padlock picture.";
+}
+else {
+  say "TEST-FAILED Fetch of images/padlock.png failed
 Your web server could not fetch $url.
 Check your web server configuration and try again.";
-    exit(1);
+  exit(1);
 }
 
 # Try to execute a cgi script
 my $response = clean_text(fetch($ARGV[0] . "/testagent.cgi"));
 if ($response =~ /^OK (.*)$/) {
-    say "TEST-OK Webserver is executing CGIs via $1.";
-} elsif ($response =~ /^#!/) {
-    say
-"TEST-FAILED Webserver is fetching rather than executing CGI files.
+  say "TEST-OK Webserver is executing CGIs via $1.";
+}
+elsif ($response =~ /^#!/) {
+  say "TEST-FAILED Webserver is fetching rather than executing CGI files.
 Check the AddHandler statement in your httpd.conf file.";
-    exit(1);
-} else {
-    say "TEST-FAILED Webserver is not executing CGI files.";
+  exit(1);
+}
+else {
+  say "TEST-FAILED Webserver is not executing CGI files.";
 }
 
 # Make sure that the web server is honoring .htaccess files
 my $localconfig = bz_locations()->{'localconfig'};
 $localconfig =~ s~^\./~~;
-$url = $ARGV[0] . "/$localconfig";
+$url      = $ARGV[0] . "/$localconfig";
 $response = fetch($url);
 if ($response) {
-    say
-"TEST-FAILED Webserver is permitting fetch of $url.
+  say "TEST-FAILED Webserver is permitting fetch of $url.
 This is a serious security problem.
 Check your web server configuration.";
-    exit(1);
-} else {
-    say "TEST-OK Webserver is preventing fetch of $url.";
+  exit(1);
+}
+else {
+  say "TEST-OK Webserver is preventing fetch of $url.";
 }
 
 # Test chart generation
 eval 'use GD';
 if ($@ eq '') {
-    undef $/;
-
-    # Ensure major versions of GD and libgd match
-    # Windows's GD module include libgd.dll, guaranteed to match
-    if (!ON_WINDOWS) {
-        my $gdlib = `gdlib-config --version 2>&1` || "";
-        $gdlib =~ s/\n$//;
-        if (!$gdlib) {
-            say "TEST-WARNING Failed to run gdlib-config; can't compare " .
-                  "GD versions.";
-        }
-        else {
-            my $gd = $GD::VERSION;
-    
-            my $verstring = "GD version $gd, libgd version $gdlib";
-    
-            $gdlib =~ s/^([^\.]+)\..*/$1/;
-            $gd =~ s/^([^\.]+)\..*/$1/;
-    
-            if ($gdlib == $gd) {
-                say "TEST-OK $verstring; Major versions match.";
-            } else {
-                say "TEST-FAILED $verstring; Major versions do not match.";
-            }
-        }
+  undef $/;
+
+  # Ensure major versions of GD and libgd match
+  # Windows's GD module include libgd.dll, guaranteed to match
+  if (!ON_WINDOWS) {
+    my $gdlib = `gdlib-config --version 2>&1` || "";
+    $gdlib =~ s/\n$//;
+    if (!$gdlib) {
+      say "TEST-WARNING Failed to run gdlib-config; can't compare " . "GD versions.";
+    }
+    else {
+      my $gd = $GD::VERSION;
+
+      my $verstring = "GD version $gd, libgd version $gdlib";
+
+      $gdlib =~ s/^([^\.]+)\..*/$1/;
+      $gd =~ s/^([^\.]+)\..*/$1/;
+
+      if ($gdlib == $gd) {
+        say "TEST-OK $verstring; Major versions match.";
+      }
+      else {
+        say "TEST-FAILED $verstring; Major versions do not match.";
+      }
     }
+  }
 
-    # Test GD
+  # Test GD
+  eval {
+    my $image = new GD::Image(100, 100);
+    my $black = $image->colorAllocate(0,   0,   0);
+    my $white = $image->colorAllocate(255, 255, 255);
+    my $red   = $image->colorAllocate(255, 0,   0);
+    my $blue  = $image->colorAllocate(0,   0,   255);
+    $image->transparent($white);
+    $image->rectangle(0, 0, 99, 99, $black);
+    $image->arc(50, 50, 95, 75, 0, 360, $blue);
+    $image->fill(50, 50, $red);
+
+    if ($image->can('png')) {
+      create_file("$datadir/testgd-local.png", $image->png);
+      check_image("$datadir/testgd-local.png", 'GD');
+    }
+    else {
+      say "TEST-FAILED GD doesn't support PNG generation.";
+    }
+  };
+  if ($@ ne '') {
+    say "TEST-FAILED GD returned: $@";
+  }
+
+  # Test Chart
+  eval 'use Chart::Lines';
+  if ($@) {
+    say "TEST-FAILED Chart::Lines is not installed.";
+  }
+  else {
     eval {
-        my $image = new GD::Image(100, 100);
-        my $black = $image->colorAllocate(0, 0, 0);
-        my $white = $image->colorAllocate(255, 255, 255);
-        my $red = $image->colorAllocate(255, 0, 0);
-        my $blue = $image->colorAllocate(0, 0, 255);
-        $image->transparent($white);
-        $image->rectangle(0, 0, 99, 99, $black);
-        $image->arc(50, 50, 95, 75, 0, 360, $blue);
-        $image->fill(50, 50, $red);
-
-        if ($image->can('png')) {
-            create_file("$datadir/testgd-local.png", $image->png);
-            check_image("$datadir/testgd-local.png", 'GD');
-        } else {
-            say "TEST-FAILED GD doesn't support PNG generation.";
-        }
+      my $chart = Chart::Lines->new(400, 400);
+
+      $chart->add_pt('foo', 30, 25);
+      $chart->add_pt('bar', 16, 32);
+
+      $chart->png("$datadir/testchart-local.png");
+      check_image("$datadir/testchart-local.png", "Chart");
     };
     if ($@ ne '') {
-        say "TEST-FAILED GD returned: $@";
+      say "TEST-FAILED Chart returned: $@";
     }
+  }
 
-    # Test Chart
-    eval 'use Chart::Lines';
-    if ($@) {
-        say "TEST-FAILED Chart::Lines is not installed.";
-    } else {
-        eval {
-            my $chart = Chart::Lines->new(400, 400);
-
-            $chart->add_pt('foo', 30, 25);
-            $chart->add_pt('bar', 16, 32);
-
-            $chart->png("$datadir/testchart-local.png");
-            check_image("$datadir/testchart-local.png", "Chart");
-        };
-        if ($@ ne '') {
-            say "TEST-FAILED Chart returned: $@";
-        }
-    }
+  eval 'use Template::Plugin::GD::Image';
+  if ($@) {
+    say "TEST-FAILED Template::Plugin::GD is not installed.";
+  }
+  else {
+    say "TEST-OK Template::Plugin::GD is installed.";
+  }
+}
 
-    eval 'use Template::Plugin::GD::Image';
-    if ($@) {
-        say "TEST-FAILED Template::Plugin::GD is not installed.";
+sub fetch {
+  my $url = shift;
+  my $rtn;
+  if ($lwp) {
+    if ($url =~ /^https:/i && !$lwpssl) {
+      die("You need LWP::Protocol::https installed to use https with testserver.pl");
     }
     else {
-        say "TEST-OK Template::Plugin::GD is installed.";
+      my $req = HTTP::Request->new(GET => $url);
+      my $ua  = LWP::UserAgent->new;
+      my $res = $ua->request($req);
+      $rtn = ($res->is_success ? $res->content : undef);
+    }
+  }
+  elsif ($url =~ /^https:/i) {
+    die(
+      "You need LWP (and LWP::Protocol::https, for LWP 6.02 or newer) installed to use https with testserver.pl"
+    );
+  }
+  else {
+    my ($host, $port, $file) = ('', 80, '');
+    if ($url =~ m#^http://([^:]+):(\d+)(/.*)#i) {
+      ($host, $port, $file) = ($1, $2, $3);
+    }
+    elsif ($url =~ m#^http://([^/]+)(/.*)#i) {
+      ($host, $file) = ($1, $2);
+    }
+    else {
+      die("Cannot parse url");
     }
-}
 
-sub fetch {
-    my $url = shift;
-    my $rtn;
-    if ($lwp) {
-        my $req = HTTP::Request->new(GET => $url);
-        my $ua = LWP::UserAgent->new;
-        my $res = $ua->request($req);
-        $rtn = ($res->is_success ? $res->content : undef);
-    } elsif ($url =~ /^https:/i) {
-        die("You need LWP installed to use https with testserver.pl");
-    } else {
-        my($host, $port, $file) = ('', 80, '');
-        if ($url =~ m#^http://([^:]+):(\d+)(/.*)#i) {
-            ($host, $port, $file) = ($1, $2, $3);
-        } elsif ($url =~ m#^http://([^/]+)(/.*)#i) {
-            ($host, $file) = ($1, $2);
-        } else {
-            die("Cannot parse url");
-        }
-
-        my $proto = getprotobyname('tcp');
-        socket(SOCK, PF_INET, SOCK_STREAM, $proto);
-        my $sin = sockaddr_in($port, inet_aton($host));
-        if (connect(SOCK, $sin)) {
-            binmode SOCK;
-            select((select(SOCK), $| = 1)[0]);
-
-            # get content
-            print SOCK "GET $file HTTP/1.0\015\012host: $host:$port\015\012\015\012";
-            my $header = '';
-            while (defined(my $line = <SOCK>)) {
-                last if $line eq "\015\012";
-                $header .= $line;
-            }
-            my $content = '';
-            while (defined(my $line = <SOCK>)) {
-                $content .= $line;
-            }
-
-            my ($status) = $header =~ m#^HTTP/\d+\.\d+ (\d+)#;
-            $rtn = (($status =~ /^2\d\d/) ? $content : undef);
-        }
+    my $proto = getprotobyname('tcp');
+    socket(SOCK, PF_INET, SOCK_STREAM, $proto);
+    my $sin = sockaddr_in($port, inet_aton($host));
+    if (connect(SOCK, $sin)) {
+      binmode SOCK;
+      select((select(SOCK), $| = 1)[0]);
+
+      # get content
+      print SOCK "GET $file HTTP/1.0\015\012host: $host:$port\015\012\015\012";
+      my $header = '';
+      while (defined(my $line = <SOCK>)) {
+        last if $line eq "\015\012";
+        $header .= $line;
+      }
+      my $content = '';
+      while (defined(my $line = <SOCK>)) {
+        $content .= $line;
+      }
+
+      my ($status) = $header =~ m#^HTTP/\d+\.\d+ (\d+)#;
+      $rtn = (($status =~ /^2\d\d/) ? $content : undef);
     }
-    return($rtn);
+  }
+  return ($rtn);
 }
 
 sub check_image {
-    my ($local_file, $library) = @_;
-    my $filedata = read_file($local_file);
-    if ($filedata =~ /^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A/) {
-        say "TEST-OK $library library generated a good PNG image.";
-        unlink $local_file;
-    } else {
-        say "TEST-WARNING $library library did not generate a good PNG.";
-    }
+  my ($local_file, $library) = @_;
+  my $filedata = read_file($local_file);
+  if ($filedata =~ /^\x89\x50\x4E\x47\x0D\x0A\x1A\x0A/) {
+    say "TEST-OK $library library generated a good PNG image.";
+    unlink $local_file;
+  }
+  else {
+    say "TEST-WARNING $library library did not generate a good PNG.";
+  }
 }
 
 sub create_file {
-    my ($filename, $content) = @_;
-    open(FH, ">$filename")
-        or die "Failed to create $filename: $!\n";
-    binmode FH;
-    print FH $content;
-    close FH;
+  my ($filename, $content) = @_;
+  open(FH, ">", $filename) or die "Failed to create $filename: $!\n";
+  binmode FH;
+  print FH $content;
+  close FH;
 }
 
 sub read_file {
-    my ($filename) = @_;
-    open(FH, $filename)
-        or die "Failed to open $filename: $!\n";
-    binmode FH;
-    my $content = <FH>;
-    close FH;
-    return $content;
+  my ($filename) = @_;
+  open(FH, '<', $filename) or die "Failed to open $filename: $!\n";
+  binmode FH;
+  my $content = <FH>;
+  close FH;
+  return $content;
 }
diff --git a/token.cgi b/token.cgi
index 830ecfccb9..0feb74a05f 100755
--- a/token.cgi
+++ b/token.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
@@ -22,12 +22,12 @@ use Bugzilla::User;
 use Date::Format;
 use Date::Parse;
 
-local our $cgi = Bugzilla->cgi;
+local our $cgi      = Bugzilla->cgi;
 local our $template = Bugzilla->template;
-local our $vars = {};
+local our $vars     = {};
 
 my $action = $cgi->param('a');
-my $token = $cgi->param('t');
+my $token  = $cgi->param('t');
 
 Bugzilla->login(LOGIN_OPTIONAL);
 
@@ -41,66 +41,66 @@ my ($user_id, $date, $data, $tokentype) = Bugzilla::Token::GetTokenData($token);
 # Requesting a new password is the single action which doesn't require a token.
 # XXX Ideally, these checks should be done inside the subroutines themselves.
 unless ($action eq 'reqpw') {
-    $tokentype || ThrowUserError("token_does_not_exist");
-
-    # Make sure the token is the correct type for the action being taken.
-    # The { user_error => 'wrong_token_for_*' } trick is to make 012throwables.t happy.
-    my $error = {};
-    if (grep($action eq $_ , qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password') {
-        $error = { user_error => 'wrong_token_for_changing_passwd' };
-    }
-    elsif ($action eq 'cxlem'
-           && ($tokentype ne 'emailold' && $tokentype ne 'emailnew'))
-    {
-        $error = { user_error => 'wrong_token_for_cancelling_email_change' };
-    }
-    elsif (grep($action eq $_ , qw(cfmem chgem)) && $tokentype ne 'emailnew') {
-        $error = { user_error => 'wrong_token_for_confirming_email_change' };
-    }
-    elsif ($action =~ /^(request|confirm|cancel)_new_account$/
-           && $tokentype ne 'account')
-    {
-        $error = { user_error => 'wrong_token_for_creating_account' };
-    }
-
-    if (my $user_error = $error->{user_error}) {
-        Bugzilla::Token::Cancel($token, $user_error);
-        ThrowUserError($user_error);
-    }
+  $tokentype || ThrowUserError("token_does_not_exist");
+
+# Make sure the token is the correct type for the action being taken.
+# The { user_error => 'wrong_token_for_*' } trick is to make 012throwables.t happy.
+  my $error = {};
+  if (grep($action eq $_, qw(cfmpw cxlpw chgpw)) && $tokentype ne 'password') {
+    $error = {user_error => 'wrong_token_for_changing_passwd'};
+  }
+  elsif ($action eq 'cxlem'
+    && ($tokentype ne 'emailold' && $tokentype ne 'emailnew'))
+  {
+    $error = {user_error => 'wrong_token_for_cancelling_email_change'};
+  }
+  elsif (grep($action eq $_, qw(cfmem chgem)) && $tokentype ne 'emailnew') {
+    $error = {user_error => 'wrong_token_for_confirming_email_change'};
+  }
+  elsif ($action =~ /^(request|confirm|cancel)_new_account$/
+    && $tokentype ne 'account')
+  {
+    $error = {user_error => 'wrong_token_for_creating_account'};
+  }
+
+  if (my $user_error = $error->{user_error}) {
+    Bugzilla::Token::Cancel($token, $user_error);
+    ThrowUserError($user_error);
+  }
 }
 
 if ($action eq 'reqpw') {
-    requestChangePassword();
+  requestChangePassword();
 }
 elsif ($action eq 'cfmpw') {
-    confirmChangePassword($token);
+  confirmChangePassword($token);
 }
 elsif ($action eq 'cxlpw') {
-    cancelChangePassword($token);
+  cancelChangePassword($token);
 }
 elsif ($action eq 'chgpw') {
-    changePassword($user_id, $token);
+  changePassword($user_id, $token);
 }
 elsif ($action eq 'cfmem') {
-    confirmChangeEmail($token);
+  confirmChangeEmail($token);
 }
 elsif ($action eq 'cxlem') {
-    cancelChangeEmail($user_id, $data, $tokentype, $token);
+  cancelChangeEmail($user_id, $data, $tokentype, $token);
 }
 elsif ($action eq 'chgem') {
-    changeEmail($user_id, $data, $token);
+  changeEmail($user_id, $data, $token);
 }
 elsif ($action eq 'request_new_account') {
-    request_create_account($date, $data, $token);
+  request_create_account($date, $data, $token);
 }
 elsif ($action eq 'confirm_new_account') {
-    confirm_create_account($data, $token);
+  confirm_create_account($data, $token);
 }
 elsif ($action eq 'cancel_new_account') {
-    cancel_create_account($data, $token);
+  cancel_create_account($data, $token);
 }
 else {
-    ThrowUserError('unknown_action', {action => $action});
+  ThrowUserError('unknown_action', {action => $action});
 }
 
 exit;
@@ -113,235 +113,256 @@ exit;
 # their login name and it exists in the database, and that the DB module is in
 # the list of allowed verification methods.
 sub requestChangePassword {
-    # check verification methods
-    Bugzilla->user->authorizer->can_change_password
-      || ThrowUserError("password_change_requests_not_allowed");
 
-    # Check the hash token to make sure this user actually submitted
-    # the forgotten password form.
-    my $token = $cgi->param('token');
-    check_hash_token($token, ['reqpw']);
+  # check verification methods
+  Bugzilla->user->authorizer->can_change_password
+    || ThrowUserError("password_change_requests_not_allowed");
 
-    my $login_name = $cgi->param('loginname')
-      or ThrowUserError("login_needed_for_password_change");
+  # Check the hash token to make sure this user actually submitted
+  # the forgotten password form.
+  my $token = $cgi->param('token');
+  check_hash_token($token, ['reqpw']);
 
-    check_email_syntax($login_name);
-    my $user = new Bugzilla::User({ name => $login_name });
+  my $email = $cgi->param('email')
+    or ThrowUserError("email_needed_for_password_change");
 
-    # Make sure the user account is active.
-    if ($user && !$user->is_enabled) {
-        ThrowUserError('account_disabled',
-                       {disabled_reason => get_text('account_disabled', {account => $login_name})});
-    }
+  my $userid = email_to_id($email, 'throw_error_if_not_exist');
+  my $user = new Bugzilla::User($userid);
+
+  # Make sure the user account is active.
+  if (!$user->is_enabled) {
+    ThrowUserError('account_disabled',
+      {disabled_reason => get_text('account_disabled', {email => $email})});
+  }
 
-    Bugzilla::Token::IssuePasswordToken($user) if $user;
+  Bugzilla::Token::IssuePasswordToken($user);
 
-    $vars->{'message'} = "password_change_request";
-    $vars->{'login_name'} = $login_name;
+  $vars->{'message'} = "password_change_request";
+  $vars->{'email'}   = $email;
 
-    print $cgi->header();
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub confirmChangePassword {
-    my $token = shift;
-    $vars->{'token'} = $token;
+  my $token = shift;
+  $vars->{'token'} = $token;
 
-    print $cgi->header();
-    $template->process("account/password/set-forgotten-password.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("account/password/set-forgotten-password.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub cancelChangePassword {
-    my $token = shift;
-    $vars->{'message'} = "password_change_canceled";
-    Bugzilla::Token::Cancel($token, $vars->{'message'});
+  my $token = shift;
+  $vars->{'message'} = "password_change_canceled";
+  Bugzilla::Token::Cancel($token, $vars->{'message'});
 
-    print $cgi->header();
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 # If the user is changing their password, make sure they submitted a new
 # password and that the new password is valid.
 sub changePassword {
-    my ($user_id, $token) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($user_id, $token) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    my $password = $cgi->param('password');
-    (defined $password && defined $cgi->param('matchpassword'))
-      || ThrowUserError("require_new_password");
+  my $password = $cgi->param('password');
+  (defined $password && defined $cgi->param('matchpassword'))
+    || ThrowUserError("require_new_password");
 
-    validate_password($password, $cgi->param('matchpassword'));
-    # Make sure that these never show up in the UI under any circumstances.
-    $cgi->delete('password', 'matchpassword');
+  validate_password($password, $cgi->param('matchpassword'));
 
-    my $user = Bugzilla::User->check({ id => $user_id });
-    $user->set_password($password);
-    $user->update();
-    delete_token($token);
-    $dbh->do(q{DELETE FROM tokens WHERE userid = ?
-               AND tokentype = 'password'}, undef, $user_id);
+  # Make sure that these never show up in the UI under any circumstances.
+  $cgi->delete('password', 'matchpassword');
 
-    Bugzilla->logout_user_by_id($user_id);
+  my $user = Bugzilla::User->check({id => $user_id});
+  $user->set_password($password);
+  $user->update();
+  delete_token($token);
+  $dbh->do(
+    q{DELETE FROM tokens WHERE userid = ?
+               AND tokentype = 'password'}, undef, $user_id
+  );
 
-    $vars->{'message'} = "password_changed";
+  Bugzilla->logout_user_by_id($user_id);
 
-    print $cgi->header();
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $vars->{'message'} = "password_changed";
+
+  print $cgi->header();
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub confirmChangeEmail {
-    my $token = shift;
-    $vars->{'token'} = $token;
+  my $token = shift;
+  $vars->{'token'} = $token;
 
-    print $cgi->header();
-    $template->process("account/email/confirm.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process("account/email/confirm.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub changeEmail {
-    my ($userid, $eventdata, $token) = @_;
-    my $dbh = Bugzilla->dbh;
-    my ($old_email, $new_email) = split(/:/,$eventdata);
-
-    $dbh->bz_start_transaction();
-    
-    my $user = Bugzilla::User->check({ id => $userid });
-    my $realpassword = $user->cryptpassword;
-    my $cgipassword  = $cgi->param('password');
-
-    # Make sure the user who wants to change the email address
-    # is the real account owner.
-    if (bz_crypt($cgipassword, $realpassword) ne $realpassword) {
-        ThrowUserError("old_password_incorrect");
-    }
-
-    # The new email address should be available as this was 
-    # confirmed initially so cancel token if it is not still available
-    if (! is_available_username($new_email,$old_email)) {
-        $vars->{'email'} = $new_email; # Needed for Bugzilla::Token::Cancel's mail
-        Bugzilla::Token::Cancel($token, "account_exists", $vars);
-        ThrowUserError("account_exists", { email => $new_email } );
-    } 
-
-    # Update the user's login name in the profiles table.
-    $user->set_login($new_email);
-    $user->update({ keep_session => 1, keep_tokens => 1 });
-    delete_token($token);
-    $dbh->do(q{DELETE FROM tokens WHERE userid = ?
-               AND tokentype = 'emailnew'}, undef, $userid);
-
-    $dbh->bz_commit_transaction();
-
-    # Return HTTP response headers.
-    print $cgi->header();
-
-    # Let the user know their email address has been changed.
-    $vars->{'message'} = "login_changed";
-
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  my ($userid, $eventdata, $token) = @_;
+  my $dbh = Bugzilla->dbh;
+  my ($old_email, $new_email) = split(/:/, $eventdata);
+
+  $dbh->bz_start_transaction();
+
+  my $user = Bugzilla::User->check({id => $userid});
+  my $cgipassword = $cgi->param('password');
+
+  # Make sure the user who wants to change the email address
+  # is the real account owner.
+  $user->check_current_password($cgipassword);
+
+  # The new email address should be available as this was
+  # confirmed initially so cancel token if it is not still available
+  if (!is_available_email($new_email, $old_email)) {
+    $vars->{'email'} = $new_email;    # Needed for Bugzilla::Token::Cancel's mail
+    Bugzilla::Token::Cancel($token, "account_exists", $vars);
+    ThrowUserError("account_exists", {email => $new_email});
+  }
+
+  # Update the user's email address in the profiles table.
+  $user->set_email($new_email);
+  $user->update({keep_session => 1, keep_tokens => 1});
+  delete_token($token);
+  $dbh->do(
+    q{DELETE FROM tokens WHERE userid = ?
+               AND tokentype = 'emailnew'}, undef, $userid
+  );
+
+  $dbh->bz_commit_transaction();
+
+  # Return HTTP response headers.
+  print $cgi->header();
+
+  # Let the user know their email address has been changed.
+  $vars->{'message'} = "login_changed";
+
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub cancelChangeEmail {
-    my ($userid, $eventdata, $tokentype, $token) = @_;
-    my $dbh = Bugzilla->dbh;
+  my ($userid, $eventdata, $tokentype, $token) = @_;
+  my $dbh = Bugzilla->dbh;
 
-    $dbh->bz_start_transaction();
+  $dbh->bz_start_transaction();
 
-    my ($old_email, $new_email) = split(/:/,$eventdata);
+  my ($old_email, $new_email) = split(/:/, $eventdata);
 
-    if ($tokentype eq "emailold") {
-        $vars->{'message'} = "emailold_change_canceled";
-        my $user = Bugzilla::User->check({ id => $userid });
+  if ($tokentype eq "emailold") {
+    $vars->{'message'} = "emailold_change_canceled";
+    my $user = Bugzilla::User->check({id => $userid});
 
-        # check to see if it has been altered
-        if ($user->login ne $old_email) {
-            $user->set_login($old_email);
-            $user->update({ keep_tokens => 1 });
+    # check to see if it has been altered
+    if ($user->email ne $old_email) {
+      $user->set_email($old_email);
+      $user->update({keep_tokens => 1});
 
-            $vars->{'message'} = "email_change_canceled_reinstated";
-        } 
-    } 
-    else {
-        $vars->{'message'} = 'email_change_canceled'
-     }
+      $vars->{'message'} = "email_change_canceled_reinstated";
+    }
+  }
+  else {
+    $vars->{'message'} = 'email_change_canceled';
+  }
 
-    $vars->{'old_email'} = $old_email;
-    $vars->{'new_email'} = $new_email;
-    Bugzilla::Token::Cancel($token, $vars->{'message'}, $vars);
+  $vars->{'old_email'} = $old_email;
+  $vars->{'new_email'} = $new_email;
+  Bugzilla::Token::Cancel($token, $vars->{'message'}, $vars);
 
-    $dbh->do(q{DELETE FROM tokens WHERE userid = ?
-               AND tokentype = 'emailold' OR tokentype = 'emailnew'},
-             undef, $userid);
+  $dbh->do(
+    q{DELETE FROM tokens WHERE userid = ?
+               AND tokentype = 'emailold' OR tokentype = 'emailnew'}, undef, $userid
+  );
 
-    $dbh->bz_commit_transaction();
+  $dbh->bz_commit_transaction();
 
-    # Return HTTP response headers.
-    print $cgi->header();
+  # Return HTTP response headers.
+  print $cgi->header();
 
-    $template->process("global/message.html.tmpl", $vars)
-      || ThrowTemplateError($template->error());
+  $template->process("global/message.html.tmpl", $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub request_create_account {
-    my ($date, $login_name, $token) = @_;
+  my ($date, $data, $token) = @_;
+
+  Bugzilla->user->check_account_creation_enabled;
 
-    Bugzilla->user->check_account_creation_enabled;
+  # Be careful! Some logins may contain ":" in them.
+  my ($email, $login) = split(':', $data, 2);
+  $vars = {
+    token => $token,
+    login => $login,
+    email => $email,
 
-    $vars->{'token'} = $token;
-    $vars->{'email'} = $login_name . Bugzilla->params->{'emailsuffix'};
-    $vars->{'expiration_ts'} = ctime(str2time($date) + MAX_TOKEN_AGE * 86400);
+    # Make sure nobody else chose this login meanwhile.
+    login_already_in_use => login_to_id($login) ? 1 : 0,
+    expiration_ts => ctime(str2time($date) + MAX_TOKEN_AGE * 86400)
+  };
 
-    print $cgi->header();
-    $template->process('account/email/confirm-new.html.tmpl', $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process('account/email/confirm-new.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub confirm_create_account {
-    my ($login_name, $token) = @_;
+  my ($data, $token) = @_;
+
+  Bugzilla->user->check_account_creation_enabled;
 
-    Bugzilla->user->check_account_creation_enabled;
+  my $password = $cgi->param('passwd1') || '';
+  validate_password($password, $cgi->param('passwd2') || '');
 
-    my $password = $cgi->param('passwd1') || '';
-    validate_password($password, $cgi->param('passwd2') || '');
-    # Make sure that these never show up anywhere in the UI.
-    $cgi->delete('passwd1', 'passwd2');
+  # Make sure that these never show up anywhere in the UI.
+  $cgi->delete('passwd1', 'passwd2');
 
-    my $otheruser = Bugzilla::User->create({
-        login_name => $login_name, 
-        realname   => scalar $cgi->param('realname'),
-        cryptpassword => $password});
+  # Be careful! Some logins may contain ":" in them.
+  my ($email, $login) = split(':', $data, 2);
+  $login = $cgi->param('login') if login_to_id($login);
 
-    # Now delete this token.
-    delete_token($token);
+  my $otheruser = Bugzilla::User->create({
+    login_name    => $login,
+    email         => $email,
+    realname      => scalar $cgi->param('realname'),
+    cryptpassword => $password
+  });
 
-    # Let the user know that their user account has been successfully created.
-    $vars->{'message'} = 'account_created';
-    $vars->{'otheruser'} = $otheruser;
+  # Now delete this token.
+  delete_token($token);
 
-    # Log in the new user using credentials they just gave.
-    $cgi->param('Bugzilla_login', $otheruser->login);
-    $cgi->param('Bugzilla_password', $password);
-    Bugzilla->login(LOGIN_OPTIONAL);
+  # Let the user know that their user account has been successfully created.
+  $vars->{'message'}   = 'account_created';
+  $vars->{'otheruser'} = $otheruser;
 
-    print $cgi->header();
+  # Log in the new user using credentials they just gave.
+  $cgi->param('Bugzilla_login',    $otheruser->login);
+  $cgi->param('Bugzilla_password', $password);
+  Bugzilla->login(LOGIN_OPTIONAL);
 
-    $template->process('index.html.tmpl', $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+
+  $template->process('index.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
 
 sub cancel_create_account {
-    my ($login_name, $token) = @_;
+  my ($data, $token) = @_;
+
+  $vars->{'message'} = 'account_creation_canceled';
 
-    $vars->{'message'} = 'account_creation_canceled';
-    $vars->{'account'} = $login_name;
-    Bugzilla::Token::Cancel($token, $vars->{'message'});
+  # Be careful! Some logins may contain ":" in them.
+  ($vars->{'email'}, $vars->{'login'}) = split(':', $data, 2);
+  Bugzilla::Token::Cancel($token, $vars->{'message'});
 
-    print $cgi->header();
-    $template->process('global/message.html.tmpl', $vars)
-      || ThrowTemplateError($template->error());
+  print $cgi->header();
+  $template->process('global/message.html.tmpl', $vars)
+    || ThrowTemplateError($template->error());
 }
diff --git a/userprefs.cgi b/userprefs.cgi
index 1f5f625f7c..c9a3a16565 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -6,11 +6,11 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::BugMail;
@@ -28,536 +28,569 @@ my $template = Bugzilla->template;
 local our $vars = {};
 
 ###############################################################################
-# Each panel has two functions - panel Foo has a DoFoo, to get the data 
-# necessary for displaying the panel, and a SaveFoo, to save the panel's 
-# contents from the form data (if appropriate). 
-# SaveFoo may be called before DoFoo.    
+# Each panel has two functions - panel Foo has a DoFoo, to get the data
+# necessary for displaying the panel, and a SaveFoo, to save the panel's
+# contents from the form data (if appropriate).
+# SaveFoo may be called before DoFoo.
 ###############################################################################
 sub DoAccount {
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    $vars->{'realname'} = $user->name;
-
-    if (Bugzilla->params->{'allowemailchange'}
-        && $user->authorizer->can_change_email)
-    {
-       # First delete old tokens.
-       Bugzilla::Token::CleanTokenTable();
-
-        my @token = $dbh->selectrow_array(
-            "SELECT tokentype, " .
-                    $dbh->sql_date_math('issuedate', '+', MAX_TOKEN_AGE, 'DAY')
-                    . ", eventdata
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  if (Bugzilla->params->{'allowemailchange'}
+    && $user->authorizer->can_change_email)
+  {
+    # First delete old tokens.
+    Bugzilla::Token::CleanTokenTable();
+
+    my @token = $dbh->selectrow_array(
+          "SELECT tokentype, "
+        . $dbh->sql_date_math('issuedate', '+', MAX_TOKEN_AGE, 'DAY')
+        . ", eventdata
                FROM tokens
               WHERE userid = ?
                 AND tokentype LIKE 'email%'
-           ORDER BY tokentype ASC " . $dbh->sql_limit(1), undef, $user->id);
-        if (scalar(@token) > 0) {
-            my ($tokentype, $change_date, $eventdata) = @token;
-            $vars->{'login_change_date'} = $change_date;
-
-            if($tokentype eq 'emailnew') {
-                my ($oldemail,$newemail) = split(/:/,$eventdata);
-                $vars->{'new_login_name'} = $newemail;
-            }
-        }
+           ORDER BY tokentype ASC " . $dbh->sql_limit(1), undef, $user->id
+    );
+    if (scalar(@token) > 0) {
+      my ($tokentype, $change_date, $eventdata) = @token;
+      $vars->{'email_change_date'} = $change_date;
+
+      if ($tokentype eq 'emailnew') {
+        my ($oldemail, $newemail) = split(/:/, $eventdata);
+        $vars->{'new_email'} = $newemail;
+      }
     }
+  }
 }
 
 sub SaveAccount {
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    
-    $dbh->bz_start_transaction;
+  my $cgi = Bugzilla->cgi;
+  my $dbh = Bugzilla->dbh;
 
-    my $user = Bugzilla->user;
+  $dbh->bz_start_transaction;
 
-    my $oldpassword = $cgi->param('old_password');
-    my $pwd1 = $cgi->param('new_password1');
-    my $pwd2 = $cgi->param('new_password2');
-    my $new_login_name = trim($cgi->param('new_login_name'));
-
-    if ($user->authorizer->can_change_password
-        && ($oldpassword ne "" || $pwd1 ne "" || $pwd2 ne ""))
-    {
-        my $oldcryptedpwd = $user->cryptpassword;
-        $oldcryptedpwd || ThrowCodeError("unable_to_retrieve_password");
-
-        if (bz_crypt($oldpassword, $oldcryptedpwd) ne $oldcryptedpwd) {
-            ThrowUserError("old_password_incorrect");
-        }
+  my $user = Bugzilla->user;
 
-        if ($pwd1 ne "" || $pwd2 ne "") {
-            $pwd1 || ThrowUserError("new_password_missing");
-            validate_password($pwd1, $pwd2);
+  my $oldpassword = $cgi->param('old_password');
+  my $verified_password;
+  my $pwd1      = $cgi->param('new_password1');
+  my $pwd2      = $cgi->param('new_password2');
+  my $new_login = clean_text(scalar $cgi->param('new_login'));
+  my $new_email = clean_text(scalar $cgi->param('new_email'));
 
-            if ($oldpassword ne $pwd1) {
-                $user->set_password($pwd1);
-                # Invalidate all logins except for the current one
-                Bugzilla->logout(LOGOUT_KEEP_CURRENT);
-            }
-        }
-    }
+  if ($user->authorizer->can_change_password && ($pwd1 ne "" || $pwd2 ne "")) {
+    $user->check_current_password($oldpassword);
+    $verified_password = 1;
 
-    if ($user->authorizer->can_change_email
-        && Bugzilla->params->{"allowemailchange"}
-        && $new_login_name)
-    {
-        if ($user->login ne $new_login_name) {
-            $oldpassword || ThrowUserError("old_password_required");
+    $pwd1 || ThrowUserError("new_password_missing");
+    validate_password($pwd1, $pwd2);
 
-            # Block multiple email changes for the same user.
-            if (Bugzilla::Token::HasEmailChangeToken($user->id)) {
-                ThrowUserError("email_change_in_progress");
-            }
+    if ($oldpassword ne $pwd1) {
+      $user->set_password($pwd1);
 
-            # Before changing an email address, confirm one does not exist.
-            check_email_syntax($new_login_name);
-            is_available_username($new_login_name)
-              || ThrowUserError("account_exists", {email => $new_login_name});
+      # Invalidate all logins except for the current one
+      Bugzilla->logout(LOGOUT_KEEP_CURRENT);
+    }
+  }
+
+  # This is used only if email and login are separate
+  if ( $user->authorizer->can_change_login
+    && !Bugzilla->params->{"use_email_as_login"}
+    && $new_login
+    && $user->login ne $new_login)
+  {
+    $verified_password || $user->check_current_password($oldpassword);
+
+    if ($new_login =~ /@/ && $new_login ne $user->email) {
+      ThrowUserError("login_at_sign_disallowed");
+    }
 
-            Bugzilla::Token::IssueEmailChangeToken($user, $new_login_name);
+    if (Bugzilla::Token::HasEmailChangeToken($user->id)) {
+      ThrowUserError("login_change_during_email_change");
+    }
 
-            $vars->{'email_changes_saved'} = 1;
-        }
+    $user->set_login($new_login);
+  }
+
+  # This is used for the single value if use_email_as_login is true, or for
+  # the email address otherwise.
+  if ( $user->authorizer->can_change_email
+    && Bugzilla->params->{"allowemailchange"}
+    && $new_email
+    && $user->email ne $new_email)
+  {
+    $verified_password || $user->check_current_password($oldpassword);
+
+    # Block multiple email changes for the same user.
+    if (Bugzilla::Token::HasEmailChangeToken($user->id)) {
+      ThrowUserError("email_change_in_progress");
     }
 
-    $user->set_name($cgi->param('realname'));
-    $user->update({ keep_session => 1, keep_tokens => 1 });
-    $dbh->bz_commit_transaction;
+    # Before changing to an email address, confirm it does not exist.
+    $user->check_email($new_email);
+
+    $vars->{'email_token'} = Bugzilla::Token::IssueEmailChangeToken($new_email);
+    $vars->{'email_changes_saved'} = 1;
+  }
+  $user->set_name(scalar $cgi->param('realname'));
+  $user->update({keep_session => 1, keep_tokens => 1});
+  $dbh->bz_commit_transaction;
 }
 
 
 sub DoSettings {
-    my $user = Bugzilla->user;
+  my $user = Bugzilla->user;
 
-    my $settings = $user->settings;
-    $vars->{'settings'} = $settings;
+  my $settings = $user->settings;
+  $vars->{'settings'} = $settings;
 
-    my @setting_list = keys %$settings;
-    $vars->{'setting_names'} = \@setting_list;
+  my @setting_list = sort keys %$settings;
+  $vars->{'setting_names'} = \@setting_list;
 
-    $vars->{'has_settings_enabled'} = 0;
-    # Is there at least one user setting enabled?
-    foreach my $setting_name (@setting_list) {
-        if ($settings->{"$setting_name"}->{'is_enabled'}) {
-            $vars->{'has_settings_enabled'} = 1;
-            last;
-        }
+  $vars->{'has_settings_enabled'} = 0;
+
+  # Is there at least one user setting enabled?
+  foreach my $setting_name (@setting_list) {
+    if ($settings->{"$setting_name"}->{'is_enabled'}) {
+      $vars->{'has_settings_enabled'} = 1;
+      last;
     }
-    $vars->{'dont_show_button'} = !$vars->{'has_settings_enabled'};
+  }
+  $vars->{'dont_show_button'} = !$vars->{'has_settings_enabled'};
 }
 
 sub SaveSettings {
-    my $cgi = Bugzilla->cgi;
-    my $user = Bugzilla->user;
-
-    my $settings = $user->settings;
-    my @setting_list = keys %$settings;
-
-    foreach my $name (@setting_list) {
-        next if ! ($settings->{$name}->{'is_enabled'});
-        my $value = $cgi->param($name);
-        next unless defined $value;
-        my $setting = new Bugzilla::User::Setting($name);
-
-        if ($value eq "${name}-isdefault" ) {
-            if (! $settings->{$name}->{'is_default'}) {
-                $settings->{$name}->reset_to_default;
-            }
-        }
-        else {
-            $setting->validate_value($value);
-            $settings->{$name}->set($value);
-        }
+  my $cgi  = Bugzilla->cgi;
+  my $user = Bugzilla->user;
+
+  my $settings     = $user->settings;
+  my @setting_list = keys %$settings;
+
+  foreach my $name (@setting_list) {
+    next if !($settings->{$name}->{'is_enabled'});
+    my $value = $cgi->param($name);
+    next unless defined $value;
+    my $setting = new Bugzilla::User::Setting($name);
+
+    if ($value eq "${name}-isdefault") {
+      if (!$settings->{$name}->{'is_default'}) {
+        $settings->{$name}->reset_to_default;
+      }
+    }
+    else {
+      $setting->validate_value($value);
+      $settings->{$name}->set($value);
     }
-    $vars->{'settings'} = $user->settings(1);
-    clear_settings_cache($user->id);
+  }
+  $vars->{'settings'} = $user->settings(1);
+  clear_settings_cache($user->id);
 }
 
 sub DoEmail {
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    
-    ###########################################################################
-    # User watching
-    ###########################################################################
-    my $watched_ref = $dbh->selectcol_arrayref(
-        "SELECT profiles.login_name FROM watch INNER JOIN profiles" .
-        " ON watch.watched = profiles.userid" .
-        " WHERE watcher = ?" .
-        " ORDER BY profiles.login_name",
-        undef, $user->id);
-    $vars->{'watchedusers'} = $watched_ref;
-
-    my $watcher_ids = $dbh->selectcol_arrayref(
-        "SELECT watcher FROM watch WHERE watched = ?",
-        undef, $user->id);
-
-    my @watchers;
-    foreach my $watcher_id (@$watcher_ids) {
-        my $watcher = new Bugzilla::User($watcher_id);
-        push(@watchers, Bugzilla::User::identity($watcher));
-    }
-
-    @watchers = sort { lc($a) cmp lc($b) } @watchers;
-    $vars->{'watchers'} = \@watchers;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  ###########################################################################
+  # User watching
+  ###########################################################################
+  my $watched_ref = $dbh->selectcol_arrayref(
+    "SELECT profiles.login_name FROM watch INNER JOIN profiles"
+      . " ON watch.watched = profiles.userid"
+      . " WHERE watcher = ?"
+      . " ORDER BY profiles.login_name",
+    undef, $user->id
+  );
+  $vars->{'watchedusers'} = $watched_ref;
+
+  my $watcher_ids
+    = $dbh->selectcol_arrayref("SELECT watcher FROM watch WHERE watched = ?",
+    undef, $user->id);
+
+  my @watchers;
+  foreach my $watcher_id (@$watcher_ids) {
+    my $watcher = new Bugzilla::User($watcher_id);
+    push(@watchers, Bugzilla::User::identity($watcher));
+  }
+
+  @watchers = sort { lc($a) cmp lc($b) } @watchers;
+  $vars->{'watchers'} = \@watchers;
 }
 
 sub SaveEmail {
-    my $dbh = Bugzilla->dbh;
-    my $cgi = Bugzilla->cgi;
-    my $user = Bugzilla->user;
-
-    Bugzilla::User::match_field({ 'new_watchedusers' => {'type' => 'multi'} });
-
-    ###########################################################################
-    # Role-based preferences
-    ###########################################################################
-    $dbh->bz_start_transaction();
-
-    my $sth_insert = $dbh->prepare('INSERT INTO email_setting
-                                    (user_id, relationship, event) VALUES (?, ?, ?)');
-
-    my $sth_delete = $dbh->prepare('DELETE FROM email_setting
-                                    WHERE user_id = ? AND relationship = ? AND event = ?');
-    # Load current email preferences into memory before updating them.
-    my $settings = $user->mail_settings;
-
-    # Update the table - first, with normal events in the
-    # relationship/event matrix.
-    my %relationships = Bugzilla::BugMail::relationships();
-    foreach my $rel (keys %relationships) {
-        next if ($rel == REL_QA && !Bugzilla->params->{'useqacontact'});
-        # Positive events: a ticked box means "send me mail."
-        foreach my $event (POS_EVENTS) {
-            my $is_set = $cgi->param("email-$rel-$event");
-            if ($is_set xor $settings->{$rel}{$event}) {
-                if ($is_set) {
-                    $sth_insert->execute($user->id, $rel, $event);
-                }
-                else {
-                    $sth_delete->execute($user->id, $rel, $event);
-                }
-            }
+  my $dbh  = Bugzilla->dbh;
+  my $cgi  = Bugzilla->cgi;
+  my $user = Bugzilla->user;
+
+  Bugzilla::User::match_field({'new_watchedusers' => {'type' => 'multi'}});
+
+  ###########################################################################
+  # Role-based preferences
+  ###########################################################################
+  $dbh->bz_start_transaction();
+
+  my $sth_insert = $dbh->prepare(
+    'INSERT INTO email_setting
+                                    (user_id, relationship, event) VALUES (?, ?, ?)'
+  );
+
+  my $sth_delete = $dbh->prepare(
+    'DELETE FROM email_setting
+                                    WHERE user_id = ? AND relationship = ? AND event = ?'
+  );
+
+  # Load current email preferences into memory before updating them.
+  my $settings = $user->mail_settings;
+
+  # Update the table - first, with normal events in the
+  # relationship/event matrix.
+  my %relationships = Bugzilla::BugMail::relationships();
+  foreach my $rel (keys %relationships) {
+    next if ($rel == REL_QA && !Bugzilla->params->{'useqacontact'});
+
+    # Positive events: a ticked box means "send me mail."
+    foreach my $event (POS_EVENTS) {
+      my $is_set = $cgi->param("email-$rel-$event");
+      if ($is_set xor $settings->{$rel}{$event}) {
+        if ($is_set) {
+          $sth_insert->execute($user->id, $rel, $event);
         }
-        
-        # Negative events: a ticked box means "don't send me mail."
-        foreach my $event (NEG_EVENTS) {
-            my $is_set = $cgi->param("neg-email-$rel-$event");
-            if (!$is_set xor $settings->{$rel}{$event}) {
-                if (!$is_set) {
-                    $sth_insert->execute($user->id, $rel, $event);
-                }
-                else {
-                    $sth_delete->execute($user->id, $rel, $event);
-                }
-            }
+        else {
+          $sth_delete->execute($user->id, $rel, $event);
         }
+      }
     }
 
-    # Global positive events: a ticked box means "send me mail."
-    foreach my $event (GLOBAL_EVENTS) {
-        my $is_set = $cgi->param("email-" . REL_ANY . "-$event");
-        if ($is_set xor $settings->{+REL_ANY}{$event}) {
-            if ($is_set) {
-                $sth_insert->execute($user->id, REL_ANY, $event);
-            }
-            else {
-                $sth_delete->execute($user->id, REL_ANY, $event);
-            }
+    # Negative events: a ticked box means "don't send me mail."
+    foreach my $event (NEG_EVENTS) {
+      my $is_set = $cgi->param("neg-email-$rel-$event");
+      if (!$is_set xor $settings->{$rel}{$event}) {
+        if (!$is_set) {
+          $sth_insert->execute($user->id, $rel, $event);
+        }
+        else {
+          $sth_delete->execute($user->id, $rel, $event);
         }
+      }
     }
+  }
+
+  # Global positive events: a ticked box means "send me mail."
+  foreach my $event (GLOBAL_EVENTS) {
+    my $is_set = $cgi->param("email-" . REL_ANY . "-$event");
+    if ($is_set xor $settings->{+REL_ANY}{$event}) {
+      if ($is_set) {
+        $sth_insert->execute($user->id, REL_ANY, $event);
+      }
+      else {
+        $sth_delete->execute($user->id, REL_ANY, $event);
+      }
+    }
+  }
 
-    $dbh->bz_commit_transaction();
-
-    # We have to clear the cache about email preferences.
-    delete $user->{'mail_settings'};
-
-    ###########################################################################
-    # User watching
-    ###########################################################################
-    if (defined $cgi->param('new_watchedusers')
-        || defined $cgi->param('remove_watched_users'))
-    {
-        $dbh->bz_start_transaction();
-
-        # Use this to protect error messages on duplicate submissions
-        my $old_watch_ids =
-            $dbh->selectcol_arrayref("SELECT watched FROM watch"
-                                   . " WHERE watcher = ?", undef, $user->id);
+  $dbh->bz_commit_transaction();
 
-        # The new information given to us by the user.
-        my $new_watched_users = join(',', $cgi->param('new_watchedusers')) || '';
-        my @new_watch_names = split(/[,\s]+/, $new_watched_users);
-        my %new_watch_ids;
+  # We have to clear the cache about email preferences.
+  delete $user->{'mail_settings'};
 
-        foreach my $username (@new_watch_names) {
-            my $watched_userid = login_to_id(trim($username), THROW_ERROR);
-            $new_watch_ids{$watched_userid} = 1;
-        }
+  ###########################################################################
+  # User watching
+  ###########################################################################
+  if ( defined $cgi->param('new_watchedusers')
+    || defined $cgi->param('remove_watched_users'))
+  {
+    $dbh->bz_start_transaction();
 
-        # Add people who were added.
-        my $insert_sth = $dbh->prepare('INSERT INTO watch (watched, watcher)'
-                                     . ' VALUES (?, ?)');
-        foreach my $add_me (keys(%new_watch_ids)) {
-            next if grep($_ == $add_me, @$old_watch_ids);
-            $insert_sth->execute($add_me, $user->id);
-        }
+    # Use this to protect error messages on duplicate submissions
+    my $old_watch_ids
+      = $dbh->selectcol_arrayref("SELECT watched FROM watch" . " WHERE watcher = ?",
+      undef, $user->id);
 
-        if (defined $cgi->param('remove_watched_users')) {
-            my @removed = $cgi->param('watched_by_you');
-            # Remove people who were removed.
-            my $delete_sth = $dbh->prepare('DELETE FROM watch WHERE watched = ?'
-                                         . ' AND watcher = ?');
-            
-            my %remove_watch_ids;
-            foreach my $username (@removed) {
-                my $watched_userid = login_to_id(trim($username), THROW_ERROR);
-                $remove_watch_ids{$watched_userid} = 1;
-            }
-            foreach my $remove_me (keys(%remove_watch_ids)) {
-                $delete_sth->execute($remove_me, $user->id);
-            }
-        }
+    # The new information given to us by the user.
+    my $new_watched_users = join(',', $cgi->param('new_watchedusers')) || '';
+    my @new_watch_names = split(/[,\s]+/, $new_watched_users);
+    my %new_watch_ids;
 
-        $dbh->bz_commit_transaction();
+    foreach my $username (@new_watch_names) {
+      my $watched_userid = login_to_id(trim($username), THROW_ERROR);
+      $new_watch_ids{$watched_userid} = 1;
     }
 
-    ###########################################################################
-    # Ignore Bugs
-    ###########################################################################
-    my %ignored_bugs = map { $_->{'id'} => 1 } @{$user->bugs_ignored};
-
-    # Validate the new bugs to ignore by checking that they exist and also
-    # if the user gave an alias
-    my @add_ignored = split(/[\s,]+/, $cgi->param('add_ignored_bugs'));
-    @add_ignored = map { Bugzilla::Bug->check($_)->id } @add_ignored;
-    map { $ignored_bugs{$_} = 1 } @add_ignored;
-
-    # Remove any bug ids the user no longer wants to ignore
-    foreach my $key (grep(/^remove_ignored_bug_/, $cgi->param)) {
-        my ($bug_id) = $key =~ /(\d+)$/;
-        delete $ignored_bugs{$bug_id};
+    # Add people who were added.
+    my $insert_sth
+      = $dbh->prepare('INSERT INTO watch (watched, watcher)' . ' VALUES (?, ?)');
+    foreach my $add_me (keys(%new_watch_ids)) {
+      next if grep($_ == $add_me, @$old_watch_ids);
+      $insert_sth->execute($add_me, $user->id);
     }
 
-    # Update the database with any changes made
-    my ($removed, $added) = diff_arrays([ map { $_->{'id'} } @{$user->bugs_ignored} ],
-                                        [ keys %ignored_bugs ]);
+    if (defined $cgi->param('remove_watched_users')) {
+      my @removed = $cgi->multi_param('watched_by_you');
+
+      # Remove people who were removed.
+      my $delete_sth
+        = $dbh->prepare('DELETE FROM watch WHERE watched = ?' . ' AND watcher = ?');
+
+      my %remove_watch_ids;
+      foreach my $username (@removed) {
+        my $watched_userid = login_to_id(trim($username), THROW_ERROR);
+        $remove_watch_ids{$watched_userid} = 1;
+      }
+      foreach my $remove_me (keys(%remove_watch_ids)) {
+        $delete_sth->execute($remove_me, $user->id);
+      }
+    }
 
-    if (scalar @$removed || scalar @$added) {
-        $dbh->bz_start_transaction();
+    $dbh->bz_commit_transaction();
+  }
+
+  ###########################################################################
+  # Ignore Bugs
+  ###########################################################################
+  my %ignored_bugs = map { $_->{'id'} => 1 } @{$user->bugs_ignored};
+
+  # Validate the new bugs to ignore by checking that they exist and also
+  # if the user gave an alias
+  my @add_ignored = split(/[\s,]+/, $cgi->param('add_ignored_bugs'));
+  @add_ignored = map { Bugzilla::Bug->check($_)->id } @add_ignored;
+  map { $ignored_bugs{$_} = 1 } @add_ignored;
+
+  # Remove any bug ids the user no longer wants to ignore
+  foreach my $key (grep(/^remove_ignored_bug_/, $cgi->multi_param())) {
+    my ($bug_id) = $key =~ /(\d+)$/a;
+    delete $ignored_bugs{$bug_id};
+  }
+
+  # Update the database with any changes made
+  my ($removed, $added)
+    = diff_arrays([map { $_->{'id'} } @{$user->bugs_ignored}],
+    [keys %ignored_bugs]);
+
+  if (scalar @$removed || scalar @$added) {
+    $dbh->bz_start_transaction();
 
-        if (scalar @$removed) {
-            $dbh->do('DELETE FROM email_bug_ignore WHERE user_id = ? AND ' . 
-                     $dbh->sql_in('bug_id', $removed),
-                     undef, $user->id);
-        }
-        if (scalar @$added) {
-            my $sth = $dbh->prepare('INSERT INTO email_bug_ignore
-                                     (user_id, bug_id) VALUES (?, ?)');
-            $sth->execute($user->id, $_) foreach @$added;
-        }
+    if (scalar @$removed) {
+      $dbh->do(
+        'DELETE FROM email_bug_ignore WHERE user_id = ? AND '
+          . $dbh->sql_in('bug_id', $removed),
+        undef, $user->id
+      );
+    }
+    if (scalar @$added) {
+      my $sth = $dbh->prepare(
+        'INSERT INTO email_bug_ignore
+                                     (user_id, bug_id) VALUES (?, ?)'
+      );
+      $sth->execute($user->id, $_) foreach @$added;
+    }
 
-        # Reset the cache of ignored bugs if the list changed.
-        delete $user->{bugs_ignored};
+    # Reset the cache of ignored bugs if the list changed.
+    delete $user->{bugs_ignored};
 
-        $dbh->bz_commit_transaction();
-    }
+    $dbh->bz_commit_transaction();
+  }
 }
 
 
 sub DoPermissions {
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-    my (@has_bits, @set_bits);
-
-    my $groups = $dbh->selectall_arrayref(
-               "SELECT DISTINCT name, description FROM groups WHERE id IN (" .
-               $user->groups_as_string . ") ORDER BY name");
-    foreach my $group (@$groups) {
-        my ($nam, $desc) = @$group;
-        push(@has_bits, {"desc" => $desc, "name" => $nam});
-    }
-    $groups = $dbh->selectall_arrayref('SELECT DISTINCT id, name, description
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+  my (@has_bits, @set_bits);
+
+  my $groups
+    = $dbh->selectall_arrayref(
+        "SELECT DISTINCT name, description FROM groups WHERE id IN ("
+      . $user->groups_as_string
+      . ") ORDER BY name");
+  foreach my $group (@$groups) {
+    my ($nam, $desc) = @$group;
+    push(@has_bits, {"desc" => $desc, "name" => $nam});
+  }
+  $groups = $dbh->selectall_arrayref(
+    'SELECT DISTINCT id, name, description
                                           FROM groups
-                                         ORDER BY name');
-    foreach my $group (@$groups) {
-        my ($group_id, $nam, $desc) = @$group;
-        if ($user->can_bless($group_id)) {
-            push(@set_bits, {"desc" => $desc, "name" => $nam});
-        }
+                                         ORDER BY name'
+  );
+  foreach my $group (@$groups) {
+    my ($group_id, $nam, $desc) = @$group;
+    if ($user->can_bless($group_id)) {
+      push(@set_bits, {"desc" => $desc, "name" => $nam});
     }
+  }
 
-    # If the user has product specific privileges, inform them about that.
-    foreach my $privs (PER_PRODUCT_PRIVILEGES) {
-        next if $user->in_group($privs);
-        $vars->{"local_$privs"} = $user->get_products_by_permission($privs);
-    }
+  # If the user has product specific privileges, inform them about that.
+  foreach my $privs (PER_PRODUCT_PRIVILEGES) {
+    next if $user->in_group($privs);
+    $vars->{"local_$privs"} = $user->get_products_by_permission($privs);
+  }
 
-    $vars->{'has_bits'} = \@has_bits;
-    $vars->{'set_bits'} = \@set_bits;    
+  $vars->{'has_bits'} = \@has_bits;
+  $vars->{'set_bits'} = \@set_bits;
 }
 
 # No SavePermissions() because this panel has no changeable fields.
 
 
 sub DoSavedSearches {
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    if ($user->queryshare_groups_as_string) {
-        $vars->{'queryshare_groups'} =
-            Bugzilla::Group->new_from_list($user->queryshare_groups);
-    }
-    $vars->{'bless_group_ids'} = [map { $_->id } @{$user->bless_groups}];
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  if ($user->queryshare_groups_as_string) {
+    $vars->{'queryshare_groups'}
+      = Bugzilla::Group->new_from_list($user->queryshare_groups);
+  }
+  $vars->{'bless_group_ids'} = [map { $_->id } @{$user->bless_groups}];
 }
 
 sub SaveSavedSearches {
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
+  my $cgi  = Bugzilla->cgi;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
 
-    # We'll need this in a loop, so do the call once.
-    my $user_id = $user->id;
+  # We'll need this in a loop, so do the call once.
+  my $user_id = $user->id;
 
-    my $sth_insert_nl = $dbh->prepare('INSERT INTO namedqueries_link_in_footer
+  my $sth_insert_nl = $dbh->prepare(
+    'INSERT INTO namedqueries_link_in_footer
                                        (namedquery_id, user_id)
-                                       VALUES (?, ?)');
-    my $sth_delete_nl = $dbh->prepare('DELETE FROM namedqueries_link_in_footer
+                                       VALUES (?, ?)'
+  );
+  my $sth_delete_nl = $dbh->prepare(
+    'DELETE FROM namedqueries_link_in_footer
                                              WHERE namedquery_id = ?
-                                               AND user_id = ?');
-    my $sth_insert_ngm = $dbh->prepare('INSERT INTO namedquery_group_map
+                                               AND user_id = ?'
+  );
+  my $sth_insert_ngm = $dbh->prepare(
+    'INSERT INTO namedquery_group_map
                                         (namedquery_id, group_id)
-                                        VALUES (?, ?)');
-    my $sth_update_ngm = $dbh->prepare('UPDATE namedquery_group_map
+                                        VALUES (?, ?)'
+  );
+  my $sth_update_ngm = $dbh->prepare(
+    'UPDATE namedquery_group_map
                                            SET group_id = ?
-                                         WHERE namedquery_id = ?');
-    my $sth_delete_ngm = $dbh->prepare('DELETE FROM namedquery_group_map
-                                              WHERE namedquery_id = ?');
-
-    # Update namedqueries_link_in_footer for this user.
-    foreach my $q (@{$user->queries}, @{$user->queries_available}) {
-        if (defined $cgi->param("link_in_footer_" . $q->id)) {
-            $sth_insert_nl->execute($q->id, $user_id) if !$q->link_in_footer;
-        }
-        else {
-            $sth_delete_nl->execute($q->id, $user_id) if $q->link_in_footer;
-        }
+                                         WHERE namedquery_id = ?'
+  );
+  my $sth_delete_ngm = $dbh->prepare(
+    'DELETE FROM namedquery_group_map
+                                              WHERE namedquery_id = ?'
+  );
+
+  # Update namedqueries_link_in_footer for this user.
+  foreach my $q (@{$user->queries}, @{$user->queries_available}) {
+    if (defined $cgi->param("link_in_footer_" . $q->id)) {
+      $sth_insert_nl->execute($q->id, $user_id) if !$q->link_in_footer;
     }
+    else {
+      $sth_delete_nl->execute($q->id, $user_id) if $q->link_in_footer;
+    }
+  }
 
-    # For user's own queries, update namedquery_group_map.
-    foreach my $q (@{$user->queries}) {
-        my $group_id;
+  # For user's own queries, update namedquery_group_map.
+  foreach my $q (@{$user->queries}) {
+    my $group_id;
 
-        if ($user->in_group(Bugzilla->params->{'querysharegroup'})) {
-            $group_id = $cgi->param("share_" . $q->id) || '';
-        }
+    if ($user->in_group(Bugzilla->params->{'querysharegroup'})) {
+      $group_id = $cgi->param("share_" . $q->id) || '';
+    }
 
-        if ($group_id) {
-            # Don't allow the user to share queries with groups they're not
-            # allowed to.
-            next unless grep($_ eq $group_id, @{$user->queryshare_groups});
-
-            # $group_id is now definitely a valid ID of a group the
-            # user can share queries with, so we can trick_taint.
-            detaint_natural($group_id);
-            if ($q->shared_with_group) {
-                $sth_update_ngm->execute($group_id, $q->id);
-            }
-            else {
-                $sth_insert_ngm->execute($q->id, $group_id);
-            }
-
-            # If we're sharing our query with a group we can bless, we 
-            # have the ability to add link to our search to the footer of
-            # direct group members automatically.
-            if ($user->can_bless($group_id) && $cgi->param('force_' . $q->id)) {
-                my $group = new Bugzilla::Group($group_id);
-                my $members = $group->members_non_inherited;
-                foreach my $member (@$members) {
-                    next if $member->id == $user->id;
-                    $sth_insert_nl->execute($q->id, $member->id)
-                        if !$q->link_in_footer($member);
-                }
-            }
-        }
-        else {
-            # They have unshared that query.
-            if ($q->shared_with_group) {
-                $sth_delete_ngm->execute($q->id);
-            }
-
-            # Don't remove namedqueries_link_in_footer entries for users
-            # subscribing to the shared query. The idea is that they will
-            # probably want to be subscribers again should the sharing
-            # user choose to share the query again.
+    if ($group_id) {
+
+      # Don't allow the user to share queries with groups they're not
+      # allowed to.
+      next unless grep($_ eq $group_id, @{$user->queryshare_groups});
+
+      # $group_id is now definitely a valid ID of a group the
+      # user can share queries with, so we can trick_taint.
+      detaint_natural($group_id);
+      if ($q->shared_with_group) {
+        $sth_update_ngm->execute($group_id, $q->id);
+      }
+      else {
+        $sth_insert_ngm->execute($q->id, $group_id);
+      }
+
+      # If we're sharing our query with a group we can bless, we
+      # have the ability to add link to our search to the footer of
+      # direct group members automatically.
+      if ($user->can_bless($group_id) && $cgi->param('force_' . $q->id)) {
+        my $group   = new Bugzilla::Group($group_id);
+        my $members = $group->members_non_inherited;
+        foreach my $member (@$members) {
+          next if $member->id == $user->id;
+          $sth_insert_nl->execute($q->id, $member->id) if !$q->link_in_footer($member);
         }
+      }
+    }
+    else {
+      # They have unshared that query.
+      if ($q->shared_with_group) {
+        $sth_delete_ngm->execute($q->id);
+      }
+
+      # Don't remove namedqueries_link_in_footer entries for users
+      # subscribing to the shared query. The idea is that they will
+      # probably want to be subscribers again should the sharing
+      # user choose to share the query again.
     }
+  }
 
-    $user->flush_queries_cache;
+  $user->flush_queries_cache;
 
-    # Update profiles.mybugslink.
-    my $showmybugslink = defined($cgi->param("showmybugslink")) ? 1 : 0;
-    $dbh->do("UPDATE profiles SET mybugslink = ? WHERE userid = ?",
-             undef, ($showmybugslink, $user->id));
-    $user->{'showmybugslink'} = $showmybugslink;
-    Bugzilla->memcached->clear({ table => 'profiles', id => $user->id });
+  # Update profiles.mybugslink.
+  my $showmybugslink = defined($cgi->param("showmybugslink")) ? 1 : 0;
+  $dbh->do("UPDATE profiles SET mybugslink = ? WHERE userid = ?",
+    undef, ($showmybugslink, $user->id));
+  $user->{'showmybugslink'} = $showmybugslink;
+  Bugzilla->memcached->clear({table => 'profiles', id => $user->id});
 }
 
 
 sub DoApiKey {
-    my $user = Bugzilla->user;
+  my $user = Bugzilla->user;
 
-    my $api_keys = Bugzilla::User::APIKey->match({ user_id => $user->id });
-    $vars->{api_keys} = $api_keys;
-    $vars->{any_revoked} = grep { $_->revoked } @$api_keys;
+  my $api_keys = Bugzilla::User::APIKey->match({user_id => $user->id});
+  $vars->{api_keys} = $api_keys;
+  $vars->{any_revoked} = grep { $_->revoked } @$api_keys;
 }
 
 sub SaveApiKey {
-    my $cgi = Bugzilla->cgi;
-    my $dbh = Bugzilla->dbh;
-    my $user = Bugzilla->user;
-
-    # Do it in a transaction.
-    $dbh->bz_start_transaction;
-
-    # Update any existing keys
-    my $api_keys = Bugzilla::User::APIKey->match({ user_id => $user->id });
-    foreach my $api_key (@$api_keys) {
-        my $description = $cgi->param('description_' . $api_key->id);
-        my $revoked = $cgi->param('revoked_' . $api_key->id);
-
-        if ($description ne $api_key->description
-            || $revoked != $api_key->revoked)
-        {
-            $api_key->set_all({
-                description => $description,
-                revoked     => $revoked,
-            });
-            $api_key->update();
-        }
-    }
-
-    # Create a new API key if requested.
-    if ($cgi->param('new_key')) {
-        $vars->{new_key} = Bugzilla::User::APIKey->create({
-            user_id     => $user->id,
-            description => scalar $cgi->param('new_description'),
-        });
-
-        # As a security precaution, we always sent out an e-mail when
-        # an API key is created
-        my $template = Bugzilla->template_inner($user->setting('lang'));
-        my $message;
-        $template->process('email/new-api-key.txt.tmpl', $vars, \$message)
-          || ThrowTemplateError($template->error());
-
-        MessageToMTA($message);
+  my $cgi  = Bugzilla->cgi;
+  my $dbh  = Bugzilla->dbh;
+  my $user = Bugzilla->user;
+
+  # Do it in a transaction.
+  $dbh->bz_start_transaction;
+
+  # Update any existing keys
+  my $api_keys = Bugzilla::User::APIKey->match({user_id => $user->id});
+  foreach my $api_key (@$api_keys) {
+    my $description = $cgi->param('description_' . $api_key->id);
+    my $revoked     = $cgi->param('revoked_' . $api_key->id);
+
+    if ($description ne $api_key->description || $revoked != $api_key->revoked) {
+      $api_key->set_all({description => $description, revoked => $revoked,});
+      $api_key->update();
     }
-
-    $dbh->bz_commit_transaction;
+  }
+
+  # Create a new API key if requested.
+  if ($cgi->param('new_key')) {
+    $vars->{new_key}
+      = Bugzilla::User::APIKey->create({
+      user_id => $user->id, description => scalar $cgi->param('new_description'),
+      });
+
+    # As a security precaution, we always sent out an e-mail when
+    # an API key is created
+    my $template = Bugzilla->template_inner($user->setting('lang'));
+    my $message;
+    $template->process('email/new-api-key.txt.tmpl', $vars, \$message)
+      || ThrowTemplateError($template->error());
+
+    MessageToMTA($message);
+  }
+
+  $dbh->bz_commit_transaction;
 }
 
 ###############################################################################
@@ -574,9 +607,10 @@ $cgi->delete('GoAheadAndLogIn');
 my $user = Bugzilla->login(LOGIN_OPTIONAL);
 
 if (!$user->id) {
-    # Use credentials given in the form if login cookies are not available.
-    $cgi->param('Bugzilla_login', $cgi->param('old_login'));
-    $cgi->param('Bugzilla_password', $cgi->param('old_password'));
+
+  # Use credentials given in the form if login cookies are not available.
+  $cgi->param('Bugzilla_login',    $cgi->param('old_login'));
+  $cgi->param('Bugzilla_password', $cgi->param('old_password'));
 }
 Bugzilla->login(LOGIN_REQUIRED);
 
@@ -596,52 +630,55 @@ check_token_data($token, 'edit_user_prefs') if $save_changes;
 # Do any saving, and then display the current tab.
 SWITCH: for ($current_tab_name) {
 
-    # Extensions must set it to 1 to confirm the tab is valid.
-    my $handled = 0;
-    Bugzilla::Hook::process('user_preferences',
-                            { 'vars'       => $vars,
-                              save_changes => $save_changes,
-                              current_tab  => $current_tab_name,
-                              handled      => \$handled });
-    last SWITCH if $handled;
-
-    /^account$/ && do {
-        SaveAccount() if $save_changes;
-        DoAccount();
-        last SWITCH;
-    };
-    /^settings$/ && do {
-        SaveSettings() if $save_changes;
-        DoSettings();
-        last SWITCH;
-    };
-    /^email$/ && do {
-        SaveEmail() if $save_changes;
-        DoEmail();
-        last SWITCH;
-    };
-    /^permissions$/ && do {
-        DoPermissions();
-        last SWITCH;
-    };
-    /^saved-searches$/ && do {
-        SaveSavedSearches() if $save_changes;
-        DoSavedSearches();
-        last SWITCH;
-    };
-    /^apikey$/ && do {
-        SaveApiKey() if $save_changes;
-        DoApiKey();
-        last SWITCH;
-    };
-
-    ThrowUserError("unknown_tab",
-                   { current_tab_name => $current_tab_name });
+  # Extensions must set it to 1 to confirm the tab is valid.
+  my $handled = 0;
+  Bugzilla::Hook::process(
+    'user_preferences',
+    {
+      'vars'       => $vars,
+      save_changes => $save_changes,
+      current_tab  => $current_tab_name,
+      handled      => \$handled
+    }
+  );
+  last SWITCH if $handled;
+
+  /^account$/ && do {
+    SaveAccount() if $save_changes;
+    DoAccount();
+    last SWITCH;
+  };
+  /^settings$/ && do {
+    SaveSettings() if $save_changes;
+    DoSettings();
+    last SWITCH;
+  };
+  /^email$/ && do {
+    SaveEmail() if $save_changes;
+    DoEmail();
+    last SWITCH;
+  };
+  /^permissions$/ && do {
+    DoPermissions();
+    last SWITCH;
+  };
+  /^saved-searches$/ && do {
+    SaveSavedSearches() if $save_changes;
+    DoSavedSearches();
+    last SWITCH;
+  };
+  /^apikey$/ && do {
+    SaveApiKey() if $save_changes;
+    DoApiKey();
+    last SWITCH;
+  };
+
+  ThrowUserError("unknown_tab", {current_tab_name => $current_tab_name});
 }
 
 delete_token($token) if $save_changes;
 if ($current_tab_name ne 'permissions') {
-    $vars->{'token'} = issue_session_token('edit_user_prefs');
+  $vars->{'token'} = issue_session_token('edit_user_prefs');
 }
 
 # Generate and return the UI (HTML page) from the appropriate template.
diff --git a/view_job_queue.cgi b/view_job_queue.cgi
new file mode 100755
index 0000000000..f1d7e25ade
--- /dev/null
+++ b/view_job_queue.cgi
@@ -0,0 +1,123 @@
+#!/usr/bin/perl -T
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use lib qw(. lib local/lib/perl5);
+
+use Bugzilla;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::Util qw(template_var);
+use Scalar::Util qw(blessed);
+use Storable qw(read_magic thaw);
+
+my $user = Bugzilla->login(LOGIN_REQUIRED);
+$user->in_group("admin")
+  || ThrowUserError("auth_failure",
+  {group => "admin", action => "access", object => "job_queue"});
+
+my $vars = {};
+generate_report($vars);
+
+print Bugzilla->cgi->header();
+my $template = Bugzilla->template;
+$template->process('admin/reports/job_queue.html.tmpl', $vars)
+  || ThrowTemplateError($template->error());
+
+sub generate_report {
+  my ($vars) = @_;
+  my $dbh    = Bugzilla->dbh;
+  my $user   = Bugzilla->user;
+
+  my $query = "
+        SELECT
+            j.jobid,
+            j.arg,
+            j.run_after AS run_time,
+            j.grabbed_until,
+            f.funcname AS func,
+            (SELECT COUNT(*)
+               FROM ts_error
+              WHERE ts_error.jobid = j.jobid
+            ) AS error_count,
+            e.error_time AS error_time,
+            e.message AS error_message
+        FROM
+            ts_job j
+            INNER JOIN ts_funcmap f
+                ON f.funcid = j.funcid
+            NATURAL LEFT JOIN (
+                SELECT MAX(error_time) AS error_time, jobid
+                  FROM ts_error
+                 GROUP BY jobid
+            ) t
+            LEFT JOIN ts_error e
+                ON (e.error_time  = t.error_time) AND (e.jobid = t.jobid)
+        ORDER BY
+            j.run_after, j.grabbed_until, j.insert_time, j.jobid
+        " . $dbh->sql_limit(JOB_QUEUE_VIEW_MAX_JOBS + 1);
+
+  $vars->{jobs} = $dbh->selectall_arrayref($query, {Slice => {}});
+  if (@{$vars->{jobs}} == JOB_QUEUE_VIEW_MAX_JOBS + 1) {
+    pop @{$vars->{jobs}};
+    $vars->{job_count}     = $dbh->selectrow_array("SELECT COUNT(*) FROM ts_job");
+    $vars->{too_many_jobs} = 1;
+  }
+
+  my $bug_word = template_var('terms')->{bug};
+  foreach my $job (@{$vars->{jobs}}) {
+    my ($recipient, $description);
+    eval {
+      if ($job->{func} eq 'Bugzilla::Job::BugMail') {
+        my $arg = _cond_thaw(delete $job->{arg});
+        next unless $arg;
+        my $vars = $arg->{vars};
+        $recipient = $vars->{to_user}->{login_name};
+        $description
+          = "[$bug_word " . $vars->{bug}->{bug_id} . '] ' . $vars->{bug}->{short_desc};
+      }
+
+      elsif ($job->{func} eq 'Bugzilla::Job::Mailer') {
+        my $arg = _cond_thaw(delete $job->{arg});
+        next unless $arg;
+        my $msg = $arg->{msg};
+        if (ref($msg) && blessed($msg) eq 'Email::MIME') {
+          $recipient   = $msg->header('to');
+          $description = $msg->header('subject');
+        }
+        else {
+          ($recipient)   = $msg =~ /\nTo: ([^\n]+)/i;
+          ($description) = $msg =~ /\nSubject: ([^\n]+)/i;
+        }
+      }
+    };
+    if ($recipient) {
+      $job->{subject} = "<$recipient> $description";
+    }
+  }
+}
+
+sub _cond_thaw {
+  my $data = shift;
+  my $magic = eval { read_magic($data); };
+  if ($magic && $magic->{major} && $magic->{major} >= 2 && $magic->{major} <= 5) {
+    my $thawed = eval { thaw($data) };
+    if ($@) {
+
+      # false alarm... looked like a Storable, but wasn't
+      return undef;
+    }
+    return $thawed;
+  }
+  else {
+    return undef;
+  }
+}
diff --git a/votes.cgi b/votes.cgi
index ae692a941b..4030ee452e 100755
--- a/votes.cgi
+++ b/votes.cgi
@@ -9,31 +9,31 @@
 # This script remains as a backwards-compatibility URL for before
 # the time that Voting was an extension.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Error;
 
-my $is_enabled = grep { $_->NAME eq 'Voting' } @{ Bugzilla->extensions };
-$is_enabled || ThrowUserError('extension_disabled', { name => 'Voting' });
+my $is_enabled = grep { $_->NAME eq 'Voting' } @{Bugzilla->extensions};
+$is_enabled || ThrowUserError('extension_disabled', {name => 'Voting'});
 
 my $cgi = Bugzilla->cgi;
 my $action = $cgi->param('action') || 'show_user';
 
 if ($action eq "show_bug") {
-    $cgi->delete('action');
-    $cgi->param('id', 'voting/bug.html');
-} 
+  $cgi->delete('action');
+  $cgi->param('id', 'voting/bug.html');
+}
 elsif ($action eq "show_user" or $action eq 'vote') {
-    $cgi->delete('action') unless $action eq 'vote';
-    $cgi->param('id', 'voting/user.html');
+  $cgi->delete('action') unless $action eq 'vote';
+  $cgi->param('id', 'voting/user.html');
 }
 else {
-    ThrowUserError('unknown_action', {action => $action});
+  ThrowUserError('unknown_action', {action => $action});
 }
 
 print $cgi->redirect('page.cgi?' . $cgi->query_string);
diff --git a/web.config b/web.config
new file mode 100644
index 0000000000..1ebec727b2
--- /dev/null
+++ b/web.config
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <system.webServer>
+        <defaultDocument>
+            <files>
+                <clear />
+                <add value="index.cgi" />
+            </files>
+        </defaultDocument>
+        <rewrite>
+            <rules>
+                <rule name="REST">
+                    <match url="^rest/(.*)$" />
+                    <action type="Rewrite" url="rest.cgi/{R:1}" />
+                </rule>
+            </rules>
+        </rewrite>
+        <directoryBrowse enabled="false" />
+        <security>
+            <requestFiltering>
+                <fileExtensions allowUnlisted="true">
+                    <add fileExtension=".dot" allowed="false" />
+                    <add fileExtension=".pl" allowed="false" />
+                    <add fileExtension=".pm" allowed="false" />
+                    <add fileExtension=".rst" allowed="false" />
+                    <add fileExtension=".tmpl" allowed="false" />
+                </fileExtensions>
+                <hiddenSegments>
+                    <add segment="localconfig" />
+                    <add segment="params.json" />
+                    <add segment="mailer.testfile" />
+                </hiddenSegments>
+                <denyUrlSequences>
+                    <add sequence="/contrib/" />
+                    <add sequence="/data/attachments/" />
+                    <add sequence="/data/db/" />
+                    <add sequence="/data/mining/" />
+                    <add sequence="/lib/" />
+                    <add sequence="/rst/" />
+                    <add sequence="/template/" />
+                    <add sequence="/t/" />
+                    <add sequence="/xt/" />
+                </denyUrlSequences>
+            </requestFiltering>
+        </security>
+    </system.webServer>
+</configuration>
diff --git a/whine.pl b/whine.pl
index a7e3ee1cf0..34fc2633a5 100755
--- a/whine.pl
+++ b/whine.pl
@@ -10,17 +10,18 @@
 # Script Initialization
 ################################################################################
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Search;
 use Bugzilla::User;
 use Bugzilla::Mailer;
+use Bugzilla::MIME;
 use Bugzilla::Util;
 use Bugzilla::Group;
 
@@ -37,38 +38,35 @@
 
 # These statement handles should live outside of their functions in order to
 # allow the database to keep their SQL compiled.
-my $sth_run_queries =
-    $dbh->prepare("SELECT " .
-                  "query_name, title, onemailperbug " .
-                  "FROM whine_queries " .
-                  "WHERE eventid=? " .
-                  "ORDER BY sortkey");
-my $sth_get_query =
-    $dbh->prepare("SELECT query FROM namedqueries " .
-                  "WHERE userid = ? AND name = ?");
+my $sth_run_queries
+  = $dbh->prepare("SELECT "
+    . "query_name, title, onemailperbug "
+    . "FROM whine_queries "
+    . "WHERE eventid=? "
+    . "ORDER BY sortkey");
+my $sth_get_query = $dbh->prepare(
+  "SELECT query FROM namedqueries " . "WHERE userid = ? AND name = ?");
 
 # get the event that's scheduled with the lowest run_next value
-my $sth_next_scheduled_event = $dbh->prepare(
-    "SELECT " .
-    " whine_schedules.eventid, " .
-    " whine_events.owner_userid, " .
-    " whine_events.subject, " .
-    " whine_events.body, " .
-    " whine_events.mailifnobugs " .
-    "FROM whine_schedules " .
-    "LEFT JOIN whine_events " .
-    " ON whine_events.id = whine_schedules.eventid " .
-    "WHERE run_next <= NOW() " .
-    "ORDER BY run_next " .
-    $dbh->sql_limit(1)
-);
+my $sth_next_scheduled_event
+  = $dbh->prepare("SELECT "
+    . " whine_schedules.eventid, "
+    . " whine_events.owner_userid, "
+    . " whine_events.subject, "
+    . " whine_events.body, "
+    . " whine_events.mailifnobugs "
+    . "FROM whine_schedules "
+    . "LEFT JOIN whine_events "
+    . " ON whine_events.id = whine_schedules.eventid "
+    . "WHERE run_next <= NOW() "
+    . "ORDER BY run_next "
+    . $dbh->sql_limit(1));
 
 # get all pending schedules matching an eventid
-my $sth_schedules_by_event = $dbh->prepare(
-    "SELECT id, mailto_type, mailto " .
-    "FROM whine_schedules " .
-    "WHERE eventid=? AND run_next <= NOW()"
-);
+my $sth_schedules_by_event
+  = $dbh->prepare("SELECT id, mailto_type, mailto "
+    . "FROM whine_schedules "
+    . "WHERE eventid=? AND run_next <= NOW()");
 
 
 ################################################################################
@@ -88,20 +86,25 @@
 my $fromaddress = Bugzilla->params->{'mailfrom'};
 
 # get the current date and time
-my ($now_sec, $now_minute, $now_hour, $now_day, $now_month, $now_year, 
-    $now_weekday) = localtime;
+my (
+  $now_sec,   $now_minute, $now_hour, $now_day,
+  $now_month, $now_year,   $now_weekday
+) = localtime;
+
 # Convert year to two digits
 $now_year = sprintf("%02d", $now_year % 100);
+
 # Convert the month to January being "1" instead of January being "0".
 $now_month++;
 
 my @daysinmonth = qw(0 31 28 31 30 31 30 31 31 30 31 30 31);
+
 # Alter February in case of a leap year.  This simple way to do it only
 # applies if you won't be looking at February of next year, which whining
 # doesn't need to do.
-if (($now_year % 4 == 0) &&
-    (($now_year % 100 != 0) || ($now_year % 400 == 0))) {
-    $daysinmonth[2] = 29;
+if (($now_year % 4 == 0) && (($now_year % 100 != 0) || ($now_year % 400 == 0)))
+{
+  $daysinmonth[2] = 29;
 }
 
 # run_day can contain either a calendar day (1, 2, 3...), a day of the week
@@ -113,67 +116,79 @@
 #
 # We go over each uninitialized schedule record and use its settings to
 # determine what the next time it runs should be
-my $sched_h = $dbh->prepare("SELECT id, run_day, run_time " .
-                            "FROM whine_schedules " .
-                            "WHERE run_next IS NULL" );
+my $sched_h
+  = $dbh->prepare("SELECT id, run_day, run_time "
+    . "FROM whine_schedules "
+    . "WHERE run_next IS NULL");
 $sched_h->execute();
 while (my ($schedule_id, $day, $time) = $sched_h->fetchrow_array) {
-    # fill in some defaults in case they're blank
-    $day  ||= '0';
-    $time ||= '0';
-
-    # If this schedule is supposed to run today, we see if it's supposed to be
-    # run at a particular hour.  If so, we set it for that hour, and if not,
-    # it runs at an interval over the course of a day, which means we should
-    # set it to run immediately.
-    if (&check_today($day)) {
-        # Values that are not entirely numeric are intervals, like "30min"
-        if ($time !~ /^\d+$/) {
-            # set it to now
-            $sth = $dbh->prepare( "UPDATE whine_schedules " .
-                                  "SET run_next=NOW() " .
-                                  "WHERE id=?");
-            $sth->execute($schedule_id);
-        }
-        # A time greater than now means it still has to run today
-        elsif ($time >= $now_hour) {
-            # set it to today + number of hours
-            $sth = $dbh->prepare(
-                "UPDATE whine_schedules " .
-                   "SET run_next = " .
-                        $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'HOUR') .
-                " WHERE id = ?");
-            $sth->execute($time, $schedule_id);
-        }
-        # the target time is less than the current time
-        else { # set it for the next applicable day
-            $day = &get_next_date($day);
-            my $run_next = $dbh->sql_date_math('(' 
-                . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'DAY')
-                . ')', '+', '?', 'HOUR');
-            $sth = $dbh->prepare("UPDATE whine_schedules " .
-                                    "SET run_next = $run_next
-                                   WHERE id = ?");
-            $sth->execute($day, $time, $schedule_id);
-        }
 
+  # fill in some defaults in case they're blank
+  $day  ||= '0';
+  $time ||= '0';
+
+  # If this schedule is supposed to run today, we see if it's supposed to be
+  # run at a particular hour.  If so, we set it for that hour, and if not,
+  # it runs at an interval over the course of a day, which means we should
+  # set it to run immediately.
+  if (&check_today($day)) {
+
+    # Values that are not entirely numeric are intervals, like "30min"
+    if ($time !~ /^\d+$/) {
+
+      # set it to now
+      $sth = $dbh->prepare(
+        "UPDATE whine_schedules " . "SET run_next=NOW() " . "WHERE id=?");
+      $sth->execute($schedule_id);
     }
-    # If the schedule is not supposed to run today, we set it to run on the
-    # appropriate date and time
-    else {
-        my $target_date = &get_next_date($day);
-        # If configured for a particular time, set it to that, otherwise
-        # midnight
-        my $target_time = ($time =~ /^\d+$/) ? $time : 0;
-
-       my $run_next = $dbh->sql_date_math('(' 
-            . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'DAY') 
-            . ')', '+', '?', 'HOUR');
-        $sth = $dbh->prepare("UPDATE whine_schedules " .
-                                "SET run_next = $run_next
-                               WHERE id = ?");
-        $sth->execute($target_date, $target_time, $schedule_id);
+
+    # A time greater than now means it still has to run today
+    elsif ($time >= $now_hour) {
+
+      # set it to today + number of hours
+      $sth
+        = $dbh->prepare("UPDATE whine_schedules "
+          . "SET run_next = "
+          . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'HOUR')
+          . " WHERE id = ?");
+      $sth->execute($time, $schedule_id);
+    }
+
+    # the target time is less than the current time
+    else {    # set it for the next applicable day
+      $day = &get_next_date($day);
+      my $run_next
+        = $dbh->sql_date_math(
+        '(' . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'DAY') . ')',
+        '+', '?', 'HOUR');
+      $sth = $dbh->prepare(
+        "UPDATE whine_schedules " . "SET run_next = $run_next
+                                   WHERE id = ?"
+      );
+      $sth->execute($day, $time, $schedule_id);
     }
+
+  }
+
+  # If the schedule is not supposed to run today, we set it to run on the
+  # appropriate date and time
+  else {
+    my $target_date = &get_next_date($day);
+
+    # If configured for a particular time, set it to that, otherwise
+    # midnight
+    my $target_time = ($time =~ /^\d+$/) ? $time : 0;
+
+    my $run_next
+      = $dbh->sql_date_math(
+      '(' . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'DAY') . ')',
+      '+', '?', 'HOUR');
+    $sth = $dbh->prepare(
+      "UPDATE whine_schedules " . "SET run_next = $run_next
+                               WHERE id = ?"
+    );
+    $sth->execute($target_date, $target_time, $schedule_id);
+  }
 }
 $sched_h->finish();
 
@@ -187,7 +202,7 @@
 #   5. Return an event hashref
 #
 # The event hashref consists of:
-#   eventid - ID of the event 
+#   eventid - ID of the event
 #   author  - user object for the event's creator
 #   users   - array of user objects for recipients
 #   subject - Subject line for the email
@@ -195,91 +210,85 @@
 #   mailifnobugs - send message even if there are no query or query results
 
 sub get_next_event {
-    my $event = {};
-
-    # Loop until there's something to return
-    until (scalar keys %{$event}) {
-
-        $dbh->bz_start_transaction();
-
-        # Get the event ID for the first pending schedule
-        $sth_next_scheduled_event->execute;
-        my $fetched = $sth_next_scheduled_event->fetch;
-        $sth_next_scheduled_event->finish;
-        return undef unless $fetched;
-        my ($eventid, $owner_id, $subject, $body, $mailifnobugs) = @{$fetched};
-
-        my $owner = Bugzilla::User->new($owner_id);
-
-        my $whineatothers = $owner->in_group('bz_canusewhineatothers');
-
-        my %user_objects;   # Used for keeping track of who has been added
-
-        # Get all schedules that match that event ID and are pending
-        $sth_schedules_by_event->execute($eventid);
-
-        # Add the users from those schedules to the list
-        while (my $row = $sth_schedules_by_event->fetch) {
-            my ($sid, $mailto_type, $mailto) = @{$row};
-
-            # Only bother doing any work if this user has whine permission
-            if ($owner->in_group('bz_canusewhines')) {
-
-                if ($mailto_type == MAILTO_USER) {
-                    if (not defined $user_objects{$mailto}) {
-                        if ($mailto == $owner_id) {
-                            $user_objects{$mailto} = $owner;
-                        }
-                        elsif ($whineatothers) {
-                            $user_objects{$mailto} = Bugzilla::User->new($mailto);
-                        }
-                    }
-                }
-                elsif ($mailto_type == MAILTO_GROUP) {
-                    my $sth = $dbh->prepare("SELECT name FROM groups " .
-                                            "WHERE id=?");
-                    $sth->execute($mailto);
-                    my $groupname = $sth->fetch->[0];
-                    my $group_id = Bugzilla::Group::ValidateGroupName(
-                        $groupname, $owner);
-                    if ($group_id) {
-                        my $glist = join(',',
-                            @{Bugzilla::Group->flatten_group_membership(
-                            $group_id)});
-                        $sth = $dbh->prepare("SELECT user_id FROM " .
-                                             "user_group_map " .
-                                             "WHERE group_id IN ($glist)");
-                        $sth->execute();
-                        for my $row (@{$sth->fetchall_arrayref}) {
-                            if (not defined $user_objects{$row->[0]}) {
-                                $user_objects{$row->[0]} =
-                                    Bugzilla::User->new($row->[0]);
-                            }
-                        }
-                    }
-                }
+  my $event = {};
 
-            }
+  # Loop until there's something to return
+  until (scalar keys %{$event}) {
 
-            reset_timer($sid);
-        }
+    $dbh->bz_start_transaction();
+
+    # Get the event ID for the first pending schedule
+    $sth_next_scheduled_event->execute;
+    my $fetched = $sth_next_scheduled_event->fetch;
+    $sth_next_scheduled_event->finish;
+    return undef unless $fetched;
+    my ($eventid, $owner_id, $subject, $body, $mailifnobugs) = @{$fetched};
+
+    my $owner = Bugzilla::User->new($owner_id);
+
+    my $whineatothers = $owner->in_group('bz_canusewhineatothers');
+
+    my %user_objects;    # Used for keeping track of who has been added
+
+    # Get all schedules that match that event ID and are pending
+    $sth_schedules_by_event->execute($eventid);
+
+    # Add the users from those schedules to the list
+    while (my $row = $sth_schedules_by_event->fetch) {
+      my ($sid, $mailto_type, $mailto) = @{$row};
 
-        $dbh->bz_commit_transaction();
-
-        # Only set $event if the user is allowed to do whining
-        if ($owner->in_group('bz_canusewhines')) {
-            my @users = values %user_objects;
-            $event = {
-                    'eventid' => $eventid,
-                    'author'  => $owner,
-                    'mailto'  => \@users,
-                    'subject' => $subject,
-                    'body'    => $body,
-                    'mailifnobugs' => $mailifnobugs,
-            };
+      # Only bother doing any work if this user has whine permission
+      if ($owner->in_group('bz_canusewhines')) {
+
+        if ($mailto_type == MAILTO_USER) {
+          if (not defined $user_objects{$mailto}) {
+            if ($mailto == $owner_id) {
+              $user_objects{$mailto} = $owner;
+            }
+            elsif ($whineatothers) {
+              $user_objects{$mailto} = Bugzilla::User->new($mailto);
+            }
+          }
+        }
+        elsif ($mailto_type == MAILTO_GROUP) {
+          my $sth = $dbh->prepare("SELECT name FROM groups " . "WHERE id=?");
+          $sth->execute($mailto);
+          my $groupname = $sth->fetch->[0];
+          my $group_id = Bugzilla::Group::ValidateGroupName($groupname, $owner);
+          if ($group_id) {
+            my $glist = join(',', @{Bugzilla::Group->flatten_group_membership($group_id)});
+            $sth = $dbh->prepare(
+              "SELECT user_id FROM " . "user_group_map " . "WHERE group_id IN ($glist)");
+            $sth->execute();
+            for my $row (@{$sth->fetchall_arrayref}) {
+              if (not defined $user_objects{$row->[0]}) {
+                $user_objects{$row->[0]} = Bugzilla::User->new($row->[0]);
+              }
+            }
+          }
         }
+
+      }
+
+      reset_timer($sid);
+    }
+
+    $dbh->bz_commit_transaction();
+
+    # Only set $event if the user is allowed to do whining
+    if ($owner->in_group('bz_canusewhines')) {
+      my @users = values %user_objects;
+      $event = {
+        'eventid'      => $eventid,
+        'author'       => $owner,
+        'mailto'       => \@users,
+        'subject'      => $subject,
+        'body'         => $body,
+        'mailifnobugs' => $mailifnobugs,
+      };
     }
-    return $event;
+  }
+  return $event;
 }
 
 # Run the queries for each event
@@ -293,38 +302,38 @@ sub get_next_event {
 #   mailifnobugs (send message even if there are no query or query results)
 while (my $event = get_next_event) {
 
-    my $eventid = $event->{'eventid'};
-
-    # We loop for each target user because some of the queries will be using
-    # subjective pronouns
-    $dbh = Bugzilla->switch_to_shadow_db();
-    for my $target (@{$event->{'mailto'}}) {
-        my $args = {
-            'subject'     => $event->{'subject'},
-            'body'        => $event->{'body'},
-            'eventid'     => $event->{'eventid'},
-            'author'      => $event->{'author'},
-            'recipient'   => $target,
-            'from'        => $fromaddress,
-        };
-
-        # run the queries for this schedule
-        my $queries = run_queries($args);
-
-        # If mailifnobugs is false, make sure there is something to output
-        if (!$event->{'mailifnobugs'}) {
-            my $there_are_bugs = 0;
-            for my $query (@{$queries}) {
-                $there_are_bugs = 1 if scalar @{$query->{'bugs'}};
-            }
-            next unless $there_are_bugs;
-        }
+  my $eventid = $event->{'eventid'};
+
+  # We loop for each target user because some of the queries will be using
+  # subjective pronouns
+  $dbh = Bugzilla->switch_to_shadow_db();
+  for my $target (@{$event->{'mailto'}}) {
+    my $args = {
+      'subject'   => $event->{'subject'},
+      'body'      => $event->{'body'},
+      'eventid'   => $event->{'eventid'},
+      'author'    => $event->{'author'},
+      'recipient' => $target,
+      'from'      => $fromaddress,
+    };
+
+    # run the queries for this schedule
+    my $queries = run_queries($args);
+
+    # If mailifnobugs is false, make sure there is something to output
+    if (!$event->{'mailifnobugs'}) {
+      my $there_are_bugs = 0;
+      for my $query (@{$queries}) {
+        $there_are_bugs = 1 if scalar @{$query->{'bugs'}};
+      }
+      next unless $there_are_bugs;
+    }
 
-        $args->{'queries'} = $queries;
+    $args->{'queries'} = $queries;
 
-        mail($args);
-    }
-    $dbh = Bugzilla->switch_to_main_db();
+    mail($args);
+  }
+  $dbh = Bugzilla->switch_to_main_db();
 }
 
 ################################################################################
@@ -346,145 +355,115 @@ sub get_next_event {
 #  - subject        Subject line for the message
 #  - recipient      user object for the recipient
 #  - author         user object of the person who created the whine event
-#
-# In addition, mail adds two more fields to $args:
-#  - alternatives   array of hashes defining mime multipart types and contents
-#  - boundary       a MIME boundary generated using the process id and time
-#
 sub mail {
-    my $args = shift;
-    my $addressee = $args->{recipient};
-    # Don't send mail to someone whose bugmail notification is disabled.
-    return if $addressee->email_disabled;
-
-    my $template = Bugzilla->template_inner($addressee->setting('lang'));
-    my $msg = ''; # it's a temporary variable to hold the template output
-    $args->{'alternatives'} ||= [];
-
-    # put together the different multipart mime segments
-
-    $template->process("whine/mail.txt.tmpl", $args, \$msg)
-        or die($template->error());
-    push @{$args->{'alternatives'}},
-        {
-            'content' => $msg,
-            'type'    => 'text/plain',
-        };
-    $msg = '';
-
-    $template->process("whine/mail.html.tmpl", $args, \$msg)
-        or die($template->error());
-    push @{$args->{'alternatives'}},
-        {
-            'content' => $msg,
-            'type'    => 'text/html',
-        };
-    $msg = '';
-
-    # now produce a ready-to-mail mime-encoded message
-
-    $args->{'boundary'} = "----------" . $$ . "--" . time() . "-----";
-
-    $template->process("whine/multipart-mime.txt.tmpl", $args, \$msg)
-        or die($template->error());
-
-    MessageToMTA($msg);
-
-    delete $args->{'boundary'};
-    delete $args->{'alternatives'};
-
+  my $args = shift;
+
+  # Don't send mail to someone whose bugmail notification is disabled.
+  return if $args->{recipient}->email_disabled;
+
+  $args->{to_user} = $args->{recipient};
+  MessageToMTA(generate_email(
+    $args,
+    {
+      header => 'whine/header.txt.tmpl',
+      text   => 'whine/mail.txt.tmpl',
+      html   => 'whine/mail.html.tmpl',
+    }
+  ));
 }
 
 # run_queries runs all of the queries associated with a schedule ID, adding
 # the results to $args or mailing off the template if a query wants individual
 # messages for each bug
 sub run_queries {
-    my $args = shift;
-
-    my $return_queries = [];
-
-    $sth_run_queries->execute($args->{'eventid'});
-    my @queries = ();
-    for (@{$sth_run_queries->fetchall_arrayref}) {
-        push(@queries,
-            {
-              'name'          => $_->[0],
-              'title'         => $_->[1],
-              'onemailperbug' => $_->[2],
-              'columnlist'    => [],
-              'bugs'          => [],
-            }
-        );
+  my $args = shift;
+
+  my $return_queries = [];
+
+  $sth_run_queries->execute($args->{'eventid'});
+  my @queries = ();
+  for (@{$sth_run_queries->fetchall_arrayref}) {
+    push(
+      @queries,
+      {
+        'name'          => $_->[0],
+        'title'         => $_->[1],
+        'onemailperbug' => $_->[2],
+        'columnlist'    => [],
+        'bugs'          => [],
+      }
+    );
+  }
+
+  foreach my $thisquery (@queries) {
+    next unless $thisquery->{'name'};    # named query is blank
+
+    my $savedquery = get_query($thisquery->{'name'}, $args->{'author'});
+    next unless $savedquery;             # silently ignore missing queries
+
+    # Execute the saved query
+    my @searchfields = ('bug_id', DEFAULT_COLUMN_LIST);
+
+    # A new Bugzilla::CGI object needs to be created to allow
+    # Bugzilla::Search to execute a saved query.  It's exceedingly weird,
+    # but that's how it works.
+    my $searchparams = new Bugzilla::CGI($savedquery);
+
+    # Use the columnlist for the saved query, if it exists, and make
+    # sure bug_id is always in the list.
+    if (my $columnlist = $searchparams->param('columnlist')) {
+      @searchfields = split(/[\s,]+/, $columnlist);
+      unshift(@searchfields, 'bug_id') unless grep { $_ eq 'bug_id' } @searchfields;
+    }
+    push @{$thisquery->{'columnlist'}}, @searchfields;
+
+    my @orderstrings = split(/,\s*/, $searchparams->param('order') || '');
+    my $search = new Bugzilla::Search(
+      'fields' => \@searchfields,
+      'params' => scalar $searchparams->Vars,
+      'user'   => $args->{'recipient'},         # the search runs as the recipient
+      'order'  => \@orderstrings
+    );
+
+    # If a query fails for whatever reason, it shouldn't kill the script.
+    my $data = eval { $search->data };
+    if ($@) {
+      print STDERR get_text('whine_query_failed',
+        {query_name => $thisquery->{'name'}, author => $args->{'author'}, reason => $@})
+        . "\n";
+      next;
     }
 
-    foreach my $thisquery (@queries) {
-        next unless $thisquery->{'name'};   # named query is blank
-
-        my $savedquery = get_query($thisquery->{'name'}, $args->{'author'});
-        next unless $savedquery;    # silently ignore missing queries
-
-        # Execute the saved query
-        my @searchfields = ('bug_id', DEFAULT_COLUMN_LIST);
-
-        # A new Bugzilla::CGI object needs to be created to allow
-        # Bugzilla::Search to execute a saved query.  It's exceedingly weird,
-        # but that's how it works.
-        my $searchparams = new Bugzilla::CGI($savedquery);
-
-        # Use the columnlist for the saved query, if it exists, and make
-        # sure bug_id is always in the list.
-        if (my $columnlist = $searchparams->param('columnlist')) {
-            @searchfields = split(/[\s,]+/, $columnlist);
-            unshift(@searchfields, 'bug_id') unless grep { $_ eq 'bug_id' } @searchfields;
-        }
-        push @{$thisquery->{'columnlist'}}, @searchfields;
-
-        my @orderstrings = split(/,\s*/, $searchparams->param('order') || '');
-        my $search = new Bugzilla::Search(
-            'fields' => \@searchfields,
-            'params' => scalar $searchparams->Vars,
-            'user'   => $args->{'recipient'}, # the search runs as the recipient
-            'order'  => \@orderstrings
-        );
-        # If a query fails for whatever reason, it shouldn't kill the script.
-        my $data = eval { $search->data };
-        if ($@) {
-            print STDERR get_text('whine_query_failed', { query_name => $thisquery->{'name'},
-                                                          author => $args->{'author'},
-                                                          reason => $@ }) . "\n";
-            next;
-        }
-
-        foreach my $row (@$data) {
-            my $bug = {};
-            for my $field (@searchfields) {
-                my $fieldname = $field;
-                $fieldname =~ s/^bugs\.//;  # No need for bugs.whatever
-                $bug->{$fieldname} = shift @$row;
-            }
-
-            if ($thisquery->{'onemailperbug'}) {
-                $args->{'queries'} = [
-                    {
-                        'name' => $thisquery->{'name'},
-                        'title' => $thisquery->{'title'},
-                        'columnlist' => $thisquery->{'columnlist'},
-                        'bugs' => [ $bug ],
-                    },
-                ];
-                mail($args);
-                delete $args->{'queries'};
-            }
-            else {  # It belongs in one message with any other lists
-                push @{$thisquery->{'bugs'}}, $bug;
-            }
-        }
-        if (!$thisquery->{'onemailperbug'} && @{$thisquery->{'bugs'}}) {
-            push @{$return_queries}, $thisquery;
-        }
+    foreach my $row (@$data) {
+      my $bug = {};
+      for my $field (@searchfields) {
+        my $fieldname = $field;
+        $fieldname =~ s/^bugs\.//;    # No need for bugs.whatever
+        $bug->{$fieldname} = shift @$row;
+      }
+
+      if ($thisquery->{'onemailperbug'}) {
+        $args->{'queries'} = [
+          {
+            'name'       => $thisquery->{'name'},
+            'title'      => $thisquery->{'title'},
+            'columnlist' => $thisquery->{'columnlist'},
+            'bugs'       => [$bug],
+          },
+        ];
+        mail($args);
+        delete $args->{'queries'};
+      }
+      else {    # It belongs in one message with any other lists
+        push @{$thisquery->{'bugs'}}, $bug;
+      }
     }
+    if (!$thisquery->{'onemailperbug'} && @{$thisquery->{'bugs'}}) {
+      push @{$return_queries}, $thisquery;
+    }
+  }
 
-    return $return_queries;
+  return $return_queries;
 }
 
 # get_query gets the namedquery.  It's similar to LookupNamedQuery (in
@@ -492,12 +471,12 @@ sub run_queries {
 # individual named queries might go away without the whine_queries that point
 # to them being removed.
 sub get_query {
-    my ($name, $user) = @_;
-    my $qname = $name;
-    $sth_get_query->execute($user->id, $qname);
-    my $fetched = $sth_get_query->fetch;
-    $sth_get_query->finish;
-    return $fetched ? $fetched->[0] : '';
+  my ($name, $user) = @_;
+  my $qname = $name;
+  $sth_get_query->execute($user->id, $qname);
+  my $fetched = $sth_get_query->fetch;
+  $sth_get_query->finish;
+  return $fetched ? $fetched->[0] : '';
 }
 
 # check_today gets a run day from the schedule and sees if it matches today
@@ -509,25 +488,23 @@ sub get_query {
 #   - 'MF' for every weekday
 
 sub check_today {
-    my $run_day  = shift;
-
-    if (($run_day eq 'MF')
-     && ($now_weekday > 0)
-     && ($now_weekday < 6)) {
-        return 1;
-    }
-    elsif (
-         length($run_day) == 3 &&
-         index("SunMonTueWedThuFriSat", $run_day)/3 == $now_weekday) {
-        return 1;
-    }
-    elsif  (($run_day eq 'All')
-         || (($run_day eq 'last')  &&
-             ($now_day == $daysinmonth[$now_month] ))
-         || ($run_day eq $now_day)) {
-        return 1;
-    }
-    return 0;
+  my $run_day = shift;
+
+  if (($run_day eq 'MF') && ($now_weekday > 0) && ($now_weekday < 6)) {
+    return 1;
+  }
+  elsif (length($run_day) == 3
+    && index("SunMonTueWedThuFriSat", $run_day) / 3 == $now_weekday)
+  {
+    return 1;
+  }
+  elsif (($run_day eq 'All')
+    || (($run_day eq 'last') && ($now_day == $daysinmonth[$now_month]))
+    || ($run_day eq $now_day))
+  {
+    return 1;
+  }
+  return 0;
 }
 
 # reset_timer sets the next time a whine is supposed to run, assuming it just
@@ -536,95 +513,101 @@ sub check_today {
 # reset_timer does not lock the whine_schedules table.  Anything that calls it
 # should do that itself.
 sub reset_timer {
-    my $schedule_id = shift;
-
-    # Schedules may not be executed more than once for each invocation of
-    # whine.pl -- there are legitimate circumstances that can cause this, like
-    # a set of whines that take a very long time to execute, so it's done
-    # quietly.
-    if (grep($_ == $schedule_id, @seen_schedules)) {
-        null_schedule($schedule_id);
-        return;
-    }
-    push @seen_schedules, $schedule_id;
-
-    $sth = $dbh->prepare( "SELECT run_day, run_time FROM whine_schedules " .
-                          "WHERE id=?" );
-    $sth->execute($schedule_id);
-    my ($run_day, $run_time) = $sth->fetchrow_array;
-
-    # It may happen that the run_time field is NULL or blank due to
-    # a bug in editwhines.cgi when this field was initially 0.
-    $run_time ||= 0;
-
-    my $run_today = 0;
-    my $minute_offset = 0;
-
-    # If the schedule is to run today, and it runs many times per day,
-    # it shall be set to run immediately.
-    $run_today = &check_today($run_day);
-    if (($run_today) && ($run_time !~ /^\d+$/)) {
-        # The default of 60 catches any bad value
-        my $minute_interval = 60;
-        if ($run_time =~ /^(\d+)min$/i) {
-            $minute_interval = $1;
-        }
-
-        # set the minute offset to the next interval point
-        $minute_offset = $minute_interval - ($now_minute % $minute_interval);
-    }
-    elsif (($run_today) && ($run_time > $now_hour)) {
-        # timed event for later today
-        # (This should only happen if, for example, an 11pm scheduled event
-        #  didn't happen until after midnight)
-        $minute_offset = (60 * ($run_time - $now_hour)) - $now_minute;
-    }
-    else {
-        # it's not something that runs later today.
-        $minute_offset = 0;
-
-        # Set the target time if it's a specific hour
-        my $target_time = ($run_time =~ /^\d+$/) ? $run_time : 0;
-
-        my $nextdate = &get_next_date($run_day);
-        my $run_next = $dbh->sql_date_math('('
-            . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'DAY')
-            . ')', '+', '?', 'HOUR');
-        $sth = $dbh->prepare("UPDATE whine_schedules " .
-                                "SET run_next = $run_next
-                               WHERE id = ?");
-        $sth->execute($nextdate, $target_time, $schedule_id);
-        return;
+  my $schedule_id = shift;
+
+  # Schedules may not be executed more than once for each invocation of
+  # whine.pl -- there are legitimate circumstances that can cause this, like
+  # a set of whines that take a very long time to execute, so it's done
+  # quietly.
+  if (grep($_ == $schedule_id, @seen_schedules)) {
+    null_schedule($schedule_id);
+    return;
+  }
+  push @seen_schedules, $schedule_id;
+
+  $sth = $dbh->prepare(
+    "SELECT run_day, run_time FROM whine_schedules " . "WHERE id=?");
+  $sth->execute($schedule_id);
+  my ($run_day, $run_time) = $sth->fetchrow_array;
+
+  # It may happen that the run_time field is NULL or blank due to
+  # a bug in editwhines.cgi when this field was initially 0.
+  $run_time ||= 0;
+
+  my $run_today     = 0;
+  my $minute_offset = 0;
+
+  # If the schedule is to run today, and it runs many times per day,
+  # it shall be set to run immediately.
+  $run_today = &check_today($run_day);
+  if (($run_today) && ($run_time !~ /^\d+$/)) {
+
+    # The default of 60 catches any bad value
+    my $minute_interval = 60;
+    if ($run_time =~ /^(\d+)min$/i) {
+      $minute_interval = $1;
     }
 
-    if ($minute_offset > 0) {
-        # Scheduling is done in terms of whole minutes.
-        
-        my $next_run = $dbh->selectrow_array(
-            'SELECT ' . $dbh->sql_date_math('NOW()', '+', '?', 'MINUTE'),
-            undef, $minute_offset);
-        $next_run = format_time($next_run, "%Y-%m-%d %R");
-
-        $sth = $dbh->prepare("UPDATE whine_schedules " .
-                             "SET run_next = ? WHERE id = ?");
-        $sth->execute($next_run, $schedule_id);
-    } else {
-        # The minute offset is zero or less, which is not supposed to happen.
-        # complain to STDERR
-        null_schedule($schedule_id);
-        print STDERR "Error: bad minute_offset for schedule ID $schedule_id\n";
-    }
+    # set the minute offset to the next interval point
+    $minute_offset = $minute_interval - ($now_minute % $minute_interval);
+  }
+  elsif (($run_today) && ($run_time > $now_hour)) {
+
+    # timed event for later today
+    # (This should only happen if, for example, an 11pm scheduled event
+    #  didn't happen until after midnight)
+    $minute_offset = (60 * ($run_time - $now_hour)) - $now_minute;
+  }
+  else {
+    # it's not something that runs later today.
+    $minute_offset = 0;
+
+    # Set the target time if it's a specific hour
+    my $target_time = ($run_time =~ /^\d+$/) ? $run_time : 0;
+
+    my $nextdate = &get_next_date($run_day);
+    my $run_next
+      = $dbh->sql_date_math(
+      '(' . $dbh->sql_date_math('CURRENT_DATE', '+', '?', 'DAY') . ')',
+      '+', '?', 'HOUR');
+    $sth = $dbh->prepare(
+      "UPDATE whine_schedules " . "SET run_next = $run_next
+                               WHERE id = ?"
+    );
+    $sth->execute($nextdate, $target_time, $schedule_id);
+    return;
+  }
+
+  if ($minute_offset > 0) {
+
+    # Scheduling is done in terms of whole minutes.
+
+    my $next_run
+      = $dbh->selectrow_array(
+      'SELECT ' . $dbh->sql_date_math('NOW()', '+', '?', 'MINUTE'),
+      undef, $minute_offset);
+    $next_run = format_time($next_run, "%Y-%m-%d %R");
+
+    $sth
+      = $dbh->prepare("UPDATE whine_schedules " . "SET run_next = ? WHERE id = ?");
+    $sth->execute($next_run, $schedule_id);
+  }
+  else {
+    # The minute offset is zero or less, which is not supposed to happen.
+    # complain to STDERR
+    null_schedule($schedule_id);
+    print STDERR "Error: bad minute_offset for schedule ID $schedule_id\n";
+  }
 }
 
 # null_schedule is used to safeguard against infinite loops.  Schedules with
 # run_next set to NULL will not be available to get_next_event until they are
 # rescheduled, which only happens when whine.pl starts.
 sub null_schedule {
-    my $schedule_id = shift;
-    $sth = $dbh->prepare("UPDATE whine_schedules " .
-                         "SET run_next = NULL " .
-                         "WHERE id=?");
-    $sth->execute($schedule_id);
+  my $schedule_id = shift;
+  $sth = $dbh->prepare(
+    "UPDATE whine_schedules " . "SET run_next = NULL " . "WHERE id=?");
+  $sth->execute($schedule_id);
 }
 
 # get_next_date determines the difference in days between now and the next
@@ -633,56 +616,58 @@ sub null_schedule {
 # It takes a run_day argument (see check_today, above, for an explanation),
 # and returns an integer, representing a number of days.
 sub get_next_date {
-    my $day = shift;
+  my $day = shift;
 
-    my $add_days = 0;
+  my $add_days = 0;
 
-    if ($day eq 'All') {
-        $add_days = 1;
+  if ($day eq 'All') {
+    $add_days = 1;
+  }
+  elsif ($day eq 'last') {
+
+    # next_date should contain the last day of this month, or next month
+    # if it's today
+    if ($daysinmonth[$now_month] == $now_day) {
+      my $month = $now_month + 1;
+      $month = 1 if $month > 12;
+      $add_days = $daysinmonth[$month] + 1;
     }
-    elsif ($day eq 'last') {
-        # next_date should contain the last day of this month, or next month
-        # if it's today
-        if ($daysinmonth[$now_month] == $now_day) {
-            my $month = $now_month + 1;
-            $month = 1 if $month > 12;
-            $add_days = $daysinmonth[$month] + 1;
-        }
-        else {
-            $add_days = $daysinmonth[$now_month] - $now_day;
-        }
+    else {
+      $add_days = $daysinmonth[$now_month] - $now_day;
     }
-    elsif ($day eq 'MF') { # any day Monday through Friday
-        if ($now_weekday < 5) { # Sun-Thurs
-            $add_days = 1;
-        }
-        elsif ($now_weekday == 5) { # Friday
-            $add_days = 3;
-        }
-        else { # it's 6, Saturday
-            $add_days = 2;
-        }
+  }
+  elsif ($day eq 'MF') {    # any day Monday through Friday
+    if ($now_weekday < 5) {    # Sun-Thurs
+      $add_days = 1;
+    }
+    elsif ($now_weekday == 5) {    # Friday
+      $add_days = 3;
+    }
+    else {                         # it's 6, Saturday
+      $add_days = 2;
     }
-    elsif ($day !~ /^\d+$/) { # A specific day of the week
+  }
+  elsif ($day !~ /^\d+$/) {        # A specific day of the week
         # The default is used if there is a bad value in the database, in
         # which case we mark it to a less-popular day (Sunday)
-        my $day_num = 0;
+    my $day_num = 0;
 
-        if (length($day) == 3) {
-            $day_num = (index("SunMonTueWedThuFriSat", $day)/3) or 0;
-        }
+    if (length($day) == 3) {
+      $day_num = (index("SunMonTueWedThuFriSat", $day) / 3) or 0;
+    }
 
-        $add_days = $day_num - $now_weekday;
-        if ($add_days <= 0) { # it's next week
-            $add_days += 7;
-        }
+    $add_days = $day_num - $now_weekday;
+    if ($add_days <= 0) {    # it's next week
+      $add_days += 7;
     }
-    else { # it's a number, so we set it for that calendar day
-        $add_days = $day - $now_day;
-        # If it's already beyond that day this month, set it to the next one
-        if ($add_days <= 0) {
-            $add_days += $daysinmonth[$now_month];
-        }
+  }
+  else {                     # it's a number, so we set it for that calendar day
+    $add_days = $day - $now_day;
+
+    # If it's already beyond that day this month, set it to the next one
+    if ($add_days <= 0) {
+      $add_days += $daysinmonth[$now_month];
     }
-    return $add_days;
+  }
+  return $add_days;
 }
diff --git a/whineatnews.pl b/whineatnews.pl
index 4812b4cfe2..f940b14789 100755
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -7,18 +7,18 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 
-# This is a script suitable for running once a day from a cron job.  It 
-# looks at all the bugs, and sends whiny mail to anyone who has a bug 
+# This is a script suitable for running once a day from a cron job.  It
+# looks at all the bugs, and sends whiny mail to anyone who has a bug
 # assigned to them that has status CONFIRMED, NEW, or REOPENED that has not
 # been touched for more than the number of days specified in the whinedays
 # param. (We have NEW and REOPENED in there to keep compatibility with old
 # Bugzillas.)
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Mailer;
@@ -28,58 +28,59 @@
 # Whining is disabled if whinedays is zero
 exit unless Bugzilla->params->{'whinedays'} >= 1;
 
-my $dbh = Bugzilla->dbh;
+my $dbh   = Bugzilla->dbh;
 my $query = q{SELECT bug_id, short_desc, login_name
                 FROM bugs
           INNER JOIN profiles
                   ON userid = assigned_to
                WHERE bug_status IN (?,?,?)
                  AND disable_mail = 0
-                 AND } . $dbh->sql_to_days('NOW()') . " - " .
-                       $dbh->sql_to_days('delta_ts') . " > " .
-                       Bugzilla->params->{'whinedays'} .
-          " ORDER BY bug_id";
+                 AND }
+  . $dbh->sql_to_days('NOW()') . " - "
+  . $dbh->sql_to_days('delta_ts') . " > "
+  . Bugzilla->params->{'whinedays'}
+  . " ORDER BY bug_id";
 
 my %bugs;
 my %desc;
 
-my $slt_bugs = $dbh->selectall_arrayref($query, undef, 'CONFIRMED', 'NEW',
-                                                       'REOPENED');
+my $slt_bugs
+  = $dbh->selectall_arrayref($query, undef, 'CONFIRMED', 'NEW', 'REOPENED');
 
 foreach my $bug (@$slt_bugs) {
-    my ($id, $desc, $email) = @$bug;
-    if (!defined $bugs{$email}) {
-        $bugs{$email} = [];
-    }
-    if (!defined $desc{$email}) {
-        $desc{$email} = [];
-    }
-    push @{$bugs{$email}}, $id;
-    push @{$desc{$email}}, $desc;
+  my ($id, $desc, $login) = @$bug;
+  if (!defined $bugs{$login}) {
+    $bugs{$login} = [];
+  }
+  if (!defined $desc{$login}) {
+    $desc{$login} = [];
+  }
+  push @{$bugs{$login}}, $id;
+  push @{$desc{$login}}, $desc;
 }
 
 
-foreach my $email (sort (keys %bugs)) {
-    my $user = new Bugzilla::User({name => $email});
-    next if $user->email_disabled;
+foreach my $login (sort (keys %bugs)) {
+  my $user = new Bugzilla::User({name => $login});
+  next if $user->email_disabled;
 
-    my $vars = {'email' => $email};
+  my $vars = {'email' => $user->email};
 
-    my @bugs = ();
-    foreach my $i (@{$bugs{$email}}) {
-        my $bug = {};
-        $bug->{'summary'} = shift(@{$desc{$email}});
-        $bug->{'id'} = $i;
-        push @bugs, $bug;
-    }
-    $vars->{'bugs'} = \@bugs;
+  my @bugs = ();
+  foreach my $i (@{$bugs{$login}}) {
+    my $bug = {};
+    $bug->{'summary'} = shift(@{$desc{$login}});
+    $bug->{'id'}      = $i;
+    push @bugs, $bug;
+  }
+  $vars->{'bugs'} = \@bugs;
 
-    my $msg;
-    my $template = Bugzilla->template_inner($user->setting('lang'));
-    $template->process("email/whine.txt.tmpl", $vars, \$msg)
-      or die($template->error());
+  my $msg;
+  my $template = Bugzilla->template_inner($user->setting('lang'));
+  $template->process("email/whine.txt.tmpl", $vars, \$msg)
+    or die($template->error());
 
-    MessageToMTA($msg);
+  MessageToMTA($msg);
 
-    say "$email      " . join(" ", @{$bugs{$email}});
+  say $user->email . "      " . join(" ", @{$bugs{$login}});
 }
diff --git a/xmlrpc.cgi b/xmlrpc.cgi
index 893bfba5d8..2341bb04ea 100755
--- a/xmlrpc.cgi
+++ b/xmlrpc.cgi
@@ -6,20 +6,21 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::WebService::Constants;
+
 BEGIN {
-    if (!Bugzilla->feature('xmlrpc')) {
-        ThrowUserError('feature_disabled', { feature => 'xmlrpc' });
-    }
+  if (!Bugzilla->feature('xmlrpc')) {
+    ThrowUserError('feature_disabled', {feature => 'xmlrpc'});
+  }
 }
 use Bugzilla::WebService::Server::XMLRPC;
 
@@ -28,6 +29,7 @@ Bugzilla->usage_mode(USAGE_MODE_XMLRPC);
 # Fix the error code that SOAP::Lite uses for Perl errors.
 local $SOAP::Constants::FAULT_SERVER;
 $SOAP::Constants::FAULT_SERVER = ERROR_UNKNOWN_FATAL;
+
 # The line above is used, this one is ignored, but SOAP::Lite
 # might start using this constant (the correct one) for XML-RPC someday.
 local $XMLRPC::Constants::FAULT_SERVER;
@@ -35,8 +37,8 @@ $XMLRPC::Constants::FAULT_SERVER = ERROR_UNKNOWN_FATAL;
 
 local @INC = (bz_locations()->{extensionsdir}, @INC);
 my $server = new Bugzilla::WebService::Server::XMLRPC;
-# We use a sub for on_action because that gets us the info about what 
-# class is being called. Note that this is a hack--this is technically 
+
+# We use a sub for on_action because that gets us the info about what
+# class is being called. Note that this is a hack--this is technically
 # for setting SOAPAction, which isn't used by XML-RPC.
-$server->on_action(sub { $server->handle_login(WS_DISPATCH, @_) })
-       ->handle();
+$server->on_action(sub { $server->handle_login(WS_DISPATCH, @_) })->handle();
diff --git a/xt/README b/xt/README
deleted file mode 100644
index 22f9f171be..0000000000
--- a/xt/README
+++ /dev/null
@@ -1,18 +0,0 @@
-The tests in this directory require a working database, as opposed
-to the tests in t/, which simply test the code without a working
-installation.
-
-Some of the tests may modify your current working installation, even
-if only temporarily. To run the tests that modify your database,
-set the environment variable BZ_WRITE_TESTS to 1.
-
-Some tests also take additional, optional arguments. You can pass arguments
-to tests like:
-
-  prove xt/search.t :: --long --operators=equals,notequals
-
-Note the "::"--that is necessary to note that the arguments are going to
-the test, not to "prove".
-
-See the perldoc of the individual tests to see what options they support,
-or do "perl xt/search.t --help".
diff --git a/xt/config/checksetup_answers.txt b/xt/config/checksetup_answers.txt
new file mode 100644
index 0000000000..77484c7771
--- /dev/null
+++ b/xt/config/checksetup_answers.txt
@@ -0,0 +1,27 @@
+ $answer{'db_host'} = 'localhost';
+ $answer{'db_driver'} = '%DB%';
+ $answer{'db_port'} = 0;
+ $answer{'db_name'} = 'bugs_test',
+ $answer{'db_user'} = 'bugs';
+ $answer{'db_pass'} = 'bugs';
+ $answer{'db_sock'} = '';
+ $answer{'db_check'} = 1;
+ $answer{'db_mysql_ssl_ca_file'} = '';
+ $answer{'db_mysql_ssl_ca_path'} = '';
+ $answer{'db_mysql_ssl_client_cert'} = '';
+ $answer{'db_mysql_ssl_client_key'} = '';
+ $answer{'urlbase'} = 'http://localhost/bugzilla/';
+ $answer{'use_email_as_login'} = 1;
+ $answer{'create_htaccess'} = '';
+ $answer{'use_suexec'} = '';
+ $answer{'index_html'} = 0;
+ $answer{'cvsbin'} = '/usr/bin/cvs';
+ $answer{'interdiffbin'} = '/usr/bin/interdiff';
+ $answer{'diffpath'} = '/usr/bin';
+ $answer{'webservergroup'} = 'bugzilla';
+ $answer{'ADMIN_OK'} = 'Y';
+ $answer{'ADMIN_EMAIL'} = 'admin@bugzilla.org';
+ $answer{'ADMIN_LOGIN'} = 'admin';
+ $answer{'ADMIN_PASSWORD'} = 'password';
+ $answer{'ADMIN_REALNAME'} = 'QA Admin';
+ $answer{'NO_PAUSE'} = 1;
diff --git a/xt/config/generate_test_data.pl b/xt/config/generate_test_data.pl
new file mode 100755
index 0000000000..d56c146729
--- /dev/null
+++ b/xt/config/generate_test_data.pl
@@ -0,0 +1,678 @@
+#!/usr/bin/perl
+
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use Cwd;
+
+my $conf_path;
+my $config;
+
+BEGIN {
+  say 'reading the config file...';
+  my $conf_file = 'selenium_test.conf';
+  $config = do "$conf_file" or die "can't read configuration '$conf_file': $!$@";
+
+  $conf_path = $config->{bugzilla_path};
+
+  # We don't want randomly-generated keys. We want the ones specified
+  # in the config file so that we can use them in tests scripts.
+  *Bugzilla::User::APIKey::_check_api_key = sub { return $_[1]; };
+}
+
+use lib $conf_path, "$conf_path/local/lib/perl5";
+
+use Bugzilla;
+use Bugzilla::Attachment;
+use Bugzilla::Bug;
+use Bugzilla::User;
+use Bugzilla::Install;
+use Bugzilla::Milestone;
+use Bugzilla::Product;
+use Bugzilla::Component;
+use Bugzilla::Group;
+use Bugzilla::Version;
+use Bugzilla::Constants;
+use Bugzilla::Keyword;
+use Bugzilla::Config qw(:admin);
+use Bugzilla::User::Setting;
+use Bugzilla::User::APIKey;
+
+my $dbh = Bugzilla->dbh;
+
+# set Bugzilla usage mode to USAGE_MODE_CMDLINE
+Bugzilla->usage_mode(USAGE_MODE_CMDLINE);
+
+##########################################################################
+# Set Parameters
+##########################################################################
+
+# Some parameters must be turned on to create bugs requiring them.
+# They are also expected to be turned on by some webservice_*.t scripts.
+my ($urlbase, $sslbase);
+$urlbase = $config->{browser_url} . '/' . $config->{bugzilla_installation};
+$urlbase .= '/' unless $urlbase =~ /\/$/;
+
+if ($urlbase =~ /^https/) {
+  $sslbase = $urlbase;
+  $urlbase =~ s/^https(.+)$/http$1/;
+}
+
+my %set_params = (
+  urlbase              => $urlbase,
+  sslbase              => $sslbase,
+  useqacontact         => 1,
+  mail_delivery_method => 'Test',
+  maxattachmentsize    => 256,
+);
+
+my $params_modified;
+foreach my $param (keys %set_params) {
+  my $value = $set_params{$param};
+  next unless defined $value && Bugzilla->params->{$param} ne $value;
+  SetParam($param, $value);
+  $params_modified = 1;
+}
+
+write_params() if $params_modified;
+
+##########################################################################
+# Set Default User Preferences
+##########################################################################
+
+# When editing a bug, the page being displayed depends on the
+# post_bug_submit_action user pref. We set it globally so that we know
+# the exact behavior of process_bug.cgi.
+my %user_prefs = (post_bug_submit_action => 'nothing');
+
+foreach my $pref (keys %user_prefs) {
+  my $value = $user_prefs{$pref};
+  Bugzilla::User::Setting::set_default($pref, $value, 0);
+}
+
+##########################################################################
+# Create Users
+##########################################################################
+
+# First of all, remove the default .* regexp for the editbugs group.
+my $group = Bugzilla::Group->new({name => 'editbugs'});
+$group->set_user_regexp('');
+$group->update();
+
+my @usernames = (
+  'admin',       'no-privs',       'QA-Selenium-TEST', 'canconfirm',
+  'tweakparams', 'permanent_user', 'editbugs',         'disabled',
+);
+
+say 'creating user accounts...';
+foreach my $username (@usernames) {
+  my ($password, $login);
+
+  my $prefix = $username;
+  if ($username eq 'permanent_user') {
+    $password = $config->{admin_user_passwd};
+    $login    = $config->{$username};
+  }
+  elsif ($username eq 'no-privs') {
+    $prefix = 'unprivileged';
+  }
+  elsif ($username eq 'QA-Selenium-TEST') {
+    $prefix = 'QA_Selenium_TEST';
+  }
+
+  $password ||= $config->{"${prefix}_user_passwd"};
+  $login    ||= $config->{"${prefix}_user_login"};
+  my $api_key = $config->{"${prefix}_user_api_key"};
+
+  if (is_available_email($login)) {
+    my %extra_args;
+    if ($username eq 'disabled') {
+      $extra_args{disabledtext} = '!!This is the text!!';
+    }
+
+    my $user = Bugzilla::User->create({
+      login_name    => $login,
+      email         => $login,
+      realname      => $username,
+      cryptpassword => $password,
+      %extra_args,
+    });
+
+    if ($api_key) {
+      Bugzilla::User::APIKey->create({
+        user_id     => $user->id,
+        description => 'API key for QA tests',
+        api_key     => $api_key
+      });
+    }
+
+    if ($username eq 'admin' or $username eq 'permanent_user') {
+      Bugzilla::Install::make_admin($login);
+    }
+  }
+}
+
+##########################################################################
+# Create Bugs
+##########################################################################
+
+# login to bugzilla
+my $admin_user = Bugzilla::User->check($config->{admin_user_login});
+Bugzilla->set_user($admin_user);
+
+my %field_values = (
+  'priority'     => 'Highest',
+  'bug_status'   => 'CONFIRMED',
+  'version'      => 'unspecified',
+  'bug_file_loc' => '',
+  'comment'      => 'please ignore this bug',
+  'component'    => 'TestComponent',
+  'rep_platform' => 'All',
+  'short_desc'   => 'This is a testing bug only',
+  'product'      => 'TestProduct',
+  'op_sys'       => 'Linux',
+  'bug_severity' => 'normal',
+);
+
+say 'creating bugs...';
+my $bug = Bugzilla::Bug->create(\%field_values);
+say 'Bug ' . $bug->id . ' created';
+if (Bugzilla::Bug->new('public_bug')->{error}) {
+
+  # The deadline must be set so that this bug can be used to test
+  # timetracking fields using WebServices.
+  $bug = Bugzilla::Bug->create(
+    {%field_values, alias => 'public_bug', deadline => '2010-01-01'});
+  say 'Bug ' . $bug->id . ' (alias: public_bug) created';
+}
+
+##########################################################################
+# Create Classifications
+##########################################################################
+
+my @classifications = (
+  {name => 'Class2_QA', description => "required by Selenium... DON'T DELETE"},
+);
+
+say 'creating classifications...';
+for my $class (@classifications) {
+  my $new_class = Bugzilla::Classification->new({name => $class->{name}});
+  if (!$new_class) {
+    $dbh->do('INSERT INTO classifications (name, description) VALUES (?, ?)',
+      undef, ($class->{name}, $class->{description}));
+  }
+}
+##########################################################################
+# Create Products
+##########################################################################
+
+my @products = (
+  {
+    product_name     => 'QA-Selenium-TEST',
+    description      => "used by Selenium test.. DON'T DELETE",
+    versions         => ['unspecified', 'QAVersion'],
+    milestones       => ['QAMilestone'],
+    defaultmilestone => '---',
+    components       => [{
+      name             => 'QA-Selenium-TEST',
+      description      => "used by Selenium test.. DON'T DELETE",
+      initialowner     => $config->{QA_Selenium_TEST_user_login},
+      initialqacontact => $config->{QA_Selenium_TEST_user_login},
+      initial_cc       => [$config->{QA_Selenium_TEST_user_login}],
+    }],
+  },
+
+  {
+    product_name     => 'Another Product',
+    description      => 'Alternate product used by Selenium. <b>Do not edit!</b>',
+    versions         => ['unspecified', 'Another1', 'Another2'],
+    milestones       => ['AnotherMS1', 'AnotherMS2', 'Milestone'],
+    defaultmilestone => '---',
+    components       => [
+      {
+        name             => 'c1',
+        description      => 'c1',
+        initialowner     => $config->{permanent_user},
+        initialqacontact => '',
+        initial_cc       => [],
+      },
+      {
+        name             => 'c2',
+        description      => 'c2',
+        initialowner     => $config->{permanent_user},
+        initialqacontact => '',
+        initial_cc       => [],
+      },
+    ],
+  },
+
+  {
+    product_name => 'C2 Forever',
+    description  => 'I must remain in the Class2_QA classification '
+      . 'in all cases! Do not edit!',
+    classification   => 'Class2_QA',
+    versions         => ['unspecified', 'C2Ver'],
+    milestones       => ['C2Mil'],
+    defaultmilestone => '---',
+    components       => [{
+      name             => 'Helium',
+      description      => 'Feel free to add bugs to me',
+      initialowner     => $config->{permanent_user},
+      initialqacontact => '',
+      initial_cc       => [],
+    }],
+  },
+
+  {
+    product_name     => 'QA Entry Only',
+    description      => 'Only the QA group may enter bugs here.',
+    versions         => ['unspecified'],
+    milestones       => [],
+    defaultmilestone => '---',
+    components       => [{
+      name             => 'c1',
+      description      => "Same name as Another Product's component",
+      initialowner     => $config->{QA_Selenium_TEST_user_login},
+      initialqacontact => '',
+      initial_cc       => [],
+    }],
+  },
+
+  {
+    product_name     => 'QA Search Only',
+    description      => 'Only the QA group may search for bugs here.',
+    versions         => ['unspecified'],
+    milestones       => [],
+    defaultmilestone => '---',
+    components       => [{
+      name             => 'c1',
+      description      => 'Still same name as the Another component',
+      initialowner     => $config->{QA_Selenium_TEST_user_login},
+      initialqacontact => '',
+      initial_cc       => [],
+    }],
+  },
+);
+
+say 'creating products...';
+foreach my $product (@products) {
+  my $new_product = Bugzilla::Product->new({name => $product->{product_name}});
+  if (!$new_product) {
+    my $class_id = 1;
+    if ($product->{classification}) {
+      $class_id
+        = Bugzilla::Classification->new({name => $product->{classification}})->id;
+    }
+    $dbh->do(
+      'INSERT INTO products (name, description, classification_id) VALUES (?, ?, ?)',
+      undef,
+      ($product->{product_name}, $product->{description}, $class_id)
+    );
+
+    $new_product = Bugzilla::Product->new({name => $product->{product_name}});
+
+    $dbh->do('INSERT INTO milestones (product_id, value) VALUES (?, ?)',
+      undef, ($new_product->id, $product->{defaultmilestone}));
+
+    # Now clear the internal list of accessible products.
+    delete Bugzilla->user->{selectable_products};
+
+    foreach my $component (@{$product->{components}}) {
+      Bugzilla::Component->create({
+        name             => $component->{name},
+        product          => $new_product,
+        description      => $component->{description},
+        initialowner     => $component->{initialowner},
+        initialqacontact => $component->{initialqacontact},
+        initial_cc       => $component->{initial_cc},
+      });
+    }
+  }
+
+  foreach my $version (@{$product->{versions}}) {
+    my $new_version
+      = Bugzilla::Version->new({name => $version, product => $new_product});
+    if (!$new_version) {
+      Bugzilla::Version->create({value => $version, product => $new_product});
+    }
+  }
+
+  foreach my $milestone (@{$product->{milestones}}) {
+    my $new_milestone
+      = Bugzilla::Milestone->new({name => $milestone, product => $new_product});
+    if (!$new_milestone) {
+
+      # We don't use Bugzilla::Milestone->create because we want to
+      # bypass security checks.
+      $dbh->do('INSERT INTO milestones (product_id, value) VALUES (?,?)',
+        undef, $new_product->id, $milestone);
+    }
+  }
+}
+
+##########################################################################
+# Create Groups
+##########################################################################
+
+# create Master group
+my ($group_name, $group_desc)
+  = ('Master', 'Master Selenium Group <b>DO NOT EDIT!</b>');
+
+say 'creating groups...';
+my $new_group = Bugzilla::Group->new({name => $group_name});
+if (!$new_group) {
+  my $group
+    = Bugzilla::Group->create({
+    name => $group_name, description => $group_desc, isbuggroup => 1
+    });
+
+  $dbh->do(
+    'INSERT INTO group_control_map
+              (group_id, product_id, entry, membercontrol, othercontrol, canedit)
+              SELECT ?, products.id, 0, ?, ?, 0 FROM products', undef,
+    ($group->id, CONTROLMAPSHOWN, CONTROLMAPSHOWN)
+  );
+}
+
+# create QA-Selenium-TEST group. Do not use Group->create() so that
+# the admin group doesn't inherit membership (yes, that's what we want!).
+($group_name, $group_desc)
+  = ('QA-Selenium-TEST', "used by Selenium test.. DON'T DELETE");
+
+$new_group = Bugzilla::Group->new({name => $group_name});
+if (!$new_group) {
+  $dbh->do(
+    'INSERT INTO groups (name, description, isbuggroup, isactive)
+              VALUES (?, ?, 1, 1)', undef, ($group_name, $group_desc)
+  );
+}
+
+##########################################################################
+# Add Users to Groups
+##########################################################################
+
+my @users_groups = (
+  {user => $config->{QA_Selenium_TEST_user_login}, group => 'QA-Selenium-TEST'},
+  {user => $config->{tweakparams_user_login},      group => 'tweakparams'},
+  {user => $config->{canconfirm_user_login},       group => 'canconfirm'},
+  {user => $config->{editbugs_user_login},         group => 'editbugs'},
+);
+
+say 'adding users to groups...';
+foreach my $user_group (@users_groups) {
+  my $group = Bugzilla::Group->new({name => $user_group->{group}});
+  my $user = Bugzilla::User->new({name => $user_group->{user}});
+
+  my $sth_add_mapping = $dbh->prepare(
+    'INSERT INTO user_group_map (user_id, group_id, isbless, grant_type)
+                     VALUES (?, ?, ?, ?)'
+  );
+
+  # Don't crash if the entry already exists.
+  eval { $sth_add_mapping->execute($user->id, $group->id, 0, GRANT_DIRECT); };
+}
+
+##########################################################################
+# Associate Products with groups
+##########################################################################
+
+# Associate the QA-Selenium-TEST group with the QA-Selenium-TEST.
+my $created_group = Bugzilla::Group->new({name => 'QA-Selenium-TEST'});
+my $secret_product = Bugzilla::Product->new({name => 'QA-Selenium-TEST'});
+my $no_entry       = Bugzilla::Product->new({name => 'QA Entry Only'});
+my $no_search      = Bugzilla::Product->new({name => 'QA Search Only'});
+
+say 'restricting products to groups...';
+
+# Don't crash if the entries already exist.
+my $sth = $dbh->prepare(
+  'INSERT INTO group_control_map
+                         (group_id, product_id, entry, membercontrol, othercontrol, canedit)
+                         VALUES (?, ?, ?, ?, ?, ?)'
+);
+eval {
+  $sth->execute($created_group->id, $secret_product->id, 1, CONTROLMAPMANDATORY,
+    CONTROLMAPMANDATORY, 0);
+};
+eval {
+  $sth->execute($created_group->id, $no_entry->id, 1, CONTROLMAPNA, CONTROLMAPNA,
+    0);
+};
+eval {
+  $sth->execute($created_group->id, $no_search->id, 0, CONTROLMAPMANDATORY,
+    CONTROLMAPMANDATORY, 0);
+};
+
+##########################################################################
+# Create flag types
+##########################################################################
+
+my @flagtypes = (
+  {
+    name             => 'spec_multi_flag',
+    desc             => 'Specifically requestable and multiplicable bug flag',
+    is_requestable   => 1,
+    is_requesteeble  => 1,
+    is_multiplicable => 1,
+    grant_group      => 'editbugs',
+    target_type      => 'b',
+    cc_list          => '',
+    inclusions       => ['Another Product:c1']
+  },
+);
+
+say 'creating flag types...';
+foreach my $flag (@flagtypes) {
+
+# The name is not unique, even within a single product/component, so there is NO WAY
+# to know if the existing flag type is the one we want or not.
+# As our Selenium scripts would be confused anyway if there is already such a flag name,
+# we simply skip it and assume the existing flag type is the one we want.
+  next if Bugzilla::FlagType->new({name => $flag->{name}});
+
+  my $grant_group_id
+    = $flag->{grant_group}
+    ? Bugzilla::Group->new({name => $flag->{grant_group}})->id
+    : undef;
+  my $request_group_id
+    = $flag->{request_group}
+    ? Bugzilla::Group->new({name => $flag->{request_group}})->id
+    : undef;
+
+  $dbh->do(
+    'INSERT INTO flagtypes (name, description, cc_list, target_type, is_requestable,
+                                     is_requesteeble, is_multiplicable, grant_group_id, request_group_id)
+                             VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
+    undef,
+    (
+      $flag->{name},             $flag->{desc},
+      $flag->{cc_list},          $flag->{target_type},
+      $flag->{is_requestable},   $flag->{is_requesteeble},
+      $flag->{is_multiplicable}, $grant_group_id,
+      $request_group_id
+    )
+  );
+
+  my $type_id = $dbh->bz_last_key('flagtypes', 'id');
+
+  foreach my $inclusion (@{$flag->{inclusions}}) {
+    my ($product, $component) = split(':', $inclusion);
+    my ($prod_id, $comp_id);
+    if ($product) {
+      my $prod_obj = Bugzilla::Product->new({name => $product});
+      $prod_id = $prod_obj->id;
+      if ($component) {
+        $comp_id
+          = Bugzilla::Component->new({name => $component, product => $prod_obj})->id;
+      }
+    }
+    $dbh->do(
+      'INSERT INTO flaginclusions (type_id, product_id, component_id)
+                  VALUES (?, ?, ?)', undef, ($type_id, $prod_id, $comp_id)
+    );
+  }
+}
+
+##########################################################################
+# Create custom fields
+##########################################################################
+
+my @fields = (
+  {
+    name        => 'cf_QA_status',
+    description => 'QA Status',
+    type        => FIELD_TYPE_MULTI_SELECT,
+    sortkey     => 100,
+    mailhead    => 0,
+    enter_bug   => 1,
+    obsolete    => 0,
+    custom      => 1,
+    values      => ['verified', 'in progress', 'untested']
+  },
+  {
+    name        => 'cf_single_select',
+    description => 'SingSel',
+    type        => FIELD_TYPE_SINGLE_SELECT,
+    mailhead    => 0,
+    enter_bug   => 1,
+    custom      => 1,
+    values      => [qw(one two three)],
+  },
+);
+
+say 'creating custom fields...';
+foreach my $f (@fields) {
+
+  # Skip existing custom fields.
+  next if Bugzilla::Field->new({name => $f->{name}});
+
+  my @values;
+  if (exists $f->{values}) {
+    @values = @{$f->{values}};
+
+    # We have to delete this key, else create() will complain
+    # that 'values' is not an existing column name.
+    delete $f->{values};
+  }
+  my $field = Bugzilla::Field->create($f);
+
+  # Now populate the table with valid values, if necessary.
+  next unless scalar @values;
+
+  my $sth = $dbh->prepare('INSERT INTO ' . $field->name . ' (value) VALUES (?)');
+  foreach my $value (@values) {
+    $sth->execute($value);
+  }
+}
+
+####################################################################
+# Set Parameters That Require Other Things To Have Been Done First #
+####################################################################
+
+if (Bugzilla->params->{insidergroup} ne 'QA-Selenium-TEST') {
+  SetParam('insidergroup', 'QA-Selenium-TEST');
+  write_params();
+}
+
+if (Bugzilla->params->{timetrackinggroup} ne 'editbugs') {
+  SetParam('timetrackinggroup', 'editbugs');
+  write_params();
+}
+
+########################
+# Create a Private Bug #
+########################
+
+my $test_user = Bugzilla::User->check($config->{QA_Selenium_TEST_user_login});
+$test_user->{'groups'} = [
+  Bugzilla::Group->new({name => 'editbugs'}),
+  Bugzilla::Group->new({name => 'QA-Selenium-TEST'})
+];    # editbugs is needed for alias creation
+Bugzilla->set_user($test_user);
+
+if (Bugzilla::Bug->new('private_bug')->{error}) {
+  say 'Creating private bug...';
+  my %priv_values = %field_values;
+  $priv_values{alias}     = 'private_bug';
+  $priv_values{product}   = 'QA-Selenium-TEST';
+  $priv_values{component} = 'QA-Selenium-TEST';
+  my $bug = Bugzilla::Bug->create(\%priv_values);
+  say 'Bug ' . $bug->id . ' (alias: private_bug) created';
+}
+
+######################
+# Create Attachments #
+######################
+
+say 'creating attachments...';
+
+# We use the contents of this script as the attachment.
+open(my $attachment_fh, '<', __FILE__) or die __FILE__ . ": $!";
+my $attachment_contents;
+{
+  local $/;
+  $attachment_contents = <$attachment_fh>;
+}
+close($attachment_fh);
+
+foreach my $alias (qw(public_bug private_bug)) {
+  my $bug = Bugzilla::Bug->new($alias);
+
+  foreach my $is_private (0, 1) {
+    Bugzilla::Attachment->create({
+      bug         => $bug,
+      data        => $attachment_contents,
+      description => "${alias}_${is_private}",
+      filename    => "${alias}_${is_private}.pl",
+      mimetype    => 'application/x-perl',
+      isprivate   => $is_private,
+    });
+  }
+}
+
+###################
+# Create Keywords #
+###################
+
+my @keywords = (
+  {
+    name        => 'test-keyword-1',
+    description => 'Created for Bugzilla QA Tests, Keyword 1'
+  },
+  {
+    name        => 'test-keyword-2',
+    description => 'Created for Bugzilla QA Tests, Keyword 2'
+  },
+);
+
+say 'creating keywords...';
+foreach my $kw (@keywords) {
+  next if Bugzilla::Keyword->new({name => $kw->{name}});
+  Bugzilla::Keyword->create($kw);
+}
+
+############################
+# Install the QA extension #
+############################
+
+say 'copying the QA extension...';
+my $output = `cp -R ../extensions/QA $conf_path/extensions/.`;
+print $output if $output;
+
+my $cwd = cwd();
+chdir($conf_path);
+$output = `perl contrib/fixperms.pl`;
+print $output if $output;
+chdir($cwd);
+
+say 'installation and configuration complete!';
diff --git a/xt/config/patch.diff b/xt/config/patch.diff
new file mode 100644
index 0000000000..cbaff02495
--- /dev/null
+++ b/xt/config/patch.diff
@@ -0,0 +1,18 @@
+Index: Bugzilla/Config/MTA.pm
+===================================================================
+RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Config/MTA.pm,v
+retrieving revision 1.13
+diff -3 -p -u -r1.13 MTA.pm
+--- Bugzilla/Config/MTA.pm 13 Nov 2006 23:32:28 -0000 1.13
++++ Bugzilla/Config/MTA.pm  9 Dec 2006 12:19:44 -0000
+@@ -44,7 +44,9 @@ sub get_param_list {
+   {
+    name => 'mail_delivery_method',
+    type => 's',
+-   choices => [Email::Send->new()->all_mailers(), 'None'],
++   # Bugzilla is not ready yet to send mails to newsgroups, and 'IO'
++   # is of no use for now as we already have our own 'Test' mode.
++   choices => [grep {$_ ne 'NNTP' && $_ ne 'IO'} Email::Send->new()->all_mailers(), 'None'],
+    default => 'Sendmail',
+    checker => \&check_mail_delivery_method
+   },
diff --git a/xt/config/selenium_test.conf b/xt/config/selenium_test.conf
new file mode 100644
index 0000000000..997ad97fbb
--- /dev/null
+++ b/xt/config/selenium_test.conf
@@ -0,0 +1,46 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# To make this configuration file useful to you, you have to:
+# - set the path and URL to your Bugzilla installation.
+# - replace @my.company by something more relevant to you,
+#   also what comes before @my.company if you want/need to.
+# - set passwords for each user accounts.
+
+{   'browser'                           => '*firefox',
+    'experimental_browser_launcher'     => '*chrome',
+    'host'                              => 'localhost',
+    'port'                              => 4444,
+    'browser_url'                       => 'http://localhost',
+    'attachment_file'                   => '/var/www/html/bugzilla/xt/config/patch.diff',
+    'bugzilla_installation'             => 'bugzilla',
+    'bugzilla_path'                     => '/var/www/html/bugzilla',
+    'admin_user_login'                  => 'admin@my.company',
+    'admin_user_passwd'                 => '******',
+    'admin_user_username'               => 'admin',
+    'admin_user_api_key'                => 'zQ5TSBzq7tTZMtKYq9K1ZqJMjifKx3cPL7pIGk9Q',
+    'permanent_user'                    => 'permanent_user@my.company',
+    'unprivileged_user_login'           => 'no-privs@my.company',
+    'unprivileged_user_passwd'          => '******',
+    'unprivileged_user_username'        => 'no-privs',
+    'unprivileged_user_login_truncated' => 'no-privs@my',
+    'unprivileged_user_api_key'         => 'zQ5TSBzqP4nrdBKYq9Re4qJrjifKx3cK07pIGk9Q',
+    'QA_Selenium_TEST_user_login'       => 'QA-Selenium-TEST@my.company',
+    'QA_Selenium_TEST_user_passwd'      => '******',
+    'editbugs_user_login'               => 'editbugs@my.company',
+    'editbugs_user_passwd'              => '******',
+    'editbugs_user_api_key'             => 'zQ5ewBzq3gTrdBKYq9K1ZqJMjifKx3cKleE6k9TQ',
+    'canconfirm_user_login'             => 'canconfirm@my.company',
+    'canconfirm_user_passwd'            => '******',
+    'tweakparams_user_login'            => 'tweakparams@my.company',
+    'tweakparams_user_login_truncated'  => 'tweakparams@my',
+    'tweakparams_user_passwd'           => '******',
+    'disabled_user_login'               => 'disabled@my.company',
+    'disabled_user_passwd'              => '******',
+    'common_email'                      => '@my.company',
+    'test_extensions'                   => 0,
+};
diff --git a/runtests.pl b/xt/extensions/QA/Config.pm
old mode 100755
new mode 100644
similarity index 53%
rename from runtests.pl
rename to xt/extensions/QA/Config.pm
index 52de88e102..cb9ee3bb55
--- a/runtests.pl
+++ b/xt/extensions/QA/Config.pm
@@ -1,4 +1,3 @@
-#!/usr/bin/perl
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -6,25 +5,16 @@
 # This Source Code Form is "Incompatible With Secondary Licenses", as
 # defined by the Mozilla Public License, v. 2.0.
 
-use 5.10.1;
-use diagnostics;
+package Bugzilla::Extension::QA;
+
+use 5.14.0;
 use strict;
 use warnings;
 
-use lib qw(lib);
-
-use Test::Harness qw(&runtests $verbose);
+use constant NAME => 'QA';
 
-$verbose = 0;
-my $onlytest = "";
+use constant REQUIRED_MODULES => [];
 
-foreach (@ARGV) {
-    if (/^(?:-v|--verbose)$/) {
-        $verbose = 1;
-    }
-    else {
-        $onlytest = sprintf("%0.3d",$_);
-    }
-}
+use constant OPTIONAL_MODULES => [];
 
-runtests(glob("t/$onlytest*.t"));
+__PACKAGE__->NAME;
diff --git a/xt/extensions/QA/Extension.pm b/xt/extensions/QA/Extension.pm
new file mode 100644
index 0000000000..38f2ec0b08
--- /dev/null
+++ b/xt/extensions/QA/Extension.pm
@@ -0,0 +1,74 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Extension::QA;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use parent qw(Bugzilla::Extension);
+
+use Bugzilla::Extension::QA::Util;
+use Bugzilla::Constants;
+use Bugzilla::Error;
+use Bugzilla::Util;
+use Bugzilla::Bug;
+use Bugzilla::User;
+
+our $VERSION = '1.0';
+
+sub page_before_template {
+  my ($self, $args) = @_;
+  return if $args->{page_id} ne 'qa/email_in.html';
+
+  my $template = Bugzilla->template;
+  my $cgi      = Bugzilla->cgi;
+  print $cgi->header;
+
+  # Needed to make sure he can access and edit bugs.
+  my $user = Bugzilla::User->check(scalar $cgi->param('sender'));
+  Bugzilla->set_user($user);
+
+  my ($output, $tmpl_file);
+  my $action = $cgi->param('action') || '';
+  my $vars = {sender => $user, action => $action, pid => $$};
+
+  if ($action eq 'create') {
+    $tmpl_file = 'qa/create_bug.txt.tmpl';
+  }
+  elsif ($action eq 'create_with_headers') {
+    $tmpl_file = 'qa/create_bug_with_headers.txt.tmpl';
+  }
+  elsif ($action =~ /^update(_with_headers)?$/) {
+    my $f = $1 || '';
+    $tmpl_file = "qa/update_bug$f.txt.tmpl";
+    my $bug = Bugzilla::Bug->check(scalar $cgi->param('bug_id'));
+    $vars->{bug_id} = $bug->id;
+  }
+  else {
+    ThrowUserError('unknown_action', {action => $action});
+  }
+
+  $template->process($tmpl_file, $vars, \$output)
+    or ThrowTemplateError($template->error());
+
+  my $file = "/tmp/email_in_$$.txt";
+  open(FH, '>', $file);
+  print FH $output;
+  close FH;
+
+  $output = `email_in.pl -v < $file 2>&1`;
+  unlink $file;
+
+  parse_output($output, $vars);
+
+  $template->process('qa/results.html.tmpl', $vars)
+    or ThrowTemplateError($template->error());
+}
+
+__PACKAGE__->NAME;
diff --git a/xt/extensions/QA/lib/Util.pm b/xt/extensions/QA/lib/Util.pm
new file mode 100644
index 0000000000..c83952a982
--- /dev/null
+++ b/xt/extensions/QA/lib/Util.pm
@@ -0,0 +1,28 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::Extension::QA::Util;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use parent qw(Exporter);
+
+our @EXPORT = qw(
+  parse_output
+);
+
+sub parse_output {
+  my ($output, $vars) = @_;
+
+  $vars->{error} = ($output =~ /software error/i) ? 1 : 0;
+  $vars->{output} = $output;
+  $vars->{bug_id} ||= ($output =~ /Created bug (\d+)/i) ? $1 : undef;
+}
+
+1;
diff --git a/xt/extensions/QA/template/en/default/hook/README b/xt/extensions/QA/template/en/default/hook/README
new file mode 100644
index 0000000000..3f1e487e25
--- /dev/null
+++ b/xt/extensions/QA/template/en/default/hook/README
@@ -0,0 +1,5 @@
+Template hooks go in this directory. Template hooks are called in normal
+Bugzilla templates like [% Hook.process('some-hook') %].
+More information about them can be found in the documentation of
+Bugzilla::Extension. (Do "perldoc Bugzilla::Extension" from the main
+Bugzilla directory to see that documentation.)
diff --git a/extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.html.tmpl b/xt/extensions/QA/template/en/default/pages/qa/email_in.html.tmpl
similarity index 88%
rename from extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.html.tmpl
rename to xt/extensions/QA/template/en/default/pages/qa/email_in.html.tmpl
index 1966a1aa12..bcb75107df 100644
--- a/extensions/OldBugMove/template/en/default/hook/global/user-error-auth_failure_action.html.tmpl
+++ b/xt/extensions/QA/template/en/default/pages/qa/email_in.html.tmpl
@@ -5,7 +5,3 @@
   # This Source Code Form is "Incompatible With Secondary Licenses", as
   # defined by the Mozilla Public License, v. 2.0.
   #%]
-
-[% IF action == "move" %]
-  move
-[% END %]
diff --git a/xt/extensions/QA/template/en/default/qa/README b/xt/extensions/QA/template/en/default/qa/README
new file mode 100644
index 0000000000..604d00cfeb
--- /dev/null
+++ b/xt/extensions/QA/template/en/default/qa/README
@@ -0,0 +1,16 @@
+Normal templates go in this directory. You can load them in your
+code like this:
+
+use Bugzilla::Error;
+my $template = Bugzilla->template;
+$template->process('qa/some-template.html.tmpl')
+  or ThrowTemplateError($template->error());
+
+That would be how to load a file called some-template.html.tmpl that
+was in this directory.
+
+Note that you have to be careful that the full path of your template
+never conflicts with a template that exists in Bugzilla or in
+another extension, or your template might override that template. That's why
+we created this directory called 'qa' for you, so you
+can put your templates in here to help avoid conflicts.
diff --git a/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl b/xt/extensions/QA/template/en/default/qa/create_bug.txt.tmpl
similarity index 55%
rename from extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl
rename to xt/extensions/QA/template/en/default/qa/create_bug.txt.tmpl
index 1490f08ad6..5a83a6c5b7 100644
--- a/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl
+++ b/xt/extensions/QA/template/en/default/qa/create_bug.txt.tmpl
@@ -6,10 +6,12 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% IF oldbugmove_user_is_mover(user) AND bug.resolution != 'MOVED' %]
-  <p>
-    <input type="submit" id="oldbugmove" name="oldbugmove"
-           value="Move [% terms.Bug FILTER html %] to 
-                  [%= Param('move-to-url') FILTER html %]">
-  </p>
-[% END %]
+From: [% sender.email %]
+Subject: [% terms.Bug %] created using email_in.pl
+Content-Type: text/plain; charset="UTF-8"
+
+@product = TestProduct
+@component = TestComponent
+@version = unspecified
+
+This [% terms.bug %] has been created using email_in.pl (PID: [% pid %]).
diff --git a/xt/extensions/QA/template/en/default/qa/create_bug_with_headers.txt.tmpl b/xt/extensions/QA/template/en/default/qa/create_bug_with_headers.txt.tmpl
new file mode 100644
index 0000000000..997378343a
--- /dev/null
+++ b/xt/extensions/QA/template/en/default/qa/create_bug_with_headers.txt.tmpl
@@ -0,0 +1,33 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+From - Sat Jan  1 18:38:17 2011
+X-Account-Key: account2
+X-UIDL: GmailId12d42784d83cb4a4
+X-Mozilla-Status: 0011
+X-Mozilla-Status2: 00000000
+X-Mozilla-Keys:
+Return-Path: <foo@bar.com>
+Received: from [192.168.0.2] (provider.com [51.162.153.14])
+        by mx.google.com with ESMTPS id m10sm12712256wbc.4.2011.01.01.09.38.01
+        (version=TLSv1/SSLv3 cipher=RC4-MD5);
+        Sat, 01 Jan 2011 09:38:01 -0800 (PST)
+Message-ID: <4D1F6580.9060076@gmail.com>
+Date: Sat, 01 Jan 2011 18:38:08 +0100
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; fr; rv:1.9.2.13) Gecko/20101207 Lightning/1.0b2 Thunderbird/3.1.7
+MIME-Version: 1.0
+From: [% sender.email %]
+Subject: [% terms.Bug %] created using email_in.pl (with email headers)
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+@product = TestProduct
+@component = TestComponent
+@version = unspecified
+
+This [% terms.bug %] has been created using email_in.pl (PID: [% pid %]) with email headers.
diff --git a/xt/extensions/QA/template/en/default/qa/results.html.tmpl b/xt/extensions/QA/template/en/default/qa/results.html.tmpl
new file mode 100644
index 0000000000..a2f812697b
--- /dev/null
+++ b/xt/extensions/QA/template/en/default/qa/results.html.tmpl
@@ -0,0 +1,28 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% title = BLOCK %]
+  [% IF error %]
+    Unexpected error
+  [% ELSE %]
+    email_in.pl output
+  [% END %]
+[% END %]
+
+[% PROCESS global/header.html.tmpl %]
+
+<h1>Action '[% action FILTER html %]' successful</h1>
+
+<div>
+<p>PID: <span id="pid">[% pid FILTER html %]</span></p>
+<p>[%+ terms.Bug %] ID: <span id="bug_id">[% bug_id FILTER html %]</span></p>
+
+<p>Full output:</p>
+<pre id="output">[% output FILTER html_light %]</pre>
+
+[% PROCESS global/footer.html.tmpl %]
diff --git a/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl b/xt/extensions/QA/template/en/default/qa/update_bug.txt.tmpl
similarity index 58%
rename from extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl
rename to xt/extensions/QA/template/en/default/qa/update_bug.txt.tmpl
index a5380da975..f37c00262a 100644
--- a/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl
+++ b/xt/extensions/QA/template/en/default/qa/update_bug.txt.tmpl
@@ -6,10 +6,8 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-[% IF oldbugmove_user_is_mover(user) %]
-  <p>
-    <input type="submit" id="oldbugmove" name="oldbugmove"
-           value="Move [% terms.Bugs FILTER html %] to 
-                  [%= Param('move-to-url') FILTER html %]">
-  </p>
-[% END %]
+From: [% sender.email %]
+Subject: [[% terms.Bug %] [%+ bug_id %]] This subject is ignored, only the [% terms.bug %] ID matters
+Content-Type: text/plain; charset="UTF-8"
+
+Comment added by email_in.pl (PID: [% pid %]). No other changes.
diff --git a/xt/extensions/QA/template/en/default/qa/update_bug_with_headers.txt.tmpl b/xt/extensions/QA/template/en/default/qa/update_bug_with_headers.txt.tmpl
new file mode 100644
index 0000000000..fd093d3b0b
--- /dev/null
+++ b/xt/extensions/QA/template/en/default/qa/update_bug_with_headers.txt.tmpl
@@ -0,0 +1,29 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+From - Sat Jan  1 18:38:17 2011
+X-Account-Key: account2
+X-UIDL: GmailId12d42784d83cb4a4
+X-Mozilla-Status: 0011
+X-Mozilla-Status2: 00000000
+X-Mozilla-Keys:
+Return-Path: <foo@bar.com>
+Received: from [192.168.0.2] (provider.com [51.162.153.14])
+        by mx.google.com with ESMTPS id m10sm12712256wbc.4.2011.01.01.09.38.01
+        (version=TLSv1/SSLv3 cipher=RC4-MD5);
+        Sat, 01 Jan 2011 09:38:01 -0800 (PST)
+Message-ID: <4D1F6580.9060076@gmail.com>
+Date: Sat, 01 Jan 2011 18:38:08 +0100
+User-Agent: Mozilla/5.0 (X11; U; Linux i686; fr; rv:1.9.2.13) Gecko/20101207 Lightning/1.0b2 Thunderbird/3.1.7
+MIME-Version: 1.0
+From: [% sender.email %]
+Subject: [[% terms.Bug %] [%+ bug_id %]] This subject is ignored, only the [% terms.bug %] ID matters
+Content-Type: text/plain; charset="UTF-8"
+Content-Transfer-Encoding: 8bit
+
+Comment added by email_in.pl (PID: [% pid %]) with email headers. No other changes.
diff --git a/xt/extensions/QA/web/README b/xt/extensions/QA/web/README
new file mode 100644
index 0000000000..23456410fd
--- /dev/null
+++ b/xt/extensions/QA/web/README
@@ -0,0 +1,7 @@
+Web-accessible files, like JavaScript, CSS, and images go in this
+directory. You can reference them directly in your HTML. For example,
+if you have a file called "style.css" and your extension is called
+"Foo", you would put it in "extensions/Foo/web/style.css", and then
+you could link to it in HTML like:
+
+<link href="extensions/Foo/web/style.css" rel="stylesheet" type="text/css">
\ No newline at end of file
diff --git a/xt/lib/Bugzilla/Test/Search.pm b/xt/lib/Bugzilla/Test/Search.pm
deleted file mode 100644
index ca3bba5cf7..0000000000
--- a/xt/lib/Bugzilla/Test/Search.pm
+++ /dev/null
@@ -1,987 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This module tests Bugzilla/Search.pm. It uses various constants
-# that are in Bugzilla::Test::Search::Constants, in xt/lib/.
-#
-# It does this by:
-# 1) Creating a bunch of field values. Each field value is
-#    randomly named and fully unique.
-# 2) Creating a bunch of bugs that use those unique field
-#    values. Each bug has different characteristics--see
-#    the comment above the NUM_BUGS constant for a description
-#    of each bug.
-# 3) Running searches using the combination of every search operator against
-#    every field. The tests that we run are described by the TESTS constant.
-#    Some of the operator/field combinations are known to be broken--
-#    these are listed in the KNOWN_BROKEN constant.
-# 4) For each search, we make sure that certain bugs are contained in
-#    the search, and certain other bugs are not contained in the search.
-#    The code for the operator/field tests is mostly in
-#    Bugzilla::Test::Search::FieldTest.
-# 5) After testing each operator/field combination's functionality, we
-#    do additional tests to make sure that there are no SQL injections
-#    possible via any operator/field combination. The code for the
-#    SQL Injection tests is in Bugzilla::Test::Search::InjectionTest.
-#
-# Generally, the only way that you should modify the behavior of this
-# script is by modifying the constants.
-
-package Bugzilla::Test::Search;
-
-use strict;
-use warnings;
-use Bugzilla::Attachment;
-use Bugzilla::Bug ();
-use Bugzilla::Constants;
-use Bugzilla::Field;
-use Bugzilla::Field::Choice;
-use Bugzilla::FlagType;
-use Bugzilla::Group;
-use Bugzilla::Install ();
-use Bugzilla::Test::Search::Constants;
-use Bugzilla::Test::Search::CustomTest;
-use Bugzilla::Test::Search::FieldTestNormal;
-use Bugzilla::Test::Search::OperatorTest;
-use Bugzilla::User ();
-use Bugzilla::Util qw(generate_random_password);
-
-use Carp;
-use DateTime;
-use Scalar::Util qw(blessed);
-
-###############
-# Constructor #
-###############
-
-sub new {
-    my ($class, $options) = @_;
-    return bless { options => $options }, $class;
-}
-
-#############
-# Accessors #
-#############
-
-sub options { return $_[0]->{options} }
-sub option { return $_[0]->{options}->{$_[1]} }
-
-sub num_tests {
-    my ($self) = @_;
-    my @top_operators = $self->top_level_operators;
-    my @all_operators = $self->all_operators;
-    my $top_operator_tests = $self->_total_operator_tests(\@top_operators);
-    my $all_operator_tests = $self->_total_operator_tests(\@all_operators);
-
-    my @fields = $self->all_fields;
-
-    # Basically, we run TESTS_PER_RUN tests for each field/operator combination.
-    my $top_combinations = $top_operator_tests * scalar(@fields);
-    my $all_combinations = $all_operator_tests * scalar(@fields);
-    # But we also have ORs, for which we run combinations^2 tests.
-    my $join_tests = $self->option('long')
-                     ? ($top_combinations * $all_combinations) : 0;
-    # And AND tests, which means we run 2x $join_tests;
-    $join_tests = $join_tests * 2;
-    # Also, because of NOT tests and Normal tests, we run 3x $top_combinations.
-    my $basic_tests = $top_combinations * 3;
-    my $operator_field_tests = ($basic_tests + $join_tests) * TESTS_PER_RUN;
-
-    # Then we test each field/operator combination for SQL injection.
-    my @injection_values = INJECTION_TESTS;
-    my $sql_injection_tests = scalar(@fields) * scalar(@top_operators)
-                              * scalar(@injection_values) * NUM_SEARCH_TESTS;
-
-    # This @{ [] } thing is the only reasonable way to get a count out of a
-    # constant array.
-    my $special_tests = scalar(@{ [SPECIAL_PARAM_TESTS, CUSTOM_SEARCH_TESTS] }) 
-                        * TESTS_PER_RUN;
-    
-    return $operator_field_tests + $sql_injection_tests + $special_tests;
-}
-
-sub _total_operator_tests {
-    my ($self, $operators) = @_;
-    
-    # Some operators have more than one test. Find those ones and add
-    # them to the total operator tests
-    my $extra_operator_tests;
-    foreach my $operator (@$operators) {
-        my $tests = TESTS->{$operator};
-        next if !$tests;
-        my $extra_num = scalar(@$tests) - 1;
-        $extra_operator_tests += $extra_num;
-    }
-    return scalar(@$operators) + $extra_operator_tests;
-    
-}
-
-sub all_operators {
-    my ($self) = @_;
-    if (not $self->{all_operators}) {
-        
-        my @operators;
-        if (my $limit_operators = $self->option('operators')) {
-            @operators = split(',', $limit_operators);
-        }
-        else {
-            @operators = sort (keys %{ Bugzilla::Search::OPERATORS() });
-        }
-        # "substr" is just a backwards-compatibility operator, same as "substring".
-        @operators = grep { $_ ne 'substr' } @operators;
-        $self->{all_operators} = \@operators;
-    }
-    return @{ $self->{all_operators} };
-}
-
-sub all_fields {
-    my $self = shift;
-    if (not $self->{all_fields}) {
-        $self->_create_custom_fields();
-        my @fields = @{ Bugzilla->fields };
-        @fields = sort { $a->name cmp $b->name } @fields;
-        $self->{all_fields} = \@fields;
-    }
-    return @{ $self->{all_fields} };
-}
-
-sub top_level_operators {
-    my ($self) = @_;
-    if (!$self->{top_level_operators}) {
-        my @operators;
-        my $limit_top = $self->option('top-operators');
-        if ($limit_top) {
-            @operators = split(',', $limit_top);
-        }
-        else {
-            @operators = $self->all_operators;
-        }
-        $self->{top_level_operators} = \@operators;
-    }
-    return @{ $self->{top_level_operators} };
-}
-
-sub text_fields {
-    my ($self) = @_;
-    my @text_fields = grep { $_->type == FIELD_TYPE_TEXTAREA
-                             or $_->type == FIELD_TYPE_FREETEXT } $self->all_fields;
-    @text_fields = map { $_->name } @text_fields;
-    push(@text_fields, qw(short_desc status_whiteboard bug_file_loc see_also));
-    return @text_fields;
-}
-
-sub bugs {
-    my $self = shift;
-    $self->{bugs} ||= [map { $self->_create_one_bug($_) } (1..NUM_BUGS)];
-    return @{ $self->{bugs} };
-}
-
-# Get a numbered bug.
-sub bug {
-    my ($self, $number) = @_;
-    return ($self->bugs)[$number - 1];
-}
-
-sub admin {
-    my $self = shift;
-    if (!$self->{admin_user}) {
-        my $admin = create_user("admin");
-        Bugzilla::Install::make_admin($admin);
-        $self->{admin_user} = $admin;
-    }
-    # We send back a fresh object every time, to make sure that group
-    # memberships are always up-to-date.
-    return new Bugzilla::User($self->{admin_user}->id);
-}
-
-sub nobody {
-    my $self = shift;
-    $self->{nobody} ||= Bugzilla::Group->create({ name => "nobody-" . random(),
-        description => "Nobody", isbuggroup => 1 });
-    return $self->{nobody};
-}
-sub everybody {
-    my ($self) = @_;
-    $self->{everybody} ||= create_group('To The Limit');
-    return $self->{everybody};
-}
-
-sub bug_create_value {
-    my ($self, $number, $field) = @_;
-    $field = $field->name if blessed($field);
-    if ($number == 6 and $field ne 'alias') {
-        $number = 1;
-    }
-    my $extra_values = $self->_extra_bug_create_values->{$number};
-    if (exists $extra_values->{$field}) {
-        return $extra_values->{$field};
-    }
-    return $self->_bug_create_values->{$number}->{$field};
-}
-sub bug_update_value {
-    my ($self, $number, $field) = @_;
-    $field = $field->name if blessed($field);
-    if ($number == 6 and $field ne 'alias') {
-        $number = 1;
-    }
-    return $self->_bug_update_values->{$number}->{$field};
-}
-
-# Values used to create the bugs.
-sub _bug_create_values {
-    my $self = shift;
-    return $self->{bug_create_values} if $self->{bug_create_values};
-    my %values;
-    foreach my $number (1..NUM_BUGS) {
-        $values{$number} = $self->_create_field_values($number, 'for create');
-    }
-    $self->{bug_create_values} = \%values;
-    return $self->{bug_create_values};
-}
-# Values as they existed on the bug, at creation time. Used by the
-# changedfrom tests.
-sub _extra_bug_create_values {
-    my $self = shift;
-    $self->{extra_bug_create_values} ||= { map { $_ => {} } (1..NUM_BUGS) };
-    return $self->{extra_bug_create_values};
-}
-
-# Values used to update the bugs after they are created.
-sub _bug_update_values {
-    my $self = shift;
-    return $self->{bug_update_values} if $self->{bug_update_values};
-    my %values;
-    foreach my $number (1..NUM_BUGS) {
-        $values{$number} = $self->_create_field_values($number);
-    }
-    $self->{bug_update_values} = \%values;
-    return $self->{bug_update_values};
-}
-
-##############################
-# General Helper Subroutines #
-##############################
-
-sub random {
-    $_[0] ||= FIELD_SIZE;
-    generate_random_password(@_);
-}
-
-# We need to use a custom timestamp for each create() and update(),
-# because the database returns the same value for LOCALTIMESTAMP(0)
-# for the entire transaction, and we need each created bug to have
-# its own creation_ts and delta_ts.
-sub timestamp {
-    my ($day, $second) = @_;
-    return DateTime->new(
-        year   => 2037,
-        month  => 1,
-        day    => $day,
-        hour   => 12,
-        minute => $second,
-        second => 0,
-        # We make it floating because the timezone doesn't matter for our uses,
-        # and we want totally consistent behavior across all possible machines.
-        time_zone => 'floating',
-    );
-}
-
-sub create_keyword {
-    my ($number) = @_;
-    return Bugzilla::Keyword->create({
-        name => "$number-keyword-" . random(),
-        description => "Keyword $number" });
-}
-
-sub create_user {
-    my ($prefix) = @_;
-    my $user_name = $prefix . '-' . random(15) . "@" . random(12)
-                    . "." . random(3);
-    my $user_realname = $prefix . '-' . random();
-    my $user = Bugzilla::User->create({
-        login_name => $user_name,
-        realname   => $user_realname,
-        cryptpassword => '*',
-    });
-    return $user;
-}
-
-sub create_group {
-    my ($prefix) = @_;
-    return Bugzilla::Group->create({
-        name => "$prefix-group-" . random(), description => "Everybody $prefix",
-        userregexp => '.*', isbuggroup => 1 });
-}
-
-sub create_legal_value {
-    my ($field, $number) = @_;
-    my $type = Bugzilla::Field::Choice->type($field);
-    my $field_name = $field->name;
-    return $type->create({ value => "$number-$field_name-" . random(),
-                           is_open => 0 });
-}
-
-#########################
-# Custom Field Creation #
-#########################
-
-sub _create_custom_fields {
-    my ($self) = @_;
-    return if !$self->option('add-custom-fields');
-    
-    while (my ($type, $name) = each %{ CUSTOM_FIELDS() }) {
-        my $exists = new Bugzilla::Field({ name => $name });
-        next if $exists;
-        Bugzilla::Field->create({
-            name => $name,
-            type => $type,
-            description => "Search Test Field $name",
-            enter_bug => 1,
-            custom => 1,
-            buglist => 1,
-            is_mandatory => 0,
-        });
-    }
-}
-
-########################
-# Field Value Creation #
-########################
-
-sub _create_field_values {
-    my ($self, $number, $for_create) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    Bugzilla->set_user($self->admin);
-
-    my @selects = grep { $_->is_select } $self->all_fields;
-    my %values;
-    foreach my $field (@selects) {
-        next if $field->is_abnormal;
-        $values{$field->name} = create_legal_value($field, $number)->name;
-    }
-
-    my $group = create_group($number);
-    $values{groups} = [$group->name];
-
-    $values{'keywords'} = create_keyword($number)->name;
-
-    foreach my $field (qw(assigned_to qa_contact reporter cc)) {
-        $values{$field} = create_user("$number-$field")->login;
-    }
-
-    my $classification = Bugzilla::Classification->create(
-        { name => "$number-classification-" . random() });
-    $classification = $classification->name;
-
-    my $version = "$number-version-" . random();
-    my $milestone = "$number-tm-" . random(15);
-    my $product = Bugzilla::Product->create({
-        name => "$number-product-" . random(),
-        description => 'Created by t/search.t',
-        defaultmilestone => $milestone,
-        classification => $classification,
-        version => $version,
-        allows_unconfirmed => 1,
-    });
-    foreach my $item ($group, $self->nobody) {
-        $product->set_group_controls($item,
-            { membercontrol => CONTROLMAPSHOWN,
-              othercontrol => CONTROLMAPNA });
-    }
-    # $product->update() is called lower down.
-    my $component = Bugzilla::Component->create({
-        product => $product, name => "$number-component-" . random(),
-        initialowner => create_user("$number-defaultowner")->login,
-        initialqacontact => create_user("$number-defaultqa")->login,
-        initial_cc => [create_user("$number-initcc")->login],
-        description => "Component $number" });
-    
-    $values{'product'} = $product->name;
-    $values{'component'} = $component->name;
-    $values{'target_milestone'} = $milestone;
-    $values{'version'} = $version;
-
-    foreach my $field ($self->text_fields) {
-        # We don't add a - after $field for the text fields, because
-        # if we do, fulltext searching for short_desc pulls out
-        # "short_desc" as a word and matches it in every bug.
-        my $value = "$number-$field" . random();
-        if ($field eq 'bug_file_loc' or $field eq 'see_also') {
-            $value = "http://$value-" . random(3)
-                     . "/show_bug.cgi?id=$number";
-        }
-        $values{$field} = $value;
-    }
-    $values{'tag'} = ["$number-tag-" . random()];
-    
-    my @date_fields = grep { $_->type == FIELD_TYPE_DATETIME } $self->all_fields;
-    foreach my $field (@date_fields) {
-        # We use 03 as the month because that differs from our creation_ts,
-        # delta_ts, and deadline. (It's nice to have recognizable values
-        # for each field when debugging.)
-        my $second = $for_create ? $number : $number + 1;
-        $values{$field->name} = "2037-03-0$number 12:34:0$second";
-    }
-
-    $values{alias} = "$number-alias-" . random(12);
-
-    # Prefixing the original comment with "description" makes the
-    # lesserthan and greaterthan tests behave predictably.
-    my $comm_prefix = $for_create ? "description-" : '';
-    $values{comment} = "$comm_prefix$number-comment-" . random()
-                               . ' ' . random();
-
-    my @flags;
-    my $setter = create_user("$number-setters.login_name");
-    my $requestee = create_user("$number-requestees.login_name");
-    $values{set_flags} = _create_flags($number, $setter, $requestee);
-
-    my $month = $for_create ? "12" : "02";
-    $values{'deadline'} = "2037-$month-0$number";
-    my $estimate_times = $for_create ? 10 : 1;
-    $values{estimated_time} = $estimate_times * $number;
-
-    $values{attachment} = _get_attach_values($number, $for_create);
-
-    # Some things only happen on the first bug.
-    if ($number == 1) {
-        # We use 6 as the prefix for the extra values, because bug 6's values
-        # don't otherwise get used (since bug 6 is created as a clone of
-        # bug 1). This also makes sure that our greaterthan/lessthan
-        # tests work properly.
-        my $extra_group = create_group(6);
-        $product->set_group_controls($extra_group,
-            { membercontrol => CONTROLMAPSHOWN,
-              othercontrol => CONTROLMAPNA });
-        $values{groups} = [$values{groups}->[0], $extra_group->name];
-        my $extra_keyword = create_keyword(6);
-        $values{keywords} = [$values{keywords}, $extra_keyword->name];
-        my $extra_cc = create_user("6-cc");
-        $values{cc} = [$values{cc}, $extra_cc->login];
-        my @multi_selects = grep { $_->type == FIELD_TYPE_MULTI_SELECT }
-                                 $self->all_fields;
-        foreach my $field (@multi_selects) {
-            my $new_value = create_legal_value($field, 6);
-            my $name = $field->name;
-            $values{$name} = [$values{$name}, $new_value->name];
-        }
-        push(@{ $values{'tag'} }, "6-tag-" . random());
-    }
-
-    # On bug 5, any field that *can* be left empty, *is* left empty.
-    if ($number == 5) {
-        my @set_fields = grep { $_->type == FIELD_TYPE_SINGLE_SELECT }
-                         $self->all_fields;
-        @set_fields = map { $_->name } @set_fields;
-        push(@set_fields, qw(short_desc version reporter));
-        foreach my $key (keys %values) {
-            delete $values{$key} unless grep { $_ eq $key } @set_fields;
-        }
-    }
-
-    $product->update();
-
-    return \%values;
-}
-
-# Flags
-sub _create_flags {
-    my ($number, $setter, $requestee) = @_;
-
-    my $flagtypes = _create_flagtypes($number);
-
-    my %flags;
-    foreach my $type (qw(a b)) {
-        $flags{$type} = _get_flag_values(@_, $flagtypes->{$type});
-    }
-    return \%flags;
-}
-
-sub _create_flagtypes {
-    my ($number) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $name = "$number-flag-" . random();
-    my $desc = "FlagType $number";
-
-    my %flagtypes; 
-    foreach my $target (qw(a b)) {
-         $dbh->do("INSERT INTO flagtypes
-                  (name, description, target_type, is_requestable, 
-                   is_requesteeble, is_multiplicable, cc_list)
-                   VALUES (?,?,?,1,1,1,'')",
-                   undef, $name, $desc, $target);
-         my $id = $dbh->bz_last_key('flagtypes', 'id');
-         $dbh->do('INSERT INTO flaginclusions (type_id) VALUES (?)',
-                  undef, $id);
-         my $flagtype = new Bugzilla::FlagType($id);
-         $flagtypes{$target} = $flagtype;
-    }
-    return \%flagtypes;
-}
-
-sub _get_flag_values {
-    my ($number, $setter, $requestee, $flagtype) = @_;
-
-    my @set_flags;
-    if ($number <= 2) {
-        foreach my $value (qw(? - + ?)) {
-            my $flag = { type_id => $flagtype->id, status => $value,
-                         setter => $setter, flagtype => $flagtype };
-            push(@set_flags, $flag);
-        }
-        $set_flags[0]->{requestee} = $requestee->login;
-    }
-    else {
-        @set_flags = ({ type_id => $flagtype->id, status => '+',
-                        setter => $setter, flagtype => $flagtype });
-    }
-    return \@set_flags;
-}
-
-# Attachments
-sub _get_attach_values {
-    my ($number, $for_create) = @_;
-
-    my $boolean = $number == 1 ? 1 : 0;
-    if ($for_create) {
-        $boolean = !$boolean ? 1 : 0;
-    }
-    my $ispatch = $for_create ? 'ispatch' : 'is_patch';
-    my $isobsolete = $for_create ? 'isobsolete' : 'is_obsolete';
-    my $isprivate = $for_create ? 'isprivate' : 'is_private';
-    my $mimetype = $for_create ? 'mimetype' : 'content_type';
-
-    my %values = (
-        description => "$number-attach_desc-" . random(),
-        filename => "$number-filename-" . random(),
-        $ispatch => $boolean,
-        $isobsolete => $boolean,
-        $isprivate => $boolean,
-        $mimetype => "text/x-$number-" . random(),
-    );
-    if ($for_create) {
-        $values{data} = "$number-data-" . random() . random();
-    }
-    return \%values;
-}
-
-################
-# Bug Creation #
-################
-
-sub _create_one_bug {
-    my ($self, $number) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    # We need bug 6 to have a unique alias that is not a clone of bug 1's,
-    # so we get the alias separately from the other parameters.
-    my $alias = $self->bug_create_value($number, 'alias');
-    my $update_alias = $self->bug_update_value($number, 'alias');
-    
-    # Otherwise, make bug 6 a clone of bug 1.
-    my $real_number = $number;
-    $number = 1 if $number == 6;
-    
-    my $reporter = $self->bug_create_value($number, 'reporter');
-    Bugzilla->set_user(Bugzilla::User->check($reporter));
-    
-    # We create the bug with one set of values, and then we change it
-    # to have different values.
-    my %params = %{ $self->_bug_create_values->{$number} };
-    $params{alias} = $alias;
-    
-    # There are some things in bug_create_values that shouldn't go into
-    # create().
-    delete @params{qw(attachment set_flags tag)};
-    
-    my ($status, $resolution, $see_also) = 
-        delete @params{qw(bug_status resolution see_also)};
-    # All the bugs are created with everconfirmed = 0.
-    $params{bug_status} = 'UNCONFIRMED';
-    my $bug = Bugzilla::Bug->create(\%params);
-    
-    # These are necessary for the changedfrom tests.
-    my $extra_values = $self->_extra_bug_create_values->{$number};
-    foreach my $field (qw(comments remaining_time percentage_complete
-                         keyword_objects everconfirmed dependson blocked
-                         groups_in classification actual_time))
-    {
-        $extra_values->{$field} = $bug->$field;
-    }
-    $extra_values->{reporter_accessible} = $number == 1 ? 0 : 1;
-    $extra_values->{cclist_accessible}   = $number == 1 ? 0 : 1;
-    
-    if ($number == 5) {
-        # Bypass Bugzilla::Bug--we don't want any changes in bugs_activity
-        # for bug 5.
-        $dbh->do('UPDATE bugs SET qa_contact = NULL, reporter_accessible = 0,
-                                  cclist_accessible = 0 WHERE bug_id = ?',
-                 undef, $bug->id);
-        $dbh->do('DELETE FROM cc WHERE bug_id = ?', undef, $bug->id);
-        my $ts = '1970-01-01 00:00:00';
-        $dbh->do('UPDATE bugs SET creation_ts = ?, delta_ts = ?
-                   WHERE bug_id = ?', undef, $ts, $ts, $bug->id);
-        $dbh->do('UPDATE longdescs SET bug_when = ? WHERE bug_id = ?',
-                 undef, $ts, $bug->id);
-        $bug->{creation_ts} = $ts;
-        $extra_values->{see_also} = [];
-    }
-    else {
-        # Manually set the creation_ts so that each bug has a different one.
-        #
-        # Also, manually update the resolution and bug_status, because
-        # we want to see both of them change in bugs_activity, so we
-        # have to start with values for both (and as of the time when I'm
-        # writing this test, Bug->create doesn't support setting resolution).
-        #
-        # Same for see_also.
-        my $timestamp = timestamp($number, $number - 1);
-        my $creation_ts = $timestamp->ymd . ' ' . $timestamp->hms;
-        $bug->{creation_ts} = $creation_ts;
-        $dbh->do('UPDATE longdescs SET bug_when = ? WHERE bug_id = ?',
-                 undef, $creation_ts, $bug->id);
-        $dbh->do('UPDATE bugs SET creation_ts = ?, bug_status = ?,
-                  resolution = ? WHERE bug_id = ?',
-                 undef, $creation_ts, $status, $resolution, $bug->id);
-        $dbh->do('INSERT INTO bug_see_also (bug_id, value, class) VALUES (?,?,?)',
-                 undef, $bug->id, $see_also, 'Bugzilla::BugUrl::Bugzilla');
-        $extra_values->{see_also} = $bug->see_also;
-
-        # All the tags must be created as the admin user, so that the
-        # admin user can find them, later.
-        my $original_user = Bugzilla->user;
-        Bugzilla->set_user($self->admin);
-        my $tags = $self->bug_create_value($number, 'tag');
-        $bug->add_tag($_) foreach @$tags;
-        $extra_values->{tags} = $tags;
-        Bugzilla->set_user($original_user);
-
-        if ($number == 1) {
-            # Bug 1 needs to start off with reporter_accessible and
-            # cclist_accessible being 0, so that when we change them to 1,
-            # that change shows up in bugs_activity.
-            $dbh->do('UPDATE bugs SET reporter_accessible = 0,
-                      cclist_accessible = 0 WHERE bug_id = ?',
-                      undef, $bug->id);
-            # Bug 1 gets three comments, so that longdescs.count matches it
-            # uniquely. The third comment is added in the middle, so that the
-            # last comment contains all of the important data, like work_time.
-            $bug->add_comment("1-comment-" . random(100));
-        }
-        
-        my %update_params = %{ $self->_bug_update_values->{$number} };
-        my %reverse_map = reverse %{ Bugzilla::Bug->FIELD_MAP };
-        foreach my $db_name (keys %reverse_map) {
-            next if $db_name eq 'comment';
-            next if $db_name eq 'status_whiteboard';
-            if (exists $update_params{$db_name}) {
-                my $update_name = $reverse_map{$db_name};
-                $update_params{$update_name} = delete $update_params{$db_name};
-            }
-        }
-        
-        my ($new_status, $new_res) = 
-            delete @update_params{qw(status resolution)};
-        # Bypass the status workflow.
-        $bug->{bug_status} = $new_status;
-        $bug->{resolution} = $new_res;
-        $bug->{everconfirmed} = 1 if $number == 1;
-        
-        # add/remove/set fields.
-        $update_params{keywords} = { set => $update_params{keywords} };
-        $update_params{groups} = { add => $update_params{groups},
-                                   remove => $bug->groups_in };
-        my @cc_remove = map { $_->login } @{ $bug->cc_users };
-        my $cc_new = $update_params{cc};
-        my @cc_add = ref($cc_new) ? @$cc_new : ($cc_new);
-        # We make the admin an explicit CC on bug 1 (but not on bug 6), so
-        # that we can test the %user% pronoun properly.
-        if ($real_number == 1) {
-            push(@cc_add, $self->admin->login);
-        }
-        $update_params{cc} = { add => \@cc_add, remove => \@cc_remove };
-        my $see_also_remove = $bug->see_also;
-        my $see_also_add = [$update_params{see_also}];
-        $update_params{see_also} = { add => $see_also_add, 
-                                     remove => $see_also_remove };
-        $update_params{comment} = { body => $update_params{comment} };
-        $update_params{work_time} = $number;
-        # Setting work_time kills the remaining_time, so we need to
-        # preserve that. We add 8 because that produces an integer
-        # percentage_complete for bug 1, which is necessary for
-        # accurate "equals"-type searching.
-        $update_params{remaining_time} = $number + 8;
-        $update_params{reporter_accessible} = $number == 1 ? 1 : 0;
-        $update_params{cclist_accessible} = $number == 1 ? 1 : 0;
-        $update_params{alias} = $update_alias;
-
-        $bug->set_all(\%update_params);
-        my $flags = $self->bug_create_value($number, 'set_flags')->{b};
-        $bug->set_flags([], $flags);
-        $timestamp->set(second => $number);
-        $bug->update($timestamp->ymd . ' ' . $timestamp->hms);
-        $extra_values->{flags} = $bug->flags;
-        
-        # It's not generally safe to do update() multiple times on
-        # the same Bug object.
-        $bug = new Bugzilla::Bug($bug->id);
-        my $update_flags = $self->bug_update_value($number, 'set_flags')->{b};
-        $_->{status} = 'X' foreach @{ $bug->flags };
-        $bug->set_flags($bug->flags, $update_flags);
-        if ($number == 1) {
-            my $comment_id = $bug->comments->[-1]->id;
-            $bug->set_comment_is_private({ $comment_id => 1 });
-        }
-        $bug->update($bug->delta_ts);
-        
-        my $attach_create = $self->bug_create_value($number, 'attachment');
-        my $attachment = Bugzilla::Attachment->create({
-            bug => $bug,
-            creation_ts => $creation_ts,
-            %$attach_create });
-        # Store for the changedfrom tests.
-        $extra_values->{attachments} = 
-            [new Bugzilla::Attachment($attachment->id)];
-        
-        my $attach_update = $self->bug_update_value($number, 'attachment');
-        $attachment->set_all($attach_update);
-        # In order to keep the mimetype on the ispatch attachment,
-        # we need to bypass the validator.
-        $attachment->{mimetype} = $attach_update->{content_type};
-        my $attach_flags = $self->bug_update_value($number, 'set_flags')->{a};
-        $attachment->set_flags([], $attach_flags);
-        $attachment->update($bug->delta_ts);
-    }
-    
-    # Values for changedfrom.
-    $extra_values->{creation_ts} = $bug->creation_ts;
-    $extra_values->{delta_ts}    = $bug->creation_ts;
-    
-    return new Bugzilla::Bug($bug->id);
-}
-
-###################################
-# Test::Builder Memory Efficiency #
-###################################
-
-# Test::Builder stores information for each test run, but Test::Harness
-# and TAP::Harness don't actually need this information. When we run 60
-# million tests, the history eats up all our memory. (After about
-# 1 million tests, memory usage is around 1 GB.)
-#
-# The only part of the history that Test::More actually *uses* is the "ok"
-# field, which we store more efficiently, in an array, and then we re-populate
-# the Test_Results in Test::Builder at the end of the test.
-sub clean_test_history {
-    my ($self) = @_;
-    return if !$self->option('long');
-    my $builder = Test::More->builder;
-    my $current_test = $builder->current_test;
-
-    # I don't use details() because I don't want to copy the array.
-    my $results = $builder->{Test_Results};
-    my $check_test = $current_test - 1;
-    while (my $result = $results->[$check_test]) {
-        last if !$result;
-        $self->test_success($check_test, $result->{ok});
-        $check_test--;
-    }
-
-    # Truncate the test history array, but retain the current test number.
-    $builder->{Test_Results} = [];
-    $builder->{Curr_Test} = $current_test;
-}
-
-sub test_success {
-    my ($self, $index, $status) = @_;
-    $self->{test_success}->[$index] = $status;
-    return $self->{test_success};
-}
-
-sub repopulate_test_results {
-    my ($self) = @_;
-    return if !$self->option('long');
-    $self->clean_test_history();
-    # We create only two hashes, for memory efficiency.
-    my %ok = ( ok => 1 );
-    my %not_ok = ( ok => 0 );
-    my @results;
-    foreach my $success (@{ $self->{test_success} }) {
-        push(@results, $success ? \%ok : \%not_ok);
-    }
-    my $builder = Test::More->builder;
-    $builder->{Test_Results} = \@results;
-}
-
-##########
-# Caches #
-##########
-
-# When doing AND and OR tests, we essentially test the same field/operator
-# combinations over and over. So, if we're going to be running those tests,
-# we cache the translated_value of the FieldTests globally so that we don't
-# have to re-run the value-translation code every time (which can be pretty
-# slow).
-sub value_translation_cache {
-    my ($self, $field_test, $value) = @_;
-    return if !$self->option('long');
-    my $test_name = $field_test->name;
-    if (@_ == 3) {
-        $self->{value_translation_cache}->{$test_name} = $value;
-    }
-    return $self->{value_translation_cache}->{$test_name};
-}
-
-# When doing AND/OR tests, the value for transformed_value_was_equal
-# (see Bugzilla::Test::Search::FieldTest) won't be recalculated
-# if we pull our values from the value_translation_cache. So we need
-# to also cache the values for transformed_value_was_equal.
-sub was_equal_cache {
-    my ($self, $field_test, $number, $value) = @_;
-    return if !$self->option('long');
-    my $test_name = $field_test->name;
-    if (@_ == 4) {
-        $self->{tvwe_cache}->{$test_name}->{$number} = $value;
-    }
-    return $self->{tvwe_cache}->{$test_name}->{$number};
-}
-
-#############
-# Main Test #
-#############
-
-sub run {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
-
-    # We want backtraces on any "die" message or any warning.
-    # Otherwise it's hard to trace errors inside of Bugzilla::Search from
-    # reading automated test run results.
-    local $SIG{__WARN__} = \&Carp::cluck;
-    local $SIG{__DIE__}  = \&Carp::confess;
-
-    $dbh->bz_start_transaction();
-    
-    # Some parameters need to be set in order for the tests to function
-    # properly.
-    my $everybody = $self->everybody;
-    my $params = Bugzilla->params;
-    local $params->{'useclassification'} = 1;
-    local $params->{'useqacontact'} = 1;
-    local $params->{'usetargetmilestone'} = 1;
-    local $params->{'mail_delivery_method'} = 'None';
-    local $params->{'timetrackinggroup'} = $everybody->name;
-    local $params->{'insidergroup'} = $everybody->name;
-
-    $self->_setup_bugs();
-    
-    # Even though _setup_bugs set us as an admin, we want to be sure at
-    # this point that we have an admin with refreshed group memberships.
-    Bugzilla->set_user($self->admin);
-    foreach my $test (CUSTOM_SEARCH_TESTS) {
-        my $custom_test = new Bugzilla::Test::Search::CustomTest($test, $self);
-        $custom_test->run();
-    }
-    foreach my $test (SPECIAL_PARAM_TESTS) {
-        my $operator_test =
-            new Bugzilla::Test::Search::OperatorTest($test->{operator}, $self);
-        my $field = Bugzilla::Field->check($test->{field});
-        my $special_test = new Bugzilla::Test::Search::FieldTestNormal(
-            $operator_test, $field, $test);
-        $special_test->run();
-    }
-    foreach my $operator ($self->top_level_operators) {
-        my $operator_test =
-            new Bugzilla::Test::Search::OperatorTest($operator, $self);
-        $operator_test->run();
-    }
-
-    # Rollbacks won't get rid of bugs_fulltext entries, so we do that ourselves.
-    my @bug_ids = map { $_->id } $self->bugs;
-    my $bug_id_string = join(',', @bug_ids);
-    $dbh->do("DELETE FROM bugs_fulltext WHERE bug_id IN ($bug_id_string)");
-    $dbh->bz_rollback_transaction();
-    $self->repopulate_test_results();
-}
-
-# This makes a few changes to the bugs after they're created--changes
-# that can only be done after all the bugs have been created.
-sub _setup_bugs {
-    my ($self) = @_;
-    $self->_setup_dependencies();
-    $self->_set_bug_id_fields();
-    $self->_protect_bug_6();
-}
-sub _setup_dependencies {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    # Set up depedency relationships between the bugs.
-    # Bug 1 + 6 depend on bug 2 and block bug 3.
-    my $bug2 = $self->bug(2);
-    my $bug3 = $self->bug(3);
-    foreach my $number (1,6) {
-        my $bug = $self->bug($number);
-        my @original_delta = ($bug2->delta_ts, $bug3->delta_ts);
-        Bugzilla->set_user($bug->reporter);
-        $bug->set_dependencies([$bug2->id], [$bug3->id]);
-        $bug->update($bug->delta_ts);
-        # Setting dependencies changed the delta_ts on bug2 and bug3, so
-        # re-set them back to what they were before. However, we leave
-        # the correct update times in bugs_activity, so that the changed*
-        # searches still work right.
-        my $set_delta = $dbh->prepare(
-            'UPDATE bugs SET delta_ts = ? WHERE bug_id = ?');
-        foreach my $row ([$original_delta[0], $bug2->id], 
-                         [$original_delta[1], $bug3->id])
-        {
-            $set_delta->execute(@$row);
-        }
-    }
-}
-
-sub _set_bug_id_fields {
-    my ($self) = @_;
-    # BUG_ID fields couldn't be set before, because before we create bug 1,
-    # we don't necessarily have any valid bug ids.)
-    my @bug_id_fields = grep { $_->type == FIELD_TYPE_BUG_ID }
-                             $self->all_fields;
-    foreach my $number (1..NUM_BUGS) {
-        my $bug = $self->bug($number);
-        $number = 1 if $number == 6;
-        next if $number == 5;
-        my $other_bug = $self->bug($number + 1);
-        Bugzilla->set_user($bug->reporter);
-        foreach my $field (@bug_id_fields) {
-            $bug->set_custom_field($field, $other_bug->id);
-            $bug->update($bug->delta_ts);
-        }
-    }
-}
-
-sub _protect_bug_6 {
-    my ($self) = @_;
-    my $dbh = Bugzilla->dbh;
-    
-    Bugzilla->set_user($self->admin);
-    
-    # Put bug6 in the nobody group.
-    my $nobody = $self->nobody;
-    # We pull it newly from the DB to be sure it's safe to call update()
-    # on.
-    my $bug6 = new Bugzilla::Bug($self->bug(6)->id);
-    $bug6->add_group($nobody);
-    $bug6->update($bug6->delta_ts);
-    
-    # Remove the admin (and everybody else) from the $nobody group.
-    $dbh->do('DELETE FROM group_group_map 
-               WHERE grantor_id = ? OR member_id = ?', undef,
-             $nobody->id, $nobody->id);
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/AndTest.pm b/xt/lib/Bugzilla/Test/Search/AndTest.pm
deleted file mode 100644
index f34ba1f3af..0000000000
--- a/xt/lib/Bugzilla/Test/Search/AndTest.pm
+++ /dev/null
@@ -1,52 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This test combines two field/operator combinations using AND in
-# a single boolean chart.
-package Bugzilla::Test::Search::AndTest;
-use parent qw(Bugzilla::Test::Search::OrTest);
-
-use Bugzilla::Test::Search::Constants;
-use List::MoreUtils qw(all);
-
-use constant type => 'AND';
-
-#############
-# Accessors #
-#############
-
-# In an AND test, bugs ARE supposed to be contained only if they are contained
-# by ALL tests.
-sub bug_is_contained {
-    my ($self, $number) = @_;
-    return all { $_->bug_is_contained($number) } $self->field_tests;
-}
-
-sub _bug_will_actually_be_contained {
-    my ($self, $number) = @_;
-    return all { $_->will_actually_contain_bug($number) } $self->field_tests;
-}
-
-##############################
-# Bugzilla::Search arguments #
-##############################
-
-sub search_params {
-    my ($self) = @_;
-    my @all_params = map { $_->search_params } $self->field_tests;
-    my %params;
-    my $chart = 0;
-    foreach my $item (@all_params) {
-        $params{"field0-$chart-0"} = $item->{'field0-0-0'};
-        $params{"type0-$chart-0"}  = $item->{'type0-0-0'};
-        $params{"value0-$chart-0"} = $item->{'value0-0-0'};
-        $chart++;
-    }
-    return \%params;
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/Constants.pm b/xt/lib/Bugzilla/Test/Search/Constants.pm
deleted file mode 100644
index 5d84ec6ff7..0000000000
--- a/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ /dev/null
@@ -1,1203 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-
-# These are constants used by Bugzilla::Test::Search.
-# See the comment at the top of that package for a general overview
-# of how the search test works, and how the constants are used.
-# More detailed information on each constant is available in the comments
-# in this file.
-package Bugzilla::Test::Search::Constants;
-use parent qw(Exporter);
-use Bugzilla::Constants;
-use Bugzilla::Util qw(generate_random_password);
-
-our @EXPORT = qw(
-    ATTACHMENT_FIELDS
-    BROKEN_NOT
-    COLUMN_TRANSLATION
-    COMMENT_FIELDS
-    CUSTOM_FIELDS
-    CUSTOM_SEARCH_TESTS
-    FIELD_SIZE
-    FIELD_SUBSTR_SIZE
-    FLAG_FIELDS
-    INJECTION_BROKEN_FIELD
-    INJECTION_BROKEN_OPERATOR
-    INJECTION_TESTS
-    KNOWN_BROKEN
-    NUM_BUGS
-    NUM_SEARCH_TESTS
-    SKIP_FIELDS
-    SPECIAL_PARAM_TESTS
-    SUBSTR_NO_FIELD_ADD
-    SUBSTR_SIZE
-    TESTS
-    TESTS_PER_RUN
-    USER_FIELDS
-);
-
-# Bug 1 is designed to be found by all the "equals" tests. It has
-# multiple values for several fields where other fields only have
-# one value.
-#
-# Bug 2 and 3 have a dependency relationship with Bug 1,
-# but show up in "not equals" tests. We do use bug 2 in multiple-value
-# tests.
-#
-# Bug 4 should never show up in any equals test, and has no relationship
-# with any other bug. However, it does have all its fields set.
-#
-# Bug 5 only has values set for mandatory fields, to expose problems
-# that happen with "not equals" tests failing to catch bugs that don't
-# have a value set at all.
-#
-# Bug 6 is a clone of Bug 1, but is in a group that the searcher isn't
-# in.
-use constant NUM_BUGS => 6;
-
-# How many tests there are for each operator/field combination other
-# than the "contains" tests.
-use constant NUM_SEARCH_TESTS => 3;
-# This is how many tests get run for each field/operator.
-use constant TESTS_PER_RUN => NUM_SEARCH_TESTS + NUM_BUGS;
-
-# This is how many random characters we generate for most fields' names.
-# (Some fields can't be this long, though, so they have custom lengths
-# in Bugzilla::Test::Search).
-use constant FIELD_SIZE => 30;
-
-# These are the custom fields that are created if the BZ_MODIFY_DATABASE_TESTS
-# environment variable is set.
-use constant CUSTOM_FIELDS => {
-    FIELD_TYPE_FREETEXT,  'cf_freetext',
-    FIELD_TYPE_SINGLE_SELECT, 'cf_single_select',
-    FIELD_TYPE_MULTI_SELECT, 'cf_multi_select',
-    FIELD_TYPE_TEXTAREA, 'cf_textarea',
-    FIELD_TYPE_DATETIME, 'cf_datetime',
-    FIELD_TYPE_BUG_ID, 'cf_bugid',
-};
-
-# This translates fielddefs names into Search column names.
-use constant COLUMN_TRANSLATION => {
-    creation_ts => 'opendate',
-    delta_ts    => 'changeddate',
-    work_time => 'actual_time',
-};
-
-# Make comment field names to their Bugzilla::Comment accessor.
-use constant COMMENT_FIELDS => {
-    longdesc  => 'body',
-    commenter => 'author',
-    'longdescs.isprivate' => 'is_private',
-};
-
-# Same as above, for Bugzilla::Attachment.
-use constant ATTACHMENT_FIELDS => {
-    mimetype => 'contenttype',
-    submitter => 'attacher',
-    thedata   => 'data',
-};
-
-# Same, for Bugzilla::Flag.
-use constant FLAG_FIELDS => {
-    'flagtypes.name' => 'name',
-    'setters.login_name' => 'setter',
-    'requestees.login_name' => 'requestee',
-};
-
-# These are fields that we don't test. Test::More will mark these
-# "TODO & SKIP", and not run tests for them at all.
-#
-# We don't support days_elapsed or owner_idle_time yet.
-use constant SKIP_FIELDS => qw(
-    owner_idle_time
-    days_elapsed
-);
-
-# All the fields that represent users.
-use constant USER_FIELDS => qw(
-    assigned_to
-    cc
-    reporter
-    qa_contact
-    commenter
-    attachments.submitter
-    setters.login_name
-    requestees.login_name
-);
-
-# For the "substr"-type searches, how short of a substring should
-# we use? The goal is to be shorter than the full string, but
-# long enough to still be globally unique.
-use constant SUBSTR_SIZE => 20;
-# However, for some fields, we use a different size.
-use constant FIELD_SUBSTR_SIZE => {
-    alias => 11,
-    # Just the month and day.
-    deadline => -5,
-    creation_ts => -8,
-    delta_ts => -8,
-    percentage_complete => 1,
-    work_time => 3,
-    remaining_time => 3,
-    target_milestone => 15,
-    longdesc => 25,
-    # Just the hour and minute.
-    FIELD_TYPE_DATETIME, -5,
-};
-
-# For most fields, we add the length of the name of the field plus
-# the SUBSTR_SIZE specified above to determine how large of a substring
-# we're going to use. However, for some fields, it doesn't make sense to
-# add in their field name this way.
-use constant SUBSTR_NO_FIELD_ADD => FIELD_TYPE_DATETIME, qw(
-    target_milestone remaining_time percentage_complete work_time
-    attachments.mimetype attachments.submitter attachments.filename
-    attachments.description flagtypes.name
-);
-
-################
-# Known Broken #
-################
-
-# See the KNOWN_BROKEN constant for a general description of these
-# "_BROKEN" constants.
-
-# Shared between greaterthan and greaterthaneq.
-#
-# As with other fields, longdescs greaterthan matches if any comment
-# matches (which might be OK).
-#
-# Same for keywords, and cc. Logically, all of these might
-# be OK, but it makes the operation not the logical reverse of
-# lessthaneq. What we're really saying here by marking these broken
-# is that there ought to be some way of searching "all ccs" vs "any cc"
-# (and same for the other fields).
-use constant GREATERTHAN_BROKEN => (
-    cc        => { contains => [1] },
-);
-
-# allwords and allwordssubstr have these broken tests in common.
-use constant ALLWORDS_BROKEN => (
-    # allwordssubstr on cc fields matches against a single cc,
-    # instead of matching against all ccs on a bug.
-    cc        => { contains => [1] },
-    # bug 828344 changed how these searches operate to revert back to the 4.0
-    # behavour, so these tests need to be updated (bug 849117).
-    'flagtypes.name' => { contains => [1] },
-    longdesc         => { contains => [1] },
-);
-
-# Fields that don't generally work at all with changed* searches, but
-# probably should.
-use constant CHANGED_BROKEN => (
-    classification => { contains => [1] },
-    commenter => { contains => [1] },
-    percentage_complete     => { contains => [1] },
-    'requestees.login_name' => { contains => [1] },
-    'setters.login_name'    => { contains => [1] },
-    delta_ts                => { contains => [1] },
-);
-
-# These are additional broken tests that changedfrom and changedto
-# have in common.
-use constant CHANGED_VALUE_BROKEN => (
-    bug_group        => { contains => [1] },
-    cc               => { contains => [1] },
-    estimated_time   => { contains => [1] },
-    'flagtypes.name' => { contains => [1] },
-    keywords  => { contains => [1] },
-    'longdescs.count' => { search => 1 },
-    FIELD_TYPE_MULTI_SELECT, { contains => [1] },
-);
-
-
-# Any test listed in KNOWN_BROKEN gets marked TODO by Test::More
-# (using some complex code in Bugzilla::Test::Seach::FieldTest).
-# This means that if you run the test under "prove -v", these tests will
-# still show up as "not ok", but the test suite results won't show them
-# as a failure.
-#
-# This constant contains operators as keys, which point to hashes. The hashes
-# have field names as keys. Each field name points to a hash describing
-# how that field/operator combination is broken. The "contains"
-# array specifies that that particular "contains" test is expected
-# to fail. If "search" is set to 1, then we expect the creation of the
-# Bugzilla::Search object to fail.
-#
-# To allow handling custom fields, you can also use the field type as a key
-# instead of the field name. Specifying explicit field names always overrides
-# specifying a field type.
-#
-# Sometimes the operators have multiple tests, and one of them works
-# while the other fails. In this case, we have a special override for
-# "operator-value", which uniquely identifies tests.
-use constant KNOWN_BROKEN => {
-    greaterthan   => { GREATERTHAN_BROKEN },
-    greaterthaneq => { GREATERTHAN_BROKEN },
-
-    'allwordssubstr-<1>' => { ALLWORDS_BROKEN },
-    'allwords-<1>' => {
-        ALLWORDS_BROKEN,
-    },
-    'anywords-<1>' => {
-        'flagtypes.name' => { contains => [1,2,3,4,5] },
-    },
-    'anywords-<1> <2>' => {
-        'flagtypes.name' => { contains => [3,4,5] },
-    },
-    'anywordssubstr-<1> <2>' => {
-        'flagtypes.name' => { contains => [3,4,5] },
-    },
-
-    # setters.login_name and requestees.login name aren't tracked individually
-    # in bugs_activity, so can't be searched using this method.
-    #
-    # percentage_complete isn't tracked in bugs_activity (and it would be
-    # really hard to track). However, it adds a 0=0 term instead of using
-    # the changed* charts or simply denying them.
-    #
-    # delta_ts changedbefore/after should probably search for bugs based
-    # on their delta_ts.
-    #
-    # creation_ts changedbefore/after should search for bug creation dates.
-    #
-    # The commenter field changedbefore/after should search for comment
-    # creation dates.
-    #
-    # classification isn't being tracked properly in bugs_activity, I think.
-    #
-    # attach_data.thedata should search when attachments were created and
-    # who they were created by.
-    'changedbefore' => {
-        CHANGED_BROKEN,
-        'attach_data.thedata' => { contains => [1] },
-    },
-    'changedafter' => {
-        'attach_data.thedata' => { contains => [2,3,4] },
-        classification => { contains => [2,3,4] },
-        commenter   => { contains => [2,3,4] },
-        delta_ts    => { contains => [2,3,4] },
-        percentage_complete => { contains => [2,3,4] },
-        'requestees.login_name' => { contains => [2,3,4] },
-        'setters.login_name'    => { contains => [2,3,4] },
-    },
-    changedfrom => {
-        CHANGED_BROKEN,
-        CHANGED_VALUE_BROKEN,
-        # All fields should have a way to search for "changing
-        # from a blank value" probably.
-        blocked   => { contains => [3,4,5], no_criteria => 1 },
-        dependson => { contains => [2,4,5], no_criteria => 1 },
-        work_time => { contains => [1] },
-        FIELD_TYPE_BUG_ID, { contains => [5], no_criteria => 1 },
-    },
-    # changeto doesn't find remaining_time changes (possibly due to us not
-    # tracking that data properly).
-    #
-    # multi-valued fields are stored as comma-separated strings, so you
-    # can't do changedfrom/to on them.
-    #
-    # Perhaps commenter can either tell you who the last commenter was,
-    # or if somebody commented at a given time (combined with other
-    # charts).
-    #
-    # longdesc changedto/from doesn't do anything; maybe it should.
-    # Same for attach_data.thedata.
-    changedto => {
-        CHANGED_BROKEN,
-        CHANGED_VALUE_BROKEN,
-        'attach_data.thedata' => { contains => [1] },
-        longdesc         => { contains => [1] },
-        remaining_time   => { contains => [1] },
-    },
-    changedby => {
-        CHANGED_BROKEN,
-        # This should probably search the attacher or anybody who changed
-        # anything about an attachment at all.
-        'attach_data.thedata' => { contains => [1] },
-        # This should probably search the reporter.
-        creation_ts => { contains => [1] },
-    },
-    notequals => {
-        'flagtypes.name' => { contains => [1, 5] },
-        longdesc         => { contains => [1] },
-    },
-    notregexp => {
-        'flagtypes.name' => { contains => [1, 5] },
-        longdesc         => { contains => [1] },
-    },
-    notsubstring => {
-        'flagtypes.name' => { contains => [5] },
-        longdesc         => { contains => [1] },
-    },
-    nowords => {
-        'flagtypes.name' => { contains => [1, 5] },
-    },
-    nowordssubstr => {
-        'flagtypes.name' => { contains => [5] },
-    },
-};
-
-###################
-# Broken NotTests #
-###################
-
-# Common BROKEN_NOT values for the changed* fields.
-use constant CHANGED_BROKEN_NOT => (
-    "attach_data.thedata"   => { contains => [1] },
-    "classification"        => { contains => [1] },
-    "commenter"             => { contains => [1] },
-    "delta_ts"              => { contains => [1] },
-    percentage_complete     => { contains => [1] },
-    "requestees.login_name" => { contains => [1] },
-    "setters.login_name"    => { contains => [1] },
-);
-
-# For changedfrom and changedto.
-use constant CHANGED_FROM_TO_BROKEN_NOT => (
-    'longdescs.count' => { search => 1 },
-    "bug_group" => { contains => [1] },
-    "cc" => { contains => [1] },
-    "estimated_time" => { contains => [1] },
-    "flagtypes.name" => { contains => [1] },
-    "keywords" => { contains => [1] },    
-    FIELD_TYPE_MULTI_SELECT, { contains => [1] },
-);
-
-# These are field/operator combinations that are broken when run under NOT().
-use constant BROKEN_NOT => {
-    allwords => {
-        cc               => { contains => [1] },
-        'flagtypes.name' => { contains => [1, 5] },
-        longdesc         => { contains => [1] },
-    },
-    'allwords-<1> <2>' => {
-        cc => { },
-    },
-    allwordssubstr => {
-        cc               => { contains => [1] },
-        'flagtypes.name' => { contains => [5, 6] },
-        longdesc         => { contains => [1] },
-    },
-    'allwordssubstr-<1>,<2>' => {
-        cc               => { },
-        longdesc         => { contains => [1] },
-    },
-    anyexact => {
-        'flagtypes.name' => { contains => [1, 2, 5] },
-    },
-    'anywords-<1>' => {
-        'flagtypes.name' => { contains => [1, 2, 3, 4, 5] },
-    },
-    'anywords-<1> <2>' => {
-        'flagtypes.name' => { contains => [3, 4, 5] },
-    },
-    anywordssubstr => {
-        'flagtypes.name' => { contains => [5] },
-    },
-    'anywordssubstr-<1> <2>' => {
-        'flagtypes.name' => { contains => [3,4,5] },
-    },
-    casesubstring => {
-        'flagtypes.name' => { contains => [5] },
-    },
-    changedafter => {
-        "attach_data.thedata"   => { contains => [2, 3, 4] },
-        "classification"        => { contains => [2, 3, 4] },
-        "commenter"             => { contains => [2, 3, 4] },
-        percentage_complete     => { contains => [2, 3, 4] },
-        "delta_ts"              => { contains => [2, 3, 4] },
-        "requestees.login_name" => { contains => [2, 3, 4] },
-        "setters.login_name"    => { contains => [2, 3, 4] },
-    },
-    changedbefore => {
-        CHANGED_BROKEN_NOT,
-    },
-    changedby => {
-        CHANGED_BROKEN_NOT,
-        creation_ts => { contains => [1] },
-        work_time   => { contains => [1] },
-    },
-    changedfrom => {
-        CHANGED_BROKEN_NOT,
-        CHANGED_FROM_TO_BROKEN_NOT,
-        'attach_data.thedata' => { },
-        blocked         => { contains => [1, 2] },
-        dependson       => { contains => [1, 3] },
-        work_time       => { contains => [1] },
-        FIELD_TYPE_BUG_ID, { contains => [1 .. 4] },
-    },
-    changedto => {
-        CHANGED_BROKEN_NOT,
-        CHANGED_FROM_TO_BROKEN_NOT,
-        longdesc => { contains => [1] },
-        "remaining_time" => { contains => [1] },
-    },
-    greaterthan => {
-        cc               => { contains => [1] },
-        'flagtypes.name' => { contains => [5] },
-    },
-    greaterthaneq => {
-        cc               => { contains => [1] },
-        'flagtypes.name' => { contains => [2, 5] },
-    },
-    equals => {
-        'flagtypes.name' => { contains => [1, 5] },
-    },
-    notequals => {
-        longdesc         => { contains => [1] },
-    },
-    notregexp => {
-        longdesc         => { contains => [1] },
-    },
-    notsubstring => {
-        longdesc         => { contains => [1] },
-    },
-    'nowords-<1>' => {
-        'flagtypes.name' => { contains => [5] },
-    },
-    'nowordssubstr-<1>' => {
-        'flagtypes.name' => { contains => [5] },
-    },
-    lessthan => {
-        'flagtypes.name' => { contains => [5] },
-    },
-    lessthaneq => {
-        'flagtypes.name' => { contains => [1, 5] },
-    },
-    regexp => {
-        'flagtypes.name' => { contains => [1, 5] },
-        longdesc         => { contains => [1] },
-    },
-    substring => {
-        'flagtypes.name' => { contains => [5] },
-        longdesc         => { contains => [1] },
-    },
-};
-
-#############
-# Overrides #
-#############
-
-# These overrides are used in the TESTS constant, below.
-
-# Regex tests need unique test values for certain fields.
-use constant REGEX_OVERRIDE => {
-    'attachments.mimetype'  => { value => '^text/x-1-' },
-    bug_file_loc => { value => '^http://1-' },
-    see_also  => { value => '^http://1-' },
-    blocked   => { value => '^<1>$' },
-    dependson => { value => '^<1>$' },
-    bug_id    => { value => '^<1>$' },
-    'attachments.isobsolete' => { value => '^1'},
-    'attachments.ispatch'    => { value => '^1'},
-    'attachments.isprivate'  => { value => '^1' },
-    cclist_accessible        => { value => '^1' },
-    reporter_accessible      => { value => '^1' },
-    everconfirmed            => { value => '^1' },
-    'longdescs.count'        => { value => '^3' },
-    'longdescs.isprivate'    => { value => '^1' },
-    creation_ts => { value => '^2037-01-01' },
-    delta_ts    => { value => '^2037-01-01' },
-    deadline    => { value => '^2037-02-01' },
-    estimated_time => { value => '^1.0' },
-    remaining_time => { value => '^9.0' },
-    work_time      => { value => '^1.0' },
-    longdesc       => { value => '^1-' },
-    percentage_complete => { value => '^10' },
-    FIELD_TYPE_BUG_ID, { value => '^<1>$' },
-    FIELD_TYPE_DATETIME, { value => '^2037-03-01' }
-};
-
-# Common overrides between lessthan and lessthaneq.
-use constant LESSTHAN_OVERRIDE => (
-    alias             => { contains => [1,5] },
-    estimated_time    => { contains => [1,5] },
-    qa_contact        => { contains => [1,5] },
-    resolution        => { contains => [1,5] },
-    status_whiteboard => { contains => [1,5] },
-    FIELD_TYPE_TEXTAREA, { contains => [1,5] },
-    FIELD_TYPE_FREETEXT, { contains => [1,5] },
-);
-
-# The mandatorily-set fields have values higher than <1>,
-# so bug 5 shows up.
-use constant GREATERTHAN_OVERRIDE => (
-    classification => { contains => [2,3,4,5] },
-    assigned_to  => { contains => [2,3,4,5] },
-    bug_id       => { contains => [2,3,4,5] },
-    bug_group    => { contains => [1,2,3,4] },
-    bug_severity => { contains => [2,3,4,5] },
-    bug_status   => { contains => [2,3,4,5] },
-    component    => { contains => [2,3,4,5] },
-    commenter    => { contains => [2,3,4,5] },
-    # keywords matches if *any* keyword matches
-    keywords     => { contains => [1,2,3,4] },
-    longdesc     => { contains => [1,2,3,4] },
-    op_sys       => { contains => [2,3,4,5] },
-    priority     => { contains => [2,3,4,5] },
-    product      => { contains => [2,3,4,5] },
-    reporter     => { contains => [2,3,4,5] },
-    rep_platform => { contains => [2,3,4,5] },
-    short_desc   => { contains => [2,3,4,5] },
-    version      => { contains => [2,3,4,5] },
-    tag          => { contains => [1,2,3,4] },
-    target_milestone => { contains => [2,3,4,5] },
-    # Bug 2 is the only bug besides 1 that has a Requestee set.
-    'requestees.login_name'  => { contains => [2] },
-    FIELD_TYPE_SINGLE_SELECT, { contains => [2,3,4,5] },
-    # Override SINGLE_SELECT for resolution.
-    resolution => { contains => [2,3,4] },
-    # MULTI_SELECTs match if *any* value matches
-    FIELD_TYPE_MULTI_SELECT, { contains => [1,2,3,4] },
-);
-
-# For all positive multi-value types.
-use constant MULTI_BOOLEAN_OVERRIDE => (
-    'attachments.ispatch'    => { value => '1,1', contains => [1] },
-    'attachments.isobsolete' => { value => '1,1', contains => [1] },
-    'attachments.isprivate'  => { value => '1,1', contains => [1] },
-    cclist_accessible        => { value => '1,1', contains => [1] },
-    reporter_accessible      => { value => '1,1', contains => [1] },
-    'longdescs.isprivate'    => { value => '1,1', contains => [1] },
-    everconfirmed            => { value => '1,1', contains => [1] },
-);
-
-# Same as above, for negative multi-value types.
-use constant NEGATIVE_MULTI_BOOLEAN_OVERRIDE => (
-    'attachments.ispatch'    => { value => '1,1', contains => [2,3,4,5] },
-    'attachments.isobsolete' => { value => '1,1', contains => [2,3,4,5] },
-    'attachments.isprivate'  => { value => '1,1', contains => [2,3,4,5] },
-    cclist_accessible        => { value => '1,1', contains => [2,3,4,5] },
-    reporter_accessible      => { value => '1,1', contains => [2,3,4,5] },
-    'longdescs.isprivate'    => { value => '1,1', contains => [2,3,4,5] },
-    everconfirmed            => { value => '1,1', contains => [2,3,4,5] },
-);
-
-# For anyexact and anywordssubstr
-use constant ANY_OVERRIDE => (
-    'longdescs.count' => { contains => [1,2,3,4] },
-    'work_time' => { value => '1.0,2.0' },
-    dependson => { value => '<1>,<3>', contains => [1,3] },
-    MULTI_BOOLEAN_OVERRIDE,
-);
-
-# For all the changed* searches. The ones that have empty contains
-# are fields that never change in value, or will never be rationally
-# tracked in bugs_activity.
-use constant CHANGED_OVERRIDE => (
-    'attachments.submitter' => { contains => [] },
-    bug_id    => { contains => [] },
-    reporter  => { contains => [] },
-    tag       => { contains => [] },
-);
-
-#########
-# Tests #
-#########
-
-# The basic format of this is a hashref, where the keys are operators,
-# and each operator has an arrayref of tests that it runs. The tests
-# are hashrefs, with the following possible keys:
-#
-# contains: This is a list of bug numbers that the search is expected
-#           to contain. (This is bug numbers, like 1,2,3, not the bug
-#           ids. For a description of each bug number, see NUM_BUGS.)
-#           Any bug not listed in "contains" must *not* show up in the
-#           search result.
-# value: The value that you're searching for. There are certain special
-#        codes that will be replaced with bug values when the tests are
-#        run. In these examples below, "#" indicates a bug number:
-#
-#        <#> - The field value for this bug.
-#
-#              For any operator that has the string "word" in it, this is
-#              *all* the values for the current field from the numbered bug,
-#              joined by a space.
-#
-#              If the operator has the string "substr" in it, then we
-#              take a substring of the value (for single-value searches)
-#              or we take a substring of each value and join them (for
-#              multi-value "word" searches). The length of the substring
-#              is determined by the SUBSTR_SIZE constants above.)
-#
-#              For other operators, this just becomes the first value from
-#              the field for the numbered bug.
-#
-#              So, if we were running the "equals" test and checking the
-#              cc field, <1> would become the login name of the first cc on
-#              Bug 1. If we did an "anywords" search test, it would become
-#              a space-separated string of the login names of all the ccs
-#              on Bug 1. If we did an "anywordssubstr" search test, it would
-#              become a space-separated string of the first few characters
-#              of each CC's login name on Bug 1.
-#              
-#        <#-id> - The bug id of the numbered bug.
-#        <#-reporter> - The login name of the numbered bug's reporter.
-#        <#-delta> - The delta_ts of the numbered bug.
-#
-# escape: If true, we will call quotemeta() on the value immediately
-#         before passing it to Search.pm.
-#
-# transform: A function to call on any field value before inserting
-#            it for a <#> replacement. The transformation function
-#            gets all of the bug's values for the field as its arguments.
-# if_equal: This allows you to override "contains" for the case where
-#           the transformed value (from calling the "transform" function)
-#           is equal to the original value.
-#
-# override: This allows you to override "contains" and "values" for
-#           certain fields.
-use constant TESTS => {
-    equals => [
-        { contains => [1], value => '<1>' },
-    ],
-    notequals => [
-        { contains => [2,3,4,5], value => '<1>' },
-    ],
-    substring => [
-        { contains => [1], value => '<1>',
-          override => {
-              percentage_complete => { contains => [1,2,3] },
-          }
-        },
-    ],
-    casesubstring => [
-        { contains => [1], value => '<1>',
-          override => {
-              percentage_complete => { contains => [1,2,3] },
-          }
-        },
-        { contains => [], value => '<1>', transform => sub { lc($_[0]) },
-          extra_name => 'lc', if_equal => { contains => [1] },
-          override => {
-              percentage_complete => { contains => [1,2,3] },
-          }
-        },
-    ],
-    notsubstring => [
-        { contains => [2,3,4,5], value => '<1>',
-          override => {
-              percentage_complete => { contains => [4,5] },
-          },
-        }
-    ],
-    regexp => [
-        { contains => [1], value => '<1>', escape => 1,
-          override => {
-              percentage_complete => { value => '^10' },
-          }
-        },
-        { contains => [1], value => '^1-', override => REGEX_OVERRIDE },
-    ],
-    notregexp => [
-        { contains => [2,3,4,5], value => '<1>', escape => 1,
-          override => {
-              percentage_complete => { value => '^10' },
-          }
-        },
-        { contains => [2,3,4,5], value => '^1-', override => REGEX_OVERRIDE },
-    ],
-    lessthan => [
-        { contains => [1], value => 2, 
-          override => {
-              # A lot of these contain bug 5 because an empty value is validly
-              # less than the specified value.
-              bug_file_loc => { value => 'http://2-', contains => [1,5] },
-              see_also     => { value => 'http://2-' },
-              'attachments.mimetype' => { value => 'text/x-2-' },
-              blocked   => { value => '<4-id>', contains => [1,2] },
-              dependson => { value => '<3-id>', contains => [1,3] },
-              bug_id    => { value => '<2-id>' },
-              'attachments.isprivate'  => { value => 1, contains => [2,3,4] },
-              'attachments.isobsolete' => { value => 1, contains => [2,3,4] },
-              'attachments.ispatch'    => { value => 1, contains => [2,3,4] },
-              cclist_accessible        => { value => 1, contains => [2,3,4,5] },
-              reporter_accessible      => { value => 1, contains => [2,3,4,5] },
-              'longdescs.count'        => { value => 3, contains => [2,3,4,5] },
-              'longdescs.isprivate'    => { value => 1, contains => [1,2,3,4,5] },
-              everconfirmed            => { value => 1, contains => [2,3,4,5] },
-              creation_ts => { value => '2037-01-02', contains => [1,5] },
-              delta_ts    => { value => '2037-01-02', contains => [1,5] },
-              deadline    => { value => '2037-02-02', contains => [1,5] },
-              remaining_time => { value => 10, contains => [1,5] },
-              percentage_complete => { value => 11, contains => [1,5] },
-              longdesc => { value => '2-', contains => [1,5] },
-              work_time => { value => 1, contains => [5] },
-              FIELD_TYPE_BUG_ID, { value => '<2>', contains => [1,5] },
-              FIELD_TYPE_DATETIME, { value => '2037-03-02', contains => [1,5] },
-              LESSTHAN_OVERRIDE,
-          }
-        },
-    ],
-    lessthaneq => [
-        { contains => [1], value => '<1>',
-          override => {
-              'attachments.isobsolete' => { value => 0, contains => [2,3,4] },
-              'attachments.ispatch'    => { value => 0, contains => [2,3,4] },
-              'attachments.isprivate'  => { value => 0, contains => [2,3,4] },
-              cclist_accessible        => { value => 0, contains => [2,3,4,5] },
-              reporter_accessible      => { value => 0, contains => [2,3,4,5] },
-              'longdescs.count'        => { value => 2, contains => [2,3,4,5] },
-              'longdescs.isprivate'    => { value => -1, contains => [] },
-              everconfirmed            => { value => 0, contains => [2,3,4,5] },
-              bug_file_loc   => { contains => [1,5] },
-              blocked        => { contains => [1,2] },
-              deadline       => { contains => [1,5] },
-              dependson      => { contains => [1,3] },
-              creation_ts    => { contains => [1,5] },
-              delta_ts       => { contains => [1,5] },
-              remaining_time => { contains => [1,5] },
-              longdesc       => { contains => [1,5] },
-              percentage_complete => { contains => [1,5] },
-              work_time => { value => 1, contains => [1,5] },
-              FIELD_TYPE_BUG_ID, { contains => [1,5] },
-              FIELD_TYPE_DATETIME, { contains => [1,5] },
-              LESSTHAN_OVERRIDE,
-          },
-        },
-    ],
-    greaterthan => [
-        { contains => [2,3,4], value => '<1>',
-          override => {
-              dependson => { contains => [3] },
-              blocked   => { contains => [2] },
-              'attachments.ispatch'    => { value => 0, contains => [1] },
-              'attachments.isobsolete' => { value => 0, contains => [1] },
-              'attachments.isprivate'  => { value => 0, contains => [1] },
-              cclist_accessible        => { value => 0, contains => [1] },
-              reporter_accessible      => { value => 0, contains => [1] },
-              'longdescs.count'        => { value => 2, contains => [1] },
-              'longdescs.isprivate'    => { value => 0, contains => [1] },
-              everconfirmed            => { value => 0, contains => [1] },
-              'flagtypes.name'         => { value => 2, contains => [2,3,4] },
-              GREATERTHAN_OVERRIDE,
-          },
-        },
-    ],
-    greaterthaneq => [
-        { contains => [2,3,4], value => '<2>',
-          override => {
-              'attachments.ispatch'    => { value => 1, contains => [1] },
-              'attachments.isobsolete' => { value => 1, contains => [1] },
-              'attachments.isprivate'  => { value => 1, contains => [1] },
-              cclist_accessible        => { value => 1, contains => [1] },
-              reporter_accessible      => { value => 1, contains => [1] },
-              'longdescs.count'        => { value => 3, contains => [1] },
-              'longdescs.isprivate'    => { value => 1, contains => [1] },
-              everconfirmed            => { value => 1, contains => [1] },
-              dependson => { value => '<3>', contains => [1,3] },
-              blocked   => { contains => [1,2] },
-              GREATERTHAN_OVERRIDE,
-          }
-        },
-    ],
-    matches => [
-        { contains => [1], value => '<1>' },
-    ],
-    notmatches => [
-        { contains => [2,3,4,5], value => '<1>' },
-    ],
-    anyexact => [
-        { contains => [1,2], value => '<1>, <2>', 
-          override => { ANY_OVERRIDE } },
-    ],
-    anywordssubstr => [
-        { contains => [1,2], value => '<1> <2>', 
-          override => {
-              ANY_OVERRIDE,
-              percentage_complete => { contains => [1,2,3] },
-          }
-        },
-    ],
-    allwordssubstr => [
-        { contains => [1], value => '<1>',
-          override => {
-              MULTI_BOOLEAN_OVERRIDE,
-              # We search just the number "1" for percentage_complete,
-              # which matches a lot of bugs.
-              percentage_complete => { contains => [1,2,3] },
-          },
-        },
-        { contains => [], value => '<1>,<2>',
-          override => {
-              dependson => { value => '<1-id> <3-id>', contains => [] },
-              # bug 3 has the value "21" here, so matches "2,1"
-              percentage_complete => { value => '<2>,<3>', contains => [3] },
-              # 1 0 matches bug 1, which has both public and private comments.
-             'longdescs.isprivate' => { contains => [1] },              
-          }
-        },
-    ],
-    nowordssubstr => [
-        { contains => [2,3,4,5], value => '<1>',
-          override => {
-              # longdescs.isprivate translates to "1 0", so no bugs should
-              # show up.
-              'longdescs.isprivate' => { contains => [] },
-              percentage_complete => { contains => [4,5] },
-              work_time => { contains => [2,3,4,5] },
-          }
-        },
-    ],
-    anywords => [
-        { contains => [1], value => '<1>',
-          override => {
-              MULTI_BOOLEAN_OVERRIDE,
-          }
-        },
-        { contains => [1,2], value => '<1> <2>',
-          override => {
-              MULTI_BOOLEAN_OVERRIDE,
-              dependson => { value => '<1> <3>', contains => [1,3] },
-              'longdescs.count' => { contains => [1,2,3,4] },              
-          },
-        },
-    ],
-    allwords => [
-        { contains => [1], value => '<1>',
-          override => { MULTI_BOOLEAN_OVERRIDE } },
-        { contains => [], value => '<1> <2>',
-          override => {
-            dependson => { contains => [], value => '<2-id> <3-id>' },
-            # 1 0 matches bug 1, which has both public and private comments.
-            'longdescs.isprivate' => { contains => [1] },
-          }
-        },
-    ],
-    nowords => [
-        { contains => [2,3,4,5], value => '<1>',
-          override => {
-              # longdescs.isprivate translates to "1 0", so no bugs should
-              # show up.
-              'longdescs.isprivate' => { contains => [] },
-              work_time => { contains => [2,3,4,5] },
-          }
-        },
-    ],
-
-    changedbefore => [
-        { contains => [1], value => '<1-delta>',
-          override => {
-              CHANGED_OVERRIDE,
-              creation_ts => { contains => [1,5] },
-              blocked   => { contains => [1,2] },
-              dependson => { contains => [1,3] },
-              longdesc => { contains => [1,5] },
-              'longdescs.count' => { contains => [1,5] },
-          }
-        },
-    ],
-    changedafter => [
-        { contains => [2,3,4], value => '<2-delta>',
-          override => { 
-              CHANGED_OVERRIDE,
-              creation_ts => { contains => [3,4] },
-              # We only change this for one bug, and it doesn't match.
-              'longdescs.isprivate' => { contains => [] },
-              # Same for everconfirmed.
-              'everconfirmed' => { contains => [] },
-              # For blocked and dependson, they have the delta_ts of bug1
-              # in the bugs_activity table, so they won't ever match.
-              blocked   => { contains => [] },
-              dependson => { contains => [] },
-          }
-        },
-    ],
-    changedfrom => [
-        { contains => [1], value => '<1>',
-          override => {
-              CHANGED_OVERRIDE,
-              # The test never changes an already-set dependency field, but
-              # we *can* attempt to test searching against an empty value,
-              # which should get us some bugs.
-              blocked   => { value => '', contains => [1,2] },
-              dependson => { value => '', contains => [1,3] },
-              FIELD_TYPE_BUG_ID, { value => '', contains => [1,2,3,4] },
-              # longdesc changedfrom doesn't make any sense.
-              longdesc => { contains => [] },
-              # Nor does creation_ts changedfrom.
-              creation_ts => { contains => [] },
-              'attach_data.thedata' => { contains => [] },
-              bug_id => { value => '<1-id>', contains => [] },
-          },
-        },
-    ],
-    changedto => [
-        { contains => [1], value => '<1>',
-          override => {
-              CHANGED_OVERRIDE,
-              # I can't imagine any use for creation_ts changedto.
-              creation_ts => { contains => [] },
-          }
-        },
-    ],
-    changedby => [
-        { contains => [1], value => '<1-reporter>',
-          override => {
-              CHANGED_OVERRIDE,
-              blocked   => { contains => [1,2] },
-              dependson => { contains => [1,3] },
-          },
-        },
-    ],
-    # XXX these need tests developed
-    isempty => [],
-    isnotempty => [],
-};
-
-# Fields that do not behave as we expect, for InjectionTest.
-# search => 1 means the Bugzilla::Search creation fails.
-# sql_error is a regex that specifies a SQL error that's OK for us to throw.
-# operator_ok overrides the "brokenness" of certain operators, so that they
-# are always OK for that field/operator combination.
-use constant INJECTION_BROKEN_FIELD => {
-    # Pg can't run injection tests against integer or date fields. See bug 577557.
-    'attachments.isobsolete' => { db_skip => ['Pg'] },
-    'attachments.ispatch'    => { db_skip => ['Pg'] },
-    'attachments.isprivate'  => { db_skip => ['Pg'] },
-    blocked                  => { db_skip => ['Pg'] },
-    bug_id                   => { db_skip => ['Pg'] },
-    cclist_accessible        => { db_skip => ['Pg'] },
-    creation_ts              => { db_skip => ['Pg'] },
-    days_elapsed             => { db_skip => ['Pg'] },
-    dependson                => { db_skip => ['Pg'] },
-    deadline                 => { db_skip => ['Pg'] },
-    delta_ts                 => { db_skip => ['Pg'] },
-    estimated_time           => { db_skip => ['Pg'] },
-    everconfirmed            => { db_skip => ['Pg'] },
-    'longdescs.isprivate'    => { db_skip => ['Pg'] },
-    percentage_complete      => { db_skip => ['Pg'] },
-    remaining_time           => { db_skip => ['Pg'] },
-    reporter_accessible      => { db_skip => ['Pg'] },
-    work_time                => { db_skip => ['Pg'] },
-    FIELD_TYPE_BUG_ID,          { db_skip => ['Pg'] },
-    FIELD_TYPE_DATETIME,        { db_skip => ['Pg'] },
-    owner_idle_time => { search => 1 },
-    'longdescs.count' => {
-        search => 1,
-        db_skip => ['Pg'],
-        operator_ok => [qw(allwords allwordssubstr anywordssubstr casesubstring
-                           changedbefore changedafter greaterthan greaterthaneq
-                           lessthan lessthaneq notregexp notsubstring
-                           nowordssubstr regexp substring anywords
-                           notequals nowords equals anyexact)],
-    },
-};
-
-# Operators that do not behave as we expect, for InjectionTest.
-# search => 1 means the Bugzilla::Search creation fails, but
-# field_ok contains fields that it does actually succeed for.
-use constant INJECTION_BROKEN_OPERATOR => {
-    changedafter  => { search => 1, field_ok => ['creation_ts'] },
-    changedbefore => { search => 1, field_ok => ['creation_ts'] },
-    changedby     => { search => 1 },
-    isempty       => { search => 1 },
-    isnotempty    => { search => 1 },
-};
-
-# Tests run by Bugzilla::Test::Search::InjectionTest.
-# We have to make sure the values are all one word or they'll be split
-# up by the multi-word tests.
-use constant INJECTION_TESTS => (
-    { value => ';SEMICOLON_TEST' },
-    { value => '--COMMENT_TEST'  },
-    { value => "'QUOTE_TEST" },
-    { value => "';QUOTE_SEMICOLON_TEST" },
-    { value => '/*STAR_COMMENT_TEST' }
-);
-
-#################
-# Special Tests #
-#################
-
-use constant SPECIAL_PARAM_TESTS => (
-    { field => 'bug_status', operator => 'anyexact', value => '__open__',
-      contains => [5] },
-    { field => 'bug_status', operator => 'anyexact', value => '__closed__',
-      contains => [1,2,3,4] },
-    { field => 'bug_status', operator => 'anyexact', value => '__all__',
-      contains => [1,2,3,4,5] },
-    
-    { field => 'resolution', operator => 'anyexact', value => '---',
-      contains => [5] },
-    
-    # email* query parameters.
-    { field => 'assigned_to', operator => 'anyexact',
-      value => '<1>, <2-reporter>', contains => [1,2],
-      extra_params => { emailreporter1 => 1 } },
-    { field => 'assigned_to', operator => 'equals',
-      value => '<1>', extra_name => 'email2', contains => [],
-      extra_params => {
-          email2 => generate_random_password(100), emaillongdesc2 => 1,
-      },
-    },
-    
-    # standard pronouns
-    { field => 'assigned_to', operator => 'equals', value => '%assignee%',
-      contains => [1,2,3,4,5] },
-    { field => 'reporter', operator => 'equals', value => '%reporter%',
-      contains => [1,2,3,4,5] },
-    { field => 'qa_contact', operator => 'equals', value => '%qacontact%',
-      contains => [1,2,3,4,5] },
-    { field => 'cc', operator => 'equals', value => '%user%',
-      contains => [1] },
-    # group pronouns
-    { field => 'reporter', operator => 'equals',
-      value => '%group.<1-bug_group>%', contains => [1,2,3,4,5] },
-    { field => 'assigned_to', operator => 'equals',
-      value => '%group.<1-bug_group>%', contains => [1,2,3,4,5] },
-    { field => 'qa_contact', operator => 'equals',
-      value => '%group.<1-bug_group>%', contains => [1,2,3,4] },
-    { field => 'cc', operator => 'equals',
-      value => '%group.<1-bug_group>%', contains => [1,2,3,4] },
-    { field => 'commenter', operator => 'equals',
-      value => '%group.<1-bug_group>%', contains => [1,2,3,4,5] },
-);
-
-use constant CUSTOM_SEARCH_TESTS => (
-    { name => 'OP without CP', contains => [1],
-      params => [
-          { f => 'OP' },
-          { f => 'bug_id', o => 'equals', v => '<1>' },
-      ]
-    },
-
-    { name => 'Empty OP/CP pair before criteria', contains => [1],
-      params => [
-          { f => 'OP' }, { f => 'CP' },
-          { f => 'bug_id', o => 'equals', v => '<1>' },
-      ]
-    },
-
-    { name => 'Empty OP/CP pair after criteria', contains => [1],
-      params => [
-          { f => 'bug_id', o => 'equals', v => '<1>' },
-          { f => 'OP' }, { f => 'CP' },
-      ]
-    },
-
-    { name  => 'empty OP/CP mid criteria', contains => [1],
-      columns => ['assigned_to'],
-      params => [
-          { f => 'bug_id', o => 'equals', v => '<1>' },
-          { f => 'OP' }, { f => 'CP' },
-          { f => 'assigned_to', o => 'substr', v => '@' },
-      ]
-    },
-
-    { name  => 'bug_id = 1 AND assigned_to contains @', contains => [1],
-      columns => ['assigned_to'],
-      params => [
-          { f => 'bug_id',      o => 'equals', v => '<1>' },
-          { f => 'assigned_to', o => 'substr', v => '@' },
-      ]
-    },
-
-    { name  => 'NOT(bug_id = 1) AND NOT(assigned_to = 2)',
-      contains => [3,4,5],
-      columns => ['assigned_to'],
-      params => [
-          { n => 1, f => 'bug_id',      o => 'equals', v => '<1>' },
-          { n => 1, f => 'assigned_to', o => 'equals', v => '<2>' },
-      ]
-    },
-
-    { name  => 'bug_id = 1 OR assigned_to = 2', contains => [1,2],
-      columns => ['assigned_to'], top_params => { j_top => 'OR' },
-      params => [
-          { f => 'bug_id',      o => 'equals', v => '<1>' },
-          { f => 'assigned_to', o => 'equals', v => '<2>' },
-      ]
-    },
-
-    { name => 'NOT(bug_id = 1 AND assigned_to = 1)', contains => [2,3,4,5],
-      columns => ['assigned_to'],
-      params => [
-          { f => 'OP', n => 1 },
-            { f => 'bug_id',      o => 'equals', v => '<1>' },
-            { f => 'assigned_to', o => 'equals', v => '<1>' },
-          { f => 'CP' },
-      ]
-    },
-
-
-    { name  => '(bug_id = 1 AND assigned_to contains @) '
-               . ' OR (bug_id = 2 AND assigned_to contains @)',
-      contains => [1,2], columns => ['assigned_to'],
-      top_params => { j_top => 'OR' },
-      params => [
-          { f => 'OP' },
-            { f => 'bug_id',      o => 'equals', v => '<1>' },
-            { f => 'assigned_to', o => 'substr', v => '@' },
-          { f => 'CP' },
-          { f => 'OP' },
-            { f => 'bug_id',      o => 'equals', v => '<2>' },
-            { f => 'assigned_to', o => 'substr', v => '@' },
-          { f => 'CP' },
-      ]
-    },
-
-    { name  => '(bug_id = 1 OR assigned_to = 2) '
-               . ' AND (bug_id = 2 OR assigned_to = 1)',
-      contains => [1,2], columns => ['assigned_to'],
-      params => [
-          { f => 'OP', j => 'OR' },
-            { f => 'bug_id',      o => 'equals', v => '<1>' },
-            { f => 'assigned_to', o => 'equals', v => '<2>' },
-          { f => 'CP' },
-          { f => 'OP', j => 'OR' },
-            { f => 'bug_id',      o => 'equals', v => '<2>' },
-            { f => 'assigned_to', o => 'equals', v => '<1>' },
-          { f => 'CP' },
-      ]
-    },
-
-    { name  => 'bug_id = 3 OR ( (bug_id = 1 OR assigned_to = 2) '
-               . ' AND (bug_id = 2 OR assigned_to = 1) )',
-      contains => [1,2,3], columns => ['assigned_to'],
-      top_params => { j_top => 'OR' },
-      params => [
-          { f => 'bug_id', o => 'equals', v => '<3>' },
-          { f => 'OP' },
-            { f => 'OP', j => 'OR' },
-              { f => 'bug_id',      o => 'equals', v => '<1>' },
-              { f => 'assigned_to', o => 'equals', v => '<2>' },
-            { f => 'CP' },
-            { f => 'OP', j => 'OR' },
-              { f => 'bug_id',      o => 'equals', v => '<2>' },
-              { f => 'assigned_to', o => 'equals', v => '<1>' },
-            { f => 'CP' },
-          { f => 'CP' },
-      ]
-    },
-
-    { name  => 'bug_id = 3 OR ( (bug_id = 1 OR assigned_to = 2) '
-               . ' AND (bug_id = 2 OR assigned_to = 1) ) OR bug_id = 4',
-      contains => [1,2,3,4], columns => ['assigned_to'],
-      top_params => { j_top => 'OR' },
-      params => [
-          { f => 'bug_id', o => 'equals', v => '<3>' },
-          { f => 'OP' },
-            { f => 'OP', j => 'OR' },
-              { f => 'bug_id',      o => 'equals', v => '<1>' },
-              { f => 'assigned_to', o => 'equals', v => '<2>' },
-            { f => 'CP' },
-            { f => 'OP', j => 'OR' },
-              { f => 'bug_id',      o => 'equals', v => '<2>' },
-              { f => 'assigned_to', o => 'equals', v => '<1>' },
-            { f => 'CP' },
-          { f => 'CP' },
-          { f => 'bug_id', o => 'equals', v => '<4>' },
-      ]
-    },
-
-);
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/CustomTest.pm b/xt/lib/Bugzilla/Test/Search/CustomTest.pm
deleted file mode 100644
index 132e5ac407..0000000000
--- a/xt/lib/Bugzilla/Test/Search/CustomTest.pm
+++ /dev/null
@@ -1,101 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This module represents a test with custom URL parameters.
-# Tests like this are specified in CUSTOM_SEARCH_TESTS in
-# Bugzilla::Test::Search::Constants.
-package Bugzilla::Test::Search::CustomTest;
-use parent qw(Bugzilla::Test::Search::FieldTest);
-use strict;
-use warnings;
-
-use Bugzilla::Test::Search::FieldTest;
-use Bugzilla::Test::Search::OperatorTest;
-
-use Storable qw(dclone);
-
-###############
-# Constructor #
-###############
-
-sub new {
-  my ($class, $test, $search_test) = @_;
-  bless { raw_test => dclone($test), search_test => $search_test }, $class;
-}
-
-#############
-# Accessors #
-#############
-
-sub search_test { return $_[0]->{search_test} }
-sub name { return 'Custom: ' . $_[0]->test->{name} }
-sub test { return $_[0]->{raw_test} }
-
-sub operator_test { die "unimplemented" }
-sub field_object { die "unimplemented" }
-sub main_value { die "unimplenmented" }
-sub test_value { die "unimplemented" }
-# Custom tests don't use transforms.
-sub transformed_value_was_equal { 0 }
-sub debug_value {
-    my ($self) = @_;
-    my $string = '';
-    my $params = $self->search_params;
-    foreach my $param (keys %$params) {
-        $string .= $param . "=" . $params->{$param} . '&';
-    }
-    chop($string);
-    return $string;
-}
-
-# The tests we know are broken for this operator/field combination.
-sub _known_broken { return {} }
-sub contains_known_broken { return undef }
-sub search_known_broken { return undef }
-sub field_not_yet_implemented { return undef }
-sub invalid_field_operator_combination { return undef }
-
-#########################################
-# Accessors: Bugzilla::Search Arguments #
-#########################################
-
-# Converts the f, o, v rows into f0, o0, v0, etc. and translates
-# the values appropriately.
-sub search_params {
-    my ($self) = @_;
-
-    my %params = %{ $self->test->{top_params} || {} };
-    my $counter = 0;
-    foreach my $row (@{ $self->test->{params} }) {
-        $row->{v} = $self->translate_value($row) if exists $row->{v};
-        foreach my $key (keys %$row) {
-            $params{"${key}$counter"} = $row->{$key};
-        }
-        $counter++;
-    }
-
-    return \%params;
-}
-
-sub translate_value {
-    my ($self, $row) = @_;
-    my $as_test = { field => $row->{f}, operator => $row->{o},
-                    value => $row->{v} };
-    my $operator_test = new Bugzilla::Test::Search::OperatorTest($row->{o},
-        $self->search_test);
-    my $field = Bugzilla::Field->check($row->{f});
-    my $field_test = new Bugzilla::Test::Search::FieldTest($operator_test,
-      $field, $as_test);
-    return $field_test->translated_value;
-}
-
-sub search_columns {
-    my ($self) = @_;
-    return ['bug_id', @{ $self->test->{columns} || [] }];
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/FieldTest.pm b/xt/lib/Bugzilla/Test/Search/FieldTest.pm
deleted file mode 100644
index 5e86d92e2b..0000000000
--- a/xt/lib/Bugzilla/Test/Search/FieldTest.pm
+++ /dev/null
@@ -1,617 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This module represents the tests that get run on a single
-# operator/field combination for Bugzilla::Test::Search.
-# This is where all the actual testing happens.
-package Bugzilla::Test::Search::FieldTest;
-
-use strict;
-use warnings;
-use Bugzilla::Search;
-use Bugzilla::Test::Search::Constants;
-use Bugzilla::Util qw(trim);
-
-use Data::Dumper;
-use Scalar::Util qw(blessed);
-use Test::More;
-use Test::Exception;
-
-###############
-# Constructor #
-###############
-
-sub new {
-    my ($class, $operator_test, $field, $test) = @_;
-    return bless { operator_test => $operator_test,
-                   field_object => $field,
-                   raw_test     => $test }, $class;
-}
-
-#############
-# Accessors #
-#############
-
-sub num_tests { return TESTS_PER_RUN }
-
-# The Bugzilla::Test::Search::OperatorTest that this is a child of.
-sub operator_test { return $_[0]->{operator_test} }
-# The Bugzilla::Field being tested.
-sub field_object { return $_[0]->{field_object} }
-# The name of the field being tested, which we need much more often
-# than we need the object.
-sub field {
-    my ($self) = @_;
-    $self->{field_name} ||= $self->field_object->name;
-    return $self->{field_name};
-}
-# The Bugzilla::Test::Search object that this is a child of.
-sub search_test { return $_[0]->operator_test->search_test }
-# The operator being tested
-sub operator { return $_[0]->operator_test->operator }
-# The bugs currently being tested by Bugzilla::Test::Search.
-sub bugs { return $_[0]->search_test->bugs }
-sub bug {
-    my $self = shift;
-    return $self->search_test->bug(@_);
-}
-sub number {
-    my ($self, $id) = @_;
-    foreach my $number (1..NUM_BUGS) {
-        return $number if $self->search_test->bug($number)->id == $id;
-    }
-    return 0;
-}
-
-# The name displayed for this test by Test::More. Used in test descriptions.
-sub name {
-    my ($self) = @_;
-    my $field = $self->field;
-    my $operator = $self->operator;
-    my $value = $self->main_value;
-    
-    my $name = "$field-$operator-$value";
-    if (my $extra_name = $self->test->{extra_name}) {
-        $name .= "-$extra_name";
-    }
-    return $name;
-}
-
-# The appropriate value from the TESTS constant for this test, taking
-# into account overrides.
-sub test {
-    my $self = shift;
-    return $self->{test} if $self->{test};
-    
-    my %test = %{ $self->{raw_test} };
-    
-    # We have field name overrides...
-    my $override = $test{override}->{$self->field};
-    # And also field type overrides.
-    if (!$override) {
-        $override = $test{override}->{$self->field_object->type} || {};
-    }
-    
-    foreach my $key (%$override) {
-        $test{$key} = $override->{$key};
-    }
-    
-    $self->{test} = \%test;
-    return $self->{test};
-}
-
-# All the values for all the bugs for this field.
-sub _field_values {
-    my ($self) = @_;
-    return $self->{field_values} if $self->{field_values};
-    
-    my %field_values;
-    foreach my $number (1..NUM_BUGS) {
-        $field_values{$number} = $self->_field_values_for_bug($number);
-    }
-    $self->{field_values} = \%field_values;
-    return $self->{field_values};
-}
-# The values for this field for the numbered bug.
-sub bug_values {
-    my ($self, $number) = @_;
-    return @{ $self->_field_values->{$number} };
-}
-
-# The untranslated, non-overriden value--used in the name of the test
-# and other places.
-sub main_value { return $_[0]->{raw_test}->{value} }
-# The untranslated test value, taking into account overrides.
-sub test_value { return $_[0]->test->{value} };
-# The value translated appropriately for passing to Bugzilla::Search.
-sub translated_value {
-    my $self = shift;
-    if (!exists $self->{translated_value}) {
-        my $value = $self->search_test->value_translation_cache($self);
-        if (!defined $value) {
-            $value = $self->_translate_value();
-            $self->search_test->value_translation_cache($self, $value);
-        }
-        $self->{translated_value} = $value;
-    }
-    return $self->{translated_value};
-}
-# Used in failure diagnostic messages.
-sub debug_fail {
-    my ($self, $number, $results, $sql) = @_;
-    my @expected = @{ $self->test->{contains} };
-    my @results = sort
-                  map { $self->number($_) }
-                  map { $_->[0] }
-                  @$results;
-    return
-        "   Value: '" . $self->translated_value . "'\n" .
-        "Expected: [" . join(',', @expected) . "]\n" .
-        " Results: [" . join(',', @results) . "]\n" .
-        trim($sql) . "\n";
-}
-
-# True for a bug if we ran the "transform" function on it and the
-# result was equal to its first value.
-sub transformed_value_was_equal {
-    my ($self, $number, $value) = @_;
-    if (@_ > 2) {
-        $self->{transformed_value_was_equal}->{$number} = $value;
-        $self->search_test->was_equal_cache($self, $number, $value);
-    }
-    my $cached = $self->search_test->was_equal_cache($self, $number);
-    return $cached if defined $cached;
-    return $self->{transformed_value_was_equal}->{$number};
-}
-
-# True if this test is supposed to contain the numbered bug.
-sub bug_is_contained {
-    my ($self, $number) = @_;
-    my $contains = $self->test->{contains};
-    if ($self->transformed_value_was_equal($number)
-        and !$self->test->{override}->{$self->field}->{contains})
-    {
-        $contains = $self->test->{if_equal}->{contains};
-    }
-    return grep($_ == $number, @$contains) ? 1 : 0;
-}
-
-###################################################
-# Accessors: Ways of doing SKIP and TODO on tests #
-###################################################
-
-# The tests we know are broken for this operator/field combination.
-sub _known_broken {
-    my ($self, $constant, $skip_pg_check) = @_;
-
-    $constant ||= KNOWN_BROKEN;
-    my $field = $self->field;
-    my $type = $self->field_object->type;
-    my $operator = $self->operator;
-    my $value = $self->main_value;
-    my $value_name = "$operator-$value";
-    if (my $extra_name = $self->test->{extra_name}) {
-        $value_name .= "-$extra_name";
-    }
-
-    my $value_broken = $constant->{$value_name}->{$field};
-    $value_broken ||= $constant->{$value_name}->{$type};
-    return $value_broken if $value_broken;
-    my $operator_broken = $constant->{$operator}->{$field};
-    $operator_broken ||= $constant->{$operator}->{$type};
-    return $operator_broken if $operator_broken;
-    return {};
-}
-
-# True if the "contains" search for the numbered bug is broken.
-# That is, either the result is supposed to contain it and doesn't,
-# or the result is not supposed to contain it and does.
-sub contains_known_broken {
-    my ($self, $number) = @_;
-    my $field = $self->field;
-    my $operator = $self->operator;
-
-    my $contains_broken = $self->_known_broken->{contains} || [];
-    if (grep($_ == $number, @$contains_broken)) {
-        return "$field $operator contains $number is known to be broken";
-    }
-    return undef;
-}
-
-# Used by subclasses. Checks both bug_is_contained and contains_known_broken
-# to tell you whether or not the bug will *actually* be found by the test.
-sub will_actually_contain_bug {
-    my ($self, $number) = @_;
-    my $is_contained = $self->bug_is_contained($number) ? 1 : 0;
-    my $is_broken = $self->contains_known_broken($number) ? 1 : 0;
-
-    # If the test is supposed to contain the bug and *isn't* broken,
-    # then the test will contain the bug.
-    return 1 if ($is_contained and !$is_broken);
-    # If this test is *not* supposed to contain the bug, but that test is
-    # broken, then this test *will* contain the bug.
-    return 1 if (!$is_contained and $is_broken);
-
-    return 0;
-}
-
-# Returns a string if creating a Bugzilla::Search object throws an error,
-# with this field/operator/value combination.
-sub search_known_broken {
-    my ($self) = @_;
-    my $field = $self->field;
-    my $operator = $self->operator;
-    if ($self->_known_broken->{search}) {
-        return "Bugzilla::Search for $field $operator is known to be broken";
-    }
-    return undef;
-}
-    
-# Returns a string if we haven't yet implemented the tests for this field,
-# but we plan to in the future.
-sub field_not_yet_implemented {
-    my ($self) = @_;
-    my $skip_this_field = grep { $_ eq $self->field } SKIP_FIELDS;
-    if ($skip_this_field) {
-        my $field = $self->field;
-        return "$field testing not yet implemented";
-    }
-    return undef;
-}
-
-# Returns a message if this field/operator combination can't ever be run.
-# At no time in the future will this field/operator combination ever work.
-sub invalid_field_operator_combination {
-    my ($self) = @_;
-    my $field = $self->field;
-    my $operator = $self->operator;
-    
-    if ($field eq 'content' && $operator !~ /matches/) {
-        return "content field does not support $operator";
-    }
-    elsif ($operator =~ /matches/ && $field ne 'content') {
-        return "matches operator does not support fields other than content";
-    }
-    return undef;
-}
-
-# True if this field is broken in an OR combination.
-sub join_broken {
-    my ($self, $or_broken_map) = @_;
-    my $or_broken = $or_broken_map->{$self->field . '-' . $self->operator};
-    if (!$or_broken) {
-        # See if this is a comment field, and in that case, if there's
-        # a generic entry for all comment fields.
-        my $is_comment_field = COMMENT_FIELDS->{$self->field};
-        if ($is_comment_field) {
-            $or_broken = $or_broken_map->{'longdescs.-' . $self->operator};
-        }
-    }
-    return $or_broken;
-}
-
-#########################################
-# Accessors: Bugzilla::Search Arguments #
-#########################################
-
-# The data that will get passed to Bugzilla::Search as its arguments.
-sub search_params {
-    my ($self) = @_;
-    return $self->{search_params} if $self->{search_params};
-
-    my %params = (
-        "field0-0-0" => $self->field,
-        "type0-0-0"  => $self->operator,
-        "value0-0-0"  => $self->translated_value,
-    );
-    
-    $self->{search_params} = \%params;
-    return $self->{search_params};
-}
-
-sub search_columns {
-    my ($self) = @_;
-    my $field = $self->field;
-    my @search_fields = qw(bug_id);
-    if ($self->field_object->buglist) {
-        my $col_name = COLUMN_TRANSLATION->{$field} || $field;
-        push(@search_fields, $col_name);
-    }
-    return \@search_fields;
-}
-
-
-################
-# Field Values #
-################
-
-sub _field_values_for_bug {
-    my ($self, $number) = @_;
-    my $field = $self->field;
-
-    my @values;
-
-    if ($field =~ /^attach.+\.(.+)$/ ) {
-        my $attach_field = $1;
-        $attach_field = ATTACHMENT_FIELDS->{$attach_field} || $attach_field;
-        @values = $self->_values_for($number, 'attachments', $attach_field);
-    }
-    elsif (my $flag_field = FLAG_FIELDS->{$field}) {
-        @values = $self->_values_for($number, 'flags', $flag_field);
-    }
-    elsif (my $translation = COMMENT_FIELDS->{$field}) {
-        @values = $self->_values_for($number, 'comments', $translation);
-        # We want the last value to come first, so that single-value
-        # searches use the last comment.
-        @values = reverse @values;
-    }
-    elsif ($field eq 'longdescs.count') {
-        @values = scalar(@{ $self->bug($number)->comments });
-    }
-    elsif ($field eq 'work_time') {
-        @values = $self->_values_for($number, 'actual_time');
-    }
-    elsif ($field eq 'bug_group') {
-        @values = $self->_values_for($number, 'groups_in', 'name');
-    }
-    elsif ($field eq 'keywords') {
-        @values = $self->_values_for($number, 'keyword_objects', 'name'); 
-    }
-    elsif ($field eq 'content') {
-        @values = $self->_values_for($number, 'short_desc');
-    }
-    elsif ($field eq 'see_also') {
-        @values = $self->_values_for($number, 'see_also', 'name');
-    }
-    elsif ($field eq 'tag') {
-        @values = $self->_values_for($number, 'tags');
-    }
-    # Bugzilla::Bug truncates creation_ts, but we need the full value
-    # from the database. This has no special value for changedfrom,
-    # because it never changes.
-    elsif ($field eq 'creation_ts') {
-        my $bug = $self->bug($number);
-        my $creation_ts = Bugzilla->dbh->selectrow_array(
-            'SELECT creation_ts FROM bugs WHERE bug_id = ?',
-            undef, $bug->id);
-        @values = ($creation_ts);
-    }
-    else {
-        @values = $self->_values_for($number, $field);
-    }
-
-    # We convert user objects to their login name, here, all in one
-    # block for simplicity.
-    if (grep { $_ eq $field } USER_FIELDS) {
-        # requestees.login_name is empty for most bugs (but checking
-        # blessed(undef) handles that.
-        # Values that come from %original_values aren't User objects.
-        @values = map { blessed($_) ? $_->login : $_ } @values;
-        @values = grep { defined $_ } @values;
-    }
-    
-    return \@values;
-}
-
-sub _values_for {
-    my ($self, $number, $bug_field, $item_field) = @_;
-
-    my $item;
-    if ($self->operator eq 'changedfrom') {
-        $item = $self->search_test->bug_create_value($number, $bug_field);
-    }
-    else {
-        my $bug = $self->bug($number);
-        $item = $bug->$bug_field;
-    }
-
-    if ($item_field) {
-        if ($bug_field eq 'flags' and $item_field eq 'name') {
-            return (map { $_->name . $_->status } @$item);
-        }
-        return (map { $self->_get_item($_, $item_field) } @$item);
-    }
-
-    return @$item if ref($item) eq 'ARRAY';
-    return $item if defined $item;
-    return ();
-}
-
-sub _get_item {
-    my ($self, $from, $field) = @_;
-    if (blessed($from)) {
-        return $from->$field;
-    }
-    return $from->{$field};
-}
-
-#####################
-# Value Translation #
-#####################
-
-# This function translates the "value" specified in TESTS into an actual
-# search value to pass to Search.pm. This means that we get the value
-# from the current bug (or, in the case of changedfrom, from %original_values)
-# and then we insert it as required into the "value" from TESTS. (For example,
-# <1> becomes the value for the field from bug 1.)
-sub _translate_value {
-    my $self = shift;
-    my $value = $self->test_value;
-    foreach my $number (1..NUM_BUGS) {
-        $value = $self->_translate_value_for_bug($number, $value);
-    }
-    # Sanity check to make sure that none of the <> stuff was left in.
-    if ($value =~ /<\d/) {
-        die $self->name . ": value untranslated: $value\n";
-    }
-    return $value;
-}
-
-sub _translate_value_for_bug {
-    my ($self, $number, $value) = @_;
-    
-    my $bug = $self->bug($number);
-    
-    my $bug_id = $bug->id;
-    $value =~ s/<$number-id>/$bug_id/g;
-    my $bug_delta = $bug->delta_ts;
-    $value =~ s/<$number-delta>/$bug_delta/g;
-    my $reporter = $bug->reporter->login;
-    $value =~ s/<$number-reporter>/$reporter/g;
-    if ($value =~ /<$number-bug_group>/) {
-        my @bug_groups = map { $_->name } @{ $bug->groups_in };
-        @bug_groups = grep { $_ =~ /^\d+-group-/ } @bug_groups;
-        my $group = $bug_groups[0];
-        $value =~ s/<$number-bug_group>/$group/g;
-    }
-    
-    my @bug_values = $self->bug_values($number);    
-    return $value if !@bug_values;
-    
-    if ($self->operator =~ /substr/) {
-        @bug_values = map { $self->_substr_value($_) } @bug_values;
-    }
-
-    my $string_value = $bug_values[0];
-    if ($self->operator =~ /word/) {
-        $string_value = join(' ', @bug_values);
-    }
-    if (my $func = $self->test->{transform}) {
-        my $transformed = $func->(@bug_values);
-        my $is_equal = $transformed eq $bug_values[0] ? 1 : 0;
-        $self->transformed_value_was_equal($number, $is_equal);
-        $string_value = $transformed;
-    }
-
-    if ($self->test->{escape}) {
-        $string_value = quotemeta($string_value);
-    }
-    $value =~ s/<$number>/$string_value/g;
-    
-    return $value;
-}
-
-sub _substr_value {
-    my ($self, $value) = @_;
-    my $field = $self->field;
-    my $type  = $self->field_object->type;
-    my $substr_size = SUBSTR_SIZE;
-    if (exists FIELD_SUBSTR_SIZE->{$field}) {
-        $substr_size = FIELD_SUBSTR_SIZE->{$field};
-    }
-    elsif (exists FIELD_SUBSTR_SIZE->{$type}) {
-        $substr_size = FIELD_SUBSTR_SIZE->{$type};
-    }
-    if ($substr_size > 0) {
-        # The field name is included in every field value, and if it's
-        # long, it might take up the whole substring, and we don't want that.
-        if (!grep { $_ eq $field or $_ eq $type } SUBSTR_NO_FIELD_ADD) {
-            $substr_size += length($field);
-        }
-        my $string = substr($value, 0, $substr_size);
-        return $string;
-    }
-    return substr($value, $substr_size);
-}
-
-#####################
-# Main Test Methods #
-#####################
-
-sub run {
-    my ($self) = @_;
-    
-    my $invalid_combination = $self->invalid_field_operator_combination;
-    my $field_not_implemented = $self->field_not_yet_implemented;
-
-    SKIP: {    
-        skip($invalid_combination, $self->num_tests) if $invalid_combination;
-        TODO: {
-            todo_skip ($field_not_implemented, $self->num_tests) if $field_not_implemented;
-            $self->do_tests();
-        }
-    }
-}
-
-sub do_tests {
-    my ($self) = @_;
-    my $name = $self->name;
-
-    my $search_broken = $self->search_known_broken;
-    
-    my $search = $self->_test_search_object_creation();
-
-    my $sql;
-    TODO: {
-        local $TODO = $search_broken if $search_broken;
-        lives_ok { $sql = $search->_sql } "$name: generate SQL";
-    }
-    
-    my $results;
-    SKIP: {
-        skip "Can't run SQL without any SQL", 1 if !defined $sql;
-        $results = $self->_test_sql($search);
-    }
-
-    $self->_test_content($results, $sql);
-}
-
-sub _test_search_object_creation {
-    my ($self) = @_;
-    my $name = $self->name;
-    my @args = (fields => $self->search_columns, params => $self->search_params);
-    my $search;
-    lives_ok { $search = new Bugzilla::Search(@args) }
-             "$name: create search object";
-    return $search;
-}
-
-sub _test_sql {
-    my ($self, $search) = @_;
-    my $name = $self->name;
-    my $results;
-    lives_ok { $results = $search->data } "$name: Run SQL Query"
-        or diag($search->_sql);
-    return $results;
-}
-
-sub _test_content {
-    my ($self, $results, $sql) = @_;
-
-    SKIP: {
-        skip "Without results we can't test them", NUM_BUGS if !$results;
-        foreach my $number (1..NUM_BUGS) {
-            $self->_test_content_for_bug($number, $results, $sql);
-        }
-    }
-}
-
-sub _test_content_for_bug {
-    my ($self, $number, $results, $sql) = @_;
-    my $name = $self->name;
-    
-    my $contains_known_broken = $self->contains_known_broken($number);
-    
-    my %result_ids = map { $_->[0] => 1 } @$results;
-    my $bug_id = $self->bug($number)->id;
-    
-    TODO: {
-        local $TODO = $contains_known_broken if $contains_known_broken;
-        if ($self->bug_is_contained($number)) {
-            ok($result_ids{$bug_id},
-               "$name: contains bug $number ($bug_id)")
-                or diag $self->debug_fail($number, $results, $sql);
-        }
-        else {
-            ok(!$result_ids{$bug_id},
-               "$name: does not contain bug $number ($bug_id)")
-                or diag $self->debug_fail($number, $results, $sql);
-        }
-    }
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm b/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
deleted file mode 100644
index 888e7eb13f..0000000000
--- a/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
+++ /dev/null
@@ -1,104 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This is the same as a FieldTest, except that it uses normal URL
-# parameters instead of Boolean Charts.
-package Bugzilla::Test::Search::FieldTestNormal;
-use strict;
-use warnings;
-use parent qw(Bugzilla::Test::Search::FieldTest);
-
-use Scalar::Util qw(blessed);
-
-use constant CH_OPERATOR => {
-    changedafter  => 'chfieldfrom',
-    changedbefore => 'chfieldto',
-    changedto     => 'chfieldvalue',
-};
-
-use constant EMAIL_FIELDS => qw(assigned_to qa_contact cc reporter commenter);
-
-# Normally, we just clone a FieldTest because that's the best for performance,
-# overall--that way we don't have to translate the value again. However,
-# sometimes (like in Bugzilla::Test::Search's direct code) we just want
-# to create a FieldTestNormal.
-sub new {
-    my $class = shift;
-    my ($first_arg) = @_;
-    if (blessed $first_arg
-        and $first_arg->isa('Bugzilla::Test::Search::FieldTest'))
-    {
-        my $self = { %$first_arg };
-        return bless $self, $class;
-    }
-    return $class->SUPER::new(@_);
-}
-
-sub name {
-    my $self = shift;
-    my $name = $self->SUPER::name(@_);
-    return "$name (Normal Params)";
-}
-
-sub search_columns {
-    my $self = shift;
-    my $field = $self->field;
-    # For the assigned_to, qa_contact, and reporter fields, have the
-    # "Normal Params" test check that the _realname columns work
-    # all by themselves.
-    if (grep($_ eq $field, EMAIL_FIELDS) && $self->field_object->buglist) {
-        return ['bug_id', "${field}_realname"]
-    }
-    return $self->SUPER::search_columns(@_);
-}
-
-sub search_params {
-    my ($self) = @_;
-    my $field = $self->field;
-    my $operator = $self->operator;
-    my $value = $self->translated_value;
-    if ($operator eq 'anyexact') {
-        $value = [split ',', $value];
-    }
-    
-    if (my $ch_param = CH_OPERATOR->{$operator}) {
-        if ($field eq 'creation_ts') {
-            $field = '[Bug creation]';
-        }
-        return { chfield => $field, $ch_param => $value };
-    }
-    
-    if ($field eq 'delta_ts' and $operator eq 'greaterthaneq') {
-        return { chfieldfrom => $value };
-    }
-    if ($field eq 'delta_ts' and $operator eq 'lessthaneq') {
-        return { chfieldto => $value };
-    }
-    
-    if ($field eq 'deadline' and $operator eq 'greaterthaneq') {
-        return { deadlinefrom => $value };
-    }
-    if ($field eq 'deadline' and $operator eq 'lessthaneq') {
-        return { deadlineto => $value };
-    }
-    
-    if (grep { $_ eq $field } EMAIL_FIELDS) {
-        $field = 'longdesc' if $field eq 'commenter';
-        return {
-            email1           => $value,
-            "email${field}1" => 1,
-            emailtype1       => $operator,
-            # Used to do extra tests on special sorts of email* combinations.
-            %{ $self->test->{extra_params} || {} },
-        };
-    }
-
-    $field =~ s/\./_/g;
-    return { $field => $value, "${field}_type" => $operator };
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/InjectionTest.pm b/xt/lib/Bugzilla/Test/Search/InjectionTest.pm
deleted file mode 100644
index 90eaabc787..0000000000
--- a/xt/lib/Bugzilla/Test/Search/InjectionTest.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This module represents the SQL Injection tests that get run on a single
-# operator/field combination for Bugzilla::Test::Search.
-package Bugzilla::Test::Search::InjectionTest;
-use parent qw(Bugzilla::Test::Search::FieldTest);
-
-use strict;
-use warnings;
-use Bugzilla::Test::Search::Constants;
-use Test::Exception;
-
-sub num_tests { return NUM_SEARCH_TESTS }
-
-sub _known_broken {
-    my ($self) = @_;
-    my $operator_broken = INJECTION_BROKEN_OPERATOR->{$self->operator};
-    # We don't want to auto-vivify $operator_broken and thus make it true.
-    my @field_ok = $operator_broken ? @{ $operator_broken->{field_ok} || [] }
-                                    : ();
-    $operator_broken = undef if grep { $_ eq $self->field } @field_ok;
-
-    my $field_broken = INJECTION_BROKEN_FIELD->{$self->field}
-                       || INJECTION_BROKEN_FIELD->{$self->field_object->type};
-    # We don't want to auto-vivify $field_broken and thus make it true.
-    my @operator_ok = $field_broken ? @{ $field_broken->{operator_ok} || [] }
-                                    : ();
-    $field_broken = undef if grep { $_ eq $self->operator } @operator_ok;
-
-    return $operator_broken || $field_broken || {};
-}
-
-sub sql_error_ok { return $_[0]->_known_broken->{sql_error} }
-
-# Injection tests only skip fields on certain dbs.
-sub field_not_yet_implemented {
-    my ($self) = @_;
-    # We use the constant directly because we don't want operator_ok
-    # or field_ok to stop us.
-    my $broken = INJECTION_BROKEN_FIELD->{$self->field}
-                 || INJECTION_BROKEN_FIELD->{$self->field_object->type};
-    my $skip_for_dbs = $broken->{db_skip};
-    return undef if !$skip_for_dbs;
-    my $dbh = Bugzilla->dbh;
-    if (my ($skip) = grep { $dbh->isa("Bugzilla::DB::$_") } @$skip_for_dbs) {
-        my $field = $self->field;
-        return "$field injection testing is not supported with $skip";
-    }
-    return undef;
-}
-# Injection tests don't do translation.
-sub translated_value { $_[0]->test_value }
-
-sub name { return "injection-" . $_[0]->SUPER::name; }
-
-# Injection tests don't check content.
-sub _test_content {}
-
-sub _test_sql {
-    my $self = shift;
-    my ($sql) = @_;
-    my $dbh = Bugzilla->dbh;
-    my $name = $self->name;
-    if (my $error_ok = $self->sql_error_ok) {
-        throws_ok { $dbh->selectall_arrayref($sql) } $error_ok,
-                  "$name: SQL query dies, as we expect";
-        return;
-    }
-    return $self->SUPER::_test_sql(@_);
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/NotTest.pm b/xt/lib/Bugzilla/Test/Search/NotTest.pm
deleted file mode 100644
index 190b8567bb..0000000000
--- a/xt/lib/Bugzilla/Test/Search/NotTest.pm
+++ /dev/null
@@ -1,61 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This module runs tests just like a normal FieldTest, AndTest,
-# or OrTest, but in a NOT chart instead of a normal chart.
-#
-# Logically this should be a mixin of some sort so that we can apply
-# it to OrTest and AndTest, but without Moose there isn't much of an
-# easy way to do that.
-package Bugzilla::Test::Search::NotTest;
-use parent qw(Bugzilla::Test::Search::FieldTest);
-use strict;
-use warnings;
-use Bugzilla::Test::Search::Constants;
-
-# We just clone a FieldTest because that's the best for performance,
-# overall--that way we don't have to translate the value again.
-sub new {
-    my ($class, $field_test) = @_;
-    my $self = { %$field_test };
-    return bless $self, $class;
-}
-
-#############
-# Accessors #
-#############
-
-sub name {
-    my ($self) = @_;
-    return "NOT(" . $self->SUPER::name . ")";
-}
-
-# True if this test is supposed to contain the numbered bug. Reversed for
-# NOT tests.
-sub bug_is_contained {
-    my $self = shift;
-    my ($number) = @_;
-    # No search ever returns bug 6, because it's protected by security groups
-    # that the searcher isn't a member of.
-    return 0 if $number == 6;
-    return $self->SUPER::bug_is_contained(@_) ? 0 : 1;
-}
-
-# NOT tests have their own constant for tracking broken-ness.
-sub _known_broken {
-    my ($self) = @_;
-    return $self->SUPER::_known_broken(BROKEN_NOT, 'skip pg check');
-}
-
-sub search_params {
-    my ($self) = @_;
-    my %params = %{ $self->SUPER::search_params() };
-    $params{negate0} = 1;
-    return \%params;
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/OperatorTest.pm b/xt/lib/Bugzilla/Test/Search/OperatorTest.pm
deleted file mode 100644
index 5ab502dfcf..0000000000
--- a/xt/lib/Bugzilla/Test/Search/OperatorTest.pm
+++ /dev/null
@@ -1,103 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This module represents the tests that get run on a single operator
-# from the TESTS constant in Bugzilla::Search::Test::Constants.
-package Bugzilla::Test::Search::OperatorTest;
-
-use strict;
-use warnings;
-use Bugzilla::Test::Search::Constants;
-use Bugzilla::Test::Search::FieldTest;
-use Bugzilla::Test::Search::FieldTestNormal;
-use Bugzilla::Test::Search::InjectionTest;
-use Bugzilla::Test::Search::OrTest;
-use Bugzilla::Test::Search::AndTest;
-use Bugzilla::Test::Search::NotTest;
-
-###############
-# Constructor #
-###############
-
-sub new {
-    my ($invocant, $operator, $search_test) = @_;
-    $search_test ||= $invocant->search_test;
-    my $class = ref($invocant) || $invocant;
-    return bless { search_test => $search_test, operator => $operator }, $class;
-}
-
-#############
-# Accessors #
-#############
-
-# The Bugzilla::Test::Search object that this is a child of.
-sub search_test { return $_[0]->{search_test} }
-# The operator being tested
-sub operator { return $_[0]->{operator} }
-# The tests that we're going to run on this operator.
-sub tests { return @{ TESTS->{$_[0]->operator } } }
-# The fields we're going to test for this operator.
-sub test_fields { return $_[0]->search_test->all_fields }
-
-sub run {
-    my ($self) = @_;
-
-    foreach my $field ($self->test_fields) {
-        foreach my $test ($self->tests) {
-            my $field_test =
-                new Bugzilla::Test::Search::FieldTest($self, $field, $test);
-            $field_test->run();
-            my $normal_test =
-                new Bugzilla::Test::Search::FieldTestNormal($field_test);
-            $normal_test->run();
-            my $not_test = new Bugzilla::Test::Search::NotTest($field_test);
-            $not_test->run();
-            
-            next if !$self->search_test->option('long');
-
-            # Run the OR tests. This tests every other operator (including
-            # this operator itself) in combination with every other field,
-            # in an OR with this operator and field.
-            foreach my $other_operator ($self->search_test->all_operators) {
-                $self->run_join_tests($field_test, $other_operator);
-            }
-        }
-        foreach my $test (INJECTION_TESTS) {
-            my $injection_test =
-                new Bugzilla::Test::Search::InjectionTest($self, $field, $test);
-            $injection_test->run();
-        }
-    }
-}
-
-sub run_join_tests {
-    my ($self, $field_test, $other_operator) = @_;
-
-    my $other_operator_test = $self->new($other_operator);
-    foreach my $other_test ($other_operator_test->tests) {
-        foreach my $other_field ($self->test_fields) {
-            $self->_run_one_join_test($field_test, $other_operator_test,
-                                      $other_field, $other_test);
-            $self->search_test->clean_test_history();
-        }
-    }
-}
-
-sub _run_one_join_test {
-    my ($self, $field_test, $other_operator_test, $other_field, $other_test) = @_;
-    my $other_field_test =
-        new Bugzilla::Test::Search::FieldTest($other_operator_test,
-                                              $other_field, $other_test);
-    my $or_test = new Bugzilla::Test::Search::OrTest($field_test,
-                                                     $other_field_test);
-    $or_test->run();
-    my $and_test = new Bugzilla::Test::Search::AndTest($field_test,
-                                                       $other_field_test);
-    $and_test->run();
-}
-
-1;
diff --git a/xt/lib/Bugzilla/Test/Search/OrTest.pm b/xt/lib/Bugzilla/Test/Search/OrTest.pm
deleted file mode 100644
index 1b948f38de..0000000000
--- a/xt/lib/Bugzilla/Test/Search/OrTest.pm
+++ /dev/null
@@ -1,141 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# This test combines two field/operator combinations using OR in
-# a single boolean chart.
-package Bugzilla::Test::Search::OrTest;
-use parent qw(Bugzilla::Test::Search::FieldTest);
-
-use Bugzilla::Test::Search::Constants;
-use List::MoreUtils qw(all any uniq);
-
-use constant type => 'OR';
-
-###############
-# Constructor #
-###############
-
-sub new {
-    my $class = shift;
-    my $self = { field_tests => [@_] };
-    return bless $self, $class;
-}
-
-#############
-# Accessors #
-#############
-
-sub field_tests { return @{ $_[0]->{field_tests} } }
-sub search_test { ($_[0]->field_tests)[0]->search_test }
-
-sub name {
-    my ($self) = @_;
-    my @names = map { $_->name } $self->field_tests;
-    return join('-' . $self->type . '-', @names);
-}
-
-# In an OR test, bugs ARE supposed to be contained if they are contained
-# by ANY test.
-sub bug_is_contained {
-    my ($self, $number) = @_;
-    return any { $_->bug_is_contained($number) } $self->field_tests;
-}
-
-# Needed only for failure messages
-sub debug_value {
-    my ($self) = @_;
-    my @values = map { $_->field . ' ' . $_->debug_value } $self->field_tests;
-    return join(' ' . $self->type . ' ', @values);
-}
-
-########################
-# SKIP & TODO Messages #
-########################
-
-sub field_not_yet_implemented {
-    my ($self) = @_;
-    return $self->_join_messages('field_not_yet_implemented');
-}
-sub invalid_field_operator_combination {
-    my ($self) = @_;
-    return $self->_join_messages('invalid_field_operator_combination');
-}
-sub search_known_broken {
-    my ($self) = @_;
-    return $self->_join_messages('search_known_broken');    
-}
-
-sub _join_messages {
-    my ($self, $message_method) = @_;
-    my @messages = map { $_->$message_method } $self->field_tests;
-    @messages = grep { $_ } @messages;
-    return join(' AND ', @messages);
-}
-
-sub _bug_will_actually_be_contained {
-    my ($self, $number) = @_;
-
-    foreach my $test ($self->field_tests) {
-        # Some tests are broken in such a way that they actually
-        # generate no criteria in the SQL. In this case, the only way
-        # the test contains the bug is if *another* test contains it.
-        next if $test->_known_broken->{no_criteria};
-        return 1 if $test->will_actually_contain_bug($number);
-    }
-    return 0;
-}
-
-sub contains_known_broken {
-    my ($self, $number) = @_;
-
-    if ( ( $self->bug_is_contained($number)
-           and !$self->_bug_will_actually_be_contained($number) )
-        or ( !$self->bug_is_contained($number)
-             and $self->_bug_will_actually_be_contained($number) ) )
-    {
-        my @messages = map { $_->contains_known_broken($number) } 
-                           $self->field_tests;
-        @messages = grep { $_ } @messages;
-        # Sometimes, with things that break because of no_criteria, there won't
-        # be anything in @messages even though we need to print out a message.
-        if (!@messages) {
-            my @no_criteria = grep { $_->_known_broken->{no_criteria} }
-                                   $self->field_tests;
-            @messages = map { "No criteria generated by " . $_->name }
-                            @no_criteria;
-        }
-        die "broken test with no message" if !@messages;
-        return join(' AND ', @messages);
-    }
-    return undef;
-}
-
-##############################
-# Bugzilla::Search arguments #
-##############################
-
-sub search_columns {
-    my ($self) = @_;
-    my @columns = map { @{ $_->search_columns } } $self->field_tests;
-    return [uniq @columns];
-}
-
-sub search_params {
-    my ($self) = @_;
-    my @all_params = map { $_->search_params } $self->field_tests;
-    my %params;
-    my $chart = 0;
-    foreach my $item (@all_params) {
-        $params{"field0-0-$chart"} = $item->{'field0-0-0'};
-        $params{"type0-0-$chart"}  = $item->{'type0-0-0'};
-        $params{"value0-0-$chart"} = $item->{'value0-0-0'};
-        $chart++;
-    }
-    return \%params;
-}
-
-1;
diff --git a/xt/lib/QA/REST.pm b/xt/lib/QA/REST.pm
new file mode 100644
index 0000000000..11f0d98cac
--- /dev/null
+++ b/xt/lib/QA/REST.pm
@@ -0,0 +1,70 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package QA::REST;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../../lib", "$RealBin/../../../local/lib/perl5";
+
+use autodie;
+
+use LWP::UserAgent;
+use JSON;
+use QA::Util;
+
+use parent qw(LWP::UserAgent Exporter);
+
+@QA::REST::EXPORT = qw(
+  MUST_FAIL
+  get_rest_client
+);
+
+use constant MUST_FAIL => 1;
+
+sub get_rest_client {
+  my $rest_client = LWP::UserAgent->new(ssl_opts => {verify_hostname => 0});
+  bless($rest_client, 'QA::REST');
+  my $config = $rest_client->{bz_config} = get_config();
+  $rest_client->{bz_url}
+    = $config->{browser_url} . '/' . $config->{bugzilla_installation} . '/rest/';
+  $rest_client->{bz_default_headers}
+    = {'Accept' => 'application/json', 'Content-Type' => 'application/json'};
+  return $rest_client;
+}
+
+sub bz_config { return $_[0]->{bz_config}; }
+
+sub call {
+  my ($self, $method, $data, $http_verb, $expect_to_fail) = @_;
+  $http_verb = lc($http_verb || 'GET');
+  $data //= {};
+
+  my %args = %{$self->{bz_default_headers}};
+
+# We do not pass the API key in the URL, so that it's not logged by the web server.
+  if ($http_verb eq 'get' && $data->{api_key}) {
+    $args{'X-BUGZILLA-API-KEY'} = $data->{api_key};
+  }
+  elsif ($http_verb ne 'get') {
+    $args{Content} = encode_json($data);
+  }
+
+  my $response = $self->$http_verb($self->{bz_url} . $method, %args);
+  my $res = decode_json($response->decoded_content);
+  if ($response->is_success xor $expect_to_fail) {
+    return $res;
+  }
+  else {
+    die 'error ' . $res->{code} . ': ' . $res->{message} . "\n";
+  }
+}
+
+1;
diff --git a/xt/lib/QA/RPC.pm b/xt/lib/QA/RPC.pm
new file mode 100644
index 0000000000..d7954bf2c1
--- /dev/null
+++ b/xt/lib/QA/RPC.pm
@@ -0,0 +1,316 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+package QA::RPC;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../../lib", "$RealBin/../../../local/lib/perl5";
+
+use Data::Dumper;
+use QA::Util;
+use QA::Tests qw(PRIVATE_BUG_USER create_bug_fields);
+use Storable qw(dclone);
+use Test::More;
+
+sub bz_config {
+  my $self = shift;
+  $self->{bz_config} ||= QA::Util::get_config();
+  return $self->{bz_config};
+}
+
+# True if we're doing calls over GET instead of POST.
+sub bz_get_mode { return 0 }
+
+# When doing bz_log_in over GET, we can't actually call User.login,
+# we just store credentials here and then pass them as Bugzilla_login
+# and Bugzilla_password with every future call until User.logout is called
+# (which actually just calls _bz_clear_credentials, under GET).
+sub _bz_credentials {
+  my ($self, $user, $pass) = @_;
+  if (@_ == 3) {
+    $self->{_bz_credentials}->{user} = $user;
+    $self->{_bz_credentials}->{pass} = $pass;
+  }
+  return $self->{_bz_credentials};
+}
+sub _bz_clear_credentials { delete $_[0]->{_bz_credentials} }
+
+################################
+# Helpers for RPC test scripts #
+################################
+
+sub bz_log_in {
+  my ($self, $user) = @_;
+  my $username = $self->bz_config->{"${user}_user_login"};
+  my $password = $self->bz_config->{"${user}_user_passwd"};
+
+  if ($self->bz_get_mode) {
+    $self->_bz_credentials($username, $password);
+    return;
+  }
+
+  my $call = $self->bz_call_success('User.login',
+    {login => $username, password => $password});
+  cmp_ok($call->result->{id}, 'gt', 0, $self->TYPE . ": Logged in as $user");
+  $self->{_bz_credentials}->{token} = $call->result->{token};
+}
+
+sub bz_call_success {
+  my ($self, $method, $orig_args, $test_name) = @_;
+  my $args = $orig_args ? dclone($orig_args) : {};
+
+  if ($self->bz_get_mode and $method eq 'User.logout') {
+    $self->_bz_clear_credentials();
+    return;
+  }
+
+  my $call;
+
+  # Under XMLRPC::Lite, if we pass undef as the second argument,
+  # it sends a single param <value />, which shows up as an
+  # empty string on the Bugzilla side.
+  if ($self->{_bz_credentials}->{token}) {
+    $args->{Bugzilla_token} = $self->{_bz_credentials}->{token};
+  }
+
+  if (scalar keys %$args) {
+    $call = $self->call($method, $args);
+  }
+  else {
+    $call = $self->call($method);
+  }
+  $test_name ||= "$method returned successfully";
+  $self->_handle_undef_response($test_name) if !$call;
+  ok(!$call->fault, $self->TYPE . ": $test_name") or diag($call->faultstring);
+
+  if ($method eq 'User.logout') {
+    delete $self->{_bz_credentials}->{token};
+  }
+  return $call;
+}
+
+sub bz_call_fail {
+  my ($self, $method, $orig_args, $faultstring, $test_name) = @_;
+  my $args = $orig_args ? dclone($orig_args) : {};
+
+  if ($self->{_bz_credentials}->{token}) {
+    $args->{Bugzilla_token} = $self->{_bz_credentials}->{token};
+  }
+
+  $test_name ||= "$method failed (as intended)";
+  my $call = $self->call($method, $args);
+  $self->_handle_undef_response($test_name) if !$call;
+  ok($call->fault, $self->TYPE . ": $test_name")
+    or diag("Returned: " . Dumper($call->result));
+  if (defined $faultstring) {
+    cmp_ok(trim($call->faultstring),
+      '=~', $faultstring, $self->TYPE . ": Got correct fault for $method");
+  }
+  ok(
+    $call->faultcode && (
+      ($call->faultcode < 32000 && $call->faultcode > -32000)
+
+      # Fault codes 32610 and above are OK because they are errors
+      # that we expect and test for sometimes.
+      || $call->faultcode >= 32610
+    ),
+    $self->TYPE . ': Fault code is set properly'
+  ) or diag("Code: " . $call->faultcode . " Message: " . $call->faultstring);
+
+  return $call;
+}
+
+sub _handle_undef_response {
+  my ($self, $test_name) = @_;
+  my $response = $self->transport->http_response;
+  die "$test_name:\n", $response->as_string;
+}
+
+sub bz_get_products {
+  my ($self) = @_;
+  $self->bz_log_in('QA_Selenium_TEST');
+
+  my $accessible = $self->bz_call_success('Product.get_accessible_products');
+  my $prod_call = $self->bz_call_success('Product.get', $accessible->result);
+  my %products;
+  foreach my $prod (@{$prod_call->result->{products}}) {
+    $products{$prod->{name}} = $prod->{id};
+  }
+
+  $self->bz_call_success('User.logout');
+  return \%products;
+}
+
+sub _string_array {
+  map { random_string() } (1 .. $_[0]);
+}
+
+sub bz_create_test_bugs {
+  my ($self, $second_private) = @_;
+  my $config = $self->bz_config;
+
+  my @whiteboard_strings = _string_array(3);
+  my @summary_strings    = _string_array(3);
+
+  my $public_bug = create_bug_fields($config);
+  $public_bug->{whiteboard} = join(' ', @whiteboard_strings);
+  $public_bug->{summary}    = join(' ', @summary_strings);
+
+  my $private_bug = dclone($public_bug);
+  if ($second_private) {
+    $private_bug->{product}          = 'QA-Selenium-TEST';
+    $private_bug->{component}        = 'QA-Selenium-TEST';
+    $private_bug->{target_milestone} = 'QAMilestone';
+    $private_bug->{version}          = 'QAVersion';
+
+    # Although we don't directly use this, this helps some tests that
+    # depend on the values in $private_bug.
+    $private_bug->{creator} = $config->{PRIVATE_BUG_USER . '_user_login'};
+  }
+
+  my @create_bugs = (
+    {user => 'editbugs', args => $public_bug, test => 'Create a public bug'},
+    {
+      user => $second_private ? PRIVATE_BUG_USER : 'editbugs',
+      args => $private_bug,
+      test => $second_private ? 'Create a private bug' : 'Create a second public bug'
+    },
+  );
+
+  my $post_success = sub {
+    my ($call, $t) = @_;
+    my $id = $call->result->{id};
+    $t->{args}->{id} = $id;
+  };
+
+  # Creating the bugs isn't really a test, it's just preliminary work
+  # for the tests. So we just run it with one of the RPC clients.
+  $self->bz_run_tests(
+    tests        => \@create_bugs,
+    method       => 'Bug.create',
+    post_success => $post_success
+  );
+
+  return ($public_bug, $private_bug);
+}
+
+sub bz_run_tests {
+  my ($self, %params) = @_;
+
+  # Required params
+  my $config = $self->bz_config;
+  my $tests  = $params{tests};
+  my $method = $params{method};
+
+  # Optional params
+  my $post_success = $params{post_success};
+  my $pre_call     = $params{pre_call};
+
+  my $former_user = '';
+  foreach my $t (@$tests) {
+
+    # Only logout/login if the user has changed since the last test
+    # (this saves us LOTS of needless logins).
+    my $user = $t->{user} || '';
+    if ($former_user ne $user) {
+      $self->bz_call_success('User.logout') if $former_user;
+      $self->bz_log_in($user) if $user;
+      $former_user = $user;
+    }
+
+    $pre_call->($t, $self) if $pre_call;
+
+    if ($t->{error}) {
+      $self->bz_call_fail($method, $t->{args}, $t->{error}, $t->{test});
+    }
+    else {
+      my $call = $self->bz_call_success($method, $t->{args}, $t->{test});
+      if ($call->result && $post_success) {
+        $post_success->($call, $t, $self);
+      }
+    }
+  }
+
+  $self->bz_call_success('User.logout') if $former_user;
+}
+
+sub bz_test_bug {
+  my ($self, $fields, $bug, $orig_expect, $t, $creation_time) = @_;
+
+  my $expect = dclone($orig_expect);
+
+  foreach my $field (sort @$fields) {
+
+    # "description" is used by Bug.create but comments are not returned
+    # by Bug.get or Bug.search.
+    next if $field eq 'description';
+
+    my @include = @{$t->{args}->{include_fields} || []};
+    my @exclude = @{$t->{args}->{exclude_fields} || []};
+    if ( (@include and !grep($_ eq $field, @include))
+      or (@exclude and grep($_ eq $field, @exclude)))
+    {
+      ok(!exists $bug->{$field}, "$field is not included") or diag Dumper($bug);
+      next;
+    }
+
+    foreach my $field (qw(assigned_to creator qa_contact)) {
+      if (!$t->{user}) {
+        $expect->{$field} = email_filter($expect->{$field});
+      }
+    }
+
+    if ($field =~ /^is_/) {
+      ok(defined $bug->{$field}, $self->TYPE . ": $field is not null");
+      is(
+        $bug->{$field}    ? 1 : 0,
+        $expect->{$field} ? 1 : 0,
+        $self->TYPE . ": $field has the right boolean value"
+      );
+    }
+    elsif ($field eq 'cc') {
+      foreach my $cc_item (@{$expect->{cc} || []}) {
+        $cc_item = email_filter($cc_item) if !$t->{user};
+        ok(
+          grep($_ eq $cc_item, @{$bug->{cc}}),
+          $self->TYPE . ": $field contains $cc_item"
+        );
+      }
+    }
+    elsif ($field eq 'creation_time' or $field eq 'last_change_time') {
+      my $creation_day;
+
+      # XML-RPC and JSON-RPC have different date formats.
+      if ($self->isa('QA::RPC::XMLRPC')) {
+        $creation_day = $creation_time->ymd('');
+      }
+      else {
+        $creation_day = $creation_time->ymd;
+      }
+
+      like(
+        $bug->{$field},
+        qr/^\Q${creation_day}\ET\d\d:\d\d:\d\d/,
+        $self->TYPE . ": $field has the right format"
+      );
+    }
+    else {
+      is_deeply($bug->{$field}, $expect->{$field},
+        $self->TYPE . ": $field value is correct");
+    }
+  }
+}
+
+1;
+
+__END__
diff --git a/xt/lib/QA/RPC/JSONRPC.pm b/xt/lib/QA/RPC/JSONRPC.pm
new file mode 100644
index 0000000000..9dc0d614fe
--- /dev/null
+++ b/xt/lib/QA/RPC/JSONRPC.pm
@@ -0,0 +1,189 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+package QA::RPC::JSONRPC;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../../../lib", "$RealBin/../../../../local/lib/perl5";
+
+use QA::RPC;
+
+BEGIN {
+  our @ISA = qw(QA::RPC);
+
+  if (eval { require JSON::RPC::Client }) {
+    push(@ISA, 'JSON::RPC::Client');
+  }
+  else {
+    require JSON::RPC::Legacy::Client;
+    push(@ISA, 'JSON::RPC::Legacy::Client');
+  }
+}
+
+use URI::Escape;
+
+use constant DATETIME_REGEX => qr/^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$/;
+
+sub TYPE {
+  my ($self) = @_;
+  return $self->bz_get_mode ? 'JSON-RPC GET' : 'JSON-RPC';
+}
+
+#################################
+# Consistency with XMLRPC::Lite #
+#################################
+
+sub ua {
+  my $self = shift;
+  if ($self->{ua} and not $self->{ua}->isa('QA::RPC::UserAgent')) {
+    bless $self->{ua}, 'QA::RPC::UserAgent';
+  }
+  return $self->SUPER::ua(@_);
+}
+sub transport { $_[0]->ua }
+
+sub bz_get_mode {
+  my ($self, $value) = @_;
+  $self->{bz_get_mode} = $value if @_ > 1;
+  return $self->{bz_get_mode};
+}
+
+sub _bz_callback {
+  my ($self, $value) = @_;
+  $self->{bz_callback} = $value if @_ > 1;
+  return $self->{bz_callback};
+}
+
+sub call {
+  my $self = shift;
+  my ($method, $args) = @_;
+  my %params = (method => $method);
+  $params{params} = $args ? [$args] : [];
+
+  my $config = $self->bz_config;
+  my $url
+    = $config->{browser_url} . "/"
+    . $config->{bugzilla_installation}
+    . "/jsonrpc.cgi";
+  my $result;
+  if ($self->bz_get_mode) {
+    my $method_escaped = uri_escape($method);
+    $url .= "?method=$method_escaped";
+    if (my $cred = $self->_bz_credentials) {
+      $args->{Bugzilla_login} = $cred->{user} if !exists $args->{Bugzilla_login};
+      $args->{Bugzilla_password} = $cred->{pass}
+        if !exists $args->{Bugzilla_password};
+    }
+    if ($args) {
+      my $params_json    = $self->json->encode($args);
+      my $params_escaped = uri_escape($params_json);
+      $url .= "&params=$params_escaped";
+    }
+    if ($self->version eq '1.1') {
+      $url .= "&version=1.1";
+    }
+    my $callback = delete $args->{callback};
+    if (defined $callback) {
+      $self->_bz_callback($callback);
+      $url .= "&callback=" . uri_escape($callback);
+    }
+    $result = $self->SUPER::call($url);
+  }
+  else {
+    $result = $self->SUPER::call($url, \%params);
+  }
+
+  if ($result) {
+    bless $result, 'QA::RPC::JSONRPC::ReturnObject';
+  }
+  return $result;
+}
+
+sub _get {
+  my $self   = shift;
+  my $result = $self->SUPER::_get(@_);
+
+  # Simple JSONP support for tests. We just remove the callback from
+  # the return value.
+  my $callback = $self->_bz_callback;
+  if (defined $callback and $result->is_success) {
+    my $content = $result->content;
+    $content =~ s/^(?:\/\*\*\/)?\Q$callback(\E(.*)\)$/$1/s;
+    $result->content($content);
+
+    # We don't need this anymore, and we don't want it to affect
+    # future calls.
+    delete $self->{bz_callback};
+  }
+  return $result;
+}
+
+1;
+
+package QA::RPC::JSONRPC::ReturnObject;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+BEGIN {
+  if (eval { require JSON::RPC::Client }) {
+    our @ISA = qw(JSON::RPC::ReturnObject);
+  }
+  else {
+    require JSON::RPC::Legacy::Client;
+    our @ISA = qw(JSON::RPC::Legacy::ReturnObject);
+  }
+}
+
+#################################
+# Consistency with XMLRPC::Lite #
+#################################
+
+sub faultstring { $_[0]->{content}->{error}->{message} }
+sub faultcode   { $_[0]->{content}->{error}->{code} }
+sub fault       { $_[0]->is_error }
+
+1;
+
+package QA::RPC::UserAgent;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use parent qw(LWP::UserAgent);
+
+########################################
+# Consistency with XMLRPC::Lite's ->ua #
+########################################
+
+sub send_request {
+  my $self     = shift;
+  my $response = $self->SUPER::send_request(@_);
+  $self->http_response($response);
+
+  # JSON::RPC::Client can't handle 500 responses, even though
+  # they're required by the JSON-RPC spec.
+  $response->code(200);
+  return $response;
+}
+
+# Copied directly from SOAP::Lite::Transport::HTTP.
+sub http_response {
+  my $self = shift;
+  if (@_) { $self->{'_http_response'} = shift; return $self }
+  return $self->{'_http_response'};
+}
+
+1;
diff --git a/xt/lib/QA/RPC/XMLRPC.pm b/xt/lib/QA/RPC/XMLRPC.pm
new file mode 100644
index 0000000000..1dc84a16da
--- /dev/null
+++ b/xt/lib/QA/RPC/XMLRPC.pm
@@ -0,0 +1,24 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+package QA::RPC::XMLRPC;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../../../lib", "$RealBin/../../../../local/lib/perl5";
+
+use parent qw(QA::RPC XMLRPC::Lite);
+
+use constant TYPE           => 'XML-RPC';
+use constant DATETIME_REGEX => qr/^\d{8}T\d\d:\d\d:\d\d$/;
+
+1;
diff --git a/xt/lib/QA/Tests.pm b/xt/lib/QA/Tests.pm
new file mode 100644
index 0000000000..da82e6d58c
--- /dev/null
+++ b/xt/lib/QA/Tests.pm
@@ -0,0 +1,128 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+package QA::Tests;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../../lib", "$RealBin/../../../local/lib/perl5";
+
+use parent qw(Exporter);
+
+our @EXPORT_OK = qw(
+  PRIVATE_BUG_USER
+  STANDARD_BUG_TESTS
+  bug_tests
+  create_bug_fields
+);
+
+use constant INVALID_BUG_ID    => -1;
+use constant INVALID_BUG_ALIAS => 'aaaaaaa12345';
+use constant PRIVATE_BUG_USER  => 'QA_Selenium_TEST';
+
+use constant CREATE_BUG => {
+  'priority'    => 'Highest',
+  'status'      => 'CONFIRMED',
+  'version'     => 'unspecified',
+  'creator'     => 'editbugs',
+  'description' => '-- Comment Created By Bugzilla XML-RPC Tests --',
+  'cc'          => ['unprivileged'],
+  'component'   => 'c1',
+  'platform'    => 'PC',
+
+  # It's necessary to assign the bug to somebody who isn't in the
+  # timetracking group, for the Bug.update tests.
+  'assigned_to'    => PRIVATE_BUG_USER,
+  'summary'        => 'WebService Test Bug',
+  'product'        => 'Another Product',
+  'op_sys'         => 'Linux',
+  'severity'       => 'normal',
+  'qa_contact'     => 'canconfirm',
+  version          => 'Another1',
+  url              => 'http://www.bugzilla.org/',
+  target_milestone => 'AnotherMS1',
+};
+
+sub create_bug_fields {
+  my ($config) = @_;
+  my %bug = %{CREATE_BUG()};
+  foreach my $field (qw(creator assigned_to qa_contact)) {
+    my $value = $bug{$field};
+    $bug{$field} = $config->{"${value}_user_login"};
+  }
+  $bug{cc} = [map { $config->{$_ . "_user_login"} } @{$bug{cc}}];
+  return \%bug;
+}
+
+sub bug_tests {
+  my ($public_id, $private_id) = @_;
+  return [
+    {
+      args  => {ids => [$private_id]},
+      error => "You are not authorized to access",
+      test  => 'Logged-out user cannot access a private bug',
+    },
+    {
+      args => {ids => [$public_id]},
+      test => 'Logged-out user can access a public bug.',
+    },
+    {
+      args  => {ids => [INVALID_BUG_ID]},
+      error => "not a valid bug number",
+      test  => 'Passing invalid bug id returns error "Invalid Bug ID"',
+    },
+    {
+      args  => {ids => [undef]},
+      error => "You must enter a valid bug number",
+      test  => 'Passing undef as bug id param returns error "Invalid Bug ID"',
+    },
+    {
+      args  => {ids => [INVALID_BUG_ALIAS]},
+      error => "nor an alias to a bug",
+      test  => 'Passing invalid bug alias returns error "Invalid Bug Alias"',
+    },
+
+    {
+      user  => 'editbugs',
+      args  => {ids => [$private_id]},
+      error => "You are not authorized to access",
+      test  => 'Access to a private bug is denied to a user without privs',
+    },
+    {
+      user => 'unprivileged',
+      args => {ids => [$public_id]},
+      test => 'User without privs can access a public bug',
+    },
+    {
+      user => 'admin',
+      args => {ids => [$public_id]},
+      test => 'Admin can access a public bug.',
+    },
+    {
+      user => PRIVATE_BUG_USER,
+      args => {ids => [$private_id]},
+      test => 'User with privs can successfully access a private bug',
+    },
+
+    # This helps webservice_bug_attachment get private attachment ids
+    # from the public bug, and doesn't hurt for the other tests.
+    {
+      user => PRIVATE_BUG_USER,
+      args => {ids => [$public_id]},
+      test => 'User with privs can also access the public bug',
+    },
+  ];
+}
+
+use constant STANDARD_BUG_TESTS => bug_tests('public_bug', 'private_bug');
+
+1;
diff --git a/xt/lib/QA/Util.pm b/xt/lib/QA/Util.pm
new file mode 100644
index 0000000000..19b821b17b
--- /dev/null
+++ b/xt/lib/QA/Util.pm
@@ -0,0 +1,416 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+package QA::Util;
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../../lib", "$RealBin/../../../local/lib/perl5";
+
+use autodie;
+use Data::Dumper;
+use Email::Address;
+use Test::More;
+
+use parent qw(Exporter);
+@QA::Util::EXPORT = qw(
+  trim
+  url_quote
+  random_string
+  email_filter
+
+  log_in
+  logout
+  file_bug_in_product
+  create_bug
+  edit_bug
+  edit_bug_and_return
+  go_to_bug
+  go_to_home
+  go_to_admin
+  edit_product
+  add_product
+  open_advanced_search_page
+  set_parameters
+
+  get_selenium
+  get_rpc_clients
+  get_config
+
+  WAIT_TIME
+  CHROME_MODE
+);
+
+# How long we wait for pages to load.
+use constant WAIT_TIME   => 60000;
+use constant CONF_FILE   => "$RealBin/../config/selenium_test.conf";
+use constant CHROME_MODE => 1;
+use constant NDASH       => chr(0x2013);
+
+#####################
+# Utility Functions #
+#####################
+
+sub random_string {
+  my $size = shift || 30;    # default to 30 chars if nothing specified
+  return
+    join("", map { ('0' .. '9', 'a' .. 'z', 'A' .. 'Z')[rand 62] } (1 .. $size));
+}
+
+# Remove consecutive as well as leading and trailing whitespaces.
+sub trim {
+  my ($str) = @_;
+  if ($str) {
+    $str =~ s/[\r\n\t\s]+/ /g;
+    $str =~ s/^\s+//g;
+    $str =~ s/\s+$//g;
+  }
+  return $str;
+}
+
+# This originally came from CGI.pm, by Lincoln D. Stein
+sub url_quote {
+  my ($toencode) = (@_);
+  $toencode =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("%%%02x",ord($1))/eg;
+  return $toencode;
+}
+
+###################
+# Setup Functions #
+###################
+
+sub get_config {
+
+  # read the test configuration file
+  my $conf_file = CONF_FILE;
+  my $config    = do($conf_file)
+    or die "can't read configuration '$conf_file': $!$@";
+  return $config;
+}
+
+sub get_selenium {
+  my $chrome_mode = shift;
+  my $config      = get_config();
+
+  require Test::WWW::Selenium;
+  require WWW::Selenium::Util;
+
+  if (!WWW::Selenium::Util::server_is_running()) {
+    die "Selenium Server isn't running!";
+  }
+
+  my $sel = Test::WWW::Selenium->new(
+    host    => $config->{host},
+    port    => $config->{port},
+    browser => $chrome_mode
+    ? $config->{experimental_browser_launcher}
+    : $config->{browser},
+    browser_url => $config->{browser_url}
+  );
+
+  return ($sel, $config);
+}
+
+sub get_xmlrpc_client {
+  my $config = get_config();
+  my $xmlrpc_url
+    = $config->{browser_url} . "/"
+    . $config->{bugzilla_installation}
+    . "/xmlrpc.cgi";
+
+  require QA::RPC::XMLRPC;
+  my $rpc = QA::RPC::XMLRPC->new(proxy => $xmlrpc_url);
+  return ($rpc, $config);
+}
+
+sub get_jsonrpc_client {
+  my ($get_mode) = @_;
+  require QA::RPC::JSONRPC;
+  my $rpc = QA::RPC::JSONRPC->new();
+
+  # If we don't set a long timeout, then the Bug.add_comment test
+  # where we add a too-large comment fails.
+  $rpc->transport->timeout(180);
+  $rpc->version($get_mode ? '1.1' : '1.0');
+  $rpc->bz_get_mode($get_mode);
+  return $rpc;
+}
+
+sub get_rpc_clients {
+  my ($xmlrpc, $config) = get_xmlrpc_client();
+  my $jsonrpc     = get_jsonrpc_client();
+  my $jsonrpc_get = get_jsonrpc_client('GET');
+  return ($config, $xmlrpc, $jsonrpc, $jsonrpc_get);
+}
+
+################################
+# Helpers for Selenium Scripts #
+################################
+
+sub go_to_home {
+  my ($sel, $config) = @_;
+  $sel->open_ok("/$config->{bugzilla_installation}/",
+    undef, "Go to the home page");
+  $sel->title_is("Bugzilla Main Page");
+}
+
+# Go to the home/login page and log in.
+sub log_in {
+  my ($sel, $config, $user) = @_;
+
+  go_to_home($sel, $config);
+  $sel->type_ok(
+    "Bugzilla_login_top",
+    $config->{"${user}_user_login"},
+    "Enter $user login name"
+  );
+  $sel->type_ok(
+    "Bugzilla_password_top",
+    $config->{"${user}_user_passwd"},
+    "Enter $user password"
+  );
+  $sel->click_ok("log_in_top", undef, "Submit credentials");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Bugzilla Main Page", "User is logged in");
+}
+
+# Log out. Will fail if you are not logged in.
+sub logout {
+  my $sel = shift;
+
+  $sel->click_ok("link=Log out", undef, "Logout");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Logged Out");
+}
+
+# Display the bug form to enter a bug in the given product.
+sub file_bug_in_product {
+  my ($sel, $product, $classification) = @_;
+
+  $classification ||= "Unclassified";
+  $sel->click_ok("link=New", undef, "Go create a new bug");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  my $title = $sel->get_title();
+  if ($sel->is_text_present("Select Classification")) {
+    ok(1,
+      "More than one enterable classification available. Display them in a list");
+    $sel->click_ok("link=$classification", undef, "Choose $classification");
+    $sel->wait_for_page_to_load(WAIT_TIME);
+    $title = $sel->get_title();
+  }
+  if ($title eq "Enter Bug") {
+    ok(1, "Display the list of enterable products");
+    $sel->click_ok("link=$product", undef, "Choose $product");
+    $sel->wait_for_page_to_load(WAIT_TIME);
+  }
+  else {
+    ok(1,
+      "Only one product available in $classification. Skipping the 'Choose product' page."
+    );
+  }
+  $sel->title_is("Enter Bug: $product", "Display form to enter bug data");
+}
+
+sub create_bug {
+  my ($sel, $bug_summary) = @_;
+  my $ndash = NDASH;
+
+  $sel->click_ok('commit');
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  my $bug_id = $sel->get_value('//input[@name="id" and @type="hidden"]');
+  $sel->title_like(
+    qr/$bug_id $ndash( \(.*\))? $bug_summary/,
+    "Bug $bug_id created with summary '$bug_summary'"
+  );
+  return $bug_id;
+}
+
+sub edit_bug {
+  my ($sel, $bug_id, $bug_summary, $options) = @_;
+  my $ndash = NDASH;
+  my $btn_id = $options ? $options->{id} : 'commit';
+
+  $sel->click_ok($btn_id);
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("$bug_id $ndash $bug_summary",
+    "Changes submitted to bug $bug_id");
+
+  # If the web browser doesn't support history.ReplaceState or has it turned off,
+  # "Bug FIXME processed" is displayed instead (as in Bugzilla 4.0 and older).
+  # $sel->title_is("Bug $bug_id processed", "Changes submitted to bug $bug_id");
+}
+
+sub edit_bug_and_return {
+  my ($sel, $bug_id, $bug_summary, $options) = @_;
+  my $ndash = NDASH;
+  edit_bug($sel, $bug_id, $bug_summary, $options);
+  $sel->click_ok("//a[contains(\@href, 'show_bug.cgi?id=$bug_id')]");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("$bug_id $ndash $bug_summary", "Returning back to bug $bug_id");
+}
+
+# Go to show_bug.cgi.
+sub go_to_bug {
+  my ($sel, $bug_id) = @_;
+
+  $sel->type_ok("quicksearch_top", $bug_id);
+  $sel->click_ok("find_top", undef, "Go to bug $bug_id");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  my $bug_title = $sel->get_title();
+  utf8::encode($bug_title) if utf8::is_utf8($bug_title);
+  $sel->title_like(qr/^$bug_id /, $bug_title);
+}
+
+# Go to admin.cgi.
+sub go_to_admin {
+  my $sel = shift;
+
+  $sel->click_ok("link=Administration", undef, "Go to the Admin page");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_like(qr/^Administer your installation/, "Display admin.cgi");
+}
+
+# Go to editproducts.cgi and display the given product.
+sub edit_product {
+  my ($sel, $product, $classification) = @_;
+
+  $classification ||= "Unclassified";
+  go_to_admin($sel);
+  $sel->click_ok("link=Products", undef, "Go to the Products page");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  my $title = $sel->get_title();
+  if ($title eq "Select Classification") {
+    ok(1,
+      "More than one enterable classification available. Display them in a list");
+    $sel->click_ok("link=$classification", undef, "Choose $classification");
+    $sel->wait_for_page_to_load(WAIT_TIME);
+  }
+  else {
+    $sel->title_is("Select product", "Display the list of enterable products");
+  }
+  $sel->click_ok("link=$product", undef, "Choose $product");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Edit Product '$product'", "Display properties of $product");
+}
+
+sub add_product {
+  my ($sel, $classification) = @_;
+
+  $classification ||= "Unclassified";
+  go_to_admin($sel);
+  $sel->click_ok("link=Products", undef, "Go to the Products page");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  my $title = $sel->get_title();
+  if ($title eq "Select Classification") {
+    ok(1,
+      "More than one enterable classification available. Display them in a list");
+    $sel->click_ok(
+      "//a[contains(\@href, 'editproducts.cgi?action=add&classification=$classification')]",
+      undef,
+      "Add product to $classification"
+    );
+  }
+  else {
+    $sel->title_is("Select product", "Display the list of enterable products");
+    $sel->click_ok("link=Add", undef, "Add a new product");
+  }
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Add Product", "Display the new product form");
+}
+
+sub open_advanced_search_page {
+  my $sel = shift;
+
+  $sel->click_ok("link=Search");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  my $title = $sel->get_title();
+  if ($title eq "Simple Search") {
+    ok(1, "Display the simple search form");
+    $sel->click_ok("link=Advanced Search");
+    $sel->wait_for_page_to_load(WAIT_TIME);
+  }
+  $sel->title_is("Search for bugs", "Display the Advanced search form");
+}
+
+# $params is a hashref of the form:
+# {section1 => { param1 => {type => '(text|select)', value => 'foo'},
+#                param2 => {type => '(text|select)', value => 'bar'},
+#                param3 => undef },
+#  section2 => { param4 => ...},
+# }
+# section1, section2, ... is the name of the section
+# param1, param2, ... is the name of the parameter (which must belong to the given section)
+# type => 'text' is for text fields
+# type => 'select' is for drop-down select fields
+# undef is for radio buttons (in which case the parameter must be the ID of the radio button)
+# value => 'foo' is the value of the parameter (either text or label)
+sub set_parameters {
+  my ($sel, $params) = @_;
+
+  go_to_admin($sel);
+  $sel->click_ok("link=Parameters", undef, "Go to the Config Parameters page");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Configuration: Required Settings");
+  my $last_section = "Required Settings";
+
+  foreach my $section (keys %$params) {
+    if ($section ne $last_section) {
+      $sel->click_ok("link=$section");
+      $sel->wait_for_page_to_load_ok(WAIT_TIME);
+      $sel->title_is("Configuration: $section");
+      $last_section = $section;
+    }
+    my $param_list = $params->{$section};
+    foreach my $param (keys %$param_list) {
+      my $data = $param_list->{$param};
+      if (defined $data) {
+        my $type  = $data->{type};
+        my $value = $data->{value};
+
+        if ($type eq 'text') {
+          $sel->type_ok($param, $value);
+        }
+        elsif ($type eq 'select') {
+          $sel->select_ok($param, "label=$value");
+        }
+        else {
+          ok(0, "Unknown parameter type: $type");
+        }
+      }
+      else {
+        # If the value is undefined, then the param name is
+        # the ID of the radio button.
+        $sel->click_ok($param);
+      }
+    }
+    $sel->click_ok('//input[@type="submit" and @value="Save Changes"]',
+      undef, "Save Changes");
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is("Parameters Updated");
+  }
+}
+
+sub email_filter {
+  my ($toencode) = @_;
+  my @emails = Email::Address->parse($toencode);
+  if (scalar @emails) {
+    my @hosts = map { quotemeta($_->host) } @emails;
+    my $hosts_re = join('|', @hosts);
+    $toencode =~ s/\@(?:$hosts_re)//g;
+    return $toencode;
+  }
+  return $toencode;
+}
+
+1;
+
+__END__
diff --git a/xt/rest/bugzilla.t b/xt/rest/bugzilla.t
new file mode 100644
index 0000000000..ea9b5915bd
--- /dev/null
+++ b/xt/rest/bugzilla.t
@@ -0,0 +1,71 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#######################################
+# Tests for REST calls in Bugzilla.pm #
+#######################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 11;
+use QA::REST;
+
+my $rest   = get_rest_client();
+my $config = $rest->bz_config;
+
+my $version = $rest->call('version')->{version};
+ok($version, "GET /rest/version returns $version");
+
+my $extensions = $rest->call('extensions')->{extensions};
+isa_ok($extensions, 'HASH', 'GET /rest/extensions');
+my @ext_names = sort keys %$extensions;
+
+# There is always at least the QA extension enabled.
+ok(scalar(@ext_names),
+  scalar(@ext_names) . ' extension(s) found: ' . join(', ', @ext_names));
+ok($extensions->{QA},
+  'The QA extension is enabled, with version ' . $extensions->{QA}->{version});
+
+my $timezone = $rest->call('timezone')->{timezone};
+ok($timezone, "GET /rest/timezone returns $timezone");
+
+my $time = $rest->call('time');
+foreach my $type (qw(db_time web_time)) {
+  ok($time->{$type}, "GET /rest/time returns $type = " . $time->{$type});
+}
+
+# Logged-out users can only access the maintainer and requirelogin parameters.
+my $params      = $rest->call('parameters')->{parameters};
+my @param_names = sort keys %$params;
+ok(
+  @param_names == 2
+    && defined $params->{maintainer}
+    && defined $params->{requirelogin},
+  'Only 2 parameters accessible to logged-out users: ' . join(', ', @param_names)
+);
+
+# Powerless users can access much more parameters.
+$params
+  = $rest->call('parameters', {api_key => $config->{unprivileged_user_api_key}})
+  ->{parameters};
+@param_names = sort keys %$params;
+ok(@param_names > 2,
+  scalar(@param_names) . ' parameters accessible to powerless users');
+
+# Admins can access all parameters.
+$params = $rest->call('parameters', {api_key => $config->{admin_user_api_key}})
+  ->{parameters};
+@param_names = sort keys %$params;
+ok(@param_names > 2, scalar(@param_names) . ' parameters accessible to admins');
+
+my $timestamp = $rest->call('last_audit_time')->{last_audit_time};
+ok($timestamp, "GET /rest/last_audit_time returns $timestamp");
diff --git a/xt/rest/classification.t b/xt/rest/classification.t
new file mode 100644
index 0000000000..182e04a9c9
--- /dev/null
+++ b/xt/rest/classification.t
@@ -0,0 +1,85 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#############################################
+# Tests for REST calls in Classification.pm #
+#############################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 7;
+use QA::REST;
+
+my $rest   = get_rest_client();
+my $config = $rest->bz_config;
+my $args   = {api_key => $config->{admin_user_api_key}};
+
+my $params = $rest->call('parameters', $args)->{parameters};
+my $use_class = $params->{useclassification};
+ok(defined($use_class),
+  'Classifications are ' . ($use_class ? 'enabled' : 'disabled'));
+
+# Admins can always access classifications, even when they are disabled.
+my $class = $rest->call('classification/1', $args)->{classifications}->[0];
+ok($class->{id},
+      "Admin found classification '"
+    . $class->{name}
+    . "' with the description '"
+    . $class->{description}
+    . "'");
+my @products = sort map { $_->{name} } @{$class->{products}};
+ok(scalar(@products),
+  scalar(@products) . ' product(s) found: ' . join(', ', @products));
+
+$class = $rest->call('classification/Class2_QA', $args)->{classifications}->[0];
+ok($class->{id},
+      "Admin found classification '"
+    . $class->{name}
+    . "' with the description '"
+    . $class->{description}
+    . "'");
+@products = sort map { $_->{name} } @{$class->{products}};
+ok(scalar(@products),
+  scalar(@products) . ' product(s) found: ' . join(', ', @products));
+
+if ($use_class) {
+
+  # When classifications are enabled, everybody can query classifications...
+  # ... including logged-out users.
+  $class = $rest->call('classification/1')->{classifications}->[0];
+  ok($class->{id},
+    'Logged-out users can access classification ' . $class->{name});
+
+  # ... and non-admins.
+  $class = $rest->call('classification/1',
+    {api_key => $config->{editbugs_user_api_key}})->{classifications}->[0];
+  ok($class->{id}, 'Non-admins can access classification ' . $class->{name});
+}
+else {
+  # When classifications are disabled, only users in the 'editclassifications'
+  # group can access this method...
+  # ... logged-out users get an error.
+  my $error = $rest->call('classification/1', undef, undef, MUST_FAIL);
+  ok(
+    $error->{error} && $error->{code} == 900,
+    'Logged-out users cannot query classifications when disabled: '
+      . $error->{message}
+  );
+
+  # ... as well as non-admins.
+  $error
+    = $rest->call('classification/1',
+    {api_key => $config->{editbugs_user_api_key}},
+    undef, MUST_FAIL);
+  ok($error->{error} && $error->{code} == 900,
+    'Non-admins cannot query classifications when disabled: ' . $error->{message});
+}
diff --git a/xt/search.t b/xt/search.t
deleted file mode 100644
index 81f2f33383..0000000000
--- a/xt/search.t
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/perl -w
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This Source Code Form is "Incompatible With Secondary Licenses", as
-# defined by the Mozilla Public License, v. 2.0.
-
-# For a description of this test, see Bugzilla::Test::Search
-# in xt/lib/.
-
-use strict;
-use warnings;
-use lib qw(. xt/lib lib);
-use Bugzilla;
-use Bugzilla::Constants;
-use Bugzilla::Test::Search;
-use Getopt::Long;
-use Pod::Usage;
-
-use Test::More;
-
-my %switches;
-GetOptions(\%switches, 'operators=s', 'top-operators=s', 'long',
-                       'add-custom-fields', 'help|h') || die $@;
-
-pod2usage(verbose => 1) if $switches{'help'};
-
-plan skip_all => "BZ_WRITE_TESTS environment variable not set"
-  if !$ENV{BZ_WRITE_TESTS};
-
-Bugzilla->usage_mode(USAGE_MODE_TEST);
-
-my $test = new Bugzilla::Test::Search(\%switches);
-plan tests => $test->num_tests;
-$test->run();
-
-__END__
-
-=head1 NAME
-
-search.t - Test L<Bugzilla::Search>
-
-=head1 DESCRIPTION
-
-This test tests L<Bugzilla::Search>.
-
-Note that users may be prevented from writing new bugs, products, components,
-etc. to your database while this test is running.
-
-=head1 OPTIONS
-
-=over
-
-=item --long
-
-Run AND and OR tests in addition to normal tests. Specifying
---long without also specifying L</--top-operators> is likely to
-run your system out of memory.
-
-=item --add-custom-fields
-
-This adds every type of custom field to the database, so that they can
-all be tested. Note that this B<CANNOT BE REVERSED>, so do not use this
-switch on a production installation.
-
-=item --operators=a,b,c
-
-Limit the test to testing only the listed operators.
-
-=item --top-operators=a,b,c
-
-Limit the top-level tested operators to the following list. This
-means that for normal tests, only the listed operators will be tested.
-However, for OR and AND tests, all other operators will be tested
-along with the operators you listed.
-
-=item --help
-
-Display this help.
-
-=back
diff --git a/xt/selenium/bug_edit.t b/xt/selenium/bug_edit.t
new file mode 100644
index 0000000000..96e67c061a
--- /dev/null
+++ b/xt/selenium/bug_edit.t
@@ -0,0 +1,498 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Bug Fields" => {"usestatuswhiteboard-on" => undef}});
+
+# Clear the saved search, in case this test didn't complete previously.
+if ($sel->is_text_present("My bugs from QA_Selenium")) {
+  $sel->click_ok("link=My bugs from QA_Selenium");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Bug List: My bugs from QA_Selenium");
+  $sel->click_ok("forget_search");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Search is gone");
+  $sel->is_text_present_ok("OK, the My bugs from QA_Selenium search is gone");
+}
+
+# Just in case the test failed before completion previously, reset the CANEDIT bit.
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Master");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Group: Master");
+my $group_url = $sel->get_location();
+$group_url =~ /group=(\d+)$/;
+my $master_gid = $1;
+
+clear_canedit_on_testproduct($sel, $master_gid);
+logout($sel);
+
+# First create a bug.
+
+log_in($sel, $config, 'QA_Selenium_TEST');
+file_bug_in_product($sel, 'TestProduct');
+my $bug_summary = "Test bug editing";
+$sel->select_ok("bug_severity", "label=critical");
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "ploc");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# Now edit field values of the bug you just filed.
+
+$sel->select_ok("rep_platform", "label=Other");
+$sel->select_ok("op_sys",       "label=Other");
+$sel->select_ok("priority",     "label=Highest");
+$sel->select_ok("bug_severity", "label=blocker");
+$sel->type_ok("bug_file_loc",      "foo.cgi?action=bar");
+$sel->type_ok("status_whiteboard", "[Selenium was here]");
+$sel->type_ok("comment",           "new comment from me :)");
+$sel->select_ok("bug_status", "label=RESOLVED");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# Now move the bug into another product, which has a mandatory group.
+
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->select_ok("product", "label=QA-Selenium-TEST");
+$sel->type_ok("comment", "moving to QA-Selenium-TEST");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Verify New Product Details...");
+$sel->select_ok("component", "label=QA-Selenium-TEST");
+$sel->is_element_present_ok(
+  '//input[@type="checkbox" and @name="groups" and @value="QA-Selenium-TEST"]');
+ok(
+  !$sel->is_editable(
+    '//input[@type="checkbox" and @name="groups" and @value="QA-Selenium-TEST"]'),
+  "QA-Selenium-TEST group not editable"
+);
+$sel->is_checked_ok(
+  '//input[@type="checkbox" and @name="groups" and @value="QA-Selenium-TEST"]');
+edit_bug_and_return($sel, $bug1_id, $bug_summary, {id => "change_product"});
+$sel->select_ok("bug_severity", "label=normal");
+$sel->select_ok("priority",     "label=High");
+$sel->select_ok("rep_platform", "label=All");
+$sel->select_ok("op_sys",       "label=All");
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc",   $config->{admin_user_login});
+$sel->type_ok("comment", "Unchecking the reporter_accessible checkbox");
+
+# This checkbox is checked by default.
+$sel->click_ok("reporter_accessible");
+$sel->select_ok("bug_status", "label=VERIFIED");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->type_ok("comment",
+  "I am the reporter, but I can see the bug anyway as I belong to the mandatory group"
+);
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# The admin is not in the mandatory group, but he has been CC'ed,
+# so he can view and edit the bug (as he has editbugs privs by inheritance).
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+$sel->select_ok("bug_severity", "label=blocker");
+$sel->select_ok("priority",     "label=Highest");
+$sel->type_ok("status_whiteboard", "[Selenium was here][admin too]");
+$sel->select_ok("bug_status", "label=CONFIRMED");
+$sel->click_ok("bz_assignee_edit_action");
+$sel->type_ok("assigned_to", $config->{admin_user_login});
+$sel->type_ok("comment",     "I have editbugs privs. Taking!");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", $config->{unprivileged_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# The powerless user can see the restricted bug, as he has been CC'ed.
+
+log_in($sel, $config, 'unprivileged');
+go_to_bug($sel, $bug1_id);
+$sel->is_text_present_ok("I have editbugs privs. Taking!");
+logout($sel);
+
+# Now turn off cclist_accessible, which will prevent
+# the powerless user to see the bug again.
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("cclist_accessible");
+$sel->type_ok("comment",
+  "I am allowed to turn off cclist_accessible despite not being in the mandatory group"
+);
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# The powerless user cannot see the restricted bug anymore.
+
+log_in($sel, $config, 'unprivileged');
+$sel->type_ok("quicksearch_top", $bug1_id);
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug Access Denied");
+$sel->is_text_present_ok("You are not authorized to access bug #$bug1_id");
+logout($sel);
+
+# Move the bug back to TestProduct, which has no group restrictions.
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+$sel->select_ok("product", "label=TestProduct");
+
+# When selecting a new product, Bugzilla tries to reassign the bug by default,
+# so we have to uncheck it.
+$sel->click_ok("set_default_assignee");
+$sel->uncheck_ok("set_default_assignee");
+$sel->type_ok("comment", "-> Moving back to Testproduct.");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Verify New Product Details...");
+$sel->select_ok("component", "label=TestComponent");
+$sel->is_text_present_ok(
+  "These groups are not legal for the 'TestProduct' product or you are not allowed to restrict bugs to these groups"
+);
+$sel->is_element_present_ok(
+  '//input[@type="checkbox" and @name="groups" and @value="QA-Selenium-TEST"]');
+ok(
+  !$sel->is_editable(
+    '//input[@type="checkbox" and @name="groups" and @value="QA-Selenium-TEST"]'),
+  "QA-Selenium-TEST group not editable"
+);
+ok(
+  !$sel->is_checked(
+    '//input[@type="checkbox" and @name="groups" and @value="QA-Selenium-TEST"]'),
+  "QA-Selenium-TEST group not selected"
+);
+$sel->is_element_present_ok(
+  '//input[@type="checkbox" and @name="groups" and @value="Master"]');
+$sel->is_editable_ok(
+  '//input[@type="checkbox" and @name="groups" and @value="Master"]');
+ok(
+  !$sel->is_checked(
+    '//input[@type="checkbox" and @name="groups" and @value="Master"]'),
+  "Master group not selected by default"
+);
+edit_bug($sel, $bug1_id, $bug_summary, {id => "change_product"});
+logout($sel);
+
+# The unprivileged user can view the bug again, but cannot
+# edit it, except adding comments.
+
+log_in($sel, $config, 'unprivileged');
+go_to_bug($sel, $bug1_id);
+$sel->type_ok("comment",
+  "I have no privs, I can only comment (and remove people from the CC list)");
+ok(!$sel->is_element_present('//select[@name="product"]'),
+  "Product field not editable");
+ok(!$sel->is_element_present('//select[@name="bug_severity"]'),
+  "Severity field not editable");
+ok(!$sel->is_element_present('//select[@name="priority"]'),
+  "Priority field not editable");
+ok(!$sel->is_element_present('//select[@name="op_sys"]'),
+  "OS field not editable");
+ok(!$sel->is_element_present('//select[@name="rep_platform"]'),
+  "Hardware field not editable");
+$sel->click_ok("cc_edit_area_showhide");
+$sel->add_selection_ok("cc", "label=" . $config->{admin_user_login});
+$sel->click_ok("removecc");
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# Now let's test the CANEDIT bit.
+
+log_in($sel, $config, 'admin');
+edit_product($sel, "TestProduct");
+$sel->click_ok("link=Edit Group Access Controls:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Group Controls for TestProduct");
+$sel->check_ok("canedit_$master_gid");
+$sel->click_ok("submit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Update group access controls for TestProduct");
+
+# The user is in the master group, so he can comment.
+
+go_to_bug($sel, $bug1_id);
+$sel->type_ok("comment", "Do nothing except adding a comment...");
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# This user is not in the master group, so he cannot comment.
+
+log_in($sel, $config, 'QA_Selenium_TEST');
+go_to_bug($sel, $bug1_id);
+$sel->type_ok("comment", "Just a comment too...");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Product Edit Access Denied");
+$sel->is_text_present_ok(
+  "You are not permitted to edit bugs in product TestProduct.");
+logout($sel);
+
+# Test searches and "format for printing".
+
+log_in($sel, $config, 'admin');
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product", "TestProduct");
+$sel->remove_all_selections_ok("bug_status");
+$sel->remove_all_selections_ok("resolution");
+$sel->check_ok("emailassigned_to1");
+$sel->select_ok("emailtype1", "label=is");
+$sel->type_ok("email1", $config->{admin_user_login});
+$sel->check_ok("emailassigned_to2");
+$sel->check_ok("emailqa_contact2");
+$sel->check_ok("emailcc2");
+$sel->select_ok("emailtype2", "label=is");
+$sel->type_ok("email2", $config->{QA_Selenium_TEST_user_login});
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+
+$sel->is_text_present_ok("One bug found.");
+$sel->type_ok("save_newqueryname", "My bugs from QA_Selenium");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+$sel->is_text_present_ok(
+  "OK, you have a new search named My bugs from QA_Selenium.");
+$sel->click_ok("link=My bugs from QA_Selenium");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: My bugs from QA_Selenium");
+$sel->click_ok("long_format");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Full Text Bug Listing");
+$sel->is_text_present_ok("Bug $bug1_id");
+$sel->is_text_present_ok("Status: CONFIRMED");
+$sel->is_text_present_ok(
+  "Reporter: QA-Selenium-TEST ($config->{QA_Selenium_TEST_user_login})");
+$sel->is_text_present_ok("Assignee: admin ($config->{admin_user_login})");
+$sel->is_text_present_ok("Severity: blocker");
+$sel->is_text_present_ok("Priority: Highest");
+$sel->is_text_present_ok("I have no privs, I can only comment");
+logout($sel);
+
+# Let's create a 2nd bug by this user so that we can test mass-change
+# using the saved search the admin just created.
+
+log_in($sel, $config, 'QA_Selenium_TEST');
+file_bug_in_product($sel, 'TestProduct');
+my $bug_summary2 = "New bug from me";
+$sel->select_ok("bug_severity", "label=blocker");
+$sel->type_ok("short_desc", $bug_summary2);
+
+# We turned on the CANEDIT bit for TestProduct.
+$sel->type_ok("comment", "I can enter a new bug, but not edit it, right?");
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+# Clicking the "Back" button and resubmitting the form again should trigger a warning.
+
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Enter Bug: TestProduct");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Suspicious Action");
+$sel->is_text_present_ok(
+  "no valid token for the create_bug action while processing the 'post_bug.cgi' script"
+);
+$sel->click_ok("confirm");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/\d+ \S $bug_summary2/, "Bug created");
+$sel->type_ok("comment", "New comment not allowed");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Product Edit Access Denied");
+$sel->is_text_present_ok(
+  "You are not permitted to edit bugs in product TestProduct.");
+logout($sel);
+
+# Reassign the newly created bug to the admin.
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug2_id);
+$sel->click_ok("bz_assignee_edit_action");
+$sel->type_ok("assigned_to", $config->{admin_user_login});
+$sel->type_ok("comment",     "Taking!");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+# Test mass-change.
+
+$sel->click_ok("link=My bugs from QA_Selenium");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: My bugs from QA_Selenium");
+$sel->is_text_present_ok("2 bugs found");
+$sel->click_ok("mass_change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->click_ok("check_all");
+$sel->type_ok("comment", 'Mass change"');
+$sel->select_ok("bug_status", "label=RESOLVED");
+$sel->select_ok("resolution", "label=WORKSFORME");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugs processed");
+
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/$bug1_id /);
+$sel->selected_label_is("resolution", "WORKSFORME");
+$sel->select_ok("resolution", "label=INVALID");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->selected_label_is("resolution", "INVALID");
+
+$sel->click_ok("link=History");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Changes made to bug $bug1_id");
+$sel->is_text_present_ok("URL foo.cgi?action=bar");
+$sel->is_text_present_ok("Severity critical blocker");
+$sel->is_text_present_ok(
+  "Whiteboard [Selenium was here] [Selenium was here][admin too]");
+$sel->is_text_present_ok("Product QA-Selenium-TEST TestProduct");
+$sel->is_text_present_ok("Status CONFIRMED RESOLVED");
+
+# Last step: move bugs to another DB, if the extension is enabled.
+
+if ($config->{test_extensions}) {
+  set_parameters(
+    $sel,
+    {
+      "Bug Moving" => {
+        "move-to-url"     => {type => "text", value => 'http://www.foo.com/'},
+        "move-to-address" => {type => "text", value => 'import@foo.com'},
+        "movers"          => {type => "text", value => $config->{admin_user_login}}
+      }
+    }
+  );
+
+  $sel->click_ok("link=My bugs from QA_Selenium");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Bug List: My bugs from QA_Selenium");
+  $sel->is_text_present_ok("2 bugs found");
+  $sel->click_ok("mass_change");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Bug List");
+  $sel->click_ok("check_all");
+  $sel->type_ok("comment", "-> moved");
+  $sel->click_ok('oldbugmove');
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Bugs processed");
+  $sel->is_text_present_ok("Changes submitted for bug $bug1_id");
+  $sel->is_text_present_ok("Changes submitted for bug $bug2_id");
+  $sel->click_ok("link=$bug2_id");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_like(qr/^$bug2_id/);
+  $sel->selected_label_is("resolution", "MOVED");
+  $sel->is_text_present_ok("Bug moved to http://www.foo.com/.");
+
+  # Disable bug moving again.
+  set_parameters($sel,
+    {"Bug Moving" => {"movers" => {type => "text", value => ""}}});
+}
+
+# Make sure token checks are working correctly for single bug editing and mass change,
+# first with no token, then with an invalid token.
+
+foreach my $params (["no_token_single_bug", ""],
+  ["invalid_token_single_bug", "&token=1"])
+{
+  my ($comment, $token) = @$params;
+  $sel->open_ok(
+    "/$config->{bugzilla_installation}/process_bug.cgi?id=$bug1_id&comment=$comment$token",
+    undef, "Edit a single bug with " . ($token ? "an invalid" : "no") . " token"
+  );
+  $sel->title_is("Suspicious Action");
+  $sel->is_text_present_ok($token ? "an invalid token" : "web browser directly");
+  edit_bug_and_return($sel, $bug1_id, $bug_summary, {id => "confirm"});
+  $sel->is_text_present_ok($comment);
+}
+
+foreach my $params (["no_token_mass_change", ""],
+  ["invalid_token_mass_change", "&token=1"])
+{
+  my ($comment, $token) = @$params;
+  $sel->open_ok(
+    "/$config->{bugzilla_installation}/process_bug.cgi?id_$bug1_id=1&id_$bug2_id=1&comment=$comment$token",
+    undef, "Mass change with " . ($token ? "an invalid" : "no") . " token"
+  );
+  $sel->title_is("Suspicious Action");
+  $sel->is_text_present_ok("no valid token for the buglist_mass_change action");
+  $sel->click_ok("confirm");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Bugs processed");
+  foreach my $bug_id ($bug1_id, $bug2_id) {
+    $sel->click_ok("link=$bug_id");
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_like(qr/^$bug_id /);
+    $sel->is_text_present_ok($comment);
+    next if $bug_id == $bug2_id;
+    $sel->go_back_ok();
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is("Bugs processed");
+  }
+}
+
+# Now move these bugs out of our radar.
+
+$sel->click_ok("link=My bugs from QA_Selenium");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: My bugs from QA_Selenium");
+$sel->is_text_present_ok("2 bugs found");
+$sel->click_ok("mass_change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->click_ok("check_all");
+$sel->type_ok("comment",     "Reassigning to the reporter");
+$sel->type_ok("assigned_to", $config->{QA_Selenium_TEST_user_login});
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugs processed");
+
+# Now delete the saved search.
+
+$sel->click_ok("link=My bugs from QA_Selenium");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: My bugs from QA_Selenium");
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search is gone");
+$sel->is_text_present_ok("OK, the My bugs from QA_Selenium search is gone");
+
+# Reset the CANEDIT bit. We want it to be turned off by default.
+clear_canedit_on_testproduct($sel, $master_gid);
+logout($sel);
+
+sub clear_canedit_on_testproduct {
+  my ($sel, $master_gid) = @_;
+
+  edit_product($sel, "TestProduct");
+  $sel->click_ok("link=Edit Group Access Controls:");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Edit Group Controls for TestProduct");
+  $sel->uncheck_ok("canedit_$master_gid");
+  $sel->click_ok("submit");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Update group access controls for TestProduct");
+}
diff --git a/xt/selenium/choose_priority.t b/xt/selenium/choose_priority.t
new file mode 100644
index 0000000000..354d771c9b
--- /dev/null
+++ b/xt/selenium/choose_priority.t
@@ -0,0 +1,33 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters($sel,
+  {"Bug Change Policies" => {"letsubmitterchoosepriority-off" => undef}});
+file_bug_in_product($sel, "TestProduct");
+ok(!$sel->is_text_present("Priority"), "The Priority label is not present");
+ok(!$sel->is_element_present("//select[\@name='priority']"),
+  "The Priority drop-down menu is not present");
+set_parameters($sel,
+  {"Bug Change Policies" => {"letsubmitterchoosepriority-on" => undef}});
+file_bug_in_product($sel, "TestProduct");
+$sel->is_text_present_ok("Priority");
+$sel->is_element_present_ok("//select[\@name='priority']");
+logout($sel);
diff --git a/xt/selenium/classifications.t b/xt/selenium/classifications.t
new file mode 100644
index 0000000000..69d7c73b6c
--- /dev/null
+++ b/xt/selenium/classifications.t
@@ -0,0 +1,151 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Enable classifications
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Bug Fields" => {"useclassification-on" => undef}});
+
+# Create a new classification.
+
+go_to_admin($sel);
+$sel->click_ok("link=Classifications");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select classification");
+
+# Delete old classifications if this script failed.
+# Accessing action=delete directly must 1) trigger the security check page,
+# and 2) automatically reclassify products in this classification.
+if ($sel->is_text_present("cone")) {
+  $sel->open_ok(
+    "/$config->{bugzilla_installation}/editclassifications.cgi?action=delete&amp;classification=cone"
+  );
+  $sel->title_is("Suspicious Action");
+  $sel->click_ok("confirm");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Classification Deleted");
+}
+if ($sel->is_text_present("ctwo")) {
+  $sel->open_ok(
+    "/$config->{bugzilla_installation}/editclassifications.cgi?action=delete&amp;classification=ctwo"
+  );
+  $sel->title_is("Suspicious Action");
+  $sel->click_ok("confirm");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Classification Deleted");
+}
+
+$sel->click_ok("link=Add a new classification");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add new classification");
+$sel->type_ok("classification", "cone");
+$sel->type_ok("description",    "Classification number 1");
+$sel->click_ok('//input[@type="submit" and @value="Add"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Classification Created");
+
+# Add TestProduct to the new classification. There should be no other
+# products in this classification.
+
+$sel->select_ok("prodlist", "value=TestProduct");
+$sel->click_ok("add_products");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Reclassify products");
+my @products = $sel->get_select_options("myprodlist");
+ok(scalar @products == 1 && $products[0] eq 'TestProduct',
+  "TestProduct successfully added to 'cone'");
+
+# Create a new bug in this product/classification.
+
+file_bug_in_product($sel, 'TestProduct', 'cone');
+my $bug_summary = "Bug in classification cone";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment", "Created by Selenium with classifications turned on");
+create_bug($sel, $bug_summary);
+
+# Rename 'cone' to 'Unclassified', which must be rejected as it already exists,
+# then to 'ctwo', which is not yet in use. Should work fine, even with products
+# already in it.
+
+go_to_admin($sel);
+$sel->click_ok("link=Classifications");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select classification");
+$sel->click_ok("link=cone");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit classification");
+$sel->type_ok("classification", "Unclassified");
+$sel->click_ok("//input[\@value='Update']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Classification Already Exists");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit classification");
+$sel->type_ok("classification", "ctwo");
+$sel->click_ok("//input[\@value='Update']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Classification Updated");
+
+# Now try to delete the 'ctwo' classification. It should fail as there are
+# products in it.
+
+go_to_admin($sel);
+$sel->click_ok("link=Classifications");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select classification");
+$sel->click_ok(
+  '//a[@href="editclassifications.cgi?action=del&classification=ctwo"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Error");
+my $error = trim($sel->get_text("error_msg"));
+ok($error =~ /there are products for this classification/,
+  "Reject classification deletion");
+
+# Reclassify the product before deleting the classification.
+
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select classification");
+$sel->click_ok(
+  '//a[@href="editclassifications.cgi?action=reclassify&classification=ctwo"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Reclassify products");
+$sel->add_selection_ok("myprodlist", "label=TestProduct");
+$sel->click_ok("remove_products");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Reclassify products");
+$sel->click_ok("link=edit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select classification");
+$sel->click_ok(
+  '//a[@href="editclassifications.cgi?action=del&classification=ctwo"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete classification");
+$sel->is_text_present_ok("Do you really want to delete this classification?");
+$sel->click_ok("//input[\@value='Yes, delete']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Classification Deleted");
+
+# Disable classifications and make sure you cannot edit them anymore.
+
+set_parameters($sel, {"Bug Fields" => {"useclassification-off" => undef}});
+$sel->open_ok("/$config->{bugzilla_installation}/editclassifications.cgi");
+$sel->title_is("Classification Not Enabled");
+logout($sel);
diff --git a/xt/selenium/config.t b/xt/selenium/config.t
new file mode 100644
index 0000000000..edb7a0f6c4
--- /dev/null
+++ b/xt/selenium/config.t
@@ -0,0 +1,50 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Turn on 'requirelogin' and log out.
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"User Authentication" => {"requirelogin-on" => undef}});
+logout($sel);
+
+# Accessing config.cgi should display no sensitive data.
+
+$sel->open_ok("/$config->{bugzilla_installation}/config.cgi",
+  undef, "Go to config.cgi (JS format)");
+$sel->is_text_present_ok("var status = [ ];");
+$sel->is_text_present_ok("var status_open = [ ];");
+$sel->is_text_present_ok("var status_closed = [ ];");
+$sel->is_text_present_ok("var resolution = [ ];");
+$sel->is_text_present_ok("var keyword = [ ];");
+$sel->is_text_present_ok("var platform = [ ];");
+$sel->is_text_present_ok("var severity = [ ];");
+$sel->is_text_present_ok("var field = [\n];");
+
+ok(!$sel->is_text_present("cf_"),        "No custom field displayed");
+ok(!$sel->is_text_present("component["), "No component displayed");
+ok(!$sel->is_text_present("version["),   "No version displayed");
+ok(!$sel->is_text_present("target_milestone["),
+  "No target milestone displayed");
+
+# Turn on 'requirelogin' and log out.
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"User Authentication" => {"requirelogin-off" => undef}});
+logout($sel);
diff --git a/xt/selenium/create_user_accounts.t b/xt/selenium/create_user_accounts.t
new file mode 100644
index 0000000000..76c395652b
--- /dev/null
+++ b/xt/selenium/create_user_accounts.t
@@ -0,0 +1,176 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Set the email regexp for new bugzilla accounts to end with @bugzilla.test.
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "User Authentication" =>
+      {"createemailregexp" => {type => "text", value => '[^@]+@bugzilla\.test$'}}
+  }
+);
+logout($sel);
+
+# Create a valid account. We need to randomize the login address, because a request
+# expires after 3 days only and this test can be executed several times per day.
+my $valid_account = 'selenium-' . random_string(10) . '@bugzilla.test';
+
+$sel->click_ok("link=Home");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugzilla Main Page");
+$sel->is_text_present_ok("Open a New Account");
+$sel->click_ok("link=Open a New Account");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create a new Bugzilla account");
+$sel->type_ok("email", $valid_account);
+$sel->click_ok("send");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Request for new user account '$valid_account' submitted");
+$sel->is_text_present_ok("A confirmation email has been sent");
+
+# Try creating the same account again. It's too soon.
+$sel->click_ok("link=Home");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugzilla Main Page");
+$sel->is_text_present_ok("Open a New Account");
+$sel->click_ok("link=Open a New Account");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create a new Bugzilla account");
+$sel->type_ok("email", $valid_account);
+$sel->click_ok("send");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Too Soon For New Token");
+my $error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /Please wait 10 minutes/, "Too soon for this account");
+
+# These accounts do not pass the regexp.
+my @accounts
+  = ('test@yahoo.com', 'test@bugzilla.net', 'test@bugzilla.test.com');
+foreach my $account (@accounts) {
+  $sel->click_ok("link=New Account");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Create a new Bugzilla account");
+  $sel->type_ok("email", $account);
+  $sel->click_ok("send");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Account Creation Restricted");
+  $sel->is_text_present_ok("User account creation has been restricted.");
+}
+
+# These accounts are illegal.
+@accounts = (
+  'test\bugzilla@bugzilla.test', 'test@bugzilla.org@bugzilla.test',
+  'test@bugzilla..test'
+);
+
+# Logins larger than 127 characters must be rejected, for security reasons.
+push @accounts, 'selenium-' . random_string(110) . '@bugzilla.test';
+
+foreach my $account (@accounts) {
+  $sel->click_ok("link=New Account");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Create a new Bugzilla account");
+
+  # Starting with 5.0, the login field is a type=email and is marked "required"
+  # This means that we need to add the novalidate attribute to the enclosing form
+  # so that the illegal login can still be checked by the backend code.
+  my $script = q{
+        document.getElementById('account_creation_form').setAttribute('novalidate', 1);
+    };
+  $sel->run_script($script);
+  $sel->type_ok("email", $account);
+  $sel->click_ok("send");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Invalid Email Address");
+  my $error_msg = trim($sel->get_text("error_msg"));
+  ok(
+    $error_msg
+      =~ /^The e-mail address you entered (\S+) didn't pass our syntax checking/,
+    "Invalid email address detected"
+  );
+}
+
+# This account already exists.
+$sel->click_ok("link=New Account");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create a new Bugzilla account");
+$sel->type_ok("email", $config->{admin_user_login});
+$sel->click_ok("send");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Account Already Exists");
+$error_msg = trim($sel->get_text("error_msg"));
+ok(
+  $error_msg eq
+    "There is already an account with the email address $config->{admin_user_login}.",
+  "Account already exists"
+);
+
+# Turn off user account creation.
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "User Authentication" => {"createemailregexp" => {type => "text", value => ''}}
+  }
+);
+logout($sel);
+
+# Make sure that links pointing to createaccount.cgi are all deactivated.
+ok(!$sel->is_text_present("New Account"), "No link named 'New Account'");
+$sel->click_ok("link=Home");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugzilla Main Page");
+ok(
+  !$sel->is_text_present("Open a New Account"),
+  "No link named 'Open a New Account'"
+);
+$sel->open_ok("/$config->{bugzilla_installation}/createaccount.cgi");
+$sel->title_is("Account Creation Disabled");
+$error_msg = trim($sel->get_text("error_msg"));
+ok(
+  $error_msg
+    =~ /^User account creation has been disabled. New accounts must be created by an administrator/,
+  "User account creation disabled"
+);
+
+# Re-enable user account creation.
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "User Authentication" =>
+      {"createemailregexp" => {type => "text", value => '.*'}}
+  }
+);
+
+# Make sure selenium-<random_string>@bugzilla.test has not be added to the DB yet.
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search users");
+$sel->type_ok("matchstr", $valid_account);
+$sel->click_ok("search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select user");
+$sel->is_text_present_ok("0 users found");
+logout($sel);
diff --git a/xt/selenium/custom_fields.t b/xt/selenium/custom_fields.t
new file mode 100644
index 0000000000..7fb5ceda47
--- /dev/null
+++ b/xt/selenium/custom_fields.t
@@ -0,0 +1,510 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+log_in($sel, $config, 'admin');
+
+# Create new bug to test custom fields
+
+file_bug_in_product($sel, 'TestProduct');
+my $bug_summary = "What's your ID?";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",
+  "Use the ID of this bug to generate a unique custom field name.");
+$sel->type_ok("bug_severity", "label=normal");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# Create custom fields
+
+go_to_admin($sel);
+$sel->click_ok("link=Custom Fields");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Fields");
+$sel->click_ok("link=Add a new custom field");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add a new Custom Field");
+$sel->type_ok("name", "cf_qa_freetext_$bug1_id");
+$sel->type_ok("desc", "Freetext$bug1_id");
+$sel->select_ok("type", "label=Free Text");
+$sel->type_ok("sortkey", $bug1_id);
+
+# These values are off by default.
+$sel->value_is("enter_bug", "off");
+$sel->value_is("obsolete",  "off");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Created");
+$sel->is_text_present_ok(
+  "The new custom field 'cf_qa_freetext_$bug1_id' has been successfully created."
+);
+
+$sel->click_ok("link=Add a new custom field");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add a new Custom Field");
+$sel->type_ok("name", "cf_qa_list_$bug1_id");
+$sel->type_ok("desc", "List$bug1_id");
+$sel->select_ok("type", "label=Drop Down");
+$sel->type_ok("sortkey", $bug1_id);
+$sel->click_ok("enter_bug");
+$sel->value_is("enter_bug", "on");
+sleep(3);
+$sel->click_ok("new_bugmail");
+$sel->value_is("new_bugmail", "on");
+$sel->value_is("obsolete",    "off");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Created");
+$sel->is_text_present_ok(
+  "The new custom field 'cf_qa_list_$bug1_id' has been successfully created.");
+
+$sel->click_ok("link=Add a new custom field");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add a new Custom Field");
+$sel->type_ok("name", "cf_qa_bugid_$bug1_id");
+$sel->type_ok("desc", "Reference$bug1_id");
+$sel->select_ok("type", "label=Bug ID");
+$sel->type_ok("sortkey",      $bug1_id);
+$sel->type_ok("reverse_desc", "IsRef$bug1_id");
+$sel->click_ok("enter_bug");
+$sel->value_is("enter_bug", "on");
+$sel->value_is("obsolete",  "off");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Created");
+$sel->is_text_present_ok(
+  "The new custom field 'cf_qa_bugid_$bug1_id' has been successfully created.");
+
+# Add values to the custom fields.
+
+$sel->click_ok("link=cf_qa_list_$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit the Custom Field 'cf_qa_list_$bug1_id' (List$bug1_id)");
+$sel->click_ok("link=Edit legal values for this field");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Select value for the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Value for the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->type_ok("value",   "have fun?");
+$sel->type_ok("sortkey", "805");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Field Value Created");
+$sel->is_text_present_ok(
+  "The value have fun? has been added as a valid choice for the List$bug1_id (cf_qa_list_$bug1_id) field."
+);
+
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Value for the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->type_ok("value",   "storage");
+$sel->type_ok("sortkey", "49");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Field Value Created");
+$sel->is_text_present_ok(
+  "The value storage has been added as a valid choice for the List$bug1_id (cf_qa_list_$bug1_id) field."
+);
+
+# Also create a new bug status and a new resolution.
+
+go_to_admin($sel);
+$sel->click_ok("link=Field Values");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit values for which field?");
+$sel->click_ok("link=Resolution");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select value for the 'Resolution' (resolution) field");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Value for the 'Resolution' (resolution) field");
+$sel->type_ok("value",   "UPSTREAM");
+$sel->type_ok("sortkey", 450);
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Field Value Created");
+
+go_to_admin($sel);
+$sel->click_ok("link=Field Values");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit values for which field?");
+$sel->click_ok("link=Status");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select value for the 'Status' (bug_status) field");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Value for the 'Status' (bug_status) field");
+$sel->type_ok("value",   "SUSPENDED");
+$sel->type_ok("sortkey", 250);
+$sel->click_ok("open_status");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Field Value Created");
+
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Value for the 'Status' (bug_status) field");
+$sel->type_ok("value",   "IN_QA");
+$sel->type_ok("sortkey", 550);
+$sel->click_ok("closed_status");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Field Value Created");
+
+$sel->click_ok("link=status workflow page");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Workflow");
+$sel->click_ok(
+  '//td[@title="From UNCONFIRMED to SUSPENDED"]//input[@type="checkbox"]');
+$sel->click_ok(
+  '//td[@title="From CONFIRMED to SUSPENDED"]//input[@type="checkbox"]');
+$sel->click_ok(
+  '//td[@title="From SUSPENDED to CONFIRMED"]//input[@type="checkbox"]');
+$sel->click_ok(
+  '//td[@title="From SUSPENDED to IN_PROGRESS"]//input[@type="checkbox"]');
+$sel->click_ok(
+  '//td[@title="From RESOLVED to IN_QA"]//input[@type="checkbox"]');
+$sel->click_ok(
+  '//td[@title="From IN_QA to VERIFIED"]//input[@type="checkbox"]');
+$sel->click_ok(
+  '//td[@title="From IN_QA to CONFIRMED"]//input[@type="checkbox"]');
+$sel->click_ok('//input[@value="Commit Changes"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Workflow");
+
+# Create new bug to test custom fields in bug creation page
+
+file_bug_in_product($sel, 'TestProduct');
+$sel->is_text_present_ok("List$bug1_id:");
+$sel->is_element_present_ok("cf_qa_list_$bug1_id");
+$sel->is_text_present_ok("Reference$bug1_id:");
+$sel->is_element_present_ok("cf_qa_bugid_$bug1_id");
+ok(
+  !$sel->is_text_present("Freetext$bug1_id:"),
+  "Freetext$bug1_id is not displayed"
+);
+ok(
+  !$sel->is_element_present("cf_qa_freetext_$bug1_id"),
+  "cf_qa_freetext_$bug1_id is not available"
+);
+my $bug_summary2 = "Et de un";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->select_ok("bug_severity", "critical");
+$sel->type_ok("cf_qa_bugid_$bug1_id", $bug1_id);
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+# Both fields are editable.
+
+$sel->type_ok("cf_qa_freetext_$bug1_id", "bonsai");
+$sel->selected_label_is("cf_qa_list_$bug1_id", "---");
+$sel->select_ok("bug_status", "label=SUSPENDED");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+go_to_bug($sel, $bug1_id);
+$sel->type_ok("cf_qa_freetext_$bug1_id", "dumbo");
+$sel->select_ok("cf_qa_list_$bug1_id", "label=storage");
+$sel->is_text_present_ok("IsRef$bug1_id: $bug2_id");
+$sel->select_ok("bug_status", "RESOLVED");
+$sel->select_ok("resolution", "UPSTREAM");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->select_ok("bug_status", "IN_QA");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+$sel->click_ok("link=Format For Printing");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Full Text Bug Listing");
+$sel->is_text_present_ok("Freetext$bug1_id: dumbo");
+$sel->is_text_present_ok("List$bug1_id: storage");
+$sel->is_text_present_ok("Status: IN_QA UPSTREAM");
+go_to_bug($sel, $bug2_id);
+$sel->select_ok("cf_qa_list_$bug1_id", "label=storage");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+# Test searching for bugs using the custom fields
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product", "TestProduct");
+$sel->remove_all_selections("bug_status");
+$sel->remove_all_selections("resolution");
+$sel->select_ok("f1", "label=List$bug1_id");
+$sel->select_ok("o1", "label=is equal to");
+$sel->type_ok("v1", "storage");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("2 bugs found");
+$sel->is_text_present_ok("What's your ID?");
+$sel->is_text_present_ok("Et de un");
+
+# Now edit custom fields in mass changes.
+
+$sel->click_ok("mass_change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->click_ok("check_all");
+$sel->select_ok("cf_qa_list_$bug1_id", "label=---");
+$sel->type_ok("cf_qa_freetext_$bug1_id", "thanks");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugs processed");
+$sel->click_ok("link=$bug2_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug2_id/);
+$sel->value_is("cf_qa_freetext_$bug1_id", "thanks");
+$sel->selected_label_is("cf_qa_list_$bug1_id", "---");
+$sel->select_ok("cf_qa_list_$bug1_id", "label=storage");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+# Let's now test custom field visibility.
+
+go_to_admin($sel);
+$sel->click_ok("link=Custom Fields");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Fields");
+$sel->click_ok("link=cf_qa_list_$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit the Custom Field 'cf_qa_list_$bug1_id' (List$bug1_id)");
+$sel->select_ok("visibility_field_id", "label=Severity (bug_severity)");
+$sel->add_selection_ok("visibility_values", "label=blocker");
+$sel->add_selection_ok("visibility_values", "label=critical");
+$sel->click_ok("edit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Updated");
+
+go_to_bug($sel, $bug1_id);
+$sel->is_element_present_ok("cf_qa_list_$bug1_id",
+  "List$bug1_id is in the DOM of the page...");
+ok(!$sel->is_visible("cf_qa_list_$bug1_id"),
+  "... but is not displayed with severity = 'normal'");
+$sel->select_ok("bug_severity", "major");
+ok(!$sel->is_visible("cf_qa_list_$bug1_id"), "... nor with severity = 'major'");
+$sel->select_ok("bug_severity", "critical");
+$sel->is_visible_ok("cf_qa_list_$bug1_id",
+  "... but is visible with severity = 'critical'");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->is_visible_ok("cf_qa_list_$bug1_id");
+
+go_to_bug($sel, $bug2_id);
+$sel->is_visible_ok("cf_qa_list_$bug1_id");
+$sel->select_ok("bug_severity", "minor");
+ok(!$sel->is_visible("cf_qa_list_$bug1_id"),
+  "List$bug1_id is not displayed with severity = 'minor'");
+edit_bug_and_return($sel, $bug2_id, $bug_summary2);
+ok(!$sel->is_visible("cf_qa_list_$bug1_id"),
+  "List$bug1_id is not displayed with severity = 'minor'");
+
+# Add a new value which is only listed under some condition.
+
+go_to_admin($sel);
+$sel->click_ok("link=Custom Fields");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Fields");
+$sel->click_ok("link=cf_qa_list_$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit the Custom Field 'cf_qa_list_$bug1_id' (List$bug1_id)");
+$sel->select_ok("value_field_id", "label=Resolution (resolution)");
+$sel->click_ok("edit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Updated");
+$sel->click_ok("link=cf_qa_list_$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit the Custom Field 'cf_qa_list_$bug1_id' (List$bug1_id)");
+$sel->click_ok("link=Edit legal values for this field");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Select value for the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Value for the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->type_ok("value",   "ghost");
+$sel->type_ok("sortkey", "500");
+$sel->select_ok("visibility_value_id", "label=FIXED");
+$sel->click_ok("id=create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Field Value Created");
+
+go_to_bug($sel, $bug1_id);
+my @labels = $sel->get_select_options("cf_qa_list_$bug1_id");
+ok(grep(/^ghost$/, @labels), "ghost is in the DOM of the page...");
+my $disabled = $sel->get_attribute("v4_cf_qa_list_$bug1_id\@disabled");
+ok($disabled, "... but is not available for selection by default");
+$sel->select_ok("bug_status",          "label=RESOLVED");
+$sel->select_ok("resolution",          "label=FIXED");
+$sel->select_ok("cf_qa_list_$bug1_id", "label=ghost");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->selected_label_is("cf_qa_list_$bug1_id", "ghost");
+
+# Delete an unused field value.
+
+go_to_admin($sel);
+$sel->click_ok("link=Field Values");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit values for which field?");
+$sel->click_ok("link=List$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Select value for the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->click_ok(
+  "//a[contains(\@href, 'editvalues.cgi?action=del&field=cf_qa_list_$bug1_id&value=have%20fun%3F')]"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Delete Value 'have fun?' from the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->is_text_present_ok("Do you really want to delete this value?");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Field Value Deleted");
+
+# This value cannot be deleted as it's in use.
+
+$sel->click_ok(
+  "//a[contains(\@href, 'editvalues.cgi?action=del&field=cf_qa_list_$bug1_id&value=storage')]"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Delete Value 'storage' from the 'List$bug1_id' (cf_qa_list_$bug1_id) field");
+$sel->is_text_present_ok("There is 1 bug with this field value");
+
+# Mark the <select> field as obsolete, making it unavailable in bug reports.
+
+go_to_admin($sel);
+$sel->click_ok("link=Custom Fields");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Fields");
+$sel->click_ok("link=cf_qa_list_$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit the Custom Field 'cf_qa_list_$bug1_id' (List$bug1_id)");
+$sel->click_ok("obsolete");
+$sel->value_is("obsolete", "on");
+$sel->click_ok("edit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Updated");
+go_to_bug($sel, $bug1_id);
+$sel->value_is("cf_qa_freetext_$bug1_id", "thanks");
+ok(!$sel->is_element_present("cf_qa_list_$bug1_id"),
+  "The custom list is not visible");
+
+# Custom fields are also viewable by logged out users.
+
+logout($sel);
+go_to_bug($sel, $bug1_id);
+$sel->is_text_present_ok("Freetext$bug1_id: thanks");
+
+# Powerless users should still be able to CC themselves when
+# custom fields are in use.
+
+log_in($sel, $config, 'unprivileged');
+go_to_bug($sel, $bug1_id);
+$sel->is_text_present_ok("Freetext$bug1_id: thanks");
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", $config->{unprivileged_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# Disable the remaining free text field.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Custom Fields");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Fields");
+$sel->click_ok("link=cf_qa_freetext_$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Edit the Custom Field 'cf_qa_freetext_$bug1_id' (Freetext$bug1_id)");
+$sel->click_ok("obsolete");
+$sel->value_is("obsolete", "on");
+$sel->click_ok("edit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Field Updated");
+
+# Trying to delete a bug status which is in use is forbidden.
+
+go_to_admin($sel);
+$sel->click_ok("link=Field Values");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit values for which field?");
+$sel->click_ok("link=Status");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select value for the 'Status' (bug_status) field");
+$sel->click_ok(
+  '//a[@href="editvalues.cgi?action=del&field=bug_status&value=SUSPENDED"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Value 'SUSPENDED' from the 'Status' (bug_status) field");
+$sel->is_text_present_ok("Sorry, but the 'SUSPENDED' value cannot be deleted");
+
+go_to_bug($sel, $bug2_id);
+$sel->select_ok("bug_status", "CONFIRMED");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+go_to_bug($sel, $bug1_id);
+$sel->select_ok("bug_status", "VERIFIED");
+$sel->select_ok("resolution", "INVALID");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# Unused values can be deleted.
+
+go_to_admin($sel);
+$sel->click_ok("link=Field Values");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit values for which field?");
+$sel->click_ok("link=Status");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select value for the 'Status' (bug_status) field");
+$sel->click_ok(
+  '//a[@href="editvalues.cgi?action=del&field=bug_status&value=SUSPENDED"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Value 'SUSPENDED' from the 'Status' (bug_status) field");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Field Value Deleted");
+$sel->is_text_present_ok(
+  "The value SUSPENDED of the Status (bug_status) field has been deleted");
+
+$sel->click_ok(
+  '//a[@href="editvalues.cgi?action=del&field=bug_status&value=IN_QA"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Value 'IN_QA' from the 'Status' (bug_status) field");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Field Value Deleted");
+$sel->is_text_present_ok(
+  "The value IN_QA of the Status (bug_status) field has been deleted");
+
+go_to_admin($sel);
+$sel->click_ok("link=Field Values");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit values for which field?");
+$sel->click_ok("link=Resolution");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select value for the 'Resolution' (resolution) field");
+$sel->click_ok(
+  '//a[@href="editvalues.cgi?action=del&field=resolution&value=UPSTREAM"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Delete Value 'UPSTREAM' from the 'Resolution' (resolution) field");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Field Value Deleted");
+$sel->is_text_present_ok(
+  "The value UPSTREAM of the Resolution (resolution) field has been deleted");
+
+logout($sel);
diff --git a/xt/selenium/custom_fields_admin.t b/xt/selenium/custom_fields_admin.t
new file mode 100644
index 0000000000..761a1d1f73
--- /dev/null
+++ b/xt/selenium/custom_fields_admin.t
@@ -0,0 +1,59 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+log_in($sel, $config, 'admin');
+
+# Create a custom field, going through each type available,
+# mark it as obsolete and delete it immediately.
+
+go_to_admin($sel);
+$sel->click_ok("link=Custom Fields");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Custom Fields");
+
+my @types = (
+  "Bug ID", "Large Text Box",
+  "Free Text", "Multiple-Selection Box",
+  "Drop Down", "Date/Time"
+);
+my $counter = int(rand(10000));
+
+foreach my $type (@types) {
+  my $fname = "cf_field" . ++$counter;
+  my $fdesc = "Field" . $counter;
+
+  $sel->click_ok("link=Add a new custom field");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Add a new Custom Field");
+  $sel->type_ok("name", $fname);
+  $sel->type_ok("desc", $fdesc);
+  $sel->select_ok("type", "label=$type");
+  $sel->click_ok("obsolete");
+  $sel->click_ok("create");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Custom Field Created");
+  $sel->click_ok("//a[\@href='editfields.cgi?action=del&name=$fname']");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Delete the Custom Field '$fname' ($fdesc)");
+  $sel->click_ok("link=Delete field '$fdesc'");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Custom Field Deleted");
+}
+
+logout($sel);
diff --git a/xt/selenium/dependencies.t b/xt/selenium/dependencies.t
new file mode 100644
index 0000000000..922ce5c0d6
--- /dev/null
+++ b/xt/selenium/dependencies.t
@@ -0,0 +1,59 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Let's create a public and a private bug.
+
+log_in($sel, $config, 'admin');
+file_bug_in_product($sel, "TestProduct");
+my $bug_summary = "Dependency Checks";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "This bug is public");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+file_bug_in_product($sel, "TestProduct");
+$sel->type_ok("alias", "secret_qa_bug_$bug1_id+1");
+my $bug_summary2 = "Big Ben";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "This bug is private");
+$sel->type_ok("dependson",  $bug1_id);
+$sel->check_ok('//input[@name="groups" and @value="Master"]');
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("link=Mark as Duplicate");
+$sel->type_ok("dup_id", $bug2_id);
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->is_text_present_ok("secret_qa_bug_$bug1_id+1");
+logout($sel);
+
+# A user with editbugs privs who cannot see some bugs in the dependency list
+# or the bug this duplicate points to should still be able to edit this bug.
+
+log_in($sel, $config, 'editbugs');
+go_to_bug($sel, $bug1_id);
+ok(
+  !$sel->is_text_present("secret_qa_bug_$bug1_id+1"),
+  "The alias of the private bug is not visible"
+);
+$sel->select_ok("priority",   "label=High");
+$sel->select_ok("bug_status", "VERIFIED");
+$sel->type_ok("comment", "Can I still edit this bug?");
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
diff --git a/xt/selenium/edit_products_properties.t b/xt/selenium/edit_products_properties.t
new file mode 100644
index 0000000000..fe098e5ebe
--- /dev/null
+++ b/xt/selenium/edit_products_properties.t
@@ -0,0 +1,388 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+my $admin_user_login        = $config->{admin_user_login};
+my $unprivileged_user_login = $config->{unprivileged_user_login};
+my $permanent_user          = $config->{permanent_user};
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "Bug Fields" =>
+      {"useclassification-off" => undef, "usetargetmilestone-on" => undef},
+    "Administrative Policies" => {"allowbugdeletion-on" => undef}
+  }
+);
+
+# Create a product and add components to it. Do some cleanup first
+# if the script failed during a previous run.
+
+go_to_admin($sel);
+$sel->click_ok("link=Products");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+
+# No risk to get the "Select classification" page. We turned off useclassification.
+$sel->title_is("Select product");
+
+my $text = trim($sel->get_text("bugzilla-body"));
+if ($text =~ /(Kill me!|Kill me nicely)/) {
+  my $product         = $1;
+  my $escaped_product = url_quote($product);
+  $sel->click_ok(
+    "//a[\@href='editproducts.cgi?action=del&product=$escaped_product']");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Delete Product '$product'");
+  $sel->click_ok("delete");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Product Deleted");
+}
+
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Product");
+$sel->type_ok("product", "Kill me!");
+$sel->type_ok("description",
+  "I will disappear very soon. Do not add bugs to it.");
+$sel->type_ok("defaultmilestone", "0.1a");
+
+# Since Bugzilla 4.0, the voting system is in an extension.
+if ($config->{test_extensions}) {
+  $sel->type_ok("votesperuser",   "1");
+  $sel->type_ok("maxvotesperbug", "1");
+  $sel->type_ok("votestoconfirm", "10");
+}
+$sel->type_ok("version",      "0.1a");
+$sel->type_ok("component",    "first comp");
+$sel->type_ok("comp_desc",    "comp 1");
+$sel->type_ok("initialowner", $admin_user_login);
+$sel->click_ok("add-product");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Product Created");
+
+# Try creating a second component with the same name.
+
+$sel->click_ok("link=Edit components:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select component of product 'Kill me!'");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add component to the Kill me! product");
+$sel->type_ok("component",    "first comp");
+$sel->type_ok("description",  "comp 2");
+$sel->type_ok("initialowner", $admin_user_login);
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Component Already Exists");
+
+# Now really create a second component, with a distinct name.
+
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->type_ok("component", "second comp");
+
+# FIXME - Re-enter the default assignee (regression due to bug 577574)
+$sel->type_ok("initialowner", $admin_user_login);
+$sel->type_ok("initialcc",    $permanent_user);
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Component Created");
+
+# Add a new version.
+
+edit_product($sel, "Kill me!");
+$sel->click_ok("link=Edit versions:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select version of product 'Kill me!'");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->type_ok("version", "0.1");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Version Created");
+
+# Add a new milestone.
+
+$sel->click_ok("link='Kill me!'");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Product 'Kill me!'");
+$sel->click_ok("link=Edit milestones:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select milestone of product 'Kill me!'");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Milestone to Product 'Kill me!'");
+$sel->type_ok("milestone", "0.2");
+$sel->type_ok("sortkey",   "2");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Milestone Created");
+
+# Add another milestone.
+
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add Milestone to Product 'Kill me!'");
+$sel->type_ok("milestone", "0.1a");
+
+# Negative sortkeys are valid for milestones.
+$sel->type_ok("sortkey", "-2");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Milestone Already Exists");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->type_ok("milestone", "pre-0.1");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Milestone Created");
+
+# Now create an UNCONFIRMED bug and add it to the newly created product.
+
+file_bug_in_product($sel, "Kill me!");
+$sel->select_ok("version",   "label=0.1a");
+$sel->select_ok("component", "label=first comp");
+
+# UNCONFIRMED must be present.
+$sel->select_ok("bug_status", "label=UNCONFIRMED");
+$sel->type_ok("cc",           $unprivileged_user_login);
+$sel->type_ok("bug_file_loc", "http://www.test.com");
+my $bug_summary = "test create/edit product properties";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "this bug will soon be dead");
+my $bug1_id = create_bug($sel, $bug_summary);
+my @cc_list = $sel->get_select_options("cc");
+ok(
+  grep($_ eq $unprivileged_user_login, @cc_list),
+  "$unprivileged_user_login correctly added to the CC list"
+);
+ok(!grep($_ eq $permanent_user, @cc_list),
+  "$permanent_user not in the CC list for 'first comp' by default");
+
+# File a second bug, and make sure users in the default CC list are added.
+file_bug_in_product($sel, "Kill me!");
+$sel->select_ok("version",   "label=0.1a");
+$sel->select_ok("component", "label=second comp");
+my $bug_summary2 = "check default CC list";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "is the CC list populated correctly?");
+create_bug($sel, $bug_summary2);
+@cc_list = $sel->get_select_options("cc");
+ok(grep($_ eq $permanent_user, @cc_list),
+  "$permanent_user in the CC list for 'second comp' by default");
+
+# Edit product properties and set votes_to_confirm to 0, which has
+# the side-effect to disable auto-confirmation (new behavior compared
+# to Bugzilla 3.4 and older).
+
+edit_product($sel, "Kill me!");
+$sel->type_ok("product", "Kill me nicely");
+$sel->type_ok("description",
+  "I will disappear very soon. Do not add bugs to it (except for testing).");
+$sel->select_ok("defaultmilestone", "label=0.2");
+if ($config->{test_extensions}) {
+  $sel->type_ok("votesperuser",   "2");
+  $sel->type_ok("maxvotesperbug", 5);
+  $sel->type_ok("votestoconfirm", "0");
+}
+$sel->click_ok("update-product");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Updating Product 'Kill me nicely'");
+$sel->is_text_present_ok(
+  "Updated product name from 'Kill me!' to 'Kill me nicely'");
+$sel->is_text_present_ok("Updated description");
+$sel->is_text_present_ok("Updated default milestone");
+if ($config->{test_extensions}) {
+  $sel->is_text_present_ok("Updated votes per user");
+  $sel->is_text_present_ok("Updated maximum votes per bug");
+  $sel->is_text_present_ok("Updated number of votes needed to confirm a bug");
+  $text = trim($sel->get_text("bugzilla-body"));
+
+  # We use .{1} in place of the right arrow character, which fails otherwise.
+  ok(
+    $text
+      =~ /Checking unconfirmed bugs in this product for any which now have sufficient votes\.{3} .{1}there were none/,
+    "No bugs confirmed by popular votes (votestoconfirm = 0 disables auto-confirmation)"
+  );
+
+  # Now set votestoconfirm to 2, vote for a bug, and then set
+  # this attribute back to 1, to trigger auto-confirmation.
+
+  $sel->click_ok("link=Kill me nicely");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Edit Product 'Kill me nicely'",
+    "Display properties of Kill me nicely");
+  $sel->type_ok("votestoconfirm", 2);
+  $sel->click_ok("update-product");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Updating Product 'Kill me nicely'");
+  $sel->is_text_present_ok("Updated number of votes needed to confirm a bug");
+
+  go_to_bug($sel, $bug1_id);
+  $sel->click_ok("link=vote");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Change Votes");
+  $sel->type_ok("bug_$bug1_id", 1);
+  $sel->click_ok("change");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Change Votes");
+  $sel->is_text_present_ok("The changes to your votes have been saved");
+
+  edit_product($sel, "Kill me nicely");
+  $sel->type_ok("votestoconfirm", 1);
+  $sel->click_ok("update-product");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Updating Product 'Kill me nicely'");
+  $sel->is_text_present_ok("Updated number of votes needed to confirm a bug");
+  $text = trim($sel->get_text("bugzilla-body"));
+  ok(
+    $text =~ /Bug $bug1_id confirmed by number of votes/,
+    "Bug $bug1_id is confirmed by popular votes"
+  );
+}
+
+# Edit the bug.
+
+go_to_bug($sel, $bug1_id);
+$sel->selected_label_is("product",    "Kill me nicely");
+$sel->selected_label_is("bug_status", "CONFIRMED")
+  if $config->{test_extensions};
+$sel->select_ok("target_milestone", "label=pre-0.1");
+$sel->select_ok("component",        "label=second comp");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+@cc_list = $sel->get_select_options("cc");
+ok(grep($_ eq $permanent_user, @cc_list),
+  "User $permanent_user automatically added to the CC list");
+
+# Delete the milestone the bug belongs to. This should retarget the bug
+# to the default milestone.
+
+edit_product($sel, "Kill me nicely");
+$sel->click_ok("link=Edit milestones:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select milestone of product 'Kill me nicely'");
+$sel->click_ok(
+  '//a[@href="editmilestones.cgi?action=del&product=Kill%20me%20nicely&milestone=pre-0.1"]'
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Milestone of Product 'Kill me nicely'");
+$text = trim($sel->get_text("bugzilla-body"));
+ok($text =~ /There is 1 bug entered for this milestone/, "Warning displayed");
+ok($text =~ /Do you really want to delete this milestone\?/,
+  "Requesting confirmation");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Milestone Deleted");
+$text = trim($sel->get_text("message"));
+ok(
+  $text
+    =~ /Bugs targetted to this milestone have been retargetted to the default milestone/,
+  "Bug retargetted"
+);
+
+# Try deleting the version used by the bug. This action must be rejected.
+
+$sel->click_ok("link='Kill me nicely'");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Product 'Kill me nicely'");
+$sel->click_ok("link=Edit versions:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select version of product 'Kill me nicely'");
+$sel->click_ok(
+  "//a[contains(\@href, 'editversions.cgi?action=del&product=Kill%20me%20nicely&version=0.1a')]"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Version of Product 'Kill me nicely'");
+$text = trim($sel->get_text("bugzilla-body"));
+ok($text =~ /Sorry, there are 2 outstanding bugs for this version/,
+  "Rejecting version deletion");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+
+# Delete an unused version. The action must succeed.
+
+$sel->click_ok(
+  '//a[@href="editversions.cgi?action=del&product=Kill%20me%20nicely&version=0.1"]'
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Version of Product 'Kill me nicely'");
+$text = trim($sel->get_text("bugzilla-body"));
+ok($text =~ /Do you really want to delete this version\?/,
+  "Requesting confirmation");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Version Deleted");
+
+# Delete the component the bug belongs to. The action must succeed.
+
+$sel->click_ok("link='Kill me nicely'");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Product 'Kill me nicely'");
+$sel->click_ok("link=Edit components:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select component of product 'Kill me nicely'");
+$sel->click_ok(
+  "//a[contains(\@href, 'editcomponents.cgi?action=del&product=Kill%20me%20nicely&component=second%20comp')]"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete component 'second comp' from 'Kill me nicely' product");
+$text = trim($sel->get_text("bugzilla-body"));
+ok($text =~ /There are 2 bugs entered for this component/, "Warning displayed");
+ok($text =~ /Do you really want to delete this component\?/,
+  "Requesting confirmation");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Component Deleted");
+$text = trim($sel->get_text("bugzilla-body"));
+ok($text =~ /The component second comp has been deleted/,
+  "Component deletion confirmed");
+ok(
+  $text
+    =~ /All bugs being in this component and all references to them have also been deleted/,
+  "Bug deletion confirmed"
+);
+
+# Only one value for component, version and milestone available. They should
+# be selected by default.
+
+file_bug_in_product($sel, "Kill me nicely");
+$bug_summary2 = "bye bye everybody!";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "I'm dead :(");
+create_bug($sel, $bug_summary2);
+
+# Now delete the product.
+
+go_to_admin($sel);
+$sel->click_ok("link=Products");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select product");
+$sel->click_ok(
+  "//a[\@href='editproducts.cgi?action=del&product=Kill%20me%20nicely']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Product 'Kill me nicely'");
+$text = trim($sel->get_text("bugzilla-body"));
+ok($text =~ /There is 1 bug entered for this product/, "Warning displayed");
+ok($text =~ /Do you really want to delete this product\?/,
+  "Confirmation request displayed");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Product Deleted");
+logout($sel);
diff --git a/xt/selenium/email_preferences.t b/xt/selenium/email_preferences.t
new file mode 100644
index 0000000000..8489029864
--- /dev/null
+++ b/xt/selenium/email_preferences.t
@@ -0,0 +1,475 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Used to test sent bugmails
+use constant RCPT_BOTH   => 1;
+use constant RCPT_ADMIN  => 2;
+use constant RCPT_NORMAL => 3;
+use constant RCPT_NONE   => 4;
+my @email_both = ($config->{admin_user_login}, $config->{editbugs_user_login});
+my @email_admin = ($config->{admin_user_login});
+my @email_normal = ($config->{editbugs_user_login});
+my @email_none   = ("no one");
+
+# Test script to test email preferences.
+# For reference, following bugmail and request mails should be generated.
+#
+# Admin should get following bugmails (in order):
+#  1) A bug is created
+#  2) Normal user adds a CC for itself
+#  3) Admin removes CC of normal user
+#  4) Admin assigns the bug to itself
+#  5) Admin requests a flag from normal user
+#  6) Admin grants a flag requested from itself
+#  7) Normal user set severity to normal
+#  8) Normal user adds a comment #3
+#  9) Normal user assigns the bug to itself
+# Normal User should get following bugmail (in order):
+#  1) A bug is created
+#  2) Normal user sets severity to blocker
+#  3) Admin sets severity to trivial
+#  4) Admin adds a comment #2
+#  5) Admin removes CC of normal user
+#  6) Admin assigns the bug to itself
+#  7) Normal user sets severity to normal
+#
+# Admin should get following request mails (in order):
+#  1) Normal user denies a flag requested by the admin
+# Normal user should get following request mails (in order):
+#  1) Admin requests a flag from normal user
+#
+# NOTE that only correct bugmail is verified by the test script because
+# sending request mail is not indicated on the UI.
+
+# Set admin Email Prefs (via link in footer)
+log_in($sel, $config, 'admin');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Email Notifications");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok("Email Notifications");
+$sel->click_ok("//input[\@value='Disable All Mail']");
+$sel->click_ok("email-0-1", undef,
+  'Set "I\'m added to or removed from this capacity" for Assignee role');
+$sel->click_ok("email-0-5", undef,
+  'Set "The priority, status, severity, or milestone changes" for Assignee role');
+$sel->click_ok("email-0-2", undef,
+  'Set "New comments are added" for Assignee role');
+$sel->click_ok("email-0-0", undef,
+  'Set "Any field not mentioned above changes" for Assignee role');
+$sel->click_ok("email-3-8", undef, 'Set "The CC field changes" for CCed role');
+$sel->click_ok("email-1-10", undef,
+  'Set "A new bug is created" for QA Contact role');
+$sel->click_ok("email-100-101", undef,
+  'Set "Email me when someone sets a flag I asked for" global option');
+
+# Restore the old 4.2 behavior for 'Disable All Mail'.
+foreach my $col (0 .. 3) {
+  foreach my $row (50 .. 51) {
+    $sel->click_ok("neg-email-$col-$row");
+  }
+}
+$sel->value_is("email-0-1",      "on");
+$sel->value_is("email-0-10",     "off");
+$sel->value_is("email-0-6",      "off");
+$sel->value_is("email-0-5",      "on");
+$sel->value_is("email-0-2",      "on");
+$sel->value_is("email-0-3",      "off");
+$sel->value_is("email-0-4",      "off");
+$sel->value_is("email-0-7",      "off");
+$sel->value_is("email-0-8",      "off");
+$sel->value_is("email-0-9",      "off");
+$sel->value_is("email-0-0",      "on");
+$sel->value_is("neg-email-0-50", "off");
+$sel->value_is("neg-email-0-51", "off");
+$sel->value_is("email-1-1",      "off");
+$sel->value_is("email-1-10",     "on");
+$sel->value_is("email-1-6",      "off");
+$sel->value_is("email-1-5",      "off");
+$sel->value_is("email-1-2",      "off");
+$sel->value_is("email-1-3",      "off");
+$sel->value_is("email-1-4",      "off");
+$sel->value_is("email-1-7",      "off");
+$sel->value_is("email-1-8",      "off");
+$sel->value_is("email-1-9",      "off");
+$sel->value_is("email-1-0",      "off");
+$sel->value_is("neg-email-1-50", "off");
+$sel->value_is("neg-email-1-51", "off");
+ok(!$sel->is_editable("email-2-1"),
+  'The "I\'m added to or removed from this capacity" for Reporter role is disabled'
+);
+$sel->value_is("email-2-10",     "off");
+$sel->value_is("email-2-6",      "off");
+$sel->value_is("email-2-5",      "off");
+$sel->value_is("email-2-2",      "off");
+$sel->value_is("email-2-3",      "off");
+$sel->value_is("email-2-4",      "off");
+$sel->value_is("email-2-7",      "off");
+$sel->value_is("email-2-8",      "off");
+$sel->value_is("email-2-9",      "off");
+$sel->value_is("email-2-0",      "off");
+$sel->value_is("neg-email-2-50", "off");
+$sel->value_is("neg-email-2-51", "off");
+$sel->value_is("email-3-1",      "off");
+$sel->value_is("email-3-10",     "off");
+$sel->value_is("email-3-6",      "off");
+$sel->value_is("email-3-5",      "off");
+$sel->value_is("email-3-2",      "off");
+$sel->value_is("email-3-3",      "off");
+$sel->value_is("email-3-4",      "off");
+$sel->value_is("email-3-7",      "off");
+$sel->value_is("email-3-8",      "on");
+$sel->value_is("email-3-9",      "off");
+$sel->value_is("email-3-0",      "off");
+$sel->value_is("neg-email-3-50", "off");
+$sel->value_is("neg-email-3-51", "off");
+$sel->value_is("email-100-100",  "off");
+$sel->value_is("email-100-101",  "on");
+$sel->click_ok("update", undef, "Submit modified admin email preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok(
+  "The changes to your email notifications have been saved.");
+
+# Set "After changing a bug" default preference to "Show the updated bug"
+# This simplifies bug changes below
+go_to_admin($sel);
+$sel->click_ok("link=Default Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+$sel->select_ok("post_bug_submit_action", "label=Show the updated bug");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+
+# Set normal user Email Prefs
+logout($sel);
+log_in($sel, $config, 'editbugs');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Email Notifications");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Email Notifications");
+$sel->is_text_present_ok("Email Notifications");
+$sel->click_ok("//input[\@value='Enable All Mail']");
+$sel->click_ok("email-3-1", undef,
+  'Clear "I\'m added to or removed from this capacity" for CCed role');
+$sel->click_ok("email-3-5", undef,
+  'Clear "The priority, status, severity, or milestone changes" for CCed role');
+$sel->click_ok("email-2-2", undef,
+  'Clear "New comments are added" for Reporter role');
+$sel->click_ok("email-3-2", undef,
+  'Clear "New comments are added" for CCed role');
+$sel->click_ok("email-2-8", undef,
+  'Clear "The CC field changes" for Reporter role');
+$sel->click_ok("email-3-8", undef,
+  'Clear "The CC field changes" for CCed role');
+$sel->click_ok("email-2-0", undef,
+  'Clear "Any field not mentioned above changes" for Reporter role');
+$sel->click_ok("email-3-0", undef,
+  'Clear "Any field not mentioned above changes" for CCed role');
+$sel->click_ok("neg-email-0-51", undef,
+  'Set "Change was made by me" override for Assignee role');
+$sel->click_ok("email-100-101", undef,
+  'Clear "Email me when someone sets a flag I asked for" global option');
+$sel->value_is("email-0-1",      "on");
+$sel->value_is("email-0-10",     "on");
+$sel->value_is("email-0-6",      "on");
+$sel->value_is("email-0-5",      "on");
+$sel->value_is("email-0-2",      "on");
+$sel->value_is("email-0-3",      "on");
+$sel->value_is("email-0-4",      "on");
+$sel->value_is("email-0-7",      "on");
+$sel->value_is("email-0-8",      "on");
+$sel->value_is("email-0-9",      "on");
+$sel->value_is("email-0-0",      "on");
+$sel->value_is("neg-email-0-50", "off");
+$sel->value_is("neg-email-0-51", "on");
+$sel->value_is("email-1-1",      "on");
+$sel->value_is("email-1-10",     "on");
+$sel->value_is("email-1-6",      "on");
+$sel->value_is("email-1-5",      "on");
+$sel->value_is("email-1-2",      "on");
+$sel->value_is("email-1-3",      "on");
+$sel->value_is("email-1-4",      "on");
+$sel->value_is("email-1-7",      "on");
+$sel->value_is("email-1-8",      "on");
+$sel->value_is("email-1-9",      "on");
+$sel->value_is("email-1-0",      "on");
+$sel->value_is("neg-email-1-50", "off");
+$sel->value_is("neg-email-1-51", "off");
+ok(!$sel->is_editable("email-2-1"),
+  'The "I\'m added to or removed from this capacity" for Reporter role is disabled'
+);
+$sel->value_is("email-2-10",     "on");
+$sel->value_is("email-2-6",      "on");
+$sel->value_is("email-2-5",      "on");
+$sel->value_is("email-2-2",      "off");
+$sel->value_is("email-2-3",      "on");
+$sel->value_is("email-2-4",      "on");
+$sel->value_is("email-2-7",      "on");
+$sel->value_is("email-2-8",      "off");
+$sel->value_is("email-2-9",      "on");
+$sel->value_is("email-2-0",      "off");
+$sel->value_is("neg-email-2-50", "off");
+$sel->value_is("neg-email-2-51", "off");
+$sel->value_is("email-3-1",      "off");
+$sel->value_is("email-3-10",     "on");
+$sel->value_is("email-3-6",      "on");
+$sel->value_is("email-3-5",      "off");
+$sel->value_is("email-3-2",      "off");
+$sel->value_is("email-3-3",      "on");
+$sel->value_is("email-3-4",      "on");
+$sel->value_is("email-3-7",      "on");
+$sel->value_is("email-3-8",      "off");
+$sel->value_is("email-3-9",      "on");
+$sel->value_is("email-3-0",      "off");
+$sel->value_is("neg-email-3-50", "off");
+$sel->value_is("neg-email-3-51", "off");
+$sel->value_is("email-100-100",  "on");
+$sel->value_is("email-100-101",  "off");
+$sel->click_ok("update", undef,
+  "Submit modified normal user email preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok(
+  "The changes to your email notifications have been saved.");
+
+# Create a test bug (bugmail to both normal user and admin)
+file_bug_in_product($sel, "Another Product");
+$sel->select_ok("component", "label=c1");
+my $bug_summary = "Selenium Email Preference test bug";
+$sel->type_ok("short_desc", $bug_summary, "Enter bug summary");
+$sel->type_ok(
+  "comment",
+  "Created by Selenium to test Email Notifications",
+  "Enter bug description"
+);
+$sel->type_ok("assigned_to", $config->{editbugs_user_login});
+$sel->type_ok("qa_contact",  $config->{admin_user_login});
+$sel->type_ok("cc",          $config->{admin_user_login});
+my $bug1_id = create_bug($sel, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_BOTH);
+
+# Make normal user changes (first pass)
+#
+go_to_bug($sel, $bug1_id);
+
+# Severity change (bugmail to normal user but not admin)
+$sel->select_ok("bug_severity", "label=blocker");
+$sel->selected_label_is("bug_severity", "blocker");
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NORMAL);
+
+# Add a comment (bugmail to no one)
+$sel->type_ok("comment",
+  "This is a Selenium generated normal user test comment 1 of 2. (No bugmail should be generated for this.)"
+);
+$sel->value_is("comment",
+  "This is a Selenium generated normal user test comment 1 of 2. (No bugmail should be generated for this.)"
+);
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NONE);
+
+# Add normal user to CC list (bugmail to admin but not normal user)
+$sel->type_ok("newcc", $config->{editbugs_user_login});
+$sel->value_is("newcc", $config->{editbugs_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_ADMIN);
+
+# Request a flag from admin (bugmail to no one, request mail to no one)
+$sel->select_ok("flag_type-1", "label=?");
+$sel->type_ok("requestee_type-1", $config->{admin_user_login});
+$sel->value_is("requestee_type-1", $config->{admin_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NONE);
+
+# Make admin changes
+#
+logout($sel);
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+
+# Severity change (bugmail to normal user but not admin)
+$sel->select_ok("bug_severity", "label=trivial");
+$sel->selected_label_is("bug_severity", "trivial");
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NORMAL);
+
+# Add a comment (bugmail to normal user but not admin)
+$sel->type_ok("comment",
+  "This is a Selenium generated admin user test comment. (Only normal user should get bugmail for this.)"
+);
+$sel->value_is("comment",
+  "This is a Selenium generated admin user test comment. (Only normal user should get bugmail for this.)"
+);
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NORMAL);
+
+# Remove normal user from CC list (bugmail to both normal user and admin)
+$sel->click_ok("removecc");
+$sel->add_selection_ok("cc", "label=$config->{editbugs_user_login}");
+$sel->value_is("removecc", "on");
+$sel->selected_label_is("cc", $config->{editbugs_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_BOTH);
+
+# Reassign bug to admin user (bugmail to both normal user and admin)
+$sel->type_ok("assigned_to", $config->{admin_user_login});
+$sel->value_is("assigned_to", $config->{admin_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_BOTH);
+
+# Request a flag from normal user (bugmail to admin but not normal user and request mail to admin)
+$sel->select_ok("flag_type-1", "label=?");
+$sel->type_ok("requestee_type-1", $config->{editbugs_user_login});
+$sel->value_is("requestee_type-1", $config->{editbugs_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_ADMIN);
+
+# Grant a normal user flag request (bugmail to admin but not normal user and request mail to no one)
+my $flag1_id = set_flag($sel, $config->{admin_user_login}, "?", "+");
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_ADMIN);
+
+# Make normal user changes (second pass)
+#
+logout($sel);
+log_in($sel, $config, 'editbugs');
+go_to_bug($sel, $bug1_id);
+
+# Severity change (bugmail to both admin and normal user)
+$sel->select_ok("bug_severity", "label=normal");
+$sel->selected_label_is("bug_severity", "normal");
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_BOTH);
+
+# Add a comment (bugmail to admin but not normal user)
+$sel->type_ok("comment",
+  "This is a Selenium generated normal user test comment 2 of 2. (Only admin should get bugmail for this.)"
+);
+$sel->value_is("comment",
+  "This is a Selenium generated normal user test comment 2 of 2. (Only admin should get bugmail for this.)"
+);
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_ADMIN);
+
+# Reassign to normal user (bugmail to admin but not normal user)
+$sel->type_ok("assigned_to", $config->{editbugs_user_login});
+$sel->value_is("assigned_to", $config->{editbugs_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_ADMIN);
+
+# Deny a flag requested by admin (bugmail to no one and request mail to admin)
+my $flag2_id = set_flag($sel, $config->{editbugs_user_login}, "?", "-");
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NONE);
+
+# Cancel both flags (bugmail and request mail to no one)
+set_flag($sel, undef, "+", "X", $flag1_id);
+set_flag($sel, undef, "-", "X", $flag2_id);
+edit_bug($sel, $bug1_id, $bug_summary);
+verify_bugmail_recipients($sel, RCPT_NONE);
+logout($sel);
+
+# Set "After changing a bug" default preference back to "Do Nothing".
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Default Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+$sel->select_ok("post_bug_submit_action", "label=Do Nothing");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+logout($sel);
+
+# Help functions
+sub verify_bugmail_recipients {
+  my ($sel, $rcpt_sentto) = @_;
+  my $wanted_sentto;
+  my $err = 0;
+
+  my ($package, $filename, $line) = caller;
+  my $prefix = "verify_bugmail_recipients:$line";
+
+  # Verify sentto field
+  my @email_sentto = sort split(/, /,
+    $sel->get_text("//dt[text()='Email sent to:']/following-sibling::dd"));
+  if ($rcpt_sentto == RCPT_BOTH) {
+    $wanted_sentto = \@email_both;
+    is_deeply(\@email_sentto, $wanted_sentto, "$prefix: Bugmail sent to both")
+      or $err = 1;
+  }
+  elsif ($rcpt_sentto == RCPT_ADMIN) {
+    $wanted_sentto = \@email_admin;
+    is_deeply(\@email_sentto, $wanted_sentto, "$prefix: Bugmail sent to admin")
+      or $err = 1;
+  }
+  elsif ($rcpt_sentto == RCPT_NORMAL) {
+    $wanted_sentto = \@email_normal;
+    is_deeply(\@email_sentto, $wanted_sentto,
+      "$prefix: Bugmail sent to normal user")
+      or $err = 1;
+  }
+  else {
+    $wanted_sentto = \@email_none;
+    is_deeply(\@email_sentto, $wanted_sentto, "$prefix: Bugmail sent to no one")
+      or $err = 1;
+  }
+
+  # In case of an error, retrieve and show diagnostics info
+  if ($err) {
+    diag("Sent, actual     : " . join(', ', @email_sentto));
+    diag("Sent, wanted     : " . join(', ', @$wanted_sentto));
+    diag("Changer          : "
+        . trim($sel->get_text('//a[contains(@href, "logout")]/../text()[3]')));
+    diag(
+      "Reporter         : "
+        . $sel->get_attribute(
+        '//th[contains(text(), "Reported:")]/following-sibling::td//a@title')
+    );
+    diag("Assignee         : " . $sel->get_value('assigned_to'));
+    diag("QA contact       : " . $sel->get_value('qa_contact'));
+    diag("CC List          : " . join(', ', $sel->get_select_options('cc')));
+  }
+}
+
+sub set_flag {
+  my ($sel, $login, $curval, $newval, $prev_id) = @_;
+
+  # Retrieve flag id for the flag to be set
+  my $flag_id = $prev_id;
+  if (defined $login) {
+    my $flag_name
+      = $sel->get_attribute("//table[\@id='flags']//input[\@value='$login']\@name");
+    $flag_name =~ /^requestee-(\d+)$/;
+    $flag_id = $1;
+  }
+
+  # Set new value for the flag (verifies current value)
+  $sel->select_ok(
+    "//select[\@id=\"flag-$flag_id\"]/option[\@value=\"$curval\" and \@selected]/..",
+    "value=$newval",
+    "Set flag ID $flag_id to $newval from $curval"
+  );
+
+  return $flag_id;
+}
diff --git a/xt/selenium/enter_new_bug.t b/xt/selenium/enter_new_bug.t
new file mode 100644
index 0000000000..4d9f3ddf78
--- /dev/null
+++ b/xt/selenium/enter_new_bug.t
@@ -0,0 +1,39 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Very simple test script to test if bug creation with minimal data
+# passes successfully for different user privileges.
+#
+# More elaborate tests exist in other scripts. This doesn't mean this
+# one could not be improved a bit.
+
+my $bug_summary = "Bug created by Selenium";
+foreach my $user (qw(admin unprivileged canconfirm)) {
+  log_in($sel, $config, $user);
+  file_bug_in_product($sel, "TestProduct");
+  $sel->type_ok("short_desc", $bug_summary, "Enter bug summary");
+  $sel->type_ok(
+    "comment",
+    "--- Bug created by Selenium ---",
+    "Enter bug description"
+  );
+  create_bug($sel, $bug_summary);
+  logout($sel);
+}
diff --git a/xt/selenium/flags.t b/xt/selenium/flags.t
new file mode 100644
index 0000000000..f7ba9d75a6
--- /dev/null
+++ b/xt/selenium/flags.t
@@ -0,0 +1,508 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+# We have to upload files from the local computer. This requires
+# chrome privileges.
+my ($sel, $config) = get_selenium(CHROME_MODE);
+
+# First create a flag type for bugs.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Flags");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Administer Flag Types");
+$sel->click_ok("link=Create Flag Type for Bugs");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->type_ok("name",        "SeleniumBugFlag1Test");
+$sel->type_ok("description", "bugflag1");
+$sel->select_ok("product", "label=TestProduct");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->remove_all_selections_ok("inclusion_to_remove");
+$sel->add_selection_ok("inclusion_to_remove", "label=__Any__:__Any__");
+$sel->click_ok("categoryAction-removeInclusion");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->select_ok("product", "label=QA-Selenium-TEST");
+$sel->click_ok("categoryAction-exclude");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->select_ok("product", "label=QA-Selenium-TEST");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+my @inclusion = $sel->get_select_options("inclusion_to_remove");
+ok(scalar @inclusion == 2, "The inclusion list contains 2 elements");
+ok(
+  grep($_ eq "QA-Selenium-TEST:__Any__", @inclusion),
+  "QA-Selenium-TEST:__Any__ is in the inclusion list"
+);
+ok(
+  grep($_ eq "TestProduct:__Any__", @inclusion),
+  "TestProduct:__Any__ is in the inclusion list"
+);
+my @exclusion = $sel->get_select_options("exclusion_to_remove");
+ok(scalar @exclusion == 1, "The exclusion list contains 1 element");
+ok(
+  $exclusion[0] eq "QA-Selenium-TEST:__Any__",
+  "QA-Selenium-TEST:__Any__ is in the exclusion list"
+);
+$sel->type_ok("sortkey", "900");
+$sel->value_is("cc_list",          "");
+$sel->value_is("is_active",        "on");
+$sel->value_is("is_requestable",   "on");
+$sel->value_is("is_requesteeble",  "on");
+$sel->value_is("is_multiplicable", "on");
+$sel->select_ok("grant_group",   "label=admin");
+$sel->select_ok("request_group", "label=(no group)");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'SeleniumBugFlag1Test' Created");
+$sel->is_text_present_ok(
+  "The flag type SeleniumBugFlag1Test has been created.");
+my $flagtype_url = $sel->get_attribute('link=SeleniumBugFlag1Test@href');
+$flagtype_url =~ /id=(\d+)$/;
+my $flagtype1_id = $1;
+
+# Clone the flag type, but set the request group to 'editbugs' and the sortkey to 950.
+
+$sel->click_ok("//a[\@href='editflagtypes.cgi?action=copy&id=$flagtype1_id']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs Based on SeleniumBugFlag1Test");
+$sel->type_ok("name",        "SeleniumBugFlag2Test");
+$sel->type_ok("description", "bugflag2");
+@inclusion = $sel->get_select_options("inclusion_to_remove");
+ok(scalar @inclusion == 2, "The inclusion list contains 2 elements");
+ok(
+  grep($_ eq "QA-Selenium-TEST:__Any__", @inclusion),
+  "QA-Selenium-TEST:__Any__ is in the inclusion list"
+);
+ok(
+  grep($_ eq "TestProduct:__Any__", @inclusion),
+  "TestProduct:__Any__ is in the inclusion list"
+);
+@exclusion = $sel->get_select_options("exclusion_to_remove");
+ok(scalar @exclusion == 1, "The exclusion list contains 1 element");
+ok(
+  $exclusion[0] eq "QA-Selenium-TEST:__Any__",
+  "QA-Selenium-TEST:__Any__ is in the exclusion list"
+);
+$sel->type_ok("sortkey", "950");
+$sel->value_is("is_active",        "on");
+$sel->value_is("is_requestable",   "on");
+$sel->value_is("is_requesteeble",  "on");
+$sel->value_is("is_multiplicable", "on");
+$sel->type_ok("cc_list", $config->{canconfirm_user_login});
+$sel->selected_label_is("grant_group", "admin");
+$sel->select_ok("request_group", "label=editbugs");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'SeleniumBugFlag2Test' Created");
+$sel->is_text_present_ok(
+  "The flag type SeleniumBugFlag2Test has been created.");
+$flagtype_url = $sel->get_attribute('link=SeleniumBugFlag2Test@href');
+$flagtype_url =~ /id=(\d+)$/;
+my $flagtype2_id = $1;
+
+# Clone the first flag type again, but with different attributes.
+
+$sel->click_ok("//a[\@href='editflagtypes.cgi?action=copy&id=$flagtype1_id']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs Based on SeleniumBugFlag1Test");
+$sel->type_ok("name",        "SeleniumBugFlag3Test");
+$sel->type_ok("description", "bugflag3");
+$sel->type_ok("sortkey",     "980");
+$sel->value_is("is_active",      "on");
+$sel->value_is("is_requestable", "on");
+$sel->uncheck_ok("is_requesteeble");
+$sel->uncheck_ok("is_multiplicable");
+$sel->value_is("cc_list", "");
+$sel->select_ok("grant_group", "label=(no group)");
+$sel->selected_label_is("request_group", "(no group)");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'SeleniumBugFlag3Test' Created");
+$sel->is_text_present_ok(
+  "The flag type SeleniumBugFlag3Test has been created.");
+$flagtype_url = $sel->get_attribute('link=SeleniumBugFlag3Test@href');
+$flagtype_url =~ /id=(\d+)$/;
+my $flagtype3_id = $1;
+
+# We now create a flag type for attachments.
+
+$sel->click_ok("link=Create Flag Type For Attachments");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+$sel->type_ok("name",        "SeleniumAttachmentFlag1Test");
+$sel->type_ok("description", "attachmentflag1");
+$sel->select_ok("product", "label=TestProduct");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+$sel->remove_all_selections_ok("inclusion_to_remove");
+$sel->add_selection_ok("inclusion_to_remove", "label=__Any__:__Any__");
+$sel->click_ok("categoryAction-removeInclusion");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+@inclusion = $sel->get_select_options("inclusion_to_remove");
+ok(scalar @inclusion == 1, "The inclusion list contains 1 element");
+ok(
+  $inclusion[0] eq "TestProduct:__Any__",
+  "TestProduct:__Any__ is in the exclusion list"
+);
+$sel->type_ok("sortkey", "700");
+$sel->value_is("cc_list", "");
+$sel->select_ok("grant_group",   "label=editbugs");
+$sel->select_ok("request_group", "label=canconfirm");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'SeleniumAttachmentFlag1Test' Created");
+$sel->is_text_present_ok(
+  "The flag type SeleniumAttachmentFlag1Test has been created.");
+$flagtype_url = $sel->get_attribute('link=SeleniumAttachmentFlag1Test@href');
+$flagtype_url =~ /id=(\d+)$/;
+my $aflagtype1_id = $1;
+
+# Clone the flag type.
+
+$sel->click_ok("//a[\@href='editflagtypes.cgi?action=copy&id=$aflagtype1_id']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Create Flag Type for Attachments Based on SeleniumAttachmentFlag1Test");
+$sel->type_ok("name",        "SeleniumAttachmentFlag2Test");
+$sel->type_ok("description", "attachmentflag2");
+@inclusion = $sel->get_select_options("inclusion_to_remove");
+ok(scalar @inclusion == 1, "The inclusion list contains 1 element");
+ok(
+  $inclusion[0] eq "TestProduct:__Any__",
+  "TestProduct:__Any__ is in the exclusion list"
+);
+$sel->type_ok("sortkey", "750");
+$sel->type_ok("cc_list", $config->{admin_user_login});
+$sel->uncheck_ok("is_multiplicable");
+$sel->select_ok("grant_group",   "label=(no group)");
+$sel->select_ok("request_group", "label=(no group)");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'SeleniumAttachmentFlag2Test' Created");
+$sel->is_text_present_ok(
+  "The flag type SeleniumAttachmentFlag2Test has been created.");
+$flagtype_url = $sel->get_attribute('link=SeleniumAttachmentFlag2Test@href');
+$flagtype_url =~ /id=(\d+)$/;
+my $aflagtype2_id = $1;
+
+# Clone the flag type again, and set it as inactive.
+
+$sel->click_ok("//a[\@href='editflagtypes.cgi?action=copy&id=$aflagtype1_id']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is(
+  "Create Flag Type for Attachments Based on SeleniumAttachmentFlag1Test");
+$sel->type_ok("name",        "SeleniumAttachmentFlag3Test");
+$sel->type_ok("description", "attachmentflag3");
+$sel->type_ok("sortkey",     "800");
+$sel->uncheck_ok("is_active");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'SeleniumAttachmentFlag3Test' Created");
+$sel->is_text_present_ok(
+  "The flag type SeleniumAttachmentFlag3Test has been created.");
+$flagtype_url = $sel->get_attribute('link=SeleniumAttachmentFlag3Test@href');
+$flagtype_url =~ /id=(\d+)$/;
+my $aflagtype3_id = $1;
+
+# All flag types have been created. Now "real" tests can start.
+
+file_bug_in_product($sel, 'TestProduct');
+my $bug_summary = "test flags";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "this bug is used by Selenium to test flags");
+
+# Restrict the bug to the Master group. That's important for subsequent tests!
+$sel->check_ok('//input[@name="groups" and @value="Master"]');
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# All 3 bug flag types must be available; we are in the TestProduct product.
+
+$sel->is_text_present_ok("SeleniumBugFlag1Test");
+
+# We specify //select or //input, just to be sure. This is not required, though.
+$sel->is_element_present_ok("//select[\@id='flag_type-$flagtype1_id']");
+$sel->is_element_present_ok("//input[\@id='requestee_type-$flagtype1_id']");
+
+# If fields are of the correct type above, we assume this is still true below.
+$sel->is_text_present_ok("SeleniumBugFlag2Test");
+$sel->is_element_present_ok("flag_type-$flagtype2_id");
+$sel->is_element_present_ok("requestee_type-$flagtype2_id");
+$sel->is_text_present_ok("SeleniumBugFlag3Test");
+$sel->is_element_present_ok("flag_type-$flagtype3_id");
+ok(
+  !$sel->is_element_present("requestee_type-$flagtype3_id"),
+  "SeleniumBugFlag3Test is not specifically requestable"
+);
+
+# This is intentional to generate "flagmail". Some flags have a CC list
+# associated with them, some others don't. This is to catch crashes due to
+# the MTA.
+
+$sel->select_ok("flag_type-$flagtype1_id", "label=?");
+$sel->select_ok("flag_type-$flagtype2_id", "label=?");
+$sel->select_ok("flag_type-$flagtype3_id", "label=?");
+$sel->type_ok("comment", "Setting all 3 flags to ?");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# We need to store the new flag IDs.
+
+$sel->is_text_present_ok(
+  "$config->{admin_user_username}: SeleniumBugFlag1Test");
+my $flag1_1_id = $sel->get_attribute('//select[@title="bugflag1"]@id');
+$flag1_1_id =~ s/flag-//;
+$sel->is_text_present_ok(
+  "$config->{admin_user_username}: SeleniumBugFlag2Test");
+my $flag2_1_id = $sel->get_attribute('//select[@title="bugflag2"]@id');
+$flag2_1_id =~ s/flag-//;
+$sel->is_text_present_ok(
+  "$config->{admin_user_username}: SeleniumBugFlag3Test");
+my $flag3_1_id = $sel->get_attribute('//select[@title="bugflag3"]@id');
+$flag3_1_id =~ s/flag-//;
+
+$sel->is_text_present_ok("addl. SeleniumBugFlag1Test");
+$sel->is_text_present_ok("addl. SeleniumBugFlag2Test");
+ok(
+  !$sel->is_text_present("addl. SeleniumBugFlag3Test"),
+  "SeleniumBugFlag3Test is not multiplicable"
+);
+$sel->select_ok("flag_type-$flagtype1_id", "label=+");
+$sel->select_ok("flag_type-$flagtype2_id", "label=-");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# Now let's test requestees. SeleniumBugFlag2Test requires the requestee
+# to be in the editbugs group.
+
+$sel->select_ok("flag_type-$flagtype1_id", "label=?");
+$sel->type_ok("requestee_type-$flagtype1_id", $config->{admin_user_login});
+$sel->select_ok("flag_type-$flagtype2_id", "label=?");
+$sel->type_ok("requestee_type-$flagtype2_id",
+  $config->{unprivileged_user_login});
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Requestee Not Authorized");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->type_ok("requestee_type-$flagtype2_id", $config->{admin_user_login});
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# Final tests for bug flags.
+
+$sel->select_ok("flag-$flag1_1_id", "value=X");
+$sel->select_ok("flag-$flag2_1_id", "label=+");
+$sel->select_ok("flag-$flag3_1_id", "label=-");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# Now we test attachment flags.
+
+$sel->click_ok("link=Add an attachment");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "patch, v1");
+$sel->check_ok("ispatch");
+$sel->is_text_present_ok("SeleniumAttachmentFlag1Test");
+$sel->is_text_present_ok("SeleniumAttachmentFlag2Test");
+ok(
+  !$sel->is_text_present("SeleniumAttachmentFlag3Test"),
+  "Inactive SeleniumAttachmentFlag3Test flag type not displayed"
+);
+
+# Let's generate some "flagmail", first with no requestee.
+
+$sel->select_ok("flag_type-$aflagtype1_id", "label=?");
+$sel->select_ok("flag_type-$aflagtype2_id", "label=?");
+$sel->type_ok("comment", "patch for testing purposes only");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "create"});
+
+# Store the flag ID.
+
+my $alink = $sel->get_attribute('//a[@title="patch, v1"]@href');
+$alink =~ /id=(\d+)/;
+my $attachment1_id = $1;
+
+# Now create another attachment, and set requestees.
+
+$sel->click_ok("link=Create Another Attachment to Bug $bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "patch, v2");
+$sel->check_ok("ispatch");
+
+# Mark the previous attachment as obsolete.
+$sel->check_ok($attachment1_id);
+$sel->select_ok("flag_type-$aflagtype1_id", "label=?");
+$sel->type_ok("requestee_type-$aflagtype1_id", $config->{admin_user_login});
+$sel->select_ok("flag_type-$aflagtype2_id", "label=?");
+
+# The requestee is not in the Master group, and so he cannot view the bug.
+# He must be silently skipped from the requestee field.
+$sel->type_ok("requestee_type-$aflagtype2_id",
+  $config->{unprivileged_user_login});
+$sel->type_ok("comment", "second patch, with requestee");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "create"});
+$alink = $sel->get_attribute('//a[@title="patch, v2"]@href');
+$alink =~ /id=(\d+)/;
+my $attachment2_id = $1;
+
+# Create a third attachment, but we now set the MIME type manually.
+
+$sel->click_ok("link=Create Another Attachment to Bug $bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "patch, v3");
+$sel->click_ok("list");
+$sel->select_ok("contenttypeselection",     "label=plain text (text/plain)");
+$sel->select_ok("flag_type-$aflagtype1_id", "label=+");
+$sel->type_ok("comment", "one +, the other one blank");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "create"});
+$alink = $sel->get_attribute('//a[@title="patch, v3"]@href');
+$alink =~ /id=(\d+)/;
+my $attachment3_id = $1;
+
+# Display the bug and check flags are correctly set.
+
+$sel->click_ok("link=bug $bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->is_text_present_ok(
+  "$config->{admin_user_username}: SeleniumAttachmentFlag1Test? ($config->{admin_user_username})"
+);
+$sel->is_text_present_ok(
+  "$config->{admin_user_username}: SeleniumAttachmentFlag2Test?");
+$sel->is_text_present_ok(
+  "$config->{admin_user_username}: SeleniumAttachmentFlag1Test+");
+
+# We marked the first attachment as obsolete, so it should have no flag on it.
+$sel->is_text_present_ok("no flags");
+
+# Make the bug public and log out.
+
+$sel->uncheck_ok('//input[@name="groups" and @value="Master"]');
+edit_bug($sel, $bug1_id, $bug_summary);
+logout($sel);
+
+# As an unprivileged user, try to edit flags.
+
+log_in($sel, $config, 'unprivileged');
+go_to_bug($sel, $bug1_id);
+
+# No privs are required to clear this flag.
+$sel->select_ok("flag-$flag3_1_id", "value=X");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# editbugs privs are required to clear this flag, so no other option
+# should be displayed besides the currently set "+".
+
+my @flag_states = $sel->get_select_options("flag-$flag2_1_id");
+ok(scalar(@flag_states) == 1 && $flag_states[0] eq '+',
+  "Single flag state '+' available");
+
+# Powerless users cannot set the flag to +, but setting it to ? is allowed.
+
+@flag_states = $sel->get_select_options("flag_type-$flagtype1_id");
+ok(scalar @flag_states == 2, "Two flag states available");
+ok(grep($_ eq '?', @flag_states), "Flag state '?' available");
+
+# A powerless user cannot edit someone else's attachment flags.
+
+$sel->click_ok("//a[\@href='attachment.cgi?id=$attachment2_id&action=edit']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment $attachment2_id Details for Bug $bug1_id/);
+ok($sel->is_element_present('//select[@title="attachmentflag2" and @disabled]'),
+  "Attachment flags are not editable by a powerless user");
+
+# Add an attachment and set flags on it.
+
+$sel->click_ok("//a[contains(\@href, 'show_bug.cgi?id=$bug1_id')]");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/);
+$sel->click_ok("link=Add an attachment");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "patch, v4");
+$sel->value_is("ispatch",    "off");
+$sel->value_is("autodetect", "on");
+
+# canconfirm/editbugs privs are required to edit this flag.
+
+ok(!$sel->is_element_present("flag_type-$aflagtype1_id"),
+  "Flag type 'SeleniumAttachmentFlag1Test' not displayed to powerless users");
+
+# No privs are required to edit this flag.
+
+$sel->select_ok("flag_type-$aflagtype2_id", "label=+");
+$sel->type_ok("comment", "granting again");
+edit_bug_and_return($sel, $bug1_id, $bug_summary, {id => "create"});
+$sel->is_text_present_ok(
+  "$config->{unprivileged_user_username}: SeleniumAttachmentFlag2Test+");
+logout($sel);
+
+# Final tests as an admin. He has editbugs privs, so he can edit
+# someone else's patch.
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("//a[\@href='attachment.cgi?id=${attachment3_id}&action=edit']");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment $attachment3_id Details for Bug $bug1_id/);
+$sel->select_ok('//select[@title="attachmentflag1"]', "label=+");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "update"});
+
+# It's time to delete all created flag types.
+
+go_to_admin($sel);
+$sel->click_ok("link=Flags");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Administer Flag Types");
+
+foreach my $flagtype (
+  [$flagtype1_id,  "SeleniumBugFlag1Test"],
+  [$flagtype2_id,  "SeleniumBugFlag2Test"],
+  [$flagtype3_id,  "SeleniumBugFlag3Test"],
+  [$aflagtype1_id, "SeleniumAttachmentFlag1Test"],
+  [$aflagtype2_id, "SeleniumAttachmentFlag2Test"],
+  [$aflagtype3_id, "SeleniumAttachmentFlag3Test"]
+  )
+{
+  my $flag_id   = $flagtype->[0];
+  my $flag_name = $flagtype->[1];
+  $sel->click_ok(
+    "//a[\@href='editflagtypes.cgi?action=confirmdelete&id=$flag_id']");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Confirm Deletion of Flag Type '$flag_name'");
+  $sel->click_ok("link=Yes, delete");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Flag Type '$flag_name' Deleted");
+  my $msg = trim($sel->get_text("message"));
+  ok($msg eq "The flag type $flag_name has been deleted.",
+    "Flag type $flag_name deleted");
+}
+logout($sel);
diff --git a/xt/selenium/flags2.t b/xt/selenium/flags2.t
new file mode 100644
index 0000000000..cc8ef038d0
--- /dev/null
+++ b/xt/selenium/flags2.t
@@ -0,0 +1,333 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+################################################################
+# 2nd script about flags. This one is focused on flag behavior #
+# when moving a bug from one product/component to another one. #
+################################################################
+
+# We have to upload files from the local computer. This requires
+# chrome privileges.
+my ($sel, $config) = get_selenium(CHROME_MODE);
+
+# Start by creating a flag type for bugs.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Flags");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Administer Flag Types");
+$sel->click_ok("link=Create Flag Type for Bugs");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->type_ok("name",        "selenium");
+$sel->type_ok("description", "Available in TestProduct and Another Product/c1");
+$sel->add_selection_ok("inclusion_to_remove", "label=__Any__:__Any__");
+$sel->click_ok("categoryAction-removeInclusion");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->select_ok("product", "label=TestProduct");
+$sel->selected_label_is("component", "__Any__");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->select_ok("product",   "label=Another Product");
+$sel->select_ok("component", "label=c1");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+
+# This flag type must have a higher sortkey than the one we will create later.
+# The reason is that link=selenium will catch the first link with this name in
+# the UI, so when the second flag type with this name is created, we have to
+# catch it, not this one (which will be unique for now, so no worry to find it).
+
+$sel->type_ok("sortkey", 100);
+$sel->value_is("is_active",      "on");
+$sel->value_is("is_requestable", "on");
+$sel->click_ok("is_multiplicable");
+$sel->value_is("is_multiplicable", "off");
+$sel->select_ok("grant_group",   "label=editbugs");
+$sel->select_ok("request_group", "label=canconfirm");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'selenium' Created");
+$sel->is_text_present_ok("The flag type selenium has been created.");
+
+# Store the flag type ID.
+
+$sel->click_ok("link=selenium");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+my $flag_url = $sel->get_location();
+$flag_url =~ /id=(\d+)/;
+my $flagtype1_id = $1;
+
+# Now create a flag type for attachments in 'Another Product'.
+
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->click_ok("link=Create Flag Type For Attachments");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+$sel->type_ok("name",        "selenium_review");
+$sel->type_ok("description", "Review flag used by Selenium");
+$sel->add_selection_ok("inclusion_to_remove", "label=__Any__:__Any__");
+$sel->click_ok("categoryAction-removeInclusion");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+$sel->select_ok("product", "label=Another Product");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+$sel->type_ok("sortkey", 100);
+$sel->value_is("is_active",      "on");
+$sel->value_is("is_requestable", "on");
+$sel->click_ok("is_multiplicable");
+$sel->value_is("is_multiplicable", "off");
+$sel->selected_label_is("grant_group",   "(no group)");
+$sel->selected_label_is("request_group", "(no group)");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'selenium_review' Created");
+$sel->is_text_present_ok("The flag type selenium_review has been created.");
+
+# Store the flag type ID.
+
+$sel->click_ok("link=selenium_review");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$flag_url = $sel->get_location();
+$flag_url =~ /id=(\d+)/;
+my $aflagtype1_id = $1;
+
+# Create a 2nd flag type for attachments, with the same name
+# as the 1st one, but now *excluded* from 'Another Product'.
+
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->click_ok("link=Create Flag Type For Attachments");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->type_ok("name",        "selenium_review");
+$sel->type_ok("description", "Another review flag used by Selenium");
+$sel->select_ok("product", "label=Another Product");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Attachments");
+$sel->type_ok("sortkey", 50);
+$sel->value_is("is_active",        "on");
+$sel->value_is("is_requestable",   "on");
+$sel->value_is("is_multiplicable", "on");
+$sel->select_ok("grant_group",   "label=editbugs");
+$sel->select_ok("request_group", "label=canconfirm");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'selenium_review' Created");
+
+# Store the flag type ID.
+
+$sel->click_ok("link=selenium_review");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$flag_url = $sel->get_location();
+$flag_url =~ /id=(\d+)/;
+my $aflagtype2_id = $1;
+
+# We are done with the admin tasks. Now play with flags in bugs.
+
+file_bug_in_product($sel, 'TestProduct');
+$sel->select_ok("flag_type-$flagtype1_id", "label=+");
+my $bug_summary = "The selenium flag should be kept on product change";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "pom");
+$sel->click_ok('//input[@value="Add an attachment"]');
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "small patch");
+$sel->click_ok("ispatch");
+$sel->value_is("ispatch", "on");
+ok(
+  !$sel->is_element_present("flag_type-$aflagtype1_id"),
+  "Flag type $aflagtype1_id not available in TestProduct"
+);
+$sel->select_ok("flag_type-$aflagtype2_id", "label=-");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+$sel->is_text_present_ok("$config->{admin_user_username}: selenium");
+my $flag1_id = $sel->get_attribute(
+  '//select[@title="Available in TestProduct and Another Product/c1"]@id');
+$flag1_id =~ s/flag-//;
+$sel->selected_label_is("flag-$flag1_id", "+");
+$sel->is_text_present_ok("$config->{admin_user_username}: selenium_review-");
+
+# Now move the bug into the 'Another Product' product.
+# Both the bug and attachment flags should survive.
+
+$sel->select_ok("product", "label=Another Product");
+$sel->type_ok("comment",
+  "Moving to Another Product / c1. The flag should be preserved.");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Verify New Product Details...");
+$sel->select_ok("component", "label=c1");
+edit_bug_and_return($sel, $bug1_id, $bug_summary, {id => "change_product"});
+$sel->selected_label_is("flag-$flag1_id", "+");
+$sel->is_text_present_ok("$config->{admin_user_username}: selenium_review-");
+
+# Now moving the bug into the c2 component. The bug flag
+# won't survive, but the attachment flag should.
+
+$sel->type_ok("comment", "Moving to c2. The selenium flag will be deleted.");
+$sel->select_ok("component", "label=c2");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+ok(
+  !$sel->is_element_present("flag-$flag1_id"),
+  "The selenium bug flag didn't survive"
+);
+ok(!$sel->is_element_present("flag_type-$flagtype1_id"),
+  "The selenium flag type doesn't exist");
+$sel->is_text_present_ok("$config->{admin_user_username}: selenium_review-");
+
+# File a bug in 'Another Product / c2' and assign it
+# to a powerless user, so that he can move it later.
+
+file_bug_in_product($sel, 'Another Product');
+$sel->select_ok("component", "label=c2");
+$sel->type_ok("assigned_to", $config->{unprivileged_user_login});
+ok(!$sel->is_editable("flag_type-$flagtype1_id"),
+  "The selenium bug flag type is displayed but not selectable");
+$sel->select_ok("component", "label=c1");
+$sel->is_editable_ok("flag_type-$flagtype1_id",
+  "The selenium bug flag type is not selectable");
+$sel->select_ok("flag_type-$flagtype1_id", "label=?");
+my $bug_summary2 = "Create a new selenium flag for c2";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    ".");
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+$sel->is_text_present_ok("$config->{admin_user_username}: selenium");
+my $flag2_id = $sel->get_attribute(
+  '//select[@title="Available in TestProduct and Another Product/c1"]@id');
+$flag2_id =~ s/flag-//;
+$sel->selected_label_is("flag-$flag2_id", '?');
+
+# Create a 2nd bug flag type, again named 'selenium', but now
+# for the 'Another Product / c2' component only.
+
+go_to_admin($sel);
+$sel->click_ok("link=Flags");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Administer Flag Types");
+$sel->click_ok("link=Create Flag Type for Bugs");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->type_ok("name",        "selenium");
+$sel->type_ok("description", "Another flag with the selenium name");
+$sel->add_selection_ok("inclusion_to_remove", "label=__Any__:__Any__");
+$sel->click_ok("categoryAction-removeInclusion");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->select_ok("product",   "label=Another Product");
+$sel->select_ok("component", "label=c2");
+$sel->click_ok("categoryAction-include");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create Flag Type for Bugs");
+$sel->type_ok("sortkey", 50);
+$sel->value_is("is_active",        "on");
+$sel->value_is("is_requestable",   "on");
+$sel->value_is("is_multiplicable", "on");
+$sel->selected_label_is("grant_group",   "(no group)");
+$sel->selected_label_is("request_group", "(no group)");
+$sel->click_ok("save");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Flag Type 'selenium' Created");
+
+# Store the flag type ID.
+
+$sel->click_ok("link=selenium");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$flag_url = $sel->get_location();
+$flag_url =~ /id=(\d+)/;
+my $flagtype2_id = $1;
+
+# Now move the bug from c1 into c2. The bug flag should survive.
+
+go_to_bug($sel, $bug2_id);
+$sel->select_ok("component", "label=c2");
+ok(!$sel->is_checked("set_default_assignee"),
+  "Moving the bug into another component must not change the assignee");
+$sel->type_ok("comment", "The selenium flag should be preserved.");
+edit_bug_and_return($sel, $bug2_id, $bug_summary2);
+$sel->selected_label_is("flag-$flag2_id", '?');
+ok(!$sel->is_element_present("flag_type-$flagtype1_id"),
+  "Flag type not available in component c2");
+$sel->is_element_present_ok("flag_type-$flagtype2_id");
+logout($sel);
+
+# Powerless users can edit the 'selenium' flag being in c2.
+
+log_in($sel, $config, 'unprivileged');
+go_to_bug($sel, $bug2_id);
+$sel->select_ok("flag-$flag2_id", "label=+");
+edit_bug_and_return($sel, $bug2_id, $bug_summary2);
+$sel->selected_label_is("flag-$flag2_id", "+");
+
+# But moving the bug into TestProduct will delete the flag
+# as the flag setter is not in the editbugs group.
+
+$sel->select_ok("product", "label=TestProduct");
+$sel->type_ok("comment",
+  "selenium flag will be lost. I don't have editbugs privs.");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Verify New Product Details...");
+edit_bug_and_return($sel, $bug2_id, $bug_summary2, {id => "change_product"});
+ok(!$sel->is_element_present("flag-$flag2_id"), "Flag $flag2_id deleted");
+ok(
+  !$sel->is_element_present("flag_type-$flagtype1_id"),
+  "Flag type 'selenium' not displayed to powerless users"
+);
+ok(!$sel->is_element_present("flag_type-$flagtype2_id"),
+  "Flag type not available in component c1");
+logout($sel);
+
+# Time to delete created flag types.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Flags");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Administer Flag Types");
+
+foreach my $flagtype (
+  [$flagtype1_id,  "selenium"],
+  [$flagtype2_id,  "selenium"],
+  [$aflagtype1_id, "selenium_review"],
+  [$aflagtype2_id, "selenium_review"]
+  )
+{
+  my $flag_id   = $flagtype->[0];
+  my $flag_name = $flagtype->[1];
+  $sel->click_ok(
+    "//a[\@href='editflagtypes.cgi?action=confirmdelete&id=$flag_id']");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Confirm Deletion of Flag Type '$flag_name'");
+  $sel->click_ok("link=Yes, delete");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Flag Type '$flag_name' Deleted");
+  my $msg = trim($sel->get_text("message"));
+  ok($msg eq "The flag type $flag_name has been deleted.",
+    "Flag type $flag_name deleted");
+}
+logout($sel);
diff --git a/xt/selenium/groups.t b/xt/selenium/groups.t
new file mode 100644
index 0000000000..18f53313d6
--- /dev/null
+++ b/xt/selenium/groups.t
@@ -0,0 +1,429 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Add the new Selenium-test group.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Add Group");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Add group");
+$sel->type_ok("name", "Selenium-test");
+$sel->type_ok("desc", "Test group for Selenium");
+$sel->check_ok("isactive");
+$sel->uncheck_ok("insertnew");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("New Group Created");
+my $group_id = $sel->get_value("group_id");
+
+# Mark the Selenium-test group as Shown/Mandatory for TestProduct.
+
+edit_product($sel, "TestProduct");
+$sel->click_ok("link=Edit Group Access Controls:");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Group Controls for TestProduct");
+$sel->is_text_present_ok("Selenium-test");
+$sel->select_ok("membercontrol_${group_id}", "label=Shown");
+$sel->select_ok("othercontrol_${group_id}",  "label=Mandatory");
+$sel->click_ok("submit");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Update group access controls for TestProduct");
+
+# File a new bug in the TestProduct product, and restrict it to the bug group.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->is_text_present_ok("Test group for Selenium");
+$sel->value_is("group_${group_id}", "off");    # Must be OFF (else that's a bug)
+$sel->check_ok("group_${group_id}");
+my $bug_summary = "bug restricted to the Selenium group";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "should be invisible");
+$sel->selected_label_is("component", "TestComponent");
+my $bug1_id = create_bug($sel, $bug_summary);
+$sel->is_text_present_ok("Test group for Selenium");
+$sel->value_is("group_${group_id}", "on");     # Must be ON
+
+# Look for this new bug and add it to the new "Selenium bugs" saved search.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product", "TestProduct");
+$sel->remove_all_selections("bug_status");
+$sel->add_selection_ok("bug_status", "UNCONFIRMED");
+$sel->add_selection_ok("bug_status", "CONFIRMED");
+$sel->select_ok("f1", "Group");
+$sel->select_ok("o1", "is equal to");
+$sel->type_ok("v1", "Selenium-test");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("One bug found");
+$sel->is_text_present_ok("bug restricted to the Selenium group");
+$sel->type_ok("save_newqueryname", "Selenium bugs");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->is_text_present_ok("OK, you have a new search named Selenium bugs");
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_text_present_ok("One bug found");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+
+# No longer use Selenium-test as a bug group.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Selenium-test");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->value_is("isactive", "on");
+$sel->click_ok("isactive");
+$sel->click_ok('//input[@value="Update Group"]');
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->is_text_present_ok("The group will no longer be used for bugs");
+
+# File another new bug, now visible as the bug group is disabled.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->selected_label_is("component", "TestComponent");
+my $bug_summary2 = "bug restricted to the Selenium group";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",
+  "should be *visible* when created (the group is disabled)");
+ok(!$sel->is_text_present("Test group for Selenium"),
+  "Selenium-test group unavailable");
+ok(!$sel->is_element_present("group_${group_id}"),
+  "Selenium-test checkbox not present");
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+# Make sure the new bug doesn't appear in the "Selenium bugs" saved search.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_text_present_ok("One bug found");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+ok(
+  !$sel->is_element_present("b$bug2_id"),
+  "Bug $bug2_id NOT restricted to the bug group"
+);
+
+# Re-enable the Selenium-test group as bug group. This doesn't affect
+# already filed bugs as this group is not mandatory.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Selenium-test");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->value_is("isactive", "off");
+$sel->click_ok("isactive");
+$sel->title_is("Change Group: Selenium-test");
+$sel->click_ok('//input[@value="Update Group"]');
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->is_text_present_ok("The group will now be used for bugs");
+
+# Make sure the second filed bug has not been added to the bug group.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_text_present_ok("One bug found");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+ok(
+  !$sel->is_element_present("b$bug2_id"),
+  "Bug $bug2_id NOT restricted to the bug group"
+);
+
+# Make the Selenium-test group mandatory for TestProduct.
+
+edit_product($sel, "TestProduct");
+$sel->is_text_present_ok("Selenium-test:Shown/Mandatory");
+$sel->click_ok("link=Edit Group Access Controls:");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->select_ok("membercontrol_${group_id}", "Mandatory");
+$sel->click_ok("submit");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Confirm Group Control Change for product 'TestProduct'");
+$sel->is_text_present_ok("this group is mandatory and will be added");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Update group access controls for TestProduct");
+$sel->is_text_present_ok(
+  'regexp:Adding bugs to group \'Selenium-test\' which is now mandatory for this product'
+);
+
+# All bugs being in TestProduct must now be restricted to the bug group.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug2_id", undef,
+  "Bug $bug2_id restricted to the bug group");
+
+# File a new bug, which must automatically be restricted to the bug group.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->selected_label_is("component", "TestComponent");
+my $bug_summary3 = "Selenium-test group mandatory";
+$sel->type_ok("short_desc", $bug_summary3);
+$sel->type_ok("comment",    "group enabled");
+ok(!$sel->is_text_present("Test group for Selenium"),
+  "Selenium-test group not available");
+ok(
+  !$sel->is_element_present("group_${group_id}"),
+  "Selenium-test checkbox not present (mandatory group)"
+);
+my $bug3_id = create_bug($sel, $bug_summary3);
+
+# Make sure all three bugs are listed as being restricted to the bug group.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug2_id", undef,
+  "Bug $bug2_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug3_id", undef,
+  "Bug $bug3_id restricted to the bug group");
+
+# Turn off the Selenium-test group again.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Selenium-test");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->value_is("isactive", "on");
+$sel->click_ok("isactive");
+$sel->click_ok("//input[\@value='Update Group']");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->is_text_present_ok("The group will no longer be used for bugs");
+
+# File a bug again. It should not be added to the bug group as this one is disabled.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->selected_label_is("component", "TestComponent");
+my $bug_summary4 = "bug restricted to the Selenium-test group";
+$sel->type_ok("short_desc", $bug_summary4);
+$sel->type_ok("comment",    "group disabled");
+ok(!$sel->is_text_present("Test group for Selenium"),
+  "Selenium-test group not available");
+ok(!$sel->is_element_present("group_${group_id}"),
+  "Selenium-test checkbox not present");
+my $bug4_id = create_bug($sel, $bug_summary4);
+
+# The last bug must not be in the list.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug2_id", undef,
+  "Bug $bug2_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug3_id", undef,
+  "Bug $bug3_id restricted to the bug group");
+ok(
+  !$sel->is_element_present("b$bug4_id"),
+  "Bug $bug4_id NOT restricted to the bug group"
+);
+
+# Re-enable the mandatory group. All bugs should be restricted to this bug group automatically.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Selenium-test");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->value_is("isactive", "off");
+$sel->click_ok("isactive");
+$sel->click_ok("//input[\@value='Update Group']");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->is_text_present_ok("The group will now be used for bugs");
+
+# Make sure all bugs are restricted to the bug group.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_element_present_ok("b$bug1_id", undef,
+  "Bug $bug1_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug2_id", undef,
+  "Bug $bug2_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug3_id", undef,
+  "Bug $bug3_id restricted to the bug group");
+$sel->is_element_present_ok("b$bug4_id", undef,
+  "Bug $bug4_id restricted to the bug group");
+
+# Try to remove the Selenium-test group from TestProduct, but DON'T do it!
+# We just want to make sure a warning is displayed about this removal.
+
+edit_product($sel, "TestProduct");
+$sel->is_text_present_ok("Selenium-test:Mandatory/Mandatory");
+$sel->click_ok("link=Edit Group Access Controls:");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Group Controls for TestProduct");
+$sel->is_text_present_ok("Selenium-test");
+$sel->select_ok("membercontrol_${group_id}", "NA");
+$sel->select_ok("othercontrol_${group_id}",  "NA");
+$sel->click_ok("submit");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Confirm Group Control Change for product 'TestProduct'");
+$sel->is_text_present_ok(
+  "this group is no longer applicable and will be removed");
+
+# Make sure that renaming a group which is used as a special group
+# (such as insidergroup or querysharegroup) is correctly propagated
+# and that you cannot delete this group.
+
+set_parameters(
+  $sel,
+  {
+    "Group Security" =>
+      {"querysharegroup" => {type => "select", value => "Selenium-test"}}
+  }
+);
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Selenium-test");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->type_ok("name", "X-Selenium-Y");
+$sel->click_ok("update-group");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: X-Selenium-Y");
+$sel->is_text_present_ok("The name was changed to 'X-Selenium-Y'");
+
+go_to_admin($sel);
+$sel->click_ok("link=Parameters");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Configuration: Required Settings");
+$sel->click_ok("link=Group Security");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Configuration: Group Security");
+$sel->value_is("querysharegroup", "X-Selenium-Y");
+
+# There is no UI to delete this group, so we have to type the URL directly.
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/editgroups.cgi?action=del&group=$group_id");
+$sel->title_is("Group not deletable");
+$sel->is_text_present_ok(
+  "The group 'X-Selenium-Y' is used by the 'querysharegroup' parameter");
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/editgroups.cgi?action=delete&group=$group_id"
+);
+$sel->title_is("Suspicious Action");
+$sel->is_text_present_ok(
+  "you have no valid token for the delete_group action while processing the 'editgroups.cgi' script"
+);
+$sel->click_ok("confirm");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Group not deletable");
+$sel->is_text_present_ok(
+  "The group 'X-Selenium-Y' is used by the 'querysharegroup' parameter");
+
+set_parameters($sel,
+  {"Group Security" => {"querysharegroup" => {type => "select", value => ""}}});
+
+# Revert the group name change to not mess with the subsequent tests
+# which expect to see 'Selenium-test'.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=X-Selenium-Y");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: X-Selenium-Y");
+$sel->type_ok("name", "Selenium-test");
+$sel->click_ok("update-group");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: Selenium-test");
+$sel->is_text_present_ok("The name was changed to 'Selenium-test'");
+
+# Delete the Selenium-test group.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("//a[\@href='editgroups.cgi?action=del&group=${group_id}']");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_like(qr/^Delete group/);
+$sel->is_text_present_ok("Do you really want to delete this group?");
+$sel->is_element_present_ok("removebugs");
+$sel->value_is("removebugs", "off");
+$sel->is_text_present_ok("Remove all bugs from this group restriction for me");
+$sel->is_element_present_ok("unbind");
+$sel->value_is("unbind", "off");
+$sel->is_text_present_ok("remove these controls");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Cannot Delete Group");
+my $error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /^The Selenium-test group cannot be deleted/,
+  "Group is in use - not deletable");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->check("removebugs");
+$sel->check("unbind");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Group Deleted");
+$sel->is_text_present_ok("The group Selenium-test has been deleted.");
+
+# No more bugs listed in the saved search as the bug group is gone.
+
+$sel->click_ok("link=Selenium bugs");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: Selenium bugs");
+$sel->is_text_present_ok("Zarro Boogs found");
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Search is gone");
+$sel->is_text_present_ok("OK, the Selenium bugs search is gone.");
+logout($sel);
diff --git a/xt/selenium/keywords.t b/xt/selenium/keywords.t
new file mode 100644
index 0000000000..06a318b1d7
--- /dev/null
+++ b/xt/selenium/keywords.t
@@ -0,0 +1,186 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Create keywords. Do some cleanup first if necessary.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Keywords");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select keyword");
+
+# If keywords already exist, delete them to not disturb the test.
+
+my $page     = $sel->get_body_text();
+my @keywords = $page =~ m/(key-selenium-\w+)/gi;
+
+foreach my $keyword (@keywords) {
+  my $url = $sel->get_attribute("link=$keyword\@href");
+  $url =~ s/action=edit/action=del/;
+  $sel->click_ok("//a[\@href='$url']");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Delete Keyword");
+  $sel->click_ok("delete");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Keyword Deleted");
+}
+
+# Now let's create our first keyword.
+
+go_to_admin($sel);
+$sel->click_ok("link=Keywords");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select keyword");
+$sel->click_ok("link=Add a new keyword");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Add keyword");
+$sel->type_ok("name",        "key-selenium-kone");
+$sel->type_ok("description", "Hopefully an ice cream");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("New Keyword Created");
+
+# Try create the same keyword, to check validators.
+
+$sel->click_ok("link=Add a new keyword");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Add keyword");
+$sel->type_ok("name",        "key-selenium-kone");
+$sel->type_ok("description", "FIX ME!");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Keyword Already Exists");
+my $error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg eq 'A keyword with the name key-selenium-kone already exists.',
+  'Already created keyword');
+$sel->go_back_ok();
+$sel->wait_for_page_to_load(WAIT_TIME);
+
+# Create a second keyword.
+
+$sel->type_ok("name",        "key-selenium-ktwo");
+$sel->type_ok("description", "FIX ME!");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("New Keyword Created");
+
+# Again test validators.
+
+$sel->click_ok("link=key-selenium-ktwo");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit keyword");
+$sel->type_ok("name",        "key-selenium-kone");
+$sel->type_ok("description", "the second keyword");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Keyword Already Exists");
+$error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg eq 'A keyword with the name key-selenium-kone already exists.',
+  'Already created keyword');
+$sel->go_back_ok();
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit keyword");
+$sel->type_ok("name", "key-selenium-ktwo");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Keyword Updated");
+
+# Add keywords to bugs
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+$sel->type_ok("keywords", "key-selenium-kone");
+my $bug_summary = "It's a beautiful day";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "This bug is to test keywords");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+$sel->type_ok("keywords", "key-selenium-kone, key-selenium-ktwo");
+my $bug_summary2 = "Radio gaga";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",
+  "This bug is also to test keywords, like bug $bug1_id");
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+# Now make sure these bugs correctly appear in buglists.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections("product");
+$sel->remove_all_selections("bug_status");
+$sel->type_ok("keywords", "key-selenium-kone");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("2 bugs found");
+
+$sel->click_ok("link=Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Search for bugs");
+$sel->remove_all_selections("product");
+$sel->remove_all_selections("bug_status");
+
+# Try with a different case than the one in the DB.
+$sel->type_ok("keywords", "key-selenium-ktWO");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("One bug found");
+
+$sel->click_ok("link=Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Search for bugs");
+$sel->remove_all_selections("product");
+$sel->remove_all_selections("bug_status");
+
+# Substrings also work for keywords.
+$sel->type_ok("keywords", "selenium");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("2 bugs found");
+
+# Make sure describekeywords.cgi works as expected.
+
+$sel->click_ok("link=$bug_summary");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->click_ok("link=Keywords:");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bugzilla Keyword Descriptions");
+$sel->is_text_present_ok("key-selenium-kone");
+$sel->is_text_present_ok("Hopefully an ice cream");
+$sel->is_text_present_ok("key-selenium-ktwo");
+$sel->is_text_present_ok("the second keyword");
+$sel->click_ok('//a[@href="buglist.cgi?keywords=key-selenium-kone"]');
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_element_present_ok("link=$bug1_id");
+$sel->is_element_present_ok("link=$bug2_id");
+$sel->is_text_present_ok("2 bugs found");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->click_ok('//a[@href="buglist.cgi?keywords=key-selenium-ktwo"]');
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_element_present_ok("link=$bug2_id");
+$sel->is_text_present_ok("One bug found");
+logout($sel);
diff --git a/xt/selenium/login.t b/xt/selenium/login.t
new file mode 100644
index 0000000000..73c756855a
--- /dev/null
+++ b/xt/selenium/login.t
@@ -0,0 +1,38 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# FIXME - At some point, this trivial script should be merged with test_create_user_accounts.t.
+#       Either that or we should improve this script a lot.
+
+# Try to log in to Bugzilla using an invalid account. To be sure that the login form
+# is triggered, we try to file a new bug.
+
+go_to_home($sel, $config);
+$sel->click_ok("link=New");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Log in to Bugzilla");
+
+# The login and password are hardcoded here, because this account doesn't exist.
+$sel->type_ok("Bugzilla_login",    'guest@foo.com');
+$sel->type_ok("Bugzilla_password", 'foo-bar-baz');
+$sel->click_ok("log_in");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Invalid Login Or Password");
+$sel->is_text_present_ok("The login or password you entered is not valid.");
diff --git a/xt/selenium/milestones.t b/xt/selenium/milestones.t
new file mode 100644
index 0000000000..7e714e8af9
--- /dev/null
+++ b/xt/selenium/milestones.t
@@ -0,0 +1,168 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# 1st step: turn on usetargetmilestone and letsubmitterchoosemilestone.
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    'Bug Fields'          => {'usetargetmilestone-on'          => undef},
+    'Bug Change Policies' => {'letsubmitterchoosemilestone-on' => undef},
+  }
+);
+
+# 2nd step: Add the milestone "2.0" (with sortkey = 10) to the TestProduct product.
+
+edit_product($sel, "TestProduct");
+$sel->click_ok("link=Edit milestones:", undef,
+  "Go to the Edit milestones page");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select milestone of product 'TestProduct'",
+  "Display milestones");
+$sel->click_ok("link=Add", undef, "Go add a new milestone");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Add Milestone to Product 'TestProduct'", "Enter new milestone");
+$sel->type_ok("milestone", "2.0", "Set its name to 2.0");
+$sel->type_ok("sortkey",   "10",  "Set its sortkey to 10");
+$sel->click_ok("create", undef, "Submit data");
+$sel->wait_for_page_to_load(WAIT_TIME);
+
+# If the milestone already exists, that's not a big deal. So no special action
+# is required in this case.
+$sel->title_is("Milestone Created", "Milestone Created");
+
+# 3rd step: file a new bug, leaving the milestone alone (should fall back to the default one).
+
+file_bug_in_product($sel, "TestProduct");
+$sel->selected_label_is("component", "TestComponent",
+  "Component already selected (no other component defined)");
+$sel->selected_label_is("target_milestone", "---",
+  "Default milestone selected");
+$sel->selected_label_is("version", "unspecified",
+  "Version already selected (no other version defined)");
+my $bug_summary = "Target Milestone left to default";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",
+  "Created by Selenium to test 'musthavemilestoneonaccept'");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# 4th step: edit the bug
+
+go_to_bug($sel, $bug1_id);
+$sel->select_ok("bug_status", "label=IN_PROGRESS",
+  "Change bug status to IN_PROGRESS");
+$sel->select_ok("target_milestone", "label=2.0",
+  "Select a non-default milestone");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# 5th step: create another bug.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("target_milestone", "label=2.0", "Set the milestone to 2.0");
+$sel->selected_label_is("component", "TestComponent",
+  "Component already selected (no other component defined)");
+$sel->selected_label_is("version", "unspecified",
+  "Version already selected (no other version defined)");
+my $bug_summary2 = "Target Milestone set to non-default";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "Created by Selenium to test milestone support");
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+# 6th step: edit the bug
+
+$sel->select_ok("bug_status", "label=IN_PROGRESS");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+# 7th step: test validation methods for milestones.
+
+go_to_admin($sel);
+$sel->click_ok("link=milestones");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit milestones for which product?");
+$sel->click_ok("link=TestProduct");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select milestone of product 'TestProduct'");
+$sel->click_ok("link=2.0");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Milestone '2.0' of product 'TestProduct'");
+$sel->type_ok("milestone", "1.0");
+$sel->value_is("milestone", "1.0");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Milestone Updated");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Add Milestone to Product 'TestProduct'");
+$sel->type_ok("milestone", "1.5");
+$sel->value_is("milestone", "1.5");
+$sel->type_ok("sortkey", "99999999999999999");
+$sel->value_is("sortkey", "99999999999999999");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Invalid Milestone Sortkey");
+my $error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /^The sortkey '99999999999999999' is not in the range/,
+  "Invalid sortkey");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->type_ok("sortkey", "-polu7A");
+$sel->value_is("sortkey", "-polu7A");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Invalid Milestone Sortkey");
+$error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /^The sortkey '-polu7A' is not in the range/,
+  "Invalid sortkey");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->click_ok("link='TestProduct'");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select milestone of product 'TestProduct'");
+$sel->click_ok("link=Delete");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Delete Milestone of Product 'TestProduct'");
+$sel->is_text_present_ok("When you delete this milestone",
+  undef, "Warn the user about bugs being affected");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Milestone Deleted");
+
+# 8th step: make sure the (now deleted) milestone of the bug has fallen back to the default milestone.
+
+go_to_bug($sel, $bug1_id);
+$sel->is_text_present_ok('regexp:Target Milestone:\W+---',
+  undef, "Milestone has fallen back to the default milestone");
+
+# 9th step: file another bug.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->selected_label_is("target_milestone", "---",
+  "Default milestone selected");
+$sel->selected_label_is("component", "TestComponent");
+my $bug_summary3 = "Only one Target Milestone available";
+$sel->type_ok("short_desc", $bug_summary3);
+$sel->type_ok("comment",    "Created by Selenium to test milestone support");
+my $bug3_id = create_bug($sel, $bug_summary3);
+
+$sel->select_ok("bug_status", "label=IN_PROGRESS");
+edit_bug($sel, $bug3_id, $bug_summary3);
+
+logout($sel);
diff --git a/xt/selenium/password_complexity.t b/xt/selenium/password_complexity.t
new file mode 100644
index 0000000000..840611d26c
--- /dev/null
+++ b/xt/selenium/password_complexity.t
@@ -0,0 +1,151 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+log_in($sel, $config, 'admin');
+
+set_parameters(
+  $sel,
+  {
+    "Administrative Policies" => {"allowuserdeletion-on" => undef},
+    "User Authentication" =>
+      {"createemailregexp" => {type => "text", value => '.*'}}
+  }
+);
+
+# Set the password complexity to MIXED LETTERS.
+# Password must contain at least one UPPER and one lowercase letter.
+my @invalid_mixed_letter = qw(lowercase UPPERCASE 1234567890 123lowercase
+  123UPPERCASE !@%&^lower !@&^UPPER);
+
+check_passwords($sel, 'mixed_letters', \@invalid_mixed_letter,
+  ['PaSSwOrd', '%9rT#j22S']);
+
+# Set the password complexity to LETTERS AND NUMBERS.
+# Passwords must contain at least one UPPER and one lower case letter and a number.
+my @invalid_letter_number = (@invalid_mixed_letter, qw(lowerUPPER 123!@%^$));
+
+check_passwords($sel, 'letters_numbers', \@invalid_letter_number,
+  ['-UniCode6.3', 'UNO54sun']);
+
+# Set the password complexity to LETTERS, NUMBERS AND SPECIAL CHARACTERS.
+# Passwords must contain at least one letter, a number and a special character.
+my @invalid_letter_number_splchar
+  = (qw(!@%^&~* lowerUPPER123), @invalid_letter_number);
+
+check_passwords(
+  $sel,
+  'letters_numbers_specialchars',
+  \@invalid_letter_number_splchar,
+  ['@gu731', 'HU%m70?']
+);
+
+# Set the password complexity to No Constraints.
+check_passwords(
+  $sel, 'no_constraints',
+  ['12xY!',    'aaaaa'],
+  ['aaaaaaaa', '>F12Xy?']
+);
+
+logout($sel);
+
+
+sub check_passwords {
+  my ($sel, $param, $invalid_passwords, $valid_passwords) = @_;
+
+  set_parameters(
+    $sel,
+    {
+      "User Authentication" =>
+        {"password_complexity" => {type => "select", value => $param}}
+    }
+  );
+  my $new_user = 'selenium-' . random_string(10) . '@bugzilla.org';
+
+  go_to_admin($sel);
+  $sel->click_ok("link=Users");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is('Search users');
+  $sel->click_ok('link=add a new user');
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is('Add user');
+  $sel->type_ok('email', $new_user);
+
+  foreach my $password (@$invalid_passwords) {
+    $sel->type_ok('password', $password, 'Enter password');
+    $sel->click_ok('add');
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    if ($param eq 'no_constraints') {
+      $sel->title_is('Password Too Short');
+    }
+    else {
+      $sel->title_is('Password Fails Requirements');
+    }
+
+    my $error_msg = trim($sel->get_text("error_msg"));
+    if ($param eq 'mixed_letters') {
+      ok(
+        $error_msg =~ /UPPERCASE letter.*lowercase letter/,
+        "Mixed letter password fails requirement: $password"
+      );
+    }
+    elsif ($param eq 'letters_numbers') {
+      ok(
+        $error_msg =~ /UPPERCASE letter.*lowercase letter.*digit/,
+        "Letter & Number password fails requirement: $password"
+      );
+
+    }
+    elsif ($param eq 'letters_numbers_specialchars') {
+      ok($error_msg =~ /letter.*special character.*digit/,
+        "Letter, Number & Special Character password fails requirement: $password");
+    }
+    else {
+      ok($error_msg =~ /The password must be at least \d+ characters long/,
+        "Password Too Short: $password");
+    }
+    $sel->go_back_ok();
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  }
+
+  my $created = 0;
+
+  foreach my $password (@$valid_passwords) {
+    $sel->type_ok('password', $password, 'Enter password');
+    $sel->click_ok($created ? 'update' : 'add');
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is($created ? "User $new_user updated" : "Edit user $new_user");
+    my $msg = trim($sel->get_text('message'));
+    if ($created++) {
+      ok($msg =~ /A new password has been set/, 'Account updated');
+    }
+    else {
+      ok($msg =~ /The user account $new_user has been created successfully/,
+        'Account created');
+    }
+  }
+
+  return unless $created;
+
+  $sel->click_ok('delete');
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Confirm deletion of user $new_user");
+  $sel->click_ok('delete');
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("User $new_user deleted");
+}
diff --git a/xt/selenium/private_attachments.t b/xt/selenium/private_attachments.t
new file mode 100644
index 0000000000..203c51f843
--- /dev/null
+++ b/xt/selenium/private_attachments.t
@@ -0,0 +1,209 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+# We have to upload files from the local computer. This requires
+# chrome privileges.
+my ($sel, $config) = get_selenium(CHROME_MODE);
+
+# set the insidergroup parameter to the admin group, and make sure
+# we can view and delete attachments.
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "Group Security" => {"insidergroup" => {type => "select", value => "admin"}},
+    "Attachments"    => {
+      "allow_attachment_display-on"  => undef,
+      "allow_attachment_deletion-on" => undef
+    }
+  }
+);
+
+# First create a new bug with a private attachment.
+
+file_bug_in_product($sel, "TestProduct");
+my $bug_summary = "Some comments are private";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "and some attachments too, like this one.");
+$sel->check_ok("comment_is_private");
+$sel->click_ok('//input[@value="Add an attachment"]');
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "private attachment, v1");
+$sel->check_ok("ispatch");
+my $bug1_id = create_bug($sel, $bug_summary);
+$sel->is_text_present_ok("private attachment, v1 (");
+$sel->is_text_present_ok("and some attachments too, like this one.");
+$sel->is_checked_ok(
+  '//a[@id="comment_link_0"]/../..//div//input[@type="checkbox"]');
+
+# Now attach a public patch to the existing bug.
+
+$sel->click_ok("link=Add an attachment");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "public attachment, v2");
+$sel->check_ok("ispatch");
+
+# The existing attachment name must be displayed, to mark it as obsolete.
+$sel->is_text_present_ok("private attachment, v1");
+$sel->type_ok("comment", "this patch is public. Everyone can see it.");
+$sel->value_is("isprivate", "off");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "create"});
+
+# We need to store the attachment ID.
+
+$sel->is_text_present_ok("public attachment, v2");
+my $alink = $sel->get_attribute('//a[@title="public attachment, v2"]@href');
+$alink =~ /id=(\d+)/;
+my $attachment1_id = $1;
+$sel->is_text_present_ok("this patch is public. Everyone can see it.");
+ok(
+  !$sel->is_checked(
+    '//a[@id="comment_link_1"]/../..//div//input[@type="checkbox"]'),
+  "Public attachment is visible"
+);
+logout($sel);
+
+# A logged out user cannot see the private attachment, only the public one.
+# Same for a user with no privs.
+
+foreach my $user ('', 'unprivileged') {
+  log_in($sel, $config, $user) if $user;
+  go_to_bug($sel, $bug1_id);
+  ok(!$sel->is_text_present("private attachment, v1"),
+    "Private attachment not visible");
+  $sel->is_text_present_ok("public attachment, v2");
+  ok(!$sel->is_text_present("and some attachments too, like this one"),
+    "Private comment not visible");
+  $sel->is_text_present_ok("this patch is public. Everyone can see it.");
+}
+
+# A powerless user can comment on attachments he doesn't own.
+
+$sel->click_ok(
+  '//a[@href="attachment.cgi?id=' . $attachment1_id . '&action=edit"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment $attachment1_id Details for Bug $bug1_id/);
+$sel->is_text_present_ok("created by admin");
+$sel->type_ok("comment", "This attachment is not mine.");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "update"});
+$sel->is_text_present_ok("This attachment is not mine");
+
+# Powerless users will always be able to view their own attachments, even
+# when those are marked private by a member of the insider group.
+
+$sel->click_ok("link=Add an attachment");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok("data", $config->{attachment_file});
+$sel->check_ok("ispatch");
+
+# The user doesn't have editbugs privs.
+ok(
+  !$sel->is_text_present(
+    "Check each existing attachment made obsolete by your new attachment"),
+  "No attachments can be marked as obsolete"
+);
+$sel->type_ok("description", "My patch, which I should see, always");
+$sel->type_ok("comment",     "This is my patch!");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "create"});
+$sel->is_text_present_ok("My patch, which I should see, always (");
+$alink = $sel->get_attribute(
+  '//a[@title="My patch, which I should see, always"]@href');
+$alink =~ /id=(\d+)/;
+my $attachment2_id = $1;
+$sel->is_text_present_ok("This is my patch!");
+logout($sel);
+
+# Let the admin mark the powerless user's attachment as private.
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+$sel->click_ok(
+  '//a[@href="attachment.cgi?id=' . $attachment2_id . '&action=edit"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment $attachment2_id Details for Bug $bug1_id/);
+$sel->check_ok("isprivate");
+$sel->type_ok("comment", "Making the powerless user's patch private.");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "update"});
+$sel->is_text_present_ok("My patch, which I should see, always (");
+$sel->is_checked_ok(
+  '//a[@id="comment_link_4"]/../..//div//input[@type="checkbox"]');
+$sel->is_text_present_ok("Making the powerless user's patch private.");
+logout($sel);
+
+# A logged out user cannot see private attachments.
+
+go_to_bug($sel, $bug1_id);
+ok(
+  !$sel->is_text_present("private attachment, v1"),
+  "Private attachment not visible to logged out users"
+);
+ok(
+  !$sel->is_text_present("My patch, which I should see, always ("),
+  "Private attachment not visible to logged out users"
+);
+$sel->is_text_present_ok("This is my patch!");
+ok(!$sel->is_text_present("Making the powerless user's patch private"),
+  "Private comment not visible to logged out users");
+
+# A powerless user can only see private attachments he owns.
+
+log_in($sel, $config, 'unprivileged');
+go_to_bug($sel, $bug1_id);
+$sel->is_text_present_ok("My patch, which I should see, always (");
+$sel->click_ok("link=My patch, which I should see, always");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+
+# No title displayed while viewing an attachment.
+$sel->title_is("");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+logout($sel);
+
+# Admins can delete attachments.
+
+log_in($sel, $config, 'admin');
+go_to_bug($sel, $bug1_id);
+$sel->click_ok(
+  '//a[@href="attachment.cgi?id=' . $attachment2_id . '&action=edit"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment $attachment2_id Details for Bug $bug1_id/);
+$sel->click_ok("link=Delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Attachment $attachment2_id of Bug $bug1_id");
+$sel->is_text_present_ok("Do you really want to delete this attachment?");
+$sel->type_ok("reason", "deleted by Selenium");
+edit_bug_and_return($sel, $bug1_id, $bug_summary, {id => "delete"});
+$sel->is_text_present_ok("deleted by Selenium");
+$sel->click_ok("link=attachment $attachment2_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Attachment Removed");
+$sel->is_text_present_ok(
+  "The attachment you are attempting to access has been removed");
+
+set_parameters(
+  $sel,
+  {
+    "Group Security" =>
+      {"insidergroup" => {type => "select", value => "QA-Selenium-TEST"}},
+  }
+);
+logout($sel);
diff --git a/xt/selenium/qa_contact.t b/xt/selenium/qa_contact.t
new file mode 100644
index 0000000000..b5beefa401
--- /dev/null
+++ b/xt/selenium/qa_contact.t
@@ -0,0 +1,191 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# First make sure the 'My QA query' saved search is gone.
+
+log_in($sel, $config, 'admin');
+if ($sel->is_text_present("My QA query")) {
+  $sel->click_ok("link=My QA query");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Bug List: My QA query");
+  $sel->click_ok("forget_search");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Search is gone");
+  $sel->is_text_present_ok("OK, the My QA query search is gone.");
+}
+
+# Enable the QA contact field and file a new bug restricted to the 'Master' group
+# with a powerless user as the QA contact. He should only be able to access the
+# bug if the QA contact field is enabled, else he looses this privilege.
+
+set_parameters($sel, {"Bug Fields" => {"useqacontact-on" => undef}});
+file_bug_in_product($sel, 'TestProduct');
+$sel->type_ok(
+  "qa_contact",
+  $config->{unprivileged_user_login},
+  "Set the powerless user as QA contact"
+);
+my $bug_summary = "Test for QA contact";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "This is a test to check QA contact privs.");
+$sel->check_ok('//input[@name="groups" and @value="Master"]');
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# Create a saved search querying for all bugs with the powerless user
+# as QA contact.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product", "TestProduct");
+$sel->remove_all_selections("bug_status");
+$sel->select_ok("f1", "label=QA Contact");
+$sel->select_ok("o1", "label=is equal to");
+$sel->type_ok(
+  "v1",
+  $config->{unprivileged_user_login},
+  "Look for the powerless user as QA contact"
+);
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_element_present_ok("b$bug1_id", undef, "Bug $bug1_id is on the list");
+$sel->is_text_present_ok("Test for QA contact");
+$sel->type_ok("save_newqueryname", "My QA query");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+my $text = trim($sel->get_text("message"));
+ok($text =~ /OK, you have a new search named My QA query/,
+  "New saved search 'My QA query'");
+$sel->click_ok("link=My QA query");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: My QA query");
+$sel->is_element_present_ok("b$bug1_id", undef, "Bug $bug1_id is on the list");
+$sel->is_text_present_ok("Test for QA contact");
+
+# The saved search should still work, even with the QA contact field disabled.
+# ("work" doesn't mean you should still see all bugs, depending on your role
+# and privs!)
+
+set_parameters($sel, {"Bug Fields" => {"useqacontact-off" => undef}});
+$sel->click_ok("link=My QA query");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: My QA query");
+$sel->is_text_present_ok("One bug found");
+$sel->is_element_present_ok("b$bug1_id", undef, "Bug $bug1_id is on the list");
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+
+# The 'QA Contact' label must not be displayed.
+ok(!$sel->is_text_present("QA Contact"), "The QA Contact label is not present");
+logout($sel);
+
+# You cannot access the bug when being logged out, as it's restricted
+# to the Master group.
+
+$sel->type_ok("quicksearch_top", $bug1_id);
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug Access Denied");
+$sel->is_text_present_ok("You are not authorized to access bug");
+
+# You are still not allowed to access the bug when logged in as the
+# powerless user, as the QA contact field is disabled.
+# Don't use it log_in() as we want to follow this specific link.
+
+$sel->click_ok("link=log in to an account", undef, "Log in");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Log in to Bugzilla");
+$sel->is_text_present_ok(
+  "Bugzilla needs a legitimate login and password to continue");
+$sel->type_ok(
+  "Bugzilla_login",
+  $config->{unprivileged_user_login},
+  "Enter login name"
+);
+$sel->type_ok(
+  "Bugzilla_password",
+  $config->{unprivileged_user_passwd},
+  "Enter password"
+);
+$sel->click_ok("log_in", undef, "Submit credentials");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug Access Denied");
+$sel->is_text_present_ok("You are not authorized to access bug");
+logout($sel);
+
+# Re-enable the QA contact field.
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Bug Fields" => {"useqacontact-on" => undef}});
+logout($sel);
+
+# Log in as the powerless user. As the QA contact field is enabled again,
+# you can now access the restricted bug.
+
+log_in($sel, $config, 'unprivileged');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->select_ok("state_addselfcc", "value=never");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product", "TestProduct");
+$sel->remove_all_selections_ok("bug_status");
+$sel->select_ok("f1", "label=QA Contact");
+$sel->select_ok("o1", "label=is equal to");
+$sel->type_ok(
+  "v1",
+  $config->{unprivileged_user_login},
+  "Look for the powerless user as QA contact"
+);
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("One bug found");
+$sel->is_element_present_ok("b$bug1_id", undef, "Bug $bug1_id is on the list");
+$sel->is_text_present_ok("Test for QA contact");
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/$bug1_id /);
+$sel->click_ok("bz_qa_contact_edit_action");
+$sel->value_is(
+  "qa_contact",
+  $config->{unprivileged_user_login},
+  "The powerless user is the current QA contact"
+);
+$sel->check_ok("set_default_qa_contact");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# The user is no longer the QA contact, and he has no other role
+# with the bug. He can no longer see it.
+
+$sel->is_text_present_ok("(list of e-mails not available)");
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug Access Denied");
+logout($sel);
+
+$sel->stop();
diff --git a/xt/selenium/require_login.t b/xt/selenium/require_login.t
new file mode 100644
index 0000000000..fc647f5231
--- /dev/null
+++ b/xt/selenium/require_login.t
@@ -0,0 +1,87 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Turn on 'requirelogin'.
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"User Authentication" => {"requirelogin-on" => undef}});
+logout($sel);
+
+# We try to access each page. None of the ones listed below should
+# let you view it without being logged in.
+
+my @pages = qw(admin attachment buglist chart colchange describecomponents
+  describekeywords duplicates editclassifications editcomponents
+  editfields editflagtypes editgroups editkeywords editmilestones
+  editparams editproducts editsettings editusers editvalues
+  editversions editwhines editworkflow enter_bug page post_bug
+  process_bug query quips report reports request sanitycheck
+  search_plugin show_activity show_bug showdependencygraph
+  showdependencytree summarize_time userprefs votes);
+
+foreach my $page (@pages) {
+  $sel->open_ok("/$config->{bugzilla_installation}/${page}.cgi");
+  if ($page ne 'votes' || $config->{test_extensions}) {
+    $sel->title_is("Log in to Bugzilla");
+  }
+  else {
+    $sel->title_is("Extension Disabled");
+  }
+}
+
+# Those have parameters passed to the page, so we put them here separately.
+
+@pages = (
+  "query.cgi?format=report-table", "query.cgi?format=report-graph",
+  "votes.cgi?action=show_user",    "votes.cgi?action=show_bug"
+);
+
+foreach my $page (@pages) {
+  $sel->open_ok("/$config->{bugzilla_installation}/$page");
+  if ($page !~ /^votes/ || $config->{test_extensions}) {
+    $sel->title_is("Log in to Bugzilla");
+  }
+  else {
+    $sel->title_is("Extension Disabled");
+  }
+}
+
+# These pages should still be accessible.
+
+@pages = (
+  "config.cgi", "createaccount.cgi", "index.cgi", "relogin.cgi",
+  "token.cgi?a=reqpw&loginname=" . $config->{unprivileged_user_login}
+);
+
+foreach my $page (@pages) {
+  $sel->open_ok("/$config->{bugzilla_installation}/$page");
+  $sel->title_isnt("Log in to Bugzilla");
+}
+
+# Turn off 'requirelogin'.
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"User Authentication" => {"requirelogin-off" => undef}});
+logout($sel);
+
+# Make sure we can access random pages again.
+$sel->click_ok("link=Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_isnt("Log in to Bugzilla");
diff --git a/xt/selenium/sanity_check.t b/xt/selenium/sanity_check.t
new file mode 100644
index 0000000000..6b6be8d580
--- /dev/null
+++ b/xt/selenium/sanity_check.t
@@ -0,0 +1,55 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Sanity Check", undef, "Go to Sanity Check (no parameter)");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Sanity Check", "Display sanitycheck.cgi");
+$sel->is_text_present_ok("Sanity check completed.",
+  undef, "Page displayed correctly");
+
+my @args
+  = qw(rebuildvotecache createmissinggroupcontrolmapentries repair_creation_date
+  repair_bugs_fulltext remove_invalid_bug_references repair_bugs_fulltext
+  remove_invalid_attach_references remove_old_whine_targets rescanallBugMail);
+
+foreach my $arg (@args) {
+  $sel->open_ok("/$config->{bugzilla_installation}/sanitycheck.cgi?$arg=1");
+  $sel->title_is("Suspicious Action",
+    "Calling sanitycheck.cgi with no token triggers a confirmation page");
+  $sel->click_ok("confirm", "Confirm the action");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Sanity Check", "Calling sanitycheck.cgi with $arg=1");
+  if ($arg eq 'rescanallBugMail') {
+
+# sanitycheck.cgi always stops after looking for unsent bugmail. So we cannot rely on
+# "Sanity check completed." to determine if an error has been thrown or not.
+    $sel->is_text_present_ok("found with possibly unsent mail",
+      undef, "Look for unsent bugmail");
+    ok(!$sel->is_text_present("Software error"), "No error thrown");
+  }
+  else {
+    $sel->is_text_present_ok("Sanity check completed.",
+      undef, "Page displayed correctly");
+  }
+}
+
+logout($sel);
diff --git a/xt/selenium/saved_searches.t b/xt/selenium/saved_searches.t
new file mode 100644
index 0000000000..591a63d946
--- /dev/null
+++ b/xt/selenium/saved_searches.t
@@ -0,0 +1,135 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# If a saved search named 'SavedSearchTEST1' exists, remove it.
+
+log_in($sel, $config, 'QA_Selenium_TEST');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+
+if ($sel->is_text_present("SavedSearchTEST1")) {
+
+  # There is no other way to identify this link (as they are all named "Forget").
+  $sel->click_ok(
+    '//a[contains(@href,"buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd=SavedSearchTEST1")]'
+  );
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Search is gone");
+  $sel->is_text_present_ok("OK, the SavedSearchTEST1 search is gone.");
+}
+
+# Create a new saved search.
+
+open_advanced_search_page($sel);
+$sel->type_ok("short_desc", "test search");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->type_ok("save_newqueryname", "SavedSearchTEST1");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+my $text = trim($sel->get_text("message"));
+ok(
+  $text =~ /OK, you have a new search named SavedSearchTEST1./,
+  "New search named SavedSearchTEST1 has been created"
+);
+$sel->click_ok("link=SavedSearchTEST1");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: SavedSearchTEST1");
+
+# Remove the saved search from the page footer. It should no longer be displayed there.
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+
+$sel->is_text_present_ok("SavedSearchTEST1");
+$sel->uncheck_ok('//input[@type="checkbox" and @alt="SavedSearchTEST1"]');
+
+# $sel->value_is("//input[\@type='checkbox' and \@alt='SavedSearchTEST1']", "off");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+$text = trim($sel->get_text("message"));
+ok($text =~ /The changes to your saved searches have been saved./,
+  "Saved searches changes have been saved");
+
+# Modify the saved search. Said otherwise, we should still be able to save
+# a new search with exactly the same name.
+
+open_advanced_search_page($sel);
+$sel->type_ok("short_desc", "bilboa");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+
+# As we said, this saved search should no longer be displayed in the page footer.
+ok(
+  !$sel->is_text_present("SavedSearchTEST1"),
+  "SavedSearchTEST1 is not present in the page footer"
+);
+$sel->type_ok("save_newqueryname", "SavedSearchTEST1");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search updated");
+$text = trim($sel->get_text("message"));
+ok(
+  $text =~ /Your search named SavedSearchTEST1 has been updated./,
+  "Saved searche SavedSearchTEST1 has been updated."
+);
+
+# Make sure our new criteria has been saved (let's edit the saved search).
+# As the saved search is no longer displayed in the footer, we have to go
+# to the "Preferences" page to edit it.
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+
+$sel->is_text_present_ok("SavedSearchTEST1");
+$sel->click_ok(
+  '//a[@href="buglist.cgi?cmdtype=dorem&remaction=run&namedcmd=SavedSearchTEST1"]'
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: SavedSearchTEST1");
+$sel->click_ok("edit_search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search for bugs");
+$sel->value_is("short_desc", "bilboa");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search is gone");
+$text = trim($sel->get_text("message"));
+ok($text =~ /OK, the SavedSearchTEST1 search is gone./,
+  "The SavedSearchTEST1 search is gone.");
+logout($sel);
diff --git a/xt/selenium/search.t b/xt/selenium/search.t
new file mode 100644
index 0000000000..636e43d6db
--- /dev/null
+++ b/xt/selenium/search.t
@@ -0,0 +1,75 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use Test::More "no_plan";
+
+my ($sel, $config) = get_selenium();
+
+# TODO: This test really needs improvement. There is by far much more stuff
+# to test in this area.
+
+# First, a very trivial search, which returns no result.
+
+go_to_home($sel, $config);
+open_advanced_search_page($sel);
+$sel->type_ok("short_desc", "oisÂŁjdfm#sd%fasd!fm",
+  "Type a non-existent string in the bug summary field");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("Zarro Boogs found");
+
+# Display all available columns. Look for all bugs assigned to a user who doesn't exist.
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/buglist.cgi?quicksearch=%40xx45ft&columnlist=all"
+);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("Zarro Boogs found");
+
+# Now some real tests.
+
+log_in($sel, $config, 'canconfirm');
+file_bug_in_product($sel, "TestProduct");
+my $bug_summary = "Update this summary with this bug ID";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "I'm supposed to appear in the coming buglist.");
+my $bug1_id = create_bug($sel, $bug_summary);
+$sel->click_ok("summary_edit_action");
+$bug_summary .= ": my ID is $bug1_id";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "Updating bug summary....");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# Test pronoun substitution.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections("bug_status");
+$sel->remove_all_selections("resolution");
+$sel->type_ok("short_desc", "my ID is $bug1_id");
+$sel->select_ok("f1", "label=Commenter");
+$sel->select_ok("o1", "label=is equal to");
+$sel->type_ok("v1", "%user%");
+$sel->click_ok("add_button");
+$sel->select_ok("f2", "label=Comment");
+$sel->select_ok("o2", "label=contains the string");
+$sel->type_ok("v2", "coming buglist");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("One bug found");
+$sel->is_text_present_ok(
+  "Update this summary with this bug ID: my ID is $bug1_id");
+logout($sel);
diff --git a/xt/selenium/security.t b/xt/selenium/security.t
new file mode 100644
index 0000000000..6e5af096ff
--- /dev/null
+++ b/xt/selenium/security.t
@@ -0,0 +1,223 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium(CHROME_MODE);
+my $urlbase    = $config->{bugzilla_installation};
+my $admin_user = $config->{admin_user_login};
+
+# Let's create a bug and attachment to play with.
+
+log_in($sel, $config, 'admin');
+file_bug_in_product($sel, "TestProduct");
+my $bug_summary = "Security checks";
+$sel->type_ok("short_desc",  $bug_summary);
+$sel->type_ok("comment",     "This bug will be used to test security fixes.");
+$sel->type_ok("data",        $config->{attachment_file});
+$sel->type_ok("description", "simple patch, v1");
+$sel->click_ok("ispatch");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+
+#######################################################################
+# Security bug 38862.
+#######################################################################
+
+# No alternate host for attachments; cookies will be accessible.
+
+set_parameters(
+  $sel,
+  {
+    "Attachments" =>
+      {"allow_attachment_display-on" => undef, "reset-attachment_base" => undef}
+  }
+);
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("link=Add an attachment");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Create New Attachment for Bug #$bug1_id");
+$sel->type_ok(
+  "attach_text",
+  "<html>\n<head>\n<title>I want your cookies</title>\n<head>\n"
+    . "<body>\n<script type='text/javascript'>document.write(document.cookie);</script>\n"
+    . "</body>\n</html>",
+  "Writing text into the attachment textarea"
+);
+$sel->type_ok("description", "show my cookies");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "create"});
+my $alink = $sel->get_attribute('//a[@title="show my cookies"]@href');
+$alink =~ /id=(\d+)/;
+my $attach1_id = $1;
+$sel->click_ok("link=Attachment #$attach1_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment $attach1_id Details for Bug $bug1_id/);
+$sel->click_ok("link=edit details");
+$sel->type_ok("contenttypeentry", "text/html");
+edit_bug($sel, $bug1_id, $bug_summary, {id => "update"});
+
+$sel->click_ok("link=show my cookies");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("I want your cookies");
+my @cookies = split(/[\s;]+/, $sel->get_body_text());
+my $nb_cookies = scalar @cookies;
+ok($nb_cookies, "Found $nb_cookies cookies:\n" . join("\n", @cookies));
+ok(!$sel->is_cookie_present("Bugzilla_login"), "Bugzilla_login not accessible");
+ok(!$sel->is_cookie_present("Bugzilla_logincookie"),
+  "Bugzilla_logincookie not accessible");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+
+# Alternate host for attachments; no cookie should be accessible.
+
+set_parameters(
+  $sel,
+  {
+    "Attachments" =>
+      {"attachment_base" => {type => "text", value => "http://127.0.0.1/$urlbase"}}
+  }
+);
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("link=show my cookies");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("I want your cookies");
+@cookies = split(/[\s;]+/, $sel->get_body_text());
+$nb_cookies = scalar @cookies;
+ok(!$nb_cookies,                               "No cookies found");
+ok(!$sel->is_cookie_present("Bugzilla_login"), "Bugzilla_login not accessible");
+ok(!$sel->is_cookie_present("Bugzilla_logincookie"),
+  "Bugzilla_logincookie not accessible");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+
+set_parameters($sel, {"Attachments" => {"reset-attachment_base" => undef}});
+
+#######################################################################
+# Security bug 472362.
+#######################################################################
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+my $admin_cookie = $sel->get_value("token");
+logout($sel);
+
+log_in($sel, $config, 'editbugs');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+my $editbugs_cookie = $sel->get_value("token");
+
+# Using our own unused token is fine.
+
+$sel->open_ok(
+  "/$urlbase/userprefs.cgi?dosave=1&display_quips=off&token=$editbugs_cookie");
+$sel->title_is("General Preferences");
+$sel->is_text_present_ok(
+  "The changes to your general preferences have been saved");
+
+# Reusing a token must fail. They must all trigger the Suspicious Action warning.
+
+my @args = ("", "token=", "token=i123x", "token=$admin_cookie",
+  "token=$editbugs_cookie");
+
+foreach my $arg (@args) {
+  $sel->open_ok("/$urlbase/userprefs.cgi?dosave=1&display_quips=off&$arg");
+  $sel->title_is("Suspicious Action");
+
+  if ($arg eq "token=$admin_cookie") {
+    $sel->is_text_present_ok("Generated by: admin ($admin_user)");
+    $sel->is_text_present_ok("This token has not been generated by you");
+  }
+  else {
+    $sel->is_text_present_ok("It looks like you didn't come from the right page");
+  }
+}
+logout($sel);
+
+#######################################################################
+# Security bug 529416.
+#######################################################################
+
+log_in($sel, $config, 'admin');
+file_bug_in_product($sel, "TestProduct");
+$sel->type_ok("alias", "secret_qa_bug_" . ($bug1_id + 1));
+my $bug_summary2 = "Private QA Bug";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "This private bug is used to test security fixes.");
+$sel->type_ok("dependson",  $bug1_id);
+$sel->check_ok('//input[@name="groups" and @value="Master"]');
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+go_to_bug($sel, $bug1_id);
+$sel->is_text_present_ok("secret_qa_bug_$bug2_id");
+logout($sel);
+
+log_in($sel, $config, 'editbugs');
+go_to_bug($sel, $bug1_id);
+ok(!$sel->is_text_present("secret_qa_bug_$bug2_id"),
+  "The alias 'secret_qa_bug_$bug2_id' is not visible for unauthorized users");
+$sel->is_text_present_ok($bug2_id);
+logout($sel);
+
+go_to_bug($sel, $bug1_id);
+ok(!$sel->is_text_present("secret_qa_bug_$bug2_id"),
+  "The alias 'secret_qa_bug_$bug2_id' is not visible for logged out users");
+$sel->is_text_present_ok($bug2_id);
+
+#######################################################################
+# Security bug 472206.
+# Keep this test as the very last one as the File Saver will remain
+# open till the end of the script. Selenium is currently* unable
+# to interact with it and close it (* = 2.6.0).
+#######################################################################
+
+log_in($sel, $config, 'admin');
+set_parameters($sel,
+  {"Attachments" => {"allow_attachment_display-off" => undef}});
+
+# Attachments are not viewable.
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("link=Details");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/Attachment \d+ Details for Bug $bug1_id/);
+$sel->is_text_present_ok(
+  "The attachment is not viewable in your browser due to security restrictions");
+$sel->click_ok("link=View");
+
+# Wait 1 second to give the browser a chance to display the attachment.
+# Do not use wait_for_page_to_load_ok() as the File Saver will never go away.
+sleep(1);
+ok(!$sel->is_text_present('@@'), "Patch not displayed");
+
+# Enable viewing attachments.
+
+set_parameters($sel,
+  {"Attachments" => {"allow_attachment_display-on" => undef}});
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok('link=simple patch, v1');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("");
+$sel->is_text_present_ok('@@');
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/$bug1_id /);
+logout($sel);
diff --git a/xt/selenium/shared_searches.t b/xt/selenium/shared_searches.t
new file mode 100644
index 0000000000..a66363f0f1
--- /dev/null
+++ b/xt/selenium/shared_searches.t
@@ -0,0 +1,244 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Set the querysharegroup param to be the canconfirm group.
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "Group Security" =>
+      {"querysharegroup" => {type => "select", value => "canconfirm"}}
+  }
+);
+
+# Create new saved search and call it 'Shared Selenium buglist'.
+
+$sel->type_ok("quicksearch_top", ":TestProduct Selenium");
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->type_ok("save_newqueryname", "Shared Selenium buglist");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+my $text = trim($sel->get_text("message"));
+ok(
+  $text =~ /OK, you have a new search named Shared Selenium buglist./,
+  "New search named 'Shared Selenium buglist' has been created"
+);
+
+# Retrieve the newly created saved search's internal ID and make sure it's displayed
+# in the footer by default.
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+my $ssname = $sel->get_attribute(
+  '//input[@type="checkbox" and @alt="Shared Selenium buglist"]@name');
+$ssname =~ /(?:link_in_footer_(\d+))/;
+my $saved_search1_id = $1;
+$sel->is_checked_ok("link_in_footer_$saved_search1_id");
+
+# As an admin, the "Add to footer" checkbox must be displayed, but unchecked by default.
+
+$sel->select_ok("share_$saved_search1_id", "label=canconfirm");
+ok(!$sel->is_checked("force_$saved_search1_id"),
+  "Shared search not displayed in other users' footer by default");
+$sel->click_ok("force_$saved_search1_id");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+logout($sel);
+
+# Log in as the "canconfirm" user. The search shared by the admin must appear
+# in the footer.
+
+log_in($sel, $config, 'canconfirm');
+$sel->is_text_present_ok("Shared Selenium buglist");
+$sel->click_ok("link=Shared Selenium buglist");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: Shared Selenium buglist");
+
+# You cannot delete other users' saved searches.
+ok(
+  !$sel->is_element_present("forget_search"),
+  "'Forget...' button not available"
+);
+
+# The name of the sharer must appear in the "Saved Searches" section.
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+$sel->is_text_present_ok($config->{admin_user_login});
+
+# Remove the shared search from your footer.
+
+$sel->is_checked_ok("link_in_footer_$saved_search1_id");
+$sel->click_ok("link_in_footer_$saved_search1_id");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+
+# Go to a page where the query name is unlikely to appear in the main page.
+$sel->click_ok("link=Permissions");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Permissions");
+ok(
+  !$sel->is_text_present("Shared Selenium buglist"),
+  "Shared query no longer displayed in the footer"
+);
+
+# Create your own saved search, and share it with the canconfirm group.
+
+$sel->type_ok("quicksearch_top", ":TestProduct sw:helpwanted");
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->type_ok("save_newqueryname", "helpwanted");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+$text = trim($sel->get_text("message"));
+ok(
+  $text =~ /OK, you have a new search named helpwanted./,
+  "New search named helpwanted has been created"
+);
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+$ssname
+  = $sel->get_attribute('//input[@type="checkbox" and @alt="helpwanted"]@name');
+$ssname =~ /(?:link_in_footer_(\d+))/;
+my $saved_search2_id = $1;
+
+# Our own saved searches are displayed in the footer by default.
+$sel->is_checked_ok("link_in_footer_$saved_search2_id");
+$sel->select_ok("share_$saved_search2_id", "label=canconfirm");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+logout($sel);
+
+# Log in as admin again. The other user is not a blesser for the 'canconfirm'
+# group, and so his shared search must not be displayed by default. But it
+# must still be available and can be added to the footer, if desired.
+
+log_in($sel, $config, 'admin');
+ok(
+  !$sel->is_text_present("helpwanted"),
+  "No 'helpwanted' shared search displayed"
+);
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+$sel->is_text_present_ok("helpwanted");
+$sel->is_text_present_ok($config->{canconfirm_user_login});
+
+ok(
+  !$sel->is_checked("link_in_footer_$saved_search2_id"),
+  "Shared query available but not displayed"
+);
+$sel->click_ok("link_in_footer_$saved_search2_id");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+
+# This query is now available from the footer.
+$sel->click_ok("link=helpwanted");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: helpwanted");
+
+# Remove the 'Shared Selenium buglist' query.
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+
+# There is no better way to identify the link
+$sel->click_ok(
+  '//a[contains(@href,"buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd=Shared%20Selenium%20buglist")]',
+  undef, "Deleting the 'Shared Selenium buglist' search"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search is gone");
+$text = trim($sel->get_text("message"));
+ok(
+  $text =~ /OK, the Shared Selenium buglist search is gone./,
+  "The 'Shared Selenium buglist' search is gone"
+);
+logout($sel);
+
+# Make sure that the 'helpwanted' query is not shared with the QA_Selenium_TEST
+# user as he doesn't belong to the 'canconfirm' group.
+
+log_in($sel, $config, 'QA_Selenium_TEST');
+ok(!$sel->is_text_present("helpwanted"),
+  "The 'helpwanted' query is not displayed in the footer");
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+ok(!$sel->is_text_present("helpwanted"),
+  "The 'helpwanted' query is not shared with this user");
+logout($sel);
+
+# Now remove the 'helpwanted' saved search.
+
+log_in($sel, $config, 'canconfirm');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Saved Searches");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Saved Searches");
+ok(
+  !$sel->is_text_present("Shared Selenium buglist"),
+  "The 'Shared Selenium buglist' is no longer available"
+);
+$sel->click_ok(
+  '//a[contains(@href,"buglist.cgi?cmdtype=dorem&remaction=forget&namedcmd=helpwanted")]',
+  undef, "Deleting the 'helpwanted' search"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search is gone");
+$text = trim($sel->get_text("message"));
+ok($text =~ /OK, the helpwanted search is gone./,
+  "The 'helpwanted' search is gone");
+logout($sel);
diff --git a/xt/selenium/show_all_products.t b/xt/selenium/show_all_products.t
new file mode 100644
index 0000000000..cab5194c98
--- /dev/null
+++ b/xt/selenium/show_all_products.t
@@ -0,0 +1,59 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Bug Fields" => {"useclassification-on" => undef}});
+
+# Do not use file_bug_in_product() because our goal here is not to file
+# a bug but to check what is present in the UI, and also to make sure
+# that we get exactly the right page with the right information.
+#
+# The admin is not a member of the "QA‑Selenium‑TEST" group, and so
+# cannot see the "QA‑Selenium‑TEST" product.
+
+$sel->click_ok("link=New");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok("Select Classification");
+my $full_text = trim($sel->get_body_text());
+ok($full_text =~ /All: Show all products/, "The 'All' link is displayed");
+$sel->click_ok("link=All");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok("Select Product");
+ok(
+  !$sel->is_text_present("QA-Selenium-TEST"),
+  "The QA-Selenium-TEST product is not displayed"
+);
+logout($sel);
+
+# Same steps, but for a member of the "QA‑Selenium‑TEST" group.
+# The "QA‑Selenium‑TEST" product must be visible to him.
+
+log_in($sel, $config, 'QA_Selenium_TEST');
+$sel->click_ok("link=New");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok("Select Classification");
+$sel->click_ok("link=All");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok("Select Product");
+$sel->is_text_present_ok("QA-Selenium-TEST");
+$sel->click_ok('//a[contains(@href, "product=QA-Selenium-TEST")]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Enter Bug: QA-Selenium-TEST");
+logout($sel);
diff --git a/xt/selenium/shutdown.t b/xt/selenium/shutdown.t
new file mode 100644
index 0000000000..066a6b707b
--- /dev/null
+++ b/xt/selenium/shutdown.t
@@ -0,0 +1,93 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "General" => {
+      shutdownhtml => {type => "text", value => "I'm down (set by test_shutdown.t)"}
+    }
+  }
+);
+
+# None of the following pages should be accessible when Bugzilla is down.
+
+my @pages = qw(admin attachment buglist chart colchange config createaccount
+  describecomponents describekeywords duplicates
+  editclassifications editcomponents editfields editflagtypes
+  editgroups editkeywords editmilestones editproducts editsettings
+  editusers editvalues editversions editwhines editworkflow
+  enter_bug index page post_bug process_bug query quips relogin
+  report reports request sanitycheck search_plugin show_activity
+  show_bug showdependencygraph showdependencytree summarize_time
+  token userprefs votes xmlrpc);
+
+foreach my $page (@pages) {
+  $sel->open_ok("/$config->{bugzilla_installation}/${page}.cgi");
+  $sel->title_is("Bugzilla is Down");
+}
+
+# Those have parameters passed to the page, so we put them here separately.
+
+@pages = (
+  "query.cgi?format=report-table", "query.cgi?format=report-graph",
+  "votes.cgi?action=show_user",    "votes.cgi?action=show_bug"
+);
+
+foreach my $page (@pages) {
+  $sel->open_ok("/$config->{bugzilla_installation}/$page");
+  $sel->title_is("Bugzilla is Down");
+}
+
+# Clear 'shutdownhtml', to re-enable Bugzilla.
+# At this point, the admin has been logged out. We cannot use log_in(),
+# nor set_parameters(), due to shutdownhtml being active.
+
+$sel->open_ok("/$config->{bugzilla_installation}/editparams.cgi");
+$sel->title_is("Log in to Bugzilla");
+$sel->type_ok(
+  "Bugzilla_login",
+  $config->{admin_user_login},
+  "Enter admin login name"
+);
+$sel->type_ok(
+  "Bugzilla_password",
+  $config->{admin_user_passwd},
+  "Enter admin password"
+);
+$sel->click_ok("log_in");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Configuration: Required Settings");
+$sel->click_ok("link=General");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Configuration: General");
+$sel->type_ok("shutdownhtml", "");
+$sel->click_ok('//input[@type="submit" and @value="Save Changes"]',
+  undef, "Save Changes");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Parameters Updated");
+
+# Accessing index.cgi should work again now.
+
+$sel->click_ok("link=Home");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugzilla Main Page");
+logout($sel);
diff --git a/xt/selenium/status_whiteboard.t b/xt/selenium/status_whiteboard.t
new file mode 100644
index 0000000000..3084d7f2e2
--- /dev/null
+++ b/xt/selenium/status_whiteboard.t
@@ -0,0 +1,121 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {'Bug Fields' => {'usestatuswhiteboard-on' => undef}});
+
+# Make sure the status whiteboard is displayed and add stuff to it.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+my $bug_summary = "white and black";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "This bug is to test the status whiteboard");
+my $bug1_id = create_bug($sel, $bug_summary);
+$sel->is_text_present_ok("Whiteboard:");
+$sel->type_ok("status_whiteboard", "[msg from test_status_whiteboard.t: x77v]");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+my $bug_summary2 = "WTC";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "bugzillation!");
+my $bug2_id = create_bug($sel, $bug_summary2);
+$sel->type_ok("status_whiteboard", "[msg from test_status_whiteboard.t: x77v]");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+# Now search these bugs above using data being in the status whiteboard,
+# and save the query.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->remove_all_selections_ok("bug_status");
+$sel->type_ok("status_whiteboard", "x77v");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("2 bugs found");
+$sel->type_ok("save_newqueryname", "sw-x77v");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+my $text = trim($sel->get_text("message"));
+ok($text =~ /you have a new search named sw-x77v/,
+  'Saved search correctly saved');
+
+# Make sure the saved query works.
+
+$sel->click_ok("link=sw-x77v");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: sw-x77v");
+$sel->is_text_present_ok("2 bugs found");
+
+# The status whiteboard should no longer be displayed in both the query
+# and bug view pages (query.cgi and show_bug.cgi) when usestatuswhiteboard
+# is off.
+
+set_parameters($sel, {'Bug Fields' => {'usestatuswhiteboard-off' => undef}});
+$sel->click_ok("link=Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search for bugs");
+ok(!$sel->is_text_present("Whiteboard:"),
+  "Whiteboard label no longer displayed in the search page");
+go_to_bug($sel, $bug1_id);
+ok(!$sel->is_text_present("Whiteboard:"),
+  "Whiteboard label no longer displayed in the bug page");
+
+# Queries based on the status whiteboard should still work when
+# the parameter is off.
+
+$sel->click_ok("link=sw-x77v");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: sw-x77v");
+$sel->is_text_present_ok("2 bugs found");
+
+# Turn on usestatuswhiteboard again as some other scripts may expect the status
+# whiteboard to be available by default.
+
+set_parameters($sel, {'Bug Fields' => {'usestatuswhiteboard-on' => undef}});
+
+# Clear the status whiteboard and delete the saved search.
+
+$sel->click_ok("link=sw-x77v");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: sw-x77v");
+$sel->is_text_present_ok("2 bugs found");
+$sel->click_ok("mass_change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->click_ok("check_all");
+$sel->type_ok("status_whiteboard", "");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bugs processed");
+
+$sel->click_ok("link=sw-x77v");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: sw-x77v");
+$sel->is_text_present_ok("Zarro Boogs found");
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search is gone");
+$sel->is_text_present_ok("OK, the sw-x77v search is gone.");
+logout($sel);
diff --git a/xt/selenium/strict_isolation.t b/xt/selenium/strict_isolation.t
new file mode 100644
index 0000000000..4fed22cede
--- /dev/null
+++ b/xt/selenium/strict_isolation.t
@@ -0,0 +1,149 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+my $qa_user       = $config->{QA_Selenium_TEST_user_login};
+my $no_privs_user = $config->{unprivileged_user_login};
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Group Security" => {"strict_isolation-on" => undef}});
+
+# Restrict the bug to the "Master" group, so that we can check that only
+# allowed people can be CC'ed to the bug.
+
+file_bug_in_product($sel, 'Another Product');
+$sel->select_ok("component", "label=c2");
+$sel->select_ok("version",   "label=Another2");
+my $bug_summary = "Test isolation";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "Unallowed users refused");
+my $master_gid = $sel->get_attribute(
+  '//input[@type="checkbox" and @name="groups" and @value="Master"]@id');
+$sel->check_ok($master_gid);
+$master_gid =~ s/group_//;
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# At that point, CANEDIT is off and so everybody can be CC'ed to the bug.
+
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", "$qa_user, $no_privs_user");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+$sel->click_ok("cc_edit_area_showhide");
+$sel->add_selection_ok("cc", "label=$no_privs_user");
+$sel->add_selection_ok("cc", "label=$qa_user");
+$sel->check_ok("removecc");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# Now enable CANEDIT for the "Master" group. This will enable strict isolation
+# for the product.
+
+edit_product($sel, "Another Product");
+$sel->click_ok("link=Edit Group Access Controls:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Group Controls for Another Product");
+$sel->check_ok("canedit_$master_gid");
+$sel->click_ok("submit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Update group access controls for Another Product");
+
+# Non-members can no longer be CC'ed to the bug.
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", $no_privs_user);
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Invalid User Group");
+$sel->is_text_present_ok(
+  "User '$no_privs_user' is not able to edit the 'Another Product' Product");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", $qa_user);
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Invalid User Group");
+$sel->is_text_present_ok(
+  "User '$qa_user' is not able to edit the 'Another Product' Product");
+
+# Now set QA_Selenium_TEST user as a member of the Master group.
+
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search users");
+$sel->type_ok("matchstr", $qa_user);
+$sel->select_ok("matchtype", "label=exact (find this user)");
+$sel->click_ok("search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit user QA-Selenium-TEST ($qa_user)");
+$sel->check_ok("group_$master_gid");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("User $qa_user updated");
+
+# The QA_Selenium_TEST user can now be CC'ed to the bug.
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", $qa_user);
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->click_ok("cc_edit_area_showhide");
+$sel->add_selection_ok("cc", "label=$qa_user");
+$sel->check_ok("removecc");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# The powerless user still cannot be CC'ed.
+
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", "$qa_user, $no_privs_user");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Invalid User Group");
+$sel->is_text_present_ok(
+  "User '$no_privs_user' is not able to edit the 'Another Product' Product");
+
+# Reset parameters back to defaults.
+
+set_parameters($sel, {"Group Security" => {"strict_isolation-off" => undef}});
+
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search users");
+$sel->type_ok("matchstr", $qa_user);
+$sel->select_ok("matchtype", "label=exact (find this user)");
+$sel->click_ok("search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit user QA-Selenium-TEST ($qa_user)");
+$sel->uncheck_ok("group_$master_gid");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("User $qa_user updated");
+
+edit_product($sel, "Another Product");
+$sel->click_ok("link=Edit Group Access Controls:");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Group Controls for Another Product");
+$sel->uncheck_ok("canedit_$master_gid");
+$sel->click_ok("submit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Update group access controls for Another Product");
+logout($sel);
diff --git a/xt/selenium/sudo_sessions.t b/xt/selenium/sudo_sessions.t
new file mode 100644
index 0000000000..dfde6403bb
--- /dev/null
+++ b/xt/selenium/sudo_sessions.t
@@ -0,0 +1,190 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Turn on the usevisibilitygroups param so that some users are invisible.
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Group Security" => {"usevisibilitygroups-on" => undef}});
+
+# You can see all users from editusers.cgi, but once you leave this page,
+# usual group visibility restrictions apply and the "powerless" user cannot
+# be sudo'ed as he is in no group.
+
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search users");
+$sel->type_ok("matchstr", $config->{unprivileged_user_login});
+$sel->select_ok("matchtype", "label=exact (find this user)");
+$sel->click_ok("search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit user no-privs ($config->{unprivileged_user_login})");
+$sel->value_is("email", $config->{unprivileged_user_login});
+$sel->click_ok("link=Impersonate this user");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Begin sudo session");
+$sel->value_is("target_login", $config->{unprivileged_user_login});
+$sel->type_ok("reason", "Selenium test about sudo sessions");
+$sel->type_ok("password", $config->{admin_user_passwd}, "Enter admin password");
+$sel->click_ok('//input[@value="Begin Session"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Match Failed");
+my $error_msg = trim($sel->get_text("error_msg"));
+ok(
+  $error_msg eq
+    "$config->{unprivileged_user_login} does not exist or you are not allowed to see that user.",
+  "Cannot impersonate users you cannot see"
+);
+
+# Turn off the usevisibilitygroups param so that all users are visible again.
+
+set_parameters($sel,
+  {"Group Security" => {"usevisibilitygroups-off" => undef}});
+
+# The "powerless" user can now be sudo'ed.
+
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search users");
+$sel->type_ok("matchstr", $config->{unprivileged_user_login});
+$sel->select_ok("matchtype", "label=exact (find this user)");
+$sel->click_ok("search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit user no-privs ($config->{unprivileged_user_login})");
+$sel->value_is("email", $config->{unprivileged_user_login});
+$sel->click_ok("link=Impersonate this user");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Begin sudo session");
+$sel->value_is("target_login", $config->{unprivileged_user_login});
+$sel->type_ok("password", $config->{admin_user_passwd}, "Enter admin password");
+$sel->click_ok('//input[@value="Begin Session"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Sudo session started");
+my $text = trim($sel->get_text("message"));
+ok(
+  $text =~ /The sudo session has been started/,
+  "The sudo session has been started"
+);
+
+# Make sure this user is not an admin and has no privs at all, and that
+# he cannot access editusers.cgi (despite the sudoer can).
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("General Preferences");
+$sel->click_ok("link=Permissions");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Permissions");
+$sel->is_text_present_ok("There are no permission bits set on your account");
+
+# We access the page directly as there is no link pointing to it.
+$sel->open_ok("/$config->{bugzilla_installation}/editusers.cgi");
+$sel->title_is("Authorization Required");
+$error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /^Sorry, you aren't a member of the 'editusers' group/,
+  "Not a member of the editusers group");
+$sel->click_ok("link=end session");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Sudo session complete");
+$sel->is_text_present_ok("Your sudo session has ended");
+
+# Try to access the sudo page directly, with no credentials.
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/relogin.cgi?action=begin-sudo&target_login=$config->{admin_user_login}"
+);
+$sel->title_is("Password Required");
+
+# Now try to start a sudo session directly, with all required credentials.
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/relogin.cgi?action=begin-sudo&password=$config->{admin_user_passwd}&target_login=$config->{unprivileged_user_login}",
+  undef, "Impersonate a user directly by providing all required data"
+);
+
+# A direct access to the page is supposed to have no Referer header set,
+# which would trigger the "Untrusted Authentication Request" error, but
+# due to the way Selenium works, the Referer header is set and the
+# "Preparation Required" error is thrown instead. In any case, one of
+# those two errors must be thrown.
+my $title = $sel->get_title();
+ok(
+  $title eq "Untrusted Authentication Request"
+    || $title eq "Preparation Required",
+  $title
+);
+
+# Now try to sudo an admin, which is not allowed.
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/relogin.cgi?action=prepare-sudo&target_login=$config->{admin_user_login}"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Begin sudo session");
+$sel->value_is("target_login", $config->{admin_user_login});
+$sel->type_ok("reason", "Selenium hack");
+$sel->type_ok("password", $config->{admin_user_passwd}, "Enter admin password");
+$sel->click_ok('//input[@value="Begin Session"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("User Protected");
+$error_msg = trim($sel->get_text("error_msg"));
+ok(
+  $error_msg
+    =~ /^The user $config->{admin_user_login} may not be impersonated by sudoers/,
+  "Cannot impersonate administrators"
+);
+
+# Now try to sudo a non-existing user account, with no password.
+
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Begin sudo session");
+
+# Starting with 5.0, the password field is a type=password and is marked
+# "required". This means that we need to remove the required attribute from
+# the input so that it can still be checked by the backend code.
+my $script = q{
+    document.getElementById('password').removeAttribute('required');
+};
+$sel->run_script($script);
+$sel->type_ok("target_login", 'foo@bar.com');
+$sel->click_ok('//input[@value="Begin Session"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Password Required");
+
+# Same as above, but with your password.
+
+$sel->open_ok(
+  "/$config->{bugzilla_installation}/relogin.cgi?action=prepare-sudo&target_login=foo\@bar.com"
+);
+$sel->title_is("Begin sudo session");
+$sel->value_is("target_login", 'foo@bar.com');
+$sel->type_ok("password", $config->{admin_user_passwd}, "Enter admin password");
+$sel->click_ok('//input[@value="Begin Session"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Match Failed");
+$error_msg = trim($sel->get_text("error_msg"));
+ok(
+  $error_msg eq
+    'foo@bar.com does not exist or you are not allowed to see that user.',
+  "Cannot impersonate non-existing accounts"
+);
+logout($sel);
diff --git a/xt/selenium/target_milestones.t b/xt/selenium/target_milestones.t
new file mode 100644
index 0000000000..cdf68040f2
--- /dev/null
+++ b/xt/selenium/target_milestones.t
@@ -0,0 +1,122 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters($sel, {"Bug Fields" => {"usetargetmilestone-on" => undef}});
+
+# Create a new milestone to the 'TestProduct' product.
+
+edit_product($sel, "TestProduct");
+$sel->click_ok("link=Edit milestones:");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select milestone of product 'TestProduct'");
+$sel->click_ok("link=Add");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Add Milestone to Product 'TestProduct'");
+$sel->type_ok("milestone", "TM1");
+$sel->type_ok("sortkey",   "10");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Milestone Created");
+
+# Edit the milestone of bugs.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+my $bug_summary = "stone and rock";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "This bug is to test milestones");
+my $bug1_id = create_bug($sel, $bug_summary);
+$sel->is_text_present_ok("Target Milestone:");
+$sel->select_ok("target_milestone", "label=TM1");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# Query for bugs with the TM1 milestone.
+
+open_advanced_search_page($sel);
+$sel->is_text_present_ok("Target Milestone:");
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product",          "label=TestProduct");
+$sel->add_selection_ok("target_milestone", "label=TM1");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("One bug found");
+$sel->type_ok("save_newqueryname", "selenium_m0");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+my $text = trim($sel->get_text("message"));
+ok(
+  $text =~ /OK, you have a new search named selenium_m0./,
+  "New search named selenium_m0 has been created"
+);
+
+# Turn off milestones and check that the milestone field no longer appears in bugs.
+
+set_parameters($sel, {"Bug Fields" => {"usetargetmilestone-off" => undef}});
+
+$sel->click_ok("link=Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search for bugs");
+ok(!$sel->is_text_present("Target:"),
+  "The target milestone field is no longer displayed in the search page");
+
+go_to_bug($sel, $bug1_id);
+ok(!$sel->is_text_present("Target Milestone:"),
+  "The milestone field is no longer displayed in the bug page");
+
+# The existing query must still work despite milestones are off now.
+
+$sel->click_ok("link=selenium_m0");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: selenium_m0");
+$sel->is_text_present_ok("One bug found");
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search is gone");
+$text = trim($sel->get_text("message"));
+ok($text =~ /OK, the selenium_m0 search is gone./,
+  "The selenium_m0 search is gone");
+
+# Re-enable the usetargetmilestone parameter and delete the created
+# milestone from the Testproduct product.
+
+set_parameters($sel, {"Bug Fields" => {"usetargetmilestone-on" => undef}});
+
+edit_product($sel, "TestProduct");
+$sel->click_ok("link=Edit milestones:");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Select milestone of product 'TestProduct'");
+$sel->click_ok(
+  '//a[@href="editmilestones.cgi?action=del&product=TestProduct&milestone=TM1"]',
+  undef, "Deleting the TM1 milestone"
+);
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Milestone of Product 'TestProduct'");
+$text = trim($sel->get_body_text());
+ok(
+  $text =~ /There is 1 bug entered for this milestone/,
+  "Warning displayed about 1 bug targetted to TM1"
+);
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Milestone Deleted");
+logout($sel);
diff --git a/xt/selenium/time_summary.t b/xt/selenium/time_summary.t
new file mode 100644
index 0000000000..ca0b1dc1de
--- /dev/null
+++ b/xt/selenium/time_summary.t
@@ -0,0 +1,108 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Set the timetracking group to "editbugs", which is the default value for this parameter.
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "Group Security" =>
+      {"timetrackinggroup" => {type => "select", value => "editbugs"}}
+  }
+);
+
+# Add some Hours Worked to a bug so that we are sure at least one bug
+# will be present in our buglist below.
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+my $bug_summary = "Rocket science";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "Time flies");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+$sel->type_ok("work_time", 2.6);
+$sel->type_ok("comment",   "I did some work");
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+$sel->is_text_present_ok("I did some work");
+$sel->is_text_present_ok("Additional hours worked: 2.6");
+
+# Let's call summarize_time.cgi directly, with no parameters.
+
+$sel->open_ok("/$config->{bugzilla_installation}/summarize_time.cgi");
+$sel->title_is("No Bugs Selected");
+my $error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /You apparently didn't choose any bugs for viewing/,
+  "No data displayed");
+
+# Search for bugs which have some value in the Hours Worked field.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections("bug_status");
+$sel->select_ok("f1", "label=Hours Worked");
+$sel->select_ok("o1", "label=is greater than");
+$sel->type_ok("v1", "0");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("found");
+
+# Test dates passed to summarize_time.cgi.
+
+$sel->click_ok("timesummary");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^Time Summary \(\d+ bugs selected\)/);
+$sel->check_ok("monthly");
+$sel->check_ok("detailed");
+$sel->type_ok("start_date", "2009-01-01");
+$sel->type_ok("end_date",   "2009-04-30");
+$sel->click_ok("summarize");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^Time Summary \(\d+ bugs selected\)/);
+$sel->is_text_present_ok('regexp:Total of \d+\.\d+ hours worked');
+$sel->is_text_present_ok("2009-01-01 to 2009-01-31");
+$sel->is_text_present_ok("2009-02-01 to 2009-02-28");
+$sel->is_text_present_ok("2009-04-01 to 2009-04-30");
+
+$sel->type_ok("end_date", "2009-04-as");
+$sel->click_ok("summarize");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Illegal Date");
+$error_msg = trim($sel->get_text("error_msg"));
+ok($error_msg =~ /'2009-04-as' is not a legal date/, "Illegal end date");
+
+# Now display one bug only. We cannot do careful checks, because
+# the page sums up contributions made by the same user during the same
+# month, and so running this script several times per month would
+# break checks we may want to do (e.g. by making sure that the contribution
+# above has been taken into account). So we are just making sure that
+# the page is displayed and throws no error.
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("//a[contains(text(),'Summarize time')]");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Time Summary for Bug $bug1_id");
+$sel->check_ok("inactive");
+$sel->check_ok("owner");
+$sel->click_ok("summarize");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Time Summary for Bug $bug1_id");
+logout($sel);
diff --git a/xt/selenium/user_groups.t b/xt/selenium/user_groups.t
new file mode 100644
index 0000000000..068c29b0bd
--- /dev/null
+++ b/xt/selenium/user_groups.t
@@ -0,0 +1,273 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'admin');
+set_parameters($sel,
+  {"Administrative Policies" => {"allowuserdeletion-on" => undef}});
+
+# First delete test users, if not deleted correctly during a previous run.
+
+cleanup_users($sel);
+
+# The Master group inherits privs of the Slave group.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Master");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Group: Master");
+my $group_url = $sel->get_location();
+$group_url =~ /group=(\d+)$/;
+my $master_gid = $1;
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=Add Group");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Add group");
+$sel->type_ok("name", "Slave");
+$sel->type_ok("desc",
+  "Members of the Master group are also members of this group");
+$sel->uncheck_ok("isactive");
+ok(!$sel->is_checked("insertnew"), "Group not added to products by default");
+$sel->click_ok("create");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("New Group Created");
+my $slave_gid = $sel->get_value("group_id");
+$sel->add_selection_ok("members_add", "label=Master");
+$sel->click_ok('//input[@value="Update Group"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Group: Slave");
+
+# Create users.
+
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Search users');
+$sel->click_ok('link=add a new user');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Add user');
+$sel->type_ok('email',        'master@selenium.bugzilla.org');
+$sel->type_ok('name',         'master-user');
+$sel->type_ok('password',     'selenium', 'Enter password');
+$sel->type_ok('disabledtext', 'Not for common usage');
+$sel->click_ok('add');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Edit user master-user (master@selenium.bugzilla.org)');
+$sel->check_ok("//input[\@name='group_$master_gid']");
+$sel->click_ok('update');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('User master@selenium.bugzilla.org updated');
+$sel->is_text_present_ok('The account has been added to the Master group');
+
+$sel->click_ok("link=add a new user");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Add user');
+$sel->type_ok('email',        'slave@selenium.bugzilla.org');
+$sel->type_ok('name',         'slave-user');
+$sel->type_ok('password',     'selenium', 'Enter password');
+$sel->type_ok('disabledtext', 'Not for common usage');
+$sel->click_ok('add');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Edit user slave-user (slave@selenium.bugzilla.org)');
+$sel->check_ok("//input[\@name='group_$slave_gid']");
+$sel->click_ok('update');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('User slave@selenium.bugzilla.org updated');
+$sel->is_text_present_ok('The account has been added to the Slave group');
+
+$sel->click_ok("link=add a new user");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Add user');
+$sel->type_ok('email',        'reg@selenium.bugzilla.org');
+$sel->type_ok('name',         'reg-user');
+$sel->type_ok('password',     'selenium', 'Enter password');
+$sel->type_ok('disabledtext', 'Not for common usage');
+$sel->click_ok('add');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Edit user reg-user (reg@selenium.bugzilla.org)');
+
+# Disabled accounts are not listed by default.
+
+$sel->click_ok('link=find other users');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Search users');
+$sel->select_ok('is_enabled', 'label=Enabled');
+$sel->click_ok('search');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+ok(
+  !$sel->is_text_present('master@selenium.bugzilla.org'),
+  'Inactive user account master-user not listed by default'
+);
+ok(
+  !$sel->is_text_present('slave@selenium.bugzilla.org'),
+  'Inactive user account slave-user not listed by default'
+);
+ok(
+  !$sel->is_text_present('reg@selenium.bugzilla.org'),
+  'Inactive user account reg-user not displayed by default'
+);
+
+# Now make sure group inheritance works correctly.
+
+$sel->click_ok('link=find other users');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Search users');
+$sel->check_ok('grouprestrict');
+$sel->select_ok('groupid',    'label=Master');
+$sel->select_ok('matchtype',  'value=substr');
+$sel->select_ok('is_enabled', 'label=All');
+$sel->click_ok('search');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok('master@selenium.bugzilla.org',
+  'master-user in Master group');
+ok(!$sel->is_text_present('slave@selenium.bugzilla.org'),
+  'slave-user not in Master group');
+ok(!$sel->is_text_present('reg@selenium.bugzilla.org'),
+  'reg-user not in Master group');
+
+$sel->click_ok('link=find other users');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Search users');
+$sel->check_ok('grouprestrict');
+$sel->select_ok('groupid',    'label=Slave');
+$sel->select_ok('matchtype',  'value=substr');
+$sel->select_ok('is_enabled', 'label=All');
+$sel->click_ok('search');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok('master@selenium.bugzilla.org',
+  'master-user in Slave group');
+$sel->is_text_present_ok('slave@selenium.bugzilla.org',
+  'slave-user in Slave group');
+ok(!$sel->is_text_present('reg@selenium.bugzilla.org'),
+  'reg-user not in Slave group');
+
+# Add a regular expression to the Slave group.
+
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok('link=Slave');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Change Group: Slave');
+$sel->type_ok('regexp', '^reg\@.*$');
+$sel->click_ok('//input[@value="Update Group"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Group: Slave");
+
+# Test group inheritance again.
+
+go_to_admin($sel);
+$sel->click_ok("link=Users");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Search users');
+$sel->check_ok('grouprestrict');
+$sel->select_ok('groupid',    'label=Master');
+$sel->select_ok('matchtype',  'value=substr');
+$sel->select_ok('is_enabled', 'label=All');
+$sel->click_ok('search');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok('master@selenium.bugzilla.org',
+  'master-user in Master group');
+ok(!$sel->is_text_present('slave@selenium.bugzilla.org'),
+  'slave-user not in Master group');
+ok(!$sel->is_text_present('reg@selenium.bugzilla.org'),
+  'reg-user not in Master group');
+
+$sel->click_ok('link=find other users');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is('Search users');
+$sel->check_ok('grouprestrict');
+$sel->select_ok('groupid',    'label=Slave');
+$sel->select_ok('matchtype',  'value=substr');
+$sel->select_ok('is_enabled', 'label=All');
+$sel->click_ok('search');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->is_text_present_ok('master@selenium.bugzilla.org',
+  'master-user in Slave group');
+$sel->is_text_present_ok('slave@selenium.bugzilla.org',
+  'slave-user in Slave group');
+$sel->is_text_present_ok('reg@selenium.bugzilla.org',
+  'reg-user in Slave group');
+
+# Remove created users and groups.
+
+cleanup_users($sel);
+cleanup_groups($sel, $slave_gid);
+logout($sel);
+
+sub cleanup_users {
+  my $sel = shift;
+
+  go_to_admin($sel);
+  $sel->click_ok("link=Users");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Search users");
+  $sel->type_ok('matchstr', '(master|slave|reg)@selenium.bugzilla.org');
+  $sel->select_ok('matchtype',  'value=regexp');
+  $sel->select_ok('is_enabled', 'label=All');
+  $sel->click_ok("search");
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Select user");
+
+  foreach my $user ('master', 'slave', 'reg') {
+    my $login = $user . '@selenium.bugzilla.org';
+    next unless $sel->is_text_present($login);
+
+    $sel->click_ok("link=$login");
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is("Edit user ${user}-user ($login)");
+    $sel->click_ok("delete");
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is("Confirm deletion of user $login");
+    ok(!$sel->is_text_present('You cannot delete this user account'),
+      'The user can be safely deleted');
+    $sel->click_ok("delete");
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is("User $login deleted");
+    $sel->click_ok('link=show the user list again');
+    $sel->wait_for_page_to_load_ok(WAIT_TIME);
+    $sel->title_is('Select user');
+  }
+}
+
+sub cleanup_groups {
+  my ($sel, $slave_gid) = @_;
+
+  go_to_admin($sel);
+  $sel->click_ok("link=Groups");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Edit Groups");
+  $sel->click_ok("//a[\@href='editgroups.cgi?action=del&group=$slave_gid']");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Delete group 'Slave'");
+  $sel->is_text_present_ok("Do you really want to delete this group?");
+  ok(!$sel->is_element_present("removeusers"), 'No direct members in this group');
+  $sel->click_ok("delete");
+  $sel->wait_for_page_to_load(WAIT_TIME);
+  $sel->title_is("Group Deleted");
+  $sel->is_text_present_ok("The group Slave has been deleted.");
+}
diff --git a/xt/selenium/user_matching.t b/xt/selenium/user_matching.t
new file mode 100644
index 0000000000..118c387e11
--- /dev/null
+++ b/xt/selenium/user_matching.t
@@ -0,0 +1,220 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+log_in($sel, $config, 'tweakparams');
+set_parameters(
+  $sel,
+  {
+    "User Matching" => {
+      "usemenuforusers-off"       => undef,
+      "maxusermatches"            => {type => 'text', value => '0'},
+      "confirmuniqueusermatch-on" => undef
+    },
+    "Group Security" => {"usevisibilitygroups-off" => undef}
+  }
+);
+
+file_bug_in_product($sel, "TestProduct");
+$sel->select_ok("component", "TestComponent");
+my $bug_summary = "Today is Tuesday";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "Poker Face");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# We enter an incomplete email address. process_bug.cgi must ask
+# for confirmation as confirmuniqueusermatch is turned on.
+
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", $config->{unprivileged_user_login_truncated});
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Confirm Match");
+$sel->is_text_present_ok(
+  "$config->{unprivileged_user_login_truncated} matched");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/);
+$sel->click_ok("cc_edit_area_showhide");
+
+# We now enter a complete and valid email address, so it must be accepted.
+# confirmuniqueusermatch = 1 must not trigger the confirmation page as we
+# type the complete email address.
+
+$sel->type_ok("newcc", $config->{unprivileged_user_login});
+edit_bug_and_return($sel, $bug1_id, $bug_summary);
+
+# Now test wildcards ("*"). Due to confirmuniqueusermatch being turned on,
+# a confirmation page must be displayed.
+
+$sel->click_ok("cc_edit_area_showhide");
+$sel->type_ok("newcc", "$config->{unprivileged_user_login_truncated}*");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Confirm Match");
+$sel->is_text_present_ok("($config->{unprivileged_user_login})");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/);
+$sel->click_ok("cc_edit_area_showhide");
+
+# This will return more than one account.
+
+$sel->type_ok("newcc", "*$config->{common_email}");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Confirm Match");
+$sel->is_text_present_ok("*$config->{common_email} matched:");
+
+# Now restrict 'maxusermatches'.
+
+set_parameters($sel,
+  {"User Matching" => {"maxusermatches" => {type => 'text', value => '1'}}});
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("cc_edit_area_showhide");
+
+# Several user accounts match this partial email address. Due to
+# maxusermatches = 1, no email address is suggested.
+
+$sel->type_ok("newcc", "*$config->{common_email}");
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Match Failed");
+$sel->is_text_present_ok("matches multiple users");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/);
+$sel->click_ok("cc_edit_area_showhide");
+
+# We now type a complete and valid email address, so no confirmation
+# page should be displayed.
+
+$sel->type_ok("newcc", $config->{unprivileged_user_login});
+edit_bug($sel, $bug1_id, $bug_summary);
+
+# Now turn on group visibility. It involves important security checks.
+
+set_parameters(
+  $sel,
+  {
+    "User Matching" => {"maxusermatches" => {type => 'text', value => '2'}},
+    "Group Security" => {"usevisibilitygroups-on" => undef}
+  }
+);
+
+# By default, groups are not visible to themselves, so we have to enable this.
+# The tweakparams user has not enough privs to do it himself.
+
+logout($sel);
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Groups");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Edit Groups");
+$sel->click_ok("link=tweakparams");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Change Group: tweakparams");
+
+my @groups = $sel->get_select_options("visible_from_add");
+if (grep { $_ eq 'tweakparams' } @groups) {
+  $sel->add_selection_ok("visible_from_add", "label=tweakparams");
+  $sel->click_ok('//input[@value="Update Group"]');
+  $sel->wait_for_page_to_load_ok(WAIT_TIME);
+  $sel->title_is("Change Group: tweakparams");
+}
+logout($sel);
+log_in($sel, $config, 'tweakparams');
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("cc_edit_area_showhide");
+
+# We are not in the same groups as the unprivileged user, so we cannot see him.
+
+$sel->type_ok("newcc", $config->{unprivileged_user_login_truncated});
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Match Failed");
+$sel->is_text_present_ok(
+  "$config->{unprivileged_user_login_truncated} did not match anything");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/);
+$sel->click_ok("cc_edit_area_showhide");
+
+# This will return too many users (there are at least always three:
+# you, the admin and the permanent user (who has admin privs too)).
+
+$sel->type_ok("newcc", $config->{common_email});
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Confirm Match");
+$sel->is_text_present_ok(
+  "$config->{common_email} matched more than the maximum of 2 users");
+$sel->go_back_ok();
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/);
+$sel->click_ok("cc_edit_area_showhide");
+
+# We can always see ourselves.
+
+$sel->type_ok("newcc", $config->{tweakparams_user_login_truncated});
+$sel->click_ok("commit");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Confirm Match");
+$sel->is_text_present_ok("($config->{tweakparams_user_login})");
+
+# Now test user menus. It must NOT display users we are not allowed to see.
+
+set_parameters($sel, {"User Matching" => {"usemenuforusers-on" => undef}});
+
+go_to_bug($sel, $bug1_id);
+$sel->click_ok("cc_edit_area_showhide");
+my @cc = $sel->get_select_options("newcc");
+ok(
+  !grep($_ =~ /$config->{unprivileged_user_login}/, @cc),
+  "$config->{unprivileged_user_login} is not visible"
+);
+ok(
+  !grep($_ =~ /$config->{canconfirm_user_login}/, @cc),
+  "$config->{canconfirm_user_login} is not visible"
+);
+ok(
+  grep($_ =~ /$config->{admin_user_login}/, @cc),
+  "$config->{admin_user_login} is visible"
+);
+ok(
+  grep($_ =~ /$config->{tweakparams_user_login}/, @cc),
+  "$config->{tweakparams_user_login} is visible"
+);
+
+# Reset parameters.
+
+set_parameters(
+  $sel,
+  {
+    "User Matching" => {
+      "usemenuforusers-off"        => undef,
+      "maxusermatches"             => {type => 'text', value => '0'},
+      "confirmuniqueusermatch-off" => undef
+    },
+    "Group Security" => {"usevisibilitygroups-off" => undef}
+  }
+);
+logout($sel);
diff --git a/xt/selenium/user_preferences.t b/xt/selenium/user_preferences.t
new file mode 100644
index 0000000000..8079461ecd
--- /dev/null
+++ b/xt/selenium/user_preferences.t
@@ -0,0 +1,232 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Update default user preferences.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Default Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+$sel->uncheck_ok("skin-enabled");
+$sel->value_is("skin-enabled", "off");
+$sel->check_ok("state_addselfcc-enabled");
+$sel->select_ok("state_addselfcc", "label=Never");
+$sel->check_ok("post_bug_submit_action-enabled");
+$sel->select_ok("post_bug_submit_action", "label=Show the updated bug");
+$sel->uncheck_ok("zoom_textareas-enabled");
+$sel->select_ok("zoom_textareas", "label=Off");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+
+# Update own user preferences. Some of them are not editable.
+
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("General Preferences");
+ok(!$sel->is_editable("skin"), "The 'skin' user preference is not editable");
+$sel->select_ok("state_addselfcc", "label=Site Default (Never)");
+$sel->select_ok("post_bug_submit_action",
+  "label=Site Default (Show the updated bug)");
+ok(!$sel->is_editable("zoom_textareas"),
+  "The 'zoom_textareas' user preference is not editable");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("General Preferences");
+
+# File a bug in the 'TestProduct' product. The form fields must follow user prefs.
+
+file_bug_in_product($sel, 'TestProduct');
+$sel->value_is("cc", "");
+my $bug_summary = "First bug created";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "I'm not in the CC list.");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+$sel->value_is("addselfcc", "off");
+$sel->type_ok("tag", "sel-tmp");
+$sel->select_ok("bug_status", "label=IN_PROGRESS");
+edit_bug($sel, $bug1_id, $bug_summary);
+$sel->click_ok("summary_edit_action");
+$sel->value_is("short_desc", $bug_summary);
+$sel->value_is("addselfcc",  "off");
+
+# Create a saved search for the 'sel-tmp' tag.
+
+$sel->type_ok("quicksearch_top", "tag:sel-tmp");
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List: tag:sel-tmp");
+$sel->type_ok("save_newqueryname", "sel-tmp");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Search created");
+$sel->is_text_present_ok("OK, you have a new search named sel-tmp");
+
+# Leave this page to avoid clicking on the wrong 'sel-tmp' link.
+go_to_home($sel, $config);
+$sel->click_ok("link=sel-tmp");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: sel-tmp");
+$sel->is_text_present_ok("One bug found");
+
+# File another bug in the 'TestProduct' product.
+
+file_bug_in_product($sel, 'TestProduct');
+$sel->value_is("cc", "");
+my $bug_summary2 = "My second bug";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "Still not in the CC list");
+my $bug2_id = create_bug($sel, $bug_summary2);
+$sel->value_is("addselfcc", "off");
+$sel->type_ok("tag", "sel-tmp");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+$sel->click_ok("link=sel-tmp");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: sel-tmp");
+$sel->is_text_present_ok("2 bugs found");
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->type_ok("comment", "The next bug I should see is this one.");
+edit_bug($sel, $bug1_id, $bug_summary);
+$sel->click_ok("summary_edit_action");
+$sel->value_is("short_desc", "First bug created");
+$sel->is_text_present_ok("The next bug I should see is this one.");
+
+# Remove the saved search. The tag itself still exists.
+
+$sel->click_ok("link=sel-tmp");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: sel-tmp");
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Search is gone");
+$sel->is_text_present_ok("OK, the sel-tmp search is gone");
+
+# Remove the tag from bugs.
+
+$sel->type_ok("quicksearch_top", "tag:sel-tmp");
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("2 bugs found");
+
+# We cannot remove tags from several bugs at once (bug 791584).
+go_to_bug($sel, $bug1_id);
+$sel->type_ok("tag", "");
+edit_bug($sel, $bug1_id, $bug_summary);
+
+go_to_bug($sel, $bug2_id);
+$sel->type_ok("tag", "");
+edit_bug($sel, $bug2_id, $bug_summary2);
+
+$sel->type_ok("quicksearch_top", "tag:sel-tmp");
+$sel->click_ok("find_top");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("Zarro Boogs found");
+logout($sel);
+
+# Edit own user preferences, now as an unprivileged user.
+
+log_in($sel, $config, 'unprivileged');
+$sel->click_ok("link=Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("General Preferences");
+ok(!$sel->is_editable("skin"), "The 'skin' user preference is not editable");
+$sel->select_ok("state_addselfcc",        "label=Always");
+$sel->select_ok("post_bug_submit_action", "label=Show next bug in my list");
+ok(!$sel->is_editable("zoom_textareas"),
+  "The 'zoom_textareas' user preference is not editable");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("General Preferences");
+
+# Create a new search named 'my_list'.
+
+open_advanced_search_page($sel);
+$sel->remove_all_selections_ok("product");
+$sel->add_selection_ok("product", "TestProduct");
+$sel->remove_all_selections_ok("bug_status");
+$sel->select_ok("bug_id_type", "label=only included in");
+$sel->type_ok("bug_id", "$bug1_id , $bug2_id");
+$sel->select_ok("order", "label=Bug Number");
+$sel->click_ok("Search");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Bug List");
+$sel->is_text_present_ok("2 bugs found");
+$sel->type_ok("save_newqueryname", "my_list");
+$sel->click_ok("remember");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Search created");
+$sel->is_text_present_ok("OK, you have a new search named my_list");
+
+# Editing bugs should follow user preferences.
+
+$sel->click_ok("link=my_list");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: my_list");
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->value_is("addselfcc", "on");
+$sel->type_ok("comment",
+  "I should be CC'ed and then I should see the next bug.");
+edit_bug($sel, $bug2_id, $bug_summary2);
+$sel->is_text_present_ok("The next bug in your list is bug $bug2_id");
+ok(!$sel->is_text_present("I should see the next bug"),
+  "The updated bug is no longer displayed");
+
+# The user has no privs, so the short_desc field is not present.
+$sel->is_text_present("short_desc", "My second bug");
+$sel->value_is("addselfcc", "on");
+$sel->click_ok("link=$bug1_id");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id /);
+$sel->is_text_present("1 user including you");
+
+# Delete the saved search and log out.
+
+$sel->click_ok("link=my_list");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Bug List: my_list");
+$sel->click_ok("forget_search");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Search is gone");
+$sel->is_text_present_ok("OK, the my_list search is gone");
+logout($sel);
+
+# Restore default user preferences.
+
+log_in($sel, $config, 'admin');
+go_to_admin($sel);
+$sel->click_ok("link=Default Preferences");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+$sel->check_ok("skin-enabled");
+$sel->uncheck_ok("post_bug_submit_action-enabled");
+$sel->select_ok("post_bug_submit_action", "label=Do Nothing");
+$sel->click_ok("update");
+$sel->wait_for_page_to_load(WAIT_TIME);
+$sel->title_is("Default Preferences");
+logout($sel);
diff --git a/xt/selenium/user_privs.t b/xt/selenium/user_privs.t
new file mode 100644
index 0000000000..05b96bd3a2
--- /dev/null
+++ b/xt/selenium/user_privs.t
@@ -0,0 +1,78 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+# Create a new bug. As the reporter, some forms are editable to you.
+# But as you don't have editbugs privs, you cannot edit everything.
+
+log_in($sel, $config, 'unprivileged');
+file_bug_in_product($sel, 'TestProduct');
+ok(!$sel->is_editable("assigned_to"), "The assignee field is not editable");
+my $bug_summary = "Greetings from a powerless user";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "File a bug with an empty CC list");
+my $bug1_id = create_bug($sel, $bug_summary);
+logout($sel);
+
+# Some checks while being logged out.
+
+go_to_bug($sel, $bug1_id);
+ok(!$sel->is_element_present("commit"), "Button 'Commit' not available");
+my $text = trim($sel->get_text("//fieldset"));
+ok(
+  $text
+    =~ /You need to log in before you can comment on or make changes to this bug./,
+  "Addl. comment box not displayed"
+);
+
+# Don't call log_in() here. We explicitly want to use the "log in" link
+# in the addl. comment box.
+
+$sel->click_ok("link=log in");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Log in to Bugzilla");
+$sel->is_text_present_ok(
+  "Bugzilla needs a legitimate login and password to continue");
+$sel->type_ok(
+  "Bugzilla_login",
+  $config->{unprivileged_user_login},
+  "Enter login name"
+);
+$sel->type_ok(
+  "Bugzilla_password",
+  $config->{unprivileged_user_passwd},
+  "Enter password"
+);
+$sel->click_ok("log_in", undef, "Submit credentials");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/^$bug1_id/, "Display bug $bug1_id");
+
+# Neither the (edit) link nor the hidden form must exist, at all.
+# But the 'Commit' button does exist.
+
+ok(
+  !$sel->is_element_present("bz_assignee_edit_action"),
+  "No (edit) link displayed for the assignee"
+);
+ok(
+  !$sel->is_element_present("assigned_to"),
+  "No hidden assignee field available"
+);
+$sel->is_element_present_ok("commit");
+logout($sel);
diff --git a/xt/selenium/votes.t b/xt/selenium/votes.t
new file mode 100644
index 0000000000..4580101063
--- /dev/null
+++ b/xt/selenium/votes.t
@@ -0,0 +1,265 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More "no_plan";
+
+use QA::Util;
+
+my ($sel, $config) = get_selenium();
+
+unless ($config->{test_extensions}) {
+  ok(1,
+    "this installation doesn't test extensions. Skipping test_votes.t completely.");
+  exit;
+}
+
+log_in($sel, $config, 'admin');
+set_parameters(
+  $sel,
+  {
+    "Bug Fields"              => {"useclassification-off" => undef},
+    "Administrative Policies" => {"allowbugdeletion-on"   => undef}
+  }
+);
+
+# Create a new product, so that we can safely play with vote settings.
+
+add_product($sel);
+$sel->type_ok("product",        "Eureka");
+$sel->type_ok("description",    "A great new product");
+$sel->type_ok("votesperuser",   10);
+$sel->type_ok("maxvotesperbug", 5);
+$sel->type_ok("votestoconfirm", 3);
+$sel->type_ok("component",      "Pegasus");
+$sel->type_ok("comp_desc",      "A constellation in the north hemisphere.");
+$sel->type_ok(
+  "initialowner",
+  $config->{permanent_user},
+  "Setting the default owner"
+);
+$sel->click_ok('add-product');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Product Created");
+
+# Create a new bug with the CONFIRMED status.
+
+file_bug_in_product($sel, 'Eureka');
+
+# CONFIRMED must be the default bug status for users with editbugs privs.
+$sel->selected_label_is("bug_status", "CONFIRMED");
+my $bug_summary = "Aries";
+$sel->type_ok("short_desc", $bug_summary);
+$sel->type_ok("comment",    "1st constellation");
+my $bug1_id = create_bug($sel, $bug_summary);
+
+# Now vote for this bug.
+
+$sel->click_ok("link=vote");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+
+# No comment :-/
+my $full_text = trim($sel->get_body_text());
+
+# OK, this is not the most robust regexp, but that's better than nothing.
+ok(
+  $full_text =~ /only 5 votes allowed per bug in this product/,
+  "Notice about the number of votes allowed per bug displayed"
+);
+$sel->type_ok("bug_$bug1_id", 4);
+$sel->click_ok("change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+$full_text = trim($sel->get_body_text());
+
+# OK, we may get a false positive if another product has the exact same numbers,
+# but I have no better idea to check this information.
+ok($full_text =~ /4 votes used out of 10 allowed/,
+  "Display the number of votes used");
+
+# File a new bug, now as UNCONFIRMED. We will confirm it by popular votes.
+
+file_bug_in_product($sel, 'Eureka');
+$sel->select_ok("bug_status", "UNCONFIRMED");
+my $bug_summary2 = "Taurus";
+$sel->type_ok("short_desc", $bug_summary2);
+$sel->type_ok("comment",    "2nd constellation");
+my $bug2_id = create_bug($sel, $bug_summary2);
+
+# Put enough votes on this bug to confirm it by popular votes.
+
+$sel->click_ok("link=vote");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+$sel->type_ok("bug_$bug2_id", 5);
+$sel->click_ok("change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+$sel->is_text_present_ok("Bug $bug2_id confirmed by number of votes");
+
+# File a third bug, again as UNCONFIRMED. We will confirm it
+# by decreasing the number required to confirm bugs by popular votes.
+
+file_bug_in_product($sel, 'Eureka');
+$sel->select_ok("bug_status", "UNCONFIRMED");
+my $bug_summary3 = "Gemini";
+$sel->type_ok("short_desc", $bug_summary3);
+$sel->type_ok("comment",    "3rd constellation");
+my $bug3_id = create_bug($sel, $bug_summary3);
+
+# Vote for this bug, but remain below the threshold required
+# to confirm the bug by popular votes.
+# We also change votes set on other bugs for testing purposes.
+
+$sel->click_ok("link=vote");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+$sel->type_ok("bug_$bug1_id", 2);
+$sel->type_ok("bug_$bug3_id", 2);
+$sel->click_ok("change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+
+# Illegal change: max is 5 votes per bug!
+$sel->type_ok("bug_$bug2_id", 15);
+$sel->click_ok("change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Illegal Vote");
+my $text = trim($sel->get_text("error_msg"));
+ok(
+  $text
+    =~ /You may only use at most 5 votes for a single bug in the Eureka product, but you are trying to use 15/,
+  "Too many votes per bug"
+);
+
+# FIXME - We cannot use go_back_ok() here, because Firefox complains about
+# POST data not being stored in its cache. As a workaround, we go to
+# the bug we just visited and click the 'vote' link again.
+
+go_to_bug($sel, $bug3_id);
+$sel->click_ok("link=vote");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Change Votes");
+
+# Illegal change: max is 10 votes for this product!
+$sel->type_ok("bug_$bug2_id", 5);
+$sel->type_ok("bug_$bug1_id", 5);
+$sel->click_ok("change");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Illegal Vote");
+$text = trim($sel->get_text("error_msg"));
+ok(
+  $text
+    =~ /You tried to use 12 votes in the Eureka product, which exceeds the maximum of 10 votes for this product/,
+  "Too many votes for this product"
+);
+
+# Decrease the confirmation threshold so that $bug3 becomes confirmed.
+
+edit_product($sel, 'Eureka');
+$sel->type_ok("votestoconfirm", 2);
+$sel->click_ok("update-product");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Updating Product 'Eureka'");
+$full_text = trim($sel->get_body_text());
+ok($full_text =~ /Updated number of votes needed to confirm a bug from 3 to 2/,
+  "Confirming the new number of votes to confirm");
+$sel->is_text_present_ok("Bug $bug3_id confirmed by number of votes");
+
+# Decrease the number of votes per bug so that $bug2 is updated.
+
+$sel->click_ok("link='Eureka'");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Edit Product 'Eureka'");
+$sel->type_ok("maxvotesperbug", 4);
+$sel->click_ok("update-product");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Updating Product 'Eureka'");
+$full_text = trim($sel->get_body_text());
+ok($full_text =~ /Updated maximum votes per bug from 5 to 4/,
+  "Confirming the new number of votes per bug");
+$sel->is_text_present_ok(
+  "removed votes for bug $bug2_id from " . $config->{admin_user_login},
+  undef, "Removed votes from the admin");
+
+# Go check that $bug2 has been correctly updated.
+
+$sel->click_ok("link=$bug2_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/$bug2_id /);
+$text = trim($sel->get_text("votes_container"));
+ok($text =~ /4 votes/, "4 votes remaining");
+
+# Decrease the number per user. Bugs should keep at least one vote,
+# i.e. not all votes are removed (which was the old behavior).
+
+edit_product($sel, "Eureka");
+$sel->type_ok("votesperuser", 5);
+$sel->click_ok("update-product");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Updating Product 'Eureka'");
+$full_text = trim($sel->get_body_text());
+ok(
+  $full_text =~ /Updated votes per user from 10 to 5/,
+  "Confirming the new number of votes per user"
+);
+$sel->is_text_present_ok("removed votes for bug");
+
+# Go check that $bug3 has been correctly updated.
+
+$sel->click_ok("link=$bug3_id");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_like(qr/$bug3_id /);
+$text = trim($sel->get_text("votes_container"));
+ok($text =~ /2 votes/, "2 votes remaining");
+
+# Now disable UNCONFIRMED.
+
+edit_product($sel, "Eureka");
+$sel->click_ok("allows_unconfirmed");
+$sel->click_ok("update-product");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Updating Product 'Eureka'");
+$full_text = trim($sel->get_body_text());
+ok($full_text =~ /The product no longer allows the UNCONFIRMED status/,
+  "Disable UNCONFIRMED");
+
+# File a new bug. UNCONFIRMED must not be listed as a valid bug status.
+
+file_bug_in_product($sel, "Eureka");
+ok(!scalar(grep { $_ eq "UNCONFIRMED" } $sel->get_select_options("bug_status")),
+  "UNCONFIRMED not listed");
+my $bug_summary4 = "Cancer";
+$sel->type_ok("short_desc", $bug_summary4);
+$sel->type_ok("comment",    "4th constellation");
+my $bug4_id = create_bug($sel, $bug_summary4);
+
+# Now delete the 'Eureka' product.
+
+go_to_admin($sel);
+$sel->click_ok("link=Products");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Select product");
+$sel->click_ok('//a[@href="editproducts.cgi?action=del&product=Eureka"]');
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Delete Product 'Eureka'");
+$full_text = trim($sel->get_body_text());
+ok($full_text =~ /There are 4 bugs entered for this product/,
+  "Display warning about existing bugs");
+ok($full_text =~ /Pegasus: A constellation in the north hemisphere/,
+  "Display product description");
+$sel->click_ok("delete");
+$sel->wait_for_page_to_load_ok(WAIT_TIME);
+$sel->title_is("Product Deleted");
+logout($sel);
diff --git a/xt/webservice/bug_add_attachment.t b/xt/webservice/bug_add_attachment.t
new file mode 100644
index 0000000000..5a9cb91c53
--- /dev/null
+++ b/xt/webservice/bug_add_attachment.t
@@ -0,0 +1,266 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use MIME::Base64 qw(encode_base64 decode_base64);
+use Test::More tests => 187;
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+use constant INVALID_BUG_ID    => -1;
+use constant INVALID_BUG_ALIAS => random_string(20);
+use constant PRIVS_USER        => 'QA_Selenium_TEST';
+
+sub attach {
+  my ($id, $override) = @_;
+  my %fields = (
+    ids          => [$id],
+    data         => 'data-' . random_string(100),
+    file_name    => 'file_name-' . random_string(60),
+    summary      => 'summary-' . random_string(100),
+    content_type => 'text/plain',
+    comment      => 'comment-' . random_string(100),
+  );
+
+  foreach my $key (keys %{$override || {}}) {
+    my $value = $override->{$key};
+    if (defined $value) {
+      $fields{$key} = $value;
+    }
+    else {
+      delete $fields{$key};
+    }
+  }
+  return \%fields;
+}
+
+my ($public_bug, $private_bug) = $xmlrpc->bz_create_test_bugs('private');
+my $public_id  = $public_bug->{id};
+my $private_id = $private_bug->{id};
+
+my @tests = (
+
+  # Permissions
+  {
+    args  => attach($public_id),
+    error => 'You must log in',
+    test  => 'Logged-out user cannot add an attachment to a public bug',
+  },
+  {
+    args  => attach($private_id),
+    error => "You must log in",
+    test  => 'Logged-out user cannot add an attachment to a private bug',
+  },
+  {
+    user  => 'editbugs',
+    args  => attach($private_id),
+    error => "not authorized to access",
+    test  => "Editbugs user can't add an attachment to a private bug",
+  },
+
+  # Test ID parameter
+  {
+    user  => 'unprivileged',
+    args  => attach(undef, {ids => undef}),
+    error => 'a ids argument',
+    test  => 'Failing to pass the "ids" param fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach(INVALID_BUG_ID),
+    error => "not a valid bug number",
+    test  => 'Passing invalid bug id returns error "Invalid Bug ID"',
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach(''),
+    error => "You must enter a valid bug number",
+    test  => 'Passing empty bug id returns error "Invalid Bug ID"',
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach(INVALID_BUG_ALIAS),
+    error => "nor an alias to a bug",
+    test  => 'Passing invalid bug alias returns error "Invalid Bug Alias"',
+  },
+
+  # Test Comment parameter
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {data => undef}),
+    error => 'a data argument',
+    test  => 'Failing to pass the "data" parameter fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {data => ''}),
+    error => "The file you are trying to attach is empty",
+    test  => 'Passing empty data fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {data => random_string(300_000)}),
+    error => "Attachments cannot be more than",
+    test  => "Passing an attachment that's too large fails",
+  },
+
+  # Test the private parameter
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {is_private => 1}),
+    error => 'attachments as private',
+    test  => 'Unprivileged user cannot add a private attachment'
+  },
+
+  # Content-type
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {content_type => 'foo/bar'}),
+    error => "Valid types must be of the form",
+    test  => "Well-formed but invalid content type fails",
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {content_type => undef}),
+    error => 'Valid types must be of the form',
+    test  => "Failing to pass content_type fails",
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {content_type => ''}),
+    error => 'Valid types must be of the form',
+    test  => "Empty content type fails",
+  },
+
+  # Summary
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {summary => undef}),
+    error => 'You must enter a description for the attachment',
+    test  => "Failing to pass summary fails",
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {summary => ''}),
+    error => 'You must enter a description for the attachment',
+    test  => "Empty summary fails",
+  },
+
+  # Filename
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {file_name => undef}),
+    error => 'You did not specify a file to attach',
+    test  => "Failing to pass file_name fails",
+  },
+  {
+    user  => 'unprivileged',
+    args  => attach($public_id, {file_name => ''}),
+    error => 'You did not specify a file to attach',
+    test  => "Empty file_name fails",
+  },
+
+  # Success tests
+  {
+    user => 'unprivileged',
+    args => attach($public_id),
+    test => 'Unprivileged user can add an attachment to a public bug',
+  },
+  {
+    user => 'unprivileged',
+    args => attach($public_id, {is_patch => 1, content_type => undef}),
+    test => 'Attaching a patch with no content type works',
+  },
+  {
+    user => 'unprivileged',
+    args => attach(
+      $public_id, {is_patch => 1, content_type => 'application/octet-stream'}
+    ),
+    test => 'Attaching a patch with a bad content_type works',
+  },
+  {
+    user => PRIVS_USER,
+    args => attach($private_id),
+    test => 'Privileged user can add an attachment to a private bug',
+  },
+  {
+    user => PRIVS_USER,
+    args => attach($public_id, {is_private => 1}),
+    test => 'Insidergroup user can add a private attachment',
+  },
+);
+
+$jsonrpc_get->bz_call_fail(
+  'Bug.add_attachment', attach($public_id),
+  'must use HTTP POST', 'add_attachment fails over GET'
+);
+
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'Bug.add_attachment',
+    post_success => \&post_success,
+    pre_call     => \&pre_call
+  );
+}
+
+# We have to encode data manually when using JSON-RPC, else it fails.
+sub pre_call {
+  my ($t, $rpc) = @_;
+  return if !$rpc->isa('QA::RPC::JSONRPC');
+  return if !defined $t->{args}->{data};
+
+  $t->{args}->{data} = encode_base64($t->{args}->{data}, '');
+}
+
+sub post_success {
+  my ($call, $t, $rpc) = @_;
+
+  my $ids = $call->result->{ids};
+  $call = $rpc->bz_call_success("Bug.attachments", {attachment_ids => $ids});
+  my $attachments = $call->result->{attachments};
+
+  foreach my $id (keys %$attachments) {
+    my $attachment = $attachments->{$id};
+    if ($t->{args}->{is_private}) {
+      ok($attachment->{is_private}, $rpc->TYPE . ": Attachment $id is private");
+    }
+    else {
+      ok(!$attachment->{is_private}, $rpc->TYPE . ": Attachment $id is NOT private");
+    }
+
+    if ($t->{args}->{is_patch}) {
+      is($attachment->{content_type},
+        'text/plain', $rpc->TYPE . ": Patch $id content type is text/plain");
+    }
+    else {
+      is(
+        $attachment->{content_type},
+        $t->{args}->{content_type},
+        $rpc->TYPE . ": Attachment $id content type is correct"
+      );
+    }
+
+    if ($rpc->isa('QA::RPC::JSONRPC')) {
+
+    # We encoded data in pre_call(), so we have to restore it to its original content.
+      $t->{args}->{data} = decode_base64($t->{args}->{data});
+      $attachment->{data} = decode_base64($attachment->{data});
+    }
+    is(
+      $attachment->{data},
+      $t->{args}->{data},
+      $rpc->TYPE . ": Attachment $id data is correct"
+    );
+  }
+}
diff --git a/xt/webservice/bug_add_comment.t b/xt/webservice/bug_add_comment.t
new file mode 100644
index 0000000000..44c1ea5b5a
--- /dev/null
+++ b/xt/webservice/bug_add_comment.t
@@ -0,0 +1,202 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#############################################
+# Test for xmlrpc call to Bug.add_comment() #
+#############################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use Test::More tests => 141;
+
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+use constant INVALID_BUG_ID    => -1;
+use constant INVALID_BUG_ALIAS => 'aaaaaaa12345';
+use constant PRIVS_USER        => 'QA_Selenium_TEST';
+use constant TIMETRACKING_USER => 'admin';
+
+use constant TEST_COMMENT     => '--- Test Comment From QA Tests ---';
+use constant TOO_LONG_COMMENT => 'a' x 100000;
+
+my @tests = (
+
+  # Permissions
+  {
+    args  => {id => 'public_bug', comment => TEST_COMMENT},
+    error => 'You must log in',
+    test  => 'Logged-out user cannot comment on a public bug',
+  },
+  {
+    args  => {id => 'private_bug', comment => TEST_COMMENT},
+    error => "You must log in",
+    test  => 'Logged-out user cannot comment on a private bug',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => 'private_bug', comment => TEST_COMMENT},
+    error => "not authorized to access",
+    test  => "Unprivileged user can't comment on a private bug",
+  },
+
+  # Test ID parameter
+  {
+    user  => 'unprivileged',
+    args  => {comment => TEST_COMMENT},
+    error => 'a id argument',
+    test  => 'Failing to pass the "id" param fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => INVALID_BUG_ID, comment => TEST_COMMENT},
+    error => "not a valid bug number",
+    test  => 'Passing invalid bug id returns error "Invalid Bug ID"',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => '', comment => TEST_COMMENT},
+    error => "You must enter a valid bug number",
+    test  => 'Passing empty bug id param returns error "Invalid Bug ID"',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => INVALID_BUG_ALIAS, comment => TEST_COMMENT},
+    error => "nor an alias to a bug",
+    test  => 'Passing invalid bug alias returns error "Invalid Bug Alias"',
+  },
+
+  # Test Comment parameter
+  {
+    user  => 'unprivileged',
+    args  => {id => 'public_bug'},
+    error => 'a comment argument',
+    test  => 'Failing to pass the "comment" parameter fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => 'public_bug', comment => ''},
+    error => "a comment argument",
+    test  => 'Passing an empty comment fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => 'public_bug', comment => ' '},
+    error => 'a comment argument',
+    test  => 'Passing only a space for comment fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => 'public_bug', comment => " \t\n\n\r\n\r\n\r "},
+    error => 'a comment argument',
+    test  => 'Passing only whitespace (including newlines) fails',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {id => 'public_bug', comment => TOO_LONG_COMMENT},
+    error => "cannot be longer than",
+    test  => "Passing a comment that's too long fails",
+  },
+
+  # Testing the "private" parameter happens in the tests for Bug.comments
+
+  # Test work_time parameter
+  # FIXME Should be testing permissions on the work_time parameter,
+  # but we currently have no way to verify whether or not time was
+  # added to the bug, and there's no error thrown if you lack perms.
+  {
+    user  => 'admin',
+    args  => {id => 'public_bug', comment => TEST_COMMENT, work_time => 'aaa'},
+    error => "is not a numeric value",
+    test  => "Passing a non-numeric work_time fails",
+  },
+  {
+    user => 'admin',
+    args =>
+      {id => 'public_bug', comment => TEST_COMMENT, work_time => '1234567890'},
+    error => 'more than the maximum',
+    test  => 'Passing too large of a work_time fails',
+  },
+  {
+    user  => 'admin',
+    args  => {id => 'public_bug', comment => '', work_time => '1.0'},
+    error => 'a comment argument',
+    test  => 'Passing a work_time with an empty comment fails',
+  },
+
+  # Success tests
+  {
+    user => 'unprivileged',
+    args => {id => 'public_bug', comment => TEST_COMMENT},
+    test => 'Unprivileged user can add a comment to a public bug',
+  },
+  {
+    user => 'unprivileged',
+    args => {id => 'public_bug', comment => " \n" . TEST_COMMENT},
+    test => 'Can add a comment to a bug where the first line is whitespace',
+  },
+  {
+    user          => 'QA_Selenium_TEST',
+    args          => {id => 'private_bug', comment => TEST_COMMENT},
+    test          => 'Privileged user can add a comment to a private bug',
+    check_privacy => 1,
+  },
+  {
+    user          => 'QA_Selenium_TEST',
+    args          => {id => 'public_bug', comment => TEST_COMMENT, is_private => 1},
+    test          => 'Insidergroup user can add a private comment',
+    check_privacy => 1,
+  },
+  {
+    user => 'admin',
+    args => {id => 'public_bug', comment => TEST_COMMENT, work_time => '1.5'},
+    test => 'Timetracking user can add work_time to a bug',
+  },
+
+  # FIXME Need to verify that the comment added actually has work_time.
+);
+
+$jsonrpc_get->bz_call_fail(
+  'Bug.add_comment',
+  {id => 'public_bug', comment => TEST_COMMENT},
+  'must use HTTP POST',
+  'add_comment fails over GET'
+);
+
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'Bug.add_comment',
+    post_success => \&post_success
+  );
+}
+
+sub post_success {
+  my ($call, $t, $rpc) = @_;
+  return unless $t->{check_privacy};
+
+  my $comment_id = $call->result->{id};
+  my $result
+    = $rpc->bz_call_success('Bug.comments', {comment_ids => [$comment_id]});
+  if ($t->{args}->{is_private}) {
+    ok(
+      $result->result->{comments}->{$comment_id}->{is_private},
+      $rpc->TYPE . ": Comment $comment_id is private"
+    );
+  }
+  else {
+    ok(
+      !$result->result->{comments}->{$comment_id}->{is_private},
+      $rpc->TYPE . ": Comment $comment_id is NOT private"
+    );
+  }
+}
diff --git a/xt/webservice/bug_attachments.t b/xt/webservice/bug_attachments.t
new file mode 100644
index 0000000000..d24df60773
--- /dev/null
+++ b/xt/webservice/bug_attachments.t
@@ -0,0 +1,181 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);
+use Data::Dumper;
+use List::Util qw(first);
+use MIME::Base64;
+use Test::More tests => 313;
+my ($config, @clients) = get_rpc_clients();
+
+################
+# Bug ID Tests #
+################
+
+our %attachments;
+
+sub post_bug_success {
+  my ($call, $t) = @_;
+
+  my $bugs = $call->result->{bugs};
+  is(scalar keys %$bugs, 1, "Got exactly one bug") or diag(Dumper($call->result));
+
+  my $bug_attachments = (values %$bugs)[0];
+
+  # Collect attachment ids
+  foreach my $alias (qw(public_bug private_bug)) {
+    foreach my $is_private (0, 1) {
+      my $find_desc = "${alias}_${is_private}";
+      my $attachment = first { $_->{summary} eq $find_desc }
+      reverse @$bug_attachments;
+      if ($attachment) {
+        $attachments{$find_desc} = $attachment->{id};
+      }
+    }
+  }
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => STANDARD_BUG_TESTS,
+    method       => 'Bug.attachments',
+    post_success => \&post_bug_success
+  );
+}
+
+foreach my $alias (qw(public_bug private_bug)) {
+  foreach my $is_private (0, 1) {
+    ok(
+      $attachments{"${alias}_${is_private}"},
+      "Found attachment id for ${alias}_${is_private}"
+    );
+  }
+}
+
+####################
+# Attachment Tests #
+####################
+
+my $content_file
+  = $config->{bugzilla_path} . '/xt/config/generate_test_data.pl';
+open(my $fh, '<', $content_file) or die "$content_file: $!";
+my $content;
+{ local $/; $content = <$fh>; }
+close($fh);
+
+# Access tests for public/private stuff, and also validate that the
+# format of each return value is correct.
+
+my @tests = (
+
+  # Logged-out user
+  {
+    args => {attachment_ids => [$attachments{'public_bug_0'}]},
+    test => 'Logged-out user can access public attachment on public'
+      . '  bug by id',
+  },
+  {
+    args  => {attachment_ids => [$attachments{'public_bug_1'}]},
+    test  => 'Logged-out user cannot access private attachment on public bug',
+    error => 'Sorry, you are not authorized',
+  },
+  {
+    args  => {attachment_ids => [$attachments{'private_bug_0'}]},
+    test  => 'Logged-out user cannot access attachments by id on private bug',
+    error => 'You are not authorized to access',
+  },
+  {
+    args => {attachment_ids => [$attachments{'private_bug_1'}]},
+    test => 'Logged-out user cannot access private attachment on ' . ' private bug',
+    error => 'You are not authorized to access',
+  },
+
+  # Logged-in, unprivileged user.
+  {
+    user => 'unprivileged',
+    args => {attachment_ids => [$attachments{'public_bug_0'}]},
+    test => 'Logged-in user can see a public attachment on a public bug by id',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {attachment_ids => [$attachments{'public_bug_1'}]},
+    test  => 'Logged-in user cannot access private attachment on public bug',
+    error => 'Sorry, you are not authorized',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {attachment_ids => [$attachments{'private_bug_0'}]},
+    test  => 'Logged-in user cannot access attachments by id on private bug',
+    error => "You are not authorized to access",
+  },
+  {
+    user  => 'unprivileged',
+    args  => {attachment_ids => [$attachments{'private_bug_1'}]},
+    test  => 'Logged-in user cannot access private attachment on private bug',
+    error => "You are not authorized to access",
+  },
+
+  # User who can see private bugs and private attachments
+  {
+    user => PRIVATE_BUG_USER,
+    args => {attachment_ids => [$attachments{'public_bug_1'}]},
+    test => PRIVATE_BUG_USER . ' can see private attachment on public bug',
+  },
+  {
+    user => PRIVATE_BUG_USER,
+    args => {attachment_ids => [$attachments{'private_bug_1'}]},
+    test => PRIVATE_BUG_USER . ' can see private attachment on private bug',
+  },
+);
+
+sub post_success {
+  my ($call, $t, $rpc) = @_;
+  is(scalar keys %{$call->result->{attachments}}, 1,
+    "Got exactly one attachment");
+  my $attachment = (values %{$call->result->{attachments}})[0];
+
+  cmp_ok($attachment->{last_change_time},
+    '=~', $rpc->DATETIME_REGEX, "last_change_time is in the right format");
+  cmp_ok($attachment->{creation_time},
+    '=~', $rpc->DATETIME_REGEX, "creation_time is in the right format");
+  is($attachment->{is_obsolete}, 0, 'is_obsolete is 0');
+  cmp_ok($attachment->{bug_id}, '=~', qr/^\d+$/, "bug_id is an integer");
+  cmp_ok($attachment->{id},     '=~', qr/^\d+$/, "id is an integer");
+  is($attachment->{content_type}, 'application/x-perl',
+    "content_type is correct");
+  cmp_ok($attachment->{file_name},
+    '=~', qr/^\w+\.pl$/, "filename is in the expected format");
+  is(
+    $attachment->{creator},
+    (
+        $t->{user}
+      ? $config->{QA_Selenium_TEST_user_login}
+      : email_filter($config->{QA_Selenium_TEST_user_login})
+    ),
+    "creator is the correct user"
+  );
+  my $data = $attachment->{data};
+  $data = decode_base64($data) if $rpc->isa('QA::RPC::JSONRPC');
+  is($data,               $content,      'data is correct');
+  is($attachment->{size}, length($data), "size matches data's size");
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    method       => 'Bug.attachments',
+    tests        => \@tests,
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_comments.t b/xt/webservice/bug_comments.t
new file mode 100644
index 0000000000..60c178459d
--- /dev/null
+++ b/xt/webservice/bug_comments.t
@@ -0,0 +1,207 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+##########################################
+# Test for xmlrpc call to Bug.comments() #
+##########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use DateTime;
+use QA::Util;
+use QA::Tests qw(STANDARD_BUG_TESTS PRIVATE_BUG_USER);
+use Test::More tests => 331;
+my ($config, @clients) = get_rpc_clients();
+
+# These gets populated when we call Bug.add_comment.
+our $creation_time;
+our %comments = (
+  public_comment_public_bug   => 0,
+  public_comment_private_bug  => 0,
+  private_comment_public_bug  => 0,
+  private_comment_private_bug => 0,
+);
+
+sub test_comments {
+  my ($comments_returned, $call, $t, $rpc) = @_;
+
+  my $comment = $comments_returned->[0];
+  ok($comment->{bug_id}, "bug_id exists");
+
+  # FIXME At some point we should test attachment_id here.
+
+  if ($t->{args}->{comment_ids}) {
+    my $expected_id = $t->{args}->{comment_ids}->[0];
+    is($comment->{id}, $expected_id, "comment id is correct");
+
+    my %reverse_map   = reverse %comments;
+    my $expected_text = $reverse_map{$expected_id};
+    is($comment->{text}, $expected_text, "comment has the correct text");
+
+    my $priv_login = $rpc->bz_config->{PRIVATE_BUG_USER . '_user_login'};
+    $priv_login = $t->{user} ? $priv_login : email_filter($priv_login);
+    is($comment->{creator}, $priv_login, "comment creator is correct");
+
+    my $creation_day;
+    if ($rpc->isa('QA::RPC::XMLRPC')) {
+      $creation_day = $creation_time->ymd('');
+    }
+    else {
+      $creation_day = $creation_time->ymd;
+    }
+    like(
+      $comment->{time},
+      qr/^\Q${creation_day}\ET\d\d:\d\d:\d\d/,
+      "comment time has the right format"
+    );
+  }
+  else {
+    foreach my $field (qw(id text creator time)) {
+      ok(defined $comment->{$field}, "$field is defined");
+    }
+  }
+}
+
+################
+# Bug ID Tests #
+################
+
+sub post_bug_success {
+  my ($call, $t) = @_;
+  my @bugs = values %{$call->result->{bugs}};
+  is(scalar @bugs, 1, "Got exactly one bug");
+  my @comments = map { @{$_->{comments}} } @bugs;
+  test_comments(\@comments, @_);
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => STANDARD_BUG_TESTS,
+    method       => 'Bug.comments',
+    post_success => \&post_bug_success
+  );
+}
+
+####################
+# Comment ID Tests #
+####################
+
+# First, create comments using add_comment.
+my @add_comment_tests;
+foreach my $key (keys %comments) {
+  $key =~ /^([a-z]+)_comment_(\w+)$/;
+  my $is_private = ($1 eq 'private' ? 1 : 0);
+  my $bug_alias = $2;
+  push(
+    @add_comment_tests,
+    {
+      args => {id => $bug_alias, comment => $key, private => $is_private},
+      test => "Add comment: $key",
+      user => PRIVATE_BUG_USER
+    }
+  );
+}
+
+# Set the comment id for each comment that we add, so we can test getting
+# them back, later.
+sub post_add {
+  my ($call, $t) = @_;
+  my $key = $t->{args}->{comment};
+  $comments{$key} = $call->result->{id};
+}
+
+$creation_time = DateTime->now();
+
+# We only need to create these comments once, with one of the interfaces.
+$clients[0]->bz_run_tests(
+  tests        => \@add_comment_tests,
+  method       => 'Bug.add_comment',
+  post_success => \&post_add
+);
+
+# Now check access on each private and public comment
+
+my @comment_tests = (
+
+  # Logged-out user
+  {
+    args => {comment_ids => [$comments{'public_comment_public_bug'}]},
+    test => 'Logged-out user can access public comment on public bug by id',
+  },
+  {
+    args  => {comment_ids => [$comments{'private_comment_public_bug'}]},
+    test  => 'Logged-out user cannot access private comment on public bug',
+    error => 'is private',
+  },
+  {
+    args  => {comment_ids => [$comments{'public_comment_private_bug'}]},
+    test  => 'Logged-out user cannot access comments by id on private bug',
+    error => 'You are not authorized to access',
+  },
+  {
+    args  => {comment_ids => [$comments{'private_comment_private_bug'}]},
+    test  => 'Logged-out user cannot access private comment on private bug',
+    error => 'You are not authorized to access',
+  },
+
+  # Logged-in, unprivileged user.
+  {
+    user => 'unprivileged',
+    args => {comment_ids => [$comments{'public_comment_public_bug'}]},
+    test => 'Logged-in user can see a public comment on a public bug by id',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {comment_ids => [$comments{'private_comment_public_bug'}]},
+    test  => 'Logged-in user cannot access private comment on public bug',
+    error => 'is private',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {comment_ids => [$comments{'public_comment_private_bug'}]},
+    test  => 'Logged-in user cannot access comments by id on private bug',
+    error => "You are not authorized to access",
+  },
+  {
+    user  => 'unprivileged',
+    args  => {comment_ids => [$comments{'private_comment_private_bug'}]},
+    test  => 'Logged-in user cannot access private comment on private bug',
+    error => "You are not authorized to access",
+  },
+
+  # User who can see private bugs and private comments
+  {
+    user => PRIVATE_BUG_USER,
+    args => {comment_ids => [$comments{'private_comment_public_bug'}]},
+    test => PRIVATE_BUG_USER . ' can see private comment on public bug',
+  },
+  {
+    user => PRIVATE_BUG_USER,
+    args => {comment_ids => [$comments{'private_comment_private_bug'}]},
+    test => PRIVATE_BUG_USER . ' can see private comment on private bug',
+  },
+);
+
+sub post_comments {
+  my ($call) = @_;
+  my @comments = values %{$call->result->{comments}};
+  is(scalar @comments, 1, "Got exactly one comment");
+  test_comments(\@comments, @_);
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => \@comment_tests,
+    method       => 'Bug.comments',
+    post_success => \&post_comments
+  );
+}
diff --git a/xt/webservice/bug_create.t b/xt/webservice/bug_create.t
new file mode 100644
index 0000000000..77c1973136
--- /dev/null
+++ b/xt/webservice/bug_create.t
@@ -0,0 +1,250 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+########################################
+# Test for xmlrpc call to Bug.create() #
+########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Storable qw(dclone);
+use Test::More tests => 293;
+use QA::Util;
+use QA::Tests qw(create_bug_fields PRIVATE_BUG_USER);
+
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+########################
+# Bug.create() testing #
+########################
+
+my $bug_fields = create_bug_fields($config);
+
+# hash to contain all the possible $bug_fields values that
+# can be passed to createBug()
+my $fields = {
+  summary => {
+    undefined =>
+      {faultstring => 'You must enter a summary for this bug', value => undef},
+  },
+
+  product => {
+    undefined =>
+      {faultstring => 'You must select/enter a product.', value => undef},
+    invalid => {faultstring => 'does not exist', value => 'does-not-exist'},
+  },
+
+  component => {
+    undefined =>
+      {faultstring => 'you must first choose a component', value => undef},
+    invalid => {
+      faultstring => "There is no component named 'does-not-exist'",
+      value       => 'does-not-exist'
+    },
+  },
+
+  version => {
+    undefined =>
+      {faultstring => 'You must select/enter a version.', value => undef},
+    invalid => {
+      faultstring => "There is no version named 'does-not-exist' in the",
+      value       => 'does-not-exist'
+    },
+  },
+  platform => {
+    undefined => {faultstring => 'You must select/enter a Hardware.', value => ''},
+    invalid   => {
+      faultstring => "There is no Hardware named 'does-not-exist'.",
+      value       => 'does-not-exist'
+    },
+  },
+
+  status => {
+    invalid => {
+      faultstring => "There is no status named 'does-not-exist'",
+      value       => 'does-not-exist'
+    },
+  },
+
+  severity => {
+    undefined => {faultstring => 'You must select/enter a Severity.', value => ''},
+    invalid   => {
+      faultstring => "There is no Severity named 'does-not-exist'.",
+      value       => 'does-not-exist'
+    },
+  },
+
+  priority => {
+    undefined => {faultstring => 'You must select/enter a Priority.', value => ''},
+    invalid   => {
+      faultstring => "There is no Priority named 'does-not-exist'.",
+      value       => 'does-not-exist'
+    },
+  },
+
+  op_sys => {
+    undefined => {faultstring => 'You must select/enter a OS.', value => ''},
+    invalid   => {
+      faultstring => "There is no OS named 'does-not-exist'.",
+      value       => 'does-not-exist'
+    },
+  },
+
+  cc => {
+    invalid =>
+      {faultstring => 'not a valid username', value => ['nonuserATbugillaDOTorg']},
+  },
+
+  assigned_to => {
+    invalid => {
+      faultstring => "There is no user named 'does-not-exist'",
+      value       => 'does-not-exist'
+    },
+  },
+  qa_contact => {
+    invalid => {
+      faultstring => "There is no user named 'does-not-exist'",
+      value       => 'does-not-exist'
+    },
+  },
+  alias => {
+    long => {
+      faultstring => 'Bug aliases cannot be longer than 40 characters',
+      value       => 'MyyyyyyyyyyyyyyyyyyBugggggggggggggggggggggg'
+    },
+    existing => {
+      faultstring =>
+        'Please choose another alias or visit that bug and change its alias.',
+      value => 'public_bug'
+    },
+    numeric =>
+      {faultstring => 'aliases cannot be merely numbers', value => '12345'},
+    commma_or_space_separated => {
+      faultstring => 'contains one or more commas or spaces',
+      value       => ['Bug 12345']
+    },
+
+  },
+  groups => {
+    non_existent => {
+      faultstring =>
+        'either this group does not exist, or you are not allowed to restrict bugs to this group',
+      value => [random_string(20)],
+    },
+  },
+  comment_is_private => {
+    invalid =>
+      {faultstring => 'you are not allowed to.+comments.+private', value => 1,}
+  },
+};
+
+$jsonrpc_get->bz_call_fail(
+  'Bug.create', $bug_fields,
+  'must use HTTP POST',
+  'create fails over GET'
+);
+
+my @tests = (
+  {
+    args  => $bug_fields,
+    error => "You must log in",
+    test  => "Cannot file bugs as a logged-out user",
+  },
+  {
+    user => PRIVATE_BUG_USER,
+    args => {
+      %$bug_fields,
+      product          => 'QA-Selenium-TEST',
+      component        => 'QA-Selenium-TEST',
+      target_milestone => 'QAMilestone',
+      version          => 'QAVersion',
+      groups           => ['QA-Selenium-TEST'],
+
+      # These are set here because we can't actually set them,
+      # and we need the values to be correct for post_success.
+      qa_contact => $config->{PRIVATE_BUG_USER . '_user_login'},
+      status     => 'UNCONFIRMED'
+    },
+    test => "Authorized user can file a bug against a group",
+  },
+  {
+    user => PRIVATE_BUG_USER,
+    args => {
+      %$bug_fields,
+      comment_is_private => 1,
+
+      # These are here because PRIVATE_BUG_USER can't set them
+      # and we need their values to be correct for post_success.
+      assigned_to => $config->{'permanent_user'},
+      qa_contact  => '',
+      status      => 'UNCONFIRMED'
+    },
+    test => "Insider can create a private description"
+  },
+  {
+    user => 'editbugs',
+    args => $bug_fields,
+    test => "Creating a bug with standard values succeeds",
+  },
+);
+
+# Convert the $fields tests into standard bz_run_tests format.
+foreach my $field (sort keys %$fields) {
+  my $test_values = $fields->{$field};
+  foreach my $test_name (sort keys %$test_values) {
+    my $input_fields = dclone($bug_fields);
+    my $check_value  = $test_values->{$test_name}->{value};
+    my $error        = $test_values->{$test_name}->{faultstring};
+    $input_fields->{$field} = $check_value;
+    my $test = {
+      user  => 'editbugs',
+      args  => $input_fields,
+      error => $error,
+      test  => "$field $test_name: fails as expected"
+    };
+    push(@tests, $test);
+  }
+}
+
+sub post_success {
+  my ($call, $t, $rpc) = @_;
+
+  my $id = $call->result->{id};
+  ok($id, $rpc->TYPE . ": Result has an id: $id");
+
+  my $get_call = $rpc->bz_call_success('Bug.get', {ids => [$id]});
+  my $bug = $get_call->result->{bugs}->[0];
+
+  my $expect = dclone $t->{args};
+
+  my $comment_is_private = delete $expect->{comment_is_private};
+  $expect->{creator} = $rpc->bz_config->{$t->{user} . '_user_login'};
+
+  my @fields = keys %$expect;
+  $rpc->bz_test_bug(\@fields, $bug, $expect, $t);
+
+  my $comment_call = $rpc->bz_call_success('Bug.comments', {ids => [$id]});
+  my $comment = $comment_call->result->{bugs}->{$id}->{comments}->[0];
+  is(
+    $comment->{is_private} ? 1 : 0,
+    $comment_is_private    ? 1 : 0,
+    $rpc->TYPE . ": comment privacy is correct"
+  );
+}
+
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'Bug.create',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_fields.t b/xt/webservice/bug_fields.t
new file mode 100644
index 0000000000..18157b5340
--- /dev/null
+++ b/xt/webservice/bug_fields.t
@@ -0,0 +1,238 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Data::Dumper;
+use Test::More;
+use List::Util qw(first);
+use QA::Util;
+
+my ($config, @clients) = get_rpc_clients();
+plan tests => ($config->{test_extensions} ? 1338 : 1320);
+
+use constant INVALID_FIELD_NAME => 'invalid_field';
+use constant INVALID_FIELD_ID   => -1;
+
+sub GLOBAL_GENERAL_FIELDS {
+  my @fields = qw(
+    attach_data.thedata
+    attachments.description
+    attachments.filename
+    attachments.isobsolete
+    attachments.ispatch
+    attachments.isprivate
+    attachments.mimetype
+    attachments.submitter
+
+    flagtypes.name
+    requestees.login_name
+    setters.login_name
+
+    alias
+    assigned_to
+    blocked
+    bug_file_loc
+    bug_group
+    bug_id
+    cc
+    cclist_accessible
+    classification
+    commenter
+    content
+    creation_ts
+    days_elapsed
+    delta_ts
+    dependson
+    everconfirmed
+    keywords
+    longdesc
+    longdescs.isprivate
+    owner_idle_time
+    product
+    qa_contact
+    reporter
+    reporter_accessible
+    see_also
+    short_desc
+    status_whiteboard
+
+    deadline
+    estimated_time
+    percentage_complete
+    remaining_time
+    work_time
+  );
+  push(@fields, 'votes') if QA::Util::get_config()->{test_extensions};
+
+  return @fields;
+}
+
+use constant STANDARD_SELECT_FIELDS =>
+  qw(bug_severity bug_status op_sys priority rep_platform resolution);
+
+use constant ALL_SELECT_FIELDS =>
+  (STANDARD_SELECT_FIELDS, qw(cf_qa_status cf_single_select));
+use constant PRODUCT_FIELDS => qw(version target_milestone component);
+use constant ALL_FIELDS =>
+  (GLOBAL_GENERAL_FIELDS, ALL_SELECT_FIELDS, PRODUCT_FIELDS);
+use constant MANDATORY_FIELDS => qw(short_desc product version component);
+
+use constant PUBLIC_PRODUCT  => 'Another Product';
+use constant PRIVATE_PRODUCT => 'QA-Selenium-TEST';
+
+sub get_field {
+  my ($fields, $field) = @_;
+  return first { $_->{name} eq $field } @$fields;
+}
+
+sub get_products_from_field {
+  my $field = shift;
+  my %products;
+  foreach my $value (@{$field->{values}}) {
+    foreach my $vis_value (@{$value->{visibility_values}}) {
+      $products{$vis_value} = 1;
+    }
+  }
+  return \%products;
+}
+
+our %field_ids;
+foreach my $rpc (@clients) {
+  my $call   = $rpc->bz_call_success('Bug.fields');
+  my $fields = $call->result->{fields};
+  foreach my $field (ALL_FIELDS) {
+    my $field_data = get_field($fields, $field);
+    ok($field_data, "$field is in the returned result") or diag(Dumper($fields));
+    $field_ids{$field} = $field_data->{id};
+
+    if (grep($_ eq $field, MANDATORY_FIELDS)) {
+      ok($field_data->{is_mandatory}, "$field is mandatory");
+    }
+    else {
+      ok(!$field_data->{is_mandatory}, "$field is not mandatory");
+    }
+  }
+
+  foreach my $field (ALL_SELECT_FIELDS, PRODUCT_FIELDS) {
+    my $field_data = get_field($fields, $field);
+    ok(
+      defined $field_data->{visibility_values},
+      "$field has visibility_values defined"
+    );
+    my $field_vis_undefs = grep { !defined $_ } @{$field_data->{visibility_values}};
+    is($field_vis_undefs, 0, "$field.visibility_values has no undefs")
+      or diag(Dumper($field_data->{visibility_values}));
+
+    ok(defined $field_data->{values}, "$field has 'values' defined");
+    my $num_values = scalar @{$field_data->{values}};
+    ok($num_values, "$field has $num_values values");
+
+    # The first bug status is a fake one and has no name, so we choose the 2nd item.
+    my $first_value = $field_data->{values}->[1];
+    ok(defined $first_value->{name}, 'The first value has a name')
+      or diag(Dumper($field_data->{values}));
+
+    # The sortkey for milestones can be negative.
+    cmp_ok($first_value->{sortkey},
+      '=~', qr/^-?\d+$/, "The first value has a numeric sortkey");
+
+    ok(defined $first_value->{visibility_values},
+      "$field has visibilty_values defined on its first value")
+      or diag(Dumper($field_data->{values}));
+    my @value_visibility_values
+      = map { @{$_->{visibility_values}} } @{$field_data->{values}};
+    my $undefs = grep { !defined $_ } @value_visibility_values;
+    is($undefs, 0, "$field.values.visibility_values has no undefs");
+  }
+
+  foreach my $field (PRODUCT_FIELDS) {
+    my $field_data = get_field($fields, $field);
+    is($field_data->{value_field},
+      'product', "The value_field for $field is 'product'");
+    my $products = get_products_from_field($field_data);
+    ok($products->{+PUBLIC_PRODUCT},
+      "$field values are returned for the public product");
+    ok(!$products->{+PRIVATE_PRODUCT},
+      "No $field values are returned for the private product");
+  }
+}
+
+my @all_tests = (
+  {
+    args  => {ids => [values %field_ids], names => [ALL_FIELDS]},
+    test  => 'Getting all fields by name and id simultaneously',
+    count => scalar ALL_FIELDS
+  },
+  {
+    args  => {names => [INVALID_FIELD_NAME]},
+    error => "There is no field named",
+    test  => 'Invalid field name'
+  },
+  {
+    args  => {ids => [INVALID_FIELD_ID]},
+    error => 'must be numeric',
+    test  => 'Invalid field id'
+  },
+  {
+    user  => 'QA_Selenium_TEST',
+    args  => {names => [PRODUCT_FIELDS]},
+    test  => 'Getting product-specific fields as a privileged user',
+    count => scalar PRODUCT_FIELDS,
+    product_private_values => 1
+  },
+);
+
+foreach my $field (ALL_FIELDS) {
+  push(
+    @all_tests,
+    {
+      args => {names => [$field]},
+      test => "Logged-out users can get the $field field by name"
+    }
+  );
+  push(
+    @all_tests,
+    {
+      args => {ids => [$field_ids{$field}]},
+      test => "Logged-out users can get the $field by id"
+    }
+  );
+}
+
+sub post_success {
+  my ($call, $t) = @_;
+  my $fields = $call->result->{fields};
+  my $count  = $t->{count};
+  $count = 1 if !defined $count;
+  is(scalar @$fields, $count, "Exactly $count field(s) returned");
+
+  if ($t->{product_private_values}) {
+    foreach my $field (@$fields) {
+      my $name       = $field->{name};
+      my $field_data = get_field($fields, $name);
+      my $products   = get_products_from_field($field_data);
+      ok($products->{+PUBLIC_PRODUCT},
+        "$name values are returned for the public product");
+      ok($products->{+PRIVATE_PRODUCT},
+        "$name values are returned for the private product");
+    }
+  }
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => \@all_tests,
+    method       => 'Bug.fields',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_get.t b/xt/webservice/bug_get.t
new file mode 100644
index 0000000000..f36bd209d6
--- /dev/null
+++ b/xt/webservice/bug_get.t
@@ -0,0 +1,173 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+###########################################
+# Test for xmlrpc call to Bug.get()       #
+###########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Data::Dumper;
+use DateTime;
+use QA::Util;
+use QA::Tests qw(bug_tests PRIVATE_BUG_USER);
+use Test::More tests => 988;
+my ($config, @clients) = get_rpc_clients();
+
+my $xmlrpc = $clients[0];
+our $creation_time = DateTime->now();
+our ($public_bug, $private_bug) = $xmlrpc->bz_create_test_bugs('private');
+my $private_id = $private_bug->{id};
+my $public_id  = $public_bug->{id};
+
+my $base_url
+  = $config->{browser_url} . "/" . $config->{bugzilla_installation} . '/';
+
+# Set a few fields on the private bug, including setting up
+# a dependency relationship.
+$xmlrpc->bz_log_in(PRIVATE_BUG_USER);
+$xmlrpc->bz_call_success(
+  'Bug.update',
+  {
+    ids                   => [$private_id],
+    blocks                => {set => [$public_id]},
+    dupe_of               => $public_id,
+    is_creator_accessible => 0,
+    keywords              => {set => ['test-keyword-1', 'test-keyword-2']},
+    see_also              => {
+      add => [
+        "${base_url}show_bug.cgi?id=$public_id",
+        "http://landfill.bugzilla.org/show_bug.cgi?id=123456"
+      ]
+    },
+    cf_qa_status     => ['in progress', 'verified'],
+    cf_single_select => 'two',
+  },
+  'Update the private bug'
+);
+$xmlrpc->bz_call_success('User.logout');
+
+$private_bug->{blocks}                = [$public_id];
+$private_bug->{dupe_of}               = $public_id;
+$private_bug->{status}                = 'RESOLVED';
+$private_bug->{is_open}               = 0;
+$private_bug->{resolution}            = 'DUPLICATE';
+$private_bug->{is_creator_accessible} = 0;
+$private_bug->{is_cc_accessible}      = 1;
+$private_bug->{keywords}              = ['test-keyword-1', 'test-keyword-2'];
+$private_bug->{see_also}              = [
+  "${base_url}show_bug.cgi?id=$public_id",
+  "http://landfill.bugzilla.org/show_bug.cgi?id=123456"
+];
+$private_bug->{cf_qa_status} = ['in progress', 'verified'];
+$private_bug->{cf_single_select} = 'two';
+
+$public_bug->{depends_on}            = [$private_id];
+$public_bug->{dupe_of}               = undef;
+$public_bug->{resolution}            = '';
+$public_bug->{is_open}               = 1;
+$public_bug->{is_creator_accessible} = 1;
+$public_bug->{is_cc_accessible}      = 1;
+$public_bug->{keywords}              = [];
+
+# Local Bugzilla bugs are automatically updated.
+$public_bug->{see_also}         = ["${base_url}show_bug.cgi?id=$private_id"];
+$public_bug->{cf_qa_status}     = [];
+$public_bug->{cf_single_select} = '---';
+
+# Fill in the timetracking fields on the public bug.
+$xmlrpc->bz_log_in('admin');
+$xmlrpc->bz_call_success(
+  'Bug.update',
+  {
+    ids            => [$public_id],
+    deadline       => '2038-01-01',
+    estimated_time => '10.0',
+    remaining_time => '5.0',
+  }
+);
+$xmlrpc->bz_call_success('User.logout');
+
+# Populate other fields.
+$public_bug->{classification}  = 'Unclassified';
+$private_bug->{classification} = 'Unclassified';
+$private_bug->{groups}         = ['QA-Selenium-TEST'];
+$public_bug->{groups}          = [];
+
+# The user filing $private_bug doesn't have permission to set the status
+# or qa_contact, so they differ from normal $public_bug values.
+$private_bug->{qa_contact} = $config->{PRIVATE_BUG_USER . '_user_login'};
+
+sub post_success {
+  my ($call, $t, $rpc) = @_;
+
+  is(scalar @{$call->result->{bugs}}, 1, "Got exactly one bug");
+  my $bug = $call->result->{bugs}->[0];
+
+  if ($t->{user} && $t->{user} eq 'admin') {
+    ok(exists $bug->{estimated_time} && exists $bug->{remaining_time},
+      'Admin correctly gets time-tracking fields');
+    is($bug->{deadline}, '2038-01-01', 'deadline is correct');
+    cmp_ok($bug->{estimated_time}, '==', '10.0', 'estimated_time is correct');
+    cmp_ok($bug->{remaining_time}, '==', '5.0',  'remaining_time is correct');
+  }
+  else {
+    ok(
+      !exists $bug->{estimated_time} && !exists $bug->{remaining_time},
+      'Time-tracking fields are not returned to non-privileged users'
+    );
+  }
+
+  if ($t->{user}) {
+    ok($bug->{update_token}, 'Update token returned for logged-in user');
+  }
+  else {
+    ok(!exists $bug->{update_token},
+      'Update token not returned for logged-out users');
+  }
+
+  my $expect = $bug->{id} == $private_bug->{id} ? $private_bug : $public_bug;
+
+  my @fields = sort keys %$expect;
+  push(@fields, 'creation_time', 'last_change_time');
+
+  $rpc->bz_test_bug(\@fields, $bug, $expect, $t, $creation_time);
+}
+
+my @tests = (
+  @{bug_tests($public_id, $private_id)},
+  {
+    args => {ids => [$public_id], include_fields => ['id', 'summary', 'groups']},
+    test => 'include_fields',
+  },
+  {
+    args =>
+      {ids => [$public_id], exclude_fields => ['assigned_to', 'cf_qa_status']},
+    test => 'exclude_fields'
+  },
+  {
+    args => {
+      ids            => [$public_id],
+      include_fields => ['id', 'summary', 'groups'],
+      exclude_fields => ['summary']
+    },
+    test => 'exclude_fields overrides include_fields'
+  },
+);
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'Bug.get',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_history.t b/xt/webservice/bug_history.t
new file mode 100644
index 0000000000..1aea9d7608
--- /dev/null
+++ b/xt/webservice/bug_history.t
@@ -0,0 +1,36 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#########################################
+# Test for xmlrpc call to Bug.history() #
+#########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use QA::Tests qw(STANDARD_BUG_TESTS);
+use Test::More tests => 114;
+my ($config, @clients) = get_rpc_clients();
+
+sub post_success {
+  my ($call, $t) = @_;
+  is(scalar @{$call->result->{bugs}}, 1, "Got exactly one bug");
+  isa_ok($call->result->{bugs}->[0]->{history}, 'ARRAY', "Bug's history");
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => STANDARD_BUG_TESTS,
+    method       => 'Bug.history',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_legal_values.t b/xt/webservice/bug_legal_values.t
new file mode 100644
index 0000000000..3d3e6a16f1
--- /dev/null
+++ b/xt/webservice/bug_legal_values.t
@@ -0,0 +1,114 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+##############################################
+# Test for xmlrpc call to Bug.legal_values() #
+##############################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 269;
+use QA::Util;
+my ($config, @clients) = get_rpc_clients();
+
+use constant INVALID_PRODUCT_ID => -1;
+use constant INVALID_FIELD_NAME => 'invalid_field';
+use constant GLOBAL_FIELDS =>
+  qw(bug_severity bug_status op_sys priority rep_platform resolution
+  cf_qa_status cf_single_select);
+use constant PRODUCT_FIELDS => qw(version target_milestone component);
+
+
+my $products        = $clients[0]->bz_get_products();
+my $public_product  = $products->{'Another Product'};
+my $private_product = $products->{'QA-Selenium-TEST'};
+
+my @all_tests;
+
+for my $field (GLOBAL_FIELDS) {
+  push(@all_tests,
+    {args => {field => $field}, test => "Logged-out user can get $field values"});
+}
+
+for my $field (PRODUCT_FIELDS) {
+  my @tests = (
+    {
+      args  => {field => $field},
+      error => "argument was not set",
+      test  => "$field can't be accessed without a value for 'product'",
+    },
+    {
+      args  => {product_id => INVALID_PRODUCT_ID, field => $field},
+      error => "does not exist",
+      test  => "$field cannot be accessed with an invalid product id",
+    },
+
+    {
+      args  => {product_id => $private_product, field => $field},
+      error => "you don't have access",
+      test  => "Logged-out user cannot access $field in private product"
+    },
+    {
+      args => {product_id => $public_product, field => $field},
+      test => "Logged-out user can access $field in a public product",
+    },
+
+    {
+      user  => 'unprivileged',
+      args  => {product_id => $private_product, field => $field},
+      error => "you don't have access",
+      test  => "Unprivileged user cannot access $field in private product",
+    },
+    {
+      user => 'unprivileged',
+      args => {product_id => $public_product, field => $field},
+      test => "Logged-in user can access $field in public product",
+    },
+
+    {
+      user => 'QA_Selenium_TEST',
+      args => {product_id => $private_product, field => $field},
+      test => "Privileged user can access $field in a private product",
+    },
+  );
+
+  push(@all_tests, @tests);
+}
+
+my @extra_tests = (
+  {
+    args  => {product_id => $private_product,},
+    error => "requires a field argument",
+    test  => "Passing product_id without 'field' throws an error",
+  },
+  {
+    args  => {field => INVALID_FIELD_NAME},
+    error => "Can't use \"" . INVALID_FIELD_NAME . "\" as a field name",
+    test  => 'Invalid field name'
+  },
+);
+
+push(@all_tests, @extra_tests);
+
+sub post_success {
+  my ($call) = @_;
+
+  cmp_ok(scalar @{$call->result->{'values'}}, '>', 0, 'Got one or more values');
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => \@all_tests,
+    method       => 'Bug.legal_values',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_search.t b/xt/webservice/bug_search.t
new file mode 100644
index 0000000000..3328cece8e
--- /dev/null
+++ b/xt/webservice/bug_search.t
@@ -0,0 +1,269 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+########################################
+# Test for xmlrpc call to Bug.search() #
+########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use QA::Tests qw(PRIVATE_BUG_USER);
+use DateTime;
+use List::MoreUtils qw(uniq);
+use Test::More;
+use Data::Dumper;
+
+my ($config, @clients) = get_rpc_clients();
+plan tests => $config->{test_extensions} ? 531 : 522;
+
+my ($public_bug, $private_bug) = $clients[0]->bz_create_test_bugs('private');
+
+# Add aliases to both bugs
+$public_bug->{alias}  = random_string(40);
+$private_bug->{alias} = random_string(40);
+my $alias_tests = [
+  {
+    user => 'editbugs',
+    args => {ids => [$public_bug->{id}], alias => $public_bug->{alias}},
+    test => 'Add alias to public bug'
+  },
+  {
+    user => PRIVATE_BUG_USER,
+    args => {
+      ids => [$private_bug->{id}],
+      cc  => {add => [$config->{'editbugs_user_login'}]}
+    },
+    test => 'Add editusers to cc of private bug'
+  },
+  {
+    user => 'editbugs',
+    args => {ids => [$private_bug->{id}], alias => $private_bug->{alias}},
+    test => 'Add alias to private bug'
+  },
+  {
+    user => PRIVATE_BUG_USER,
+    args => {
+      ids => [$private_bug->{id}],
+      cc  => {remove => [$config->{'editbugs_user_login'}]}
+    },
+    test => 'Remove editusers from cc of private bug'
+  },
+];
+$clients[0]->bz_run_tests(tests => $alias_tests, method => 'Bug.update');
+
+my @tests;
+foreach my $field (keys %$public_bug) {
+  next if ($field eq 'cc' or $field eq 'description');
+  my $test
+    = {args => {$field => $public_bug->{$field}}, test => "Search by $field"};
+  if (grep($_ eq $field, qw(alias whiteboard summary))) {
+    $test->{exactly} = 1;
+    $test->{bugs}    = 1;
+  }
+  push(@tests, $test);
+}
+
+push(
+  @tests,
+  (
+    {
+      args  => {offset => 1},
+      test  => "Offset without limit fails",
+      error => 'requires a limit argument',
+    },
+
+    {
+      args => {alias => $private_bug->{alias}},
+      test => 'Logged-out cannot find a private_bug by alias',
+      bugs => 0,
+    },
+
+    {
+      args => {creation_time => '19700101T00:00:00'},
+      test => 'Get all bugs by creation time',
+    },
+    {
+      args => {creation_time => '20380101T00:00:00'},
+      test => 'Get no bugs, by creation time',
+      bugs => 0,
+    },
+    {
+      args => {last_change_time => '19700101T00:00:00'},
+      test => 'Get all bugs by last_change_time',
+    },
+    {
+      args => {last_change_time => '20380101T00:00:00'},
+      test => 'Get no bugs by last_change_time',
+      bugs => 0,
+    },
+
+    {
+      args => {reporter => $config->{editbugs_user_login}},
+      test => 'Search by reporter',
+    },
+    {args => {resolution => ''}, test => 'Search for empty resolution',},
+    {
+      args => {resolution => 'NO_SUCH_RESOLUTION'},
+      test => 'Search for invalid resolution',
+      bugs => 0,
+    },
+    {
+      args    => {summary => substr($public_bug->{summary}, 0, 50)},
+      test    => 'Search by partial summary',
+      bugs    => 1,
+      exactly => 1
+    },
+    {
+      args => {summary => random_string() . ' ' . random_string()},
+      test => 'Summary search that returns no results',
+      bugs => 0,
+    },
+    {
+      args => {summary => [split(/\s/, $public_bug->{summary})]},
+      test => 'Summary search using multiple terms',
+    },
+
+    {
+      args    => {whiteboard => substr($public_bug->{whiteboard}, 0, 50)},
+      test    => 'Search by partial whiteboard',
+      bugs    => 1,
+      exactly => 1,
+    },
+    {
+      args => {whiteboard => random_string(100)},
+      test => 'Whiteboard search that returns no results',
+      bugs => 0,
+    },
+    {
+      args    => {whiteboard => [split(/\s/, $public_bug->{whiteboard})]},
+      test    => 'Whiteboard search using multiple terms',
+      bugs    => 1,
+      exactly => 1,
+    },
+
+    {
+      args => {
+        product          => $public_bug->{product},
+        component        => $public_bug->{component},
+        last_change_time => '19700101T00:00:00'
+      },
+      test => 'Search by multiple arguments',
+    },
+
+    # Logged-in user who can see private bugs
+    {
+      user    => PRIVATE_BUG_USER,
+      args    => {alias => [$public_bug->{alias}, $private_bug->{alias}]},
+      test    => 'Search using two aliases (including one private)',
+      bugs    => 2,
+      exactly => 1,
+    },
+    {
+      user => PRIVATE_BUG_USER,
+      args =>
+        {product => [$public_bug->{product}, $private_bug->{product}], limit => 1},
+      test    => 'Limit 1',
+      bugs    => 1,
+      exactly => 1,
+    },
+    {
+      user => PRIVATE_BUG_USER,
+      args => {
+        product => [$public_bug->{product}, $private_bug->{product}],
+        limit   => 1,
+        offset  => 1
+      },
+      test    => 'Limit 1 Offset 1',
+      bugs    => 1,
+      exactly => 1,
+    },
+
+    # include_fields ane exclude_fields
+    {
+      args => {
+        id             => $public_bug->{id},
+        include_fields => ['id', 'alias', 'summary', 'groups']
+      },
+      test => 'include_fields',
+    },
+    {
+      args =>
+        {id => $public_bug->{id}, exclude_fields => ['assigned_to', 'cf_qa_status']},
+      test => 'exclude_fields'
+    },
+    {
+      args => {
+        id             => $public_bug->{id},
+        include_fields => ['id', 'alias', 'summary', 'groups'],
+        exclude_fields => ['summary']
+      },
+      test => 'exclude_fields overrides include_fields'
+    },
+  )
+);
+
+push(
+  @tests,
+  {
+    args => {votes => 1},
+    test => 'Search by votes',
+    bugs => -1,                  # We don't care how many it returns, for now.
+  }
+) if $config->{test_extensions};
+
+sub post_success {
+  my ($call, $t) = @_;
+  my $bugs = $call->result->{bugs};
+
+  my $expected_count = $t->{bugs};
+  $expected_count = 1 if !defined $expected_count;
+  if ($expected_count) {
+    my $operator = $t->{exactly} ? '==' : '>=';
+    cmp_ok(scalar @$bugs,
+      $operator, $expected_count, 'The right number of bugs are returned');
+    unless ($t->{user} and $t->{user} eq PRIVATE_BUG_USER) {
+      ok(!grep($_->{alias} && $_->{alias} eq $private_bug->{alias}, @$bugs),
+        'Result does not contain the private bug');
+    }
+
+    my @include = @{$t->{args}->{include_fields} || []};
+    my @exclude = @{$t->{args}->{exclude_fields} || []};
+    if (@include or @exclude) {
+      my @check_fields = uniq(keys %$public_bug, @include);
+      foreach my $field (sort @check_fields) {
+        next if $field eq 'description';
+        if ( (@include and !grep { $_ eq $field } @include)
+          or (@exclude and grep { $_ eq $field } @exclude))
+        {
+          ok(!exists $bugs->[0]->{$field}, "$field is not included")
+            or diag Dumper($bugs);
+        }
+        else {
+          ok(exists $bugs->[0]->{$field}, "$field is included");
+        }
+      }
+    }
+
+  }
+  else {
+    is(scalar @$bugs, 0, 'No bugs returned');
+  }
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'Bug.search',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_update.t b/xt/webservice/bug_update.t
new file mode 100644
index 0000000000..f12d287b10
--- /dev/null
+++ b/xt/webservice/bug_update.t
@@ -0,0 +1,894 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Data::Dumper;
+use QA::Util;
+use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
+use Storable qw(dclone);
+use Test::More tests => 937;
+
+use constant NONEXISTENT_BUG => 12_000_000;
+
+###############
+# Subroutines #
+###############
+
+# We have to generate different values for each RPC client, so we
+# have a function to generate the tests for each client.
+sub get_tests {
+  my ($config, $rpc) = @_;
+
+  # update doesn't support logged-out users.
+  my @tests = grep { $_->{user} } @{STANDARD_BUG_TESTS()};
+
+  my ($public_bug, $second_bug) = $rpc->bz_create_test_bugs();
+  my ($public_id, $second_id) = ($public_bug->{id}, $second_bug->{id});
+
+  # Add aliases to both bugs
+  $public_bug->{alias} = random_string(40);
+  $second_bug->{alias} = random_string(40);
+  my $alias_tests = [
+    {
+      user => 'editbugs',
+      args => {ids => [$public_id], alias => $public_bug->{alias}},
+      test => 'Add alias to public bug'
+    },
+    {
+      user => 'editbugs',
+      args => {ids => [$second_id], alias => $second_bug->{alias}},
+      test => 'Add alias to second bug'
+    },
+  ];
+  $rpc->bz_run_tests(tests => $alias_tests, method => 'Bug.update');
+
+  my $comment_call
+    = $rpc->bz_call_success('Bug.comments', {ids => [$public_id, $second_id]});
+  $public_bug->{comment}
+    = $comment_call->result->{bugs}->{$public_id}->{comments}->[0];
+  $second_bug->{comment}
+    = $comment_call->result->{bugs}->{$second_id}->{comments}->[0];
+
+  push(
+    @tests,
+    (
+      {
+        args  => {ids => [$public_id]},
+        error => 'You must log in',
+        test  => 'Logged-out users cannot call update'
+      },
+
+      # FIXME We need a permissions test for canedit, but it's so uncommonly
+      # used that it's not a high priority.
+    )
+  );
+
+  my %valid = valid_values($config, $public_bug, $second_bug);
+  my $valid_value_tests = valid_values_to_tests(\%valid, $public_bug);
+  push(@tests, @$valid_value_tests);
+
+  my %invalid = invalid_values($public_bug, $second_bug);
+  my $invalid_value_tests = invalid_values_to_tests(\%invalid, $public_bug);
+  push(@tests, @$invalid_value_tests);
+
+  return \@tests;
+}
+
+sub valid_values {
+  my ($config, $public_bug, $second_bug) = @_;
+
+  my $admin      = $config->{'admin_user_login'};
+  my $second_id  = $second_bug->{id};
+  my $comment_id = $public_bug->{comment}->{id};
+  my $bug_uri
+    = $config->{browser_url} . '/'
+    . $config->{bugzilla_installation}
+    . '/show_bug.cgi?id=';
+
+  my %values = (
+    alias       => [{value => random_string(20)},],
+    assigned_to => [{value => $config->{'unprivileged_user_login'}}],
+    blocks      => [
+      {
+        value => {set => [$second_id]},
+        added => $second_id,
+        test  => 'set to second bug'
+      },
+      {
+        value   => {remove => [$second_id]},
+        added   => '',
+        removed => $second_id,
+        test    => 'remove second bug'
+      },
+      {
+        value   => {add => [$second_id]},
+        added   => $second_id,
+        removed => '',
+        test    => 'add second bug'
+      },
+      {
+        value   => {set => []},
+        added   => '',
+        removed => $second_id,
+        test    => 'set to nothing'
+      },
+    ],
+
+    cc => [
+      {
+        value   => {add => [$admin]},
+        added   => $admin,
+        removed => '',
+        test    => 'add admin'
+      },
+      {
+        value   => {remove => [$admin]},
+        added   => '',
+        removed => $admin,
+        test    => 'remove admin'
+      },
+      {
+        value      => {remove => [$admin]},
+        test       => "removing user who isn't on the list works",
+        no_changes => 1
+      },
+    ],
+
+    is_cc_accessible =>
+      [{value => 0, test => 'set to 0'}, {value => 1, test => 'set to 1'},],
+
+    comment => [
+      {value => {body => random_string(100)}, test => 'public'},
+      {
+        value => {body => random_string(100), is_private => 1},
+        user  => PRIVATE_BUG_USER,
+        test  => 'private'
+      },
+    ],
+
+    comment_is_private => [
+      {
+        value => {$comment_id => 1},
+        user  => PRIVATE_BUG_USER,
+        test  => 'make description private'
+      },
+      {
+        value => {$comment_id => 0},
+        user  => PRIVATE_BUG_USER,
+        test  => 'make description public'
+      },
+    ],
+
+    component => [{value => 'c2'}],
+
+    deadline => [
+      {value => '2037-01-01'},
+      {value => '', removed => '2037-01-01', test => 'remove'},
+    ],
+
+    dupe_of => [{value => $second_id},],
+
+    estimated_time => [
+      {value => '10.0'},
+      {value => '0.0', removed => '10.0', test => 'set to zero'},
+    ],
+
+    groups => [
+      {
+        value => {add => ['Master']},
+        user  => 'admin',
+        added => 'Master',
+        test  => 'add Master'
+      },
+      {
+        value   => {remove => ['Master']},
+        user    => 'admin',
+        added   => '',
+        removed => 'Master',
+        test    => 'remove Master'
+      },
+    ],
+
+    keywords => [
+      {
+        value => {add => ['test-keyword-1']},
+        test  => 'add one',
+        added => 'test-keyword-1'
+      },
+      {
+        value => {set => ['test-keyword-1', 'test-keyword-2']},
+        test  => 'set two',
+        added => 'test-keyword-2'
+      },
+      {
+        value   => {remove => ['test-keyword-1']},
+        removed => 'test-keyword-1',
+        added   => '',
+        test    => 'remove one'
+      },
+      {
+        value   => {set => []},
+        removed => 'test-keyword-2',
+        added   => '',
+        test    => 'set to empty'
+      },
+      {
+        value      => {remove => ['test-keyword-2']},
+        test       => 'removing removed keyword does nothing',
+        no_changes => 1
+      },
+    ],
+
+    op_sys => [{value => 'All'},],
+
+    platform => [{value => 'All'},],
+
+    priority => [{value => 'Normal'},],
+
+    product => [
+      {
+        value => 'C2 Forever',
+        extra =>
+          {component => 'Helium', version => 'unspecified', target_milestone => '---',},
+        test => 'move to C2 Forever'
+      },
+
+      # This also tests that the extra fields transfer over properly
+      # when they have identical names in both products.
+      {
+        value => $public_bug->{product},
+        extra => {component => $public_bug->{component}},
+        test  => 'move back to original product'
+      },
+    ],
+
+    qa_contact => [
+      {value => $admin}, {value => '', test => 'set blank', removed => $admin},
+
+      # Reset to the original so that reset_qa_contact can also be tested.
+      {value => $public_bug->{qa_contact}},
+    ],
+
+    remaining_time => [{value => '1000.50'}, {value => 0},],
+
+    reset_assigned_to =>
+      [{value => 1, field => 'assigned_to', added => $config->{permanent_user}},],
+
+    reset_qa_contact => [{value => 1, field => 'qa_contact', added => ''},],
+
+    resolution => [
+      {
+        value => 'FIXED',
+        extra => {status => 'RESOLVED'},
+        test  => 'to RESOLVED FIXED'
+      },
+      {value => 'INVALID', test => 'just resolution'},
+    ],
+
+    see_also => [
+      {
+        value   => {add => [$bug_uri . $second_id]},
+        added   => $bug_uri . $second_id,
+        removed => '',
+        test    => 'add local bug URI'
+      },
+      {
+        value   => {remove => [$bug_uri . $second_id]},
+        removed => $bug_uri . $second_id,
+        added   => '',
+        test    => 'remove local bug URI'
+      },
+      {
+        value =>
+          {remove => ['http://landfill.bugzilla.org/bugzilla-tip/show_bug.cgi?id=1']},
+        no_changes => 1,
+        test       => 'removing non-existent URI works'
+      },
+      {
+        value      => {add => ['']},
+        no_changes => 1,
+        test       => 'adding an empty string to see_also does nothing'
+      },
+      {
+        value      => {add => [undef]},
+        no_changes => 1,
+        test       => 'adding a null to see_also does nothing'
+      },
+    ],
+
+    status => [
+
+      # At this point, due to previous tests, the status is RESOLVED,
+      # so changing to CONFIRMED is our only real option if we want to
+      # test a simple open status.
+      {value => 'CONFIRMED'},
+    ],
+
+    severity => [{value => 'critical'},],
+
+    summary => [{value => random_string(100)},],
+
+    target_milestone => [{value => 'AnotherMS2'},],
+
+    url => [{value => 'http://' . random_string(20) . '/'},],
+
+    version => [{value => 'Another2'},],
+
+    whiteboard => [{value => random_string(1000)},],
+
+    work_time => [
+
+      # FIXME: work_time really needs to start showing up in the changes
+      # hash.
+      {value => '1.2', no_changes => 1},
+      {value => '-1.2', test => 'negative value', no_changes => 1},
+    ],
+  );
+
+  $values{depends_on}            = $values{blocks};
+  $values{is_creator_accessible} = $values{is_cc_accessible};
+
+  return %values;
+}
+
+sub valid_values_to_tests {
+  my ($valid_values, $public_bug) = @_;
+
+  my @tests;
+  foreach my $field (sort keys %$valid_values) {
+    my @tests_valid = @{$valid_values->{$field}};
+    foreach my $item (@tests_valid) {
+      my $desc = $item->{test} || 'valid value';
+      my %args = (
+        ids    => [$public_bug->{id}],
+        $field => $item->{value},
+        %{$item->{extra} || {}},
+      );
+      my %test = (
+        user  => 'editbugs',
+        args  => \%args,
+        field => $field,
+        test  => "$field: $desc"
+      );
+      foreach my $item_field (qw(no_changes added removed field user)) {
+        next if !exists $item->{$item_field};
+        $test{$item_field} = $item->{$item_field};
+      }
+      push(@tests, \%test);
+    }
+  }
+
+  return \@tests;
+}
+
+sub invalid_values {
+  my ($public_bug, $second_bug) = @_;
+
+  my $public_id = $public_bug->{id};
+  my $second_id = $second_bug->{id};
+
+  my $comment_id        = $public_bug->{comment}->{id};
+  my $second_comment_id = $second_bug->{comment}->{id};
+
+  my %values = (
+    alias => [
+      {
+        value => random_string(41),
+        error => 'aliases cannot be longer than',
+        test  => 'alias cannot be too long'
+      },
+      {
+        value => $second_bug->{alias},
+        error => 'Please choose another alias or visit that bug and change its alias',
+        test  => 'duplicate alias fails'
+      },
+      {
+        value => 123456,
+        error => 'at least one letter',
+        test  => 'numeric alias fails'
+      },
+      {
+        value => random_string(20),
+        ids   => [$public_id, $second_id],
+        error => 'aliases when modifying multiple',
+        test  => 'setting alias on multiple bugs fails'
+      },
+    ],
+
+    assigned_to => [
+      {
+        value => random_string(20),
+        error => 'There is no user named',
+        test  => 'changing assigned_to to invalid user fails'
+      },
+      {
+        value => '',
+        error => 'you must provide an address for the new assignee',
+        test  => 'empty assigned_to fails'
+      },
+
+      # FIXME Also check strict_isolation at some point in the future,
+      # perhaps.
+    ],
+
+    blocks => [
+      {
+        value => {add => [NONEXISTENT_BUG]},
+        error => 'does not exist',
+        test  => 'Non-existent bug number fails in deps'
+      },
+      {
+        value => {add => [$public_id]},
+        error => 'block itself or depend on itself',
+        test  => "can't add this bug itself in a dep field"
+      },
+
+      # FIXME Could use strict_isolation checks at some point.
+      # FIXME Could use a dependency_loop_multi test.
+    ],
+
+    cc => [
+      {
+        value => {add => [random_string(20)]},
+        error => 'There is no user named',
+        test  => 'adding invalid user to cc fails'
+      },
+      {
+        value => {remove => [random_string(20)]},
+        error => 'There is no user named',
+        test  => 'removing invalid user from cc fails'
+      },
+    ],
+
+    comment => [
+      {
+        value => {body => random_string(100_000)},
+        error => 'cannot be longer',
+        test  => 'comment too long'
+      },
+      {
+        value => {body => random_string(100), is_private => 1},
+        error => 'comments or attachments as private',
+        test  => 'normal user cannot add private comments'
+      },
+    ],
+
+    comment_is_private => [
+      {
+        value => {$comment_id => 1},
+        error => 'comments or attachments as private',
+        test  => 'normal user cannot make a comment private'
+      },
+      {
+        value => {$second_comment_id => 1},
+        error => 'You tried to modify the privacy of comment',
+        user  => PRIVATE_BUG_USER,
+        test  => 'cannot change privacy on a comment on another bug'
+      },
+    ],
+
+    component => [
+      {
+        value => '',
+        error => 'you must first choose a component',
+        test  => 'empty component fails'
+      },
+      {
+        value => random_string(20),
+        error => 'There is no component named',
+        test  => 'invalid component fails'
+      },
+    ],
+
+    deadline => [
+      {
+        value => random_string(20),
+        error => 'is not a legal date',
+        test  => 'Non-date fails in deadline'
+      },
+      {
+        value => '2037',
+        error => 'is not a legal date',
+        test  => 'year alone fails in deadline'
+      },
+    ],
+
+    dupe_of => [
+      {
+        value => undef,
+        error => 'dup_id was not defined',
+        test  => 'undefined dupe_of fails'
+      },
+      {
+        value => NONEXISTENT_BUG,
+        error => 'does not exist',
+        test  => 'Cannot dup to a nonexistent bug'
+      },
+      {
+        value => $public_id,
+        error => 'as a duplicate of itself',
+        test  => 'Cannot dup bug to itself'
+      },
+    ],
+
+    estimated_time => [
+      {
+        value => -1,
+        error => 'less than the minimum allowable value',
+        test  => 'negative estimated_time fails'
+      },
+      {
+        value => 100_000_000,
+        error => 'more than the maximum allowable value',
+        test  => 'too-large estimated_time fails'
+      },
+      {
+        value => random_string(20),
+        error => 'is not a numeric value',
+        test  => 'non-numeric estimated_time fails'
+      },
+
+      # We use PRIVATE_BUG_USER because he can modify the bug, but
+      # can't change time-tracking fields.
+      {
+        value => '100',
+        user  => PRIVATE_BUG_USER,
+        error => 'only a user with the required permissions',
+        test  => 'non-timetracker can not set estimated_time'
+      },
+    ],
+
+    groups => [
+      {
+        value => {add => ['Master']},
+        error =>
+          'either this group does not exist, or you are not allowed to restrict bugs to this group',
+        test => "adding group we don't have access to but is valid fails"
+      },
+      {
+        value => {add => ['QA-Selenium-TEST']},
+        error =>
+          'either this group does not exist, or you are not allowed to restrict bugs to this group',
+        test => 'adding valid group that is not in this product fails'
+      },
+      {
+        value => {add => [random_string(20)]},
+        error =>
+          'either this group does not exist, or you are not allowed to restrict bugs to this group',
+        test => 'adding non-existent group fails'
+      },
+      {
+        value => {remove => [random_string(20)]},
+        error =>
+          'either this group does not exist, or you are not allowed to remove bugs from this group',
+        test => 'removing non-existent group fails'
+      },
+    ],
+
+    keywords => [
+      {
+        value => {add => [random_string(20)]},
+        error => 'See the list of available keywords',
+        test  => 'adding invalid keyword fails'
+      },
+      {
+        value => {remove => [random_string(20)]},
+        error => 'See the list of available keywords',
+        test  => 'removing invalid keyword fails'
+      },
+      {
+        value => {set => [random_string(20)]},
+        error => 'See the list of available keywords',
+        test  => 'setting invalid keyword fails'
+      },
+    ],
+
+    op_sys => [
+      {
+        value => random_string(20),
+        error => 'There is no',
+        test  => 'invalid op_sys fails'
+      },
+      {value => '', error => 'You must select/enter', test => 'blank op_sys fails'},
+    ],
+
+    product => [
+      {
+        value => random_string(60),
+        error => "does not exist or you aren't authorized",
+        test  => 'invalid product fails'
+      },
+      {
+        value => '',
+        error => 'You must select/enter a product',
+        test  => 'moving to blank product fails'
+      },
+      {
+        value => 'TestProduct',
+        error => 'There is no component named',
+        test  => 'moving products without other fields fails'
+      },
+      {
+        value => 'QA-Selenium-TEST',
+        extra => {component => 'QA-Selenium-TEST'},
+        error => "does not exist or you aren't authorized",
+        test  => 'moving to inaccessible product fails'
+      },
+      {
+        value => 'QA Entry Only',
+        error => "does not exist or you aren't authorized",
+        test  => 'moving to product where ENTRY is denied fails'
+      },
+    ],
+
+    qa_contact => [
+      {
+        value => random_string(20),
+        error => 'There is no user named',
+        test  => 'changing qa_contact to invalid user fails'
+      },
+    ],
+
+    remaining_time => [
+      {
+        value => -1,
+        error => 'less than the minimum allowable value',
+        test  => 'negative remaining_time fails'
+      },
+      {
+        value => 100_000_000,
+        error => 'more than the maximum allowable value',
+        test  => 'too-large remaining_time fails'
+      },
+      {
+        value => random_string(20),
+        error => 'is not a numeric value',
+        test  => 'non-numeric remaining_time fails'
+      },
+
+      # We use PRIVATE_BUG_USER because he can modify the bug, but
+      # can't change time-tracking fields.
+      {
+        value => '100',
+        user  => PRIVATE_BUG_USER,
+        error => 'only a user with the required permissions',
+        test  => 'non-timetracker can not set remaining_time'
+      },
+    ],
+
+    # We do all the failing resolution tests on the second bug,
+    # because we want to be sure that we're starting from an open
+    # status.
+    resolution => [
+      {
+        value => random_string(20),
+        ids   => [$second_id],
+        extra => {status => 'RESOLVED'},
+        error => 'There is no Resolution named',
+        test  => 'invalid resolution fails'
+      },
+      {
+        value => 'FIXED',
+        ids   => [$second_id],
+        error => 'You cannot set a resolution for open bugs',
+        test  => 'setting resolution on open bug fails'
+      },
+      {
+        value => 'DUPLICATE',
+        ids   => [$second_id],
+        extra => {status => 'RESOLVED'},
+        error => 'id to mark this bug as a duplicate',
+        test  => 'setting DUPLICATE without dup_id fails'
+      },
+      {
+        value => '',
+        ids   => [$second_id],
+        extra => {status => 'RESOLVED'},
+        error => 'A valid resolution is required',
+        test  => 'blank resolution fails with closed status'
+      },
+    ],
+
+    see_also => [
+      {
+        value => {add => [random_string(20)]},
+        error => 'is not a valid bug number nor an alias',
+        test  => 'random string fails in see_also'
+      },
+      {
+        value => {add => ['http://landfill.bugzilla.org/']},
+        error => 'See Also URLs should point to one of',
+        test  => 'no show_bug.cgi in see_also URI'
+      },
+    ],
+
+    status => [
+      {
+        value => random_string(20),
+        error => 'There is no status named',
+        test  => 'invalid status fails'
+      },
+      {
+        value => '',
+        error => 'You must select/enter a status',
+        test  => 'blank status fails'
+      },
+
+      # We use the second bug for this because we can guarantee that
+      # it is open.
+      {
+        value => 'VERIFIED',
+        ids   => [$second_id],
+        extra => {resolution => 'FIXED'},
+        error => 'You are not allowed to change the bug status from',
+        test  => 'invalid transition fails'
+      },
+    ],
+
+    summary => [
+      {
+        value => random_string(300),
+        error => 'The text you entered in the Summary field is too long',
+        test  => 'too-long summary fails'
+      },
+      {
+        value => '',
+        error => 'You must enter a summary for this bug',
+        test  => 'blank summary fails'
+      },
+    ],
+
+    work_time => [
+      {
+        value => 100_000_000,
+        error => 'more than the maximum allowable value',
+        test  => 'too-large work_time fails'
+      },
+      {
+        value => random_string(20),
+        error => 'is not a numeric value',
+        test  => 'non-numeric work_time fails'
+      },
+
+      # We use PRIVATE_BUG_USER because he can modify the bug, but
+      # can't change time-tracking fields.
+      {
+        value => '10',
+        user  => PRIVATE_BUG_USER,
+        error => 'only a user with the required permissions',
+        test  => 'non-timetracker can not set work_time'
+      },
+    ],
+  );
+
+  $values{depends_on} = $values{blocks};
+
+  foreach my $field (qw(platform priority severity target_milestone version)) {
+    my $tests = dclone($values{op_sys});
+    foreach my $test (@$tests) {
+      $test->{test} =~ s/op_sys/$field/g;
+    }
+    $values{$field} = $tests;
+  }
+
+  return %values;
+}
+
+sub invalid_values_to_tests {
+  my ($invalid_values, $public_bug) = @_;
+
+  my @tests;
+  foreach my $field (sort keys %$invalid_values) {
+    my @tests_invalid = @{$invalid_values->{$field}};
+    foreach my $item (@tests_invalid) {
+      my %args = (
+        ids => $item->{ids} || [$public_bug->{id}],
+        $field => $item->{value},
+        %{$item->{extra} || {}},
+      );
+      push(
+        @tests,
+        {
+          user  => $item->{user} || 'editbugs',
+          args  => \%args,
+          error => $item->{error},
+          test  => $item->{test}
+        }
+      );
+    }
+  }
+
+  return \@tests;
+}
+
+###############
+# Main Script #
+###############
+
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+$jsonrpc_get->bz_call_fail(
+  'Bug.update',
+  {ids => ['public_bug']},
+  'must use HTTP POST',
+  'update fails over GET'
+);
+
+sub post_success {
+  my ($call, $t, $rpc) = @_;
+  return if $t->{no_changes};
+  my $field = $t->{field};
+  return if !$field;
+
+  my @bugs = @{$call->result->{bugs}};
+  foreach my $bug (@bugs) {
+    if ($field =~ /^comment/) {
+      _check_comment($bug, $field, $t, $rpc);
+    }
+    else {
+      _check_changes($bug, $field, $t);
+    }
+  }
+}
+
+sub _check_changes {
+  my ($bug, $field, $t) = @_;
+
+  my $changes = $bug->{changes}->{$field};
+  ok(defined $changes, "$field was changed") or diag Dumper($bug, $t);
+
+  my $new_value = $t->{added};
+  $new_value = $t->{args}->{$field} if !defined $new_value;
+  _test_value($changes->{added}, $new_value, $field, 'added');
+
+  if (defined $t->{removed}) {
+    _test_value($changes->{removed}, $t->{removed}, $field, 'removed');
+  }
+}
+
+sub _test_value {
+  my ($got, $expected, $field, $type) = @_;
+  if ($field eq 'estimated_time' or $field eq 'remaining_time') {
+    cmp_ok($got, '==', $expected, "$field: $type is correct");
+  }
+  else {
+    is($got, $expected, "$field: $type is correct");
+  }
+}
+
+sub _check_comment {
+  my ($bug, $field, $t, $rpc) = @_;
+  my $bug_id   = $bug->{id};
+  my $call     = $rpc->bz_call_success('Bug.comments', {ids => [$bug_id]});
+  my $comments = $call->result->{bugs}->{$bug_id}->{comments};
+
+  if ($field eq 'comment_is_private') {
+    my $first_private = $comments->[0]->{is_private};
+    my ($expected) = values %{$t->{args}->{comment_is_private}};
+    cmp_ok($first_private, '==', $expected, 'description privacy is correct');
+  }
+  else {
+    my $last_comment = $comments->[-1];
+    my $expected     = $t->{args}->{comment}->{body};
+    is($last_comment->{text}, $expected, 'comment added correctly');
+  }
+
+}
+
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  $rpc->bz_run_tests(
+    tests        => get_tests($config, $rpc),
+    method       => 'Bug.update',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bug_update_see_also.t b/xt/webservice/bug_update_see_also.t
new file mode 100644
index 0000000000..77f7002ac0
--- /dev/null
+++ b/xt/webservice/bug_update_see_also.t
@@ -0,0 +1,103 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#################################################
+# Test for xmlrpc call to Bug.update_see_also() #
+#################################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use QA::Tests qw(PRIVATE_BUG_USER STANDARD_BUG_TESTS);
+use Test::More tests => 117;
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+my $bug_url = 'http://landfill.bugzilla.org/bugzilla-tip/show_bug.cgi?id=100';
+
+# update_see_also doesn't support logged-out users.
+my @tests = grep { $_->{user} } @{STANDARD_BUG_TESTS()};
+foreach my $t (@tests) {
+  $t->{args}->{add} = $t->{args}->{remove} = [];
+}
+
+push(
+  @tests,
+  (
+    {
+      user  => 'unprivileged',
+      args  => {ids => ['public_bug'], add => [$bug_url]},
+      error => 'only the assignee or reporter of the bug, or a user',
+      test  => 'Unprivileged user cannot add a URL to a bug',
+    },
+
+    {
+      user  => 'admin',
+      args  => {ids => ['public_bug'], add => ['asdfasdfasdf']},
+      error => 'asdf',
+      test  => 'Admin cannot add an invalid URL',
+    },
+    {
+      user => 'admin',
+      args => {ids => ['public_bug'], remove => ['asdfasdfasdf']},
+      test => 'Invalid URL silently ignored',
+    },
+
+    {
+      user => 'admin',
+      args => {ids => ['public_bug'], add => [$bug_url]},
+      test => 'Admin can add a URL to a public bug',
+    },
+    {
+      user  => 'unprivileged',
+      args  => {ids => ['public_bug'], remove => [$bug_url]},
+      error => 'only the assignee or reporter of the bug, or a user',
+      test  => 'Unprivileged user cannot remove a URL from a bug',
+    },
+    {
+      user => 'admin',
+      args => {ids => ['public_bug'], remove => [$bug_url]},
+      test => 'Admin can remove a URL from a public bug',
+    },
+
+    {
+      user => PRIVATE_BUG_USER,
+      args => {ids => ['private_bug'], add => [$bug_url]},
+      test => PRIVATE_BUG_USER . ' can add a URL to a private bug',
+    },
+    {
+      user => PRIVATE_BUG_USER,
+      args => {ids => ['private_bug'], remove => [$bug_url]},
+      test => PRIVATE_BUG_USER . ' can remove a URL from a private bug',
+    },
+
+  )
+);
+
+sub post_success {
+  my ($call, $t) = @_;
+  isa_ok($call->result->{changes}, 'HASH', "Changes");
+}
+
+$jsonrpc_get->bz_call_fail(
+  'Bug.update_see_also',
+  {ids => ['public_bug'], add => [$bug_url]},
+  'must use HTTP POST',
+  'update_see_also fails over GET'
+);
+
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'Bug.update_see_also',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/bugzilla.t b/xt/webservice/bugzilla.t
new file mode 100644
index 0000000000..2b5bcfa46d
--- /dev/null
+++ b/xt/webservice/bugzilla.t
@@ -0,0 +1,50 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+##################################################
+# Test for xmlrpc call functions in Bugzilla.pm  #
+##################################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 11 * 3;
+use QA::Util;
+my ($config, @clients) = get_rpc_clients();
+
+foreach my $rpc (@clients) {
+  my $vers_call = $rpc->bz_call_success('Bugzilla.version');
+  my $version   = $vers_call->result->{version};
+  ok($version, "Bugzilla.version returns $version");
+
+  my $tz_call = $rpc->bz_call_success('Bugzilla.timezone');
+  my $tz      = $tz_call->result->{timezone};
+  ok($tz, "Bugzilla.timezone returns $tz");
+
+  my $ext_call   = $rpc->bz_call_success('Bugzilla.extensions');
+  my $extensions = $ext_call->result->{extensions};
+  isa_ok($extensions, 'HASH', 'extensions');
+
+  # There is always at least the QA extension enabled.
+  my $cmp = $config->{test_extensions} ? '>' : '==';
+  my @ext_names = keys %$extensions;
+  my $desc
+    = scalar(@ext_names) . ' extension(s) returned: ' . join(', ', @ext_names);
+  cmp_ok(scalar(@ext_names), $cmp, 1, $desc);
+  ok(grep($_ eq 'QA', @ext_names), 'The QA extension is enabled');
+
+  my $time_call   = $rpc->bz_call_success('Bugzilla.time');
+  my $time_result = $time_call->result;
+  foreach my $type (qw(db_time web_time)) {
+    cmp_ok($time_result->{$type}, '=~', $rpc->DATETIME_REGEX,
+      "Bugzilla.time returns a datetime for $type");
+  }
+}
diff --git a/xt/webservice/group_create.t b/xt/webservice/group_create.t
new file mode 100644
index 0000000000..9634c61873
--- /dev/null
+++ b/xt/webservice/group_create.t
@@ -0,0 +1,124 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+##########################################
+# Test for xmlrpc call to Group.create() #
+##########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 77;
+use QA::Util;
+
+use constant DESCRIPTION => 'Group created by Group.create';
+
+sub post_success {
+  my $call = shift;
+  my $gid  = $call->result->{id};
+  ok($gid, "Got a non-zero group ID: $gid");
+}
+
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+my @tests = (
+  {
+    args  => {name => random_string(20), description => DESCRIPTION},
+    error => 'You must log in',
+    test  => 'Logged-out user cannot call Group.create',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {name => random_string(20), description => DESCRIPTION},
+    error => 'you are not authorized',
+    test  => 'Unprivileged user cannot call Group.create',
+  },
+  {
+    user  => 'admin',
+    args  => {description => DESCRIPTION},
+    error => 'You must enter a name',
+    test  => 'Missing name to Group.create',
+  },
+  {
+    user  => 'admin',
+    args  => {name => random_string(20)},
+    error => 'You must enter a description',
+    test  => 'Missing description to Group.create',
+  },
+  {
+    user  => 'admin',
+    args  => {name => '', description => DESCRIPTION},
+    error => 'You must enter a name',
+    test  => 'Name to Group.create cannot be empty',
+  },
+  {
+    user  => 'admin',
+    args  => {name => random_string(20), description => ''},
+    error => 'You must enter a description',
+    test  => 'Description to Group.create cannot be empty',
+  },
+  {
+    user  => 'admin',
+    args  => {name => 'canconfirm', description => DESCRIPTION},
+    error => 'already exists',
+    test  => 'Name to Group.create already exists',
+  },
+  {
+    user  => 'admin',
+    args  => {name => 'caNConFIrm', description => DESCRIPTION},
+    error => 'already exists',
+    test  => 'Name to Group.create already exists but with a different case',
+  },
+  {
+    user => 'admin',
+    args =>
+      {name => random_string(20), description => DESCRIPTION, user_regexp => '\\'},
+    error => 'The regular expression you entered is invalid',
+    test  => 'The regular expression passed to Group.create is invalid',
+  },
+);
+
+$jsonrpc_get->bz_call_fail(
+  'Group.create',
+  {name => random_string(20), description => 'Created with JSON-RPC via GET'},
+  'must use HTTP POST',
+  'Group.create fails over GET'
+);
+
+foreach my $rpc ($xmlrpc, $jsonrpc) {
+
+  # Tests which work must be called from here,
+  # to avoid creating twice the same group.
+  my @all_tests = (
+    @tests,
+    {
+      user => 'admin',
+      args => {name => random_string(20), description => DESCRIPTION},
+      test => 'Passing the name and description only works',
+    },
+    {
+      user => 'admin',
+      args => {
+        name        => random_string(20),
+        description => DESCRIPTION,
+        user_regexp => '\@foo.com$',
+        is_active   => 1,
+        icon_url    => 'http://www.bugzilla.org/favicon.ico'
+      },
+      test => 'Passing all arguments works',
+    },
+  );
+  $rpc->bz_run_tests(
+    tests        => \@all_tests,
+    method       => 'Group.create',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/jsonp.t b/xt/webservice/jsonp.t
new file mode 100644
index 0000000000..d2f8b2deab
--- /dev/null
+++ b/xt/webservice/jsonp.t
@@ -0,0 +1,41 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 85;
+use QA::Util;
+my $jsonrpc_get = QA::Util::get_jsonrpc_client('GET');
+
+my @chars = (0 .. 9, 'A' .. 'Z', 'a' .. 'z', '_[].');
+
+our @tests = (
+  {
+    args => {callback => join('', @chars)},
+    test => 'callback accepts all legal characters.'
+  },
+);
+foreach
+  my $char (qw(! ~ ` @ $ % ^ & * - + = { } ; : ' " < > / ? |), '(', ')', '\\',
+  '#', ',')
+{
+  push(
+    @tests,
+    {
+      args  => {callback => "a$char"},
+      error => "as your 'callback' parameter",
+      test  => "$char is not valid in callback"
+    }
+  );
+}
+
+$jsonrpc_get->bz_run_tests(method => 'Bugzilla.version', tests => \@tests);
diff --git a/xt/webservice/product_create.t b/xt/webservice/product_create.t
new file mode 100644
index 0000000000..0b9f45cde6
--- /dev/null
+++ b/xt/webservice/product_create.t
@@ -0,0 +1,244 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+############################################
+# Test for xmlrpc call to Product.create() #
+############################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 121;
+use QA::Util;
+
+use constant DESCRIPTION  => 'Product created by Product.create';
+use constant PROD_VERSION => 'unspecified';
+
+sub post_success {
+  my ($call, $test, $self) = @_;
+  my $args    = $test->{args};
+  my $prod_id = $call->result->{id};
+  ok($prod_id, "Got a non-zero product ID: $prod_id");
+
+  $call = $self->bz_call_success("Product.get", {ids => [$prod_id]});
+  my $product   = $call->result->{products}->[0];
+  my $prod_name = $product->{name};
+  my $is_active = defined $args->{is_open} ? $args->{is_open} : 1;
+  ok($product->{is_active} == $is_active,
+    "Product $prod_name has the correct value for is_active/is_open: $is_active");
+  my $has_unco = defined $args->{has_unconfirmed} ? $args->{has_unconfirmed} : 1;
+  ok($product->{has_unconfirmed} == $has_unco,
+    "Product $prod_name has the correct value for has_unconfirmed: $has_unco");
+}
+
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+my @tests = (
+  {
+    args => {
+      name        => random_string(20),
+      version     => PROD_VERSION,
+      description => DESCRIPTION
+    },
+    error => 'You must log in',
+    test  => 'Logged-out user cannot call Product.create',
+  },
+  {
+    user => 'unprivileged',
+    args => {
+      name        => random_string(20),
+      version     => PROD_VERSION,
+      description => DESCRIPTION
+    },
+    error => 'you are not authorized',
+    test  => 'Unprivileged user cannot call Product.create',
+  },
+  {
+    user  => 'admin',
+    args  => {version => PROD_VERSION, description => DESCRIPTION},
+    error => 'You must enter a name',
+    test  => 'Missing name to Product.create',
+  },
+  {
+    user  => 'admin',
+    args  => {name => random_string(20), version => PROD_VERSION},
+    error => 'You must enter a description',
+    test  => 'Missing description to Product.create',
+  },
+  {
+    user  => 'admin',
+    args  => {name => random_string(20), description => DESCRIPTION},
+    error => 'You must enter a valid version',
+    test  => 'Missing version to Product.create',
+  },
+  {
+    user  => 'admin',
+    args  => {name => '', version => PROD_VERSION, description => DESCRIPTION},
+    error => 'You must enter a name',
+    test  => 'Name to Product.create cannot be empty',
+  },
+  {
+    user => 'admin',
+    args => {name => random_string(20), version => PROD_VERSION, description => ''},
+    error => 'You must enter a description',
+    test  => 'Description to Product.create cannot be empty',
+  },
+  {
+    user  => 'admin',
+    args  => {name => random_string(20), version => '', description => DESCRIPTION},
+    error => 'You must enter a valid version',
+    test  => 'Version to Product.create cannot be empty',
+  },
+  {
+    user => 'admin',
+    args => {
+      name        => random_string(20000),
+      version     => PROD_VERSION,
+      description => DESCRIPTION
+    },
+    error => 'The name of a product is limited',
+    test  => 'Name to Product.create too long',
+  },
+  {
+    user => 'admin',
+    args => {
+      name        => 'Another Product',
+      version     => PROD_VERSION,
+      description => DESCRIPTION
+    },
+    error => 'already exists',
+    test  => 'Name to Product.create already exists',
+  },
+  {
+    user => 'admin',
+    args => {
+      name        => 'aNoThEr Product',
+      version     => PROD_VERSION,
+      description => DESCRIPTION
+    },
+    error => 'differs from existing product',
+    test  => 'Name to Product.create already exists but with a different case',
+  },
+);
+
+# FIXME - Should be: if (classifications enabled).
+# But there is currently now way to query the value of a parameter via WS.
+if (0) {
+  push(
+    @tests,
+    {
+      user => 'admin',
+      args => {
+        name              => random_string(20),
+        version           => PROD_VERSION,
+        description       => DESCRIPTION,
+        has_unconfirmed   => 1,
+        classification    => '',
+        default_milestone => '2.0',
+        is_open           => 1,
+        create_series     => 1
+      },
+      error => 'You must select/enter a classification',
+      test  => 'Passing an empty classification to Product.create fails',
+    },
+    {
+      user => 'admin',
+      args => {
+        name              => random_string(20),
+        version           => PROD_VERSION,
+        description       => DESCRIPTION,
+        has_unconfirmed   => 1,
+        classification    => random_string(10),
+        default_milestone => '2.0',
+        is_open           => 1,
+        create_series     => 1
+      },
+      error => 'You must select/enter a classification',
+      test  => 'Passing an invalid classification to Product.create fails',
+    },
+  );
+}
+
+$jsonrpc_get->bz_call_fail(
+  'Product.create',
+  {
+    name        => random_string(20),
+    version     => PROD_VERSION,
+    description => 'Created with JSON-RPC via GET'
+  },
+  'must use HTTP POST',
+  'Product.create fails over GET'
+);
+
+foreach my $rpc ($xmlrpc, $jsonrpc) {
+
+  # Tests which work must be called from here,
+  # to avoid creating twice the same product.
+  my @all_tests = (
+    @tests,
+    {
+      user => 'admin',
+      args => {
+        name        => random_string(20),
+        version     => PROD_VERSION,
+        description => DESCRIPTION
+      },
+      test => 'Passing the name, description and version only works',
+    },
+    {
+      user => 'admin',
+      args => {
+        name              => random_string(20),
+        version           => PROD_VERSION,
+        description       => DESCRIPTION,
+        has_unconfirmed   => 1,
+        classification    => 'Class2_QA',
+        default_milestone => '2.0',
+        is_open           => 1,
+        create_series     => 1
+      },
+      test => 'Passing all arguments works',
+    },
+    {
+      user => 'admin',
+      args => {
+        name              => random_string(20),
+        version           => PROD_VERSION,
+        description       => DESCRIPTION,
+        has_unconfirmed   => 0,
+        classification    => 'Class2_QA',
+        default_milestone => '2.0',
+        is_open           => 0,
+        create_series     => 0
+      },
+      test => 'Passing null values works',
+    },
+    {
+      user => 'admin',
+      args => {
+        name              => random_string(20),
+        version           => PROD_VERSION,
+        description       => DESCRIPTION,
+        has_unconfirmed   => 1,
+        classification    => 'Class2_QA',
+        default_milestone => '',
+        is_open           => 1,
+        create_series     => 1
+      },
+      test => 'Passing an empty default milestone works (falls back to "---")',
+    },
+  );
+  $rpc->bz_run_tests(
+    tests        => \@all_tests,
+    method       => 'Product.create',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/product_get.t b/xt/webservice/product_get.t
new file mode 100644
index 0000000000..b4906b395a
--- /dev/null
+++ b/xt/webservice/product_get.t
@@ -0,0 +1,111 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+########################################
+# Test for xmlrpc calls to:            #
+# Product.get_selectable_products()    #
+# Product.get_enterable_products()     #
+# Product.get_accessible_products()    #
+# Product.get()                        #
+########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Test::More tests => 134;
+use QA::Util;
+my ($config, @clients) = get_rpc_clients();
+
+my $products  = $clients[0]->bz_get_products();
+my $public    = $products->{'Another Product'};
+my $private   = $products->{'QA-Selenium-TEST'};
+my $no_entry  = $products->{'QA Entry Only'};
+my $no_search = $products->{'QA Search Only'};
+
+my %id_map = reverse %$products;
+
+my $tests = {
+  'QA_Selenium_TEST' => {
+    selectable => [$public, $private, $no_entry, $no_search],
+    enterable  => [$public, $private, $no_entry, $no_search],
+    accessible => [$public, $private, $no_entry, $no_search],
+  },
+  'unprivileged' => {
+    selectable     => [$public, $no_entry],
+    not_selectable => $no_search,
+    enterable      => [$public, $no_search],
+    not_enterable  => $no_entry,
+    accessible     => [$public, $no_entry, $no_search],
+    not_accessible => $private,
+  },
+  '' => {
+    selectable     => [$public, $no_entry],
+    not_selectable => $no_search,
+    enterable      => [$public, $no_search],
+    not_enterable  => $no_entry,
+    accessible     => [$public, $no_entry, $no_search],
+    not_accessible => $private,
+  },
+};
+
+foreach my $rpc (@clients) {
+  foreach my $user (keys %$tests) {
+    my @selectable     = @{$tests->{$user}->{selectable}};
+    my @enterable      = @{$tests->{$user}->{enterable}};
+    my @accessible     = @{$tests->{$user}->{accessible}};
+    my $not_selectable = $tests->{$user}->{not_selectable};
+    my $not_enterable  = $tests->{$user}->{not_enterable};
+    my $not_accessible = $tests->{$user}->{not_accessible};
+
+    $rpc->bz_log_in($user) if $user;
+    $user ||= "Logged-out user";
+
+    my $select_call = $rpc->bz_call_success('Product.get_selectable_products');
+    my $select_ids  = $select_call->result->{ids};
+    foreach my $id (@selectable) {
+      ok(grep($_ == $id, @$select_ids), "$user can select " . $id_map{$id});
+    }
+    if ($not_selectable) {
+      ok(
+        !grep($_ == $not_selectable, @$select_ids),
+        "$user cannot select " . $id_map{$not_selectable}
+      );
+    }
+
+    my $enter_call = $rpc->bz_call_success('Product.get_enterable_products');
+    my $enter_ids  = $enter_call->result->{ids};
+    foreach my $id (@enterable) {
+      ok(grep($_ == $id, @$enter_ids), "$user can enter " . $id_map{$id});
+    }
+    if ($not_enterable) {
+      ok(
+        !grep($_ == $not_enterable, @$enter_ids),
+        "$user cannot enter " . $id_map{$not_enterable}
+      );
+    }
+
+    my $access_call = $rpc->bz_call_success('Product.get_accessible_products');
+    my $get_call    = $rpc->bz_call_success('Product.get', {ids => \@accessible});
+    my $products    = $get_call->result->{products};
+    my $expected_count = scalar @accessible;
+    cmp_ok(scalar @$products,
+      '==', $expected_count,
+      "Product.get gets all $expected_count accessible products" . " for $user.");
+    if ($not_accessible) {
+      my $no_access_call
+        = $rpc->bz_call_success('Product.get', {ids => [$not_accessible]});
+      ok(!scalar @{$no_access_call->result->{products}},
+        "$user gets 0 products when asking for " . $id_map{$not_accessible});
+    }
+
+    $rpc->bz_call_success('User.logout') if $user ne "Logged-out user";
+  }
+}
diff --git a/xt/webservice/user_create.t b/xt/webservice/user_create.t
new file mode 100644
index 0000000000..1ed2674f95
--- /dev/null
+++ b/xt/webservice/user_create.t
@@ -0,0 +1,143 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#########################################
+# Test for xmlrpc call to User.Create() #
+#########################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use Test::More tests => 75;
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+use constant NEW_PASSWORD => 'password';
+use constant NEW_FULLNAME => 'WebService Created User';
+
+use constant PASSWORD_TOO_SHORT => 'a';
+
+# These are the characters that are actually invalid per RFC.
+use constant INVALID_EMAIL => '()[]\;:,<>@webservice.test';
+
+sub new_login {
+  return 'created_' . random_string(@_) . '@webservice.test';
+}
+
+sub post_success {
+  my ($call) = @_;
+  ok($call->result->{id}, "Got a non-zero user id");
+}
+
+$jsonrpc_get->bz_call_fail(
+  'User.create',
+  {email => new_login(), full_name => NEW_FULLNAME, password => '*'},
+  'must use HTTP POST',
+  'User.create fails over GET'
+);
+
+# We have to wrap @tests in the foreach, because we want a different
+# login for each user, separately for each RPC client. (You can't create
+# two users with the same username, and XML-RPC would otherwise try to
+# create the same users that JSON-RPC created.)
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  my @tests = (
+
+    # Permissions checks
+    {
+      args =>
+        {email => new_login(), full_name => NEW_FULLNAME, password => NEW_PASSWORD},
+      error => "you are not authorized",
+      test  => 'Logged-out user cannot call User.create',
+    },
+    {
+      user => 'unprivileged',
+      args =>
+        {email => new_login(), full_name => NEW_FULLNAME, password => NEW_PASSWORD},
+      error => "you are not authorized",
+      test  => 'Unprivileged user cannot call User.create',
+    },
+
+    # Login name checks.
+    {
+      user  => 'admin',
+      args  => {full_name => NEW_FULLNAME, password => NEW_PASSWORD},
+      error => "argument was not set",
+      test  => 'Leaving out email argument fails',
+    },
+    {
+      user  => 'admin',
+      args  => {email => '', full_name => NEW_FULLNAME, password => NEW_PASSWORD},
+      error => "argument was not set",
+      test  => "Passing an empty email argument fails",
+    },
+    {
+      user => 'admin',
+      args =>
+        {email => INVALID_EMAIL, full_name => NEW_FULLNAME, password => NEW_PASSWORD},
+      error => "didn't pass our syntax checking",
+      test  => 'Invalid email address fails',
+    },
+    {
+      user => 'admin',
+      args => {
+        email     => new_login(128),
+        full_name => NEW_FULLNAME,
+        password  => NEW_PASSWORD
+      },
+      error => "didn't pass our syntax checking",
+      test  => 'Too long (> 127 chars) email address fails',
+    },
+    {
+      user => 'admin',
+      args => {
+        email     => $config->{unprivileged_user_login},
+        full_name => NEW_FULLNAME,
+        password  => NEW_PASSWORD
+      },
+      error => "There is already an account",
+      test  => 'Trying to use an existing login name fails',
+    },
+
+    {
+      user => 'admin',
+      args => {
+        email     => new_login(),
+        full_name => NEW_FULLNAME,
+        password  => PASSWORD_TOO_SHORT
+      },
+      error => 'password must be at least',
+      test  => 'Password Too Short fails',
+    },
+    {
+      user => 'admin',
+      args =>
+        {email => new_login(), full_name => NEW_FULLNAME, password => NEW_PASSWORD},
+      test => 'Creating a user with all arguments and correct privileges',
+    },
+    {
+      user => 'admin',
+      args => {email => new_login(), password => NEW_PASSWORD},
+      test => 'Leaving out fullname works',
+    },
+    {
+      user => 'admin',
+      args => {email => new_login(), full_name => NEW_FULLNAME},
+      test => 'Leaving out password works',
+    },
+  );
+
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'User.create',
+    post_success => \&post_success
+  );
+}
diff --git a/xt/webservice/user_get.t b/xt/webservice/user_get.t
new file mode 100644
index 0000000000..3688317b1c
--- /dev/null
+++ b/xt/webservice/user_get.t
@@ -0,0 +1,274 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+######################################
+# Test for xmlrpc call to User.get() #
+######################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use QA::Tests qw(PRIVATE_BUG_USER);
+use Test::More tests => 330;
+our ($config, @clients) = get_rpc_clients();
+
+my $get_user        = $config->{'unprivileged_user_login'};
+my $canconfirm_user = $config->{'canconfirm_user_login'};
+my $priv_user       = $config->{PRIVATE_BUG_USER . '_user_login'};
+my $disabled        = $config->{'disabled_user_login'};
+my $disabled_match  = substr($disabled, 0, length($disabled) - 1);
+
+# These are the basic tests. There are tests for include_fields
+# and exclude_field below.
+
+my @tests = (
+  {
+    args => {names => [$get_user]},
+    test => "Logged-out user can get unprivileged user by name"
+  },
+  {
+    args  => {match => [$get_user]},
+    test  => 'Logged-out user cannot use the match argument',
+    error => 'Logged-out users cannot use',
+  },
+  {
+    args  => {ids => [1]},
+    test  => 'Logged-out users cannot use the "ids" argument',
+    error => 'Logged-out users cannot use',
+  },
+
+  # match & names
+  {
+    user => 'unprivileged',
+    args => {names => [$get_user]},
+    test => "Unprivileged user can get himself",
+  },
+  {
+    user => 'unprivileged',
+    args => {match => [$get_user]},
+    test => 'Logged-in user can use the match argument',
+  },
+  {
+    user => 'unprivileged',
+    args => {match => [$get_user], names => [$get_user]},
+    test => 'Specifying the same thing in "match" and "names"',
+  },
+
+  # include_disabled
+  {
+    user => 'unprivileged',
+    args => {match => [$get_user, $disabled_match]},
+    test => 'Disabled users are not normally returned'
+  },
+  {
+    user => 'unprivileged',
+    args => {match => [$disabled_match], include_disabled => 1},
+    test => 'Specifying include_disabled returns disabled users'
+  },
+  {
+    user => 'unprivileged',
+    args => {match => [$disabled]},
+    test => 'Full match on a disabled user returns that user',
+  },
+
+  # groups and group_ids
+  {
+    args  => {groups => ['QA-Selenium-TEST']},
+    test  => 'Specifying just groups fails',
+    error => 'one of the following parameters',
+  },
+  {
+    args  => {group_ids => [1]},
+    test  => 'Specifying just group ids fails',
+    error => 'one of the following parameters',
+  },
+  {
+    args  => {names => [$get_user, $priv_user], groups => ['QA-Selenium-TEST']},
+    test  => 'Limiting the return value to a group while being logged out fails',
+    error => 'The group you specified, QA-Selenium-TEST, is not valid here',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {names => [$get_user, $priv_user], groups => ['missing_group']},
+    test  => 'Limiting the return value to a group which does not exist fails',
+    error => 'The group you specified, missing_group, is not valid here',
+  },
+  {
+    user  => 'unprivileged',
+    args  => {names => [$get_user, $priv_user], groups => ['QA-Selenium-TEST']},
+    test  => 'Limiting the return value to a group you do not belong to fails',
+    error => 'The group you specified, QA-Selenium-TEST, is not valid here',
+  },
+  {
+    user => 'editbugs',
+    args =>
+      {names => [$get_user, $priv_user], groups => ['canconfirm', 'editbugs']},
+    test  => 'Limiting the return value to some groups you do not belong to fails',
+    error => 'The group you specified, canconfirm, is not valid here',
+  },
+  {
+    user => 'admin',
+    args => {names => [$canconfirm_user], groups => ['canconfirm', 'editbugs']},
+    test => 'Limiting the return value to groups you belong to',
+  },
+
+  # groups returned
+  {
+    user => 'admin',
+    args => {names => [$get_user]},
+    test => 'Admin can get user',
+  },
+  {
+    user => 'admin',
+    args => {names => [$canconfirm_user]},
+    test => 'Admin can get user',
+  },
+  {
+    user => 'canconfirm',
+    args => {names => [$canconfirm_user]},
+    test => 'Privileged user can get himself',
+  },
+  {
+    user => 'editbugs',
+    args => {names => [$canconfirm_user]},
+    test => 'Privileged user can get another user',
+  },
+);
+
+sub post_success {
+  my ($call, $t) = @_;
+
+  my $result = $call->result;
+  is(scalar @{$result->{users}}, 1, "Got exactly one user");
+  my $item = $result->{users}->[0];
+  my $user = $t->{user} || '';
+
+  if ($user eq 'admin') {
+    ok(
+      exists $item->{email}
+        && exists $item->{can_login}
+        && exists $item->{email_enabled}
+        && exists $item->{login_denied_text},
+      'Admin correctly gets all user fields'
+    );
+  }
+  elsif ($user) {
+    ok(exists $item->{can_login}, 'Logged-in user correctly gets can_login');
+    ok(
+      !exists $item->{email_enabled} && !exists $item->{login_denied_text},
+      "Non-admin user doesn't get email_enabled and login_denied_text"
+    );
+  }
+  else {
+    my @item_keys = sort keys %$item;
+    is_deeply(
+      \@item_keys,
+      ['id', 'name', 'real_name'],
+      'Only id, name, and real_name are returned to logged-out users'
+    );
+    return;
+  }
+
+  my $username = $config->{"${user}_user_login"};
+
+  # FIXME We have no way to create a saved search or a saved report from
+  # the WebService, so we cannot test that the correct data is returned
+  # if the user is accessing his own account.
+  if ($username eq $item->{name}) {
+    ok(
+      exists $item->{saved_searches} && exists $item->{saved_reports},
+      'Users can get the list of saved searches and reports for their own account'
+    );
+  }
+  else {
+    ok(
+      !exists $item->{saved_searches} && !exists $item->{saved_reports},
+      "Users cannot get the list of saved searches and reports from someone else's acccount"
+    );
+  }
+
+  my @groups = map { $_->{name} } @{$item->{groups}};
+
+  # Admins can see all groups a user belongs to (assuming they inherited
+  # membership for all groups). Same for a user querying his own account.
+  if ($username eq $item->{name} || $user eq 'admin') {
+    if ($username eq $get_user) {
+      ok(!scalar @groups, "The unprivileged user doesn't belong to any group");
+    }
+    elsif ($username eq $canconfirm_user) {
+      ok(grep($_ eq 'canconfirm', @groups), "Group 'canconfirm' returned");
+    }
+  }
+  else {
+    ok(!scalar @groups, "No groups are visible to users without bless privs");
+  }
+}
+
+foreach my $rpc (@clients) {
+  $rpc->bz_run_tests(
+    tests        => \@tests,
+    method       => 'User.get',
+    post_success => \&post_success
+  );
+
+  #############################
+  # Include and Exclude Tests #
+  #############################
+
+  my $include_nothing = $rpc->bz_call_success(
+    'User.get',
+    {names => [$get_user], include_fields => ['asdfasdfsdf'],},
+    'User.get including only invalid fields'
+  );
+  is(scalar keys %{$include_nothing->result->{users}->[0]},
+    0, 'No fields returned for user');
+
+  my $include_one = $rpc->bz_call_success(
+    'User.get',
+    {names => [$get_user], include_fields => ['id'],},
+    'User.get including only id'
+  );
+  is(scalar keys %{$include_one->result->{users}->[0]},
+    1, 'Only one field returned for user');
+
+  my $exclude_none = $rpc->bz_call_success(
+    'User.get',
+    {names => [$get_user], exclude_fields => ['asdfasdfsdf'],},
+    'User.get excluding only invalid fields'
+  );
+  is(scalar keys %{$exclude_none->result->{users}->[0]},
+    3, 'All fields returned for user');
+
+  my $exclude_one = $rpc->bz_call_success(
+    'User.get',
+    {names => [$get_user], exclude_fields => ['id'],},
+    'User.get excluding id'
+  );
+  is(scalar keys %{$exclude_one->result->{users}->[0]},
+    2, 'Only two fields returned for user');
+
+  my $override = $rpc->bz_call_success(
+    'User.get',
+    {
+      names          => [$get_user],
+      include_fields => ['id', 'name'],
+      exclude_fields => ['id']
+    },
+    'User.get with both include and exclude'
+  );
+  is(scalar keys %{$override->result->{users}->[0]}, 1,
+    'Only one field returned');
+  ok(
+    exists $override->result->{users}->[0]->{name},
+    '...and that field is the "name" field'
+  );
+}
diff --git a/xt/webservice/user_login_logout.t b/xt/webservice/user_login_logout.t
new file mode 100644
index 0000000000..86fbb417fa
--- /dev/null
+++ b/xt/webservice/user_login_logout.t
@@ -0,0 +1,137 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+##########################################################
+# Test for xmlrpc call to User.login() and User.logout() #
+##########################################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use Data::Dumper;
+use QA::Util;
+use Test::More tests => 119;
+my ($config, @clients) = get_rpc_clients();
+
+use constant INVALID_EMAIL => '@invalid_user@';
+
+my $user  = $config->{unprivileged_user_login};
+my $pass  = $config->{unprivileged_user_passwd};
+my $error = "The login or password you entered is not valid";
+
+my @tests = (
+  {user => 'unprivileged', test => "Unprivileged user can log in successfully",},
+
+  {
+    args  => {login => $user, password => ''},
+    error => $error,
+    test  => "Empty password can't log in",
+  },
+  {
+    args  => {login => '', password => $pass},
+    error => $error,
+    test  => "Empty login can't log in",
+  },
+  {
+    args  => {login => $user},
+    error => "requires a password argument",
+    test  => "Undef password can't log in",
+  },
+  {
+    args  => {password => $pass},
+    error => "requires a login argument",
+    test  => "Undef login can't log in",
+  },
+
+  {
+    args  => {login => INVALID_EMAIL, password => $pass},
+    error => $error,
+    test  => "Invalid email can't log in",
+  },
+  {
+    args  => {login => $user, password => '*'},
+    error => $error,
+    test  => "Invalid password can't log in",
+  },
+
+  {
+    args => {
+      login    => $config->{disabled_user_login},
+      password => $config->{disabled_user_passwd}
+    },
+    error => "!!This is the text!!",
+    test  => "Can't log in with a disabled account",
+  },
+  {
+    args  => {login => $config->{disabled_user_login}, password => '*'},
+    error => $error,
+    test  => "Logging in with invalid password doesn't show disabledtext",
+  },
+);
+
+sub _login_args {
+  my $args       = shift;
+  my %fixed_args = %$args;
+  $fixed_args{Bugzilla_login}    = delete $fixed_args{login};
+  $fixed_args{Bugzilla_password} = delete $fixed_args{password};
+  return \%fixed_args;
+}
+
+foreach my $rpc (@clients) {
+  if ($rpc->bz_get_mode) {
+    $rpc->bz_call_fail(
+      'User.logout', undef,
+      'must use HTTP POST',
+      'User.logout fails when called via GET'
+    );
+  }
+
+  foreach my $t (@tests) {
+    if ($t->{user}) {
+      my $username = $config->{$t->{user} . '_user_login'};
+      my $password = $config->{$t->{user} . '_user_passwd'};
+
+      if ($rpc->bz_get_mode) {
+        $rpc->bz_call_fail(
+          'User.login',
+          {login => $username, password => $password},
+          'must use HTTP POST',
+          $t->{test} . ' (fails on GET)'
+        );
+      }
+      else {
+        $rpc->bz_log_in($t->{user});
+        ok($rpc->{_bz_credentials}->{token}, 'Login token returned');
+        $rpc->bz_call_success('User.logout');
+      }
+
+      if ($t->{error}) {
+        $rpc->bz_call_fail('Bugzilla.version',
+          {Bugzilla_login => $username, Bugzilla_password => $password});
+      }
+      else {
+        $rpc->bz_call_success('Bugzilla.version',
+          {Bugzilla_login => $username, Bugzilla_password => $password});
+      }
+    }
+    else {
+      # Under GET, there's no reason to have extra failing tests.
+      if (!$rpc->bz_get_mode) {
+        $rpc->bz_call_fail('User.login', $t->{args}, $t->{error}, $t->{test});
+      }
+      if (defined $t->{args}->{login} and defined $t->{args}->{password}) {
+        my $fixed_args = _login_args($t->{args});
+        $rpc->bz_call_fail('Bugzilla.version', $fixed_args, $t->{error},
+          "Bugzilla_login: " . $t->{test});
+      }
+    }
+  }
+}
diff --git a/xt/webservice/user_offer_account_by_email.t b/xt/webservice/user_offer_account_by_email.t
new file mode 100644
index 0000000000..a9cdad5429
--- /dev/null
+++ b/xt/webservice/user_offer_account_by_email.t
@@ -0,0 +1,68 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+#########################################################
+# Test for xmlrpc call to User.offer_account_by_email() #
+#########################################################
+
+use 5.14.0;
+use strict;
+use warnings;
+
+use FindBin qw($RealBin);
+use lib "$RealBin/../lib", "$RealBin/../../local/lib/perl5";
+
+use QA::Util;
+use Test::More tests => 29;
+my ($config, $xmlrpc, $jsonrpc, $jsonrpc_get) = get_rpc_clients();
+
+# These are the characters that are actually invalid per RFC.
+use constant INVALID_EMAIL => '()[]\;:,<>@webservice.test';
+
+sub new_login {
+  return 'requested_' . random_string() . '@webservice.test';
+}
+
+$jsonrpc_get->bz_call_fail(
+  'User.offer_account_by_email',
+  {email => new_login()},
+  'must use HTTP POST',
+  'offer_account_by_email fails over GET'
+);
+
+# Have to wrap @tests in the foreach so that new_login returns something
+# different each time.
+foreach my $rpc ($jsonrpc, $xmlrpc) {
+  my @tests = (
+
+    # Login name checks.
+    {
+      args  => {},
+      error => "argument was not set",
+      test  => 'Leaving out email argument fails',
+    },
+    {
+      args  => {email => ''},
+      error => "argument was not set",
+      test  => "Passing an empty email argument fails",
+    },
+    {
+      args  => {email => INVALID_EMAIL},
+      error => "didn't pass our syntax checking",
+      test  => 'Invalid email address fails',
+    },
+    {
+      args  => {email => $config->{unprivileged_user_login}},
+      error => "There is already an account",
+      test  => 'Trying to use an existing login name fails',
+    },
+
+    {args => {email => new_login()}, test => 'Valid, non-existing email passes.',},
+  );
+
+  $rpc->bz_run_tests(tests => \@tests, method => 'User.offer_account_by_email');
+}