Complete previous merge
Merge branch 'nat' of github.com:mozilla/shumway into nat