Nicole Engard [Thu, 30 Dec 2010 16:57:06 +0000 (11:57 -0500)]
bug 5419: make reason checkouts blocked stand out
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f379638c9d1921e8663e2c8c5bfabe27af42a666)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Wed, 15 Dec 2010 23:11:28 +0000 (18:11 -0500)]
Bug 5374 (update transaction date when saving biblio) RESENT with small fix
Currently, the plugin marc21_field_005 and its unimarc opponent fill field 005
when this field gets focus. This implies that updating a record without
touching this field does not update 005.
At the same time, a user could accidentally delete a character in the 005 when
having focus. This mutilated field value will be saved however.
I would suggest to add a few lines to ModBiblioMarc in Biblio.pm to ascertain
that adding or updating a record always updates 005 in marc21 as well as
unimarc.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 76338220ddf688f6e38488624dd260e0810db1c3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 16:59:20 +0000 (11:59 -0500)]
bug 5562 change 'issues' to read 'checkouts'
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c71a36fd27ece805705161149bb885aa3e4decdd)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 17:02:15 +0000 (12:02 -0500)]
bug 5563 change note about cover images on enhanced content
on the enhanced content tab of system
preferences it says that Koha will pick
the first cover image - but in fact it
shows them all - that note needs to be
updated to properly warn of the expected
behavior.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 606f9784199722bd661d60be1944aa97c6a8971c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 30 Dec 2010 17:07:11 +0000 (12:07 -0500)]
Reimplemented fix for bug 5556, OPAC does not display the type of authority
Formatting Janusz's suggested changes as a patch.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4e1f49097c184ec7b199fe8176ccf6b9ae331035)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 30 Dec 2010 17:20:33 +0000 (12:20 -0500)]
Reimplement fix for bug 5557 - Link to logs for user with view_system_logs permission
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6a61750bf0a5a6cc5668e0419ab2160cf5d02eac)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Thu, 30 Dec 2010 17:32:37 +0000 (12:32 -0500)]
bug 5040 fix misspelling of distance in marc21 framework
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Fri, 31 Dec 2010 14:18:55 +0000 (09:18 -0500)]
bug 4942 - add validation to patron administration
This validation requires an enrollment period or a date to be provided
before the form will save, which will prevent invalid dates getting into
the system.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7d0212cf38b802d510aa03a705b19fb11060a537)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Fri, 31 Dec 2010 16:19:17 +0000 (11:19 -0500)]
bug 5045 - Help works even when the referrer is being stripped
This fix puts the URL of the source page as a parameter to help.pl,
which will override the referrer value, if it's provided. This deals
with people sitting behind proxies that strip the referrer information
out.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 980de26320d7dc389a0faf88d341f3dc373dd831)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 20 Dec 2010 15:56:11 +0000 (09:56 -0600)]
Fix for Bug 5526, List of lists should be in alphabetical order by list name
Signed-off-by: Liz Rea <lrea@nekls.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit cdbf872bd5dcc99b6e93ab920a0ef17a7592c8c9)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 17 Dec 2010 23:11:43 +0000 (18:11 -0500)]
Fix for bug 5451, can add tags with userlogin turned off
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
(Corrected to apply to 3.2.x)
Frédéric Demians [Fri, 17 Dec 2010 11:16:52 +0000 (11:16 +0000)]
Bug 5446 Fix a bug introduces by previous patch
When AcqCreateItem was set to 'cataloguing' there was no items fields in the
acq web form to validate in JS...
Alert commented.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9a048e2b12e2004fad51b5b0db3187a8eb6c2a04)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Colin Campbell [Thu, 16 Dec 2010 09:59:34 +0000 (04:59 -0500)]
Bug 4286 Allow receiving if subscription enddate not set
HasSubscriptionExpired is not a boolean return it may also
return that a valid subscription enddate is not set
This should not block receipting of issues
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 74e63fe0e602f745e711cf00417b965614f7be68)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Thu, 16 Dec 2010 02:30:38 +0000 (21:30 -0500)]
Fix for Bug 4946 - hold warning needs rewording
This patch improves the phrasing of several messages by
breaking the message variable into distinct parts for more
natural-sounding warnings when:
- Checking out an item on hold for another patron
- Checking out an item which is waiting for another patron
- Checking out an item which is checked out to another patron
- Checking out an item which is checked out to this patron
- Checking out to a patron who has too many checked out
I would appreciate special attention to my changes to the
TooMany function in Circulation.pm to make sure I handled
it correctly.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 324991fefd1c6f336308b0f7aec8e8f0047e6e1a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Wed, 15 Dec 2010 14:23:14 +0000 (09:23 -0500)]
bug 4826 change 'add basket' to 'new basket'
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 07834371f25ab207688e1534c39654049b890951)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Frédéric Demians [Tue, 21 Dec 2010 20:42:41 +0000 (21:42 +0100)]
Bug 5506 Shorten .po file comment lines
In opac/staff templates .po files, we have comment lines contextualizing
extracted text in templates. Path to template are absolute. For example, we can
have:
The first part of the pathname is useless. With this patch, we just keep
relative path to tempalte from Koha template main directory. The above example
becomes:
Nicole Engard [Mon, 20 Dec 2010 13:22:42 +0000 (13:22 +0000)]
bug 5035 remove default opaccolorstylesheet value for new installs
Per the bug, the color.css file is blank and so this preference
should have no value by default. This patch only fixes this for
new installs. There is no way to know if people have added values
to the color.css file in existing installs, so removing that value
in those cases might break things.
This patch does not remove the blank color.css file, it only
edits the default system preference.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a45eb8fb7864ed2c41abb449b1671cf715cab3a7)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jesse Weaver [Sun, 19 Dec 2010 02:12:04 +0000 (19:12 -0700)]
Add .packages file for Ubuntu 10.10
Ubuntu 10.10 has all of Koha's Perl dependencies packaged (aside from a
couple small version issues); add a dpkg --set-selections compatible
file to reflect that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 88d3d09897aa8624b20ad5762b0c06699caa766e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Tue, 14 Dec 2010 19:20:42 +0000 (14:20 -0500)]
Fix for 5143, now with IE debug removed
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work
adds:
- the subtitles into the title link (originally Chris Cormack)
- barcodes for every listed hold
- denoted which items were only item and which could be filled by any item on that bib.
- added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)
[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit be8f1f33430f35257c0ed5e93fc52ddfc65b7d84)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Jane Wagner [Tue, 14 Dec 2010 16:39:12 +0000 (11:39 -0500)]
Bug 3789 Set off shelving location in staff and OPAC title display
Koha puts the shelving location immediately after the library name in the
"Location" column of the title display. If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location. I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates. This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.
[Edit] Re-implemented some changes which wouldn't merge after so long
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f05bd5984c94fbbf1603317fd9fdd8909959dbb5)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Garry Collum [Tue, 14 Dec 2010 14:38:19 +0000 (09:38 -0500)]
Bug 4937: Fixes XHTML in the pagination links of a saved report.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0fc7e5bfdc30ba03ff342f35b27c61f0bd3938d8)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Tue, 14 Dec 2010 13:57:46 +0000 (08:57 -0500)]
bug 4977 add missing order links to 'no results found' page
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5c8ca5129cef8b8d1042e9b774114463bb4e75bb)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Ian Walls [Fri, 10 Sep 2010 16:43:18 +0000 (12:43 -0400)]
Fixes bug 5125: Default focus on circulation-home page
Fix created by Owen Leonard, related over IRC chat (rather than a patch file).
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 34155975fc805059635f520c6cedfe927b9fd7fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Tue, 14 Dec 2010 06:24:16 +0000 (07:24 +0100)]
Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21c516601cf1bba2ae22a3448898a2efed159b8a)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Srdjan Jankovic [Mon, 13 Dec 2010 21:34:07 +0000 (22:34 +0100)]
Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixed small error in circulation.tmpl Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4d1762f5ec451729d74e3fa6282e1726a0a74969)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 13 Dec 2010 21:14:11 +0000 (22:14 +0100)]
Fix for Bug 5000, Uncertain prices misses option to choose display language
- Adding missing footer include for language chooser
- Correcting markup and structure errors
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 21cdd2feb45406728faa395cd457670c4aef2bb3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Mon, 13 Dec 2010 16:13:58 +0000 (11:13 -0500)]
bug 5255 change 'document type' to 'item type'
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 40e2b5421a478ec2e9251798b34858eefa2ef114)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Nicole Engard [Mon, 13 Dec 2010 15:27:47 +0000 (10:27 -0500)]
bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a6799f95fb0315aa413c56f7d75817bb9d1a481e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Mon, 13 Dec 2010 15:30:07 +0000 (15:30 +0000)]
Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.
The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.
Revised for current HEAD
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bd7cca935b9c77ad0514038cfee6c84d02bd8e7d)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Chris Cormack [Mon, 13 Dec 2010 11:44:35 +0000 (11:44 +0000)]
Bug 5484 - Handling bad borrower categories in serial routing lists more gracefully
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 96330a7b07dc78e627d44c5347fd07e42415ca36)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 10 Sep 2010 12:37:55 +0000 (14:37 +0200)]
Fix for Bug 5208, Language chooser missing on Batch item deletion/modification
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2b53b14bacfdd276c3188de2f76ed03201a0cab0)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Thu, 16 Sep 2010 07:08:57 +0000 (19:08 +1200)]
Bug 5228 - make rebuild_zebra handle fixing the zebra dirs
If the zebra server directories don't exist, zebra will spit the dummy.
This makes rebuild_zebra.pl smart enough to create them if they're not
there. If that fails, it'll scream loudly so you know zebra isn't
reindexing.
Owen Leonard [Wed, 24 Nov 2010 14:48:24 +0000 (09:48 -0500)]
Fix for Bug 5416, Template syntax error in moredetails.tmpl
Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen
Owen Leonard [Tue, 21 Sep 2010 14:45:03 +0000 (10:45 -0400)]
Fix for Bug 4218 - Staff client detail page does not show item hold status
Showing "on hold" in the holdings list (as we used to do) is misleading
if it is a bibilo-level hold. However seeing that a title has holds
is important information for this view. This patch adds a line to the
biblio-level information display with a count of the title's outstanding
holds.
Signed-off-by: Nicole Engard <nengard@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6466ac847fadd23ab7941bbca49424c87d382e6e)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Sun, 12 Dec 2010 22:20:03 +0000 (11:20 +1300)]
Update Debian changelog for 3.2.1 release
This adds the required changelog changes to keep it current for the
3.2.1 release. It is intended to go straight into 3.2.x, and probably
should go into master also.
Owen Leonard [Fri, 10 Dec 2010 15:32:20 +0000 (15:32 +0000)]
Fix for Bug 5443, Inaccurate highlighting of fields in patron update email
- email was incorrectly named emailaddress
- string processing was being done to address and B_address
which didn't seem to be serving a purpose
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4095d45eaf374f99b1962b8e41c0c10f1c23f76c)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Owen Leonard [Fri, 10 Dec 2010 14:33:36 +0000 (14:33 +0000)]
Fix for Bug 4173 - Statuses not appearing in the OPAC
This adds display of "Use restrictions" authorized values
to the OPAC and the staff client for available and
not-for-loan items.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit bdf4dd13afc6c709ca682f41618c99d4d4b1ec23)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This was due to the use of an OR which seems to have caused the
param method to be called in a scalar context thus returning only
the first of multiple repeated cgi params.
This patch retains the intent of the OR by replacing it with a
conditional.
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Katrin Fischer [Mon, 6 Dec 2010 07:28:38 +0000 (08:28 +0100)]
Bug 5423: Deleted Patrons are no longer saved in table deletedborrowers
Tested with HEAD
> Should also apply to 3.2.x
( Not tested with 3.2.x)
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Marcel de Rooy [Thu, 9 Dec 2010 12:36:07 +0000 (12:36 +0000)]
bug5455 (Fix uninitialized-warnings on authorities.pl)
Fix warnings for uninitialized authtypecode on lines 646, 653.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 434c1d648325cbae1750a6052bab845a1f450694)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Liz Rea [Wed, 8 Dec 2010 20:15:10 +0000 (15:15 -0500)]
Bug 4935: fix for allowing authorized values to be "unset"
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 61957d07ce718ff3a24bf507828f7d313522f9c3)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Bug 5475 Wrong messages date formating on Check Out page
On the Check Out page, messages related to the borrower are displayed on the
right side. Message text is preceded by a date and library code. The date is
displayed in US format (mm/dd/YYY). Is should be displayed formated depending
on 'dateformat' syspref.
Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 37a17d8fadf745aa9a236f96a1fb5c9665651f04)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Added a jQuery table filter, usefull when you have a lot of rows. This filter works on the entire row and allows you for exemple to type "Adul Perio 5".
Indentation cleaning.
Added tabs to filter colums on 4 axes: All, Issues, Fines and Reserves.
Moved the table filter to the right of the tabs.
Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit fefd158f424939fc473f54a2ffe4ee0e39ffba08)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
Robin Sheat [Mon, 6 Dec 2010 15:58:04 +0000 (16:58 +0100)]
Bug 4500 - remove commas from price formatting
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 692786b51922e75dae76403a7a3317f7aae13905)
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>