updates from rails 4.1.1 to 4.1.5