Merge branch 'hotfix/1.3.11' v1.3.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Sep 2016 20:21:21 +0000 (16:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 30 Sep 2016 20:21:21 +0000 (16:21 -0400)

Trivial merge