rails/rails

https://www.youtube.com/watch?v=kADwcTDjMok&feature=youtube_gdata_player&hd=1

#15127

mhenirecord wants to merge 4-1-stable into master