Add changes from 2014-04-30 rehearsal.