Merge branch 'develop' into hotfix/1.2.7
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:38:43 +0000 (11:38 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Jun 2016 15:38:43 +0000 (11:38 -0400)

Trivial merge