Pick up some changes from release-0.2; not sure why they won't merge with git. Worried.