Merge pull request #354 from erickt/develop

Fix test failures from the recent merges