Merge branch 'hotfix/1.3.6'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Aug 2015 16:38:04 +0000 (12:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Aug 2015 16:38:04 +0000 (12:38 -0400)

Trivial merge