Merge branch 'master' into gh-pages
auto resize
Revert a4eb1cf..9b6f57d

This rolls back to commit a4eb1cf4c0e30ba868992cdf7c624842cd6813d5.
join
Merge branch 'gh-pages'