Merge branch 'hotfix/1.5.11' v1.5.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 14:37:34 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 14:37:34 +0000 (10:37 -0400)

Trivial merge