Merge branch 'master' of ssh://git@moblin.intel.com/umg-moorestown-libva