code sync'd wit new server interface
Merge branch 'master' into ice-cream-sandwich