Merge branch 'hotfix/1.1.5' v1.1.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 20:49:39 +0000 (16:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 20:49:39 +0000 (16:49 -0400)

Trivial merge