Updates to C28 and C29
Merge branch 'master' of github.com:uw/aad