Merge branch 'release/1.2.0' v1.2.0
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:43:02 +0000 (09:43 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 19 Oct 2016 13:43:02 +0000 (09:43 -0400)

Trivial merge