Merge remote-tracking branch 'upstream/master'
Include the core directly
Merge remote-tracking branch 'upstream/master' into divorce-papers
Merge pull request #146 from CodaFi/divorce-papers

Divorce papers