Bump rev to 2.0.M6-SNAP25.
Added a TODO comment.