New upstream version of UIkit
Merge branch 'master' into shop