Merging in the latest from TC
Couple of fixes.
Merge branch 'master' of github.com:markfinger/viewport