Merge pull request #627 from sdboyer/catch-master

Catch back up to master