Merge branch 'hotfix/1.5.5' v1.5.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 20:38:11 +0000 (15:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 20:38:11 +0000 (15:38 -0500)

Trivial merge