Merge branch 'release/1.2.0' v1.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 17:41:42 +0000 (12:41 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 29 Jan 2019 17:41:42 +0000 (12:41 -0500)

Trivial merge