Merge remote-tracking branch 'upstream/master' into ima_beta_seven

Conflicts:
	GoogleMediaFramework/GMFPlayerOverlayView.h