Merge branch 'release'
vooking email alerts fixes #25