Updated to newer upstream version. This makes the two patches obsolete, and also fixes the 64bit incompatibility issue (due to a cast from integer to pointer) in one of the header files