Update to master from rails branch.