Merge branch 'hotfix/1.3.6' v1.3.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Sep 2016 14:37:37 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 9 Sep 2016 14:37:37 +0000 (10:37 -0400)

Trivial merge