Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-22 4ae3b94bce6b2f26002c1a50247a01ab4cf2219a

1
2
3
check process hhvm_{SYSTEM_USER} with pidfile /var/run/hhvm/hhvm_{SYSTEM_USER}.pid
   start program = "/etc/init.d/hhvm_{SYSTEM_USER} restart"
   stop  program = "/etc/init.d/hhvm_{SYSTEM_USER} stop"