Merge - Dec 2014 #1

First set of merges from server side changes made during initial limited
beta trial.
Merge - Dec 2014 #2

Merge from:
* Bagus: d52936ec49853bc41c1ec4b1bda22b937b62e12d
* Yuk: af88fe55e1b16fd8fa5901af1be9ed1ec09429f2