:scissors:

This commit also addresses rails/docrails#169 and rails/rails#14159