Fixes #631
Merge branch 'develop' of github.com:uikit/uikit into develop