Return local time for backwards compatibility
Make sure that a joins Relation can be merged with has_many :through + association proxy

Closes #11248.
Fix simple_format output example ending tag
Merge pull request #11383 from mattdbridges/simple-format-doc-fix

Fix simple_format output example ending tag