Skydrive upload stuff
Merge commit 'f80eb1dca131ea1d7507540d96633de505b1748b'