Ap 17 meeting notes
Merge branch 'master' into EmilyC