Merge pull request #33 from MatthewFluet/pre-201306-release

Further work for 201307?? release.