Merge branch 'hotfix/1.5.5' v1.5.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:19:33 +0000 (11:19 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:19:33 +0000 (11:19 -0500)

Trivial merge