Updated sk_* and imported them from Core.
Merge origin/master