Merge branch 'release/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:52:46 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 16:52:46 +0000 (11:52 -0500)

Trivial merge