Merge pull request koding#10095 from koding/master

merging from: master, into: sandbox

Merge pull request koding#10095 from koding/master

merging from: master, into: sandbox

Merge pull request koding#10032 from koding/master

merging from: master, into: sandbox

This is the latest stable branch just before we browserified the whol…

…e codebase.

Empty commit for resetting the branch age.