Thanks, Llewellyn and Terran! Merged for inclusion in 3.10.
Llewellyn, just a note that I modified your commit messages to include the launchpad bug number.
Thanks, Llewellyn and Terran! Merged for inclusion in 3.10.
Llewellyn, just a note that I modified your commit messages to include the launchpad bug number.