Merge branch 'master' into hhvm
Use user ubuntu
Merge branch 'hhvm' into test