EXPED-758 Applied patch from https://drupal.org/node/2214427#comment-8560069