1.3.0 hhvm

Merge from 1.3.0