Upgraded Rails to 3.1.9 as per security recommendations.
Upgraded the MySQL adapter to match.
Note: A new security warning "No secret option provided..." may appear in logs or on the console.
This warning is expected and poses no security threat.
(See http://j.mp/ZyhGV3 for ongoing discussion of the Rails bug.)
Merge branch 'master' into develop