Branch rails31 merged into master