Merge branch 'hotfix/1.3.6' V1.3.6
authorLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:08:41 +0000 (09:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 29 Oct 2015 13:08:41 +0000 (09:08 -0400)

Trivial merge