merge trunk
change NULL to INT2PTR(0), for clarity
change NULL to INT2PTR(0), for clarity