Update Machine Head to beta5

I don't think there are any breaking API changes that affect the
project.
MK's changes
resolving conflict