Merge upto the latest Hercules commit.

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