Merge branch 'master' into hackathon
Another correction to the notification email.

By this time I know there lot more of minor modifications (corrections)
to come.
Merge branch 'hackathon'