Merge branch 'master' into 'stable-3.1'

Till Brehm

2016-04-25 7198764e180cf0af9f619a9079beeb12c286cf4a

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"