Fixes #367
Merge branch 'master' of github.com:uikit/uikit
changelog updated