
        Merge branch 'master' into announce-extension

b7f31d0