Merge up to the latest version of Hercules.

Signed-off-by: Jedzkie <jedzkie13@rocketmail.com>