Merge branch 'less-el-get' into current