Added @edmundwong for work on #1076.  Thanks!