Merge branch 'master' of github.com:lme4/lme4

merge
Merge branch 'master' of github.com:lme4/lme4

merge