* Merge from upstream tree at: https://github.com/socialtext/open/tree/8b5efffebed641b0c5149cf434e8402d128f65f4
Merge branch 'master' of github.com:audreyt/socialtext-open