Merge branch 'release/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:36:21 +0000 (14:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 19 Sep 2016 18:36:21 +0000 (14:36 -0400)

Trivial merge