* Hercules merge e587d71
* Fixed typo at 9e8e3cf

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>