Merge "Use NULL not 0 for pointers"