Chasing 8.x with https://drupal.org/node/2275679.
Merge branch '8.x-1.x' into embed-display

Conflicts:
	src/Plugin/Filter/EntityEmbedFilter.php