minor e-mail address change
Merge branch 'habana'