3.0.7

by Peter Wen

M-1 and Sort order bug fixes.