Rebased ref, commits from common ancestor:
- weston: Changes to 'upstream-unstable' Hector Oron
- weston: Changes to 'upstream-unstable' Hector Oron
- weston: Changes to 'upstream-unstable' Hector Oron
- weston: Changes to 'upstream-unstable' Emilio Pozuelo Monfort
