Fixes #734
Merge branches 'develop' and 'develop' of github.com:uikit/uikit into develop