Dev-freeze -> master merge.