Merge develop into master

Bye bye HHVM, I'll give another try in the future.