Merge branch 'hotfix/1.0.13'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 May 2016 14:08:54 +0000 (10:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 May 2016 14:08:54 +0000 (10:08 -0400)

Trivial merge