Add swinkiness.
Merge branch 'master' into robert