Merge branch 'release/1.2.0' v1.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:29:42 +0000 (14:29 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Feb 2017 19:29:42 +0000 (14:29 -0500)

Trivial merge