Merge pull request #515 from forcedotcom/master

Update multi-tenant branch with latest from master
Merge pull request #517 from forcedotcom/master

One more merge from master
Merge pull request #453 from elilevine/multitenant_tables

Multi-tenant tables