Dev

All tests pass.  Based on recent upstream.