Merge branch 'release/1.2.0' v1.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:50:44 +0000 (13:50 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 12 Aug 2016 17:50:44 +0000 (13:50 -0400)

Trivial merge