update rails, json
Merge branch '3.2.12' into development