Fix regressions.
Merge branch 'master' of github.com:substance/surface