This commit will resolve the RedHat Bugzilla #1322111. [ import from identical commit against master branch ] [ but without trailing whitespace, thank you so much ] Imported by: Jim Warner <james.warner@comcast.net>