wintersmith
Updated meta data
Merge branch 'master' into wintersmith