Refix again. Could have been a bad merge this time.
Merge pull request #739 from kwhatmough/next

Refix again. Could have been a bad merge this time.