Ship fully tested
Merge origin/master