Updated to Cmdr revision <2659fd6b13>.