Added a max size to ExtendViewport.

#1504
Merge branch 'origin/master'