Pulling last-minute changes

If this goes to the wrong repo... sorry (first time with inter-fork pull requests).