Merge remote-tracking branch 'repo/master'
Conflicts: lib/lime/formeval.c lib/lime/progress.c tst/forms/simple-atom.lk
Merge remote-tracking branch 'repo/master'
Conflicts:
lib/lime/formeval.c
lib/lime/progress.c
tst/forms/simple-atom.lk