Freeze 2.3
Merge remote branch 'upstream/master'