Resync master with final beta for 3.0.10 series.