@amcates amcates released this Sep 13, 2017 · 292 commits to production since this release

Assets 2
release-2.6.0

Merge branch 'testing' into production