Final work for 20130715 release.