Revert "Revert "Update 2014-05-12""

This reverts commit 24edbe98c8e048a08528e323bb985ec8aba7b1ac.