Merge remote-tracking branch 'origin/new/bug_6530'

Conflicts:
	kohaversion.pl

diff --cc installer/data/mysql/updatedatabase.pl
index 3ff4ba3,df68dac..e333627
--- 1/installer/data/mysql/updatedatabase.pl
--- 2/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@@ -4571,17 -4571,10 +4571,17 @@@ if ( C4::Context->preference("Version"
      SetVersion($DBversion);
  }
  
- $DBversion = "3.06.02.001";
+ $DBversion = "3.07.00.003";
  if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
      $dbh->do(" UPDATE `message_attributes` SET message_name='Item_Due' WHERE message_name='Item_DUE'");
 -    print "Updating message_name in message_attributes";
 +    print "Updating message_name in message_attributes\n";
 +    SetVersion($DBversion);
 +}
 +
 +$DBversion = "3.06.03.001";
 +if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
 +    $dbh->do("ALTER TABLE  `suggestions` ADD  `patronreason` TEXT NULL AFTER  `reason`");
 +    print "Upgrade to $DBversion done (Add column to suggestions table to store patrons' reasons for submitting a suggestion. )\n";
      SetVersion($DBversion);
  }