The final commit before officially updating the main version 2 branch.
Authored by: mfg8876 2013-03-01
Parent: [r287]
Child: [r289]