nojhan, original author and dolmen, maintener
Merge branch 'develop': post release fixes