Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 16:31:27 +0000 (11:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 16:31:27 +0000 (11:31 -0500)

Trivial merge