Merge pull request #23 from 01org/devel

Devel
Merge pull request #25 from 01org/devel

Devel
Merge pull request #26 from 01org/devel

Devel