Introducing Yoast
Merge remote-tracking branch 'origin/plugins' into plugins

* origin/plugins:
  getting img widgets to work