Merge branch 'develop' into move-static-setup

This commit is contained in:
Matt Jaffee 2018-06-19 19:18:23 -05:00
commit 6fb0519683
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF