Motor order in motor balance warning

What is the motor order in the log Auto Analysis report from MP? Is it this: http://ardupilot.org/copter/docs/connect-escs-and-motors.html? Or the ABCD ordering used in the motor test in MP? I’m getting a mismatch warning and want to match the numbers in the report to the motors on the quad.

This is a Quad-X frame with a Pixracer running ArduCopter 3.4.6.

Thank you.

Motors in the log are by the numbers. 1 upper right, 2 lower left, 3 upper left, and 4 lower right.

ABCD is only for testing with Mission Planner and is clockwise starting with motor 1 in this case. A->1, B->4, C->2, D->3

Mike