Merge branch 'develop' into hotfix/1.0.5
authorLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 14:19:03 +0000 (09:19 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 31 Jan 2017 14:19:03 +0000 (09:19 -0500)

Trivial merge