Merge branch 'hotfix/1.6.4' master v1.6.4
authorLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 19:26:06 +0000 (15:26 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 12 May 2017 19:26:06 +0000 (15:26 -0400)
commita54477023664c5fb601a4ce51ee56c4f10b73795
tree0a021bb30135a88134f9e97c39d9b1570cc7bee1
parent824a076d881fb6c1cc17157c72812189c3a61d04
parent1fdade6765bf57e19281687cf5046b8486b13738
Merge branch 'hotfix/1.6.4'