Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 17:58:04 +0000 (13:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 2 May 2016 17:58:04 +0000 (13:58 -0400)

Trivial merge