Merge branch 'release/1.2.0'
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 20:55:21 +0000 (16:55 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 25 Jul 2016 20:55:21 +0000 (16:55 -0400)

Trivial merge