Apply WYSIWYG ACF fix patch

https://drupal.org/node/1956778