Applied patch from solquimpo in this issue: https://drupal.org/node/2097223,...

  Applied patch from solquimpo in this issue: https://drupal.org/node/2097223, to correct an in-correctly
  set pre-render value which sometimes results in a warning being thrown from the Webform module.

  Added support for webform markup fields as per issue: https://drupal.org/node/1968464