update version
Merge branch '2.3' into 2.3-1080p