Merge branch 'hotfix/1.1.5' v1.1.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 20:48:43 +0000 (16:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 Aug 2016 20:48:43 +0000 (16:48 -0400)

Trivial merge