IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
