Merge docrails master

I was wondering when merge happens in contrib and was informed it was a manual process. It's been a few days so @zzak suggested a PR. /cc @vijaydev

How do we handle merging rails/rails back into docrails? Do you typically also do that around the same time?