Merge "Use NULL not 0 for raw pointers"