Merge branch 'hotfix/1.5.5' v1.5.5
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 19:03:34 +0000 (14:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 19:03:34 +0000 (14:03 -0500)

Trivial merge