Merge from master

All tests pass