Merge branch 'hotfix/1.0.17' v1.0.17
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:21 +0000 (10:21 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 14:21:21 +0000 (10:21 -0400)

Trivial merge