Fix for shiny issue #2284117

Add patch from drupal.org