stage the yeti files
Merge branch 'master' into theme-yeti
Merge in the yeti customization files.