Merged with winrt branch.