Franklin

What's Changed

• Merge master into develop post Elion release by @mpsolano in #398
• REQ-456 Retire python3.5 to support psqlgraph by @stilesj-uchicago in #401

Full Changelog: 3.7.0...4.0.0