Add changes from 2014-05-06 rehearsal.