Update for March 2014 event.
Fix merge conflicts...again.