Merge branch 'hotfix/2.0.2' v2.0.2
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:52:53 +0000 (17:52 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 26 May 2016 21:52:53 +0000 (17:52 -0400)

Trivial merge