Merge branch 'hotfix/1.2' master v1.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 14:48:17 +0000 (10:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 23 Mar 2017 14:48:17 +0000 (10:48 -0400)

Trivial merge