Fixes #371
Merge branch 'master' of github.com:uikit/uikit