Merge remote-tracking branch 'refs/remotes/origin/2.1'
removed media embed
fixed twig error
Merge remote-tracking branch 'refs/remotes/origin/master' into 2.1