Merge branch 'master' of gitlab.mpcdf.mpg.de:elpa/elpa