Add changes from 2014-05-05 rehearsal.