Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:17 +0000 (10:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 15:58:17 +0000 (10:58 -0500)

Trivial merge