olympus xml is experimental
added ms windows phone
Merge remote-tracking branch 'svn/trunk'