Merge tag '0.12_rc2'